Fix for stable processing of mirror constraint (eliminating SolveSpace problems)

[modules/shaper.git] / src / SketcherPrs / SketcherPrs_Perpendicular.cpp

diff --git a/src/SketcherPrs/SketcherPrs_Perpendicular.cpp b/src/SketcherPrs/SketcherPrs_Perpendicular.cpp
index 05c7506b251198b26d8cabcf13dfb0510160a9bb..d27cf03e57cb1b28e4876ec9d52b7c11ac05f67b 100644 (file)
--- a/src/SketcherPrs/SketcherPrs_Perpendicular.cpp
+++ b/src/SketcherPrs/SketcherPrs_Perpendicular.cpp
@@ -8,33 +8,10 @@
 #include "SketcherPrs_Tools.h"
 #include "SketcherPrs_PositionMgr.h"
 
-#include <GeomAPI_Pnt.h>
-
 #include <SketchPlugin_Constraint.h>
 
-#include <AIS_Drawer.hxx>
-#include <gp_Pnt2d.hxx>
-
-#include <Prs3d_PointAspect.hxx>
-#include <Prs3d_Root.hxx>
-#include <Prs3d_LineAspect.hxx>
-
-#include <Graphic3d_MarkerImage.hxx>
-#include <Graphic3d_AspectMarker3d.hxx>
 #include <Graphic3d_AspectLine3d.hxx>
-#include <Graphic3d_ArrayOfSegments.hxx>
-
-#include <Select3D_SensitivePoint.hxx>
-#include <Select3D_SensitiveSegment.hxx>
-
-#include <SelectMgr_SequenceOfOwner.hxx>
-#include <SelectMgr_Selection.hxx>
-#include <SelectMgr_EntityOwner.hxx>
-
-
-// Function which is defined in SketchPlugin_ConstraintDistance.cpp
-extern std::shared_ptr<GeomAPI_Pnt2d> getFeaturePoint(DataPtr theData,
-                                                      const std::string& theAttribute);
+#include <Prs3d_Root.hxx>
 
 
 
