-// Copyright (C) 2014-2017 CEA/DEN, EDF R&D
+// Copyright (C) 2014-2023 CEA, EDF
//
// 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);
+ //aDrawer->SetTypeOfDeflection(Aspect_TOD_ABSOLUTE);
}
bool PartSet_OperationPrs::hasShapes()
thePresentation->Clear();
bool aReadyToDisplay = !myShapeToPrsMap.IsEmpty();
- XGUI_Displayer* aDisplayer = XGUI_Tools::workshop(myWorkshop)->displayer();
Handle(Prs3d_Drawer) aDrawer = Attributes();
// create presentations on the base of the shapes
BRep_Builder aBuilder;
// 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);
+ //This presentation is not used for selection, so it don't need highlighting
+ //ModuleBase_Tools::setDefaultDeviationCoefficient(aShape, DynamicHilightAttributes());
if (myUseAISWidth) {
Handle(AIS_InteractiveObject) anIO = anIter.Value();
int aWidth = anIO->Width();
/// workaround for zero width. Else, there will be a crash
if (aWidth == 0) { // width returns of TSolid shape is zero
- bool isDisplayed = !anIO->GetContext().IsNull();
aWidth = PartSet_Tools::getAISDefaultWidth();// default width value
}
setWidth(aDrawer, aWidth);
StdPrs_WFShape::Add(thePresentation, aShape, aDrawer);
}
catch (...) {
- Events_InfoMessage("PartSet_OperationPrs",
- "An empty AIS presentation: PartSet_OperationPrs").send();
- std::shared_ptr<Events_Message> aMsg = std::shared_ptr<Events_Message>(
- new Events_Message(Events_Loop::eventByName(EVENT_EMPTY_OPERATION_PRESENTATION)));
- Events_Loop::loop()->send(aMsg);
return;
}
}
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);
GeomShapePtr aShape = theShape;
if (!aShape.get()) {
- ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(theObject);
- if (aResult.get())
- aShape = aResult->shape();
+ ResultPtr aRes = std::dynamic_pointer_cast<ModelAPI_Result>(theObject);
+ if (aRes.get())
+ aShape = aRes->shape();
}
if (!isSubObject(theObject, theFeature))
appendShapeIfVisible(theWorkshop, theObject, aShape, theObjectShapes);
GeomShapePtr theGeomShape,
QMap<ObjectPtr, QList<GeomShapePtr> >& theObjectShapes)
{
- XGUI_Displayer* aDisplayer = XGUI_Tools::workshop(theWorkshop)->displayer();
- if (XGUI_Displayer::isVisible(aDisplayer, theObject)) {
- if (theGeomShape.get()) {
- if (theObjectShapes.contains(theObject))
- theObjectShapes[theObject].append(theGeomShape);
- else {
- QList<GeomShapePtr> aShapes;
- aShapes.append(theGeomShape);
- theObjectShapes[theObject] = aShapes;
- }
- } else {
- #ifdef DEBUG_EMPTY_SHAPE
- qDebug(QString("Empty shape in result, result: %1")
- .arg(ModuleBase_Tools::objectInfo(theObject)).toStdString().c_str());
- #endif
+ if (theGeomShape.get()) {
+ if (theObjectShapes.contains(theObject))
+ theObjectShapes[theObject].append(theGeomShape);
+ else {
+ QList<GeomShapePtr> aShapes;
+ aShapes.append(theGeomShape);
+ theObjectShapes[theObject] = aShapes;
}
+ } else {
+#ifdef DEBUG_EMPTY_SHAPE
+ qDebug(QString("Empty shape in result, result: %1")
+ .arg(ModuleBase_Tools::objectInfo(theObject)).toStdString().c_str());
+#endif
}
}
ObjectPtr anObject;
GeomShapePtr aShape;
if (anAttrType == ModelAPI_AttributeRefAttr::typeId()) {
- AttributeRefAttrPtr anAttr =
+ AttributeRefAttrPtr aRefAttr =
std::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>(anAttribute);
- if (anAttr->isObject()) {
- anObject = anAttr->object();
+ if (aRefAttr->isObject()) {
+ anObject = aRefAttr->object();
}
else {
- AttributePtr anAttribute = anAttr->attr();
- aShape = PartSet_Tools::findShapeBy2DPoint(anAttribute, theWorkshop);
+ AttributePtr anAttr = aRefAttr->attr();
+ aShape = PartSet_Tools::findShapeBy2DPoint(anAttr, theWorkshop);
// the distance point is not found if the point is selected in the 2nd time
// TODO: after debug, this check can be removed
if (!aShape.get())
continue;
- anObject = anAttr->attr()->owner();
+ anObject = anAttr->owner();
}
}
if (anAttrType == ModelAPI_AttributeSelection::typeId()) {
if (!theFeature.get())
return;
- XGUI_Displayer* aDisplayer = XGUI_Tools::workshop(theWorkshop)->displayer();
-
std::list<ResultPtr> aResults;
ModelAPI_Tools::allResults(theFeature, aResults);
std::list<ResultPtr>::const_iterator aRIt = aResults.begin(),
aRLast = aResults.end();
for (; aRIt != aRLast; aRIt++) {
ResultPtr aResult = *aRIt;
- GeomShapePtr aGeomShape = aResult->shape();
- appendShapeIfVisible(theWorkshop, aResult, aGeomShape, theObjectShapes);
+ if (!aResult->isDisabled()) {
+ GeomShapePtr aGeomShape = aResult->shape();
+ appendShapeIfVisible(theWorkshop, aResult, aGeomShape, theObjectShapes);
+ }
}
}
