Remove code duplication.

diff --git a/src/SketcherPrs/SketcherPrs_Factory.cpp b/src/SketcherPrs/SketcherPrs_Factory.cpp
index 187b94dce89024a05296b8cb6a556935db012c02..8898569c3ca419595ed1fdf7d5e20cb4849c65d7 100644 (file)
--- a/src/SketcherPrs/SketcherPrs_Factory.cpp
+++ b/src/SketcherPrs/SketcherPrs_Factory.cpp
@@ -11,40 +11,17 @@
 #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;
-}
-
-
-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;
+#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::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;
-}
-
-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;
-}
+CONSTRAINT_PRS_IMPL(coincidentConstraint, SketcherPrs_Coincident);
+CONSTRAINT_PRS_IMPL(parallelConstraint, SketcherPrs_Parallel);
+CONSTRAINT_PRS_IMPL(perpendicularConstraint, SketcherPrs_Perpendicular);
+CONSTRAINT_PRS_IMPL(rigidConstraint, SketcherPrs_Rigid)

diff --git a/src/SketcherPrs/SketcherPrs_Factory.h b/src/SketcherPrs/SketcherPrs_Factory.h
index 6e61853e93a30171cd83449902d387853e2d6697..a76b5a28531b2b0e0eabeda164f084b1ee452e12 100644 (file)
--- a/src/SketcherPrs/SketcherPrs_Factory.h
+++ b/src/SketcherPrs/SketcherPrs_Factory.h
@@ -14,6 +14,11 @@
 
 class SketchPlugin_Constraint;
 
+#define GET_CONSTRAINT_PRS(NAME) \
+  static AISObjectPtr NAME(SketchPlugin_Constraint* theConstraint, \
+                           const std::shared_ptr<GeomAPI_Ax3>& thePlane); \
+
+
 /**
 * Class which creates constraints presentations
 */
@@ -23,26 +28,22 @@ public:
   /// Creates coincedent constraint presentation
   /// \param theConstraint the constraint
   /// \param thePlane the current sketch plane
-  static AISObjectPtr coincidentConstraint(SketchPlugin_Constraint* theConstraint, 
-                                           const std::shared_ptr<GeomAPI_Ax3>& thePlane);
+  GET_CONSTRAINT_PRS(coincidentConstraint)
 
   /// Creates coincedent parallel presentation
   /// \param theConstraint the constraint
   /// \param thePlane the current sketch plane
-  static AISObjectPtr parallelConstraint(SketchPlugin_Constraint* theConstraint, 
-                                         const std::shared_ptr<GeomAPI_Ax3>& thePlane);
+  GET_CONSTRAINT_PRS(parallelConstraint)
 
   /// Creates coincedent perpendicular presentation
   /// \param theConstraint the constraint
   /// \param thePlane the current sketch plane
-  static AISObjectPtr perpendicularConstraint(SketchPlugin_Constraint* theConstraint, 
-                                         const std::shared_ptr<GeomAPI_Ax3>& thePlane);
+  GET_CONSTRAINT_PRS(perpendicularConstraint)
 
   /// Creates coincedent perpendicular presentation
   /// \param theConstraint the constraint
   /// \param thePlane the current sketch plane
-  static AISObjectPtr rigidConstraint(SketchPlugin_Constraint* theConstraint, 
-                                      const std::shared_ptr<GeomAPI_Ax3>& thePlane);
+  GET_CONSTRAINT_PRS(rigidConstraint)
 };
 
 #endif