Plot area alignment with manual layout when two panels have the same left position

Benjamin Renard
1 parent cf0ebe91
Showing 3 changed files with 64 additions and 8 deletions Show diff stats
src/ParamOutputImpl/Plot/PanelPlotOutput.cc
src/ParamOutputImpl/Plot/PlotOutput.cc
src/ParamOutputImpl/Plot/PlotOutput.hh
@@ -2207,6 +2207,8 @@ int PanelPlotOutput::getLeftAxisTickMarkWidth (void) {
 void PanelPlotOutput::forceLeftAxisTickMarkWidth(int leftAxisTickMarkWidth) {
 	for (Axes::iterator it = _panel->_axes.begin(); it != _panel->_axes.end();	++it) {
 		boost::shared_ptr<Axis> lAxis = it->second;
+		if (lAxis == nullptr)
+			continue;
 		// Look for a visible fleft Axis with legend and
 		if ((lAxis->_visible) && (lAxis->_position == PlotCommon::Position::POS_LEFT)) {
 			lAxis->setFixedTickMarkWidth(leftAxisTickMarkWidth);
@@ -11,6 +11,7 @@
 #include "PlotLogger.hh"
 #include "LayoutAuto.hh"
 #include "LayoutVertical.hh"
+#include "TimePlotNode.hh"
  
 namespace plot {
  
@@ -366,10 +367,14 @@ void PlotOutput::computePanelBounds(void) {
 }
  
 void PlotOutput::computePanelPlotAreaBounds(void) {
-	// Nothing to plot -> nothing to compute !
-	// Nothing to compute if layout type is manual
-	if ((_plots.empty() == true) ||
-		(_page->_layoutProperties.getType() == LayoutType::MANUAL))	{
+	if ((_plots.empty() == true))	{
+		// Nothing to plot -> nothing to compute
+		return;
+	}
+
+	if (_page->_layoutProperties.getType() == LayoutType::MANUAL) {
+		//Specific treatment for manual layout
+		computePanelPlotAreaBoundsForManualLayout();
 		return;
 	}
  
@@ -399,11 +404,50 @@ void PlotOutput::computePanelPlotAreaBounds(void) {
 	}
 }
  
-void PlotOutput::computePanelLegendPosition(void) {
+void PlotOutput::computePanelPlotAreaBoundsForManualLayout(void) {
 	// Nothing to plot -> nothing to compute !
-	// Nothing to compute if layout type is manual
+	// Can be used only for a plot with manual layout
 	if ((_plots.empty() == true) ||
-		(_page->_layoutProperties.getType() == LayoutType::MANUAL))	{
+		(_page->_layoutProperties.getType() != LayoutType::MANUAL))	{
+		return;
+	}
+
+	LOG4CXX_DEBUG(gLogger,"PlotOutput::computePanelPlotAreaBoundsForManualLayout...");
+
+	//Regroup panels by left positions (only for timePlot)
+	std::map<double, std::vector<boost::shared_ptr<PanelPlotOutput>>> leftPanelsPosList;
+	for (auto plot : _plots) {
+		if (plot->typeName() != TIMEPLOT_NODENAME)
+			continue;
+		leftPanelsPosList[plot->_panel->_bounds._x].push_back(plot);
+	}
+
+	//Align plot area
+	Bounds plotAreaBounds;
+	for (auto leftPanelPos : leftPanelsPosList) {
+		double plotAreaLeftPos = 0;
+		double plotAreaRightPos = 1;
+		for (auto plot : leftPanelPos.second) {
+			plot->getPlotAreaBounds(plotAreaBounds);
+
+			if (plotAreaBounds._x > plotAreaLeftPos)
+				plotAreaLeftPos = plotAreaBounds._x;
+
+			if ((plotAreaBounds._x + plotAreaBounds._width) < plotAreaRightPos)
+				plotAreaRightPos = (plotAreaBounds._x + plotAreaBounds._width);
+
+		}
+
+		for (auto plot : leftPanelPos.second) {
+			plot->getPlotAreaBounds(plotAreaBounds);
+			plot->forcePlotAreaPosAndWidth(plotAreaLeftPos, plotAreaRightPos - plotAreaLeftPos);
+		}
+	}
+}
+
+void PlotOutput::computePanelLegendPosition(void) {
+	// Nothing to plot -> nothing to compute !
+	if ((_plots.empty() == true))	{
 		return;
 	}
  
@@ -414,6 +458,9 @@ void PlotOutput::computePanelLegendPosition(void) {
 	int maxLeftAxisTickMarkWitdh = 0;
 	int leftAxisTickMarkWitdh = 0;
 	for (auto plot : _plots) {
+		//if manual layout => only apply on timePlots
+		if ((_page->_layoutProperties.getType() == LayoutType::MANUAL) && (plot->typeName() != TIMEPLOT_NODENAME))
+			continue;
 		if (plot->getLayoutConstraint() == PanelConstraint::MaxWidth) {
 			leftAxisTickMarkWitdh = plot->getLeftAxisTickMarkWidth();
  
@@ -421,9 +468,11 @@ void PlotOutput::computePanelLegendPosition(void) {
 				maxLeftAxisTickMarkWitdh = leftAxisTickMarkWitdh;
 		}
 	}
-
 	// Force plot left axis tickmark max width for panels with MaxWidth constraint
 	for (auto plot : _plots) {
+		//if manual layout => only apply on timePlots
+		if ((_page->_layoutProperties.getType() == LayoutType::MANUAL) && (plot->typeName() != TIMEPLOT_NODENAME))
+			continue;
 		if (plot->getLayoutConstraint() == PanelConstraint::MaxWidth) {
 			plot->forceLeftAxisTickMarkWidth(maxLeftAxisTickMarkWitdh);
 		}
@@ -188,6 +188,11 @@ protected:
 	virtual void computePanelPlotAreaBounds (void);
  
 	/**
+	 * @brief Compute panel plot area position for manual layout
+	 */
+	virtual void computePanelPlotAreaBoundsForManualLayout(void);
+
+	/**
 	 * @brief Compute legend position depending on the panel constraints
 	 */
 	virtual void computePanelLegendPosition (void);