7616 - Adding modifications of the Kernel part

Erdogan Furkan
1 parent b15cd226
Showing 6 changed files with 129 additions and 85 deletions Show diff stats
config/xsd/request/statusPlot.xsd
src/ParamOutputImpl/Plot/AbstractPlotConfigNode.hh
src/ParamOutputImpl/Plot/DecoratorPlot/AbstractDecoratorPlotNode.cc
src/ParamOutputImpl/Plot/StatusPlot/StatusBarDecorator.cc
src/ParamOutputImpl/Plot/StatusPlot/StatusBarDecorator.hh
src/ParamOutputImpl/Plot/Time/TimePlot.cc
@@ -18,6 +18,7 @@
             </xs:documentation>
           </xs:annotation>
           <xs:complexType>
+            <xs:attribute name="color" type="xs:string" use="optional"></xs:attribute>
             <xs:attribute name="index" type="xs:string"/>       
             <xs:attribute name="resolution" type="xs:integer"/>      
           </xs:complexType>
@@ -91,7 +91,7 @@ protected:
 				xmlFree(value);
 		}
 		// -- default color
-		updateColor( props_.getColor(), pNode_,(const xmlChar*)"color",(const xmlChar*)"colorMapIndex");
+		// updateColor( props_.getColor(), pNode_,(const xmlChar*)"color",(const xmlChar*)"colorMapIndex");
 	}
  
 };
@@ -128,67 +128,84 @@ void DecoratorSeriesNode::parseAttributes(xmlNodePtr pNode_,
 		((SeriesProperties&) props_).setIndex(AMDA::Common::ParameterIndexComponent(-1,-1)); // default case: if no index attribute, we use default index value -1 which means for all series.
 	}
  
-	// -- parameter resolution
-	/*value = xmlGetProp(pNode_, (const xmlChar *) "resolution");
-	if (value) {
-		props_.setMaxResolution(atoi((const char*) value));
+	// -- color
+	Color color(0, 255, 0);
+	value = xmlGetProp(pNode_, (const xmlChar *)"color");
+	if (value)
+	{
+		try
+		{
+			std::string strValue((const char *)value);
+			createColor(color, strValue);
+			((SeriesProperties &)props_).setColor(color);
+		}
+		catch (std::logic_error &e)
+		{
+			LOG4CXX_WARN(gLogger, "StatusBar Color : " << e.what());
+		}
 		xmlFree(value);
-	}*/
+	}
 }
  
-DecoratorParamsNode::DecoratorParamsNode() :
-		AMDA::XMLConfigurator::NodeGrpCfg() {
+DecoratorParamsNode::DecoratorParamsNode() : AMDA::XMLConfigurator::NodeGrpCfg()
+{
 	getChildList()["param"] = AMDA::XMLConfigurator::NodeCfgSPtr(
-			new DecoratorParamNode());
+		new DecoratorParamNode());
 }
  
-DecoratorParamsNode::~DecoratorParamsNode() {
-}
+	DecoratorParamsNode::~DecoratorParamsNode()
+	{
+	}
  
