CDPP / AMDA_Integration

Commit a88159f7ebcedd4f872c69d2a6aa83c4afd3ee27

Authored by Benjamin Renard
1 parent 063337d8
Exists in master and in 66 other branches 10098, 4797, 5390, 6728, 7616, 8528, 8928, 9016Bis, 9049, 9084, 9259, 9326, FER_10400, FER_10663, FER_11100, FER_11242, FER_11500, FER_11586, FER_11588, FER_6265, FER_6860, FER_6951, FER_7618, FER_8455, FER_9629, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, akka-scatter-multi-xparams, amdadev, anr_tempete, cu2022, density_maps, develop, evol-6371, expression-parser-bre, frames-transformation, install-rework, livraison-akka, master_vge, mlplasmas, multiplot, new-save-plot-request, plot-request, plot-tt-catalog, rm_5357, rm_6595, rm_6912, rm_7926, rm_8932, save-other-requests, shared-objects-updater, sum-components-indexes, test-merge, webservice, ws_get_catalog

Add panel index support

Showing 2 changed files with 14 additions and 0 deletions   Show diff stats
Inline Side-by-side
src/InputOutput/IHMImpl/Params/PlotImpl/IHMInputOutputParamsPlotClass.php
  Diff comments   View file @a88159f
@@ -376,6 +376,9 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass @@ -376,6 +376,9 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
376 if (isset($panelData->{'id'})) 376 if (isset($panelData->{'id'}))
377 $panelNode->setId($panelData->{'id'}); 377 $panelNode->setId($panelData->{'id'});
378 378
  379 + if (isset($panelData->{'panel-index'}))
  380 + $panelNode->setIndex($panelData->{'panel-index'});
  381 +
379 //Panel background color 382 //Panel background color
380 if (($panelData->{'panel-background-color'} != 'none') && ($panelData->{'panel-background-color'} != '')) 383 if (($panelData->{'panel-background-color'} != 'none') && ($panelData->{'panel-background-color'} != ''))
381 $panelNode->setBackgroundColor($this->hexColor2KernelColor($panelData->{'panel-background-color'})); 384 $panelNode->setBackgroundColor($this->hexColor2KernelColor($panelData->{'panel-background-color'}));
src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotPanelNodeClass.php
  Diff comments   View file @a88159f
@@ -15,6 +15,7 @@ define ("REQUESTOUTPUTPLOTPANEL_XMARGIN", "xMargin"); @@ -15,6 +15,7 @@ define ("REQUESTOUTPUTPLOTPANEL_XMARGIN", "xMargin");
15 define ("REQUESTOUTPUTPLOTPANEL_PREFEREDWIDTH", "preferedWidth"); 15 define ("REQUESTOUTPUTPLOTPANEL_PREFEREDWIDTH", "preferedWidth");
16 define ("REQUESTOUTPUTPLOTPANEL_PREFEREDHEIGHT", "preferedHeight"); 16 define ("REQUESTOUTPUTPLOTPANEL_PREFEREDHEIGHT", "preferedHeight");
17 define ("REQUESTOUTPUTPLOTPANEL_ID", "id"); 17 define ("REQUESTOUTPUTPLOTPANEL_ID", "id");
  18 +define ("REQUESTOUTPUTPLOTPANEL_INDEX", "index");
18 19
19 abstract class RequestOutputPlotElementTypeEnum 20 abstract class RequestOutputPlotElementTypeEnum
20 { 21 {
@@ -156,6 +157,16 @@ class RequestOutputPlotPanelNodeClass extends NodeClass @@ -156,6 +157,16 @@ class RequestOutputPlotPanelNodeClass extends NodeClass
156 return $this->getAttribute(REQUESTOUTPUTPLOTPANEL_ID); 157 return $this->getAttribute(REQUESTOUTPUTPLOTPANEL_ID);
157 } 158 }
158 159
  160 + public function setIndex($index)
  161 + {
  162 + $this->setAttribute(REQUESTOUTPUTPLOTPANEL_INDEX, $index);
  163 + }
  164 +
  165 + public function getIndex()
  166 + {
  167 + return $this->getAttribute(REQUESTOUTPUTPLOTPANEL_INDEX);
  168 + }
  169 +
159 public function loadFromNode($xmlNode) 170 public function loadFromNode($xmlNode)
160 { 171 {
161 $this->setBackgroundColor($this->getXmlNodeAttribute($xmlNode, REQUESTOUTPUTPLOTPANEL_BACKGROUNDCOLOR)); 172 $this->setBackgroundColor($this->getXmlNodeAttribute($xmlNode, REQUESTOUTPUTPLOTPANEL_BACKGROUNDCOLOR));