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 NewSummaryPlot command to what it actually is - OpenSummaryPlotEditor command. Remove unused includes.

Browse Source 
Move Single Summary Plots to bottom of tree and show them as Single Summary Plots.
This commit is contained in:
Jon Jenssen 2022-03-21 12:23:50 +01:00 committed by jonjenssen
parent e20adcdb69
commit 560917a481
14 changed files with 21 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ApplicationLibCode/Application/Tools/RiaImportEclipseCaseTools.cpp
View File

@ -21,7 +21,6 @@
#include "ApplicationCommands/RicShowMainWindowFeature.h"
#include "SummaryPlotCommands/RicNewSummaryCurveFeature.h"
#include "SummaryPlotCommands/RicNewSummaryPlotFeature.h"
#include "SummaryPlotCommands/RicSummaryPlotFeatureImpl.h"
#include "RiaApplication.h"

2
ApplicationLibCode/Commands/RicConvertGroupToEnsembleFeature.cpp
View File

@ -37,8 +37,6 @@
#include "RiuMainWindow.h"
#include "RiuPlotMainWindow.h"
#include "SummaryPlotCommands/RicNewSummaryPlotFeature.h"
#include "cafSelectionManagerTools.h"
#include <QAction>

1
ApplicationLibCode/Commands/RicImportEnsembleFeature.cpp
View File

@ -45,7 +45,6 @@
#include "RiuPlotMainWindow.h"
#include "SummaryPlotCommands/RicNewSummaryEnsembleCurveSetFeature.h"
#include "SummaryPlotCommands/RicNewSummaryPlotFeature.h"
#include <QAction>
#include <QDebug>

1
ApplicationLibCode/Commands/RicImportSummaryCasesFeature.cpp
View File

@ -44,7 +44,6 @@
#include "RiuPlotMainWindowTools.h"
#include "SummaryPlotCommands/RicNewSummaryEnsembleCurveSetFeature.h"
#include "SummaryPlotCommands/RicNewSummaryPlotFeature.h"
#include "SummaryPlotCommands/RicSummaryPlotFeatureImpl.h"
#include "cafProgressInfo.h"

2
ApplicationLibCode/Commands/RicImportSummaryGroupFeature.cpp
View File

@ -37,8 +37,6 @@
#include "RiuMainWindow.h"
#include "RiuPlotMainWindow.h"
#include "SummaryPlotCommands/RicNewSummaryPlotFeature.h"
#include <QAction>
#include <QInputDialog>

4
ApplicationLibCode/Commands/SummaryPlotCommands/CMakeLists_files.cmake
View File

