CDPP / AMDA_Integration

Commit 1514ed12d95d8f13a3a5d5ac498bdb54fc1704e7

Authored by Erdogan Furkan
1 parent 17e90e13
Exists in master and in 33 other branches 5390, 9016Bis, 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, amdadev, cu2022, density_maps, develop, mlplasmas

#5390 - Integration part

Showing 2 changed files with 16 additions and 0 deletions   Show diff stats
Inline Side-by-side
src/InputOutput/IHMImpl/Params/PlotImpl/IHMInputOutputParamsPlotClass.php
  Diff comments   View file @1514ed1
@@ -299,6 +299,11 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass @@ -299,6 +299,11 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
299 if (($panelData->{'panel-background-color'} != 'none') && ($panelData->{'panel-background-color'} != '')) 299 if (($panelData->{'panel-background-color'} != 'none') && ($panelData->{'panel-background-color'} != ''))
300 $panelNode->setBackgroundColor($this->hexColor2KernelColor($panelData->{'panel-background-color'})); 300 $panelNode->setBackgroundColor($this->hexColor2KernelColor($panelData->{'panel-background-color'}));
301 301
  302 + //Plot Area background color
  303 + if (($panelData->{'panel-plotareabackground-color'} != 'none') && ($panelData->{'panel-plotareabackground-color'} != '')) {
  304 + $panelNode->setPlotAreaBackgroundColor($this->hexColor2KernelColor($panelData->{'panel-plotareabackground-color'}));
  305 + }
  306 +
302 //Panel font 307 //Panel font
303 $this->unmarshallFont($panelData, 'panel-font', $panelNode->getFont()); 308 $this->unmarshallFont($panelData, 'panel-font', $panelNode->getFont());
304 309
src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotPanelNodeClass.php
  Diff comments   View file @1514ed1
@@ -11,6 +11,7 @@ require_once "RequestOutputPlotFontNodeClass.php"; @@ -11,6 +11,7 @@ require_once "RequestOutputPlotFontNodeClass.php";
11 define ("REQUESTOUTPUTPLOTPANEL_NAME", "panel"); 11 define ("REQUESTOUTPUTPLOTPANEL_NAME", "panel");
12 define ("REQUESTOUTPUTPLOTPANEL_TITLE", "title"); 12 define ("REQUESTOUTPUTPLOTPANEL_TITLE", "title");
13 define ("REQUESTOUTPUTPLOTPANEL_BACKGROUNDCOLOR", "backgroundColor"); 13 define ("REQUESTOUTPUTPLOTPANEL_BACKGROUNDCOLOR", "backgroundColor");
  14 +define("REQUESTOUTPUTPLOTPANEL_PLOTAREABACKGROUNDCOLOR", "plotAreaBackgroundColor");
14 define ("REQUESTOUTPUTPLOTPANEL_XMARGIN", "xMargin"); 15 define ("REQUESTOUTPUTPLOTPANEL_XMARGIN", "xMargin");
15 define ("REQUESTOUTPUTPLOTPANEL_PREFEREDWIDTH", "preferedWidth"); 16 define ("REQUESTOUTPUTPLOTPANEL_PREFEREDWIDTH", "preferedWidth");
16 define ("REQUESTOUTPUTPLOTPANEL_PREFEREDHEIGHT", "preferedHeight"); 17 define ("REQUESTOUTPUTPLOTPANEL_PREFEREDHEIGHT", "preferedHeight");
@@ -43,11 +44,21 @@ class RequestOutputPlotPanelNodeClass extends NodeClass @@ -43,11 +44,21 @@ class RequestOutputPlotPanelNodeClass extends NodeClass
43 { 44 {
44 $this->setAttribute(REQUESTOUTPUTPLOTPANEL_BACKGROUNDCOLOR, $color); 45 $this->setAttribute(REQUESTOUTPUTPLOTPANEL_BACKGROUNDCOLOR, $color);
45 } 46 }
  47 +
  48 + public function setPlotAreaBackgroundColor($color)
  49 + {
  50 + $this->setAttribute(REQUESTOUTPUTPLOTPANEL_PLOTAREABACKGROUNDCOLOR, $color);
  51 + }
46 52
47 public function getBackgroundColor() 53 public function getBackgroundColor()
48 { 54 {
49 return $this->getAttribute(REQUESTOUTPUTPLOTPANEL_BACKGROUNDCOLOR); 55 return $this->getAttribute(REQUESTOUTPUTPLOTPANEL_BACKGROUNDCOLOR);
50 } 56 }
  57 +
  58 + public function getPlotAreaBackgroundColor()
  59 + {
  60 + return $this->getAttribute(REQUESTOUTPUTPLOTPANEL_PLOTAREABACKGROUNDCOLOR);
  61 + }
51 62
52 public function getBounds() 63 public function getBounds()
53 { 64 {