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

caf: Renamed the WidgetBasedObjectEditor to FormLayoutObjectEditor

Browse Source
This commit is contained in:
Jacob Støren
2018-08-27 16:11:39 +02:00
parent 0a2b68348f
commit 8fca7475e9
7 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorEditor.h
View File

@@ -18,7 +18,7 @@
#pragma once
#include "cafPdmUiWidgetBasedObjectEditor.h"
#include "cafPdmUiFormLayoutObjectEditor.h"
#include <vector>
#include <memory>
@@ -41,7 +41,7 @@ namespace caf {
///
///
//==================================================================================================
class RicSummaryCurveCalculatorEditor : public caf::PdmUiWidgetBasedObjectEditor
class RicSummaryCurveCalculatorEditor : public caf::PdmUiFormLayoutObjectEditor
{
Q_OBJECT

4
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreatorSplitterUi.h
View File

@@ -18,7 +18,7 @@
#pragma once
#include "cafPdmUiWidgetBasedObjectEditor.h"
#include "cafPdmUiFormLayoutObjectEditor.h"
#include <vector>
#include <memory>
@@ -45,7 +45,7 @@ namespace caf {
///
///
//==================================================================================================
class RicSummaryCurveCreatorSplitterUi : public caf::PdmUiWidgetBasedObjectEditor
class RicSummaryCurveCreatorSplitterUi : public caf::PdmUiFormLayoutObjectEditor
{
Q_OBJECT

4
ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionEditor.h
View File

@@ -18,7 +18,7 @@
#pragma once
#include "cafPdmUiWidgetBasedObjectEditor.h"
#include "cafPdmUiFormLayoutObjectEditor.h"
#include <vector>
#include <memory>
@@ -43,7 +43,7 @@ namespace caf {
///
///
//==================================================================================================
class RiuSummaryCurveDefSelectionEditor : public caf::PdmUiWidgetBasedObjectEditor
class RiuSummaryCurveDefSelectionEditor : public caf::PdmUiFormLayoutObjectEditor
{
public:
RiuSummaryCurveDefSelectionEditor();

6
Fwk/AppFwk/cafUserInterface/CMakeLists.txt
View File

@@ -43,7 +43,7 @@ set( QOBJECT_HEADERS
QMinimizePanel.h
cafPdmUiTreeSelectionEditor.h
cafPdmUiTreeSelectionQModel.h
cafPdmUiWidgetBasedObjectEditor.h
cafPdmUiFormLayoutObjectEditor.h
cafPdmUiDoubleValueEditor.h
)
@@ -124,8 +124,8 @@ set( PROJECT_FILES
cafPdmUiPropertyView.h
cafPdmUiPropertyViewDialog.cpp
cafPdmUiPropertyViewDialog.h
cafPdmUiWidgetBasedObjectEditor.cpp
cafPdmUiWidgetBasedObjectEditor.h
cafPdmUiFormLayoutObjectEditor.cpp
cafPdmUiFormLayoutObjectEditor.h
cafPdmUiDoubleValueEditor.cpp
cafPdmUiDoubleValueEditor.h

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

@@ -37,7 +37,7 @@
#pragma once
#include "cafPdmUiWidgetBasedObjectEditor.h"
#include "cafPdmUiFormLayoutObjectEditor.h"
#include <QPointer>
@@ -55,7 +55,7 @@ class PdmUiGroup;
//==================================================================================================
/// The default editor for PdmObjects. Manages the field editors in a grid layout vertically
//==================================================================================================
class PdmUiDefaultObjectEditor : public PdmUiWidgetBasedObjectEditor
class PdmUiDefaultObjectEditor : public PdmUiFormLayoutObjectEditor
{
Q_OBJECT
public:

22
Fwk/AppFwk/cafUserInterface/cafPdmUiWidgetBasedObjectEditor.cpp → Fwk/AppFwk/cafUserInterface/cafPdmUiFormLayoutObjectEditor.cpp
View File

@@ -35,7 +35,7 @@
//##################################################################################################
#include "cafPdmUiWidgetBasedObjectEditor.h"
#include "cafPdmUiFormLayoutObjectEditor.h"
#include "cafPdmObjectHandle.h"
#include "cafPdmUiFieldEditorHandle.h"
@@ -53,7 +53,7 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::PdmUiWidgetBasedObjectEditor::PdmUiWidgetBasedObjectEditor()
caf::PdmUiFormLayoutObjectEditor::PdmUiFormLayoutObjectEditor()
{
}
@@ -61,7 +61,7 @@ caf::PdmUiWidgetBasedObjectEditor::PdmUiWidgetBasedObjectEditor()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::PdmUiWidgetBasedObjectEditor::~PdmUiWidgetBasedObjectEditor()
caf::PdmUiFormLayoutObjectEditor::~PdmUiFormLayoutObjectEditor()
{
// If there are field editor present, the usage of this editor has not cleared correctly
// The intended usage is to call the method setPdmObject(NULL) before closing the dialog
@@ -71,7 +71,7 @@ caf::PdmUiWidgetBasedObjectEditor::~PdmUiWidgetBasedObjectEditor()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void caf::PdmUiWidgetBasedObjectEditor::recursivelyConfigureAndUpdateUiItemsInGridLayoutColumn(const std::vector<PdmUiItem*>& uiItems, QWidget* containerWidgetWithGridLayout, const QString& uiConfigName)
void caf::PdmUiFormLayoutObjectEditor::recursivelyConfigureAndUpdateUiItemsInGridLayoutColumn(const std::vector<PdmUiItem*>& uiItems, QWidget* containerWidgetWithGridLayout, const QString& uiConfigName)
{
CAF_ASSERT(containerWidgetWithGridLayout);
@@ -179,7 +179,7 @@ void caf::PdmUiWidgetBasedObjectEditor::recursivelyConfigureAndUpdateUiItemsInGr
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool caf::PdmUiWidgetBasedObjectEditor::isUiGroupExpanded(const PdmUiGroup* uiGroup) const
bool caf::PdmUiFormLayoutObjectEditor::isUiGroupExpanded(const PdmUiGroup* uiGroup) const
{
if (uiGroup->hasForcedExpandedState()) return uiGroup->forcedExpandedState();
@@ -201,7 +201,7 @@ bool caf::PdmUiWidgetBasedObjectEditor::isUiGroupExpanded(const PdmUiGroup* uiGr
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QMinimizePanel* caf::PdmUiWidgetBasedObjectEditor::findOrCreateGroupBox(QWidget* parent, PdmUiGroup* group, const QString& uiConfigName)
QMinimizePanel* caf::PdmUiFormLayoutObjectEditor::findOrCreateGroupBox(QWidget* parent, PdmUiGroup* group, const QString& uiConfigName)
{
QString groupBoxKey = group->keyword();
QMinimizePanel* groupBox = nullptr;
@@ -243,7 +243,7 @@ QMinimizePanel* caf::PdmUiWidgetBasedObjectEditor::findOrCreateGroupBox(QWidget*
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::PdmUiFieldEditorHandle* caf::PdmUiWidgetBasedObjectEditor::findOrCreateFieldEditor(QWidget* parent, PdmUiFieldHandle* field, const QString& uiConfigName)
caf::PdmUiFieldEditorHandle* caf::PdmUiFormLayoutObjectEditor::findOrCreateFieldEditor(QWidget* parent, PdmUiFieldHandle* field, const QString& uiConfigName)
{
caf::PdmUiFieldEditorHandle* fieldEditor = nullptr;
@@ -283,7 +283,7 @@ caf::PdmUiFieldEditorHandle* caf::PdmUiWidgetBasedObjectEditor::findOrCreateFiel
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void caf::PdmUiWidgetBasedObjectEditor::groupBoxExpandedStateToggled(bool isExpanded)
void caf::PdmUiFormLayoutObjectEditor::groupBoxExpandedStateToggled(bool isExpanded)
{
if (!this->pdmObject()->xmlCapability()) return;
@@ -298,7 +298,7 @@ void caf::PdmUiWidgetBasedObjectEditor::groupBoxExpandedStateToggled(bool isExpa
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void caf::PdmUiWidgetBasedObjectEditor::cleanupBeforeSettingPdmObject()
void caf::PdmUiFormLayoutObjectEditor::cleanupBeforeSettingPdmObject()
{
std::map<PdmFieldHandle*, PdmUiFieldEditorHandle*>::iterator it;
for (it = m_fieldViews.begin(); it != m_fieldViews.end(); ++it)
@@ -322,7 +322,7 @@ void caf::PdmUiWidgetBasedObjectEditor::cleanupBeforeSettingPdmObject()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void caf::PdmUiWidgetBasedObjectEditor::configureAndUpdateUi(const QString& uiConfigName)
void caf::PdmUiFormLayoutObjectEditor::configureAndUpdateUi(const QString& uiConfigName)
{
caf::PdmUiOrdering config;
if (pdmObject())
@@ -392,7 +392,7 @@ void caf::PdmUiWidgetBasedObjectEditor::configureAndUpdateUi(const QString& uiCo
//--------------------------------------------------------------------------------------------------
/// Unused. Should probably remove
//--------------------------------------------------------------------------------------------------
void caf::PdmUiWidgetBasedObjectEditor::recursiveVerifyUniqueNames(const std::vector<PdmUiItem*>& uiItems,
void caf::PdmUiFormLayoutObjectEditor::recursiveVerifyUniqueNames(const std::vector<PdmUiItem*>& uiItems,
const QString& uiConfigName,
std::set<QString>* fieldKeywordNames,
std::set<QString>* groupNames)

6
Fwk/AppFwk/cafUserInterface/cafPdmUiWidgetBasedObjectEditor.h → Fwk/AppFwk/cafUserInterface/cafPdmUiFormLayoutObjectEditor.h
View File

@@ -56,12 +56,12 @@ class PdmUiGroup;
//==================================================================================================
///
//==================================================================================================
class PdmUiWidgetBasedObjectEditor : public PdmUiObjectEditorHandle
class PdmUiFormLayoutObjectEditor : public PdmUiObjectEditorHandle
{
Q_OBJECT
public:
PdmUiWidgetBasedObjectEditor();
~PdmUiWidgetBasedObjectEditor();
PdmUiFormLayoutObjectEditor();
~PdmUiFormLayoutObjectEditor();
protected:
/// When overriding this function, use findOrCreateGroupBox() or findOrCreateFieldEditor() for detailed control