From: mpv <mpv@opencascade.com>
Date: Thu, 6 Dec 2018 14:06:07 +0000 (+0300)
Subject: Added the "Add dimensions" flag to the sketch drawer.
X-Git-Tag: End2018~110
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=52c2a94c9d3be46e59b9952f7cd6e1efdb129001;p=modules%2Fshaper.git

Added the "Add dimensions" flag to the sketch drawer.
---

diff --git a/src/SketchPlugin/SketchPlugin_SketchDrawer.cpp b/src/SketchPlugin/SketchPlugin_SketchDrawer.cpp
index cd4319332..fd4deeddb 100644
--- a/src/SketchPlugin/SketchPlugin_SketchDrawer.cpp
+++ b/src/SketchPlugin/SketchPlugin_SketchDrawer.cpp
@@ -43,6 +43,7 @@
 
 #include <ModelAPI_AttributeSelection.h>
 #include <ModelAPI_AttributeDouble.h>
+#include <ModelAPI_AttributeBoolean.h>
 #include <ModelAPI_ResultConstruction.h>
 
 #include <cmath>
@@ -56,6 +57,7 @@ void SketchPlugin_SketchDrawer::initAttributes()
 {
   data()->addAttribute(BASE_ID(), ModelAPI_AttributeSelection::typeId());
   data()->addAttribute(PLANE_ID(), ModelAPI_AttributeSelection::typeId());
+  data()->addAttribute(ADD_DIMENSIONS_ID(), ModelAPI_AttributeBoolean::typeId());
 }
 
 // sets a point attribute of the feature by 3D point on the sketch
@@ -101,6 +103,7 @@ void SketchPlugin_SketchDrawer::execute()
   aSketch->selection(SketchPlugin_SketchEntity::EXTERNAL_ID())->
     setValue(ResultPtr(), GeomShapePtr());
 
+  bool addDimensions = boolean(ADD_DIMENSIONS_ID())->value();
   // iterate all edges of the base to find all edges that belong to this plane
   GeomAPI_DataMapOfShapeShape alreadyProcessed;
   std::list<AttributePoint2DPtr> aCreatedPoints;// points to check and set coincidence
@@ -133,25 +136,28 @@ void SketchPlugin_SketchDrawer::execute()
       } else {
         isHorVertConstr = false;
       }
