It removes obsolete code. In Mirror constraint setFlushed should not be called as...

diff --git a/src/PartSet/PartSet_WidgetShapeSelector.cpp b/src/PartSet/PartSet_WidgetShapeSelector.cpp
index 4f8134e10732b1c58b7f4bc418628003ac263936..5b2a4e7150874008dbfecac8a26dd64cb4e3f970 100644 (file)
--- a/src/PartSet/PartSet_WidgetShapeSelector.cpp
+++ b/src/PartSet/PartSet_WidgetShapeSelector.cpp
@@ -28,8 +28,6 @@
 #include <SelectMgr_IndexedMapOfOwner.hxx>
 #include <StdSelect_BRepOwner.hxx>
 
-//#define DEBUG_EMPTY_SHAPE
-
 PartSet_WidgetShapeSelector::PartSet_WidgetShapeSelector(QWidget* theParent,
                                                          ModuleBase_IWorkshop* theWorkshop,
                                                          const Config_WidgetAPI* theData,
@@ -63,10 +61,6 @@ void PartSet_WidgetShapeSelector::setObject(ObjectPtr theSelectedObject, GeomSha
   std::shared_ptr<SketchPlugin_Feature> aSPFeature = 
           std::dynamic_pointer_cast<SketchPlugin_Feature>(aSelectedFeature);
   // Processing of sketch object
-#ifdef DEBUG_EMPTY_SHAPE
-  if (aSPFeature.get() != NULL && theShape.get()) {
-    setPointAttribute(theSelectedObject, theShape);
-#else
   if (aSPFeature.get() != NULL) {
     GeomShapePtr aShape = theShape;
     if (!aShape.get()) {
@@ -76,7 +70,6 @@ void PartSet_WidgetShapeSelector::setObject(ObjectPtr theSelectedObject, GeomSha
       }
     }
     setPointAttribute(theSelectedObject, aShape);
-#endif
   }
   else
     ModuleBase_WidgetShapeSelector::setObject(theSelectedObject, theShape);

diff --git a/src/SketchPlugin/SketchPlugin_ConstraintMirror.cpp b/src/SketchPlugin/SketchPlugin_ConstraintMirror.cpp
index dfc90aa492f4668da8338ff74f4357c96305fe90..73649b1cf8c5be45560eb220d4a2ad2f6329d8ff 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_ConstraintMirror.cpp
+++ b/src/SketchPlugin/SketchPlugin_ConstraintMirror.cpp
@@ -206,12 +206,6 @@ void SketchPlugin_ConstraintMirror::attributeChanged(const std::string& theID)
   if (theID == MIRROR_LIST_ID()) {
     AttributeSelectionListPtr aMirrorObjectRefs = selectionList(MIRROR_LIST_ID());
     if (aMirrorObjectRefs->size() == 0) {
-      // Wait all objects being created, then send update events
-      static Events_ID anUpdateEvent = Events_Loop::eventByName(EVENT_OBJECT_UPDATED);
-      bool isUpdateFlushed = Events_Loop::loop()->isFlushed(anUpdateEvent);
-      if (isUpdateFlushed)
-        Events_Loop::loop()->setFlushed(anUpdateEvent, false);
-
       // Clear list of objects
       AttributeRefListPtr aRefListOfMirrored = std::dynamic_pointer_cast<ModelAPI_AttributeRefList>(
           data()->attribute(SketchPlugin_Constraint::ENTITY_C()));
@@ -227,10 +221,6 @@ void SketchPlugin_ConstraintMirror::attributeChanged(const std::string& theID)
         if (aFeature)
           aDoc->removeFeature(aFeature);
       }
-
-      // send events to update the sub-features by the solver
-      if (isUpdateFlushed)
-        Events_Loop::loop()->setFlushed(anUpdateEvent, true);
     }
   }
 }

diff --git a/src/SketchPlugin/SketchPlugin_MultiRotation.cpp b/src/SketchPlugin/SketchPlugin_MultiRotation.cpp
index 5864a194e901dcd8a44756c4fed3a7fc5a767374..126c2fe5986e47adb0e7a2240fed8a2ccd62908c 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_MultiRotation.cpp
+++ b/src/SketchPlugin/SketchPlugin_MultiRotation.cpp
@@ -283,14 +283,6 @@ void SketchPlugin_MultiRotation::attributeChanged(const std::string& theID)
   if (theID == ROTATION_LIST_ID()) {
     AttributeSelectionListPtr aRotationObjectRefs = selectionList(ROTATION_LIST_ID());
     if (aRotationObjectRefs->size() == 0) {
-      // the commented code is not necessary here because if an update event is flushed
-      // before the setFlushed with true value happens, it leads to crash
-      // Wait all objects being created, then send update events
-      static Events_ID anUpdateEvent = Events_Loop::eventByName(EVENT_OBJECT_UPDATED);
-      //bool isUpdateFlushed = Events_Loop::loop()->isFlushed(anUpdateEvent);
-      //if (isUpdateFlushed)
-      //  Events_Loop::loop()->setFlushed(anUpdateEvent, false);
-
       int aNbCopies = integer(NUMBER_OF_COPIES_ID())->value();
       // Clear list of objects
       AttributeRefListPtr aRefListOfRotated = std::dynamic_pointer_cast<ModelAPI_AttributeRefList>(
@@ -315,11 +307,6 @@ void SketchPlugin_MultiRotation::attributeChanged(const std::string& theID)
         data()->attribute(SketchPlugin_Constraint::ENTITY_A()))->clear();
       std::dynamic_pointer_cast<ModelAPI_AttributeRefList>(
         data()->attribute(SketchPlugin_Constraint::ENTITY_B()))->clear();
-
-      // the commented code is incorrect and obsolete, so it is removed
-      // send events to update the sub-features by the solver
-      //if (isUpdateFlushed)
-      //  Events_Loop::loop()->setFlushed(anUpdateEvent, true);
     }
   }
 }

