CDPP / AMDA_Kernel

Commit 11754f0124984ee892faa9baaa2bd4258c42373f

Authored by Benjamin Renard
1 parent 3ab32f47
Exists in master and in 98 other branches 10038, 10098, 5390, 5770, 6728, 7616, 7811, 7875, 8034_7628, 8038, 8041, 8045_8044, 8295, 8459, 8528, 8928, 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, SolarOrbiter, SpeasyGet, akka-centos7, akka-scatter-multi-xparams, amdadev, amdadev_test, centos7, cu2022, das2, density_maps, develop, evol-5638, evol-6371, evol_9042, expression-parser-bre, feature/9259, frames-transformation, pickle, rm_5639, rm_5776, rm_6015, rm_6595, rm_6599, rm_6616, rm_6616_bis, rm_6912, rm_7926, rm_8050, rm_8932, shue, shue97, sum-components-indexes, test-merge, tickplot, ubuntu

Fix axis range for an instant plot

Showing 1 changed file with 16 additions and 8 deletions   Show diff stats
Inline Side-by-side
src/ParamOutputImpl/Plot/InstantPlot/InstantPlot.cc
  Diff comments   View file @11754f0
@@ -761,13 +761,17 @@ void InstantPlot::configureTableAxis (boost::shared_ptr<Axis> axisSPtr, bool isS @@ -761,13 +761,17 @@ void InstantPlot::configureTableAxis (boost::shared_ptr<Axis> axisSPtr, bool isS
761 761
762 if (isSpectro) 762 if (isSpectro)
763 { 763 {
764 - lAxisRange.setMin(std::min(crtBound.min,lAxisRange.getMin()));  
765 - lAxisRange.setMax(std::max(crtBound.max,lAxisRange.getMax())); 764 + if (!isNAN(crtBound.min))
  765 + lAxisRange.setMin(std::min(crtBound.min,lAxisRange.getMin()));
  766 + if (!isNAN(crtBound.max))
  767 + lAxisRange.setMax(std::max(crtBound.max,lAxisRange.getMax()));
766 } 768 }
767 else 769 else
768 { 770 {
769 - lAxisRange.setMin(std::min((crtBound.min+ crtBound.max) / 2.0,lAxisRange.getMin()));  
770 - lAxisRange.setMax(std::max((crtBound.min+ crtBound.max) / 2.0,lAxisRange.getMax())); 771 + if (!isNAN(crtBound.min) && !isNAN(crtBound.max))
  772 + lAxisRange.setMin(std::min((crtBound.min+ crtBound.max) / 2.0,lAxisRange.getMin()));
  773 + if (!isNAN(crtBound.min) && !isNAN(crtBound.max))
  774 + lAxisRange.setMax(std::max((crtBound.min+ crtBound.max) / 2.0,lAxisRange.getMax()));
771 } 775 }
772 } 776 }
773 } 777 }
@@ -810,13 +814,17 @@ void InstantPlot::configureTableAxis (boost::shared_ptr<Axis> axisSPtr, bool isS @@ -810,13 +814,17 @@ void InstantPlot::configureTableAxis (boost::shared_ptr<Axis> axisSPtr, bool isS
810 crtBound = tableSPtr->getBound(&_parameterManager, i, &paramsTableData); 814 crtBound = tableSPtr->getBound(&_parameterManager, i, &paramsTableData);
811 if (isSpectro) 815 if (isSpectro)
812 { 816 {
813 - lAxisRange.setMin(std::min(crtBound.min,lAxisRange.getMin()));  
814 - lAxisRange.setMax(std::max(crtBound.max,lAxisRange.getMax())); 817 + if (!isNAN(crtBound.min))
  818 + lAxisRange.setMin(std::min(crtBound.min,lAxisRange.getMin()));
  819 + if (!isNAN(crtBound.max))
  820 + lAxisRange.setMax(std::max(crtBound.max,lAxisRange.getMax()));
815 } 821 }
816 else 822 else
817 { 823 {
818 - lAxisRange.setMin(std::min((crtBound.min+ crtBound.max) / 2.0,lAxisRange.getMin()));  
819 - lAxisRange.setMax(std::max((crtBound.min+ crtBound.max) / 2.0,lAxisRange.getMax())); 824 + if (!isNAN(crtBound.min) && !isNAN(crtBound.max))
  825 + lAxisRange.setMin(std::min((crtBound.min+ crtBound.max) / 2.0,lAxisRange.getMin()));
  826 + if (!isNAN(crtBound.min) && !isNAN(crtBound.max))
  827 + lAxisRange.setMax(std::max((crtBound.min+ crtBound.max) / 2.0,lAxisRange.getMax()));
820 } 828 }
821 } 829 }
822 } 830 }