Merge branch 'master' into expression-parser-bre

Benjamin Renard
2 parents 7470a668 aa8bb402
Showing 22 changed files with 143 additions and 59 deletions Show diff stats
generic_data/rank.json
help/epic.html
help/epic_amda.html
help/epic_table.html
help/ics_e.html
help/ics_i.html
help/images/amda_epic.png
help/images/epic.png
help/images/epic_table.png
help/images/ics_e.png
help/images/ics_i.png
help/images/stics.png
help/stics.html
js/app/models/LocalParamNode.js
js/app/models/PlotObjects/PlotLayoutAutoObject.js
js/app/models/PlotObjects/PlotLayoutVerticalObject.js
js/app/models/PlotObjects/PlotLegendSeriesObject.js
js/app/views/ExplorerUI.js
js/resources/css/amda.css
php/classes/RequestMgr.php
-{"Mercury": 1, "Venus": 2, "Heliosphere.NearEarth": 3, "Heliosphere.Remote1AU": 4,
-"Earth.Magnetosheath": 5, "Earth.Magnetosphere": 5, "Earth": 5, "Earth.Surface": 6,
-"Mars": 7, "Jupiter": 8, "Ganymede" : 8, "Saturn": 9, "Uranus" : 10, "Neptune" : 11, "Comet" : 93, 
+{"Sun" : 1, "Mercury": 2, "Venus": 3, "Heliosphere.NearEarth": 4, "Heliosphere.Remote1AU": 5,
+"Earth.Magnetosheath": 6, "Earth.Magnetosphere": 6, "Earth": 6, "Earth.Surface": 7,
+"Mars": 8, "Jupiter": 9, "Ganymede" : 9, "Saturn": 91, "Uranus" : 92, "Neptune" : 93,  "Comet" : 94, 
 "Heliosphere" : 99 }     
 \ No newline at end of file
@@ -0,0 +1,3 @@
+<body>
+	<img src="images/epic.png"/>
+</body>
 \ No newline at end of file
@@ -0,0 +1,3 @@
+<body>
+	<img src="images/amda_epic.png"/>
+</body>
 \ No newline at end of file
@@ -0,0 +1,3 @@
+<body>
+	<img src="images/epic_table.png"/>
+</body>
 \ No newline at end of file
@@ -0,0 +1,3 @@
+<body>
+	<img src="images/ics_e.png"/>
+</body>
 \ No newline at end of file
@@ -0,0 +1,3 @@
+<body>
+	<img src="images/ics_i.png"/>
+</body>
 \ No newline at end of file
@@ -0,0 +1,3 @@
+<body>
+	<img src="images/stics.png"/>
+</body>
 \ No newline at end of file
@@ -28,9 +28,9 @@ Ext.define(&#39;amdaModel.LocalParamNode&#39;,
 		{name: 'rank', type: 'integer', persist: false, defaultValue: null}
 	],
  
-	icons : {'1' : 'icon-mercury','2' : 'icon-venus','3' : 'icon-sw','4' : 'icon-sw','5' : 'icon-earth','6' : 'icon-earth',
-				'7' : 'icon-mars','8' : 'icon-jupiter','9' : 'icon-saturn','10' : 'icon-uranus','11' : 'icon-neptune',
-				'93' :'icon-comet', '99' :'icon-solarsystem', '999' :'icon-solarsystem' 
+	icons : {'1' : 'icon-sun', '2' : 'icon-mercury','3' : 'icon-venus','4' : 'icon-sw','5' : 'icon-sw','6' : 'icon-earth','7' : 'icon-earth',
+				'8' : 'icon-mars','9' : 'icon-jupiter','91' : 'icon-saturn','92' : 'icon-uranus','93' : 'icon-neptune',
+				'94' :'icon-comet', '99' :'icon-solarsystem', '999' :'icon-solarsystem' 
 	},
  
 	constructor : function(config)
@@ -14,18 +14,41 @@
  
  
 Ext.define('amdaPlotObj.PlotLayoutAutoObject', {
-	extend: 'Ext.data.Model',
+    extend: 'Ext.data.Model',
  
-	requires: [
-	           'amdaPlotObj.PlotObjectConfig'
-	],
+    requires: [
+        'amdaPlotObj.PlotObjectConfig'
+    ],
  
-	fields : [
-	          {name: 'layout-panel-height', type: 'float', defaultValue: amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.panelHeight},
-	          {name: 'layout-panel-spacing', type: 'float', defaultValue: amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.panelSpacing},
-	          {name: 'layout-expand', type: 'boolean', defaultValue: amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.expand},
-		  {name: 'layout-timeaxes-legend-lowerone', type: 'boolean', defaultValue: amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.timeAxesLegend}
+    fields : [
+        {name: 'layout-panel-height', type: 'float'},
+        {name: 'layout-panel-spacing', type: 'float'},
+        {name: 'layout-expand', type: 'boolean'},
+        {name: 'layout-timeaxes-legend-lowerone', type: 'boolean'}
     ],
+
+    constructor: function()
+    {
+        var me = this;
+        me.callParent(arguments);
+        if ((arguments.length > 0) && arguments[0])
+        {
+        }
+        else
+        {
+            //new object, set default fields values
+            me.setDefaultValues();
+        }
+        this.dirty = false;
+    },
+
+    setDefaultValues: function()
+    {
+        this.set('layout-panel-height', amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.panelHeight);
+        this.set('layout-panel-spacing', amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.panelSpacing);
+        this.set('layout-expand', amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.expand);
+        this.set('layout-timeaxes-legend-lowerone', amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.timeAxesLegend);
+    },
  
     getJsonValues : function() 
     {
@@ -14,23 +14,45 @@
  
  
 Ext.define('amdaPlotObj.PlotLayoutVerticalObject', {
-	extend: 'Ext.data.Model',
+    extend: 'Ext.data.Model',
  
-	requires: [
-	           'amdaPlotObj.PlotObjectConfig'
-	],
+    requires: [
+        'amdaPlotObj.PlotObjectConfig'
+    ],
  
-	fields : [
-	          {name: 'layout-panel-height', type: 'float', defaultValue: amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.panelHeight},
-	          {name: 'layout-panel-spacing', type: 'float', defaultValue: amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.panelSpacing},
-	          {name: 'layout-expand', type: 'boolean', defaultValue: amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.expand},
-		  {name: 'layout-timeaxes-legend-lowerone', type: 'boolean', defaultValue: amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.timeAxesLegend},
-	          //{name: 'layout-timeplot-width', type: 'float', useNull:true},
-	          {name: 'layout-timeplot-height', type: 'float', useNull:true},
-	          {name: 'layout-xyplot-width', type: 'float', useNull:true},
-	          {name: 'layout-xyplot-height', type: 'float', useNull:true}
+    fields : [
+        {name: 'layout-panel-height', type: 'float'},
+        {name: 'layout-panel-spacing', type: 'float'},
+        {name: 'layout-expand', type: 'boolean'},
+        {name: 'layout-timeaxes-legend-lowerone', type: 'boolean'},
+        //{name: 'layout-timeplot-width', type: 'float', useNull:true},
+        {name: 'layout-timeplot-height', type: 'float', useNull:true},
+        {name: 'layout-xyplot-width', type: 'float', useNull:true},
+        {name: 'layout-xyplot-height', type: 'float', useNull:true}
     ],
-    
+
+    constructor: function()
+    {
+        var me = this;
+        me.callParent(arguments);
+        if ((arguments.length > 0) && arguments[0])
+        {
+        }
+        else {
+            //new object, set default fields values
+            me.setDefaultValues();
+        }
+        this.dirty = false;
+    },
+
+    setDefaultValues: function()
+    {
+        this.set('layout-panel-height', amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.panelHeight);
+        this.set('layout-panel-spacing', amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.panelSpacing);
+        this.set('layout-expand', amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.expand);
+        this.set('layout-timeaxes-legend-lowerone', amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.timeAxesLegend);
+    },
+
     getJsonValues : function() 
     {
     	var layoutValues  = new Object();
@@ -14,32 +14,46 @@
  
  
 Ext.define('amdaPlotObj.PlotLegendSeriesObject', {
-	extend: 'Ext.data.Model',
+    extend: 'Ext.data.Model',
  
-	requires: [
-	           'amdaPlotObj.PlotObjectConfig'
-	],
+    requires: [
+        'amdaPlotObj.PlotObjectConfig'
+    ],
  
-	fields : [
-	          {name: 'legend-series-activated', type: 'boolean', defaultValue: false},
-	          {name: 'legend-series-type', type: 'string', defaultValue: amdaPlotObj.PlotObjectConfig.defaultValues.legends.series.type},
-	          {name: 'legend-series-position', type: 'string', defaultValue: amdaPlotObj.PlotObjectConfig.defaultValues.legends.series.position},
-	          {name: 'legend-series-showparaminfo', type: 'boolean', defaultValue: true},
-		      {name: 'legend-series-defaulttextcolor', type: 'string', defaultValue: amdaPlotObj.PlotObjectConfig.defaultValues.legends.series.text.color},
-	          {name: 'legend-series-border-activated', type: 'boolean', defaultValue: false},
-	          {name: 'legend-series-border-color', type: 'string', defaultValue: amdaPlotObj.PlotObjectConfig.defaultValues.legends.series.border.color},
-	          {name: 'legend-series-intervalinfo-activated', type: 'boolean', defaultValue: false},
-	          {name: 'legend-series-intervalinfo-type', type: 'string', defaultValue: amdaPlotObj.PlotObjectConfig.defaultValues.legends.series.intervalinfo.type},
-	          {name: 'legend-series-font-activated', type: 'boolean', defaultValue: false},
-              {name: 'legend-series-font-name', type: 'string', defaultValue: amdaPlotObj.PlotObjectConfig.defaultValues.legends.series.font.name},
-              {name: 'legend-series-font-size', type: 'int', defaultValue: amdaPlotObj.PlotObjectConfig.defaultValues.legends.series.font.size},
-              {name: 'legend-series-font-bold', type: 'boolean', defaultValue: false},
-              {name: 'legend-series-font-italic', type: 'boolean', defaultValue: false}
+    fields : [
+        {name: 'legend-series-activated', type: 'boolean'},
+        {name: 'legend-series-type', type: 'string'},
+        {name: 'legend-series-position', type: 'string'},
+        {name: 'legend-series-showparaminfo', type: 'boolean'},
+        {name: 'legend-series-defaulttextcolor', type: 'string'},
+        {name: 'legend-series-border-activated', type: 'boolean'},
+        {name: 'legend-series-border-color', type: 'string'},
+        {name: 'legend-series-intervalinfo-activated', type: 'boolean'},
+        {name: 'legend-series-intervalinfo-type', type: 'string'},
+        {name: 'legend-series-font-activated', type: 'boolean'},
+        {name: 'legend-series-font-name', type: 'string'},
+        {name: 'legend-series-font-size', type: 'int'},
+        {name: 'legend-series-font-bold', type: 'boolean'},
+        {name: 'legend-series-font-italic', type: 'boolean'}
     ],
+
+    constructor: function()
+    {
+        var me = this;
+        me.callParent(arguments);
+        if ((arguments.length > 0) && arguments[0])
+        {
+        }
+        else {
+            //new object, set default fields values
+            me.setDefaultValues();
+        }
+        this.dirty = false;
+    },
  
     setDefaultValues: function()
     {
-    	/*this.set('legend-series-activated', false);
+    	this.set('legend-series-activated', false);
     	this.set('legend-series-type', amdaPlotObj.PlotObjectConfig.defaultValues.legends.series.type);
     	this.set('legend-series-position', amdaPlotObj.PlotObjectConfig.defaultValues.legends.series.position);
     	this.set('legend-series-showparaminfo', true);
@@ -52,7 +66,7 @@ Ext.define(&#39;amdaPlotObj.PlotLegendSeriesObject&#39;, {
     	this.set('legend-series-font-name', amdaPlotObj.PlotObjectConfig.defaultValues.legends.series.font.name);
     	this.set('legend-series-font-size', amdaPlotObj.PlotObjectConfig.defaultValues.legends.series.font.size);
     	this.set('legend-series-font-bold', false);
-    	this.set('legend-series-font-italic', false);*/
+    	this.set('legend-series-font-italic', false);
     },
  
     getShortInfo : function()
@@ -86,4 +100,4 @@ Ext.define(&#39;amdaPlotObj.PlotLegendSeriesObject&#39;, {
  
     	return legendValues;
     }
-});
 \ No newline at end of file
+});
@@ -232,7 +232,7 @@ Ext.define(&#39;amdaUI.ExplorerUI&#39;, {
 					toggleGroup: 'sorting',
 					handler: function(){
 							var tree = Ext.getCmp(amdaUI.ExplorerUI.RESRC_TAB.TREE_ID);
-							tree.getStore().sort([{ property : 'rank' }]);
+							tree.getStore().sort('rank');
 							this.updateFilter();
 					}
 				}]
@@ -354,6 +354,12 @@ background-image: url(../images/16x16/error.png) !important;
     opacity:0.5 !important;
 }
  
+.icon-sun {
+     background-image:url(../images/icons/sun.png) !important;
+     background-position: center;
+     background-repeat: no-repeat;
+}
+
 .icon-mercury {
      background-image:url(../images/icons/mercury.png) !important;
      background-position: center;
@@ -284,7 +284,7 @@ class RequestMgr extends AmdaObjectMgr
 						{
 							$argsTab['param'] = array_unique($params);
 							$argsTab['startTime'] = $tab->{'multi-plot-linked'} ? $obj->startDate : $tab->startDate;
-							$argsTab['stopTime'] = $tab->{'multi-plot-linked'} ? $obj->startDate : $tab->stopDate;
+							$argsTab['stopTime'] = $tab->{'multi-plot-linked'} ? $obj->stopDate : $tab->stopDate;
 						}
 					}	
 					if (count($argsTab) > 0) $args[] = $argsTab;
@@ -314,8 +314,8 @@ class RequestMgr extends AmdaObjectMgr
 				{
 					// tab is not defined, iterate over $obj->tabs?
 					$argsTab['param'] = array_unique($params);
-					$argsTab['startTime'] = $tab->{'multi-plot-linked'} ? $obj->startDate : $tab->startDate;
-					$argsTab['stopTime'] = $tab->{'multi-plot-linked'} ? $obj->startDate : $tab->stopDate;
+					$argsTab['startTime'] = $obj->startDate;
+					$argsTab['stopTime'] = $obj->stopDate;
 				}
 				if (count($argsTab) > 0) $args[] = $argsTab;
  
@@ -452,10 +452,11 @@ class TimeTableMgr extends AmdaObjectMgr
 		$attributesToReturn['folderId'] = $folderId;
  
 		if (!$onlyDescription) {
-			$intNodes = $dom->getElementsByTagName('intervals');
+			$xpath = new DOMXPath($dom);
  
-			/** @var DOMElement $intNode */
-			foreach ($intNodes as $intNode) {
+			$intervals = $xpath->query('//intervals');
+
+			foreach ($intervals as $intNode) {
 				$startNodes = $intNode->getElementsByTagName('start');
 				if ($startNodes->length <= 0) {
 					return ['error' => 'Error detected in result file'];
@@ -63,7 +63,7 @@ define(&#39;EPNTAP_APIS&#39;, &#39;http://voparis-tap.obspm.fr/__system__/tap/run/tap/sync&#39;)
 define('EPNTAP_AMDA', 'http://cdpp-epntap.irap.omp.eu/__system__/tap/run/tap/sync');
  
 // PHP run-time settings 
-ini_set('memory_limit',128000000);
+ini_set('memory_limit',256000000);
 ini_set('max_execution_time',600); // max PHP execution
  
 ini_set('default_socket_timeout', 600); //TODO if this is needed ? IMPEX LONG DURATION WEBSERVICES