Commit c427842a07126d33bfa697aa8c00cb63435c4d94
1 parent
e5706944
Exists in
master
and in
28 other branches
Fix status bar color
Showing
2 changed files
with
4 additions
and
4 deletions
Show diff stats
src/ParamOutputImpl/Plot/Time/TimePlot.cc
... | ... | @@ -1759,9 +1759,9 @@ namespace plot |
1759 | 1759 | } |
1760 | 1760 | } |
1761 | 1761 | |
1762 | - Color TimePlot::getStatusColor(AMDA::Info::ParamInfoSPtr ¶mInfo, double value) | |
1762 | + Color TimePlot::getStatusColor(AMDA::Info::ParamInfoSPtr ¶mInfo, double value, Color defaultColor) | |
1763 | 1763 | { |
1764 | - Color color; | |
1764 | + Color color = defaultColor; | |
1765 | 1765 | |
1766 | 1766 | if ((paramInfo != nullptr) && !paramInfo->getStatusDef().empty()) |
1767 | 1767 | { |
... | ... | @@ -1852,7 +1852,7 @@ namespace plot |
1852 | 1852 | continue; |
1853 | 1853 | } |
1854 | 1854 | |
1855 | - crtColor = pIntervals.getColor(); | |
1855 | + crtColor = getStatusColor(paramInfo, crtVal, pIntervals.getColor()); | |
1856 | 1856 | |
1857 | 1857 | drawOneInterval(tmin, tmax, crtColor); |
1858 | 1858 | ... | ... |
src/ParamOutputImpl/Plot/Time/TimePlot.hh
... | ... | @@ -234,7 +234,7 @@ namespace plot |
234 | 234 | bool colorLessSpecified, Color &colorLess, |
235 | 235 | SeriesProperties &rSeriesProperties); |
236 | 236 | |
237 | - Color getStatusColor(AMDA::Info::ParamInfoSPtr ¶mInfo, double value); | |
237 | + Color getStatusColor(AMDA::Info::ParamInfoSPtr ¶mInfo, double value, Color defaultColor); | |
238 | 238 | |
239 | 239 | void drawOneInterval(double tmin, double tmax, Color color); |
240 | 240 | ... | ... |