Fix for the problem: the second sketch is shown as invalid after the first edit is...

[modules/shaper.git] / src / SketchPlugin / SketchPlugin_Fillet.cpp

diff --git a/src/SketchPlugin/SketchPlugin_Fillet.cpp b/src/SketchPlugin/SketchPlugin_Fillet.cpp
index 3916cfb35e1a343b4171f63302a320a779c7d957..ece5689f626b13ca6a84ee9107a01bcc6acc68a0 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_Fillet.cpp
+++ b/src/SketchPlugin/SketchPlugin_Fillet.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2017  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2022  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -12,10 +12,9 @@
 //
 // You should have received a copy of the GNU Lesser General Public
 // License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-// See http://www.salome-platform.org/ or
-// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
 #include "SketchPlugin_Fillet.h"
@@ -32,6 +31,7 @@
 #include "SketchPlugin_ConstraintTangent.h"
 #include "SketchPlugin_ConstraintRadius.h"
 #include "SketchPlugin_Tools.h"
+#include "SketchPlugin_Validators.h"
 
 #include <ModelAPI_AttributeDouble.h>
 #include <ModelAPI_AttributeInteger.h>
@@ -54,6 +54,7 @@
 #include <GeomDataAPI_Point2D.h>
 
 #include <Events_Loop.h>
+#include <Events_InfoMessage.h>
 
 #include <math.h>
 
@@ -82,8 +83,9 @@ static std::set<FeaturePtr> findFeaturesToRemove(const FeaturePtr theFeature,
                                                  const AttributePtr theAttribute);
 
 SketchPlugin_Fillet::SketchPlugin_Fillet()
-: myFilletCreated(false)
+: myIsReversed(false), myFilletCreated(false)
 {
+  myIsNotInversed[0] = myIsNotInversed[1] = true;
 }
 
 void SketchPlugin_Fillet::initAttributes()
@@ -104,6 +106,10 @@ void SketchPlugin_Fillet::execute()
 
   // create feature for fillet arc
   FeaturePtr aFilletArc = createFilletArc();
+  if (!aFilletArc) {
+    setError("Error: unable to create a fillet arc.");
+    return;
+  }
 
   // collect features referred to the edges participating in fillet
   AttributePoint2DPtr aFilletPoints[2];
@@ -133,12 +139,12 @@ void SketchPlugin_Fillet::execute()
   FeaturePtr aConstraint;
 
   // Create coincidence features.
