correct relative positionning of source/group

[blast.git] / GroupItem.cpp

diff --git a/GroupItem.cpp b/GroupItem.cpp
index 69b5e0473dc19ca5a5a622883bc49613f4750b1f..90c5574f025c58578e1277154f3371b8143775dc 100644 (file)
--- a/GroupItem.cpp
+++ b/GroupItem.cpp
@@ -5,6 +5,7 @@
 #include "Dispatcher.h"
 #include "Parameters.h"
 #include "BoxItem.h"
 #include "Dispatcher.h"
 #include "Parameters.h"
 #include "BoxItem.h"

+#include "SourceItem.h"

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


@@ -38,7 +39,7 @@ GroupItem::GroupItem(BoxItem *_parentItem,
   selected = false;
 
 
   selected = false;
 
 

-  setZValue(-100);
+  setZValue(100);

 
   setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemSendsGeometryChanges);  
 
 
   setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemSendsGeometryChanges);  
 


@@ -55,7 +56,7 @@ GroupItem::GroupItem(Dispatcher *_dispatcher,Parameters *_params) throw(Exceptio
   parentItem = NULL;
   rectTitle = QRectF(0,-(nameHeight+2*nameMargin),nameWidth+2*nameMargin,nameHeight+2*nameMargin);
   selected = false;
   parentItem = NULL;
   rectTitle = QRectF(0,-(nameHeight+2*nameMargin),nameWidth+2*nameMargin,nameHeight+2*nameMargin);
   selected = false;

-  setZValue(-100);
+  setZValue(100);

   setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemSendsGeometryChanges);
 
   updateGeometry(InterfaceMove);
   setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemSendsGeometryChanges);
 
   updateGeometry(InterfaceMove);


