From 0180df1b980aab5271fef1600691da63c2a893f2 Mon Sep 17 00:00:00 2001 From: Anatoly Mihalchenko Date: Wed, 23 May 2012 12:39:04 +0300 Subject: [PATCH] SANKORE-527 PDF : Sankore overwrite Pdf layer to empty, after picture(shape) was "set as background" --- src/adaptors/UBCFFSubsetAdaptor.cpp | 2 +- src/board/UBBoardController.cpp | 4 ++-- src/board/UBBoardPaletteManager.cpp | 2 +- src/board/UBLibraryController.cpp | 4 ++-- src/core/UBDocumentManager.cpp | 2 +- src/domain/UBGraphicsScene.cpp | 4 ++-- src/domain/UBGraphicsScene.h | 6 +++++- 7 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/adaptors/UBCFFSubsetAdaptor.cpp b/src/adaptors/UBCFFSubsetAdaptor.cpp index fbc079c3..774fd8ea 100644 --- a/src/adaptors/UBCFFSubsetAdaptor.cpp +++ b/src/adaptors/UBCFFSubsetAdaptor.cpp @@ -738,7 +738,7 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgImage(const QDomElement &ele } } - UBGraphicsPixmapItem *pixItem = mCurrentScene->addPixmap(pix); + UBGraphicsPixmapItem *pixItem = mCurrentScene->addPixmap(pix, NULL); QTransform transform; QString textTransform = element.attribute(aTransform); diff --git a/src/board/UBBoardController.cpp b/src/board/UBBoardController.cpp index b32c3a6c..c1f86511 100644 --- a/src/board/UBBoardController.cpp +++ b/src/board/UBBoardController.cpp @@ -816,7 +816,7 @@ void UBBoardController::downloadFinished(bool pSuccess, QUrl sourceUrl, QString img.loadFromData(pData); QPixmap pix = QPixmap::fromImage(img); - UBGraphicsPixmapItem* pixItem = mActiveScene->addPixmap(pix, pPos, 1.); + UBGraphicsPixmapItem* pixItem = mActiveScene->addPixmap(pix, NULL, pPos, 1.); pixItem->setSourceUrl(sourceUrl); if (isBackground) @@ -1986,7 +1986,7 @@ void UBBoardController::processMimeData(const QMimeData* pMimeData, const QPoint // validate that the image is really an image, webkit does not fill properly the image mime data if (pix.width() != 0 && pix.height() != 0) { - mActiveScene->addPixmap(pix, pPos, 1.); + mActiveScene->addPixmap(pix, NULL, pPos, 1.); return; } } diff --git a/src/board/UBBoardPaletteManager.cpp b/src/board/UBBoardPaletteManager.cpp index 1585df84..3962ce5f 100644 --- a/src/board/UBBoardPaletteManager.cpp +++ b/src/board/UBBoardPaletteManager.cpp @@ -793,7 +793,7 @@ void UBBoardPaletteManager::addItemToCurrentPage() UBApplication::boardController->downloadURL(mItemUrl); else { - UBGraphicsPixmapItem* item = UBApplication::boardController->activeScene()->addPixmap(mPixmap, mPos, mScaleFactor); + UBGraphicsPixmapItem* item = UBApplication::boardController->activeScene()->addPixmap(mPixmap, NULL, mPos, mScaleFactor); item->setSourceUrl(mItemUrl); item->setSelected(true); diff --git a/src/board/UBLibraryController.cpp b/src/board/UBLibraryController.cpp index 8f65bd4c..addf65cc 100644 --- a/src/board/UBLibraryController.cpp +++ b/src/board/UBLibraryController.cpp @@ -505,7 +505,7 @@ void UBLibraryController::setItemAsBackground(UBLibElement* image) } else{ QPixmap pix(image->path().toLocalFile()); - UBGraphicsPixmapItem* boardItem = activeScene()->addPixmap(pix, QPointF(0, 0)); + UBGraphicsPixmapItem* boardItem = activeScene()->addPixmap(pix, activeScene()->backgroundObject(), QPointF(0, 0)); activeScene()->setAsBackgroundObject(boardItem, true); } } @@ -679,7 +679,7 @@ void UBLibraryController::addImagesToCurrentPage(const QList& images) itemInScene = activeScene()->addSvg(url, pos); } else { itemInScene = activeScene()->addPixmap(QPixmap( - url.toLocalFile()), pos); + url.toLocalFile()), NULL, pos); } } diff --git a/src/core/UBDocumentManager.cpp b/src/core/UBDocumentManager.cpp index 48dd0352..cb3e5731 100644 --- a/src/core/UBDocumentManager.cpp +++ b/src/core/UBDocumentManager.cpp @@ -263,7 +263,7 @@ int UBDocumentManager::addImageAsPageToDocument(const QStringList& filenames, UB } else { - gi = scene->addPixmap(pix, QPointF(0, 0)); + gi = scene->addPixmap(pix, NULL, QPointF(0, 0)); } } diff --git a/src/domain/UBGraphicsScene.cpp b/src/domain/UBGraphicsScene.cpp index e247ed58..e5b21997 100644 --- a/src/domain/UBGraphicsScene.cpp +++ b/src/domain/UBGraphicsScene.cpp @@ -1044,7 +1044,7 @@ void UBGraphicsScene::clearAnnotations() } -UBGraphicsPixmapItem* UBGraphicsScene::addPixmap(const QPixmap& pPixmap, const QPointF& pPos, qreal pScaleFactor, bool pUseAnimation) +UBGraphicsPixmapItem* UBGraphicsScene::addPixmap(const QPixmap& pPixmap, QGraphicsItem* replaceFor, const QPointF& pPos, qreal pScaleFactor, bool pUseAnimation) { UBGraphicsPixmapItem* pixmapItem = new UBGraphicsPixmapItem(); @@ -1061,7 +1061,7 @@ UBGraphicsPixmapItem* UBGraphicsScene::addPixmap(const QPixmap& pPixmap, const Q addItem(pixmapItem); if (enableUndoRedoStack) { //should be deleted after scene own undo stack implemented - UBGraphicsItemUndoCommand* uc = new UBGraphicsItemUndoCommand(this, 0, pixmapItem); + UBGraphicsItemUndoCommand* uc = new UBGraphicsItemUndoCommand(this, replaceFor, pixmapItem); UBApplication::undoStack->push(uc); } diff --git a/src/domain/UBGraphicsScene.h b/src/domain/UBGraphicsScene.h index 446bfb93..cc451445 100644 --- a/src/domain/UBGraphicsScene.h +++ b/src/domain/UBGraphicsScene.h @@ -279,7 +279,11 @@ class UBGraphicsScene: public UBCoreGraphicsScene, public UBItem void deselectAllItems(); - UBGraphicsPixmapItem* addPixmap(const QPixmap& pPixmap, const QPointF& pPos = QPointF(0,0), qreal scaleFactor = 1.0, bool pUseAnimation = false); + UBGraphicsPixmapItem* addPixmap(const QPixmap& pPixmap, + QGraphicsItem* replaceFor, + const QPointF& pPos = QPointF(0,0), + qreal scaleFactor = 1.0, + bool pUseAnimation = false); void textUndoCommandAdded(UBGraphicsTextItem *textItem);