Merge branch 'Dev_0.6.1' of newgeom:newgeom.git into Dev_0.6.1

diff --git a/src/PartSet/PartSet_TestOCC.cpp b/src/PartSet/PartSet_TestOCC.cpp
index f0678d0799b6718408431c072298faf8e5fd685a..57a1529a6f96f1184930840fe7d2bcb666a6b560 100644 (file)
--- a/src/PartSet/PartSet_TestOCC.cpp
+++ b/src/PartSet/PartSet_TestOCC.cpp
@@ -11,7 +11,6 @@
 #include <XGUI_Displayer.h>
 #include <XGUI_ViewerProxy.h>
 #include <PartSet_Tools.h>
-#include <PartSet_OperationSketchBase.h>
 
 #include <ModuleBase_ViewerPrs.h>
 #include <ModelAPI_Feature.h>

diff --git a/src/SketchPlugin/SketchPlugin_Feature.cpp b/src/SketchPlugin/SketchPlugin_Feature.cpp
index dcd2f9847d14220cffbb693f67aed8448fb87e0d..6e0f7111d1c29125622aae6885db76c5e1003b5e 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_Feature.cpp
+++ b/src/SketchPlugin/SketchPlugin_Feature.cpp
@@ -31,13 +31,3 @@ SketchPlugin_Sketch* SketchPlugin_Feature::sketch()
   return mySketch;
 }
 
-
-void SketchPlugin_Feature::customisePresentation(AISObjectPtr thePrs)
-{
-  // if this is an edge
-  if (thePrs->getShapeType() == 6)
-    thePrs->setWidth(3);
-  // if this is a vertex
-  else if (thePrs->getShapeType() == 7)
-    thePrs->setPointMarker(6, 2.);
-}
\ No newline at end of file

diff --git a/src/SketchPlugin/SketchPlugin_Feature.h b/src/SketchPlugin/SketchPlugin_Feature.h
index 7ca0eb6d36d6f0f995d0e32ca7c8d0c53073b2cc..d43fe66a9235b8b9983d7aea4e345ffe4d692741 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_Feature.h
+++ b/src/SketchPlugin/SketchPlugin_Feature.h
@@ -64,7 +64,15 @@ class SketchPlugin_Feature : public ModelAPI_Feature, public GeomAPI_ICustomPrs
   }
 
   /// Customize presentation of the feature
-  virtual void customisePresentation(AISObjectPtr thePrs);
+  virtual void customisePresentation(AISObjectPtr thePrs)
+  {
+    // if this is an edge
+    if (thePrs->getShapeType() == 6)
+      thePrs->setWidth(3);
+    // if this is a vertex
+    else if (thePrs->getShapeType() == 7)
+      thePrs->setPointMarker(6, 2.);
+  }
 
   /// Returns the sketch of this feature
   SketchPlugin_Sketch* sketch();