SANKORE-1026 Navigation palette: thumbnails isn't refeshed after application added to the page

Improvement of scene update flag setting
preferencesAboutTextFull
Anatoly Mihalchenko 12 years ago
parent d9be3652f5
commit 8f06cfd8a1
  1. 16
      src/domain/UBGraphicsScene.cpp
  2. 12
      src/domain/UBGraphicsScene.h
  3. 4
      src/frameworks/UBCoreGraphicsScene.cpp
  4. 13
      src/frameworks/UBCoreGraphicsScene.h

@ -263,7 +263,6 @@ UBGraphicsScene::UBGraphicsScene(UBDocumentProxy* parent)
, mCrossedBackground(false) , mCrossedBackground(false)
, mIsDesktopMode(false) , mIsDesktopMode(false)
, mZoomFactor(1) , mZoomFactor(1)
, mIsModified(true)
, mBackgroundObject(0) , mBackgroundObject(0)
, mPreviousWidth(0) , mPreviousWidth(0)
, mInputDeviceIsPressed(false) , mInputDeviceIsPressed(false)
@ -1564,7 +1563,6 @@ UBGraphicsTextItem *UBGraphicsScene::addTextHtml(const QString &pString, const Q
void UBGraphicsScene::addItem(QGraphicsItem* item) void UBGraphicsScene::addItem(QGraphicsItem* item)
{ {
setModified(true);
UBCoreGraphicsScene::addItem(item); UBCoreGraphicsScene::addItem(item);
UBGraphicsItem::assignZValue(item, mZLayerController->generateZLevel(item)); UBGraphicsItem::assignZValue(item, mZLayerController->generateZLevel(item));
@ -1577,8 +1575,6 @@ void UBGraphicsScene::addItem(QGraphicsItem* item)
void UBGraphicsScene::addItems(const QSet<QGraphicsItem*>& items) void UBGraphicsScene::addItems(const QSet<QGraphicsItem*>& items)
{ {
setModified(true);
foreach(QGraphicsItem* item, items) { foreach(QGraphicsItem* item, items) {
UBCoreGraphicsScene::addItem(item); UBCoreGraphicsScene::addItem(item);
UBGraphicsItem::assignZValue(item, mZLayerController->generateZLevel(item)); UBGraphicsItem::assignZValue(item, mZLayerController->generateZLevel(item));
@ -1591,7 +1587,6 @@ void UBGraphicsScene::addItems(const QSet<QGraphicsItem*>& items)
void UBGraphicsScene::removeItem(QGraphicsItem* item) void UBGraphicsScene::removeItem(QGraphicsItem* item)
{ {
setModified(true);
UBCoreGraphicsScene::removeItem(item); UBCoreGraphicsScene::removeItem(item);
UBApplication::boardController->freezeW3CWidget(item, true); UBApplication::boardController->freezeW3CWidget(item, true);
@ -1603,8 +1598,6 @@ void UBGraphicsScene::removeItem(QGraphicsItem* item)
void UBGraphicsScene::removeItems(const QSet<QGraphicsItem*>& items) void UBGraphicsScene::removeItems(const QSet<QGraphicsItem*>& items)
{ {
setModified(true);
foreach(QGraphicsItem* item, items) foreach(QGraphicsItem* item, items)
UBCoreGraphicsScene::removeItem(item); UBCoreGraphicsScene::removeItem(item);
@ -1762,7 +1755,6 @@ void UBGraphicsScene::addRuler(QPointF center)
addItem(ruler); addItem(ruler);
ruler->setVisible(true); ruler->setVisible(true);
setModified(true);
} }
void UBGraphicsScene::addProtractor(QPointF center) void UBGraphicsScene::addProtractor(QPointF center)
@ -1780,7 +1772,6 @@ void UBGraphicsScene::addProtractor(QPointF center)
protractor->moveBy(center.x() - itemSceneCenter.x(), center.y() - itemSceneCenter.y()); protractor->moveBy(center.x() - itemSceneCenter.x(), center.y() - itemSceneCenter.y());
protractor->setVisible(true); protractor->setVisible(true);
setModified(true);
} }
void UBGraphicsScene::addTriangle(QPointF center) void UBGraphicsScene::addTriangle(QPointF center)
@ -1798,7 +1789,6 @@ void UBGraphicsScene::addTriangle(QPointF center)
triangle->moveBy(center.x() - itemSceneCenter.x(), center.y() - itemSceneCenter.y()); triangle->moveBy(center.x() - itemSceneCenter.x(), center.y() - itemSceneCenter.y());
triangle->setVisible(true); triangle->setVisible(true);
setModified(true);
} }
void UBGraphicsScene::addMagnifier(UBMagnifierParams params) void UBGraphicsScene::addMagnifier(UBMagnifierParams params)
@ -1857,6 +1847,7 @@ void UBGraphicsScene::moveMagnifier()
{ {
QPoint magnifierPos = QPoint(magniferControlViewWidget->pos().x() + magniferControlViewWidget->size().width() / 2, magniferControlViewWidget->pos().y() + magniferControlViewWidget->size().height() / 2 ); QPoint magnifierPos = QPoint(magniferControlViewWidget->pos().x() + magniferControlViewWidget->size().width() / 2, magniferControlViewWidget->pos().y() + magniferControlViewWidget->size().height() / 2 );
moveMagnifier(magnifierPos, true); moveMagnifier(magnifierPos, true);
setModified(true);
} }
} }
@ -1889,6 +1880,7 @@ void UBGraphicsScene::moveMagnifier(QPoint newPos, bool forceGrab)
void UBGraphicsScene::closeMagnifier() void UBGraphicsScene::closeMagnifier()
{ {
DisposeMagnifierQWidgets(); DisposeMagnifierQWidgets();
setModified(true);
} }
void UBGraphicsScene::zoomInMagnifier() void UBGraphicsScene::zoomInMagnifier()
@ -1906,6 +1898,7 @@ void UBGraphicsScene::zoomOutMagnifier()
{ {
magniferControlViewWidget->setZoom(magniferControlViewWidget->params.zoom - 0.5); magniferControlViewWidget->setZoom(magniferControlViewWidget->params.zoom - 0.5);
magniferDisplayViewWidget->setZoom(magniferDisplayViewWidget->params.zoom - 0.5); magniferDisplayViewWidget->setZoom(magniferDisplayViewWidget->params.zoom - 0.5);
setModified(true);
} }
} }
@ -1917,6 +1910,7 @@ void UBGraphicsScene::resizedMagnifier(qreal newPercent)
magniferControlViewWidget->grabPoint(); magniferControlViewWidget->grabPoint();
magniferDisplayViewWidget->setSize(newPercent); magniferDisplayViewWidget->setSize(newPercent);
magniferDisplayViewWidget->grabPoint(); magniferDisplayViewWidget->grabPoint();
setModified(true);
} }
} }
@ -1932,7 +1926,6 @@ void UBGraphicsScene::addCompass(QPointF center)
compass->setData(UBGraphicsItemData::ItemLayerType, QVariant(UBItemLayerType::Tool)); compass->setData(UBGraphicsItemData::ItemLayerType, QVariant(UBItemLayerType::Tool));
compass->setVisible(true); compass->setVisible(true);
setModified(true);
} }
void UBGraphicsScene::addCache() void UBGraphicsScene::addCache()
@ -1962,7 +1955,6 @@ void UBGraphicsScene::addMask(const QPointF &center)
curtain->setRect(rect); curtain->setRect(rect);
curtain->setVisible(true); curtain->setVisible(true);
curtain->setSelected(true); curtain->setSelected(true);
setModified(true);
} }
void UBGraphicsScene::setRenderingQuality(UBItem::RenderingQuality pRenderingQuality) void UBGraphicsScene::setRenderingQuality(UBItem::RenderingQuality pRenderingQuality)

