Draw intervals in a status bar

Benjamin Renard
1 parent 677db865
Showing 5 changed files with 75 additions and 55 deletions Show diff stats
src/ParamOutputImpl/Plot/InstantPlot/InstantPlot.cc
src/ParamOutputImpl/Plot/PanelPlotOutput.cc
src/ParamOutputImpl/Plot/PanelPlotOutput.hh
src/ParamOutputImpl/Plot/StatusPlot/StatusBarDecorator.cc
src/ParamOutputImpl/Plot/Time/TimePlot.cc
@@ -1113,6 +1113,7 @@ void InstantPlot::drawSpectro(double startDate, double stopDate, std::string pPa
 				part.y[1] = log10(part.y[1]);
 			}
  
+			part.isColorIndex = false;
 			if (_iSpectroProperties->getDimOnXAxis() == 0) {
 				part.value = data.getInterpolatedValue(_time, AMDA::Common::ParameterIndexComponent(i,j));
 			}
@@ -1389,7 +1389,6 @@ void PanelPlotOutput::drawRectangle(double xmin, double xmax, double ymin, doubl
         a = alpha;
         _pls->scol0a( icol, r, g, b, a );
         _pls->col0( icol );
-            
         _pls->fill(4, x, y);
  
 	// Restore color.
@@ -1400,7 +1399,7 @@ void PanelPlotOutput::drawRectangle(double xmin, double xmax, double ymin, doubl
  * @brief Draw a matrix
  */
 void PanelPlotOutput::drawMatrix(MatrixGrid& matrixGrid, double minDataVal, double maxDataVal,
-		Color minValColor, Color maxValColor, int colorMapIndex, bool dataValueIsColorIndex, bool useLog0AsMin)
+		Color minValColor, Color maxValColor, int colorMapIndex, bool useLog0AsMin)
 {
 	//set color map
 	_pls->spal1(
@@ -1428,7 +1427,7 @@ void PanelPlotOutput::drawMatrix(MatrixGrid&amp; matrixGrid, double minDataVal, doub
 		if (isNAN(part.value))
 			continue;
  
-		if (!dataValueIsColorIndex)
+		if (!part.isColorIndex)
 		{
 			if (!getColoredValue(part.value, minDataVal, maxDataVal, useLog0AsMin, col))
 				continue;
@@ -264,6 +264,7 @@ public:
 		double x[2];
 		double y[2];
 		double value;
+		double isColorIndex;
 	};
  
 	typedef std::vector<GridPart> MatrixGrid;
@@ -272,7 +273,7 @@ public:
 	 * @brief Draw a matrix
 	 */
 	void drawMatrix(MatrixGrid& matrixGrid, double minDataVal, double maxDataVal,
-			Color minValColor, Color maxValColor, int colorMapIndex, bool dataValueIsColorIndex = false, bool useLog0AsMin = false);
+			Color minValColor, Color maxValColor, int colorMapIndex, bool useLog0AsMin = false);
  
 	/**
 	 * @brief Reset cursor used to attribute automatically a color to a serie
@@ -281,6 +282,11 @@ public:
 		_automaticSerieColorCursor = 0;
 	}
  
+	/**
+ 	 * Draw a rectangle
+	 */
+	void drawRectangle(double xmin, double xmax, double ymin, double ymax, Color& pColor, double alpha = 1.);
+
 	AMDA::Parameters::ParameterManager& _parameterManager;
  
 	std::map<std::string, ParameterData> *_pParameterValues;
@@ -325,11 +331,6 @@ protected:
 			int pNbData, double* pXData, double* pYData,
 			double* pZData = NULL, double filterZMin = -DBL_MAX, double filterZMax = DBL_MAX);
  
-        /**
-         * Draw a rectangle
-         */
-        void drawRectangle(double xmin, double xmax, double ymin, double ymax, Color& pColor, double alpha = 1.);
-        
 	/**
 	 * Draw errors segments
 	 */
@@ -25,6 +25,7 @@
 #include "ColormapManager.hh"
 #include "ParamMgr.hh"
 #include "PlPlotUtil.hh"
+#include "CommonNode.hh"
  
 #define BAR_HEIGHT 0.02
 #define BAR_SPACE  0.005
@@ -235,66 +236,85 @@ void StatusBarDecorator::draw(PanelPlotOutput* pplot_, Axis* axis_,
 		ParamInfoSPtr paramInfo = _barInfoList[i]._paramInfoSPtr;
  
 		//Working list of pair used to build the legend
-		std::vector<std::pair<int,std::string>> legend;
+		std::vector<std::pair<Color,std::string>> legend;
  
 		//legend configuration
 		if ((paramInfo != nullptr) && !paramInfo->getStatusDef().empty())
 		{
 			for (int s = 0 ; s < (int)paramInfo->getStatusDef().size(); ++s)
 			{
-				legend.push_back(std::make_pair(s,paramInfo->getStatusDef()[s].getName()));
+				std::string colorStr = paramInfo->getStatusDef()[s].getColor();
+				Color color;
+				if (!colorStr.empty()) {
+					createColor(color, colorStr);
+				}
+				else {
+					color = Color(_colorMapIndex, s);
+				}
+				legend.push_back(std::make_pair(color,paramInfo->getStatusDef()[s].getName()));
 			}
 		}
  
+
+		//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
-		PanelPlotOutput::MatrixGrid matrixGrid;
+		PLFLT x[4], y[4];
 		for (int t = 0; t < _barInfoList[i]._dataPtr->getSize() - 1;++t)
 		{
-			PanelPlotOutput::GridPart part;
-			part.x[0] = _barInfoList[i]._dataPtr->getTimes()[t];
-			part.x[1] = _barInfoList[i]._dataPtr->getTimes()[t+1];
-			part.y[0] = 0;
-			part.y[1] = 1;
+			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];
+			y[0] = 0.;
+			y[1] = 1.;
+			y[2] = 1.;
+			y[3] = 0.;
  
 			double paramValue = _barInfoList[i]._dataPtr->getValues(_barInfoList[i]._index)[t];
  
-			if (isNAN(paramValue))
-				part.value = NAN;
-			else
+			if (isNAN(paramValue)) {
+				continue;
+			}
+			if ((paramInfo != nullptr) && !paramInfo->getStatusDef().empty())
 			{
-				if ((paramInfo != nullptr) && !paramInfo->getStatusDef().empty())
+				for (int s = 0 ; s < (int)paramInfo->getStatusDef().size(); ++s)
 				{
-					bool valid = false;
-					for (int s = 0 ; s < (int)paramInfo->getStatusDef().size(); ++s)
+					if ((paramValue >= paramInfo->getStatusDef()[s].getMinValue()) &&
+						(paramValue <= paramInfo->getStatusDef()[s].getMaxValue()))
 					{
-						if ((paramValue >= paramInfo->getStatusDef()[s].getMinValue()) &&
-							(paramValue <= paramInfo->getStatusDef()[s].getMaxValue()))
-						{
-							valid = true;
-							part.value = s;
-							break;
+						std::string colorStr = paramInfo->getStatusDef()[s].getColor();
+						if (!colorStr.empty()) {
+							Color dataValueColor;
+							createColor(dataValueColor, colorStr);
+							restoreColor(pls_, dataValueColor, pplot_->_panel->_page->_mode);
+							pls_->fill(4, x, y);
+							pls_->spal1(ColormapManager::getInstance().getColorAxis(_colorMapIndex).c_str(), true);
+						}
+						else {
+							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;
 					}
-
-					if (!valid)
-						part.value = NAN;
 				}
-				else
-					//status definition is given by the paramInfo
-					part.value = NAN;
 			}
-
-			matrixGrid.push_back(part);
 		}
  
-		Color minValColor;
-		Color maxValColor;
-
-		//draw spectro
-		pplot_->drawMatrix(matrixGrid,
-				_barInfoList[i]._dataPtr->getMin(),
-				_barInfoList[i]._dataPtr->getMin(),
-				minValColor, maxValColor, _colorMapIndex, true);
+		//restore to initial color context
+		pls_->spal1(
+				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
 		pls_->box("bc", 0, 0, "bc", 0, 0);
@@ -306,18 +326,17 @@ void StatusBarDecorator::draw(PanelPlotOutput* pplot_, Axis* axis_,
 		//plot parameter name
 		pls_->mtex("t",1,0,0,legendText.c_str());
  
-		PLFLT xmin,xmax,ymin,ymax;
-		pls_->gspa(xmin,xmax,ymin,ymax);
+		PLFLT xmin2,xmax2,ymin2,ymax2;
+		pls_->gspa(xmin2,xmax2,ymin2,ymax2);
  
-		double textFactor = (xmax-xmin) * 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
 		for (int p = 0; p < (int)legend.size(); ++p)
 		{
-			Color partColor(_colorMapIndex, (int)legend[p].first);
-			Color initColor = changeColor(pls_, partColor, pplot_->_panel->_page->_mode);
+			Color initColor = changeColor(pls_, legend[p].first, pplot_->_panel->_page->_mode);
 			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);
@@ -942,7 +942,7 @@ void TimePlot::drawSpectro(double startDate, double stopDate, std::string pParam
 			{
 				part.x[0] = data.getTimes()[startIndex+i];
 				part.x[1] = data.getTimes()[startIndex+i+1];
-
+				part.isColorIndex = false;
 				part.value = data.getValues(index, startIndex)[i];
 				matrixGrid.push_back(part);
 			}
@@ -978,6 +978,7 @@ void TimePlot::drawSpectro(double startDate, double stopDate, std::string pParam
  
 			for (auto index : pSpectro.getIndexes())
 			{
+				part.isColorIndex = false;
 				part.value = data.getValues(index,startIndex)[i];
  
 				if (pSpectro.getRelatedDim() == 0)
@@ -1013,7 +1014,7 @@ void TimePlot::drawSpectro(double startDate, double stopDate, std::string pParam
 	//draw spectro
 	LOG4CXX_DEBUG(gLogger, "TimePlot::drawSpectro - Draw data grid");
 	drawMatrix(matrixGrid, pSpectro.getMin(), pSpectro.getMax(),
-			minValColor, maxValColor, lZAxis->_color._colorMapIndex, FALSE, pSpectro.getUseLog0AsMin());
+			minValColor, maxValColor, lZAxis->_color._colorMapIndex, pSpectro.getUseLog0AsMin());
 }
  
 Color TimePlot::getStatusColor(AMDA::Info::ParamInfoSPtr& paramInfo, double value) {
@@ -1105,12 +1106,11 @@ void TimePlot::drawIntervals(double startDate, double stopDate, std::string pPar
             tmin = t1;
             tmax = t2;
             crtVal = v;
+            crtColor = Color();
         }
  
         //Draw last interval if need
-        if (!isNAN(crtVal)) {
-            drawOneInterval(tmin, tmax, crtColor);
-        }
+        drawOneInterval(tmin, tmax, crtColor);
 }
  
 /**