@ -1,5 +1,5 @@
set(SOURCE_GROUP_HEADER_FILES
${CMAKE_CURRENT_LIST_DIR}/RicNewSummaryPlotFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicOpenSummaryPlotEditorFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicNewDefaultSummaryPlotFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicNewSummaryCrossPlotFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicNewSummaryCurveFeature.h
@ -48,7 +48,7 @@ set(SOURCE_GROUP_HEADER_FILES
)
set(SOURCE_GROUP_SOURCE_FILES
${CMAKE_CURRENT_LIST_DIR}/RicNewSummaryPlotFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicOpenSummaryPlotEditorFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicNewDefaultSummaryPlotFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicNewSummaryCrossPlotFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicNewSummaryCurveFeature.cpp

10
ApplicationLibCode/Commands/SummaryPlotCommands/RicNewSummaryPlotFeature.cpp → ApplicationLibCode/Commands/SummaryPlotCommands/RicOpenSummaryPlotEditorFeature.cpp
View File

@ -16,7 +16,7 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RicNewSummaryPlotFeature.h"
#include "RicOpenSummaryPlotEditorFeature.h"
#include "RiaSummaryTools.h"
@ -44,12 +44,12 @@
#include <QAction>
CAF_CMD_SOURCE_INIT( RicNewSummaryPlotFeature, "RicNewSummaryPlotFeature" );
CAF_CMD_SOURCE_INIT( RicOpenSummaryPlotEditorFeature, "RicOpenSummaryPlotEditorFeature" );
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicNewSummaryPlotFeature::isCommandEnabled()
bool RicOpenSummaryPlotEditorFeature::isCommandEnabled()
{
RimSummaryPlotCollection* sumPlotColl = nullptr;
RimCustomObjectiveFunctionCollection* customObjFuncCollection = nullptr;
@ -81,7 +81,7 @@ bool RicNewSummaryPlotFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicNewSummaryPlotFeature::onActionTriggered( bool isChecked )
void RicOpenSummaryPlotEditorFeature::onActionTriggered( bool isChecked )
{
RimProject* project = RimProject::current();
CVF_ASSERT( project );
@ -140,7 +140,7 @@ void RicNewSummaryPlotFeature::onActionTriggered( bool isChecked )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicNewSummaryPlotFeature::setupActionLook( QAction* actionToSetup )
void RicOpenSummaryPlotEditorFeature::setupActionLook( QAction* actionToSetup )
{
actionToSetup->setText( "Open Summary Plot Editor" );
actionToSetup->setIcon( QIcon( ":/SummaryPlotLight16x16.png" ) );

2
ApplicationLibCode/Commands/SummaryPlotCommands/RicNewSummaryPlotFeature.h → ApplicationLibCode/Commands/SummaryPlotCommands/RicOpenSummaryPlotEditorFeature.h
View File

@ -25,7 +25,7 @@
//==================================================================================================
///
//==================================================================================================
class RicNewSummaryPlotFeature : public caf::CmdFeature
class RicOpenSummaryPlotEditorFeature : public caf::CmdFeature
{
CAF_CMD_HEADER_INIT;

1
ApplicationLibCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeature.cpp
View File

@ -19,7 +19,6 @@
#include "RicPasteAsciiDataToSummaryPlotFeature.h"
#include "OperationsUsingObjReferences/RicPasteFeatureImpl.h"
#include "RicNewSummaryPlotFeature.h"
#include "RicPasteAsciiDataToSummaryPlotFeatureUi.h"
#include "RiaLogging.h"

10
ApplicationLibCode/ProjectDataModel/RimContextCommandBuilder.cpp
View File

@ -559,7 +559,7 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
menuBuilder << "RicPasteSummaryPlotFeature";
menuBuilder << "RicPasteAsciiDataToSummaryPlotFeature";
menuBuilder << "Separator";
menuBuilder << "RicNewSummaryPlotFeature";
menuBuilder << "RicOpenSummaryPlotEditorFeature";
menuBuilder << "RicNewDefaultSummaryPlotFeature";
menuBuilder << "Separator";
menuBuilder << "RicShowSummaryCurveCalculatorFeature";
@ -769,7 +769,7 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
menuBuilder.subMenuEnd();
menuBuilder.addSeparator();
menuBuilder << "RicNewDerivedEnsembleFeature";
menuBuilder << "RicNewSummaryPlotFeature";
menuBuilder << "RicOpenSummaryPlotEditorFeature";
menuBuilder << "RicNewDefaultSummaryPlotFeature";
menuBuilder << "RicNewSummaryCrossPlotFeature";
menuBuilder.addSeparator();
@ -785,7 +785,7 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
menuBuilder << "RicImportEnsembleFeature";
menuBuilder.subMenuEnd();
menuBuilder.addSeparator();
menuBuilder << "RicNewSummaryPlotFeature";
menuBuilder << "RicOpenSummaryPlotEditorFeature";
menuBuilder << "RicNewDefaultSummaryPlotFeature";
menuBuilder << "RicNewSummaryCrossPlotFeature";
menuBuilder.addSeparator();
@ -794,7 +794,7 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
if ( !dynamic_cast<RimObservedSummaryData*>( firstUiItem ) )
{
menuBuilder << "RicShowSummaryCurveCalculatorFeature";
// menuBuilder << "RicNewSummaryPlotFeature";
// menuBuilder << "RicOpenSummaryPlotEditorFeature";
}
}
else if ( dynamic_cast<RimWellLogFileChannel*>( firstUiItem ) )
@ -1063,7 +1063,7 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
menuBuilder << "RicShowTotalAllocationDataFeature";
menuBuilder << "RicNewDerivedEnsembleFeature";
menuBuilder << "RicNewSummaryPlotFeature";
menuBuilder << "RicOpenSummaryPlotEditorFeature";
menuBuilder << "RicNewDefaultSummaryPlotFeature";
menuBuilder << "RicNewSummaryMultiPlotFeature";
menuBuilder << "RicNewSummaryCrossPlotFeature";

9
ApplicationLibCode/ProjectDataModel/RimProject.cpp
View File

@ -1374,11 +1374,6 @@ void RimProject::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, Q
{
if ( mainPlotCollection )
{
if ( mainPlotCollection->summaryPlotCollection() )
{
uiTreeOrdering.add( mainPlotCollection->summaryPlotCollection() );
}
if ( mainPlotCollection->summaryMultiPlotCollection() )
{
uiTreeOrdering.add( mainPlotCollection->summaryMultiPlotCollection() );
@ -1455,6 +1450,10 @@ void RimProject::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, Q
statisticsItemCollection->add( mainPlotCollection->ensembleFractureStatisticsPlotCollection() );
}
#endif
if ( mainPlotCollection->summaryPlotCollection() )
{
uiTreeOrdering.add( mainPlotCollection->summaryPlotCollection() );
}
}
}
else if ( uiConfigName == "PlotWindow.DataSources" )

4
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlotCollection.cpp
View File

@ -31,9 +31,9 @@ CAF_PDM_SOURCE_INIT( RimSummaryMultiPlotCollection, "RimSummaryMultiPlotCollecti
//--------------------------------------------------------------------------------------------------
RimSummaryMultiPlotCollection::RimSummaryMultiPlotCollection()
{
CAF_PDM_InitObject( "Summary Multi Plots", ":/MultiPlot16x16.png" );
CAF_PDM_InitObject( "Summary Plots", ":/MultiPlot16x16.png" );
CAF_PDM_InitFieldNoDefault( &m_summaryMultiPlots, "MultiSummaryPlots", "Multi Summary Plots" );
CAF_PDM_InitFieldNoDefault( &m_summaryMultiPlots, "MultiSummaryPlots", "Summary Plots" );
m_summaryMultiPlots.uiCapability()->setUiTreeHidden( true );
caf::PdmFieldReorderCapability::addToField( &m_summaryMultiPlots );
}

4
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotCollection.cpp
View File

@ -37,9 +37,9 @@ CAF_PDM_SOURCE_INIT( RimSummaryPlotCollection, "SummaryPlotCollection" );
//--------------------------------------------------------------------------------------------------
RimSummaryPlotCollection::RimSummaryPlotCollection()
{
CAF_PDM_InitScriptableObject( "Summary Plots", ":/SummaryPlotsLight16x16.png" );
CAF_PDM_InitScriptableObject( "Single Summary Plots", ":/SummaryPlotsLight16x16.png" );
CAF_PDM_InitFieldNoDefault( &m_summaryPlots, "SummaryPlots", "Summary Plots" );
CAF_PDM_InitFieldNoDefault( &m_summaryPlots, "SummaryPlots", "Single Summary Plots" );
m_summaryPlots.uiCapability()->setUiTreeHidden( true );
caf::PdmFieldReorderCapability::addToField( &m_summaryPlots );
}

1
ApplicationLibCode/ProjectDataModelCommands/RimcSummaryPlotCollection.cpp
View File

@ -20,7 +20,6 @@
#include "SummaryPlotCommands/RicNewDefaultSummaryPlotFeature.h"
#include "SummaryPlotCommands/RicNewSummaryEnsembleCurveSetFeature.h"
#include "SummaryPlotCommands/RicNewSummaryPlotFeature.h"
#include "SummaryPlotCommands/RicSummaryPlotFeatureImpl.h"
#include "RiaTextStringTools.h"