First step for rework of tickplot legend

Benjamin Renard
1 parent 0f321c54
Showing 2 changed files with 74 additions and 115 deletions Show diff stats
src/ParamOutputImpl/Plot/TickPlot/TickMarkDecorator.cc
src/ParamOutputImpl/Plot/TickPlot/TickMarkDecorator.hh
@@ -212,27 +212,6 @@ void TickMarkDecorator::draw(PanelPlotOutput* pplot_, Axis* axis_,
 	// draw a virtual axis for each entry // take into account plot orientation
 	TimeAxis* pAxis = (TimeAxis*) axis_;
  
-	// Get plot area viewport.
-	Bounds vpBounds;
-	PLFLT lXMin, lXMax, lYMin, lYMax;
-	pls_->gvpd(lXMin, lXMax, lYMin, lYMax);
-	vpBounds._x = lXMin;
-	vpBounds._y = lYMin;
-	vpBounds._width = lXMax - lXMin;
-	vpBounds._height = lYMax - lYMin;
-
-	// get windows
-	Bounds winBounds;
-	PLFLT xwmin, xwmax, ywmin, ywmax;
-	pls_->gvpw(xwmin, xwmax, ywmin, ywmax);
-	winBounds._x = xwmin;
-	winBounds._y = ywmin;
-	winBounds._width = xwmax - xwmin;
-	winBounds._height = ywmax - ywmin;
-
-	LOG4CXX_DEBUG(_logger, " viewport :"<<vpBounds.toString());
-	LOG4CXX_DEBUG(_logger, " window :"<<winBounds.toString());
-
 	// tick configuration for this axis :
 	double xtick = getMajorTickSpace(pAxis, pAxis->getRange().getMin(),
 			pAxis->getRange().getMax());
@@ -270,21 +249,18 @@ void TickMarkDecorator::draw(PanelPlotOutput* pplot_, Axis* axis_,
 	PlPlotUtil::setPlFont(legendFont);
 	CharSize legendCharSize = PlPlotUtil::getCharacterSizeInPlPage(pplot_->_panel->_page);
  
-	// delta is negative when axis is at bottom (which is the default case). positive otherwise.
-	// (viewport origin is in the left bottom corner of the page).
-	double yDelta = -legendCharSize.second * 2;
+	double yInc = legendCharSize.second * 1.2;
  
 	std::string options = "";
 	int start;
 	int end;
 	int dir;
+	double yDelta = 0;
  
 	PlPlotUtil::setPlFont(legendFont);
  
 	if (pAxis->_position == PlotCommon::POS_TOP) {
 		options = "mxo"; // options means : m=display above axe, x=do not plot ticks, o=user label function provided.
-		yDelta = -yDelta; // if axis is displayed on top of graph we have to use an inverse translation delta.
-		// reverse direction :
 		start = _seriesInfoList.size() - 1;
 		end = -1;
 		dir = -1;
@@ -294,51 +270,52 @@ void TickMarkDecorator::draw(PanelPlotOutput* pplot_, Axis* axis_,
 		end = _seriesInfoList.size();
 		dir = 1;
 	}
-	LOG4CXX_DEBUG(_logger, " viewport translation:"<<yDelta);
-	LOG4CXX_DEBUG(_logger, " virtual axis options:"<<options);
  
-	// store initial delta, as it is also the increment to add to delta at each new serie (see below).
-	double yInc = yDelta;
+	yDelta = yInc * dir;
  
-	// at this point, we change viewport to be able to plot each virtual axis
-	// (only labels are plotted)...
-
-	// We need to take into account tick length.
-	if (pAxis->_tick._position == Tick::TickPosition::OUTWARDS) {
-		// set room for tick, tickmarks (graduation) and extra space between tickmarks (graduation) and data time.
-		yDelta = getVerticalTickLength(pAxis, panelCharSize.second) +  yDelta + (0.5 * yInc);
-	} else {
-		// for the first serie, we add an extra space (half of yInc) to add a sepration with time labels
-		yDelta = yDelta + (0.5 * yInc);
-	}
+	LOG4CXX_DEBUG(_logger, " viewport translation:"<<yDelta);
+	LOG4CXX_DEBUG(_logger, " virtual axis options:"<<options);
  
 	for (int i = start; i != end; i += dir) {
 		LOG4CXX_TRACE(_logger, " virtual axis ["<<i<<"]");
 		// install label generator specific for that virtual axis
 		pls_->slabelfunc(generateYLabel, _seriesInfoList[i].get());
-		// translate viewport :
-		pls_->vpor(vpBounds._x, vpBounds._x + vpBounds._width,
-				vpBounds._y + yDelta, vpBounds._y + vpBounds._height + yDelta);
-		// sets windows for new viewport :
-		pls_->wind(winBounds._x, winBounds._x + winBounds._width, winBounds._y,
-				winBounds._y + winBounds._height);
-		pls_->box(options.c_str(), xtick, nxsub, "", 0, 0);
-
+		// draw virtual axis
+		drawVirtualAxis(yDelta * dir, yInc, _seriesInfoList[i]->_name.c_str(), xtick, nxsub, options.c_str(), pls_);
+		// increment offset
 		yDelta = yDelta + yInc;
-
 	}
  
-	// restore viewport.
-	pls_->vpor(vpBounds._x, vpBounds._x + vpBounds._width, vpBounds._y,
-			vpBounds._y + vpBounds._height);
-
-	// restore window
-	pls_->wind(winBounds._x, winBounds._x + winBounds._width, winBounds._y,
-			winBounds._y + winBounds._height);
-
 	// Restore initial color.
 	restoreColor(pls_, lInitialColor, pplot_->_panel->_page->_mode);
+}
+
+void TickMarkDecorator::drawVirtualAxis(double offset, double height, const char* legend, double xtick, int nxsub, const char* options, std::shared_ptr<plstream> pls_) {
+	// Get plot area viewport
+	PLFLT lXMin, lXMax, lYMin, lYMax;
+	pls_->gvpd(lXMin, lXMax, lYMin, lYMax);
  
+	// Get window
+	PLFLT xwmin, xwmax, ywmin, ywmax;
+	pls_->gvpw(xwmin, xwmax, ywmin, ywmax);
+
+	// translate viewport :
+	pls_->vpor(lXMin, lXMax, lYMin - offset, lYMin - offset + height);
+
+	// sets windows for new viewport :
+	pls_->wind(xwmin, xwmax, 0, 1);
+
+	// draw virtual axis
+	pls_->box(options, xtick, nxsub, "", 0, 0);
+
+	// draw legend
+	pls_->mtex("lv", 3, -1, 1, legend);
+
+	// restore viewport
+	pls_->vpor(lXMin, lXMax, lYMin, lYMax);
+
+	// restore window
+	pls_->wind(xwmin, xwmax, ywmin, ywmax);
 }
  
 void TickMarkDecorator::installLabelGenerator(PanelPlotOutput* /*pplot_*/, TimeAxis* timeAxis_) {
@@ -432,39 +409,28 @@ void generateYLabel(PLINT axis, PLFLT value, char *label, PLINT length,
 			return;
 		}
 		SeriesInfo* pInfo = static_cast<SeriesInfo*> (data);
-		// if value equals min, display _name string
-		// otherwise, format value and display it
-		if (pInfo->_isFirstLabel) {
-			// do not display min value label
-			// but display title :
-			snprintf(label, length, "%*s", pInfo->_maxLen,
-					pInfo->_name.c_str());
-			pInfo->_isFirstLabel = false;
-		} else {
-			// display formatted value
-			std::ostringstream labels;
-
-			//get nearest value
-			double crtTime = (double) value;
-
-			int crtIndex = pInfo->_parameterData->indexOf(crtTime);
-
-			if (crtIndex == -1 && (crtTime - (pInfo->_parameterData->getTimes()[pInfo->_parameterData->getSize()-1]) < pInfo->_parameterData->getParamGapSize()))
-				//Fix last value
-				crtIndex = pInfo->_parameterData->getSize()-1;
-			else if ((crtTime - (pInfo->_parameterData->getTimes()[crtIndex])) > pInfo->_parameterData->getParamGapSize())
-				//Be sure that we are not in a data gap
-				crtIndex = -1;
-
-			if (crtIndex == -1) {
-				labels << "NaN" << std::endl;
-			}
-			else {
-				labels << boost::format(pInfo->_valuesFormat) % (*pInfo->_parameterData->getValues(pInfo->_indexComponents, crtIndex));
-			}
+		// display formatted value
+		std::ostringstream labels;
  
-			snprintf(label, length, "%s", labels.str().c_str());
+		//get nearest value
+		double crtTime = (double) value;
+
+		int crtIndex = pInfo->_parameterData->indexOf(crtTime);
+
+		if (crtIndex == -1 && (crtTime - (pInfo->_parameterData->getTimes()[pInfo->_parameterData->getSize()-1]) < pInfo->_parameterData->getParamGapSize()))
+			//Fix last value
+			crtIndex = pInfo->_parameterData->getSize()-1;
+		else if ((crtTime - (pInfo->_parameterData->getTimes()[crtIndex])) > pInfo->_parameterData->getParamGapSize())
+			//Be sure that we are not in a data gap
+			crtIndex = -1;
+
+		if (crtIndex == -1) {
+			labels << "NaN" << std::endl;
+		}
+		else {
+			labels << boost::format(pInfo->_valuesFormat) % (*pInfo->_parameterData->getValues(pInfo->_indexComponents, crtIndex));
 		}
+			snprintf(label, length, "%s", labels.str().c_str());
 	}
 }
  
@@ -481,35 +447,23 @@ void generateOrbitTimeLabel(PLINT axis, PLFLT value, char *label, PLINT length,
 			return;
 		}
 		TimeInfo* pInfo = static_cast<TimeInfo*> (data);
-		// get time format and min value
-		// if value equals min, display an empty string
-		// otherwise, format time and display formatted time
-
-		if (pInfo->_isFirstLabel) {
-			// do not display min value label
-			// but display title :
-			snprintf(label, length, "%*s", pInfo->_maxLen,
-					pInfo->_timeTitle.c_str());
-			pInfo->_isFirstLabel = false;
-
-		} else {
-			// display formatted time
-			std::string timeFormatstr = pInfo->_timeFormat.c_str();
-			char *timeFormat = new char[timeFormatstr.length() + 1];
-			strcpy(timeFormat, timeFormatstr.c_str());
-
-			if (TimePlot::qsasconfig == NULL) {
-				configqsas(1. / 86400., 0., 0., 0x0, 1, 1970, 0, 1, 0, 0, 0.,
-						&TimePlot::qsasconfig);
-			}
-			char formattedTime[40];
  
-			strfqsas(formattedTime, 40, timeFormat, (double) value,
-					TimePlot::qsasconfig);
-			delete[] timeFormat;
+		// display formatted time
+		std::string timeFormatstr = pInfo->_timeFormat.c_str();
+		char *timeFormat = new char[timeFormatstr.length() + 1];
+		strcpy(timeFormat, timeFormatstr.c_str());
  
-			snprintf(label, length, "%s", formattedTime);
+		if (TimePlot::qsasconfig == NULL) {
+			configqsas(1. / 86400., 0., 0., 0x0, 1, 1970, 0, 1, 0, 0, 0.,
+					&TimePlot::qsasconfig);
 		}
+		char formattedTime[40];
+
+		strfqsas(formattedTime, 40, timeFormat, (double) value,
+					TimePlot::qsasconfig);
+		delete[] timeFormat;
+
+		snprintf(label, length, "%s", formattedTime);
 	}
 }
  
@@ -127,6 +127,11 @@ protected:
 private:
  
 	/**
+	 * @brief Draw virtual axis
+	 */
+	void drawVirtualAxis(double offset, double height, const char* legend, double xtick, int nxsub, const char* options, std::shared_ptr<plstream> pls_);
+
+	/**
 	 * @brief Calculates plot area for date display
 	 */
 	double computeStartDateWidth(PanelPlotOutput* pplot_, TimeAxis* pAxis_);