X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/blast.git/blobdiff_plain/abbc64cf04a35ab3549d5c516f44c7c5921baa63..HEAD:/GroupItem.cpp?ds=inline diff --git a/GroupItem.cpp b/GroupItem.cpp index 04d7bca..d9e7459 100644 --- a/GroupItem.cpp +++ b/GroupItem.cpp @@ -5,10 +5,14 @@ #include "Dispatcher.h" #include "Parameters.h" #include "BoxItem.h" +#include "StimuliItem.h" #include "AbstractBlock.h" #include "AbstractInterface.h" #include "ConnectedInterface.h" #include "GroupScene.h" +#include "ParametersWindow.h" +#include "GroupBlock.h" +#include "GroupInterface.h" GroupItem::GroupItem(BoxItem *_parentItem, @@ -17,26 +21,46 @@ GroupItem::GroupItem(BoxItem *_parentItem, Parameters *_params) throw(Exception) :AbstractBoxItem( _refBlock, _dispatcher, _params) { parentItem = _parentItem; + if (parentItem != NULL) { + 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); + setZValue(100); setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemSendsGeometryChanges); - updateGeometry(); + + updateGeometry(Creation); + setPos(boxPoint); + cout << "total size of group: " << totalWidth << "," << totalHeight << endl; + cout << "pos in scene: " << x() << "," << y() << endl; +} + +GroupItem::GroupItem(Dispatcher *_dispatcher,Parameters *_params) throw(Exception) :AbstractBoxItem(_dispatcher, _params) { + + parentItem = NULL; + rectTitle = QRectF(0,-(nameHeight+2*nameMargin),nameWidth+2*nameMargin,nameHeight+2*nameMargin); + selected = false; + setZValue(100); + setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemSendsGeometryChanges); + + updateGeometry(InterfaceMove); QPointF initPos = QPointF(0.0,0.0) - originPoint; setPos(initPos); cout << "total size of group: " << totalWidth << "," << totalHeight << endl; @@ -56,7 +80,17 @@ BoxItem* GroupItem::getParentItem() { return parentItem; } +void GroupItem::setParentItem(BoxItem *_parentItem) { + parentItem = _parentItem; + if (parentItem != NULL) { + parentItem->setChildGroupItem(this); + } +} + void GroupItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) { + + if (!visible) return; + if(boxWidth > 0 && boxHeight > 0){ if(selected) painter->setPen(Qt::red); @@ -95,67 +129,189 @@ void GroupItem::updateMinimumSize() { minimumBoxHeight = 2*marginConn; if (getScene() == NULL) return; + QList blocks = getScene()->getBoxItems(); + 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; - QList blocks = getScene()->getBlockItems(); - 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(); + 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(); + } + } + else { + if (boxItem.height()+marginConn > topHighest) { + topHighest = boxItem.height()+marginConn; + } + } + if (item->getSpan() == BoxItem::HSpan) { + if (item->getMinimumBoxWidth() > leftLargest) { + leftLargest = item->getMinimumBoxWidth(); } - if (item->getTotalHeight() > yMaxZero) { - yMaxZero = item->getTotalHeight(); + } + } + + 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 (yMaxZero+marginConn > yMax) { - minimumBoxHeight = yMaxZero+2*marginConn; + } + } + + if (item->getPosition() == BoxItem::Right) { + + if (item->getSpan() == BoxItem::HSpan) { + if (item->getMinimumBoxWidth() > rightLargest) { + rightLargest = item->getMinimumBoxWidth(); } - else { - minimumBoxHeight = yMax+marginConn; + } + else { + if (boxItem.width()+marginConn > rightLargest) { + rightLargest = boxItem.width()+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; } void GroupItem::updateShape() { - updateGeometry(); + updateGeometry(InterfaceMove); +} + +void GroupItem::updateBorderSpanItems() { + QList 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) { @@ -163,20 +319,43 @@ bool GroupItem::updateGeometry(ChangeType type) { QPointF oldOrigin = originPoint; QSize oldSize(totalWidth,totalHeight); - updateMinimumSize(); bool boxSizeChanged = false; - if (boxWidth < minimumBoxWidth) { - boxWidth = minimumBoxWidth; + + // whatever the change, the minimum size may have changed + updateMinimumSize(); + + if (type == Creation) { boxSizeChanged = true; - } - if (boxHeight < minimumBoxHeight) { + boxWidth = minimumBoxWidth; boxHeight = minimumBoxHeight; - boxSizeChanged = true; + /* reset and update interfaces positions + * in case of spanning, the interface are positionned + * only on free borders. + */ + resetInterfaceItemsPosition(); } - if (boxSizeChanged) { - updateInterfacesAndConnections(); + 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(); + } } + // compute the max. width of interfaces' name for 4 orientations. int maxSouth = 0; int maxNorth = 0; @@ -221,35 +400,53 @@ bool GroupItem::updateGeometry(ChangeType type) { 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; } +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) { - 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(); - //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(StimuliItem* 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) { @@ -283,7 +480,7 @@ void GroupItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event) { cout << "abnormal case while resizing block" << endl; break; } - updateGeometry(); + updateGeometry(Resize); /* // recompute the geometry of the block updateGeometry(); @@ -302,16 +499,16 @@ void GroupItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event) { } else if(params->editState == Parameters::EditInterfaceMove) { prepareGeometryChange(); - deplaceInterface(event->pos()); + moveInterfaceItemTo(event->pos()); // recompute the geometry of the block - updateGeometry(); + updateGeometry(InterfaceMove); // update connection from/to the selected interface foreach(ConnectionItem *item, getScene()->getConnectionItems()){ if ((item->getFromInterfaceItem() == currentInterface) || (item->getToInterfaceItem() == currentInterface)) { - item->setPathes(); + item->setPath(); } } - update(); + //update(); } } @@ -327,15 +524,10 @@ void GroupItem::mousePressEvent(QGraphicsSceneMouseEvent *event) { int mode = getScene()->getEditionMode(); - dispatcher->setCurrentGroupWidget(getScene()->getGroupWindow()); - - /* 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. + dispatcher->setCurrentGroupWidget(Dispatcher::Design, 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) { @@ -352,12 +544,11 @@ void GroupItem::mousePressEvent(QGraphicsSceneMouseEvent *event) { } } } - } - */ - if (mode == GroupScene::ItemEdition) { + } + else if (mode == GroupScene::ItemEdition) { if (params->cursorState == Parameters::CursorOnInterface) { - InterfaceItem *inter = getInterfaceFromCursor(x,y); + InterfaceItem *inter = getInterfaceItemFromCursor(x,y); if (inter != NULL) { currentInterface = inter; params->setEditState(Parameters::EditInterfaceMove); @@ -379,11 +570,6 @@ void GroupItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) { 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) { @@ -401,19 +587,25 @@ void GroupItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) { } 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->createConnection(Dispatcher::Design, iface1,iface2); 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); } + 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; @@ -429,7 +621,7 @@ void GroupItem::hoverMoveEvent(QGraphicsSceneHoverEvent *event) { 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); @@ -443,7 +635,7 @@ void GroupItem::hoverMoveEvent(QGraphicsSceneHoverEvent *event) { 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); @@ -454,11 +646,11 @@ void GroupItem::hoverMoveEvent(QGraphicsSceneHoverEvent *event) { if ((y>boxHeight-2*marginS)&&(yboxHeight-marginS)&&(yboxWidth-2*marginE)&&(xpos().x(), event->pos().y()); - InterfaceItem* ifaceItem = getInterfaceFromCursor(event->pos().x(), event->pos().y()); - if( ifaceItem != NULL){ + // menu for interface + if( ifaceItem != NULL) { + titleAction = menu.addAction("Interface operations"); + titleAction->setEnabled(false); + menu.addSeparator(); showProperties = menu.addAction("Show properties"); renameAction = menu.addAction("Rename"); menu.addSeparator(); @@ -510,7 +709,18 @@ void GroupItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) { } } else { + titleAction = menu.addAction("Block operations"); + titleAction->setEnabled(false); + menu.addSeparator(); + + if (refBlock->nbParameters() > 0) { + 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()); @@ -518,15 +728,24 @@ void GroupItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) { if(selectedAction == renameAction){ if(ifaceItem != NULL) - dispatcher->rename(ifaceItem); + dispatcher->renameInterface(Dispatcher::Design, ifaceItem); else - dispatcher->rename(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); } } @@ -538,6 +757,85 @@ InterfaceItem* GroupItem::isHoverInterface(QPointF point) { return NULL; } +void GroupItem::load(QDomElement groupElement) throw(Exception) { + + GroupBlock* groupBlock = AB_TO_GRP(refBlock); + + bool ok = false; + + int id = groupElement.attribute("id","none").toInt(&ok); + if(!ok) throw(Exception(PROJECTFILE_CORRUPTED)); + + QString nameStr = groupElement.attribute("name","none"); + if(nameStr == "none") throw(Exception(PROJECTFILE_CORRUPTED)); + + QStringList positionStr = groupElement.attribute("position","none").split(","); + if(positionStr.length() != 2) throw(Exception(PROJECTFILE_CORRUPTED)); + int posX = positionStr.at(0).toInt(&ok); + if(!ok) throw(Exception(PROJECTFILE_CORRUPTED)); + int posY = positionStr.at(1).toInt(&ok); + if(!ok) throw(Exception(PROJECTFILE_CORRUPTED)); + + QStringList dimensionStr = groupElement.attribute("dimension","none").split(","); + if(dimensionStr.length() != 2) throw(Exception(PROJECTFILE_CORRUPTED)); + int dimX = dimensionStr.at(0).toInt(&ok); + if(!ok) throw(Exception(PROJECTFILE_CORRUPTED)); + int dimY = dimensionStr.at(1).toInt(&ok); + if(!ok) throw(Exception(PROJECTFILE_CORRUPTED)); + + setId(id); + setPos(posX,posY); + setDimension(dimX,dimY); + groupBlock->setName(nameStr); + + cout << "group info : \n-id : " << id << "\n-pos : " << posX << ", " << posY << "\n-dim : " << dimX << ", " << dimY << "\n-name : " << nameStr.toStdString() << endl; + + QDomNodeList interfaces = groupElement.elementsByTagName("group_iface"); + for(int j=0; jaddInterface(groupIface); + bool show = false; + if ((groupBlock->isTopGroupBlock()) && (purpose == AbstractInterface::Clock)) { + show = true; + } + + InterfaceItem *interfaceItem = new InterfaceItem(position,orientation,groupIface,this,params,show); + interfaceItem->setId(id); + 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 " << qPrintable(name) << " added to " << groupBlock->getName().toStdString() << endl; + } + +} + void GroupItem::save(QXmlStreamWriter &writer) { writer.writeStartElement("group_item"); @@ -548,7 +846,7 @@ void GroupItem::save(QXmlStreamWriter &writer) { 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())); @@ -566,8 +864,8 @@ void GroupItem::save(QXmlStreamWriter &writer) { 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("purpose",QString(item->refInter->getPurposeString())); writer.writeAttribute("direction",QString(item->refInter->getDirectionString())); writer.writeAttribute("orientation",item->getStrOrientation()); writer.writeAttribute("position",QString::number(item->getPositionRatio()));