@@ -49,7 +26,7 @@ SketcherPrs_Perpendicular::SketcherPrs_Perpendicular(SketchPlugin_Constraint* th
 {
   myPntArray = new Graphic3d_ArrayOfPoints(2);
   myPntArray->AddVertex(0., 0., 0.);
-  myPntArray->AddVertex(0. ,0., 0.);
+  myPntArray->AddVertex(0., 0., 0.);
 }  
 
 void SketcherPrs_Perpendicular::Compute(const Handle(PrsMgr_PresentationManager3d)& thePresentationManager,
@@ -58,40 +35,20 @@ void SketcherPrs_Perpendicular::Compute(const Handle(PrsMgr_PresentationManager3
 {
   prepareAspect();
 
-  std::shared_ptr<GeomAPI_Shape> aLine1 = SketcherPrs_Tools::getLine(myConstraint, SketchPlugin_Constraint::ENTITY_A());
+  ObjectPtr aObj1 = SketcherPrs_Tools::getResult(myConstraint, SketchPlugin_Constraint::ENTITY_A());
+  ObjectPtr aObj2 = SketcherPrs_Tools::getResult(myConstraint, SketchPlugin_Constraint::ENTITY_B());
+
+  std::shared_ptr<GeomAPI_Shape> aLine1 = SketcherPrs_Tools::getShape(aObj1);
   if (aLine1.get() == NULL)
     return;
 
-  std::shared_ptr<GeomAPI_Shape> aLine2 = SketcherPrs_Tools::getLine(myConstraint, SketchPlugin_Constraint::ENTITY_B());
+  std::shared_ptr<GeomAPI_Shape> aLine2 = SketcherPrs_Tools::getShape(aObj2);
   if (aLine2.get() == NULL)
     return;
 
   SketcherPrs_PositionMgr* aMgr = SketcherPrs_PositionMgr::get();
-  gp_Pnt aP1 = aMgr->getPosition(aLine1, this);
-  gp_Pnt aP2 = aMgr->getPosition(aLine2, this);
-  //std::shared_ptr<GeomAPI_Pnt> aPnt1 = aLine1->firstPoint();
-  //std::shared_ptr<GeomAPI_Pnt> aPnt2 = aLine1->lastPoint();
-  //gp_Pnt aP1((aPnt1->x() + aPnt2->x())/2.,
-  //           (aPnt1->y() + aPnt2->y())/2.,
-  //           (aPnt1->z() + aPnt2->z())/2.);
-
-  //gp_Vec aVec1(aPnt1->impl<gp_Pnt>(), aPnt2->impl<gp_Pnt>());
-  //gp_Vec aShift = aVec1.Crossed(myPlane->norm()->impl<gp_Dir>());
-  //aShift.Normalize();
-  //aShift.Multiply(20);
-  //aP1.Translate(aShift);
-
-  //aPnt1 = aLine2->firstPoint();
-  //aPnt2 = aLine2->lastPoint();
-  //gp_Pnt aP2((aPnt1->x() + aPnt2->x())/2.,
-  //           (aPnt1->y() + aPnt2->y())/2.,
-  //           (aPnt1->z() + aPnt2->z())/2.);
-
-  //gp_Vec aVec2(aPnt1->impl<gp_Pnt>(), aPnt2->impl<gp_Pnt>());
-  //aShift = aVec2.Crossed(myPlane->norm()->impl<gp_Dir>());
-  //aShift.Normalize();
-  //aShift.Multiply(20);
-  //aP2.Translate(aShift);
+  gp_Pnt aP1 = aMgr->getPosition(aObj1, this);
+  gp_Pnt aP2 = aMgr->getPosition(aObj2, this);
 
   Handle(Graphic3d_Group) aGroup = Prs3d_Root::CurrentGroup(thePresentation);
   aGroup->SetPrimitivesAspect(myAspect);
@@ -100,45 +57,6 @@ void SketcherPrs_Perpendicular::Compute(const Handle(PrsMgr_PresentationManager3
   aGroup->AddPrimitiveArray(myPntArray);
 }
 
-void SketcherPrs_Perpendicular::ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,
-                                            const Standard_Integer aMode)
-{
-  ClearSelected();
-
-  Handle(SelectMgr_EntityOwner) aOwn = new SelectMgr_EntityOwner(this);
-  Handle(Select3D_SensitivePoint) aSP1 = new Select3D_SensitivePoint(aOwn, myPntArray->Vertice(1));
-  Handle(Select3D_SensitivePoint) aSP2 = new Select3D_SensitivePoint(aOwn, myPntArray->Vertice(2));
-  aSelection->Add(aSP1);
-  aSelection->Add(aSP2);
-}
-
-void SketcherPrs_Perpendicular::HilightSelected(const Handle(PrsMgr_PresentationManager3d)& thePM, 
-                                           const SelectMgr_SequenceOfOwner& theOwners)
-{
-
-  Handle( Prs3d_Presentation ) aSelectionPrs = GetSelectPresentation( thePM );
-  aSelectionPrs->Clear();
-  drawLines(aSelectionPrs, Quantity_NOC_WHITE);
-
-  aSelectionPrs->SetDisplayPriority(9);
-  aSelectionPrs->Display();
-  thePM->Highlight(this);
-}
-
-void SketcherPrs_Perpendicular::HilightOwnerWithColor(const Handle(PrsMgr_PresentationManager3d)& thePM, 
-                                                 const Quantity_NameOfColor theColor, const Handle(SelectMgr_EntityOwner)& theOwner)
-{
-  thePM->Color(this, theColor);
-
-  Handle( Prs3d_Presentation ) aHilightPrs = GetHilightPresentation( thePM );
-  aHilightPrs->Clear();
-  drawLines(aHilightPrs, theColor);
-
-  if (thePM->IsImmediateModeOn())
-    thePM->AddToImmediateList(aHilightPrs);
-}
-
-
 void SketcherPrs_Perpendicular::drawLines(const Handle(Prs3d_Presentation)& thePrs, Quantity_Color theColor) const
 {
   Handle(Graphic3d_Group) aGroup = Prs3d_Root::NewGroup(thePrs);