Skip to content
Snippets Groups Projects
Commit a337ef7d authored by Mirco Nasuti's avatar Mirco Nasuti
Browse files

first step trying to merge with Paul's frontend

parent d3110033
No related branches found
No related tags found
No related merge requests found
Showing
with 9975 additions and 4 deletions
......@@ -268,6 +268,7 @@ module.exports = function (grunt) {
imagemin: {
dist: {
dynamic: {
files: [{
expand: true,
cwd: '<%= yeoman.app %>/images',
......@@ -275,6 +276,7 @@ module.exports = function (grunt) {
dest: '<%= yeoman.dist %>/images'
}]
}
}
},
svgmin: {
......@@ -352,6 +354,20 @@ module.exports = function (grunt) {
dropboxAppkey: '7wew0rj0gh2qcik'
}
},
docker_dev: {
constants: {
backendUrl: 'http://backend',
backendExportChartUrl: '<%= ngconstant.demo.constants.backendUrl %>/exportingChart.php',
dropboxAppkey: '7wew0rj0gh2qcik'
}
},
as_dev: {
constants: {
backendUrl: 'https://hbp-dev-backend.ahead-solutions.ch',
backendExportChartUrl: '<%= ngconstant.demo.constants.backendUrl %>/exportingChart.php',
dropboxAppkey: '7wew0rj0gh2qcik'
}
},
prod: {
constants: {
backendUrl: 'http://hbp-mip.chuv.ch/services/backend',
......@@ -434,6 +450,32 @@ module.exports = function (grunt) {
}
]
}
},
docker_dev: {
files: {
'<%= yeoman.dist %>/': '<%= yeoman.dist %>/index.html'
},
options: {
replacements: [
{
pattern: "%DropBoxAppKey%",
replacement: "<%= ngconstant.prod.constants.dropboxAppkey %>"
}
]
}
},
as_dev: {
files: {
'<%= yeoman.dist %>/': '<%= yeoman.dist %>/index.html'
},
options: {
replacements: [
{
pattern: "%DropBoxAppKey%",
replacement: "<%= ngconstant.prod.constants.dropboxAppkey %>"
}
]
}
}
},
......
{
"name": "d3",
"main": "d3.js",
"scripts": [
"d3.js"
],
"ignore": [
".DS_Store",
".git",
".gitignore",
".npmignore",
".spmignore",
".travis.yml",
"Makefile",
"bin",
"component.json",
"composer.json",
"index.js",
"lib",
"node_modules",
"package.json",
"src",
"test"
],
"homepage": "https://github.com/mbostock/d3",
"version": "3.5.6",
"_release": "3.5.6",
"_resolution": {
"type": "version",
"tag": "v3.5.6",
"commit": "0e88ef5aacbc565b7282790c829ea51dd86c978d"
},
"_source": "git://github.com/mbostock/d3.git",
"_target": "3.5.6",
"_originalSource": "d3"
}
\ No newline at end of file
bower.json -diff merge=ours
component.json -diff merge=ours
d3.js -diff merge=ours
d3.min.js -diff merge=ours
package.js -diff merge=ours
# Contributing
**Important:** these GitHub issues are for *bug reports and feature requests only*. Please use [StackOverflow](http://stackoverflow.com/questions/tagged/d3.js) or the [d3-js Google group](https://groups.google.com/d/forum/d3-js) for general help.
If you’re looking for ways to contribute, please [peruse open issues](https://github.com/mbostock/d3/issues?milestone=&page=1&state=open). The icebox is a good place to find ideas that are not currently in development. If you already have an idea, please check past issues to see whether your idea or a similar one was previously discussed.
Before submitting a pull request, consider implementing a live example first, say using [bl.ocks.org](http://bl.ocks.org). Real-world use cases go a long way to demonstrating the usefulness of a proposed feature. The more complex a feature’s implementation, the more usefulness it should provide. Share your demo using the #d3js tag on Twitter or by sending it to the [d3-js Google group](https://groups.google.com/d/forum/d3-js).
If your proposed feature does not involve changing core functionality, consider submitting it instead as a [D3 plugin](https://github.com/d3/d3-plugins). New core features should be for general use, whereas plugins are suitable for more specialized use cases. When in doubt, it’s easier to start with a plugin before “graduating” to core.
To contribute new documentation or add examples to the gallery, just [edit the Wiki](https://github.com/mbostock/d3/wiki)!
## How to Submit a Pull Request
1. Click the “Fork” button to create your personal fork of the D3 repository.
2. After cloning your fork of the D3 repository in the terminal, run `npm install` to install D3’s dependencies.
3. Create a new branch for your new feature. For example: `git checkout -b my-awesome-feature`. A dedicated branch for your pull request means you can develop multiple features at the same time, and ensures that your pull request is stable even if you later decide to develop an unrelated feature.
4. The `d3.js` and `d3.min.js` files are built from source files in the `src` directory. _Do not edit `d3.js` directly._ Instead, edit the source files, and then run `make` to build the generated files.
5. Use `make test` to run tests and verify your changes. If you are adding a new feature, you should add new tests! If you are changing existing functionality, make sure the existing tests run, or update them as appropriate.
6. Sign D3’s [Individual Contributor License Agreement](https://docs.google.com/forms/d/1CzjdBKtDuA8WeuFJinadx956xLQ4Xriv7-oDvXnZMaI/viewform). Unless you are submitting a trivial patch (such as fixing a typo), this form is needed to verify that you are able to contribute.
7. Submit your pull request, and good luck!
Copyright (c) 2010-2015, Michael Bostock
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
* The name Michael Bostock may not be used to endorse or promote products
derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL MICHAEL BOSTOCK BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# Data-Driven Documents
<a href="http://d3js.org"><img src="http://d3js.org/logo.svg" align="left" hspace="10" vspace="6"></a>
**D3.js** is a JavaScript library for manipulating documents based on data. **D3** helps you bring data to life using HTML, SVG, and CSS. **D3** emphasizes web standards and combines powerful visualization components with a data-driven approach to DOM manipulation, giving you the full capabilities of modern browsers without tying yourself to a proprietary framework.
Want to learn more? [See the wiki.](https://github.com/mbostock/d3/wiki)
For examples, [see the gallery](https://github.com/mbostock/d3/wiki/Gallery) and [mbostock’s bl.ocks](http://bl.ocks.org/mbostock).
{
"name": "d3",
"main": "d3.js",
"scripts": [
"d3.js"
],
"ignore": [
".DS_Store",
".git",
".gitignore",
".npmignore",
".spmignore",
".travis.yml",
"Makefile",
"bin",
"component.json",
"composer.json",
"index.js",
"lib",
"node_modules",
"package.json",
"src",
"test"
]
}
This diff is collapsed.
This diff is collapsed.
// Package metadata for Meteor.js.
Package.describe({
name: "d3js:d3", // http://atmospherejs.com/d3js/d3
summary: "D3 (official): A JavaScript visualization library for HTML and SVG.",
version: "3.5.6",
git: "https://github.com/mbostock/d3.git"
});
Package.onUse(function(api) {
api.versionsFrom(["METEOR@1.0"]);
api.addFiles("d3.js", "client");
});
{
"name": "image-map-resizer",
"version": "1.0.0",
"homepage": "https://github.com/davidjbradshaw/image-map-resizer",
"authors": [
"David J. Bradshaw <dave@bradshaw.net>"
],
"description": "Keep HTML Image Maps scaled to the size of an image. It detects the window being resized and updates the co-ordinates of the image map.",
"main": "js/imageMapResizer.min.js",
"keywords": [
"imagemap",
"resizer",
"responsive",
"RWD",
"fluid",
"resize",
"design"
],
"license": "MIT",
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"test",
"tests",
"examples",
"*.md",
"AUTHORS.txt",
"grunt.js",
"gruntfile.js",
"package.json",
"bower.json"
],
"dependencies": {
"jquery": ">=1.7"
},
"_release": "1.0.0",
"_resolution": {
"type": "version",
"tag": "v1.0.0",
"commit": "fc6a53f3b98be0eea7d6a0d9d90f63f5ce46ee50"
},
"_source": "git://github.com/davidjbradshaw/image-map-resizer.git",
"_target": "1.0.0",
"_originalSource": "image-map-resizer"
}
\ No newline at end of file
{
"name": "image-map-resizer",
"version": "1.0.0",
"homepage": "https://github.com/davidjbradshaw/image-map-resizer",
"authors": [
"David J. Bradshaw <dave@bradshaw.net>"
],
"description": "Keep HTML Image Maps scaled to the size of an image. It detects the window being resized and updates the co-ordinates of the image map.",
"main": "js/imageMapResizer.min.js",
"keywords": [
"imagemap",
"resizer",
"responsive",
"RWD",
"fluid",
"resize",
"design"
],
"license": "MIT",
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"test",
"tests",
"examples",
"*.md",
"AUTHORS.txt",
"grunt.js",
"gruntfile.js",
"package.json",
"bower.json"
],
"dependencies": {
"jquery": ">=1.7"
}
}
{
"name": "imageMapResizer",
"title": "Image Map Resizer",
"description": "Keep HTML Image Maps scaled to the size of an image. It detects the window being resized and updates the co-ordinates of the image map.",
"keywords": [
"imagemap",
"resizer",
"responsive",
"RWD",
"fluid",
"resize",
"design"
],
"version": "1.0.0",
"author": {
"name": "David J. Bradshaw",
"email": "davidjbradshaw+github@gmail.com"
},
"maintainers": [
{
"name": "David J. Bradshaw",
"email": "davidjbradshaw+github@gmail.com"
}
],
"licenses": [
{
"type": "MIT",
"url": "https://github.com/jquery/jquery-color/blob/2.1.2/MIT-LICENSE.txt"
}
],
"bugs": "https://github.com/davidjbradshaw/image-map-resizer/issues",
"homepage": "http://davidjbradshaw.github.io/image-map-resizer/",
"docs": "https://github.com/davidjbradshaw/image-map-resizer",
"dependencies": {
"jquery": ">=1.0"
}
}
/*! Image Map Resizer
* Desc: Resize HTML imageMap to scaled image.
* Copyright: (c) 2014-15 David J. Bradshaw - dave@bradshaw.net
* License: MIT
*/
(function(){
'use strict';
function scaleImageMap(){
function resizeMap() {
function resizeAreaTag(cachedAreaCoords,idx){
function scale(coord){
var dimension = ( 1 === (isWidth = 1-isWidth) ? 'width' : 'height' );
return Math.floor(Number(coord) * scallingFactor[dimension]);
}
var isWidth = 0;
areas[idx].coords = cachedAreaCoords.split(',').map(scale).join(',');
}
var scallingFactor = {
width : image.width / image.naturalWidth,
height : image.height / image.naturalHeight
};
cachedAreaCoordsArray.forEach(resizeAreaTag);
}
function getCoords(e){
//Normalize coord-string to csv format without any space chars
return e.coords.replace(/ *, */g,',').replace(/ +/g,',');
}
function debounce() {
clearTimeout(timer);
timer = setTimeout(resizeMap, 250);
}
function start(){
if ((image.width !== image.naturalWidth) || (image.height !== image.naturalHeight)) {
resizeMap();
}
}
function attach(){
map._resize = resizeMap; //Bind resize method to HTML map element
image.addEventListener('onload', resizeMap, false); //Detect late image loads in IE11
window.addEventListener('focus', resizeMap, false); //Cope with window being resized whilst on another tab
window.addEventListener('resize', debounce, false);
document.addEventListener('fullscreenchange', resizeMap, false);
}
function beenHere(){
return ('function' === typeof map._resize);
}
function setup(){
areas = map.getElementsByTagName('area');
cachedAreaCoordsArray = Array.prototype.map.call(areas, getCoords);
image = document.querySelector('img[usemap="#'+map.name+'"]');
}
var
/*jshint validthis:true */
map = this,
areas = null, cachedAreaCoordsArray = null, image = null, timer = null;
if (!beenHere()){
setup();
attach();
start();
} else {
map._resize(); //Already setup, so just resize map
}
}
function factory(){
function init(element){
if(!element.tagName) {
throw new TypeError('Object is not a valid DOM element');
} else if ('MAP' !== element.tagName.toUpperCase()) {
throw new TypeError('Expected <MAP> tag, found <'+element.tagName+'>.');
}
scaleImageMap.call(element);
}
return function imageMapResizeF(target){
switch (typeof(target)){
case 'undefined':
case 'string':
Array.prototype.forEach.call(document.querySelectorAll(target||'map'),init);
break;
case 'object':
init(target);
break;
default:
throw new TypeError('Unexpected data type ('+typeof target+').');
}
};
}
if (typeof define === 'function' && define.amd) {
define([],factory);
} else if (typeof module === 'object' && typeof module.exports === 'object'){
module.exports = factory(); //Node for browserfy
} else {
window.imageMapResize = factory();
}
if('jQuery' in window) {
jQuery.fn.imageMapResize = function $imageMapResizeF(){
return this.filter('map').each(scaleImageMap).end();
};
}
})();
{"version":3,"file":"imageMapResizer.min.js","sources":["imageMapResizer.js"],"names":["scaleImageMap","resizeMap","resizeAreaTag","cachedAreaCoords","idx","scale","coord","dimension","isWidth","Math","floor","Number","scallingFactor","areas","coords","split","map","join","width","image","naturalWidth","height","naturalHeight","cachedAreaCoordsArray","forEach","getCoords","e","replace","debounce","clearTimeout","timer","setTimeout","start","attach","_resize","addEventListener","window","document","beenHere","setup","getElementsByTagName","Array","prototype","call","querySelector","name","this","factory","init","element","tagName","TypeError","toUpperCase","target","querySelectorAll","define","amd","module","exports","imageMapResize","jQuery","fn","filter","each","end"],"mappings":";;;;;;CAMA,WACI,YAEA,SAASA,KAEL,QAASC,KACL,QAASC,GAAcC,EAAiBC,GACpC,QAASC,GAAMC,GACX,GAAIC,GAAc,KAAOC,EAAU,EAAEA,GAAW,QAAU,QAC1D,OAAOC,MAAKC,MAAMC,OAAOL,GAASM,EAAeL,IAGrD,GAAIC,GAAU,CAEdK,GAAMT,GAAKU,OAASX,EAAiBY,MAAM,KAAKC,IAAIX,GAAOY,KAAK,KAGpE,GAAIL,IACAM,MAASC,EAAMD,MAASC,EAAMC,aAC9BC,OAASF,EAAME,OAASF,EAAMG,cAGlCC,GAAsBC,QAAQtB,GAGlC,QAASuB,GAAUC,GAEf,MAAOA,GAAEZ,OAAOa,QAAQ,SAAS,KAAKA,QAAQ,MAAM,KAGxD,QAASC,KACLC,aAAaC,GACbA,EAAQC,WAAW9B,EAAW,KAGlC,QAAS+B,MACAb,EAAMD,QAAUC,EAAMC,cAAkBD,EAAME,SAAWF,EAAMG,gBAChErB,IAIR,QAASgC,KACLjB,EAAIkB,QAAUjC,EACdkB,EAAMgB,iBAAiB,SAAWlC,GAAW,GAC7CmC,OAAOD,iBAAiB,QAAUlC,GAAW,GAC7CmC,OAAOD,iBAAiB,SAAUP,GAAW,GAC7CS,SAASF,iBAAiB,mBAAoBlC,GAAY,GAG9D,QAASqC,KACL,MAAQ,kBAAsBtB,GAAIkB,QAGtC,QAASK,KACL1B,EAAwBG,EAAIwB,qBAAqB,QACjDjB,EAAwBkB,MAAMC,UAAU1B,IAAI2B,KAAK9B,EAAOY,GACxDN,EAAwBkB,SAASO,cAAc,gBAAgB5B,EAAI6B,KAAK,MAI5E,GAEI7B,GAAQ8B,KACRjC,EAAQ,KAAMU,EAAwB,KAAMJ,EAAQ,KAAMW,EAAQ,IAEjEQ,KAKDtB,EAAIkB,WAJJK,IACAN,IACAD,KAQR,QAASe,KACL,QAASC,GAAKC,GACV,IAAIA,EAAQC,QACR,KAAM,IAAIC,WAAU,oCACjB,IAAI,QAAUF,EAAQC,QAAQE,cACjC,KAAM,IAAID,WAAU,8BAA8BF,EAAQC,QAAQ,KAGtElD,GAAc2C,KAAKM,GAGvB,MAAO,UAAyBI,GAC5B,aAAc,IACV,IAAK,YACL,IAAK,SACDZ,MAAMC,UAAUlB,QAAQmB,KAAKN,SAASiB,iBAAiBD,GAAQ,OAAOL,EACtE,MACJ,KAAK,SACDA,EAAKK,EACL,MACJ,SACI,KAAM,IAAIF,WAAU,+BAAgCE,GAAO,QAKrD,kBAAXE,SAAyBA,OAAOC,IACvCD,UAAUR,GACe,gBAAXU,SAAiD,gBAAnBA,QAAOC,QACnDD,OAAOC,QAAUX,IAEjBX,OAAOuB,eAAiBZ,IAIzB,UAAYX,UACXwB,OAAOC,GAAGF,eAAiB,WACvB,MAAOb,MAAKgB,OAAO,OAAOC,KAAK/D,GAAegE"}
\ No newline at end of file
/*! Image Map Resizer (imageMapResizer.min.js ) - v1.0.0 - 2015-10-02
* Desc: Resize HTML imageMap to scaled image.
* Copyright: (c) 2015 David J. Bradshaw - dave@bradshaw.net
* License: MIT
*/
!function(){"use strict";function a(){function a(){function a(a,c){function d(a){var c=1===(e=1-e)?"width":"height";return Math.floor(Number(a)*b[c])}var e=0;i[c].coords=a.split(",").map(d).join(",")}var b={width:k.width/k.naturalWidth,height:k.height/k.naturalHeight};j.forEach(a)}function b(a){return a.coords.replace(/ *, */g,",").replace(/ +/g,",")}function c(){clearTimeout(l),l=setTimeout(a,250)}function d(){(k.width!==k.naturalWidth||k.height!==k.naturalHeight)&&a()}function e(){h._resize=a,k.addEventListener("onload",a,!1),window.addEventListener("focus",a,!1),window.addEventListener("resize",c,!1),document.addEventListener("fullscreenchange",a,!1)}function f(){return"function"==typeof h._resize}function g(){i=h.getElementsByTagName("area"),j=Array.prototype.map.call(i,b),k=document.querySelector('img[usemap="#'+h.name+'"]')}var h=this,i=null,j=null,k=null,l=null;f()?h._resize():(g(),e(),d())}function b(){function b(b){if(!b.tagName)throw new TypeError("Object is not a valid DOM element");if("MAP"!==b.tagName.toUpperCase())throw new TypeError("Expected <MAP> tag, found <"+b.tagName+">.");a.call(b)}return function(a){switch(typeof a){case"undefined":case"string":Array.prototype.forEach.call(document.querySelectorAll(a||"map"),b);break;case"object":b(a);break;default:throw new TypeError("Unexpected data type ("+typeof a+").")}}}"function"==typeof define&&define.amd?define([],b):"object"==typeof module&&"object"==typeof module.exports?module.exports=b():window.imageMapResize=b(),"jQuery"in window&&(jQuery.fn.imageMapResize=function(){return this.filter("map").each(a).end()})}();
//# sourceMappingURL=imageMapResizer.map
\ No newline at end of file
......@@ -50,15 +50,12 @@
<!-- Add your site or application content here -->
<header id="topnav" class="navbar navbar-default navbar-fixed-top fixed" change-on-scroll role="banner"
ng-include="'scripts/app/header/header.html'" ng-controller="HeaderController" ng-show="!isNewVisitor()"></header>
<div id="wrapper">
<div id="layout-static">
<div class="static-content-wrapper">
<div class="static-content">
<div class="page-content" ui-view class="mainview-animation animated"></div>
</div>
<footer id="footer" role="contentinfo" ng-cloak ng-show="!isNewVisitor()">
<div class="clearfix container-fluid">
<div class="row">
......@@ -71,7 +68,6 @@
</div>
</div>
</footer>
</div>
</div>
</div>
......@@ -130,6 +126,7 @@
<script src="bower_components/jquery.ui/ui/jquery.ui.sortable.js"></script>
<script src="bower_components/angular-utf8-base64/angular-utf8-base64.min.js"></script>
<script src="bower_components/image-map-resizer/js/imageMapResizer.min.js"></script>
<script src="bower_components/d3/d3.js"></script>
<!-- endbower -->
<script type='text/javascript' src='styles/plugins/wijets/wijets.js'></script>
<!-- endbuild -->
......@@ -174,6 +171,8 @@
<script src="scripts/app/models/model.router.js"></script>
<script src="scripts/app/models/model.controller.js"></script>
<script src="scripts/app/models/model.service.js"></script>
<script src="scripts/app/models/variable_selection/variable_selection.directives.js"></script>
<script src="scripts/app/models/criteria/criteria.controller.js"></script>
<script src="scripts/app/models/chart/chart.controller.js"></script>
<script src="scripts/app/models/configuration/configuration.controller.js"></script>
......
{
"count": 1649,
"min": 0,
"std": 0.550091934,
"code": "3rdVentricle",
"max": 4.1260505,
"average": 1.711390532,
"dataType": "SummaryStatistics"
}
\ No newline at end of file
{
"count": 1649,
"min": 0,
"std": 0.519514017,
"code": "4thVentricle",
"max": 5.638474,
"average": 2.091866911,
"dataType": "SummaryStatistics"
}
\ No newline at end of file
{
"count": 1505,
"min": 0,
"std": 9.640863171,
"code": "ADAS11",
"max": 66,
"average": 10.85851827,
"dataType": "SummaryStatistics"
}
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment