OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix zoom for stacked well log curves and support dataChanged()

Browse Source
This commit is contained in:
Gaute Lindkvist 2020-07-01 08:51:48 +02:00
parent 48a9fa01bb
commit 82a96a1866
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ApplicationCode/ProjectDataModel/RimWellLogTrack.cpp
View File

@ -465,7 +465,6 @@ void RimWellLogTrack::calculateYZoomRange()
//--------------------------------------------------------------------------------------------------
void RimWellLogTrack::updateXZoom()
{
const double eps = 1.0e-8;
if ( !m_plotWidget ) return;
calculateXZoomRange();
@ -475,12 +474,10 @@ void RimWellLogTrack::updateXZoom()
m_visibleXRangeMin = m_availableXRangeMin;
m_visibleXRangeMax = m_availableXRangeMax;
// Consider auto zooming to full range [0..1] range
if ( -eps < m_visibleXRangeMin && m_visibleXRangeMin < 0.25 && 0.75 < m_visibleXRangeMax &&
m_visibleXRangeMax < 1.0 + eps && !m_isLogarithmicScaleEnabled )
// Set min limit to 0.0 for stacked curves
if ( m_stackCurves && !m_isLogarithmicScaleEnabled )
{
m_visibleXRangeMin = 0.0;
m_visibleXRangeMax = 1.0;
}
computeAndSetXRangeMinForLogarithmicScale();
updateEditors();
@ -732,12 +729,22 @@ void RimWellLogTrack::fieldChangedByUi( const caf::PdmFieldHandle* changedField,
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellLogTrack::curveDataChanged( const caf::SignalEmitter* emitter )
{
if ( m_stackCurves )
{
updateStackedCurveData();
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellLogTrack::curveVisibilityChanged( const caf::SignalEmitter* emitter, bool visible )
{
qDebug() << "Curve turned " << ( visible ? "on" : "off" );
if ( m_stackCurves )
{
updateStackedCurveData();
@ -2017,6 +2024,7 @@ std::vector<std::pair<double, double>> RimWellLogTrack::waterAndRockRegions( Ria
//--------------------------------------------------------------------------------------------------
void RimWellLogTrack::connectCurveSignals( RimWellLogCurve* curve )
{
curve->dataChanged.connect( this, &RimWellLogTrack::curveDataChanged );
curve->visibilityChanged.connect( this, &RimWellLogTrack::curveVisibilityChanged );
curve->appearanceChanged.connect( this, &RimWellLogTrack::curveAppearanceChanged );
}
@ -2026,6 +2034,7 @@ void RimWellLogTrack::connectCurveSignals( RimWellLogCurve* curve )
//--------------------------------------------------------------------------------------------------
void RimWellLogTrack::disconnectCurveSignals( RimWellLogCurve* curve )
{
curve->dataChanged.disconnect( this );
curve->visibilityChanged.disconnect( this );
curve->appearanceChanged.disconnect( this );
}

1
ApplicationCode/ProjectDataModel/RimWellLogTrack.h
View File

@ -250,6 +250,7 @@ private:
void doRemoveFromCollection() override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
void curveDataChanged( const caf::SignalEmitter* emitter );
void curveVisibilityChanged( const caf::SignalEmitter* emitter, bool visible );
void curveAppearanceChanged( const caf::SignalEmitter* emitter );