CDPP / AMDA_Kernel

Commit e7b3586a31e330bea1233f598767856b1b4a5f87

Authored by Benjamin Renard
1 parent 035ba49b
Exists in master and in 96 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-scatter-multi-xparams, amdadev, amdadev_test, 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 fill between a serie and a constant with a log axis (fix #6294)

Showing 2 changed files with 13 additions and 4 deletions   Show diff stats
Inline Side-by-side
src/ParamOutputImpl/Plot/Time/TimePlot.cc
  Diff comments   View file @e7b3586
... ... @@ -418,7 +418,7 @@ double TimePlot::convertXAxisValue(const std::string &value) {
418 418 return DD_Time2Double (value.c_str());
419 419 }
420 420  
421   -ConstantLine * TimePlot::getConstantLineFromId (int serieId, int constantId) {
  421 +ConstantLine * TimePlot::getConstantLineFromId (int serieId, int constantId, boost::shared_ptr<Axis>& yAxis) {
422 422  
423 423 SeriesProperties serieProperties;
424 424 for (auto parameter : _parameterAxesList) {
... ... @@ -427,7 +427,7 @@ ConstantLine * TimePlot::getConstantLineFromId (int serieId, int constantId) {
427 427 serieProperties = parameter.getYSeriePropertiesAt(lIndex);
428 428  
429 429 if ((serieProperties.getId() == serieId) &&(serieProperties.hasYAxis() == true)) {
430   - boost::shared_ptr<Axis> yAxis(_panel->getAxis(serieProperties.getYAxisId()));
  430 + yAxis = _panel->getAxis(serieProperties.getYAxisId());
431 431 for (auto constantLine : yAxis->_constantLines) {
432 432 if (constantLine->getId() == constantId) {
433 433 return constantLine.get();
... ... @@ -674,7 +674,11 @@ void TimePlot::drawFills(double startDate, double stopDate) {
674 674 }
675 675  
676 676 // Retrieve constantLine informations for these fill
677   - ConstantLine *constantLine = getConstantLineFromId ( fillSerieConstant->getSerieId(), fillSerieConstant->getConstantId());
  677 + boost::shared_ptr<Axis> yAxis;
  678 + ConstantLine *constantLine = getConstantLineFromId ( fillSerieConstant->getSerieId(), fillSerieConstant->getConstantId(), yAxis);
  679 +
  680 + // Retrieve axis attachment
  681 +
678 682  
679 683 // Build values2 values2Time array with 2 values : yConst & (first time, last time) for serie
680 684 values2 = new double [2];
... ... @@ -683,6 +687,11 @@ void TimePlot::drawFills(double startDate, double stopDate) {
683 687 values2 [0] = convertYAxisValue (constantLine->getValue());
684 688 values2 [1] = convertYAxisValue (constantLine->getValue());
685 689  
  690 + if (yAxis->_scale == Axis::Scale::LOGARITHMIC) {
  691 + values2[0] = log10 (values2[0]);
  692 + values2[1] = log10 (values2[1]);
  693 + }
  694 +
686 695 values2Time [0] = values1Time [0];
687 696 values2Time [1] = values1Time [values1Nb-1];
688 697  
... ...
src/ParamOutputImpl/Plot/Time/TimePlot.hh
  Diff comments   View file @e7b3586
... ... @@ -152,7 +152,7 @@ private:
152 152 /**
153 153 * @brief Retrieve ConstantLine informations for a given serieId and constantId.
154 154 */
155   - ConstantLine * getConstantLineFromId (int serieId, int constantId);
  155 + ConstantLine * getConstantLineFromId (int serieId, int constantId, boost::shared_ptr<Axis>& yAxis);
156 156  
157 157 /**
158 158 * @brief Retrieve serie properties by serie Id.
... ...