X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/blast.git/blobdiff_plain/48f48e6a26a54751ecd0ab90b10ab972cc5e89cd..2bdaa0aa3fab52f0808f60d9bbdabcd56d0efae9:/GroupItem.cpp?ds=sidebyside

diff --git a/GroupItem.cpp b/GroupItem.cpp
index 3286c14..385b352 100644
--- a/GroupItem.cpp
+++ b/GroupItem.cpp
@@ -25,28 +25,29 @@ GroupItem::GroupItem(BoxItem *_parentItem,
     parentItem->setChildGroupItem(this);    
   }
 
-  /*
-  minimumBoxWidth = nameWidth+2*nameMargin;
-  minimumBoxHeight = 100;
-  boxHeight = minimumBoxHeight;
-  boxWidth = minimumBoxWidth;
-  */
+  boxHeight = 1;
+  boxWidth = 1;
   rectTitle = QRectF(0,-(nameHeight+2*nameMargin),nameWidth+2*nameMargin,nameHeight+2*nameMargin);
+
+  /* NB: boxPoint represent the position in scene of the top-left corner of the box, thus
+   * without taking into account the interfaces. It is also the reference position to draw the item.
+   * Nevertheless, in order to place sources in the scene, the real bouding box of the group is determined
+   * from originPoint and totalWidth/totalheight.
+   * */
+  boxPoint = QPointF(0,0);
   /*
   totalHeight = boxHeight + rectTitle.height();
   totalWidth = boxWidth;
 */
   selected = false;
 
-
   setZValue(100);
 
   setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemSendsGeometryChanges);  
 
 
-  updateGeometry(InterfaceMove);
-  QPointF initPos = QPointF(0.0,0.0) - originPoint;
-  setPos(initPos);
+  updateGeometry(Creation);
+  setPos(boxPoint);
   cout << "total size of group: " << totalWidth << "," << totalHeight << endl;
   cout << "pos in scene: " << x() << "," << y() << endl;
 }
