CDPP / AMDA_Integration

Commit 4f9a8e36d665d3d732643a610d42386dacc7df40

Authored by Benjamin Renard
1 parent 5ae799cc
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

Min/Max value definition

Showing 3 changed files with 50 additions and 13 deletions   Show diff stats
Inline Side-by-side
src/InputOutput/IHMImpl/Params/PlotImpl/IHMInputOutputParamsPlotClass.php
  Diff comments   View file @4f9a8e3
... ... @@ -580,9 +580,9 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
580 580 case 'serie' :
581 581 //Unmarshall x serie
582 582 if (count($paramXInfo['indexes']) == 0)
583   - $xParamNode->addXSerie(REQUESTOUTPUTPLOTELEMENTXY_XAXISID, -1);
  583 + $xParamNode->addXSerie(REQUESTOUTPUTPLOTELEMENTXY_XAXISID, -1, $paramData->{'param-drawing-object'}->{'serie-xvalue-min'}, $paramData->{'param-drawing-object'}->{'serie-xvalue-max'});
584 584 else if (count($paramXInfo['indexes']) == 1)
585   - $xParamNode->addXSerie(REQUESTOUTPUTPLOTELEMENTXY_XAXISID, $paramXInfo['indexes'][0]);
  585 + $xParamNode->addXSerie(REQUESTOUTPUTPLOTELEMENTXY_XAXISID, $paramXInfo['indexes'][0], $paramData->{'param-drawing-object'}->{'serie-xvalue-min'}, $paramData->{'param-drawing-object'}->{'serie-xvalue-max'});
