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 PdmUiTableViewPushButtonEditorAttribute

Browse Source
This commit is contained in:
Magne Sjaastad 2018-06-13 11:41:32 +02:00
parent a4f11daf0b
commit eb8cba5e31
8 changed files with 59 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/ProjectDataModel/RimSummaryCalculationVariable.cpp
View File

@ -32,7 +32,7 @@
#include "RiuSummaryCurveDefSelectionDialog.h" #include "RiuSummaryCurveDefSelectionDialog.h"
#include "cafPdmUiPushButtonEditor.h" #include "cafPdmUiPushButtonEditor.h"
#include "cafPdmUiTableView.h" #include "cafPdmUiTableViewEditor.h"
CAF_PDM_SOURCE_INIT(RimSummaryCalculationVariable, "RimSummaryCalculationVariable"); CAF_PDM_SOURCE_INIT(RimSummaryCalculationVariable, "RimSummaryCalculationVariable");
@ -169,7 +169,7 @@ void RimSummaryCalculationVariable::defineUiOrdering(QString uiConfigName, caf::
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimSummaryCalculationVariable::defineObjectEditorAttribute(QString uiConfigName, caf::PdmUiEditorAttribute* attribute) void RimSummaryCalculationVariable::defineObjectEditorAttribute(QString uiConfigName, caf::PdmUiEditorAttribute* attribute)
{ {
caf::PdmUiTableViewEditorAttribute* attr = dynamic_cast<caf::PdmUiTableViewEditorAttribute*>(attribute); caf::PdmUiTableViewPushButtonEditorAttribute* attr = dynamic_cast<caf::PdmUiTableViewPushButtonEditorAttribute*>(attribute);
if (attr) if (attr)
{ {
attr->registerPushButtonTextForFieldKeyword(m_button.keyword(), "Edit"); attr->registerPushButtonTextForFieldKeyword(m_button.keyword(), "Edit");

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

@ -375,7 +375,7 @@ protected:
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
virtual void defineObjectEditorAttribute(QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override virtual void defineObjectEditorAttribute(QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override
{ {
caf::PdmUiTableViewEditorAttribute* attr = dynamic_cast<caf::PdmUiTableViewEditorAttribute*>(attribute); caf::PdmUiTableViewPushButtonEditorAttribute* attr = dynamic_cast<caf::PdmUiTableViewPushButtonEditorAttribute*>(attribute);
if (attr) if (attr)
{ {
attr->registerPushButtonTextForFieldKeyword(m_pushButtonField.keyword(), "Edit"); attr->registerPushButtonTextForFieldKeyword(m_pushButtonField.keyword(), "Edit");

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

@ -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 } //End of namespace caf

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

@ -54,20 +54,6 @@ class PdmObjectHandle;
class PdmUiTableViewEditor; class PdmUiTableViewEditor;
class PdmChildArrayFieldHandle; 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<QString, QString> m_fieldKeywordAndPushButtonText;
};
//================================================================================================== //==================================================================================================
/// ///

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

@ -438,6 +438,37 @@ caf::PdmChildArrayFieldHandle* PdmUiTableViewEditor::childArrayFieldHandle()
return 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 } // end namespace caf

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

@ -60,6 +60,21 @@ class PdmUiItem;
class PdmUiTableViewDelegate; class PdmUiTableViewDelegate;
class PdmUiTableViewQModel; 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<QString, QString> m_fieldKeywordAndPushButtonText;
};
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///

16
Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewQModel.cpp
View File

@ -338,12 +338,12 @@ void PdmUiTableViewQModel::setPdmData(PdmChildArrayFieldHandle* listField, const
if (m_pdmList && !m_pdmList->empty()) if (m_pdmList && !m_pdmList->empty())
{ {
PdmObjectHandle* pdmObjHandle = m_pdmList->at(0); PdmObjectHandle* firstObject = m_pdmList->at(0);
PdmUiObjectHandle* uiObject = pdmObjHandle->uiCapability(); PdmUiObjectHandle* uiHandleForFirstObject = firstObject->uiCapability();
if (uiObject) if (uiHandleForFirstObject)
{ {
uiObject->uiOrdering(configName, configForFirstObject); uiHandleForFirstObject->uiOrdering(configName, configForFirstObject);
uiObject->objectEditorAttribute(m_currentConfigName, &m_attributes); uiHandleForFirstObject->objectEditorAttribute(m_currentConfigName, &m_pushButtonEditorAttributes);
} }
} }
@ -570,7 +570,7 @@ bool PdmUiTableViewQModel::isRepresentingBoolean(const QModelIndex &index) const
PdmFieldHandle* fieldHandle = getField(index); PdmFieldHandle* fieldHandle = getField(index);
if (fieldHandle) if (fieldHandle)
{ {
if (m_attributes.showPushButtonForFieldKeyword(fieldHandle->keyword())) if (m_pushButtonEditorAttributes.showPushButtonForFieldKeyword(fieldHandle->keyword()))
{ {
return false; return false;
} }
@ -595,13 +595,13 @@ void PdmUiTableViewQModel::createPersistentPushButtonWidgets(QTableView* tableVi
for (int col = 0; col < columnCount(); col++) for (int col = 0; col < columnCount(); col++)
{ {
PdmFieldHandle* fieldHandle = getField(createIndex(0, 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++) for (int row = 0; row < rowCount(); row++)
{ {
QModelIndex mi = createIndex(row, col); 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); tableView->openPersistentEditor(mi);
} }
} }

4
Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewQModel.h
View File

@ -39,7 +39,7 @@
#include "cafPdmUiTreeOrdering.h" #include "cafPdmUiTreeOrdering.h"
#include "cafPdmUiFieldHandle.h" #include "cafPdmUiFieldHandle.h"
#include "cafPdmUiTableView.h" #include "cafPdmUiTableViewEditor.h"
#include <QAbstractItemModel> #include <QAbstractItemModel>
#include <QItemSelection> #include <QItemSelection>
@ -122,7 +122,7 @@ private:
std::vector<PdmUiTableItemEditor*> m_tableItemEditors; std::vector<PdmUiTableItemEditor*> m_tableItemEditors;
PdmUiTableViewEditorAttribute m_attributes; PdmUiTableViewPushButtonEditorAttribute m_pushButtonEditorAttributes;
}; };