#include <SketchPlugin_Sketch.h>
#include <SketcherPrs_Tools.h>
-#include <BRepClass3d_SolidClassifier.hxx>
#include <Precision.hxx>
#include <gp_Pln.hxx>
#include <gp_Pnt.hxx>
PartSet_WidgetSketchLabel::~PartSet_WidgetSketchLabel()
{
- erasePreviewPlanes();
}
bool PartSet_WidgetSketchLabel::setSelection(QList<ModuleBase_ViewerPrs>& theValues,
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)
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_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());
+ myWorkshop->viewer()->setViewProjection(aXYZ.X(), aXYZ.Y(), aXYZ.Z(), aTwist);
}
// 3. Clear text in the label
myLabel->setText("");
// 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;