X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FPartSet%2FPartSet_ResultSketchPrs.cpp;h=dc3c1c8315e7b3221893349618487fe763aeb3e1;hb=ac6c4b849218e6f1a45c0a21e46c5fda401c38f0;hp=e0d6010c50e896e62382c1b21899bcc53ed5a11a;hpb=d4229cf0e4819ef684866a59e18a82e57f0092b0;p=modules%2Fshaper.git

diff --git a/src/PartSet/PartSet_ResultSketchPrs.cpp b/src/PartSet/PartSet_ResultSketchPrs.cpp
index e0d6010c5..dc3c1c831 100755
--- a/src/PartSet/PartSet_ResultSketchPrs.cpp
+++ b/src/PartSet/PartSet_ResultSketchPrs.cpp
@@ -1,8 +1,22 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        PartSet_ResultSketchPrs.h
-// Created:     25 March 2015
-// 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 "PartSet_ResultSketchPrs.h"
 #include "PartSet_Tools.h"
@@ -11,6 +25,7 @@
 #include <ModelAPI_Events.h>
 #include <ModelAPI_Tools.h>
 #include <ModelAPI_ResultConstruction.h>
+#include <ModelAPI_ResultCompSolid.h>
 #include <GeomAPI_PlanarEdges.h>
 
 #include <Events_InfoMessage.h>
@@ -28,7 +43,7 @@
 #include <Prs3d_PointAspect.hxx>
 #include <TopoDS_Builder.hxx>
 #include <SelectMgr_SelectionManager.hxx>
-#include <StdPrs_WFDeflectionShape.hxx>
+#include <StdPrs_WFShape.hxx>
 #include <StdSelect_BRepSelectionTool.hxx>
 #include <Graphic3d_AspectLine3d.hxx>
 #include <Prs3d_LineAspect.hxx>
@@ -43,7 +58,6 @@
 
 //*******************************************************************************************
 
-IMPLEMENT_STANDARD_HANDLE(PartSet_ResultSketchPrs, ViewerData_AISShape);
 IMPLEMENT_STANDARD_RTTIEXT(PartSet_ResultSketchPrs, ViewerData_AISShape);
 
 PartSet_ResultSketchPrs::PartSet_ResultSketchPrs(ResultPtr theResult)
@@ -54,7 +68,7 @@ PartSet_ResultSketchPrs::PartSet_ResultSketchPrs(ResultPtr theResult)
   TopoDS_Shape aShape = aShapePtr->impl<TopoDS_Shape>();
   Set(aShape);
   Handle(Prs3d_Drawer) aDrawer = Attributes();
-  if (aDrawer->HasOwnPointAspect()) 
+  if (aDrawer->HasOwnPointAspect())
     aDrawer->PointAspect()->SetTypeOfMarker(Aspect_TOM_PLUS);
   else
     aDrawer->SetPointAspect(new Prs3d_PointAspect(Aspect_TOM_PLUS, Quantity_NOC_YELLOW, 1.));
