diff --git a/ApplicationLibCode/ModelVisualization/RivWellPathPartMgr.h b/ApplicationLibCode/ModelVisualization/RivWellPathPartMgr.h index f718729824..3fd557914a 100644 --- a/ApplicationLibCode/ModelVisualization/RivWellPathPartMgr.h +++ b/ApplicationLibCode/ModelVisualization/RivWellPathPartMgr.h @@ -132,8 +132,6 @@ class RivWellPathPartMgr : public cvf::Object bool isWellPathWithinBoundingBox( const cvf::BoundingBox& wellPathClipBoundingBox ) const; - static cvf::Color3f mapWellMeasurementToColor( const QString& measurementKind, double value ); - bool isWellPathEnabled( const cvf::BoundingBox& wellPathClipBoundingBox ) const; private: diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCase.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCase.cpp index de14294092..1feb6ca34b 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCase.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCase.cpp @@ -285,6 +285,14 @@ void RimEclipseStatisticsCase::selectAllTimeSteps() } } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimEclipseStatisticsCase::setWellDataSourceCase( const QString& reservoirDescription ) +{ + m_wellDataSourceCase = reservoirDescription; +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCase.h b/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCase.h index e9c0a825c2..9af7e47b12 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCase.h +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseStatisticsCase.h @@ -85,6 +85,8 @@ class RimEclipseStatisticsCase : public RimEclipseCase void setSourceProperties( RiaDefines::ResultCatType propertyType, const std::vector& propertyNames ); void selectAllTimeSteps(); + void setWellDataSourceCase( const QString& reservoirDescription ); + private: void scheduleACTIVEGeometryRegenOnReservoirViews(); diff --git a/ApplicationLibCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp b/ApplicationLibCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp index 201574156e..8b740585af 100644 --- a/ApplicationLibCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp @@ -429,6 +429,13 @@ RimEclipseStatisticsCase* RimIdenticalGridCaseGroup::createStatisticsCase( bool if ( selectDefaultResults ) newStatisticsCase->populateResultSelectionAfterLoadingGrid(); + auto reservoirs = caseCollection->reservoirs().childrenByType(); + if ( !reservoirs.empty() ) + { + auto caseDescription = reservoirs.front()->caseUserDescription(); + newStatisticsCase->setWellDataSourceCase( caseDescription ); + } + newStatisticsCase->openEclipseGridFile(); newStatisticsCase->computeActiveCellsBoundingBox(); newStatisticsCase->selectAllTimeSteps(); diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.cpp index 3fa046e92a..1521504979 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.cpp @@ -77,6 +77,7 @@ RimSummaryCurve::RimSummaryCurve() m_yValuesSummaryAddressUiField.uiCapability()->setUiEditorTypeName( caf::PdmUiLineEditor::uiEditorTypeName() ); CAF_PDM_InitFieldNoDefault( &m_yValuesSummaryAddress, "SummaryAddress", "Summary Address" ); + m_yValuesSummaryAddress.uiCapability()->setUiTreeChildrenHidden( true ); CAF_PDM_InitFieldNoDefault( &m_yPushButtonSelectSummaryAddress, "SelectAddress", "" ); caf::PdmUiPushButtonEditor::configureEditorLabelHidden( &m_yPushButtonSelectSummaryAddress ); @@ -102,6 +103,7 @@ RimSummaryCurve::RimSummaryCurve() m_xValuesSummaryAddressUiField.uiCapability()->setUiEditorTypeName( caf::PdmUiLineEditor::uiEditorTypeName() ); CAF_PDM_InitFieldNoDefault( &m_xValuesSummaryAddress, "SummaryAddressX", "Summary Address" ); + m_xValuesSummaryAddress.uiCapability()->setUiTreeChildrenHidden( true ); CAF_PDM_InitFieldNoDefault( &m_xPushButtonSelectSummaryAddress, "SelectAddressX", "" ); caf::PdmUiPushButtonEditor::configureEditorLabelHidden( &m_xPushButtonSelectSummaryAddress ); @@ -120,6 +122,7 @@ RimSummaryCurve::RimSummaryCurve() CAF_PDM_InitFieldNoDefault( &m_xPlotAxisProperties, "XAxis", "Axis" ); CAF_PDM_InitFieldNoDefault( &m_curveNameConfig, "SummaryCurveNameConfig", "SummaryCurveNameConfig" ); + m_curveNameConfig.uiCapability()->setUiTreeChildrenHidden( true ); m_curveNameConfig = new RimSummaryCurveAutoName; diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.cpp index bac202cdc3..ba6620c1a1 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.cpp @@ -157,6 +157,7 @@ RimSummaryMultiPlot::RimSummaryMultiPlot() m_sourceStepping = new RimSummaryPlotSourceStepping; m_sourceStepping->setSourceSteppingObject( this ); + m_sourceStepping.uiCapability()->setUiTreeChildrenHidden( true ); m_sourceStepping.xmlCapability()->disableIO(); CAF_PDM_InitFieldNoDefault( &m_defaultStepDimension, "DefaultStepDimension", "Default Step Dimension" ); diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.cpp index 5119e94faf..f8222e1975 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.cpp @@ -529,9 +529,6 @@ void RimSummaryPlotSourceStepping::fieldChangedByUi( const caf::PdmFieldHandle* // The time axis can be zoomed and will be used for all plots. Do not zoom time axis in this case. summaryMultiPlot->zoomAllYAxes(); } - - RiuPlotMainWindow* mainPlotWindow = RiaGuiApplication::instance()->mainPlotWindow(); - mainPlotWindow->updateMultiPlotToolBar(); } else { @@ -541,6 +538,11 @@ void RimSummaryPlotSourceStepping::fieldChangedByUi( const caf::PdmFieldHandle* summaryPlot->curvesChanged.send(); } + updateAllRequiredEditors(); + + RiuPlotMainWindow* mainPlotWindow = RiaGuiApplication::instance()->mainPlotWindow(); + mainPlotWindow->updateMultiPlotToolBar(); + auto ensembleCurveColl = firstAncestorOrThisOfType(); if ( ensembleCurveColl ) { diff --git a/ResInsightVersion.cmake b/ResInsightVersion.cmake index b85cd78f8e..e843593281 100644 --- a/ResInsightVersion.cmake +++ b/ResInsightVersion.cmake @@ -5,7 +5,7 @@ set(RESINSIGHT_PATCH_VERSION 0) # Opional text with no restrictions #set(RESINSIGHT_VERSION_TEXT "-dev") -set(RESINSIGHT_VERSION_TEXT "-RC_03") +set(RESINSIGHT_VERSION_TEXT "-RC_04") # Optional text # Must be unique and increasing within one combination of major/minor/patch version