CDPP / AMDA_Integration

Commit aba3bf575677ec88d6338185645105aa95deb762

Authored by Menouar AZIB
1 parent 28c6d6c5
Exists in master and in 19 other branches FER_11100, FER_11242, FER_11500, FER_11586, FER_11588, FER_6265, FER_6951, FER_7618, FER_9629, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_FIX_9016, SpeasyGet, amdadev, develop

Handle the adding of writeDataFile flag in xml of plot

Showing 2 changed files with 15 additions and 0 deletions   Show diff stats
Inline Side-by-side
src/InputOutput/IHMImpl/Params/PlotImpl/IHMInputOutputParamsPlotClass.php
  Diff comments   View file @aba3bf5
@@ -67,6 +67,8 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass @@ -67,6 +67,8 @@ class IHMInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
67 67
68 $plotOutputNode->setWriteContextFile($this->isInteractiveRequest ? "true" : "false"); 68 $plotOutputNode->setWriteContextFile($this->isInteractiveRequest ? "true" : "false");
69 69
  70 + $plotOutputNode->setWriteDataFile($this->isInteractiveRequest ? "true" : "false");
  71 +
70 $compression = ""; 72 $compression = "";
71 if (!$this->isInteractiveRequest && !$this->isFromWS) { 73 if (!$this->isInteractiveRequest && !$this->isFromWS) {
72 switch ($input->{'file-output'}) { 74 switch ($input->{'file-output'}) {
src/Request/ParamsRequestImpl/Nodes/Requests/RequestOutputPlotNodeClass.php
  Diff comments   View file @aba3bf5
@@ -5,6 +5,7 @@ require_once("RequestOutputPostProcessingNodeClass.php"); @@ -5,6 +5,7 @@ require_once("RequestOutputPostProcessingNodeClass.php");
5 5
6 define ("REQUESTOUTPUTPLOT_NAME", "plot"); 6 define ("REQUESTOUTPUTPLOT_NAME", "plot");
7 define ("REQUESTOUTPUTPLOT_WRITECONTEXTFILE", "writeContextFile"); 7 define ("REQUESTOUTPUTPLOT_WRITECONTEXTFILE", "writeContextFile");
  8 +define ("REQUESTOUTPUTPLOT_WRITEDATAFILE", "writeDataFile");
8 define ("REQUESTOUTPUTPLOT_STRUCTURE", "outputStructure"); 9 define ("REQUESTOUTPUTPLOT_STRUCTURE", "outputStructure");
9 define ("REQUESTOUTPUTPLOT_FILEPREFIX", "filePrefix"); 10 define ("REQUESTOUTPUTPLOT_FILEPREFIX", "filePrefix");
10 11
@@ -54,6 +55,16 @@ class RequestOutputPlotNodeClass extends NodeClass @@ -54,6 +55,16 @@ class RequestOutputPlotNodeClass extends NodeClass
54 return $this->getAttribute(REQUESTOUTPUTPLOT_WRITECONTEXTFILE); 55 return $this->getAttribute(REQUESTOUTPUTPLOT_WRITECONTEXTFILE);
55 } 56 }
56 57
  58 + public function setWriteDataFile($write)
  59 + {
  60 + $this->setAttribute(REQUESTOUTPUTPLOT_WRITEDATAFILE, $write);
  61 + }
  62 +
  63 + public function getWritDataFile()
  64 + {
  65 + return $this->getAttribute(REQUESTOUTPUTPLOT_WRITEDATAFILE);
  66 + }
  67 +
57 public function setFilePrefix($prefix) 68 public function setFilePrefix($prefix)
58 { 69 {
59 $node = $this->getChildInstanceByName(REQUESTOUTPUTPLOT_FILEPREFIX, true); 70 $node = $this->getChildInstanceByName(REQUESTOUTPUTPLOT_FILEPREFIX, true);
@@ -109,6 +120,8 @@ class RequestOutputPlotNodeClass extends NodeClass @@ -109,6 +120,8 @@ class RequestOutputPlotNodeClass extends NodeClass
109 $this->setStructure($this->getXmlNodeValue($structureXmlNode)); 120 $this->setStructure($this->getXmlNodeValue($structureXmlNode));
110 121
111 $this->setWriteContextFile($this->getXmlNodeAttribute($xmlNode, REQUESTOUTPUTPLOT_WRITECONTEXTFILE)); 122 $this->setWriteContextFile($this->getXmlNodeAttribute($xmlNode, REQUESTOUTPUTPLOT_WRITECONTEXTFILE));
  123 +
  124 + $this->setWriteDataFile($this->getXmlNodeAttribute($xmlNode, REQUESTOUTPUTPLOT_WRITEDATAFILE));
112 125
113 $fileprefixXmlNode = $this->getXmlNodeChildByTagName($xmlNode, REQUESTOUTPUTPLOT_FILEPREFIX); 126 $fileprefixXmlNode = $this->getXmlNodeChildByTagName($xmlNode, REQUESTOUTPUTPLOT_FILEPREFIX);
114 if (isset($fileprefixXmlNode)) 127 if (isset($fileprefixXmlNode))