Improve tickplot draw

Benjamin Renard
1 parent 86a2f0f0
Showing 2 changed files with 54 additions and 52 deletions Show diff stats
src/ParamOutputImpl/Plot/TickPlot/TickMarkDecorator.cc
src/ParamOutputImpl/Plot/TickPlot/TickMarkDecorator.hh
@@ -274,64 +274,71 @@ void TickMarkDecorator::draw(PanelPlotOutput* pplot_, Axis* axis_,
 		yDelta = yInc;
 	}
  
-	LOG4CXX_DEBUG(_logger, " viewport translation:"<<yDelta);
-	LOG4CXX_DEBUG(_logger, " virtual axis options:"<<options);
-
+	bool isFirst = true;
 	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());
-		if (top) {
-			// draw virtual axis
-			drawVirtualAxis(top, yDelta * dir, yInc, _seriesInfoList[i]->_name.c_str(), xtick, nxsub, options.c_str(), pls_);
-			// increment offset
-			yDelta = yDelta + yInc;
-		}
-		if (!_seriesInfoList[i]->_description.empty()) {
-			// draw additionnal description
-			drawVirtualAxis(top, yDelta * dir, yInc, _seriesInfoList[i]->_description.c_str(), 0, 0, "", pls_);
-			// increment offset
-			yDelta = yDelta + yInc;
-		}
-		if (!top) {
-			// draw virtual axis
-			drawVirtualAxis(top, yDelta * dir, yInc, _seriesInfoList[i]->_name.c_str(), xtick, nxsub, options.c_str(), pls_);
-			// increment offset
-			yDelta = yDelta + yInc;
+		// 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);
+
+		double position = top ? lYMax : lYMin;
+
+		if (isFirst) {
+			//Draw time axis legend
+			if (top) {
+				pls_->vpor(lXMin, lXMax, position - yInc, position);
+			}
+			else {
+				pls_->vpor(lXMin, lXMax, position, position + yInc);
+			}
+			pls_->wind(xwmin, xwmax, 0, 1);
+			pls_->mtex("lv", 4, top ? 2 : -1, 1, _pTimeInfo->_timeTitle.c_str());
+			isFirst = false;
 		}
-	}
  
-	// Restore initial color.
-	restoreColor(pls_, lInitialColor, pplot_->_panel->_page->_mode);
-}
  
-void TickMarkDecorator::drawVirtualAxis(bool top, 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);
+		position -= yDelta * dir;
+
+		if (!_seriesInfoList[i]->_description.empty()) {
+			// Draw description
+			if (top) {
+				pls_->vpor(lXMin, lXMax, position + yInc, position + 2*yInc);
+			}
+			else {
+				pls_->vpor(lXMin, lXMax, position, position + yInc);
+				position -= yInc;
+			}
+			pls_->wind(xwmin, xwmax, 0, 1);
+			pls_->mtex("lv", 4, top ? 2 : -1, 1, _seriesInfoList[i]->_description.c_str());
+		}
  
-	// Get window
-	PLFLT xwmin, xwmax, ywmin, ywmax;
-	pls_->gvpw(xwmin, xwmax, ywmin, ywmax);
+		pls_->vpor(lXMin, lXMax, position, position + yInc);
+		pls_->wind(xwmin, xwmax, 0, 1);
+		
+		// install label generator specific for that virtual axis
+		pls_->slabelfunc(generateYLabel, _seriesInfoList[i].get());
  
-	// translate viewport :
-	double position = top ? lYMax : lYMin;
-	pls_->vpor(lXMin, lXMax, position - offset, position - offset + height);
+		// draw virtual axis
+		pls_->box(options.c_str(), xtick, nxsub, "", 0, 0);
  
-	// sets windows for new viewport :
-	pls_->wind(xwmin, xwmax, 0, 1);
+		// draw legend
+		pls_->mtex("lv", 4, top ? 2 : -1, 1, _seriesInfoList[i]->_name.c_str());
  
-	// draw virtual axis
-	pls_->box(options, xtick, nxsub, "", 0, 0);
+		// restore viewport
+		pls_->vpor(lXMin, lXMax, lYMin, lYMax);
  
-	// draw legend
-	pls_->mtex("lv", 3, top ? 2 : -1, 1, legend);
+		// restore window
+		pls_->wind(xwmin, xwmax, ywmin, ywmax);
  
-	// restore viewport
-	pls_->vpor(lXMin, lXMax, lYMin, lYMax);
+		// increment offset
+		yDelta = yDelta + (_seriesInfoList[i]->_description.empty() ? 1 : 2) * yInc;
+	}
  
-	// restore window
-	pls_->wind(xwmin, xwmax, ywmin, ywmax);
+	// Restore initial color.
+	restoreColor(pls_, lInitialColor, pplot_->_panel->_page->_mode);
 }
  
 void TickMarkDecorator::installLabelGenerator(PanelPlotOutput* /*pplot_*/, TimeAxis* timeAxis_) {
@@ -128,11 +128,6 @@ protected:
 private:
  
 	/**
-	 * @brief Draw virtual axis
-	 */
-	void drawVirtualAxis(bool top, 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_);