From: mkr <mkr@opencascade.com>
Date: Thu, 29 Sep 2005 11:29:39 +0000 (+0000)
Subject: Fix for bug PAL8110 : PAL-SUPRV-004: "Supervisor Warning" message box misses.
X-Git-Tag: V2_2_6~18
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=76f51b7d2fe6ade7df2673822c8f57f9074da2bc;p=modules%2Fsuperv.git

Fix for bug PAL8110 : PAL-SUPRV-004: "Supervisor Warning" message box misses.
---

diff --git a/src/SUPERVGUI/SUPERVGUI.cxx b/src/SUPERVGUI/SUPERVGUI.cxx
index d8055e4..e118983 100644
--- a/src/SUPERVGUI/SUPERVGUI.cxx
+++ b/src/SUPERVGUI/SUPERVGUI.cxx
@@ -363,8 +363,11 @@ void SUPERVGUI::exportDataflow() {
 	QString aBackupFile = SUPERVGUI::createBackupFile( f );
 
 	if ( main->getDataflow()->Export(f.latin1()) ) {
-	  unregisterGraph(main);
-	  registerGraph(f, main);
+	  // mkr : PAL8110 : if we re-register graph with its xml-file name the "Supervisor Warning"
+	  //       after object browser popup "Display" item will not appear, it's an error,
+	  //       because of this dataflow is already displayed.
+          //unregisterGraph(main);
+          //registerGraph(f, main);
 
 	  // remove a backup file if export was successfull
 	  if ( !aBackupFile.isNull() && !aBackupFile.isEmpty() )
diff --git a/src/SUPERVGUI/SUPERVGUI_CanvasPort.cxx b/src/SUPERVGUI/SUPERVGUI_CanvasPort.cxx
index 1a5c30b..c7105b2 100644
--- a/src/SUPERVGUI/SUPERVGUI_CanvasPort.cxx
+++ b/src/SUPERVGUI/SUPERVGUI_CanvasPort.cxx
@@ -303,7 +303,12 @@ void SUPERVGUI_CanvasPortOut::toStudy()
   getMain()->getCanvas()->update();
 
   if ( myInStudy ) // put values to study (supervision, supervision->dataflow, supervision->dataflow->runXXX, etc.
-    getMain()->putDataStudy( getEngine(), STUDY_PORT_OUT ); 
+    if ( getMain()->putDataStudy( getEngine(), STUDY_PORT_OUT ) ) {
+      // mkr : PAL8110 : re-register dataflow in object browser with 
+      //       changing its key to IOR name (from xml-file name, for example)
+      Supervision.unregisterGraph(getMain());
+      Supervision.registerGraph(getMain()->getDataflow()->getIOR(), getMain());
+    }
 }