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

#1143 - pre-proto - Reordering fields / graying out not relevant fields.

Browse Source
This commit is contained in:
astridkbjorke
2017-02-06 13:51:13 +01:00
parent e6958c3e65
commit 642d468b94
3 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ApplicationCode/ProjectDataModel/RimEllipseFractureTemplate.cpp
View File

@@ -59,7 +59,7 @@ RimEllipseFractureTemplate::RimEllipseFractureTemplate(void)
CAF_PDM_InitField(&height, "Height", 75.0f, "Height", "", "", "");
CAF_PDM_InitField(&width, "Width", 1.0f, "Width", "", "", "");
CAF_PDM_InitField(&orientation, "Orientation", caf::AppEnum<FracOrientationEnum>(TRANSVERSE_WELL_PATH), "Fracture orientation", "", "", "");
CAF_PDM_InitField(&azimuthAngle, "AzimuthAngle", 0.0f, "Angle (if Azimuth Orientation)", "", "", ""); //Is this correct description?
CAF_PDM_InitField(&azimuthAngle, "AzimuthAngle", 0.0f, "Azimuth Angle", "", "", ""); //Is this correct description?
CAF_PDM_InitField(&perforationLength, "PerforationLength", 0.0f, "Lenght of well perforation", "", "", ""); //Is this correct description?
@@ -199,10 +199,22 @@ void RimEllipseFractureTemplate::defineUiOrdering(QString uiConfigName, caf::Pdm
geometryGroup->add(&height);
geometryGroup->add(&orientation);
geometryGroup->add(&azimuthAngle);
geometryGroup->add(&perforationLength);
caf::PdmUiGroup* group = uiOrdering.addNewGroup("Fracture properties");
group->add(&permeability);
group->add(&width);
group->add(&skinFactor);
if (orientation == RimEllipseFractureTemplate::ALONG_WELL_PATH
|| orientation == RimEllipseFractureTemplate::TRANSVERSE_WELL_PATH)
{
azimuthAngle.uiCapability()->setUiReadOnly(true);
}
else if (orientation == RimEllipseFractureTemplate::AZIMUTH)
{
azimuthAngle.uiCapability()->setUiReadOnly(false);
}
caf::PdmUiGroup* propertyGroup = uiOrdering.addNewGroup("Fracture properties");
propertyGroup->add(&permeability);
propertyGroup->add(&width);
propertyGroup->add(&skinFactor);
propertyGroup->add(&perforationLength);
}

15
ApplicationCode/ProjectDataModel/RimSimWellFracture.cpp
View File

@@ -154,11 +154,10 @@ void RimSimWellFracture::defineUiOrdering(QString uiConfigName, caf::PdmUiOrderi
{
uiOrdering.add(&name);
uiOrdering.add(&m_location);
caf::PdmUiGroup* geometryGroup = uiOrdering.addNewGroup("Properties");
geometryGroup->add(&azimuth);
caf::PdmUiGroup* locationGroup = uiOrdering.addNewGroup("Location / Orientation");
locationGroup->add(&m_location);
locationGroup->add(&m_branchIndex);
locationGroup->add(&azimuth);
if (attachedFractureDefinition())
{
if (attachedFractureDefinition()->orientation == RimEllipseFractureTemplate::ALONG_WELL_PATH
@@ -172,9 +171,9 @@ void RimSimWellFracture::defineUiOrdering(QString uiConfigName, caf::PdmUiOrderi
}
}
geometryGroup->add(&m_fractureTemplate);
caf::PdmUiGroup* propertyGroup = uiOrdering.addNewGroup("Properties");
propertyGroup->add(&m_fractureTemplate);
propertyGroup->add(&perforationLength);
caf::PdmUiGroup* fractureCenterGroup = uiOrdering.addNewGroup("Fracture Center Info");
fractureCenterGroup->add(&m_uiAnchorPosition);

12
ApplicationCode/ProjectDataModel/RimWellPathFracture.cpp
View File

@@ -149,10 +149,9 @@ void RimWellPathFracture::defineUiOrdering(QString uiConfigName, caf::PdmUiOrder
{
uiOrdering.add(&name);
uiOrdering.add(&m_measuredDepth);
caf::PdmUiGroup* geometryGroup = uiOrdering.addNewGroup("Properties");
geometryGroup->add(&azimuth);
caf::PdmUiGroup* locationGroup = uiOrdering.addNewGroup("Location / Orientation");
locationGroup->add(&m_measuredDepth);
locationGroup->add(&azimuth);
if (attachedFractureDefinition())
{
if (attachedFractureDefinition()->orientation == RimEllipseFractureTemplate::ALONG_WELL_PATH
@@ -166,8 +165,9 @@ void RimWellPathFracture::defineUiOrdering(QString uiConfigName, caf::PdmUiOrder
}
}
geometryGroup->add(&m_fractureTemplate);
caf::PdmUiGroup* propertyGroup = uiOrdering.addNewGroup("Properties");
propertyGroup->add(&m_fractureTemplate);
propertyGroup->add(&perforationLength);
caf::PdmUiGroup* fractureCenterGroup = uiOrdering.addNewGroup("Fracture Center Info");
fractureCenterGroup->add(&m_uiAnchorPosition);