X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_WidgetSketchLabel.cpp;h=2ce6f152e509dc63d733a5228c3e3a327f96f137;hb=1834431e0e067cbb4616f42679562d56af528f5e;hp=42d4cd3edecc0d737ba7f675269b026f89cea5c1;hpb=05b2338e0d6dd63e13c05476973f231284f5297a;p=modules%2Fshaper.git

diff --git a/src/PartSet/PartSet_WidgetSketchLabel.cpp b/src/PartSet/PartSet_WidgetSketchLabel.cpp
index 42d4cd3ed..2ce6f152e 100644
--- a/src/PartSet/PartSet_WidgetSketchLabel.cpp
+++ b/src/PartSet/PartSet_WidgetSketchLabel.cpp
@@ -85,6 +85,17 @@ PartSet_WidgetSketchLabel::~PartSet_WidgetSketchLabel()
   erasePreviewPlanes();
 }
 
+bool PartSet_WidgetSketchLabel::setSelection(const QList<ModuleBase_ViewerPrs>& theValues, int& thePosition)
+{
+  // do not use the given selection if the plane of the sketch has been already set.
+  // If this check is absent, a selected plane in the viewer can be set in the sketch
+  // even if the sketch is built on another plane.
+  if (plane().get())
+    return true;
+
+  return ModuleBase_WidgetValidated::setSelection(theValues, thePosition);
+}
+
 QList<QWidget*> PartSet_WidgetSketchLabel::getControls() const
 {
   QList<QWidget*> aResult;
@@ -94,69 +105,59 @@ QList<QWidget*> PartSet_WidgetSketchLabel::getControls() const
 
 void PartSet_WidgetSketchLabel::onSelectionChanged()
 {
-  ModuleBase_ViewerPrs aPrs;
-  // 1. find selected presentation either in the viewer or in OB
-  XGUI_Selection* aSelection = myWorkshop->selector()->selection();
-  QList<ModuleBase_ViewerPrs> aSelected = aSelection->getSelected();
-  // the selection in OCC viewer - the selection of a face in the viewer
-  // it can be th main plane's face of a face on a visualized body
-  if (!aSelected.empty()) {
-    aPrs = aSelected.first();
+  QList<ModuleBase_ViewerPrs> aSelectedPrs = getSelectedEntitiesOrObjects(
+                                             myWorkshop->selector()->selection());
+  if (aSelectedPrs.empty())
+    return;
+  ModuleBase_ViewerPrs aPrs = aSelectedPrs.first();
+  if (aPrs.isEmpty() || !isValidSelection(aPrs))
+    return;
+
+  // 2. set the selection to sketch
+  setSelectionCustom(aPrs);
+  // 3. hide main planes if they have been displayed
+  erasePreviewPlanes();
+  // 4. if the planes were displayed, change the view projection
+  TopoDS_Shape aShape = aPrs.shape();
+  std::shared_ptr<GeomAPI_Shape> aGShape;
+  // selection happens in OCC viewer
+  if (!aShape.IsNull()) {
+    aGShape =  std::shared_ptr<GeomAPI_Shape>(new GeomAPI_Shape);
+    aGShape->setImpl(new TopoDS_Shape(aShape));
   }
-  else {
-    // the selection in Object Browser: the plane object can be used as sketch plane
-    QObjectPtrList anObjects = aSelection->selectedObjects();
-    if (!anObjects.empty()) {
-      aPrs.setObject(anObjects.first());
+  else { // selection happens in OCC viewer(on body) of in the OB browser
+    DataPtr aData = feature()->data();
+    AttributeSelectionPtr aSelAttr = std::dynamic_pointer_cast<ModelAPI_AttributeSelection>
+                              (aData->attribute(SketchPlugin_SketchEntity::EXTERNAL_ID()));
+    if (aSelAttr) {
+      aGShape = aSelAttr->value();
     }
   }
-  if (aPrs.isEmpty())
-    return;
+  if (aGShape.get() != NULL) {
+    // get plane parameters
+    std::shared_ptr<GeomAPI_Pln> aPlane = GeomAlgoAPI_FaceBuilder::plane(aGShape);
+    std::shared_ptr<GeomAPI_Dir> aDir = aPlane->direction();
 
-  if (isValidSelection(aPrs)) {
-    // 2. set the selection to sketch
-    setSelectionCustom(aPrs);
-    // 3. hide main planes if they have been displayed
-    erasePreviewPlanes();
-    // 4. if the planes were displayed, change the view projection
-    TopoDS_Shape aShape = aPrs.shape();
-    if (!aShape.IsNull()) {
-      DataPtr aData = feature()->data();
-      AttributeSelectionPtr aSelAttr = std::dynamic_pointer_cast<ModelAPI_AttributeSelection>
-                                (aData->attribute(SketchPlugin_SketchEntity::EXTERNAL_ID()));
-      if (aSelAttr) {
-        GeomShapePtr aShapePtr = aSelAttr->value();
-        if (aShapePtr.get() == NULL || aShapePtr->isNull()) {
-          //TopoDS_Shape aShape = aShapePtr->impl<TopoDS_Shape>();
-          std::shared_ptr<GeomAPI_Shape> aGShape(new GeomAPI_Shape);
-          aGShape->setImpl(new TopoDS_Shape(aShape));
-          // get plane parameters
-          std::shared_ptr<GeomAPI_Pln> aPlane = GeomAlgoAPI_FaceBuilder::plane(aGShape);
-          std::shared_ptr<GeomAPI_Dir> aDir = aPlane->direction();
-
-          myWorkshop->viewer()->setViewProjection(aDir->x(), aDir->y(), aDir->z());
-        }
-      }
-    }
-    // 5. Clear text in the label
-    myLabel->setText("");
-    myLabel->setToolTip("");
-    disconnect(myWorkshop->selector(), SIGNAL(selectionChanged()), 
-               this, SLOT(onSelectionChanged()));
-    // 6. deactivate face selection filter
-    activateFilters(myWorkshop->module()->workshop(), false);
-
-    // 7. Clear selection mode and define sketching mode
-    //XGUI_Displayer* aDisp = myWorkshop->displayer();
-    //aDisp->closeLocalContexts();
-    emit planeSelected(plane());
-    //setSketchingMode();
-
-    // 8. Update sketcher actions
-    XGUI_ActionsMgr* anActMgr = myWorkshop->actionsMgr();
-    anActMgr->update();
-    myWorkshop->viewer()->update();
+    myWorkshop->viewer()->setViewProjection(aDir->x(), aDir->y(), aDir->z());
   }
+  // 5. Clear text in the label
+  myLabel->setText("");
+  myLabel->setToolTip("");
+  disconnect(myWorkshop->selector(), SIGNAL(selectionChanged()), 
+              this, SLOT(onSelectionChanged()));
+  // 6. deactivate face selection filter
+  activateFilters(myWorkshop->module()->workshop(), false);
+
+  // 7. Clear selection mode and define sketching mode
+  //XGUI_Displayer* aDisp = myWorkshop->displayer();
+  //aDisp->closeLocalContexts();
+  emit planeSelected(plane());
+  //setSketchingMode();
+
+  // 8. Update sketcher actions
+  XGUI_ActionsMgr* anActMgr = myWorkshop->actionsMgr();
+  anActMgr->update();
+  myWorkshop->viewer()->update();
 }
 
 std::shared_ptr<GeomAPI_Pln> PartSet_WidgetSketchLabel::plane() const
@@ -210,20 +211,22 @@ bool PartSet_WidgetSketchLabel::setSelectionCustom(const ModuleBase_ViewerPrs& t
       ResultPtr aRes = std::dynamic_pointer_cast<ModelAPI_Result>(thePrs.object());
       if (aRes) {
         GeomShapePtr aShapePtr(new GeomAPI_Shape());
-        if (aShape.IsNull()) {
+        if (aShape.IsNull()) {  // selection happens in the OCC viewer
           aShapePtr = ModelAPI_Tools::shape(aRes);
         }
-        else {
+        else { // selection happens in OB browser
           aShapePtr->setImpl(new TopoDS_Shape(aShape));
         }
-        aSelAttr->setValue(aRes, aShapePtr);
-        isOwnerSet = true;
+        if (aShapePtr.get() != NULL) {
+          aSelAttr->setValue(aRes, aShapePtr);
+          isOwnerSet = true;
+        }
       }
     }
   }
   else if (!aShape.IsNull()) {
     aDir = setSketchPlane(aShape);
-    isOwnerSet = aDir;
+    isOwnerSet = aDir.get();
   }
   return isOwnerSet;
 }
@@ -231,6 +234,9 @@ bool PartSet_WidgetSketchLabel::setSelectionCustom(const ModuleBase_ViewerPrs& t
 void PartSet_WidgetSketchLabel::activateCustom()
 {
   std::shared_ptr<GeomAPI_Pln> aPlane = plane();
+  if (aPlane.get())
+    return;
+
   bool aBodyIsVisualized = false;
   XGUI_Displayer* aDisp = myWorkshop->displayer();
   QObjectPtrList aDisplayed = aDisp->displayedObjects();
@@ -243,14 +249,7 @@ void PartSet_WidgetSketchLabel::activateCustom()
     }
   }
 
-  if (aPlane || aBodyIsVisualized) {
-    //setSketchingMode();
-    // In order to avoid Opening/Closing of context too often
-    // it can be useful for a delay on the property panel filling
-    // it is possible that it is not necessary anymore, but it requires a check
-    //mySelectionTimer->start(20);
-    //setSketchingMode();
-  } else {
+  if (!aBodyIsVisualized) {
     // We have to select a plane before any operation
     showPreviewPlanes();
   }