Commit 9eb08cf7a838794b7b7ebc306be6c2c9d98d76f1
1 parent
0fa2d990
Exists in
master
and in
49 other branches
Some minor fixes
Showing
2 changed files
with
26 additions
and
6 deletions
Show diff stats
src/ParamOutputImpl/Plot/IntervalsNode.hh
| @@ -84,8 +84,22 @@ public: | @@ -84,8 +84,22 @@ public: | ||
| 84 | try | 84 | try |
| 85 | { | 85 | { |
| 86 | std::string strValue((const char *)value); | 86 | std::string strValue((const char *)value); |
| 87 | - if (strValue == "POS_RIGHT" || strValue == "POS_LEFT" || strValue == "POS_TOP" || strValue == "POS_BOTTOM") | ||
| 88 | - intervalsPropsPtr->setPosition(strValue); | 87 | + if (strValue == "right") |
| 88 | + { | ||
| 89 | + intervalsPropsPtr->setPosition("POS_RIGHT"); | ||
| 90 | + } | ||
| 91 | + else if (strValue == "left") | ||
| 92 | + { | ||
| 93 | + intervalsPropsPtr->setPosition("POS_RIGHT"); | ||
| 94 | + } | ||
| 95 | + else if (strValue == "top") | ||
| 96 | + { | ||
| 97 | + intervalsPropsPtr->setPosition("POS_TOP"); | ||
| 98 | + } | ||
| 99 | + else if (strValue == "bottom") | ||
| 100 | + { | ||
| 101 | + intervalsPropsPtr->setPosition("POS_BOTTOM"); | ||
| 102 | + } | ||
| 89 | else | 103 | else |
| 90 | intervalsPropsPtr->setPosition("POS_RIGHT"); | 104 | intervalsPropsPtr->setPosition("POS_RIGHT"); |
| 91 | } | 105 | } |
| @@ -95,6 +109,10 @@ public: | @@ -95,6 +109,10 @@ public: | ||
| 95 | } | 109 | } |
| 96 | xmlFree(value); | 110 | xmlFree(value); |
| 97 | } | 111 | } |
| 112 | + else | ||
| 113 | + { | ||
| 114 | + intervalsPropsPtr->setPosition("POS_RIGHT"); | ||
| 115 | + } | ||
| 98 | // -- text | 116 | // -- text |
| 99 | value = xmlGetProp(pNode_, (const xmlChar *)"text"); | 117 | value = xmlGetProp(pNode_, (const xmlChar *)"text"); |
| 100 | if (value) | 118 | if (value) |
| @@ -104,7 +122,7 @@ public: | @@ -104,7 +122,7 @@ public: | ||
| 104 | xmlFree(value); | 122 | xmlFree(value); |
| 105 | } | 123 | } |
| 106 | // -- font name | 124 | // -- font name |
| 107 | - Font labelFont("sans-serif", 12); | 125 | + Font labelFont("sans-serif", 10); |
| 108 | value = xmlGetProp(pNode_, (const xmlChar *)"fontName"); | 126 | value = xmlGetProp(pNode_, (const xmlChar *)"fontName"); |
| 109 | if (value) | 127 | if (value) |
| 110 | { | 128 | { |
src/ParamOutputImpl/Plot/IntervalsProperties.hh
| @@ -30,16 +30,18 @@ namespace plot { | @@ -30,16 +30,18 @@ namespace plot { | ||
| 30 | */ | 30 | */ |
| 31 | void dump(std::ostream &out_, std::string &prefix_); | 31 | void dump(std::ostream &out_, std::string &prefix_); |
| 32 | 32 | ||
| 33 | - IntervalsProperties() : DrawingProperties(), _paramId(""), _indexDef(""), _font("sans-serif", 12) | 33 | + IntervalsProperties() : DrawingProperties(), _paramId(""), _indexDef(""), _font("sans-serif", 10), _position("POS_RIGHT") |
| 34 | { | 34 | { |
| 35 | } | 35 | } |
| 36 | 36 | ||
| 37 | - IntervalsProperties(const DrawingProperties &ref_) : DrawingProperties(ref_), _paramId(""), _indexDef(""), _font("sans-serif", 12) | 37 | + IntervalsProperties(const DrawingProperties &ref_) : DrawingProperties(ref_), _paramId(""), _indexDef(""), _font("sans-serif", 10), |
| 38 | + _position("POS_RIGHT") | ||
| 38 | { | 39 | { |
| 39 | } | 40 | } |
| 40 | 41 | ||
| 41 | IntervalsProperties(const IntervalsProperties &pParamDrawingProperties_) : DrawingProperties(pParamDrawingProperties_), _paramId(""), | 42 | IntervalsProperties(const IntervalsProperties &pParamDrawingProperties_) : DrawingProperties(pParamDrawingProperties_), _paramId(""), |
| 42 | - _indexDef(pParamDrawingProperties_._indexDef), _font("sans-serif", 12) | 43 | + _indexDef(pParamDrawingProperties_._indexDef), _font("sans-serif", 10), |
| 44 | + _position("POS_RIGHT") | ||
| 43 | { | 45 | { |
| 44 | } | 46 | } |
| 45 | 47 |