From 2c1a5a441fd3ddf95de374708173540f1b1d14f5 Mon Sep 17 00:00:00 2001 From: mkr Date: Fri, 3 Feb 2006 15:18:47 +0000 Subject: [PATCH] Fix for bug IPAL11362 : "Gate" ports disappear after redisplaying node with started execution process. --- src/SUPERVGUI/SUPERVGUI_Main.cxx | 19 ++++++++----------- src/SUPERVGUI/SUPERVGUI_Main.h | 4 +--- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/src/SUPERVGUI/SUPERVGUI_Main.cxx b/src/SUPERVGUI/SUPERVGUI_Main.cxx index cdce9ff..bd23eaa 100644 --- a/src/SUPERVGUI/SUPERVGUI_Main.cxx +++ b/src/SUPERVGUI/SUPERVGUI_Main.cxx @@ -88,6 +88,8 @@ SUPERVGUI_Main::SUPERVGUI_Main( SUPERVGraph_ViewFrame* theParent, } else { init(theDesktop); } + // mkr : IPAL11362 + connect(this, SIGNAL(EventToSync()), this, SLOT(onObjectCreatedDeleted())); } void SUPERVGUI_Main::init(SUIT_Desktop* theDesktop) { @@ -273,13 +275,17 @@ void SUPERVGUI_Main::syncAsync() { void SUPERVGUI_Main::execute( char * theNodeName, SUPERV::GraphState theNodeState ) { if (myCurrentView == CANVAS || myCurrentView == CONTROLFLOW) { SUPERVGUI_CanvasNode* aNode = (SUPERVGUI_CanvasNode*) myCanvas->child(theNodeName, "SUPERVGUI_CanvasNode"); - if ( aNode ) + if ( aNode ) { aNode->sync(); + emit EventToSync(); // mkr : IPAL11362 + } } else if (myCurrentView == CANVASTABLE) { SUPERVGUI_CanvasCellNode* aNode = (SUPERVGUI_CanvasCellNode*) myArray->child(theNodeName, "SUPERVGUI_CanvasCellNode"); - if (aNode) + if (aNode) { aNode->sync(); + emit EventToSync(); // mkr : IPAL11362 + } } // asv : 26.01.05 : Bug PAL7164 : puting out-value to study if the "put_to_Study" flag is set on a @@ -1296,15 +1302,6 @@ 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 0a4a4a6..146c90f 100644 --- a/src/SUPERVGUI/SUPERVGUI_Main.h +++ b/src/SUPERVGUI/SUPERVGUI_Main.h @@ -137,6 +137,7 @@ class SUPERVGUI_Main: public SUPERVGraph_View { signals: void KillMyThread(bool theValue); + void EventToSync(); // mkr : IPAL11362 public slots: void execute(char * theNodeNode, SUPERV::GraphState theNodeState); @@ -165,9 +166,6 @@ 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(); -- 2.39.2