Add tools

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

diff --git a/src/PartSet/PartSet_SketcherMgr.cpp b/src/PartSet/PartSet_SketcherMgr.cpp
index 4a84b0cc1f5d45dd500ab2887a8e49beea51385c..dc983a46ab911cdb95283782ec37d2125fc610a3 100644 (file)
--- a/src/PartSet/PartSet_SketcherMgr.cpp
+++ b/src/PartSet/PartSet_SketcherMgr.cpp
@@ -373,11 +373,10 @@ void PartSet_SketcherMgr::onMousePressed(ModuleBase_IViewWindow* theWnd, QMouseE
       return;
 
     Handle(AIS_InteractiveContext) aContext = aViewer->AISContext();
-    if (aContext.IsNull())
-      return;
-    // MoveTo in order to highlight current object
-    aContext->MoveTo(theEvent->x(), theEvent->y(), theWnd->v3dView());
-
+    if (!aContext.IsNull()) {
+      // MoveTo in order to highlight current object
+      aContext->MoveTo(theEvent->x(), theEvent->y(), theWnd->v3dView());
+    }
     // Remember highlighted objects for editing
     ModuleBase_ISelection* aSelect = aWorkshop->selection();
 
@@ -853,7 +852,7 @@ void PartSet_SketcherMgr::startSketch(ModuleBase_Operation* theOperation)
     aConnector->activateModuleSelectionModes();
 }
 
-void PartSet_SketcherMgr::stopSketch(ModuleBase_Operation* /* theOperation*/)
+void PartSet_SketcherMgr::stopSketch(ModuleBase_Operation* theOperation)
 {
   myIsMouseOverWindow = false;
   myIsConstraintsShown = true;
@@ -894,13 +893,19 @@ void PartSet_SketcherMgr::stopSketch(ModuleBase_Operation* /* theOperation*/)
     std::list<ResultPtr>::const_iterator aIt;
     Events_Loop* aLoop = Events_Loop::loop();
     static Events_ID aDispEvent = aLoop->eventByName(EVENT_OBJECT_TO_REDISPLAY);
+
+    ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>
+                                                                           (theOperation);
     for (aIt = aResults.begin(); aIt != aResults.end(); ++aIt) {
-      (*aIt)->setDisplayed(true);
-      // this display event is needed because sketch already may have "displayed" state,
-      // but not displayed while it is still active (issue 613, abort of existing sketch)
-      ModelAPI_EventCreator::get()->sendUpdated(*aIt, aDispEvent);
+      if (!aFOperation->isDisplayedOnStart(*aIt)) {
+        (*aIt)->setDisplayed(true);
+        // this display event is needed because sketch already may have "displayed" state,
+        // but not displayed while it is still active (issue 613, abort of existing sketch)
+        ModelAPI_EventCreator::get()->sendUpdated(*aIt, aDispEvent);
+      }
     }
-    myCurrentSketch->setDisplayed(true);
+    if (!aFOperation->isDisplayedOnStart(myCurrentSketch))
+      myCurrentSketch->setDisplayed(true);
     
     myCurrentSketch = CompositeFeaturePtr();
     myModule->workshop()->viewer()->removeSelectionFilter(myPlaneFilter);
@@ -914,7 +919,8 @@ void PartSet_SketcherMgr::stopSketch(ModuleBase_Operation* /* theOperation*/)
 void PartSet_SketcherMgr::startNestedSketch(ModuleBase_Operation* theOperation)
 {
   connectToPropertyPanel(true);
-  QApplication::setOverrideCursor(QCursor(QIcon(":pictures/button_plus.png").pixmap(20,20)));
+  if (isNestedCreateOperation(theOperation))
+    QApplication::setOverrideCursor(QCursor(QIcon(":pictures/button_plus.png").pixmap(20,20)));
 }
 
 void PartSet_SketcherMgr::stopNestedSketch(ModuleBase_Operation* theOp)
@@ -923,7 +929,8 @@ void PartSet_SketcherMgr::stopNestedSketch(ModuleBase_Operation* theOp)
   myIsResetCurrentValue = false;
   myIsMouseOverViewProcessed = true;
   operationMgr()->onValidateOperation();
-  QApplication::restoreOverrideCursor();
+  if (isNestedCreateOperation(theOp))
+    QApplication::restoreOverrideCursor();
 }
 
 void PartSet_SketcherMgr::commitNestedSketch(ModuleBase_Operation* theOperation)
