Merge branch '9326' into develop

Benjamin Renard
2 parents 0baafd6e 3d47da02
Showing 8 changed files with 98 additions and 7 deletions Show diff stats
src/ExternLib/ttcat_to_param/CMakeLists.txt
src/ExternLib/ttcat_to_param/ProcessTTCatToParam.cc
src/ExternLib/ttcat_to_param/ProcessTTCatToParam.hh
src/Info/ParamInfo.hh
src/InternLib/MultiParamProcess.cc
src/ParamOutputImpl/Plot/PanelPlotOutput.cc
src/ParamOutputImpl/Plot/PanelPlotOutput.hh
src/ParamOutputImpl/Plot/PlotOutput.cc
@@ -10,6 +10,7 @@ include_directories(
     ${CMAKE_HOME_DIRECTORY}/src/Plugins/
     ${CMAKE_HOME_DIRECTORY}/src/helpers/
     ${CMAKE_HOME_DIRECTORY}/src/TimeTableCatalog/
+	${CMAKE_HOME_DIRECTORY}/src/Info/
     ${LOG4CXX_INCLUDE_DIR}
     ${Boost_INCLUDE_DIR}
 )
@@ -16,6 +16,7 @@
 #include "TTCatToParam.hh"
 #include "TimeTableCatalogFactory.hh"
 #include "Catalog.hh"
+#include "ParamMgr.hh"
  
 using namespace std;
 using namespace boost;
@@ -84,7 +85,18 @@ TimeStamp ProcessTTCatToParam::init() {
 	return timeStamp;
 }
  
+void ProcessTTCatToParam::updateInfo(Parameter &parameter)
+{
+	SingleParamProcess::updateInfo(parameter);
  
+	AMDA::Info::ParamInfoSPtr paramInfo = AMDA::Info::ParamMgr::getInstance()->getParamInfoFromId(parameter.getInfoId(), true);
+
+	if (paramInfo == nullptr)
+	{
+		return;
+	}
+	paramInfo->addAdditionalInfo("TTCatToParamPath", _attributList[0]);
+}
  
 } /* namespace Parameters */
 } /* namespace AMDA */
@@ -38,6 +38,7 @@ public:
 	 */
 	TimeStamp init();
  
+	virtual void updateInfo(Parameter &parameter);
 };
  
 } /* namespace Parameters */
@@ -340,6 +340,19 @@ public:
 		return _processInfo;
 	}
  
+	void addAdditionalInfo(std::string key, std::string value)
+	{
+		_additionalInfo[key] = value;
+	}
+
+	/*
+	 * @brief Get information about parameter process
+	 */
+	const std::map<std::string, std::string> getAdditionInfo() const
+	{
+		return _additionalInfo;
+	}
+
 	/*
 	 * @brief Set a description of the parameter process
 	 */
@@ -425,7 +438,8 @@ protected:
 	std::vector<std::string> _linkedParamList;
 	std::string _dataset_id;
 	std::string _instrument_id;
-        	static log4cxx::LoggerPtr _logger;
+	std::map<std::string, std::string> _additionalInfo;
+	static log4cxx::LoggerPtr _logger;
 };
  
 typedef boost::shared_ptr<ParamInfo> ParamInfoSPtr;
@@ -226,8 +226,21 @@ void MultiParamProcess::updateInfo(Parameter &amp; parameter)
 	}
  
 	paramInfo->setProcessDescription(description);
-}
  
+	if ((_paramNameList.size() == 1) && paramInfo->getAdditionInfo().empty())
+	{
+		AMDA::Info::ParamInfoSPtr inputParamInfo = AMDA::Info::ParamMgr::getInstance()->getParamInfoFromId(_paramNameList.begin()->second.first->getInfoId());
+		if (inputParamInfo != nullptr)
+		{
+			// Copy tables
+			std::map<std::string, std::string> inputAdditionals = inputParamInfo->getAdditionInfo();
+			for (std::map<std::string, std::string>::iterator it = inputAdditionals.begin(); it != inputAdditionals.end(); ++it)
+			{
+				paramInfo->addAdditionalInfo(it->first, it->second);
+			}
+		}
+	}
+}
 /*
  * @brief Get min sampling
  */
@@ -16,6 +16,8 @@
 #include "ParamMgr.hh"
 #include "DecoratorPlot.hh"
 #include "PlPlotUtil.hh"
+#include "Catalog.hh"
+#include "TimeTableCatalogFactory.hh"
  
 #include <string>
 #include <boost/range/adaptor/reversed.hpp>
