X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_ResultSketchPrs.cpp;h=6f07b0f225bb39268a7288c791ae3ec67fc4d6b5;hb=6aae805714dac28f7aa2498f8060e1f588145645;hp=9cd8bace74fc822549207a7a7db812af9f3e1e23;hpb=423c10234142d14d0d5de89383f2f96a4ec5930f;p=modules%2Fshaper.git

diff --git a/src/PartSet/PartSet_ResultSketchPrs.cpp b/src/PartSet/PartSet_ResultSketchPrs.cpp
old mode 100755
new mode 100644
index 9cd8bace7..6f07b0f22
--- a/src/PartSet/PartSet_ResultSketchPrs.cpp
+++ b/src/PartSet/PartSet_ResultSketchPrs.cpp
@@ -1,8 +1,21 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        PartSet_ResultSketchPrs.h
-// Created:     25 March 2015
-// Author:      Natalia ERMOLAEVA
+// Copyright (C) 2014-2019  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
+//
 
 #include "PartSet_ResultSketchPrs.h"
 #include "PartSet_Tools.h"
@@ -11,6 +24,7 @@
 #include <ModelAPI_Events.h>
 #include <ModelAPI_Tools.h>
 #include <ModelAPI_ResultConstruction.h>
+#include <ModelAPI_ResultBody.h>
 #include <GeomAPI_PlanarEdges.h>
 
 #include <Events_InfoMessage.h>
@@ -28,7 +42,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 +57,6 @@
 
 //*******************************************************************************************
 
-IMPLEMENT_STANDARD_HANDLE(PartSet_ResultSketchPrs, ViewerData_AISShape);
 IMPLEMENT_STANDARD_RTTIEXT(PartSet_ResultSketchPrs, ViewerData_AISShape);
 
 PartSet_ResultSketchPrs::PartSet_ResultSketchPrs(ResultPtr theResult)
@@ -58,12 +71,17 @@ PartSet_ResultSketchPrs::PartSet_ResultSketchPrs(ResultPtr theResult)
     aDrawer->PointAspect()->SetTypeOfMarker(Aspect_TOM_PLUS);
   else
     aDrawer->SetPointAspect(new Prs3d_PointAspect(Aspect_TOM_PLUS, Quantity_NOC_YELLOW, 1.));
+  //aDrawer->SetTypeOfDeflection(Aspect_TOD_ABSOLUTE);
 
   // Activate individual repaintng if this is a part of compsolid
-  ResultCompSolidPtr aCompSolid = ModelAPI_Tools::compSolidOwner(myResult);
-  SetAutoHilight(aCompSolid.get() == NULL);
+  ResultBodyPtr anOwner = ModelAPI_Tools::bodyOwner(myResult);
+  SetAutoHilight(anOwner.get() == NULL);
 
   ModuleBase_Tools::setPointBallHighlighting(this);
+
+  // change deviation coefficient to provide more precise circle
+  ModuleBase_Tools::setDefaultDeviationCoefficient(Shape(), DynamicHilightAttributes());
+  ModuleBase_Tools::setDefaultDeviationCoefficient(Shape(), Attributes());
 }
 
 void PartSet_ResultSketchPrs::Compute(
@@ -91,15 +109,17 @@ void PartSet_ResultSketchPrs::Compute(
 
   setAuxiliaryPresentationStyle(false);
 
-  // change deviation coefficient to provide more precise circle
-  //ModuleBase_Tools::setDefaultDeviationCoefficient(myResult, Attributes());
-  AIS_Shape::Compute(thePresentationManager, thePresentation, theMode);
-
+  try {
+    AIS_Shape::Compute(thePresentationManager, thePresentation, theMode);
+  }
+  catch (...) {
+    return;
+  }
   if (!myAuxiliaryCompound.IsNull()) {
     setAuxiliaryPresentationStyle(true);
 
     Handle(Prs3d_Drawer) aDrawer = Attributes();
-    StdPrs_WFDeflectionShape::Add(thePresentation, myAuxiliaryCompound, aDrawer);
+    StdPrs_WFShape::Add(thePresentation, myAuxiliaryCompound, aDrawer);
   }
 
   if (!aReadyToDisplay) {
@@ -167,8 +187,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;
   }
@@ -227,13 +246,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);
   }
 }
 
@@ -266,7 +287,8 @@ void PartSet_ResultSketchPrs::fillShapes(TopoDS_Shape& theResultShape,
   CompositeFeaturePtr aSketchFeature = std::dynamic_pointer_cast<ModelAPI_CompositeFeature>
                                                                           (aResultFeature);
   std::list<ResultPtr> anAuxiliaryResults;
-  for (int i = 0; i < aSketchFeature->numberOfSubs(); i++) {
+  int aNumberOfSubs = aSketchFeature->numberOfSubs();
+  for (int i = 0; i < aNumberOfSubs; i++) {
     FeaturePtr aFeature = aSketchFeature->subFeature(i);
     if (PartSet_Tools::isAuxiliarySketchEntity(aFeature)) {
       std::list<ResultPtr> aResults = aFeature->results();
@@ -277,8 +299,10 @@ void PartSet_ResultSketchPrs::fillShapes(TopoDS_Shape& theResultShape,
           anAuxiliaryResults.push_back(aResult);
       }
     }
-    else {
-    /// append not-edges shapes, e.g. center of a circle, an arc, a point feature
+    else if (PartSet_Tools::isIncludeIntoSketchResult(aFeature)) {
+      // Append not-edges shapes, e.g. center of a circle, an arc, a point feature.
+      // Issue #2535: do not show elements produced by Projection or Intersection features,
+      // which should not be included into the sketch result.
       const std::list<std::shared_ptr<ModelAPI_Result> >& aRes = aFeature->results();
       std::list<std::shared_ptr<ModelAPI_Result> >::const_iterator aResIter = aRes.cbegin();
       for (; aResIter != aRes.cend(); aResIter++) {