-// Copyright (C) 2014-2017 CEA/DEN, EDF R&D
+// 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
//
// 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
+// 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>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#include "PartSet_OperationPrs.h"
#include <ModelAPI_AttributeRefList.h>
#include <ModelAPI_Validator.h>
#include <ModelAPI_Session.h>
-#include <ModelAPI_ResultCompSolid.h>
+#include <ModelAPI_ResultBody.h>
#include <ModelAPI_Tools.h>
#include <Events_InfoMessage.h>
#include <BRepBuilderAPI_MakeVertex.hxx>
#include <BRep_Builder.hxx>
#include <TopoDS_Compound.hxx>
+#include <Prs3d_IsoAspect.hxx>
//#define DEBUG_EMPTY_SHAPE
//#define DEBUG_OPERATION_PRS
BRepBuilderAPI_MakeVertex aMaker(aPnt);
TopoDS_Vertex aVertex = aMaker.Vertex();
myShapeToPrsMap.Bind(aVertex, NULL);
+
+ Handle(Prs3d_Drawer) aDrawer = Attributes();
+ Handle(Prs3d_IsoAspect) aUIsoAspect = new Prs3d_IsoAspect(myShapeColor, Aspect_TOL_SOLID, 1, 0);
+ Handle(Prs3d_IsoAspect) aVIsoAspect = new Prs3d_IsoAspect(myShapeColor, Aspect_TOL_SOLID, 1, 0);
+ aDrawer->SetUIsoAspect(aUIsoAspect);
+ aDrawer->SetVIsoAspect(aVIsoAspect);
+ aDrawer->SetIsoOnPlane(false);
}
bool PartSet_OperationPrs::hasShapes()
// change deviation coefficient to provide more precise circle
// as there is no result, the shape is processed to correct deviation. To be unified
ModuleBase_Tools::setDefaultDeviationCoefficient(aShape, aDrawer);
+ Handle(Prs3d_Drawer) aHighlightDrawer = DynamicHilightAttributes();
+ if (!aHighlightDrawer.IsNull())
+ ModuleBase_Tools::setDefaultDeviationCoefficient(aShape, aHighlightDrawer);
if (myUseAISWidth) {
Handle(AIS_InteractiveObject) anIO = anIter.Value();
setWidth(aDrawer, aWidth);
}
}
- StdPrs_WFShape::Add(thePresentation, aShape, aDrawer);
+ try {
+ StdPrs_WFShape::Add(thePresentation, aShape, aDrawer);
+ }
+ catch (...) {
+ return;
+ }
}
Set(aComp);
if (!aReadyToDisplay) {
if (theObject.get()) {
ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(theObject);
if (aResult.get()) {
- ResultCompSolidPtr aCompsolidResult =
- std::dynamic_pointer_cast<ModelAPI_ResultCompSolid>(theObject);
- if (aCompsolidResult.get()) {
- if (aCompsolidResult->numberOfSubs() > 0) {
- for(int i = 0; i < aCompsolidResult->numberOfSubs(); i++) {
- ResultPtr aSubResult = aCompsolidResult->subResult(i);
+ ResultBodyPtr aBodyResult =
+ std::dynamic_pointer_cast<ModelAPI_ResultBody>(theObject);
+ if (aBodyResult.get()) {
+ if (aBodyResult->numberOfSubs() > 0) {
+ for(int i = 0; i < aBodyResult->numberOfSubs(); i++) {
+ ResultPtr aSubResult = aBodyResult->subResult(i);
if (aSubResult.get()) {
GeomShapePtr aShape;
addValue(aSubResult, aShape, theFeature, theWorkshop, theObjectShapes);
QMap<ObjectPtr, QList<GeomShapePtr> >& theObjectShapes)
{
XGUI_Displayer* aDisplayer = XGUI_Tools::workshop(theWorkshop)->displayer();
- if (XGUI_Displayer::isVisible(aDisplayer, theObject)) {
+ // VSV: Do not use isVisible checking because it can be used when state "Show Only" is ON
+ //if (XGUI_Displayer::isVisible(aDisplayer, theObject)) {
if (theGeomShape.get()) {
if (theObjectShapes.contains(theObject))
theObjectShapes[theObject].append(theGeomShape);
.arg(ModuleBase_Tools::objectInfo(theObject)).toStdString().c_str());
#endif
}
- }
+ //}
}
void PartSet_OperationPrs::getFeatureShapes(const FeaturePtr& theFeature,