Draw border around empty panel

Fix another bug with page margin definition

Draw border around empty panel
Fix another bug with page margin definition
Benjamin Renard
1 parent 08ec1dde
Showing 7 changed files with 72 additions and 14 deletions Show diff stats
src/ParamOutputImpl/Plot/CommonNode.cc
src/ParamOutputImpl/Plot/Page.cc
src/ParamOutputImpl/Plot/Page.hh
src/ParamOutputImpl/Plot/Panel.cc
src/ParamOutputImpl/Plot/Panel.hh
src/ParamOutputImpl/Plot/PanelPlotOutput.cc
src/ParamOutputImpl/Plot/Time/TimePlot.cc
@@ -21,14 +21,14 @@ void MarginNode::proceed(xmlNodePtr pNode,
 	// -- horizontal margin
 	value = xmlGetProp(pNode, (const xmlChar *) "x");
 	if (value) {
-		element->_xMargin = atof((const char*) value);
+		element->_xLoadedMargin = atof((const char*) value);
 		xmlFree(value);
 	}
  
 	// -- vertical margin
 	value = xmlGetProp(pNode, (const xmlChar *) "y");
 	if (value) {
-		element->_yMargin = atof((const char*) value);
+		element->_yLoadedMargin = atof((const char*) value);
 		xmlFree(value);
 	}
 }
@@ -36,6 +36,8 @@ Page::Page() :
 		_format(),
 		_xMargin(-1),
 		_yMargin(-1),
+		_xLoadedMargin(-1),
+		_yLoadedMargin(-1),
 		_orientation(PlotCommon::Orientation::LANDSCAPE),
 		_mode(PlotCommon::Mode::COLOR),
 		_dimension(PlotCommon::Dimension::ISO_A4),
@@ -72,6 +74,8 @@ Page::Page(DefaultPlotConfiguration&amp; defaults) :
 		_format(defaults._defaultPage._format),
 		_xMargin(-1),
 		_yMargin(-1),
+		_xLoadedMargin(-1),
+		_yLoadedMargin(-1),
 		_orientation(defaults._defaultPage._orientation),
 		_mode(defaults._defaultPage._mode),
 		_dimension(defaults._defaultPage._dimension),
@@ -107,6 +111,8 @@ Page::Page(const Page&amp; page) :
 		_format(page._format),
 		_xMargin(-1),
 		_yMargin(-1),
+		_xLoadedMargin(-1),
+		_yLoadedMargin(-1),
 		_orientation(page._orientation),
 		_mode(page._mode),
 		_dimension(page._dimension),
@@ -315,14 +321,17 @@ void Page::writeCopywrite(std::shared_ptr&lt;plstream&gt;&amp; pls) {
  
 void Page::initPageParameters(std::shared_ptr<plstream>& pls) {
 	// get default margin if not set
-	if (_xMargin == -1)
-		calculateRelativeXMargin(_orientation, _dimension, DefaultPlotConfiguration::getInstance()._defaultPage._xMargin);
+	if (_xLoadedMargin == -1)
+		calculateRelativeXMargin(_orientation, _dimension, DefaultPlotConfiguration::getInstance()._defaultPage._xLoadedMargin);
 	else
-		calculateRelativeXMargin(_orientation, _dimension, _xMargin);
-	if (_yMargin == -1)
-		calculateRelativeYMargin(_orientation, _dimension, DefaultPlotConfiguration::getInstance()._defaultPage._yMargin);
+		calculateRelativeXMargin(_orientation, _dimension, _xLoadedMargin);
+
+	if (_yLoadedMargin == -1)
+		calculateRelativeYMargin(_orientation, _dimension, DefaultPlotConfiguration::getInstance()._defaultPage._yLoadedMargin);
 	else
-		calculateRelativeYMargin(_orientation, _dimension, _yMargin);
+		calculateRelativeYMargin(_orientation, _dimension, _yLoadedMargin);
+
+
  
 	// set page size according to page format A4 or letter
 	// offset not seams to work
@@ -387,6 +396,7 @@ void Page::calculateRelativeYMargin(PlotCommon::Orientation&amp; orientation,
 			ylengthInMm = Page::A4_X_LENGTH_IN_MM;
 		}
 	}
+
 	_yMargin = yMarginInMm / ylengthInMm;
 }
  
@@ -103,6 +103,16 @@ public:
 	float _yMargin;
  
 	/**
+	 * Page horizontal loaded margin
+	 */
+	float _xLoadedMargin;
+
+	/**
+	 * Page vertical loaded margin
+	 */
+	float _yLoadedMargin;
+
+	/**
 	 * Page orientation : landscape, portrait
 	 */
 	PlotCommon::Orientation _orientation;
