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

Janitor: Fix some minor GUI issues

Browse Source 
Use appendMenu instead of context command builder
Remove case name from import grid feature
Fix shortcut for feature
This commit is contained in:
Magne Sjaastad
2024-10-16 11:00:50 +02:00
parent 4fd9edc7a5
commit da321830a7
7 changed files with 51 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationLibCode/Commands/PlotTemplateCommands/RicCreatePlotFromTemplateByShortcutFeature.cpp
View File

@@ -71,7 +71,7 @@ void RicCreatePlotFromTemplateByShortcutFeature::setupActionLook( QAction* actio
actionToSetup->setText( "Create Plot from Last Used Template" );
actionToSetup->setIcon( QIcon( ":/plot-template-standard.svg" ) );
QKeySequence keySeq( Qt::CTRL, Qt::Key_T );
QKeySequence keySeq( Qt::CTRL | Qt::Key_T );
applyShortcutWithHintToAction( actionToSetup, keySeq );
}

5
ApplicationLibCode/Commands/RicImportGridModelFromSummaryCaseFeature.cpp
View File

@@ -63,10 +63,5 @@ void RicImportGridModelFromSummaryCaseFeature::setupActionLook( QAction* actionT
txt = "Import Grid Model";
}
if ( !summaryCaseName.isEmpty() )
{
txt += QString( " for '%1'" ).arg( summaryCaseName );
}
actionToSetup->setText( txt );
}

24
ApplicationLibCode/ProjectDataModel/RimContextCommandBuilder.cpp
View File

@@ -790,30 +790,6 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
menuBuilder << "RicConvertGroupToEnsembleFeature";
menuBuilder.addSeparator();
}
else if ( dynamic_cast<RimSummaryCase*>( firstUiItem ) )
{
menuBuilder << "RicShowDataSourcesForRealization";
menuBuilder.addSeparator();
menuBuilder.subMenuStart( "Import" );
menuBuilder << "RicImportSummaryCaseFeature";
menuBuilder << "RicImportSummaryCasesFeature";
menuBuilder << "RicImportSummaryGroupFeature";
menuBuilder << "RicImportEnsembleFeature";
menuBuilder.subMenuEnd();
menuBuilder.addSeparator();
menuBuilder << "RicNewSummaryMultiPlotFeature";
menuBuilder << "RicOpenSummaryPlotEditorFeature";
menuBuilder << "RicAppendSummaryCurvesForSummaryCasesFeature";
menuBuilder << "RicAppendSummaryPlotsForSummaryCasesFeature";
menuBuilder.addSeparator();
menuBuilder << "RicImportGridModelFromSummaryCaseFeature";
if ( !dynamic_cast<RimObservedSummaryData*>( firstUiItem ) )
{
menuBuilder << "RicShowSummaryCurveCalculatorFeature";
}
}
else if ( dynamic_cast<RimWellLogChannel*>( firstUiItem ) )
{
menuBuilder << "RicAddWellLogToPlotFeature";

9
ApplicationLibCode/ProjectDataModel/Summary/RimObservedSummaryData.cpp
View File

@@ -110,6 +110,15 @@ QString RimObservedSummaryData::customWellName() const
return "";
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimObservedSummaryData::appendMenuItems( caf::CmdFeatureMenuBuilder& menuBuilder ) const
{
// Do not show curve calculator for observed data
RimSummaryCase::appendMenuItems( menuBuilder, false );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

2
ApplicationLibCode/ProjectDataModel/Summary/RimObservedSummaryData.h
View File

@@ -46,6 +46,8 @@ public:
protected:
QString customWellName() const;
void appendMenuItems( caf::CmdFeatureMenuBuilder& menuBuilder ) const override;
private:
QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions ) override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;

37
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCase.cpp
View File

@@ -27,6 +27,7 @@
#include "RimSummaryAddressCollection.h"
#include "RimSummaryEnsemble.h"
#include "cafCmdFeatureMenuBuilder.h"
#include "cafPdmFieldScriptingCapability.h"
#include "cafPdmUiCheckBoxEditor.h"
#include "cafPdmUiTreeOrdering.h"
@@ -224,6 +225,42 @@ void RimSummaryCase::buildChildNodes()
m_dataVectorFolders->updateFolderStructure( addresses, m_caseId );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryCase::appendMenuItems( caf::CmdFeatureMenuBuilder& menuBuilder ) const
{
appendMenuItems( menuBuilder, true );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryCase::appendMenuItems( caf::CmdFeatureMenuBuilder& menuBuilder, bool showCurveCalculator ) const
{
menuBuilder << "RicShowDataSourcesForRealization";
menuBuilder.addSeparator();
menuBuilder.subMenuStart( "Import" );
menuBuilder << "RicImportSummaryCaseFeature";
menuBuilder << "RicImportSummaryCasesFeature";
menuBuilder << "RicImportSummaryGroupFeature";
menuBuilder << "RicImportEnsembleFeature";
menuBuilder.subMenuEnd();
menuBuilder.addSeparator();
menuBuilder << "RicNewSummaryMultiPlotFeature";
menuBuilder << "RicOpenSummaryPlotEditorFeature";
menuBuilder << "RicAppendSummaryCurvesForSummaryCasesFeature";
menuBuilder << "RicAppendSummaryPlotsForSummaryCasesFeature";
menuBuilder.addSeparator();
menuBuilder << "RicImportGridModelFromSummaryCaseFeature";
if ( showCurveCalculator )
{
menuBuilder << "RicShowSummaryCurveCalculatorFeature";
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

2
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCase.h
View File

@@ -100,6 +100,8 @@ protected:
virtual QString caseName() const = 0;
void initAfterRead() override;
void appendMenuItems( caf::CmdFeatureMenuBuilder& menuBuilder ) const override;
void appendMenuItems( caf::CmdFeatureMenuBuilder& menuBuilder, bool showCurveCalculator ) const;
private:
void buildChildNodes();