Use file prefix for compressed archive + Add TTName in output files names

Benjamin Renard
1 parent 87c20ffe
Showing 7 changed files with 37 additions and 8 deletions Show diff stats
src/ParamOutputImpl/Plot/PlotNode.cc
src/ParamOutputImpl/Plot/PlotOutput.cc
src/ParamOutputImpl/Plot/PlotOutput.hh
src/ParamOutputImpl/Plot/TickPlot/TickMarkDecorator.cc
src/PostProcessing/PostProcessingNode.hh
src/PostProcessing/TarNode.cc
src/PostProcessing/ZipNode.cc
@@ -51,6 +51,7 @@ void PlotNode::proceed(xmlNodePtr pNode,
  
 	lContext.push<PlotOutput*>(plotOutput);
 	lContext.push<AMDA::Parameters::ParameterManager*>(lParameterManager);
+	lContext.push<std::string*>(&plotOutput->getFilePrefix());
 	AMDA::Parameters::ParamOutputSPtr lParamOutput(plotOutput);
 	AMDA::XMLConfigurator::NodeGrpCfg::proceed(pNode, lContext);
 	lParameterManager->getParamOutputList().push_back(lParamOutput);
@@ -145,8 +145,9 @@ void PlotOutput::apply() {
  
 /**
  * @brief Init new page - Create also the new file if necessary
+ *
  */
-void PlotOutput::initNewPage(int intervalIndex)
+bool PlotOutput::initNewPage(int intervalIndex, std::string& ttName)
 {
 	LOG4CXX_DEBUG(gLogger,"PlotOutput::initNewPage");
 	std::stringstream plotFilePrefix;
@@ -163,12 +164,14 @@ void PlotOutput::initNewPage(int intervalIndex)
 	if ((_timeIntervalList->size() > 1) &&
 		(_outputStructure == OutputStructure::ONE_FILE_PER_INTERVAL) &&
 		!_page->_superposeMode)
-		plotFilePrefix << _filePrefix << "_" << intervalIndex << "_";
+		plotFilePrefix << _filePrefix << "_" << ttName << "_" << intervalIndex << "_";
 	else
 		plotFilePrefix << _filePrefix << "_";
  
 	//draw page
 	_page->draw(_pls, newFile, plotFilePrefix.str().c_str());
+
+	return newFile;
 }
  
 /*
@@ -183,7 +186,7 @@ void PlotOutput::drawOneIntervalByPage()
 		getDataFromServer();
  
 		//init the page
-		initNewPage(_currentTimeInterval->_index);
+		bool newFile = initNewPage(_currentTimeInterval->_index, _currentTimeInterval->_ttName);
  
 		// Compute panel position depending on the page layout
 		computePanelBounds();
@@ -246,7 +249,8 @@ void PlotOutput::drawOneIntervalByPage()
 			_parameterValues[paramId].reset();
  
 		//add file to file list for post processing
-		_files.push_back(_page->_fileName);
+		if (newFile)
+			_files.push_back(_page->_fileName);
  
 		//go to next interval
 		++_currentTimeInterval;
@@ -274,7 +278,7 @@ void PlotOutput::drawAllIntervalsInOnePage()
 	}
  
 	//init the page
-	initNewPage(0);
+	initNewPage(0,_timeIntervalList->begin()->_ttName);
  
 	//Compute panel position depending on the page layout
 	computePanelBounds();
@@ -87,6 +87,13 @@ public:
 			_filePrefix = filePrefix;
 		}
  
+		/**
+		 * @brief sets the file prefix to use.
+		*/
+		std::string& getFilePrefix()
+		{
+			return _filePrefix;
+		}
 	AMDA::Parameters::ParameterManager& getParameterManager(){
 		return _parameterManager;
 	}
@@ -218,7 +225,7 @@ private:
 	/**
 	 * @brief Init new page - Create also the new file if necessary
 	 */
-	void initNewPage(int intervalIndex);
+	bool initNewPage(int intervalIndex, std::string& ttName);
  
 	/*
 	 * @brief Sequence to draw one interval by page
@@ -445,6 +445,7 @@ void TickMarkDecorator::installLabelGenerator(PanelPlotOutput* /*pplot_*/, TimeA
 	//_decoratorPlot->getDataFromServer();
  
 	// build all series names :
+	_seriesInfoList.clear();
 	for (auto p : _decoratorPlot->_parameterAxesList) {
 		const std::string name = p._originalParamId;
 		LOG4CXX_DEBUG(_logger, " inspecting parameter : " << name);
@@ -51,6 +51,9 @@ public:
 		// Push post processing able in the context
 		lContext.push<PostProcessingAble*>(lOutput);
  
+		std::string* filePrefix = pContext.get<std::string*>();
+		lContext.push<std::string*>(filePrefix);
+
 		// proceed child nodes
 		NodeGrpCfg::proceed(pNode, lContext);
 	}
@@ -20,7 +20,13 @@ void TarNode::proceed(xmlNodePtr pNode,
  
 	// Set value in output param
 	std::stringstream outputNodeName;
-	outputNodeName << pNode->parent->parent->name;
+
+	std::string* filePrefix = pContext.get<std::string*>();
+
+	if (filePrefix == NULL)
+		outputNodeName << pNode->parent->parent->name;
+	else
+		outputNodeName << (*filePrefix);
 	output->addPostProcessing(new TarPostProcessing(outputNodeName.str()));
 }
  
@@ -20,7 +20,14 @@ void ZipNode::proceed(xmlNodePtr pNode,
  
 		// Set value in output param
 		std::stringstream outputNodeName;
-		outputNodeName << pNode->parent->parent->name;
+
+		std::string* filePrefix = pContext.get<std::string*>();
+
+		if (filePrefix == NULL)
+			outputNodeName << pNode->parent->parent->name;
+		else
+			outputNodeName << (*filePrefix);
+
 		output->addPostProcessing(new ZipPostProcessing(outputNodeName.str()));
 	}
 }