@@ -125,62 +126,155 @@ void GroupItem::updateMinimumSize() {
   minimumBoxHeight = 2*marginConn;
 
   if (getScene() == NULL) return;
-
   QList<BoxItem *> blocks = getScene()->getBoxItems();
-  if(blocks.length() > 0) {
-    // first, search for blocks that are at (0,0)
-    int xMaxZero = 0;
-    int yMaxZero = 0;
-    int xMax = 0;
-    int yMax = 0;
-    bool isZeroBlocks = false;
-    bool isOtherBlocks = false;
-    foreach(BoxItem* item, blocks) {
-      QPointF p = item->pos() + item->getOriginPoint();
-      if ((p.x()==0.0) && (p.y()==0.0)) {
-        isZeroBlocks = true;
-        if (item->getTotalWidth() > xMaxZero) {
-          xMaxZero = item->getTotalWidth();
+  if(blocks.length() == 0) return; // no blocks within, keep the miniumum computed before.
+
+  QRectF boxFree; // the bounding box of free blocks.
+  foreach(BoxItem* item, blocks) {
+    QRectF boxItem = item->boundingRect();
+    if (item->getPosition() == BoxItem::Free) {
+      boxItem.translate(item->pos());
+      if (item->getSpan() == BoxItem::NoSpan) {
+        boxFree = boxFree.united(boxItem);
+      }
+      else if (item->getSpan() == BoxItem::HSpan) {
+        QRectF r(boxFree.left()+boxFree.width()/2.0,boxItem.top(),1,boxItem.height());
+        boxFree = boxFree.united(r);
+      }
+      else if (item->getSpan() == BoxItem::VSpan) {
+        QRectF r(boxItem.left(),boxFree.top()+boxFree.height()/2.0,boxItem.width(),1);
+        boxFree = boxFree.united(r);
+      }
+    }
+  }
+  // find the move to apply to freely located items
+  double gapXLeft = 0.0;
+  double gapYTop = 0.0;
+  if (boxFree.left() < marginConn) {
+    gapXLeft = boxFree.left() - marginConn;
+  }
+  if (boxFree.top() < marginConn) {
+    gapYTop = boxFree.top() - marginConn;
+  }
+  // translate the box
+  boxFree.translate(-gapXLeft,-gapYTop);
+  minimumBoxWidth = boxFree.right() + marginConn;
+  minimumBoxHeight = boxFree.bottom() + marginConn;
+
+  // find the highest/largest item stick on top/bottom/left/right
+
+  qreal topHighest = 0.0;
+  qreal bottomHighest = 0.0;
+  qreal leftLargest = 0.0;
+  qreal rightLargest = 0.0;
+
+  foreach(BoxItem* item, blocks) {
+    QRectF boxItem = item->boundingRect();
+
+    if (item->getPosition() == BoxItem::Top) {
+
+      if (item->getSpan() == BoxItem::VSpan) {
+        if (item->getMinimumBoxHeight() > topHighest) {
+          topHighest = item->getMinimumBoxHeight();
         }
-        if (item->getTotalHeight() > yMaxZero) {
-          yMaxZero = item->getTotalHeight();
+      }
+      else {
+        if (boxItem.height()+marginConn > topHighest) {
+          topHighest = boxItem.height()+marginConn;
+        }
+      }
+      if (item->getSpan() == BoxItem::HSpan) {
+        if (item->getMinimumBoxWidth() > leftLargest) {
+          leftLargest = item->getMinimumBoxWidth();
+        }
+      }
+    }
+
+    if (item->getPosition() == BoxItem::Bottom) {
+
+      if (item->getSpan() == BoxItem::VSpan) {
+        if (item->getMinimumBoxHeight() > bottomHighest) {
+          bottomHighest = item->getMinimumBoxHeight();
         }
       }
       else {
-        isOtherBlocks = true;
-        if(p.x()+item->getTotalWidth() > xMax) {
-          xMax = p.x()+item->getTotalWidth();
+        if (boxItem.height()+marginConn > bottomHighest) {
+          bottomHighest = boxItem.height()+marginConn;
         }
-        if(p.y()+item->getTotalHeight() > yMax) {
-          yMax = p.y()+item->getTotalHeight();
+      }
+      if (item->getSpan() == BoxItem::HSpan) {
+        if (item->getMinimumBoxWidth() > leftLargest) {
+          leftLargest = item->getMinimumBoxWidth();
         }
       }
     }
-    if (isZeroBlocks) {
-      if (!isOtherBlocks) {
-        minimumBoxWidth = xMaxZero+2*marginConn;
-        minimumBoxHeight = yMaxZero+2*marginConn;
+
+    if (item->getPosition() == BoxItem::Left) {
+
+      if (item->getSpan() == BoxItem::HSpan) {
+        if (item->getMinimumBoxWidth() > leftLargest) {
+          leftLargest = item->getMinimumBoxWidth();
+        }
       }
       else {
-        if (xMaxZero+marginConn > xMax) {
-          minimumBoxWidth = xMaxZero+2*marginConn;
+        if (boxItem.width()+marginConn > leftLargest) {
+          leftLargest = boxItem.width()+marginConn;
         }
-        else {
-          minimumBoxWidth = xMax+marginConn;
+      }
+      if (item->getSpan() == BoxItem::VSpan) {
+        if (item->getMinimumBoxHeight() > topHighest) {
+          topHighest = item->getMinimumBoxHeight();
+        }
+      }
+    }
+
+    if (item->getPosition() == BoxItem::Right) {
+
+      if (item->getSpan() == BoxItem::HSpan) {
+        if (item->getMinimumBoxWidth() > rightLargest) {
+          rightLargest = item->getMinimumBoxWidth();
         }
-        if (yMaxZero+marginConn > yMax) {
-          minimumBoxHeight = yMaxZero+2*marginConn;
+      }
+      else {
+        if (boxItem.width()+marginConn > rightLargest) {
+          rightLargest = boxItem.width()+marginConn;
         }
-        else {
-          minimumBoxHeight = yMax+marginConn;
+      }
+      if (item->getSpan() == BoxItem::VSpan) {
+        if (item->getMinimumBoxHeight() > topHighest) {
+          topHighest = item->getMinimumBoxHeight();
         }
       }
     }
-    else {
-      minimumBoxWidth = xMax+marginConn;
-      minimumBoxHeight = yMax+marginConn;
+  }
+
+  if (leftLargest > minimumBoxWidth) {
+    minimumBoxWidth = leftLargest;
+  }
+  if (rightLargest > minimumBoxWidth) {
+    minimumBoxWidth = rightLargest;
+  }
+  if (topHighest > minimumBoxHeight) {
+    minimumBoxHeight = topHighest;
+  }
+  if (bottomHighest > minimumBoxHeight) {
+    minimumBoxHeight = bottomHighest;
+  }
+  // must move all free boxitem within of -gapXLeft,-gapYTop
+  foreach(BoxItem* item, blocks) {
+    if (item->getPosition() == BoxItem::Free) {
+      if (item->getSpan() == BoxItem::HSpan) {
+        item->moveBy(0,-gapYTop);
+      }
+      if (item->getSpan() == BoxItem::VSpan) {
+        item->moveBy(-gapXLeft,0);
+      }
+      else {
+        item->moveBy(-gapXLeft,-gapYTop);
+      }
     }
   }
+
   //cout << "min group size: " << minimumBoxWidth << "," << minimumBoxHeight << endl;
 }
 
@@ -188,6 +282,35 @@ void GroupItem::updateShape() {
   updateGeometry(InterfaceMove);
 }
 
+void GroupItem::updateBorderSpanItems() {
+  QList<BoxItem *> blocks = getScene()->getBoxItems();
+  bool changed = false;
+  foreach(BoxItem* item, blocks) {
+    changed = false;
+    if (item->getPosition() == BoxItem::Bottom) {
+      changed = true;
+      QPointF pos = item->pos();
+      item->moveTo(QPointF(pos.x(),boxHeight-item->getTotalHeight()));
+    }
+    else if (item->getPosition() == BoxItem::Right) {
+      changed = true;
+      QPointF pos = item->pos();
+      item->moveTo(QPointF(boxWidth-item->getTotalWidth(),pos.y()));
+    }
+    if (item->getSpan() == BoxItem::HSpan) {
+      changed = true;
+      item->setWidth(boxWidth);
+    }
+    else if (item->getSpan() == BoxItem::VSpan) {
+      changed = true;
+      item->setHeight(boxHeight);
+    }
+    if (changed) {
+      item->updateGeometry(Resize);
+    }
+  }
+}
+
 bool GroupItem::updateGeometry(ChangeType type) {
 
   QPointF oldOrigin = originPoint;
@@ -198,21 +321,35 @@ bool GroupItem::updateGeometry(ChangeType type) {
   // whatever the change, the minimum size may have changed
   updateMinimumSize();
 
-  if (type == Resize) {
+  if (type == Creation) {
     boxSizeChanged = true;
-  }
-  // if an internal block has moved, the actual box size may be inadequate
-  if (boxWidth < minimumBoxWidth) {
     boxWidth = minimumBoxWidth;
-    boxSizeChanged = true;
-  }
-  if (boxHeight < minimumBoxHeight) {
     boxHeight = minimumBoxHeight;
-    boxSizeChanged = true;
+    /* reset and update interfaces positions
+     * in case of spanning, the interface are positionned
+     * only on free borders.
+     */
+    resetInterfaceItemsPosition();
   }
-
-  if (boxSizeChanged) {
+  else if (type == Resize) {
+    boxSizeChanged = true;
     updateInterfaceAndConnectionItems();
+    updateBorderSpanItems();
+  }  
+  else if (type == InterfaceMove) {
+    // if an internal block has moved, the actual box size may be inadequate
+    if (boxWidth < minimumBoxWidth) {
+      boxWidth = minimumBoxWidth;
+      boxSizeChanged = true;
+      updateInterfaceAndConnectionItems();
+      updateBorderSpanItems();
+    }
+    if (boxHeight < minimumBoxHeight) {
+      boxHeight = minimumBoxHeight;
+      boxSizeChanged = true;
+      updateInterfaceAndConnectionItems();
+      updateBorderSpanItems();
+    }
   }
 
 
@@ -384,7 +521,7 @@ void GroupItem::mousePressEvent(QGraphicsSceneMouseEvent *event) {
 
   int mode = getScene()->getEditionMode();
 
-  dispatcher->setCurrentGroupWidget(getScene()->getGroupWidget());
+  dispatcher->setCurrentGroupWidget(Dispatcher::Design, getScene()->getGroupWidget());
 
   if ((mode == GroupScene::AddConnection) && (params->cursorState == Parameters::CursorOnInterface)) {
     InterfaceItem *inter = getInterfaceItemFromCursor(x,y);
@@ -448,7 +585,7 @@ void GroupItem::mouseReleaseEvent(QGraphicsSceneMouseEvent  *event) {
     else if (params->editState == Parameters::EditCloseConnection) {
       InterfaceItem* iface1 = getScene()->getSelectedInterface(1);
       InterfaceItem* iface2 = getScene()->getSelectedInterface(2);      
-      bool ok = dispatcher->createConnection(iface1,iface2);     
+      bool ok = dispatcher->createConnection(Dispatcher::Design, iface1,iface2);
       if (ok) {
         iface1->selected = false;
         update(iface1->boundingRect());
@@ -506,11 +643,11 @@ void GroupItem::hoverMoveEvent(QGraphicsSceneHoverEvent *event) {
 
       if ((y>boxHeight-2*marginS)&&(y<boxHeight)) {
         currentBorder = CornerSouthEast;
-        setCursor(Qt::SizeFDiagCursor);
+        setCursor(Qt::SizeFDiagCursor);        
       }
       else {
         currentBorder = BorderEast;
-        setCursor(Qt::SizeHorCursor);
+        setCursor(Qt::SizeHorCursor);        
       }
     }
     else if ((y>boxHeight-marginS)&&(y<boxHeight)) {
@@ -519,11 +656,11 @@ void GroupItem::hoverMoveEvent(QGraphicsSceneHoverEvent *event) {
 
       if ((x>boxWidth-2*marginE)&&(x<boxWidth)) {
         currentBorder = CornerSouthEast;
-        setCursor(Qt::SizeFDiagCursor);
+        setCursor(Qt::SizeFDiagCursor);        
       }
       else {
         currentBorder = BorderSouth;
-        setCursor(Qt::SizeVerCursor);
+        setCursor(Qt::SizeVerCursor);        
       }
     }
     else {
@@ -536,9 +673,7 @@ void GroupItem::hoverMoveEvent(QGraphicsSceneHoverEvent *event) {
         setCursor(Qt::ArrowCursor);
       }
     }
-  }
-  //QGraphicsItem::hoverMoveEvent(event);
-  event->ignore();
+  }  
 }
 
 void GroupItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) {
@@ -548,6 +683,7 @@ void GroupItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) {
   QAction* removeAction = NULL;
   QAction* renameAction = NULL;
   QAction* showParameters = NULL;
+  QAction* addExtClkAction = NULL;
 
   InterfaceItem* ifaceItem = getInterfaceItemFromCursor(event->pos().x(), event->pos().y());
 
@@ -578,6 +714,10 @@ void GroupItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) {
       showParameters = menu.addAction("Show parameters");
     }
     renameAction = menu.addAction("Rename");
+    if (refBlock->isTopGroupBlock()) {
+      addExtClkAction = menu.addAction("Add new external clock/reset");
+    }
+
   }
   QAction* selectedAction = menu.exec(event->screenPos());
 
@@ -585,19 +725,25 @@ void GroupItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) {
 
   if(selectedAction == renameAction){
     if(ifaceItem != NULL)
-      dispatcher->renameInterface(ifaceItem);
+      dispatcher->renameInterface(Dispatcher::Design, ifaceItem);
     else
-      dispatcher->renameGroupBlock(this);
+      dispatcher->renameGroupBlock(Dispatcher::Design, this);
   }
   else if(selectedAction == showProperties){
-    dispatcher->showProperties(ifaceItem);
+    dispatcher->showProperties(Dispatcher::Design, ifaceItem);
   }  
   else if (selectedAction == removeAction) {
-    dispatcher->removeGroupInterface(ifaceItem);
+    dispatcher->removeGroupInterface(Dispatcher::Design, ifaceItem);
   }
   else if(selectedAction == showParameters) {
     new ParametersWindow(refBlock, params, NULL);
-  }   
+  }
+  else if (selectedAction == addExtClkAction) {
+    bool ok = false;
+    double freq = QInputDialog::getDouble(NULL,"Adding a clkrstgen","External clock frequency (in MHz)",100,0,100000,1,&ok);
+    if (!ok) return;
+    dispatcher->addClkRstGenBlock(Dispatcher::Design, freq);
+  }
 }
 
 InterfaceItem* GroupItem::isHoverInterface(QPointF point) {
@@ -667,15 +813,16 @@ void GroupItem::load(QDomElement groupElement) throw(Exception) {
     if(!ok) throw(Exception(PROJECTFILE_CORRUPTED));
     
     GroupInterface *groupIface = new GroupInterface(groupBlock,name,direction,purpose);
-    GroupInterface *groupCtlIface = new GroupInterface(groupBlock,name+"_enb",direction,AbstractInterface::Control);
-    groupCtlIface->setAssociatedIface(groupIface);
-    
+    groupBlock->addInterface(groupIface);
     InterfaceItem *interfaceItem = new InterfaceItem(position,orientation,groupIface,this,params);
     interfaceItem->setId(id);
-
-    groupBlock->addInterface(groupIface);
-    groupBlock->addInterface(groupCtlIface);
     addInterfaceItem(interfaceItem, false);
+
+    if (purpose == AbstractInterface::Data) {
+      GroupInterface *groupCtlIface = new GroupInterface(groupBlock,name+"_enb",direction,AbstractInterface::Control);
+      groupCtlIface->setAssociatedIface(groupIface);
+      groupBlock->addInterface(groupCtlIface);
+    }
     cout << "interface add to " << groupBlock->getName().toStdString() << endl;
   }