From 30cbd8018f23f5e0e79a77a13a3ab6350d4724cb Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Wed, 10 Jan 2018 07:44:26 +0100 Subject: [PATCH] #2359 Move fields to private, whitespace cleanup --- .../RimEllipseFractureTemplate.cpp | 104 +++++++++--------- .../Completions/RimEllipseFractureTemplate.h | 25 +++-- .../Completions/RimFractureTemplate.cpp | 6 +- .../Completions/RimFractureTemplate.h | 6 +- 4 files changed, 71 insertions(+), 70 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.cpp b/ApplicationCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.cpp index b5c1b09fd3..e1448244c1 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.cpp +++ b/ApplicationCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.cpp @@ -47,11 +47,11 @@ RimEllipseFractureTemplate::RimEllipseFractureTemplate(void) { CAF_PDM_InitObject("Fracture Template", ":/FractureTemplate16x16.png", "", ""); - CAF_PDM_InitField(&halfLength, "HalfLength", 0.0f, "Halflength Xf", "", "", ""); - CAF_PDM_InitField(&height, "Height", 0.0f, "Height", "", "", ""); - CAF_PDM_InitField(&width, "Width", 0.0f, "Width", "", "", ""); + CAF_PDM_InitField(&m_halfLength, "HalfLength", 0.0f, "Halflength Xf", "", "", ""); + CAF_PDM_InitField(&m_height, "Height", 0.0f, "Height", "", "", ""); + CAF_PDM_InitField(&m_width, "Width", 0.0f, "Width", "", "", ""); - CAF_PDM_InitField(&permeability,"Permeability", 0.0f, "Permeability [mD]", "", "", ""); + CAF_PDM_InitField(&m_permeability,"Permeability", 0.0f, "Permeability [mD]", "", "", ""); m_fractureGrid = new RigFractureGrid(); setupFractureGridCells(); @@ -79,7 +79,7 @@ void RimEllipseFractureTemplate::fieldChangedByUi(const caf::PdmFieldHandle* cha { RimFractureTemplate::fieldChangedByUi(changedField, oldValue, newValue); - if (changedField == &halfLength || changedField == &height) + if (changedField == &m_halfLength || changedField == &m_height) { //Changes to one of these parameters should change all fractures with this fracture template attached. RimProject* proj; @@ -91,7 +91,7 @@ void RimEllipseFractureTemplate::fieldChangedByUi(const caf::PdmFieldHandle* cha setupFractureGridCells(); } } - if (changedField == &width || changedField == &permeability) + if (changedField == &m_width || changedField == &m_permeability) { setupFractureGridCells(); } @@ -111,21 +111,21 @@ void RimEllipseFractureTemplate::fractureTriangleGeometry(std::vector cellPolygon; cellPolygon.push_back(cvf::Vec3d(X1, Y1, 0.0)); @@ -222,12 +222,12 @@ void RimEllipseFractureTemplate::setupFractureGridCells() if (fractureTemplateUnit == RiaEclipseUnitTools::UNITS_METRIC) { //Conductivity should be md-m, width is in m - cond = permeability * width; + cond = m_permeability * m_width; } else if(fractureTemplateUnit == RiaEclipseUnitTools::UNITS_FIELD) { //Conductivity should be md-ft, but width is in inches - cond = permeability * RiaEclipseUnitTools::inchToFeet(width); + cond = m_permeability * RiaEclipseUnitTools::inchToFeet(m_width); } std::vector ellipseFracPolygon = fractureBorderPolygon(fractureTemplateUnit()); @@ -282,17 +282,17 @@ void RimEllipseFractureTemplate::setDefaultValuesFromUnit() { if (fractureTemplateUnit == RiaEclipseUnitTools::UNITS_FIELD) { - width = 0.5f; - permeability = 800000.0f; - halfLength = 300.0f; - height = 225.0f; + m_width = 0.5f; + m_permeability = 800000.0f; + m_halfLength = 300.0f; + m_height = 225.0f; } else { - width = 0.01f; - permeability = 1000000.0f; - halfLength = 100.0f; - height = 75.0f; + m_width = 0.01f; + m_permeability = 1000000.0f; + m_halfLength = 100.0f; + m_height = 75.0f; } this->setDefaultWellDiameterFromUnit(); @@ -307,37 +307,37 @@ void RimEllipseFractureTemplate::defineUiOrdering(QString uiConfigName, caf::Pdm if (fractureTemplateUnit == RiaEclipseUnitTools::UNITS_METRIC) { - halfLength.uiCapability()->setUiName("Halflenght Xf [m]"); - height.uiCapability()->setUiName("Height [m]"); - width.uiCapability()->setUiName("Width [m]"); + m_halfLength.uiCapability()->setUiName("Halflenght Xf [m]"); + m_height.uiCapability()->setUiName("Height [m]"); + m_width.uiCapability()->setUiName("Width [m]"); wellDiameter.uiCapability()->setUiName("Well Diameter [m]"); } else if (fractureTemplateUnit == RiaEclipseUnitTools::UNITS_FIELD) { - halfLength.uiCapability()->setUiName("Halflenght Xf [Ft]"); - height.uiCapability()->setUiName("Height [Ft]"); - width.uiCapability()->setUiName("Width [inches]"); + m_halfLength.uiCapability()->setUiName("Halflenght Xf [Ft]"); + m_height.uiCapability()->setUiName("Height [Ft]"); + m_width.uiCapability()->setUiName("Width [inches]"); wellDiameter.uiCapability()->setUiName("Well Diameter [inches]"); } if (conductivityType == FINITE_CONDUCTIVITY) { - permeability.uiCapability()->setUiHidden(false); - width.uiCapability()->setUiHidden(false); + m_permeability.uiCapability()->setUiHidden(false); + m_width.uiCapability()->setUiHidden(false); } else if (conductivityType == INFINITE_CONDUCTIVITY) { - permeability.uiCapability()->setUiHidden(true); - width.uiCapability()->setUiHidden(true); + m_permeability.uiCapability()->setUiHidden(true); + m_width.uiCapability()->setUiHidden(true); } uiOrdering.add(&name); caf::PdmUiGroup* geometryGroup = uiOrdering.addNewGroup("Geometry"); - geometryGroup->add(&halfLength); - geometryGroup->add(&height); + geometryGroup->add(&m_halfLength); + geometryGroup->add(&m_height); geometryGroup->add(&orientationType); geometryGroup->add(&azimuthAngle); @@ -346,8 +346,8 @@ void RimEllipseFractureTemplate::defineUiOrdering(QString uiConfigName, caf::Pdm caf::PdmUiGroup* propertyGroup = uiOrdering.addNewGroup("Properties"); propertyGroup->add(&conductivityType); - propertyGroup->add(&permeability); - propertyGroup->add(&width); + propertyGroup->add(&m_permeability); + propertyGroup->add(&m_width); propertyGroup->add(&skinFactor); propertyGroup->add(&perforationLength); propertyGroup->add(&perforationEfficiency); diff --git a/ApplicationCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.h b/ApplicationCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.h index f65f5ee1d6..47ebcc2cb9 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.h +++ b/ApplicationCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.h @@ -46,15 +46,7 @@ public: RimEllipseFractureTemplate(void); virtual ~RimEllipseFractureTemplate(void); - caf::PdmField halfLength; - caf::PdmField height; - - caf::PdmField width; - caf::PdmField permeability; - void loadDataAndUpdate(); - - virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override; void fractureTriangleGeometry(std::vector* nodeCoords, std::vector* polygonIndices, @@ -64,11 +56,20 @@ public: const RigFractureGrid* fractureGrid() const; - void setDefaultValuesFromUnit(); + void setDefaultValuesFromUnit(); + protected: - virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering); + virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering); + virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override; private: - void setupFractureGridCells(); - cvf::ref m_fractureGrid; + void setupFractureGridCells(); + +private: + cvf::ref m_fractureGrid; + + caf::PdmField m_halfLength; + caf::PdmField m_height; + caf::PdmField m_width; + caf::PdmField m_permeability; }; diff --git a/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplate.cpp b/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplate.cpp index d03302b918..70125b54cd 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplate.cpp +++ b/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplate.cpp @@ -61,7 +61,7 @@ CAF_PDM_XML_ABSTRACT_SOURCE_INIT(RimFractureTemplate, "RimFractureTemplate"); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimFractureTemplate::RimFractureTemplate(void) +RimFractureTemplate::RimFractureTemplate() { CAF_PDM_InitObject("Fracture Template", ":/FractureTemplate16x16.png", "", ""); @@ -226,7 +226,7 @@ void RimFractureTemplate::defineEditorAttribute(const caf::PdmFieldHandle* field { if (field == &perforationEfficiency) { - caf::PdmUiDoubleSliderEditorAttribute* myAttr = dynamic_cast(attribute); + auto myAttr = dynamic_cast(attribute); if (myAttr) { myAttr->m_minimum = 0; @@ -303,4 +303,4 @@ void RimFractureTemplate::setDefaultWellDiameterFromUnit() { wellDiameter = 0.216; } -} \ No newline at end of file +} diff --git a/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplate.h b/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplate.h index e053b9e0b0..2227114c08 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplate.h +++ b/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplate.h @@ -45,8 +45,8 @@ class RimFractureTemplate : public caf::PdmObject CAF_PDM_HEADER_INIT; public: - RimFractureTemplate(void); - virtual ~RimFractureTemplate(void); + RimFractureTemplate(); + virtual ~RimFractureTemplate(); caf::PdmField name; caf::PdmField azimuthAngle; @@ -91,7 +91,7 @@ protected: virtual caf::PdmFieldHandle* userDescriptionField() override; virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override; - virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering); + virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override; virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;