X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSUPERVGUI%2FSUPERVGUI_CanvasNode.cxx;h=3eaa873bf72adefcb1547ea416ce7ae917f77ac4;hb=787989820026cbd647c7bdb7159beed8e12e4944;hp=a7469ff8a7bd4c14e49835a80e96abaa0e4446b0;hpb=097f9667b76db86426a194bd458a3243ce13e4b9;p=modules%2Fsuperv.git

diff --git a/src/SUPERVGUI/SUPERVGUI_CanvasNode.cxx b/src/SUPERVGUI/SUPERVGUI_CanvasNode.cxx
index a7469ff..3eaa873 100644
--- a/src/SUPERVGUI/SUPERVGUI_CanvasNode.cxx
+++ b/src/SUPERVGUI/SUPERVGUI_CanvasNode.cxx
@@ -18,9 +18,10 @@ using namespace std;
 #include "SUPERVGUI_Information.h"
 #include "SUPERVGUI_Library.h"
 
-#include "SALOMEGUI_NameDlg.h"
-#include "QAD_MessageBox.h"
-#include "QAD_Message.h"
+#include "SalomeApp_NameDlg.h"
+#include "SUIT_MessageBox.h"
+#include "LogWindow.h"
+#include "SUIT_Session.h"
 
 
 SUPERVGUI_CanvasNode::SUPERVGUI_CanvasNode(QObject* theParent, SUPERVGUI_Main* theMain, SUPERV_CNode theNode, bool theIsCell):
@@ -341,13 +342,13 @@ bool SUPERVGUI_CanvasNode::setNodeName(QString aName)  {
     // TODO: update name of all the links to this node
   } 
   else {
-    QMessageBox::warning( QAD_Application::getDesktop(), tr( "ERROR" ), tr( "MSG_CANT_RENAMENODE" ) );
+    QMessageBox::warning( SUIT_Session::session()->activeApplication()->desktop(), tr( "ERROR" ), tr( "MSG_CANT_RENAMENODE" ) );
   }
   return result;
 }
 
 void SUPERVGUI_CanvasNode::rename()  {
-  QString aName = SALOMEGUI_NameDlg::getName(QAD_Application::getDesktop(), myNode->Name());
+  QString aName = SalomeApp_NameDlg::getName( SUIT_Session::session()->activeApplication()->desktop(), myNode->Name() );
   if (!aName.isEmpty()) {
     setNodeName(aName);
   }
@@ -397,7 +398,7 @@ void SUPERVGUI_CanvasNode::suspendResume() {
   int n = queryList("SUPERVGUI_CanvasNode")->count(); 
   if (myNode->IsSuspended()) {
     if (!((n==1)? myMain->getDataflow()->Resume() : myNode->Resume())) {
-      QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_CANT_RESUMENODE"));
+      QMessageBox::warning( SUIT_Session::session()->activeApplication()->desktop(), tr("ERROR"), tr("MSG_CANT_RESUMENODE") );
     }
     else {
       sync();
@@ -405,10 +406,10 @@ void SUPERVGUI_CanvasNode::suspendResume() {
     }
   } else {
     if (!((n==1)? myMain->getDataflow()->Suspend() : myNode->Suspend())) {
-      QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_CANT_SUSPENDNODE"));
+      QMessageBox::warning( SUIT_Session::session()->activeApplication()->desktop(), tr("ERROR"), tr("MSG_CANT_SUSPENDNODE") );
     } else {
       syncOnEvent(SUPERV::SuspendReadyState);
-      myMain->getMessage()->setMessage(tr("MSG_NODE_SUSPENDED1")+myNode->Name()+tr("MSG_NODE_SUSPENDED2"));
+      myMain->getMessage()->putMessage(tr("MSG_NODE_SUSPENDED1")+myNode->Name()+tr("MSG_NODE_SUSPENDED2"));
     }
   }
 }
@@ -417,10 +418,10 @@ void SUPERVGUI_CanvasNode::kill() {
   Trace("SUPERVGUI_CanvasNode::kill");
   int n = queryList("SUPERVGUI_CanvasNode")->count(); 
   if (!((n==1)? myMain->getDataflow()->Kill() : myNode->Kill())) {
-    QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_CANT_KILLNODE"));
+    QMessageBox::warning( SUIT_Session::session()->activeApplication()->desktop(), tr("ERROR"), tr("MSG_CANT_KILLNODE") );
   } else {
     syncOnEvent(SUPERV_Kill);
-    myMain->getMessage()->setMessage(tr("MSG_NODE_KILLED1")+myNode->Name()+tr("MSG_NODE_KILLED2"));
+    myMain->getMessage()->putMessage(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,
@@ -431,11 +432,11 @@ void SUPERVGUI_CanvasNode::stopRestart() {
   int n = queryList("SUPERVGUI_CanvasNode")->count(); 
   if ((myNode->State() == SUPERV_Stop) || (myNode->State() == SUPERV_Kill)) {
     if (!((n==1)? myMain->getDataflow()->Run() : myNode->ReStart())) {
-      QMessageBox::warning(QAD_Application::getDesktop(),  tr("ERROR"), tr("MSG_CANT_RESTARTNODE"));
+      QMessageBox::warning( SUIT_Session::session()->activeApplication()->desktop(),  tr("ERROR"), tr("MSG_CANT_RESTARTNODE") );
     }
   } else {
     if (!((n==1)? myMain->getDataflow()->Stop() : myNode->Stop())) {
-      QMessageBox::warning(QAD_Application::getDesktop(),  tr("ERROR"), tr("MSG_CANT_STOPNODE"));
+      QMessageBox::warning( SUIT_Session::session()->activeApplication()->desktop(),  tr("ERROR"), tr("MSG_CANT_STOPNODE") );
     }
   }
 }
@@ -454,7 +455,7 @@ void SUPERVGUI_CanvasNode::changeInformation() {
 void SUPERVGUI_CanvasNode::configure() 
 {
   Trace("SUPERVGUI_CanvasNode::configure");
-  QMessageBox::warning(QAD_Application::getDesktop(),  tr("ERROR"), tr("MSG_NOT_IMPLEMENTED")); // kloss : a faire : lancer l'ihm DATA
+  QMessageBox::warning( SUIT_Session::session()->activeApplication()->desktop(),  tr("ERROR"), tr("MSG_NOT_IMPLEMENTED") ); // kloss : a faire : lancer l'ihm DATA
 }
 
 void SUPERVGUI_CanvasNode::showPython() 
@@ -563,6 +564,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;
@@ -582,6 +584,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;
@@ -592,8 +595,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;
 
@@ -602,8 +603,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;
 
@@ -612,8 +611,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();
@@ -621,6 +618,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());
@@ -632,6 +630,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;
@@ -650,8 +649,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;
@@ -666,5 +663,5 @@ void SUPERVGUI_CanvasNode::exportToLib() {
   if ( !CORBA::is_nil( anINode ) )
     SUPERVGUI_Library::getLibrary()->Export( anINode );
   else
-    QAD_MessageBox::error1( QAD_Application::getDesktop(), tr( "ERROR" ), tr( "MSG_BAD_INODE" ), tr( "OK" ) );
+    SUIT_MessageBox::error1( SUIT_Session::session()->activeApplication()->desktop(), tr( "ERROR" ), tr( "MSG_BAD_INODE" ), tr( "OK" ) );
 }