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 d8055e4608ea2621e6ae1c350b234e550dc85484..e118983877de5c8eb01e69c1234e51025e13161d 100644 (file)
--- 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 1a5c30b88545e3fc83a1646b52a24d2c53379236..c7105b243af9f92bb8e88340f769fac92e68d981 100644 (file)
--- 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());
+    }
 }