3D Well Log Curves(#2671): Make curve draw plane background optional

This commit is contained in:
Gaute Lindkvist
2018-04-17 08:30:06 +02:00
parent 092624799e
commit 501e80b1ad
6 changed files with 56 additions and 42 deletions

View File

@@ -18,6 +18,7 @@
#include "Rim3dWellLogCurveCollection.h"
#include "RiaColorTables.h"
#include "Rim3dWellLogCurve.h"
#include "RimWellPath.h"
#include "RimProject.h"
@@ -45,10 +46,10 @@ Rim3dWellLogCurveCollection::Rim3dWellLogCurveCollection()
CAF_PDM_InitField(&m_showPlot, "Show3dWellLogCurves", true, "Show 3d Well Log Curves", "", "", "");
m_showPlot.uiCapability()->setUiHidden(true);
CAF_PDM_InitField(&m_showGrid, "Show3dWellLogGrid", true, "Show Grid", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_planePosition, "PlanePosition", "Plane Position", "", "", "");
CAF_PDM_InitField(&m_showGrid, "Show3dWellLogGrid", true, "Show Grid", "", "", "");
CAF_PDM_InitField(&m_showBackground, "Show3dWellLogBackground", false, "Show Background", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_3dWellLogCurves, "ArrayOf3dWellLogCurves", "", "", "", "");
m_3dWellLogCurves.uiCapability()->setUiTreeHidden(true);
}
@@ -88,6 +89,14 @@ void Rim3dWellLogCurveCollection::remove3dWellLogCurve(Rim3dWellLogCurve* curve)
m_3dWellLogCurves.removeChildObject(curve);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool Rim3dWellLogCurveCollection::isShowingPlot() const
{
return m_showPlot;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -99,13 +108,14 @@ bool Rim3dWellLogCurveCollection::isShowingGrid() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool Rim3dWellLogCurveCollection::isShowingPlot() const
bool Rim3dWellLogCurveCollection::isShowingBackground() const
{
return m_showPlot;
return m_showBackground;
}
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
Rim3dWellLogCurveCollection::PlanePosition Rim3dWellLogCurveCollection::planePosition() const
{
@@ -168,8 +178,12 @@ caf::PdmFieldHandle* Rim3dWellLogCurveCollection::objectToggleField()
//--------------------------------------------------------------------------------------------------
void Rim3dWellLogCurveCollection::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{
caf::PdmUiGroup* settingsGroup = uiOrdering.addNewGroup("Track Settings");
caf::PdmUiGroup* settingsGroup = uiOrdering.addNewGroup("Draw Plane Settings");
settingsGroup->add(&m_showGrid);
settingsGroup->add(&m_planePosition);
caf::PdmUiGroup* appearanceSettingsGroup = uiOrdering.addNewGroup("Draw Plane Appearance");
appearanceSettingsGroup->add(&m_showGrid);
appearanceSettingsGroup->add(&m_showBackground);
}

View File

@@ -48,13 +48,15 @@ public:
void add3dWellLogCurve(Rim3dWellLogCurve* curve);
void remove3dWellLogCurve(Rim3dWellLogCurve* curve);
bool isShowingGrid() const;
bool isShowingPlot() const;
bool isShowingGrid() const;
bool isShowingBackground() const;
PlanePosition planePosition() const;
std::vector<Rim3dWellLogCurve*> vectorOf3dWellLogCurves() const;
void redrawAffectedViewsAndEditors();
private:
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
virtual caf::PdmFieldHandle* objectToggleField() override;
@@ -63,8 +65,11 @@ private:
private:
caf::PdmField<bool> m_showPlot;
caf::PdmField<bool> m_showGrid;
caf::PdmField<caf::AppEnum<PlanePosition>> m_planePosition;
caf::PdmField<bool> m_showGrid;
caf::PdmField<bool> m_showBackground;
caf::PdmChildArrayField<Rim3dWellLogCurve*> m_3dWellLogCurves;
};