Commit 1d221578 authored by Haocheng LIU's avatar Haocheng LIU Committed by Kitware Robot

Merge topic 'release-zoom-to-data' into release

fde57c55 BUG: Reword Group, Add Auxiliary and Add Image operator
9343d6f6 BUG: Show Selection for grow operator when finishes
ca8804e5 BUG: Add BBox check logic for zooming to auxiliary geometry/image
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !912
parents db079a64 fde57c55
......@@ -26,16 +26,16 @@
The operation determines which action to take on the group: create it, modify its membership, or remove it.
</DetailedDescription>
<ChildrenDefinitions>
<ModelEntity Name="modify cell group" NumberOfRequiredValues="1">
<ModelEntity Name="modify cell group" Label="modify entity group" NumberOfRequiredValues="1">
<MembershipMask>group</MembershipMask>
</ModelEntity>
<ModelEntity Name="remove cell group" Extensible="1" NumberOfRequiredValues="0">
<ModelEntity Name="remove cell group" Label="remove entity group" Extensible="1" NumberOfRequiredValues="0">
<MembershipMask>group</MembershipMask>
</ModelEntity>
<ModelEntity Name="cell to add" NumberOfRequiredValues="0" Extensible="1">
<ModelEntity Name="cell to add" Label="entity to add" NumberOfRequiredValues="0" Extensible="1">
<MembershipMask>volume|face|edge</MembershipMask>
</ModelEntity>
<ModelEntity Name="cell to remove" NumberOfRequiredValues="0" Extensible="1">
<ModelEntity Name="cell to remove" Label="entity to remove" NumberOfRequiredValues="0" Extensible="1">
<MembershipMask>volume|face|edge</MembershipMask>
</ModelEntity>
<Int Name="group type" Label="Group Type:" Version="0" NumberOfRequiredValues="1">
......
......@@ -58,6 +58,9 @@
<ItemDefinitions>
<MeshSelection Name="selection">
</MeshSelection>
<Void Name= "show selection" AdvanceLevel="11">
<BriefDescription> Show selection when the operation is finished </BriefDescription>
</Void>
</ItemDefinitions>
</AttDef>
</Definitions>
......
......@@ -538,6 +538,16 @@ std::vector<double> EntityRef::boundingBox() const
}
return bBox;
}
else if (this->isAuxiliaryGeometry())
{
if (this->hasFloatProperty(SMTK_BOUNDING_BOX_PROP))
{
smtk::model::FloatList currentBBox(this->floatProperty(SMTK_BOUNDING_BOX_PROP));
bBox = this->unionBoundingBox(bBox, currentBBox);
return bBox;
}
return dummy;
}
else
{
return dummy;
......
......@@ -73,7 +73,7 @@
*/
#define SMTK_GEOM_STYLE_PROP "_geomstyle"
/**\brief The name of an float property used to store the bounding box of a model entity
/**\brief The name of a float property used to store the bounding box of a model entity or an auxiliary geometry
*
* \sa SMTK_BOUNDING_BOX_PROP
*/
......
......@@ -4,7 +4,8 @@
<Definitions>
<!-- Operator -->
<AttDef Type="add auxiliary geometry" BaseType="operator" Label="Model - Add Auxiliary Geometry">
<AssociationsDef Name="entities" NumberOfRequiredValues="1">
<!-- In the future Label shoud be removed when SMTK supports compound auxiliary geometry -->
<AssociationsDef Name="entities" Label="model" NumberOfRequiredValues="1">
<MembershipMask>model</MembershipMask>
</AssociationsDef>
<BriefDescription>
......
......@@ -4,7 +4,8 @@
<Definitions>
<!-- Operator -->
<AttDef Type="add image" BaseType="operator" Label="Model - Add Image">
<AssociationsDef Name="entities" NumberOfRequiredValues="1">
<!-- In the future Label shoud be removed when SMTK supports compound auxiliary geometry -->
<AssociationsDef Name="entities" Label="model" NumberOfRequiredValues="1">
<MembershipMask>model</MembershipMask>
</AssociationsDef>
<BriefDescription>
......
......@@ -24,16 +24,16 @@
The operation determines which action to take on the group: create it, modify its membership, or remove it.
</DetailedDescription>
<ChildrenDefinitions>
<ModelEntity Name="modify cell group" NumberOfRequiredValues="1">
<ModelEntity Name="modify cell group" Label="modify entity group" NumberOfRequiredValues="1">
<MembershipMask>group</MembershipMask>
</ModelEntity>
<ModelEntity Name="remove cell group" Extensible="1" NumberOfRequiredValues="0">
<ModelEntity Name="remove cell group" Label="remove entity group" Extensible="1" NumberOfRequiredValues="0">
<MembershipMask>group</MembershipMask>
</ModelEntity>
<ModelEntity Name="cell to add" NumberOfRequiredValues="0" Extensible="1">
<ModelEntity Name="cell to add" Label="entity to add" NumberOfRequiredValues="0" Extensible="1">
<MembershipMask>volume|face|edge</MembershipMask>
</ModelEntity>
<ModelEntity Name="cell to remove" NumberOfRequiredValues="0" Extensible="1">
<ModelEntity Name="cell to remove" Label="entity to remove" NumberOfRequiredValues="0" Extensible="1">
<MembershipMask>volume|face|edge</MembershipMask>
</ModelEntity>
<Void Name="Vertex" Label="Vertex" Version="0" NumberOfRequiredValues="1" Optional="true" AdvanceLevel = "1" Option = "true" IsEnabledByDefault = "true">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment