Salome HOME
A new dialog class for edition of Ports of an InLine nodes is introduced. This funct...
[modules/superv.git] / src / SUPERVGUI / SUPERVGUI_Main.cxx
index 74595fb33779821d754c797e8a96111f08197e5e..aa397a8c17f7bf91e69e0dd94b8967fc07afad61 100644 (file)
@@ -1,11 +1,31 @@
-using namespace std;
-//  File      : SUPERVGUI_Main.cxx
-//  Created   : 24 / 10 / 2001
-//  Author    : Francis KLOSS
-//  Project   : SALOME
-//  Module    : SUPERVGUI
-//  Copyright : CEA
+//  SUPERV SUPERVGUI : GUI for Supervisor component
+//
+//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
+// 
+//  This library is free software; you can redistribute it and/or 
+//  modify it under the terms of the GNU Lesser General Public 
+//  License as published by the Free Software Foundation; either 
+//  version 2.1 of the License. 
+// 
+//  This library is distributed in the hope that it will be useful, 
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+//  Lesser General Public License for more details. 
+// 
+//  You should have received a copy of the GNU Lesser General Public 
+//  License along with this library; if not, write to the Free Software 
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+// 
+//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+//
+//
+//
+//  File   : SUPERVGUI_Main.cxx
+//  Author : Francis KLOSS
+//  Module : SUPERV
 
+using namespace std;
 #include "QAD_Splitter.h"
 #include "QAD_LeftFrame.h"
 #include "QAD_ObjectBrowser.h"
@@ -16,6 +36,7 @@ using namespace std;
 #include "QAD_Application.h"
 #include "SUPERVGUI_Def.h"
 #include "QAD_RightFrame.h"
+#include "SALOME_Event.hxx"
 #include "SUPERVGraph_ViewFrame.h"
 #include <qlayout.h>
 #include <qfile.h>
@@ -27,8 +48,12 @@ using namespace std;
 #include "SUPERVGUI_Notification.h"
 #include "SALOMEGUI_ImportOperation.h"
 #include "SUPERVGUI_Information.h"
+#include "SUPERVGUI_CanvasControlNode.h"
+#include <qvalidator.h>
 
-
+/*
+asv 20.10.04: removed 2 SUPERVGUI_Main constructors.  there is only ONE way 
+to create a Main object now: with a non-null DataFlow as a 3d parameter
 SUPERVGUI_Main::SUPERVGUI_Main(SUPERVGraph_ViewFrame* theParent, QAD_Desktop* theDesktop, bool fromIOR)
      : SUPERVGraph_View(theParent), 
        myLogged( false ),
@@ -56,7 +81,7 @@ SUPERVGUI_Main::SUPERVGUI_Main(SUPERVGraph_ViewFrame* theParent, QAD_Desktop* th
     if (obj->FindAttribute(anAttr, "AttributeIOR")) {
       SALOMEDS::AttributeIOR_var anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
       Standard_CString ior = anIOR->Value();
-      dataflow = (*Supervision.getEngine())->getGraph(ior);
+      dataflow = Supervision.getEngine()->getStreamGraph(ior);
       if (SUPERV_isNull(dataflow)) {
        QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_ACCESS_BAD_IOR"));
        close();
@@ -68,7 +93,7 @@ SUPERVGUI_Main::SUPERVGUI_Main(SUPERVGraph_ViewFrame* theParent, QAD_Desktop* th
       close();
     }
   } else {
-    dataflow = (*Supervision.getEngine())->Graph(MAIN_NEW);
+    dataflow = Supervision.getEngine()->StreamGraph(MAIN_NEW);
     if (SUPERV_isNull(dataflow)) {
       QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_CANT_CREATE_DF"));
       close();
@@ -92,9 +117,9 @@ SUPERVGUI_Main::SUPERVGUI_Main(SUPERVGraph_ViewFrame* theParent, QAD_Desktop* th
   Trace("SUPERVGUI_Main::SUPERVGUI_Main (file)")
     theParent->setViewWidget(this);  
   if (isModify) {
-    dataflow = (*Supervision.getEngine())->Graph(f);
+    dataflow = Supervision.getEngine()->StreamGraph(f);
   } else {
-    dataflow = (*Supervision.getEngine())->GraphE(f);
+    dataflow = Supervision.getEngine()->StreamGraphE(f);
   }
   if (SUPERV_isNull(dataflow)) {
     QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_BAD_FILE").arg(f));
@@ -103,8 +128,9 @@ SUPERVGUI_Main::SUPERVGUI_Main(SUPERVGraph_ViewFrame* theParent, QAD_Desktop* th
     init(theDesktop);
   }
 }
+*/
 
-SUPERVGUI_Main::SUPERVGUI_Main(SUPERVGraph_ViewFrame* theParent, QAD_Desktop* theDesktop, SUPERV_Graph cp)
+SUPERVGUI_Main::SUPERVGUI_Main(SUPERVGraph_ViewFrame* theParent, QAD_Desktop* theDesktop, SUPERV_Graph theDataFlow )
      : SUPERVGraph_View(theParent),
        myLogged( false ),
        myFiltered( false ),
