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

Minor test application mainwindow changes after AppFwk updates

Browse Source
This commit is contained in:
Magne Sjaastad 2015-08-24 18:22:16 +02:00
parent c0d6caffe3
commit 08f570f4ed
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Fwk/AppFwk/cafTests/cafTestApplication/MainWindow.cpp
View File

@ -419,7 +419,7 @@ void MainWindow::createDockPanels()
m_pdmUiTreeView2 = new caf::PdmUiTreeView(dockWidget); m_pdmUiTreeView2 = new caf::PdmUiTreeView(dockWidget);
m_pdmUiTreeView2->enableDefaultContextMenu(true); m_pdmUiTreeView2->enableDefaultContextMenu(true);
m_pdmUiTreeView2->setCurrentSelectionToCurrentEditorSelection(true); m_pdmUiTreeView2->enableSelectionManagerUpdating(true);
dockWidget->setWidget(m_pdmUiTreeView2); dockWidget->setWidget(m_pdmUiTreeView2);
addDockWidget(Qt::RightDockWidgetArea, dockWidget); addDockWidget(Qt::RightDockWidgetArea, dockWidget);
@ -588,7 +588,7 @@ void MainWindow::createActions()
void MainWindow::slotInsert() void MainWindow::slotInsert()
{ {
std::vector<caf::PdmUiItem*> selection; std::vector<caf::PdmUiItem*> selection;
m_pdmUiTreeView->selectedObjects(selection); m_pdmUiTreeView->selectedUiItems(selection);
for (size_t i = 0; i < selection.size(); ++i) for (size_t i = 0; i < selection.size(); ++i)
{ {
@ -624,7 +624,7 @@ void MainWindow::slotInsert()
void MainWindow::slotRemove() void MainWindow::slotRemove()
{ {
std::vector<caf::PdmUiItem*> selection; std::vector<caf::PdmUiItem*> selection;
m_pdmUiTreeView->selectedObjects(selection); m_pdmUiTreeView->selectedUiItems(selection);
for (size_t i = 0; i < selection.size(); ++i) for (size_t i = 0; i < selection.size(); ++i)
{ {
@ -641,7 +641,7 @@ void MainWindow::slotRemove()
delete obj; delete obj;
// Update editors // Update editors
caf::PdmUiFieldHandle::updateConnectedUiEditors(field); field->uiCapability()->updateConnectedEditors();
break; break;
} }
@ -662,14 +662,14 @@ void MainWindow::slotRemoveAll()
void MainWindow::slotSimpleSelectionChanged() void MainWindow::slotSimpleSelectionChanged()
{ {
std::vector<caf::PdmUiItem*> selection; std::vector<caf::PdmUiItem*> selection;
m_pdmUiTreeView->selectedObjects(selection); m_pdmUiTreeView->selectedUiItems(selection);
caf::PdmObjectHandle* obj = NULL; caf::PdmObjectHandle* obj = NULL;
caf::PdmChildArrayFieldHandle* listField = NULL; caf::PdmChildArrayFieldHandle* listField = NULL;
if (selection.size()) if (selection.size())
{ {
caf::PdmUiObjectHandle* pdmUiObj = dynamic_cast<caf::PdmUiObjectHandle*>( selection[0] ); caf::PdmUiObjectHandle* pdmUiObj = dynamic_cast<caf::PdmUiObjectHandle*>( selection[0] );
if (pdmUiObj) obj = pdmUiObj->owner(); if (pdmUiObj) obj = pdmUiObj->objectHandle();
} }
m_pdmUiPropertyView->showProperties(obj); m_pdmUiPropertyView->showProperties(obj);
@ -681,7 +681,7 @@ void MainWindow::slotSimpleSelectionChanged()
void MainWindow::slotShowTableView() void MainWindow::slotShowTableView()
{ {
std::vector<caf::PdmUiItem*> selection; std::vector<caf::PdmUiItem*> selection;
m_pdmUiTreeView2->selectedObjects(selection); m_pdmUiTreeView2->selectedUiItems(selection);
caf::PdmObjectHandle* obj = NULL; caf::PdmObjectHandle* obj = NULL;
caf::PdmChildArrayFieldHandle* listField = NULL; caf::PdmChildArrayFieldHandle* listField = NULL;
@ -704,5 +704,8 @@ void MainWindow::slotShowTableView()
m_pdmUiTableView->setListField(listField); m_pdmUiTableView->setListField(listField);
caf::PdmUiFieldHandle::updateConnectedUiEditors(listField); if (listField)
{
listField->uiCapability()->updateConnectedEditors();
}
} }