From eb8cba5e31e91d4b4f93289c734c6d6f0771a018 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Wed, 13 Jun 2018 11:41:32 +0200 Subject: [PATCH] #3037 AppFwk : Rename to PdmUiTableViewPushButtonEditorAttribute --- .../RimSummaryCalculationVariable.cpp | 4 +-- .../cafTestApplication/MainWindow.cpp | 2 +- .../cafUserInterface/cafPdmUiTableView.cpp | 31 ------------------- .../cafUserInterface/cafPdmUiTableView.h | 14 --------- .../cafPdmUiTableViewEditor.cpp | 31 +++++++++++++++++++ .../cafPdmUiTableViewEditor.h | 15 +++++++++ .../cafPdmUiTableViewQModel.cpp | 16 +++++----- .../cafPdmUiTableViewQModel.h | 4 +-- 8 files changed, 59 insertions(+), 58 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/RimSummaryCalculationVariable.cpp b/ApplicationCode/ProjectDataModel/RimSummaryCalculationVariable.cpp index c5f31f6842..92d3de5e1d 100644 --- a/ApplicationCode/ProjectDataModel/RimSummaryCalculationVariable.cpp +++ b/ApplicationCode/ProjectDataModel/RimSummaryCalculationVariable.cpp @@ -32,7 +32,7 @@ #include "RiuSummaryCurveDefSelectionDialog.h" #include "cafPdmUiPushButtonEditor.h" -#include "cafPdmUiTableView.h" +#include "cafPdmUiTableViewEditor.h" CAF_PDM_SOURCE_INIT(RimSummaryCalculationVariable, "RimSummaryCalculationVariable"); @@ -169,7 +169,7 @@ void RimSummaryCalculationVariable::defineUiOrdering(QString uiConfigName, caf:: //-------------------------------------------------------------------------------------------------- void RimSummaryCalculationVariable::defineObjectEditorAttribute(QString uiConfigName, caf::PdmUiEditorAttribute* attribute) { - caf::PdmUiTableViewEditorAttribute* attr = dynamic_cast(attribute); + caf::PdmUiTableViewPushButtonEditorAttribute* attr = dynamic_cast(attribute); if (attr) { attr->registerPushButtonTextForFieldKeyword(m_button.keyword(), "Edit"); diff --git a/Fwk/AppFwk/cafTests/cafTestApplication/MainWindow.cpp b/Fwk/AppFwk/cafTests/cafTestApplication/MainWindow.cpp index d8be2abe0d..4f912558a6 100644 --- a/Fwk/AppFwk/cafTests/cafTestApplication/MainWindow.cpp +++ b/Fwk/AppFwk/cafTests/cafTestApplication/MainWindow.cpp @@ -375,7 +375,7 @@ protected: //-------------------------------------------------------------------------------------------------- virtual void defineObjectEditorAttribute(QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override { - caf::PdmUiTableViewEditorAttribute* attr = dynamic_cast(attribute); + caf::PdmUiTableViewPushButtonEditorAttribute* attr = dynamic_cast(attribute); if (attr) { attr->registerPushButtonTextForFieldKeyword(m_pushButtonField.keyword(), "Edit"); diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiTableView.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiTableView.cpp index 6d5901c29d..16f17ca87f 100644 --- a/Fwk/AppFwk/cafUserInterface/cafPdmUiTableView.cpp +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTableView.cpp @@ -175,36 +175,5 @@ PdmObjectHandle* PdmUiTableView::pdmObjectFromModelIndex(const QModelIndex& mi) } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void PdmUiTableViewEditorAttribute::registerPushButtonTextForFieldKeyword(const QString& keyword, const QString& text) -{ - m_fieldKeywordAndPushButtonText[keyword] = text; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -bool PdmUiTableViewEditorAttribute::showPushButtonForFieldKeyword(const QString& keyword) const -{ - if (m_fieldKeywordAndPushButtonText.count(keyword) > 0) return true; - - return false; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -QString PdmUiTableViewEditorAttribute::pushButtonText(const QString& keyword) const -{ - if (showPushButtonForFieldKeyword(keyword)) - { - return m_fieldKeywordAndPushButtonText.at(keyword); - } - - return ""; -} - } //End of namespace caf diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiTableView.h b/Fwk/AppFwk/cafUserInterface/cafPdmUiTableView.h index 315543456e..035309bd07 100644 --- a/Fwk/AppFwk/cafUserInterface/cafPdmUiTableView.h +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTableView.h @@ -54,20 +54,6 @@ class PdmObjectHandle; class PdmUiTableViewEditor; class PdmChildArrayFieldHandle; -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -class PdmUiTableViewEditorAttribute : public PdmUiEditorAttribute -{ -public: - void registerPushButtonTextForFieldKeyword(const QString& keyword, const QString& text); - - bool showPushButtonForFieldKeyword(const QString& keyword) const; - QString pushButtonText(const QString& keyword) const; - -private: - std::map m_fieldKeywordAndPushButtonText; -}; //================================================================================================== /// diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewEditor.cpp index a7ad44db5d..b6bc9a9df4 100644 --- a/Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewEditor.cpp +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewEditor.cpp @@ -438,6 +438,37 @@ caf::PdmChildArrayFieldHandle* PdmUiTableViewEditor::childArrayFieldHandle() return childArrayFieldHandle; } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void PdmUiTableViewPushButtonEditorAttribute::registerPushButtonTextForFieldKeyword(const QString& keyword, const QString& text) +{ + m_fieldKeywordAndPushButtonText[keyword] = text; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +bool PdmUiTableViewPushButtonEditorAttribute::showPushButtonForFieldKeyword(const QString& keyword) const +{ + if (m_fieldKeywordAndPushButtonText.count(keyword) > 0) return true; + + return false; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString PdmUiTableViewPushButtonEditorAttribute::pushButtonText(const QString& keyword) const +{ + if (showPushButtonForFieldKeyword(keyword)) + { + return m_fieldKeywordAndPushButtonText.at(keyword); + } + + return ""; +} + } // end namespace caf diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewEditor.h b/Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewEditor.h index 335bdfb7a7..48a5e03828 100644 --- a/Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewEditor.h +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewEditor.h @@ -60,6 +60,21 @@ class PdmUiItem; class PdmUiTableViewDelegate; class PdmUiTableViewQModel; +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +class PdmUiTableViewPushButtonEditorAttribute : public PdmUiEditorAttribute +{ +public: + void registerPushButtonTextForFieldKeyword(const QString& keyword, const QString& text); + + bool showPushButtonForFieldKeyword(const QString& keyword) const; + QString pushButtonText(const QString& keyword) const; + +private: + std::map m_fieldKeywordAndPushButtonText; +}; + //-------------------------------------------------------------------------------------------------- /// diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewQModel.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewQModel.cpp index 6987730446..7961ae0da1 100644 --- a/Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewQModel.cpp +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewQModel.cpp @@ -338,12 +338,12 @@ void PdmUiTableViewQModel::setPdmData(PdmChildArrayFieldHandle* listField, const if (m_pdmList && !m_pdmList->empty()) { - PdmObjectHandle* pdmObjHandle = m_pdmList->at(0); - PdmUiObjectHandle* uiObject = pdmObjHandle->uiCapability(); - if (uiObject) + PdmObjectHandle* firstObject = m_pdmList->at(0); + PdmUiObjectHandle* uiHandleForFirstObject = firstObject->uiCapability(); + if (uiHandleForFirstObject) { - uiObject->uiOrdering(configName, configForFirstObject); - uiObject->objectEditorAttribute(m_currentConfigName, &m_attributes); + uiHandleForFirstObject->uiOrdering(configName, configForFirstObject); + uiHandleForFirstObject->objectEditorAttribute(m_currentConfigName, &m_pushButtonEditorAttributes); } } @@ -570,7 +570,7 @@ bool PdmUiTableViewQModel::isRepresentingBoolean(const QModelIndex &index) const PdmFieldHandle* fieldHandle = getField(index); if (fieldHandle) { - if (m_attributes.showPushButtonForFieldKeyword(fieldHandle->keyword())) + if (m_pushButtonEditorAttributes.showPushButtonForFieldKeyword(fieldHandle->keyword())) { return false; } @@ -595,13 +595,13 @@ void PdmUiTableViewQModel::createPersistentPushButtonWidgets(QTableView* tableVi for (int col = 0; col < columnCount(); col++) { PdmFieldHandle* fieldHandle = getField(createIndex(0, col)); - if (m_attributes.showPushButtonForFieldKeyword(fieldHandle->keyword())) + if (m_pushButtonEditorAttributes.showPushButtonForFieldKeyword(fieldHandle->keyword())) { for (int row = 0; row < rowCount(); row++) { QModelIndex mi = createIndex(row, col); - tableView->setIndexWidget(mi, new TableViewPushButton(getField(mi)->uiCapability(), m_attributes.pushButtonText(fieldHandle->keyword()))); + tableView->setIndexWidget(mi, new TableViewPushButton(getField(mi)->uiCapability(), m_pushButtonEditorAttributes.pushButtonText(fieldHandle->keyword()))); tableView->openPersistentEditor(mi); } } diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewQModel.h b/Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewQModel.h index dc993f62b1..74f2bd789b 100644 --- a/Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewQModel.h +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewQModel.h @@ -39,7 +39,7 @@ #include "cafPdmUiTreeOrdering.h" #include "cafPdmUiFieldHandle.h" -#include "cafPdmUiTableView.h" +#include "cafPdmUiTableViewEditor.h" #include #include @@ -122,7 +122,7 @@ private: std::vector m_tableItemEditors; - PdmUiTableViewEditorAttribute m_attributes; + PdmUiTableViewPushButtonEditorAttribute m_pushButtonEditorAttributes; };