X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchPlugin%2FSketchPlugin_Plugin.cpp;h=e6451367d112de681be2f3ffa3f218237bc7830b;hb=b5893b0a30fac08134c24de4565cb513a43affa6;hp=f446375fa87deef4df5c4da2f272b8542c02f6e9;hpb=bb5bba6e567f9cae87f9fbaf584d2d0502ec372e;p=modules%2Fshaper.git

diff --git a/src/SketchPlugin/SketchPlugin_Plugin.cpp b/src/SketchPlugin/SketchPlugin_Plugin.cpp
index f446375fa..e6451367d 100644
--- a/src/SketchPlugin/SketchPlugin_Plugin.cpp
+++ b/src/SketchPlugin/SketchPlugin_Plugin.cpp
@@ -13,7 +13,7 @@
 #include <SketchPlugin_ConstraintCollinear.h>
 #include <SketchPlugin_ConstraintDistance.h>
 #include <SketchPlugin_ConstraintEqual.h>
-#include <SketchPlugin_ConstraintFillet.h>
+#include <SketchPlugin_Fillet.h>
 #include <SketchPlugin_ConstraintSplit.h>
 #include <SketchPlugin_ConstraintHorizontal.h>
 #include <SketchPlugin_ConstraintLength.h>
@@ -25,8 +25,11 @@
 #include <SketchPlugin_ConstraintRigid.h>
 #include <SketchPlugin_ConstraintTangent.h>
 #include <SketchPlugin_ConstraintVertical.h>
+#include <SketchPlugin_MacroArc.h>
+#include <SketchPlugin_MacroCircle.h>
 #include <SketchPlugin_MultiRotation.h>
 #include <SketchPlugin_MultiTranslation.h>
+#include <SketchPlugin_Trim.h>
 #include <SketchPlugin_Validators.h>
 #include <SketchPlugin_ExternalValidator.h>
 
@@ -46,9 +49,13 @@
 #include <iostream>
 #endif
 
-//#define SET_PLANES_COLOR_IN_PREFERENCES
+#define SKETCH_ENTITY_COLOR "225,0,0"
+#define SKETCH_EXTERNAL_COLOR "170,0,225"
+#define SKETCH_AUXILIARY_COLOR "0,85,0"
+#define SKETCH_OVERCONSTRAINT_COLOR "0,0,0"
+#define SKETCH_FULLY_CONSTRAINED_COLOR "0,150,0"
 
-using namespace std;
+//#define SET_PLANES_COLOR_IN_PREFERENCES
 
 // the only created instance of this plugin
 static SketchPlugin_Plugin* MY_SKETCH_INSTANCE = new SketchPlugin_Plugin();
@@ -58,7 +65,7 @@ SketchPlugin_Plugin::SketchPlugin_Plugin()
   SessionPtr aMgr = ModelAPI_Session::get();
   ModelAPI_ValidatorsFactory* aFactory = aMgr->validators();
   aFactory->registerValidator("SketchPlugin_DistanceAttr",
-                              new SketchPlugin_DistanceAttrValidator);  
+                              new SketchPlugin_DistanceAttrValidator);
   aFactory->registerValidator("SketchPlugin_ExternalValidator",
                               new SketchPlugin_ExternalValidator);
   aFactory->registerValidator("SketchPlugin_TangentAttr",
@@ -79,6 +86,8 @@ SketchPlugin_Plugin::SketchPlugin_Plugin()
                               new SketchPlugin_FilletVertexValidator);
   aFactory->registerValidator("SketchPlugin_SplitValidator",
                               new SketchPlugin_SplitValidator);
+  aFactory->registerValidator("SketchPlugin_TrimValidator",
+                              new SketchPlugin_TrimValidator);
   aFactory->registerValidator("SketchPlugin_MiddlePointAttr",
                               new SketchPlugin_MiddlePointAttrValidator);
   aFactory->registerValidator("SketchPlugin_ArcTangentPoint",
@@ -87,23 +96,36 @@ SketchPlugin_Plugin::SketchPlugin_Plugin()
                               new SketchPlugin_IntersectionValidator);
   aFactory->registerValidator("SketchPlugin_ProjectionValidator",
                               new SketchPlugin_ProjectionValidator);
+  aFactory->registerValidator("SketchPlugin_DifferentReference",
+                              new SketchPlugin_DifferentReferenceValidator);
+  aFactory->registerValidator("SketchPlugin_DifferentPointReference",
+                              new SketchPlugin_DifferentPointReferenceValidator);
+  aFactory->registerValidator("SketchPlugin_CirclePassedPointValidator",
+                              new SketchPlugin_CirclePassedPointValidator);
+  aFactory->registerValidator("SketchPlugin_ThirdPointValidator",
+                              new SketchPlugin_ThirdPointValidator);
+  aFactory->registerValidator("SketchPlugin_ArcEndPointValidator",
+                              new SketchPlugin_ArcEndPointValidator);
+  aFactory->registerValidator("SketchPlugin_ArcEndPointIntersectionValidator",
+                              new SketchPlugin_ArcEndPointIntersectionValidator);
+  aFactory->registerValidator("SketchPlugin_HasNoConstraint", new SketchPlugin_HasNoConstraint);
 
   // register this plugin
   ModelAPI_Session::get()->registerPlugin(this);
