Release adjustments

* Use appendMenuItems instead of ContextCommandBuilder
* Specify RimEclipseCaseCollection menu features once
* Add function to enable up/down arrows for combo box
* Guard crash when closing project
* Improve UI for grid case ensemble
- Create a view for the first case in the ensemble
- Show case name in view title
- Enable up/down buttons to Eclipse case
* Make sure 3D views in grid ensemble are created on project load
This commit is contained in:
Magne Sjaastad
2024-09-16 09:49:22 +02:00
committed by GitHub
parent 1f80503f01
commit 9d66e6195e
22 changed files with 189 additions and 70 deletions

View File

@@ -18,13 +18,16 @@
#include "RiuMenuBarBuildTools.h"
#include "cafCmdFeatureManager.h"
#include "cvfAssert.h"
#include "RimEclipseCaseCollection.h"
#include "RiuToolTipMenu.h"
#include "RiuTools.h"
#include "cafCmdFeatureManager.h"
#include "cafCmdFeatureMenuBuilder.h"
#include "cvfAssert.h"
#include <QMainWindow>
#include <QMenu>
#include <QMenuBar>
@@ -113,11 +116,7 @@ void RiuMenuBarBuildTools::addImportMenuWithActions( QObject* parent, QMenu* men
QMenu* importMenu = menu->addMenu( "&Import" );
QMenu* importEclipseMenu = importMenu->addMenu( QIcon( ":/Case48x48.png" ), "Eclipse Cases" );
importEclipseMenu->addAction( cmdFeatureMgr->action( "RicImportEclipseCaseFeature" ) );
importEclipseMenu->addAction( cmdFeatureMgr->action( "RicImportEclipseCasesFeature" ) );
importEclipseMenu->addAction( cmdFeatureMgr->action( "RicImportEclipseCaseTimeStepFilterFeature" ) );
importEclipseMenu->addAction( cmdFeatureMgr->action( "RicImportInputEclipseCaseFeature" ) );
importEclipseMenu->addAction( cmdFeatureMgr->action( "RicCreateGridCaseGroupFromFilesFeature" ) );
caf::CmdFeatureMenuBuilder::appendToMenu( importEclipseMenu, RimEclipseCaseCollection::importMenuFeatureNames() );
QMenu* importRoffMenu = importMenu->addMenu( QIcon( ":/Case48x48.png" ), "Roff Grid Models" );
importRoffMenu->addAction( cmdFeatureMgr->action( "RicImportRoffCaseFeature" ) );

View File

@@ -18,8 +18,10 @@
#include "RiuTools.h"
#include "QMenu"
#include "QObject"
#include "cafPdmUiComboBoxEditor.h"
#include <QMenu>
#include <QObject>
//--------------------------------------------------------------------------------------------------
///
@@ -48,3 +50,16 @@ void RiuTools::enableAllActionsOnShow( QObject* object, QMenu* menu )
} );
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuTools::enableUpDownArrowsForComboBox( caf::PdmUiEditorAttribute* attribute )
{
if ( auto attrib = dynamic_cast<caf::PdmUiComboBoxEditorAttribute*>( attribute ) )
{
attrib->nextIcon = QIcon( ":/ComboBoxDown.svg" );
attrib->previousIcon = QIcon( ":/ComboBoxUp.svg" );
attrib->showPreviousAndNextButtons = true;
}
}

View File

@@ -23,8 +23,14 @@
class QMenu;
class QObject;
namespace caf
{
class PdmUiEditorAttribute;
}
namespace RiuTools
{
Qt::WindowFlags defaultDialogFlags();
void enableAllActionsOnShow( QObject* object, QMenu* menu );
void enableUpDownArrowsForComboBox( caf::PdmUiEditorAttribute* attribute );
} // end namespace RiuTools