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

Fixed (#583) and improved (#585) and (#592)

Browse Source 
Also a renamed typo allign -> align
This commit is contained in:
Jacob Støren 2015-10-28 10:06:35 +01:00
parent 0a45354bd9
commit 44463f3a41
5 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Commands/RicDeleteItemExec.cpp
View File

@ -121,7 +121,7 @@ void RicDeleteItemExec::redo()
parentObj->firstAnchestorOrThisOfType(wellLogPlotTrack); parentObj->firstAnchestorOrThisOfType(wellLogPlotTrack);
if (wellLogPlotTrack) if (wellLogPlotTrack)
{ {
wellLogPlotTrack->allignDepthZoomToPlotAndZoomAllX(); wellLogPlotTrack->alignDepthZoomToPlotAndZoomAllX();
} }
RimWellLogPlotCollection* wellLogPlotCollection = NULL; RimWellLogPlotCollection* wellLogPlotCollection = NULL;

7
ApplicationCode/Commands/WellLogCommands/RicWellLogPlotTrackFeatureImpl.cpp
View File

@ -46,8 +46,8 @@ void RicWellLogPlotTrackFeatureImpl::moveCurvesToWellLogPlotTrack(RimWellLogPlot
wellLogPlotTrack->insertCurve(curves[cIdx], cIdx); wellLogPlotTrack->insertCurve(curves[cIdx], cIdx);
} }
wellLogPlotTrack->loadDataAndUpdate();
wellLogPlotTrack->allignDepthZoomToPlotAndZoomAllX(); wellLogPlotTrack->alignDepthZoomToPlotAndZoomAllX();
wellLogPlotTrack->updateConnectedEditors(); wellLogPlotTrack->updateConnectedEditors();
} }
@ -59,7 +59,8 @@ void RicWellLogPlotTrackFeatureImpl::moveCurvesToWellLogPlotTrack(RimWellLogPlot
CVF_ASSERT(wellLogPlotTrack && insertAfterCurve); CVF_ASSERT(wellLogPlotTrack && insertAfterCurve);
wellLogPlotTrack->moveCurves(insertAfterCurve, curves); wellLogPlotTrack->moveCurves(insertAfterCurve, curves);
wellLogPlotTrack->allignDepthZoomToPlotAndZoomAllX(); wellLogPlotTrack->loadDataAndUpdate();
wellLogPlotTrack->alignDepthZoomToPlotAndZoomAllX();
wellLogPlotTrack->updateConnectedEditors(); wellLogPlotTrack->updateConnectedEditors();
} }

9
ApplicationCode/ProjectDataModel/RimWellLogPlotCurve.cpp
View File

@ -252,20 +252,15 @@ void RimWellLogPlotCurve::updateTrackAndPlotFromCurveData()
firstAnchestorOrThisOfType(wellLogPlot); firstAnchestorOrThisOfType(wellLogPlot);
if (wellLogPlot) if (wellLogPlot)
{ {
bool setDepthRange = !wellLogPlot->hasAvailableDepthRange();
wellLogPlot->calculateAvailableDepthRange(); wellLogPlot->calculateAvailableDepthRange();
wellLogPlot->zoomAllDepth();
if (setDepthRange)
{
wellLogPlot->zoomAllDepth();
}
} }
RimWellLogPlotTrack* plotTrack; RimWellLogPlotTrack* plotTrack;
firstAnchestorOrThisOfType(plotTrack); firstAnchestorOrThisOfType(plotTrack);
if (plotTrack) if (plotTrack)
{ {
plotTrack->allignDepthZoomToPlotAndZoomAllX(); plotTrack->alignDepthZoomToPlotAndZoomAllX();
} }
} }

3
ApplicationCode/ProjectDataModel/RimWellLogPlotTrack.cpp
View File

@ -124,6 +124,7 @@ void RimWellLogPlotTrack::addCurve(RimWellLogPlotCurve* curve)
void RimWellLogPlotTrack::insertCurve(RimWellLogPlotCurve* curve, size_t index) void RimWellLogPlotTrack::insertCurve(RimWellLogPlotCurve* curve, size_t index)
{ {
curves.insert(index, curve); curves.insert(index, curve);
// Todo: Mark curve data to use either TVD or MD
if (m_wellLogTrackPlotWidget) if (m_wellLogTrackPlotWidget)
{ {
@ -274,7 +275,7 @@ void RimWellLogPlotTrack::detachAllCurves()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimWellLogPlotTrack::allignDepthZoomToPlotAndZoomAllX() void RimWellLogPlotTrack::alignDepthZoomToPlotAndZoomAllX()
{ {
if (m_wellLogTrackPlotWidget) if (m_wellLogTrackPlotWidget)
{ {

2
ApplicationCode/ProjectDataModel/RimWellLogPlotTrack.h
View File

@ -57,7 +57,7 @@ public:
void loadDataAndUpdate(); void loadDataAndUpdate();
bool availableDepthRange(double* minimumDepth, double* maximumDepth); bool availableDepthRange(double* minimumDepth, double* maximumDepth);
void allignDepthZoomToPlotAndZoomAllX(); void alignDepthZoomToPlotAndZoomAllX();
RiuWellLogTrackPlot* viewer(); RiuWellLogTrackPlot* viewer();