changed connection process

[blast.git] / BoxItem.cpp

diff --git a/BoxItem.cpp b/BoxItem.cpp
index a107198654913fdc6badc66bc19ed9b13f784d47..43cceecfce17395145bb149f2d86fbe1b520b5bc 100644 (file)
--- a/BoxItem.cpp
+++ b/BoxItem.cpp
@@ -207,11 +207,18 @@ bool BoxItem::updateGeometry(ChangeType type) {
   return false;
 }
 
   return false;
 }
 

-void BoxItem::interfaceRenamed() {
+void BoxItem::nameChanged() {
+  
+  QFontMetrics fmId(params->defaultBlockFont);
+  nameWidth = fmId.width(refBlock->getName());
+  nameHeight = fmId.height();
+  

   if (updateGeometry(InterfaceMove)) {
     //cout << "must recompute group item geometry" << endl;
     (getScene()->getGroupItem())->updateShape();
   if (updateGeometry(InterfaceMove)) {
     //cout << "must recompute group item geometry" << endl;
     (getScene()->getGroupItem())->updateShape();

-  }  
+  }
+  // force the update in case of size has not changed
+  update();

 }
 
 void BoxItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event) {
 }
 
 void BoxItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event) {


@@ -335,7 +342,7 @@ void BoxItem::mousePressEvent(QGraphicsSceneMouseEvent *event) {
     }
   }
   else if (mode == GroupScene::ItemEdition) {
     }
   }
   else if (mode == GroupScene::ItemEdition) {

-    setZValue(zValue()+100);
+    //setZValue(zValue()+100);

     if (params->cursorState == Parameters::CursorOnInterface) {
       InterfaceItem *inter = getInterfaceFromCursor(x,y);
       if (inter != NULL) {
     if (params->cursorState == Parameters::CursorOnInterface) {
       InterfaceItem *inter = getInterfaceFromCursor(x,y);
       if (inter != NULL) {


@@ -366,7 +373,7 @@ void BoxItem::mousePressEvent(QGraphicsSceneMouseEvent *event) {
 
 void BoxItem::mouseReleaseEvent(QGraphicsSceneMouseEvent  *event) {
 
 
 void BoxItem::mouseReleaseEvent(QGraphicsSceneMouseEvent  *event) {
 

-  setZValue(zValue()-100);
+  //setZValue(zValue()-100);

 
   int mode = getScene()->getEditionMode();
 
 
   int mode = getScene()->getEditionMode();
 


@@ -387,10 +394,12 @@ void BoxItem::mouseReleaseEvent(QGraphicsSceneMouseEvent  *event) {
     else if (params->editState == Parameters::EditCloseConnection) {
       InterfaceItem* iface1 = getScene()->getSelectedInterface(1);
       InterfaceItem* iface2 = getScene()->getSelectedInterface(2);
     else if (params->editState == Parameters::EditCloseConnection) {
       InterfaceItem* iface1 = getScene()->getSelectedInterface(1);
       InterfaceItem* iface2 = getScene()->getSelectedInterface(2);

-      bool ok = dispatcher->connect(iface1,iface2);
+      bool ok = dispatcher->createConnection(iface1,iface2);

       if (ok) {
         iface1->selected = false;
       if (ok) {
         iface1->selected = false;

-        // no update needed since the whole scene will be repainted
+        update(iface1->boundingRect());
+        iface2->selected = false;
+        update(iface2->boundingRect());        

         getScene()->setSelectedInterface(1,NULL);
         getScene()->setSelectedInterface(2,NULL);
         params->setEditState(Parameters::EditNoOperation);
         getScene()->setSelectedInterface(1,NULL);
         getScene()->setSelectedInterface(2,NULL);
         params->setEditState(Parameters::EditNoOperation);


@@ -476,12 +485,13 @@ void BoxItem::hoverMoveEvent(QGraphicsSceneHoverEvent * event) {
       }
     }
   }
       }
     }
   }

-  QGraphicsItem::hoverMoveEvent(event);
+  //QGraphicsItem::hoverMoveEvent(event);
+  event->ignore();

 }
 
 
 }
 
 

-void BoxItem::contextMenuEvent(QGraphicsSceneContextMenuEvent * event) {
-
+void BoxItem::contextMenuEvent(QGraphicsSceneContextMenuEvent * event) {  
+  

   QMenu menu;
   QAction* titleAction = NULL;
   QAction* removeAction = NULL;
   QMenu menu;
   QAction* titleAction = NULL;
   QAction* removeAction = NULL;


@@ -587,17 +597,24 @@ void BoxItem::contextMenuEvent(QGraphicsSceneContextMenuEvent * event) {
      dispatcher->removeFunctionalInterface(ifaceItem);
     }
     else {
      dispatcher->removeFunctionalInterface(ifaceItem);
     }
     else {

-      dispatcher->removeBlock(this);
+      dispatcher->removeBoxItem(this);

     }
   }
   else if (selectedAction == duplicateAction) {
     }
   }
   else if (selectedAction == duplicateAction) {

-    dispatcher->duplicateBlock(this);
+    dispatcher->duplicateBoxItem(this);

   }
   else if(selectedAction == renameAction){
   }
   else if(selectedAction == renameAction){

-    if(ifaceItem != NULL)
+    if(ifaceItem != NULL) {

       dispatcher->renameInterface(ifaceItem);
       dispatcher->renameInterface(ifaceItem);

-    else
-      dispatcher->renameBlockOrGroup(this);
+    }
+    else {
+      if (refBlock->isFunctionalBlock()) {          
+        dispatcher->renameFunctionalBlock(this);
+      }
+      else if (refBlock->isGroupBlock()) {        
+        dispatcher->renameGroupBlock(childGroupItem);
+      }
+    }   

   }
   else if(selectedAction == showProperties){
     dispatcher->showProperties(ifaceItem);
   }
   else if(selectedAction == showProperties){
     dispatcher->showProperties(ifaceItem);


@@ -609,7 +626,7 @@ void BoxItem::contextMenuEvent(QGraphicsSceneContextMenuEvent * event) {
     dispatcher->disconnectInterFromGroup(ifaceItem);
   }
   else if (selectedAction == cloneInterface){
     dispatcher->disconnectInterFromGroup(ifaceItem);
   }
   else if (selectedAction == cloneInterface){

-    dispatcher->duplicateInterface(ifaceItem);
+    dispatcher->duplicateInterfaceItem(ifaceItem);

   }
   else if (selectedAction == openWindow){
     dispatcher->showRaiseWindow(this);
   }
   else if (selectedAction == openWindow){
     dispatcher->showRaiseWindow(this);


@@ -622,8 +639,9 @@ void BoxItem::contextMenuEvent(QGraphicsSceneContextMenuEvent * event) {
   }
   else if(selectedAction == showParameters){
     new ParametersWindow(refBlock, params, NULL);
   }
   else if(selectedAction == showParameters){
     new ParametersWindow(refBlock, params, NULL);

-  }
+  }    

 }
 }

+

 void BoxItem::loadFunctional(QDomElement funcElement) throw(Exception) {
 
   bool ok = false;
 void BoxItem::loadFunctional(QDomElement funcElement) throw(Exception) {
 
   bool ok = false;


@@ -676,7 +694,7 @@ void BoxItem::loadFunctional(QDomElement funcElement) throw(Exception) {
   }
   
   GroupBlock* parentGroupBlock = AB_TO_GRP(((GroupItem *)parentItem())->getRefBlock());
   }
   
   GroupBlock* parentGroupBlock = AB_TO_GRP(((GroupItem *)parentItem())->getRefBlock());

-  FunctionalBlock* functionalBlock = params->getGraph()->addFunctionalBlock(parentGroupBlock, reference);
+  FunctionalBlock* functionalBlock = params->getGraph()->createFunctionalBlock(parentGroupBlock, reference);

   /* NB: addFunctionalBlock creates all interfaces from the reference, which is annoying when
     reading bif_iface tags. Thus interface are all removed.
   */
   /* NB: addFunctionalBlock creates all interfaces from the reference, which is annoying when
     reading bif_iface tags. Thus interface are all removed.
   */


@@ -726,7 +744,7 @@ void BoxItem::loadFunctional(QDomElement funcElement) throw(Exception) {
     functionalBlock->addInterface(functionalInterface);
     
     // searching for control interface
     functionalBlock->addInterface(functionalInterface);
     
     // searching for control interface

-    QString ctlRefName = refName+"_ctl";
+    QString ctlRefName = refName+"_enb";

     ReferenceInterface* ctlRefIface = AI_TO_REF(reference->getIfaceFromName(ctlRefName));
     
     if (ctlRefIface != NULL) {
     ReferenceInterface* ctlRefIface = AI_TO_REF(reference->getIfaceFromName(ctlRefName));
     
     if (ctlRefIface != NULL) {


@@ -735,7 +753,7 @@ void BoxItem::loadFunctional(QDomElement funcElement) throw(Exception) {
       if (! ctlIface->setAssociatedIface(functionalInterface)) {
         throw(Exception(PROJECTFILE_CORRUPTED));
       }      
       if (! ctlIface->setAssociatedIface(functionalInterface)) {
         throw(Exception(PROJECTFILE_CORRUPTED));
       }      

-      ctlIface->setName(name+"_ctl");
+      ctlIface->setName(name+"_enb");

       functionalBlock->addInterface(ctlIface);
     }    
   }
       functionalBlock->addInterface(ctlIface);
     }    
   }