X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketcherPrs%2FSketcherPrs_Parallel.cpp;h=6b7e071946cb9f67986edadae00d4f49ab2b7965;hb=68420e410a9846ec7dcb2f4645030455bc374288;hp=74e97723b7cc3874852792ad64f2bf337d4f2bdb;hpb=694482299ca580d780c221cc6a3e7574e59fd2c3;p=modules%2Fshaper.git

diff --git a/src/SketcherPrs/SketcherPrs_Parallel.cpp b/src/SketcherPrs/SketcherPrs_Parallel.cpp
index 74e97723b..6b7e07194 100644
--- a/src/SketcherPrs/SketcherPrs_Parallel.cpp
+++ b/src/SketcherPrs/SketcherPrs_Parallel.cpp
@@ -6,96 +6,49 @@
 
 #include "SketcherPrs_Parallel.h"
 #include "SketcherPrs_Tools.h"
-
-#include <GeomAPI_Pnt.h>
+#include "SketcherPrs_PositionMgr.h"
 
 #include <SketchPlugin_Constraint.h>
 
-#include <AIS_Drawer.hxx>
-#include <Graphic3d_AspectMarker3d.hxx>
-#include <Prs3d_PointAspect.hxx>
+#include <Graphic3d_AspectLine3d.hxx>
 #include <Prs3d_Root.hxx>
-#include <gp_Pnt2d.hxx>
-#include <Image_AlienPixMap.hxx>
-#include <Graphic3d_MarkerImage.hxx>
-#include <SelectMgr_EntityOwner.hxx>
-#include <Select3D_SensitivePoint.hxx>
-#include <SelectMgr_Selection.hxx>
-#include <Select3D_SensitiveSegment.hxx>
-
-extern std::shared_ptr<GeomAPI_Pnt2d> getFeaturePoint(DataPtr theData,
-                                                      const std::string& theAttribute);
 
-#ifdef WIN32
-# define FSEP "\\"
-#else
-# define FSEP "/"
-#endif
 
 
-IMPLEMENT_STANDARD_HANDLE(SketcherPrs_Parallel, AIS_InteractiveObject);
-IMPLEMENT_STANDARD_RTTIEXT(SketcherPrs_Parallel, AIS_InteractiveObject);
+IMPLEMENT_STANDARD_HANDLE(SketcherPrs_Parallel, SketcherPrs_SymbolPrs);
+IMPLEMENT_STANDARD_RTTIEXT(SketcherPrs_Parallel, SketcherPrs_SymbolPrs);
 
 static Handle(Image_AlienPixMap) MyPixMap;
 
 SketcherPrs_Parallel::SketcherPrs_Parallel(SketchPlugin_Constraint* theConstraint, 
                                            const std::shared_ptr<GeomAPI_Ax3>& thePlane) 
- : AIS_InteractiveObject(), myConstraint(theConstraint), myPlane(thePlane)
+ : SketcherPrs_SymbolPrs(theConstraint, thePlane)
 {
-  if (MyPixMap.IsNull()) {
-    TCollection_AsciiString aFile(getenv("NewGeomResources"));
-    aFile += FSEP;
-    aFile += "parallel.png";
-    MyPixMap = new Image_AlienPixMap();
-    if (!MyPixMap->Load(aFile))
-      MyPixMap.Nullify();
-  }
-  if (!MyPixMap.IsNull()) {
-    myAspect = new Graphic3d_AspectMarker3d(MyPixMap);
-    myPntArray = new Graphic3d_ArrayOfPoints(2);
-    myPntArray->AddVertex(0., 0., 0.);
-    myPntArray->AddVertex(0. ,0., 0.);
-  }
+  myPntArray = new Graphic3d_ArrayOfPoints(2);
+  myPntArray->AddVertex(0., 0., 0.);
+  myPntArray->AddVertex(0. ,0., 0.);
 }  
 
 void SketcherPrs_Parallel::Compute(const Handle(PrsMgr_PresentationManager3d)& thePresentationManager,
                                    const Handle(Prs3d_Presentation)& thePresentation, 
                                    const Standard_Integer theMode)
 {
-  if (myAspect.IsNull())
-    return;
+  prepareAspect();
 
-  std::shared_ptr<GeomAPI_Edge> 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_Edge> aLine2 = SketcherPrs_Tools::getLine(myConstraint, SketchPlugin_Constraint::ENTITY_B());
+  std::shared_ptr<GeomAPI_Shape> aLine2 = SketcherPrs_Tools::getShape(aObj2);
   if (aLine2.get() == NULL)
     return;
-
-  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 = aVec1.Crossed(myPlane->norm()->impl<gp_Dir>());
-  aShift.Normalize();
-  aShift.Multiply(20);
-  aP2.Translate(aShift);
+  
+  SketcherPrs_PositionMgr* aMgr = SketcherPrs_PositionMgr::get();
+  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);
@@ -104,21 +57,14 @@ void SketcherPrs_Parallel::Compute(const Handle(PrsMgr_PresentationManager3d)& t
   aGroup->AddPrimitiveArray(myPntArray);
 }
 
-void SketcherPrs_Parallel::ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,
-                                            const Standard_Integer aMode)
+void SketcherPrs_Parallel::drawLines(const Handle(Prs3d_Presentation)& thePrs, Quantity_Color theColor) const
 {
-  std::shared_ptr<GeomAPI_Edge> aLine1 = SketcherPrs_Tools::getLine(myConstraint, SketchPlugin_Constraint::ENTITY_A());
-  if (aLine1.get() == NULL)
-    return;
+  Handle(Graphic3d_Group) aGroup = Prs3d_Root::NewGroup(thePrs);
 
-  std::shared_ptr<GeomAPI_Edge> aLine2 = SketcherPrs_Tools::getLine(myConstraint, SketchPlugin_Constraint::ENTITY_B());
-  if (aLine2.get() == NULL)
-    return;
+  Handle(Graphic3d_AspectLine3d) aLineAspect = new Graphic3d_AspectLine3d(theColor, Aspect_TOL_SOLID, 2);
+  aGroup->SetPrimitivesAspect(aLineAspect);
 
-  Handle(SelectMgr_EntityOwner) eown = new SelectMgr_EntityOwner(this);
-  Handle(Select3D_SensitivePoint) aSP1 = new Select3D_SensitivePoint(eown, myPntArray->Vertice(1));
-  Handle(Select3D_SensitivePoint) aSP2 = new Select3D_SensitivePoint(eown, myPntArray->Vertice(2));
-  aSelection->Add(aSP1);
-  aSelection->Add(aSP2);
+  addLine(aGroup, SketchPlugin_Constraint::ENTITY_A());
+  addLine(aGroup, SketchPlugin_Constraint::ENTITY_B());
 }