Fix bug with panel title color

Benjamin Renard
1 parent 8499fbdd
Showing 5 changed files with 18 additions and 6 deletions Show diff stats
config/DataBaseParameters/xsd/request/plot.xsd
config/DataBaseParameters/xsd/request/xyPlot.xsd
src/ParamOutputImpl/Plot/Panel.cc
src/ParamOutputImpl/Plot/Time/TimePlot.cc
src/ParamOutputImpl/Plot/TimeAxis.hh
@@ -100,7 +100,7 @@
         	<xs:documentation>Parameter identifier</xs:documentation>
         </xs:annotation>
         <xs:sequence>
-            <xs:element name="param" minOccurs="1" maxOccurs="unbounded">
+            <xs:element name="param" minOccurs="0" maxOccurs="unbounded">
                 <xs:complexType>
                 	<xs:sequence>
                 		<xs:element name="default"
@@ -14,7 +14,7 @@
         	    <xs:documentation>Parameter serie definition</xs:documentation>
               </xs:annotation>
               <xs:sequence>
-			    <xs:element name="param" minOccurs="1" maxOccurs="unbounded">
+			    <xs:element name="param" minOccurs="0" maxOccurs="unbounded">
                   <xs:complexType>
                 	<xs:sequence>
                 		<xs:element name="default"
@@ -121,8 +121,16 @@ void Panel::draw(std::shared_ptr&lt;plstream&gt;&amp; pls) {
  
 	// write title with dedicated position and align
 	pls->col0(0);
-	pls->sfont(getPlFontFamily(_title._font), getPlFontStyle(_title._style), getPlFontWeight(_title._style));
-	pls->schr(getPlFontDef(_title._font), getPlFontScaleFactor(_title._font));
+
+	Color lInitialColor = changeColor(pls, _title._color, _page->_mode);
+
+	pls->sfont(getPlFontFamily(_title._font.isSet() ? _title._font : _font),
+				   (_title._font.isSet() ? getPlFontStyle(_title._style) : _font._style),
+				   (_title._font.isSet() ? getPlFontWeight(_title._style) : _font._weight));
+	if (_title._font.isSet())
+		pls->schr(getPlFontDef(_title._font), getPlFontScaleFactor(_title._font));
+	else
+		pls->schr(getPlFontDef(_font), getPlFontScaleFactor(_font));
  
 	// Draw panel title depending on page title existence
  
@@ -141,6 +149,9 @@ void Panel::draw(std::shared_ptr&lt;plstream&gt;&amp; pls) {
 		lRowDisp -= (1 + LINE_SPACE_TITLE);
 	}
  
+	// Restore initial color.
+	restoreColor(pls, lInitialColor, _page->_mode);
+
 	_drawn = true;
 }
  
@@ -1102,8 +1102,7 @@ const std::string TimePlot::getXAxisId() const {
 			return param.getSpectroProperties()->getXAxisId();
 	}
  
-	//not found, TODO see if we should raise an exception...
-	return "";
+	return DefaultPlotConfiguration::TIME_DEFAULT_ID;
 }
  
  
@@ -117,6 +117,8 @@ inline std::ostream&amp; operator &lt;&lt;(std::ostream&amp; out, const TimeAxis&amp; axis) {
 	out << axis._id << ".axis.timeFormat=" << axis._timeFormat << std::endl;
 	out << axis._id << ".axis.showLegend=" << axis._showLegend << std::endl;
 	out << axis._id << ".axis.showTickMark=" << axis._showTickMark << std::endl;
+	out << axis._id << ".axis.visible=" << std::boolalpha << axis._visible << std::endl;
+
 	return out;
 }