Task "Make the size of the selection area even bigger, especially for points"

[modules/shaper.git] / src / Model / Model_AttributeSelection.cpp

diff --git a/src/Model/Model_AttributeSelection.cpp b/src/Model/Model_AttributeSelection.cpp
index f388abb9ea40bbde10328ad009319dbccdebf79d..c672ed47effb8b8299b90ef0563f4d561777d219 100644 (file)
--- a/src/Model/Model_AttributeSelection.cpp
+++ b/src/Model/Model_AttributeSelection.cpp
@@ -18,7 +18,7 @@
 #include <ModelAPI_Tools.h>
 #include <GeomAPI_Shape.h>
 #include <GeomAPI_PlanarEdges.h>
-#include <Events_Error.h>
+#include <Events_InfoMessage.h>
 
 #include <TNaming_Selector.hxx>
 #include <TNaming_NamedShape.hxx>
@@ -181,11 +181,16 @@ void Model_AttributeSelection::setValue(const ResultPtr& theContext,
 
 std::shared_ptr<GeomAPI_Shape> Model_AttributeSelection::value()
 {
+  GeomShapePtr aResult;
   if (myTmpContext.get() || myTmpSubShape.get()) {
+    ResultConstructionPtr aResulConstruction = std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(myTmpContext);
+    if(aResulConstruction.get()) {
+      // it is just reference to construction.
+      return myTmpSubShape;
+    }
     return myTmpSubShape.get() ? myTmpSubShape : myTmpContext->shape();
   }
 
-  std::shared_ptr<GeomAPI_Shape> aResult;
   TDF_Label aSelLab = selectionLabel();
   if (aSelLab.IsAttribute(kINVALID_SELECTION))
     return aResult;
@@ -433,18 +438,20 @@ bool Model_AttributeSelection::update()
   if (aSelLab.IsAttribute(kPART_REF_ID)) { // it is reference to the part object
     std::shared_ptr<GeomAPI_Shape> aNoSelection;
     bool aResult = selectPart(aContext, aNoSelection, true);
+    aResult = setInvalidIfFalse(aSelLab, aResult);
     if (aResult) {
       owner()->data()->sendAttributeUpdated(this);
     }
-    return setInvalidIfFalse(aSelLab, aResult);
+    return aResult;
   }
 
   if (aContext->groupName() == ModelAPI_ResultBody::group()) {
     // body: just a named shape, use selection mechanism from OCCT
     TNaming_Selector aSelector(aSelLab);
     bool aResult = aSelector.Solve(scope()) == Standard_True;
+    aResult = setInvalidIfFalse(aSelLab, aResult); // must be before sending of updated attribute (1556)
     owner()->data()->sendAttributeUpdated(this);
-    return setInvalidIfFalse(aSelLab, aResult);
+    return aResult;
   } else if (aContext->groupName() == ModelAPI_ResultConstruction::group()) {
     // construction: identification by the results indexes, recompute faces and
     // take the face that more close by the indexes
@@ -474,8 +481,8 @@ bool Model_AttributeSelection::update()
         return setInvalidIfFalse(aSelLab, false);
       }
 
-      if (aShapeType == TopAbs_FACE) { // compound is for the whole sketch selection
-        // If this is a wire with plane defined thin it is a sketch-like object
+      if (aShapeType == TopAbs_FACE || aShapeType == TopAbs_WIRE) { // compound is for the whole sketch selection
+        // If this is a wire with plane defined then it is a sketch-like object
         if (!aConstructionContext->facesNum()) // no faces, update can not work correctly
           return setInvalidIfFalse(aSelLab, false);
         // if there is no edges indexes, any face can be used: take the first
@@ -552,9 +559,17 @@ bool Model_AttributeSelection::update()
           }
         }
         if (aNewSelected) { // store this new selection
+          if (aShapeType == TopAbs_WIRE) { // just get a wire from face to have wire
+            TopExp_Explorer aWireExp(aNewSelected->impl<TopoDS_Shape>(), TopAbs_WIRE);
+            if (aWireExp.More()) {
+              aNewSelected.reset(new GeomAPI_Shape);
+              aNewSelected->setImpl<TopoDS_Shape>(new TopoDS_Shape(aWireExp.Current()));
+            }
+          }
           selectConstruction(aContext, aNewSelected);
+          setInvalidIfFalse(aSelLab, true);
           owner()->data()->sendAttributeUpdated(this);
-          return setInvalidIfFalse(aSelLab, true);
+          return true;
         } else { // if the selection is not found, put the empty shape: it's better to have disappeared shape, than the old, the lost one
           TNaming_Builder anEmptyBuilder(selectionLabel());
           return setInvalidIfFalse(aSelLab, false);
@@ -574,8 +589,9 @@ bool Model_AttributeSelection::update()
                 std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(*aResIter);
               if (aRes && aRes->shape() && aRes->shape()->isEdge()) { // found!
                 selectConstruction(aContext, aRes->shape());
+                setInvalidIfFalse(aSelLab, true);
                 owner()->data()->sendAttributeUpdated(this);
-                return setInvalidIfFalse(aSelLab, true);
+                return true;
               }
             }
           }
@@ -603,8 +619,9 @@ bool Model_AttributeSelection::update()
                 if (aRes && aRes->shape()) {
                   if (aRes->shape()->isVertex() && aVertexNum == 0) { // found!
                     selectConstruction(aContext, aRes->shape());
+                    setInvalidIfFalse(aSelLab, true);
                     owner()->data()->sendAttributeUpdated(this);
-                    return setInvalidIfFalse(aSelLab, true);
+                    return true;
                   } else if (aRes->shape()->isEdge() && aVertexNum > 0) {
                     const TopoDS_Shape& anEdge = aRes->shape()->impl<TopoDS_Shape>();
                     int aVIndex = 1;
@@ -613,8 +630,9 @@ bool Model_AttributeSelection::update()
                         std::shared_ptr<GeomAPI_Shape> aVertex(new GeomAPI_Shape);
                         aVertex->setImpl(new TopoDS_Shape(aVExp.Current()));
                         selectConstruction(aContext, aVertex);
+                        setInvalidIfFalse(aSelLab, true);
                         owner()->data()->sendAttributeUpdated(this);
-                        return setInvalidIfFalse(aSelLab, true);
+                        return true;
                       }
                       aVIndex++;
                     }
@@ -626,8 +644,9 @@ bool Model_AttributeSelection::update()
       }
     } else { // simple construction element: the selected is that needed
       selectConstruction(aContext, aContext->shape());
+      setInvalidIfFalse(aSelLab, true);
       owner()->data()->sendAttributeUpdated(this);
-      return setInvalidIfFalse(aSelLab, true);
+      return true;
     }
   }
   return setInvalidIfFalse(aSelLab, false); // unknown case
@@ -650,7 +669,7 @@ void Model_AttributeSelection::selectBody(
     if (aResult) {
       aContext = aResult->shape()->impl<TopoDS_Shape>();
     } else {
-      Events_Error::send("A result with shape is expected");
+      Events_InfoMessage("Model_AttributeSelection", "A result with shape is expected").send();
       return;
     }
   }
@@ -686,6 +705,7 @@ static void registerSubShape(TDF_Label theMainLabel, TopoDS_Shape theShape,
   if (!theAdditionalName.empty())
     aName<<theAdditionalName<<"/";
   if (theShape.ShapeType() == TopAbs_FACE) aName<<"Face";
+  else if (theShape.ShapeType() == TopAbs_WIRE) aName<<"Wire";
   else if (theShape.ShapeType() == TopAbs_EDGE) aName<<"Edge";
   else if (theShape.ShapeType() == TopAbs_VERTEX) aName<<"Vertex";