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

3d Well Log Plots: Remove curve filled code

Browse Source
This commit is contained in:
Gaute Lindkvist
2018-05-18 11:04:42 +02:00
parent 68dd0ba13e
commit 9e665d5ab1
5 changed files with 3 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ApplicationCode/ProjectDataModel/Rim3dWellLogCurve.cpp
View File

@@ -51,13 +51,6 @@ namespace caf
setDefault(Rim3dWellLogCurve::VERTICAL_ABOVE);
}
template<>
void AppEnum< Rim3dWellLogCurve::DrawStyle >::setUp()
{
addItem(Rim3dWellLogCurve::LINE, "LINE", "Line");
addItem(Rim3dWellLogCurve::FILLED, "FILLED", "Filled");
setDefault(Rim3dWellLogCurve::LINE);
}
}
//--------------------------------------------------------------------------------------------------
@@ -75,7 +68,6 @@ Rim3dWellLogCurve::Rim3dWellLogCurve()
CAF_PDM_InitField(&m_maxCurveUIValue, "MaxCurveValue", std::numeric_limits<float>::infinity(), "Maximum Curve Value", "", "Clip curve values above this.", "");
CAF_PDM_InitField(&m_drawPlane, "DrawPlane", DrawPlaneEnum(VERTICAL_ABOVE), "Draw Plane", "", "", "");
CAF_PDM_InitField(&m_drawStyle, "DrawStyle", DrawStyleEnum(LINE), "Draw Style", "", "", "");
CAF_PDM_InitField(&m_color, "CurveColor", cvf::Color3f(0.0f, 0.0f, 0.0f), "Curve Color", "", "", "");
this->uiCapability()->setUiTreeChildrenHidden(true);
}
@@ -105,14 +97,6 @@ Rim3dWellLogCurve::DrawPlane Rim3dWellLogCurve::drawPlane() const
return m_drawPlane();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
Rim3dWellLogCurve::DrawStyle Rim3dWellLogCurve::drawStyle() const
{
return m_drawStyle();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -207,8 +191,6 @@ void Rim3dWellLogCurve::configurationUiOrdering(caf::PdmUiOrdering& uiOrdering)
{
caf::PdmUiGroup* configurationGroup = uiOrdering.addNewGroup("Curve Appearance");
configurationGroup->add(&m_drawPlane);
// Disable filled draw style in the GUI because of triangle stitching issue #2860.
// configurationGroup->add(&m_drawStyle);
configurationGroup->add(&m_color);
configurationGroup->add(&m_minCurveUIValue);
configurationGroup->add(&m_maxCurveUIValue);

9
ApplicationCode/ProjectDataModel/Rim3dWellLogCurve.h
View File

@@ -51,13 +51,6 @@ public:
};
typedef caf::AppEnum<DrawPlane> DrawPlaneEnum;
enum DrawStyle
{
LINE,
FILLED
};
typedef caf::AppEnum<DrawStyle> DrawStyleEnum;
public:
Rim3dWellLogCurve();
virtual ~Rim3dWellLogCurve();
@@ -68,7 +61,6 @@ public:
virtual QString resultPropertyString() const = 0;
DrawPlane drawPlane() const;
DrawStyle drawStyle() const;
double drawPlaneAngle() const;
cvf::Color3f color() const;
@@ -99,7 +91,6 @@ private:
void resetMinMaxValues();
protected:
caf::PdmField<DrawPlaneEnum> m_drawPlane;
caf::PdmField<DrawStyleEnum> m_drawStyle;
caf::PdmField<cvf::Color3f> m_color;
caf::PdmField<float> m_minCurveUIValue;
caf::PdmField<float> m_maxCurveUIValue;