@@ -2071,7 +2073,8 @@ void PanelPlotOutput::drawCurvePlot(CurvePlot &amp;/*curvePlot*/) {
 /**
  * @brief Write plot context
  */
-void PanelPlotOutput::writeContext(ContextFileWriter& writer) {
+void PanelPlotOutput::writeContext(ContextFileWriter &writer, AMDA::Parameters::TimeIntervalList::iterator currentTimeInterval)
+{
 	if (!isStandalone())
 		return;
  
@@ -2088,10 +2091,57 @@ void PanelPlotOutput::writeContext(ContextFileWriter&amp; writer) {
 				hasSpectro = true;
 				break;
 			}
-                                                            if (parameter.getSauvaudProperties() != nullptr) {
+			if (parameter.getSauvaudProperties() != nullptr)
+			{
 				hasSauvaud = true;
 				break;
 			}
+			if (parameter.getIntervalsProperties() != nullptr)
+			{
+				ParameterSPtr p = _parameterManager.getParameter(parameter._originalParamId);
+				AMDA::Info::ParamInfoSPtr paramInfo = AMDA::Info::ParamMgr::getInstance()->getParamInfoFromId(p->getInfoId());
+				std::map<std::string, std::string> inputAdditionals = paramInfo->getAdditionInfo();
+				std::string ttOrCatPath = inputAdditionals["TTCatToParamPath"];
+
+				// Load TT or Catalog
+				std::string lReaderType = TimeTableCatalog::TimeTableCatalogFactory::getInstance().getReaderType(ttOrCatPath);
+				if (!lReaderType.empty())
+				{
+					TimeTableCatalog::Catalog inputTTOrCat;
+					inputTTOrCat.read(ttOrCatPath, lReaderType);
+
+					for (std::vector<TimeTableCatalog::TimeInterval>::const_iterator it = inputTTOrCat.getIntervals().begin(); it != inputTTOrCat.getIntervals().end(); ++it)
+					{
+						if (it->_startTime >= currentTimeInterval->_startTime && it->_stopTime <= currentTimeInterval->_stopTime) // inside the interval
+						{
+							writer.startElement("intervals");
+							writer.addAttribute("name", inputTTOrCat._name.c_str());
+							writer.addAttribute("id", std::to_string(it->_index).c_str());
+							writer.addAttribute("startTime", std::to_string(it->_startTime).c_str());
+							writer.addAttribute("stopTime", std::to_string(it->_stopTime).c_str());
+							writer.endElement();
+						}
+						else if (it->_startTime <= currentTimeInterval->_startTime && it->_stopTime <= currentTimeInterval->_stopTime && it->_stopTime >= currentTimeInterval->_startTime) // begins before, ends inside
+						{
+							writer.startElement("intervals");
+							writer.addAttribute("name", inputTTOrCat._name.c_str());
+							writer.addAttribute("id", std::to_string(it->_index).c_str());
+							writer.addAttribute("startTime", std::to_string(currentTimeInterval->_startTime).c_str());
+							writer.addAttribute("stopTime", std::to_string(it->_stopTime).c_str());
+							writer.endElement();
+						}
+						else if (it->_startTime >= currentTimeInterval->_startTime && it->_startTime <= currentTimeInterval->_stopTime && it->_stopTime >= currentTimeInterval->_stopTime) // begins inside, ends after
+						{
+							writer.startElement("intervals");
+							writer.addAttribute("name", inputTTOrCat._name.c_str());
+							writer.addAttribute("id", std::to_string(it->_index).c_str());
+							writer.addAttribute("startTime", std::to_string(it->_startTime).c_str());
+							writer.addAttribute("stopTime", std::to_string(currentTimeInterval->_stopTime).c_str());
+							writer.endElement();
+						}
+					}
+				}
+			}
 		}
  
  
@@ -108,7 +108,7 @@ public:
 	/**
 	 * @brief Write plot context
 	 */
-	void writeContext(ContextFileWriter& writer);
+	void writeContext(ContextFileWriter &writer, AMDA::Parameters::TimeIntervalList::iterator currentTimeInterval);
  
 	/*
 	 * @brief Set a pointer to the time intervals list
@@ -242,7 +242,7 @@ void PlotOutput::drawOneIntervalByPage()
 			}
 			//write plot context
 			if (_writeContextFile)
-				plot->writeContext(_contextWriter);
+				plot->writeContext(_contextWriter, _currentTimeInterval);
 			//prepare for the next time interval
 			plot->resetPlot();
 		}
@@ -347,7 +347,7 @@ void PlotOutput::drawAllIntervalsInOnePage()
 				dataPloted[plotIndex] = dataPlotedForInt;
 			if (_writeContextFile && (_currentTimeInterval == _timeIntervalList->begin()))
 				//write plot context
-					plot->writeContext(_contextWriter);
+				plot->writeContext(_contextWriter, _currentTimeInterval);
 			++plotIndex;
 		}