add graph modif, progress on vhdl generation

[blast.git] / SourceItem.cpp

diff --git a/SourceItem.cpp b/SourceItem.cpp
index 62f601ac790851b614dcfa67709f8732f9608ced..6c2b30de91935cfbb7a38b568ff84c6351a357ef 100644 (file)
--- a/SourceItem.cpp
+++ b/SourceItem.cpp
@@ -30,9 +30,9 @@ SourceItem::SourceItem(AbstractBlock *_refBlock,
   setZValue(100);
   setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemSendsGeometryChanges);
 
   setZValue(100);
   setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemSendsGeometryChanges);
 

-  initInterfaces();
+  initInterfaceItems();

   updateGeometry(InterfaceMove);
   updateGeometry(InterfaceMove);

-  resetInterfacesPosition();
+  resetInterfaceItemsPosition();

   QPointF initPos = QPointF(0.0,0.0) - originPoint;
   setPos(initPos);
   //cout << "total size of block: " << totalWidth << "," << totalHeight << endl;
   QPointF initPos = QPointF(0.0,0.0) - originPoint;
   setPos(initPos);
   //cout << "total size of block: " << totalWidth << "," << totalHeight << endl;


@@ -177,7 +177,7 @@ bool SourceItem::updateGeometry(ChangeType type) {
     }
   }
   if (boxSizeChanged) {
     }
   }
   if (boxSizeChanged) {

-    updateInterfacesAndConnections();
+    updateInterfaceAndConnectionItems();

   }
 
 
   }
 
 


