Fix for the issue #2415 : generation of wide naming structure for the Compound feature

[modules/shaper.git] / src / SketcherPrs / SketcherPrs_Middle.cpp

diff --git a/src/SketcherPrs/SketcherPrs_Middle.cpp b/src/SketcherPrs/SketcherPrs_Middle.cpp
index 4d4a00e15e7466b41045aa2e0937bd6d6fb5d280..ef272b49d898d73129fef0ee812b7f7d8cbc1fb2 100755 (executable)
--- a/src/SketcherPrs/SketcherPrs_Middle.cpp
+++ b/src/SketcherPrs/SketcherPrs_Middle.cpp
@@ -1,8 +1,22 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        SketcherPrs_Middle.cpp
-// Created:     29 February 2016
-// Author:      Natalia ERMOLAEVA
+// Copyright (C) 2014-2017  CEA/DEN, EDF R&D
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.salome-platform.org/ or
+// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+//
 
 #include "SketcherPrs_Middle.h"
 #include "SketcherPrs_Tools.h"
@@ -10,32 +24,30 @@
 
 #include <SketchPlugin_Constraint.h>
 
-#include "Events_Error.h"
-
 #include <Graphic3d_AspectLine3d.hxx>
 #include <Prs3d_Root.hxx>
 
 
-IMPLEMENT_STANDARD_HANDLE(SketcherPrs_Middle, SketcherPrs_SymbolPrs);
 IMPLEMENT_STANDARD_RTTIEXT(SketcherPrs_Middle, SketcherPrs_SymbolPrs);
 
 static Handle(Image_AlienPixMap) MyPixMap;
 
-SketcherPrs_Middle::SketcherPrs_Middle(ModelAPI_Feature* theConstraint, 
-                                     const std::shared_ptr<GeomAPI_Ax3>& thePlane) 
- : SketcherPrs_SymbolPrs(theConstraint, thePlane)
+SketcherPrs_Middle::SketcherPrs_Middle(ModelAPI_Feature* theConstraint,
+                                      ModelAPI_CompositeFeature* theSketcher,
+                                     const std::shared_ptr<GeomAPI_Ax3>& thePlane)
+ : SketcherPrs_SymbolPrs(theConstraint, theSketcher, thePlane)
 {
-  myPntArray = new Graphic3d_ArrayOfPoints(2);
-  myPntArray->AddVertex(0., 0., 0.);
-}  
+}
 
 bool SketcherPrs_Middle::IsReadyToDisplay(ModelAPI_Feature* theConstraint,
                                          const std::shared_ptr<GeomAPI_Ax3>&/* thePlane*/)
 {
   bool aReadyToDisplay = false;
 
-  ObjectPtr aObj1 = SketcherPrs_Tools::getResult(theConstraint, SketchPlugin_Constraint::ENTITY_A());
-  ObjectPtr aObj2 = SketcherPrs_Tools::getResult(theConstraint, SketchPlugin_Constraint::ENTITY_B());
+  ObjectPtr aObj1 =
+    SketcherPrs_Tools::getResult(theConstraint, SketchPlugin_Constraint::ENTITY_A());
+  ObjectPtr aObj2 =
+    SketcherPrs_Tools::getResult(theConstraint, SketchPlugin_Constraint::ENTITY_B());
 
   // one object is a feature Line, other object is a point result. We check shape of point result
   aReadyToDisplay = aObj1.get() && aObj2.get() &&
@@ -45,22 +57,26 @@ bool SketcherPrs_Middle::IsReadyToDisplay(ModelAPI_Feature* theConstraint,
   return aReadyToDisplay;
 }
 
-bool SketcherPrs_Middle::updateIfReadyToDisplay(double theStep) const
+bool SketcherPrs_Middle::updateIfReadyToDisplay(double theStep, bool withColor) const
 {
   if (!IsReadyToDisplay(myConstraint, myPlane))
     return false;
   ObjectPtr aPointObject;
 
   // find a line result to set middle symbol near it
-  AttributePtr anAttribute = SketcherPrs_Tools::getAttribute(myConstraint, SketchPlugin_Constraint::ENTITY_A());
+  myPntArray = new Graphic3d_ArrayOfPoints(1, withColor);
+  AttributePtr anAttribute =
+    SketcherPrs_Tools::getAttribute(myConstraint, SketchPlugin_Constraint::ENTITY_A());
   if (!anAttribute.get()) {
-    ObjectPtr aObj = SketcherPrs_Tools::getResult(myConstraint, SketchPlugin_Constraint::ENTITY_A());
+    ObjectPtr aObj =
+      SketcherPrs_Tools::getResult(myConstraint, SketchPlugin_Constraint::ENTITY_A());
     std::shared_ptr<GeomAPI_Shape> aShape = SketcherPrs_Tools::getShape(aObj);
     if (aShape.get() && aShape->isEdge())
       aPointObject = aObj;
   }
   if (!aPointObject.get()) {
-    ObjectPtr aObj = SketcherPrs_Tools::getResult(myConstraint, SketchPlugin_Constraint::ENTITY_B());
+    ObjectPtr aObj =
+      SketcherPrs_Tools::getResult(myConstraint, SketchPlugin_Constraint::ENTITY_B());
     std::shared_ptr<GeomAPI_Shape> aShape = SketcherPrs_Tools::getShape(aObj);
     if (aShape.get() && aShape->isEdge())
       aPointObject = aObj;
@@ -76,15 +92,18 @@ bool SketcherPrs_Middle::updateIfReadyToDisplay(double theStep) const
   return true;
 }
 
-void SketcherPrs_Middle::drawLines(const Handle(Prs3d_Presentation)& thePrs, Quantity_Color theColor) const
+void SketcherPrs_Middle::drawLines(const Handle(Prs3d_Presentation)& thePrs,
+                                   Quantity_Color theColor) const
 {
-  Handle(Graphic3d_Group) aGroup = Prs3d_Root::NewGroup(thePrs);
+  Handle(Graphic3d_Group) aGroup = Prs3d_Root::CurrentGroup(thePrs);
 
-  Handle(Graphic3d_AspectLine3d) aLineAspect = new Graphic3d_AspectLine3d(theColor, Aspect_TOL_SOLID, 2);
+  Handle(Graphic3d_AspectLine3d) aLineAspect =
+    new Graphic3d_AspectLine3d(theColor, Aspect_TOL_SOLID, 2);
   aGroup->SetPrimitivesAspect(aLineAspect);
 
   // Draw objects
-  ObjectPtr aObject = SketcherPrs_Tools::getResult(myConstraint, SketchPlugin_Constraint::ENTITY_A());
+  ObjectPtr aObject =
+    SketcherPrs_Tools::getResult(myConstraint, SketchPlugin_Constraint::ENTITY_A());
   drawLine(thePrs, theColor, aObject);
 
   aObject = SketcherPrs_Tools::getResult(myConstraint, SketchPlugin_Constraint::ENTITY_A());
@@ -101,13 +120,13 @@ void SketcherPrs_Middle::drawLine(const Handle(Prs3d_Presentation)& thePrs,
       ResultPtr aResult = aResults.front();
       std::shared_ptr<GeomAPI_Shape> aLine = SketcherPrs_Tools::getShape(aResult);
       if (aLine.get() != NULL)
-        drawShape(aLine, thePrs);
+        drawShape(aLine, thePrs, theColor);
     }
   }
   else {
     std::shared_ptr<GeomAPI_Shape> aLine = SketcherPrs_Tools::getShape(theObject);
     if (aLine.get() != NULL)
-      drawShape(aLine, thePrs);
+      drawShape(aLine, thePrs, theColor);
   }
 }