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

(#364) Using actions from command features

Browse Source 
Removed actions and slots that have already been refactored as command
features. Now picking the corresponding actions from the command feature
manager instead.
This commit is contained in:
Pål Hagen 2015-08-24 13:38:43 +02:00
parent 16764b5487
commit bef4fe453f
2 changed files with 27 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
ApplicationCode/UserInterface/RiuMainWindow.cpp
View File

@ -208,13 +208,7 @@ void RiuMainWindow::createActions()
m_openProjectAction = new QAction(style()->standardIcon(QStyle::SP_DirOpenIcon), "&Open Project", this); m_openProjectAction = new QAction(style()->standardIcon(QStyle::SP_DirOpenIcon), "&Open Project", this);
m_openLastUsedProjectAction = new QAction("Open &Last Used Project", this); m_openLastUsedProjectAction = new QAction("Open &Last Used Project", this);
m_importEclipseCaseAction = new QAction(QIcon(":/Case48x48.png"), "Import &Eclipse Case", this);
m_importInputEclipseFileAction= new QAction(QIcon(":/EclipseInput48x48.png"), "Import &Input Eclipse Case", this);
m_importGeoMechCaseAction = new QAction(QIcon(":/GeoMechCase48x48.png"), "Import &Geo Mechanical Model", this); m_importGeoMechCaseAction = new QAction(QIcon(":/GeoMechCase48x48.png"), "Import &Geo Mechanical Model", this);
m_openMultipleEclipseCasesAction = new QAction(QIcon(":/CreateGridCaseGroup16x16.png"), "&Create Grid Case Group from Files", this);
m_importWellPathsFromFileAction = new QAction(QIcon(":/Well.png"), "Import &Well Paths from File", this);
m_importWellPathsFromSSIHubAction = new QAction(QIcon(":/WellCollection.png"),"Import Well Paths from &SSI-hub", this);
m_mockModelAction = new QAction("&Mock Model", this); m_mockModelAction = new QAction("&Mock Model", this);
m_mockResultsModelAction = new QAction("Mock Model With &Results", this); m_mockResultsModelAction = new QAction("Mock Model With &Results", this);
@ -246,13 +240,8 @@ void RiuMainWindow::createActions()
connect(m_openProjectAction, SIGNAL(triggered()), SLOT(slotOpenProject())); connect(m_openProjectAction, SIGNAL(triggered()), SLOT(slotOpenProject()));
connect(m_openLastUsedProjectAction, SIGNAL(triggered()), SLOT(slotOpenLastUsedProject())); connect(m_openLastUsedProjectAction, SIGNAL(triggered()), SLOT(slotOpenLastUsedProject()));
connect(m_importEclipseCaseAction, SIGNAL(triggered()), SLOT(slotImportEclipseCase()));
connect(m_importGeoMechCaseAction, SIGNAL(triggered()), SLOT(slotImportGeoMechModel()));
connect(m_importInputEclipseFileAction, SIGNAL(triggered()), SLOT(slotImportInputEclipseFiles())); connect(m_importGeoMechCaseAction, SIGNAL(triggered()), SLOT(slotImportGeoMechModel()));
connect(m_openMultipleEclipseCasesAction, SIGNAL(triggered()), SLOT(slotOpenMultipleCases()));
connect(m_importWellPathsFromFileAction, SIGNAL(triggered()), SLOT(slotImportWellPathsFromFile()));
connect(m_importWellPathsFromSSIHubAction, SIGNAL(triggered()), SLOT(slotImportWellPathsFromSSIHub()));
connect(m_mockModelAction, SIGNAL(triggered()), SLOT(slotMockModel())); connect(m_mockModelAction, SIGNAL(triggered()), SLOT(slotMockModel()));
connect(m_mockResultsModelAction, SIGNAL(triggered()), SLOT(slotMockResultsModel())); connect(m_mockResultsModelAction, SIGNAL(triggered()), SLOT(slotMockResultsModel()));
@ -400,6 +389,9 @@ public:
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RiuMainWindow::createMenus() void RiuMainWindow::createMenus()
{ {
caf::CmdFeatureManager* cmdFeatureMgr = caf::CmdFeatureManager::instance();
CVF_ASSERT(cmdFeatureMgr);
// File menu // File menu
QMenu* fileMenu = new ToolTipableMenu(menuBar()); QMenu* fileMenu = new ToolTipableMenu(menuBar());
fileMenu->setTitle("&File"); fileMenu->setTitle("&File");
@ -411,16 +403,16 @@ void RiuMainWindow::createMenus()
fileMenu->addSeparator(); fileMenu->addSeparator();
QMenu* importMenu = fileMenu->addMenu("&Import"); QMenu* importMenu = fileMenu->addMenu("&Import");
importMenu->addAction(m_importEclipseCaseAction); importMenu->addAction(cmdFeatureMgr->action("RicImportEclipseCaseFeature"));
importMenu->addAction(m_importInputEclipseFileAction); importMenu->addAction(cmdFeatureMgr->action("RicImportInputEclipseCaseFeature"));
importMenu->addAction(m_openMultipleEclipseCasesAction); importMenu->addAction(cmdFeatureMgr->action("RicCreateGridCaseGroupFeature"));
importMenu->addSeparator(); importMenu->addSeparator();
#ifdef USE_ODB_API #ifdef USE_ODB_API
importMenu->addAction(m_importGeoMechCaseAction); importMenu->addAction(m_importGeoMechCaseAction);
importMenu->addSeparator(); importMenu->addSeparator();
#endif #endif
importMenu->addAction(m_importWellPathsFromFileAction); importMenu->addAction(cmdFeatureMgr->action("RicWellPathsImportFileFeature"));
importMenu->addAction(m_importWellPathsFromSSIHubAction); importMenu->addAction(cmdFeatureMgr->action("RicWellPathsImportSsihubFeature"));
QMenu* exportMenu = fileMenu->addMenu("&Export"); QMenu* exportMenu = fileMenu->addMenu("&Export");
exportMenu->addAction(m_snapshotToFile); exportMenu->addAction(m_snapshotToFile);
@ -498,12 +490,14 @@ void RiuMainWindow::createMenus()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RiuMainWindow::createToolBars() void RiuMainWindow::createToolBars()
{ {
caf::CmdFeatureManager* cmdFeatureMgr = caf::CmdFeatureManager::instance();
CVF_ASSERT(cmdFeatureMgr);
m_standardToolBar = addToolBar(tr("Standard")); m_standardToolBar = addToolBar(tr("Standard"));
m_standardToolBar->setObjectName(m_standardToolBar->windowTitle()); m_standardToolBar->setObjectName(m_standardToolBar->windowTitle());
m_standardToolBar->addAction(m_importEclipseCaseAction); m_standardToolBar->addAction(cmdFeatureMgr->action("RicImportEclipseCaseFeature"));
m_standardToolBar->addAction(m_importInputEclipseFileAction); m_standardToolBar->addAction(cmdFeatureMgr->action("RicImportInputEclipseCaseFeature"));
m_standardToolBar->addAction(m_openProjectAction); m_standardToolBar->addAction(m_openProjectAction);
//m_standardToolBar->addAction(m_openLastUsedProjectAction); //m_standardToolBar->addAction(m_openLastUsedProjectAction);
m_standardToolBar->addAction(m_saveProjectAction); m_standardToolBar->addAction(m_saveProjectAction);
@ -737,7 +731,10 @@ void RiuMainWindow::slotRefreshFileActions()
bool projectFileExists = QFile::exists(app->project()->fileName()); bool projectFileExists = QFile::exists(app->project()->fileName());
m_importWellPathsFromSSIHubAction->setEnabled(projectFileExists); caf::CmdFeatureManager* cmdFeatureMgr = caf::CmdFeatureManager::instance();
CVF_ASSERT(cmdFeatureMgr);
cmdFeatureMgr->action("RicWellPathsImportSsihubFeature")->setEnabled(projectFileExists);
} }
@ -893,36 +890,6 @@ void RiuMainWindow::slotAbout()
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuMainWindow::slotImportEclipseCase()
{
if (checkForDocumentModifications())
{
QAction* action = caf::CmdFeatureManager::instance()->action("RicImportEclipseCaseFeature");
CVF_ASSERT(action);
action->trigger();
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuMainWindow::slotImportInputEclipseFiles()
{
if (checkForDocumentModifications())
{
QAction* action = caf::CmdFeatureManager::instance()->action("RicImportInputEclipseCaseFeature");
CVF_ASSERT(action);
action->trigger();
}
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -992,15 +959,6 @@ void RiuMainWindow::slotOpenLastUsedProject()
} }
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuMainWindow::slotImportWellPathsFromFile()
{
caf::CmdFeatureManager* commandManager = caf::CmdFeatureManager::instance();
commandManager->action("RicWellPathsImportFileFeature")->trigger();
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
@ -1762,7 +1720,7 @@ void RiuMainWindow::hideAllDockWindows()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RiuMainWindow::slotOpenMultipleCases() /*void RiuMainWindow::slotOpenMultipleCases()
{ {
#if 1 #if 1
QAction* action = caf::CmdFeatureManager::instance()->action("RicCreateGridCaseGroupFeature"); QAction* action = caf::CmdFeatureManager::instance()->action("RicCreateGridCaseGroupFeature");
@ -1793,7 +1751,7 @@ void RiuMainWindow::slotOpenMultipleCases()
#endif #endif
} }
*/
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -2023,16 +1981,6 @@ void RiuMainWindow::selectedCases(std::vector<RimCase*>& cases)
#endif #endif
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuMainWindow::slotImportWellPathsFromSSIHub()
{
caf::CmdFeatureManager* commandManager = caf::CmdFeatureManager::instance();
commandManager->action("RicWellPathsImportSsihubFeature")->trigger();
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -2181,16 +2129,19 @@ void RiuMainWindow::appendActionsContextMenuForPdmObject(caf::PdmObjectHandle* p
return; return;
} }
caf::CmdFeatureManager* cmdFeatureMgr = caf::CmdFeatureManager::instance();
CVF_ASSERT(cmdFeatureMgr);
if (dynamic_cast<RimWellPathCollection*>(pdmObject)) if (dynamic_cast<RimWellPathCollection*>(pdmObject))
{ {
menu->addAction(m_importWellPathsFromFileAction); menu->addAction(cmdFeatureMgr->action("RicWellPathsImportFileFeature"));
menu->addAction(m_importWellPathsFromSSIHubAction); menu->addAction(cmdFeatureMgr->action("RicWellPathsImportSsihubFeature"));
} }
else if (dynamic_cast<RimEclipseCaseCollection*>(pdmObject)) else if (dynamic_cast<RimEclipseCaseCollection*>(pdmObject))
{ {
menu->addAction(m_importEclipseCaseAction); menu->addAction(cmdFeatureMgr->action("RicImportEclipseCaseFeature"));
menu->addAction(m_importInputEclipseFileAction); menu->addAction(cmdFeatureMgr->action("RicImportInputEclipseCaseFeature"));
menu->addAction(m_openMultipleEclipseCasesAction); menu->addAction(cmdFeatureMgr->action("RicCreateGridCaseGroupFeature"));
} }
else if (dynamic_cast<RimGeoMechModels*>(pdmObject)) else if (dynamic_cast<RimGeoMechModels*>(pdmObject))
{ {

10
ApplicationCode/UserInterface/RiuMainWindow.h
View File

@ -137,14 +137,9 @@ private:
private: private:
// File actions // File actions
QAction* m_importEclipseCaseAction;
QAction* m_importInputEclipseFileAction;
QAction* m_importGeoMechCaseAction; QAction* m_importGeoMechCaseAction;
QAction* m_openMultipleEclipseCasesAction;
QAction* m_openProjectAction; QAction* m_openProjectAction;
QAction* m_openLastUsedProjectAction; QAction* m_openLastUsedProjectAction;
QAction* m_importWellPathsFromFileAction;
QAction* m_importWellPathsFromSSIHubAction;
QAction* m_saveProjectAction; QAction* m_saveProjectAction;
QAction* m_saveProjectAsAction; QAction* m_saveProjectAsAction;
QAction* m_closeProjectAction; QAction* m_closeProjectAction;
@ -212,14 +207,9 @@ private:
private slots: private slots:
// File slots // File slots
void slotImportEclipseCase();
void slotImportInputEclipseFiles();
void slotImportGeoMechModel(); void slotImportGeoMechModel();
void slotOpenMultipleCases();
void slotOpenProject(); void slotOpenProject();
void slotOpenLastUsedProject(); void slotOpenLastUsedProject();
void slotImportWellPathsFromFile();
void slotImportWellPathsFromSSIHub();
void slotSaveProject(); void slotSaveProject();
void slotSaveProjectAs(); void slotSaveProjectAs();
void slotCloseProject(); void slotCloseProject();