boost::shared_ptr<GeomAPI_Shape> aShapePtr = aFeature->data()->shape();
if (aShapePtr) {
- TopoDS_Shape aShape = aShapePtr->impl<TopoDS_Shape>();
- display(aFeature, aShape, isUpdateViewer);
+ boost::shared_ptr<GeomAPI_AISObject> anAIS(new GeomAPI_AISObject());
+ anAIS->createShape(aShapePtr);
+ display(aFeature, anAIS, isUpdateViewer);
}
}
void XGUI_Displayer::display(FeaturePtr theFeature,
- const TopoDS_Shape& theShape, bool isUpdateViewer)
+ boost::shared_ptr<GeomAPI_AISObject> theAIS, bool isUpdateViewer)
{
Handle(AIS_InteractiveContext) aContext = AISContext();
- Handle(AIS_Shape) anAIS = new AIS_Shape(theShape);
- myFeature2AISObjectMap[theFeature] = anAIS;
+ myFeature2AISObjectMap[theFeature] = theAIS;
- aContext->Display(anAIS, isUpdateViewer);
+ Handle(AIS_InteractiveObject) anAISIO = theAIS->impl<Handle(AIS_InteractiveObject)>();
+ if (!anAISIO.IsNull())
+ aContext->Display(anAISIO, isUpdateViewer);
}
return;
Handle(AIS_InteractiveContext) aContext = AISContext();
- Handle(AIS_InteractiveObject) anAIS = myFeature2AISObjectMap[aFeature];
- Handle(AIS_Shape) anAISShape = Handle(AIS_Shape)::DownCast(anAIS);
- if (!anAISShape.IsNull())
+ boost::shared_ptr<GeomAPI_AISObject> anObject = myFeature2AISObjectMap[aFeature];
+ if (anObject)
{
- aContext->Erase(anAISShape, isUpdateViewer);
+ Handle(AIS_InteractiveObject) anAIS = anObject->impl<Handle(AIS_InteractiveObject)>();
+ if (!anAIS.IsNull())
+ aContext->Erase(anAIS, isUpdateViewer);
}
myFeature2AISObjectMap.erase(aFeature);
}
bool XGUI_Displayer::redisplay(FeaturePtr theFeature,
- Handle(AIS_InteractiveObject) theAIS,
- const int theSelectionMode,
+ boost::shared_ptr<GeomAPI_AISObject> theAIS,
const bool isUpdateViewer)
{
bool isCreated = false;
+ Handle(AIS_InteractiveObject) anAIS =
+ theAIS ? theAIS->impl<Handle(AIS_InteractiveObject)>() : Handle(AIS_InteractiveObject)();
Handle(AIS_InteractiveContext) aContext = AISContext();
// Open local context if there is no one
if (!aContext->HasOpenedContext()) {
//aContext->SetPixelTolerance(MOUSE_SENSITIVITY_IN_PIXEL);
}
// display or redisplay presentation
- if (isVisible(theFeature) && !myFeature2AISObjectMap[theFeature].IsNull()) {
- aContext->RecomputeSelectionOnly(theAIS);
+ boost::shared_ptr<GeomAPI_AISObject> anObj = myFeature2AISObjectMap[theFeature];
+ if (isVisible(theFeature) && anObj && !anObj->empty()) {
+ aContext->RecomputeSelectionOnly(anAIS);
}
else {
myFeature2AISObjectMap[theFeature] = theAIS;
- if (theSelectionMode < 0)
- {
- aContext->Display(theAIS, false);
- }
- else
- {
- aContext->Display(theAIS, 0, theSelectionMode, false);
- }
+ aContext->Display(anAIS, false);
isCreated = true;
}
if (isUpdateViewer)
return isCreated;
}
+void XGUI_Displayer::redisplay(FeaturePtr theFeature, bool isUpdateViewer)
+{
+ FeaturePtr aFeature = XGUI_Tools::realFeature(theFeature);
+ if (!isVisible(aFeature))
+ return;
+
+ boost::shared_ptr<GeomAPI_Shape> aShapePtr = aFeature->data()->shape();
+ if (aShapePtr) {
+ boost::shared_ptr<GeomAPI_AISObject> aAISObj = getAISObject(aFeature);
+ Handle(AIS_Shape) aAISShape = Handle(AIS_Shape)::DownCast(aAISObj->impl<Handle(AIS_InteractiveObject)>());
+ if (!aAISShape.IsNull())
+ return;
+
+ aAISShape->Set(aShapePtr->impl<TopoDS_Shape>());
+ AISContext()->Redisplay(aAISShape);
+ }
+}
+
void XGUI_Displayer::activateInLocalContext(FeaturePtr theFeature,
const std::list<int>& theModes, const bool isUpdateViewer)
{
aContext->OpenLocalContext(false/*use displayed objects*/, true/*allow shape decomposition*/);
}
// display or redisplay presentation
- Handle(AIS_Shape) anAIS;
+ Handle(AIS_InteractiveObject) anAIS;
if (isVisible(theFeature))
- anAIS = Handle(AIS_Shape)::DownCast(myFeature2AISObjectMap[theFeature]);
+ {
+ boost::shared_ptr<GeomAPI_AISObject> anObj = myFeature2AISObjectMap[theFeature];
+ if (anObj)
+ anAIS = anObj->impl<Handle(AIS_InteractiveObject)>();
+ }
// Activate selection of objects from prs
if (!anAIS.IsNull()) {
- aContext->Load(anAIS, -1, true/*allow decomposition*/);
+ aContext->Load(anAIS, -1, true/*allow decomposition*/);
aContext->Deactivate(anAIS);
std::list<int>::const_iterator anIt = theModes.begin(), aLast = theModes.end();
for (; anIt != aLast; anIt++)
{
- aContext->Activate(anAIS, AIS_Shape::SelectionMode((TopAbs_ShapeEnum)*anIt));
- }
+ aContext->Activate(anAIS, (*anIt));
+ }
}
if (isUpdateViewer)
updateViewer();
}
-void XGUI_Displayer::stopSelection(const std::list<XGUI_ViewerPrs>& theFeatures, const bool isStop,
+void XGUI_Displayer::stopSelection(const QFeatureList& theFeatures, const bool isStop,
const bool isUpdateViewer)
{
Handle(AIS_InteractiveContext) aContext = AISContext();
Handle(AIS_Shape) anAIS;
- std::list<XGUI_ViewerPrs>::const_iterator anIt = theFeatures.begin(), aLast = theFeatures.end();
+ QFeatureList::const_iterator anIt = theFeatures.begin(), aLast = theFeatures.end();
FeaturePtr aFeature;
for (; anIt != aLast; anIt++) {
- aFeature = (*anIt).feature();
+ aFeature = *anIt;
if (isVisible(aFeature))
- anAIS = Handle(AIS_Shape)::DownCast(myFeature2AISObjectMap[aFeature]);
+ anAIS = Handle(AIS_Shape)::DownCast(myFeature2AISObjectMap[aFeature]->impl<Handle(AIS_InteractiveObject)>());
if (anAIS.IsNull())
continue;
updateViewer();
}
-void XGUI_Displayer::setSelected(const std::list<XGUI_ViewerPrs>& theFeatures, const bool isUpdateViewer)
+void XGUI_Displayer::setSelected(const QFeatureList& theFeatures, const bool isUpdateViewer)
{
Handle(AIS_InteractiveContext) aContext = AISContext();
-
- std::list<XGUI_ViewerPrs>::const_iterator anIt = theFeatures.begin(), aLast = theFeatures.end();
- FeaturePtr aFeature;
-
- Handle(AIS_Shape) anAIS;
// we need to unhighligth objects manually in the current local context
// in couple with the selection clear (TODO)
Handle(AIS_LocalContext) aLocalContext = aContext->LocalContext();
if (!aLocalContext.IsNull())
aLocalContext->UnhilightLastDetected(myWorkshop->viewer()->activeView());
- aContext->ClearSelected(false);
-
- for (; anIt != aLast; anIt++) {
- aFeature = (*anIt).feature();
- if (isVisible(aFeature))
- anAIS = Handle(AIS_Shape)::DownCast(myFeature2AISObjectMap[aFeature]);
- if (anAIS.IsNull())
- continue;
- aContext->AddOrRemoveSelected(anAIS, false);
- }
-
- if (isUpdateViewer)
- updateViewer();
-}
-
-void XGUI_Displayer::setSelected(const QFeatureList& theFeatures, const bool isUpdateViewer)
-{
- Handle(AIS_InteractiveContext) aContext = AISContext();
aContext->ClearSelected();
foreach(FeaturePtr aFeature, theFeatures) {
FeaturePtr aRFeature = XGUI_Tools::realFeature(aFeature);
if (myFeature2AISObjectMap.find(aRFeature) == myFeature2AISObjectMap.end())
return;
- Handle(AIS_InteractiveObject) anAIS = myFeature2AISObjectMap[aRFeature];
- if (!anAIS.IsNull())
- aContext->AddOrRemoveSelected(anAIS, false);
+ boost::shared_ptr<GeomAPI_AISObject> anObj = myFeature2AISObjectMap[aRFeature];
+ if (anObj)
+ {
+ Handle(AIS_InteractiveObject) anAIS = anObj->impl<Handle(AIS_InteractiveObject)>();
+ if (!anAIS.IsNull())
+ aContext->AddOrRemoveSelected(anAIS, false);
+ }
}
if (isUpdateViewer)
updateViewer();
{
FeaturePtr aFeature = (*aFIt).first;
if (!aFeature || !aFeature->data() || !aFeature->data()->isValid()) {
- Handle(AIS_InteractiveObject) anAIS = (*aFIt).second;
+ boost::shared_ptr<GeomAPI_AISObject> anObj = (*aFIt).second;
+ if (!anObj) continue;
+ Handle(AIS_InteractiveObject) anAIS = anObj->impl<Handle(AIS_InteractiveObject)>();
if (!anAIS.IsNull()) {
aContext->Erase(anAIS, false);
aRemoved.push_back(aFeature);
closeAllContexts(true);
}
-Handle(AIS_InteractiveObject) XGUI_Displayer::getAISObject(
+boost::shared_ptr<GeomAPI_AISObject> XGUI_Displayer::getAISObject(
FeaturePtr theFeature) const
{
- Handle(AIS_InteractiveObject) anIO;
+ boost::shared_ptr<GeomAPI_AISObject> anIO;
if (myFeature2AISObjectMap.find(theFeature) != myFeature2AISObjectMap.end())
anIO = (myFeature2AISObjectMap.find(theFeature))->second;
return anIO;
FeatureToAISMap::const_iterator aFIt = myFeature2AISObjectMap.begin(),
aFLast = myFeature2AISObjectMap.end();
for (; aFIt != aFLast && !aFeature; aFIt++) {
- Handle(AIS_InteractiveObject) anAIS = (*aFIt).second;
+ boost::shared_ptr<GeomAPI_AISObject> anObj = (*aFIt).second;
+ if (!anObj) continue;
+ Handle(AIS_InteractiveObject) anAIS = anObj->impl<Handle(AIS_InteractiveObject)>();
if (anAIS != theIO)
continue;
aFeature = (*aFIt).first;