-  aConstraint = SketchPlugin_Tools::createConstraint(sketch(),
+  aConstraint = SketchPlugin_Tools::createConstraintAttrAttr(sketch(),
                     SketchPlugin_ConstraintCoincidence::ID(),
                     aFilletArc->attribute(SketchPlugin_Arc::START_ID()),
                     myBaseFeatures[aFeatInd[0]]->attribute(myFeatAttributes[anAttrInd[0]]));
   ModelAPI_EventCreator::get()->sendUpdated(aConstraint, anUpdateEvent);
-  aConstraint = SketchPlugin_Tools::createConstraint(sketch(),
+  aConstraint = SketchPlugin_Tools::createConstraintAttrAttr(sketch(),
                     SketchPlugin_ConstraintCoincidence::ID(),
                     aFilletArc->attribute(SketchPlugin_Arc::END_ID()),
                     myBaseFeatures[aFeatInd[1]]->attribute(myFeatAttributes[anAttrInd[1]]));
@@ -146,7 +152,7 @@ void SketchPlugin_Fillet::execute()
 
   // Create tangent features.
   for (int i = 0; i < 2; i++) {
-    aConstraint = SketchPlugin_Tools::createConstraint(sketch(),
+    aConstraint = SketchPlugin_Tools::createConstraintObjectObject(sketch(),
                       SketchPlugin_ConstraintTangent::ID(),
                       aFilletArc->lastResult(),
                       myBaseFeatures[i]->lastResult());
@@ -189,6 +195,11 @@ AISObjectPtr SketchPlugin_Fillet::getAISObject(AISObjectPtr thePrevious)
     anAISObject = AISObjectPtr(new GeomAPI_AISObject);
   }
   anAISObject->createShape(anArcShape);
+  bool isAxiliary = false;
+  AttributeBooleanPtr aAttr = boolean(AUXILIARY_ID());
+  if (aAttr.get())
+    isAxiliary = aAttr->value();
+  SketchPlugin_Tools::customizeFeaturePrs(anAISObject, isAxiliary);
   return anAISObject;
 }
 
@@ -203,16 +214,15 @@ bool SketchPlugin_Fillet::calculateFilletParameters()
   if (!aFilletPoint2D.get())
     return false;
 
-  std::set<FeaturePtr> aFilletFeatures =
-      SketchPlugin_Tools::findFeaturesCoincidentToPoint(aFilletPoint2D);
-  if (aFilletFeatures.size() != 2) {
-    setError("Error: Selected point does not have two suitable edges for fillet.");
+  Events_InfoMessage anError;
+  FeaturePtr anEdge1, anEdge2;
+  if (!SketchPlugin_FilletVertexValidator::isValidVertex
+      (aPointRefAttr, anError, anEdge1, anEdge2)) {
+    setError(anError.messageString());
     return false;
   }
-
-  std::set<FeaturePtr>::iterator aFIt = aFilletFeatures.begin();
-  myBaseFeatures[0] = *aFIt;
-  myBaseFeatures[1] = *(++aFIt);
+  myBaseFeatures[0] = anEdge1;
+  myBaseFeatures[1] = anEdge2;
 
   std::shared_ptr<GeomAPI_Pnt2d> aFilletPnt2d = aFilletPoint2D->pnt();
   double aRadius = calculateFilletRadius(myBaseFeatures);
@@ -299,6 +309,10 @@ FeaturePtr SketchPlugin_Fillet::createFilletArc()
   if (!myBaseFeatures[0] || !myBaseFeatures[1])
     calculateFilletParameters();
 
+  // fix for issue #2810 (sometimes, myCenterXY is NULL, fillet should report an error)
+  if (!myCenterXY)
+    return FeaturePtr();
+
   // Create arc feature.
   FeaturePtr aFilletArc = sketch()->addFeature(SketchPlugin_Arc::ID());
 
@@ -332,12 +346,13 @@ FeaturePtr SketchPlugin_Fillet::createFilletApex(const GeomPnt2dPtr& theCoordina
   AttributePoint2DPtr aCoord = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
       anApex->attribute(SketchPlugin_Point::COORD_ID()));
   aCoord->setValue(theCoordinates);
+  anApex->boolean(SketchPlugin_Point::AUXILIARY_ID())->setValue(true);
 
   // additional coincidence constraints
   static Events_ID anUpdateEvent = Events_Loop::eventByName(EVENT_OBJECT_UPDATED);
   FeaturePtr aConstraint;
   for (int i = 0; i < 2; i++) {
-    aConstraint = SketchPlugin_Tools::createConstraint(sketch(),
+    aConstraint = SketchPlugin_Tools::createConstraintAttrObject(sketch(),
                       SketchPlugin_ConstraintCoincidence::ID(),
                       aCoord,
                       myBaseFeatures[i]->lastResult());
@@ -348,18 +363,19 @@ FeaturePtr SketchPlugin_Fillet::createFilletApex(const GeomPnt2dPtr& theCoordina
   return anApex;
 }
 
+struct Length {
+  AttributePtr myPoints[2];
+  std::wstring myValueText;
+  double myValueDouble;
+  GeomPnt2dPtr myFlyoutPoint;
+  int myLocationType;
+};
+
 void SketchPlugin_Fillet::removeReferencesButKeepDistances(
     std::set<FeaturePtr>& theFeaturesToRemove,
     const AttributePoint2DPtr theFilletPoints[2])
 {
   FeaturePtr aFilletApex;
-  struct Length {
-    AttributePtr myPoints[2];
-    std::string myValueText;
-    double myValueDouble;
-    GeomPnt2dPtr myFlyoutPoint;
-    int myLocationType;
-  };
   std::list<Length> aLengthToDistance;
 
   std::set<FeaturePtr>::iterator aFeat = theFeaturesToRemove.begin();
@@ -415,7 +431,7 @@ void SketchPlugin_Fillet::removeReferencesButKeepDistances(
           AttributePoint2DPtr aFlyoutAttr = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
               aLength->attribute(SketchPlugin_ConstraintLength::FLYOUT_VALUE_PNT()));
           if (aFlyoutAttr && aFlyoutAttr->isInitialized())
-            aNewLength.myFlyoutPoint = aFlyoutAttr->pnt();
+            aNewLength.myFlyoutPoint = SketchPlugin_Tools::flyoutPointCoordinates(aLength);
           AttributeIntegerPtr aLocationAttr =
               aLength->integer(SketchPlugin_ConstraintLength::LOCATION_TYPE_ID());
           if (aLocationAttr && aLocationAttr->isInitialized())
@@ -437,7 +453,7 @@ void SketchPlugin_Fillet::removeReferencesButKeepDistances(
   FeaturePtr aConstraint;
   std::list<Length>::iterator anIt = aLengthToDistance.begin();
   for (; anIt != aLengthToDistance.end(); ++anIt) {
-    aConstraint = SketchPlugin_Tools::createConstraint(sketch(),
+    aConstraint = SketchPlugin_Tools::createConstraintAttrAttr(sketch(),
         SketchPlugin_ConstraintDistance::ID(), anIt->myPoints[0], anIt->myPoints[1]);
     // set value
     AttributeDoublePtr aValue = aConstraint->real(SketchPlugin_Constraint::VALUE());
@@ -554,7 +570,7 @@ double calculateFilletRadius(FeaturePtr theFilletFeatures[2])
     if (anEdge)
       aLengths[i] = anEdge->length();
   }
-  return std::min(aLengths[0], aLengths[1]) / 6.0;
+  return (aLengths[0] < aLengths[1] ? aLengths[0] : aLengths[1]) / 6.0;
 }
 
 std::set<FeaturePtr> findFeaturesToRemove(const FeaturePtr theFeature,