Commit 1ce37eda1f49ebe28687e37cafb291b1ba2dfefe
1 parent
61e60608
Exists in
master
and in
13 other branches
Histo 1D&2D working
Showing
2 changed files
with
4 additions
and
4 deletions
Show diff stats
config/kernel/plotConfig.xml
@@ -34,6 +34,8 @@ | @@ -34,6 +34,8 @@ | ||
34 | <symbol type="circle" size="5" color="[120,120,0]" /> | 34 | <symbol type="circle" size="5" color="[120,120,0]" /> |
35 | </timeTick> | 35 | </timeTick> |
36 | </xyPlot> | 36 | </xyPlot> |
37 | + <histoPlot zAxis="colorAxis"> | ||
38 | + </histoPlot> | ||
37 | <instantPlot zAxis="colorAxis"> | 39 | <instantPlot zAxis="colorAxis"> |
38 | <line type="no" style="plain" color="[255,0,0]" width="1" /> | 40 | <line type="no" style="plain" color="[255,0,0]" width="1" /> |
39 | <symbol type="dot" size="4" color="[0,0,255]" /> | 41 | <symbol type="dot" size="4" color="[0,0,255]" /> |
src/InputOutput/IHMImpl/Params/PlotImpl/IHMInputOutputParamsPlotClass.php
@@ -364,9 +364,6 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass | @@ -364,9 +364,6 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass | ||
364 | 364 | ||
365 | protected function unmarshallPlotType($panelData, $panelNode) | 365 | protected function unmarshallPlotType($panelData, $panelNode) |
366 | { | 366 | { |
367 | - | ||
368 | - | ||
369 | - error_log($panelData->{'panel-plot-type'}); | ||
370 | switch ($panelData->{'panel-plot-type'}) { | 367 | switch ($panelData->{'panel-plot-type'}) { |
371 | case 'timePlot': | 368 | case 'timePlot': |
372 | $plotNode = $panelNode->addPlotElement(RequestOutputPlotElementTypeEnum::TIMEPLOT); | 369 | $plotNode = $panelNode->addPlotElement(RequestOutputPlotElementTypeEnum::TIMEPLOT); |
@@ -558,8 +555,9 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass | @@ -558,8 +555,9 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass | ||
558 | { | 555 | { |
559 | //X parameters | 556 | //X parameters |
560 | $isScatter = ($plotNode->getName() == REQUESTOUTPUTPLOTELEMENTXY_NAME); | 557 | $isScatter = ($plotNode->getName() == REQUESTOUTPUTPLOTELEMENTXY_NAME); |
558 | + $isHisto = ($plotNode->getName() == REQUESTOUTPUTPLOTELEMENTHISTO_NAME); | ||
561 | $xIds = array(); | 559 | $xIds = array(); |
562 | - if ($isScatter) { | 560 | + if ($isScatter || $isHisto) { |
563 | $crtXId = 0; | 561 | $crtXId = 0; |
564 | foreach ($paramsData as $paramData) { | 562 | foreach ($paramsData as $paramData) { |
565 | if ($paramData->{'param-drawing-object'}->{'serie-xaxis-param'} == '') | 563 | if ($paramData->{'param-drawing-object'}->{'serie-xaxis-param'} == '') |