Commit 0b965ef1 authored by Maxime Chazalviel's avatar Maxime Chazalviel

Merge branch 'master' into feature/flux

# Conflicts:
#	resources/lib/functions/GraphNetwork.js
#	resources/lib/functions/GraphUtils.js
parents 2ef02e31 73c65a3f

Too many changes to show.

To preserve performance only 612 of 612+ files are displayed.

......@@ -3,11 +3,11 @@
* The application's namespace.
*/
"name": "metExploreViz",
/**
* The version of the application.
*/
"version": "2.6.5",
"version": "2.6.13",
/**
* The relative path to the application's markup file (html, jsp, asp, etc.).
......@@ -41,22 +41,22 @@
* The Sencha Framework for this application: "ext" or "touch".
*/
"framework": "ext",
/**
* The toolkit to use. Select either "classic" or "modern".
*/
"toolkit": "classic",
/**
* The name of the theme for this application.
*/
"theme": "theme-triton",
/**
* The list of required packages (with optional versions; default is "latest").
*
......@@ -103,9 +103,9 @@
* "save": "sass/save.scss"
*
*/
// "save": "sass/save.scss",
/**
* Comma-separated list of files or folders containing extra Sass. These
* files are automatically included in the Sass compilation. By default this
......@@ -342,18 +342,18 @@
"bundle": true
},
{
"path": "resources/lib/functions/GraphPanel.js",
"path": "resources/lib/functions/GraphPanel.js",
"bundle": true
},
{
"path": "resources/lib/functions/GraphPath.js",
"path": "resources/lib/functions/GraphPath.js",
"bundle": true
},
{
"path": "resources/lib/functions/GraphStyleEdition.js",
"bundle": true
}
],
],
......@@ -430,21 +430,21 @@
* are supported.
*
*/
"loader": {
// This property controls how the loader manages caching for requests:
//
// - true: allows requests to receive cached responses
// - false: disable cached responses by adding a random "cache buster"
// - other: a string (such as the build.timestamp shown here) to allow
// requests to be cached for this build.
//
"cache": false,
// When "cache" is not true, this value is the request parameter used
// to control caching.
//
"cacheParam": "_dc"
},
"loader": {
// This property controls how the loader manages caching for requests:
//
// - true: allows requests to receive cached responses
// - false: disable cached responses by adding a random "cache buster"
// - other: a string (such as the build.timestamp shown here) to allow
// requests to be cached for this build.
//
"cache": false,
// When "cache" is not true, this value is the request parameter used
// to control caching.
//
"cacheParam": "_dc"
},
/**
* Settings specific to production builds.
......@@ -466,13 +466,13 @@
"type": "yui"
}
},
/**
* Settings specific to testing builds.
*/
"testing": {
},
/**
* Settings specific to development builds.
*/
......@@ -515,7 +515,7 @@
*/
"bootstrap": {
"base": "${app.dir}",
"microloader": "bootstrap.js",
"css": "bootstrap.css"
},
......@@ -560,7 +560,7 @@
* }
*
*/
"output": {
"base": "${workspace.build.dir}/${build.environment}/${app.name}",
"appCache": {
......@@ -572,8 +572,8 @@
"enable": true
}
},
/**
* Controls for localStorage caching
* "cache": {
......@@ -589,11 +589,12 @@
* "deltas": "deltas"
* }
*/
"cache": {
"enable": false
"enable": false,
"deltas": true
},
/**
* Used to automatically generate cache.manifest (HTML 5 application cache manifest)
......@@ -648,9 +649,9 @@
* generated inside this directory must be kept intact for proper generation of
* deltas between updates.
*/
"archivePath": "archive",
/**
......@@ -695,7 +696,7 @@
* }
*
*/
/**
* Uniquely generated id for this application, used as prefix for localStorage keys.
......
......@@ -37,7 +37,7 @@ Ext.define('metExploreViz.view.form.drawingStyleForm.DrawingStyleForm', {
// text: 'Charge',
html:" <h2>Charge</h2> Attracts (+) or repels (-) nodes to/from each other.\n",
// style: " font-size:20px;",
margin:'5 5 5 5',
margin:'5 5 5 5'
},
{
xtype: 'slider',
......@@ -120,7 +120,7 @@ Ext.define('metExploreViz.view.form.drawingStyleForm.DrawingStyleForm', {
xtype: 'label',
forId: 'myFieldId',
html:" <h2>Collide</h2> Prevents nodes from overlapping\n",
margin:'5 5 5 5',
margin:'5 5 5 5'
},
{
xtype: 'slider',
......@@ -201,7 +201,7 @@ Ext.define('metExploreViz.view.form.drawingStyleForm.DrawingStyleForm', {
xtype: 'label',
forId: 'myFieldId',
html:" <h2>Gravity</h2> Pulls all points towards window center\n",
margin:'5 5 5 5',
margin:'5 5 5 5'
},
{
xtype: 'slider',
......@@ -236,7 +236,7 @@ Ext.define('metExploreViz.view.form.drawingStyleForm.DrawingStyleForm', {
xtype: 'label',
forId: 'myFieldId',
html:" <h2>Link</h2> Sets link length\n",
margin:'5 5 5 5',
margin:'5 5 5 5'
},
{
xtype: 'slider',
......
......@@ -92,9 +92,9 @@ Ext.define('metExploreViz.view.menu.viz_DrawingMenu.Viz_DrawingMenu', {
// id:'hierarchicalLayoutMenuID',
reference:'hierarchicalLayout',
tooltip:'Apply hierarchical drawing algorithm on the network',
iconCls:'hierarchicalDrawing',
iconCls:'hierarchicalDrawing'
// padding:'0 0 0 0',
// iconCls:'hierarchicalLayoutMenu'
},
}
]
});
\ No newline at end of file
......@@ -62,5 +62,5 @@ Ext.define('metExploreViz.view.menu.viz_MiningMenu.Viz_MiningMenuController', {
},
highlightSubnetwork : function(){
metExploreD3.GraphFunction.highlightSubnetwork();
},
}
});
\ No newline at end of file
<?xml version="1.0"?>
<svg xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:cml="http://www.xml-cml.org/schema" width="189.282" height="180" x="0" y="0" font-family="sans-serif" stroke="rgb(0,0,0)" stroke-width="1" >
<line x1="109.3" y1="50.4" x2="109.3" y2="80.0"/>
<polygon points="122.682032 103.209481 112.746134 78.000000 105.817931 82.000000 " />
<line x1="109.3" y1="80.0" x2="74.6" y2="100.0"/>
<line x1="109.3" y1="80.0" x2="138.9" y2="80.0"/>
<line x1="73.1" y1="102.6" x2="47.5" y2="87.8"/>
<line x1="76.1" y1="97.4" x2="50.5" y2="82.6"/>
<line x1="74.6" y1="100.0" x2="74.6" y2="129.6"/>
<text x="103.282032" y="48.320000" fill="rgb(102,102,102)" stroke="rgb(102,102,102)" stroke-width="1" font-size="16" >CH</text>
<text x="127.282032" y="56.000000" fill="rgb(102,102,102)" stroke="rgb(102,102,102)" stroke-width="1" font-size="13" >3</text>
<text x="143.282032" y="84.800000" fill="rgb(12,12,255)" stroke="rgb(12,12,255)" stroke-width="1" font-size="16" >NH</text>
<text x="167.282032" y="89.600000" fill="rgb(12,12,255)" stroke="rgb(12,12,255)" stroke-width="1" font-size="13" >2</text>
<text x="36.400000" y="88.320000" fill="rgb(255,12,12)" stroke="rgb(255,12,12)" stroke-width="1" font-size="16" >O</text>
<text x="68.641016" y="144.800000" fill="rgb(255,12,12)" stroke="rgb(255,12,12)" stroke-width="1" font-size="16" >OH</text>
<text x="123.282032" y="119.441016" fill="rgb(191,191,191)" stroke="rgb(191,191,191)" stroke-width="1" font-size="16" >H</text>
<text font-size="18.000000" fill ="black" font-family="sans-serif"
x="140.000000" y="20.000000" ></text>
<title> - OBDepict</title>
</svg>
<?xml version="1.0"?>
<svg xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:cml="http://www.xml-cml.org/schema" width="392.376" height="250.188" x="0" y="0" font-family="sans-serif" stroke="rgb(0,0,0)" stroke-width="1" >
<line x1="269.6" y1="72.7" x2="269.6" y2="110.5"/>
<line x1="269.6" y1="72.7" x2="245.4" y2="58.7"/>
<line x1="181.0" y1="72.7" x2="143.2" y2="72.7"/>
<line x1="181.0" y1="72.7" x2="195.0" y2="48.5"/>
<polygon points="293.002134 120.180436 271.148450 106.798775 268.086983 114.189811 " />
<polygon points="155.866364 50.796450 139.746707 70.716515 146.674910 74.716515 " />
<line x1="326.0" y1="134.1" x2="326.2" y2="134.9"/>
<line x1="318.6" y1="135.7" x2="319.0" y2="137.2"/>
<line x1="311.2" y1="137.2" x2="311.8" y2="139.5"/>
<line x1="303.8" y1="138.8" x2="304.6" y2="141.9"/>
<line x1="296.4" y1="140.4" x2="297.4" y2="144.2"/>
<line x1="289.0" y1="141.9" x2="290.2" y2="146.6"/>
<line x1="281.6" y1="143.5" x2="283.0" y2="148.9"/>
<line x1="279.4" y1="147.0" x2="299.2" y2="166.8"/>
<polygon points="270.580060 191.595405 255.510829 170.869320 249.853975 176.526174 " />
<line x1="252.7" y1="173.7" x2="245.4" y2="200.7"/>
<polygon points="135.805404 173.223312 113.958395 127.383182 107.030191 131.383182 " />
<line x1="110.5" y1="129.4" x2="96.5" y2="153.6"/>
<line x1="66.0" y1="131.6" x2="65.3" y2="131.2"/>
<line x1="68.3" y1="128.6" x2="66.9" y2="127.8"/>
<line x1="70.5" y1="125.5" x2="68.4" y2="124.3"/>
<line x1="72.7" y1="122.4" x2="70.0" y2="120.8"/>
<line x1="75.0" y1="119.3" x2="71.5" y2="117.3"/>
<line x1="77.2" y1="116.3" x2="73.1" y2="113.9"/>
<line x1="79.4" y1="113.2" x2="74.6" y2="110.4"/>
<line x1="77.8" y1="110.5" x2="49.8" y2="110.5"/>
<line x1="210.3" y1="187.4" x2="209.5" y2="187.2"/>
<line x1="211.7" y1="183.8" x2="210.1" y2="183.4"/>
<line x1="213.0" y1="180.3" x2="210.7" y2="179.7"/>
<line x1="214.4" y1="176.7" x2="211.3" y2="175.9"/>
<line x1="215.8" y1="173.2" x2="211.9" y2="172.2"/>
<line x1="217.1" y1="169.6" x2="212.5" y2="168.4"/>
<line x1="218.5" y1="166.1" x2="213.1" y2="164.7"/>
<line x1="216.2" y1="163.9" x2="189.2" y2="171.2"/>
<line x1="140.5" y1="134.5" x2="139.7" y2="134.4"/>
<line x1="141.3" y1="130.8" x2="139.8" y2="130.6"/>
<line x1="142.2" y1="127.1" x2="139.9" y2="126.8"/>
<line x1="143.1" y1="123.4" x2="139.9" y2="123.0"/>
<line x1="144.0" y1="119.7" x2="140.0" y2="119.2"/>
<line x1="144.9" y1="116.1" x2="140.1" y2="115.4"/>
<line x1="145.8" y1="112.4" x2="140.2" y2="111.6"/>
<line x1="143.2" y1="110.5" x2="170.2" y2="103.3"/>
<line x1="77.8" y1="72.7" x2="49.8" y2="72.7"/>
<line x1="77.8" y1="72.7" x2="63.8" y2="48.5"/>
<polygon points="181.965606 133.980605 207.449539 131.293311 205.378986 123.565904 " />
<line x1="206.4" y1="127.4" x2="186.6" y2="107.7"/>
<line x1="143.2" y1="72.7" x2="143.2" y2="110.5"/>
<line x1="143.2" y1="110.5" x2="110.5" y2="129.4"/>
<line x1="110.5" y1="129.4" x2="77.8" y2="110.5"/>
<line x1="77.8" y1="110.5" x2="77.8" y2="72.7"/>
<line x1="77.8" y1="72.7" x2="102.0" y2="58.7"/>
<line x1="119.0" y1="58.7" x2="143.2" y2="72.7"/>
<line x1="269.6" y1="110.5" x2="279.4" y2="147.0"/>
<line x1="279.4" y1="147.0" x2="252.7" y2="173.7"/>
<line x1="252.7" y1="173.7" x2="216.2" y2="163.9"/>
<line x1="216.2" y1="163.9" x2="206.4" y2="127.4"/>
<line x1="206.4" y1="127.4" x2="226.2" y2="107.7"/>
<line x1="242.6" y1="103.3" x2="269.6" y2="110.5"/>
<text x="221.301201" y="62.147626" fill="rgb(255,12,12)" stroke="rgb(255,12,12)" stroke-width="1" font-size="16" >HO</text>
<text x="193.877475" y="48.320000" fill="rgb(255,12,12)" stroke="rgb(255,12,12)" stroke-width="1" font-size="16" >OH</text>
<text x="300.108248" y="178.497747" fill="rgb(255,12,12)" stroke="rgb(255,12,12)" stroke-width="1" font-size="16" >OH</text>
<text x="227.304794" y="214.988278" fill="rgb(255,12,12)" stroke="rgb(255,12,12)" stroke-width="1" font-size="16" >HO</text>
<text x="76.005404" y="166.899697" fill="rgb(255,12,12)" stroke="rgb(255,12,12)" stroke-width="1" font-size="16" >HO</text>
<text x="24.400000" y="115.294293" fill="rgb(255,12,12)" stroke="rgb(255,12,12)" stroke-width="1" font-size="16" >HO</text>
<text x="164.101340" y="178.497747" fill="rgb(255,12,12)" stroke="rgb(255,12,12)" stroke-width="1" font-size="16" >HO</text>
<text x="43.288889" y="48.320000" fill="rgb(255,12,12)" stroke="rgb(255,12,12)" stroke-width="1" font-size="16" >HO</text>
<text x="104.494293" y="62.147626" fill="rgb(255,12,12)" stroke="rgb(255,12,12)" stroke-width="1" font-size="16" >O</text>
<text x="229.527185" y="109.036685" fill="rgb(255,12,12)" stroke="rgb(255,12,12)" stroke-width="1" font-size="16" >O</text>
<text x="173.701340" y="109.036685" fill="rgb(255,12,12)" stroke="rgb(255,12,12)" stroke-width="1" font-size="16" >O</text>
<text x="298.519832" y="129.751223" fill="rgb(191,191,191)" stroke="rgb(191,191,191)" stroke-width="1" font-size="16" >H</text>
<text x="156.099697" y="48.320000" fill="rgb(191,191,191)" stroke="rgb(191,191,191)" stroke-width="1" font-size="16" >H</text>
<text x="346.376387" y="135.749608" fill="rgb(191,191,191)" stroke="rgb(191,191,191)" stroke-width="1" font-size="16" >H</text>
<text x="273.395325" y="205.210670" fill="rgb(191,191,191)" stroke="rgb(191,191,191)" stroke-width="1" font-size="16" >H</text>
<text x="142.272071" y="199.616212" fill="rgb(191,191,191)" stroke="rgb(191,191,191)" stroke-width="1" font-size="16" >H</text>
<text x="55.288889" y="148.010808" fill="rgb(191,191,191)" stroke="rgb(191,191,191)" stroke-width="1" font-size="16" >H</text>
<text x="202.814262" y="205.210670" fill="rgb(191,191,191)" stroke="rgb(191,191,191)" stroke-width="1" font-size="16" >H</text>
<text x="134.679819" y="152.748877" fill="rgb(191,191,191)" stroke="rgb(191,191,191)" stroke-width="1" font-size="16" >H</text>
<text x="36.400000" y="77.516515" fill="rgb(191,191,191)" stroke="rgb(191,191,191)" stroke-width="1" font-size="16" >H</text>
<text x="166.323731" y="142.007216" fill="rgb(191,191,191)" stroke="rgb(191,191,191)" stroke-width="1" font-size="16" >H</text>
<text font-size="18.000000" fill ="black" font-family="sans-serif"
x="140.000000" y="20.000000" ></text>
<title> - OBDepict</title>
</svg>
<?xml version="1.0"?>
<svg xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:cml="http://www.xml-cml.org/schema" width="120" height="80" x="0" y="0" font-family="sans-serif" stroke="rgb(0,0,0)" stroke-width="1" >
<line x1="69.6" y1="43.0" x2="50.4" y2="43.0"/>
<line x1="69.6" y1="37.0" x2="50.4" y2="37.0"/>
<text x="74.000000" y="44.800000" fill="rgb(102,102,102)" stroke="rgb(102,102,102)" stroke-width="1" font-size="16" >CH</text>
<text x="98.000000" y="49.600000" fill="rgb(102,102,102)" stroke="rgb(102,102,102)" stroke-width="1" font-size="13" >2</text>
<text x="36.400000" y="44.800000" fill="rgb(255,12,12)" stroke="rgb(255,12,12)" stroke-width="1" font-size="16" >O</text>
<text font-size="18.000000" fill ="black" font-family="sans-serif"
x="140.000000" y="20.000000" ></text>
<title> - OBDepict</title>
</svg>
<?xml version="1.0"?>
<svg xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:cml="http://www.xml-cml.org/schema" width="189.282" height="154.641" x="0" y="0" font-family="sans-serif" stroke="rgb(0,0,0)" stroke-width="1" >
<line x1="109.3" y1="50.4" x2="109.3" y2="80.0"/>
<line x1="74.6" y1="100.0" x2="109.3" y2="80.0"/>
<line x1="74.6" y1="100.0" x2="49.0" y2="85.2"/>
<line x1="122.4" y1="102.0" x2="121.7" y2="102.4"/>
<line x1="120.8" y1="98.3" x2="119.4" y2="99.1"/>
<line x1="119.1" y1="94.6" x2="117.0" y2="95.8"/>
<line x1="117.5" y1="91.0" x2="114.7" y2="92.6"/>
<line x1="115.8" y1="87.3" x2="112.3" y2="89.3"/>