OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-11 07:56:08 -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

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

@ -34,32 +34,27 @@
//
//##################################################################################################
#include "cafPdmUiToolBarEditor.h"
#include "cafPdmField.h"
#include "cafPdmObjectHandle.h"
#include "cafPdmUiComboBoxEditor.h"
#include "cafPdmUiFieldEditorHandle.h"
#include "cafPdmUiFieldEditorHelper.h"
#include "cafPdmUiFieldHandle.h"
#include "cafPdmUiObjectHandle.h"
#include "cafPdmUiOrdering.h"
#include "cafPdmUiPushButtonEditor.h"
#include "cafPdmUiToolButtonEditor.h"
#include <QToolBar>
#include <QMainWindow>
#include <QAction>
#include "cafPdmUiOrdering.h"
#include "cafPdmObjectHandle.h"
#include "cafPdmUiObjectHandle.h"
#include "cafPdmUiFieldHandle.h"
#include "cafPdmUiFieldEditorHelper.h"
#include <QMainWindow>
#include <QToolBar>
namespace caf
{
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
PdmUiToolBarEditor::PdmUiToolBarEditor(const QString& title, QMainWindow* mainWindow)
{
@ -71,7 +66,7 @@ PdmUiToolBarEditor::PdmUiToolBarEditor(const QString& title, QMainWindow* mainWi
}
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
PdmUiToolBarEditor::~PdmUiToolBarEditor()
{
@ -79,27 +74,24 @@ PdmUiToolBarEditor::~PdmUiToolBarEditor()
}
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
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 = NULL;
PdmUiFieldEditorHandle* fieldEditor = nullptr;
PdmUiOrdering config;
caf::PdmUiObjectHandle* ownerUiObject = uiObj(field->ownerObject());
if (ownerUiObject)
{
PdmUiOrdering config;
ownerUiObject->uiOrdering(uiConfigName, config);
}
// Find or create FieldEditor
std::map<QString, PdmUiFieldEditorHandle*>::iterator it;
it = m_fieldViews.find(field->keyword());
if (it == m_fieldViews.end())
{
caf::PdmUiFieldHandle* uiFieldHandle = field->uiCapability();
@ -109,14 +101,14 @@ void PdmUiToolBarEditor::configureAndUpdateUi(const QString& uiConfigName)
{
if (uiFieldHandle->uiValue().type() == QVariant::Bool)
{
// Special handling of bool values into tool button editors
QString editorTypeName = caf::PdmUiToolButtonEditor::uiEditorTypeName();
fieldEditor = caf::Factory<PdmUiFieldEditorHandle, QString>::instance()->create(editorTypeName);
}
else
{
fieldEditor = caf::PdmUiFieldEditorHelper::fieldEditorForField(field->uiCapability(), uiConfigName);
addSpace = true;
}
}
@ -124,9 +116,9 @@ void PdmUiToolBarEditor::configureAndUpdateUi(const QString& uiConfigName)
if (fieldEditor)
{
m_fieldViews[field->keyword()] = fieldEditor;
fieldEditor->createWidgets(NULL);
fieldEditor->createWidgets(nullptr);
m_actions.push_back(m_toolbar->addWidget(fieldEditor->editorWidget()));
if (addSpace)
{
QWidget* widget = new QWidget;
@ -149,7 +141,7 @@ void PdmUiToolBarEditor::configureAndUpdateUi(const QString& uiConfigName)
// Enabled state of a tool button is controlled by the QAction associated with a tool button
// Changing the state of a widget directly has no effect
// See Qt doc for QToolBar::insertWidget
// See Qt doc for QToolBar::insertWidget
QAction* action = m_actions[static_cast<int>(i)];
caf::PdmUiFieldHandle* uiFieldHandle = field->uiCapability();
@ -164,7 +156,7 @@ void PdmUiToolBarEditor::configureAndUpdateUi(const QString& uiConfigName)
}
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
void PdmUiToolBarEditor::setFields(std::vector<caf::PdmFieldHandle*>& fields)
{
@ -174,14 +166,13 @@ void PdmUiToolBarEditor::setFields(std::vector<caf::PdmFieldHandle*>& fields)
}
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
void PdmUiToolBarEditor::clear()
{
std::map<QString, PdmUiFieldEditorHandle*>::iterator it;
for (it = m_fieldViews.begin(); it != m_fieldViews.end(); ++it)
for (auto it : m_fieldViews)
{
delete it->second;
delete it.second;
}
m_fieldViews.clear();
@ -194,5 +185,4 @@ void PdmUiToolBarEditor::clear()
m_actions.clear();
}
} // end namespace caf

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

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