(#632) Update application items when selection changes using a separate class

Added RiuSelectionChangedHandler
Moved code from ViewerCommands into SelectionChangedHandler
This commit is contained in:
Magne Sjaastad
2015-11-11 11:41:11 +01:00
parent ff6ea6cf0b
commit a13376a8bf
7 changed files with 449 additions and 199 deletions

View File

@@ -20,6 +20,25 @@
#include "RiuSelectionManager.h"
#include "RimEclipseView.h"
#include "RimGeoMechView.h"
#include "RiuSelectionChangedHandler.h"
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuSelectionManager::RiuSelectionManager()
: m_notificationCenter(new RiuSelectionChangedHandler)
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuSelectionManager::~RiuSelectionManager()
{
delete m_notificationCenter;
}
//--------------------------------------------------------------------------------------------------
///
@@ -41,19 +60,23 @@ void RiuSelectionManager::selectedItems(std::vector<RiuSelectionItem*>& items) c
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuSelectionManager::setSelectedItems(const std::vector<RiuSelectionItem*>& items)
void RiuSelectionManager::appendItemToSelection(RiuSelectionItem* item)
{
CVF_ASSERT(m_selection.size() == 0);
m_selection.push_back(item);
m_selection = items;
m_notificationCenter->handleItemAppended(item);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuSelectionManager::appendItemToSelection(RiuSelectionItem* item)
void RiuSelectionManager::setSelectedItem(RiuSelectionItem* item)
{
deleteAllItemsFromSelection();
m_selection.push_back(item);
m_notificationCenter->handleSetSelectedItem(item);
}
//--------------------------------------------------------------------------------------------------
@@ -61,12 +84,11 @@ void RiuSelectionManager::appendItemToSelection(RiuSelectionItem* item)
//--------------------------------------------------------------------------------------------------
void RiuSelectionManager::deleteAllItems()
{
for (size_t i = 0; i < m_selection.size(); i++)
{
delete m_selection[i];
}
if (m_selection.size() == 0) return;
m_selection.clear();
deleteAllItemsFromSelection();
m_notificationCenter->handleSelectionDeleted();
}
//--------------------------------------------------------------------------------------------------
@@ -80,10 +102,38 @@ bool RiuSelectionManager::isEmpty() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuEclipseSelectionItem::RiuEclipseSelectionItem(RimEclipseView* view, size_t gridIndex, size_t cellIndex, cvf::Color3f color)
void RiuSelectionManager::deleteAllItemsFromSelection()
{
for (size_t i = 0; i < m_selection.size(); i++)
{
delete m_selection[i];
}
m_selection.clear();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuEclipseSelectionItem::RiuEclipseSelectionItem(RimEclipseView* view, size_t gridIndex, size_t cellIndex, size_t nncIndex, cvf::Color3f color, cvf::StructGridInterface::FaceType face, const cvf::Vec3d& localIntersectionPoint)
: m_view(view),
m_gridIndex(gridIndex),
m_cellIndex(cellIndex),
m_color(color)
m_nncIndex(nncIndex),
m_color(color),
m_face(face),
m_localIntersectionPoint(localIntersectionPoint)
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuGeoMechSelectionItem::RiuGeoMechSelectionItem(RimGeoMechView* view, size_t gridIndex, size_t cellIndex, cvf::Color3f color, const cvf::Vec3d& localIntersectionPoint)
: m_view(view),
m_gridIndex(gridIndex),
m_cellIndex(cellIndex),
m_color(color),
m_localIntersectionPoint(localIntersectionPoint)
{
}