Merge branch 'master' of github.com:Sankore/Sankore-3.1

preferencesAboutTextFull
shibakaneki 13 years ago
commit d84003e09d
  1. 2
      Sankore_3.1.pro
  2. 2
      src/domain/UBGraphicsDelegateFrame.cpp
  3. 45
      src/domain/UBGraphicsScene.cpp
  4. 4
      src/domain/UBGraphicsScene.h

@ -7,7 +7,7 @@ CONFIG += debug_and_release \
no_include_pwd no_include_pwd
VERSION_MAJ = 1 VERSION_MAJ = 1
VERSION_MIN = 26 VERSION_MIN = 28
VERSION_TYPE = b # a = alpha, b = beta, r = release, other => error VERSION_TYPE = b # a = alpha, b = beta, r = release, other => error
VERSION_PATCH = 00 VERSION_PATCH = 00

@ -299,7 +299,7 @@ void UBGraphicsDelegateFrame::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
QSizeF newSize = resizableItem->size() + incVector; QSizeF newSize = resizableItem->size() + incVector;
if (newSize.width() < 0 || newSize.height() < 0) if (newSize.width() < 50 /*0*/ || newSize.height() < /*0*/ 50)
return; return;
resizableItem->resize(newSize); resizableItem->resize(newSize);

@ -110,7 +110,7 @@ UBGraphicsScene::UBGraphicsScene(UBDocumentProxy* parent)
mEraser->setRect(QRect(0, 0, 0, 0)); mEraser->setRect(QRect(0, 0, 0, 0));
mEraser->setVisible(false); mEraser->setVisible(false);
mEraser->setZValue(toolLayerStart + toolOffsetEraser); mEraser->setZValue(/*toolLayerStart + toolOffsetEraser*/2);
mEraser->setData(UBGraphicsItemData::ItemLayerType, QVariant(UBItemLayerType::Control)); mEraser->setData(UBGraphicsItemData::ItemLayerType, QVariant(UBItemLayerType::Control));
mTools << mEraser; mTools << mEraser;
@ -123,7 +123,7 @@ UBGraphicsScene::UBGraphicsScene(UBDocumentProxy* parent)
mPointer->setPen(Qt::NoPen); mPointer->setPen(Qt::NoPen);
mPointer->setBrush(QBrush(QColor(255, 0, 0, 186))); mPointer->setBrush(QBrush(QColor(255, 0, 0, 186)));
mPointer->setZValue(toolLayerStart + toolOffsetPointer); mPointer->setZValue( /*toolLayerStart + toolOffsetPointer*/ 2);
mPointer->setData(UBGraphicsItemData::ItemLayerType, QVariant(UBItemLayerType::Tool)); mPointer->setData(UBGraphicsItemData::ItemLayerType, QVariant(UBItemLayerType::Tool));
mTools << mPointer; mTools << mPointer;
@ -230,11 +230,13 @@ bool UBGraphicsScene::inputDevicePress(const QPointF& scenePos, const qreal& pre
eraserWidth /= UBApplication::boardController->currentZoom(); eraserWidth /= UBApplication::boardController->currentZoom();
eraseLineTo(scenePos, eraserWidth); eraseLineTo(scenePos, eraserWidth);
drawEraser(scenePos, true);
accepted = true; accepted = true;
} }
else if (currentTool == UBStylusTool::Pointer) else if (currentTool == UBStylusTool::Pointer)
{ {
drawPointer(scenePos); drawPointer(scenePos, true);
accepted = true; accepted = true;
} }
} }
@ -369,7 +371,7 @@ bool UBGraphicsScene::inputDeviceRelease()
// MARK: - // MARK: -
void UBGraphicsScene::drawEraser(const QPointF &pPoint) void UBGraphicsScene::drawEraser(const QPointF &pPoint, bool isFirstDraw)
{ {
qreal eraserWidth = UBSettings::settings()->currentEraserWidth(); qreal eraserWidth = UBSettings::settings()->currentEraserWidth();
eraserWidth /= UBApplication::boardController->systemScaleFactor(); eraserWidth /= UBApplication::boardController->systemScaleFactor();
@ -381,12 +383,27 @@ void UBGraphicsScene::drawEraser(const QPointF &pPoint)
if (mEraser) if (mEraser)
{ {
mEraser->setRect(QRectF(pPoint.x() - eraserRadius, pPoint.y() - eraserRadius, eraserWidth, eraserWidth)); mEraser->setRect(QRectF(pPoint.x() - eraserRadius, pPoint.y() - eraserRadius, eraserWidth, eraserWidth));
mEraser->show();
if(isFirstDraw)
{
QList<QGraphicsItem *> 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);
}
mEraser->setZValue(2);
mEraser->show();
}
} }
} }
void UBGraphicsScene::drawPointer(const QPointF &pPoint) void UBGraphicsScene::drawPointer(const QPointF &pPoint, bool isFirstDraw)
{ {
qreal pointerDiameter = UBSettings::pointerDiameter / UBApplication::boardController->currentZoom(); qreal pointerDiameter = UBSettings::pointerDiameter / UBApplication::boardController->currentZoom();
qreal pointerRadius = pointerDiameter / 2; qreal pointerRadius = pointerDiameter / 2;
@ -399,7 +416,21 @@ void UBGraphicsScene::drawPointer(const QPointF &pPoint)
pointerDiameter, pointerDiameter,
pointerDiameter)); pointerDiameter));
mPointer->show(); if(isFirstDraw)
{
QList<QGraphicsItem *> 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);
}
mPointer->setZValue(2);
mPointer->show();
}
} }
} }

@ -297,8 +297,8 @@ class UBGraphicsScene: public UBCoreGraphicsScene, public UBItem
void initPolygonItem(UBGraphicsPolygonItem*); void initPolygonItem(UBGraphicsPolygonItem*);
void drawEraser(const QPointF& pEndPoint); void drawEraser(const QPointF& pEndPoint, bool isFirstDraw = false);
void drawPointer(const QPointF& pEndPoint); void drawPointer(const QPointF& pEndPoint, bool isFirstDraw = false);
void DisposeMagnifierQWidgets(); void DisposeMagnifierQWidgets();

Loading…
Cancel
Save