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 : Whitespace improvements and use modern c++

Browse Source
This commit is contained in:
Magne Sjaastad 2017-11-29 17:09:13 +01:00
parent cef82c77e3
commit 5efd583390
2 changed files with 35 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Fwk/AppFwk/cafUserInterface/cafPdmUiToolBarEditor.cpp
View File

@ -34,30 +34,25 @@
// //
//################################################################################################## //##################################################################################################
#include "cafPdmUiToolBarEditor.h" #include "cafPdmUiToolBarEditor.h"
#include "cafPdmField.h" #include "cafPdmField.h"
#include "cafPdmObjectHandle.h"
#include "cafPdmUiComboBoxEditor.h" #include "cafPdmUiComboBoxEditor.h"
#include "cafPdmUiFieldEditorHandle.h" #include "cafPdmUiFieldEditorHandle.h"
#include "cafPdmUiFieldEditorHelper.h"
#include "cafPdmUiFieldHandle.h"
#include "cafPdmUiObjectHandle.h"
#include "cafPdmUiOrdering.h"
#include "cafPdmUiPushButtonEditor.h" #include "cafPdmUiPushButtonEditor.h"
#include "cafPdmUiToolButtonEditor.h" #include "cafPdmUiToolButtonEditor.h"
#include <QToolBar>
#include <QMainWindow>
#include <QAction> #include <QAction>
#include <QMainWindow>
#include "cafPdmUiOrdering.h" #include <QToolBar>
#include "cafPdmObjectHandle.h"
#include "cafPdmUiObjectHandle.h"
#include "cafPdmUiFieldHandle.h"
#include "cafPdmUiFieldEditorHelper.h"
namespace caf namespace caf
{ {
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -83,23 +78,20 @@ PdmUiToolBarEditor::~PdmUiToolBarEditor()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void PdmUiToolBarEditor::configureAndUpdateUi(const QString& uiConfigName) void PdmUiToolBarEditor::configureAndUpdateUi(const QString& uiConfigName)
{ {
for (size_t fIdx = 0; fIdx < m_fields.size(); fIdx++) for (PdmFieldHandle* field : m_fields)
{ {
PdmFieldHandle* field = m_fields[fIdx]; PdmUiFieldEditorHandle* fieldEditor = nullptr;
PdmUiFieldEditorHandle* fieldEditor = NULL;
PdmUiOrdering config;
caf::PdmUiObjectHandle* ownerUiObject = uiObj(field->ownerObject()); caf::PdmUiObjectHandle* ownerUiObject = uiObj(field->ownerObject());
if (ownerUiObject) if (ownerUiObject)
{ {
PdmUiOrdering config;
ownerUiObject->uiOrdering(uiConfigName, config); ownerUiObject->uiOrdering(uiConfigName, config);
} }
// Find or create FieldEditor // Find or create FieldEditor
std::map<QString, PdmUiFieldEditorHandle*>::iterator it; std::map<QString, PdmUiFieldEditorHandle*>::iterator it;
it = m_fieldViews.find(field->keyword()); it = m_fieldViews.find(field->keyword());
if (it == m_fieldViews.end()) if (it == m_fieldViews.end())
{ {
caf::PdmUiFieldHandle* uiFieldHandle = field->uiCapability(); caf::PdmUiFieldHandle* uiFieldHandle = field->uiCapability();
@ -109,14 +101,14 @@ void PdmUiToolBarEditor::configureAndUpdateUi(const QString& uiConfigName)
{ {
if (uiFieldHandle->uiValue().type() == QVariant::Bool) if (uiFieldHandle->uiValue().type() == QVariant::Bool)
{ {
// Special handling of bool values into tool button editors
QString editorTypeName = caf::PdmUiToolButtonEditor::uiEditorTypeName(); QString editorTypeName = caf::PdmUiToolButtonEditor::uiEditorTypeName();
fieldEditor = caf::Factory<PdmUiFieldEditorHandle, QString>::instance()->create(editorTypeName); fieldEditor = caf::Factory<PdmUiFieldEditorHandle, QString>::instance()->create(editorTypeName);
} }
else else
{ {
fieldEditor = caf::PdmUiFieldEditorHelper::fieldEditorForField(field->uiCapability(), uiConfigName); fieldEditor = caf::PdmUiFieldEditorHelper::fieldEditorForField(field->uiCapability(), uiConfigName);
addSpace = true; addSpace = true;
} }
} }
@ -124,7 +116,7 @@ void PdmUiToolBarEditor::configureAndUpdateUi(const QString& uiConfigName)
if (fieldEditor) if (fieldEditor)
{ {
m_fieldViews[field->keyword()] = fieldEditor; m_fieldViews[field->keyword()] = fieldEditor;
fieldEditor->createWidgets(NULL); fieldEditor->createWidgets(nullptr);
m_actions.push_back(m_toolbar->addWidget(fieldEditor->editorWidget())); m_actions.push_back(m_toolbar->addWidget(fieldEditor->editorWidget()));
if (addSpace) if (addSpace)
@ -178,10 +170,9 @@ void PdmUiToolBarEditor::setFields(std::vector<caf::PdmFieldHandle*>& fields)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void PdmUiToolBarEditor::clear() void PdmUiToolBarEditor::clear()
{ {
std::map<QString, PdmUiFieldEditorHandle*>::iterator it; for (auto it : m_fieldViews)
for (it = m_fieldViews.begin(); it != m_fieldViews.end(); ++it)
{ {
delete it->second; delete it.second;
} }
m_fieldViews.clear(); m_fieldViews.clear();
@ -194,5 +185,4 @@ void PdmUiToolBarEditor::clear()
m_actions.clear(); m_actions.clear();
} }
} // end namespace caf } // end namespace caf

24
Fwk/AppFwk/cafUserInterface/cafPdmUiToolBarEditor.h
View File

@ -34,7 +34,6 @@
// //
//################################################################################################## //##################################################################################################
#pragma once #pragma once
#include "cafPdmUiEditorHandle.h" #include "cafPdmUiEditorHandle.h"
@ -49,11 +48,13 @@ class QMainWindow;
namespace caf namespace caf
{ {
class PdmUiFieldEditorHandle; class PdmUiFieldEditorHandle;
class PdmUiItem; class PdmUiItem;
class PdmFieldHandle; class PdmFieldHandle;
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
class PdmUiToolBarEditor : public PdmUiEditorHandle class PdmUiToolBarEditor : public PdmUiEditorHandle
{ {
public: public:
@ -63,17 +64,16 @@ public:
void setFields(std::vector<caf::PdmFieldHandle*>& fields); void setFields(std::vector<caf::PdmFieldHandle*>& fields);
void clear(); void clear();
protected: private:
virtual void configureAndUpdateUi(const QString& uiConfigName); virtual void configureAndUpdateUi(const QString& uiConfigName) override;
private: private:
QToolBar* m_toolbar; QPointer<QToolBar> m_toolbar;
std::vector<caf::PdmFieldHandle*> m_fields; std::vector<caf::PdmFieldHandle*> m_fields;
std::map<QString, PdmUiFieldEditorHandle*> m_fieldViews; std::map<QString, PdmUiFieldEditorHandle*> m_fieldViews;
QList<QAction*> m_actions; QList<QAction*> m_actions;
}; };
} // end namespace caf } // end namespace caf