MPV: Merge V1_2d

[modules/superv.git] / src / SUPERVGUI / SUPERVGUI_ControlNode.cxx

diff --git a/src/SUPERVGUI/SUPERVGUI_ControlNode.cxx b/src/SUPERVGUI/SUPERVGUI_ControlNode.cxx
index fd5ab5ed4929dea67c7c3a53383f0c18473fe257..a97a43e9ddb5b416a56c75deb8aee828a41f940a 100644 (file)
--- a/src/SUPERVGUI/SUPERVGUI_ControlNode.cxx
+++ b/src/SUPERVGUI/SUPERVGUI_ControlNode.cxx
@@ -88,7 +88,6 @@ void SUPERVGUI_StartControlNode::rename() {
 void SUPERVGUI_StartControlNode::remove() {
   myEndNode->deleteLinks();
   deleteLinks();
-  myEndNode->getEngine()->destroy();
   myNode->destroy();
   myMain->getGraph()->deleteNode(myEndNode);
   myMain->getGraph()->deleteNode(this);
@@ -148,6 +147,7 @@ void SUPERVGUI_StartControlNode::addInputPort() {
 
 void SUPERVGUI_StartControlNode::deletePort(SUPERVGUI_Port* thePort) {
   if (getNodeType() == SUPERV::LoopNode) {
+    
     SUPERV_Port aPortEngine = thePort->getPort();
     QString aName(aPortEngine->Name());
     QString aNameIn = aName + "Input";
@@ -171,10 +171,12 @@ void SUPERVGUI_StartControlNode::deletePort(SUPERVGUI_Port* thePort) {
 
     myPIcount--;
     myPOcount--;
+    
     myEndNode->getPIcount()--;
     myEndNode->getPOcount()--; 
-   
+    
     aPortEngine->destroy();
+
     updatePorts();
     updateShape();
     myEndNode->updatePorts();
@@ -215,45 +217,8 @@ SUPERVGUI_EndControlNode::SUPERVGUI_EndControlNode(QWidget* theParent, SUPERVGUI
 
   myPortsBox->reparent(this, pos());  
   
-  myPIcount = 0;
-  myPOcount = 0;
-  SUPERV_Ports       ports = myNode->Ports();
-  int                n     = ports->length();
-
-  for (int i=0; i<n; i++) {
-    if (ports[i]->IsInput()) {
-      if (getComputingNode()->IsEndSwitch()) {
-       if (ports[i]->IsGate())
-         myGatesLayout->addWidget(new SUPERVGUI_PortInESNode(myGatesBox, myMain, ports[i]), 
-                                 0, 0);
-       else {
-         myPortLayout->addWidget(new SUPERVGUI_PortInESNode(myValuesBox, myMain, ports[i]), 
-                                 myPIcount, 0);
-         myPIcount++;
-       }
-      } else {
-       if (ports[i]->IsGate())
-         myGatesLayout->addWidget(new SUPERVGUI_PortIn(myGatesBox, myMain, ports[i]), 
-                                  0, 0);
-       else {
-         myPortLayout->addWidget(new SUPERVGUI_PortIn(myValuesBox, myMain, ports[i]), 
-                                 myPIcount, 0);
-         myPIcount++;
-       }
-      }
-    } else {
-      if (ports[i]->IsGate())
-       myGatesLayout->addWidget(new SUPERVGUI_PortOut(myGatesBox, myMain, ports[i]), 
-                                0, 1, Qt::AlignRight);
-      else {
-       myPortLayout->addWidget(new SUPERVGUI_PortOut(myValuesBox, myMain, ports[i]), 
-                               myPOcount, 1, Qt::AlignRight);
-       myPOcount++;
-      }
-    }
-  }
   aGridLayout->addMultiCellWidget(myPortsBox, 1, 1, 1, 2);
-
+  
   myStatus->reparent(this, pos());
   myTime->reparent(this, pos());
   aGridLayout->addMultiCellWidget(myStatus, 2, 2, 0, 1);