diff --git a/ApplicationCode/Commands/SummaryPlotCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/SummaryPlotCommands/CMakeLists_files.cmake index 019bcd1234..b19ccf71e1 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/CMakeLists_files.cmake +++ b/ApplicationCode/Commands/SummaryPlotCommands/CMakeLists_files.cmake @@ -21,7 +21,7 @@ ${CEE_CURRENT_LIST_DIR}RicNewGridTimeHistoryCurveFeature.h ${CEE_CURRENT_LIST_DIR}RicSelectSummaryPlotUI.h ${CEE_CURRENT_LIST_DIR}RicPasteTimeHistoryCurveFeature.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}RicSummaryCurveCreatorSplitterUi.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}RicPasteTimeHistoryCurveFeature.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}RicSummaryCurveCreatorSplitterUi.cpp ${CEE_CURRENT_LIST_DIR}RicSummaryCurveCreatorDialog.cpp diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryCurves.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryPlotFeature.cpp similarity index 84% rename from ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryCurves.cpp rename to ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryPlotFeature.cpp index 76b81c2612..e9462b5534 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryCurves.cpp +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryPlotFeature.cpp @@ -16,7 +16,7 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RicEditSummaryCurves.h" +#include "RicEditSummaryPlotFeature.h" #include "RiaApplication.h" #include "RiaPreferences.h" @@ -33,12 +33,12 @@ #include "RicSummaryCurveCreatorFactoryImpl.h" -CAF_CMD_SOURCE_INIT(RicEditSummaryCurves, "RicEditSummaryCurves"); +CAF_CMD_SOURCE_INIT(RicEditSummaryPlotFeature, "RicEditSummaryPlotFeature"); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RicEditSummaryCurves::RicEditSummaryCurves() +RicEditSummaryPlotFeature::RicEditSummaryPlotFeature() { m_curveCreatorFactory = RicSummaryCurveCreatorFactoryImpl::instance(); } @@ -46,7 +46,7 @@ RicEditSummaryCurves::RicEditSummaryCurves() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicEditSummaryCurves::closeDialogAndResetTargetPlot() +void RicEditSummaryPlotFeature::closeDialogAndResetTargetPlot() { auto dialog = m_curveCreatorFactory->dialog(); auto curveCreator = m_curveCreatorFactory->curveCreator(); @@ -65,7 +65,7 @@ void RicEditSummaryCurves::closeDialogAndResetTargetPlot() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RicEditSummaryCurves::isCommandEnabled() +bool RicEditSummaryPlotFeature::isCommandEnabled() { return true; } @@ -73,7 +73,7 @@ bool RicEditSummaryCurves::isCommandEnabled() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicEditSummaryCurves::onActionTriggered(bool isChecked) +void RicEditSummaryPlotFeature::onActionTriggered(bool isChecked) { RimProject* project = RiaApplication::instance()->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->setIcon(QIcon(":/SummaryPlot16x16.png")); + actionToSetup->setText("Edit Summary Plot"); + actionToSetup->setIcon(QIcon(":/SummaryPlot16x16.png")); } diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryCurves.h b/ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryPlotFeature.h similarity index 94% rename from ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryCurves.h rename to ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryPlotFeature.h index 89a64a71c8..9e4a911cb4 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryCurves.h +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryPlotFeature.h @@ -30,10 +30,10 @@ namespace caf { //================================================================================================== /// //================================================================================================== -class RicEditSummaryCurves : public caf::CmdFeature +class RicEditSummaryPlotFeature : public caf::CmdFeature { CAF_CMD_HEADER_INIT; - RicEditSummaryCurves(); + RicEditSummaryPlotFeature(); public: void closeDialogAndResetTargetPlot(); diff --git a/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp b/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp index c60468aed5..7d51de28a5 100644 --- a/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp +++ b/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp @@ -293,15 +293,14 @@ QStringList RimContextCommandBuilder::commandsFromSelection() commandIds << "RicPasteSummaryPlotFeature"; commandIds << "RicPasteAsciiDataToSummaryPlotFeature"; commandIds << "Separator"; + commandIds << "RicEditSummaryPlotFeature"; commandIds << "RicNewSummaryPlotFeature"; - commandIds << "RicNewSummaryCurveFilterFeature"; commandIds << "RicNewSummaryCurveFeature"; commandIds << "RicAsciiExportSummaryPlotFeature"; commandIds << "Separator"; commandIds << "RicCopyReferencesToClipboardFeature"; commandIds << "Separator"; commandIds << "RicViewZoomAllFeature"; - commandIds << "RicEditSummaryCurves"; } else if (dynamic_cast(uiItem)) { diff --git a/ApplicationCode/UserInterface/RiuMainWindow.cpp b/ApplicationCode/UserInterface/RiuMainWindow.cpp index deb4b71a1a..80100130ce 100644 --- a/ApplicationCode/UserInterface/RiuMainWindow.cpp +++ b/ApplicationCode/UserInterface/RiuMainWindow.cpp @@ -59,7 +59,7 @@ #include "cafUtils.h" #include "ExportCommands/RicSnapshotAllViewsToFileFeature.h" -#include "SummaryPlotCommands/RicEditSummaryCurves.h" +#include "SummaryPlotCommands/RicEditSummaryPlotFeature.h" #include "cvfTimer.h" @@ -185,7 +185,7 @@ void RiuMainWindow::cleanupGuiCaseClose() } m_processMonitor->startMonitorWorkProcess(NULL); - RicEditSummaryCurves* editSumCurves = dynamic_cast(caf::CmdFeatureManager::instance()->getCommandFeature("RicEditSummaryCurves")); + RicEditSummaryPlotFeature* editSumCurves = dynamic_cast(caf::CmdFeatureManager::instance()->getCommandFeature("RicEditSummaryPlotFeature")); if (editSumCurves) { editSumCurves->closeDialogAndResetTargetPlot();