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

#1917 Plot project tree. Clean up summary plot popup menu.

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2017-09-21 10:47:55 +02:00
parent 292ea3c67f
commit a72f2ea421
5 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/Commands/SummaryPlotCommands/CMakeLists_files.cmake
View File

@@ -21,7 +21,7 @@ ${CEE_CURRENT_LIST_DIR}RicNewGridTimeHistoryCurveFeature.h
${CEE_CURRENT_LIST_DIR}RicSelectSummaryPlotUI.h ${CEE_CURRENT_LIST_DIR}RicSelectSummaryPlotUI.h
${CEE_CURRENT_LIST_DIR}RicPasteTimeHistoryCurveFeature.h ${CEE_CURRENT_LIST_DIR}RicPasteTimeHistoryCurveFeature.h
${CEE_CURRENT_LIST_DIR}RicPasteAsciiDataCurveFeature.h ${CEE_CURRENT_LIST_DIR}RicPasteAsciiDataCurveFeature.h
${CEE_CURRENT_LIST_DIR}RicEditSummaryCurves.h ${CEE_CURRENT_LIST_DIR}RicEditSummaryPlotFeature.h
${CEE_CURRENT_LIST_DIR}RicSummaryCurveCreator.h ${CEE_CURRENT_LIST_DIR}RicSummaryCurveCreator.h
${CEE_CURRENT_LIST_DIR}RicSummaryCurveCreatorSplitterUi.h ${CEE_CURRENT_LIST_DIR}RicSummaryCurveCreatorSplitterUi.h
${CEE_CURRENT_LIST_DIR}RicSummaryCurveCreatorDialog.h ${CEE_CURRENT_LIST_DIR}RicSummaryCurveCreatorDialog.h
@@ -45,7 +45,7 @@ ${CEE_CURRENT_LIST_DIR}RicNewGridTimeHistoryCurveFeature.cpp
${CEE_CURRENT_LIST_DIR}RicSelectSummaryPlotUI.cpp ${CEE_CURRENT_LIST_DIR}RicSelectSummaryPlotUI.cpp
${CEE_CURRENT_LIST_DIR}RicPasteTimeHistoryCurveFeature.cpp ${CEE_CURRENT_LIST_DIR}RicPasteTimeHistoryCurveFeature.cpp
${CEE_CURRENT_LIST_DIR}RicPasteAsciiDataCurveFeature.cpp ${CEE_CURRENT_LIST_DIR}RicPasteAsciiDataCurveFeature.cpp
${CEE_CURRENT_LIST_DIR}RicEditSummaryCurves.cpp ${CEE_CURRENT_LIST_DIR}RicEditSummaryPlotFeature.cpp
${CEE_CURRENT_LIST_DIR}RicSummaryCurveCreator.cpp ${CEE_CURRENT_LIST_DIR}RicSummaryCurveCreator.cpp
${CEE_CURRENT_LIST_DIR}RicSummaryCurveCreatorSplitterUi.cpp ${CEE_CURRENT_LIST_DIR}RicSummaryCurveCreatorSplitterUi.cpp
${CEE_CURRENT_LIST_DIR}RicSummaryCurveCreatorDialog.cpp ${CEE_CURRENT_LIST_DIR}RicSummaryCurveCreatorDialog.cpp

18
ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryCurves.cpp → ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryPlotFeature.cpp
View File

