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

#2582 3d well log curves: Select created curve in tree

Browse Source
This commit is contained in:
Rebecca Cox 2018-03-07 13:03:27 +01:00
parent a37a9d3308
commit 9b8c06462c
4 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ApplicationCode/Commands/RicAdd3dWellLogCurveFeature.cpp
View File

@ -27,6 +27,8 @@
#include "RimProject.h" #include "RimProject.h"
#include "RimWellPath.h" #include "RimWellPath.h"
#include "Riu3DMainWindowTools.h"
#include <QAction> #include <QAction>
CAF_CMD_SOURCE_INIT(RicAdd3dWellLogCurveFeature, "RicAdd3dWellLogCurveFeature"); CAF_CMD_SOURCE_INIT(RicAdd3dWellLogCurveFeature, "RicAdd3dWellLogCurveFeature");
@ -48,9 +50,17 @@ bool RicAdd3dWellLogCurveFeature::isCommandEnabled()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicAdd3dWellLogCurveFeature::onActionTriggered(bool isChecked) void RicAdd3dWellLogCurveFeature::onActionTriggered(bool isChecked)
{ {
Rim3dWellLogCurve* rim3dWellLogCurve = new Rim3dWellLogCurve; RimWellPath* selectedWellPath = RicWellLogTools::selectedWellPath();
RicWellLogTools::selectedWellPath()->add3dWellLogCurve(rim3dWellLogCurve); Rim3dWellLogCurve* rim3dWellLogCurve = new Rim3dWellLogCurve();
selectedWellPath->add3dWellLogCurve(rim3dWellLogCurve);
RiaApplication::instance()->project()->updateConnectedEditors();
Riu3DMainWindowTools::selectAsCurrentItem(rim3dWellLogCurve);
Riu3DMainWindowTools::setExpanded(selectedWellPath);
selectedWellPath->updateConnectedEditors();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

11
ApplicationCode/ProjectDataModel/Rim3dWellLogCurve.cpp
View File

@ -89,6 +89,9 @@ Rim3dWellLogCurve::Rim3dWellLogCurve()
m_geomResultDefinition = new RimGeoMechResultDefinition; m_geomResultDefinition = new RimGeoMechResultDefinition;
CAF_PDM_InitField(&m_timeStep, "CurveTimeStep", 0, "Time Step", "", "", ""); CAF_PDM_InitField(&m_timeStep, "CurveTimeStep", 0, "Time Step", "", "", "");
CAF_PDM_InitField(&m_name, "Name", QString("3d Well Log Curve"), "3d Well Log Curve", "", "", "");
m_name.uiCapability()->setUiHidden(true);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -100,6 +103,14 @@ Rim3dWellLogCurve::~Rim3dWellLogCurve()
delete m_eclipseResultDefinition; delete m_eclipseResultDefinition;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::PdmFieldHandle* Rim3dWellLogCurve::userDescriptionField()
{
return &m_name;
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

5
ApplicationCode/ProjectDataModel/Rim3dWellLogCurve.h
View File

@ -60,15 +60,18 @@ public:
OTHER_RESULT OTHER_RESULT
}; };
public: public:
Rim3dWellLogCurve(); Rim3dWellLogCurve();
virtual ~Rim3dWellLogCurve(); virtual ~Rim3dWellLogCurve();
virtual caf::PdmFieldHandle* userDescriptionField() override;
private: private:
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override; virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
private: private:
caf::PdmField<QString> m_name;
caf::PdmPtrField<RimCase*> m_case; caf::PdmPtrField<RimCase*> m_case;
caf::PdmField<int> m_timeStep; caf::PdmField<int> m_timeStep;
caf::PdmChildField<RimEclipseResultDefinition*> m_eclipseResultDefinition; caf::PdmChildField<RimEclipseResultDefinition*> m_eclipseResultDefinition;

1
ApplicationCode/ProjectDataModel/RimWellPath.cpp
View File

@ -809,7 +809,6 @@ const RigWellPathFormations* RimWellPath::formationsGeometry() const
void RimWellPath::add3dWellLogCurve(Rim3dWellLogCurve* rim3dWellLogCurve) void RimWellPath::add3dWellLogCurve(Rim3dWellLogCurve* rim3dWellLogCurve)
{ {
m_3dWellLogCurves.push_back(rim3dWellLogCurve); m_3dWellLogCurves.push_back(rim3dWellLogCurve);
updateConnectedEditors();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------