Fix issue #12 An error occurred (zOrder not saved to .svg)

(Merge branch 'craig-dev' into dev)

src/adaptors/UBSvgSubsetAdaptor.cpp

@@ -1077,20 +1077,6 @@ bool UBSvgSubsetAdaptor::UBSvgSubsetWriter::persistScene(int pageIndex)
     {
         QGraphicsItem *item = items.takeFirst();
 
-        // Is the item a strokes group?
-        UBGraphicsStrokesGroup* strokesGroupItem = qgraphicsitem_cast<UBGraphicsStrokesGroup*>(item);
-
-        if(strokesGroupItem && strokesGroupItem->isVisible()){
-            // Add the polygons
-            foreach(QGraphicsItem* item, strokesGroupItem->childItems()){
-                UBGraphicsPolygonItem* poly = qgraphicsitem_cast<UBGraphicsPolygonItem*>(item);
-                if(NULL != poly){
-                    polygonItemToSvgPolygon(poly, true);
-                    items.removeOne(poly);
-                }
-            }
-        }
-
         // Is the item a polygon?
         UBGraphicsPolygonItem *polygonItem = qgraphicsitem_cast<UBGraphicsPolygonItem*> (item);
         if (polygonItem && polygonItem->isVisible())
@@ -1125,7 +1111,7 @@ bool UBSvgSubsetAdaptor::UBSvgSubsetWriter::persistScene(int pageIndex)
                     if (colorOnDarkBackground.isValid() && colorOnLightBackground.isValid())
                     {
                         mXmlWriter.writeAttribute(UBSettings::uniboardDocumentNamespaceUri, "z-value"
-                                                  , QString("%1").arg(polygonItem->zValue()));
+                                                  , QString("%1").arg(polygonItem->strokesGroup()->zValue()));
 
                         mXmlWriter.writeAttribute(UBSettings::uniboardDocumentNamespaceUri
                                                   , "fill-on-dark-background", colorOnDarkBackground.name());
@@ -2112,6 +2098,7 @@ UBGraphicsMediaItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::videoItemFromSvg()
 void UBSvgSubsetAdaptor::UBSvgSubsetReader::graphicsItemFromSvg(QGraphicsItem* gItem)
 {
 
+    // TODO: check position
     QStringRef svgTransform = mXmlReader.attributes().value("transform");
 
     QMatrix itemMatrix;

src/board/UBBoardView.cpp

@@ -1083,7 +1083,6 @@ void UBBoardView::mouseMoveEvent (QMouseEvent *event)
 
     //  QTime mouseMoveTime = QTime::currentTime();
     if(!mIsDragInProgress && ((mapToScene(event->pos()) - mLastPressedMousePos).manhattanLength() < QApplication::startDragDistance())) {
-        qDebug() << "mouse move event canceled";
         return;
     }
 

src/domain/UBGraphicsMediaItem.cpp

@@ -275,6 +275,8 @@ void UBGraphicsMediaItem::copyItemParameters(UBItem *copy) const
         cp->setSourceUrl(this->sourceUrl());
         cp->resize(this->size());
 
+        cp->setZValue(this->zValue());
+
         connect(UBApplication::boardController, SIGNAL(activeSceneChanged()), cp, SLOT(activeSceneChanged()));
         // TODO UB 4.7 complete all members
     }

src/domain/UBGraphicsPDFItem.cpp

@@ -122,6 +122,7 @@ void UBGraphicsPDFItem::copyItemParameters(UBItem *copy) const
         cp->setFlag(QGraphicsItem::ItemIsSelectable, true);
         cp->setData(UBGraphicsItemData::ItemLayerType, this->data(UBGraphicsItemData::ItemLayerType));
         cp->setSourceUrl(this->sourceUrl());
+        cp->setZValue(this->zValue());
     }
 }
 

src/domain/UBGraphicsPixmapItem.cpp

@@ -156,6 +156,8 @@ void UBGraphicsPixmapItem::copyItemParameters(UBItem *copy) const
         cp->setData(UBGraphicsItemData::ItemLayerType, this->data(UBGraphicsItemData::ItemLayerType));
         cp->setData(UBGraphicsItemData::ItemLocked, this->data(UBGraphicsItemData::ItemLocked));
         cp->setSourceUrl(this->sourceUrl());
+
+        cp->setZValue(this->zValue());
     }
 }
 

src/domain/UBGraphicsPolygonItem.cpp

