X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_WidgetSketchLabel.cpp;h=e4df553d7cbe92289ce95475453f4205dde148df;hb=f39b615e10f48ab13b8346c1e0b4c64500d44f51;hp=e9e43ba5ac243a79ab060b8edfd131e2367fd42b;hpb=840655e90a46754f2dd37aac6b888ec32eec69d3;p=modules%2Fshaper.git

diff --git a/src/PartSet/PartSet_WidgetSketchLabel.cpp b/src/PartSet/PartSet_WidgetSketchLabel.cpp
index e9e43ba5a..e4df553d7 100644
--- a/src/PartSet/PartSet_WidgetSketchLabel.cpp
+++ b/src/PartSet/PartSet_WidgetSketchLabel.cpp
@@ -26,7 +26,7 @@
 #include <ModelAPI_Tools.h>
 
 #include <GeomAlgoAPI_FaceBuilder.h>
-#include <GeomAlgoAPI_ShapeProps.h>
+#include <GeomAlgoAPI_ShapeTools.h>
 #include <GeomDataAPI_Point.h>
 #include <GeomDataAPI_Dir.h>
 #include <GeomAPI_XYZ.h>
@@ -34,7 +34,6 @@
 #include <SketchPlugin_Sketch.h>
 #include <SketcherPrs_Tools.h>
 
-#include <BRepClass3d_SolidClassifier.hxx>
 #include <Precision.hxx>
 #include <gp_Pln.hxx>
 #include <gp_Pnt.hxx>
