-// Copyright (C) 2014-2020 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
// 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);
- ModuleBase_Tools::setDefaultDeviationCoefficient(aShape, DynamicHilightAttributes());
+ //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();
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();
- //// 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);
- 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
+ }
}
void PartSet_OperationPrs::getFeatureShapes(const FeaturePtr& theFeature,
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()) {
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);
+ }
}
}