From 96b8d5c36431a3c2139ee31c927129b9e63a65c4 Mon Sep 17 00:00:00 2001 From: Anatoly Mihalchenko Date: Fri, 12 Aug 2011 18:49:14 +0300 Subject: [PATCH] SANKORE-155 Work with objects on the page is difficult. --- src/domain/UBGraphicsScene.cpp | 37 ++++++++++++++++++++++++++++++++++ src/domain/UBGraphicsScene.h | 3 +++ 2 files changed, 40 insertions(+) diff --git a/src/domain/UBGraphicsScene.cpp b/src/domain/UBGraphicsScene.cpp index 8a69e4e0..96cf1f90 100644 --- a/src/domain/UBGraphicsScene.cpp +++ b/src/domain/UBGraphicsScene.cpp @@ -130,6 +130,9 @@ UBGraphicsScene::UBGraphicsScene(UBDocumentProxy* parent) UBApplication::applicationController->initialHScroll(), UBApplication::applicationController->initialVScroll())); } + + connect(this, SIGNAL(selectionChanged()), this, SLOT(selectionChangedProcessing())); + } @@ -138,6 +141,29 @@ UBGraphicsScene::~UBGraphicsScene() // NOOP } +void UBGraphicsScene::selectionChangedProcessing() +{ + QList allItemsList = items(); + for( int i = 0; i < allItemsList.size(); i++ ) + { + QGraphicsItem *nextItem = allItemsList.at(i); + qreal zValue = nextItem->zValue(); + nextItem->setZValue(qreal(1)); + qDebug() << QString(" %1 ").arg(i) << QString(" %1 ").arg(zValue); + } + + QList selItemsList = selectedItems(); + for( int i = 0; i < selItemsList.size(); i++ ) + { + QGraphicsItem *nextItem = selItemsList.at(i); + qreal zValue = nextItem->zValue(); + nextItem->setZValue(2); + qDebug() << QString(" >>> %1 <<< ").arg(i) << QString(" >>> %1 <<< ").arg(zValue); + } + + +} + // MARK: - // MARK: Mouse/Tablet events handling @@ -1063,6 +1089,7 @@ void UBGraphicsScene::addGraphicsWidget(UBGraphicsWidgetItem* graphicsWidget, co graphicsWidget->setFlag(QGraphicsItem::ItemIsSelectable, true); graphicsWidget->setZValue(getNextObjectZIndex()); +// QGraphicsScene::addWidget(graphicsWidget->widgetWebView()); addItem(graphicsWidget); qreal ssf = 1 / UBApplication::boardController->systemScaleFactor(); @@ -1079,6 +1106,16 @@ void UBGraphicsScene::addGraphicsWidget(UBGraphicsWidgetItem* graphicsWidget, co UBApplication::undoStack->push(uc); setDocumentUpdated(); + +// graphicsWidget->widgetWebView()->setParent(graphicsWidget->v)); +// QObject *zz1= graphicsWidget->widgetWebView()->parent(); +// QWidget *zz2= graphicsWidget->widgetWebView()->parentWidget(); +// +// QObject *zz3= graphicsWidget->parent(); +// QGraphicsWidget *zz4= graphicsWidget->parentWidget(); + +// graphicsWidget->widgetWebView()->loadUrl(); + } else { diff --git a/src/domain/UBGraphicsScene.h b/src/domain/UBGraphicsScene.h index 3e86a4bf..e3d30af3 100644 --- a/src/domain/UBGraphicsScene.h +++ b/src/domain/UBGraphicsScene.h @@ -271,6 +271,9 @@ class UBGraphicsScene: public UBCoreGraphicsScene, public UBItem void setToolCursor(int tool); + void selectionChangedProcessing(); + + signals: void pageSizeChanged();