@@ -68,7 +82,7 @@ PartSet_ResultSketchPrs::PartSet_ResultSketchPrs(ResultPtr theResult)
 
 void PartSet_ResultSketchPrs::Compute(
                       const Handle(PrsMgr_PresentationManager3d)& thePresentationManager,
-                      const Handle(Prs3d_Presentation)& thePresentation, 
+                      const Handle(Prs3d_Presentation)& thePresentation,
                       const Standard_Integer theMode)
 {
   thePresentation->Clear();
@@ -99,11 +113,11 @@ void PartSet_ResultSketchPrs::Compute(
     setAuxiliaryPresentationStyle(true);
 
     Handle(Prs3d_Drawer) aDrawer = Attributes();
-    StdPrs_WFDeflectionShape::Add(thePresentation, myAuxiliaryCompound, aDrawer);
+    StdPrs_WFShape::Add(thePresentation, myAuxiliaryCompound, aDrawer);
   }
 
   if (!aReadyToDisplay) {
-    Events_InfoMessage("PartSet_ResultSketchPrs", 
+    Events_InfoMessage("PartSet_ResultSketchPrs",
                        "An empty AIS presentation: PartSet_ResultSketchPrs").send();
     static const Events_ID anEvent = Events_Loop::eventByName(EVENT_EMPTY_AIS_PRESENTATION);
     ModelAPI_EventCreator::get()->sendUpdated(myResult, anEvent);
@@ -116,7 +130,7 @@ void debugInfo(const TopoDS_Shape& theShape, const TopAbs_ShapeEnum theType)
   TopTools_IndexedMapOfShape aSubShapes;
   TopExp::MapShapes (theShape, theType, aSubShapes);
 
-  Standard_Boolean 
+  Standard_Boolean
     isComesFromDecomposition = !((aSubShapes.Extent() == 1) && (theShape == aSubShapes (1)));
   int anExtent = aSubShapes.Extent();
   for (Standard_Integer aShIndex = 1; aShIndex <= aSubShapes.Extent(); ++aShIndex)
@@ -155,7 +169,7 @@ void PartSet_ResultSketchPrs::ComputeSelection(const Handle(SelectMgr_Selection)
     TopoDS_Compound aComp;
     aBuilder.MakeCompound(aComp);
     aBuilder.Add(aComp, myOriginalShape);
-    
+
     for(NCollection_List<TopoDS_Shape>::Iterator anIt(mySketchFaceList); anIt.More(); anIt.Next()) {
       const TopoDS_Shape& aFace = anIt.Value();
       aBuilder.Add(aComp, aFace);
@@ -167,8 +181,7 @@ void PartSet_ResultSketchPrs::ComputeSelection(const Handle(SelectMgr_Selection)
     debugInfo(aComp, TopAbs_FACE); // 2
 #endif
     Set(aComp);
-    double aBodyDefDeflection = Config_PropManager::real("Visualization", "body_deflection",
-                                                         ModelAPI_ResultBody::DEFAULT_DEFLECTION());
+    double aBodyDefDeflection = Config_PropManager::real("Visualization", "body_deflection");
     Attributes()->SetDeviationCoefficient(aBodyDefDeflection);
     aShapeIsChanged = true;
   }
@@ -211,8 +224,8 @@ void PartSet_ResultSketchPrs::appendShapeSelection(const Handle(SelectMgr_Select
 
 void PartSet_ResultSketchPrs::setAuxiliaryPresentationStyle(const bool isAuxiliary)
 {
-  Standard_Integer aLineStyle = isAuxiliary? 
-    SketchPlugin_SketchEntity::SKETCH_LINE_STYLE_AUXILIARY() : 
+  Standard_Integer aLineStyle = isAuxiliary?
+    SketchPlugin_SketchEntity::SKETCH_LINE_STYLE_AUXILIARY() :
     SketchPlugin_SketchEntity::SKETCH_LINE_STYLE();
 
   Handle(Prs3d_Drawer) aDrawer = Attributes();
@@ -227,13 +240,15 @@ void PartSet_ResultSketchPrs::setAuxiliaryPresentationStyle(const bool isAuxilia
   if (aDrawer->HasOwnWireAspect()) {
     aLineAspect = aDrawer->WireAspect();
   }
-  Quantity_Color aCurrentColor;
-  Aspect_TypeOfLine aPrevLineType;
-  Standard_Real aCurrentWidth;
-  aLineAspect->Aspect()->Values(aCurrentColor, aPrevLineType, aCurrentWidth);
+  Quantity_Color aCurrentColor = aLineAspect->Aspect()->Color();
+  Aspect_TypeOfLine aPrevLineType = aLineAspect->Aspect()->Type();
+  Standard_Real aCurrentWidth = aLineAspect->Aspect()->Width();
   bool isChangedLineType = aType != aPrevLineType;
   if (isChangedLineType) {
-    aLineAspect->SetTypeOfLine(aType);
+    Handle(Prs3d_LineAspect) aAspect = new Prs3d_LineAspect(aCurrentColor, aType, aCurrentWidth);
+    aDrawer->SetLineAspect(aAspect);
+    aDrawer->SetWireAspect(aAspect);
+    SetAttributes(aDrawer);
   }
 }
 
@@ -247,7 +262,7 @@ void PartSet_ResultSketchPrs::fillShapes(TopoDS_Shape& theResultShape,
     return;
 
   theFaceList.Clear();
-  ResultConstructionPtr aConstruction = 
+  ResultConstructionPtr aConstruction =
     std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(myResult);
   if (aConstruction.get()) {
     int aFacesNum = aConstruction->facesNum();