}
XGUI_Displayer::XGUI_Displayer(XGUI_Workshop* theWorkshop)
- : myWorkshop(theWorkshop), myEnableUpdateViewer(true), myNeedUpdate(false),
- myIsTrihedronActive(false)
+ : myWorkshop(theWorkshop), myNeedUpdate(false),
+ myIsTrihedronActive(false), myViewerBlockedRecursiveCount(0)
{
- enableUpdateViewer(true);
- myCustomPrs = std::shared_ptr<GeomAPI_ICustomPrs>(new XGUI_CustomPrs());
+ myCustomPrs = std::shared_ptr<GeomAPI_ICustomPrs>(new XGUI_CustomPrs(theWorkshop));
}
XGUI_Displayer::~XGUI_Displayer()
Handle(AIS_InteractiveObject) anAIS = anObject->impl<Handle(AIS_InteractiveObject)>();
if (!anAIS.IsNull()) {
emit beforeObjectErase(theObject, anObject);
- aContext->Remove(anAIS, theUpdateViewer);
+ aContext->Remove(anAIS);
aErased = true;
}
}
qDebug(QString("erase object: %1").arg(aPtrStr.str().c_str()).toStdString().c_str());
qDebug(getResult2AISObjectMapInfo().c_str());
#endif
+
+ if (theUpdateViewer)
+ updateViewer();
+
return aErased;
}
bool XGUI_Displayer::enableUpdateViewer(const bool isEnabled)
{
- bool aWasEnabled = myEnableUpdateViewer;
+ bool aWasEnabled = isUpdateEnabled();
+ if (isEnabled)
+ myViewerBlockedRecursiveCount--;
+ else
+ myViewerBlockedRecursiveCount++;
- myEnableUpdateViewer = isEnabled;
- if (myNeedUpdate && myEnableUpdateViewer) {
+ if (myNeedUpdate && isUpdateEnabled()) {
updateViewer();
myNeedUpdate = false;
}
return aWasEnabled;
}
+bool XGUI_Displayer::isUpdateEnabled() const
+{
+ return myViewerBlockedRecursiveCount == 0;
+}
+
void XGUI_Displayer::updateViewer() const
{
Handle(AIS_InteractiveContext) aContext = AISContext();
- if (!aContext.IsNull() && myEnableUpdateViewer) {
+ if (!aContext.IsNull() && isUpdateEnabled()) {
myWorkshop->viewer()->Zfitall();
aContext->UpdateCurrentViewer();
} else {
{
Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext();
if (!aContext.IsNull()) {
- aContext->Activate(theIO, theMode, theUpdateViewer);
+ aContext->Activate(theIO, theMode, false);
#ifdef DEBUG_ACTIVATE_AIS
ObjectPtr anObject = getObject(theIO);
anInfo.append(ModuleBase_Tools::objectInfo((*anIt)));
qDebug(QString("activateAIS: theMode = %1, object = %2").arg(theMode).arg(anInfo).toStdString().c_str());
#endif
+ if (theUpdateViewer)
+ updateViewer();
}
}
Handle(AIS_InteractiveContext) aContext = AISContext();
Handle(AIS_InteractiveObject) anAISIO = theAIS->impl<Handle(AIS_InteractiveObject)>();
if (!aContext.IsNull() && !anAISIO.IsNull()) {
- aContext->Display(anAISIO, 0/*wireframe*/, 0, theUpdateViewer, true, AIS_DS_Displayed);
+ aContext->Display(anAISIO, 0/*wireframe*/, 0, false/*update viewer*/, true, AIS_DS_Displayed);
aDisplayed = true;
aContext->Deactivate(anAISIO);
aContext->Load(anAISIO);
}
}
}
+ if (theUpdateViewer)
+ updateViewer();
}
return aDisplayed;
}
if (!aContext.IsNull()) {
Handle(AIS_InteractiveObject) anAISIO = theAIS->impl<Handle(AIS_InteractiveObject)>();
if (!anAISIO.IsNull() && aContext->IsDisplayed(anAISIO)) {
- aContext->Remove(anAISIO, theUpdateViewer);
+ aContext->Remove(anAISIO, false/*update viewer*/);
aErased = true;
}
}
+ if (aErased && theUpdateViewer)
+ updateViewer();
return aErased;
}