@@ -117,8 +143,7 @@ SUPERVGUI_Main::SUPERVGUI_Main(SUPERVGraph_ViewFrame* theParent, QAD_Desktop* th
 {
   Trace("SUPERVGUI_Main::SUPERVGUI_Main (copy)");
   theParent->setViewWidget(this);  
-  //  dataflow = cp->Copy();
-  dataflow = cp;
+  dataflow = theDataFlow;
   if (SUPERV_isNull(dataflow)) {
     QMessageBox::warning(0, tr("ERROR"), tr("MSG_CANT_COPY"));
     close();
@@ -135,96 +160,106 @@ void SUPERVGUI_Main::init(QAD_Desktop* theDesktop) {
   choosing  = false;
   myIsLocked = false;
 
+  myThread = new SUPERVGUI_Thread();
+  myThread->setMain(this);
+
   myIsKilled = false;
-  //myIsRunned = false;
-  myCurrentView = GRAPH;
+  myCurrentView = CANVAS;
   myIsFromStudy = false;
+  myLastGraph = 0;
   study     = theDesktop->getActiveStudy();
-  timer = new QTimer(this);
-  connect(timer, SIGNAL(timeout()), this, SLOT(execute()));
-
-    SALOMEDS::Study_var studyDoc = study->getStudyDocument();
-    SALOMEDS::StudyBuilder_var builder = studyDoc->NewBuilder();
-    SALOMEDS::SComponent_var father = studyDoc->FindComponent(STUDY_SUPERVISION);
-    SALOMEDS::GenericAttribute_var anAttr;
-    SALOMEDS::AttributeName_var    aName;
-    SALOMEDS::AttributePixMap_var  aPixmap;
-    if (father->_is_nil()) {
-        QAD_Operation* op = new SALOMEGUI_ImportOperation( study );
-        op->start();
-        father = builder->NewComponent(STUDY_SUPERVISION);
-       anAttr = builder->FindOrCreateAttribute(father, "AttributeName");
-       aName = SALOMEDS::AttributeName::_narrow(anAttr);
-       //aName->SetValue("Supervision");
-       aName->SetValue( QAD_Application::getDesktop()->getComponentUserName( "SUPERV" ) );
-       
-       anAttr = builder->FindOrCreateAttribute(father, "AttributePixMap");
-       aPixmap = SALOMEDS::AttributePixMap::_narrow(anAttr);
-       aPixmap->SetPixMap( "ICON_OBJBROWSER_Supervision" );
-
-       builder->DefineComponentInstance(father, *Supervision.getEngine());
-        op->finish();
-    };
-
-    objectBrowser = study->getActiveStudyFrame()->getLeftFrame()->getObjectBrowser();
+  
+  SALOMEDS::Study_var studyDoc = study->getStudyDocument();
+  bool aLocked = studyDoc->GetProperties()->IsLocked();
+  SALOMEDS::StudyBuilder_var builder = studyDoc->NewBuilder();
+  SALOMEDS::SComponent_var father = studyDoc->FindComponent(STUDY_SUPERVISION);
+  SALOMEDS::GenericAttribute_var anAttr;
+  SALOMEDS::AttributeName_var    aName;
+  SALOMEDS::AttributePixMap_var  aPixmap;
+  if (father->_is_nil()) {
+    QAD_Operation* op = new SALOMEGUI_ImportOperation( study );
+    op->start();
+    if (aLocked) studyDoc->GetProperties()->SetLocked(false);
+    father = builder->NewComponent(STUDY_SUPERVISION);
+    anAttr = builder->FindOrCreateAttribute(father, "AttributeName");
+    aName = SALOMEDS::AttributeName::_narrow(anAttr);
+    aName->SetValue(QAD_Application::getDesktop()->getComponentUserName( "SUPERV" ) );
     
+    anAttr = builder->FindOrCreateAttribute(father, "AttributePixMap");
+    aPixmap = SALOMEDS::AttributePixMap::_narrow(anAttr);
+    aPixmap->SetPixMap( "ICON_OBJBROWSER_Supervision" );
+    
+    builder->DefineComponentInstance(father, Supervision.getEngine());
+    if (aLocked) studyDoc->GetProperties()->SetLocked(true);
+    op->finish();
+  };
 
-    graph = new SUPERVGUI_Graph(this);
-    array = new SUPERVGUI_Array(this);
-
-    message = study->getActiveStudyFrame()->getRightFrame()->getMessage();
-    notification = new NOTIFICATION_Consumer();
+  objectBrowser = study->getActiveStudyFrame()->getLeftFrame()->getObjectBrowser();
+    
 
-    QBoxLayout * layout = new QVBoxLayout(this);
-    layout->setMargin(0);
-    layout->setSpacing(0);
-    layout->addWidget(graph);
-    layout->addWidget(array);
+  graph = new SUPERVGUI_Graph(this);
+  graph->hide();
+  array = new SUPERVGUI_Array(this);
 
-    sync();
-    show();
-    if ( myLogged && !myLogFileName.isEmpty() && QFile::exists( myLogFileName ) ) {
-      myLogFile = fopen( myLogFileName.latin1(), "a" );
-      if (  myLogFile == NULL )
-       myLogged = false;
-    }
+  myCanvas = new SUPERVGUI_Canvas(this);
+  myCanvasView = new SUPERVGUI_CanvasView(myCanvas, this);
+  
+  message = study->getActiveStudyFrame()->getRightFrame()->getMessage();
+  notification = new NOTIFICATION_Consumer();
+
+  QBoxLayout * layout = new QVBoxLayout(this);
+  layout->setMargin(0);
+  layout->setSpacing(0);
+  layout->addWidget(graph);
+  layout->addWidget(array);
+  layout->addWidget(myCanvasView);
+
+  if (myCurrentView == CANVAS || myCurrentView == CONTROLFLOW) {
+    myCanvas->merge();
+  }
+  sync();
+  show();
+  if ( myLogged && !myLogFileName.isEmpty() && QFile::exists( myLogFileName ) ) {
+    myLogFile = fopen( myLogFileName.latin1(), "a" );
+    if (  myLogFile == NULL )
+      myLogged = false;
+  }
+  myTimer = new QTimer( this );
+  connect( myTimer, SIGNAL(timeout()), this, SLOT(checkExecution()) );
 }
 
 SUPERVGUI_Main::~SUPERVGUI_Main() {
   Trace("SUPERVGUI_Main::~SUPERVGUI_Main");
+
+  // close all opened SubGraphs 
+  QMap<QString, QAD_StudyFrame*>::iterator it;
+  for (it = mySubGraphs.begin(); it != mySubGraphs.end(); ++it) {
+    it.data()->removeEventFilter(this);
+    it.data()->disconnect();
+    it.data()->close();
+
+    QAD_Study* aStudy = it.data()->getStudy();
+    aStudy->removeStudyFrame(it.data());
+  }
+  mySubGraphs.clear();
+  mySubGraphMap.clear();
+  /*
+  QAD_StudyFrame* aSubGraph;
+  for (aSubGraph = mySubGraphs.first(); aSubGraph; aSubGraph = mySubGraphs.next()) {
+    aSubGraph->removeEventFilter(this);
+    aSubGraph->close();
+  }
+  */
+
   if ( myLogFile != NULL) {
     fclose( myLogFile );
   }
   graph->removeLinks();
-  delete notification; // kloss : nota bene : quand un datalow est detruit : verifier que les canaux de notification sont aussi detruit
-  if (!SUPERV_isNull(dataflow)) {
-    if (dataflow->IsExecuting()) {
-      if (QMessageBox::warning(QAD_Application::getDesktop(), tr("WARNING"), 
-                              tr("MSG_DF_RUNNING"), 
-                              tr("MSG_DF_EXECUTION"), 
-                              tr("MSG_DF_KILL")) == 1) {
-       dataflow->Kill();
-      }
-    }
-  }
-}
+  //delete myCanvas;
+  //  delete notification; // kloss : nota bene : quand un datalow est detruit : verifier que les canaux de notification sont aussi detruit
+  notification->_remove_ref();  // kloss : nota bene : quand un datalow est detruit : verifier que les canaux de notification sont aussi detruit
 
-void SUPERVGUI_Main::StartTimer(const char* m) {
-    Trace("SUPERVGUI_Main::StartTimer")
-    if (!timer->isActive()) {
-        timer->start(5);
-        message->setMessage(m);
-    };
-}
-
-void SUPERVGUI_Main::StopTimer(const char* m) {
-    Trace("SUPERVGUI_Main::StopTimer")
-    if (timer->isActive()) {
-        timer->stop();
-        syncNotification();
-        message->setMessage(m);
-       sync();
-    };
+  delete myCanvas;
 }
 
 void SUPERVGUI_Main::filterNotification() {
@@ -259,6 +294,13 @@ void SUPERVGUI_Main::filterNotification() {
   }
 }
 
+void SUPERVGUI_Main::changeDSGraphParameters() {
+  SUPERVGUI_DSGraphParameters* aDlg = new SUPERVGUI_DSGraphParameters(dataflow, dataflow->IsReadOnly());
+  if (aDlg->exec() )
+    sync();
+  delete aDlg;
+}
+
 void SUPERVGUI_Main::syncAsync() {
     Trace("SUPERVGUI_Main::syncAsync")
     QTimer::singleShot(1, this, SLOT(sync()));
@@ -266,51 +308,33 @@ void SUPERVGUI_Main::syncAsync() {
 
 
 /**
- * Called by timer when dataflow is executing
+ * Called by thread when dataflow is executing
  */
-void SUPERVGUI_Main::execute() {
-  SUPERV_CNode aNode;
-  SUPERV::GraphEvent aEvent;
-  SUPERV::GraphState aState;
-  dataflow->EventNoW(aNode, aEvent, aState);
-  if ((aEvent == SUPERV::NoEvent) && (aState == SUPERV::NoState)) return;
-
-  if (!SUPERV_isNull(aNode)) {
+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) aNode->sync();
+  }
+  else {
     SUPERVGUI_Node* aNodePrs; 
+    SUPERVGUI_GraphNode* aGraphNodePrs;
     if (myCurrentView == TABLE) {
-      aNodePrs = (SUPERVGUI_Node*) array->child(aNode->Name(), "SUPERVGUI_Node");
+      aNodePrs = (SUPERVGUI_Node*) array->child(theNodeName, "SUPERVGUI_Node");
+      aGraphNodePrs = (SUPERVGUI_GraphNode*) array->child(theNodeName, "SUPERVGUI_GraphNode");
     } else {
-      aNodePrs = (SUPERVGUI_Node*) graph->child(aNode->Name(), "SUPERVGUI_Node");
+      aNodePrs = (SUPERVGUI_Node*) graph->child(theNodeName, "SUPERVGUI_Node");
+      aGraphNodePrs = (SUPERVGUI_GraphNode*) graph->child(theNodeName, "SUPERVGUI_GraphNode");
+    }
+    if (aGraphNodePrs) {
+      aGraphNodePrs->sync();
+    }
+    else if (aNodePrs) {
+      aNodePrs->syncOnEvent(theNodeState);
     }
-    if (aNodePrs)
-      aNodePrs->sync();
-  }
-  switch (dataflow->State()) {
-  case SUPERV_Editing : 
-    StopTimer(dataflow->IsReadOnly()? tr("MSG_GRAPH_READONLY"): tr("MSG_GRAPH_EDITING"));
-    break;
-  
-  case SUPERV_Suspend : 
-    StopTimer(tr("MSG_GRAPH_SUSPENDED"));
-    break;
-  case SUPERV_Done : 
-    StopTimer(tr("MSG_GRAPH_FINISHED"));
-    break;
-  
-  case SUPERV_Error : 
-    StopTimer(tr("MSG_GRAPH_ABORTED"));
-    break;
-    
-  case SUPERV_Kill : 
-    StopTimer(tr("MSG_GRAPH_KILLED"));
-    break;
-    
   }
 }
 
 
-
 void SUPERVGUI_Main::sync() {
     Trace("SUPERVGUI_Main::sync")
     if ((SUPERV_isNull(dataflow))) return;
@@ -321,9 +345,12 @@ void SUPERVGUI_Main::sync() {
 
     study->updateObjBrowser();
     if (myCurrentView == TABLE) {
-        array->sync();
+      array->sync();
+    } else if (myCurrentView == GRAPH) {
+      graph->sync();
     } else {
-        graph->sync();
+      myCanvas->sync();
+      myCanvas->update();
     }
 }
 
@@ -332,8 +359,11 @@ void SUPERVGUI_Main::showTable() {
   if (myCurrentView == TABLE) return;
 
   if (array->create()) {
+    if (myCurrentView == GRAPH)
+      graph->hide();
+    else
+      myCanvasView->hide();
     myCurrentView = TABLE;
-    graph->hide();
   }
   sync();
 }
@@ -344,6 +374,10 @@ void SUPERVGUI_Main::showFullGraph() {
     array->destroy();
     graph->show();    
   }
+  else if (myCurrentView != GRAPH) { // (myCurrentView == CANVAS) {
+    myCanvasView->hide();
+    graph->show();
+  }
   myCurrentView = GRAPH;
   graph->sync();
   graph->setFullView();
@@ -351,27 +385,41 @@ void SUPERVGUI_Main::showFullGraph() {
 
 
 void SUPERVGUI_Main::showContolFlow() {
+  bool merge = false;
   if (myCurrentView == TABLE) {
     array->destroy();
-    graph->show();    
+    merge = true;
+  }
+  else if (myCurrentView == GRAPH) {
+    graph->hide();
+    merge = true;
   }
   myCurrentView = CONTROLFLOW;
-  graph->sync();
-  graph->setControlView();
+  myCanvas->setControlView();
+  if (merge) {
+    myCanvas->merge();
+    myCanvasView->show();
+  }
 }
 
+void SUPERVGUI_Main::showCanvas() {
+  if (myCurrentView == CANVAS) return;
 
-bool SUPERVGUI_Main::exportDataflow(QString theFile) {
-  Trace("SUPERVGUI_Main::exportDataflow");
-  if ((SUPERV_isNull(dataflow))) return false;
-
-  if (!theFile.isEmpty()) {
-    if (!dataflow->Export(theFile.latin1())) {
-      QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_BAD_WRITING"));
-      return false;
-    }
+  bool merge = false;
+  if (myCurrentView == TABLE) {
+    array->destroy();
+    merge = true;
+  }
+  else if (myCurrentView == GRAPH) {
+    graph->hide();
+    merge = true;
+  }
+  myCurrentView = CANVAS;
+  myCanvas->setFullView();
+  if (merge) {
+    myCanvas->merge();
+    myCanvasView->show();
   }
-  return true;
 }
 
 void SUPERVGUI_Main::insertFile() {
@@ -389,6 +437,9 @@ void SUPERVGUI_Main::insertFile() {
            array->destroy();
            array->create();
          }
+         else if (myCurrentView != GRAPH) { // (myCurrentView == CANVAS) {
+           myCanvas->merge();
+         }
          sync();
         } else {
             QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_BAD_FILE").arg(f));
@@ -406,17 +457,127 @@ void SUPERVGUI_Main::copy() {
   SUPERVGraph_ViewFrame* aViewFrame = dynamic_cast<SUPERVGraph_ViewFrame*>
     (aStudyFrame->getRightFrame()->getViewFrame());
   if(aViewFrame){
-    SUPERV_Graph aNewGraph = dataflow->Copy();
+    SUPERV_Graph aNewGraph; //  = dataflow->StreamCopy();
+    if (dataflow->IsStreamGraph()) {
+      SUPERV_StreamGraph aSGraph = dataflow->ToStreamGraph();
+      if (SUPERV_isNull(aSGraph)) {
+       QMessageBox::warning(QAD_Application::getDesktop(), tr("WARNING"), tr("MSG_CANT_COPY"));
+       return;
+      }
+      aNewGraph = aSGraph->StreamCopy();
+    }
+    else {
+      aNewGraph = dataflow->Copy();
+    }
     QString aNewName(tr("MSG_COPY_PREFIX").arg(++myCopyNum));
     aNewName += dataflow->Name();
     aNewGraph->SetName(aNewName);
-    SUPERVGUI_Main* m = new SUPERVGUI_Main(aViewFrame, 
+    /*SUPERVGUI_Main* m = */new SUPERVGUI_Main(aViewFrame, 
                                           Supervision.getDesktop(), 
                                           aNewGraph);
     study->showFrame(aStudyFrame);
   }
 }
 
+void SUPERVGUI_Main::openSubGraph(SUPERV_CNode theNode, bool correct)
+{
+  if (theNode->IsMacro()) {
+    // get SubGraph from MacroNode
+    SUPERV_Graph aMacro = SUPERV::Graph::_narrow(theNode);
+    SUPERV_Graph aGraph;
+    if (aMacro->IsStreamMacro())
+      aGraph = aMacro->StreamObjRef();
+    else
+      aGraph = aMacro->FlowObjRef();
+
+    // display SubGraph
+    if (SUPERV_isNull(aGraph)) {
+      QMessageBox::warning(QAD_Application::getDesktop(), tr("WARNING"), tr("MSG_NOACCESS"));
+      return;
+    }
+    else {
+      QString aGraphName = aGraph->Name();
+      QAD_StudyFrame* aStudyFrame;
+      if (mySubGraphs.contains(aGraphName)) {
+       aStudyFrame = mySubGraphs[aGraphName];
+       aStudyFrame->setActiveWindow();
+       aStudyFrame->setFocus();
+      }
+      else {
+       aStudyFrame = Supervision.createGraph();
+       if (aStudyFrame) {
+         SUPERVGraph_ViewFrame* aViewFrame = dynamic_cast<SUPERVGraph_ViewFrame*>
+           (aStudyFrame->getRightFrame()->getViewFrame());
+         if(aViewFrame) {
+           /*SUPERVGUI_Main* m = */new SUPERVGUI_Main(aViewFrame, 
+                                                  Supervision.getDesktop(), 
+                                                  aGraph);
+           //    connect(aStudyFrame, SIGNAL(sfStudyFrameClosing(QAD_StudyFrame*)), 
+           //            this,  SLOT(onSubGraphClosed(QAD_StudyFrame*)));
+           connect(aStudyFrame, SIGNAL(sfStudyFrameActivated(QAD_StudyFrame*)), 
+                   this,  SLOT(onSubGraphActivated(QAD_StudyFrame*)));
+           aStudyFrame->installEventFilter(this);
+
+           mySubGraphs.insert(aGraphName, aStudyFrame);
+           mySubGraphMap.insert(aGraphName, theNode->Name());
+
+         }
+       }
+      }
+      study->showFrame(aStudyFrame);
+      if (!correct) myLastGraph = aStudyFrame;
+    }
+  }
+}
+
+bool SUPERVGUI_Main::eventFilter( QObject* o, QEvent* e)
+{
+  // workaround to get close event
+  if (o->inherits("QAD_StudyFrame") && e->type() == QEvent::Close) {
+    QAD_StudyFrame* aFrame = (QAD_StudyFrame*) o;
+    onSubGraphClosed(aFrame);
+  }
+  return SUPERVGraph_View::eventFilter(o, e);
+}
+
+// workaround to fix PAL6255 -> opened SubGraph is not on top
+void SUPERVGUI_Main::onSubGraphActivated(QAD_StudyFrame* theStudyFrame)
+{
+  if (myLastGraph) {
+    QAD_StudyFrame* aFrame = myLastGraph;
+    myLastGraph = 0;
+    aFrame->setActiveWindow();
+    aFrame->setFocus();
+  }
+}
+
+void SUPERVGUI_Main::onSubGraphClosed(QAD_StudyFrame* theStudyFrame)
+{
+  QAD_ViewFrame* viewFrame = theStudyFrame->getRightFrame()->getViewFrame();
+  if(SUPERVGraph_ViewFrame* supervFrame = dynamic_cast<SUPERVGraph_ViewFrame*>(viewFrame)){
+    theStudyFrame->removeEventFilter(this);
+    disconnect(theStudyFrame, 0, this, 0);
+
+    SUPERVGraph_View* view = supervFrame->getViewWidget();
+    SUPERVGUI_Main* aGraph = dynamic_cast<SUPERVGUI_Main*>(view);
+    if (aGraph) {
+      QString aGraphName = aGraph->getDataflow()->Name();
+      QMap<QString, QString>::iterator it = mySubGraphMap.find(aGraphName);
+      if (it != mySubGraphMap.end()) {
+       QString aNodeName = it.data();
+       SUPERVGUI_CanvasNode* aNode = (SUPERVGUI_CanvasNode*) 
+         myCanvas->child(aNodeName, "SUPERVGUI_CanvasNode");
+       if (aNode) {
+         aNode->merge();
+         myCanvas->update();
+       }
+       mySubGraphMap.remove(it);
+      }
+      mySubGraphs.remove(aGraphName);
+    }
+  }
+}
+
 void SUPERVGUI_Main::run() {
   Trace("SUPERVGUI_Main::run")
     if ((SUPERV_isNull(dataflow))) return;
@@ -426,24 +587,29 @@ void SUPERVGUI_Main::run() {
       QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_DF_NOTVALID"));
     } else if (!dataflow->IsExecutable()) {
       QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_DF_NOTEXECUTABLE"));
+    } else if (graph->isAnyLinkCreating() || myCanvasView->isAnyLinkCreating()) {
+      QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_CRL_NOTCOMPLETE"));
     } else {
       myRunTime = QDateTime::currentDateTime();
       if (myIsKilled) {
       //if (myIsRunned) {
        if (!dataflow->ReRun()) {
          QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_DF_BADEXECUTE"));
+         if (dataflow->State() == SUPERV::ErrorState) {
+           kill();
+         }
        } else {
-         StartTimer(tr("MSG_GRAPH_STARTED"));
-         syncNotification();
+         myThread->startThread(tr("MSG_GRAPH_STARTED"));
          sync();
        }
       } else {
        if (!dataflow->Run()) {
          QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_DF_BADEXECUTE"));
+         if (dataflow->State() == SUPERV::ErrorState) {
+           kill();
+         }
        } else {
-         StartTimer(tr("MSG_GRAPH_STARTED"));
-         syncNotification();
-         //myIsRunned = true;
+         myThread->startThread(tr("MSG_GRAPH_STARTED"));
          sync();
        }
       }
@@ -457,13 +623,15 @@ void SUPERVGUI_Main::run() {
 
 void SUPERVGUI_Main::startExecute() {
   Trace("SUPERVGUI_Main::startExecute")
-    if ((SUPERV_isNull(dataflow))) return;
+  if ((SUPERV_isNull(dataflow))) return;
   
   if (dataflow->IsEditing()) {
     if (!dataflow->IsValid()) {
       QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_DF_NOTVALID"));
     } else if (!dataflow->IsExecutable()) {
       QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_DF_NOTEXECUTABLE"));
+    } else if (graph->isAnyLinkCreating() || myCanvasView->isAnyLinkCreating()) {
+      QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_CRL_NOTCOMPLETE"));
     } else {
       myRunTime = QDateTime::currentDateTime();
       if (myIsKilled) {
@@ -471,16 +639,14 @@ void SUPERVGUI_Main::startExecute() {
        if (!dataflow->ReStart()) {
          QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_DF_BADEXECUTE"));
        } else {
-         StartTimer(tr("MSG_GRAPH_STARTED"));
-         syncNotification();
+         myThread->startThread(tr("MSG_GRAPH_STARTED"));
        }
       }
       else {
        if (!dataflow->Start()) {
          QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_DF_BADEXECUTE"));
        } else {
-         StartTimer(tr("MSG_GRAPH_STARTED"));
-         syncNotification();
+         myThread->startThread(tr("MSG_GRAPH_STARTED"));
        }
       }
     }
@@ -498,6 +664,7 @@ void SUPERVGUI_Main::kill() {
       QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_DF_NOTRUNNING"));
     } else if (dataflow->Kill()) {
       myIsKilled = true;
+      myThread->stopThread(tr("MSG_GRAPH_KILLED"));
       sync();
     } else {
       QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_CANTKILL_DF"));
@@ -512,14 +679,14 @@ void SUPERVGUI_Main::suspendResume() {
         QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_DF_NOTRUNNING"));
     } else if (dataflow->State() == SUPERV_Suspend) {
       if (dataflow->Resume()) {
-       message->setMessage(tr("MSG_DF_RESUMED"));
-       sync();
+       myThread->startThread(tr("MSG_DF_RESUMED"));
       } else {
        QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_CANT_RESUME"));
       }
     } else {
       if (dataflow->Suspend()) {
        sync();
+       myThread->stopThread(tr("MSG_GRAPH_SUSPENDED"));
       } else {
        QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), tr("MSG_CANT_SUSPEND"));
       }
@@ -564,8 +731,6 @@ void SUPERVGUI_Main::addNode() {
   Supervision.getBrowser()->choose();
 }
 
-
-
 /**
  * Add Computation node
  */
@@ -580,19 +745,20 @@ void SUPERVGUI_Main::addComputeNode(SUPERV_CNode theNode) {
       aNode->sync();
     }
     break;
-  case CONTROLFLOW: 
-    {
-      SUPERVGUI_Node* aNode = new SUPERVGUI_ComputeNode(graph->viewport(), this, theNode);
-      aNode->hideAll();
-      graph->ResizeGraph(aNode, theNode->X(), theNode->Y());
-      graph->addChild(aNode, theNode->X(), theNode->Y());
-      aNode->sync();
-    }
-    break;
   case TABLE:
     array->destroy();
     array->create();
     break;
+  case CANVAS:
+  case CONTROLFLOW: 
+    {
+      SUPERVGUI_CanvasNode* aNode = new SUPERVGUI_CanvasComputeNode(myCanvas, this, theNode);
+      aNode->move(theNode->X(), theNode->Y());
+      if (myCurrentView == CONTROLFLOW) aNode->hideAll();
+      aNode->show();
+      myCanvas->update();
+    }
+    break;
   }
 }
 
@@ -609,26 +775,27 @@ void SUPERVGUI_Main::addGOTONode(SUPERV_CNode theNode) {
       aNode->sync();
     }
     break;
-  case CONTROLFLOW: 
-    {
-      SUPERVGUI_Node* aNode = new SUPERVGUI_GotoNode(graph->viewport(), this, theNode);
-      aNode->hideAll();
-      graph->ResizeGraph(aNode, theNode->X(), theNode->Y());
-      graph->addChild(aNode, theNode->X(), theNode->Y());
-      aNode->sync();
-    }
-    break;
   case TABLE:
     array->destroy();
     array->create();
     break;
+  case CANVAS:
+  case CONTROLFLOW: 
+    {
+      SUPERVGUI_CanvasNode* aNode = new SUPERVGUI_CanvasGotoNode(myCanvas, this, theNode);
+      aNode->move(theNode->X(), theNode->Y());
+      if (myCurrentView == CONTROLFLOW) aNode->hideAll();
+      aNode->show();
+      myCanvas->update();
+    }
+    break;
   }
 }
 
 /**
  * Add Control node
  */
-void SUPERVGUI_Main::addControlNode(SUPERV_CNode theStartNode, SUPERV_CNode theEndNode) {
+void SUPERVGUI_Main::addControlNode(SUPERV_CNode theStartNode, SUPERV_CNode theEndNode, bool Update) {
   switch (myCurrentView) {
   case GRAPH:
     {
@@ -641,43 +808,71 @@ void SUPERVGUI_Main::addControlNode(SUPERV_CNode theStartNode, SUPERV_CNode theE
       graph->addChild(aStartPrs, theStartNode->X(), theStartNode->Y());
       graph->ResizeGraph(aEndPrs, theEndNode->X(), theEndNode->Y());
       graph->addChild(aEndPrs, theEndNode->X(), theEndNode->Y());
-      aStartPrs->updateLinksPrs();
-      aEndPrs->updateLinksPrs();
+      if (Update) {
+       aStartPrs->updateLinksPrs();
+       aEndPrs->updateLinksPrs();
+      }
       aStartPrs->sync();
       aEndPrs->sync();
       graph->repaintContents();
     }
     break;
+  case TABLE:
+    array->destroy();
+    array->create();
+    break;
+  case CANVAS:
   case CONTROLFLOW: 
     {
-      SUPERVGUI_StartControlNode* aStartPrs = 
-       new SUPERVGUI_StartControlNode(graph->viewport(), this, theStartNode);
-      SUPERVGUI_EndControlNode* aEndPrs = 
-       new SUPERVGUI_EndControlNode(graph->viewport(), this, theEndNode, aStartPrs);
-      
-      aStartPrs->hideAll();
-      aEndPrs->hideAll();
-      
-      graph->ResizeGraph(aStartPrs, theStartNode->X(), theStartNode->Y());
-      graph->addChild(aStartPrs, theStartNode->X(), theStartNode->Y());
-      graph->ResizeGraph(aEndPrs, theEndNode->X(), theEndNode->Y());
-      graph->addChild(aEndPrs, theEndNode->X(), theEndNode->Y());
-      aStartPrs->updateLinksPrs();
-      aEndPrs->updateLinksPrs();
-      aStartPrs->sync();
-      aEndPrs->sync();
-      graph->repaintContents();
+      SUPERVGUI_CanvasStartNode* aStartNode = new SUPERVGUI_CanvasStartNode(myCanvas, this, theStartNode);
+      aStartNode->move(theStartNode->X(), theStartNode->Y());
+      if (myCurrentView == CONTROLFLOW) aStartNode->hideAll();
+
+      SUPERVGUI_CanvasEndNode* aEndNode = new SUPERVGUI_CanvasEndNode(myCanvas, this, theEndNode, aStartNode);
+      aEndNode->move(theEndNode->X(), theEndNode->Y());
+      if (myCurrentView == CONTROLFLOW) aEndNode->hideAll();
+
+      aStartNode->show();
+      aEndNode->show();
+      myCanvas->update();
+    }
+    break;
+  }
+}
+
+
+/**
+ * Add Macro node
+ */
+void SUPERVGUI_Main::addMacroNode(SUPERV_CNode theNode) {
+  //cout<<"### X="<<theNode->X()<<"  Y="<<theNode->Y()<<endl;
+  switch (myCurrentView) {
+  case GRAPH:
+    {
+      SUPERVGUI_Node* aNode = new SUPERVGUI_ComputeNode(graph->viewport(), this, theNode);
+      graph->ResizeGraph(aNode, theNode->X(), theNode->Y());
+      graph->addChild(aNode, theNode->X(), theNode->Y());
+      aNode->sync();
     }
     break;
   case TABLE:
     array->destroy();
     array->create();
     break;
+  case CANVAS:
+  case CONTROLFLOW: 
+    {
+      SUPERVGUI_CanvasNode* aNode = new SUPERVGUI_CanvasMacroNode(myCanvas, this, theNode);
+      aNode->move(theNode->X(), theNode->Y());
+      if (myCurrentView == CONTROLFLOW) aNode->hideAll();
+      aNode->show();
+      myCanvas->update();
+    }
+    break;
   }
 }
 
 
-
 SUPERVGUI_Graph* SUPERVGUI_Main::getGraph() {
     Trace("SUPERVGUI_Main::getGraph")
     return(graph);
@@ -688,6 +883,16 @@ SUPERVGUI_Array* SUPERVGUI_Main::getArray() {
     return(array);
 }
 
+SUPERVGUI_Canvas* SUPERVGUI_Main::getCanvas() {
+    Trace("SUPERVGUI_Main::getCanvas")
+    return(myCanvas);
+}
+
+SUPERVGUI_CanvasView* SUPERVGUI_Main::getCanvasView() {
+    Trace("SUPERVGUI_Main::getCanvasView")
+      return(myCanvasView);
+}
+
 SUPERV_Graph SUPERVGUI_Main::getDataflow() {
     Trace("SUPERVGUI_Main::getDataflow")
     return(dataflow);
@@ -712,9 +917,10 @@ void SUPERVGUI_Main::showPopup(QPopupMenu* p, QMouseEvent* e) {
   Trace("SUPERVGUI_Main::showPopup");
   // To check is Supervision active?
   if (myIsLocked) return;
+  //if (dataflow->IsExecuting()) return;
 
-  //  if (QAD_Application::getDesktop()->getActiveComponent().compare(STUDY_SUPERVISION) !=0) return;
-  if (QAD_Application::getDesktop()->getActiveComponent().compare( QAD_Application::getDesktop()->getComponentUserName( "SUPERV" ) ) !=0) return;
+  //if (QAD_Application::getDesktop()->getActiveComponent().compare(STUDY_SUPERVISION) !=0) return;
+  if (QAD_Application::getDesktop()->getActiveComponent().compare(QAD_Application::getDesktop()->getComponentUserName( "SUPERV" ) ) !=0) return;
 
   checkIsInStudy();
   if (e->button() == RightButton) {
@@ -761,13 +967,12 @@ bool SUPERVGUI_Main::addStudy() {
       aComponent = aBuilder->NewComponent(STUDY_SUPERVISION);
       anAttr = aBuilder->FindOrCreateAttribute(aComponent, "AttributeName");
       aName = SALOMEDS::AttributeName::_narrow(anAttr);
-      //aName->SetValue("Supervision");
-      aName->SetValue( QAD_Application::getDesktop()->getComponentUserName( "SUPERV" ) );
-       
+      //aName->SetValue(STUDY_SUPERVISION);
+      aName->SetValue(QAD_Application::getDesktop()->getComponentUserName( "SUPERV" ) );
       anAttr = aBuilder->FindOrCreateAttribute(aComponent, "AttributePixMap");
       aPixmap = SALOMEDS::AttributePixMap::_narrow(anAttr);
       aPixmap->SetPixMap( "ICON_OBJBROWSER_Supervision" );
-      aBuilder->DefineComponentInstance(aComponent, *Supervision.getEngine());
+      aBuilder->DefineComponentInstance(aComponent, Supervision.getEngine());
       if (aLocked) aStudy->GetProperties()->SetLocked(true);
       anOperation->finish();
     }
@@ -827,7 +1032,7 @@ void SUPERVGUI_Main::setData(SUPERVGUI_PortIn* p) {
 SALOMEDS::SObject_var SearchOrCreateSOWithName(const SALOMEDS::Study_var theStudy,
                                               const SALOMEDS::SObject_var theSO,
                                               const char* theName,
-                                              QAD_Operation* theOperation,
+                                              //QAD_Operation* theOperation,
                                               bool* theStarted) {
   SALOMEDS::SObject_var aResult;
   SALOMEDS::AttributeName_var aName;
@@ -846,11 +1051,12 @@ SALOMEDS::SObject_var SearchOrCreateSOWithName(const SALOMEDS::Study_var theStud
   }
   if (!aResult->_is_nil()) return aResult;
   // add new SObject
+  SALOMEDS::StudyBuilder_var aBuilder = theStudy->NewBuilder();
   if (!*theStarted) {
     *theStarted = true;
-    theOperation->start();
+    //theOperation->start();
+    aBuilder->NewCommand();
   }
-  SALOMEDS::StudyBuilder_var aBuilder = theStudy->NewBuilder();
   aResult = aBuilder->NewObject(theSO);
   anAttr = aBuilder->FindOrCreateAttribute(aResult, "AttributeName");
   aName = SALOMEDS::AttributeName::_narrow(anAttr);
@@ -872,30 +1078,34 @@ bool SUPERVGUI_Main::putDataStudy(SUPERV_Port p, const char* inout) {
   SALOMEDS::AttributePixMap_var  aPixmap;
   bool                           aTransaction = false;
   bool                           aLocked = aStudy->GetProperties()->IsLocked();
-  QAD_Operation*                 op = new SALOMEGUI_ImportOperation( study );
+  //  QAD_Operation*                 op = new SALOMEGUI_ImportOperation( study );
   
   // searching dataflow
   SALOMEDS::SObject_var aSO = aStudy->FindObjectIOR(dataflow->getIOR());
   if (aSO->_is_nil()) { // create new dataflow SObject
     SALOMEDS::SComponent_ptr aComponent = aStudy->FindComponent(STUDY_SUPERVISION);
     if (aComponent->_is_nil()) { // is supervision component not found, then create it
-      QAD_Operation* anOperation = new SALOMEGUI_ImportOperation( study );
-      anOperation->start();
+      //QAD_Operation* anOperation = new SALOMEGUI_ImportOperation( study );
+      //anOperation->start();
+      aBuilder->NewCommand();
       if (aLocked) aStudy->GetProperties()->SetLocked(false);
       aComponent = aBuilder->NewComponent(STUDY_SUPERVISION);
       anAttr = aBuilder->FindOrCreateAttribute(aComponent, "AttributeName");
       aName = SALOMEDS::AttributeName::_narrow(anAttr);
-      aName->SetValue( QAD_Application::getDesktop()->getComponentUserName( "SUPERV" ) );
+      //aName->SetValue(STUDY_SUPERVISION);
+      aName->SetValue(QAD_Application::getDesktop()->getComponentUserName( "SUPERV" ) );
        
       anAttr = aBuilder->FindOrCreateAttribute(aComponent, "AttributePixMap");
       aPixmap = SALOMEDS::AttributePixMap::_narrow(anAttr);
       aPixmap->SetPixMap( "ICON_OBJBROWSER_Supervision" );
-      aBuilder->DefineComponentInstance(aComponent, *Supervision.getEngine());
+      aBuilder->DefineComponentInstance(aComponent, Supervision.getEngine());
       if (aLocked) aStudy->GetProperties()->SetLocked(true);
-      anOperation->finish();
+      //      anOperation->finish();
+      aBuilder->CommitCommand();
     }
     aTransaction = true;
-    op->start();
+    //op->start();
+    aBuilder->NewCommand();
     aSO = aBuilder->NewObject(aComponent);
     anAttr =  aBuilder->FindOrCreateAttribute(aSO, "AttributeName");
     aName = SALOMEDS::AttributeName::_narrow(anAttr);
@@ -904,14 +1114,16 @@ bool SUPERVGUI_Main::putDataStudy(SUPERV_Port p, const char* inout) {
     anIORAttr = SALOMEDS::AttributeIOR::_narrow(anAttr);
     anIORAttr->SetValue(dataflow->getIOR());
   }
+  //QAD_Operation* anOperation = new SALOMEGUI_ImportOperation( study );
   aSO = SearchOrCreateSOWithName(aStudy, aSO,  // get run time SO
-                                QString("Run ") + myRunTime.toString() , op, &aTransaction);
-  aSO = SearchOrCreateSOWithName(aStudy, aSO, p->Node()->Name(), op, &aTransaction); // get node SO
-  aSO = SearchOrCreateSOWithName(aStudy, aSO, inout, op, &aTransaction); // get in/out SO
-  aSO = SearchOrCreateSOWithName(aStudy, aSO, p->Name(), op, &aTransaction); // get port SO
+                                QString("Run ") + myRunTime.toString() /*, anOperation*/, &aTransaction);
+  aSO = SearchOrCreateSOWithName(aStudy, aSO, p->Node()->Name()/*, anOperation*/, &aTransaction); // get node SO
+  aSO = SearchOrCreateSOWithName(aStudy, aSO, inout/*, anOperation*/, &aTransaction); // get in/out SO
+  aSO = SearchOrCreateSOWithName(aStudy, aSO, p->Name()/*, anOperation*/, &aTransaction); // get port SO
 
   if (aLocked) {
-    if (aTransaction) op->finish();
+    if (aTransaction) aBuilder->CommitCommand();
+      //op->finish();
     isIn = false;
     return false;
   }
@@ -942,27 +1154,36 @@ bool SUPERVGUI_Main::putDataStudy(SUPERV_Port p, const char* inout) {
          if (!aTransaction) {
            aTmpSO = aSO;
            aTransaction = true;
-           op->start();
+           //op->start();
+           aBuilder->NewCommand();
          }
          aTmpSO = aDriver->PublishInStudy(aStudy, aTmpSO, anObject, "");
          aBuilder->Addreference(aSO, aTmpSO);
        } else { // can't publish object: abort transaction
-         if (aTransaction) op->abort();
+         if (aTransaction) aBuilder->AbortCommand();
+         //op->abort();
          isIn = false;
          return false;
        }
+      } else { // component has no drivel, but could store IORs (like Calculator)
+       SALOMEDS::SObject_var anIORSO = aStudy->FindObjectIOR(p->ToString());
+       if (!CORBA::is_nil(anIORSO)) aBuilder->Addreference(aSO, anIORSO);
       }
     }
   } else {
     if (!aTransaction) {
       aTransaction = true;
-      op->start();
+      //      op->start();
+      aBuilder->NewCommand();
     }
     anIORAttr->SetValue(p->ToString()); // ior attribute already set for the prevoius condition
   }
   
-  if (aTransaction) op->finish();
-  study->updateObjBrowser();
+  if (aTransaction) 
+    //op->finish();
+    aBuilder->CommitCommand();
+  if (!myThread->running())
+    study->updateObjBrowser();
   isIn = false;
   return true;
 }
@@ -974,6 +1195,8 @@ void SUPERVGUI_Main::ActivatePanning()
     graph->ActivatePanning();
   } else if (array->isVisible()) {
     array->ActivatePanning();
+  } else if (myCanvasView->isVisible()) {
+    myCanvasView->ActivatePanning();
   }
 }
 
@@ -984,6 +1207,8 @@ void SUPERVGUI_Main::ResetView()
     graph->ResetView();
   } else if (array->isVisible()) {
     array->ResetView();
+  } else if (myCanvasView->isVisible()) {
+    myCanvasView->ResetView();
   }
 }
 
@@ -992,6 +1217,7 @@ void SUPERVGUI_Main::setAsFromStudy(bool theToStudy) {
   myIsFromStudy = theToStudy;
   graph->setAsFromStudy(theToStudy);
   array->setAsFromStudy(theToStudy);
+  myCanvas->setAsFromStudy(theToStudy);
 }
 
 void SUPERVGUI_Main::checkIsInStudy() {
@@ -1070,12 +1296,359 @@ bool SUPERVGUI_Main::isFiltered(char* graph,  char* node,   char* type, char* me
   return( b );
 }
 
+void SUPERVGUI_Main::closeEvent(QCloseEvent* e) {
+  e->accept();
+}
 
 
 void SUPERVGUI_Main::setPaletteBackgroundColor(const QColor& color) { 
+
   array->setPaletteBackgroundColor(color);
   graph->setPaletteBackgroundColor(color);
+  myCanvas->setBackgroundColor(color);
+  myCanvasView->setPaletteBackgroundColor(color.light());
   
   SUPERVGraph_View::setPaletteBackgroundColor(color); 
 }
 
+QPtrList< char * > SUPERVGUI_Main::getEventNodes() {
+  return myEventNodes;
+}
+
+void SUPERVGUI_Main::setEventNodes(QPtrList< char * > theEventNodes) {
+  myEventNodes = theEventNodes;
+}
+
+QPtrList< SUPERV::GraphState > SUPERVGUI_Main::getStates() {
+  return myStates;
+}
+
+void SUPERVGUI_Main::setStates(QPtrList< SUPERV::GraphState > theStates) {
+  myStates = theStates;
+}
+
+int SUPERVGUI_Main::getNodesNumber() {
+  //create a list of nodes of the graph
+  SUPERV_Nodes nodes = getDataflow()->Nodes();
+  int RetVal = nodes->CNodes.length() + nodes->FNodes.length() +
+               nodes->INodes.length() + nodes->GNodes.length() +
+              nodes->LNodes.length() + nodes->SNodes.length();
+  return RetVal;
+}
+
+SUPERVGUI_Thread* SUPERVGUI_Main::getMyThread() {
+  return myThread;
+}
+
+void SUPERVGUI_Main::startTimer() {
+  myTimer->start(500);
+}
+
+void SUPERVGUI_Main::executionFinished() {
+  getStudy()->updateObjBrowser();
+  myCanvas->update();
+}
+
+void SUPERVGUI_Main::checkExecution() {
+  if (myThread->finished()) {
+    myTimer->stop();
+    executionFinished();
+  }
+}
+
+/******************************* SUPERVGUI_Thread class ****************************************/
+SUPERVGUI_Thread::SUPERVGUI_Thread()
+     :QThread()
+{
+  myIsActive = false;
+}
+
+SUPERVGUI_Thread::~SUPERVGUI_Thread()
+{
+  //it is a virtual destructor and needs to be determine here
+}
+
+void SUPERVGUI_Thread::startThread(const char* m)
+{
+  if (!myIsActive) {
+    myIsActive = true;
+    //QThread::start();
+    this->start();
+    myMain->getMessage()->setMessage(m); 
+    myMain->sync();
+  }
+}
+
+void SUPERVGUI_Thread::stopThread(const char* m)
+{
+  myMain->getMessage()->setMessage(m);
+}
+
+void SUPERVGUI_Thread::setMain(SUPERVGUI_Main* theMain)
+{
+  myMain = theMain;
+}
+
+void SUPERVGUI_Thread::KillThread(bool theValue)
+{
+  myMutex.lock();
+  myIsActive = !(theValue);
+  myMutex.unlock();
+}
+
+typedef TVoidMemFun2ArgEvent<SUPERVGUI_Main, char*, SUPERV::GraphState> TNodeSyncEvent;
+
+void SUPERVGUI_Thread::run()
+{
+  SUPERV_CNode aNode = NULL;
+  SUPERV::GraphEvent aEvent = SUPERV::UndefinedEvent ;
+  SUPERV::GraphState aState = SUPERV::UndefinedState ;
+
+  SUPERV_CNode aPrevNode = NULL;
+  SUPERV::GraphEvent aPrevEvent = SUPERV::UndefinedEvent ;
+  SUPERV::GraphState aPrevState = SUPERV::UndefinedState ;
+
+  char * aName;
+  char * aPrevName;
+
+  QPtrList< char * > anEventNodes;
+  QPtrList< SUPERV::GraphState > aStates;
+
+  myMain->startTimer();
+  while(myIsActive) {
+    myMain->getDataflow()->Event(aNode, aEvent, aState);
+    
+    if (aEvent == SUPERV::UndefinedEvent && aState == SUPERV::UndefinedState
+       ||
+       aEvent == SUPERV::NoEvent && aState == SUPERV::NoState
+       ||
+       aEvent == SUPERV::KillEvent && aState == SUPERV::KillState) {
+
+      if (myMain->getEventNodes().count()) {
+       myMain->removeEventNodes();
+      }    
+      if (myMain->getStates().count()) {
+       myMain->removeStates();
+      }    
+      myIsActive = false;
+    }
+    else {    
+      if ( aNode != NULL && !CORBA::is_nil( aNode ) ) {
+       aName = aNode->Name();
+      }
+
+      if ( aPrevNode == NULL || CORBA::is_nil( aPrevNode ) ) {  //first initialize aPrev... variables
+       anEventNodes = myMain->getEventNodes();
+       anEventNodes.append( &aName ) ;
+       myMain->setEventNodes(anEventNodes);
+       
+       aStates = myMain->getStates();
+       aStates.append( &aState ) ;
+       myMain->setStates(aStates);
+      }
+      else {
+       if ( aEvent == aPrevEvent && aState == aPrevState) {
+         QString aNameStr = aName;
+         QString aPrevNameStr = aPrevName;
+         if ( aNameStr != aPrevNameStr ) {
+           anEventNodes = myMain->getEventNodes();
+           anEventNodes.append( &aName ) ;
+           myMain->setEventNodes(anEventNodes);
+           
+           aStates = myMain->getStates();
+           aStates.append( &aState ) ;
+           myMain->setStates(aStates);
+         }
+       }
+       else {
+         anEventNodes = myMain->getEventNodes();
+         anEventNodes.append( &aName ) ;
+         myMain->setEventNodes(anEventNodes);
+         
+         aStates = myMain->getStates();
+         aStates.append( &aState ) ;
+         myMain->setStates(aStates);
+       }
+      }
+    }      
+    if (!myIsActive) {
+      switch (myMain->getDataflow()->State()) {
+      case SUPERV_Editing :     
+       stopThread(myMain->getDataflow()->IsReadOnly()? tr("MSG_GRAPH_READONLY"): tr("MSG_GRAPH_EDITING"));
+       break;
+       
+      case SUPERV_Suspend : 
+       stopThread(tr("MSG_GRAPH_SUSPENDED"));
+       break;
+      case SUPERV_Done : 
+       stopThread(tr("MSG_GRAPH_FINISHED"));
+       break;
+       
+      case SUPERV_Error :
+       stopThread(tr("MSG_GRAPH_ABORTED"));
+       break;
+       
+      case SUPERV_Kill:
+       stopThread(tr("MSG_GRAPH_KILLED"));
+       break;
+      }
+
+      break;
+    }
+    if ( myMain->getEventNodes().count() ) {    
+      //if list not empty call execute() -> sync()
+      char * aNodeName = *(myMain->getEventNodes().getFirst());
+      SUPERV::GraphState aNodeState = *(myMain->getStates().getFirst());
+
+      // It is PROHIBITED to deal with widgets in a secondary thread, so event posting is used here
+      ProcessVoidEvent( new TNodeSyncEvent( myMain, &SUPERVGUI_Main::execute, aNodeName, aNodeState ) );
+
+      myMain->removeFirstEN();
+      myMain->removeFirstS();
+    }
+
+    aPrevNode = aNode;
+    aPrevEvent = aEvent;
+    aPrevState = aState;
+
+    if ( aPrevNode == NULL || CORBA::is_nil( aPrevNode ) ) 
+      aPrevName = "";
+    else 
+      aPrevName = aPrevNode->Name();
+    
+    //usleep(10);
+    //msleep(5);
+  }
+  // VSR: 04/12/03 ---> update object browser ufter finishing
+//   qApp->lock();
+//   myMain->getStudy()->updateObjBrowser();
+//   qApp->unlock();
+  // VSR: 04/12/03 <---    
+
+  QThread::exit();
+}
+
+/******************************* SUPERVGUI_DSGraphParameters class ****************************************/
+/*!
+  Constructor
+*/
+SUPERVGUI_DSGraphParameters::SUPERVGUI_DSGraphParameters(SUPERV_Graph theGraph, bool isReadOnly)
+     : QDialog( QAD_Application::getDesktop(), "", true, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) 
+{
+  Trace("SUPERVGUI_DSGraphParameters::SUPERVGUI_DSGraphParameters");
+  setCaption( tr( "TLT_DSGRAPHPARAMS" ) );
+  setSizeGripEnabled( true );
+  myGraph = theGraph;
+
+  QGridLayout* TopLayout = new QGridLayout( this );
+  TopLayout->setSpacing( 6 );
+  TopLayout->setMargin( 11 );
+    
+  QGroupBox* TopGroup = new QGroupBox( this, "TopGroup" );
+  TopGroup->setColumnLayout(0, Qt::Vertical );
+  TopGroup->layout()->setSpacing( 0 );
+  TopGroup->layout()->setMargin( 0 );
+  QGridLayout* TopGroupLayout = new QGridLayout( TopGroup->layout() );
+  TopGroupLayout->setAlignment( Qt::AlignTop );
+  TopGroupLayout->setSpacing( 6 );
+  TopGroupLayout->setMargin( 11 );
+
+  // DeltaTime
+  QLabel* DeltaTimeL = new QLabel( tr( "DELTATIME_LBL" ), TopGroup );  
+  TopGroupLayout->addWidget( DeltaTimeL, 0, 0 );
+  
+  myDeltaTime = new QAD_SpinBoxDbl( TopGroup, 0.0, 1.0, 0.1);
+  myDeltaTime->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
+  TopGroupLayout->addWidget( myDeltaTime, 0, 1 );
+
+  // TimeOut
+  QLabel* TimeOutL = new QLabel( tr( "TIMEOUT_LBL" ), TopGroup); 
+  TopGroupLayout->addWidget( TimeOutL, 1, 0 );
+
+  myTimeOut = new QLineEdit( TopGroup );
+  myTimeOut->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
+  myTimeOut->setValidator( new QIntValidator(this) );
+  myTimeOut->setMinimumSize( 100, 0 );
+  myTimeOut->setReadOnly( isReadOnly );
+  TopGroupLayout->addWidget( myTimeOut, 1, 1 );
+
+  // DataStreamTrace
+  QLabel* DataStreamTraceL = new QLabel( tr( "DATASTREAMTRACE_LBL" ), TopGroup); 
+  TopGroupLayout->addWidget( DataStreamTraceL, 2, 0 );
+
+  myDataStreamTrace = new QComboBox( TopGroup );
+  myDataStreamTrace->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
+  myDataStreamTrace->insertItem("WithoutTrace");
+  myDataStreamTrace->insertItem("SummaryTrace");
+  myDataStreamTrace->insertItem("DetailedTrace");
+  TopGroupLayout->addWidget( myDataStreamTrace, 2, 1 );
+
+  QGroupBox* GroupButtons = new QGroupBox( this, "GroupButtons" );
+  GroupButtons->setColumnLayout(0, Qt::Vertical );
+  GroupButtons->layout()->setSpacing( 0 );
+  GroupButtons->layout()->setMargin( 0 );
+  QGridLayout* GroupButtonsLayout = new QGridLayout( GroupButtons->layout() );
+  GroupButtonsLayout->setAlignment( Qt::AlignTop );
+  GroupButtonsLayout->setSpacing( 6 );
+  GroupButtonsLayout->setMargin( 11 );
+  
+  QPushButton* okB     = new QPushButton( tr( "BUT_OK" ),     GroupButtons );
+  QPushButton* cancelB = new QPushButton( tr( "BUT_CANCEL" ), GroupButtons );
+
+  GroupButtonsLayout->addWidget( okB, 0, 0 );
+  GroupButtonsLayout->addItem  ( new QSpacerItem( 5, 5, QSizePolicy::Expanding, QSizePolicy::Minimum ), 0, 1 );
+  GroupButtonsLayout->addWidget( cancelB, 0, 2 );
+
+  TopLayout->addWidget( TopGroup,     0, 0 );
+  TopLayout->addWidget( GroupButtons, 1, 0 );
+
+  connect( okB,     SIGNAL( clicked() ), this, SLOT( accept() ) );
+  connect( cancelB, SIGNAL( clicked() ), this, SLOT( reject() ) );
+
+  setData();
+}
+
+/*!
+  Destructor
+*/
+SUPERVGUI_DSGraphParameters::~SUPERVGUI_DSGraphParameters() {
+  Trace("SUPERVGUI_DSGraphParameters::~SUPERVGUI_DSGraphParameters");
+}
+
+/*!
+  Sets data function
+*/
+void SUPERVGUI_DSGraphParameters::setData() {
+  double aDeltaTime;
+  long aTimeOut;
+  SUPERV::KindOfDataStreamTrace aDataStreamTrace;
+
+//  myGraph->StreamParams(aTimeOut, aDataStreamTrace, aDeltaTime);
+  if (myGraph->IsStreamGraph()) {
+    SUPERV_StreamGraph aSGraph = myGraph->ToStreamGraph();
+    if (!SUPERV_isNull(aSGraph)) 
+      aSGraph->StreamParams(aTimeOut, aDataStreamTrace, aDeltaTime);
+  }
+
+  myDeltaTime->setValue(aDeltaTime);
+  myTimeOut->setText(QString("%1").arg(aTimeOut));
+  myDataStreamTrace->setCurrentItem((int)aDataStreamTrace);
+}
+
+/*!
+  <OK> button slot
+*/
+void SUPERVGUI_DSGraphParameters::accept() {
+//   myGraph->SetStreamParams( myTimeOut->text().toLong(),
+//                         (SUPERV::KindOfDataStreamTrace) myDataStreamTrace->currentItem(),
+//                         myDeltaTime->value());
+  if (myGraph->IsStreamGraph()) {
+    SUPERV_StreamGraph aSGraph = myGraph->ToStreamGraph();
+    if (!SUPERV_isNull(aSGraph)) 
+      aSGraph->SetStreamParams( myTimeOut->text().toLong(),
+                               (SUPERV::KindOfDataStreamTrace) myDataStreamTrace->currentItem(),
+                               myDeltaTime->value());
+  }
+  QDialog::accept();
+}