Done

Erdogan Furkan
1 parent 128f2bdb
Showing 3 changed files with 32 additions and 4 deletions Show diff stats
src/ParamOutputImpl/Plot/InstantPlot/PlotFunction.cc
src/ParamOutputImpl/Plot/PanelPlotOutput.cc
src/ParamOutputImpl/Plot/PanelPlotOutput.hh
@@ -319,10 +319,6 @@ namespace plot
                     Label label(lYAxis->_legend.getFont(), compLegendColor);
                     label._text = unit;
                     lYAxis->_legend.pushLabel(label);
-                    Color white(255, 255, 255);
-                    Label emptyLabel(lYAxis->_legend.getFont(), white);
-                    emptyLabel._text = " ";
-                    lYAxis->_legend.pushLabel(emptyLabel);
                 }
             }
         }
@@ -536,6 +536,9 @@ namespace plot
 						lSavedColor = changeColor(_pls, line.second, _panel->_page->_mode);
 					}
 					_pls->mtex(getPlSide(pAxis->_position).c_str(), lPosition, 0.5, 0.5, lineToDraw.c_str());
+					// Adding more height if needed
+					addSpaceForExInd(lineToDraw, lPosition);
+
 					lPosition += (1 + PlPlotUtil::LINE_SPACE_TITLE);
 					if (line.second.isSet())
 					{
@@ -574,6 +577,9 @@ namespace plot
 						lSavedColor = changeColor(_pls, line.second, _panel->_page->_mode);
 					}
 					_pls->mtex(getPlSide(pAxis->_position).c_str(), lPosition, 0.5, 0.5, lineToDraw.c_str());
+					// Adding more height if needed
+					addSpaceForExInd(lineToDraw, lPosition);
+
 					lPosition += (1 + PlPlotUtil::LINE_SPACE_TITLE);
 					if (line.second.isSet())
 					{
@@ -613,6 +619,9 @@ namespace plot
 						lSavedColor = changeColor(_pls, line.second, _panel->_page->_mode);
 					}
 					_pls->mtex(getPlSide(pAxis->_position).c_str(), lPosition, 0.5, 0.5, lineToDraw.c_str());
+					// Adding more height if needed
+					addSpaceForExInd(lineToDraw, lPosition);
+
 					lPosition += (1 + PlPlotUtil::LINE_SPACE_TITLE);
 					if (line.second.isSet())
 					{
@@ -653,6 +662,9 @@ namespace plot
 						lSavedColor = changeColor(_pls, line.second, _panel->_page->_mode);
 					}
 					_pls->mtex(getPlSide(pAxis->_position).c_str(), lPosition, 0.5, 0.5, lineToDraw.c_str());
+					// Adding more height if needed
+					addSpaceForExInd(lineToDraw, lPosition);
+
 					lPosition += (1 + PlPlotUtil::LINE_SPACE_TITLE);
 					if (line.second.isSet())
 					{
@@ -681,6 +693,18 @@ namespace plot
 		}
 	}
+	void PanelPlotOutput::addSpaceForExInd(std::string &legend, double &lPosition){
+		if(legend != ""){
+
+			// We check if there is an exponent or an indice
+			const char *exponent = std::strstr(legend.c_str(), "#u");
+			const char *indice = std::strstr(legend.c_str(), "#d");
+
+			if(exponent || indice)
+				lPosition += 1;
+		}
+	}
+
 	void PanelPlotOutput::drawAxis(boost::shared_ptr<Axis> pAxis, TickConf &pTickConf,
 								   std::string pXAxisOptions, std::string pYAxisOptions)
 	{
@@ -427,6 +427,14 @@ protected:
 	virtual void drawLegends(boost::shared_ptr<Axis>& pAxis, PlWindow& pPlWindow, Bounds& pPlotAreaSize);
 	/**
+	 * @brief Add space if there is an exponent or indice
+	 * 
+	 * @param legend legend to check
+	 * @param lPosition position to modify
+	 */
+	void addSpaceForExInd(std::string &legend, double &lPosition);
+
+	/**
 	 * @brief Draw parameters legend.
 	 */
 	virtual void drawParamsLegend(void);