Implement fix for bug PAL8551 ( Supervision message "Dataflow is not valid"

shoud be more explicit ) in development version.

diff --git a/src/SUPERVGUI/SUPERVGUI_CanvasView.cxx b/src/SUPERVGUI/SUPERVGUI_CanvasView.cxx
index ecdc2d0537ec73a2f06b57a3bb659123f101fff9..0d2b30fc9aee301e9db83ff4a3bf6fda1d3e70f6 100644 (file)
--- a/src/SUPERVGUI/SUPERVGUI_CanvasView.cxx
+++ b/src/SUPERVGUI/SUPERVGUI_CanvasView.cxx
@@ -664,7 +664,8 @@ void SUPERVGUI_CanvasView::endSketch(SUPERVGUI_CanvasPort* thePort)
 
     // asv : 13.12.04 : introducing a check for ports' types compatibility (Bugs and Improvements p.1.16, PAL7380)
     if ( !aLinkEngine->IsValid() ) { 
-      const int id = SUIT_MessageBox::warn2( this, tr( "TLT_INVALID_LINK" ), tr( "MSG_INVALID_LINK" ), 
+      const int id = SUIT_MessageBox::warn2( this, tr( "TLT_INVALID_LINK" ), 
+                                            tr( "MSG_INVALID_LINK" ) + QString(" : ") + QString(myMain->getDataflow()->Messages()), 
                                             tr( "Keep" ), tr( "Remove" ), 0, 1, 0 );
       if ( id == 1 ) { // "Remove" was selected in Message Box
        aLink->remove(); // the new link did not live long...

diff --git a/src/SUPERVGUI/SUPERVGUI_Main.cxx b/src/SUPERVGUI/SUPERVGUI_Main.cxx
index 8deb1a8ed2683f46e517f7af18e6e0d5bd9b681b..caf366139120237e2943bb7ff08cfa4989ce6fe4 100644 (file)
--- a/src/SUPERVGUI/SUPERVGUI_Main.cxx
+++ b/src/SUPERVGUI/SUPERVGUI_Main.cxx
@@ -560,10 +560,10 @@ void SUPERVGUI_Main::run( const bool andSuspend ) {
     Editing(); // remove old executor, update GUI (all nodes to "No Status")
 
     if ( !dataflow->IsValid() ) {
-      QMessageBox::warning(SUIT_Session::session()->activeApplication()->desktop(), tr("ERROR"), tr("MSG_DF_NOTVALID"));
+      QMessageBox::warning(SUIT_Session::session()->activeApplication()->desktop(), tr("ERROR"), tr("MSG_DF_NOTVALID") + QString(" : ") + QString(dataflow->Messages()));
     } 
     else if (!dataflow->IsExecutable()) {
-      QMessageBox::warning(SUIT_Session::session()->activeApplication()->desktop(), tr("ERROR"), tr("MSG_DF_NOTEXECUTABLE"));
+      QMessageBox::warning(SUIT_Session::session()->activeApplication()->desktop(), tr("ERROR"), tr("MSG_DF_NOTEXECUTABLE") + QString(" : ") + QString(dataflow->Messages()));
     } 
     else if (myCanvasView->isAnyLinkCreating()) {
       QMessageBox::warning(SUIT_Session::session()->activeApplication()->desktop(), tr("ERROR"), tr("MSG_CRL_NOTCOMPLETE"));