From e67f27dc909fe58f932c551e030319ae0930db6e Mon Sep 17 00:00:00 2001 From: nds Date: Tue, 18 Aug 2015 07:34:35 +0300 Subject: [PATCH] It removes obsolete code. In Mirror constraint setFlushed should not be called as it is in multi rotation and multi translation constraints. --- src/PartSet/PartSet_WidgetShapeSelector.cpp | 7 ------- src/SketchPlugin/SketchPlugin_ConstraintMirror.cpp | 10 ---------- src/SketchPlugin/SketchPlugin_MultiRotation.cpp | 13 ------------- src/SketchPlugin/SketchPlugin_MultiTranslation.cpp | 12 ------------ 4 files changed, 42 deletions(-) diff --git a/src/PartSet/PartSet_WidgetShapeSelector.cpp b/src/PartSet/PartSet_WidgetShapeSelector.cpp index 4f8134e10..5b2a4e715 100644 --- a/src/PartSet/PartSet_WidgetShapeSelector.cpp +++ b/src/PartSet/PartSet_WidgetShapeSelector.cpp @@ -28,8 +28,6 @@ #include #include -//#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 aSPFeature = std::dynamic_pointer_cast(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 dfc90aa49..73649b1cf 100644 --- 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( 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 5864a194e..126c2fe59 100644 --- 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( @@ -315,11 +307,6 @@ void SketchPlugin_MultiRotation::attributeChanged(const std::string& theID) data()->attribute(SketchPlugin_Constraint::ENTITY_A()))->clear(); std::dynamic_pointer_cast( 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 7d06cfd13..eadf54a5a 100644 --- 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( @@ -257,10 +249,6 @@ void SketchPlugin_MultiTranslation::attributeChanged(const std::string& theID) data()->attribute(SketchPlugin_Constraint::ENTITY_A()))->clear(); std::dynamic_pointer_cast( 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); } } } -- 2.39.2