Merge branch 'master' of newgeom:newgeom.git

[modules/shaper.git] / src / SketchPlugin / SketchPlugin_Sketch.cpp

diff --git a/src/SketchPlugin/SketchPlugin_Sketch.cpp b/src/SketchPlugin/SketchPlugin_Sketch.cpp
index 76e48e0760ce6f565de147baa5d92159f07c37c9..0b0381ab7eb647bedd648eca91db1374a47409ab 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_Sketch.cpp
+++ b/src/SketchPlugin/SketchPlugin_Sketch.cpp
@@ -14,14 +14,10 @@
 #include <GeomAlgoAPI_SketchBuilder.h>
 #include <ModelAPI_ResultConstruction.h>
 
+#include <Config_PropManager.h>
 
 using namespace std;
 
-const int SKETCH_PLANE_COLOR = Colors::COLOR_BROWN; /// the plane edge color
-const double SKETCH_WIDTH = 4.0; /// the plane edge width
-// face of the square-face displayed for selection of general plane
-const double PLANE_SIZE = 200;
-
 
 SketchPlugin_Sketch::SketchPlugin_Sketch()
 {
@@ -41,7 +37,8 @@ void SketchPlugin_Sketch::execute()
   if (!data()->isValid())
     return ;
   boost::shared_ptr<ModelAPI_AttributeRefList> aRefList =
-    boost::dynamic_pointer_cast<ModelAPI_AttributeRefList>(data()->attribute(SketchPlugin_Sketch::FEATURES_ID()));
+    boost::dynamic_pointer_cast<ModelAPI_AttributeRefList>(
+    data()->attribute(SketchPlugin_Sketch::FEATURES_ID()));
 
   boost::shared_ptr<GeomDataAPI_Point> anOrigin = 
     boost::dynamic_pointer_cast<GeomDataAPI_Point>(data()->attribute(SketchPlugin_Sketch::ORIGIN_ID()));
@@ -61,12 +58,19 @@ void SketchPlugin_Sketch::execute()
   std::list< boost::shared_ptr<GeomAPI_Shape> > aFeaturesPreview;
   for (; anIt != aLast; anIt++) {
     aFeature = boost::dynamic_pointer_cast<SketchPlugin_Feature>(*anIt);
-    boost::shared_ptr<ModelAPI_ResultConstruction> aRes = 
-      boost::dynamic_pointer_cast<ModelAPI_ResultConstruction>(aFeature->firstResult());
-    if (aRes) {
-      boost::shared_ptr<GeomAPI_Shape> aShape = aRes->shape();
-      if (aShape)
-        aFeaturesPreview.push_back(aShape);
+    if (aFeature) {
+
+      const std::list<boost::shared_ptr<ModelAPI_Result> >& aRes = aFeature->results();
+      std::list<boost::shared_ptr<ModelAPI_Result> >::const_iterator aResIter = aRes.cbegin();
+      for(; aResIter != aRes.cend(); aResIter++) {
+        boost::shared_ptr<ModelAPI_ResultConstruction> aConstr = 
+          boost::dynamic_pointer_cast<ModelAPI_ResultConstruction>(*aResIter);
+        if (aConstr) {
+          boost::shared_ptr<GeomAPI_Shape> aShape = aConstr->shape();
+          if (aShape)
+            aFeaturesPreview.push_back(aShape);
+        }
+      }
     }
   }
 
@@ -130,8 +134,9 @@ void addPlane(double theX, double theY, double theZ, std::list<boost::shared_ptr
 {
   boost::shared_ptr<GeomAPI_Pnt> anOrigin(new GeomAPI_Pnt(0, 0, 0));
   boost::shared_ptr<GeomAPI_Dir> aNormal(new GeomAPI_Dir(theX, theY, theZ));
+  double aSize = Config_PropManager::integer("Sketch definition", "Size of planes", PLANE_SIZE);
   boost::shared_ptr<GeomAPI_Shape> aFace = 
-    GeomAlgoAPI_FaceBuilder::square(anOrigin, aNormal, PLANE_SIZE);
+    GeomAlgoAPI_FaceBuilder::square(anOrigin, aNormal, aSize);
   theShapes.push_back(aFace);
 }
 
@@ -152,24 +157,17 @@ boost::shared_ptr<GeomAPI_AISObject> SketchPlugin_Sketch::
       boost::shared_ptr<GeomAPI_Shape> aCompound = GeomAlgoAPI_CompoundBuilder::compound(aFaces);
       aAIS = boost::shared_ptr<GeomAPI_AISObject>(new GeomAPI_AISObject());
       aAIS->createShape(aCompound);
-      aAIS->setColor(SKETCH_PLANE_COLOR);
-      aAIS->setWidth(SKETCH_WIDTH);
+
+      std::vector<int> aRGB = Config_PropManager::color("Sketch definition", 
+                                                        "planes_color", 
+                                                        SKETCH_PLANE_COLOR);
+      aAIS->setColor(aRGB[0], aRGB[1], aRGB[2]);
+
+      aAIS->setWidth(Config_PropManager::integer("Sketch definition", 
+                                                 "planes_thikness",
+                                                 SKETCH_WIDTH));
     }
     return aAIS;
   }
   return boost::shared_ptr<GeomAPI_AISObject>();
 }
-
-FeaturePtr SketchPlugin_Sketch::getFeature(ObjectPtr theObject)
-{
-  FeaturePtr aFeature = boost::dynamic_pointer_cast<ModelAPI_Feature>(theObject);
-  if (!aFeature) {
-    ResultPtr aResult = boost::dynamic_pointer_cast<ModelAPI_Result>(theObject);
-    if (aResult) {
-      PluginManagerPtr aMgr = ModelAPI_PluginManager::get();
-      DocumentPtr aDoc = aMgr->rootDocument();
-      return aDoc->feature(aResult);
-    }
-  }
-  return aFeature;
-}
\ No newline at end of file