correct relative positionning of source/group

[blast.git] / AbstractBoxItem.cpp

diff --git a/AbstractBoxItem.cpp b/AbstractBoxItem.cpp
index 0afbe29a6f0fa18978c627b63cbe2c5b96fd652d..391f79541c7c9f45935d86669fe7ed01b283e89e 100644 (file)
--- a/AbstractBoxItem.cpp
+++ b/AbstractBoxItem.cpp
@@ -8,6 +8,7 @@
 
 #include "AbstractBlock.h"
 #include "GroupScene.h"
 
 #include "AbstractBlock.h"
 #include "GroupScene.h"

+#include "GroupItem.h"

 #include "AbstractInterface.h"
 #include "ConnectedInterface.h"
 
 #include "AbstractInterface.h"
 #include "ConnectedInterface.h"
 


@@ -15,12 +16,11 @@
 AbstractBoxItem::  AbstractBoxItem(AbstractBlock *_refBlock, Dispatcher *_dispatcher, Parameters *_params, QGraphicsItem *parent) : QGraphicsItem(parent) {
   dispatcher = _dispatcher;
   params = _params;
 AbstractBoxItem::  AbstractBoxItem(AbstractBlock *_refBlock, Dispatcher *_dispatcher, Parameters *_params, QGraphicsItem *parent) : QGraphicsItem(parent) {
   dispatcher = _dispatcher;
   params = _params;

-  refBlock = _refBlock;
-  QFont fontId("Arial",10);
-  QFontMetrics fmId(fontId);
+  refBlock = _refBlock;  
+  QFontMetrics fmId(params->defaultBlockFont);

   nameWidth = fmId.width(refBlock->getName());
   nameHeight = fmId.height();
   nameWidth = fmId.width(refBlock->getName());
   nameHeight = fmId.height();

-  nameMargin = 10;
+  nameMargin = 5;

   ifaceMargin = 10;
 
   // the six following values will be override in subclass constructors
   ifaceMargin = 10;
 
   // the six following values will be override in subclass constructors


@@ -36,7 +36,37 @@ AbstractBoxItem::  AbstractBoxItem(AbstractBlock *_refBlock, Dispatcher *_dispat
   selected = false;
   currentInterface = NULL;
   rstClkVisible = false;
   selected = false;
   currentInterface = NULL;
   rstClkVisible = false;

+  wishboneVisible = false;
+
+  setAcceptHoverEvents(true);
+
+  // NOTE : initInterfaces() is only called in subclasses
+}
+
+AbstractBoxItem::AbstractBoxItem(Dispatcher *_dispatcher, Parameters *_params, QGraphicsItem* parent) : QGraphicsItem(parent) {
+  dispatcher = _dispatcher;
+  params = _params;
+  refBlock = NULL;
+  nameWidth = 0;
+  nameHeight = 0;
+  nameMargin = 10;
+  ifaceMargin = 10;

 
 

+  // the six following values will be override in subclass constructors
+  minimumBoxWidth = 0;
+  minimumBoxHeight = 0;
+  boxWidth = 0;
+  boxHeight = 0;
+  totalWidth = 0;
+  totalHeight = 0;
+
+  originPoint = QPointF(0.0,0.0);
+
+  selected = false;
+  currentInterface = NULL;
+  rstClkVisible = false;
+  wishboneVisible = false;
+  

   setAcceptHoverEvents(true);
 
   // NOTE : initInterfaces() is only called in subclasses
   setAcceptHoverEvents(true);
 
   // NOTE : initInterfaces() is only called in subclasses


@@ -57,13 +87,56 @@ bool AbstractBoxItem::isGroupItem() {
   return false;
 }
 
   return false;
 }
 

-void AbstractBoxItem::initInterfaces()
-{
+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;
+    }
+  }
+  resetInterfacesPosition();
+  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;
+    }
+  }
+  resetInterfacesPosition();
+  updateGeometry(InterfaceMove);
+  update();
+  getScene()->updateConnectionItemsShape();
+  (getScene()->getGroupItem())->updateShape();
+}
+
+void AbstractBoxItem::setRefBlock(AbstractBlock* _refBlock) {
+  refBlock = _refBlock;
+  QFontMetrics fmId(params->defaultBlockFont);
+  nameWidth = fmId.width(refBlock->getName());
+  nameHeight = fmId.height();
+}
+
+void AbstractBoxItem::initInterfaces() {

   /* 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()){
   /* 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;
       InterfaceItem *item;
       if(inter->getDirection() == AbstractInterface::Input){
         orientation = Parameters::West;


@@ -73,9 +146,9 @@ void AbstractBoxItem::initInterfaces()
         orientation = Parameters::North;
       }
       item = new InterfaceItem(0.0 , orientation, (ConnectedInterface *)inter, this, params);
         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::searchInterfaceByName(QString name) {


@@ -98,7 +171,7 @@ InterfaceItem* AbstractBoxItem::searchInterfaceByRef(ConnectedInterface *ref) {
 void AbstractBoxItem::addInterface(InterfaceItem *i, bool resetPosition) {
   interfaces.append(i);
   if (resetPosition) resetInterfacesPosition();
 void AbstractBoxItem::addInterface(InterfaceItem *i, bool resetPosition) {
   interfaces.append(i);
   if (resetPosition) resetInterfacesPosition();

-  updateGeometry();
+  updateGeometry(InterfaceMove);

   update();
 }
 
   update();
 }
 


@@ -108,7 +181,7 @@ void AbstractBoxItem::removeInterface(InterfaceItem *i) {
   delete i;
 
   //resetInterfacesPosition();
   delete i;
 
   //resetInterfacesPosition();

-  updateGeometry();
+  updateGeometry(InterfaceMove);

   update();
 }
 
   update();
 }
 


@@ -122,7 +195,7 @@ void AbstractBoxItem::resetInterfacesPosition() {
 
   foreach(InterfaceItem* inter, interfaces) {
     // only data interfaces and if needed time and reset
 
   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){
       if(inter->getOrientation() == Parameters::North){
         nbNorth++;
       } else if(inter->getOrientation() == Parameters::South){


@@ -137,7 +210,7 @@ void AbstractBoxItem::resetInterfacesPosition() {
 
   foreach(InterfaceItem* inter, interfaces) {
 
 
   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);
 
       if(inter->getOrientation() == Parameters::North){
         positionRatio = cntNorth/(double)(nbNorth+1);


@@ -158,7 +231,7 @@ void AbstractBoxItem::resetInterfacesPosition() {
   }
 }
 
   }
 }
 

-void AbstractBoxItem::deplaceInterface(QPointF pos) {
+void AbstractBoxItem::moveInterfaceTo(QPointF pos) {

   double positionRatio;
   if(currentInterface->getOrientation() == Parameters::North || currentInterface->getOrientation() == Parameters::South){
     if(pos.x() < 0){
   double positionRatio;
   if(currentInterface->getOrientation() == Parameters::North || currentInterface->getOrientation() == Parameters::South){
     if(pos.x() < 0){


@@ -196,11 +269,26 @@ void AbstractBoxItem::deplaceInterface(QPointF pos) {
 
 QRectF AbstractBoxItem::boundingRect() const {
   // returns a QRectF that contains the block (i.e the main rectangle, interfaces, title, ...)
 
 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);
 }
 
   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)
 
 /* isInterface() : return true if there are some interfaces
    with the given orientation (N,S,E,O)


@@ -226,11 +314,12 @@ void AbstractBoxItem::updateInterfacesAndConnections() {
   foreach(InterfaceItem *item, interfaces){
     item->updatePosition();
   }
   foreach(InterfaceItem *item, interfaces){
     item->updatePosition();
   }

+  // NB: dunno the utility of this test !!

   if (getScene() != NULL) {
     // update all connections from/to this block
     foreach(ConnectionItem *item, getScene()->getConnectionItems()){
       if ((item->getFromInterfaceItem()->getOwner() == this) || (item->getToInterfaceItem()->getOwner() == this)) {
   if (getScene() != NULL) {
     // update all connections from/to this block
     foreach(ConnectionItem *item, getScene()->getConnectionItems()){
       if ((item->getFromInterfaceItem()->getOwner() == this) || (item->getToInterfaceItem()->getOwner() == this)) {

-        item->setPathes();
+        item->setPath();

       }
     }
   }
       }
     }
   }