#include "XGUI_ViewerProxy.h"
#include "XGUI_ObjectsBrowser.h"
+#include "ModuleBase_ResultPrs.h"
+#include <ModuleBase_ViewerPrs.h>
+
#include <ModelAPI_Feature.h>
+#include <ModelAPI_Tools.h>
#include <AIS_InteractiveContext.hxx>
#include <AIS_Axis.hxx>
#include <set>
+#define DEBUG_DELIVERY
+
XGUI_Selection::XGUI_Selection(XGUI_Workshop* theWorkshop)
: myWorkshop(theWorkshop)
{
}
-QList<ModuleBase_ViewerPrs> XGUI_Selection::getSelected(const SelectionPlace& thePlace) const
+QList<ModuleBase_ViewerPrsPtr> XGUI_Selection::getSelected(const SelectionPlace& thePlace) const
{
- QList<ModuleBase_ViewerPrs> aPresentations;
+ QList<ModuleBase_ViewerPrsPtr> aPresentations;
switch (thePlace) {
case Browser:
return aPresentations;
}
-Handle(AIS_InteractiveObject) XGUI_Selection::getIO(const ModuleBase_ViewerPrs& thePrs)
+Handle(AIS_InteractiveObject) XGUI_Selection::getIO(const ModuleBase_ViewerPrsPtr& thePrs)
{
- Handle(AIS_InteractiveObject) anIO = thePrs.interactive();
+ Handle(AIS_InteractiveObject) anIO = thePrs->interactive();
if (anIO.IsNull()) {
- Handle(SelectMgr_EntityOwner) anOwner = thePrs.owner();
+ Handle(SelectMgr_EntityOwner) anOwner = thePrs->owner();
if (!anOwner.IsNull())
anIO = Handle(AIS_InteractiveObject)::DownCast(anOwner->Selectable());
- if (anIO.IsNull() && thePrs.object()) {
+ if (anIO.IsNull() && thePrs->object()) {
XGUI_Displayer* aDisplayer = myWorkshop->displayer();
- AISObjectPtr anAISObject = aDisplayer->getAISObject(thePrs.object());
+ AISObjectPtr anAISObject = aDisplayer->getAISObject(thePrs->object());
if (anAISObject.get())
anIO = anAISObject->impl<Handle(AIS_InteractiveObject)>();
}
return anIO;
}
-void XGUI_Selection::getSelectedInViewer(QList<ModuleBase_ViewerPrs>& thePresentations) const
+void XGUI_Selection::getSelectedInViewer(QList<ModuleBase_ViewerPrsPtr>& thePresentations) const
{
Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext();
if (!aContext.IsNull() && aContext->HasOpenedContext()) {
QList<long> aSelectedIds; // Remember of selected address in order to avoid duplicates
for (aContext->InitSelected(); aContext->MoreSelected(); aContext->NextSelected()) {
- ModuleBase_ViewerPrs aPrs;
+ ModuleBase_ViewerPrsPtr aPrs(new ModuleBase_ViewerPrs());
Handle(SelectMgr_EntityOwner) anOwner = aContext->SelectedOwner();
if (aSelectedIds.contains((long)anOwner.Access()))
}
}
-void XGUI_Selection::getSelectedInBrowser(QList<ModuleBase_ViewerPrs>& thePresentations) const
+void XGUI_Selection::getSelectedInBrowser(QList<ModuleBase_ViewerPrsPtr>& thePresentations) const
{
// collect the objects of the parameter presentation to avoid a repeted objects in the result
QObjectPtrList aPresentationObjects;
- QList<ModuleBase_ViewerPrs>::const_iterator aPrsIt = thePresentations.begin(),
+ QList<ModuleBase_ViewerPrsPtr>::const_iterator aPrsIt = thePresentations.begin(),
aPrsLast = thePresentations.end();
for (; aPrsIt != aPrsLast; aPrsIt++) {
- aPresentationObjects.push_back((*aPrsIt).object());
+ aPresentationObjects.push_back((*aPrsIt)->object());
}
QObjectPtrList anObjects = selectedObjects();
for (; anIt != aLast; anIt++) {
ObjectPtr anObject = *anIt;
if (anObject.get() != NULL && !aPresentationObjects.contains(anObject)) {
- thePresentations.append(ModuleBase_ViewerPrs(anObject, TopoDS_Shape(), NULL));
+ thePresentations.append(std::shared_ptr<ModuleBase_ViewerPrs>(
+ new ModuleBase_ViewerPrs(anObject, GeomShapePtr(), NULL)));
}
}
}
-void XGUI_Selection::fillPresentation(ModuleBase_ViewerPrs& thePrs,
+void XGUI_Selection::fillPresentation(ModuleBase_ViewerPrsPtr& thePrs,
const Handle(SelectMgr_EntityOwner)& theOwner) const
{
- thePrs.setOwner(theOwner);
+ thePrs->setOwner(theOwner);
Handle(AIS_InteractiveObject) anIO =
Handle(AIS_InteractiveObject)::DownCast(theOwner->Selectable());
- thePrs.setInteractive(anIO);
+ thePrs->setInteractive(anIO);
// we should not check the appearance of this feature because there can be some selected shapes
// for one feature
// the located method is called in the context to obtain the shape by the SelectedShape() method,
// so the shape is located by the same rules
TopoDS_Shape aShape = aBRO->Shape().Located (aBRO->Location() * aBRO->Shape().Location());
- if (!aShape.IsNull())
- thePrs.setShape(aShape);
+#ifndef DEBUG_DELIVERY
+ if (aShape.IsNull())
+ aShape = findAxisShape(anIO);
+#endif
+ if (!aShape.IsNull()) {
+ std::shared_ptr<GeomAPI_Shape> aGeomShape = std::shared_ptr<GeomAPI_Shape>(new GeomAPI_Shape());
+ aGeomShape->setImpl(new TopoDS_Shape(aShape));
+ thePrs->setShape(aGeomShape);
+ }
} else {
+#ifdef DEBUG_DELIVERY
// Fill by trihedron shapes
Handle(AIS_Axis) aAxis = Handle(AIS_Axis)::DownCast(anIO);
if (!aAxis.IsNull()) {
BRep_Builder aBuilder;
TopoDS_Edge aEdge;
aBuilder.MakeEdge(aEdge, aTLine, Precision::Confusion());
- if (!aEdge.IsNull())
- thePrs.setShape(aEdge);
+ if (!aEdge.IsNull()) {
+ std::shared_ptr<GeomAPI_Shape> aGeomShape = std::shared_ptr<GeomAPI_Shape>(new GeomAPI_Shape());
+ aGeomShape->setImpl(new TopoDS_Shape(aEdge));
+ thePrs->setShape(aGeomShape);
+ }
} else {
Handle(AIS_Point) aPoint = Handle(AIS_Point)::DownCast(anIO);
if (!aPoint.IsNull()) {
BRep_Builder aBuilder;
TopoDS_Vertex aVertex;
aBuilder.MakeVertex(aVertex, aPnt->Pnt(), Precision::Confusion());
- if (!aVertex.IsNull())
- thePrs.setShape(aVertex);
+ if (!aVertex.IsNull()) {
+ std::shared_ptr<GeomAPI_Shape> aGeomShape = std::shared_ptr<GeomAPI_Shape>(new GeomAPI_Shape());
+ aGeomShape->setImpl(new TopoDS_Shape(aVertex));
+ thePrs->setShape(aGeomShape);
+ }
}
}
+#endif
}
XGUI_Displayer* aDisplayer = myWorkshop->displayer();
ObjectPtr aFeature = aDisplayer->getObject(anIO);
- thePrs.setObject(aFeature);
+
+ Handle(ModuleBase_BRepOwner) aCompSolidBRO = Handle(ModuleBase_BRepOwner)::DownCast(theOwner);
+ if (!aCompSolidBRO.IsNull()) {
+ // If ModuleBase_BRepOwner object is created then it means that TopAbs_COMPSOLID selection mode
+ // is On and we have to use parent result which corresponds to the CompSolid shape
+ ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(aFeature);
+ if (aResult.get()) {
+ ResultCompSolidPtr aCompSolid = ModelAPI_Tools::compSolidOwner(aResult);
+ if (aCompSolid.get()) {
+ GeomShapePtr aShape = aCompSolid->shape();
+ if (aShape.get() && aShape->isEqual(thePrs->shape())) {
+ thePrs->setObject(aCompSolid);
+ return;
+ }
+ }
+ }
+ }
+ thePrs->setObject(aFeature);
}
-QList<ModuleBase_ViewerPrs> XGUI_Selection::getHighlighted() const
+QList<ModuleBase_ViewerPrsPtr> XGUI_Selection::getHighlighted() const
{
- QList<ModuleBase_ViewerPrs> aPresentations;
+ QList<ModuleBase_ViewerPrsPtr> aPresentations;
Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext();
if (aContext.IsNull())
return aPresentations;
QList<long> aSelectedIds; // Remember of selected address in order to avoid duplicates
XGUI_Displayer* aDisplayer = myWorkshop->displayer();
for (aContext->InitDetected(); aContext->MoreDetected(); aContext->NextDetected()) {
- ModuleBase_ViewerPrs aPrs;
+ ModuleBase_ViewerPrsPtr aPrs(new ModuleBase_ViewerPrs());
Handle(AIS_InteractiveObject) anIO = aContext->DetectedInteractive();
if (aSelectedIds.contains((long)anIO.Access()))
continue;
aSelectedIds.append((long)anIO.Access());
- aPrs.setInteractive(anIO);
+ aPrs->setInteractive(anIO);
ObjectPtr aResult = aDisplayer->getObject(anIO);
// we should not check the appearance of this feature because there can be some selected shapes
// for one feature
- aPrs.setObject(aResult);
+ aPrs->setObject(aResult);
if (aContext->HasOpenedContext()) {
TopoDS_Shape aShape = aContext->DetectedShape();
- if (!aShape.IsNull())
- aPrs.setShape(aShape);
+ if (!aShape.IsNull()) {
+ std::shared_ptr<GeomAPI_Shape> aGeomShape = std::shared_ptr<GeomAPI_Shape>(new GeomAPI_Shape());
+ aGeomShape->setImpl(new TopoDS_Shape(aShape));
+ aPrs->setShape(aGeomShape);
+ }
}
aPresentations.push_back(aPrs);
}
return anObject;
}
-//**************************************************************
-void XGUI_Selection::selectedShapes(NCollection_List<TopoDS_Shape>& theList,
- std::list<ObjectPtr>& theOwners) const
-{
- theList.Clear();
- Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext();
- if (aContext.IsNull())
- return;
-
- for (aContext->InitSelected(); aContext->MoreSelected(); aContext->NextSelected()) {
- TopoDS_Shape aShape = aContext->SelectedShape();
- if (!aShape.IsNull()) {
- theList.Append(aShape);
- Handle(SelectMgr_EntityOwner) aEO = aContext->SelectedOwner();
- if (!aEO.IsNull()) {
- Handle(AIS_InteractiveObject) anObj =
- Handle(AIS_InteractiveObject)::DownCast(aEO->Selectable());
- ObjectPtr anObject = myWorkshop->displayer()->getObject(anObj);
- theOwners.push_back(anObject);
- }
- }
- }
-}
-
//**************************************************************
void XGUI_Selection::selectedOwners(SelectMgr_IndexedMapOfOwner& theSelectedOwners) const
{
}
}
}
+
+//**************************************************************
+TopoDS_Shape XGUI_Selection::findAxisShape(Handle(AIS_InteractiveObject) theIO) const
+{
+ TopoDS_Shape aShape;
+ // Fill by trihedron shapes
+ Handle(AIS_Axis) aAxis = Handle(AIS_Axis)::DownCast(theIO);
+ if (!aAxis.IsNull()) {
+ // an Axis from Trihedron
+ Handle(Geom_Line) aLine = aAxis->Component();
+ Handle(Prs3d_DatumAspect) DA = aAxis->Attributes()->DatumAspect();
+ Handle(Geom_TrimmedCurve) aTLine = new Geom_TrimmedCurve(aLine, 0, DA->FirstAxisLength());
+
+ BRep_Builder aBuilder;
+ TopoDS_Edge aEdge;
+ aBuilder.MakeEdge(aEdge, aTLine, Precision::Confusion());
+ if (!aEdge.IsNull())
+ aShape = aEdge;
+ } else {
+ Handle(AIS_Point) aPoint = Handle(AIS_Point)::DownCast(theIO);
+ if (!aPoint.IsNull()) {
+ // A point from trihedron
+ Handle(Geom_Point) aPnt = aPoint->Component();
+ BRep_Builder aBuilder;
+ TopoDS_Vertex aVertex;
+ aBuilder.MakeVertex(aVertex, aPnt->Pnt(), Precision::Confusion());
+ if (!aVertex.IsNull())
+ aShape = aVertex;
+ }
+ }
+ return aShape;
+}
