diff --git a/ApplicationLibCode/Commands/RicHistogramPlotTools.cpp b/ApplicationLibCode/Commands/RicHistogramPlotTools.cpp index 68757fbb7f..e82a6af01c 100644 --- a/ApplicationLibCode/Commands/RicHistogramPlotTools.cpp +++ b/ApplicationLibCode/Commands/RicHistogramPlotTools.cpp @@ -37,6 +37,8 @@ #include "RiuPlotMainWindow.h" #include "RiuPlotMainWindowTools.h" +#include + namespace caf { template <> @@ -226,7 +228,20 @@ void RicHistogramPlotTools::addHistogramCurveToPlot( RimHistogramPlot* plot, Rim plot->addCurveNoUpdate( curve ); - if ( resolveRefs ) curve->resolveReferencesRecursively(); + if ( resolveRefs ) + { + // Resolve references and re-run initAfterRead(), which for a copied curve was called before the references were resolved + curve->initAfterInsert(); + + // The binning mode of a copied curve is unchanged, so no signal sets up the axis scale of the destination plot. + // Keep the axis scale if other curves already use the axis. + const auto plotCurves = plot->histogramCurves(); + const bool isAxisInUse = std::any_of( plotCurves.begin(), + plotCurves.end(), + [curve]( RimHistogramCurve* other ) + { return other != curve && other->axisX() == curve->axisX(); } ); + if ( !isAxisInUse ) curve->updateAxisScaleFromBinningMode(); + } plot->loadDataAndUpdate(); plot->updateConnectedEditors(); diff --git a/ApplicationLibCode/ProjectDataModel/Histogram/RimHistogramCurve.cpp b/ApplicationLibCode/ProjectDataModel/Histogram/RimHistogramCurve.cpp index 4946a4a947..abe4b94c52 100644 --- a/ApplicationLibCode/ProjectDataModel/Histogram/RimHistogramCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/Histogram/RimHistogramCurve.cpp @@ -620,6 +620,22 @@ void RimHistogramCurve::onZoomAllRequested( const caf::SignalEmitter* emitter ) /// linear axis for linear binning. The user stays in control of the axis setting afterwards. //-------------------------------------------------------------------------------------------------- void RimHistogramCurve::onBinningModeChanged( const caf::SignalEmitter* emitter, RigHistogramCalculator::BinningMode binningMode ) +{ + applyAxisScaleForBinningMode( binningMode ); +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimHistogramCurve::updateAxisScaleFromBinningMode() +{ + if ( auto source = dataSource() ) applyAxisScaleForBinningMode( source->binningMode() ); +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimHistogramCurve::applyAxisScaleForBinningMode( RigHistogramCalculator::BinningMode binningMode ) { auto plot = firstAncestorOrThisOfType(); if ( !plot ) return; diff --git a/ApplicationLibCode/ProjectDataModel/Histogram/RimHistogramCurve.h b/ApplicationLibCode/ProjectDataModel/Histogram/RimHistogramCurve.h index 9e6c4cf20b..13fbd9c1a6 100644 --- a/ApplicationLibCode/ProjectDataModel/Histogram/RimHistogramCurve.h +++ b/ApplicationLibCode/ProjectDataModel/Histogram/RimHistogramCurve.h @@ -68,6 +68,8 @@ public: RimHistogramDataSource* dataSource() const; + void updateAxisScaleFromBinningMode(); + protected: // RimPlotCurve overrides QString createCurveAutoName() override; @@ -90,6 +92,7 @@ protected: void onCumulativeChanged( const caf::SignalEmitter* emitter ); void onZoomAllRequested( const caf::SignalEmitter* emitter ); void onBinningModeChanged( const caf::SignalEmitter* emitter, RigHistogramCalculator::BinningMode binningMode ); + void applyAxisScaleForBinningMode( RigHistogramCalculator::BinningMode binningMode ); void updateCumulativeCurve(); void connectReferencedDataSourceSignals(); diff --git a/ApplicationLibCode/ProjectDataModel/Histogram/RimHistogramDataSource.h b/ApplicationLibCode/ProjectDataModel/Histogram/RimHistogramDataSource.h index eeaccaa8d3..ca29c65f10 100644 --- a/ApplicationLibCode/ProjectDataModel/Histogram/RimHistogramDataSource.h +++ b/ApplicationLibCode/ProjectDataModel/Histogram/RimHistogramDataSource.h @@ -82,8 +82,9 @@ public: virtual bool showCumulativeCurve() const; virtual void setShowCumulativeCurve( bool showCumulativeCurve ); - void setBinningMode( RigHistogramCalculator::BinningMode binningMode ); - void resetBinRange(); + void setBinningMode( RigHistogramCalculator::BinningMode binningMode ); + RigHistogramCalculator::BinningMode binningMode() const; + void resetBinRange(); virtual std::optional> dataRange() const; @@ -127,7 +128,6 @@ protected: std::pair binRange( double dataMin, double dataMax, double smallestPositiveValue ) const; - RigHistogramCalculator::BinningMode binningMode() const; RigHistogramCalculator::OutOfRangeHandling outOfRangeHandling() const; bool useUserDefinedBinRange() const;