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

(#641) Refactoring to improve readability

Browse Source
This commit is contained in:
Magne Sjaastad
2015-11-30 10:00:06 +01:00
parent 40c9b711c2
commit 8b3adf0f5b
6 changed files with 39 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Commands/CrossSectionCommands/RicNewPolylineCrossSectionFeature.cpp
View File

@@ -85,7 +85,7 @@ bool RicNewPolylineCrossSectionFeature::handleUiEvent(cvf::Object* uiEventObject
if (selection.size() == 1)
{
RicPolylineUiEvent* polylineUiEvent = dynamic_cast<RicPolylineUiEvent*>(uiEventObject);
RicLocalIntersectionUiEvent* polylineUiEvent = dynamic_cast<RicLocalIntersectionUiEvent*>(uiEventObject);
if (polylineUiEvent)
{
RimCrossSection* crossSection = selection[0];

11
ApplicationCode/Commands/CrossSectionCommands/RicNewPolylineCrossSectionFeature.h
View File

@@ -30,17 +30,6 @@
class RimCrossSectionCollection;
class RicPolylineUiEvent : public cvf::Object
{
public:
RicPolylineUiEvent(cvf::Vec3d localIntersectionPoint)
: localIntersectionPoint(localIntersectionPoint)
{
}
cvf::Vec3d localIntersectionPoint;
};
//==================================================================================================
///

20
ApplicationCode/Commands/RicCommandFeature.h
View File

@@ -21,13 +21,25 @@
#include "cafCmdFeature.h"
namespace cvf
{
class Object;
}
#include "cvfBase.h"
#include "cvfObject.h"
#include "cvfVector3.h"
class RicCommandFeature : public caf::CmdFeature
{
public:
virtual bool handleUiEvent(cvf::Object* uiEventObject) = 0;
};
class RicLocalIntersectionUiEvent : public cvf::Object
{
public:
RicLocalIntersectionUiEvent(cvf::Vec3d localIntersectionPoint)
: localIntersectionPoint(localIntersectionPoint)
{
}
cvf::Vec3d localIntersectionPoint;
};

32
ApplicationCode/ProjectDataModel/RimCrossSection.cpp
View File

@@ -81,18 +81,18 @@ RimCrossSection::RimCrossSection()
CAF_PDM_InitFieldNoDefault(&direction, "Direction", "Direction", "", "", "");
CAF_PDM_InitFieldNoDefault(&wellPath, "WellPath", "Well Path ", "", "", "");
CAF_PDM_InitFieldNoDefault(&simulationWell, "SimulationWell", "Simulation Well", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_userDefinedPolyline, "Points", "Selected points", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_userPolyline, "Points", "Points", "", "", "");
CAF_PDM_InitField (&m_branchIndex, "Branch", -1, "Branch", "", "", "");
CAF_PDM_InitField (&m_extentLength, "ExtentLength", 200.0, "Extent length", "", "", "");
CAF_PDM_InitField (&showInactiveCells, "ShowInactiveCells", false, "Inactive Cells", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_activateUiAppendPointsCommand, "m_activateUiAppendPointsCommand", "", "", "", "");
m_activateUiAppendPointsCommand.xmlCapability()->setIOWritable(false);
m_activateUiAppendPointsCommand.xmlCapability()->setIOReadable(false);
m_activateUiAppendPointsCommand.uiCapability()->setUiEditorTypeName(caf::PdmUiPushButtonEditor::uiEditorTypeName());
m_activateUiAppendPointsCommand.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
CAF_PDM_InitFieldNoDefault(&m_activateAppendPointsCommand, "m_activateUiAppendPointsCommand", "", "", "", "");
m_activateAppendPointsCommand.xmlCapability()->setIOWritable(false);
m_activateAppendPointsCommand.xmlCapability()->setIOReadable(false);
m_activateAppendPointsCommand.uiCapability()->setUiEditorTypeName(caf::PdmUiPushButtonEditor::uiEditorTypeName());
m_activateAppendPointsCommand.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
m_activateUiAppendPointsCommand = false;
m_activateAppendPointsCommand = false;
uiCapability()->setUiChildrenHidden(true);
}
@@ -131,14 +131,14 @@ void RimCrossSection::fieldChangedByUi(const caf::PdmFieldHandle* changedField,
updateName();
}
if (changedField == &m_activateUiAppendPointsCommand)
if (changedField == &m_activateAppendPointsCommand)
{
updateActiveUiCommandFeature();
m_activateUiAppendPointsCommand = false;
m_activateAppendPointsCommand = false;
}
if (changedField == &m_userDefinedPolyline)
if (changedField == &m_userPolyline)
{
rebuildGeometryAndScheduleCreateDisplayModel();
}
@@ -168,8 +168,8 @@ void RimCrossSection::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
}
else if (type == CS_POLYLINE)
{
uiOrdering.add(&m_userDefinedPolyline);
uiOrdering.add(&m_activateUiAppendPointsCommand);
geometryGroup->add(&m_userPolyline);
geometryGroup->add(&m_activateAppendPointsCommand);
}
caf::PdmUiGroup* optionsGroup = uiOrdering.addNewGroup("Options");
@@ -310,7 +310,7 @@ std::vector< std::vector <cvf::Vec3d> > RimCrossSection::polyLines() const
}
else if (type == CS_POLYLINE)
{
lines.push_back(m_userDefinedPolyline);
lines.push_back(m_userPolyline);
}
if (type == CS_WELL_PATH || type == CS_SIMULATION_WELL)
@@ -500,7 +500,7 @@ void RimCrossSection::clipToReservoir(std::vector<cvf::Vec3d> &polyLine) const
//--------------------------------------------------------------------------------------------------
void RimCrossSection::defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute)
{
if (field == &m_activateUiAppendPointsCommand)
if (field == &m_activateAppendPointsCommand)
{
caf::PdmUiPushButtonEditorAttribute* attrib = dynamic_cast<caf::PdmUiPushButtonEditorAttribute*> (attribute);
@@ -524,9 +524,9 @@ void RimCrossSection::defineEditorAttribute(const caf::PdmFieldHandle* field, QS
//--------------------------------------------------------------------------------------------------
void RimCrossSection::appendPointToPolyLine(const cvf::Vec3d& point)
{
m_userDefinedPolyline.v().push_back(point);
m_userPolyline.v().push_back(point);
m_userDefinedPolyline.uiCapability()->updateConnectedEditors();
m_userPolyline.uiCapability()->updateConnectedEditors();
rebuildGeometryAndScheduleCreateDisplayModel();
}

4
ApplicationCode/ProjectDataModel/RimCrossSection.h
View File

@@ -92,8 +92,8 @@ private:
caf::PdmField<int> m_branchIndex;
caf::PdmField<double> m_extentLength;
caf::PdmField< std::vector< cvf::Vec3d> > m_userDefinedPolyline;
caf::PdmField< bool > m_activateUiAppendPointsCommand;
caf::PdmField< std::vector< cvf::Vec3d> > m_userPolyline;
caf::PdmField< bool > m_activateAppendPointsCommand;
RimEclipseWellCollection* simulationWellCollection();
void updateWellCenterline() const;

23
ApplicationCode/UserInterface/RiuViewerCommands.cpp
View File

@@ -19,45 +19,30 @@
#include "RiuViewerCommands.h"
#include "RicCommandFeature.h"
#include "RicEclipsePropertyFilterNewExec.h"
#include "RicGeoMechPropertyFilterNewExec.h"
#include "RicRangeFilterNewExec.h"
#include "CrossSectionCommands/RicNewPolylineCrossSectionFeature.h"
#include "CrossSectionCommands/RicNewSimWellCrossSectionFeature.h"
#include "CrossSectionCommands/RicNewWellPathCrossSectionFeature.h"
#include "WellLogCommands/RicNewWellLogCurveExtractionFeature.h"
#include "WellLogCommands/RicNewWellLogFileCurveFeature.h"
#include "RigCaseData.h"
#include "RigFault.h"
#include "RigFemPartCollection.h"
#include "RigFemPartGrid.h"
#include "RigGeoMechCaseData.h"
#include "RigTimeHistoryResultAccessor.h"
#include "RimCellRangeFilter.h"
#include "RimCellRangeFilterCollection.h"
#include "RimContextCommandBuilder.h"
#include "RimCrossSection.h"
#include "RimDefines.h"
#include "RimEclipseCase.h"
#include "RimEclipseCellColors.h"
#include "RimEclipsePropertyFilter.h"
#include "RimEclipsePropertyFilterCollection.h"
#include "RimEclipseView.h"
#include "RimEclipseWell.h"
#include "RimFaultCollection.h"
#include "RimGeoMechCase.h"
#include "RimGeoMechCellColors.h"
#include "RimGeoMechPropertyFilter.h"
#include "RimGeoMechPropertyFilterCollection.h"
#include "RimGeoMechView.h"
#include "RimOilField.h"
#include "RimProject.h"
#include "RimView.h"
#include "RimViewController.h"
#include "RimWellLogFile.h"
#include "RimWellPath.h"
#include "RimWellPathCollection.h"
#include "RiuMainWindow.h"
#include "RiuSelectionColors.h"
@@ -445,7 +430,7 @@ void RiuViewerCommands::handlePickAction(int winPosX, int winPosY, Qt::KeyboardM
if (!m_activeUiCommandFeature.isNull())
{
cvf::ref<RicPolylineUiEvent> uiEventObj = new RicPolylineUiEvent(localIntersectionPoint);
cvf::ref<RicLocalIntersectionUiEvent> uiEventObj = new RicLocalIntersectionUiEvent(localIntersectionPoint);
if (m_activeUiCommandFeature->handleUiEvent(uiEventObj.p()))
{