X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_WidgetSketchLabel.cpp;h=e28724ddc37d179bc79105bfd74af476d9c6ac96;hb=1105bfe31c0304ffacd85363d070322049d564f1;hp=12d720a3c9063cce8343d5dbec2d6e0e568bc06c;hpb=73b63afd03a150740406d8c5cebf45ac5125f2e3;p=modules%2Fshaper.git

diff --git a/src/PartSet/PartSet_WidgetSketchLabel.cpp b/src/PartSet/PartSet_WidgetSketchLabel.cpp
index 12d720a3c..e28724ddc 100644
--- a/src/PartSet/PartSet_WidgetSketchLabel.cpp
+++ b/src/PartSet/PartSet_WidgetSketchLabel.cpp
@@ -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>
@@ -115,8 +114,10 @@ void PartSet_WidgetSketchLabel::onSelectionChanged()
   ModuleBase_ViewerPrs aPrs = aSelected.first();
 
   bool aDone = ModuleBase_WidgetValidated::setSelection(aSelected, false);
-  if (aDone)
+  if (aDone) {
     updateByPlaneSelected(aPrs);
+    updateObject(myFeature);
+  }
 }
 
 void PartSet_WidgetSketchLabel::updateByPlaneSelected(const ModuleBase_ViewerPrs& thePrs)
@@ -153,20 +154,10 @@ void PartSet_WidgetSketchLabel::updateByPlaneSelected(const ModuleBase_ViewerPrs
     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_ShapeTools::centreOfMass(aGShape);
-      gp_Pnt aPnt = aCenterPnt->impl<gp_Pnt>();
-      aPnt.Translate(aDir->impl<gp_Dir>().XYZ() * (10 * Precision::Confusion()));
-
-      BRepClass3d_SolidClassifier aClassifier;
-      aClassifier.Load(aBaseShape->impl<TopoDS_Shape>());
-      aClassifier.Perform(aPnt, Precision::Confusion());
-
-      if(aClassifier.State() == TopAbs_IN) {
-        aXYZ.Reverse();
-      }
-    }
+    // orienting projection is not needed: it is done in GeomAlgoAPI_FaceBuilder::plane
+    /*if (aGShape->impl<TopoDS_Shape>().Orientation() == TopAbs_REVERSED) {
+      aXYZ.Reverse();
+    }*/
 
     myWorkshop->viewer()->setViewProjection(aXYZ.X(), aXYZ.Y(), aXYZ.Z(), aTwist);
   }
@@ -182,7 +173,6 @@ void PartSet_WidgetSketchLabel::updateByPlaneSelected(const ModuleBase_ViewerPrs
   //XGUI_Displayer* aDisp = workshop()->displayer();
   //aDisp->closeLocalContexts();
   emit planeSelected(plane());
-  emit valuesChanged();
   // after the plane is selected in the sketch, the sketch selection should be activated
   // it can not be performed in the sketch label widget because, we don't need to switch off
   // the selection by any label deactivation, but need to switch it off by stop the sketch
@@ -191,7 +181,7 @@ void PartSet_WidgetSketchLabel::updateByPlaneSelected(const ModuleBase_ViewerPrs
   // 6. Update sketcher actions
   XGUI_ActionsMgr* anActMgr = workshop()->actionsMgr();
   anActMgr->update();
-  myWorkshop->viewer()->update();
+  //VSV myWorkshop->viewer()->update();
 }
 
 std::shared_ptr<GeomAPI_Pln> PartSet_WidgetSketchLabel::plane() const
@@ -299,7 +289,7 @@ void PartSet_WidgetSketchLabel::activateCustom()
   connect(workshop()->selector(), SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged()));
   activateFilters(true);
 
-  aDisp->updateViewer();
+  //VSV aDisp->updateViewer();
 }
 
 void PartSet_WidgetSketchLabel::deactivate()
@@ -347,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;