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

Rename Plot Report and Combination Plot to Multi Plot

Browse Source
This commit is contained in:
Gaute Lindkvist 2019-11-13 11:48:21 +01:00
parent 81db22586d
commit a73c7a4b97
9 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/Application/RiaGuiApplication.cpp
View File

@ -347,9 +347,9 @@ void RiaGuiApplication::loadAndUpdatePlotData()
{
sppColl = m_project->mainPlotCollection()->saturationPressurePlotCollection();
}
if ( m_project->mainPlotCollection()->combinationPlotCollection() )
if ( m_project->mainPlotCollection()->multiPlotCollection() )
{
gpwColl = m_project->mainPlotCollection()->combinationPlotCollection();
gpwColl = m_project->mainPlotCollection()->multiPlotCollection();
}
}

12
ApplicationCode/Commands/RicNewGridPlotWindowFeature.cpp
View File

@ -34,14 +34,14 @@
#include "cvfAssert.h"
RICF_SOURCE_INIT( RicNewGridPlotWindowFeature, "RicNewGridPlotWindowFeature", "createCombinationPlot" );
RICF_SOURCE_INIT( RicNewGridPlotWindowFeature, "RicNewGridPlotWindowFeature", "createMultiPlot" );
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicNewGridPlotWindowFeature::RicNewGridPlotWindowFeature()
{
CAF_PDM_InitObject( "Create Combination Plot", "", "", "" );
CAF_PDM_InitObject( "Create Multi Plot", "", "", "" );
CAF_PDM_InitFieldNoDefault( &m_plots, "plots", "Plots", "", "", "" );
}
@ -51,10 +51,10 @@ RicNewGridPlotWindowFeature::RicNewGridPlotWindowFeature()
RicfCommandResponse RicNewGridPlotWindowFeature::execute()
{
RimProject* project = RiaApplication::instance()->project();
RimGridPlotWindowCollection* plotCollection = project->mainPlotCollection()->combinationPlotCollection();
RimGridPlotWindowCollection* plotCollection = project->mainPlotCollection()->multiPlotCollection();
RimGridPlotWindow* plotWindow = new RimGridPlotWindow;
plotWindow->setMultiPlotTitle( QString( "Combination Plot %1" ).arg( plotCollection->gridPlotWindows().size() + 1 ) );
plotWindow->setMultiPlotTitle( QString( "Multi Plot %1" ).arg( plotCollection->gridPlotWindows().size() + 1 ) );
plotWindow->setAsPlotMdiWindow();
plotCollection->addGridPlotWindow( plotWindow );
@ -118,12 +118,12 @@ void RicNewGridPlotWindowFeature::setupActionLook( QAction* actionToSetup )
{
if ( selectedPlotInterfaces().empty() )
{
actionToSetup->setText( "New Empty Plot Report" );
actionToSetup->setText( "New Empty Multi Plot" );
actionToSetup->setIcon( QIcon( ":/WellLogPlot16x16.png" ) );
}
else
{
actionToSetup->setText( "Create Plot Report from Selected Plots" );
actionToSetup->setText( "Create Multi Plot from Selected Plots" );
actionToSetup->setIcon( QIcon( ":/WellLogPlot16x16.png" ) );
}
}

2
ApplicationCode/ProjectDataModel/RimGridPlotWindow.cpp
View File

@ -46,7 +46,7 @@ CAF_PDM_SOURCE_INIT( RimGridPlotWindow, "GridPlotWindow" );
//--------------------------------------------------------------------------------------------------
RimGridPlotWindow::RimGridPlotWindow()
{
CAF_PDM_InitObject( "Plot Report", ":/WellLogPlot16x16.png", "", "" );
CAF_PDM_InitObject( "Multi Plot", ":/WellLogPlot16x16.png", "", "" );
CAF_PDM_InitField( &m_showPlotWindowTitle, "ShowTitleInPlot", true, "Show Title", "", "", "" );
CAF_PDM_InitField( &m_plotWindowTitle, "PlotDescription", QString( "" ), "Name", "", "", "" );

2
ApplicationCode/ProjectDataModel/RimGridPlotWindowCollection.cpp
View File

@ -28,7 +28,7 @@ CAF_PDM_SOURCE_INIT( RimGridPlotWindowCollection, "RimGridPlotWindowCollection"
//--------------------------------------------------------------------------------------------------
RimGridPlotWindowCollection::RimGridPlotWindowCollection()
{
CAF_PDM_InitObject( "Plot Reports", ":/WellLogPlot16x16.png", "", "" );
CAF_PDM_InitObject( "Multi Plots", ":/WellLogPlot16x16.png", "", "" );
CAF_PDM_InitFieldNoDefault( &m_gridPlotWindows, "GridPlotWindows", "Plots Reports", "", "", "" );
m_gridPlotWindows.uiCapability()->setUiHidden( true );

20
ApplicationCode/ProjectDataModel/RimMainPlotCollection.cpp
View File

@ -85,8 +85,8 @@ RimMainPlotCollection::RimMainPlotCollection()
"" );
m_saturationPressurePlotCollection.uiCapability()->setUiHidden( true );
CAF_PDM_InitFieldNoDefault( &m_combinationPlotCollection, "RimGridPlotWindowCollection", "Combination Plots", "", "", "" );
m_combinationPlotCollection.uiCapability()->setUiHidden( true );
CAF_PDM_InitFieldNoDefault( &m_multiPlotCollection, "RimGridPlotWindowCollection", "Multi Plots", "", "", "" );
m_multiPlotCollection.uiCapability()->setUiHidden( true );
m_wellLogPlotCollection = new RimWellLogPlotCollection();
m_rftPlotCollection = new RimRftPlotCollection();
@ -96,7 +96,7 @@ RimMainPlotCollection::RimMainPlotCollection()
m_flowPlotCollection = new RimFlowPlotCollection();
m_gridCrossPlotCollection = new RimGridCrossPlotCollection;
m_saturationPressurePlotCollection = new RimSaturationPressurePlotCollection;
m_combinationPlotCollection = new RimGridPlotWindowCollection;
m_multiPlotCollection = new RimGridPlotWindowCollection;
}
//--------------------------------------------------------------------------------------------------
@ -188,9 +188,9 @@ RimSaturationPressurePlotCollection* RimMainPlotCollection::saturationPressurePl
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimGridPlotWindowCollection* RimMainPlotCollection::combinationPlotCollection()
RimGridPlotWindowCollection* RimMainPlotCollection::multiPlotCollection()
{
return m_combinationPlotCollection();
return m_multiPlotCollection();
}
//--------------------------------------------------------------------------------------------------
@ -206,7 +206,7 @@ void RimMainPlotCollection::deleteAllContainedObjects()
m_gridCrossPlotCollection->deleteAllChildObjects();
m_flowPlotCollection()->closeDefaultPlotWindowAndDeletePlots();
m_saturationPressurePlotCollection()->deleteAllChildObjects();
m_combinationPlotCollection()->deleteAllChildObjects();
m_multiPlotCollection()->deleteAllChildObjects();
}
//--------------------------------------------------------------------------------------------------
@ -259,9 +259,9 @@ void RimMainPlotCollection::updatePlotsWithFormations()
}
}
if ( m_combinationPlotCollection )
if ( m_multiPlotCollection )
{
for ( RimGridPlotWindow* plotWindow : m_combinationPlotCollection->gridPlotWindows() )
for ( RimGridPlotWindow* plotWindow : m_multiPlotCollection->gridPlotWindows() )
{
plotWindow->loadDataAndUpdate();
}
@ -281,9 +281,9 @@ void RimMainPlotCollection::updatePlotsWithCompletions()
}
}
if ( m_combinationPlotCollection )
if ( m_multiPlotCollection )
{
for ( RimGridPlotWindow* plotWindow : m_combinationPlotCollection->gridPlotWindows() )
for ( RimGridPlotWindow* plotWindow : m_multiPlotCollection->gridPlotWindows() )
{
plotWindow->loadDataAndUpdate();
}

4
ApplicationCode/ProjectDataModel/RimMainPlotCollection.h
View File

@ -59,7 +59,7 @@ public:
RimFlowPlotCollection* flowPlotCollection();
RimGridCrossPlotCollection* gridCrossPlotCollection();
RimSaturationPressurePlotCollection* saturationPressurePlotCollection();
RimGridPlotWindowCollection* combinationPlotCollection();
RimGridPlotWindowCollection* multiPlotCollection();
void deleteAllContainedObjects();
void updateCurrentTimeStepInPlots();
@ -84,7 +84,7 @@ private:
caf::PdmChildField<RimFlowPlotCollection*> m_flowPlotCollection;
caf::PdmChildField<RimGridCrossPlotCollection*> m_gridCrossPlotCollection;
caf::PdmChildField<RimSaturationPressurePlotCollection*> m_saturationPressurePlotCollection;
caf::PdmChildField<RimGridPlotWindowCollection*> m_combinationPlotCollection;
caf::PdmChildField<RimGridPlotWindowCollection*> m_multiPlotCollection;
caf::PdmField<bool> m_show;
};