-  
-  Config_PropManager::registerProp("Visualization", "sketch_entity_color", 
+
+  Config_PropManager::registerProp("Visualization", "sketch_entity_color",
                                    "Sketch entity color",
                                    Config_Prop::Color, SKETCH_ENTITY_COLOR);
 
-  Config_PropManager::registerProp("Visualization", "sketch_external_color", 
+  Config_PropManager::registerProp("Visualization", "sketch_external_color",
                                    "Sketch external entity color",
                                    Config_Prop::Color, SKETCH_EXTERNAL_COLOR);
 
-  Config_PropManager::registerProp("Visualization", "sketch_auxiliary_color", 
+  Config_PropManager::registerProp("Visualization", "sketch_auxiliary_color",
                                    "Sketch auxiliary entity color",
                                    Config_Prop::Color, SKETCH_AUXILIARY_COLOR);
 
-  Config_PropManager::registerProp("Visualization", "sketch_dimension_color", 
+  Config_PropManager::registerProp("Visualization", "sketch_dimension_color",
                                    "Sketch dimension color",
                                    Config_Prop::Color, SKETCH_DIMENSION_COLOR);
 
@@ -111,6 +133,10 @@ SketchPlugin_Plugin::SketchPlugin_Plugin()
                                    "Sketch overconstraint color",
                                    Config_Prop::Color, SKETCH_OVERCONSTRAINT_COLOR);
 
+  Config_PropManager::registerProp("Visualization", "sketch_fully_constrained_color",
+                                   "Sketch fully constrained color",
+                                   Config_Prop::Color, SKETCH_FULLY_CONSTRAINED_COLOR);
+
   // register sketcher properties
 #ifdef SET_PLANES_COLOR_IN_PREFERENCES
   Config_PropManager::registerProp("Visualization", "yz_plane_color", "YZ plane color",
@@ -122,7 +148,7 @@ SketchPlugin_Plugin::SketchPlugin_Plugin()
 #endif
 }
 
-FeaturePtr SketchPlugin_Plugin::createFeature(string theFeatureID)
+FeaturePtr SketchPlugin_Plugin::createFeature(std::string theFeatureID)
 {
   if (theFeatureID == SketchPlugin_Sketch::ID()) {
     return FeaturePtr(new SketchPlugin_Sketch);
@@ -166,8 +192,8 @@ FeaturePtr SketchPlugin_Plugin::createFeature(string theFeatureID)
     return FeaturePtr(new SketchPlugin_ConstraintMiddle);
   } else if (theFeatureID == SketchPlugin_ConstraintMirror::ID()) {
     return FeaturePtr(new SketchPlugin_ConstraintMirror);
-  } else if (theFeatureID == SketchPlugin_ConstraintFillet::ID()) {
-    return FeaturePtr(new SketchPlugin_ConstraintFillet);
+  } else if (theFeatureID == SketchPlugin_Fillet::ID()) {
+    return FeaturePtr(new SketchPlugin_Fillet);
   } else if (theFeatureID == SketchPlugin_ConstraintSplit::ID()) {
     return FeaturePtr(new SketchPlugin_ConstraintSplit);
   } else if (theFeatureID == SketchPlugin_MultiTranslation::ID()) {
@@ -176,6 +202,12 @@ FeaturePtr SketchPlugin_Plugin::createFeature(string theFeatureID)
     return FeaturePtr(new SketchPlugin_MultiRotation);
   } else if (theFeatureID == SketchPlugin_ConstraintAngle::ID()) {
     return FeaturePtr(new SketchPlugin_ConstraintAngle);
+  } else if (theFeatureID == SketchPlugin_Trim::ID()) {
+    return FeaturePtr(new SketchPlugin_Trim);
+  } else if (theFeatureID == SketchPlugin_MacroArc::ID()) {
+    return FeaturePtr(new SketchPlugin_MacroArc);
+  } else if (theFeatureID == SketchPlugin_MacroCircle::ID()) {
+    return FeaturePtr(new SketchPlugin_MacroCircle);
   }
   // feature of such kind is not found
   return FeaturePtr();
@@ -233,11 +265,14 @@ std::shared_ptr<ModelAPI_FeatureStateMessage> SketchPlugin_Plugin
       aMsg->setState(SketchPlugin_ConstraintTangent::ID(), aHasSketchPlane);
       aMsg->setState(SketchPlugin_ConstraintMiddle::ID(), aHasSketchPlane);
       aMsg->setState(SketchPlugin_ConstraintMirror::ID(), aHasSketchPlane);
-      aMsg->setState(SketchPlugin_ConstraintFillet::ID(), aHasSketchPlane);
+      aMsg->setState(SketchPlugin_Fillet::ID(), aHasSketchPlane);
       aMsg->setState(SketchPlugin_ConstraintSplit::ID(), aHasSketchPlane);
       aMsg->setState(SketchPlugin_ConstraintAngle::ID(), aHasSketchPlane);
       aMsg->setState(SketchPlugin_MultiRotation::ID(), aHasSketchPlane);
       aMsg->setState(SketchPlugin_MultiTranslation::ID(), aHasSketchPlane);
+      aMsg->setState(SketchPlugin_Trim::ID(), aHasSketchPlane);
+      aMsg->setState(SketchPlugin_MacroArc::ID(), aHasSketchPlane);
+      aMsg->setState(SketchPlugin_MacroCircle::ID(), aHasSketchPlane);
       // SketchRectangle is a python feature, so its ID is passed just as a string
       aMsg->setState("SketchRectangle", aHasSketchPlane);
     }