A lot of unneccessary "cout"-s and MESSAGE()-s were removed.

diff --git a/src/SUPERVGUI/SUPERVGUI_ArrayView.cxx b/src/SUPERVGUI/SUPERVGUI_ArrayView.cxx
index 92725e0f8c36aa57420d77119bb114ffa19b0ab2..16561b0555db6329549e64ac5909e90b5859ab8d 100644 (file)
--- a/src/SUPERVGUI/SUPERVGUI_ArrayView.cxx
+++ b/src/SUPERVGUI/SUPERVGUI_ArrayView.cxx
@@ -80,7 +80,6 @@ SUPERVGUI_ArrayView::~SUPERVGUI_ArrayView()
 
 void SUPERVGUI_ArrayView::ActivatePanning()
 {
-  cout<<" ===> SUPERVGUI_ArrayView::ActivatePanning()"<<endl;
   myIsPanActivated = true;
   viewport()->setMouseTracking(false);
 }
@@ -109,7 +108,6 @@ void SUPERVGUI_ArrayView::changeBackground()
 void SUPERVGUI_ArrayView::contentsMousePressEvent(QMouseEvent* theEvent) {
   myGlobalPoint = theEvent->globalPos();
 
-  cout<<" ===> myIsPanActivated = "<<myIsPanActivated<<endl;
   if (((theEvent->button() == Qt::MidButton)
        &&
        (theEvent->state() == Qt::ControlButton)) || myIsPanActivated) {

diff --git a/src/SUPERVGUI/SUPERVGUI_Canvas.cxx b/src/SUPERVGUI/SUPERVGUI_Canvas.cxx
index fb1f77cf38661bbe4f61fd2b0308a312182f5143..1a622caa17ce07833503a909442c9de567fb424c 100644 (file)
--- a/src/SUPERVGUI/SUPERVGUI_Canvas.cxx
+++ b/src/SUPERVGUI/SUPERVGUI_Canvas.cxx
@@ -98,13 +98,17 @@ SUPERVGUI_Canvas::SUPERVGUI_Canvas(SUPERVGUI_Main* m):
 
 
 SUPERVGUI_Canvas::~SUPERVGUI_Canvas() {
+  // asv : 17.01.05 : why delete its own children (CanvasNode-s)?
+  // they must be destroyed automatically.
   QObjectList* aNodeList = queryList("SUPERVGUI_CanvasNode");
   QObjectListIt aIt(*aNodeList);
   QObject* anObj;
-  while ((anObj = aIt.current()) != 0) {
+  while ( (anObj = aIt.current()) != 0 ) {
     ++aIt;
     delete anObj;
   }
+  // asv : list returned by queryList() must be removed
+  delete aNodeList;
 }
 
 void SUPERVGUI_Canvas::addView(QCanvasView* theView)
@@ -157,7 +161,6 @@ void SUPERVGUI_Canvas::updateLinks()
 }
 
 void SUPERVGUI_Canvas::sync() {
-  //  MESSAGE("===> SUPERVGUI_Canvas::sync()");
   if (SUPERV_isNull(myMain->getDataflow())) return;
       
   SUPERVGUI_CanvasNode* ihmNode;
@@ -174,7 +177,6 @@ void SUPERVGUI_Canvas::sync() {
  * Synchronizes Graph presentation with internal graph structure
  */
 void SUPERVGUI_Canvas::merge() {
-  //  MESSAGE("===> SUPERVGUI_Canvas::merge()");
   if (SUPERV_isNull(myMain->getDataflow())) return;
       
   SUPERVGUI_CanvasNode* ihmNode;

diff --git a/src/SUPERVGUI/SUPERVGUI_CanvasArray.cxx b/src/SUPERVGUI/SUPERVGUI_CanvasArray.cxx
index cce72c35af61b6b06a167d92aaf910226f3d2a6c..c7ad48573cf60e87c407af55f52ac7eb74ca8641 100644 (file)
--- a/src/SUPERVGUI/SUPERVGUI_CanvasArray.cxx
+++ b/src/SUPERVGUI/SUPERVGUI_CanvasArray.cxx
@@ -25,13 +25,11 @@ using namespace std;
       else x += (CELL_WIDTH  + CELL_SPACE); \
       cell = getCellNode(aCNode); \
       if (cell == NULL) { \
-        cout<<" ***>  cell is NULL => create a new one"<<endl; \
         SUPERVGUI_CanvasCellNode* aNode = new SUPERVGUI_CanvasCellNode(this, myMain, aCNode); \
         aNode->move(x, y); \
         aNode->show(); \
         aNode->sync(); \
       } else { \
-        cout<<" ***>  cell is NOT NULL => not create"<<endl; \
         cell->move(x, y); \
         cell->show(); \
       } \
@@ -49,7 +47,6 @@ using namespace std;
       SUPERV_CNode aCNodeEnd = SUPERV::CNode::_narrow(nodes->NodesName[co]->Coupled()); \
       cell = getCellNode(aCNode); \
       if (cell == NULL) { \
-        cout<<" ***>  cell control is NULL => create a new one"<<endl; \
         SUPERVGUI_CanvasCellNode* aNode = new SUPERVGUI_CanvasCellNode(this, myMain, aCNode); \
         aNode->move(x, y); \
         aNode->show(); \
@@ -60,7 +57,6 @@ using namespace std;
         aNodeEnd->show(); \
         aNodeEnd->sync(); \
       } else { \
-        cout<<" ***>  cell control is NOT NULL => not create"<<endl; \
         cell->move(x, y); \
         cell->show(); \
         y += (CELL_HEIGHT + CELL_SPACE); \
@@ -122,7 +118,6 @@ SUPERVGUI_CanvasArray::~SUPERVGUI_CanvasArray() {
 }
 
 void SUPERVGUI_CanvasArray::sync() {
-  MESSAGE("===> SUPERVGUI_CanvasArray::sync()");
   if (SUPERV_isNull(myMain->getDataflow())) return;
   
   SUPERVGUI_CanvasCellNode* ihmNode;
@@ -166,14 +161,12 @@ bool SUPERVGUI_CanvasArray::create() {
   if (ncols == 0) return false;
   
   QCanvasItemList anIL1 = this->allItems();
-  cout<<" ===> begin create() : CanvasArray has "<<anIL1.count()<<" items!"<<endl;
 
   QPen pen(Qt::SolidLine);
   pen.setWidth(1);
   QBrush br(MAIN_TITLE);
   
   if (myOldThreadNum) { //some of threads allready exist on canvas array
-    cout<<" ===> second ... creation !"<<endl;
     QObjectList* aThreadList = queryList("QCanvasRectangle");
     QObjectListIt aItThread(*aThreadList);
     QCanvasRectangle* anObjThread;
@@ -215,7 +208,6 @@ bool SUPERVGUI_CanvasArray::create() {
   myOldThreadNum = ncols;
   
   QCanvasItemList anIL2 = this->allItems();
-  cout<<" ===> 1 create() : CanvasArray has "<<anIL2.count()<<" items!"<<endl;
   
   y = 60;
   bool LevelHasDiffNT = false;
@@ -232,7 +224,6 @@ bool SUPERVGUI_CanvasArray::create() {
       ADDNODES(FNodes,LevelHasDiffNT);
 
        QCanvasItemList anIL3 = this->allItems();
-       cout<<" ===> 2 create() : CanvasArray has "<<anIL3.count()<<" items!"<<endl;
 
       if (aSumNum > nodes->FNodes.length())
        LevelHasDiffNT = true;
@@ -265,7 +256,6 @@ bool SUPERVGUI_CanvasArray::create() {
   nodeY = y + CELL_HEIGHT*2;
 
   QCanvasItemList anIL4 = this->allItems();
-  cout<<" ===> end create() : CanvasArray has "<<anIL4.count()<<" items!"<<endl;
 
   return true;
 
@@ -275,9 +265,7 @@ void SUPERVGUI_CanvasArray::destroy() {
   Trace("SUPERVGUI_Array::destroy");
   
   QCanvasItemList anIL1 = this->allItems();
-  cout<<" ===> begin destroy() : CanvasArray has "<<anIL1.count()<<" items!"<<endl;
   const QObjectList* anCL1 = this->children();
-  cout<<" ===> begin destroy() : CanvasArray has "<<anCL1->count()<<" children!"<<endl;
 
   QObjectList* aCellList = queryList("SUPERVGUI_CanvasCellNode");
   QObjectListIt aIt(*aCellList);
@@ -320,7 +308,6 @@ void SUPERVGUI_CanvasArray::destroy() {
   delete aTextList; 
 
   QCanvasItemList anIL2 = this->allItems();
-  cout<<" ===> end destroy() : CanvasArray has "<<anIL2.count()<<" items!"<<endl; 
 }
 
 SUPERVGUI_CanvasCellNode* SUPERVGUI_CanvasArray::getCellNode(SUPERV::CNode_ptr theNode) const

diff --git a/src/SUPERVGUI/SUPERVGUI_CanvasCellNodePrs.cxx b/src/SUPERVGUI/SUPERVGUI_CanvasCellNodePrs.cxx
index 3e08181f0d3b7e3f79f528304c999b59b61f31c6..239f53a8cab531ad71b5fd8038d807febec0e594 100644 (file)
--- a/src/SUPERVGUI/SUPERVGUI_CanvasCellNodePrs.cxx
+++ b/src/SUPERVGUI/SUPERVGUI_CanvasCellNodePrs.cxx
@@ -20,17 +20,16 @@ SUPERVGUI_CanvasCellNodePrs::SUPERVGUI_CanvasCellNodePrs(QCanvas* theCanvas, SUP
   myStatusWidth(CELL_WIDTH_PART), 
   SUPERVGUI_CanvasNodePrs(theCanvas, theNode, true)
 {
-  MESSAGE("SUPERVGUI_CanvasCellNodePrs::SUPERVGUI_CanvasCellNodePrs");
-
-  //setZ(0);
   myPortVisible = false;
-
   QCanvasItemList anIL2 = canvas()->allItems();
-  cout<<" ===> 1 conatructor CellPrs : CanvasArray has "<<anIL2.count()<<" children!"<<endl;
+}
+
+SUPERVGUI_CanvasCellNodePrs::~SUPERVGUI_CanvasCellNodePrs()
+{
 }
 
 void SUPERVGUI_CanvasCellNodePrs::moveBy(double dx, double dy) {
-  Trace("SUPERVGUI_CanvasCellNodePrs::moveBy");
+//Trace("SUPERVGUI_CanvasCellNodePrs::moveBy");
   int aX = (int) (x()+dx);
   int aY = (int) (y()+dy);
 
@@ -44,12 +43,12 @@ void SUPERVGUI_CanvasCellNodePrs::moveBy(double dx, double dy) {
 }
 
 void SUPERVGUI_CanvasCellNodePrs::drawShape(QPainter& thePainter) {
-  MESSAGE("SUPERVGUI_CanvasCellNodePrs::drawShape  begin");
+//MESSAGE("SUPERVGUI_CanvasCellNodePrs::drawShape  begin");
   drawTitle(thePainter);
   drawLabel(thePainter);
   drawStatus(thePainter);
   drawFrame(thePainter);
-  MESSAGE("SUPERVGUI_CanvasCellNodePrs::drawShape  end");
+//MESSAGE("SUPERVGUI_CanvasCellNodePrs::drawShape  end");
 }
 
 void drawCellText(QPainter& thePainter, const QString& theText, 
@@ -85,7 +84,7 @@ void drawCellText(QPainter& thePainter, const QString& theText,
 }
 
 void SUPERVGUI_CanvasCellNodePrs::drawTitle(QPainter& thePainter) {
-  MESSAGE("SUPERVGUI_CanvasCellNodePrs::drawTitle  begin");
+//MESSAGE("SUPERVGUI_CanvasCellNodePrs::drawTitle  begin");
   QBrush saved = thePainter.brush();
   if (getNode()->getEngine()->IsLoop() || getNode()->getEngine()->IsEndLoop()
       ||
@@ -101,12 +100,12 @@ void SUPERVGUI_CanvasCellNodePrs::drawTitle(QPainter& thePainter) {
   thePainter.setBrush(saved);
 
   drawCellText(thePainter, getNode()->getEngine()->Name(), getTitleRect(), Qt::AlignLeft);
-  MESSAGE("SUPERVGUI_CanvasCellNodePrs::drawTitle  end");
+//MESSAGE("SUPERVGUI_CanvasCellNodePrs::drawTitle  end");
 }
 
 void SUPERVGUI_CanvasCellNodePrs::drawLabel(QPainter& thePainter) 
 {
-  MESSAGE("SUPERVGUI_CanvasCellNodePrs::drawLabel  begin");
+//MESSAGE("SUPERVGUI_CanvasCellNodePrs::drawLabel  begin");
   QRect r = getLabelRect();
 
   QPen saved = thePainter.pen();
@@ -115,12 +114,12 @@ void SUPERVGUI_CanvasCellNodePrs::drawLabel(QPainter& thePainter)
   thePainter.setPen(saved);
 
   drawCellText(thePainter, getNode()->getLabelText(), r, Qt::AlignLeft);
-  MESSAGE("SUPERVGUI_CanvasCellNodePrs::drawLabel  end");
+//MESSAGE("SUPERVGUI_CanvasCellNodePrs::drawLabel  end");
 }
 
 void SUPERVGUI_CanvasCellNodePrs::drawStatus(QPainter& thePainter) 
 {
-  MESSAGE("SUPERVGUI_CanvasCellNodePrs::drawStatus  begin");
+//MESSAGE("SUPERVGUI_CanvasCellNodePrs::drawStatus  begin");
   QRect r = getStatusRect();
 
   QBrush savedB = thePainter.brush();
@@ -129,36 +128,36 @@ void SUPERVGUI_CanvasCellNodePrs::drawStatus(QPainter& thePainter)
   thePainter.setBrush(savedB);
 
   drawCellText(thePainter, getStatus(), r, Qt::AlignHCenter);
-  MESSAGE("SUPERVGUI_CanvasCellNodePrs::drawStatus  end");
+//MESSAGE("SUPERVGUI_CanvasCellNodePrs::drawStatus  end");
 }
 
 QRect SUPERVGUI_CanvasCellNodePrs::getTitleRect() const
 {
-  MESSAGE("SUPERVGUI_CanvasCellNodePrs::getTitleRect()!!!");
-  cout<<" xT = "<<(int)x()
-      <<" yT = "<<(int)y()
-      <<" wT = "<<getTitleWidth()
-      <<" hT = "<<getTitleHeight()<<endl;
+//MESSAGE("SUPERVGUI_CanvasCellNodePrs::getTitleRect()!!!");
+//  cout<<" xT = "<<(int)x()
+//      <<" yT = "<<(int)y()
+//      <<" wT = "<<getTitleWidth()
+//      <<" hT = "<<getTitleHeight()<<endl;
   return QRect((int)x(), (int)y(), getTitleWidth(), getTitleHeight());
 }
 
 QRect SUPERVGUI_CanvasCellNodePrs::getLabelRect() const
 {
-  MESSAGE("SUPERVGUI_CanvasCellNodePrs::getLabelRect()!!!");
-  cout<<" xL = "<<((int)x())+getTitleWidth()
-      <<" yL = "<<(int)y()
-      <<" wL = "<<getLabelWidth()
-      <<" hL = "<<getLabelHeight()<<endl;
+//  MESSAGE("SUPERVGUI_CanvasCellNodePrs::getLabelRect()!!!");
+//  cout<<" xL = "<<((int)x())+getTitleWidth()
+//      <<" yL = "<<(int)y()
+//      <<" wL = "<<getLabelWidth()
+//      <<" hL = "<<getLabelHeight()<<endl;
   return QRect(((int)x())+getTitleWidth(), (int)y(), getLabelWidth(), getLabelHeight());
 }
 
 QRect SUPERVGUI_CanvasCellNodePrs::getStatusRect() const
 {
-  MESSAGE("SUPERVGUI_CanvasCellNodePrs::getStatusRect()!!!");
-  cout<<" xS = "<<((int)x())+getTitleWidth()+getLabelWidth()
-      <<" yS = "<<(int)y()
-      <<" wS = "<<getStatusWidth()
-      <<" hS = "<<getStatusHeight()<<endl;
+//  MESSAGE("SUPERVGUI_CanvasCellNodePrs::getStatusRect()!!!");
+//  cout<<" xS = "<<((int)x())+getTitleWidth()+getLabelWidth()
+//      <<" yS = "<<(int)y()
+//      <<" wS = "<<getStatusWidth()
+//      <<" hS = "<<getStatusHeight()<<endl;
   return QRect(((int)x())+getTitleWidth()+getLabelWidth(), (int)y(),
               getStatusWidth(), getStatusHeight());
 }
@@ -177,13 +176,13 @@ int SUPERVGUI_CanvasCellNodePrs::getStatusWidth() const {
 
 int SUPERVGUI_CanvasCellNodePrs::width() const
 {
-  MESSAGE("SUPERVGUI_CanvasCellNodePrs::width()  begin");
+//MESSAGE("SUPERVGUI_CanvasCellNodePrs::width()  begin");
   return myTitleWidth + myLabelWidth + myStatusWidth;
 }
 
 int SUPERVGUI_CanvasCellNodePrs::height() const
 {
-  MESSAGE("SUPERVGUI_CanvasCellNodePrs::height()  begin");
+//MESSAGE("SUPERVGUI_CanvasCellNodePrs::height()  begin");
   return getTitleHeight();
 }
 
@@ -233,9 +232,6 @@ void SUPERVGUI_CanvasCellNodePrs::setState(SUPERV::GraphState theState)
     break;
   }
 
-  cout<<"=================>>> setState from CELL!"<<endl;
   canvas()->setChanged(getStatusRect());
-  cout<<"=================>>> before canvas()->update()!"<<endl;
   canvas()->update();
-  cout<<"=================>>> after canvas()->update()!"<<endl;
 }

diff --git a/src/SUPERVGUI/SUPERVGUI_CanvasCellNodePrs.h b/src/SUPERVGUI/SUPERVGUI_CanvasCellNodePrs.h
index f8350075130d3eacc9228a7fd71ba1dc0936f8ce..2e217086b945861d04f7f00263762740e8b929e8 100644 (file)
--- a/src/SUPERVGUI/SUPERVGUI_CanvasCellNodePrs.h
+++ b/src/SUPERVGUI/SUPERVGUI_CanvasCellNodePrs.h
@@ -18,7 +18,7 @@ class SUPERVGUI_CanvasCellNodePrs: public SUPERVGUI_CanvasNodePrs {
 
   public:
     SUPERVGUI_CanvasCellNodePrs(QCanvas* theCanvas, SUPERVGUI_CanvasCellNode* theNode);
-    virtual ~SUPERVGUI_CanvasCellNodePrs() {}
+    virtual ~SUPERVGUI_CanvasCellNodePrs();
 
     virtual void moveBy(double dx, double dy);
  

diff --git a/src/SUPERVGUI/SUPERVGUI_CanvasControlNode.cxx b/src/SUPERVGUI/SUPERVGUI_CanvasControlNode.cxx
index 22f57e8393b94eba3ee1f6f665247346a02d0d70..be508cac8eb168025787e9d58a1eedb65afdab53 100644 (file)
--- a/src/SUPERVGUI/SUPERVGUI_CanvasControlNode.cxx
+++ b/src/SUPERVGUI/SUPERVGUI_CanvasControlNode.cxx
@@ -315,6 +315,10 @@ SUPERVGUI_CanvasCellNode::SUPERVGUI_CanvasCellNode(QObject* theParent,
     myIsControl = true;
 }
 
+SUPERVGUI_CanvasCellNode::~SUPERVGUI_CanvasCellNode()
+{
+}
+
 QPopupMenu* SUPERVGUI_CanvasCellNode::getPopupMenu(QWidget* theParent)
 {
   QPopupMenu* popup = SUPERVGUI_CanvasNode::getPopupMenu(theParent);
@@ -335,8 +339,6 @@ SUPERVGUI_CanvasCellNode* SUPERVGUI_CanvasCellNode::getPairCell() {
 }
 
 void SUPERVGUI_CanvasCellNode::sync() {
-  MESSAGE("===> SUPERVGUI_CanvasCellNode::sync() " << getEngine()->Name() << ", state " << getEngine()->State());
-
   const bool isExecuting = getMain()->getDataflow()->IsExecuting();
   //if getEngine() is a MacroNode then set it state to state of its subgraph
   if ( getEngine()->IsMacro() && isExecuting ) {
@@ -372,11 +374,9 @@ bool SUPERVGUI_CanvasCellNode::setNodeName(QString aName)
 
 SUPERVGUI_CanvasNodePrs* SUPERVGUI_CanvasCellNode::createPrs() const
 {
-  MESSAGE(" -> SUPERVGUI_CanvasCellNode::createPrs()");
   SUPERVGUI_CanvasNodePrs* aPrs = 
     new SUPERVGUI_CanvasCellNodePrs(getMain()->getCanvasArray(), 
                                    (SUPERVGUI_CanvasCellNode*)this);
-  MESSAGE(" -> SUPERVGUI_CanvasCellNode::createPrs() 11");
   return aPrs;
 }
 

diff --git a/src/SUPERVGUI/SUPERVGUI_CanvasControlNode.h b/src/SUPERVGUI/SUPERVGUI_CanvasControlNode.h
index 39d4c5d8e7073d1c246402639bd3dce208051f4a..686fcbf151cf985eff4301c42857fec1bfcc89e7 100644 (file)
--- a/src/SUPERVGUI/SUPERVGUI_CanvasControlNode.h
+++ b/src/SUPERVGUI/SUPERVGUI_CanvasControlNode.h
@@ -126,7 +126,7 @@ class SUPERVGUI_CanvasCellNode : public SUPERVGUI_CanvasNode {
     SUPERVGUI_CanvasCellNode(QObject* theParent, 
                             SUPERVGUI_Main* theMain, 
                             SUPERV_CNode theNode);
-    virtual ~SUPERVGUI_CanvasCellNode() {}
+    virtual ~SUPERVGUI_CanvasCellNode();
 
     virtual QPopupMenu* getPopupMenu(QWidget* theParent);
 

diff --git a/src/SUPERVGUI/SUPERVGUI_CanvasNode.cxx b/src/SUPERVGUI/SUPERVGUI_CanvasNode.cxx
index 997e51a7c8cc84d4bb6cc9f96b7b0a7dc7286ab0..e18aacaee1f38079795d5a4a6bdd8923f96ee737 100644 (file)
--- a/src/SUPERVGUI/SUPERVGUI_CanvasNode.cxx
+++ b/src/SUPERVGUI/SUPERVGUI_CanvasNode.cxx
@@ -58,16 +58,12 @@ SUPERVGUI_CanvasNode::SUPERVGUI_CanvasNode(QObject* theParent, SUPERVGUI_Main* t
 
   // create node ports
   isIgnore = true;
-  //cout << "     get port list... " ;
   SUPERV_Ports aPortList = myNode->Ports();
-  //cout << aPortList->length() << endl;
   for (int i = 0; i < aPortList->length(); i++) {
     createPort(aPortList[i].in());
   }
 
-  //cout << "     get stream port list... " ;
   SUPERV_StreamPorts aStreamPortList = myNode->StreamPorts();
-  //cout << aStreamPortList->length() << endl;
   for (int i = 0; i < aStreamPortList->length(); i++) {
     createStreamPort(aStreamPortList[i].in());
   }
@@ -75,13 +71,15 @@ SUPERVGUI_CanvasNode::SUPERVGUI_CanvasNode(QObject* theParent, SUPERVGUI_Main* t
   isIgnore = false;
 
   QCanvasItemList anIL2 = ((QCanvas*)parent())->allItems();
-  cout<<" ===> 1 conatructor CanvasNode : CanvasArray has "<<anIL2.count()<<" children!"<<endl;
 }
 
 SUPERVGUI_CanvasNode::~SUPERVGUI_CanvasNode()
 {
   isIgnore = true;
-  if (myPrs) delete myPrs;
+  if ( myPrs ) {
+    delete myPrs;
+    myPrs = 0;
+  }
 }
 
 void SUPERVGUI_CanvasNode::setDestroyed()
@@ -90,11 +88,11 @@ void SUPERVGUI_CanvasNode::setDestroyed()
   getPrs()->hide();
 }
 
-SUPERVGUI_CanvasNodePrs* SUPERVGUI_CanvasNode::getPrs() const
+SUPERVGUI_CanvasNodePrs* SUPERVGUI_CanvasNode::getPrs()
 {
-  if (myPrs == 0) {
-    ((SUPERVGUI_CanvasNode*)this)->myPrs = createPrs();
-  }
+  if ( !myPrs )
+    myPrs = createPrs();
+
   return myPrs;
 }
 
@@ -103,7 +101,7 @@ SUPERVGUI_CanvasNodePrs* SUPERVGUI_CanvasNode::createPrs() const
   return new SUPERVGUI_CanvasNodePrs(myMain->getCanvas(), (SUPERVGUI_CanvasNode*)this);
 }
 
-void SUPERVGUI_CanvasNode::createPort(SUPERV::Port_ptr thePort) const
+void SUPERVGUI_CanvasNode::createPort(SUPERV::Port_ptr thePort)
 {
   SUPERVGUI_CanvasPort* aPort = 0;
   if (thePort->IsInput())
@@ -117,7 +115,7 @@ void SUPERVGUI_CanvasNode::createPort(SUPERV::Port_ptr thePort) const
   }
 }
 
-void SUPERVGUI_CanvasNode::createStreamPort(SUPERV::StreamPort_ptr thePort) const
+void SUPERVGUI_CanvasNode::createStreamPort(SUPERV::StreamPort_ptr thePort)
 {
   SUPERVGUI_CanvasPort* aPort = 0;
   if (thePort->IsInput())
@@ -234,49 +232,39 @@ void SUPERVGUI_CanvasNode::move(int x, int y)
 
 void SUPERVGUI_CanvasNode::merge() 
 {
-  //MESSAGE("===> SUPERVGUI_CanvasNode::merge() " << myNode->Name());
   // synchronize port list
   bool update = false;
   isIgnore = true;
   SUPERVGUI_CanvasPort* aPort;
   QObjectList* aPortList = queryList("SUPERVGUI_CanvasPort");
-  //cout << "     get port list... " ;
   SUPERV_Ports aPorts = myNode->Ports();
-  //cout << aPorts->length() << endl;
   for (int i = 0; i < aPorts->length(); i++) {
     aPort = (SUPERVGUI_CanvasPort*) 
       child(myMain->getCanvas()->getPortName(aPorts[i].in()), "SUPERVGUI_CanvasPort");
     if (aPort) {
-  //cout << "     update port " << aPort->name() << endl;
       aPortList->removeRef(aPort);
       aPort->update();
     }
     else {
-  //cout << "     create port " << myMain->getCanvas()->getPortName(aPorts[i].in()) << endl;
       createPort(aPorts[i].in());
       update = true;
     }
   }
 
-  //cout << "     get stream port list... " ;
   SUPERV_StreamPorts aStreamPorts = myNode->StreamPorts();
-  //cout << aStreamPorts->length() << endl;
   for (int i = 0; i < aStreamPorts->length(); i++) {
     aPort = (SUPERVGUI_CanvasPort*) 
       child(myMain->getCanvas()->getPortName(aStreamPorts[i].in()), "SUPERVGUI_CanvasPort");
     if (aPort) {
-  //cout << "     update stream port " << aPort->name() << endl;
       aPortList->removeRef(aPort);
       aPort->update();
     }
     else {
-  //cout << "     create stream port " << myMain->getCanvas()->getPortName(aStreamPorts[i].in()) << endl;
       createPort(aStreamPorts[i].in());
       update = true;
     }
   }
 
-  //cout << "     remove inexistant " << endl;
   QObjectListIt it(*aPortList);
   while ((aPort=(SUPERVGUI_CanvasPort*)it.current()) != 0) {
     ++it;
@@ -292,10 +280,7 @@ void SUPERVGUI_CanvasNode::merge()
 }
 
 void SUPERVGUI_CanvasNode::sync()  {
-  //MESSAGE("===> SUPERVGUI_CanvasNode::sync() " << myNode->Name() << ", state " << myNode->State());
-
   const bool isExecuting = myMain->getDataflow()->IsExecuting();
-  //if myNode is a MacroNode then set it state to state of its subgraph
   if ( myNode->IsMacro() && isExecuting ) {
     // get SubGraph from MacroNode
     SUPERV_Graph aMacro = SUPERV::Graph::_narrow(myNode);

diff --git a/src/SUPERVGUI/SUPERVGUI_CanvasNode.h b/src/SUPERVGUI/SUPERVGUI_CanvasNode.h
index acead4ec3b09127e020e60179994d01e66ce9ddc..12b6b2bb6fb12db204426bea6c3fc7d68cd31598 100644 (file)
--- a/src/SUPERVGUI/SUPERVGUI_CanvasNode.h
+++ b/src/SUPERVGUI/SUPERVGUI_CanvasNode.h
@@ -42,9 +42,9 @@ class SUPERVGUI_CanvasNode : public QObject {
     virtual void showAll();
     virtual bool setNodeName(QString aName);
 
-    SUPERV_CNode getEngine() const { return myNode; }
-    SUPERVGUI_Main* getMain() const { return myMain; }
-    SUPERVGUI_CanvasNodePrs* getPrs() const;
+    SUPERV_CNode             getEngine() const { return myNode; }
+    SUPERVGUI_Main*          getMain()   const { return myMain; }
+    SUPERVGUI_CanvasNodePrs* getPrs();
 
     bool isWarning();
     bool isStep();
@@ -58,10 +58,10 @@ class SUPERVGUI_CanvasNode : public QObject {
     SUPERV_INode  getInlineNode()    const { return SUPERV::INode::_narrow(myNode); }
     SUPERV_GNode  getGotoNode()      const { return SUPERV::GNode::_narrow(myNode); }
     SUPERV_LNode  getLoopNode()      const { return SUPERV::LNode::_narrow(myNode); }
-    SUPERV_ELNode getEndLoopNode()   const { return SUPERV::ELNode::_narrow(myNode); }
+    SUPERV_ELNode getEndLoopNode()   const { return SUPERV::ELNode::_narrow(myNode);}
     SUPERV_SNode  getSwitchNode()    const { return SUPERV::SNode::_narrow(myNode); }
-    SUPERV_ESNode getEndSwitchNode() const { return SUPERV::ESNode::_narrow(myNode); }
-    SUPERV_Graph  getMacroNode() const { return SUPERV::Graph::_narrow(myNode); }
+    SUPERV_ESNode getEndSwitchNode() const { return SUPERV::ESNode::_narrow(myNode);}
+    SUPERV_Graph  getMacroNode()     const { return SUPERV::Graph::_narrow(myNode); }
 
     SUPERV_Port createInPort();
     SUPERV_Port createOutPort();
@@ -101,9 +101,11 @@ class SUPERVGUI_CanvasNode : public QObject {
     void exportToLib();
 
   protected:
+    // redefined by most of CanvasNode successors
     virtual SUPERVGUI_CanvasNodePrs* createPrs() const;
-    virtual void createPort(SUPERV::Port_ptr thePort) const;
-    virtual void createStreamPort(SUPERV::StreamPort_ptr thePort) const;
+    
+    void createPort(SUPERV::Port_ptr thePort);
+    void createStreamPort(SUPERV::StreamPort_ptr thePort);
     
     virtual bool eventFilter(QObject* o, QEvent* e);
     SUPERVGUI_BrowseNodeDlg* myBrowseDlg;

diff --git a/src/SUPERVGUI/SUPERVGUI_CanvasNodePrs.cxx b/src/SUPERVGUI/SUPERVGUI_CanvasNodePrs.cxx
index 1661c8e54af4fe4b661ed3900a41012ef7bac081..3c0dd0cb3a3670159dca0f765c7c95b10b4dc280 100644 (file)
--- a/src/SUPERVGUI/SUPERVGUI_CanvasNodePrs.cxx
+++ b/src/SUPERVGUI/SUPERVGUI_CanvasNodePrs.cxx
@@ -56,32 +56,28 @@ SUPERVGUI_CanvasNodePrs::SUPERVGUI_CanvasNodePrs(QCanvas* theCanvas,
     // create in/out connection points prs
     myPointIn = new SUPERVGUI_CanvasHookPrs(theCanvas, this, true);
     myPointOut = new SUPERVGUI_CanvasHookPrs(theCanvas, this, false);
-  }
 
-  cout<<" ===> 0.2 conatructor NodePrs : CanvasArray has ......"<<endl;
-  //setZ(0);
-  
-  cout<<" ===> 0.3 conatructor NodePrs : CanvasArray has ......"<<endl;
-  if (!myCellPrs) {
-    cout<<" ===> 0.35 conatructor NodePrs : CanvasArray has ......"<<endl;
     setZ(0);
     setState(myNode->getEngine()->State());
     updatePorts();
   }
   
-  cout<<" ===> 0.4 conatructor NodePrs : CanvasArray has ......"<<endl;
-
   QCanvasItemList anIL2 = canvas()->allItems();
-  cout<<" ===> 1 conatructor NodePrs : CanvasArray has "<<anIL2.count()<<" children!"<<endl;
 }
 
 
 SUPERVGUI_CanvasNodePrs::~SUPERVGUI_CanvasNodePrs() 
 {
   MESSAGE("SUPERVGUI_CanvasNodePrs::~SUPERVGUI_CanvasNodePrs");
-  if (!myCellPrs) {
-    if (myPointIn) delete myPointIn;
-    if (myPointOut) delete myPointOut;
+  if ( !myCellPrs ) {
+    if ( myPointIn ) {
+      delete myPointIn;
+      myPointIn = 0;
+    }
+    if ( myPointOut ) {
+      delete myPointOut;
+      myPointOut = 0;
+    }
   }
   hide();
 }
@@ -984,7 +980,7 @@ void SUPERVGUI_CanvasHookPrs::init(QCanvas* theCanvas)
 SUPERVGUI_CanvasHookPrs::~SUPERVGUI_CanvasHookPrs()
 {
   hide();
-  if (myLine) {
+  if ( myLine ) {
     delete myLine;
     myLine = 0;
   }
@@ -993,9 +989,9 @@ SUPERVGUI_CanvasHookPrs::~SUPERVGUI_CanvasHookPrs()
 QObject* SUPERVGUI_CanvasHookPrs::getObject() const
 {
   QObject* anObj = 0;
-  if (myNodePrs)
+  if ( myNodePrs )
     anObj = myNodePrs->getNode();
-  else if (myPortPrs)
+  else if ( myPortPrs )
     anObj = myPortPrs->getPort();
   return anObj;
 }

diff --git a/src/SUPERVGUI/SUPERVGUI_CanvasView.cxx b/src/SUPERVGUI/SUPERVGUI_CanvasView.cxx
index d86b9cc5aa9aab97ea9ff839553cf39247c9abd0..4f65056e61c8b7d59fa5f3a8dd2a707cfa85db84 100644 (file)
--- a/src/SUPERVGUI/SUPERVGUI_CanvasView.cxx
+++ b/src/SUPERVGUI/SUPERVGUI_CanvasView.cxx
@@ -158,7 +158,6 @@ SUPERVGUI_CanvasView::~SUPERVGUI_CanvasView()
 
 void SUPERVGUI_CanvasView::contentsMousePressEvent(QMouseEvent* theEvent) 
 {
-  //  MESSAGE("===> SUPERVGUI_CanvasView::contentsMousePressEvent(...) ");
   myPoint = inverseWorldMatrix().map(theEvent->pos());
   myGlobalPoint = theEvent->globalPos();
   myCurrentItem = 0;
@@ -428,7 +427,6 @@ void SUPERVGUI_CanvasView::contentsMouseMoveEvent(QMouseEvent* theEvent)
 
 void SUPERVGUI_CanvasView::contentsMouseReleaseEvent(QMouseEvent* theEvent) 
 {
-  //  MESSAGE("===> SUPERVGUI_CanvasView::contentsMouseReleaseEvent(...) ");
   if (myTimer->isActive()) myTimer->stop();
 
   if (myCurrentItem) {
@@ -490,7 +488,6 @@ void SUPERVGUI_CanvasView::contentsMouseReleaseEvent(QMouseEvent* theEvent)
 
 void SUPERVGUI_CanvasView::contentsMouseDoubleClickEvent(QMouseEvent* theEvent)
 {
-  //  MESSAGE("===> SUPERVGUI_CanvasView::contentsMouseDoubleClickEvent(...) ");
   QPoint p = inverseWorldMatrix().map(theEvent->pos());
 
   // compute collision rectangle
@@ -580,7 +577,6 @@ void SUPERVGUI_CanvasView::startSketch(SUPERVGUI_CanvasPort* thePort)
 
 void SUPERVGUI_CanvasView::endSketch(SUPERVGUI_CanvasPort* thePort)
 {
-  //  MESSAGE("===> SUPERVGUI_CanvasView::endSketch(" << thePort->name() << ")");
   if (!myIsLinkCreating) return;
 
   if (myLinkBuilder && myLinkBuilder->canCreateEngine(thePort)) {

diff --git a/src/SUPERVGUI/SUPERVGUI_Main.cxx b/src/SUPERVGUI/SUPERVGUI_Main.cxx
index e4541436f320dd8fb059d59d4c955c34b834cb01..c3c1fb44d0554c6de6ca7eafc8dfa42b31396425 100644 (file)
--- a/src/SUPERVGUI/SUPERVGUI_Main.cxx
+++ b/src/SUPERVGUI/SUPERVGUI_Main.cxx
@@ -179,7 +179,6 @@ SUPERVGUI_Main::~SUPERVGUI_Main() {
     fclose( myLogFile );
   }
   
-  //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