@@ -16,7 +16,7 @@
// //
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
#include "RicEditSummaryCurves.h" #include "RicEditSummaryPlotFeature.h"
#include "RiaApplication.h" #include "RiaApplication.h"
#include "RiaPreferences.h" #include "RiaPreferences.h"
@@ -33,12 +33,12 @@
#include "RicSummaryCurveCreatorFactoryImpl.h" #include "RicSummaryCurveCreatorFactoryImpl.h"
CAF_CMD_SOURCE_INIT(RicEditSummaryCurves, "RicEditSummaryCurves"); CAF_CMD_SOURCE_INIT(RicEditSummaryPlotFeature, "RicEditSummaryPlotFeature");
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RicEditSummaryCurves::RicEditSummaryCurves() RicEditSummaryPlotFeature::RicEditSummaryPlotFeature()
{ {
m_curveCreatorFactory = RicSummaryCurveCreatorFactoryImpl::instance(); m_curveCreatorFactory = RicSummaryCurveCreatorFactoryImpl::instance();
} }
@@ -46,7 +46,7 @@ RicEditSummaryCurves::RicEditSummaryCurves()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicEditSummaryCurves::closeDialogAndResetTargetPlot() void RicEditSummaryPlotFeature::closeDialogAndResetTargetPlot()
{ {
auto dialog = m_curveCreatorFactory->dialog(); auto dialog = m_curveCreatorFactory->dialog();
auto curveCreator = m_curveCreatorFactory->curveCreator(); auto curveCreator = m_curveCreatorFactory->curveCreator();
@@ -65,7 +65,7 @@ void RicEditSummaryCurves::closeDialogAndResetTargetPlot()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RicEditSummaryCurves::isCommandEnabled() bool RicEditSummaryPlotFeature::isCommandEnabled()
{ {
return true; return true;
} }
@@ -73,7 +73,7 @@ bool RicEditSummaryCurves::isCommandEnabled()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicEditSummaryCurves::onActionTriggered(bool isChecked) void RicEditSummaryPlotFeature::onActionTriggered(bool isChecked)
{ {
RimProject* project = RiaApplication::instance()->project(); RimProject* project = RiaApplication::instance()->project();
CVF_ASSERT(project); CVF_ASSERT(project);
@@ -96,8 +96,8 @@ void RicEditSummaryCurves::onActionTriggered(bool isChecked)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicEditSummaryCurves::setupActionLook(QAction* actionToSetup) void RicEditSummaryPlotFeature::setupActionLook(QAction* actionToSetup)
{ {
actionToSetup->setText("Edit Summary Curves"); actionToSetup->setText("Edit Summary Plot");
//actionToSetup->setIcon(QIcon(":/SummaryPlot16x16.png")); actionToSetup->setIcon(QIcon(":/SummaryPlot16x16.png"));
} }

4
ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryCurves.h → ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryPlotFeature.h
View File

@@ -30,10 +30,10 @@ namespace caf {
//================================================================================================== //==================================================================================================
/// ///
//================================================================================================== //==================================================================================================
class RicEditSummaryCurves : public caf::CmdFeature class RicEditSummaryPlotFeature : public caf::CmdFeature
{ {
CAF_CMD_HEADER_INIT; CAF_CMD_HEADER_INIT;
RicEditSummaryCurves(); RicEditSummaryPlotFeature();
public: public:
void closeDialogAndResetTargetPlot(); void closeDialogAndResetTargetPlot();

3
ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
View File

@@ -293,15 +293,14 @@ QStringList RimContextCommandBuilder::commandsFromSelection()
commandIds << "RicPasteSummaryPlotFeature"; commandIds << "RicPasteSummaryPlotFeature";
commandIds << "RicPasteAsciiDataToSummaryPlotFeature"; commandIds << "RicPasteAsciiDataToSummaryPlotFeature";
commandIds << "Separator"; commandIds << "Separator";
commandIds << "RicEditSummaryPlotFeature";
commandIds << "RicNewSummaryPlotFeature"; commandIds << "RicNewSummaryPlotFeature";
commandIds << "RicNewSummaryCurveFilterFeature";
commandIds << "RicNewSummaryCurveFeature"; commandIds << "RicNewSummaryCurveFeature";
commandIds << "RicAsciiExportSummaryPlotFeature"; commandIds << "RicAsciiExportSummaryPlotFeature";
commandIds << "Separator"; commandIds << "Separator";
commandIds << "RicCopyReferencesToClipboardFeature"; commandIds << "RicCopyReferencesToClipboardFeature";
commandIds << "Separator"; commandIds << "Separator";
commandIds << "RicViewZoomAllFeature"; commandIds << "RicViewZoomAllFeature";
commandIds << "RicEditSummaryCurves";
} }
else if (dynamic_cast<RimSummaryCurve*>(uiItem)) else if (dynamic_cast<RimSummaryCurve*>(uiItem))
{ {

4
ApplicationCode/UserInterface/RiuMainWindow.cpp
View File

@@ -59,7 +59,7 @@
#include "cafUtils.h" #include "cafUtils.h"
#include "ExportCommands/RicSnapshotAllViewsToFileFeature.h" #include "ExportCommands/RicSnapshotAllViewsToFileFeature.h"
#include "SummaryPlotCommands/RicEditSummaryCurves.h" #include "SummaryPlotCommands/RicEditSummaryPlotFeature.h"
#include "cvfTimer.h" #include "cvfTimer.h"
@@ -185,7 +185,7 @@ void RiuMainWindow::cleanupGuiCaseClose()
} }
m_processMonitor->startMonitorWorkProcess(NULL); m_processMonitor->startMonitorWorkProcess(NULL);
RicEditSummaryCurves* editSumCurves = dynamic_cast<RicEditSummaryCurves*>(caf::CmdFeatureManager::instance()->getCommandFeature("RicEditSummaryCurves")); RicEditSummaryPlotFeature* editSumCurves = dynamic_cast<RicEditSummaryPlotFeature*>(caf::CmdFeatureManager::instance()->getCommandFeature("RicEditSummaryPlotFeature"));
if (editSumCurves) if (editSumCurves)
{ {
editSumCurves->closeDialogAndResetTargetPlot(); editSumCurves->closeDialogAndResetTargetPlot();