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

#3037 AppFwk : Rename to setChildArrayField()

Browse Source
This commit is contained in:
Magne Sjaastad 2018-06-11 15:00:45 +02:00
parent c491939713
commit c24a7a13ae
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -794,7 +794,7 @@ MainWindow::~MainWindow()
m_pdmUiTreeView->setPdmItem(nullptr); m_pdmUiTreeView->setPdmItem(nullptr);
m_pdmUiTreeView2->setPdmItem(nullptr); m_pdmUiTreeView2->setPdmItem(nullptr);
m_pdmUiPropertyView->showProperties(nullptr); m_pdmUiPropertyView->showProperties(nullptr);
m_pdmUiTableView->setUiFieldHandle(nullptr); m_pdmUiTableView->setChildArrayField(nullptr);
delete m_pdmUiTreeView; delete m_pdmUiTreeView;
delete m_pdmUiTreeView2; delete m_pdmUiTreeView2;
@ -975,11 +975,12 @@ void MainWindow::slotShowTableView()
if (!childArrayFieldHandle->hasSameFieldCountForAllObjects()) if (!childArrayFieldHandle->hasSameFieldCountForAllObjects())
{ {
uiFieldHandle = nullptr; uiFieldHandle = nullptr;
childArrayFieldHandle = nullptr;
} }
} }
} }
m_pdmUiTableView->setUiFieldHandle(uiFieldHandle); m_pdmUiTableView->setChildArrayField(childArrayFieldHandle);
if (uiFieldHandle) if (uiFieldHandle)
{ {

12
Fwk/AppFwk/cafUserInterface/cafPdmUiTableView.cpp
View File

@ -37,6 +37,7 @@
#include "cafPdmUiTableView.h" #include "cafPdmUiTableView.h"
#include "cafPdmChildArrayField.h"
#include "cafPdmObject.h" #include "cafPdmObject.h"
#include "cafPdmUiTableViewEditor.h" #include "cafPdmUiTableViewEditor.h"
@ -83,11 +84,18 @@ PdmUiTableView::~PdmUiTableView()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void PdmUiTableView::setUiFieldHandle(PdmUiFieldHandle* uiFieldHandle) void PdmUiTableView::setChildArrayField(PdmChildArrayFieldHandle* childArrayField)
{ {
CAF_ASSERT(m_listViewEditor); CAF_ASSERT(m_listViewEditor);
m_listViewEditor->setField(uiFieldHandle); if (childArrayField)
{
m_listViewEditor->setField(childArrayField->uiCapability());
}
else
{
m_listViewEditor->setField(nullptr);
}
// SIG_CAF_HACK // SIG_CAF_HACK
m_listViewEditor->updateUi(m_uiConfigName); m_listViewEditor->updateUi(m_uiConfigName);

2
Fwk/AppFwk/cafUserInterface/cafPdmUiTableView.h
View File

@ -84,7 +84,7 @@ public:
// SIG_CAF_HACK // SIG_CAF_HACK
void setUiConfigurationName(QString uiConfigName); void setUiConfigurationName(QString uiConfigName);
void setUiFieldHandle(PdmUiFieldHandle* uiFieldHandle); void setChildArrayField(PdmChildArrayFieldHandle* childArrayField);
void enableDefaultContextMenu(bool enable); void enableDefaultContextMenu(bool enable);
void enableHeaderText(bool enable); void enableHeaderText(bool enable);