Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

[modules/shaper.git] / src / SketchPlugin / SketchPlugin_SketchEntity.h

diff --git a/src/SketchPlugin/SketchPlugin_SketchEntity.h b/src/SketchPlugin/SketchPlugin_SketchEntity.h
index 11bc85e620fe2ddf2bdbc75f48720f82e8599829..8f716c79f1de1427c742db9c61afbc18f7b67255 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_SketchEntity.h
+++ b/src/SketchPlugin/SketchPlugin_SketchEntity.h
@@ -20,10 +20,9 @@
 
 #include <Config_PropManager.h>
 
-#define SKETCH_EDGE_COLOR "#ff0000"
-#define SKETCH_POINT_COLOR "#ff0000"
-#define SKETCH_EXTERNAL_EDGE_COLOR "#00ff00"
-#define SKETCH_CONSTRUCTION_COLOR "#000000"
+#define SKETCH_ENTITY_COLOR "#ff0000"
+#define SKETCH_EXTERNAL_COLOR "#00ff00"
+#define SKETCH_AUXILIARY_COLOR "#000000"
 
 /**\class SketchPlugin_SketchEntity
  * \ingroup Plugins
@@ -34,10 +33,10 @@ class SketchPlugin_SketchEntity : public SketchPlugin_Feature, public GeomAPI_IC
 {
  public:
   /// Reference to the construction type of the feature
-  inline static const std::string& CONSTRUCTION_ID()
+  inline static const std::string& AUXILIARY_ID()
   {
-    static const std::string MY_CONSTRUCTION_ID("Construction");
-    return MY_CONSTRUCTION_ID;
+    static const std::string MY_AUXILIARY_ID("Auxiliary");
+    return MY_AUXILIARY_ID;
   }
 
   /// Reference to the external edge or vertex as a AttributeSelection
@@ -65,45 +64,42 @@ class SketchPlugin_SketchEntity : public SketchPlugin_Feature, public GeomAPI_IC
   {
     bool isCustomized = false;
     int aShapeType = thePrs->getShapeType();
-    if (aShapeType != 6/*an edge*/ && aShapeType != 7/*a vertex*/)
+    // a compound is processed like the edge because the arc feature uses the compound for presentable AIS
+    if (aShapeType != 6/*an edge*/ && aShapeType != 7/*a vertex*/ && aShapeType != 0/*compound*/)
       return false;
 
+    // set color from preferences
     std::vector<int> aColor;
-    std::shared_ptr<ModelAPI_AttributeBoolean> aConstructionAttr =
-                                    data()->boolean(SketchPlugin_SketchEntity::CONSTRUCTION_ID());
-    bool isConstruction = aConstructionAttr.get() != NULL && aConstructionAttr->value();
-    if (aShapeType == 6) { // if this is an edge
+    std::shared_ptr<ModelAPI_AttributeBoolean> anAuxiliaryAttr =
+                                    data()->boolean(SketchPlugin_SketchEntity::AUXILIARY_ID());
+    bool isConstruction = anAuxiliaryAttr.get() != NULL && anAuxiliaryAttr->value();
+    if (isConstruction) {
+      aColor = Config_PropManager::color("Visualization", "sketch_auxiliary_color",
+                                         SKETCH_AUXILIARY_COLOR);
+    }
+    else if (isExternal()) {
+      aColor = Config_PropManager::color("Visualization", "sketch_external_color",
+                                        SKETCH_EXTERNAL_COLOR);
+    }
+    else {
+      aColor = Config_PropManager::color("Visualization", "sketch_entity_color",
+                                          SKETCH_ENTITY_COLOR);
+    }
+    if (!aColor.empty())
+      isCustomized = thePrs->setColor(aColor[0], aColor[1], aColor[2]) || isCustomized;
+
+    if (aShapeType == 6 || aShapeType == 0) { // if this is an edge or a compound
       if (isConstruction) {
         isCustomized = thePrs->setWidth(1) || isCustomized;
         isCustomized = thePrs->setLineStyle(3) || isCustomized;
-
-        aColor = Config_PropManager::color("Visualization", "sketch_construction_color",
-                                          SKETCH_CONSTRUCTION_COLOR);
       }
       else {
         isCustomized = thePrs->setWidth(3) || isCustomized;
         isCustomized = thePrs->setLineStyle(0) || isCustomized;
-
-        if (isExternal()) {
-          // Set color from preferences
-          aColor = Config_PropManager::color("Visualization", "sketch_external_color",
-                                            SKETCH_EXTERNAL_EDGE_COLOR);
-        }
-        else {
-          // Set color from preferences
-          aColor = Config_PropManager::color("Visualization", "sketch_edge_color",
-                                             SKETCH_EDGE_COLOR);
-        }
       }
     }
     else if (aShapeType == 7) { // otherwise this is a vertex
       //  thePrs->setPointMarker(6, 2.);
-      aColor = Config_PropManager::color("Visualization", "sketch_point_color",
-                                        SKETCH_POINT_COLOR);
-    }
-
-    if (!aColor.empty()) {
-      isCustomized = thePrs->setColor(aColor[0], aColor[1], aColor[2]) || isCustomized;
     }
     return isCustomized;
   }