Merge branch 'master' of newgeom:newgeom

diff --git a/src/PartSet/PartSet_Listener.cpp b/src/PartSet/PartSet_Listener.cpp
index be392c0097207ca07c38d6ac1f2fa3f302bf005e..43709df50c354fb6150680e67b6f9f8cab3cff5f 100644 (file)
--- a/src/PartSet/PartSet_Listener.cpp
+++ b/src/PartSet/PartSet_Listener.cpp
@@ -6,6 +6,7 @@
 
 #include <PartSet_Module.h>
 #include <PartSet_OperationSketchBase.h>
+#include <PartSet_OperationSketch.h>
 
 #include <XGUI_Displayer.h>
 #include <XGUI_Workshop.h>
@@ -28,7 +29,7 @@ PartSet_Listener::PartSet_Listener(PartSet_Module* theModule)
     : myModule(theModule)
 {
   Events_Loop* aLoop = Events_Loop::loop();
-  //aLoop->registerListener(this, aLoop->eventByName(EVENT_OBJECT_TO_REDISPLAY));
+  aLoop->registerListener(this, aLoop->eventByName(EVENT_OBJECT_TO_REDISPLAY));
   aLoop->registerListener(this, Events_Loop::eventByName(EVENT_OBJECT_CREATED));
   aLoop->registerListener(this, Events_Loop::eventByName(EVENT_OBJECT_DELETED));
 }
@@ -51,12 +52,27 @@ void PartSet_Listener::processEvent(const boost::shared_ptr<Events_Message>& the
     boost::shared_ptr<ModelAPI_ObjectUpdatedMessage> aUpdMsg =
         boost::dynamic_pointer_cast<ModelAPI_ObjectUpdatedMessage>(theMessage);
     std::set<ObjectPtr> aFeatures = aUpdMsg->objects();
+
+    PartSet_OperationSketch* aSketchOp = 
+      dynamic_cast<PartSet_OperationSketch*>(myModule->workshop()->operationMgr()->currentOperation());
+
     std::set<ObjectPtr>::const_iterator anIt = aFeatures.begin(), aLast = aFeatures.end();
     for (; anIt != aLast; anIt++) {
-      aDisplayer->deactivate(*anIt);
-      FeaturePtr aFeature = boost::dynamic_pointer_cast<ModelAPI_Feature>(*anIt);
-      if (aFeature)
-        myModule->activateFeature(aFeature, false);
+      ObjectPtr aObj = (*anIt);
+      aDisplayer->deactivate(aObj);
+      boost::shared_ptr<SketchPlugin_Sketch> aSketch = 
+        boost::dynamic_pointer_cast<SketchPlugin_Sketch>(aObj);
+      if (aSketch) // Activate sketcher for planes selection
+        myModule->activateFeature(aSketch, false);
+      // If current operation is Sketch then there is no active sketching operation
+      // and possible the object was created by Redo operatgion
+      else if (aSketchOp) {
+          XGUI_Displayer* aDisplayer = myModule->workshop()->displayer();
+          // Very possible it is not displayed
+          aDisplayer->display(aObj, false);
+          std::list<int> aModes = aSketchOp->getSelectionModes(aObj);
+          aDisplayer->activateInLocalContext(aObj, aModes, false);
+      }
     }
 
   } else if (aType == EVENT_OBJECT_DELETED) {

diff --git a/src/PartSet/PartSet_OperationSketchBase.cpp b/src/PartSet/PartSet_OperationSketchBase.cpp
index 398293c615bd774ac907a22389178b921dab1e6d..9dd3141eb50135b8836616dde205871b20884857 100644 (file)
--- a/src/PartSet/PartSet_OperationSketchBase.cpp
+++ b/src/PartSet/PartSet_OperationSketchBase.cpp
@@ -50,20 +50,16 @@ std::list<FeaturePtr> PartSet_OperationSketchBase::subFeatures() const
 
 std::list<int> PartSet_OperationSketchBase::getSelectionModes(ObjectPtr theFeature) const
 {
+  //TODO: Define position of selection modes definition
   std::list<int> aModes;
-  //FeaturePtr aFeature = boost::dynamic_pointer_cast<ModelAPI_Feature>(theFeature);
-  //if (aFeature) {
-  //  if (PartSet_Tools::isConstraintFeature(aFeature->getKind())) {
-  //      aModes.clear();
-  //      aModes.push_back(AIS_DSM_Text);
-  //      aModes.push_back(AIS_DSM_Line);
-  //      return aModes;
-  //  }
-  //}
-  aModes.push_back(AIS_Shape::SelectionMode((TopAbs_ShapeEnum) TopAbs_VERTEX));
-  aModes.push_back(AIS_Shape::SelectionMode((TopAbs_ShapeEnum) TopAbs_EDGE));
-  aModes.push_back(AIS_DSM_Text);
-  aModes.push_back(AIS_DSM_Line);
+  FeaturePtr aFeature = boost::dynamic_pointer_cast<ModelAPI_Feature>(theFeature);
+  if (aFeature && PartSet_Tools::isConstraintFeature(aFeature->getKind())) {
+    aModes.push_back(AIS_DSM_Text);
+    aModes.push_back(AIS_DSM_Line);
+  } else {
+    aModes.push_back(AIS_Shape::SelectionMode((TopAbs_ShapeEnum) TopAbs_VERTEX));
+    aModes.push_back(AIS_Shape::SelectionMode((TopAbs_ShapeEnum) TopAbs_EDGE));
+  }
   return aModes;
 }
 FeaturePtr PartSet_OperationSketchBase::createFeature(const bool theFlushMessage)