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

Made adding of objects more robust

Browse Source 
p4#: 21009
This commit is contained in:
Magne Sjaastad
2013-03-20 15:11:27 +01:00
parent 1a113b83d3
commit 53d7d62759
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ApplicationCode/ProjectDataModel/RimUiTreeModelPdm.cpp
View File

@@ -567,22 +567,26 @@ void RimUiTreeModelPdm::addObjects(const QModelIndex& itemIndex, caf::PdmObjectG
else if (dynamic_cast<RimCaseCollection*>(currentItem->dataObject().p()))
{
caseCollection = dynamic_cast<RimCaseCollection*>(currentItem->dataObject().p());
CVF_ASSERT(caseCollection);
gridCaseGroup = caseCollection->parentCaseGroup();
}
else if (dynamic_cast<RimReservoir*>(currentItem->dataObject().p()))
{
RimReservoir* rimReservoir = dynamic_cast<RimReservoir*>(currentItem->dataObject().p());
CVF_ASSERT(rimReservoir);
caseCollection = rimReservoir->parentCaseCollection();
gridCaseGroup = caseCollection->parentCaseGroup();
if (caseCollection)
{
gridCaseGroup = caseCollection->parentCaseGroup();
}
}
else
{
return;
}
CVF_ASSERT(caseCollection);
CVF_ASSERT(gridCaseGroup);
if (gridCaseGroup)
{
std::vector<caf::PdmPointer<RimResultReservoir> > typedObjects;

11
ApplicationCode/UserInterface/RIMainWindow.cpp
View File

@@ -375,6 +375,17 @@ void RIMainWindow::createDockPanels()
m_treeView = new RimUiTreeView(dockWidget);
m_treeView->setModel(m_treeModelPdm);
m_treeView->setSelectionMode(QAbstractItemView::ExtendedSelection);
// Must be enabled for drag and drop
/*
m_treeView->setSelectionMode(QAbstractItemView::SingleSelection);
m_treeView->setDragEnabled(true);
m_treeView->viewport()->setAcceptDrops(true);
m_treeView->setDropIndicatorShown(true);
m_treeView->setDragDropMode(QAbstractItemView::InternalMove);
*/
dockWidget->setWidget(m_treeView);