Merge from OCC_development_generic_2006

[modules/superv.git] / src / SUPERVGUI / SUPERVGUI_CanvasControlNode.h

diff --git a/src/SUPERVGUI/SUPERVGUI_CanvasControlNode.h b/src/SUPERVGUI/SUPERVGUI_CanvasControlNode.h
index 686fcbf151cf985eff4301c42857fec1bfcc89e7..cd43afae635a588f554f1458b5e3cfffa2c829ad 100644 (file)
--- a/src/SUPERVGUI/SUPERVGUI_CanvasControlNode.h
+++ b/src/SUPERVGUI/SUPERVGUI_CanvasControlNode.h
@@ -9,7 +9,6 @@
 #ifndef SUPERVGUI_CanvasControlNode_H
 #define SUPERVGUI_CanvasControlNode_H
 
-using namespace std;
 #include "SUPERVGUI_Def.h"
 #include "SUPERVGUI_CanvasNode.h"
 #include <qdialog.h>
@@ -19,7 +18,7 @@ class SUPERVGUI_CanvasComputeNode : public SUPERVGUI_CanvasNode {
   Q_OBJECT
 
   public:
-    SUPERVGUI_CanvasComputeNode(QObject* theParent, SUPERVGUI_Main* theMain, SUPERV_CNode theNode);
+    SUPERVGUI_CanvasComputeNode( SUIT_ResourceMgr*, QObject* theParent, SUPERVGUI_Main* theMain, SUPERV_CNode theNode);
     virtual ~SUPERVGUI_CanvasComputeNode() {}
 
     virtual QPopupMenu* getPopupMenu(QWidget* theParent);
@@ -29,7 +28,7 @@ class SUPERVGUI_CanvasMacroNode : public SUPERVGUI_CanvasComputeNode {
   Q_OBJECT
 
   public:
-    SUPERVGUI_CanvasMacroNode(QObject* theParent, SUPERVGUI_Main* theMain, SUPERV_CNode theNode);
+    SUPERVGUI_CanvasMacroNode( SUIT_ResourceMgr*, QObject* theParent, SUPERVGUI_Main* theMain, SUPERV_CNode theNode);
     virtual ~SUPERVGUI_CanvasMacroNode() {}
 
     virtual QPopupMenu* getPopupMenu(QWidget* theParent);
@@ -48,20 +47,21 @@ class SUPERVGUI_CanvasStartNode : public SUPERVGUI_CanvasNode {
   Q_OBJECT
 
   public:
-    SUPERVGUI_CanvasStartNode(QObject* theParent, SUPERVGUI_Main* theMain, SUPERV_CNode theNode);
+    SUPERVGUI_CanvasStartNode( SUIT_ResourceMgr*, QObject* theParent, SUPERVGUI_Main* theMain, SUPERV_CNode theNode);
     virtual ~SUPERVGUI_CanvasStartNode() {}
 
     virtual bool setNodeName(QString aName);
 
     SUPERVGUI_CanvasEndNode* getCoupled() const { return myCoupled; }
-
+    
     virtual QPopupMenu* getPopupMenu(QWidget* theParent);
 
   public slots:
     virtual void remove();
 
-    virtual void addInputPort();
-    virtual void addOutputPort();
+    // mkr : IPAL9815 : commented the following code
+    /*virtual void addInputPort();
+      virtual void addOutputPort();*/
     virtual void pastePort();
 
   protected:
@@ -83,16 +83,17 @@ class SUPERVGUI_CanvasEndNode : public SUPERVGUI_CanvasNode {
   Q_OBJECT
 
   public:
-    SUPERVGUI_CanvasEndNode(QObject* theParent, SUPERVGUI_Main* theMain, SUPERV_CNode theNode,
-                           SUPERVGUI_CanvasStartNode* theStart);
+    SUPERVGUI_CanvasEndNode( SUIT_ResourceMgr*, QObject* theParent, SUPERVGUI_Main* theMain, SUPERV_CNode theNode,
+                            SUPERVGUI_CanvasStartNode* theStart);
     virtual ~SUPERVGUI_CanvasEndNode() {}
 
     SUPERVGUI_CanvasStartNode* getCoupled() const { return myCoupled; }
 
     virtual QPopupMenu* getPopupMenu(QWidget* theParent);
 
-  public slots:
-    virtual void addInputPort();
+  // mkr : IPAL9815 : commented the following code
+  /*public slots:
+    virtual void addInputPort();*/
 
   protected:
     virtual SUPERVGUI_CanvasNodePrs* createPrs() const;
@@ -107,7 +108,7 @@ class SUPERVGUI_CanvasGotoNode : public SUPERVGUI_CanvasNode {
   Q_OBJECT
 
   public:
-    SUPERVGUI_CanvasGotoNode(QObject* theParent, SUPERVGUI_Main* theMain, SUPERV_CNode theNode);
+    SUPERVGUI_CanvasGotoNode( SUIT_ResourceMgr*, QObject* theParent, SUPERVGUI_Main* theMain, SUPERV_CNode theNode);
     virtual ~SUPERVGUI_CanvasGotoNode() {}
 
     virtual QPopupMenu* getPopupMenu(QWidget* theParent);
@@ -123,18 +124,21 @@ class SUPERVGUI_CanvasCellNode : public SUPERVGUI_CanvasNode {
   Q_OBJECT
 
   public:
-    SUPERVGUI_CanvasCellNode(QObject* theParent, 
-                            SUPERVGUI_Main* theMain, 
-                            SUPERV_CNode theNode);
+    SUPERVGUI_CanvasCellNode( SUIT_ResourceMgr*, QObject* theParent, 
+                             SUPERVGUI_Main* theMain, 
+                             SUPERV_CNode theNode);
     virtual ~SUPERVGUI_CanvasCellNode();
 
-    virtual QPopupMenu* getPopupMenu(QWidget* theParent);
+    // asv : 26.01.05 : everything moved to CanvasNode::getPopupMenu()
+    //virtual QPopupMenu* getPopupMenu(QWidget* theParent);
 
     void setPairCell(SUPERVGUI_CanvasCellNode* thePairCell);
     SUPERVGUI_CanvasCellNode* getPairCell();
 
      virtual void sync();
-     virtual bool setNodeName(QString aName);
+
+     // asv : 26.01.05 : decided to remove all "edition" operations on nodes in Table view
+     //virtual bool setNodeName(QString aName);
 
   protected:
     virtual SUPERVGUI_CanvasNodePrs* createPrs() const;
@@ -151,13 +155,14 @@ class SUPERVGUI_CanvasCellNode : public SUPERVGUI_CanvasNode {
 class SUPERVGUI_CanvasCellEndNode: public SUPERVGUI_CanvasCellNode {
  
   public:
-    SUPERVGUI_CanvasCellEndNode(QObject* theParent, 
-                               SUPERVGUI_Main* theMain, 
-                               SUPERV_CNode theNode, 
-                               SUPERVGUI_CanvasCellNode* theStart);
+    SUPERVGUI_CanvasCellEndNode( SUIT_ResourceMgr*, QObject* theParent, 
+                                SUPERVGUI_Main* theMain, 
+                                SUPERV_CNode theNode, 
+                                SUPERVGUI_CanvasCellNode* theStart);
     virtual ~SUPERVGUI_CanvasCellEndNode() {}
 
-    virtual bool setNodeName(QString theName);
+     // asv : 26.01.05 : decided to remove all "edition" operations on nodes in Table view
+     //virtual bool setNodeName(QString theName);
 };
 
 /**