X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketcherPrs%2FSketcherPrs_Factory.cpp;h=b46070694c1d2fd4db6e1df60880768f2e089b23;hb=4db1ccae61d6f09173fcf51c60d1742bb9d37067;hp=187b94dce89024a05296b8cb6a556935db012c02;hpb=0f0ed262e58309bcd9e5a1cb8415523821051d8d;p=modules%2Fshaper.git

diff --git a/src/SketcherPrs/SketcherPrs_Factory.cpp b/src/SketcherPrs/SketcherPrs_Factory.cpp
index 187b94dce..b46070694 100644
--- a/src/SketcherPrs/SketcherPrs_Factory.cpp
+++ b/src/SketcherPrs/SketcherPrs_Factory.cpp
@@ -6,45 +6,46 @@
 
 #include "SketcherPrs_Factory.h"
 
-#include <SketcherPrs_Coincident.h>
-#include <SketcherPrs_Parallel.h>
-#include <SketcherPrs_Perpendicular.h>
-#include <SketcherPrs_Rigid.h>
-
-
-AISObjectPtr SketcherPrs_Factory::coincidentConstraint(SketchPlugin_Constraint* theConstraint, 
-                                                       const std::shared_ptr<GeomAPI_Ax3>& thePlane)
-{
-  std::shared_ptr<GeomAPI_AISObject> aAISObj = AISObjectPtr(new GeomAPI_AISObject());
-  Handle(SketcherPrs_Coincident) aPrs = new SketcherPrs_Coincident(theConstraint, thePlane);
-  aAISObj->setImpl(new Handle(AIS_InteractiveObject)(aPrs));
-  return aAISObj;
+#include "SketcherPrs_Coincident.h"
+#include "SketcherPrs_Parallel.h"
+#include "SketcherPrs_Perpendicular.h"
+#include "SketcherPrs_Rigid.h"
+#include "SketcherPrs_HVDirection.h"
+#include "SketcherPrs_Equal.h"
+#include "SketcherPrs_Tangent.h"
+
+#define CONSTRAINT_PRS_IMPL(NAME, CLASS) \
+AISObjectPtr SketcherPrs_Factory::NAME(SketchPlugin_Constraint* theConstraint, \
+                                       const std::shared_ptr<GeomAPI_Ax3>& thePlane) \
+{ \
+  std::shared_ptr<GeomAPI_AISObject> aAISObj = AISObjectPtr(new GeomAPI_AISObject()); \
+  Handle(CLASS) aPrs = new CLASS(theConstraint, thePlane); \
+  aAISObj->setImpl(new Handle(AIS_InteractiveObject)(aPrs)); \
+  return aAISObj; \
 }
 
-
-AISObjectPtr SketcherPrs_Factory::parallelConstraint(SketchPlugin_Constraint* theConstraint, 
-                                                     const std::shared_ptr<GeomAPI_Ax3>& thePlane)
-{
-  std::shared_ptr<GeomAPI_AISObject> aAISObj = AISObjectPtr(new GeomAPI_AISObject());
-  Handle(SketcherPrs_Parallel) aPrs = new SketcherPrs_Parallel(theConstraint, thePlane);
-  aAISObj->setImpl(new Handle(AIS_InteractiveObject)(aPrs));
-  return aAISObj;
-}
-
-AISObjectPtr SketcherPrs_Factory::perpendicularConstraint(SketchPlugin_Constraint* theConstraint, 
-                                                     const std::shared_ptr<GeomAPI_Ax3>& thePlane)
-{
-  std::shared_ptr<GeomAPI_AISObject> aAISObj = AISObjectPtr(new GeomAPI_AISObject());
-  Handle(SketcherPrs_Perpendicular) aPrs = new SketcherPrs_Perpendicular(theConstraint, thePlane);
-  aAISObj->setImpl(new Handle(AIS_InteractiveObject)(aPrs));
-  return aAISObj;
+CONSTRAINT_PRS_IMPL(coincidentConstraint, SketcherPrs_Coincident);
+CONSTRAINT_PRS_IMPL(parallelConstraint, SketcherPrs_Parallel);
+CONSTRAINT_PRS_IMPL(perpendicularConstraint, SketcherPrs_Perpendicular);
+CONSTRAINT_PRS_IMPL(rigidConstraint, SketcherPrs_Rigid);
+CONSTRAINT_PRS_IMPL(equalConstraint, SketcherPrs_Equal);
+CONSTRAINT_PRS_IMPL(tangentConstraint, SketcherPrs_Tangent);
+
+
+AISObjectPtr SketcherPrs_Factory::horisontalConstraint(SketchPlugin_Constraint* theConstraint,
+                                       const std::shared_ptr<GeomAPI_Ax3>& thePlane)
+{ 
+  std::shared_ptr<GeomAPI_AISObject> aAISObj = AISObjectPtr(new GeomAPI_AISObject()); 
+  Handle(SketcherPrs_HVDirection) aPrs = new SketcherPrs_HVDirection(theConstraint, thePlane, true); 
+  aAISObj->setImpl(new Handle(AIS_InteractiveObject)(aPrs)); 
+  return aAISObj; 
 }
 
-AISObjectPtr SketcherPrs_Factory::rigidConstraint(SketchPlugin_Constraint* theConstraint, 
-                                                     const std::shared_ptr<GeomAPI_Ax3>& thePlane)
-{
-  std::shared_ptr<GeomAPI_AISObject> aAISObj = AISObjectPtr(new GeomAPI_AISObject());
-  Handle(SketcherPrs_Rigid) aPrs = new SketcherPrs_Rigid(theConstraint, thePlane);
-  aAISObj->setImpl(new Handle(AIS_InteractiveObject)(aPrs));
-  return aAISObj;
+AISObjectPtr SketcherPrs_Factory::verticalConstraint(SketchPlugin_Constraint* theConstraint,
+                                       const std::shared_ptr<GeomAPI_Ax3>& thePlane)
+{ 
+  std::shared_ptr<GeomAPI_AISObject> aAISObj = AISObjectPtr(new GeomAPI_AISObject()); 
+  Handle(SketcherPrs_HVDirection) aPrs = new SketcherPrs_HVDirection(theConstraint, thePlane, false); 
+  aAISObj->setImpl(new Handle(AIS_InteractiveObject)(aPrs)); 
+  return aAISObj; 
 }