@@ -212,6 +212,37 @@ void Panel::fillBackground(std::shared_ptr&lt;plstream&gt;&amp; pls,
 	}
 }
  
+void Panel::drawEmptyPanel(std::shared_ptr<plstream>& pls)
+{
+	Bounds lBounds = getCoordinateInPlPage(pls.get(), _bounds, _page);
+
+	// Specify viewport for the panel
+	pls->vpor(lBounds._x, lBounds._x + lBounds._width,
+			  lBounds._y, lBounds._y + lBounds._height);
+
+	// Set window size.
+	pls->wind(0, 1, 0, 1);
+
+
+	pls->col0(0);
+
+	//Draw panel border
+	PLFLT xBorder[5] = {0,0,1,1,0};
+	PLFLT yBorder[5] = {0,1,1,0,0};
+
+	pls->lsty(static_cast<int>(getPlLineStyle(LineStyle::LONG_SPACED_DOT)));
+	pls->width(1);
+	pls->line(5,xBorder,yBorder);
+
+	//Draw text
+	pls->schr(getPlFontDef(_font), getPlFontScaleFactor(_font));
+	pls->ptex (0.5, 0.5, 0.5, 0, 0.5, std::string("Empty panel").c_str());
+
+	// Set window size.
+	pls->wind(lBounds._x, lBounds._x + lBounds._width,
+			  lBounds._y, lBounds._y + lBounds._height);
+}
+
 Bounds Panel::getCoordinateInPlPage(plstream* pls, const Bounds& pBounds, Page* pPage) {
 	Bounds lBounds;
  
@@ -235,6 +235,8 @@ public:
  
 	float getTitlePositionUnits (void);
  
+	void drawEmptyPanel(std::shared_ptr<plstream>& pls);
+
 private:
  
 	void fillBackground(std::shared_ptr<plstream>& pls, Bounds& pBounds) const;
@@ -143,6 +143,13 @@ void PanelPlotOutput::calculatePlotArea(Bounds&amp; bounds_) {
 	CharSize lCharSizePanelTitle(getCharacterSize(lFontFactorPanelTitle));
 	double panelTitleCharHeight 	= lCharSizePanelTitle.second;
  
+	//Init
+	_plotAreaSideSet[PlotCommon::Position::POS_TOP] = false;
+	_plotAreaSideSet[PlotCommon::Position::POS_BOTTOM] = false;
+	_plotAreaSideSet[PlotCommon::Position::POS_RIGHT] = false;
+	_plotAreaSideSet[PlotCommon::Position::POS_LEFT] = false;
+	_plotAreaSideSet[PlotCommon::Position::POS_CENTER] = false;
+
 	// Set space between panel title and graduation number.
 	if (_panel->_title._text.empty() == false) {
 		LabelRowInfo splittedLegend = Label::getRowNumber(_panel->_title);
@@ -179,7 +186,7 @@ void PanelPlotOutput::calculatePlotArea(Bounds&amp; bounds_) {
 	{
 		//Add X and Y axis to the working list
 		boost::shared_ptr<Axis> lAxis = it->second;
-		if (lAxis->_isZAxis)
+		if ((lAxis == nullptr) || (lAxis->_isZAxis))
 			continue;
 		workingAxesList.push_back(std::pair<std::string,boost::shared_ptr<Axis>>(it->first,lAxis));
 	}
@@ -187,7 +194,7 @@ void PanelPlotOutput::calculatePlotArea(Bounds&amp; bounds_) {
 	{
 		//Add Z axis to the working list
 		boost::shared_ptr<Axis> lAxis = it->second;
-		if (!lAxis->_isZAxis)
+		if ((lAxis == nullptr) || (!lAxis->_isZAxis))
 			continue;
 		workingAxesList.push_back(std::pair<std::string,boost::shared_ptr<Axis>>(it->first,lAxis));
 	}
@@ -2270,9 +2277,7 @@ void PanelPlotOutput::draw(double startTime, double stopTime, int intervalIndex,
 	_panel->draw(_pls);
  
 	if (_parameterAxesList.empty())
-	{
-		_pls->mtex("b", -1., 1, 1, std::string("Empty panel").c_str());
-	}
+		_panel->drawEmptyPanel(_pls);
  
 	if (isFirstInterval)
 		_panel->_paramsLegendProperties.reset();
@@ -92,7 +92,7 @@ void TimePlot::draw(double startTime, double stopTime, int intervalIndex,
 	PanelPlotOutput::draw(startTime,stopTime,intervalIndex,isFirstInterval,isLastInterval);
  
 	// Draw start date
-	if (!_startDateDrawn && getTimeAxis()->_used)
+	if (!_startDateDrawn /*&& getTimeAxis()->_used*/)
 		drawStartDate (getTimeAxis(), startTime,stopTime);
 	_startDateDrawn = true;
 }