OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-26 23:20:29 -05:00
Code Issues Packages Projects Releases Wiki Activity

#14061 Reorder user interface for summary/grid ensemble import

Browse Source 
* Agent docs: Recommend cmake --build over ninja when sharing build/ with Visual Studio
* Disable Create Well Target Mapping for grid ensembles with individual grids
* Move RimSummaryCaseMainCollection context menu items into appendMenuItems override
* Reorganize import menus: split per-window, group submenus, rename actions, add Import/Export icons
* Show icons on "New Statistics Case" and "New Grid Case Group" menu actions
* Rename grid/summary import submenus to "More" and use the import icon
This commit is contained in:
Magne Sjaastad authored and GitHub committed 2026-05-28 16:06:39 +02:00
1 parent 24700198fb
commit 2f8ec77851
21 files changed
+119 -54
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/UserInterface/RiuMainWindow.cpp
+2 -2
View File
@@ -499,10 +499,10 @@ void RiuMainWindow::createMenus()
fileMenu->addSeparator();
// Import menu actions
RiuMenuBarBuildTools::addImportMenuWithActions( this, fileMenu );
RiuMenuBarBuildTools::addImportMenuForMainWindow( this, fileMenu );
// Export menu actions
QMenu* exportMenu = fileMenu->addMenu( "&Export" );
QMenu* exportMenu = fileMenu->addMenu( QIcon( ":/export.svg" ), "&Export" );
exportMenu->addAction( cmdFeatureMgr->action( "RicSnapshotViewToFileFeature" ) );
exportMenu->addAction( m_snapshotAllViewsToFile );
exportMenu->addAction( cmdFeatureMgr->action( "RicAdvancedSnapshotExportFeature" ) );
ApplicationLibCode/UserInterface/RiuMenuBarBuildTools.cpp
+34 -18
View File
@@ -109,32 +109,23 @@ QMenu* RiuMenuBarBuildTools::createDefaultHelpMenu( QMenuBar* menuBar )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuMenuBarBuildTools::addImportMenuWithActions( QObject* parent, QMenu* menu )
void RiuMenuBarBuildTools::addImportMenuForMainWindow( QObject* parent, QMenu* menu )
{
caf::CmdFeatureManager* cmdFeatureMgr = caf::CmdFeatureManager::instance();
if ( !parent || !menu || !cmdFeatureMgr ) return;
QMenu* importMenu = menu->addMenu( "&Import" );
QMenu* importMenu = menu->addMenu( QIcon( ":/import.svg" ), "&Import" );
QMenu* importEclipseMenu = importMenu->addMenu( QIcon( ":/Case48x48.png" ), "Eclipse Cases" );
caf::CmdFeatureMenuBuilder::appendToMenu( importEclipseMenu, RimEclipseCaseCollection::importMenuFeatureNames() );
QMenu* importRoffMenu = importMenu->addMenu( QIcon( ":/Case48x48.png" ), "Roff Grid Models" );
importRoffMenu->addAction( cmdFeatureMgr->action( "RicImportRoffCaseFeature" ) );
importMenu->addSeparator();
importMenu->addAction( cmdFeatureMgr->action( "RicImportEclipseCaseFeature" ) );
importMenu->addAction( cmdFeatureMgr->action( "RicImportGridAndSummaryEnsembleFeature" ) );
importMenu->addSeparator();
QMenu* importSummaryMenu = importMenu->addMenu( QIcon( ":/SummaryCase.svg" ), "Summary Cases" );
importSummaryMenu->addAction( cmdFeatureMgr->action( "RicImportSummaryCaseFeature" ) );
importSummaryMenu->addAction( cmdFeatureMgr->action( "RicImportSummaryCasesFeature" ) );
importSummaryMenu->addAction( cmdFeatureMgr->action( "RicImportSummaryGroupFeature" ) );
importSummaryMenu->addAction( cmdFeatureMgr->action( "RicImportEnsembleFeature" ) );
QMenu* importEclipseMenu = importMenu->addMenu( QIcon( ":/import.svg" ), "More" );
caf::CmdFeatureMenuBuilder::appendToMenu( importEclipseMenu, RimEclipseCaseCollection::importMenuFeatureNames() );
importMenu->addSeparator();
QMenu* importGeoMechMenu = importMenu->addMenu( QIcon( ":/GeoMechCase24x24.png" ), "Geo Mechanical Cases" );
QMenu* importGeoMechMenu = importMenu->addMenu( QIcon( ":/GeoMechCase24x24.png" ), "Geo Mechanical Models" );
importGeoMechMenu->addAction( cmdFeatureMgr->action( "RicImportGeoMechCaseFeature" ) );
importGeoMechMenu->addAction( cmdFeatureMgr->action( "RicImportGeoMechCaseTimeStepFilterFeature" ) );
importGeoMechMenu->addAction( cmdFeatureMgr->action( "RicImportElementPropertyFeature" ) );
@@ -148,9 +139,6 @@ void RiuMenuBarBuildTools::addImportMenuWithActions( QObject* parent, QMenu* men
importWellMenu->addAction( cmdFeatureMgr->action( "RicImportWellMeasurementsFeature" ) );
importMenu->addSeparator();
importMenu->addAction( cmdFeatureMgr->action( "RicImportObservedDataFeature" ) );
importMenu->addAction( cmdFeatureMgr->action( "RicImportObservedFmuDataFeature" ) );
importMenu->addAction( cmdFeatureMgr->action( "RicImportPressureDepthDataFeature" ) );
importMenu->addAction( cmdFeatureMgr->action( "RicImportFormationNamesFeature" ) );
importMenu->addAction( cmdFeatureMgr->action( "RicImportSurfacesFeature" ) );
importMenu->addAction( cmdFeatureMgr->action( "RicImportSeismicFeature" ) );
@@ -158,6 +146,34 @@ void RiuMenuBarBuildTools::addImportMenuWithActions( QObject* parent, QMenu* men
RiuTools::enableAllActionsOnShow( parent, importMenu );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuMenuBarBuildTools::addImportMenuForPlotWindow( QObject* parent, QMenu* menu )
{
caf::CmdFeatureManager* cmdFeatureMgr = caf::CmdFeatureManager::instance();
if ( !parent || !menu || !cmdFeatureMgr ) return;
QMenu* importMenu = menu->addMenu( QIcon( ":/import.svg" ), "&Import" );
importMenu->addAction( cmdFeatureMgr->action( "RicImportSummaryCaseFeature" ) );
importMenu->addAction( cmdFeatureMgr->action( "RicImportGridAndSummaryEnsembleFeature" ) );
QMenu* importSummaryMenu = importMenu->addMenu( QIcon( ":/import.svg" ), "More" );
importSummaryMenu->addAction( cmdFeatureMgr->action( "RicImportRevealSummaryCaseFeature" ) );
importSummaryMenu->addAction( cmdFeatureMgr->action( "RicImportStimPlanSummaryCaseFeature" ) );
importSummaryMenu->addAction( cmdFeatureMgr->action( "RicImportSummaryCasesFeature" ) );
importSummaryMenu->addAction( cmdFeatureMgr->action( "RicImportSummaryGroupFeature" ) );
importSummaryMenu->addAction( cmdFeatureMgr->action( "RicImportEnsembleFeature" ) );
importMenu->addSeparator();
importMenu->addAction( cmdFeatureMgr->action( "RicImportObservedDataFeature" ) );
importMenu->addAction( cmdFeatureMgr->action( "RicImportObservedFmuDataFeature" ) );
importMenu->addAction( cmdFeatureMgr->action( "RicImportPressureDepthDataFeature" ) );
RiuTools::enableAllActionsOnShow( parent, importMenu );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
ApplicationLibCode/UserInterface/RiuMenuBarBuildTools.h
+2 -1
View File
@@ -33,7 +33,8 @@ QMenu* createDefaultEditMenu( QMenuBar* menuBar );
QMenu* createDefaultViewMenu( QMenuBar* menuBar );
QMenu* createDefaultHelpMenu( QMenuBar* menuBar );
void addImportMenuWithActions( QObject* parent, QMenu* menu );
void addImportMenuForMainWindow( QObject* parent, QMenu* menu );
void addImportMenuForPlotWindow( QObject* parent, QMenu* menu );
void addSaveProjectActions( QMenu* menu );
void addCloseAndExitActions( QMenu* menu );
ApplicationLibCode/UserInterface/RiuPlotMainWindow.cpp
+2 -2
View File
@@ -340,10 +340,10 @@ void RiuPlotMainWindow::createMenus()
fileMenu->addSeparator();
// Import menu actions
RiuMenuBarBuildTools::addImportMenuWithActions( this, fileMenu );
RiuMenuBarBuildTools::addImportMenuForPlotWindow( this, fileMenu );
// Export menu actions
QMenu* exportMenu = fileMenu->addMenu( "&Export" );
QMenu* exportMenu = fileMenu->addMenu( QIcon( ":/export.svg" ), "&Export" );
exportMenu->addAction( cmdFeatureMgr->action( "RicSnapshotViewToFileFeature" ) );
exportMenu->addAction( cmdFeatureMgr->action( "RicSnapshotViewToPdfFeature" ) );
exportMenu->addAction( cmdFeatureMgr->action( "RicSnapshotAllPlotsToFileFeature" ) );