Merge branch 'master' of newgeom:newgeom

[modules/shaper.git] / src / PartSet / PartSet_OperationFeatureBase.cpp

diff --git a/src/PartSet/PartSet_OperationFeatureBase.cpp b/src/PartSet/PartSet_OperationFeatureBase.cpp
index 458410aba5f87f446abc99c8d228e1a6a1b5f9bd..6beb71ca409f2489b5d150de498434d5c0623600 100644 (file)
--- a/src/PartSet/PartSet_OperationFeatureBase.cpp
+++ b/src/PartSet/PartSet_OperationFeatureBase.cpp
@@ -101,7 +101,13 @@ void PartSet_OperationFeatureBase::mouseReleased(QMouseEvent* theEvent, ModuleBa
     flushUpdated();
     myPropertyPanel->activateNextWidget();
   }
-  commit();
+  // the operation can be committed only when there is no an active widget anymore
+  // if this check is absent, the edit operation for constraint perpendicular is stopped
+  // after the first object selection in the viewer(there are two objects to be selected)
+  // the second case is the constraint distance, the edit is stopped after any mouse click
+  // in the viewer whenever it is applyed or not to the selection control
+  if (!myPropertyPanel->activeWidget())
+    commit();
 }
 
 /*bool PartSet_OperationFeatureBase::setWidgetValue(ObjectPtr theFeature, double theX, double theY)