#3037 AppFwk : Rename to setChildArrayField()

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

View File

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

View File

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

View File

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