586 586 else
587 587 throw new Exception('X parameter for serie must be a component.');
588 588 break;
... ... @@ -689,13 +689,13 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
689 689 {
690 690 if (count($indexes) == 0)
691 691 {
692   - $serieNode = $paramNode->addYSerie($paramData->{'param-drawing-object'}->{'serie-yaxis'}, -1, $useXAxis ? REQUESTOUTPUTPLOTELEMENTXY_XAXISID : '', $colorSerieId);
  692 + $serieNode = $paramNode->addYSerie($paramData->{'param-drawing-object'}->{'serie-yaxis'}, -1, $useXAxis ? REQUESTOUTPUTPLOTELEMENTXY_XAXISID : '', $colorSerieId, $paramData->{'param-drawing-object'}->{'serie-value-min'}, $paramData->{'param-drawing-object'}->{'serie-value-max'});
693 693 $serieNode->setId($paramData->{'id'});
694 694 $serieNodes[] = $serieNode;
695 695 }
696 696 foreach ($indexes as $index)
697 697 {
698   - $serieNode = $paramNode->addYSerie($paramData->{'param-drawing-object'}->{'serie-yaxis'}, $index, $useXAxis ? REQUESTOUTPUTPLOTELEMENTXY_XAXISID : '', $colorSerieId);
  698 + $serieNode = $paramNode->addYSerie($paramData->{'param-drawing-object'}->{'serie-yaxis'}, $index, $useXAxis ? REQUESTOUTPUTPLOTELEMENTXY_XAXISID : '', $colorSerieId, $paramData->{'param-drawing-object'}->{'serie-value-min'}, $paramData->{'param-drawing-object'}->{'serie-value-max'});
699 699 if (count($indexes) == 1)
700 700 $serieNode->setId($paramData->{'id'});
701 701 $serieNodes[] = $serieNode;
... ... @@ -814,17 +814,17 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
814 814 switch ($serieData->{'serie-intervaltick-mode'})
815 815 {
816 816 case 'symbol-only':
817   - $intervalTickNode->setMode(RequestOutputPlotYSerieIntervalTicksModeEnum::SYMBOLONLY);
  817 + $intervalTickNode->setMode(RequestOutputPlotSerieIntervalTicksModeEnum::SYMBOLONLY);
818 818 break;
819 819 case 'interval-index':
820   - $intervalTickNode->setMode(RequestOutputPlotYSerieIntervalTicksModeEnum::INTERVALINDEX);
  820 + $intervalTickNode->setMode(RequestOutputPlotSerieIntervalTicksModeEnum::INTERVALINDEX);
821 821 break;
822 822 case 'start-stop-time':
823   - $intervalTickNode->setMode(RequestOutputPlotYSerieIntervalTicksModeEnum::STARTSTOPTIME);
  823 + $intervalTickNode->setMode(RequestOutputPlotSerieIntervalTicksModeEnum::STARTSTOPTIME);
824 824 break;
825 825 case 'start-time':
826 826 default :
827   - $intervalTickNode->setMode(RequestOutputPlotYSerieIntervalTicksModeEnum::STARTTIME);
  827 + $intervalTickNode->setMode(RequestOutputPlotSerieIntervalTicksModeEnum::STARTTIME);
828 828 }
829 829  
830 830 //Color
... ... @@ -909,7 +909,7 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
909 909  
910 910 protected function unmarshallSpectro($paramDrawingData, $plotNode, $paramNode, $indexes)
911 911 {
912   - $spectroNode = $paramNode->addSpectro($paramDrawingData->{'spectro-yaxis'});
  912 + $spectroNode = $paramNode->addSpectro($paramDrawingData->{'spectro-yaxis'}, $paramDrawingData->{'spectro-value-min'}, $paramDrawingData->{'spectro-value-max'});
913 913 }
914 914  
915 915 protected function unmarshallStatusBar($paramDrawingData, $paramNode, $indexes)
... ...
src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotBaseSerieNodeClass.php
  Diff comments   View file @4f9a8e3
... ... @@ -3,6 +3,8 @@
3 3 define ("REQUESTOUTPUTPLOTBASESERIE_YAXIS", "yAxis");
4 4 define ("REQUESTOUTPUTPLOTBASESERIE_XAXIS", "xAxis");
5 5 define ("REQUESTOUTPUTPLOTBASESERIE_COLORSERIEID", "colorSerieId");
  6 +define ("REQUESTOUTPUTPLOTBASESERIE_MIN", "min");
  7 +define ("REQUESTOUTPUTPLOTBASESERIE_MAX", "max");
6 8 define ("REQUESTOUTPUTPLOTBASESERIE_LINE", "line");
7 9 define ("REQUESTOUTPUTPLOTBASESERIE_SYMBOL", "symbol");
8 10 define ("REQUESTOUTPUTPLOTBASESERIE_TIMETICKS", "timeTick");
... ... @@ -41,7 +43,6 @@ class RequestOutputPlotBaseSerieNodeClass extends NodeClass
41 43 return $this->getAttribute(REQUESTOUTPUTPLOTBASESERIE_XAXIS);
42 44 }
43 45  
44   -
45 46 public function setColorSerieId($colorSerieId)
46 47 {
47 48 $this->setAttribute(REQUESTOUTPUTPLOTBASESERIE_COLORSERIEID, $colorSerieId);
... ... @@ -52,6 +53,26 @@ class RequestOutputPlotBaseSerieNodeClass extends NodeClass
52 53 return $this->getAttribute(REQUESTOUTPUTPLOTBASESERIE_COLORSERIEID);
53 54 }
54 55  
  56 + public function setMin($min)
  57 + {
  58 + $this->setAttribute(REQUESTOUTPUTPLOTBASESERIE_MIN, $min);
  59 + }
  60 +
  61 + public function getMin()
  62 + {
  63 + return $this->getAttribute(REQUESTOUTPUTPLOTBASESERIE_MIN);
  64 + }
  65 +
  66 + public function setMax($max)
  67 + {
  68 + $this->setAttribute(REQUESTOUTPUTPLOTBASESERIE_MAX, $max);
  69 + }
  70 +
  71 + public function getMax()
  72 + {
  73 + return $this->getAttribute(REQUESTOUTPUTPLOTBASESERIE_MAX);
  74 + }
  75 +
55 76 public function getLine()
56 77 {
57 78 $node = $this->getFirstChildByName(REQUESTOUTPUTPLOTBASESERIE_LINE);
... ...
src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotParamsNodeClass.php
  Diff comments   View file @4f9a8e3
... ... @@ -10,6 +10,8 @@ define ("REQUESTOUTPUTPLOTPARAM_ID", "id");
10 10 define ("REQUESTOUTPUTPLOTXSERIE_NAME", "xserie");
11 11 define ("REQUESTOUTPUTPLOTXSERIE_XAXIS", "xAxis");
12 12 define ("REQUESTOUTPUTPLOTXSERIE_INDEX", "index");
  13 +define ("REQUESTOUTPUTPLOTXSERIE_MIN", "min");
  14 +define ("REQUESTOUTPUTPLOTXSERIE_MAX", "max");
13 15  
14 16 define ("REQUESTOUTPUTPLOTCOLORSERIE_NAME", "colorserie");
15 17 define ("REQUESTOUTPUTPLOTCOLORSERIE_ID", "id");
... ... @@ -17,6 +19,8 @@ define ("REQUESTOUTPUTPLOTCOLORSERIE_INDEX", "index");
17 19  
18 20 define ("REQUESTOUTPUTPLOTSPECTRO_NAME", "spectro");
19 21 define ("REQUESTOUTPUTPLOTSPECTRO_YAXIS", "yAxis");
  22 +define ("REQUESTOUTPUTPLOTSPECTRO_MIN", "min");
  23 +define ("REQUESTOUTPUTPLOTSPECTRO_MAX", "max");
20 24  
21 25 define ("REQUESTOUTPUTPLOTSTATUSBAR_NAME", "serie");
22 26 define ("REQUESTOUTPUTPLOTSTATUSBAR_INDEX", "index");
... ... @@ -42,7 +46,7 @@ class RequestOutputPlotParamNodeClass extends NodeClass
42 46 return $this->getAttribute(REQUESTOUTPUTPLOTPARAM_ID);
43 47 }
44 48  
45   - public function addYSerie($yAxis, $index, $xAxis = "", $colorSerieId = -1)
  49 + public function addYSerie($yAxis, $index, $xAxis = "", $colorSerieId = -1, $min = NULL, $max = NULL)
46 50 {
47 51 if ($xAxis != "")
48 52 {
... ... @@ -52,6 +56,10 @@ class RequestOutputPlotParamNodeClass extends NodeClass
52 56 else
53 57 $ySerieNode = new RequestOutputPlotYSerieNodeClass(REQUESTOUTPUTPLOTYSERIE_TIMEPLOT_NAME);
54 58 $ySerieNode->setYAxisId($yAxis);
  59 + if (isset($min))
  60 + $ySerieNode->setMin($min);
  61 + if (isset($max))
  62 + $ySerieNode->setMax($max);
55 63 if ($index >= 0)
56 64 $ySerieNode->setIndex($index);
57 65 if ($colorSerieId >= 0)
... ... @@ -80,20 +88,28 @@ class RequestOutputPlotParamNodeClass extends NodeClass
80 88 return $iserieNode;
81 89 }
82 90  
83   - public function addSpectro($yAxis)
  91 + public function addSpectro($yAxis, $min = NULL, $max = NULL)
84 92 {
85 93 $spectroNode = new NodeClass(REQUESTOUTPUTPLOTSPECTRO_NAME);
86 94 $spectroNode->setAttribute(REQUESTOUTPUTPLOTSPECTRO_YAXIS, $yAxis);
  95 + if (isset($min))
  96 + $spectroNode->setAttribute(REQUESTOUTPUTPLOTSPECTRO_MIN, $min);
  97 + if (isset($max))
  98 + $spectroNode->setAttribute(REQUESTOUTPUTPLOTSPECTRO_MAX, $max);
87 99 $this->addChild($spectroNode);
88 100 return $spectroNode;
89 101 }
90 102  
91   - public function addXSerie($xAxis, $index)
  103 + public function addXSerie($xAxis, $index, $min = NULL, $max = NULL)
92 104 {
93 105 $xSerieNode = new NodeClass(REQUESTOUTPUTPLOTXSERIE_NAME);
94 106 $xSerieNode->setAttribute(REQUESTOUTPUTPLOTXSERIE_XAXIS, $xAxis);
95 107 if ($index >= 0)
96 108 $xSerieNode->setAttribute(REQUESTOUTPUTPLOTXSERIE_INDEX, $index);
  109 + if (isset($min))
  110 + $xSerieNode->setAttribute(REQUESTOUTPUTPLOTXSERIE_MIN, $min);
  111 + if (isset($max))
  112 + $xSerieNode->setAttribute(REQUESTOUTPUTPLOTXSERIE_MAX, $max);
97 113 $this->addChild($xSerieNode);
98 114 return $xSerieNode;
99 115 }
... ...