OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Adjustments for release

Browse Source 
* Add notification of parent object when multiple objects are updated

* Make sure unchecked curves are removed from track

* Use object names instead of "Sub Items" when possible

* Set default simulation well visualization to top of reservoir

* Show plot window after plot is created

* Allow setting plot rendering flags

* Add more plots for update when clicking in 3D view

* Seismic Difference: Fix typo for poly line data extraction

* Version RC_5
This commit is contained in:
Magne Sjaastad
2023-06-16 09:27:35 +02:00
committed by GitHub
parent 36811e7f94
commit 06b5c9afbf
25 changed files with 184 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ApplicationLibCode/ProjectDataModel/Flow/RimWellAllocationOverTimePlot.cpp
View File

@@ -170,6 +170,15 @@ void RimWellAllocationOverTimePlot::setFromSimulationWell( RimSimWellInView* sim
onLoadDataAndUpdate();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellAllocationOverTimePlot::setWellName( const QString& wellName )
{
m_wellName = wellName;
onLoadDataAndUpdate();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

1
ApplicationLibCode/ProjectDataModel/Flow/RimWellAllocationOverTimePlot.h
View File

@@ -68,6 +68,7 @@ public:
void setDescription( const QString& description );
void setFromSimulationWell( RimSimWellInView* simWell );
void setWellName( const QString& wellName );
// RimPlot implementations
RiuPlotWidget* plotWidget() override;

20
ApplicationLibCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp
View File

@@ -185,6 +185,26 @@ void RimWellAllocationPlot::setFromSimulationWell( RimSimWellInView* simWell )
onLoadDataAndUpdate();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellAllocationPlot::setWellName( const QString& wellName )
{
m_wellName = wellName;
onLoadDataAndUpdate();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellAllocationPlot::setTimeStep( int timeStep )
{
if ( timeStep < 0 ) return;
m_timeStep = timeStep;
onLoadDataAndUpdate();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

2
ApplicationLibCode/ProjectDataModel/Flow/RimWellAllocationPlot.h
View File

@@ -68,6 +68,8 @@ public:
int id() const final;
void setFromSimulationWell( RimSimWellInView* simWell );
void setWellName( const QString& wellName );
void setTimeStep( int timeStep );
void setDescription( const QString& description );
QString description() const;

18
ApplicationLibCode/ProjectDataModel/Flow/RimWellDistributionPlot.cpp
View File

@@ -150,13 +150,7 @@ void RimWellDistributionPlot::updateLegend()
return;
}
// Hide the legend when in multiplot mode, as the legend is handeled by the multi plot grid layout
bool doShowLegend = false;
if ( isMdiWindow() )
{
doShowLegend = m_showPlotLegends;
}
bool doShowLegend = true;
if ( doShowLegend )
{
QwtLegend* legend = new QwtLegend( m_plotWidget );
@@ -315,14 +309,7 @@ void RimWellDistributionPlot::onLoadDataAndUpdate()
// cvf::Trace::show("RimWellDistributionPlot::onLoadDataAndUpdate()");
// cvf::DebugTimer tim("RimWellDistributionPlot::onLoadDataAndUpdate()");
if ( isMdiWindow() )
{
updateMdiWindowVisibility();
}
else
{
updateParentLayout();
}
updateParentLayout();
if ( !m_plotWidget )
{
@@ -363,6 +350,7 @@ void RimWellDistributionPlot::onLoadDataAndUpdate()
const QString timeStepName = m_case ? m_case->timeStepName( m_timeStepIndex ) : "N/A";
const QString plotTitleStr = QString( "%1 Distribution: %2, %3" ).arg( phaseString ).arg( m_wellName ).arg( timeStepName );
m_plotWidget->setPlotTitleRenderingFlags( Qt::AlignHCenter | Qt::TextWordWrap );
m_plotWidget->setPlotTitle( plotTitleStr );
m_plotWidget->setAxisTitleText( RiuPlotAxis::defaultBottom(), "TOF [years]" );

29
ApplicationLibCode/ProjectDataModel/Flow/RimWellDistributionPlotCollection.cpp
View File

@@ -110,6 +110,30 @@ void RimWellDistributionPlotCollection::setData( RimEclipseResultCase* eclipseCa
applyPlotParametersToContainedPlots();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellDistributionPlotCollection::setWellName( const QString& wellName )
{
m_wellName = wellName;
applyPlotParametersToContainedPlots();
loadDataAndUpdate();
if ( m_viewer ) m_viewer->scheduleUpdate();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellDistributionPlotCollection::setTimeStep( int timeStep )
{
if ( timeStep < 0 ) return;
m_timeStepIndex = timeStep;
applyPlotParametersToContainedPlots();
loadDataAndUpdate();
if ( m_viewer ) m_viewer->scheduleUpdate();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -308,6 +332,11 @@ void RimWellDistributionPlotCollection::fieldChangedByUi( const caf::PdmFieldHan
{
applyPlotParametersToContainedPlots();
shouldRecalculatePlotData = true;
if ( changedField == &m_showOil || changedField == &m_showGas || changedField == &m_showWater || changedField == &m_showWindow )
{
if ( m_viewer ) m_viewer->scheduleUpdate();
}
}
RimPlotWindow::fieldChangedByUi( changedField, oldValue, newValue );

2
ApplicationLibCode/ProjectDataModel/Flow/RimWellDistributionPlotCollection.h
View File

@@ -52,6 +52,8 @@ public:
~RimWellDistributionPlotCollection() override;
void setData( RimEclipseResultCase* eclipseCase, QString wellName, int timeStepIndex );
void setWellName( const QString& wellName );
void setTimeStep( int timeStep );
QWidget* viewWidget() override;
QString description() const override;