Commit 478f2dc5 authored by mchazalviel's avatar mchazalviel

Flux optimisation

parent 01332fdf
/temp/
\ No newline at end of file
/temp/
\ No newline at end of file
This diff is collapsed.
......@@ -8,7 +8,8 @@ var Ext = Ext || window['Ext'] || {};
//<editor-fold desc="Microloader">
/**
* @Class Ext.Microloader
* @class Ext.Microloader
* @private
* @singleton
*/
Ext.Microloader = Ext.Microloader || (function () {
......@@ -24,6 +25,7 @@ Ext.Microloader = Ext.Microloader || (function () {
_privatePrefix = '_ext:' + location.pathname,
/**
* @method getStorageKey
* The Following combination is used to create isolated local storage keys
* '_ext' is used to scope all the local storage keys that we internally by Ext
* 'location.pathname' is used to force each assets to cache by an absolute URL (/build/MyApp) (dev vs prod)
......@@ -72,7 +74,7 @@ Ext.Microloader = Ext.Microloader || (function () {
}
},
/**
* private
* @private
*/
retrieveAsset: function (key) {
try {
......@@ -271,7 +273,7 @@ Ext.Microloader = Ext.Microloader || (function () {
/**
* Microloader
* @type {Array}
* @type {Array}
* @private
*/
var _listeners = [],
......@@ -370,7 +372,6 @@ Ext.Microloader = Ext.Microloader || (function () {
},
/**
*
* @param {Manifest} manifest
*/
load: function (manifest) {
......
......@@ -136,6 +136,9 @@
"production": {
"compressor": {
"type": "yui"
},
"cache": {
"enable": true
}
},
......
......@@ -183,8 +183,7 @@ this file in most cases.
-init-defaults,
-after-init-defaults,
-init-compiler,
-init-native-package,
-init-web-server"/>
-init-native-package"/>
<!--
===============================================================
......
......@@ -35,21 +35,22 @@
"appName": "metExploreViz",
"appStores": "",
"appViews": "",
"classic": true,
"classic": false,
"controllerFileName": "Main",
"controllerName": "Main",
"controllerNamespace": "metExploreViz.controller",
"frameworkKey": "ext",
"frameworkName": "ext",
"frameworkPath": "ext",
"modelNamespace": "metExploreViz.model",
"modern": false,
"name": "metExploreViz",
"packagesRelPath": "ext/packages",
"packagesRelPath": "ext/packages/,C:/wamp/www/MetExplore/lib/javascript/metExploreVizDev/ext/classic",
"senchadir": ".sencha",
"themeName": "default",
"toolkit": "classic",
"uniqueId": "6d94eb78-1987-42b5-8a20-9338f6f77a00",
"universal": false,
"toolkit": "",
"uniqueId": "c2a09d62-4072-4cd8-93fd-00718ff8a8f2",
"universal": true,
"viewFileName": "Main",
"viewName": "Main",
"viewNamespace": "metExploreViz.view"
......@@ -64,21 +65,22 @@
"appName": "metExploreViz",
"appStores": "",
"appViews": "",
"classic": true,
"classic": false,
"controllerFileName": "Main",
"controllerName": "Main",
"controllerNamespace": "metExploreViz.controller",
"frameworkKey": "ext",
"frameworkName": "ext",
"frameworkPath": "ext",
"modelNamespace": "metExploreViz.model",
"modern": false,
"name": "metExploreViz",
"packagesRelPath": "ext/packages",
"packagesRelPath": "ext/packages/,C:/wamp/www/MetExplore/lib/javascript/metExploreVizDev/ext/classic",
"senchadir": ".sencha",
"themeName": "default",
"toolkit": "classic",
"uniqueId": "6d94eb78-1987-42b5-8a20-9338f6f77a00",
"universal": false,
"toolkit": "",
"uniqueId": "c2a09d62-4072-4cd8-93fd-00718ff8a8f2",
"universal": true,
"viewFileName": "Main",
"viewName": "Main",
"viewNamespace": "metExploreViz.view"
......@@ -93,21 +95,22 @@
"appName": "metExploreViz",
"appStores": "",
"appViews": "",
"classic": true,
"classic": false,
"controllerFileName": "Main",
"controllerName": "Main",
"controllerNamespace": "metExploreViz.controller",
"frameworkKey": "ext",
"frameworkName": "ext",
"frameworkPath": "ext",
"modelNamespace": "metExploreViz.model",
"modern": false,
"name": "metExploreViz",
"packagesRelPath": "ext/packages",
"packagesRelPath": "ext/packages/,C:/wamp/www/MetExplore/lib/javascript/metExploreVizDev/ext/classic",
"senchadir": ".sencha",
"themeName": "default",
"toolkit": "classic",
"uniqueId": "6d94eb78-1987-42b5-8a20-9338f6f77a00",
"universal": false,
"toolkit": "",
"uniqueId": "c2a09d62-4072-4cd8-93fd-00718ff8a8f2",
"universal": true,
"viewFileName": "Main",
"viewName": "Main",
"viewNamespace": "metExploreViz.view"
......@@ -122,21 +125,22 @@
"appName": "metExploreViz",
"appStores": "",
"appViews": "",
"classic": true,
"classic": false,
"controllerFileName": "Main",
"controllerName": "Main",
"controllerNamespace": "metExploreViz.controller",
"frameworkKey": "ext",
"frameworkName": "ext",
"frameworkPath": "ext",
"modelNamespace": "metExploreViz.model",
"modern": false,
"name": "metExploreViz",
"packagesRelPath": "ext/packages",
"packagesRelPath": "ext/packages/,C:/wamp/www/MetExplore/lib/javascript/metExploreVizDev/ext/classic",
"senchadir": ".sencha",
"themeName": "default",
"toolkit": "classic",
"uniqueId": "6d94eb78-1987-42b5-8a20-9338f6f77a00",
"universal": false,
"toolkit": "",
"uniqueId": "c2a09d62-4072-4cd8-93fd-00718ff8a8f2",
"universal": true,
"viewFileName": "Main",
"viewName": "Main",
"viewNamespace": "metExploreViz.view"
......@@ -151,21 +155,22 @@
"appName": "metExploreViz",
"appStores": "",
"appViews": "",
"classic": true,
"classic": false,
"controllerFileName": "Main",
"controllerName": "Main",
"controllerNamespace": "metExploreViz.controller",
"frameworkKey": "ext",
"frameworkName": "ext",
"frameworkPath": "ext",
"modelNamespace": "metExploreViz.model",
"modern": false,
"name": "metExploreViz",
"packagesRelPath": "ext/packages",
"packagesRelPath": "ext/packages/,C:/wamp/www/MetExplore/lib/javascript/metExploreVizDev/ext/classic",
"senchadir": ".sencha",
"themeName": "default",
"toolkit": "classic",
"uniqueId": "6d94eb78-1987-42b5-8a20-9338f6f77a00",
"universal": false,
"toolkit": "",
"uniqueId": "c2a09d62-4072-4cd8-93fd-00718ff8a8f2",
"universal": true,
"viewFileName": "Main",
"viewName": "Main",
"viewNamespace": "metExploreViz.view"
......@@ -180,21 +185,22 @@
"appName": "metExploreViz",
"appStores": "",
"appViews": "",
"classic": true,
"classic": false,
"controllerFileName": "Main",
"controllerName": "Main",
"controllerNamespace": "metExploreViz.controller",
"frameworkKey": "ext",
"frameworkName": "ext",
"frameworkPath": "ext",
"modelNamespace": "metExploreViz.model",
"modern": false,
"name": "metExploreViz",
"packagesRelPath": "ext/packages",
"packagesRelPath": "ext/packages/,C:/wamp/www/MetExplore/lib/javascript/metExploreVizDev/ext/classic",
"senchadir": ".sencha",
"themeName": "default",
"toolkit": "classic",
"uniqueId": "6d94eb78-1987-42b5-8a20-9338f6f77a00",
"universal": false,
"toolkit": "",
"uniqueId": "c2a09d62-4072-4cd8-93fd-00718ff8a8f2",
"universal": true,
"viewFileName": "Main",
"viewName": "Main",
"viewNamespace": "metExploreViz.view"
......@@ -209,21 +215,22 @@
"appName": "metExploreViz",
"appStores": "",
"appViews": "",
"classic": true,
"classic": false,
"controllerFileName": "Main",
"controllerName": "Main",
"controllerNamespace": "metExploreViz.controller",
"frameworkKey": "ext",
"frameworkName": "ext",
"frameworkPath": "ext",
"modelNamespace": "metExploreViz.model",
"modern": false,
"name": "metExploreViz",
"packagesRelPath": "ext/packages",
"packagesRelPath": "ext/packages/,C:/wamp/www/MetExplore/lib/javascript/metExploreVizDev/ext/classic",
"senchadir": ".sencha",
"themeName": "default",
"toolkit": "classic",
"uniqueId": "6d94eb78-1987-42b5-8a20-9338f6f77a00",
"universal": false,
"toolkit": "",
"uniqueId": "c2a09d62-4072-4cd8-93fd-00718ff8a8f2",
"universal": true,
"viewFileName": "Main",
"viewName": "Main",
"viewNamespace": "metExploreViz.view"
......@@ -238,21 +245,22 @@
"appName": "metExploreViz",
"appStores": "",
"appViews": "",
"classic": true,
"classic": false,
"controllerFileName": "Main",
"controllerName": "Main",
"controllerNamespace": "metExploreViz.controller",
"frameworkKey": "ext",
"frameworkName": "ext",
"frameworkPath": "ext",
"modelNamespace": "metExploreViz.model",
"modern": false,
"name": "metExploreViz",
"packagesRelPath": "ext/packages",
"packagesRelPath": "ext/packages/,C:/wamp/www/MetExplore/lib/javascript/metExploreVizDev/ext/classic",
"senchadir": ".sencha",
"themeName": "default",
"toolkit": "classic",
"uniqueId": "6d94eb78-1987-42b5-8a20-9338f6f77a00",
"universal": false,
"toolkit": "",
"uniqueId": "c2a09d62-4072-4cd8-93fd-00718ff8a8f2",
"universal": true,
"viewFileName": "Main",
"viewName": "Main",
"viewNamespace": "metExploreViz.view"
......
......@@ -397,13 +397,14 @@
</x-compile>
</target>
<target name="-init-web-server">
<target name="-init-web-server" unless="skip.web.start">
<x-server port="${build.web.port}"
portPropertyName="build.web.port"
defaultSassFile="${app.out.scss}"
defaultCssFile="${app.out.css}"
refid="app.web.server"
saveVariablesProp="app.sass.save">
saveVariablesProp="app.sass.save"
j2eeMode="${use.webxml}">
<mapping name="~cmd" path="${cmd.dir}"/>
<mapping name="" path="${build.web.root}"/>
</x-server>
......
......@@ -15,7 +15,7 @@
<target name="-before-web-stop"/>
<target name="-web-stop">
<x-web-server stop="true" port="${build.web.port}"/>
<x-server stop="true" port="${build.web.port}"/>
</target>
<target name="-after-web-stop"/>
<target name="web-stop"
......
......@@ -202,13 +202,24 @@
toFile="${app.out.css}"/>
</then>
<else>
<x-sass-build input="${app.out.scss}"
output="${app.out.css}"
refId="app.web.server"
split="${build.css.selector.limit}"
compress="${build.css.compress}"
updateSplitFiles="true"
compilerRefId="${compiler.ref.id}"/>
<x-fashion-live-update input="${app.out.scss}"
output="${app.out.css}"
refId="app.web.server"
split="${build.css.selector.limit}"
compress="${build.css.compress}"
compilerRefId="${compiler.ref.id}"/>
<x-sencha-command>
fashion
-compress=${build.css.compress}
-split=${build.css.selector.limit}
-saveFile=${app.dir}/${app.sass.save}
${app.out.scss}
${app.out.css}
</x-sencha-command>
<x-update-css-array input="${app.out.css}"
compilerRefId="${compiler.ref.id}"/>
</else>
</if>
</then>
......
......@@ -6,5 +6,7 @@ app.resource.paths=
# Custom Properties - Place customizations below this line to avoid merge
# conflicts with newer versions
app.framework.version=6.0.0.640
app.cmd.version=6.0.1.76
app.framework.version=6.0.1.250
app.cmd.version=6.1.2.15
......@@ -4,21 +4,6 @@
depends="-detect-app-build-properties,
-generate-slicer-bootstrap,
-generate-slicer-manifest">
<x-run-if-true value="${app.sass.fashion}">
<if>
<x-is-false value="${app.sass.rhino}"/>
<then>
<x-get-relative-path from="${build.web.root}"
to="${app.example.fashion.html}"
property="app.example.fashion.html.relative"/>
<property name="example.page.url"
value="http://localhost:${build.web.port}/${app.example.fashion.html.relative}"/>
<x-sass-page page="${app.example.fashion.html}"
url="${example.page.url}"
refId="app.web.server"/>
</then>
</if>
</x-run-if-true>
</target>
<!--
......@@ -116,10 +101,13 @@
toFile="${app.example.build.dir}"/>
</then>
<else>
<x-sass-build input="${app.example.build.dir}"
output="${app.example.build.dir}"
refId="app.web.server"
compress="false"/>
<x-sencha-command>
fashion
-compress=${build.css.compress}
-split=${build.css.selector.limit}
${app.example.build.dir}
${app.example.build.dir}
</x-sencha-command>
</else>
</if>
</then>
......@@ -188,12 +176,6 @@ Ext.Boot.loadSync([
</then>
</if>
<condition property="remove.slicer.css.bootstrap.entries" value="true">
<and>
<x-is-true value="${app.sass.fashion}"/>
<x-is-false value="${app.sass.rhino}"/>
</and>
</condition>
<property name="remove.slicer.css.bootstrap.entries" value="false"/>
<x-compile refid="${compiler.ref.id}">
......@@ -216,24 +198,16 @@ Ext.Boot.loadSync([
</target>
<target name="-capture-theme-image">
<if>
<or>
<x-is-false value="${app.sass.fashion}"/>
<x-is-true value="${app.sass.rhino}"/>
</or>
<then>
<echo>Capture theme image to ${build.capture.png}</echo>
<x-sencha-command>
<![CDATA[
<echo>Capture theme image to ${build.capture.png}</echo>
<x-sencha-command>
<![CDATA[
theme
capture
-page=${app.example.theme.html}
-image=${build.capture.png}
-manifest=${build.capture.json}
]]>
</x-sencha-command>
</then>
</if>
</x-sencha-command>
</target>
<target name="-capture-sass-page-image">
......@@ -273,7 +247,6 @@ Ext.Boot.loadSync([
<target name="-slice-app-theme"
depends="-load-sass-page,
-compass-compile-slicer-css,
-capture-sass-page-image,
-capture-theme-image,
-slice-theme-images">
</target>
......
......@@ -57,7 +57,7 @@
</target>
<target name="-before-watch"/>
<target name="-watch">
<target name="-watch" depends="-init-web-server">
<x-ant-call target="${build.trigger.targets}"/>
<x-ant-call target="web-start" unless="skip.web.start">
<param name="enable.background.server" value="true"/>
......
#Mon, 14 Dec 2015 15:07:32 +0100
# -----------------------------------------------------------------------------
# This file contains configuration options that apply to all applications in
# the workspace. By convention, these options start with "workspace." but any
......
......@@ -16,7 +16,14 @@ Ext.define('metExploreViz.view.form.SelectConditionType', {
{"name":"Flux"}
]
},
flex:1,
listeners: {
render: function(c) {
new Ext.ToolTip({
target: c.getEl(),
html: 'Select a type of data'
});
}
},
displayField: 'name',
valueField: 'name',
queryMode: 'local',
......
......@@ -13,6 +13,16 @@ Ext.define('metExploreViz.view.form.selectCondition.SelectCondition', {
store: {
fields: ['name']
},
listeners: {
render: function(c) {
new Ext.ToolTip({
target: c.getEl(),
html: 'Select a condition'
});
}
},
flex:1,
multiSelect:true,
displayField: 'name',
valueField: 'name',
queryMode: 'local',
......
......@@ -40,9 +40,27 @@ Ext.define('metExploreViz.view.form.selectConditionForm.SelectConditionForm', {
xtype: 'menuseparator'
},
{
id:'selectCondition',
xtype:'selectCondition',
id:'selectConditionType',
xtype:'selectConditionType',
reference:'selectConditionType',
disabled:true
}
,
{
margin:'10 0 0 5',
xtype : 'fieldcontainer',
defaultType: 'checkboxfield',
reference : 'opacity',
hidden : true,
items: [
{
boxLabel : 'Opacity',
name : 'opacity',
inputValue: true,
id : 'opacityCheck'
}
]
},
{
border:false,
......@@ -54,45 +72,14 @@ Ext.define('metExploreViz.view.form.selectConditionForm.SelectConditionForm', {
align:'stretch'
},
items:[{
id:'selectConditionType',
xtype:'selectConditionType',
reference:'selectConditionType',
disabled:true
},{
xtype:'button',
iconCls:'add',
tooltip:'You must choose a condition to add it',
//formBind: true,
margin:'5 5 5 5',
id:'addCondition',
reference:'addCondition',
action:'addCondition',
disabled:true,
padding:'0 0 0 0'
}]
},{
xtype : 'fieldcontainer',
fieldLabel : 'Fluxes mapped',
reference:'chooseFluxType',
margin:'5 5 5 5',
defaultType: 'radiofield',
disabled:true,
hidden:true,
items: [
{
boxLabel : 'Only one flux',
name : 'display',
inputValue: 'Unique',
checked : true,
id : 'unique'
}, {
boxLabel : 'Two fluxes',
name : 'display',
inputValue: 'Compare',
id : 'compare'
}
]
},{
id:'selectCondition',
xtype:'selectCondition',
reference:'selectCondition',
disabled:true
}
]
}
,{
xtype: 'menuseparator'
}
]
......
......@@ -17,6 +17,14 @@ Ext.define('metExploreViz.view.form.selectMapping.SelectMapping', {
store: {
fields: ['name']
},
listeners: {
render: function(c) {
new Ext.ToolTip({
target: c.getEl(),
html: 'Select a mapping'
});
}
},
displayField: 'name',
valueField: 'name',
width: 150,
......
......@@ -124,55 +124,6 @@ Ext.define('metExploreViz.view.form.selectMapping.SelectMappingController', {
}
},
// /*******************************************
// * Removing of mapping
// * @param {} newMapping : boolean to know if a new mapping is launched
// */
// closeMapping : function(newMapping){
// var sessionsStore = Ext.getStore('S_NetworkVizSession');
// var session = sessionsStore.getById('viz');
// if(session && session.isMapped()!='false')
// {
// var container = Ext.getCmp(session.isMapped()+'Panel');
// var addCondition = Ext.getCmp('addCondition');
// if(addCondition!=undefined){
// addCondition.setDisabled(false);
// addCondition.setTooltip('The condition will be add to the network');
// }
// // Remove mapping caption
// var storeCond = Ext.getStore('S_Condition');
// var cmp = session.isMapped();
// var condition = storeCond.getStoreByCondName(cmp);
// var condInMetabolite = condition.getCondInMetabolite();
// if(newMapping!=undefined)
// this.removeGraphMapping(condInMetabolite);
// container.close();
// var colorStore = Ext.getStore('S_ColorMapping');
// colorStore.each(function(color){
// var newId = color.getName();
// Ext.getCmp('mappingCaptionForm'+newId).close();
// });
// if(session.getMappingDataType()=="Continuous"){
// var colorStore = Ext.getStore('S_ColorMapping');
// var newColor = colorStore.getCount()==0;
// if(!newColor){
// colorStore.loadData([],false);
// }
// }
// var networkVizSessionStore = Ext.getStore('S_NetworkVizSession');
// networkVizSession = networkVizSessionStore.getById("viz");
// networkVizSession.setMapped('false');
// }
// },
/*******************************************
* Affect selected mapping conditions to the comboBox: SelectCondition
* @param {} that
......@@ -203,15 +154,12 @@ Ext.define('metExploreViz.view.form.selectMapping.SelectMappingController', {
comboCond.setValue(storeCond[0]);
var addCondition = Ext.getCmp('addCondition');
var selectConditionType = Ext.getCmp('selectConditionType');
if(addCondition!=undefined && selectCondition!=undefined && selectConditionType!=undefined){
if(selectCondition!=undefined && selectConditionType!=undefined){
if(nbCond<1 || (nbCond==1 && conditions[0]=="undefined")){
addCondition.setDisabled(true);
addCondition.setTooltip('You must choose a condition to add it');
comboCond.clearValue();
comboCond.setDisabled(true);
selectConditionType.setDisabled(true);
......@@ -221,92 +169,9 @@ Ext.define('metExploreViz.view.form.selectMapping.SelectMappingController', {
selectConditionType.setValue(selectConditionType.getStore().first());
comboCond.setValue(storeCond.first());
addCondition.setDisabled(false);
addCondition.setTooltip('The condition will be add to the network');
comboCond.setDisabled(false);
selectConditionType.setDisabled(false);
}
}
}
}
/*******************************************
// * Affect selected mapping conditions to the comboBox: SelectCondition
// * @param {} that
// * @param {} newMapping : id of new mapping
// * @param {} old
// */
// fillComboSelectCondition : function(that, newMapping, old) {
// var mappingInfoStore = _metExploreViz.getMappingsSet();