#include "XGUI_Viewer.h"
#include "XGUI_Workshop.h"
#include "XGUI_ViewerProxy.h"
-#include "XGUI_Tools.h"
+#include "ModuleBase_Tools.h"
#include <ModelAPI_Document.h>
#include <ModelAPI_Data.h>
#include <ModelAPI_Object.h>
#include <GeomAPI_Shape.h>
+#include <GeomAPI_IPresentable.h>
#include <AIS_InteractiveContext.hxx>
#include <AIS_LocalContext.hxx>
{
}
-bool XGUI_Displayer::isVisible(FeaturePtr theFeature)
+bool XGUI_Displayer::isVisible(ObjectPtr theObject)
{
- FeaturePtr aFeature = XGUI_Tools::realFeature(theFeature);
- return myFeature2AISObjectMap.find(aFeature) != myFeature2AISObjectMap.end();
+ return myResult2AISObjectMap.find(theObject) != myResult2AISObjectMap.end();
}
-bool XGUI_Displayer::display(FeaturePtr theFeature, bool isUpdateViewer)
+void XGUI_Displayer::display(ObjectPtr theObject, bool isUpdateViewer)
{
- FeaturePtr aFeature = XGUI_Tools::realFeature(theFeature);
- boost::shared_ptr<GeomAPI_Shape> aShapePtr = aFeature->data()->shape();
-
- if (aShapePtr) {
- boost::shared_ptr<GeomAPI_AISObject> anAIS(new GeomAPI_AISObject());
- anAIS->createShape(aShapePtr);
- return display(aFeature, anAIS, isUpdateViewer);
+ if (isVisible(theObject)) {
+ redisplay(theObject, isUpdateViewer);
+ } else {
+ boost::shared_ptr<GeomAPI_AISObject> anAIS;
+
+ ResultPtr aResult = boost::dynamic_pointer_cast<ModelAPI_Result>(theObject);
+ if (aResult) {
+ boost::shared_ptr<GeomAPI_Shape> aShapePtr = ModuleBase_Tools::shape(aResult);
+ if (aShapePtr) {
+ anAIS = boost::shared_ptr<GeomAPI_AISObject>(new GeomAPI_AISObject());
+ anAIS->createShape(aShapePtr);
+ }
+ } else {
+ GeomPresentablePtr aPrs = boost::dynamic_pointer_cast<GeomAPI_IPresentable>(theObject);
+ if (aPrs) {
+ anAIS = aPrs->getAISObject(boost::shared_ptr<GeomAPI_AISObject>());
+ }
+ }
+ if (anAIS)
+ display(theObject, anAIS, isUpdateViewer);
}
- return false;
}
-bool XGUI_Displayer::display(FeaturePtr theFeature,
+void XGUI_Displayer::display(ObjectPtr theObject,
boost::shared_ptr<GeomAPI_AISObject> theAIS, bool isUpdateViewer)
{
Handle(AIS_InteractiveContext) aContext = AISContext();
Handle(AIS_InteractiveObject) anAISIO = theAIS->impl<Handle(AIS_InteractiveObject)>();
if (!anAISIO.IsNull()) {
- myFeature2AISObjectMap[theFeature] = theAIS;
+ myResult2AISObjectMap[theObject] = theAIS;
aContext->Display(anAISIO, isUpdateViewer);
- return true;
}
- return false;
}
-void XGUI_Displayer::erase(FeaturePtr theFeature,
- const bool isUpdateViewer)
+void XGUI_Displayer::erase(ObjectPtr theObject, const bool isUpdateViewer)
{
- FeaturePtr aFeature = XGUI_Tools::realFeature(theFeature);
-
- if (myFeature2AISObjectMap.find(aFeature) == myFeature2AISObjectMap.end())
- return;
+ if (!isVisible(theObject)) return;
Handle(AIS_InteractiveContext) aContext = AISContext();
- boost::shared_ptr<GeomAPI_AISObject> anObject = myFeature2AISObjectMap[aFeature];
+ boost::shared_ptr<GeomAPI_AISObject> anObject = myResult2AISObjectMap[theObject];
if (anObject) {
Handle(AIS_InteractiveObject) anAIS = anObject->impl<Handle(AIS_InteractiveObject)>();
if (!anAIS.IsNull()) {
}
}
- myFeature2AISObjectMap.erase(aFeature);
+ myResult2AISObjectMap.erase(theObject);
}
-bool XGUI_Displayer::redisplay(FeaturePtr theFeature,
+/*bool XGUI_Displayer::redisplay(ObjectPtr theObject,
boost::shared_ptr<GeomAPI_AISObject> theAIS,
const bool isUpdateViewer)
{
// Open local context if there is no one
if (!aContext->HasOpenedContext()) {
aContext->ClearCurrents(false);
- aContext->OpenLocalContext(false/*use displayed objects*/, true/*allow shape decomposition*/);
+ aContext->OpenLocalContext(false /use displayed objects/, true /allow shape decomposition/);
// set mouse sensitivity
//aContext->SetSensitivityMode(StdSelect_SM_WINDOW);
//aContext->SetPixelTolerance(MOUSE_SENSITIVITY_IN_PIXEL);
}
// display or redisplay presentation
- boost::shared_ptr<GeomAPI_AISObject> anObj = myFeature2AISObjectMap[theFeature];
- if (isVisible(theFeature) && anObj && !anObj->empty()) {
- aContext->RecomputeSelectionOnly(anAIS);
+ boost::shared_ptr<GeomAPI_AISObject> anObj = myResult2AISObjectMap[theObject];
+ if (isVisible(theObject) && anObj && !anObj->empty()) {
+ aContext->Redisplay(anAIS, isUpdateViewer);
+ //aContext->RecomputeSelectionOnly(anAIS);
}
else {
- myFeature2AISObjectMap[theFeature] = theAIS;
- aContext->Display(anAIS, false);
+ myResult2AISObjectMap[theObject] = theAIS;
+ aContext->Display(anAIS, isUpdateViewer);
isCreated = true;
}
- if (isUpdateViewer)
- updateViewer();
-
return isCreated;
-}
+}*/
-bool XGUI_Displayer::redisplay(FeaturePtr theFeature, bool isUpdateViewer)
+void XGUI_Displayer::redisplay(ObjectPtr theObject, bool isUpdateViewer)
{
- FeaturePtr aFeature = XGUI_Tools::realFeature(theFeature);
- if (!isVisible(aFeature))
- return false;
-
- 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()) {
- aAISShape->Set(aShapePtr->impl<TopoDS_Shape>());
- AISContext()->Redisplay(aAISShape);
- return true;
+ if (!isVisible(theObject))
+ return;
+
+ ResultPtr aResult = boost::dynamic_pointer_cast<ModelAPI_Result>(theObject);
+ if (aResult) {
+ boost::shared_ptr<GeomAPI_Shape> aShapePtr = ModuleBase_Tools::shape(aResult);
+ if (aShapePtr) {
+ boost::shared_ptr<GeomAPI_AISObject> aAISObj = getAISObject(theObject);
+ Handle(AIS_Shape) aAISShape = Handle(AIS_Shape)::DownCast(aAISObj->impl<Handle(AIS_InteractiveObject)>());
+ if (!aAISShape.IsNull()) {
+ aAISShape->Set(aShapePtr->impl<TopoDS_Shape>());
+ AISContext()->Redisplay(aAISShape, isUpdateViewer);
+ }
+ }
+ } else {
+ GeomPresentablePtr aPrs = boost::dynamic_pointer_cast<GeomAPI_IPresentable>(theObject);
+ if (aPrs) {
+ boost::shared_ptr<GeomAPI_AISObject> aAISObj = aPrs->getAISObject(getAISObject(theObject));
+ Handle(AIS_InteractiveObject) aAISIO = aAISObj->impl<Handle(AIS_InteractiveObject)>();
+ AISContext()->Redisplay(aAISIO, isUpdateViewer);
}
}
- return false;
}
-void XGUI_Displayer::activateInLocalContext(FeaturePtr theFeature,
+void XGUI_Displayer::activateInLocalContext(ResultPtr theResult,
const std::list<int>& theModes, const bool isUpdateViewer)
{
Handle(AIS_InteractiveContext) aContext = AISContext();
}
// display or redisplay presentation
Handle(AIS_InteractiveObject) anAIS;
- if (isVisible(theFeature))
+ if (isVisible(theResult))
{
- boost::shared_ptr<GeomAPI_AISObject> anObj = myFeature2AISObjectMap[theFeature];
+ boost::shared_ptr<GeomAPI_AISObject> anObj = myResult2AISObjectMap[theResult];
if (anObj)
anAIS = anObj->impl<Handle(AIS_InteractiveObject)>();
}
updateViewer();
}
-void XGUI_Displayer::stopSelection(const QFeatureList& theFeatures, const bool isStop,
+void XGUI_Displayer::stopSelection(const QResultList& theResults, const bool isStop,
const bool isUpdateViewer)
{
Handle(AIS_InteractiveContext) aContext = AISContext();
Handle(AIS_Shape) anAIS;
- QFeatureList::const_iterator anIt = theFeatures.begin(), aLast = theFeatures.end();
- FeaturePtr aFeature;
+ QResultList::const_iterator anIt = theResults.begin(), aLast = theResults.end();
+ ResultPtr aFeature;
for (; anIt != aLast; anIt++) {
aFeature = *anIt;
if (isVisible(aFeature))
- anAIS = Handle(AIS_Shape)::DownCast(myFeature2AISObjectMap[aFeature]->impl<Handle(AIS_InteractiveObject)>());
+ anAIS = Handle(AIS_Shape)::DownCast(myResult2AISObjectMap[aFeature]->impl<Handle(AIS_InteractiveObject)>());
if (anAIS.IsNull())
continue;
updateViewer();
}
-void XGUI_Displayer::setSelected(const QFeatureList& theFeatures, const bool isUpdateViewer)
+void XGUI_Displayer::setSelected(const QResultList& theResults, const bool isUpdateViewer)
{
Handle(AIS_InteractiveContext) aContext = AISContext();
// we need to unhighligth objects manually in the current local context
aLocalContext->UnhilightLastDetected(myWorkshop->viewer()->activeView());
aContext->ClearSelected();
- foreach(FeaturePtr aFeature, theFeatures) {
- FeaturePtr aRFeature = XGUI_Tools::realFeature(aFeature);
- if (myFeature2AISObjectMap.find(aRFeature) == myFeature2AISObjectMap.end())
+ foreach(ResultPtr aResult, theResults) {
+ if (myResult2AISObjectMap.find(aResult) == myResult2AISObjectMap.end())
return;
- boost::shared_ptr<GeomAPI_AISObject> anObj = myFeature2AISObjectMap[aRFeature];
+ boost::shared_ptr<GeomAPI_AISObject> anObj = myResult2AISObjectMap[aResult];
if (anObj)
{
Handle(AIS_InteractiveObject) anAIS = anObj->impl<Handle(AIS_InteractiveObject)>();
Handle(AIS_InteractiveObject) anIO = anIter.Value();
ic->Erase(anIO, false);
}
- myFeature2AISObjectMap.clear();
+ myResult2AISObjectMap.clear();
if (isUpdateViewer)
updateViewer();
}*/
-void XGUI_Displayer::eraseDeletedFeatures(const bool isUpdateViewer)
+void XGUI_Displayer::eraseDeletedResults(const bool isUpdateViewer)
{
Handle(AIS_InteractiveContext) aContext = AISContext();
- FeatureToAISMap::const_iterator aFIt = myFeature2AISObjectMap.begin(),
- aFLast = myFeature2AISObjectMap.end();
- std::list<FeaturePtr> aRemoved;
+ ResultToAISMap::const_iterator aFIt = myResult2AISObjectMap.begin(),
+ aFLast = myResult2AISObjectMap.end();
+ std::list<ObjectPtr> aRemoved;
for (; aFIt != aFLast; aFIt++)
{
- FeaturePtr aFeature = (*aFIt).first;
+ ObjectPtr aFeature = (*aFIt).first;
if (!aFeature || !aFeature->data() || !aFeature->data()->isValid()) {
boost::shared_ptr<GeomAPI_AISObject> anObj = (*aFIt).second;
if (!anObj) continue;
}
}
}
- std::list<FeaturePtr>::const_iterator anIt = aRemoved.begin(),
+ std::list<ObjectPtr>::const_iterator anIt = aRemoved.begin(),
aLast = aRemoved.end();
for (; anIt != aLast; anIt++) {
- myFeature2AISObjectMap.erase(myFeature2AISObjectMap.find(*anIt));
+ myResult2AISObjectMap.erase(myResult2AISObjectMap.find(*anIt));
}
if (isUpdateViewer)
closeAllContexts(true);
}
-boost::shared_ptr<GeomAPI_AISObject> XGUI_Displayer::getAISObject(
- FeaturePtr theFeature) const
+boost::shared_ptr<GeomAPI_AISObject> XGUI_Displayer::getAISObject(ObjectPtr theObject) const
{
boost::shared_ptr<GeomAPI_AISObject> anIO;
- if (myFeature2AISObjectMap.find(theFeature) != myFeature2AISObjectMap.end())
- anIO = (myFeature2AISObjectMap.find(theFeature))->second;
+ if (myResult2AISObjectMap.find(theObject) != myResult2AISObjectMap.end())
+ anIO = (myResult2AISObjectMap.find(theObject))->second;
return anIO;
}
-FeaturePtr XGUI_Displayer::getFeature(Handle(AIS_InteractiveObject) theIO) const
+ObjectPtr XGUI_Displayer::getObject(Handle(AIS_InteractiveObject) theIO) const
{
- FeaturePtr aFeature;
- FeatureToAISMap::const_iterator aFIt = myFeature2AISObjectMap.begin(),
- aFLast = myFeature2AISObjectMap.end();
+ ObjectPtr aFeature;
+ ResultToAISMap::const_iterator aFIt = myResult2AISObjectMap.begin(),
+ aFLast = myResult2AISObjectMap.end();
for (; aFIt != aFLast && !aFeature; aFIt++) {
boost::shared_ptr<GeomAPI_AISObject> anObj = (*aFIt).second;
if (!anObj) continue;
