CDPP / AMDA_Kernel

Commit cf664d1b651b8286a8c3956967cbc1d21e038c2d

Authored by Hacene SI HADJ MOHAND
1 parent 23e6e720
Exists in master and in 69 other branches 10038, 10098, 5390, 5770, 7616, 7875, 8459, 8528, 9016, 9016Bis, 9017, 9017-new, 9049, 9084, 9259, 9326, 9347, 9383, 9719, 9719.new, AllLegends, CDF_ISTP, CDF_ISTP_HOPEFULLY_ALL_WORKING, FER_10400, FER_10412, FER_10663, FER_10765, FER_11000, FER_11100, FER_11242, FER_11277, FER_11500, FER_11537, FER_11588, FER_11651, FER_19836, FER_5344, FER_6031, FER_6598, FER_6966, FER_7318, FER_7618, FER_7857, FER_8455, FER_9629, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, JUNO_JEDI, MAZ_10936, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, SpeasyGet, amdadev, amdadev_test, cu2022, das2, density_maps, develop, evol_9042, feature/9259, pickle, rm_6912, rm_8932, test-merge, ubuntu

resolving 9201

Showing 2 changed files with 16 additions and 5 deletions   Show diff stats
Inline Side-by-side
src/ParamOutputImpl/Plot/Axis.hh
  Diff comments   View file @cf664d1
... ... @@ -57,6 +57,16 @@ public:
57 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 71 void setRange(Range const& pRange) {
62 72 _range = pRange;
... ...
src/ParamOutputImpl/Plot/Time/TimePlot.cc
  Diff comments   View file @cf664d1
... ... @@ -136,9 +136,10 @@ void TimePlot::configureSeriesAxis() {
136 136 }
137 137  
138 138 lYAxis->_used = true;
139   - Range lRange(lYAxis->getRange());
  139 + Range lYAxisRequestRange = lYAxis->Axis::getRequestedRange();
  140 + Range lRange = lYAxis->Axis::getRange();
140 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 143 Range lEstimatedRange(lAxisRange[lYAxis->_id]);
143 144 for (auto index : lSeriesProperties.getIndexList(_pParameterValues)) {
144 145 Range lParamIndexRange(
... ... @@ -182,7 +183,6 @@ void TimePlot::configureSeriesAxis() {
182 183  
183 184  
184 185 lAxisRange[lYAxis->_id] = lEstimatedRange;
185   - // la
186 186 }
187 187  
188 188 // Set ZAxis range if a color param is defined for this serie
... ... @@ -285,9 +285,10 @@ void TimePlot::configureSpectroAxis() {
285 285  
286 286  
287 287 //set Y axis range
288   - Range lYAxisRange = lYAxis->Axis::getRange();
  288 + Range lYAxisRequestRange = lYAxis->Axis::getRequestedRange();
  289 + Range lYAxisRange = lYAxis->Axis::getRange();
289 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 293 boost::shared_ptr<AMDA::Info::ParamTable> tableSPtr;
293 294 if (paramInfo != nullptr)
... ...