Roll back the modification, not yet approved

[modules/shaper.git] / src / PartSet / PartSet_CustomPrs.cpp

diff --git a/src/PartSet/PartSet_CustomPrs.cpp b/src/PartSet/PartSet_CustomPrs.cpp
index 1457e0307cd5a2cad622ddac5c3b07b4405762bc..0ac8ee0c6f4cd5b6e84a4fbcd5735c95df93a53d 100755 (executable)
--- a/src/PartSet/PartSet_CustomPrs.cpp
+++ b/src/PartSet/PartSet_CustomPrs.cpp
@@ -36,49 +36,64 @@ bool PartSet_CustomPrs::isActive()
   Handle(PartSet_OperationPrs) anOperationPrs = getPresentation();
   Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext();
 
-  return aContext->IsDisplayed(anOperationPrs);
+  return !aContext.IsNull() && aContext->IsDisplayed(anOperationPrs);
 }
 
-void PartSet_CustomPrs::activate(const FeaturePtr& theFeature)
+bool PartSet_CustomPrs::activate(const FeaturePtr& theFeature, const bool theUpdateViewer)
 {
+  bool isModified = false;
   Handle(PartSet_OperationPrs) anOperationPrs = getPresentation();
 
   if (anOperationPrs->canActivate(theFeature)) {
     anOperationPrs->setFeature(theFeature);
-    if (theFeature.get())
-      displayPresentation();
+    if (theFeature.get()) {
+      displayPresentation(theUpdateViewer);
+      isModified = true;
+    }
   }
+  return isModified;
 }
 
-void PartSet_CustomPrs::deactivate()
+bool PartSet_CustomPrs::deactivate(const bool theUpdateViewer)
 {
+  bool isModified = false;
+
   Handle(PartSet_OperationPrs) anOperationPrs = getPresentation();
   anOperationPrs->setFeature(FeaturePtr());
 
-  erasePresentation();
+  Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext();
+  if (!aContext.IsNull() && aContext->IsDisplayed(anOperationPrs)) {
+    erasePresentation(theUpdateViewer);
+    isModified = true;
+  }
+
+  return isModified;
 }
 
 
-void PartSet_CustomPrs::displayPresentation()
+void PartSet_CustomPrs::displayPresentation(const bool theUpdateViewer)
 {
   Handle(PartSet_OperationPrs) anOperationPrs = getPresentation();
 
   Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext();
-  if (!aContext->IsDisplayed(anOperationPrs)) {
+  if (!aContext.IsNull() && !aContext->IsDisplayed(anOperationPrs)) {
     PartSet_Module* aModule = dynamic_cast<PartSet_Module*>(myWorkshop->module());
 
     XGUI_Workshop* aWorkshop = workshop();
-    aWorkshop->displayer()->displayAIS(myOperationPrs, false/*load object in selection*/, true);
+    aWorkshop->displayer()->displayAIS(myOperationPrs, false/*load object in selection*/, theUpdateViewer);
     aContext->SetZLayer(anOperationPrs, aModule->getVisualLayerId());
   }
-  else
+  else {
     anOperationPrs->Redisplay();
+    if (theUpdateViewer)
+      workshop()->displayer()->updateViewer();
+  }
 }
 
-void PartSet_CustomPrs::erasePresentation()
+void PartSet_CustomPrs::erasePresentation(const bool theUpdateViewer)
 {
   XGUI_Workshop* aWorkshop = workshop();
-  aWorkshop->displayer()->eraseAIS(myOperationPrs, true);
+  aWorkshop->displayer()->eraseAIS(myOperationPrs, theUpdateViewer);
 }
 
 Handle(PartSet_OperationPrs) PartSet_CustomPrs::getPresentation()
@@ -89,20 +104,25 @@ Handle(PartSet_OperationPrs) PartSet_CustomPrs::getPresentation()
   return Handle(PartSet_OperationPrs)::DownCast(anAISIO);
 }
 
-void PartSet_CustomPrs::customize(const ObjectPtr& theObject)
+bool PartSet_CustomPrs::redisplay(const ObjectPtr& theObject, const bool theUpdateViewer)
 {
+  bool isModified = false;
   // the presentation should be recomputed if the previous AIS depend on the result
   // [it should be hiddend] or the new AIS depend on it [it should be visualized]
   Handle(PartSet_OperationPrs) anOperationPrs = getPresentation();
   Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext();
-  if (aContext->IsDisplayed(anOperationPrs)) {
+  if (!aContext.IsNull() && aContext->IsDisplayed(anOperationPrs)) {
     // if there are performance poblems, to improve them, the necessity of redisplay can be checked
     //bool aChanged = anOperationPrs->dependOn(theObject);
     anOperationPrs->updateShapes();
     //aChanged = aChanged || anOperationPrs->dependOn(theObject);
     //if (aChanged)
     anOperationPrs->Redisplay();
+    isModified = true;
+    if (theUpdateViewer)
+      workshop()->displayer()->updateViewer();
   }
+  return isModified;
 }
 
 void PartSet_CustomPrs::clearPrs()
@@ -111,7 +131,7 @@ void PartSet_CustomPrs::clearPrs()
   if (!anOperationPrs.IsNull())
     anOperationPrs.Nullify();
 
-  myOperationPrs = 0;
+  myOperationPrs.reset();
 }
 
 void PartSet_CustomPrs::initPrs()