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

Whitespace

Browse Source
This commit is contained in:
Magne Sjaastad 2019-02-22 07:55:57 +01:00
parent 24bda0fda2
commit 735bd5a4b1
3 changed files with 144 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
Fwk/AppFwk/cafTests/cafTestApplication/ManyGroups.cpp
View File

@ -1,29 +1,53 @@
#include "ManyGroups.h" #include "ManyGroups.h"
#include "cafPdmUiTreeSelectionEditor.h"
#include "cafPdmUiListEditor.h" #include "cafPdmUiListEditor.h"
#include "cafPdmUiTreeSelectionEditor.h"
CAF_PDM_SOURCE_INIT(ManyGroups, "LargeObject"); CAF_PDM_SOURCE_INIT(ManyGroups, "LargeObject");
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
ManyGroups::ManyGroups() ManyGroups::ManyGroups()
{ {
CAF_PDM_InitObject("Many Groups", ":/images/win/filenew.png", "This object is a demo of the CAF framework", "This object is a demo of the CAF framework"); CAF_PDM_InitObject("Many Groups",
":/images/win/filenew.png",
"This object is a demo of the CAF framework",
"This object is a demo of the CAF framework");
CAF_PDM_InitField(&m_toggleField, "Toggle", false, "Add Items To Multi Select", "", "Toggle Field tooltip", " Toggle Field whatsthis"); CAF_PDM_InitField(
CAF_PDM_InitField(&m_doubleField, "BigNumber", 0.0, "Big Number", "", "Enter a big number here", "This is a place you can enter a big real value if you want"); &m_toggleField, "Toggle", false, "Add Items To Multi Select", "", "Toggle Field tooltip", " Toggle Field whatsthis");
CAF_PDM_InitField(&m_intField, "IntNumber", 0, "Small Number", "", "Enter some small number here", "This is a place you can enter a small integer value if you want"); CAF_PDM_InitField(&m_doubleField,
CAF_PDM_InitField(&m_textField, "TextField", QString(""), "Text", "", "Text tooltip", "This is a place you can enter a small integer value if you want"); "BigNumber",
0.0,
"Big Number",
"",
"Enter a big number here",
"This is a place you can enter a big real value if you want");
CAF_PDM_InitField(&m_intField,
"IntNumber",
0,
"Small Number",
"",
"Enter some small number here",
"This is a place you can enter a small integer value if you want");
CAF_PDM_InitField(&m_textField,
"TextField",
QString(""),
"Text",
"",
"Text tooltip",
"This is a place you can enter a small integer value if you want");
m_proxyDoubleField.registerSetMethod(this, &ManyGroups::setDoubleMember); m_proxyDoubleField.registerSetMethod(this, &ManyGroups::setDoubleMember);
m_proxyDoubleField.registerGetMethod(this, &ManyGroups::doubleMember); m_proxyDoubleField.registerGetMethod(this, &ManyGroups::doubleMember);
CAF_PDM_InitFieldNoDefault(&m_proxyDoubleField, "ProxyDouble", "Proxy Double", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_proxyDoubleField, "ProxyDouble", "Proxy Double", "", "", "");
m_proxyDoubleField = 0; m_proxyDoubleField = 0;
if (!(m_proxyDoubleField == 3)) { std::cout << "Double is not 3 " << std::endl; } if (!(m_proxyDoubleField == 3))
{
std::cout << "Double is not 3 " << std::endl;
}
CAF_PDM_InitFieldNoDefault(&m_multiSelectList, "SelectedItems", "Multi Select Field", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_multiSelectList, "SelectedItems", "Multi Select Field", "", "", "");
m_multiSelectList.uiCapability()->setAutoAddingOptionFromValue(false); m_multiSelectList.uiCapability()->setAutoAddingOptionFromValue(false);
@ -36,8 +60,9 @@ ManyGroups::ManyGroups()
m_multiSelectList.v().push_back("Second"); m_multiSelectList.v().push_back("Second");
m_multiSelectList.v().push_back("Third"); m_multiSelectList.v().push_back("Third");
CAF_PDM_InitField(&m_singleStringWithManySelectableItems, "m_singleStringWithManySelectableItems", QString(""), "Text with many items", "", "Text tooltip", ""); CAF_PDM_InitField(
m_singleStringWithManySelectableItems.uiCapability()->setUiEditorTypeName(caf::PdmUiListEditor::uiEditorTypeName()); &m_stringWithMultipleOptions, "m_stringWithMultipleOptions", QString(""), "Text with many items", "", "", "");
m_stringWithMultipleOptions.uiCapability()->setUiEditorTypeName(caf::PdmUiListEditor::uiEditorTypeName());
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -62,12 +87,13 @@ void ManyGroups::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo> ManyGroups::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) QList<caf::PdmOptionItemInfo> ManyGroups::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly)
{ {
QList<caf::PdmOptionItemInfo> options; QList<caf::PdmOptionItemInfo> options;
// Test code used to switch between two lists with different content, but same item count // Test code used to switch between two lists with different content, but same item count
if (fieldNeedingOptions == &m_singleStringWithManySelectableItems) if (fieldNeedingOptions == &m_stringWithMultipleOptions)
{ {
for (int i = 0; i < 100; i++) for (int i = 0; i < 100; i++)
{ {
@ -112,7 +138,7 @@ QList<caf::PdmOptionItemInfo> ManyGroups::calculateValueOptions(const caf::PdmFi
options.push_back(caf::PdmOptionItemInfo::createHeader(text, false, QIcon(QString(":/images/win/textbold.png")))); options.push_back(caf::PdmOptionItemInfo::createHeader(text, false, QIcon(QString(":/images/win/textbold.png"))));
{ {
text = "Second_a"; text = "Second_a";
caf::PdmOptionItemInfo itemInfo = caf::PdmOptionItemInfo(text, text, true); caf::PdmOptionItemInfo itemInfo = caf::PdmOptionItemInfo(text, text, true);
itemInfo.setLevel(1); itemInfo.setLevel(1);
options.push_back(itemInfo); options.push_back(itemInfo);
@ -120,7 +146,8 @@ QList<caf::PdmOptionItemInfo> ManyGroups::calculateValueOptions(const caf::PdmFi
{ {
text = "Second_b"; text = "Second_b";
caf::PdmOptionItemInfo itemInfo = caf::PdmOptionItemInfo(text, text, false, QIcon(QString(":/images/win/filenew.png"))); caf::PdmOptionItemInfo itemInfo =
caf::PdmOptionItemInfo(text, text, false, QIcon(QString(":/images/win/filenew.png")));
itemInfo.setLevel(1); itemInfo.setLevel(1);
options.push_back(itemInfo); options.push_back(itemInfo);
} }
@ -128,7 +155,7 @@ QList<caf::PdmOptionItemInfo> ManyGroups::calculateValueOptions(const caf::PdmFi
int additionalSubItems = 2; int additionalSubItems = 2;
for (auto i = 0; i < additionalSubItems; i++) for (auto i = 0; i < additionalSubItems; i++)
{ {
text = "Second_b_" + QString::number(i); text = "Second_b_" + QString::number(i);
caf::PdmOptionItemInfo itemInfo = caf::PdmOptionItemInfo(text, text); caf::PdmOptionItemInfo itemInfo = caf::PdmOptionItemInfo(text, text);
itemInfo.setLevel(1); itemInfo.setLevel(1);
options.push_back(itemInfo); options.push_back(itemInfo);
@ -141,7 +168,7 @@ QList<caf::PdmOptionItemInfo> ManyGroups::calculateValueOptions(const caf::PdmFi
} }
for (auto i = 0; i < s_additionalSubItems; i++) for (auto i = 0; i < s_additionalSubItems; i++)
{ {
text = "Second_b_" + QString::number(i); text = "Second_b_" + QString::number(i);
caf::PdmOptionItemInfo itemInfo = caf::PdmOptionItemInfo(text, text); caf::PdmOptionItemInfo itemInfo = caf::PdmOptionItemInfo(text, text);
itemInfo.setLevel(1); itemInfo.setLevel(1);
options.push_back(itemInfo); options.push_back(itemInfo);
@ -165,57 +192,59 @@ void ManyGroups::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOr
uiOrdering.add(&m_toggleField); uiOrdering.add(&m_toggleField);
uiOrdering.add(&m_multiSelectList); uiOrdering.add(&m_multiSelectList);
/* /*
{ {
caf::PdmUiGroup* group = uiOrdering.addNewGroup("First"); caf::PdmUiGroup* group = uiOrdering.addNewGroup("First");
caf::PdmUiGroup* subGroup = group->addNewGroup("First_Content"); caf::PdmUiGroup* subGroup = group->addNewGroup("First_Content");
subGroup->add(&m_doubleField); subGroup->add(&m_doubleField);
subGroup->add(&m_intField); subGroup->add(&m_intField);
caf::PdmUiGroup* subGroup2 = group->addNewGroup("First_Content_2"); caf::PdmUiGroup* subGroup2 = group->addNewGroup("First_Content_2");
} }
{ {
caf::PdmUiGroup* group = uiOrdering.addNewGroup("Second"); caf::PdmUiGroup* group = uiOrdering.addNewGroup("Second");
caf::PdmUiGroup* subGroup = group->addNewGroup("Second_Content"); caf::PdmUiGroup* subGroup = group->addNewGroup("Second_Content");
} }
{ {
caf::PdmUiGroup* group = uiOrdering.addNewGroup("Third"); caf::PdmUiGroup* group = uiOrdering.addNewGroup("Third");
caf::PdmUiGroup* subGroup = group->addNewGroup("Third_Content"); caf::PdmUiGroup* subGroup = group->addNewGroup("Third_Content");
} }
{ {
caf::PdmUiGroup* group = uiOrdering.addNewGroup("Fourth"); caf::PdmUiGroup* group = uiOrdering.addNewGroup("Fourth");
caf::PdmUiGroup* subGroup = group->addNewGroup("Fourth_Content"); caf::PdmUiGroup* subGroup = group->addNewGroup("Fourth_Content");
subGroup->add(&m_textField); subGroup->add(&m_textField);
} }
{ {
caf::PdmUiGroup* group = uiOrdering.addNewGroup("Fifth"); caf::PdmUiGroup* group = uiOrdering.addNewGroup("Fifth");
caf::PdmUiGroup* subGroup = group->addNewGroup("Fifth_Content"); caf::PdmUiGroup* subGroup = group->addNewGroup("Fifth_Content");
subGroup->add(&m_proxyDoubleField); subGroup->add(&m_proxyDoubleField);
} }
*/ */
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void ManyGroups::defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) void ManyGroups::defineEditorAttribute(const caf::PdmFieldHandle* field,
QString uiConfigName,
caf::PdmUiEditorAttribute* attribute)
{ {
if (field == &m_multiSelectList) if (field == &m_multiSelectList)
{ {
caf::PdmUiTreeSelectionEditorAttribute* myAttr = dynamic_cast<caf::PdmUiTreeSelectionEditorAttribute*>(attribute); caf::PdmUiTreeSelectionEditorAttribute* myAttr = dynamic_cast<caf::PdmUiTreeSelectionEditorAttribute*>(attribute);
if (myAttr) if (myAttr)
{ {
//myAttr->showTextFilter = false; // myAttr->showTextFilter = false;
//myAttr->showToggleAllCheckbox = false; // myAttr->showToggleAllCheckbox = false;
} }
} }
} }

2
Fwk/AppFwk/cafTests/cafTestApplication/ManyGroups.h
View File

@ -18,7 +18,7 @@ public:
caf::PdmProxyValueField<double> m_proxyDoubleField; caf::PdmProxyValueField<double> m_proxyDoubleField;
caf::PdmField<std::vector<QString> > m_multiSelectList; caf::PdmField<std::vector<QString> > m_multiSelectList;
caf::PdmField<QString> m_singleStringWithManySelectableItems; caf::PdmField<QString> m_stringWithMultipleOptions;
caf::PdmField<bool> m_toggleField; caf::PdmField<bool> m_toggleField;
caf::PdmFieldHandle* objectToggleField() override; caf::PdmFieldHandle* objectToggleField() override;

89
Fwk/AppFwk/cafUserInterface/cafPdmUiFormLayoutObjectEditor.cpp
View File

@ -34,7 +34,6 @@
// //
//################################################################################################## //##################################################################################################
#include "cafPdmUiFormLayoutObjectEditor.h" #include "cafPdmUiFormLayoutObjectEditor.h"
#include "cafPdmObjectHandle.h" #include "cafPdmObjectHandle.h"
@ -57,10 +56,7 @@
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
caf::PdmUiFormLayoutObjectEditor::PdmUiFormLayoutObjectEditor() caf::PdmUiFormLayoutObjectEditor::PdmUiFormLayoutObjectEditor() {}
{
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
@ -103,7 +99,7 @@ void caf::PdmUiFormLayoutObjectEditor::recursivelyConfigureAndUpdateUiOrderingIn
int nrOfExpandingItemsInRow = uiOrdering.nrOfExpandingItemsInRow(uiItemsInRow); int nrOfExpandingItemsInRow = uiOrdering.nrOfExpandingItemsInRow(uiItemsInRow);
int spareColumnsInRow = totalColumns - columnsRequiredForCurrentRow; int spareColumnsInRow = totalColumns - columnsRequiredForCurrentRow;
std::div_t columnsDiv = { 0, 0 }; std::div_t columnsDiv = {0, 0};
if (spareColumnsInRow && nrOfExpandingItemsInRow) if (spareColumnsInRow && nrOfExpandingItemsInRow)
{ {
columnsDiv = std::div(spareColumnsInRow, nrOfExpandingItemsInRow); columnsDiv = std::div(spareColumnsInRow, nrOfExpandingItemsInRow);
@ -115,7 +111,8 @@ void caf::PdmUiFormLayoutObjectEditor::recursivelyConfigureAndUpdateUiOrderingIn
PdmUiOrdering::LayoutOptions currentLayout = uiItemsInRow[i].second; PdmUiOrdering::LayoutOptions currentLayout = uiItemsInRow[i].second;
int minimumItemColumnSpan = 0, minimumLabelColumnSpan = 0, minimumFieldColumnSpan = 0; int minimumItemColumnSpan = 0, minimumLabelColumnSpan = 0, minimumFieldColumnSpan = 0;
uiOrdering.nrOfColumnsRequiredForItem(uiItemsInRow[i], &minimumItemColumnSpan, &minimumLabelColumnSpan, &minimumFieldColumnSpan); uiOrdering.nrOfColumnsRequiredForItem(
uiItemsInRow[i], &minimumItemColumnSpan, &minimumLabelColumnSpan, &minimumFieldColumnSpan);
bool isExpandingItem = currentLayout.totalColumnSpan == PdmUiOrdering::LayoutOptions::MAX_COLUMN_SPAN; bool isExpandingItem = currentLayout.totalColumnSpan == PdmUiOrdering::LayoutOptions::MAX_COLUMN_SPAN;
int spareColumnsToAssign = 0; int spareColumnsToAssign = 0;
@ -125,13 +122,17 @@ void caf::PdmUiFormLayoutObjectEditor::recursivelyConfigureAndUpdateUiOrderingIn
if (i == 0) spareColumnsToAssign += columnsDiv.rem; if (i == 0) spareColumnsToAssign += columnsDiv.rem;
} }
int itemColumnSpan = minimumItemColumnSpan + spareColumnsToAssign; int itemColumnSpan = minimumItemColumnSpan + spareColumnsToAssign;
if (currentItem->isUiGroup()) if (currentItem->isUiGroup())
{ {
recursivelyAddGroupToGridLayout(currentItem, containerWidgetWithGridLayout, recursivelyAddGroupToGridLayout(currentItem,
uiConfigName, parentLayout, currentRowIndex, containerWidgetWithGridLayout,
currentColumn, itemColumnSpan); uiConfigName,
parentLayout,
currentRowIndex,
currentColumn,
itemColumnSpan);
currentColumn += itemColumnSpan; currentColumn += itemColumnSpan;
} }
else else
@ -161,8 +162,8 @@ void caf::PdmUiFormLayoutObjectEditor::recursivelyConfigureAndUpdateUiOrderingIn
if (!fieldEditorWidget) continue; if (!fieldEditorWidget) continue;
int fieldColumnSpan = minimumFieldColumnSpan; int fieldColumnSpan = minimumFieldColumnSpan;
QWidget* fieldLabelWidget = fieldEditor->labelWidget(); QWidget* fieldLabelWidget = fieldEditor->labelWidget();
PdmUiItemInfo::LabelPosType labelPos = PdmUiItemInfo::HIDDEN; PdmUiItemInfo::LabelPosType labelPos = PdmUiItemInfo::HIDDEN;
if (fieldLabelWidget) if (fieldLabelWidget)
{ {
@ -188,7 +189,7 @@ void caf::PdmUiFormLayoutObjectEditor::recursivelyConfigureAndUpdateUiOrderingIn
CAF_ASSERT(labelPos == PdmUiItemInfo::LEFT); CAF_ASSERT(labelPos == PdmUiItemInfo::LEFT);
int leftLabelColumnSpan = minimumLabelColumnSpan; int leftLabelColumnSpan = minimumLabelColumnSpan;
if (currentLayout.leftLabelColumnSpan == PdmUiOrdering::LayoutOptions::MAX_COLUMN_SPAN && if (currentLayout.leftLabelColumnSpan == PdmUiOrdering::LayoutOptions::MAX_COLUMN_SPAN &&
currentLayout.totalColumnSpan != PdmUiOrdering::LayoutOptions::MAX_COLUMN_SPAN) currentLayout.totalColumnSpan != PdmUiOrdering::LayoutOptions::MAX_COLUMN_SPAN)
{ {
leftLabelColumnSpan += spareColumnsToAssign; leftLabelColumnSpan += spareColumnsToAssign;
spareColumnsToAssign = 0; spareColumnsToAssign = 0;
@ -199,7 +200,8 @@ void caf::PdmUiFormLayoutObjectEditor::recursivelyConfigureAndUpdateUiOrderingIn
spareColumnsToAssign -= spareColumnsToAssign / 2; spareColumnsToAssign -= spareColumnsToAssign / 2;
} }
parentLayout->addWidget(fieldLabelWidget, currentRowIndex, currentColumn, 1, leftLabelColumnSpan, Qt::AlignTop); parentLayout->addWidget(
fieldLabelWidget, currentRowIndex, currentColumn, 1, leftLabelColumnSpan, Qt::AlignTop);
currentColumn += leftLabelColumnSpan; currentColumn += leftLabelColumnSpan;
// Apply margins determined by the editor type // Apply margins determined by the editor type
@ -214,7 +216,8 @@ void caf::PdmUiFormLayoutObjectEditor::recursivelyConfigureAndUpdateUiOrderingIn
CAF_ASSERT(fieldColumnSpan >= 1 && "Need at least one column for the field"); CAF_ASSERT(fieldColumnSpan >= 1 && "Need at least one column for the field");
fieldColumnSpan = std::max(1, fieldColumnSpan); fieldColumnSpan = std::max(1, fieldColumnSpan);
parentLayout->addWidget(fieldEditorWidget, currentRowIndex, currentColumn, 1, fieldColumnSpan, Qt::AlignTop); parentLayout->addWidget(
fieldEditorWidget, currentRowIndex, currentColumn, 1, fieldColumnSpan, Qt::AlignTop);
currentColumn += fieldColumnSpan; currentColumn += fieldColumnSpan;
} }
@ -279,14 +282,15 @@ bool caf::PdmUiFormLayoutObjectEditor::isUiGroupExpanded(const PdmUiGroup* uiGro
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QMinimizePanel* caf::PdmUiFormLayoutObjectEditor::findOrCreateGroupBox(QWidget* parent, PdmUiGroup* group, const QString& uiConfigName) QMinimizePanel*
caf::PdmUiFormLayoutObjectEditor::findOrCreateGroupBox(QWidget* parent, PdmUiGroup* group, const QString& uiConfigName)
{ {
QString groupBoxKey = group->keyword(); QString groupBoxKey = group->keyword();
QMinimizePanel* groupBox = nullptr; QMinimizePanel* groupBox = nullptr;
QGridLayout* groupBoxLayout = nullptr; QGridLayout* groupBoxLayout = nullptr;
// Find or create groupBox // Find or create groupBox
std::map<QString, QPointer<QMinimizePanel> >::iterator it; std::map<QString, QPointer<QMinimizePanel>>::iterator it;
it = m_groupBoxes.find(groupBoxKey); it = m_groupBoxes.find(groupBoxKey);
if (it == m_groupBoxes.end()) if (it == m_groupBoxes.end())
@ -327,7 +331,9 @@ QMinimizePanel* caf::PdmUiFormLayoutObjectEditor::findOrCreateGroupBox(QWidget*
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
caf::PdmUiFieldEditorHandle* caf::PdmUiFormLayoutObjectEditor::findOrCreateFieldEditor(QWidget* parent, PdmUiFieldHandle* field, const QString& uiConfigName) caf::PdmUiFieldEditorHandle* caf::PdmUiFormLayoutObjectEditor::findOrCreateFieldEditor(QWidget* parent,
PdmUiFieldHandle* field,
const QString& uiConfigName)
{ {
caf::PdmUiFieldEditorHandle* fieldEditor = nullptr; caf::PdmUiFieldEditorHandle* fieldEditor = nullptr;
@ -353,7 +359,7 @@ caf::PdmUiFieldEditorHandle* caf::PdmUiFormLayoutObjectEditor::findOrCreateField
// This assert will trigger for PdmChildArrayField and PdmChildField // This assert will trigger for PdmChildArrayField and PdmChildField
// Consider to exclude assert or add editors for these types if the assert is reintroduced // Consider to exclude assert or add editors for these types if the assert is reintroduced
//CAF_ASSERT(false); // CAF_ASSERT(false);
} }
} }
else else
@ -371,8 +377,8 @@ void caf::PdmUiFormLayoutObjectEditor::groupBoxExpandedStateToggled(bool isExpan
{ {
if (!this->pdmObject()->xmlCapability()) return; if (!this->pdmObject()->xmlCapability()) return;
QString objKeyword = this->pdmObject()->xmlCapability()->classKeyword(); QString objKeyword = this->pdmObject()->xmlCapability()->classKeyword();
QMinimizePanel* panel = dynamic_cast<QMinimizePanel*>(this->sender()); QMinimizePanel* panel = dynamic_cast<QMinimizePanel*>(this->sender());
if (!panel) return; if (!panel) return;
@ -394,7 +400,7 @@ void caf::PdmUiFormLayoutObjectEditor::cleanupBeforeSettingPdmObject()
m_newGroupBoxes.clear(); m_newGroupBoxes.clear();
std::map<QString, QPointer<QMinimizePanel> >::iterator groupIt; std::map<QString, QPointer<QMinimizePanel>>::iterator groupIt;
for (groupIt = m_groupBoxes.begin(); groupIt != m_groupBoxes.end(); ++groupIt) for (groupIt = m_groupBoxes.begin(); groupIt != m_groupBoxes.end(); ++groupIt)
{ {
if (!groupIt->second.isNull()) groupIt->second->deleteLater(); if (!groupIt->second.isNull()) groupIt->second->deleteLater();
@ -432,7 +438,7 @@ void caf::PdmUiFormLayoutObjectEditor::configureAndUpdateUi(const QString& uiCon
// Remove all fieldViews not mentioned by the configuration from the layout // Remove all fieldViews not mentioned by the configuration from the layout
std::vector< PdmFieldHandle* > fvhToRemoveFromMap; std::vector<PdmFieldHandle*> fvhToRemoveFromMap;
for (it = m_fieldViews.begin(); it != m_fieldViews.end(); ++it) for (it = m_fieldViews.begin(); it != m_fieldViews.end(); ++it)
{ {
if (it->second->uiField() == nullptr) if (it->second->uiField() == nullptr)
@ -450,8 +456,8 @@ void caf::PdmUiFormLayoutObjectEditor::configureAndUpdateUi(const QString& uiCon
// Remove all unmentioned group boxes // Remove all unmentioned group boxes
std::map<QString, QPointer<QMinimizePanel> >::iterator itOld; std::map<QString, QPointer<QMinimizePanel>>::iterator itOld;
std::map<QString, QPointer<QMinimizePanel> >::iterator itNew; std::map<QString, QPointer<QMinimizePanel>>::iterator itNew;
for (itOld = m_groupBoxes.begin(); itOld != m_groupBoxes.end(); ++itOld) for (itOld = m_groupBoxes.begin(); itOld != m_groupBoxes.end(); ++itOld)
{ {
@ -475,29 +481,29 @@ void caf::PdmUiFormLayoutObjectEditor::configureAndUpdateUi(const QString& uiCon
// If this step is omitted, the scrollTo method ends up at arbitrary positions // If this step is omitted, the scrollTo method ends up at arbitrary positions
qApp->processEvents(); qApp->processEvents();
for (it = m_fieldViews.begin(); it != m_fieldViews.end(); ++it) for (it = m_fieldViews.begin(); it != m_fieldViews.end(); ++it)
{ {
auto myObj = dynamic_cast<PdmUiListEditor*>(it->second); auto myObj = dynamic_cast<PdmUiListEditor*>(it->second);
if (myObj) if (myObj)
{ {
myObj->ensureCurrentItemIsVisible(); myObj->ensureCurrentItemIsVisible();
} }
} }
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// Unused. Should probably remove /// Unused. Should probably remove
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void caf::PdmUiFormLayoutObjectEditor::recursiveVerifyUniqueNames(const std::vector<PdmUiItem*>& uiItems, void caf::PdmUiFormLayoutObjectEditor::recursiveVerifyUniqueNames(const std::vector<PdmUiItem*>& uiItems,
const QString& uiConfigName, const QString& uiConfigName,
std::set<QString>* fieldKeywordNames, std::set<QString>* fieldKeywordNames,
std::set<QString>* groupNames) std::set<QString>* groupNames)
{ {
for (size_t i = 0; i < uiItems.size(); ++i) for (size_t i = 0; i < uiItems.size(); ++i)
{ {
if (uiItems[i]->isUiGroup()) if (uiItems[i]->isUiGroup())
{ {
PdmUiGroup* group = static_cast<PdmUiGroup*>(uiItems[i]); PdmUiGroup* group = static_cast<PdmUiGroup*>(uiItems[i]);
const std::vector<PdmUiItem*>& groupChildren = group->uiItems(); const std::vector<PdmUiItem*>& groupChildren = group->uiItems();
QString groupBoxKey = group->keyword(); QString groupBoxKey = group->keyword();
@ -531,4 +537,3 @@ void caf::PdmUiFormLayoutObjectEditor::recursiveVerifyUniqueNames(const std::vec
} }
} }
} }