Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor adjustments #11306

Merged
merged 4 commits into from
Mar 21, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions ApplicationLibCode/ModelVisualization/RivWellPathPartMgr.h
Original file line number Diff line number Diff line change
@@ -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:
Original file line number Diff line number Diff line change
@@ -285,6 +285,14 @@ void RimEclipseStatisticsCase::selectAllTimeSteps()
}
}

//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEclipseStatisticsCase::setWellDataSourceCase( const QString& reservoirDescription )
{
m_wellDataSourceCase = reservoirDescription;
}

//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
Original file line number Diff line number Diff line change
@@ -85,6 +85,8 @@ class RimEclipseStatisticsCase : public RimEclipseCase
void setSourceProperties( RiaDefines::ResultCatType propertyType, const std::vector<QString>& propertyNames );
void selectAllTimeSteps();

void setWellDataSourceCase( const QString& reservoirDescription );

private:
void scheduleACTIVEGeometryRegenOnReservoirViews();

Original file line number Diff line number Diff line change
@@ -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();
Original file line number Diff line number Diff line change
@@ -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;

Original file line number Diff line number Diff line change
@@ -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" );
Original file line number Diff line number Diff line change
@@ -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<RimEnsembleCurveSetCollection>();
if ( ensembleCurveColl )
{
2 changes: 1 addition & 1 deletion ResInsightVersion.cmake
Original file line number Diff line number Diff line change
@@ -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