@@ -1023,7 +1030,7 @@ bool PartSet_SketcherMgr::canDisplayObject(const ObjectPtr& theObject) const
         isObjectFound = true;
       else {
         std::list<ResultPtr>::const_iterator anIt = aResults.begin(), aLast = aResults.end();
-        for (; anIt != aLast; anIt++) {
+        for (; anIt != aLast && !isObjectFound; anIt++) {
           isObjectFound = *anIt == theObject;
         }
       }
@@ -1100,36 +1107,36 @@ void PartSet_SketcherMgr::getCurrentSelection(const FeaturePtr& theFeature,
 
   ModuleBase_IViewer* aViewer = theWorkshop->viewer();
   Handle(AIS_InteractiveContext) aContext = aViewer->AISContext();
-  if (aContext.IsNull())
-    return;
-  XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(theWorkshop);
-  XGUI_Displayer* aDisplayer = aConnector->workshop()->displayer();
+  if (!aContext.IsNull()) {
+    XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(theWorkshop);
+    XGUI_Displayer* aDisplayer = aConnector->workshop()->displayer();
 
-  std::list<ResultPtr> aResults = theFeature->results();
-  std::list<ResultPtr>::const_iterator aIt;
-  for (aIt = aResults.begin(); aIt != aResults.end(); ++aIt)
-  {
-    ResultPtr aResult = *aIt;
-    AISObjectPtr aAISObj = aDisplayer->getAISObject(aResult);
-    if (aAISObj.get() == NULL)
-      continue;
-    Handle(AIS_InteractiveObject) anAISIO = aAISObj->impl<Handle(AIS_InteractiveObject)>();
-    for (aContext->InitSelected(); aContext->MoreSelected(); aContext->NextSelected())
+    std::list<ResultPtr> aResults = theFeature->results();
+    std::list<ResultPtr>::const_iterator aIt;
+    for (aIt = aResults.begin(); aIt != aResults.end(); ++aIt)
     {
-      Handle(SelectMgr_EntityOwner) anOwner = aContext->SelectedOwner();
-      if (anOwner->Selectable() != anAISIO)
+      ResultPtr aResult = *aIt;
+      AISObjectPtr aAISObj = aDisplayer->getAISObject(aResult);
+      if (aAISObj.get() == NULL)
         continue;
-      getAttributesOrResults(anOwner, theFeature, theSketch, aResult,
-                             aSelectedAttributes, aSelectedResults);
-    }
-    for (aContext->InitDetected(); aContext->MoreDetected(); aContext->NextDetected()) {
-      Handle(SelectMgr_EntityOwner) anOwner = aContext->DetectedOwner();
-      if (anOwner.IsNull())
-        continue;
-      if (anOwner->Selectable() != anAISIO)
-        continue;
-      getAttributesOrResults(anOwner, theFeature, theSketch, aResult,
-                             aSelectedAttributes, aSelectedResults);
+      Handle(AIS_InteractiveObject) anAISIO = aAISObj->impl<Handle(AIS_InteractiveObject)>();
+      for (aContext->InitSelected(); aContext->MoreSelected(); aContext->NextSelected())
+      {
+        Handle(SelectMgr_EntityOwner) anOwner = aContext->SelectedOwner();
+        if (anOwner->Selectable() != anAISIO)
+          continue;
+        getAttributesOrResults(anOwner, theFeature, theSketch, aResult,
+                               aSelectedAttributes, aSelectedResults);
+      }
+      for (aContext->InitDetected(); aContext->MoreDetected(); aContext->NextDetected()) {
+        Handle(SelectMgr_EntityOwner) anOwner = aContext->DetectedOwner();
+        if (anOwner.IsNull())
+          continue;
+        if (anOwner->Selectable() != anAISIO)
+          continue;
+        getAttributesOrResults(anOwner, theFeature, theSketch, aResult,
+                               aSelectedAttributes, aSelectedResults);
+      }
     }
   }
   theSelection[theFeature] = std::make_pair(aSelectedAttributes, aSelectedResults);
@@ -1139,7 +1146,7 @@ void PartSet_SketcherMgr::getSelectionOwners(const FeaturePtr& theFeature,
                                              const FeaturePtr& theSketch,
                                              ModuleBase_IWorkshop* theWorkshop,
                                              const FeatureToSelectionMap& theSelection,
-                                             SelectMgr_IndexedMapOfOwner& anOwnersToSelect)
+                                             SelectMgr_IndexedMapOfOwner& theOwnersToSelect)
 {
   if (theFeature.get() == NULL)
     return;
@@ -1149,9 +1156,6 @@ void PartSet_SketcherMgr::getSelectionOwners(const FeaturePtr& theFeature,
   std::set<ResultPtr> aSelectedResults = anIt.value().second;
 
   ModuleBase_IViewer* aViewer = theWorkshop->viewer();
-  Handle(AIS_InteractiveContext) aContext = aViewer->AISContext();
-  if (aContext.IsNull())
-    return;
 
   XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(theWorkshop);
   XGUI_Displayer* aDisplayer = aConnector->workshop()->displayer();
@@ -1166,7 +1170,7 @@ void PartSet_SketcherMgr::getSelectionOwners(const FeaturePtr& theFeature,
     for  (Standard_Integer i = 1, n = aSelectedOwners.Extent(); i <= n; i++) {
       Handle(SelectMgr_EntityOwner) anOwner = aSelectedOwners(i);
       if (!anOwner.IsNull())
-        anOwnersToSelect.Add(anOwner);
+        theOwnersToSelect.Add(anOwner);
     }
   }
 
@@ -1193,14 +1197,14 @@ void PartSet_SketcherMgr::getSelectionOwners(const FeaturePtr& theFeature,
         AttributePtr aPntAttr = PartSet_Tools::findAttributeBy2dPoint(theFeature, aShape, theSketch);
         if (aPntAttr.get() != NULL &&
             aSelectedAttributes.find(aPntAttr) != aSelectedAttributes.end()) {
-          anOwnersToSelect.Add(anOwner);
+          theOwnersToSelect.Add(anOwner);
         }
       }
       else if (aShapeType == TopAbs_EDGE) {
         bool aFound = aSelectedResults.find(aResult) != aSelectedResults.end();
         if (aSelectedResults.find(aResult) != aSelectedResults.end() &&
-            anOwnersToSelect.FindIndex(anOwner) <= 0)
-          anOwnersToSelect.Add(anOwner);
+            theOwnersToSelect.FindIndex(anOwner) <= 0)
+          theOwnersToSelect.Add(anOwner);
       }
     }
   }