X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FSketcherPrs%2FSketcherPrs_Factory.cpp;h=553ea9cf95011c965d13048ee4bc2989cb0fbbaa;hb=8d8cd4bfaf5af5db0fe563e3e75b2526e472dbe0;hp=6059e0ce0dd643132de9fe999d79c2b8defc24c0;hpb=b3695c3af5289903f1c0fa01bbb7c40203c5e544;p=modules%2Fshaper.git

diff --git a/src/SketcherPrs/SketcherPrs_Factory.cpp b/src/SketcherPrs/SketcherPrs_Factory.cpp
index 6059e0ce0..553ea9cf9 100644
--- a/src/SketcherPrs/SketcherPrs_Factory.cpp
+++ b/src/SketcherPrs/SketcherPrs_Factory.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2017  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2019  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -12,10 +12,9 @@
 //
 // You should have received a copy of the GNU Lesser General Public
 // License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-// See http://www.salome-platform.org/ or
-// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
 #include "SketcherPrs_Factory.h"
@@ -38,17 +37,16 @@
 // Macros for constraint presentation definition
 #define CONSTRAINT_PRS_IMPL(NAME, CLASS) \
 AISObjectPtr SketcherPrs_Factory::NAME(ModelAPI_Feature* theConstraint, \
-                                       ModelAPI_CompositeFeature* theSketcher, \
-                                       const std::shared_ptr<GeomAPI_Ax3>& thePlane, \
+                                       SketchPlugin_Sketch* theSketcher, \
                                        AISObjectPtr thePrevious) \
 { \
   std::shared_ptr<GeomAPI_AISObject> anAISObj; \
-  if (CLASS::IsReadyToDisplay(theConstraint, thePlane)) { \
+  if (CLASS::IsReadyToDisplay(theConstraint, theSketcher->coordinatePlane())) { \
     if (thePrevious.get()) \
       anAISObj = thePrevious; \
     else { \
       anAISObj = AISObjectPtr(new GeomAPI_AISObject()); \
-      Handle(CLASS) aPrs = new CLASS(theConstraint, theSketcher, thePlane); \
+      Handle(CLASS) aPrs = new CLASS(theConstraint, theSketcher); \
       anAISObj->setImpl(new Handle(AIS_InteractiveObject)(aPrs)); \
     } \
   } \
@@ -64,47 +62,23 @@ CONSTRAINT_PRS_IMPL(equalConstraint, SketcherPrs_Equal);
 CONSTRAINT_PRS_IMPL(tangentConstraint, SketcherPrs_Tangent);
 CONSTRAINT_PRS_IMPL(middleConstraint, SketcherPrs_Middle);
 CONSTRAINT_PRS_IMPL(mirrorConstraint, SketcherPrs_Mirror);
-
-
-
-#define CONSTRAINT2_PRS_IMPL(NAME, CLASS) \
-AISObjectPtr SketcherPrs_Factory::NAME(ModelAPI_Feature* theConstraint, \
-                                       const std::shared_ptr<GeomAPI_Ax3>& thePlane, \
-                                       AISObjectPtr thePrevious) \
-{ \
-  std::shared_ptr<GeomAPI_AISObject> anAISObj; \
-  if (CLASS::IsReadyToDisplay(theConstraint, thePlane)) { \
-    if (thePrevious.get()) \
-      anAISObj = thePrevious; \
-    else { \
-      anAISObj = AISObjectPtr(new GeomAPI_AISObject()); \
-      Handle(CLASS) aPrs = new CLASS(theConstraint, thePlane); \
-      anAISObj->setImpl(new Handle(AIS_InteractiveObject)(aPrs)); \
-    } \
-  } \
-  return anAISObj; \
-}
-
-
-CONSTRAINT2_PRS_IMPL(coincidentConstraint, SketcherPrs_Coincident);
-CONSTRAINT2_PRS_IMPL(angleConstraint, SketcherPrs_Angle);
-CONSTRAINT2_PRS_IMPL(radiusConstraint, SketcherPrs_Radius);
-CONSTRAINT2_PRS_IMPL(lengthDimensionConstraint, SketcherPrs_LengthDimension);
+CONSTRAINT_PRS_IMPL(coincidentConstraint, SketcherPrs_Coincident);
+CONSTRAINT_PRS_IMPL(lengthDimensionConstraint, SketcherPrs_LengthDimension);
+CONSTRAINT_PRS_IMPL(angleConstraint, SketcherPrs_Angle);
+CONSTRAINT_PRS_IMPL(radiusConstraint, SketcherPrs_Radius);
 
 // Non-standard constraints definition
 AISObjectPtr SketcherPrs_Factory::horisontalConstraint(ModelAPI_Feature* theConstraint,
-                                        ModelAPI_CompositeFeature* theSketcher,
-                                       const std::shared_ptr<GeomAPI_Ax3>& thePlane,
-                                       AISObjectPtr thePrevious)
+  SketchPlugin_Sketch* theSketcher, AISObjectPtr thePrevious)
 {
   std::shared_ptr<GeomAPI_AISObject> anAISObj;
-  if (SketcherPrs_HVDirection::IsReadyToDisplay(theConstraint, thePlane)) {
+  if (SketcherPrs_HVDirection::IsReadyToDisplay(theConstraint, theSketcher->coordinatePlane())) {
     if (thePrevious.get())
       anAISObj = thePrevious;
     else {
       anAISObj = AISObjectPtr(new GeomAPI_AISObject());
       Handle(SketcherPrs_HVDirection) aPrs =
-        new SketcherPrs_HVDirection(theConstraint, theSketcher, thePlane, true);
+        new SketcherPrs_HVDirection(theConstraint, theSketcher, true);
       anAISObj->setImpl(new Handle(AIS_InteractiveObject)(aPrs));
     }
   }
@@ -112,18 +86,16 @@ AISObjectPtr SketcherPrs_Factory::horisontalConstraint(ModelAPI_Feature* theCons
 }
 
 AISObjectPtr SketcherPrs_Factory::verticalConstraint(ModelAPI_Feature* theConstraint,
-                                        ModelAPI_CompositeFeature* theSketcher,
-                                       const std::shared_ptr<GeomAPI_Ax3>& thePlane,
-                                       AISObjectPtr thePrevious)
+  SketchPlugin_Sketch* theSketcher, AISObjectPtr thePrevious)
 {
   std::shared_ptr<GeomAPI_AISObject> anAISObj;
-  if (SketcherPrs_HVDirection::IsReadyToDisplay(theConstraint, thePlane)) {
+  if (SketcherPrs_HVDirection::IsReadyToDisplay(theConstraint, theSketcher->coordinatePlane())) {
     if (thePrevious.get())
       anAISObj = thePrevious;
     else {
       anAISObj = AISObjectPtr(new GeomAPI_AISObject());
       Handle(SketcherPrs_HVDirection) aPrs =
-        new SketcherPrs_HVDirection(theConstraint, theSketcher, thePlane, false);
+        new SketcherPrs_HVDirection(theConstraint, theSketcher, false);
       anAISObj->setImpl(new Handle(AIS_InteractiveObject)(aPrs));
     }
   }
@@ -131,18 +103,17 @@ AISObjectPtr SketcherPrs_Factory::verticalConstraint(ModelAPI_Feature* theConstr
 }
 
 AISObjectPtr SketcherPrs_Factory::translateConstraint(ModelAPI_Feature* theConstraint,
-                                        ModelAPI_CompositeFeature* theSketcher,
-                                       const std::shared_ptr<GeomAPI_Ax3>& thePlane,
-                                       AISObjectPtr thePrevious)
+  SketchPlugin_Sketch* theSketcher, AISObjectPtr thePrevious)
 {
   std::shared_ptr<GeomAPI_AISObject> anAISObj;
-  if (SketcherPrs_Transformation::IsReadyToDisplay(theConstraint, thePlane)) {
+  if (SketcherPrs_Transformation::IsReadyToDisplay(theConstraint,
+    theSketcher->coordinatePlane())) {
     if (thePrevious.get())
       anAISObj = thePrevious;
     else {
       anAISObj = AISObjectPtr(new GeomAPI_AISObject());
       Handle(SketcherPrs_Transformation) aPrs =
-        new SketcherPrs_Transformation(theConstraint, theSketcher, thePlane, true);
+        new SketcherPrs_Transformation(theConstraint, theSketcher, true);
       anAISObj->setImpl(new Handle(AIS_InteractiveObject)(aPrs));
     }
   }
@@ -150,18 +121,17 @@ AISObjectPtr SketcherPrs_Factory::translateConstraint(ModelAPI_Feature* theConst
 }
 
 AISObjectPtr SketcherPrs_Factory::rotateConstraint(ModelAPI_Feature* theConstraint,
-                                        ModelAPI_CompositeFeature* theSketcher,
-                                       const std::shared_ptr<GeomAPI_Ax3>& thePlane,
-                                       AISObjectPtr thePrevious)
+  SketchPlugin_Sketch* theSketcher, AISObjectPtr thePrevious)
 {
   std::shared_ptr<GeomAPI_AISObject> anAISObj;
-  if (SketcherPrs_Transformation::IsReadyToDisplay(theConstraint, thePlane)) {
+  if (SketcherPrs_Transformation::IsReadyToDisplay(theConstraint,
+    theSketcher->coordinatePlane())) {
     if (thePrevious.get())
       anAISObj = thePrevious;
     else {
       anAISObj = AISObjectPtr(new GeomAPI_AISObject());
       Handle(SketcherPrs_Transformation) aPrs =
-        new SketcherPrs_Transformation(theConstraint, theSketcher, thePlane, false);
+        new SketcherPrs_Transformation(theConstraint, theSketcher, false);
       anAISObj->setImpl(new Handle(AIS_InteractiveObject)(aPrs));
     }
   }