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

#814 Intersection Box: Adjusted UI a bit

Browse Source
This commit is contained in:
Jacob Støren 2016-10-04 10:10:06 +02:00
parent 47df6a6122
commit 0fc1d9cbf8
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ProjectDataModel/RimIntersection.cpp
View File

@ -83,7 +83,7 @@ RimIntersection::RimIntersection()
CAF_PDM_InitFieldNoDefault(&m_userPolyline, "Points", "Points", "", "Use Ctrl-C for copy and Ctrl-V for paste", ""); CAF_PDM_InitFieldNoDefault(&m_userPolyline, "Points", "Points", "", "Use Ctrl-C for copy and Ctrl-V for paste", "");
CAF_PDM_InitField (&m_branchIndex, "Branch", -1, "Branch", "", "", ""); CAF_PDM_InitField (&m_branchIndex, "Branch", -1, "Branch", "", "", "");
CAF_PDM_InitField (&m_extentLength, "ExtentLength", 200.0, "Extent length", "", "", ""); CAF_PDM_InitField (&m_extentLength, "ExtentLength", 200.0, "Extent length", "", "", "");
CAF_PDM_InitField (&showInactiveCells, "ShowInactiveCells", false, "Inactive Cells", "", "", ""); CAF_PDM_InitField (&showInactiveCells, "ShowInactiveCells", false, "Show Inactive Cells", "", "", "");
CAF_PDM_InitFieldNoDefault(&inputFromViewerEnabled, "m_activateUiAppendPointsCommand", "", "", "", ""); CAF_PDM_InitFieldNoDefault(&inputFromViewerEnabled, "m_activateUiAppendPointsCommand", "", "", "", "");
inputFromViewerEnabled.xmlCapability()->setIOWritable(false); inputFromViewerEnabled.xmlCapability()->setIOWritable(false);

19
ApplicationCode/ProjectDataModel/RimIntersectionBox.cpp
View File

@ -39,7 +39,7 @@ namespace caf
template<> template<>
void AppEnum< RimIntersectionBox::SinglePlaneState >::setUp() void AppEnum< RimIntersectionBox::SinglePlaneState >::setUp()
{ {
addItem(RimIntersectionBox::PLANE_STATE_NONE, "PLANE_STATE_NONE", "None"); addItem(RimIntersectionBox::PLANE_STATE_NONE, "PLANE_STATE_NONE", "Box");
addItem(RimIntersectionBox::PLANE_STATE_X, "PLANE_STATE_X", "X Plane"); addItem(RimIntersectionBox::PLANE_STATE_X, "PLANE_STATE_X", "X Plane");
addItem(RimIntersectionBox::PLANE_STATE_Y, "PLANE_STATE_Y", "Y Plane"); addItem(RimIntersectionBox::PLANE_STATE_Y, "PLANE_STATE_Y", "Y Plane");
addItem(RimIntersectionBox::PLANE_STATE_Z, "PLANE_STATE_Z", "Z Plane"); addItem(RimIntersectionBox::PLANE_STATE_Z, "PLANE_STATE_Z", "Z Plane");
@ -61,7 +61,7 @@ RimIntersectionBox::RimIntersectionBox()
CAF_PDM_InitField(&isActive, "Active", true, "Active", "", "", ""); CAF_PDM_InitField(&isActive, "Active", true, "Active", "", "", "");
isActive.uiCapability()->setUiHidden(true); isActive.uiCapability()->setUiHidden(true);
CAF_PDM_InitField(&m_singlePlaneState, "singlePlaneState", caf::AppEnum<SinglePlaneState>(SinglePlaneState::PLANE_STATE_NONE), "Collapse box to plane", "", "", ""); CAF_PDM_InitField(&m_singlePlaneState, "singlePlaneState", caf::AppEnum<SinglePlaneState>(SinglePlaneState::PLANE_STATE_NONE), "Box Type", "", "", "");
CAF_PDM_InitField(&m_minXCoord, "MinXCoord", 0.0, "Min", "", "", ""); CAF_PDM_InitField(&m_minXCoord, "MinXCoord", 0.0, "Min", "", "", "");
m_minXCoord.uiCapability()->setUiEditorTypeName(caf::PdmUiDoubleSliderEditor::uiEditorTypeName()); m_minXCoord.uiCapability()->setUiEditorTypeName(caf::PdmUiDoubleSliderEditor::uiEditorTypeName());
@ -81,12 +81,13 @@ RimIntersectionBox::RimIntersectionBox()
CAF_PDM_InitField(&m_maxDepth, "MaxDepth", 0.0, "Max", "", "", ""); CAF_PDM_InitField(&m_maxDepth, "MaxDepth", 0.0, "Max", "", "", "");
m_maxDepth.uiCapability()->setUiEditorTypeName(caf::PdmUiDoubleSliderEditor::uiEditorTypeName()); m_maxDepth.uiCapability()->setUiEditorTypeName(caf::PdmUiDoubleSliderEditor::uiEditorTypeName());
CAF_PDM_InitField (&showInactiveCells, "ShowInactiveCells", false, "Inactive Cells", "", "", ""); CAF_PDM_InitField (&showInactiveCells, "ShowInactiveCells", false, "Show Inactive Cells", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_show3DManipulator, "show3DManipulator", "", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_show3DManipulator, "show3DManipulator", "", "", "", "");
m_show3DManipulator.xmlCapability()->setIOWritable(false); m_show3DManipulator.xmlCapability()->setIOWritable(false);
m_show3DManipulator.xmlCapability()->setIOReadable(false); m_show3DManipulator.xmlCapability()->setIOReadable(false);
m_show3DManipulator.uiCapability()->setUiEditorTypeName(caf::PdmUiPushButtonEditor::uiEditorTypeName()); m_show3DManipulator.uiCapability()->setUiEditorTypeName(caf::PdmUiPushButtonEditor::uiEditorTypeName());
m_show3DManipulator.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
m_show3DManipulator = false; m_show3DManipulator = false;
} }
@ -369,7 +370,7 @@ void RimIntersectionBox::defineEditorAttribute(const caf::PdmFieldHandle* field,
if (m_show3DManipulator) if (m_show3DManipulator)
{ {
attrib->m_buttonText = "Hide3D manipulator"; attrib->m_buttonText = "Hide 3D manipulator";
} }
else else
{ {
@ -384,8 +385,12 @@ void RimIntersectionBox::defineEditorAttribute(const caf::PdmFieldHandle* field,
void RimIntersectionBox::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) void RimIntersectionBox::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{ {
uiOrdering.add(&name); uiOrdering.add(&name);
uiOrdering.add(&m_show3DManipulator);
uiOrdering.add(&m_singlePlaneState); {
caf::PdmUiGroup* group = uiOrdering.addNewGroup("Options");
group->add(&m_singlePlaneState);
group->add(&showInactiveCells);
}
cvf::BoundingBox cellsBoundingBox = currentCellBoundingBox(); cvf::BoundingBox cellsBoundingBox = currentCellBoundingBox();
{ {
@ -406,6 +411,8 @@ void RimIntersectionBox::defineUiOrdering(QString uiConfigName, caf::PdmUiOrderi
group->add(&m_maxDepth); group->add(&m_maxDepth);
} }
uiOrdering.add(&m_show3DManipulator);
} }