Fix for bug IPAL11362 : "Gate" ports disappear after redisplaying node with started...

diff --git a/src/SUPERVGUI/SUPERVGUI_Main.cxx b/src/SUPERVGUI/SUPERVGUI_Main.cxx
index b48d726f4c2715ae9a0371f87e9fc46a94017422..db4c6a2d5a1556c33bc0d2d77a5aefcca2cb4ea0 100644 (file)
--- a/src/SUPERVGUI/SUPERVGUI_Main.cxx
+++ b/src/SUPERVGUI/SUPERVGUI_Main.cxx
@@ -1291,6 +1291,15 @@ void SUPERVGUI_Main::checkExecution() {
   }
 }
 
+// mkr : IPAL11362
+/**
+ * Update current values on show event
+ */
+void SUPERVGUI_Main::showEvent( QShowEvent* theEvent ) {
+  sync();
+  QWidget::showEvent( theEvent );
+}
+
 /**
  * Editing() is to be called by any operation in GUI before modification of a datamodel
  * (add/remove ports or nodes, etc.).  It is used to resolve inconsistancies between 2 data models

diff --git a/src/SUPERVGUI/SUPERVGUI_Main.h b/src/SUPERVGUI/SUPERVGUI_Main.h
index bb0647643d62a091697dbdbe129d2def04b25340..0a4a4a6ea5a1e9d472cd4f1ee89b7b48f602f95b 100644 (file)
--- a/src/SUPERVGUI/SUPERVGUI_Main.h
+++ b/src/SUPERVGUI/SUPERVGUI_Main.h
@@ -165,6 +165,9 @@ class SUPERVGUI_Main: public SUPERVGraph_View {
     void chooseData(QListViewItem* item);
     void checkExecution();
 
+  protected:
+    virtual void showEvent( QShowEvent* theEvent ); // mkr : IPAL11362
+
   private:
     void init(SUIT_Desktop* parent);
     void syncNotification();

diff --git a/src/Supervision/CNode_Impl.cxx b/src/Supervision/CNode_Impl.cxx
index 7f3cf4c9f5332c441e4c2656511c4499f4d6e513..31a2dbe4ec277f88eebb85ce8990a906f90f66e7 100644 (file)
--- a/src/Supervision/CNode_Impl.cxx
+++ b/src/Supervision/CNode_Impl.cxx
@@ -1035,7 +1035,7 @@ SUPERV::ListOfPorts * CNode_Impl::Ports() {
           begin = false ;
         }
         if ( anInPort->IsLoop() || ( anInPort->IsGate() && anInPort->IsNotConnected() && 
-                                     ( IsExecuting() || DataFlowEditor()->IsReadOnly() ) ) ) {
+                                     ( /*IsExecuting() || */DataFlowEditor()->IsReadOnly() ) ) ) { // mkr : IPAL11362
 //          MESSAGE( "InPort " << i << " " << anInPort->PortName() << " of Node " << Name() << " ignored" ) ;
         }
         else if ( CORBA::is_nil( anInPort->ObjRef() ) ) {
@@ -1090,7 +1090,7 @@ SUPERV::ListOfPorts * CNode_Impl::Ports() {
           begin = false ;
         }
         if ( anOutPort->IsLoop() || ( anOutPort->IsGate() && anOutPort->IsNotConnected() &&
-                                      ( IsExecuting() || DataFlowEditor()->IsReadOnly() ) ) ) {
+                                      ( /*IsExecuting() || */DataFlowEditor()->IsReadOnly() ) ) ) { // mkr : IPAL11362
 //          MESSAGE( "OutPort " << i << " " << anOutPort->PortName() << " of Node " << Name() << " ignored" ) ;
         }
         else if ( CORBA::is_nil( anOutPort->ObjRef() ) ) {