@@ -288,7 +288,7 @@ void SourceItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event) {
   }
   else if(params->editState == Parameters::EditInterfaceMove) {
     prepareGeometryChange();
   }
   else if(params->editState == Parameters::EditInterfaceMove) {
     prepareGeometryChange();

-    moveInterfaceTo(event->pos());
+    moveInterfaceItemTo(event->pos());

     // recompute the geometry of the block
     if (updateGeometry(InterfaceMove)) {
       //cout << "must recompute group item geometry" << endl;
     // recompute the geometry of the block
     if (updateGeometry(InterfaceMove)) {
       //cout << "must recompute group item geometry" << endl;


@@ -318,7 +318,7 @@ void SourceItem::mousePressEvent(QGraphicsSceneMouseEvent *event) {
   dispatcher->setCurrentGroupWidget(getScene()->getGroupWidget());
 
   if ((mode == GroupScene::AddConnection) && (params->cursorState == Parameters::CursorOnInterface)) {
   dispatcher->setCurrentGroupWidget(getScene()->getGroupWidget());
 
   if ((mode == GroupScene::AddConnection) && (params->cursorState == Parameters::CursorOnInterface)) {

-    InterfaceItem *inter = getInterfaceFromCursor(x,y);
+    InterfaceItem *inter = getInterfaceItemFromCursor(x,y);

     if (inter != NULL) {
 
       if (params->editState == Parameters::EditNoOperation) {
     if (inter != NULL) {
 
       if (params->editState == Parameters::EditNoOperation) {


@@ -339,7 +339,7 @@ void SourceItem::mousePressEvent(QGraphicsSceneMouseEvent *event) {
   else if (mode == GroupScene::ItemEdition) {
     //setZValue(zValue()+100);
     if (params->cursorState == Parameters::CursorOnInterface) {
   else if (mode == GroupScene::ItemEdition) {
     //setZValue(zValue()+100);
     if (params->cursorState == Parameters::CursorOnInterface) {

-      InterfaceItem *inter = getInterfaceFromCursor(x,y);
+      InterfaceItem *inter = getInterfaceItemFromCursor(x,y);

       if (inter != NULL) {
         if (inter == currentInterface) {
            params->setEditState(Parameters::EditInterfaceDeselect);
       if (inter != NULL) {
         if (inter == currentInterface) {
            params->setEditState(Parameters::EditInterfaceDeselect);


@@ -424,7 +424,7 @@ void SourceItem::hoverMoveEvent(QGraphicsSceneHoverEvent * event) {
   int mode = getScene()->getEditionMode();
 
   if (mode == GroupScene::AddConnection) {
   int mode = getScene()->getEditionMode();
 
   if (mode == GroupScene::AddConnection) {

-    InterfaceItem* iface = getInterfaceFromCursor(x,y);
+    InterfaceItem* iface = getInterfaceItemFromCursor(x,y);

     if (iface != NULL) {
       params->cursorState = Parameters::CursorOnInterface;
       setCursor(Qt::PointingHandCursor);
     if (iface != NULL) {
       params->cursorState = Parameters::CursorOnInterface;
       setCursor(Qt::PointingHandCursor);


@@ -438,7 +438,7 @@ void SourceItem::hoverMoveEvent(QGraphicsSceneHoverEvent * event) {
     int marginE = 5;
     int marginS = 5;
 
     int marginE = 5;
     int marginS = 5;
 

-    InterfaceItem* iface = getInterfaceFromCursor(x,y);
+    InterfaceItem* iface = getInterfaceItemFromCursor(x,y);

     if (iface != NULL) {
       params->cursorState = Parameters::CursorOnInterface;
       setCursor(Qt::PointingHandCursor);
     if (iface != NULL) {
       params->cursorState = Parameters::CursorOnInterface;
       setCursor(Qt::PointingHandCursor);


@@ -498,7 +498,7 @@ void SourceItem::contextMenuEvent(QGraphicsSceneContextMenuEvent * event) {
   QAction* showParameters = NULL;
 
 
   QAction* showParameters = NULL;
 
 

-  InterfaceItem* ifaceItem = getInterfaceFromCursor(event->pos().x(), event->pos().y());
+  InterfaceItem* ifaceItem = getInterfaceItemFromCursor(event->pos().x(), event->pos().y());

   // menu for interface
   if( ifaceItem != NULL){
 
   // menu for interface
   if( ifaceItem != NULL){
 


@@ -603,10 +603,9 @@ void SourceItem::load(QDomElement funcElement) throw(Exception) {
   else {
     reference = referenceMd5;
   }
   else {
     reference = referenceMd5;
   }

-  
-  GroupBlock* parentGroupBlock = AB_TO_GRP(((GroupItem *)parentItem())->getRefBlock());
-  FunctionalBlock* functionalBlock = params->getGraph()->createFunctionalBlock(parentGroupBlock, reference);
-  /* NB: addFunctionalBlock creates all interfaces from the reference, which is annoying when
+    
+  FunctionalBlock* functionalBlock = params->getGraph()->createSourceBlock(reference);
+  /* NB: createSourceBlock creates all interfaces from the reference, which is annoying when

     reading bif_iface tags. Thus interface are all removed.
   */
   functionalBlock->setName(name);
     reading bif_iface tags. Thus interface are all removed.
   */
   functionalBlock->setName(name);


@@ -617,7 +616,7 @@ void SourceItem::load(QDomElement funcElement) throw(Exception) {
   setId(id);
 
 
   setId(id);
 
 

-  QDomNodeList blockParamNodes = funcElement.elementsByTagName("bif_parameter");
+  QDomNodeList blockParamNodes = funcElement.elementsByTagName("source_parameter");

   // setting parameters value
   for(int i=0; i<blockParamNodes.length(); i++){
     QDomElement currentBlockParamNode = blockParamNodes.at(i).toElement();
   // setting parameters value
   for(int i=0; i<blockParamNodes.length(); i++){
     QDomElement currentBlockParamNode = blockParamNodes.at(i).toElement();


@@ -631,12 +630,12 @@ void SourceItem::load(QDomElement funcElement) throw(Exception) {
     BlockParameter *blockParam = NULL;
     blockParam = functionalBlock->getParameterFromName(name);
     if (blockParam == NULL) throw(Exception(PROJECTFILE_CORRUPTED));
     BlockParameter *blockParam = NULL;
     blockParam = functionalBlock->getParameterFromName(name);
     if (blockParam == NULL) throw(Exception(PROJECTFILE_CORRUPTED));

-    blockParam->setValue(value);
+    blockParam->setValue(value);    

   }  
 
   // recreate all (non-control) interfaces because of some may have a multiplicity>1 with several examplars
   functionalBlock->removeAllInterfaces();
   }  
 
   // recreate all (non-control) interfaces because of some may have a multiplicity>1 with several examplars
   functionalBlock->removeAllInterfaces();

-  QDomNodeList interfaceNodes = funcElement.elementsByTagName("bif_iface");
+  QDomNodeList interfaceNodes = funcElement.elementsByTagName("source_iface");

   // setting interfaces (user name, and for multiplicity>1 may be create some new ones)
   for(int i=0; i<interfaceNodes.length(); i++) {
 
   // setting interfaces (user name, and for multiplicity>1 may be create some new ones)
   for(int i=0; i<interfaceNodes.length(); i++) {
 


@@ -670,7 +669,7 @@ void SourceItem::load(QDomElement funcElement) throw(Exception) {
   }
   
   // creating InterfaceItem
   }
   
   // creating InterfaceItem

-  initInterfaces();
+  initInterfaceItems();

   // setting them with saved values
   for(int i=0; i<interfaceNodes.length(); i++){
 
   // setting them with saved values
   for(int i=0; i<interfaceNodes.length(); i++){
 


@@ -689,7 +688,7 @@ void SourceItem::load(QDomElement funcElement) 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));
 

-    InterfaceItem *interfaceItem = searchInterfaceByName(name);
+    InterfaceItem *interfaceItem = searchInterfaceItemByName(name);

     interfaceItem->setId(id);
     interfaceItem->setOrientation(orientation);
     interfaceItem->setPositionRatio(position);
     interfaceItem->setId(id);
     interfaceItem->setOrientation(orientation);
     interfaceItem->setPositionRatio(position);