-DecoratorParamNode::DecoratorParamNode() :
-		AMDA::XMLConfigurator::NodeGrpCfg() {
-	getChildList()["serie"] = AMDA::XMLConfigurator::NodeCfgSPtr(
+	DecoratorParamNode::DecoratorParamNode() : AMDA::XMLConfigurator::NodeGrpCfg()
+	{
+		getChildList()["serie"] = AMDA::XMLConfigurator::NodeCfgSPtr(
 			new DecoratorSeriesNode());
-}
-
-DecoratorParamNode::~DecoratorParamNode() {
-}
+	}
  
-void DecoratorParamNode::proceed(xmlNodePtr pNode,
-		const AMDA::Parameters::CfgContext& pContext) {
-	LOG4CXX_DEBUG(gLogger, "DecoratorParamNode::proceed");
-	DecoratorPlot* plotOutput = pContext.get<DecoratorPlot*>();
-	xmlChar* name = NULL;
-	// -- param id
-	name = xmlGetProp(pNode, (const xmlChar *) "id");
-	if (name) {
-		plotOutput->addParam((const char*) name);
+	DecoratorParamNode::~DecoratorParamNode()
+	{
 	}
  
-	// initialize drawing default properties object:
-	DrawingProperties props;
-	// take default value during init...
-	DefaultPlotConfiguration::getInstance().applyDefaultDrawingProperties(
+	void DecoratorParamNode::proceed(xmlNodePtr pNode,
+									 const AMDA::Parameters::CfgContext &pContext)
+	{
+		LOG4CXX_DEBUG(gLogger, "DecoratorParamNode::proceed");
+		DecoratorPlot *plotOutput = pContext.get<DecoratorPlot *>();
+		xmlChar *name = NULL;
+		// -- param id
+		name = xmlGetProp(pNode, (const xmlChar *)"id");
+		if (name)
+		{
+			plotOutput->addParam((const char *)name);
+		}
+
+		// initialize drawing default properties object:
+		DrawingProperties props;
+		// take default value during init...
+		DefaultPlotConfiguration::getInstance().applyDefaultDrawingProperties(
 			plotOutput->typeName(), props);
-	// add default properties to parameter
-	plotOutput->getParameter((const char*) name).setDefaultProperties(props);
+		// add default properties to parameter
+		plotOutput->getParameter((const char *)name).setDefaultProperties(props);
  
-	AMDA::Parameters::CfgContext context;
-	context.push<xmlChar*>(name);
-	context.push<DecoratorPlot*>(plotOutput);
-	AMDA::XMLConfigurator::NodeGrpCfg::proceed(pNode, context);
+		AMDA::Parameters::CfgContext context;
+		context.push<xmlChar *>(name);
+		context.push<DecoratorPlot *>(plotOutput);
+		AMDA::XMLConfigurator::NodeGrpCfg::proceed(pNode, context);
  
-	if (name) {
-		xmlFree(name);
+		if (name)
+		{
+			xmlFree(name);
+		}
 	}
-}
  
-DecoratorAxesNode::DecoratorAxesNode() :
-		AMDA::XMLConfigurator::NodeGrpCfg() {
-	getChildList()["xAxis"] = AMDA::XMLConfigurator::NodeCfgSPtr(
+	DecoratorAxesNode::DecoratorAxesNode() : AMDA::XMLConfigurator::NodeGrpCfg()
+	{
+		getChildList()["xAxis"] = AMDA::XMLConfigurator::NodeCfgSPtr(
 			new XAxisNode());
-}
-DecoratorAxesNode::~DecoratorAxesNode() {
-}
+	}
+	DecoratorAxesNode::~DecoratorAxesNode()
+	{
+	}
  
 } /* namespace plot */
@@ -236,39 +236,48 @@ void StatusBarDecorator::draw(PanelPlotOutput* pplot_, Axis* axis_,
 		//Working list of pair used to build the legend
 		std::vector<std::pair<Color,std::string>> legend;
  
-		//legend configuration
+		// legend configuration
 		if ((paramInfo != nullptr) && !paramInfo->getStatusDef().empty())
 		{
-			for (int s = 0 ; s < (int)paramInfo->getStatusDef().size(); ++s)
+			for (int s = 0; s < (int)paramInfo->getStatusDef().size(); ++s)
 			{
 				std::string colorStr = paramInfo->getStatusDef()[s].getColor();
-				Color color;
-				if (!colorStr.empty()) {
+				if (_barInfoList[i]._color.isSet()) // we use the color set by the user
+				{
+					Color color;
+					color = _barInfoList[i]._color;
+					legend.push_back(std::make_pair(color, paramInfo->getStatusDef()[s].getName()));
+				}
+				else if (!colorStr.empty()) // if the color is not set by the user we take the StatusDef
+				{
+					Color color;
+
 					createColor(color, colorStr);
+					legend.push_back(std::make_pair(color, paramInfo->getStatusDef()[s].getName()));
 				}
-				else {
-					color = Color(_colorMapIndex, s);
+				else // if none of them is given, we set the colorMapIndex color
+				{
+					Color color(_colorMapIndex, s);
+					legend.push_back(std::make_pair(color, paramInfo->getStatusDef()[s].getName()));
 				}
-				legend.push_back(std::make_pair(color,paramInfo->getStatusDef()[s].getName()));
 			}
 		}
  
-
-		//set color map
+		// set color map
 		pls_->spal1(
 			ColormapManager::getInstance().getColorAxis(_colorMapIndex).c_str(), true);
  
 		Color lInitialColor;
 		pls_->gcol0(0, lInitialColor._red, lInitialColor._green, lInitialColor._blue);
  
-		//Draw Status data
+		// Draw Status data
 		PLFLT x[4], y[4];
-		for (int t = 0; t < _barInfoList[i]._dataPtr->getSize() - 1;++t)
+		for (int t = 0; t < _barInfoList[i]._dataPtr->getSize() - 1; ++t)
 		{
 			x[0] = _barInfoList[i]._dataPtr->getTimes()[t];
 			x[1] = _barInfoList[i]._dataPtr->getTimes()[t];
-			x[2] = _barInfoList[i]._dataPtr->getTimes()[t+1];
-			x[3] = _barInfoList[i]._dataPtr->getTimes()[t+1];
+			x[2] = _barInfoList[i]._dataPtr->getTimes()[t + 1];
+			x[3] = _barInfoList[i]._dataPtr->getTimes()[t + 1];
 			y[0] = 0.;
 			y[1] = 1.;
 			y[2] = 1.;
@@ -276,76 +285,87 @@ void StatusBarDecorator::draw(PanelPlotOutput* pplot_, Axis* axis_,
  
 			double paramValue = _barInfoList[i]._dataPtr->getValues(_barInfoList[i]._index)[t];
  
-			if (isNAN(paramValue)) {
+			if (isNAN(paramValue))
+			{
 				continue;
 			}
 			if ((paramInfo != nullptr) && !paramInfo->getStatusDef().empty())
 			{
-				for (int s = 0 ; s < (int)paramInfo->getStatusDef().size(); ++s)
+				for (int s = 0; s < (int)paramInfo->getStatusDef().size(); ++s)
 				{
 					if ((paramValue >= paramInfo->getStatusDef()[s].getMinValue()) &&
 						(paramValue <= paramInfo->getStatusDef()[s].getMaxValue()))
 					{
 						std::string colorStr = paramInfo->getStatusDef()[s].getColor();
-						if (!colorStr.empty()) {
-							Color dataValueColor;
-							createColor(dataValueColor, colorStr);
-							restoreColor(pls_, dataValueColor, pplot_->_panel->_page->_mode);
+						if (_barInfoList[i]._color.isSet()) // we use the color set by the user
+						{
+							restoreColor(pls_, _barInfoList[i]._color, pplot_->_panel->_page->_mode);
+							pls_->fill(4, x, y);
+							pls_->spal1(ColormapManager::getInstance().getColorAxis(_colorMapIndex).c_str(), true);
+						}
+						else if (!colorStr.empty()) // if the color is not set by the user we take the StatusDef
+						{
+							Color color;
+
+							createColor(color, colorStr);
+							restoreColor(pls_, color, pplot_->_panel->_page->_mode);
 							pls_->fill(4, x, y);
 							pls_->spal1(ColormapManager::getInstance().getColorAxis(_colorMapIndex).c_str(), true);
 						}
-						else {
+						else // if none of them is given, we set the colorMapIndex color
+						{
 							Color dataValueColor(_colorMapIndex, s);
 							restoreColor(pls_, dataValueColor, pplot_->_panel->_page->_mode);
 							pls_->fill(4, x, y);
 							pls_->spal1(ColormapManager::getInstance().getColorAxis(_colorMapIndex).c_str(), true);
 						}
-						break;
 					}
 				}
 			}
 		}
  
-		//restore to initial color context
+		// restore to initial color context
 		pls_->spal1(
-				ColormapManager::getInstance().get(pplot_->_panel->_page->_mode,
-				ColormapManager::DEFAULT_COLORMAP_1).c_str(), true);
+			ColormapManager::getInstance().get(pplot_->_panel->_page->_mode,
+											   ColormapManager::DEFAULT_COLORMAP_1)
+				.c_str(),
+			true);
 		pls_->scol0(0, lInitialColor._red, lInitialColor._green, lInitialColor._blue);
 		// Restore color.
 		restoreColor(pls_, lInitialColor, pplot_->_panel->_page->_mode);
  
-		//draw bar box
+		// draw bar box
 		pls_->box("bc", 0, 0, "bc", 0, 0);
  
-		//draw legend
+		// draw legend
 		PlPlotUtil::setPlFont(legendFont);
 		std::string legendText = _barInfoList[i]._name;
 		legendText += ": ";
-		//plot parameter name
-		pls_->mtex("t",1,0,0,legendText.c_str());
+		// plot parameter name
+		pls_->mtex("t", 1, 0, 0, legendText.c_str());
  
-		PLFLT xmin2,xmax2,ymin2,ymax2;
-		pls_->gspa(xmin2,xmax2,ymin2,ymax2);
+		PLFLT xmin2, xmax2, ymin2, ymax2;
+		pls_->gspa(xmin2, xmax2, ymin2, ymax2);
  
-		double textFactor = (xmax2-xmin2) * vpBounds._width ;
+		double textFactor = (xmax2 - xmin2) * vpBounds._width;
  
 		double legendPos = plstrl(legendText.c_str()) / textFactor;
 		std::string separator = ", ";
-		//plot each status name with the associated color
+		// plot each status name with the associated color
 		for (int p = 0; p < (int)legend.size(); ++p)
 		{
 			Color initColor = changeColor(pls_, legend[p].first, pplot_->_panel->_page->_mode);
-			pls_->mtex("t",1,legendPos,0,legend[p].second.c_str());
+			pls_->mtex("t", 1, legendPos, 0, legend[p].second.c_str());
 			legendPos += plstrl(legend[p].second.c_str()) / textFactor;
 			restoreColor(pls_, initColor, pplot_->_panel->_page->_mode);
 			if (p != (int)legend.size() - 1)
 			{
-				pls_->mtex("t",1,legendPos,0,separator.c_str());
+				pls_->mtex("t", 1, legendPos, 0, separator.c_str());
 				legendPos += plstrl(separator.c_str()) / textFactor;
 			}
 		}
  
-		delta += (BAR_HEIGHT+BAR_SPACE+1.5*legendCharSize.second);
+		delta += (BAR_HEIGHT + BAR_SPACE + 1.5 * legendCharSize.second);
 	}
  
 	// restore viewport.
@@ -401,6 +421,7 @@ void StatusBarDecorator::buildBarList() {
 				barInfo._index = index;
 				barInfo._dataPtr = &(*_pParameterValues)[lSeriesProperties.getParamId()];
 				barInfo._paramInfoSPtr = paramInfo;
+				barInfo._color = lSeriesProperties.getColor();
 				_barInfoList.push_back(barInfo);
 			}
 		}
@@ -44,6 +44,7 @@ public:
 	void setColorMapIndex( int colorMapIndex_){
 		_colorMapIndex = colorMapIndex_;
 	}
+
 	int getColorMapIndex() const{
 		return _colorMapIndex;
 	}
@@ -101,6 +102,11 @@ private:
 		 * @brief pointer to the parameter info
 		 */
 		ParamInfoSPtr _paramInfoSPtr;
+
+		/*
+		 * @brief Given color
+		 */
+		Color _color;
 	};
  
 	/**
@@ -146,8 +152,7 @@ private:
 	/**
 	 * @brief Plot that owns parameter values.
 	 */
-	PanelPlotOutput* _decoratorPlot;
-
+	PanelPlotOutput *_decoratorPlot;
 };
  
 /**
@@ -1819,7 +1819,7 @@ namespace plot
 				continue;
 			}
  
-			crtColor = getStatusColor(paramInfo, crtVal);
+			crtColor = pIntervals.getColor();
  
 			drawOneInterval(tmin, tmax, crtColor);
  
@@ -1832,7 +1832,7 @@ namespace plot
 		//Draw last interval if need
 		if ((tmin != tmax) && !isNAN(crtVal))
 		{
-			crtColor = getStatusColor(paramInfo, crtVal);
+			crtColor = pIntervals.getColor();
 			drawOneInterval(tmin, tmax, crtColor);
 		}
 	}