diff --git a/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp b/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp index 33cc043692..b9d8221bf8 100644 --- a/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp +++ b/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp @@ -524,7 +524,7 @@ QString Rim3dOverlayInfoConfig::caseInfoText(RimEclipseView* eclipseView) { QString infoText; - if (eclipseView) + if (eclipseView && eclipseView->eclipseCase()) { QString caseName = eclipseView->eclipseCase()->caseUserDescription(); @@ -660,7 +660,7 @@ QString Rim3dOverlayInfoConfig::resultInfoText(const HistogramData& histData, "") .arg(histData.min) .arg(histData.mean) - .arg(histData.max); + .arg(histData.max); } } else if (eclipseView) @@ -691,7 +691,8 @@ QString Rim3dOverlayInfoConfig::resultInfoText(const HistogramData& histData, if (eclipseView->cellResult()->hasDualPorFractureResult()) { - QString porosityModelText = caf::AppEnum::uiText(eclipseView->cellResult()->porosityModel()); + QString porosityModelText = + caf::AppEnum::uiText(eclipseView->cellResult()->porosityModel()); infoText += QString("Dual Porosity Type: %1
").arg(porosityModelText); } @@ -1104,18 +1105,22 @@ void Rim3dOverlayInfoConfig::update3DInfoIn2dViews() const //-------------------------------------------------------------------------------------------------- QString Rim3dOverlayInfoConfig::timeStepText(RimEclipseView* eclipseView) { - int currTimeStepIndex = eclipseView->currentTimeStep(); - std::vector timeSteps = eclipseView->currentGridCellResults()->allTimeStepDatesFromEclipseReader(); - QString dateTimeString; - if (currTimeStepIndex >= 0 && currTimeStepIndex < (int)timeSteps.size()) + + if (eclipseView && eclipseView->currentGridCellResults()) { - QString dateFormat = RiaQDateTimeTools::createTimeFormatStringFromDates(timeSteps); + int currTimeStepIndex = eclipseView->currentTimeStep(); + std::vector timeSteps = eclipseView->currentGridCellResults()->allTimeStepDatesFromEclipseReader(); - QString dateString = RiaQDateTimeTools::toStringUsingApplicationLocale(timeSteps[currTimeStepIndex], dateFormat); + if (currTimeStepIndex >= 0 && currTimeStepIndex < (int)timeSteps.size()) + { + QString dateFormat = RiaQDateTimeTools::createTimeFormatStringFromDates(timeSteps); - dateTimeString = QString("Time Step: %1/%2 %3") - .arg(QString::number(currTimeStepIndex), QString::number(timeSteps.size() - 1), dateString); + QString dateString = RiaQDateTimeTools::toStringUsingApplicationLocale(timeSteps[currTimeStepIndex], dateFormat); + + dateTimeString = QString("Time Step: %1/%2 %3") + .arg(QString::number(currTimeStepIndex), QString::number(timeSteps.size() - 1), dateString); + } } return QString("

-- %1 --
").arg(dateTimeString) + diff --git a/ApplicationCode/ProjectDataModel/RimSimWellInView.cpp b/ApplicationCode/ProjectDataModel/RimSimWellInView.cpp index fad3f8b63a..7f0bc1032d 100644 --- a/ApplicationCode/ProjectDataModel/RimSimWellInView.cpp +++ b/ApplicationCode/ProjectDataModel/RimSimWellInView.cpp @@ -171,13 +171,13 @@ std::vector RimSimWellInView::wellPipeBranches() const this->firstAncestorOrThisOfTypeAsserted(simWellCollection); RimEclipseCase* eclipseCase = nullptr; - this->firstAncestorOrThisOfTypeAsserted(eclipseCase); - RigEclipseCaseData* caseData = eclipseCase->eclipseCaseData(); - CVF_ASSERT(caseData); - if (caseData) + this->firstAncestorOrThisOfType(eclipseCase); + if (eclipseCase && eclipseCase->eclipseCaseData()) { + RigEclipseCaseData* caseData = eclipseCase->eclipseCaseData(); + bool includeCellCenters = this->isUsingCellCenterForPipe(); - bool detectBrances = simWellCollection->isAutoDetectingBranches; + bool detectBrances = simWellCollection->isAutoDetectingBranches; return caseData->simulationWellBranches(this->name(), includeCellCenters, detectBrances); }