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

#2609 Uiordering of splitted well path class ok

Browse Source
This commit is contained in:
Jacob Støren 2018-06-22 15:32:10 +02:00
parent ad709d76a2
commit dafe2319d9
2 changed files with 22 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ApplicationCode/ProjectDataModel/RimWellPath.cpp
View File

@ -165,9 +165,9 @@ void RimFileWellPath::setSurveyType(QString surveyType)
{ {
m_surveyType = surveyType; m_surveyType = surveyType;
if (m_surveyType == "PLAN") if (m_surveyType == "PLAN")
m_wellPathColor = cvf::Color3f(0.999f, 0.333f, 0.0f); setWellPathColor(cvf::Color3f(0.999f, 0.333f, 0.0f));
else if (m_surveyType == "PROTOTYPE") else if (m_surveyType == "PROTOTYPE")
m_wellPathColor = cvf::Color3f(0.0f, 0.333f, 0.999f); setWellPathColor(cvf::Color3f(0.0f, 0.333f, 0.999f));
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -177,20 +177,16 @@ void RimFileWellPath::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
{ {
RimWellPath::defineUiOrdering(uiConfigName, uiOrdering); RimWellPath::defineUiOrdering(uiConfigName, uiOrdering);
// Todo : Insert at correct place caf::PdmUiGroup* fileInfoGroup = uiOrdering.createGroupBeforeGroup("Simulation Well", "File");
caf::PdmUiGroup* fileInfoGroup = uiOrdering.addNewGroup("File");
fileInfoGroup->add(&m_filepath); fileInfoGroup->add(&m_filepath);
fileInfoGroup->add(&m_wellPathIndexInFile); fileInfoGroup->add(&m_wellPathIndexInFile);
caf::PdmUiGroup* ssihubGroup = uiOrdering.addNewGroup("Well Info"); if ( !id().isEmpty() ) uiOrdering.insertBeforeItem(m_datumElevation.uiCapability(), &id);
ssihubGroup->add(&id); if ( !sourceSystem().isEmpty() ) uiOrdering.insertBeforeItem(m_datumElevation.uiCapability(), &sourceSystem);
ssihubGroup->add(&sourceSystem); if ( !utmZone().isEmpty() ) uiOrdering.insertBeforeItem(m_datumElevation.uiCapability(), &utmZone);
ssihubGroup->add(&utmZone); if ( !updateDate().isEmpty() ) uiOrdering.insertBeforeItem(m_datumElevation.uiCapability(), &updateDate);
ssihubGroup->add(&updateDate); if ( !updateUser().isEmpty() ) uiOrdering.insertBeforeItem(m_datumElevation.uiCapability(), &updateUser);
ssihubGroup->add(&updateUser); if ( !m_surveyType().isEmpty() ) uiOrdering.insertBeforeItem(m_datumElevation.uiCapability(), &m_surveyType);
ssihubGroup->add(&m_surveyType);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -546,7 +542,7 @@ bool RimFileWellPath::readWellPathFile(QString* errorMessage, RifWellPathImporte
setSurveyType(wellMetaData.m_surveyType); setSurveyType(wellMetaData.m_surveyType);
updateDate = wellMetaData.m_updateDate.toString("d MMMM yyyy"); updateDate = wellMetaData.m_updateDate.toString("d MMMM yyyy");
m_wellPath = wellData.m_wellPathGeometry; setWellPathGeometry(wellData.m_wellPathGeometry.p());
return true; return true;
} }
else else

31
ApplicationCode/ProjectDataModel/RimWellPath.h
View File

@ -129,51 +129,44 @@ protected:
virtual void initAfterRead() override; virtual void initAfterRead() override;
virtual void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override; virtual void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
private:
void setWellPathGeometry(RigWellPath* wellPathModel); void setWellPathGeometry(RigWellPath* wellPathModel);
virtual void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName) override;
static size_t simulationWellBranchCount(const QString& simWellName);
private:
// Fields // Fields
protected:
caf::PdmField<double> m_datumElevation;
private:
caf::PdmField<QString> m_name; caf::PdmField<QString> m_name;
caf::PdmField<QString> m_simWellName; caf::PdmField<QString> m_simWellName;
caf::PdmField<int> m_branchIndex; caf::PdmField<int> m_branchIndex;
caf::PdmField<RiaEclipseUnitTools::UnitSystemType> m_unitSystem; caf::PdmField<RiaEclipseUnitTools::UnitSystemType> m_unitSystem;
caf::PdmField<double> m_datumElevation;
caf::PdmField<QString> m_wellPathFormationFilePath; caf::PdmField<QString> m_wellPathFormationFilePath;
caf::PdmField<QString> m_formationKeyInFile; caf::PdmField<QString> m_formationKeyInFile;
caf::PdmField<bool> m_showWellPath; caf::PdmField<bool> m_showWellPath;
caf::PdmField<bool> m_showWellPathLabel; caf::PdmField<bool> m_showWellPathLabel;
caf::PdmField<double> m_wellPathRadiusScaleFactor; caf::PdmField<double> m_wellPathRadiusScaleFactor;
caf::PdmField<cvf::Color3f> m_wellPathColor;
caf::PdmChildArrayField<RimWellLogFile*> m_wellLogFiles; caf::PdmChildArrayField<RimWellLogFile*> m_wellLogFiles;
caf::PdmChildField<Rim3dWellLogCurveCollection*> m_3dWellLogCurves; caf::PdmChildField<Rim3dWellLogCurveCollection*> m_3dWellLogCurves;
caf::PdmChildField<RimWellPathCompletions*> m_completions; caf::PdmChildField<RimWellPathCompletions*> m_completions;
// Geometry and data private:
cvf::ref<RigWellPathFormations> m_wellPathFormations; virtual void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName) override;
static size_t simulationWellBranchCount(const QString& simWellName);
protected:
cvf::ref<RigWellPath> m_wellPath;
caf::PdmField<cvf::Color3f> m_wellPathColor;
private: private:
// Geometry and data
cvf::ref<RigWellPath> m_wellPath;
cvf::ref<RigWellPathFormations> m_wellPathFormations;
// Obsolete fields // Obsolete fields
caf::PdmChildField<RimWellLogFile*> m_wellLogFile_OBSOLETE; caf::PdmChildField<RimWellLogFile*> m_wellLogFile_OBSOLETE;