From fd6b4910757299fc37bc31c7423a310b84e7b259 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rnar=20Grip=20Fj=C3=A6r?= Date: Fri, 16 Jun 2017 13:34:46 +0200 Subject: [PATCH] #1620 Use date editor when editing start date for perforation interval --- .../Completions/RimPerforationInterval.cpp | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/Completions/RimPerforationInterval.cpp b/ApplicationCode/ProjectDataModel/Completions/RimPerforationInterval.cpp index 0ad6e882d5..01f8e3416c 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimPerforationInterval.cpp +++ b/ApplicationCode/ProjectDataModel/Completions/RimPerforationInterval.cpp @@ -25,10 +25,6 @@ #include "RimProject.h" #include "RimWellPath.h" -#include "cafPdmUiListEditor.h" -#include "cafPdmUiTextEditor.h" -#include "cafPdmUiLineEditor.h" - CAF_PDM_SOURCE_INIT(RimPerforationInterval, "Perforation"); //-------------------------------------------------------------------------------------------------- @@ -38,13 +34,12 @@ RimPerforationInterval::RimPerforationInterval() { CAF_PDM_InitObject("Perforation", ":/PerforationInterval16x16.png", "", ""); - CAF_PDM_InitField(&m_startMD, "StartMeasuredDepth", 0.0, "Start MD [m]", "", "", ""); - CAF_PDM_InitField(&m_endMD, "EndMeasuredDepth", 0.0, "End MD [m]", "", "", ""); - CAF_PDM_InitField(&m_diameter, "Diameter", 0.216, "Diameter [m]", "", "", ""); - CAF_PDM_InitField(&m_skinFactor, "SkinFactor", 0.0, "Skin Factor", "", "", ""); - CAF_PDM_InitField(&m_startOfHistory, "StartOfHistory", true, "Start of History", "", "", ""); - CAF_PDM_InitFieldNoDefault(&m_date, "StartDate", "Start Date", "", "", ""); - m_date.uiCapability()->setUiEditorTypeName(caf::PdmUiLineEditor::uiEditorTypeName()); + CAF_PDM_InitField(&m_startMD, "StartMeasuredDepth", 0.0, "Start MD [m]", "", "", ""); + CAF_PDM_InitField(&m_endMD, "EndMeasuredDepth", 0.0, "End MD [m]", "", "", ""); + CAF_PDM_InitField(&m_diameter, "Diameter", 0.216, "Diameter [m]", "", "", ""); + CAF_PDM_InitField(&m_skinFactor, "SkinFactor", 0.0, "Skin Factor", "", "", ""); + CAF_PDM_InitField(&m_startOfHistory, "StartOfHistory", true, "Start of History", "", "", ""); + CAF_PDM_InitField(&m_date, "StartDate", QDateTime::currentDateTimeUtc(), "Start Date", "", "", ""); nameField()->uiCapability()->setUiReadOnly(true); }