A possibility to use entity point attribute for the rigid constraint in GUI.

diff --git a/src/PartSet/PartSet_WidgetShapeSelector.cpp b/src/PartSet/PartSet_WidgetShapeSelector.cpp
index 275a65d17197c6db7749c82ab78b8e0fb44f24f4..bdd7bba7a1323f37e7fd169f0818493abf2a0019 100644 (file)
--- a/src/PartSet/PartSet_WidgetShapeSelector.cpp
+++ b/src/PartSet/PartSet_WidgetShapeSelector.cpp
@@ -38,7 +38,7 @@ PartSet_WidgetShapeSelector::~PartSet_WidgetShapeSelector()
 bool PartSet_WidgetShapeSelector::setObject(ObjectPtr theSelectedObject, GeomShapePtr theShape)
 {
   ObjectPtr aSelectedObject = theSelectedObject;
-  GeomShapePtr aShape = theShape;
+  //GeomShapePtr aShape = theShape;
 
   FeaturePtr aSelectedFeature = ModelAPI_Feature::feature(aSelectedObject);
   if (aSelectedFeature == myFeature)  // In order to avoid selection of the same object
@@ -51,47 +51,16 @@ bool PartSet_WidgetShapeSelector::setObject(ObjectPtr theSelectedObject, GeomSha
   if ((aSPFeature.get() != NULL) && aSPFeature->isExternal() && (!myExternalObjectMgr->useExternal()))
     return false;
 
-  if (aSPFeature.get() == NULL && aShape.get() != NULL && !aShape->isNull() && myExternalObjectMgr->useExternal()) {
+  if (aSPFeature.get() == NULL && theShape.get() != NULL && !theShape->isNull() && myExternalObjectMgr->useExternal()) {
     aSelectedObject = myExternalObjectMgr->externalObject(theSelectedObject, theShape, sketch());
   } else {
     // Processing of sketch object
-    DataPtr aData = myFeature->data();
-    if (aShape) {
-      AttributePtr aAttr = aData->attribute(attributeID());
-      AttributeRefAttrPtr aRefAttr = 
-        std::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>(aAttr);
-      if (aRefAttr) {
-        // it is possible that the point feature is selected. It should be used itself
-        // instead of searching an attribute for the shape
-        bool aShapeIsResult = false;
-        /*ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(theSelectedObject);
-        if (aResult.get() != NULL) {
-          GeomShapePtr aShapePtr = aResult->shape();
-          // it is important to call isEqual of the shape of result.
-          // It is a GeomAPI_Vertex shape for the point. The shape of the parameter is 
-          // GeomAPI_Shape. It is important to use the realization of the isEqual method from
-          // GeomAPI_Vertex class
-          aShapeIsResult = aShapePtr.get() != NULL && aShapePtr->isEqual(theShape);
-        }*/
-
-        AttributePtr aPntAttr;
-        if (!aShapeIsResult) {
-          TopoDS_Shape aTDSShape = aShape->impl<TopoDS_Shape>();
-          aPntAttr = PartSet_Tools::findAttributeBy2dPoint(aSelectedObject, aTDSShape, mySketch);
-        }
-        // this is an alternative, whether the attribute should be set or object in the attribute
-        // the first check is the attribute because the object already exist
-        // the object is set only if there is no selected attribute
-        // test case is - preselection for distance operation, which contains two points selected on lines
-        if (aPntAttr)
-          aRefAttr->setAttr(aPntAttr);
-        else if (aSelectedObject)
-          aRefAttr->setObject(aSelectedObject);
-        return true;
-      }
+    if (theShape.get()) {
+      setPointAttribute(theSelectedObject, theShape);
+      return true;
     }
   }
-  return ModuleBase_WidgetShapeSelector::setObject(aSelectedObject, aShape);
+  return ModuleBase_WidgetShapeSelector::setObject(aSelectedObject, theShape);
 }
 
 //********************************************************************
@@ -100,3 +69,40 @@ void PartSet_WidgetShapeSelector::restoreAttributeValue(const bool theValid)
   ModuleBase_WidgetShapeSelector::restoreAttributeValue(theValid);
   myExternalObjectMgr->removeExternal(sketch(), myFeature);
 }
+
+//********************************************************************
+void PartSet_WidgetShapeSelector::setPointAttribute(ObjectPtr theSelectedObject, GeomShapePtr theShape)
+{
+  DataPtr aData = myFeature->data();
+  AttributePtr aAttr = aData->attribute(attributeID());
+  AttributeRefAttrPtr aRefAttr = 
+    std::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>(aAttr);
+  if (aRefAttr) {
+    // it is possible that the point feature is selected. It should be used itself
+    // instead of searching an attribute for the shape
+    bool aShapeIsResult = false;
+    /*ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(theSelectedObject);
+    if (aResult.get() != NULL) {
+      GeomShapePtr aShapePtr = aResult->shape();
+      // it is important to call isEqual of the shape of result.
+      // It is a GeomAPI_Vertex shape for the point. The shape of the parameter is 
+      // GeomAPI_Shape. It is important to use the realization of the isEqual method from
+      // GeomAPI_Vertex class
+      aShapeIsResult = aShapePtr.get() != NULL && aShapePtr->isEqual(theShape);
+    }*/
+
+    AttributePtr aPntAttr;
+    if (!aShapeIsResult) {
+      TopoDS_Shape aTDSShape = theShape->impl<TopoDS_Shape>();
+      aPntAttr = PartSet_Tools::findAttributeBy2dPoint(theSelectedObject, aTDSShape, mySketch);
+    }
+    // this is an alternative, whether the attribute should be set or object in the attribute
+    // the first check is the attribute because the object already exist
+    // the object is set only if there is no selected attribute
+    // test case is - preselection for distance operation, which contains two points selected on lines
+    if (aPntAttr)
+      aRefAttr->setAttr(aPntAttr);
+    else if (theSelectedObject)
+      aRefAttr->setObject(theSelectedObject);
+  }
+}

diff --git a/src/PartSet/PartSet_WidgetShapeSelector.h b/src/PartSet/PartSet_WidgetShapeSelector.h
index 5aa7ca28314e227b957e45fce3f085e549f448f9..f300db7e8d011fe85db6c010bc98c848f1bdadd3 100644 (file)
--- a/src/PartSet/PartSet_WidgetShapeSelector.h
+++ b/src/PartSet/PartSet_WidgetShapeSelector.h
@@ -19,7 +19,7 @@ class PartSet_ExternalObjectsMgr;
 /**
 * \ingroup Modules
 * Customosation of ModuleBase_WidgetShapeSelector in order to provide 
-* working with sketch specific objects.
+* working with sketch specific objects and external objects.
 */
 class PARTSET_EXPORT PartSet_WidgetShapeSelector: public ModuleBase_WidgetShapeSelector
 {
@@ -55,6 +55,12 @@ protected:
   /// \param theValid a boolean flag, if restore happens for valid parameters
   void restoreAttributeValue(const bool theValid);
 
+  /// Found the sketch point attribute by the shape and set it in the feature attribute
+  /// otherwise set the selected object
+  /// \param theSelectedObject an object
+  /// \param theShape a selected shape, which is used in the selection attribute
+  void setPointAttribute(ObjectPtr theSelectedObject, GeomShapePtr theShape);
+
 protected:
   PartSet_ExternalObjectsMgr* myExternalObjectMgr;
   /// Pointer to a sketch 

diff --git a/src/SketchPlugin/plugin-Sketch.xml b/src/SketchPlugin/plugin-Sketch.xml
index 9e2021b9cc4195a9e2fe8e72ad451987aa3b0d05..8fe582a60b816534580f73e40f225606755c4a8d 100644 (file)
--- a/src/SketchPlugin/plugin-Sketch.xml
+++ b/src/SketchPlugin/plugin-Sketch.xml
@@ -157,15 +157,17 @@
 
       <!--  SketchConstraintRigid  -->
       <feature id="SketchConstraintRigid" title="Fixed" tooltip="Fix an object" icon=":icons/fixed.png">
-        <shape_selector id="ConstraintEntityA" label="Object" tooltip="Select an object" 
-            shape_types="edge vertex">
-          <validator id="PartSet_SketchEntityValidator" parameters="SketchPoint,SketchLine,SketchCircle,SketchArc"/>
+        <sketch_shape_selector id="ConstraintEntityA" label="Object"
+                        tooltip="Select point, line end point, line, center of circle or arc."
+                        shape_types="edge vertex">
+          <!--<validator id="PartSet_SketchEntityValidator" parameters="SketchPoint,SketchLine,SketchCircle,SketchArc"/>-->
+          <validator id="GeomValidators_EdgeOrVertex"/>
           <validator id="SketchPlugin_NotFixed"/>
-        </shape_selector>
+        </sketch_shape_selector>
         <validator id="PartSet_RigidSelection"/>
       </feature>
-      
-    <!--  SketchConstraintHorizontal  -->
+
+      <!--  SketchConstraintHorizontal  -->
       <feature id="SketchConstraintHorizontal" title="Horizontal" tooltip="Create constraint defining horizontal line" icon=":icons/horisontal.png">
         <sketch_shape_selector id="ConstraintEntityA" 
             label="Line" tooltip="Select a line" shape_types="edge" use_external="false">