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

AppFwk: Auto resize of columns and rows when new field is displayed. Better Heading label behaviour.

Browse Source
This commit is contained in:
Jacob Støren 2018-07-04 16:45:26 +02:00
parent e5767c4f41
commit e739a95830
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewEditor.cpp
View File

@ -66,6 +66,7 @@ PdmUiTableViewEditor::PdmUiTableViewEditor()
m_tableModelPdm = nullptr;
m_tableHeadingIcon = nullptr;
m_delegate = nullptr;
m_previousFieldHandle = nullptr;
m_useDefaultContextMenu = false;
@ -116,8 +117,9 @@ QWidget* PdmUiTableViewEditor::createLabelWidget(QWidget * parent)
}
QHBoxLayout* layoutForIconLabel = new QHBoxLayout();
layoutForIconLabel->setMargin(0);
layoutForIconLabel->addWidget(m_tableHeadingIcon);
layoutForIconLabel->addSpacing(5);
layoutForIconLabel->addSpacing(3);
layoutForIconLabel->addWidget(m_tableHeading);
layoutForIconLabel->addStretch();
@ -164,9 +166,16 @@ void PdmUiTableViewEditor::configureAndUpdateUi(const QString& uiConfigName)
if (childArrayFH && childArrayFH->uiCapability())
{
QString text = "";
m_tableHeadingIcon->setPixmap(childArrayFH->uiCapability()->uiIcon(uiConfigName).pixmap(16, 16));
m_tableHeading->setText(childArrayFH->uiCapability()->uiName(uiConfigName) + QString(" (%1)").arg(childArrayFH->size()));
if ( childArrayFH->uiCapability()->uiIcon(uiConfigName).isNull() )
{
m_tableHeadingIcon->setText(childArrayFH->uiCapability()->uiName(uiConfigName) + QString(" (%1)").arg(childArrayFH->size()));
m_tableHeading->setText("");
}
else
{
m_tableHeadingIcon->setPixmap(childArrayFH->uiCapability()->uiIcon(uiConfigName).pixmap(16, 16));
m_tableHeading->setText(childArrayFH->uiCapability()->uiName(uiConfigName) + QString(" (%1)").arg(childArrayFH->size()));
}
m_tableModelPdm->createPersistentPushButtonWidgets(m_tableView);
}
else
@ -174,6 +183,13 @@ void PdmUiTableViewEditor::configureAndUpdateUi(const QString& uiConfigName)
m_tableHeading->setText("");
m_tableHeadingIcon->setPixmap(QPixmap());
}
if (m_previousFieldHandle != childArrayFH)
{
m_tableView->resizeColumnsToContents();
m_tableView->resizeRowsToContents();
m_previousFieldHandle = childArrayFH;
}
}
//--------------------------------------------------------------------------------------------------

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

@ -142,6 +142,8 @@ private:
bool m_useDefaultContextMenu;
SelectionManager::SelectionRole m_selectionRole;
bool m_isBlockingSelectionManagerChanged;
caf::PdmChildArrayFieldHandle* m_previousFieldHandle;
};