diff --git a/ApplicationCode/Application/RiaApplication.cpp b/ApplicationCode/Application/RiaApplication.cpp index 501cc201c7..690badecf7 100644 --- a/ApplicationCode/Application/RiaApplication.cpp +++ b/ApplicationCode/Application/RiaApplication.cpp @@ -606,12 +606,14 @@ void RiaApplication::loadAndUpdatePlotData() } } - plotProgress.setNextProgressIncrement(flowColl->plotCount()); if (flowColl) { flowColl->loadDataAndUpdate(); + + plotProgress.setNextProgressIncrement(flowColl->plotCount()); } + plotProgress.incrementProgress(); } diff --git a/ApplicationCode/Commands/WellLogCommands/RicDeleteWellLogPlotTrackFeature.cpp b/ApplicationCode/Commands/WellLogCommands/RicDeleteWellLogPlotTrackFeature.cpp index 9544f237ca..abb87fbefa 100644 --- a/ApplicationCode/Commands/WellLogCommands/RicDeleteWellLogPlotTrackFeature.cpp +++ b/ApplicationCode/Commands/WellLogCommands/RicDeleteWellLogPlotTrackFeature.cpp @@ -45,7 +45,7 @@ bool RicDeleteWellLogPlotTrackFeature::isCommandEnabled() { RimWellLogPlot* wellLogPlot = NULL; selection[0]->firstAncestorOrThisOfType(wellLogPlot); - if (wellLogPlot->trackCount() > 1) + if (wellLogPlot && wellLogPlot->trackCount() > 1) { return true; } diff --git a/ApplicationCode/ProjectDataModel/RimCellRangeFilter.cpp b/ApplicationCode/ProjectDataModel/RimCellRangeFilter.cpp index 2688a09849..86d1466e93 100644 --- a/ApplicationCode/ProjectDataModel/RimCellRangeFilter.cpp +++ b/ApplicationCode/ProjectDataModel/RimCellRangeFilter.cpp @@ -295,7 +295,7 @@ bool RimCellRangeFilter::isRangeFilterControlled() CVF_ASSERT(rimView); bool isRangeFilterControlled = false; - if (rimView->viewController() && rimView->viewController()->isRangeFiltersControlled()) + if (rimView && rimView->viewController() && rimView->viewController()->isRangeFiltersControlled()) { isRangeFilterControlled = true; } diff --git a/ApplicationCode/ProjectDataModel/RimCellRangeFilterCollection.cpp b/ApplicationCode/ProjectDataModel/RimCellRangeFilterCollection.cpp index 7cf077190e..7daeccb9e3 100644 --- a/ApplicationCode/ProjectDataModel/RimCellRangeFilterCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimCellRangeFilterCollection.cpp @@ -148,6 +148,7 @@ void RimCellRangeFilterCollection::updateDisplayModeNotifyManagedViews(RimCellRa { RimView* view = NULL; firstAncestorOrThisOfType(view); + if (!view) return; if (view->isMasterView()) { diff --git a/ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.cpp b/ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.cpp index 727cb59ed3..ee03da27af 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.cpp @@ -242,10 +242,14 @@ bool RimEclipsePropertyFilter::isPropertyFilterControlled() CVF_ASSERT(rimView); bool isPropertyFilterControlled = false; - RimViewController* vc = rimView->viewController(); - if (vc && vc->isPropertyFilterOveridden()) + + if (rimView) { - isPropertyFilterControlled = true; + RimViewController* vc = rimView->viewController(); + if (vc && vc->isPropertyFilterOveridden()) + { + isPropertyFilterControlled = true; + } } return isPropertyFilterControlled; diff --git a/ApplicationCode/ProjectDataModel/RimEclipsePropertyFilterCollection.cpp b/ApplicationCode/ProjectDataModel/RimEclipsePropertyFilterCollection.cpp index 23cd5cd6ec..5f124bd5d7 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipsePropertyFilterCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipsePropertyFilterCollection.cpp @@ -142,11 +142,14 @@ void RimEclipsePropertyFilterCollection::updateIconState() RimEclipseView* view = NULL; this->firstAncestorOrThisOfType(view); - RimViewController* viewController = view->viewController(); - if (viewController && (viewController->isPropertyFilterOveridden() - || viewController->isVisibleCellsOveridden())) + if (view) { - activeIcon = false; + RimViewController* viewController = view->viewController(); + if (viewController && (viewController->isPropertyFilterOveridden() + || viewController->isVisibleCellsOveridden())) + { + activeIcon = false; + } } if (!isActive) diff --git a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp index 5cb6d9fe8d..21df530d9d 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp @@ -593,10 +593,14 @@ RigFlowDiagResultAddress RimEclipseResultDefinition::flowDiagResAddress() const { CVF_ASSERT(m_resultType() == RimDefines::FLOW_DIAGNOSTICS); + size_t timeStep = 0; + RimView* rimView = nullptr; this->firstAncestorOrThisOfType(rimView); - - size_t timeStep = rimView->currentTimeStep(); + if (rimView) + { + timeStep = rimView->currentTimeStep(); + } std::set selTracerNames; if (m_flowTracerSelectionMode == FLOW_TR_BY_SELECTION) diff --git a/ApplicationCode/ProjectDataModel/RimGeoMechCellColors.cpp b/ApplicationCode/ProjectDataModel/RimGeoMechCellColors.cpp index 3232cd06c7..6798c2e7ef 100644 --- a/ApplicationCode/ProjectDataModel/RimGeoMechCellColors.cpp +++ b/ApplicationCode/ProjectDataModel/RimGeoMechCellColors.cpp @@ -55,14 +55,17 @@ void RimGeoMechCellColors::updateIconState() this->firstAncestorOrThisOfType(rimView); CVF_ASSERT(rimView); - RimViewController* viewController = rimView->viewController(); - if (viewController && viewController->isResultColorControlled()) + if (rimView) { - updateUiIconFromState(false); - } - else - { - updateUiIconFromState(true); + RimViewController* viewController = rimView->viewController(); + if (viewController && viewController->isResultColorControlled()) + { + updateUiIconFromState(false); + } + else + { + updateUiIconFromState(true); + } } uiCapability()->updateConnectedEditors(); diff --git a/ApplicationCode/ProjectDataModel/RimGeoMechPropertyFilter.cpp b/ApplicationCode/ProjectDataModel/RimGeoMechPropertyFilter.cpp index 4f28e6b456..48a5d720a8 100644 --- a/ApplicationCode/ProjectDataModel/RimGeoMechPropertyFilter.cpp +++ b/ApplicationCode/ProjectDataModel/RimGeoMechPropertyFilter.cpp @@ -190,15 +190,18 @@ void RimGeoMechPropertyFilter::updateReadOnlyStateOfAllFields() //-------------------------------------------------------------------------------------------------- bool RimGeoMechPropertyFilter::isPropertyFilterControlled() { + bool isPropertyFilterControlled = false; + RimView* rimView = NULL; firstAncestorOrThisOfType(rimView); CVF_ASSERT(rimView); - - bool isPropertyFilterControlled = false; - RimViewController* vc = rimView->viewController(); - if (vc && vc->isPropertyFilterOveridden()) + if (rimView) { - isPropertyFilterControlled = true; + RimViewController* vc = rimView->viewController(); + if (vc && vc->isPropertyFilterOveridden()) + { + isPropertyFilterControlled = true; + } } return isPropertyFilterControlled; diff --git a/ApplicationCode/ProjectDataModel/RimGeoMechPropertyFilterCollection.cpp b/ApplicationCode/ProjectDataModel/RimGeoMechPropertyFilterCollection.cpp index 1bbacbbdaf..acc74532fb 100644 --- a/ApplicationCode/ProjectDataModel/RimGeoMechPropertyFilterCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimGeoMechPropertyFilterCollection.cpp @@ -144,11 +144,14 @@ void RimGeoMechPropertyFilterCollection::updateIconState() RimGeoMechView* view = NULL; this->firstAncestorOrThisOfType(view); - RimViewController* viewController = view->viewController(); - if (viewController && ( viewController->isPropertyFilterOveridden() - || viewController->isVisibleCellsOveridden())) + if (view) { - activeIcon = false; + RimViewController* viewController = view->viewController(); + if (viewController && ( viewController->isPropertyFilterOveridden() + || viewController->isVisibleCellsOveridden())) + { + activeIcon = false; + } } if (!isActive) diff --git a/ApplicationCode/ProjectDataModel/RimWellLogFileCurve.cpp b/ApplicationCode/ProjectDataModel/RimWellLogFileCurve.cpp index b2dcd85067..a91acbd9c5 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogFileCurve.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellLogFileCurve.cpp @@ -82,7 +82,7 @@ void RimWellLogFileCurve::onLoadDataAndUpdate() firstAncestorOrThisOfType(wellLogPlot); CVF_ASSERT(wellLogPlot); - if (wellLogPlot->depthType() == RimWellLogPlot::TRUE_VERTICAL_DEPTH) + if (wellLogPlot && wellLogPlot->depthType() == RimWellLogPlot::TRUE_VERTICAL_DEPTH) { if (RiaApplication::instance()->preferences()->showLasCurveWithoutTvdWarning()) { diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveFilter.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveFilter.cpp index 04efa85b94..00eae82c10 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveFilter.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveFilter.cpp @@ -435,7 +435,10 @@ void RimSummaryCurveFilter::updatePlotAxisForCurves() RimSummaryPlot* plot = nullptr; firstAncestorOrThisOfType(plot); - plot->updateAxes(); + if (plot) + { + plot->updateAxes(); + } } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp index 09ebc322a7..93ed3b381c 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp @@ -311,6 +311,7 @@ void RimSummaryTimeAxisProperties::fieldChangedByUi(const caf::PdmFieldHandle* c { RimSummaryPlot* rimSummaryPlot = nullptr; this->firstAncestorOrThisOfType(rimSummaryPlot); + if (!rimSummaryPlot) return; if (changedField == &m_visibleDateRangeMax) { diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryYAxisProperties.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryYAxisProperties.cpp index af382360cf..c3c3ce7999 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryYAxisProperties.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryYAxisProperties.cpp @@ -155,33 +155,37 @@ bool RimSummaryYAxisProperties::isActive() const //-------------------------------------------------------------------------------------------------- void RimSummaryYAxisProperties::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) { - RimSummaryPlot* rimSummaryPlot = nullptr; - this->firstAncestorOrThisOfType(rimSummaryPlot); if (changedField == &isAutoTitle) { updateOptionSensitivity(); } - else if (changedField == &visibleRangeMax) - { - if (visibleRangeMin > visibleRangeMax) visibleRangeMax = oldValue.toDouble(); - - rimSummaryPlot->disableAutoZoom(); - } - else if (changedField == &visibleRangeMin) - { - if (visibleRangeMin > visibleRangeMax) visibleRangeMin = oldValue.toDouble(); - - rimSummaryPlot->disableAutoZoom(); - } - if (changedField == &isLogarithmicScaleEnabled) + RimSummaryPlot* rimSummaryPlot = nullptr; + this->firstAncestorOrThisOfType(rimSummaryPlot); + if (rimSummaryPlot) { - rimSummaryPlot->loadDataAndUpdate(); - } - else - { - rimSummaryPlot->updateAxes(); + if (changedField == &visibleRangeMax) + { + if (visibleRangeMin > visibleRangeMax) visibleRangeMax = oldValue.toDouble(); + + rimSummaryPlot->disableAutoZoom(); + } + else if (changedField == &visibleRangeMin) + { + if (visibleRangeMin > visibleRangeMax) visibleRangeMin = oldValue.toDouble(); + + rimSummaryPlot->disableAutoZoom(); + } + + if (changedField == &isLogarithmicScaleEnabled) + { + rimSummaryPlot->loadDataAndUpdate(); + } + else + { + rimSummaryPlot->updateAxes(); + } } }