X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/blast.git/blobdiff_plain/d43174d0eb3d293b3bb5fbe76662241134e74d0d..8f0bedf735fe2b306c11c3f4a168245a05e37ccd:/AbstractBoxItem.cpp

diff --git a/AbstractBoxItem.cpp b/AbstractBoxItem.cpp
index c4cdae9..925cd6f 100644
--- a/AbstractBoxItem.cpp
+++ b/AbstractBoxItem.cpp
@@ -8,6 +8,7 @@
 
 #include "AbstractBlock.h"
 #include "GroupScene.h"
+#include "GroupItem.h"
 #include "AbstractInterface.h"
 #include "ConnectedInterface.h"
 
@@ -19,7 +20,7 @@ AbstractBoxItem::  AbstractBoxItem(AbstractBlock *_refBlock, Dispatcher *_dispat
   QFontMetrics fmId(params->defaultBlockFont);
   nameWidth = fmId.width(refBlock->getName());
   nameHeight = fmId.height();
-  nameMargin = 10;
+  nameMargin = 5;
   ifaceMargin = 10;
 
   // the six following values will be override in subclass constructors
@@ -35,6 +36,7 @@ AbstractBoxItem::  AbstractBoxItem(AbstractBlock *_refBlock, Dispatcher *_dispat
   selected = false;
   currentInterface = NULL;
   rstClkVisible = false;
+  wishboneVisible = false;
 
   setAcceptHoverEvents(true);
 
@@ -63,7 +65,8 @@ AbstractBoxItem::AbstractBoxItem(Dispatcher *_dispatcher, Parameters *_params, Q
   selected = false;
   currentInterface = NULL;
   rstClkVisible = false;
-
+  wishboneVisible = false;
+  
   setAcceptHoverEvents(true);
 
   // NOTE : initInterfaces() is only called in subclasses
@@ -84,6 +87,40 @@ bool AbstractBoxItem::isGroupItem() {
   return false;
 }
 
+bool AbstractBoxItem::isSourceItem() {
+  return false;
+}
+
+void AbstractBoxItem::setRstClkVisible(bool b) { 
+  rstClkVisible = b;
+  foreach(InterfaceItem* ifaceItem, interfaces) {
+    if ((ifaceItem->refInter->getPurpose() == AbstractInterface::Clock) ||
+        (ifaceItem->refInter->getPurpose() == AbstractInterface::Reset) ) {
+      ifaceItem->visible = b;
+    }
+  }
+  resetInterfaceItemsPosition();
+  updateGeometry(InterfaceMove);
+  update();
+  getScene()->updateConnectionItemsShape();
+  (getScene()->getGroupItem())->updateShape();
+  
+}
+
+void AbstractBoxItem::setWishboneVisible(bool b) { 
+  wishboneVisible = b;
+  foreach(InterfaceItem* ifaceItem, interfaces) {
+    if (ifaceItem->refInter->getPurpose() == AbstractInterface::Wishbone) {
+      ifaceItem->visible = b;
+    }
+  }
+  resetInterfaceItemsPosition();
+  updateGeometry(InterfaceMove);
+  update();
+  getScene()->updateConnectionItemsShape();
+  (getScene()->getGroupItem())->updateShape();
+}
+
 void AbstractBoxItem::setRefBlock(AbstractBlock* _refBlock) {
   refBlock = _refBlock;
   QFontMetrics fmId(params->defaultBlockFont);
@@ -91,12 +128,15 @@ void AbstractBoxItem::setRefBlock(AbstractBlock* _refBlock) {
   nameHeight = fmId.height();
 }
 
-void AbstractBoxItem::initInterfaces() {
+void AbstractBoxItem::initInterfaceItems() {
   /* TO DO : creating all needed InterfaceItem, with by default, input at west and output at east */
   int orientation = Parameters::West;
 
   foreach(AbstractInterface *inter, refBlock->getInterfaces()){
-    if(inter->getPurpose() != AbstractInterface::Wishbone){
+   
+    /* NB: does not create InterfaceItem for control interfaces.
+    */
+    if (inter->getPurpose() != AbstractInterface::Control) {
       InterfaceItem *item;
       if(inter->getDirection() == AbstractInterface::Input){
         orientation = Parameters::West;
@@ -106,12 +146,12 @@ void AbstractBoxItem::initInterfaces() {
         orientation = Parameters::North;
       }
       item = new InterfaceItem(0.0 , orientation, (ConnectedInterface *)inter, this, params);
-      interfaces.append(item);
+      interfaces.append(item);        
     }
-  }  
+  }
 }
 
-InterfaceItem* AbstractBoxItem::searchInterfaceByName(QString name) {
+InterfaceItem* AbstractBoxItem::searchInterfaceItemByName(QString name) {
   foreach(InterfaceItem *inter, interfaces){
     if(inter->getName() == name)
       return inter;
@@ -119,7 +159,7 @@ InterfaceItem* AbstractBoxItem::searchInterfaceByName(QString name) {
   return NULL;
 }
 
-InterfaceItem* AbstractBoxItem::searchInterfaceByRef(ConnectedInterface *ref) {
+InterfaceItem* AbstractBoxItem::searchInterfaceItemByRef(ConnectedInterface *ref) {
   foreach(InterfaceItem *inter, interfaces){
     if(inter->refInter == ref) {
       return inter;
@@ -128,16 +168,16 @@ InterfaceItem* AbstractBoxItem::searchInterfaceByRef(ConnectedInterface *ref) {
   return NULL;
 }
 
-void AbstractBoxItem::addInterface(InterfaceItem *i, bool resetPosition) {
+void AbstractBoxItem::addInterfaceItem(InterfaceItem *i, bool resetPosition) {
   interfaces.append(i);
-  if (resetPosition) resetInterfacesPosition();
+  if (resetPosition) resetInterfaceItemsPosition();
   updateGeometry(InterfaceMove);
   update();
 }
 
-void AbstractBoxItem::removeInterface(InterfaceItem *i) {
+void AbstractBoxItem::removeInterfaceItem(InterfaceItem *i) {
   // NB : removing from model is done in dispatcher
-  interfaces.removeOne(i);
+  interfaces.removeAll(i);
   delete i;
 
   //resetInterfacesPosition();
@@ -146,7 +186,7 @@ void AbstractBoxItem::removeInterface(InterfaceItem *i) {
 }
 
 
-void AbstractBoxItem::resetInterfacesPosition() {
+void AbstractBoxItem::resetInterfaceItemsPosition() {
 
   int nbNorth=0, nbSouth=0, nbEast=0, nbWest=0;
   double cntNorth=1.0,cntSouth=1.0,cntEast=1.0,cntWest=1.0;
@@ -155,7 +195,7 @@ void AbstractBoxItem::resetInterfacesPosition() {
 
   foreach(InterfaceItem* inter, interfaces) {
     // only data interfaces and if needed time and reset
-    if(inter->refInter->getPurpose() == AbstractInterface::Data || inter->getOwner()->isRstClkVisible()){
+    if(inter->visible) {
       if(inter->getOrientation() == Parameters::North){
         nbNorth++;
       } else if(inter->getOrientation() == Parameters::South){
@@ -170,7 +210,7 @@ void AbstractBoxItem::resetInterfacesPosition() {
 
   foreach(InterfaceItem* inter, interfaces) {
 
-    if(inter->refInter->getPurpose() == AbstractInterface::Data || inter->getOwner()->isRstClkVisible()){
+    if(inter->visible){
 
       if(inter->getOrientation() == Parameters::North){
         positionRatio = cntNorth/(double)(nbNorth+1);
@@ -191,7 +231,7 @@ void AbstractBoxItem::resetInterfacesPosition() {
   }
 }
 
-void AbstractBoxItem::moveInterfaceTo(QPointF pos) {
+void AbstractBoxItem::moveInterfaceItemTo(QPointF pos) {
   double positionRatio;
   if(currentInterface->getOrientation() == Parameters::North || currentInterface->getOrientation() == Parameters::South){
     if(pos.x() < 0){
@@ -229,11 +269,26 @@ void AbstractBoxItem::moveInterfaceTo(QPointF pos) {
 
 QRectF AbstractBoxItem::boundingRect() const {
   // returns a QRectF that contains the block (i.e the main rectangle, interfaces, title, ...)
-  QPointF p = originPoint - QPointF(nameHeight,nameHeight);
-  QSizeF s(totalWidth+2*nameHeight,totalHeight+2*nameHeight);
+  QPointF p = originPoint;
+  QSizeF s(totalWidth,totalHeight);
   return QRectF(p,s);
 }
 
+QRectF AbstractBoxItem::boundingRectInScene() {
+  /* returns a QRectF in scene coordinates, that contains the block plus
+     a margin of size arrowWidth+arrowLineLength
+  */
+  int marginConn = params->arrowLineLength+params->arrowWidth;  
+  
+  QPointF posBox = scenePos();
+  posBox.setX(posBox.x()+originPoint.x()-marginConn);
+  posBox.setY(posBox.y()+originPoint.y()-marginConn);
+  
+  QSizeF sizeBox(totalWidth+2*marginConn,totalHeight+2*marginConn);     
+  
+  return QRectF(posBox,sizeBox);
+}
+
 
 /* isInterface() : return true if there are some interfaces
    with the given orientation (N,S,E,O)
@@ -253,7 +308,7 @@ int AbstractBoxItem::nbInterfacesByOrientation(int orientation) {
   return nb;
 }
 
-void AbstractBoxItem::updateInterfacesAndConnections() {
+void AbstractBoxItem::updateInterfaceAndConnectionItems() {
 
   // update all interfaces positions
   foreach(InterfaceItem *item, interfaces){
@@ -275,7 +330,7 @@ void AbstractBoxItem::setDimension(int x, int y) {
   boxHeight = y;
 }
 
-InterfaceItem* AbstractBoxItem::getInterfaceFromCursor(qreal x, qreal y) {
+InterfaceItem* AbstractBoxItem::getInterfaceItemFromCursor(qreal x, qreal y) {
 
   foreach(InterfaceItem* inter, interfaces) {
     if(x > inter->boundingRect().x() && x < (inter->boundingRect().x() + inter->boundingRect().width())){