Commit cf664d1b651b8286a8c3956967cbc1d21e038c2d
1 parent
23e6e720
Exists in
master
and in
69 other branches
resolving 9201
Showing
2 changed files
with
16 additions
and
5 deletions
Show diff stats
src/ParamOutputImpl/Plot/Axis.hh
| @@ -57,6 +57,16 @@ public: | @@ -57,6 +57,16 @@ public: | ||
| 57 | return _range; | 57 | return _range; |
| 58 | } | 58 | } |
| 59 | } | 59 | } |
| 60 | + | ||
| 61 | + virtual Range getRequestedRange() { | ||
| 62 | + if (_reverse) { | ||
| 63 | + Range lRange(_requestedRange.getMax(), _requestedRange.getMin()); | ||
| 64 | + lRange._extend = _requestedRange._extend; | ||
| 65 | + return lRange; | ||
| 66 | + } else { | ||
| 67 | + return _requestedRange; | ||
| 68 | + } | ||
| 69 | + } | ||
| 60 | 70 | ||
| 61 | void setRange(Range const& pRange) { | 71 | void setRange(Range const& pRange) { |
| 62 | _range = pRange; | 72 | _range = pRange; |
src/ParamOutputImpl/Plot/Time/TimePlot.cc
| @@ -136,9 +136,10 @@ void TimePlot::configureSeriesAxis() { | @@ -136,9 +136,10 @@ void TimePlot::configureSeriesAxis() { | ||
| 136 | } | 136 | } |
| 137 | 137 | ||
| 138 | lYAxis->_used = true; | 138 | lYAxis->_used = true; |
| 139 | - Range lRange(lYAxis->getRange()); | 139 | + Range lYAxisRequestRange = lYAxis->Axis::getRequestedRange(); |
| 140 | + Range lRange = lYAxis->Axis::getRange(); | ||
| 140 | // If range status for this axis is set by the user do not update range "automatically". | 141 | // If range status for this axis is set by the user do not update range "automatically". |
| 141 | - if (isnan(lRange.getMin()) && isnan(lRange.getMax())) { | 142 | + if (isnan(lYAxisRequestRange.getMin()) && isnan(lYAxisRequestRange.getMax())) { |
| 142 | Range lEstimatedRange(lAxisRange[lYAxis->_id]); | 143 | Range lEstimatedRange(lAxisRange[lYAxis->_id]); |
| 143 | for (auto index : lSeriesProperties.getIndexList(_pParameterValues)) { | 144 | for (auto index : lSeriesProperties.getIndexList(_pParameterValues)) { |
| 144 | Range lParamIndexRange( | 145 | Range lParamIndexRange( |
| @@ -182,7 +183,6 @@ void TimePlot::configureSeriesAxis() { | @@ -182,7 +183,6 @@ void TimePlot::configureSeriesAxis() { | ||
| 182 | 183 | ||
| 183 | 184 | ||
| 184 | lAxisRange[lYAxis->_id] = lEstimatedRange; | 185 | lAxisRange[lYAxis->_id] = lEstimatedRange; |
| 185 | - // la | ||
| 186 | } | 186 | } |
| 187 | 187 | ||
| 188 | // Set ZAxis range if a color param is defined for this serie | 188 | // Set ZAxis range if a color param is defined for this serie |
| @@ -285,9 +285,10 @@ void TimePlot::configureSpectroAxis() { | @@ -285,9 +285,10 @@ void TimePlot::configureSpectroAxis() { | ||
| 285 | 285 | ||
| 286 | 286 | ||
| 287 | //set Y axis range | 287 | //set Y axis range |
| 288 | - Range lYAxisRange = lYAxis->Axis::getRange(); | 288 | + Range lYAxisRequestRange = lYAxis->Axis::getRequestedRange(); |
| 289 | + Range lYAxisRange = lYAxis->Axis::getRange(); | ||
| 289 | AMDA::Info::ParamInfoSPtr paramInfo = AMDA::Info::ParamMgr::getInstance()->getParamInfoFromId(p->getInfoId()); | 290 | AMDA::Info::ParamInfoSPtr paramInfo = AMDA::Info::ParamMgr::getInstance()->getParamInfoFromId(p->getInfoId()); |
| 290 | - if (isnan(lYAxisRange.getMin()) && isnan(lYAxisRange.getMax())) | 291 | + if (isnan(lYAxisRequestRange.getMin()) && isnan(lYAxisRequestRange.getMax())) |
| 291 | { | 292 | { |
| 292 | boost::shared_ptr<AMDA::Info::ParamTable> tableSPtr; | 293 | boost::shared_ptr<AMDA::Info::ParamTable> tableSPtr; |
| 293 | if (paramInfo != nullptr) | 294 | if (paramInfo != nullptr) |