@@ -125,7 +126,7 @@ void GroupItem::updateMinimumSize() {
 
   if (getScene() == NULL) return;
 
 
   if (getScene() == NULL) return;
 

-  QList<BoxItem *> blocks = getScene()->getBlockItems();
+  QList<BoxItem *> blocks = getScene()->getBoxItems();

   if(blocks.length() > 0) {
     // first, search for blocks that are at (0,0)
     int xMaxZero = 0;
   if(blocks.length() > 0) {
     // first, search for blocks that are at (0,0)
     int xMaxZero = 0;


@@ -259,35 +260,53 @@ bool GroupItem::updateGeometry(ChangeType type) {
   originPoint.setY(y);
 
   if ((boxSizeChanged) || (newSize != oldSize) || (originPoint != oldOrigin)) {
   originPoint.setY(y);
 
   if ((boxSizeChanged) || (newSize != oldSize) || (originPoint != oldOrigin)) {

-    cout << "must change group item shape" << endl;
+    //cout << "GroupItem: must change group item shape" << endl;

     prepareGeometryChange();
     return true;
   }
   return false;
 }
 
     prepareGeometryChange();
     return true;
   }
   return false;
 }
 

+void GroupItem::nameChanged() {
+
+  
+  QFontMetrics fmId(params->defaultBlockFont);
+  nameWidth = fmId.width(refBlock->getName());
+  nameHeight = fmId.height();
+  // changing the BoxItem in the upperscene
+  if (parentItem != NULL) {
+    parentItem->nameChanged();
+  }
+  updateGeometry(InterfaceMove);
+  // force the update in case of the size has not changed
+  update();  
+}
+
+

 void GroupItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event) {
 
 void GroupItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event) {
 

-  if(params->editState == Parameters::EditGroupMove) {
-    QPointF absPos = currentPosition + originPoint;    
+  if(params->editState == Parameters::EditGroupMove) {    

     int gapX = event->scenePos().x() - cursorPosition.x();
     int gapY = event->scenePos().y() - cursorPosition.y();
 
     int gapX = event->scenePos().x() - cursorPosition.x();
     int gapY = event->scenePos().y() - cursorPosition.y();
 

-    //cout << "block abs. pos: " << absPos.x() << "," << absPos.y() << " | ";
-    //cout << "block current. pos: " << currentPosition.x() << "," << currentPosition.y() << " | ";
-/*
-    if (absPos.x()+gapX < 0) {
-      gapX = -absPos.x();
+    bool canMove = true;
+    if (refBlock->isTopGroupBlock()) {
+      QRectF rectGroup = boundingRectInScene();
+      rectGroup.moveTo(rectGroup.x()+gapX,rectGroup.y()+gapY);
+      foreach(SourceItem* source, getScene()->getSourceItems()) {
+        QRectF rectSource = source->boundingRectInScene();
+        if (rectGroup.intersects(rectSource)) canMove = false;
+      }

     }
     }

-    if (absPos.y()+gapY < 0) {
-      gapY = -absPos.y();
+        
+    if (canMove) {
+      QPointF gap(gapX,gapY);
+      currentPosition = currentPosition+gap;
+      setPos(currentPosition);
+      
+      // updating all connections of the scene.
+      getScene()->updateConnectionItemsShape();

     }
     }

-    */
-    //cout << "gap: " << gapX << "," << gapY << " | ";
-    //cout << "scene: " << getScene()->sceneRect().x() << "," << getScene()->sceneRect().y() << endl;
-    QPointF gap(gapX,gapY);
-    currentPosition = currentPosition+gap;
-    setPos(currentPosition);

     cursorPosition = event->scenePos();
   }
   else if(params->editState == Parameters::EditGroupResize) {
     cursorPosition = event->scenePos();
   }
   else if(params->editState == Parameters::EditGroupResize) {


@@ -367,11 +386,6 @@ void GroupItem::mousePressEvent(QGraphicsSceneMouseEvent *event) {
 
   dispatcher->setCurrentGroupWidget(getScene()->getGroupWidget());
 
 
   dispatcher->setCurrentGroupWidget(getScene()->getGroupWidget());
 

-  /* NOTE : commneted because group interface are normally
-     created and the connected directly to a block within
-     the group. Furthermore, there can be a single connection
-     from a groupe interface.
-

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


@@ -390,9 +404,8 @@ void GroupItem::mousePressEvent(QGraphicsSceneMouseEvent *event) {
         }
       }
     }
         }
       }
     }

-  }
-  */
-  if (mode == GroupScene::ItemEdition) {
+  }  
+  else if (mode == GroupScene::ItemEdition) {

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


@@ -417,11 +430,6 @@ void GroupItem::mouseReleaseEvent(QGraphicsSceneMouseEvent  *event) {
 
   int mode = getScene()->getEditionMode();
 
 
   int mode = getScene()->getEditionMode();
 

-  /* NOTE : commneted because group interface are normally
-     created and the connected directly to a block within
-     the group. Furthermore, there can be a single connection
-     from a groupe interface.
-

   if (mode == GroupScene::AddConnection) {
 
     if (params->editState == Parameters::EditStartConnection) {
   if (mode == GroupScene::AddConnection) {
 
     if (params->editState == Parameters::EditStartConnection) {


@@ -439,19 +447,25 @@ void GroupItem::mouseReleaseEvent(QGraphicsSceneMouseEvent  *event) {
     }
     else if (params->editState == Parameters::EditCloseConnection) {
       InterfaceItem* iface1 = getScene()->getSelectedInterface(1);
     }
     else if (params->editState == Parameters::EditCloseConnection) {
       InterfaceItem* iface1 = getScene()->getSelectedInterface(1);

-      InterfaceItem* iface2 = getScene()->getSelectedInterface(2);
-      bool ok = dispatcher->connect(iface1,iface2);
+      InterfaceItem* iface2 = getScene()->getSelectedInterface(2);      
+      bool ok = dispatcher->createConnectionItem(iface1,iface2);     

       if (ok) {
         iface1->selected = false;
         update(iface1->boundingRect());
       if (ok) {
         iface1->selected = false;
         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);
       }

+      else {
+        //QMessageBox::warning(NULL,"Error","Cannot connect selected interfaces", QMessageBox::Ok);
+        getScene()->setSelectedInterface(2,NULL);
+        params->setEditState(Parameters::EditStartConnection);
+      }

     }
     }

-  }
-  */
-  if (mode == GroupScene::ItemEdition) {
+  }  
+  else if (mode == GroupScene::ItemEdition) {

     currentInterface = NULL;
     setFlag(ItemIsMovable, true);
     params->editState = Parameters::EditNoOperation;
     currentInterface = NULL;
     setFlag(ItemIsMovable, true);
     params->editState = Parameters::EditNoOperation;


@@ -523,7 +537,8 @@ void GroupItem::hoverMoveEvent(QGraphicsSceneHoverEvent *event) {
       }
     }
   }
       }
     }
   }

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

 }
 
 void GroupItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) {
 }
 
 void GroupItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) {


@@ -572,7 +587,7 @@ void GroupItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) {
     if(ifaceItem != NULL)
       dispatcher->renameInterface(ifaceItem);
     else
     if(ifaceItem != NULL)
       dispatcher->renameInterface(ifaceItem);
     else

-      dispatcher->renameBlockOrGroup(this);
+      dispatcher->renameGroupBlock(this);

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


@@ -582,7 +597,7 @@ void GroupItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) {
   }
   else if(selectedAction == showParameters) {
     new ParametersWindow(refBlock, params, NULL);
   }
   else if(selectedAction == showParameters) {
     new ParametersWindow(refBlock, params, NULL);

-  }
+  }   

 }
 
 InterfaceItem* GroupItem::isHoverInterface(QPointF point) {
 }
 
 InterfaceItem* GroupItem::isHoverInterface(QPointF point) {


@@ -636,10 +651,6 @@ void GroupItem::load(QDomElement groupElement) throw(Exception) {
     QString name = currentInterfaceNode.attribute("name","none");
     if(name == "none") throw(Exception(PROJECTFILE_CORRUPTED));
 
     QString name = currentInterfaceNode.attribute("name","none");
     if(name == "none") throw(Exception(PROJECTFILE_CORRUPTED));
 

-    QString levelStr = currentInterfaceNode.attribute("level","none");
-    int level = AbstractInterface::getIntLevel(levelStr);
-    if(level == -1) throw(Exception(PROJECTFILE_CORRUPTED));
-

     QString directionStr = currentInterfaceNode.attribute("direction","none");
     int direction = AbstractInterface::getIntDirection(directionStr);
     if(direction == -1) throw(Exception(PROJECTFILE_CORRUPTED));
     QString directionStr = currentInterfaceNode.attribute("direction","none");
     int direction = AbstractInterface::getIntDirection(directionStr);
     if(direction == -1) throw(Exception(PROJECTFILE_CORRUPTED));


@@ -651,7 +662,7 @@ void GroupItem::load(QDomElement groupElement) throw(Exception) {
     double position = currentInterfaceNode.attribute("position","none").toDouble(&ok);
     if(!ok) throw(Exception(PROJECTFILE_CORRUPTED));
 
     double position = currentInterfaceNode.attribute("position","none").toDouble(&ok);
     if(!ok) throw(Exception(PROJECTFILE_CORRUPTED));
 

-    GroupInterface *groupInterface = new GroupInterface(groupBlock,name,direction,level);
+    GroupInterface *groupInterface = new GroupInterface(groupBlock,name,direction,AbstractInterface::Data);

 
     InterfaceItem *interfaceItem = new InterfaceItem(position,orientation,groupInterface,this,params);
     interfaceItem->setId(id);
 
     InterfaceItem *interfaceItem = new InterfaceItem(position,orientation,groupInterface,this,params);
     interfaceItem->setId(id);


@@ -673,7 +684,7 @@ void GroupItem::save(QXmlStreamWriter &writer) {
   if(parentItem != NULL){
     attrUpperItem = QString::number(parentItem->getId());
   }
   if(parentItem != NULL){
     attrUpperItem = QString::number(parentItem->getId());
   }

-  QString attrPos = QString::number(pos().x()).append(",").append(QString::number(pos().y()));
+  QString attrPos = QString::number((int)(pos().x())).append(",").append(QString::number((int)(pos().y())));

   QString attrDim = QString::number(getWidth()).append(",").append(QString::number(getHeight()));
 
 
   QString attrDim = QString::number(getWidth()).append(",").append(QString::number(getHeight()));
 
 


@@ -691,8 +702,7 @@ void GroupItem::save(QXmlStreamWriter &writer) {
     writer.writeStartElement("group_iface");
 
     writer.writeAttribute("id",QString::number(item->getId()));
     writer.writeStartElement("group_iface");
 
     writer.writeAttribute("id",QString::number(item->getId()));

-    writer.writeAttribute("name",item->getName());
-    writer.writeAttribute("level",QString(item->refInter->getLevelString()));
+    writer.writeAttribute("name",item->getName());    

     writer.writeAttribute("direction",QString(item->refInter->getDirectionString()));
     writer.writeAttribute("orientation",item->getStrOrientation());
     writer.writeAttribute("position",QString::number(item->getPositionRatio()));
     writer.writeAttribute("direction",QString(item->refInter->getDirectionString()));
     writer.writeAttribute("orientation",item->getStrOrientation());
     writer.writeAttribute("position",QString::number(item->getPositionRatio()));