Simplify tickplot drawing

Benjamin Renard · Benjamin Renard
1 parent 0f321c54
Showing 1 changed file with 6 additions and 22 deletions Show diff stats
src/ParamOutputImpl/Plot/TickPlot/TickMarkDecorator.cc
@@ -270,21 +270,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,23 +291,11 @@ 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<<"]");
@@ -318,14 +303,13 @@ void TickMarkDecorator::draw(PanelPlotOutput* pplot_, Axis* 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);
+				vpBounds._y - yDelta * dir, vpBounds._y + vpBounds._height - yDelta * dir);
 		// 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);
  
 		yDelta = yDelta + yInc;
-
 	}
  
 	// restore viewport.