finished testbench generation

[blast.git] / ConnectionItem.cpp

diff --git a/ConnectionItem.cpp b/ConnectionItem.cpp
index 4de86cb09f28ebda9dcff07d4b888bd59e0022d5..61af6c83e1a893d96477f245bd413acd4c29ab43 100644 (file)
--- a/ConnectionItem.cpp
+++ b/ConnectionItem.cpp
@@ -9,24 +9,30 @@
 
 //int ConnectionItem::counter = 0;
 
 
 //int ConnectionItem::counter = 0;
 

-ConnectionItem::ConnectionItem(InterfaceItem* _iface1,
-                               InterfaceItem* _iface2,
+ConnectionItem::ConnectionItem(InterfaceItem* _fromInterfaceItem,
+                               InterfaceItem* _toInterfaceItem,

                                Dispatcher* _dispatcher,
                                Parameters* _params) : QGraphicsItem() {
 
 
   dispatcher = _dispatcher;
   params = _params;
                                Dispatcher* _dispatcher,
                                Parameters* _params) : QGraphicsItem() {
 
 
   dispatcher = _dispatcher;
   params = _params;

+  fromInterfaceItem = _fromInterfaceItem;
+  toInterfaceItem = _toInterfaceItem;
+
+  /* NOTE: originally, the following was testing the correct order
+   * to connect the 2 interfaces. Presently, the order is predetermined
+   * when testing the AbstractInterface objets that must be connected.

 
   ConnectedInterface* ref1 = _iface1->refInter;
   ConnectedInterface* ref2 = _iface2->refInter;
 
   ConnectedInterface* ref1 = _iface1->refInter;
   ConnectedInterface* ref2 = _iface2->refInter;

-  /* ref. note in .h
+   ref. note in .h

      case 1 : ref1 is group interface, and ref2 block interface of a block within the group
      case 2 : the opposite of case 1
      case 3 : ref1 and ref2 are block interface of blocks that are both within the same parent group.
      case 1 : ref1 is group interface, and ref2 block interface of a block within the group
      case 2 : the opposite of case 1
      case 3 : ref1 and ref2 are block interface of blocks that are both within the same parent group.

-     case 4 : ref1 is source interface and ref2 interface of top group
+     case 4 : ref1 is stimuli interface and ref2 interface of top group

      case 5 : the opposite of case 4
      case 5 : the opposite of case 4

-   */
+

   if (ref1->getOwner() == ref2->getOwner()->getParent()) {
 
     if (ref1->getDirection() == AbstractInterface::Input) {
   if (ref1->getOwner() == ref2->getOwner()->getParent()) {
 
     if (ref1->getDirection() == AbstractInterface::Input) {


@@ -73,14 +79,16 @@ ConnectionItem::ConnectionItem(InterfaceItem* _iface1,
       fromInterfaceItem = _iface1;
     }
   }
       fromInterfaceItem = _iface1;
     }
   }

-  else if ((ref1->getOwner()->isSourceBlock()) && (ref2->getOwner()->isTopGroupBlock())) {    
-    fromInterfaceItem = _iface1;    
+  else if ((ref1->getOwner()->isStimuliBlock()) && (ref2->getOwner()->isTopGroupBlock())) {    
+    fromInterfaceItem = _iface1;

     toInterfaceItem = _iface2;
   }
     toInterfaceItem = _iface2;
   }

-  else if ((ref2->getOwner()->isSourceBlock()) && (ref1->getOwner()->isTopGroupBlock())) {    
-    fromInterfaceItem = _iface2;    
+  else if ((ref2->getOwner()->isStimuliBlock()) && (ref1->getOwner()->isTopGroupBlock())) {    
+    fromInterfaceItem = _iface2;

     toInterfaceItem = _iface1;
   }
     toInterfaceItem = _iface1;
   }

+
+  */

   // adding this to interface items
   fromInterfaceItem->addConnectionItem(this);
   toInterfaceItem->addConnectionItem(this);
   // adding this to interface items
   fromInterfaceItem->addConnectionItem(this);
   toInterfaceItem->addConnectionItem(this);


@@ -906,7 +914,7 @@ void ConnectionItem::contextMenuEvent(QGraphicsSceneContextMenuEvent * event) {
     QAction * selectedAction= menu.exec(event->screenPos());
 
     if(selectedAction == removeAction){
     QAction * selectedAction= menu.exec(event->screenPos());
 
     if(selectedAction == removeAction){

-      dispatcher->removeConnection(this);
+      dispatcher->removeConnection(Dispatcher::Design, this);

     }
   }
 }
     }
   }
 }