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

#3248 Refactoring: Rename of 3d object editor class.

Browse Source
This commit is contained in:
Jacob Støren
2018-08-27 16:21:38 +02:00
parent 8fca7475e9
commit d07b7d1456
2 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/Commands/WellPathCommands/PointTangentManipulator/RicPointTangentManipulator.cpp
View File

@@ -581,7 +581,7 @@ namespace caf
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
PdmUiObject3dEditorHandle::PdmUiObject3dEditorHandle() PdmUi3dObjectEditorHandle::PdmUi3dObjectEditorHandle()
{ {
} }
@@ -589,7 +589,7 @@ PdmUiObject3dEditorHandle::PdmUiObject3dEditorHandle()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
PdmUiObject3dEditorHandle::~PdmUiObject3dEditorHandle() PdmUi3dObjectEditorHandle::~PdmUi3dObjectEditorHandle()
{ {
} }
@@ -597,7 +597,7 @@ PdmUiObject3dEditorHandle::~PdmUiObject3dEditorHandle()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void PdmUiObject3dEditorHandle::setViewer(caf::Viewer* ownerViewer) void PdmUi3dObjectEditorHandle::setViewer(caf::Viewer* ownerViewer)
{ {
// Not allowed to change viewer. Should be constructor argument, but makes factory stuff difficult. // Not allowed to change viewer. Should be constructor argument, but makes factory stuff difficult.
CAF_ASSERT(m_ownerViewer.isNull()); CAF_ASSERT(m_ownerViewer.isNull());
@@ -682,7 +682,7 @@ void PdmUiSelectionVisualizer3d::onSelectionManagerSelectionChanged(int selectio
#include "RimWellPathTarget.h" #include "RimWellPathTarget.h"
CAF_PDM_UI_OBJECT_3D_EDITOR_SOURCE_INIT(RicWellPathGeometry3dEditor); CAF_PDM_UI_3D_OBJECT_EDITOR_SOURCE_INIT(RicWellPathGeometry3dEditor);
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
@@ -744,7 +744,7 @@ void RicWellPathGeometry3dEditor::configureAndUpdateUi(const QString& uiConfigNa
#include "Rim3dView.h" #include "Rim3dView.h"
#include "RimCase.h" #include "RimCase.h"
CAF_PDM_UI_OBJECT_3D_EDITOR_SOURCE_INIT(RicWellTarget3dEditor); CAF_PDM_UI_3D_OBJECT_EDITOR_SOURCE_INIT(RicWellTarget3dEditor);
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///

31
ApplicationCode/Commands/WellPathCommands/PointTangentManipulator/RicPointTangentManipulator.h
View File

@@ -175,9 +175,8 @@ private:
#include "cafSelectionChangedReceiver.h" #include "cafSelectionChangedReceiver.h"
#include "cafPdmUiObjectEditorHandle.h" #include "cafPdmUiObjectEditorHandle.h"
#include "cafFactory.h" #include "cafFactory.h"
// PdmUiObjectEditorHandle // PdmUiObjectEditorHandle -<| PdmUiWidgetObjectEditorHandle --<| PdmUiFormLayoutObjectEditor
// PdmUiObjectWidgetEditorHandle --<| PdmUiWidgetBasedObjectEditor PdmUiObjectFormLayoutEditor // -<| PdmUi3dObjectEditorHandle
// PdmUiObject3dEditorHandle
namespace caf namespace caf
{ {
@@ -185,26 +184,26 @@ namespace caf
/// Macros helping in development of PDM UI 3d editors /// Macros helping in development of PDM UI 3d editors
//================================================================================================== //==================================================================================================
/// CAF_PDM_UI_FIELD_EDITOR_HEADER_INIT assists the factory used when creating editors /// CAF_PDM_UI_3D_OBJECT_EDITOR_HEADER_INIT assists the factory used when creating editors
/// Place this in the header file inside the class definition of your PdmUiEditor /// Place this in the header file inside the class definition of your PdmUiEditor
#define CAF_PDM_UI_OBJECT_3D_EDITOR_HEADER_INIT \ #define CAF_PDM_UI_3D_OBJECT_EDITOR_HEADER_INIT \
public: \ public: \
static QString uiEditorTypeName() static QString uiEditorTypeName()
/// CAF_PDM_UI_OBJECT_3D_EDITOR_SOURCE_INIT implements editorTypeName() and registers the field editor in the field editor factory /// CAF_PDM_UI_3D_OBJECT_EDITOR_SOURCE_INIT implements editorTypeName() and registers the field editor in the field editor factory
/// Place this in the cpp file, preferably above the constructor /// Place this in the cpp file, preferably above the constructor
#define CAF_PDM_UI_OBJECT_3D_EDITOR_SOURCE_INIT(EditorClassName) \ #define CAF_PDM_UI_3D_OBJECT_EDITOR_SOURCE_INIT(EditorClassName) \
QString EditorClassName::uiEditorTypeName() { return #EditorClassName; } \ QString EditorClassName::uiEditorTypeName() { return #EditorClassName; } \
CAF_FACTORY_REGISTER(caf::PdmUiObject3dEditorHandle, EditorClassName, QString, EditorClassName::uiEditorTypeName()) CAF_FACTORY_REGISTER(caf::PdmUi3dObjectEditorHandle, EditorClassName, QString, EditorClassName::uiEditorTypeName())
class PdmUiObject3dEditorHandle : public caf::PdmUiObjectEditorHandle class PdmUi3dObjectEditorHandle : public caf::PdmUiObjectEditorHandle
{ {
public: public:
PdmUiObject3dEditorHandle(); PdmUi3dObjectEditorHandle();
~PdmUiObject3dEditorHandle() override; ~PdmUi3dObjectEditorHandle() override;
void setViewer(caf::Viewer* ownerViewer); void setViewer(caf::Viewer* ownerViewer);
@@ -232,7 +231,7 @@ public:
protected: protected:
virtual void onSelectionManagerSelectionChanged(int selectionLevel) override; virtual void onSelectionManagerSelectionChanged(int selectionLevel) override;
std::vector< QPointer<PdmUiObject3dEditorHandle> > m_active3DEditors; std::vector< QPointer<PdmUi3dObjectEditorHandle> > m_active3DEditors;
QPointer<caf::Viewer> m_ownerViewer; QPointer<caf::Viewer> m_ownerViewer;
}; };
@@ -248,9 +247,9 @@ protected:
class RicWellTarget3dEditor; class RicWellTarget3dEditor;
class RicWellPathGeometry3dEditor : public caf::PdmUiObject3dEditorHandle class RicWellPathGeometry3dEditor : public caf::PdmUi3dObjectEditorHandle
{ {
CAF_PDM_UI_OBJECT_3D_EDITOR_HEADER_INIT; CAF_PDM_UI_3D_OBJECT_EDITOR_HEADER_INIT;
Q_OBJECT Q_OBJECT
public: public:
RicWellPathGeometry3dEditor(); RicWellPathGeometry3dEditor();
@@ -271,9 +270,9 @@ private:
//================================================================================================== //==================================================================================================
class RicWellTarget3dEditor : public caf::PdmUiObject3dEditorHandle class RicWellTarget3dEditor : public caf::PdmUi3dObjectEditorHandle
{ {
CAF_PDM_UI_OBJECT_3D_EDITOR_HEADER_INIT; CAF_PDM_UI_3D_OBJECT_EDITOR_HEADER_INIT;
Q_OBJECT Q_OBJECT
public: public:
RicWellTarget3dEditor(); RicWellTarget3dEditor();