4
ApplicationCode/ProjectDataModel/RimProject.cpp
View File

@ -1302,9 +1302,9 @@ void RimProject::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, Q
itemCollection->add( mainPlotCollection->saturationPressurePlotCollection() );
}
if ( mainPlotCollection->combinationPlotCollection() )
if ( mainPlotCollection->multiPlotCollection() )
{
itemCollection->add( mainPlotCollection->combinationPlotCollection() );
itemCollection->add( mainPlotCollection->multiPlotCollection() );
}
}
}

2
ApplicationCode/ProjectDataModel/RimReloadCaseTools.cpp
View File

@ -179,7 +179,7 @@ void RimReloadCaseTools::updateAllPlots()
flowPlotCollection->loadDataAndUpdate();
}
RimGridPlotWindowCollection* gridPlotWindowCollection = project->mainPlotCollection()->combinationPlotCollection();
RimGridPlotWindowCollection* gridPlotWindowCollection = project->mainPlotCollection()->multiPlotCollection();
if ( gridPlotWindowCollection )
{
for ( RimGridPlotWindow* plotWindow : gridPlotWindowCollection->gridPlotWindows() )

2
ApplicationCode/UserInterface/RiuPlotMainWindow.cpp
View File

@ -383,7 +383,7 @@ void RiuPlotMainWindow::createToolBars()
m_summaryPlotToolBarEditor = new caf::PdmUiToolBarEditor( "Summary Plot", this );
m_summaryPlotToolBarEditor->hide();
m_gridPlotWindowToolBarEditor = new caf::PdmUiToolBarEditor( "Combination Plot", this );
m_gridPlotWindowToolBarEditor = new caf::PdmUiToolBarEditor( "Multi Plot", this );
m_gridPlotWindowToolBarEditor->hide();
}