@ -179,16 +179,6 @@ class UBGraphicsScene: public UBCoreGraphicsScene, public UBItem
bool isEmpty() const; bool isEmpty() const;
bool isModified() const
{
return mIsModified;
}
void setModified(bool pModified)
{
mIsModified = pModified;
}
void setDocument(UBDocumentProxy* pDocument); void setDocument(UBDocumentProxy* pDocument);
UBDocumentProxy* document() const UBDocumentProxy* document() const
@ -380,8 +370,6 @@ public slots:
bool mIsDesktopMode; bool mIsDesktopMode;
qreal mZoomFactor; qreal mZoomFactor;
bool mIsModified;
QGraphicsItem* mBackgroundObject; QGraphicsItem* mBackgroundObject;
QPointF mPreviousPoint; QPointF mPreviousPoint;

@ -23,6 +23,7 @@
UBCoreGraphicsScene::UBCoreGraphicsScene(QObject * parent) UBCoreGraphicsScene::UBCoreGraphicsScene(QObject * parent)
: QGraphicsScene ( parent ) : QGraphicsScene ( parent )
, mIsModified(true)
{ {
//NOOP //NOOP
} }
@ -51,6 +52,8 @@ void UBCoreGraphicsScene::addItem(QGraphicsItem* item)
if (item->scene() != this) if (item->scene() != this)
QGraphicsScene::addItem(item); QGraphicsScene::addItem(item);
setModified(true);
} }
@ -63,6 +66,7 @@ void UBCoreGraphicsScene::removeItem(QGraphicsItem* item, bool forceDelete)
delete item; delete item;
item = 0; item = 0;
} }
setModified(true);
} }
bool UBCoreGraphicsScene::deleteItem(QGraphicsItem* item) bool UBCoreGraphicsScene::deleteItem(QGraphicsItem* item)

@ -33,8 +33,21 @@ class UBCoreGraphicsScene : public QGraphicsScene
void removeItemFromDeletion(QGraphicsItem* item); void removeItemFromDeletion(QGraphicsItem* item);
void addItemToDeletion(QGraphicsItem *item); void addItemToDeletion(QGraphicsItem *item);
bool isModified() const
{
return mIsModified;
}
void setModified(bool pModified)
{
mIsModified = pModified;
}
private: private:
QSet<QGraphicsItem*> mItemsToDelete; QSet<QGraphicsItem*> mItemsToDelete;
bool mIsModified;
}; };
#endif /* UBCOREGRAPHICSSCENE_H_ */ #endif /* UBCOREGRAPHICSSCENE_H_ */

Loading…
Cancel
Save