@@ -197,6 +197,7 @@ void UBGraphicsPolygonItem::copyItemParameters(UBItem *copy) const
         cp->setColorOnDarkBackground(this->colorOnDarkBackground());
         cp->setColorOnLightBackground(this->colorOnLightBackground());
 
+        cp->setZValue(this->zValue());
         cp->setData(UBGraphicsItemData::ItemLayerType, this->data(UBGraphicsItemData::ItemLayerType));
     }
 }

src/domain/UBGraphicsScene.cpp

@@ -262,6 +262,10 @@ qreal UBZLayerController::changeZLevelTo(QGraphicsItem *item, moveDestination de
     }
 
     //Return new z value assigned to item
+    
+    // experimental
+    item->setZValue(item->data(UBGraphicsItemData::ItemOwnZValue).toReal());
+
     return item->data(UBGraphicsItemData::ItemOwnZValue).toReal();
 }
 

src/domain/UBGraphicsStrokesGroup.cpp

@@ -185,6 +185,7 @@ void UBGraphicsStrokesGroup::copyItemParameters(UBItem *copy) const
         cp->setFlag(QGraphicsItem::ItemIsSelectable, true);
         cp->setData(UBGraphicsItemData::ItemLayerType, this->data(UBGraphicsItemData::ItemLayerType));
         cp->setData(UBGraphicsItemData::ItemLocked, this->data(UBGraphicsItemData::ItemLocked));
+        cp->setZValue(this->zValue());
     }
 }
 

src/domain/UBGraphicsSvgItem.cpp

@@ -180,6 +180,7 @@ void UBGraphicsSvgItem::copyItemParameters(UBItem *copy) const
         cp->setData(UBGraphicsItemData::ItemLayerType, this->data(UBGraphicsItemData::ItemLayerType));
         cp->setData(UBGraphicsItemData::ItemLocked, this->data(UBGraphicsItemData::ItemLocked));
         cp->setSourceUrl(this->sourceUrl());
+        cp->setZValue(this->zValue());
     }
 }
 

src/domain/UBGraphicsTextItem.cpp

@@ -280,6 +280,7 @@ void UBGraphicsTextItem::copyItemParameters(UBItem *copy) const
         cp->setTextHeight(this->textHeight());
 
         cp->setSourceUrl(this->sourceUrl());
+        cp->setZValue(this->zValue());
     }
 }
 

src/domain/UBGraphicsWidgetItem.cpp

@@ -744,6 +744,7 @@ void UBGraphicsAppleWidgetItem::copyItemParameters(UBItem *copy) const
         }
 
         cp->setSourceUrl(this->sourceUrl());
+        cp->setZValue(this->zValue());
     }
 
 }
@@ -1228,6 +1229,8 @@ void UBGraphicsW3CWidgetItem::copyItemParameters(UBItem *copy) const
         {
             cp->setDatastoreEntry(key, mDatastore.value(key));
         }
+
+        cp->setZValue(this->zValue());
     }
 }
 

src/domain/UBSelectionFrame.cpp

@@ -243,9 +243,6 @@ void UBSelectionFrame::mouseReleaseEvent(QGraphicsSceneMouseEvent */*event*/)
 
 void UBSelectionFrame::onZoomChanged(qreal pZoom)
 {
-    qDebug() << "Pzoom" << pZoom;
-    qDebug() << "Board current zoom" << UBApplication::boardController->currentZoom();
-    qDebug() << "UBApplication::boardController->systemScaleFactor()" << UBApplication::boardController->systemScaleFactor();
     mAntiscaleRatio = 1 / (UBApplication::boardController->systemScaleFactor() * pZoom);
 
 }
@@ -458,7 +455,6 @@ QList<QGraphicsItem*> UBSelectionFrame::sortedByZ(const QList<QGraphicsItem *> &
 
 QList<DelegateButton*> UBSelectionFrame::buttonsForFlags(UBGraphicsFlags fls) {
 
-    qDebug() << "buttons for flags" << QString::number((int)fls, 2);
     QList<DelegateButton*> result;
 
     if (!mDeleteButton) {

src/tools/UBGraphicsCurtainItem.cpp

@@ -167,6 +167,7 @@ void UBGraphicsCurtainItem::copyItemParameters(UBItem *copy) const
         cp->setFlag(QGraphicsItem::ItemIsMovable, true);
         cp->setFlag(QGraphicsItem::ItemIsSelectable, true);
         cp->setData(UBGraphicsItemData::ItemLayerType, this->data(UBGraphicsItemData::ItemLayerType));
+        cp->setZValue(this->zValue());
     }
 }