diff --git a/src/SketchPlugin/SketchPlugin_MultiTranslation.cpp b/src/SketchPlugin/SketchPlugin_MultiTranslation.cpp
index 7d06cfd13de953db693929f7ec8e2bf3a2c63ee9..eadf54a5a08657ea07260d4ef6b194c618328110 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_MultiTranslation.cpp
+++ b/src/SketchPlugin/SketchPlugin_MultiTranslation.cpp
@@ -225,14 +225,6 @@ void SketchPlugin_MultiTranslation::attributeChanged(const std::string& theID)
   if (theID == TRANSLATION_LIST_ID()) {
     AttributeSelectionListPtr aTranslationObjectRefs = selectionList(TRANSLATION_LIST_ID());
     if (aTranslationObjectRefs->size() == 0) {
-      // the commented code is not necessary here because if an update event is flushed
-      // before the setFlushed with true value happens, it leads to crash
-      // Wait all objects being created, then send update events
-      //static Events_ID anUpdateEvent = Events_Loop::eventByName(EVENT_OBJECT_UPDATED);
-      //bool isUpdateFlushed = Events_Loop::loop()->isFlushed(anUpdateEvent);
-      //if (isUpdateFlushed)
-      //  Events_Loop::loop()->setFlushed(anUpdateEvent, false);
-
       int aNbCopies = integer(NUMBER_OF_COPIES_ID())->value();
       // Clear list of objects
       AttributeRefListPtr aRefListOfTranslated = std::dynamic_pointer_cast<ModelAPI_AttributeRefList>(
@@ -257,10 +249,6 @@ void SketchPlugin_MultiTranslation::attributeChanged(const std::string& theID)
         data()->attribute(SketchPlugin_Constraint::ENTITY_A()))->clear();
       std::dynamic_pointer_cast<ModelAPI_AttributeRefList>(
         data()->attribute(SketchPlugin_Constraint::ENTITY_B()))->clear();
-
-      // send events to update the sub-features by the solver
-      //if (isUpdateFlushed)
-      //  Events_Loop::loop()->setFlushed(anUpdateEvent, true);
     }
   }
 }