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

Improved construction of range cell execute command

Browse Source
This commit is contained in:
Magne Sjaastad 2015-08-07 09:13:22 +02:00
parent abbe591d7b
commit 6669e6f005
6 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ApplicationCode/Commands/RicRangeFilterNew.cpp
View File

@ -64,8 +64,7 @@ void RicRangeFilterNew::onActionTriggered(bool isChecked)
{ {
RimCellRangeFilterCollection* rangeFilterCollection = selectedRangeFilterCollection[0]; RimCellRangeFilterCollection* rangeFilterCollection = selectedRangeFilterCollection[0];
RicRangeFilterNewExec* filterExec = new RicRangeFilterNewExec(NULL); RicRangeFilterNewExec* filterExec = new RicRangeFilterNewExec(rangeFilterCollection);
filterExec->cellRangeFilterCollection = rangeFilterCollection;
caf::CmdExecCommandManager::instance()->processExecuteCommand(filterExec); caf::CmdExecCommandManager::instance()->processExecuteCommand(filterExec);
} }

14
ApplicationCode/Commands/RicRangeFilterNewExec.cpp
View File

@ -26,8 +26,8 @@
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RicRangeFilterNewExec::RicRangeFilterNewExec(caf::NotificationCenter* notificationCenter) RicRangeFilterNewExec::RicRangeFilterNewExec(RimCellRangeFilterCollection* rangeFilterCollection)
: CmdExecuteCommand(notificationCenter) : CmdExecuteCommand(NULL)
{ {
m_iSlice = false; m_iSlice = false;
m_jSlice = false; m_jSlice = false;
@ -36,6 +36,16 @@ RicRangeFilterNewExec::RicRangeFilterNewExec(caf::NotificationCenter* notificati
m_iSliceStart = -1; m_iSliceStart = -1;
m_jSliceStart = -1; m_jSliceStart = -1;
m_kSliceStart = -1; m_kSliceStart = -1;
cellRangeFilterCollection = rangeFilterCollection;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicRangeFilterNewExec::~RicRangeFilterNewExec()
{
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

9
ApplicationCode/Commands/RicRangeFilterNewExec.h
View File

@ -29,15 +29,15 @@ class RimCellRangeFilterCollection;
class RicRangeFilterNewExec : public caf::CmdExecuteCommand class RicRangeFilterNewExec : public caf::CmdExecuteCommand
{ {
public: public:
RicRangeFilterNewExec(caf::NotificationCenter* notificationCenter); RicRangeFilterNewExec(RimCellRangeFilterCollection* rangeFilterCollection);
virtual ~RicRangeFilterNewExec();
virtual QString name(); virtual QString name();
virtual void redo(); virtual void redo();
virtual void undo(); virtual void undo();
public: public:
caf::PdmPointer<RimCellRangeFilterCollection> cellRangeFilterCollection;
bool m_iSlice; bool m_iSlice;
bool m_jSlice; bool m_jSlice;
bool m_kSlice; bool m_kSlice;
@ -45,6 +45,9 @@ public:
int m_iSliceStart; int m_iSliceStart;
int m_jSliceStart; int m_jSliceStart;
int m_kSliceStart; int m_kSliceStart;
private:
caf::PdmPointer<RimCellRangeFilterCollection> cellRangeFilterCollection;
}; };

3
ApplicationCode/Commands/RicRangeFilterNewSliceI.cpp
View File

@ -65,8 +65,7 @@ void RicRangeFilterNewSliceI::onActionTriggered(bool isChecked)
{ {
RimCellRangeFilterCollection* rangeFilterCollection = selectedRangeFilterCollection[0]; RimCellRangeFilterCollection* rangeFilterCollection = selectedRangeFilterCollection[0];
RicRangeFilterNewExec* filterExec = new RicRangeFilterNewExec(NULL); RicRangeFilterNewExec* filterExec = new RicRangeFilterNewExec(rangeFilterCollection);
filterExec->cellRangeFilterCollection = rangeFilterCollection;
filterExec->m_iSlice = true; filterExec->m_iSlice = true;
caf::CmdExecCommandManager::instance()->processExecuteCommand(filterExec); caf::CmdExecCommandManager::instance()->processExecuteCommand(filterExec);

3
ApplicationCode/Commands/RicRangeFilterNewSliceJ.cpp
View File

@ -65,8 +65,7 @@ void RicRangeFilterNewSliceJ::onActionTriggered(bool isChecked)
{ {
RimCellRangeFilterCollection* rangeFilterCollection = selectedRangeFilterCollection[0]; RimCellRangeFilterCollection* rangeFilterCollection = selectedRangeFilterCollection[0];
RicRangeFilterNewExec* filterExec = new RicRangeFilterNewExec(NULL); RicRangeFilterNewExec* filterExec = new RicRangeFilterNewExec(rangeFilterCollection);
filterExec->cellRangeFilterCollection = rangeFilterCollection;
filterExec->m_jSlice = true; filterExec->m_jSlice = true;
caf::CmdExecCommandManager::instance()->processExecuteCommand(filterExec); caf::CmdExecCommandManager::instance()->processExecuteCommand(filterExec);

3
ApplicationCode/Commands/RicRangeFilterNewSliceK.cpp
View File

@ -65,8 +65,7 @@ void RicRangeFilterNewSliceK::onActionTriggered(bool isChecked)
{ {
RimCellRangeFilterCollection* rangeFilterCollection = selectedRangeFilterCollection[0]; RimCellRangeFilterCollection* rangeFilterCollection = selectedRangeFilterCollection[0];
RicRangeFilterNewExec* filterExec = new RicRangeFilterNewExec(NULL); RicRangeFilterNewExec* filterExec = new RicRangeFilterNewExec(rangeFilterCollection);
filterExec->cellRangeFilterCollection = rangeFilterCollection;
filterExec->m_kSlice = true; filterExec->m_kSlice = true;
caf::CmdExecCommandManager::instance()->processExecuteCommand(filterExec); caf::CmdExecCommandManager::instance()->processExecuteCommand(filterExec);