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

#2402 Code cleanup

Browse Source
This commit is contained in:
Magne Sjaastad
2018-01-25 12:27:36 +01:00
parent 001742cbd3
commit 827468b764
2 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ApplicationCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp
View File

@@ -58,7 +58,7 @@ CAF_PDM_SOURCE_INIT(RimStimPlanFractureTemplate, "RimStimPlanFractureTemplate");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimStimPlanFractureTemplate::RimStimPlanFractureTemplate(void)
RimStimPlanFractureTemplate::RimStimPlanFractureTemplate()
{
CAF_PDM_InitObject("Fracture Template", ":/FractureTemplate16x16.png", "", "");
@@ -86,6 +86,22 @@ RimStimPlanFractureTemplate::~RimStimPlanFractureTemplate()
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
int RimStimPlanFractureTemplate::activeTimeStepIndex()
{
return m_activeTimeStepIndex;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimStimPlanFractureTemplate::showStimPlanMesh()
{
return m_showStimPlanMesh;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -227,7 +243,7 @@ bool RimStimPlanFractureTemplate::setBorderPolygonResultNameToDefault()
}
// else: Set to first property
if (uiResultNamesWithUnit().size() > 0)
if (!uiResultNamesWithUnit().empty())
{
m_borderPolygonResultName = uiResultNamesWithUnit()[0].first;
return true;

15
ApplicationCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.h
View File

@@ -49,11 +49,11 @@ class RimStimPlanFractureTemplate : public RimFractureTemplate
CAF_PDM_HEADER_INIT;
public:
RimStimPlanFractureTemplate(void);
virtual ~RimStimPlanFractureTemplate(void);
RimStimPlanFractureTemplate();
virtual ~RimStimPlanFractureTemplate();
int activeTimeStepIndex() { return m_activeTimeStepIndex; }
bool showStimPlanMesh() { return m_showStimPlanMesh;}
int activeTimeStepIndex();
bool showStimPlanMesh();
void loadDataAndUpdate();
void setDefaultsBasedOnXMLfile();
@@ -67,12 +67,12 @@ public:
// Fracture geometry
const RigFractureGrid* fractureGrid() const;
const RigFractureGrid* fractureGrid() const override;
void updateFractureGrid();
void fractureTriangleGeometry(std::vector<cvf::Vec3f>* nodeCoords,
std::vector<cvf::uint>* triangleIndices,
RiaEclipseUnitTools::UnitSystem neededUnit) override;
std::vector<cvf::Vec3f> fractureBorderPolygon(RiaEclipseUnitTools::UnitSystem neededUnit);
std::vector<cvf::Vec3f> fractureBorderPolygon(RiaEclipseUnitTools::UnitSystem neededUnit) override;
// Result Access
@@ -89,7 +89,7 @@ public:
protected:
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) 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;
private:
@@ -113,5 +113,4 @@ private:
cvf::ref<RigStimPlanFractureDefinition> m_stimPlanFractureDefinitionData;
caf::PdmField<double> m_conductivityScalingFactor;
cvf::ref<RigFractureGrid> m_fractureGrid;
};