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

#932 Intersection box : Added xy step size and depth step size

Browse Source
This commit is contained in:
Magne Sjaastad
2016-10-25 13:12:43 +02:00
parent c09e22c1df
commit c418650546
2 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
ApplicationCode/ProjectDataModel/RimIntersectionBox.cpp
View File

@@ -82,6 +82,8 @@ RimIntersectionBox::RimIntersectionBox()
m_maxDepth.uiCapability()->setUiEditorTypeName(caf::PdmUiDoubleSliderEditor::uiEditorTypeName()); m_maxDepth.uiCapability()->setUiEditorTypeName(caf::PdmUiDoubleSliderEditor::uiEditorTypeName());
CAF_PDM_InitField (&showInactiveCells, "ShowInactiveCells", false, "Show Inactive Cells", "", "", ""); CAF_PDM_InitField (&showInactiveCells, "ShowInactiveCells", false, "Show Inactive Cells", "", "", "");
CAF_PDM_InitField (&m_xySliderStepSize, "xySliderStepSize", 1.0, "XY Slider Step Size", "", "", "");
CAF_PDM_InitField (&m_depthSliderStepSize, "DepthSliderStepSize", 0.5, "Depth Slider Step Size", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_show3DManipulator, "show3DManipulator", "", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_show3DManipulator, "show3DManipulator", "", "", "", "");
m_show3DManipulator.xmlCapability()->setIOWritable(false); m_show3DManipulator.xmlCapability()->setIOWritable(false);
@@ -360,8 +362,7 @@ void RimIntersectionBox::updateBoxManipulatorGeometry()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimIntersectionBox::defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) void RimIntersectionBox::defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute)
{ {
caf::PdmUiDoubleSliderEditorAttribute* myAttr = static_cast<caf::PdmUiDoubleSliderEditorAttribute*>(attribute); caf::PdmUiDoubleSliderEditorAttribute* myAttr = dynamic_cast<caf::PdmUiDoubleSliderEditorAttribute*>(attribute);
if (myAttr) if (myAttr)
{ {
cvf::BoundingBox cellsBoundingBox = currentCellBoundingBox(); cvf::BoundingBox cellsBoundingBox = currentCellBoundingBox();
@@ -369,16 +370,31 @@ void RimIntersectionBox::defineEditorAttribute(const caf::PdmFieldHandle* field,
{ {
myAttr->m_minimum = cellsBoundingBox.min().x(); myAttr->m_minimum = cellsBoundingBox.min().x();
myAttr->m_maximum = cellsBoundingBox.max().x(); myAttr->m_maximum = cellsBoundingBox.max().x();
int range = cellsBoundingBox.extent().x();
int tickCount = range / m_xySliderStepSize;
myAttr->m_sliderTickCount = cvf::Math::abs(tickCount);
} }
else if (field == &m_minYCoord || field == &m_maxYCoord) else if (field == &m_minYCoord || field == &m_maxYCoord)
{ {
myAttr->m_minimum = cellsBoundingBox.min().y(); myAttr->m_minimum = cellsBoundingBox.min().y();
myAttr->m_maximum = cellsBoundingBox.max().y(); myAttr->m_maximum = cellsBoundingBox.max().y();
int range = cellsBoundingBox.extent().y();
int tickCount = range / m_xySliderStepSize;
myAttr->m_sliderTickCount = cvf::Math::abs(tickCount);
} }
else if (field == &m_minDepth || field == &m_maxDepth) else if (field == &m_minDepth || field == &m_maxDepth)
{ {
myAttr->m_minimum = -cellsBoundingBox.max().z(); myAttr->m_minimum = -cellsBoundingBox.max().z();
myAttr->m_maximum = -cellsBoundingBox.min().z(); myAttr->m_maximum = -cellsBoundingBox.min().z();
int range = cellsBoundingBox.extent().z();
int tickCount = range / m_depthSliderStepSize;
myAttr->m_sliderTickCount = cvf::Math::abs(tickCount);
} }
} }
@@ -429,8 +445,13 @@ void RimIntersectionBox::defineUiOrdering(QString uiConfigName, caf::PdmUiOrderi
group->add(&m_maxDepth); group->add(&m_maxDepth);
} }
uiOrdering.add(&m_show3DManipulator); {
caf::PdmUiGroup* group = uiOrdering.addNewGroup("Slider Options");
group->add(&m_xySliderStepSize);
group->add(&m_depthSliderStepSize);
}
uiOrdering.add(&m_show3DManipulator);
} }

9
ApplicationCode/ProjectDataModel/RimIntersectionBox.h
View File

@@ -63,8 +63,8 @@ public:
// Fields // Fields
caf::PdmField<QString> name; caf::PdmField<QString> name;
caf::PdmField<bool> isActive; caf::PdmField<bool> isActive;
caf::PdmField< bool > showInactiveCells; caf::PdmField<bool> showInactiveCells;
cvf::Mat4d boxOrigin() const; cvf::Mat4d boxOrigin() const;
cvf::Vec3d boxSize() const; cvf::Vec3d boxSize() const;
SinglePlaneState singlePlaneState() const; SinglePlaneState singlePlaneState() const;
@@ -115,8 +115,13 @@ private:
caf::PdmField<double> m_maxYCoord; caf::PdmField<double> m_maxYCoord;
caf::PdmField<double> m_maxDepth; caf::PdmField<double> m_maxDepth;
caf::PdmField<double> m_xySliderStepSize;
caf::PdmField<double> m_depthSliderStepSize;
caf::PdmField<bool> m_show3DManipulator; caf::PdmField<bool> m_show3DManipulator;
cvf::ref<RivIntersectionBoxPartMgr> m_intersectionBoxPartMgr; cvf::ref<RivIntersectionBoxPartMgr> m_intersectionBoxPartMgr;
QPointer<RicBoxManipulatorEventHandler> m_boxManipulator; QPointer<RicBoxManipulatorEventHandler> m_boxManipulator;
}; };