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 crashes

Browse Source
This commit is contained in:
Gaute Lindkvist
2019-09-04 19:29:44 +02:00
parent a03435b2fe
commit b9d78152e1
4 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.cpp
View File

@@ -691,7 +691,7 @@ void RimWellPltPlot::syncCurvesFromUiSelection()
curveGroupId++;
}
loadDataAndUpdate();
RimWellLogPlot::onLoadDataAndUpdate();
plotTrack->calculateXZoomRange();
}
@@ -1088,7 +1088,6 @@ void RimWellPltPlot::onLoadDataAndUpdate()
updateMdiWindowVisibility();
updateFormationsOnPlot();
syncCurvesFromUiSelection();
RimWellLogPlot::loadDataAndUpdate();
}
//--------------------------------------------------------------------------------------------------
@@ -1096,6 +1095,6 @@ void RimWellPltPlot::onLoadDataAndUpdate()
//--------------------------------------------------------------------------------------------------
QWidget* RimWellPltPlot::createViewWidget(QWidget* mainWindowParent)
{
m_viewer = new RiuWellPltPlot(this, mainWindowParent);
m_viewer = new RiuWellLogPlot(this, mainWindowParent);
return m_viewer;
}

10
ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp
View File

@@ -592,7 +592,7 @@ const char* RimWellRftPlot::plotNameFormatString()
//--------------------------------------------------------------------------------------------------
void RimWellRftPlot::deleteCurvesAssosicatedWithObservedData(const RimObservedFmuRftData* observedFmuRftData)
{
for (auto track : m_wellLogPlot_OBSOLETE->tracks())
for (auto track : tracks())
{
auto curves = track->curvesVector();
for (auto curve : curves)
@@ -724,7 +724,7 @@ void RimWellRftPlot::fieldChangedByUi(const caf::PdmFieldHandle* changedField, c
m_branchIndex = 0;
RimWellLogTrack* const plotTrack = m_wellLogPlot_OBSOLETE->trackByIndex(0);
RimWellLogTrack* const plotTrack = trackByIndex(0);
if (plotTrack)
{
plotTrack->deleteAllCurves();
@@ -799,7 +799,7 @@ void RimWellRftPlot::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
if (trackCount() > 0)
{
RimWellLogTrack* track = m_wellLogPlot_OBSOLETE->trackByIndex(0);
RimWellLogTrack* track = trackByIndex(0);
track->uiOrderingForRftPltFormations(uiOrdering);
@@ -911,7 +911,7 @@ void RimWellRftPlot::onLoadDataAndUpdate()
assignWellPathToExtractionCurves();
}
RimWellLogPlot::loadDataAndUpdate();
RimWellLogPlot::onLoadDataAndUpdate();
updateEditorsFromCurves();
}
@@ -962,7 +962,7 @@ void RimWellRftPlot::assignWellPathToExtractionCurves()
//--------------------------------------------------------------------------------------------------
QWidget* RimWellRftPlot::createViewWidget(QWidget* mainWindowParent)
{
m_viewer = new RiuWellRftPlot(this, mainWindowParent);
m_viewer = new RiuWellLogPlot(this, mainWindowParent);
return m_viewer;
}

2
ApplicationCode/ProjectDataModel/RimWellLogPlot.cpp
View File

@@ -117,7 +117,7 @@ RimWellLogPlot::RimWellLogPlot()
}
//--------------------------------------------------------------------------------------------------
///
/// Move-assignment operator. Argument has to be passed with std::move()
//--------------------------------------------------------------------------------------------------
RimWellLogPlot& RimWellLogPlot::operator=(RimWellLogPlot&& rhs)
{

1
ApplicationCode/ProjectDataModel/RimWellLogPlot.h
View File

@@ -63,7 +63,6 @@ public:
RimWellLogPlot();
~RimWellLogPlot() override;
// Move-assignment operator
RimWellLogPlot& operator=(RimWellLogPlot&& rhs);
QWidget* createPlotWidget();