#include "XGUI_Workshop.h"
#include "XGUI_ModuleConnector.h"
#include "XGUI_Displayer.h"
+#include "XGUI_Tools.h"
#include "ModuleBase_Tools.h"
#include "ModuleBase_IModule.h"
static const int AIS_DEFAULT_WIDTH = 2;
-//#define DEBUG_HIDE_COPY_ATTRIBUTE
+//#define DEBUG_EMPTY_SHAPE
+// multi-rotation/translation operation
+//#define DEBUG_HIDE_COPY_ATTRIBUTE
#ifdef DEBUG_HIDE_COPY_ATTRIBUTE
#include <ModelAPI_AttributeBoolean.h>
#include <SketchPlugin_SketchEntity.h>
SetColor(myShapeColor);
thePresentation->Clear();
- XGUI_Displayer* aDisplayer = workshop(myWorkshop)->displayer();
+ XGUI_Displayer* aDisplayer = XGUI_Tools::workshop(myWorkshop)->displayer();
Handle(Prs3d_Drawer) aDrawer = Attributes();
// create presentations on the base of the shapes
aLast = myFeatureShapes.end();
for (; anIt != aLast; anIt++) {
ObjectPtr anObject = anIt.key();
- if (!isVisible(aDisplayer, anObject))
- continue;
QList<GeomShapePtr> aShapes = anIt.value();
QList<GeomShapePtr>::const_iterator aShIt = aShapes.begin(), aShLast = aShapes.end();
for (; aShIt != aShLast; aShIt++) {
GeomShapePtr aGeomShape = *aShIt;
- if (!aGeomShape.get())
- continue;
+ // the shape should not be checked here on empty value because it should be checked in
+ // appendShapeIfVisible() on the step of filling myFeatureShapes list
+ // the reason is to avoid empty AIS object visualized in the viewer
+ //if (!aGeomShape.get()) continue;
TopoDS_Shape aShape = aGeomShape->impl<TopoDS_Shape>();
// change deviation coefficient to provide more precise circle
ModuleBase_Tools::setDefaultDeviationCoefficient(aShape, aDrawer);
return isSub;
}
-void addValue(const ObjectPtr& theObject, const GeomShapePtr& theShape,
- const FeaturePtr& theFeature,
- QMap<ObjectPtr, QList<GeomShapePtr> >& theObjectShapes)
+void PartSet_OperationPrs::addValue(const ObjectPtr& theObject, const GeomShapePtr& theShape,
+ const FeaturePtr& theFeature, ModuleBase_IWorkshop* theWorkshop,
+ QMap<ObjectPtr, QList<GeomShapePtr> >& theObjectShapes)
{
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()) {
- for(int i = 0; i < aCompsolidResult->numberOfSubs(); i++) {
- ResultPtr aSubResult = aCompsolidResult->subResult(i);
- if (aSubResult.get()) {
- GeomShapePtr aShape;
- addValue(aSubResult, aShape, theFeature, theObjectShapes);
+ if (aCompsolidResult->numberOfSubs() > 0) {
+ for(int i = 0; i < aCompsolidResult->numberOfSubs(); i++) {
+ ResultPtr aSubResult = aCompsolidResult->subResult(i);
+ if (aSubResult.get()) {
+ GeomShapePtr aShape;
+ addValue(aSubResult, aShape, theFeature, theWorkshop, theObjectShapes);
+ }
}
+ return;
}
- return;
}
#ifdef DEBUG_HIDE_COPY_ATTRIBUTE
else {
if (aResult.get())
aShape = aResult->shape();
}
- if (!isSubObject(theObject, theFeature)) {
+ if (!isSubObject(theObject, theFeature))
+ appendShapeIfVisible(theWorkshop, theObject, aShape, theObjectShapes);
+ }
+}
+
+void PartSet_OperationPrs::appendShapeIfVisible(ModuleBase_IWorkshop* theWorkshop,
+ const ObjectPtr& theObject,
+ GeomShapePtr theGeomShape,
+ QMap<ObjectPtr, QList<GeomShapePtr> >& theObjectShapes)
+{
+ XGUI_Displayer* aDisplayer = XGUI_Tools::workshop(theWorkshop)->displayer();
+ if (isVisible(aDisplayer, theObject)) {
+ if (theGeomShape.get()) {
if (theObjectShapes.contains(theObject))
- theObjectShapes[theObject].append(aShape);
+ theObjectShapes[theObject].append(theGeomShape);
else {
QList<GeomShapePtr> aShapes;
- aShapes.append(aShape);
+ 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
}
}
}
std::shared_ptr<ModelAPI_AttributeSelection> aSelAttribute = aCurSelList->value(i);
ResultPtr aResult = aSelAttribute->context();
GeomShapePtr aShape = aSelAttribute->value();
- addValue(aResult, aShape, theFeature, theObjectShapes);
+ addValue(aResult, aShape, theFeature, theWorkshop, theObjectShapes);
}
}
if (anAttrType == ModelAPI_AttributeRefList::typeId()) {
for (int i = 0; i < aCurSelList->size(); i++) {
ObjectPtr anObject = aCurSelList->object(i);
FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(anObject);
- // feature rectangle uses as parameters feature lines, so we should obtain line results
+ // if a feature is stored in the attribute, we should obtain the feature results
+ // e.g. feature rectangle uses parameters feature lines in the attribute
if (aFeature.get()) {
getResultShapes(aFeature, theWorkshop, theObjectShapes, false);
}
if (aResult.get()) {
GeomShapePtr aShape = aResult->shape();
if (aShape.get())
- addValue(aResult, aShape, theFeature, theObjectShapes);
+ addValue(aResult, aShape, theFeature, theWorkshop, theObjectShapes);
}
}
}
AttributeReferencePtr anAttr = std::dynamic_pointer_cast<ModelAPI_AttributeReference>(anAttribute);
anObject = anAttr->value();
}
- addValue(anObject, aShape, theFeature, theObjectShapes);
+ addValue(anObject, aShape, theFeature, theWorkshop, theObjectShapes);
}
}
}
if (!theFeature.get())
return;
- XGUI_Displayer* aDisplayer = workshop(theWorkshop)->displayer();
+ XGUI_Displayer* aDisplayer = XGUI_Tools::workshop(theWorkshop)->displayer();
std::list<ResultPtr> aFeatureResults = theFeature->results();
std::list<ResultPtr>::const_iterator aRIt = aFeatureResults.begin(),
aRLast = aFeatureResults.end();
for (; aRIt != aRLast; aRIt++) {
ResultPtr aResult = *aRIt;
- if (!isVisible(aDisplayer, aResult))
- continue;
GeomShapePtr aGeomShape = aResult->shape();
- if (!aGeomShape.get())
- continue;
-
- if (theObjectShapes.contains(aResult))
- theObjectShapes[aResult].append(aGeomShape);
- else {
- QList<GeomShapePtr> aShapes;
- aShapes.append(aGeomShape);
- theObjectShapes[aResult] = aShapes;
- }
+ appendShapeIfVisible(theWorkshop, aResult, aGeomShape, theObjectShapes);
}
}
aGeomShape = aResult->shape();
}
}
-
- if (theObjectShapes.contains(anObject))
- theObjectShapes[anObject].append(aGeomShape);
- else {
- QList<GeomShapePtr> aShapes;
- aShapes.append(aGeomShape);
- theObjectShapes[anObject] = aShapes;
- }
+ appendShapeIfVisible(theWorkshop, anObject, aGeomShape, theObjectShapes);
}
}
anAttrType == ModelAPI_AttributeSelection::typeId() ||
anAttrType == ModelAPI_AttributeReference::typeId();
}
-
-XGUI_Workshop* PartSet_OperationPrs::workshop(ModuleBase_IWorkshop* theWorkshop)
-{
- XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(theWorkshop);
- return aConnector->workshop();
-}
