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

WIP - command for adding property filters

Browse Source
This commit is contained in:
Pål Hagen
2015-08-06 14:54:18 +02:00
parent ad800bc594
commit a9e7a8f461
4 changed files with 115 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Commands/CMakeLists_files.cmake
View File

@@ -5,6 +5,7 @@ if (${CMAKE_VERSION} VERSION_GREATER "2.8.2")
endif()
set (SOURCE_GROUP_HEADER_FILES
${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterNew.h
${CEE_CURRENT_LIST_DIR}RicRangeFilterNew.h
${CEE_CURRENT_LIST_DIR}RicRangeFilterNewSliceI.h
${CEE_CURRENT_LIST_DIR}RicRangeFilterNewSliceJ.h
@@ -12,6 +13,7 @@ ${CEE_CURRENT_LIST_DIR}RicRangeFilterNewSliceK.h
)
set (SOURCE_GROUP_SOURCE_FILES
${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterNew.cpp
${CEE_CURRENT_LIST_DIR}RicRangeFilterNew.cpp
${CEE_CURRENT_LIST_DIR}RicRangeFilterNewSliceI.cpp
${CEE_CURRENT_LIST_DIR}RicRangeFilterNewSliceJ.cpp

67
ApplicationCode/Commands/RicEclipsePropertyFilterNew.cpp Normal file
View File

@@ -0,0 +1,67 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2015- Statoil ASA
// Copyright (C) 2015- Ceetron Solutions AS
//
// ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#include "RicEclipsePropertyFilterNew.h"
#include "RimEclipsePropertyFilter.h"
#include "RimEclipsePropertyFilterCollection.h"
#include "cafSelectionManager.h"
#include <QAction>
CAF_CMD_SOURCE_INIT(RicEclipsePropertyFilterNew, "RicEclipsePropertyFilterNew");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicEclipsePropertyFilterNew::isCommandEnabled()
{
std::vector<RimEclipsePropertyFilter*> selectedPropertyFilter;
caf::SelectionManager::instance()->objectsByType(&selectedPropertyFilter);
std::vector<RimEclipsePropertyFilterCollection*> selectedPropertyFilterCollection;
caf::SelectionManager::instance()->objectsByType(&selectedPropertyFilterCollection);
if (selectedPropertyFilter.size() > 0 || selectedPropertyFilterCollection.size() > 0)
{
return true;
}
else
{
return false;
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicEclipsePropertyFilterNew::onActionTriggered(bool isChecked)
{
// MODTODO
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicEclipsePropertyFilterNew::setupActionLook(QAction* actionToSetup)
{
actionToSetup->setIcon(QIcon(":/CellFilter_Values.png"));
actionToSetup->setText("New Property Filter");
}

39
ApplicationCode/Commands/RicEclipsePropertyFilterNew.h Normal file
View File

@@ -0,0 +1,39 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2015- Statoil ASA
// Copyright (C) 2015- Ceetron Solutions AS
//
// ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#pragma once
#include "cafCmdFeature.h"
//==================================================================================================
///
//==================================================================================================
class RicEclipsePropertyFilterNew : public caf::CmdFeature
{
CAF_CMD_HEADER_INIT;
protected:
// Overrides
virtual bool isCommandEnabled();
virtual void onActionTriggered( bool isChecked );
virtual void setupActionLook( QAction* actionToSetup );
};

10
ApplicationCode/ProjectDataModel/RimProject.cpp
View File

@@ -514,6 +514,8 @@ void RimProject::computeUtmAreaOfInterest()
#include "RimCellRangeFilterCollection.h"
#include "RimCellRangeFilter.h"
#include "RimEclipsePropertyFilterCollection.h"
#include "RimEclipsePropertyFilter.h"
//--------------------------------------------------------------------------------------------------
@@ -528,16 +530,18 @@ void RimProject::actionsBasedOnSelection(std::vector<QAction*>& actions)
if (uiItems.size() == 1)
{
if (dynamic_cast<RimCellRangeFilterCollection*>(uiItems[0]))
if (dynamic_cast<RimCellRangeFilterCollection*>(uiItems[0])
|| dynamic_cast<RimCellRangeFilter*>(uiItems[0]))
{
actions.push_back(commandManager->action("RicRangeFilterNew"));
actions.push_back(commandManager->action("RicRangeFilterNewSliceI"));
actions.push_back(commandManager->action("RicRangeFilterNewSliceJ"));
actions.push_back(commandManager->action("RicRangeFilterNewSliceK"));
}
else if (dynamic_cast<RimCellRangeFilter*>(uiItems[0]))
else if (dynamic_cast<RimEclipsePropertyFilterCollection*>(uiItems[0])
|| dynamic_cast<RimEclipsePropertyFilter*>(uiItems[0]))
{
actions.push_back(commandManager->action("RicRangeFilterNew"));
actions.push_back(commandManager->action("RicEclipsePropertyFilterNew"));
}
}