X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSUPERVGUI%2FSUPERVGUI_CanvasNode.cxx;h=0104b9e37695103e3debcca57890f041ed36edc8;hb=ea7f29f75031ca13b9454f5e9ac73730f1f584eb;hp=7bd5d6500a92a793451c652aecae29a8fd0cd91c;hpb=1f679c6f6d0115608e41b2e82520bce9a389b837;p=modules%2Fsuperv.git

diff --git a/src/SUPERVGUI/SUPERVGUI_CanvasNode.cxx b/src/SUPERVGUI/SUPERVGUI_CanvasNode.cxx
index 7bd5d65..0104b9e 100644
--- a/src/SUPERVGUI/SUPERVGUI_CanvasNode.cxx
+++ b/src/SUPERVGUI/SUPERVGUI_CanvasNode.cxx
@@ -20,6 +20,8 @@ using namespace std;
 
 #include "SALOMEGUI_NameDlg.h"
 #include "QAD_MessageBox.h"
+#include "QAD_Message.h"
+
 
 SUPERVGUI_CanvasNode::SUPERVGUI_CanvasNode(QObject* theParent, SUPERVGUI_Main* theMain, SUPERV_CNode theNode, bool theIsCell):
     QObject(theParent),
@@ -406,7 +408,7 @@ void SUPERVGUI_CanvasNode::suspendResume() {
       QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_CANT_SUSPENDNODE"));
     } else {
       syncOnEvent(SUPERV::SuspendReadyState);
-      myMain->getMyThread()->stopThread(tr("MSG_NODE_SUSPENDED1")+myNode->Name()+tr("MSG_NODE_SUSPENDED2"));
+      myMain->getMessage()->setMessage(tr("MSG_NODE_SUSPENDED1")+myNode->Name()+tr("MSG_NODE_SUSPENDED2"));
     }
   }
 }
@@ -418,7 +420,7 @@ void SUPERVGUI_CanvasNode::kill() {
     QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_CANT_KILLNODE"));
   } else {
     syncOnEvent(SUPERV_Kill);
-    myMain->getMyThread()->stopThread(tr("MSG_NODE_KILLED1")+myNode->Name()+tr("MSG_NODE_KILLED2"));
+    myMain->getMessage()->setMessage(tr("MSG_NODE_KILLED1")+myNode->Name()+tr("MSG_NODE_KILLED2"));
   }
 }
 /* asv : 15.12.04 : commented out stopRestart() in Main and CanvasNode because it's not called from anywhere,
@@ -514,7 +516,8 @@ void SUPERVGUI_CanvasNode::setVerbose(bool b)
 
 void SUPERVGUI_CanvasNode::browse() 
 {
-  myMain->Editing(); // PAL6170: GUI->Engine: setting "Editing" flag 
+  // asv 28.01.05 : set "Editing" flag only on "OK" pressed in BrowseDlg
+  //myMain->Editing(); // PAL6170: GUI->Engine: setting "Editing" flag 
   if (!myBrowseDlg) {
     myBrowseDlg = new SUPERVGUI_BrowseNodeDlg(this);
     myBrowseDlg->installEventFilter(this);
@@ -560,6 +563,7 @@ SUPERV_Port SUPERVGUI_CanvasNode::createInPort()
   }
   SUPERVGUI_PortParamsDlg* aDlg = new SUPERVGUI_PortParamsDlg(getPortsNamesIN(aNode,true));
   if (aDlg->exec()) {
+    myMain->Editing(); // PAL6170: GUI->Engine: setting "Editing" flag 
     SUPERV_Port aPort = aNode->InPort(aDlg->getName().latin1(),
 				      aDlg->getType().latin1());    
     delete aDlg;
@@ -579,6 +583,7 @@ SUPERV_Port SUPERVGUI_CanvasNode::createOutPort()
   
   SUPERVGUI_PortParamsDlg* aDlg = new SUPERVGUI_PortParamsDlg(getPortsNamesIN(aNode,false));
   if (aDlg->exec()) {
+    myMain->Editing(); // PAL6170: GUI->Engine: setting "Editing" flag 
     SUPERV_Port aPort = aNode->OutPort(aDlg->getName().latin1(),
 				       aDlg->getType().latin1());
     delete aDlg;
@@ -589,8 +594,6 @@ SUPERV_Port SUPERVGUI_CanvasNode::createOutPort()
 }
 
 void SUPERVGUI_CanvasNode::addInputPort() {
-  myMain->Editing(); // PAL6170: GUI->Engine: setting "Editing" flag 
-
   SUPERV_Port aPort = createInPort();
   if (aPort == NULL || CORBA::is_nil( aPort ) ) return;
 
@@ -599,8 +602,6 @@ void SUPERVGUI_CanvasNode::addInputPort() {
 
 
 void SUPERVGUI_CanvasNode::addOutputPort() {
-  myMain->Editing(); // PAL6170: GUI->Engine: setting "Editing" flag 
-
   SUPERV_Port aPort = createOutPort();
   if (aPort == NULL || CORBA::is_nil( aPort ) ) return;
 
@@ -609,8 +610,6 @@ void SUPERVGUI_CanvasNode::addOutputPort() {
 
 
 void SUPERVGUI_CanvasNode::editFunction()  {
-  myMain->Editing(); // PAL6170: GUI->Engine: setting "Editing" flag 
-
   if (getNodeType() == SUPERV::LoopNode) {
     SUPERVGUI_EditPythonDlg* aDlg = new SUPERVGUI_EditPythonDlg(true);
     SUPERV_LNode aLNode = getLoopNode();
@@ -618,6 +617,7 @@ void SUPERVGUI_CanvasNode::editFunction()  {
     aDlg->setMoreFunction(aLNode->PyMore());
     aDlg->setNextFunction(aLNode->PyNext());
     if (aDlg->exec()) {
+      myMain->Editing(); // PAL6170: GUI->Engine: setting "Editing" flag 
       aLNode->SetPyInit(aDlg->getInitFuncName().latin1(), (aDlg->getInitFunction()).in());
       aLNode->SetPyMore(aDlg->getMoreFuncName().latin1(), (aDlg->getMoreFunction()).in());
       aLNode->SetPyNext(aDlg->getNextFuncName().latin1(), (aDlg->getNextFunction()).in());
@@ -629,6 +629,7 @@ void SUPERVGUI_CanvasNode::editFunction()  {
     SUPERV_INode aINode = getInlineNode();
     aDlg->setFunction(aINode->PyFunction());
     if (aDlg->exec()) {
+      myMain->Editing(); // PAL6170: GUI->Engine: setting "Editing" flag 
       aINode->SetPyFunction(aDlg->getFuncName().latin1(), (aDlg->getFunction()).in());
     }
     delete aDlg;
@@ -647,8 +648,6 @@ void SUPERVGUI_CanvasNode::pastePort() {
  * for detailed description of the functionality
  */
 void SUPERVGUI_CanvasNode::managePorts() {
-  myMain->Editing(); // PAL6170: GUI->Engine: setting "Editing" flag 
-
   SUPERVGUI_ManagePortsDlg* aDlg = new SUPERVGUI_ManagePortsDlg( this );
   aDlg->exec();
   delete aDlg;