Fix crash on plot deletion

This commit is contained in:
Rebecca Cox
2017-11-03 11:36:44 +01:00
parent 95f7f40b15
commit cac5fa42a5
3 changed files with 29 additions and 13 deletions

View File

@@ -798,7 +798,7 @@ std::vector<RimWellLogCurve* > RimWellLogTrack::curvesVector()
//--------------------------------------------------------------------------------------------------
void RimWellLogTrack::uiOrderingForShowFormationNamesAndCase(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{
caf::PdmUiGroup* formationGroup = uiOrdering.addNewGroup("Formation Names Properties");
caf::PdmUiGroup* formationGroup = uiOrdering.addNewGroup("Formation Names");
formationGroup->add(&m_showFormations);
formationGroup->add(&m_case);
}
@@ -995,7 +995,7 @@ void RimWellLogTrack::updateFormationNamesOnPlot()
if (m_annotationTool == nullptr)
{
m_annotationTool = std::unique_ptr<RiuPlotAnnotationTool>(new RiuPlotAnnotationTool(this->viewer()));
m_annotationTool = std::unique_ptr<RiuPlotAnnotationTool>(new RiuPlotAnnotationTool());
}
RimMainPlotCollection* mainPlotCollection;
@@ -1050,7 +1050,7 @@ void RimWellLogTrack::updateFormationNamesOnPlot()
&formationNamesToPlot,
&yValues);
m_annotationTool->attachFormationNames(formationNamesToPlot, yValues);
m_annotationTool->attachFormationNames(this->viewer(), formationNamesToPlot, yValues);
}
//--------------------------------------------------------------------------------------------------