-      if (isHorVertConstr) { // only length constraint is enough
-        FeaturePtr aLen = aSketch->addFeature(SketchPlugin_ConstraintLength::ID());
-        aLen->refattr(SketchPlugin_ConstraintLength::ENTITY_A())->setObject(anItem->firstResult());
-        aLen->real(SketchPlugin_ConstraintLength::VALUE())->setValue(anEdge->length());
-      } else { // set horizontal and vertical distance constraints
-        FeaturePtr aVDist = aSketch->addFeature(SketchPlugin_ConstraintDistanceVertical::ID());
-        aVDist->refattr(SketchPlugin_Constraint::ENTITY_A())
-          ->setAttr(anItem->attribute(SketchPlugin_Line::START_ID()));
-        aVDist->refattr(SketchPlugin_Constraint::ENTITY_B())
-          ->setAttr(anItem->attribute(SketchPlugin_Line::END_ID()));
-        aVDist->real(SketchPlugin_ConstraintDistanceVertical::VALUE())
-          ->setValue(aPoints.back().first->y() - aPoints.front().first->y());
-        FeaturePtr aHDist = aSketch->addFeature(SketchPlugin_ConstraintDistanceHorizontal::ID());
-        aHDist->refattr(SketchPlugin_Constraint::ENTITY_A())
-          ->setAttr(anItem->attribute(SketchPlugin_Line::START_ID()));
-        aHDist->refattr(SketchPlugin_Constraint::ENTITY_B())
-          ->setAttr(anItem->attribute(SketchPlugin_Line::END_ID()));
-        aHDist->real(SketchPlugin_ConstraintDistanceVertical::VALUE())
-          ->setValue(aPoints.back().first->x() - aPoints.front().first->x());
+      if (addDimensions) {
+        if (isHorVertConstr) { // only length constraint is enough
+          FeaturePtr aLen = aSketch->addFeature(SketchPlugin_ConstraintLength::ID());
+          aLen->refattr(SketchPlugin_ConstraintLength::ENTITY_A())
+            ->setObject(anItem->firstResult());
+          aLen->real(SketchPlugin_ConstraintLength::VALUE())->setValue(anEdge->length());
+        } else { // set horizontal and vertical distance constraints
+          FeaturePtr aVDist = aSketch->addFeature(SketchPlugin_ConstraintDistanceVertical::ID());
+          aVDist->refattr(SketchPlugin_Constraint::ENTITY_A())
+            ->setAttr(anItem->attribute(SketchPlugin_Line::START_ID()));
+          aVDist->refattr(SketchPlugin_Constraint::ENTITY_B())
+            ->setAttr(anItem->attribute(SketchPlugin_Line::END_ID()));
+          aVDist->real(SketchPlugin_ConstraintDistanceVertical::VALUE())
+            ->setValue(aPoints.back().first->y() - aPoints.front().first->y());
+          FeaturePtr aHDist = aSketch->addFeature(SketchPlugin_ConstraintDistanceHorizontal::ID());
+          aHDist->refattr(SketchPlugin_Constraint::ENTITY_A())
+            ->setAttr(anItem->attribute(SketchPlugin_Line::START_ID()));
+          aHDist->refattr(SketchPlugin_Constraint::ENTITY_B())
+            ->setAttr(anItem->attribute(SketchPlugin_Line::END_ID()));
+          aHDist->real(SketchPlugin_ConstraintDistanceVertical::VALUE())
+            ->setValue(aPoints.back().first->x() - aPoints.front().first->x());
+        }
       }
     } else if (anEdge->isArc()) { // check also center
       GeomPointPtr aCenter = anEdge->circle()->center();
@@ -164,8 +170,10 @@ void SketchPlugin_SketchDrawer::execute()
       setPoint(anItem, SketchPlugin_Arc::END_ID(), aSketch, anEnd, aPoints);
       anItem->execute(); // for constraints setting on result
       // set radius constraint
-      FeaturePtr aRad = aSketch->addFeature(SketchPlugin_ConstraintRadius::ID());
-      aRad->refattr(SketchPlugin_Constraint::ENTITY_A())->setObject(anItem->lastResult());
+      if (addDimensions) {
+        FeaturePtr aRad = aSketch->addFeature(SketchPlugin_ConstraintRadius::ID());
+        aRad->refattr(SketchPlugin_Constraint::ENTITY_A())->setObject(anItem->lastResult());
+      }
     } else if (anEdge->isCircle()) { // check also center and middle (at value 2.)
       GeomPointPtr aCenter = anEdge->circle()->center();
       if (aPlane->distance(aCenter) >= kTOL || aPlane->distance(anEdge->middlePoint()) >= kTOL)
@@ -176,8 +184,10 @@ void SketchPlugin_SketchDrawer::execute()
       anItem->real(SketchPlugin_Circle::RADIUS_ID())->setValue(anEdge->circle()->radius());
       anItem->execute(); // for constraints setting on result
       // set radius constraint
-      FeaturePtr aRad = aSketch->addFeature(SketchPlugin_ConstraintRadius::ID());
-      aRad->refattr(SketchPlugin_Constraint::ENTITY_A())->setObject(anItem->lastResult());
+      if (addDimensions) {
+        FeaturePtr aRad = aSketch->addFeature(SketchPlugin_ConstraintRadius::ID());
+        aRad->refattr(SketchPlugin_Constraint::ENTITY_A())->setObject(anItem->lastResult());
+      }
     } else {
       continue; // other types of edges are not supported, only lines, circles and arcs
     }
diff --git a/src/SketchPlugin/SketchPlugin_SketchDrawer.h b/src/SketchPlugin/SketchPlugin_SketchDrawer.h
index 6f6da26b2..62c1ed163 100644
--- a/src/SketchPlugin/SketchPlugin_SketchDrawer.h
+++ b/src/SketchPlugin/SketchPlugin_SketchDrawer.h
@@ -54,6 +54,12 @@ class SketchPlugin_SketchDrawer: public ModelAPI_Feature
     static const std::string ID("plane");
     return ID;
   }
+  /// Attribute name of the add-dimensions flag.
+  inline static const std::string& ADD_DIMENSIONS_ID()
+  {
+    static const std::string ID("add_dimensions");
+    return ID;
+  }
 
   /// \return the kind of a feature.
   SKETCHPLUGIN_EXPORT virtual const std::string& getKind()
diff --git a/src/SketchPlugin/plugin-Sketch.xml b/src/SketchPlugin/plugin-Sketch.xml
index 928c21d0d..3fdd8c0ce 100644
--- a/src/SketchPlugin/plugin-Sketch.xml
+++ b/src/SketchPlugin/plugin-Sketch.xml
@@ -1068,6 +1068,7 @@ email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com
         <shape_selector id="plane" label="Plane:" tooltip="Select plane for sketch" shape_types="face">
           <validator id="GeomValidators_Face" parameters="plane"/>
         </shape_selector>
+        <boolvalue id="add_dimensions" label="Create dimensions" default="true" tooltip="To add dimensions into created sketch" obligatory="0"/>
       </feature>
     </group>
   </workbench>