X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FSketchPlugin%2FSketchPlugin_Plugin.cpp;h=91a92ce7b2f89dd8498c70cd8c2b9066af0a7e37;hb=b565fcd859e5551d317233b9e8103b3987f1e79a;hp=51efb17215a0bd15bdaea25619cddf3b4712f2bd;hpb=4d8e5578a342503470e4dded487cd9148dc3fdfd;p=modules%2Fshaper.git

diff --git a/src/SketchPlugin/SketchPlugin_Plugin.cpp b/src/SketchPlugin/SketchPlugin_Plugin.cpp
index 51efb1721..91a92ce7b 100644
--- a/src/SketchPlugin/SketchPlugin_Plugin.cpp
+++ b/src/SketchPlugin/SketchPlugin_Plugin.cpp
@@ -8,14 +8,19 @@
 #include <SketchPlugin_Arc.h>
 #include <SketchPlugin_ConstraintCoincidence.h>
 #include <SketchPlugin_ConstraintDistance.h>
+#include <SketchPlugin_ConstraintEqual.h>
+#include <SketchPlugin_ConstraintFillet.h>
+#include <SketchPlugin_ConstraintHorizontal.h>
 #include <SketchPlugin_ConstraintLength.h>
+#include <SketchPlugin_ConstraintMirror.h>
 #include <SketchPlugin_ConstraintParallel.h>
 #include <SketchPlugin_ConstraintPerpendicular.h>
 #include <SketchPlugin_ConstraintRadius.h>
 #include <SketchPlugin_ConstraintRigid.h>
+#include <SketchPlugin_ConstraintTangent.h>
+#include <SketchPlugin_ConstraintVertical.h>
 #include <SketchPlugin_Validators.h>
-#include <SketchPlugin_ResultValidators.h>
-#include <SketchPlugin_ShapeValidator.h>
+#include <SketchPlugin_ExternalValidator.h>
 
 #include <Events_Loop.h>
 #include <GeomDataAPI_Dir.h>
@@ -46,25 +51,28 @@ SketchPlugin_Plugin::SketchPlugin_Plugin()
   ModelAPI_ValidatorsFactory* aFactory = aMgr->validators();
   aFactory->registerValidator("SketchPlugin_DistanceAttr",
                               new SketchPlugin_DistanceAttrValidator);  
-  //aFactory->registerValidator("SketchPlugin_DifferentObjects",
-  //                            new SketchPlugin_DifferentObjectsValidator);
-  aFactory->registerValidator("SketchPlugin_ResultPoint", new SketchPlugin_ResultPointValidator);
-  aFactory->registerValidator("SketchPlugin_ResultLine", new SketchPlugin_ResultLineValidator);
-  aFactory->registerValidator("SketchPlugin_ResultArc", new SketchPlugin_ResultArcValidator);
-  aFactory->registerValidator("SketchPlugin_ShapeValidator",
-                              new SketchPlugin_ShapeValidator);
+  aFactory->registerValidator("SketchPlugin_ExternalValidator",
+                              new SketchPlugin_ExternalValidator);
+  aFactory->registerValidator("SketchPlugin_TangentAttr",
+                              new SketchPlugin_TangentAttrValidator);
+  aFactory->registerValidator("SketchPlugin_NotFixed",
+                              new SketchPlugin_NotFixedValidator);
+  aFactory->registerValidator("SketchPlugin_EqualAttr",
+                              new SketchPlugin_EqualAttrValidator);
+  aFactory->registerValidator("SketchPlugin_MirrorAttr",
+                              new SketchPlugin_MirrorAttrValidator);
 
   // register this plugin
   ModelAPI_Session::get()->registerPlugin(this);
-
+  
   Config_PropManager::registerProp("Visualization", "sketch_entity_color", "Sketch enity color",
                                    Config_Prop::Color, SKETCH_ENTITY_COLOR);
 
   Config_PropManager::registerProp("Visualization", "sketch_external_color", "Sketch external entity color",
                                    Config_Prop::Color, SKETCH_EXTERNAL_COLOR);
 
-  Config_PropManager::registerProp("Visualization", "sketch_construction_color", "Sketch construction color",
-                                   Config_Prop::Color, SKETCH_CONSTRUCTION_COLOR);
+  Config_PropManager::registerProp("Visualization", "sketch_auxiliary_color", "Sketch auxiliary entity color",
+                                   Config_Prop::Color, SKETCH_AUXILIARY_COLOR);
 
   Config_PropManager::registerProp("Visualization", "sketch_constraint_color", "Sketch constraint color",
                                    Config_Prop::Color, SKETCH_CONSTRAINT_COLOR);
@@ -109,6 +117,18 @@ FeaturePtr SketchPlugin_Plugin::createFeature(string theFeatureID)
     return FeaturePtr(new SketchPlugin_ConstraintRadius);
   } else if (theFeatureID == SketchPlugin_ConstraintRigid::ID()) {
     return FeaturePtr(new SketchPlugin_ConstraintRigid);
+  } else if (theFeatureID == SketchPlugin_ConstraintHorizontal::ID()) {
+    return FeaturePtr(new SketchPlugin_ConstraintHorizontal);
+  } else if (theFeatureID == SketchPlugin_ConstraintVertical::ID()) {
+    return FeaturePtr(new SketchPlugin_ConstraintVertical);
+  } else if (theFeatureID == SketchPlugin_ConstraintEqual::ID()) {
+    return FeaturePtr(new SketchPlugin_ConstraintEqual);
+  } else if (theFeatureID == SketchPlugin_ConstraintTangent::ID()) {
+    return FeaturePtr(new SketchPlugin_ConstraintTangent);
+  } else if (theFeatureID == SketchPlugin_ConstraintMirror::ID()) {
+    return FeaturePtr(new SketchPlugin_ConstraintMirror);
+  } else if (theFeatureID == SketchPlugin_ConstraintFillet::ID()) {
+    return FeaturePtr(new SketchPlugin_ConstraintFillet);
   }
   // feature of such kind is not found
   return FeaturePtr();
@@ -153,6 +173,12 @@ std::shared_ptr<ModelAPI_FeatureStateMessage> SketchPlugin_Plugin
       aMsg->setState(SketchPlugin_ConstraintPerpendicular::ID(), aHasSketchPlane);
       aMsg->setState(SketchPlugin_ConstraintRadius::ID(), aHasSketchPlane);
       aMsg->setState(SketchPlugin_ConstraintRigid::ID(), aHasSketchPlane);
+      aMsg->setState(SketchPlugin_ConstraintHorizontal::ID(), aHasSketchPlane);
+      aMsg->setState(SketchPlugin_ConstraintVertical::ID(), aHasSketchPlane);
+      aMsg->setState(SketchPlugin_ConstraintEqual::ID(), aHasSketchPlane);
+      aMsg->setState(SketchPlugin_ConstraintTangent::ID(), aHasSketchPlane);
+      aMsg->setState(SketchPlugin_ConstraintMirror::ID(), aHasSketchPlane);
+      aMsg->setState(SketchPlugin_ConstraintFillet::ID(), aHasSketchPlane);
     }
   }
   return aMsg;