CDPP / AMDA_IHM

Commit 752ba9ab484327639851946ca0f1a35ac9d7195b

Authored by Benjamin Renard
1 parent 4efeb459
Exists in master and in 91 other branches 10098, 10178, 5390, 6629, 6728, 7494, 7497, 7616, 8459, 8528, 8928, 9014, 9016Bis, 9017, 9049, 9084, 9259, 9326, 9345, 9505, 9660, 9750, 9750.bck, 9800, 9980, FER_10285, FER_10400, FER_10435, FER_10557, FER_10663, FER_10765, FER_10828, FER_10828_2, FER_10829, FER_10836, FER_10852, FER_10934, FER_11100, FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_5119, FER_5165, FER_6265, FER_6860, FER_6899, FER_6951, FER_7618, FER_7862, FER_8455, FER_9629, FER_9660, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_11427, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, amdadev, amdadev_test, anr_tempete, create-user, cu2022, density_maps, develop, epn-tap, frames-transformation, master_vge, mlplasmas, multiplot, openam, remoteData, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, special-params, test-merge, ws_get_catalog

Fix nodeType for multiplot

Showing 2 changed files with 29 additions and 1 deletions   Show diff stats
Inline Side-by-side
js/app/models/PlotObjects/MultiplotRequestObject.js
  Diff comments   View file @752ba9a
... ... @@ -105,7 +105,7 @@ Ext.define('amdaPlotObj.MultiplotRequestObject', {
105 105 {
106 106 var requestValues = new Object();
107 107  
108   - requestValues['nodeType'] = 'request';
  108 + requestValues['nodeType'] = 'multiplot';
109 109 requestValues['leaf'] = true;
110 110  
111 111 requestValues['timesrc'] = this.get('timesrc');
... ...
php/classes/RequestMgr.php
  Diff comments   View file @752ba9a
... ... @@ -240,6 +240,34 @@ class RequestMgr extends AmdaObjectMgr
240 240 }
241 241 if (count($argsTab) > 0) $args[] = $argsTab;
242 242 break;
  243 + case 'multiplot':
  244 + if ($obj->timesrc != 'Interval') break;
  245 +
  246 + $argsTab = array();
  247 + foreach ($obj->plots as $plot)
  248 + {
  249 + foreach ($plot->panels as $panel)
  250 + {
  251 + $params = array();
  252 + foreach ($panel->params as $param)
  253 + {
  254 + //TODO not in code spase___IMPEX_ !!!
  255 + //TODO other models (tsyganenko etc)
  256 + if (preg_match("#^spase___IMPEX_#", $param->paramid))
  257 + {
  258 + if ($param->template_args->url_XYZ) $params[] = $param->template_args->url_XYZ;
  259 + }
  260 + }
  261 + if (count($params) > 0)
  262 + {
  263 + $argsTab['param'] = array_unique($params);
  264 + $argsTab['startTime'] = $obj->startDate;
  265 + $argsTab['stopTime'] = $obj->stopDate;
  266 + }
  267 + }
  268 + }
  269 + if (count($argsTab) > 0) $args[] = $argsTab;
  270 + break;
243 271 case 'condition' :
244 272 //$argsTab = array();
245 273 if ($obj->timesrc != 'Interval') break;
... ...