X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_WidgetSketchLabel.cpp;h=e4df553d7cbe92289ce95475453f4205dde148df;hb=f39b615e10f48ab13b8346c1e0b4c64500d44f51;hp=57cca495af866d541e1ef4c8f8755d652a06c901;hpb=d2caa0b6b754adbb59d2c8c1bd1db7a4327c1ffc;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_WidgetSketchLabel.cpp b/src/PartSet/PartSet_WidgetSketchLabel.cpp index 57cca495a..e4df553d7 100644 --- a/src/PartSet/PartSet_WidgetSketchLabel.cpp +++ b/src/PartSet/PartSet_WidgetSketchLabel.cpp @@ -34,7 +34,6 @@ #include #include -#include #include #include #include @@ -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().XYZ(); double aTwist = 0.0; - // orienting projection - if(aBaseShape.get() != NULL) { - std::shared_ptr aCenterPnt = GeomAlgoAPI_ShapeTools::centreOfMass(aGShape); - gp_Pnt aPnt = aCenterPnt->impl(); - aPnt.Translate(aDir->impl().XYZ() * (10 * Precision::Confusion())); - - BRepClass3d_SolidClassifier aClassifier; - aClassifier.Load(aBaseShape->impl()); - 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().Orientation() == TopAbs_REVERSED) { + aXYZ.Reverse(); + }*/ myWorkshop->viewer()->setViewProjection(aXYZ.X(), aXYZ.Y(), aXYZ.Z(), aTwist); } @@ -346,7 +337,8 @@ void PartSet_WidgetSketchLabel::showPreviewPlanes() // Create Preview std::shared_ptr anOrigin(new GeomAPI_Pnt(0, 0, 0)); std::shared_ptr aYZDir(new GeomAPI_Dir(1, 0, 0)); - std::shared_ptr aXZDir(new GeomAPI_Dir(0, 1, 0)); + // -1, not 1 for correct internal sketch coords (issue 898) + std::shared_ptr aXZDir(new GeomAPI_Dir(0, -1, 0)); std::shared_ptr aXYDir(new GeomAPI_Dir(0, 0, 1)); std::vector aYZRGB, aXZRGB, aXYRGB;