Commented out setNodeName() methods of CanvasCellNode and CanvasCellEndNodes, and...

setNodeName() :  decided to remove all node "edition" operations from CellNodes (delete node, rename node), becase it produces bugs in unsynchronization between CanvasNode-s and CanvasCellNode-s.
getPopupMenu() : before myDeleteItem was deactivated in CanvasCellNode, now it is not even added to CanvasNode's menu if the view_type is TABLE.

diff --git a/src/SUPERVGUI/SUPERVGUI_CanvasControlNode.cxx b/src/SUPERVGUI/SUPERVGUI_CanvasControlNode.cxx
index a41424b6a8f0093f9a53581fc14ac535f9b55a07..7f8bb384c1bbb300a91c663d8cf1565c2988a7b5 100644 (file)
--- a/src/SUPERVGUI/SUPERVGUI_CanvasControlNode.cxx
+++ b/src/SUPERVGUI/SUPERVGUI_CanvasControlNode.cxx
@@ -324,14 +324,14 @@ SUPERVGUI_CanvasCellNode::SUPERVGUI_CanvasCellNode(QObject* theParent,
 SUPERVGUI_CanvasCellNode::~SUPERVGUI_CanvasCellNode()
 {
 }
-
+/*
 QPopupMenu* SUPERVGUI_CanvasCellNode::getPopupMenu(QWidget* theParent)
 {
   QPopupMenu* popup = SUPERVGUI_CanvasNode::getPopupMenu(theParent);
   popup->setItemEnabled(myDeleteItem, false);
   return popup;
 }
-
+*/
 void SUPERVGUI_CanvasCellNode::setPairCell(SUPERVGUI_CanvasCellNode* thePairCell) {
   if (myIsControl) { //only for ControlNode
     myPairCell = thePairCell;
@@ -368,7 +368,7 @@ void SUPERVGUI_CanvasCellNode::sync() {
     getPrs()->setState(getEngine()->State());
   }
 }
-
+/*
 bool SUPERVGUI_CanvasCellNode::setNodeName(QString aName) 
 {
   bool result = SUPERVGUI_CanvasNode::setNodeName(aName);
@@ -377,7 +377,7 @@ bool SUPERVGUI_CanvasCellNode::setNodeName(QString aName)
   }
   return result;
 }
-
+*/
 SUPERVGUI_CanvasNodePrs* SUPERVGUI_CanvasCellNode::createPrs() const
 {
   SUPERVGUI_CanvasNodePrs* aPrs = 
@@ -397,12 +397,12 @@ SUPERVGUI_CanvasCellEndNode::SUPERVGUI_CanvasCellEndNode( QObject* theParent,
   //set end cell for start cell as pair
   myPairCell->setPairCell(dynamic_cast<SUPERVGUI_CanvasCellNode*>(this));
 }
-
+/*
 bool SUPERVGUI_CanvasCellEndNode::setNodeName(QString theName)
 {
   return SUPERVGUI_CanvasNode::setNodeName(theName);
 }
-
+*/
 //-----------------------------------------------------------
 //*************** Select Inline node dialog******************
 // Taken from SUPERVGUI_ControlNode.cxx without change

diff --git a/src/SUPERVGUI/SUPERVGUI_CanvasControlNode.h b/src/SUPERVGUI/SUPERVGUI_CanvasControlNode.h
index 686fcbf151cf985eff4301c42857fec1bfcc89e7..b903e9d5141c21b36333b1bf76e88ead43ac8f37 100644 (file)
--- a/src/SUPERVGUI/SUPERVGUI_CanvasControlNode.h
+++ b/src/SUPERVGUI/SUPERVGUI_CanvasControlNode.h
@@ -54,7 +54,7 @@ class SUPERVGUI_CanvasStartNode : public SUPERVGUI_CanvasNode {
     virtual bool setNodeName(QString aName);
 
     SUPERVGUI_CanvasEndNode* getCoupled() const { return myCoupled; }
-
+    
     virtual QPopupMenu* getPopupMenu(QWidget* theParent);
 
   public slots:
@@ -128,13 +128,16 @@ class SUPERVGUI_CanvasCellNode : public SUPERVGUI_CanvasNode {
                             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;
@@ -157,7 +160,8 @@ class SUPERVGUI_CanvasCellEndNode: public SUPERVGUI_CanvasCellNode {
                                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);
 };
 
 /**