From 6669e6f005168cdfba4249d20ab0918c7b6b9af9 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Fri, 7 Aug 2015 09:13:22 +0200 Subject: [PATCH] Improved construction of range cell execute command --- ApplicationCode/Commands/RicRangeFilterNew.cpp | 3 +-- ApplicationCode/Commands/RicRangeFilterNewExec.cpp | 14 ++++++++++++-- ApplicationCode/Commands/RicRangeFilterNewExec.h | 9 ++++++--- .../Commands/RicRangeFilterNewSliceI.cpp | 3 +-- .../Commands/RicRangeFilterNewSliceJ.cpp | 3 +-- .../Commands/RicRangeFilterNewSliceK.cpp | 3 +-- 6 files changed, 22 insertions(+), 13 deletions(-) diff --git a/ApplicationCode/Commands/RicRangeFilterNew.cpp b/ApplicationCode/Commands/RicRangeFilterNew.cpp index 4696234dda..bd41d4fdc7 100644 --- a/ApplicationCode/Commands/RicRangeFilterNew.cpp +++ b/ApplicationCode/Commands/RicRangeFilterNew.cpp @@ -64,8 +64,7 @@ void RicRangeFilterNew::onActionTriggered(bool isChecked) { RimCellRangeFilterCollection* rangeFilterCollection = selectedRangeFilterCollection[0]; - RicRangeFilterNewExec* filterExec = new RicRangeFilterNewExec(NULL); - filterExec->cellRangeFilterCollection = rangeFilterCollection; + RicRangeFilterNewExec* filterExec = new RicRangeFilterNewExec(rangeFilterCollection); caf::CmdExecCommandManager::instance()->processExecuteCommand(filterExec); } diff --git a/ApplicationCode/Commands/RicRangeFilterNewExec.cpp b/ApplicationCode/Commands/RicRangeFilterNewExec.cpp index 0f74101978..4bad32012d 100644 --- a/ApplicationCode/Commands/RicRangeFilterNewExec.cpp +++ b/ApplicationCode/Commands/RicRangeFilterNewExec.cpp @@ -26,8 +26,8 @@ //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RicRangeFilterNewExec::RicRangeFilterNewExec(caf::NotificationCenter* notificationCenter) - : CmdExecuteCommand(notificationCenter) +RicRangeFilterNewExec::RicRangeFilterNewExec(RimCellRangeFilterCollection* rangeFilterCollection) + : CmdExecuteCommand(NULL) { m_iSlice = false; m_jSlice = false; @@ -36,6 +36,16 @@ RicRangeFilterNewExec::RicRangeFilterNewExec(caf::NotificationCenter* notificati m_iSliceStart = -1; m_jSliceStart = -1; m_kSliceStart = -1; + + cellRangeFilterCollection = rangeFilterCollection; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +RicRangeFilterNewExec::~RicRangeFilterNewExec() +{ + } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/Commands/RicRangeFilterNewExec.h b/ApplicationCode/Commands/RicRangeFilterNewExec.h index 92b5dbe865..e5788dd7d2 100644 --- a/ApplicationCode/Commands/RicRangeFilterNewExec.h +++ b/ApplicationCode/Commands/RicRangeFilterNewExec.h @@ -29,15 +29,15 @@ class RimCellRangeFilterCollection; class RicRangeFilterNewExec : public caf::CmdExecuteCommand { public: - RicRangeFilterNewExec(caf::NotificationCenter* notificationCenter); + RicRangeFilterNewExec(RimCellRangeFilterCollection* rangeFilterCollection); + + virtual ~RicRangeFilterNewExec(); virtual QString name(); virtual void redo(); virtual void undo(); public: - caf::PdmPointer cellRangeFilterCollection; - bool m_iSlice; bool m_jSlice; bool m_kSlice; @@ -45,6 +45,9 @@ public: int m_iSliceStart; int m_jSliceStart; int m_kSliceStart; + +private: + caf::PdmPointer cellRangeFilterCollection; }; diff --git a/ApplicationCode/Commands/RicRangeFilterNewSliceI.cpp b/ApplicationCode/Commands/RicRangeFilterNewSliceI.cpp index 67a3281fdb..0e14a97581 100644 --- a/ApplicationCode/Commands/RicRangeFilterNewSliceI.cpp +++ b/ApplicationCode/Commands/RicRangeFilterNewSliceI.cpp @@ -65,8 +65,7 @@ void RicRangeFilterNewSliceI::onActionTriggered(bool isChecked) { RimCellRangeFilterCollection* rangeFilterCollection = selectedRangeFilterCollection[0]; - RicRangeFilterNewExec* filterExec = new RicRangeFilterNewExec(NULL); - filterExec->cellRangeFilterCollection = rangeFilterCollection; + RicRangeFilterNewExec* filterExec = new RicRangeFilterNewExec(rangeFilterCollection); filterExec->m_iSlice = true; caf::CmdExecCommandManager::instance()->processExecuteCommand(filterExec); diff --git a/ApplicationCode/Commands/RicRangeFilterNewSliceJ.cpp b/ApplicationCode/Commands/RicRangeFilterNewSliceJ.cpp index a0469425be..c4f84bcb21 100644 --- a/ApplicationCode/Commands/RicRangeFilterNewSliceJ.cpp +++ b/ApplicationCode/Commands/RicRangeFilterNewSliceJ.cpp @@ -65,8 +65,7 @@ void RicRangeFilterNewSliceJ::onActionTriggered(bool isChecked) { RimCellRangeFilterCollection* rangeFilterCollection = selectedRangeFilterCollection[0]; - RicRangeFilterNewExec* filterExec = new RicRangeFilterNewExec(NULL); - filterExec->cellRangeFilterCollection = rangeFilterCollection; + RicRangeFilterNewExec* filterExec = new RicRangeFilterNewExec(rangeFilterCollection); filterExec->m_jSlice = true; caf::CmdExecCommandManager::instance()->processExecuteCommand(filterExec); diff --git a/ApplicationCode/Commands/RicRangeFilterNewSliceK.cpp b/ApplicationCode/Commands/RicRangeFilterNewSliceK.cpp index c759dfc046..51167b9fd9 100644 --- a/ApplicationCode/Commands/RicRangeFilterNewSliceK.cpp +++ b/ApplicationCode/Commands/RicRangeFilterNewSliceK.cpp @@ -65,8 +65,7 @@ void RicRangeFilterNewSliceK::onActionTriggered(bool isChecked) { RimCellRangeFilterCollection* rangeFilterCollection = selectedRangeFilterCollection[0]; - RicRangeFilterNewExec* filterExec = new RicRangeFilterNewExec(NULL); - filterExec->cellRangeFilterCollection = rangeFilterCollection; + RicRangeFilterNewExec* filterExec = new RicRangeFilterNewExec(rangeFilterCollection); filterExec->m_kSlice = true; caf::CmdExecCommandManager::instance()->processExecuteCommand(filterExec);