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

File - Import: Add "Import Pressure Depth Data"

Browse Source 
* #9944 Add "Import Pressure Depth Data"  to import menu
Remove obsolete *InMenuFeatures and set all actions in menu to enabled when the signal aboutToShow() is triggered. This is useful for menus where no selection/context is available.
* Use RiaApplication::enableDevelopmentFeatures() to control visibility
This commit is contained in:
Magne Sjaastad
2023-03-10 13:20:39 +01:00
committed by GitHub
parent 07a4c13dd4
commit 74fa621332
10 changed files with 39 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationLibCode/UserInterface/RiuMainWindow.cpp
View File

@@ -64,6 +64,7 @@
#include "RiuResultInfoPanel.h"
#include "RiuResultQwtPlot.h"
#include "RiuToolTipMenu.h"
#include "RiuTools.h"
#include "RiuTreeViewEventFilter.h"
#include "RiuViewer.h"
@@ -475,11 +476,14 @@ void RiuMainWindow::createMenus()
importWellMenu->addAction( cmdFeatureMgr->action( "RicImportWellMeasurementsFeature" ) );
importMenu->addSeparator();
importMenu->addAction( cmdFeatureMgr->action( "RicImportObservedDataInMenuFeature" ) );
importMenu->addAction( cmdFeatureMgr->action( "RicImportObservedFmuDataInMenuFeature" ) );
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" ) );
RiuTools::enableAllActionsOnShow( this, importMenu );
QMenu* exportMenu = fileMenu->addMenu( "&Export" );
exportMenu->addAction( cmdFeatureMgr->action( "RicSnapshotViewToFileFeature" ) );
exportMenu->addAction( m_snapshotAllViewsToFile );

9
ApplicationLibCode/UserInterface/RiuMainWindowBase.cpp
View File

@@ -751,10 +751,11 @@ void RiuMainWindowBase::addDefaultEntriesToWindowsMenu()
}
}
#ifdef _DEBUG
QAction* exportLayoutAction = m_windowMenu->addAction( "Export Layout to Clipboard" );
connect( exportLayoutAction, SIGNAL( triggered() ), this, SLOT( exportDockLayout() ) );
#endif
if ( RiaApplication::enableDevelopmentFeatures() )
{
QAction* exportLayoutAction = m_windowMenu->addAction( "Export Layout to Clipboard" );
connect( exportLayoutAction, SIGNAL( triggered() ), this, SLOT( exportDockLayout() ) );
}
m_windowMenu->addSeparator();
QAction* cascadeWindowsAction = new QAction( "Cascade Windows", this );

8
ApplicationLibCode/UserInterface/RiuPlotMainWindow.cpp
View File

@@ -55,6 +55,7 @@
#include "RiuMessagePanel.h"
#include "RiuMultiPlotPage.h"
#include "RiuToolTipMenu.h"
#include "RiuTools.h"
#include "RiuTreeViewEventFilter.h"
#include "RiuWellAllocationPlot.h"
@@ -335,10 +336,13 @@ void RiuPlotMainWindow::createMenus()
importWellMenu->addAction( cmdFeatureMgr->action( "RicImportEnsembleWellLogsFeature" ) );
importMenu->addSeparator();
importMenu->addAction( cmdFeatureMgr->action( "RicImportObservedDataInMenuFeature" ) );
importMenu->addAction( cmdFeatureMgr->action( "RicImportObservedFmuDataInMenuFeature" ) );
importMenu->addAction( cmdFeatureMgr->action( "RicImportObservedDataFeature" ) );
importMenu->addAction( cmdFeatureMgr->action( "RicImportObservedFmuDataFeature" ) );
importMenu->addAction( cmdFeatureMgr->action( "RicImportPressureDepthDataFeature" ) );
importMenu->addAction( cmdFeatureMgr->action( "RicImportFormationNamesFeature" ) );
RiuTools::enableAllActionsOnShow( this, importMenu );
QMenu* exportMenu = fileMenu->addMenu( "&Export" );
exportMenu->addAction( cmdFeatureMgr->action( "RicSnapshotViewToFileFeature" ) );
exportMenu->addAction( cmdFeatureMgr->action( "RicSnapshotViewToPdfFeature" ) );

18
ApplicationLibCode/UserInterface/RiuTools.cpp
View File

@@ -18,6 +18,9 @@
#include "RiuTools.h"
#include "QMenu"
#include "QObject"
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -27,3 +30,18 @@ Qt::WindowFlags RiuTools::defaultDialogFlags()
return f;
}
//--------------------------------------------------------------------------------------------------
/// When a cafCmdFeature is used to create an action, the enable state is controlled by cafCmdFeature::isCommandEnabled(). If an action is
/// used in menus with no selection/context available, the enable state can be forced on before the menu is displayed.
//--------------------------------------------------------------------------------------------------
void RiuTools::enableAllActionsOnShow( QObject* object, QMenu* menu )
{
if ( object && menu )
{
object->connect( menu, &QMenu::aboutToShow, [menu]() {
for ( auto act : menu->actions() )
act->setEnabled( true );
} );
}
}

5
ApplicationLibCode/UserInterface/RiuTools.h
View File

@@ -20,8 +20,11 @@
#include "qnamespace.h"
class QMenu;
class QObject;
namespace RiuTools
{
Qt::WindowFlags defaultDialogFlags();
void applyGuiTheme();
void enableAllActionsOnShow( QObject* object, QMenu* menu );
} // end namespace RiuTools