@@ -80,7 +79,6 @@ PartSet_WidgetSketchLabel::PartSet_WidgetSketchLabel(QWidget* theParent,
 
 PartSet_WidgetSketchLabel::~PartSet_WidgetSketchLabel()
 {
-  erasePreviewPlanes();
 }
 
 bool PartSet_WidgetSketchLabel::setSelection(QList<ModuleBase_ViewerPrs>& theValues,
@@ -92,7 +90,12 @@ bool PartSet_WidgetSketchLabel::setSelection(QList<ModuleBase_ViewerPrs>& theVal
   if (plane().get())
     return true;
 
-  return ModuleBase_WidgetValidated::setSelection(theValues, theToValidate);
+  ModuleBase_ViewerPrs aPrs = theValues.first();
+  bool aDone = ModuleBase_WidgetValidated::setSelection(theValues, theToValidate);
+  if (aDone)
+    updateByPlaneSelected(aPrs);
+
+  return aDone;
 }
 
 QList<QWidget*> PartSet_WidgetSketchLabel::getControls() const
@@ -104,20 +107,25 @@ QList<QWidget*> PartSet_WidgetSketchLabel::getControls() const
 
 void PartSet_WidgetSketchLabel::onSelectionChanged()
 {
-  QList<ModuleBase_ViewerPrs> aSelected = myWorkshop->selection()->getSelected(
-                                                           ModuleBase_ISelection::AllControls);
+  QList<ModuleBase_ViewerPrs> aSelected = getFilteredSelected();
+
   if (aSelected.empty())
     return;
   ModuleBase_ViewerPrs aPrs = aSelected.first();
 
-  bool isDone = ModuleBase_WidgetValidated::setSelection(aSelected, true);
-  if (!isDone)
-    return;
+  bool aDone = ModuleBase_WidgetValidated::setSelection(aSelected, false);
+  if (aDone) {
+    updateByPlaneSelected(aPrs);
+    updateObject(myFeature);
+  }
+}
 
-  // 3. hide main planes if they have been displayed
+void PartSet_WidgetSketchLabel::updateByPlaneSelected(const ModuleBase_ViewerPrs& thePrs)
+{
+  // 1. hide main planes if they have been displayed
   erasePreviewPlanes();
-  // 4. if the planes were displayed, change the view projection
-  TopoDS_Shape aShape = aPrs.shape();
+  // 2. if the planes were displayed, change the view projection
+  TopoDS_Shape aShape = thePrs.shape();
   std::shared_ptr<GeomAPI_Shape> aGShape;
   std::shared_ptr<GeomAPI_Shape> aBaseShape;
 
@@ -127,7 +135,7 @@ void PartSet_WidgetSketchLabel::onSelectionChanged()
 
   // selection happens in OCC viewer
   if (!aShape.IsNull()) {
-    aGShape =  std::make_shared<GeomAPI_Shape>();
+    aGShape =  std::shared_ptr<GeomAPI_Shape>(new GeomAPI_Shape());
     aGShape->setImpl(new TopoDS_Shape(aShape));
 
     if (aSelAttr && aSelAttr->context()) {
@@ -144,33 +152,24 @@ void PartSet_WidgetSketchLabel::onSelectionChanged()
     std::shared_ptr<GeomAPI_Pln> aPlane = GeomAlgoAPI_FaceBuilder::plane(aGShape);
     std::shared_ptr<GeomAPI_Dir> aDir = aPlane->direction();
     gp_XYZ aXYZ = aDir->impl<gp_Dir>().XYZ();
+    double aTwist = 0.0;
 
-    // orienting projection
-    if(aBaseShape.get() != NULL) {
-      std::shared_ptr<GeomAPI_Pnt> aCenterPnt = GeomAlgoAPI_ShapeProps::centreOfMass(aGShape);
-      gp_Pnt aPnt = aCenterPnt->impl<gp_Pnt>();
-      aPnt.Translate(aDir->impl<gp_Dir>().XYZ() * (10 * Precision::Confusion()));
+    // orienting projection is not needed: it is done in GeomAlgoAPI_FaceBuilder::plane
+    /*if (aGShape->impl<TopoDS_Shape>().Orientation() == TopAbs_REVERSED) {
+      aXYZ.Reverse();
+    }*/
 
-      BRepClass3d_SolidClassifier aClassifier;
-      aClassifier.Load(aBaseShape->impl<TopoDS_Shape>());
-      aClassifier.Perform(aPnt, Precision::Confusion());
-
-      if(aClassifier.State() == TopAbs_IN) {
-        aXYZ.Reverse();
-      }
-    }
-
-    myWorkshop->viewer()->setViewProjection(aXYZ.X(), aXYZ.Y(), aXYZ.Z());
+    myWorkshop->viewer()->setViewProjection(aXYZ.X(), aXYZ.Y(), aXYZ.Z(), aTwist);
   }
-  // 5. Clear text in the label
+  // 3. Clear text in the label
   myLabel->setText("");
   myLabel->setToolTip("");
   disconnect(workshop()->selector(), SIGNAL(selectionChanged()), 
               this, SLOT(onSelectionChanged()));
-  // 6. deactivate face selection filter
+  // 4. deactivate face selection filter
   activateFilters(false);
 
-  // 7. Clear selection mode and define sketching mode
+  // 5. Clear selection mode and define sketching mode
   //XGUI_Displayer* aDisp = workshop()->displayer();
   //aDisp->closeLocalContexts();
   emit planeSelected(plane());
@@ -179,7 +178,7 @@ void PartSet_WidgetSketchLabel::onSelectionChanged()
   // the selection by any label deactivation, but need to switch it off by stop the sketch
   activateSelection(true);
 
-  // 8. Update sketcher actions
+  // 6. Update sketcher actions
   XGUI_ActionsMgr* anActMgr = workshop()->actionsMgr();
   anActMgr->update();
   myWorkshop->viewer()->update();
@@ -189,7 +188,6 @@ std::shared_ptr<GeomAPI_Pln> PartSet_WidgetSketchLabel::plane() const
 {
   CompositeFeaturePtr aSketch = std::dynamic_pointer_cast<ModelAPI_CompositeFeature>(myFeature);
   return PartSet_Tools::sketchPlane(aSketch);
-
 }
 
 bool PartSet_WidgetSketchLabel::focusTo()
@@ -205,10 +203,13 @@ void PartSet_WidgetSketchLabel::enableFocusProcessing()
 
 void PartSet_WidgetSketchLabel::storeAttributeValue()
 {
+  ModuleBase_WidgetValidated::storeAttributeValue();
 }
 
 void PartSet_WidgetSketchLabel::restoreAttributeValue(const bool theValid)
 {
+  ModuleBase_WidgetValidated::restoreAttributeValue(theValid);
+
   // it is not necessary to save the previous plane value because the plane is chosen once
   DataPtr aData = feature()->data();
   AttributeSelectionPtr aSelAttr = std::dynamic_pointer_cast<ModelAPI_AttributeSelection>
@@ -336,7 +337,8 @@ void PartSet_WidgetSketchLabel::showPreviewPlanes()
     // Create Preview
     std::shared_ptr<GeomAPI_Pnt> anOrigin(new GeomAPI_Pnt(0, 0, 0));
     std::shared_ptr<GeomAPI_Dir> aYZDir(new GeomAPI_Dir(1, 0, 0));
-    std::shared_ptr<GeomAPI_Dir> aXZDir(new GeomAPI_Dir(0, 1, 0));
+    // -1, not 1 for correct internal sketch coords (issue 898)
+    std::shared_ptr<GeomAPI_Dir> aXZDir(new GeomAPI_Dir(0, -1, 0));
     std::shared_ptr<GeomAPI_Dir> aXYDir(new GeomAPI_Dir(0, 0, 1));
 
     std::vector<int> aYZRGB, aXZRGB, aXYRGB;
@@ -355,9 +357,9 @@ void PartSet_WidgetSketchLabel::showPreviewPlanes()
     myXYPlane = createPreviewPlane(anOrigin, aXYDir, aB);
   }
   XGUI_Displayer* aDisp = workshop()->displayer();
-  aDisp->displayAIS(myYZPlane, false);
-  aDisp->displayAIS(myXZPlane, false);
-  aDisp->displayAIS(myXYPlane, false);
+  aDisp->displayAIS(myYZPlane, true, false);
+  aDisp->displayAIS(myXZPlane, true, false);
+  aDisp->displayAIS(myXYPlane, true, false);
   myPreviewDisplayed = true;
 }