Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
OpenBoard
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lifo
Nicolas Ollinger
OpenBoard
Commits
c9d41663
Commit
c9d41663
authored
Dec 12, 2011
by
Ivan Ilin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
first zvalue reimplementation
parent
cea17292
Changes
27
Hide whitespace changes
Inline
Side-by-side
Showing
27 changed files
with
131 additions
and
64 deletions
+131
-64
UBSvgSubsetAdaptor.cpp
src/adaptors/UBSvgSubsetAdaptor.cpp
+23
-12
UBBoardController.cpp
src/board/UBBoardController.cpp
+2
-1
UB.h
src/core/UB.h
+1
-0
UBGraphicsAudioItem.cpp
src/domain/UBGraphicsAudioItem.cpp
+2
-1
UBGraphicsItemDelegate.cpp
src/domain/UBGraphicsItemDelegate.cpp
+4
-2
UBGraphicsItemTransformUndoCommand.cpp
src/domain/UBGraphicsItemTransformUndoCommand.cpp
+5
-2
UBGraphicsPDFItem.cpp
src/domain/UBGraphicsPDFItem.cpp
+4
-2
UBGraphicsPixmapItem.cpp
src/domain/UBGraphicsPixmapItem.cpp
+2
-1
UBGraphicsPolygonItem.cpp
src/domain/UBGraphicsPolygonItem.cpp
+3
-1
UBGraphicsScene.cpp
src/domain/UBGraphicsScene.cpp
+36
-16
UBGraphicsSvgItem.cpp
src/domain/UBGraphicsSvgItem.cpp
+4
-2
UBGraphicsTextItem.cpp
src/domain/UBGraphicsTextItem.cpp
+2
-1
UBGraphicsVideoItem.cpp
src/domain/UBGraphicsVideoItem.cpp
+2
-1
UBGraphicsVideoItemDelegate.cpp
src/domain/UBGraphicsVideoItemDelegate.cpp
+2
-1
UBGraphicsWidgetItem.cpp
src/domain/UBGraphicsWidgetItem.cpp
+2
-1
UBItem.cpp
src/domain/UBItem.cpp
+6
-0
UBItem.h
src/domain/UBItem.h
+1
-0
UBLibraryWidget.cpp
src/gui/UBLibraryWidget.cpp
+1
-1
UBThumbnailWidget.h
src/gui/UBThumbnailWidget.h
+3
-1
Object.h
src/pdf-merger/Object.h
+1
-1
UBGraphicsCache.cpp
src/tools/UBGraphicsCache.cpp
+6
-3
UBGraphicsCompass.cpp
src/tools/UBGraphicsCompass.cpp
+2
-1
UBGraphicsCurtainItem.cpp
src/tools/UBGraphicsCurtainItem.cpp
+4
-3
UBGraphicsCurtainItemDelegate.cpp
src/tools/UBGraphicsCurtainItemDelegate.cpp
+7
-7
UBGraphicsProtractor.cpp
src/tools/UBGraphicsProtractor.cpp
+2
-1
UBGraphicsRuler.cpp
src/tools/UBGraphicsRuler.cpp
+2
-1
UBGraphicsTriangle.cpp
src/tools/UBGraphicsTriangle.cpp
+2
-1
No files found.
src/adaptors/UBSvgSubsetAdaptor.cpp
View file @
c9d41663
...
...
@@ -29,6 +29,7 @@
#include "domain/UBGraphicsTextItem.h"
#include "domain/UBAbstractWidget.h"
#include "domain/UBGraphicsStroke.h"
#include "domain/UBItem.h"
#include "tools/UBGraphicsRuler.h"
#include "tools/UBGraphicsCompass.h"
...
...
@@ -1337,11 +1338,13 @@ UBGraphicsPolygonItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::polygonItemFromPol
if
(
!
ubZValue
.
isNull
())
{
polygonItem
->
setZValue
(
ubZValue
.
toString
().
toFloat
());
// polygonItem->setZValue (ubZValue.toString().toFloat());
UBGraphicsItem
::
assignZValue
(
polygonItem
,
ubZValue
.
toString
().
toFloat
());
}
else
{
polygonItem
->
setZValue
(
mGroupZIndex
);
// polygonItem->setZValue(mGroupZIndex);
UBGraphicsItem
::
assignZValue
(
polygonItem
,
mGroupZIndex
);
}
QStringRef
ubFillOnDarkBackground
=
mXmlReader
.
attributes
().
value
(
mNamespaceUri
,
"fill-on-dark-background"
);
...
...
@@ -1444,11 +1447,13 @@ UBGraphicsPolygonItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::polygonItemFromLin
if
(
!
ubZValue
.
isNull
())
{
polygonItem
->
setZValue
(
ubZValue
.
toString
().
toFloat
());
// polygonItem->setZValue(ubZValue.toString().toFloat());
UBGraphicsItem
::
assignZValue
(
polygonItem
,
ubZValue
.
toString
().
toFloat
());
}
else
{
polygonItem
->
setZValue
(
mGroupZIndex
);
// polygonItem->setZValue(mGroupZIndex);
UBGraphicsItem
::
assignZValue
(
polygonItem
,
mGroupZIndex
);
}
...
...
@@ -1587,7 +1592,8 @@ QList<UBGraphicsPolygonItem*> UBSvgSubsetAdaptor::UBSvgSubsetReader::polygonItem
{
UBGraphicsPolygonItem
*
polygonItem
=
new
UBGraphicsPolygonItem
(
QLineF
(
points
.
at
(
i
),
points
.
at
(
i
+
1
)),
lineWidth
);
polygonItem
->
setColor
(
brushColor
);
polygonItem
->
setZValue
(
zValue
);
// polygonItem->setZValue(zValue);
UBGraphicsItem
::
assignZValue
(
polygonItem
,
zValue
);
polygonItem
->
setColorOnDarkBackground
(
colorOnDarkBackground
);
polygonItem
->
setColorOnLightBackground
(
colorOnLightBackground
);
...
...
@@ -1931,7 +1937,8 @@ void UBSvgSubsetAdaptor::UBSvgSubsetReader::graphicsItemFromSvg(QGraphicsItem* g
if
(
!
ubZValue
.
isNull
())
{
gItem
->
setZValue
(
ubZValue
.
toString
().
toFloat
());
// gItem->setZValue(ubZValue.toString().toFloat());
UBGraphicsItem
::
assignZValue
(
gItem
,
ubZValue
.
toString
().
toFloat
());
}
UBItem
*
ubItem
=
dynamic_cast
<
UBItem
*>
(
gItem
);
...
...
@@ -2484,7 +2491,8 @@ UBGraphicsRuler* UBSvgSubsetAdaptor::UBSvgSubsetReader::rulerFromSvg()
graphicsItemFromSvg
(
ruler
);
ruler
->
setZValue
(
UBGraphicsScene
::
toolLayerStart
+
UBGraphicsScene
::
toolOffsetRuler
);
// ruler->setZValue(UBGraphicsScene::toolLayerStart + UBGraphicsScene::toolOffsetRuler);
UBGraphicsItem
::
assignZValue
(
ruler
,
UBGraphicsScene
::
toolLayerStart
+
UBGraphicsScene
::
toolOffsetRuler
);
ruler
->
setData
(
UBGraphicsItemData
::
ItemLayerType
,
QVariant
(
UBItemLayerType
::
Tool
));
QStringRef
svgWidth
=
mXmlReader
.
attributes
().
value
(
"width"
);
...
...
@@ -2542,7 +2550,8 @@ UBGraphicsCompass* UBSvgSubsetAdaptor::UBSvgSubsetReader::compassFromSvg()
graphicsItemFromSvg
(
compass
);
compass
->
setZValue
(
UBGraphicsScene
::
toolLayerStart
+
UBGraphicsScene
::
toolOffsetCompass
);
//compass->setZValue(UBGraphicsScene::toolLayerStart + UBGraphicsScene::toolOffsetCompass);
UBGraphicsItem
::
assignZValue
(
compass
,
UBGraphicsScene
::
toolLayerStart
+
UBGraphicsScene
::
toolOffsetCompass
);
compass
->
setData
(
UBGraphicsItemData
::
ItemLayerType
,
QVariant
(
UBItemLayerType
::
Tool
));
QStringRef
svgX
=
mXmlReader
.
attributes
().
value
(
"x"
);
...
...
@@ -2606,7 +2615,8 @@ UBGraphicsProtractor* UBSvgSubsetAdaptor::UBSvgSubsetReader::protractorFromSvg()
{
UBGraphicsProtractor
*
protractor
=
new
UBGraphicsProtractor
();
protractor
->
setZValue
(
UBGraphicsScene
::
toolLayerStart
+
UBGraphicsScene
::
toolOffsetProtractor
);
// protractor->setZValue(UBGraphicsScene::toolLayerStart + UBGraphicsScene::toolOffsetProtractor);
UBGraphicsItem
::
assignZValue
(
protractor
,
UBGraphicsScene
::
toolLayerStart
+
UBGraphicsScene
::
toolOffsetProtractor
);
protractor
->
setData
(
UBGraphicsItemData
::
ItemLayerType
,
QVariant
(
UBItemLayerType
::
Tool
));
graphicsItemFromSvg
(
protractor
);
...
...
@@ -2676,7 +2686,8 @@ UBGraphicsTriangle* UBSvgSubsetAdaptor::UBSvgSubsetReader::triangleFromSvg()
{
UBGraphicsTriangle
*
triangle
=
new
UBGraphicsTriangle
();
triangle
->
setZValue
(
UBGraphicsScene
::
toolLayerStart
+
UBGraphicsScene
::
toolOffsetTriangle
);
// triangle->setZValue(UBGraphicsScene::toolLayerStart + UBGraphicsScene::toolOffsetTriangle);
UBGraphicsItem
::
assignZValue
(
triangle
,
UBGraphicsScene
::
toolLayerStart
+
UBGraphicsScene
::
toolOffsetTriangle
);
triangle
->
setData
(
UBGraphicsItemData
::
ItemLayerType
,
QVariant
(
UBItemLayerType
::
Tool
));
graphicsItemFromSvg
(
triangle
);
...
...
@@ -2695,7 +2706,6 @@ UBGraphicsTriangle* UBSvgSubsetAdaptor::UBSvgSubsetReader::triangleFromSvg()
triangle
->
setRect
(
svgX
.
toString
().
toFloat
(),
svgY
.
toString
().
toFloat
(),
svgWidth
.
toString
().
toFloat
(),
svgHeight
.
toString
().
toFloat
(),
orientation
);
}
triangle
->
setVisible
(
true
);
return
triangle
;
}
...
...
@@ -2703,7 +2713,8 @@ UBGraphicsTriangle* UBSvgSubsetAdaptor::UBSvgSubsetReader::triangleFromSvg()
UBGraphicsCache
*
UBSvgSubsetAdaptor
::
UBSvgSubsetReader
::
cacheFromSvg
()
{
UBGraphicsCache
*
pCache
=
new
UBGraphicsCache
();
//pCache->setZValue(UBGraphicsScene::toolLayerStart + UBGraphicsScene::toolOffsetCache);
pCache
->
setZValue
(
UBGraphicsScene
::
toolLayerStart
+
UBGraphicsScene
::
toolOffsetCache
);
// UBGraphicsItem::assignZValue(pCache, UBGraphicsScene::toolLayerStart + UBGraphicsScene::toolOffsetCache);
pCache
->
setData
(
UBGraphicsItemData
::
ItemLayerType
,
QVariant
(
UBItemLayerType
::
Tool
));
graphicsItemFromSvg
(
pCache
);
...
...
src/board/UBBoardController.cpp
View file @
c9d41663
...
...
@@ -1842,7 +1842,8 @@ void UBBoardController::processMimeData(const QMimeData* pMimeData, const QPoint
if
(
gi
)
{
gi
->
setZValue
(
mActiveScene
->
getNextObjectZIndex
());
// gi->setZValue(mActiveScene->getNextObjectZIndex());
UBGraphicsItem
::
assignZValue
(
gi
,
mActiveScene
->
getNextObjectZIndex
());
mActiveScene
->
addItem
(
gi
);
gi
->
setPos
(
gi
->
pos
()
+
QPointF
(
50
,
50
));
}
...
...
src/core/UB.h
View file @
c9d41663
...
...
@@ -78,6 +78,7 @@ struct UBGraphicsItemData
ItemLayerType
,
ItemLocked
,
ItemEditable
//for text only
,
ItemOwnZValue
};
};
...
...
src/domain/UBGraphicsAudioItem.cpp
View file @
c9d41663
...
...
@@ -95,7 +95,8 @@ UBItem* UBGraphicsAudioItem::deepCopy() const
UBGraphicsAudioItem
*
copy
=
new
UBGraphicsAudioItem
(
audioUrl
,
parentItem
());
copy
->
setPos
(
this
->
pos
());
copy
->
setZValue
(
this
->
zValue
());
// copy->setZValue(this->zValue());
UBGraphicsItem
::
assignZValue
(
copy
,
this
->
zValue
());
copy
->
setTransform
(
this
->
transform
());
copy
->
setFlag
(
QGraphicsItem
::
ItemIsMovable
,
true
);
copy
->
setFlag
(
QGraphicsItem
::
ItemIsSelectable
,
true
);
...
...
src/domain/UBGraphicsItemDelegate.cpp
View file @
c9d41663
...
...
@@ -72,7 +72,8 @@ void UBGraphicsItemDelegate::init()
{
mFrame
=
new
UBGraphicsDelegateFrame
(
this
,
QRectF
(
0
,
0
,
0
,
0
),
mFrameWidth
,
mRespectRatio
);
mFrame
->
hide
();
mFrame
->
setZValue
(
UBGraphicsScene
::
toolLayerStart
+
1
);
// mFrame->setZValue(UBGraphicsScene::toolLayerStart + 1);
UBGraphicsItem
::
assignZValue
(
mFrame
,
UBGraphicsScene
::
toolLayerStart
+
1
);
mFrame
->
setFlag
(
QGraphicsItem
::
ItemIsSelectable
,
true
);
mDeleteButton
=
new
DelegateButton
(
":/images/close.svg"
,
mDelegated
,
mFrame
);
...
...
@@ -92,7 +93,8 @@ void UBGraphicsItemDelegate::init()
foreach
(
DelegateButton
*
button
,
mButtons
)
{
button
->
hide
();
button
->
setZValue
(
UBGraphicsScene
::
toolLayerStart
+
2
);
// button->setZValue(UBGraphicsScene::toolLayerStart + 2);
UBGraphicsItem
::
assignZValue
(
button
,
UBGraphicsScene
::
toolLayerStart
+
2
);
button
->
setFlag
(
QGraphicsItem
::
ItemIsSelectable
,
true
);
}
}
...
...
src/domain/UBGraphicsItemTransformUndoCommand.cpp
View file @
c9d41663
...
...
@@ -15,6 +15,7 @@
#include "UBGraphicsItemTransformUndoCommand.h"
#include "UBResizableGraphicsItem.h"
#include "domain/UBItem.h"
#include "core/memcheck.h"
...
...
@@ -48,7 +49,8 @@ void UBGraphicsItemTransformUndoCommand::undo()
{
mItem
->
setPos
(
mPreviousPosition
);
mItem
->
setTransform
(
mPreviousTransform
);
mItem
->
setZValue
(
mPreviousZValue
);
// mItem->setZValue(mPreviousZValue);
UBGraphicsItem
::
assignZValue
(
mItem
,
mPreviousZValue
);
UBResizableGraphicsItem
*
resizableItem
=
dynamic_cast
<
UBResizableGraphicsItem
*>
(
mItem
);
...
...
@@ -60,7 +62,8 @@ void UBGraphicsItemTransformUndoCommand::redo()
{
mItem
->
setPos
(
mCurrentPosition
);
mItem
->
setTransform
(
mCurrentTransform
);
mItem
->
setZValue
(
mCurrentZValue
);
// mItem->setZValue(mCurrentZValue);
UBGraphicsItem
::
assignZValue
(
mItem
,
mCurrentZValue
);
UBResizableGraphicsItem
*
resizableItem
=
dynamic_cast
<
UBResizableGraphicsItem
*>
(
mItem
);
...
...
src/domain/UBGraphicsPDFItem.cpp
View file @
c9d41663
...
...
@@ -84,7 +84,8 @@ UBItem* UBGraphicsPDFItem::deepCopy() const
UBGraphicsPDFItem
*
copy
=
new
UBGraphicsPDFItem
(
mRenderer
,
mPageNumber
,
parentItem
());
copy
->
setPos
(
this
->
pos
());
copy
->
setZValue
(
this
->
zValue
());
// copy->setZValue(this->zValue());
UBGraphicsItem
::
assignZValue
(
copy
,
this
->
zValue
());
copy
->
setTransform
(
this
->
transform
());
copy
->
setFlag
(
QGraphicsItem
::
ItemIsMovable
,
true
);
copy
->
setFlag
(
QGraphicsItem
::
ItemIsSelectable
,
true
);
...
...
@@ -134,7 +135,8 @@ UBGraphicsPixmapItem* UBGraphicsPDFItem::toPixmapItem() const
pixmapItem
->
setPixmap
(
pixmap
);
pixmapItem
->
setPos
(
this
->
pos
());
pixmapItem
->
setZValue
(
this
->
zValue
());
// pixmapItem->setZValue(this->zValue());
UBGraphicsItem
::
assignZValue
(
pixmapItem
,
this
->
zValue
());
pixmapItem
->
setTransform
(
this
->
transform
());
pixmapItem
->
setFlag
(
QGraphicsItem
::
ItemIsMovable
,
true
);
pixmapItem
->
setFlag
(
QGraphicsItem
::
ItemIsSelectable
,
true
);
...
...
src/domain/UBGraphicsPixmapItem.cpp
View file @
c9d41663
...
...
@@ -98,7 +98,8 @@ UBItem* UBGraphicsPixmapItem::deepCopy() const
copy
->
setPixmap
(
this
->
pixmap
());
copy
->
setPos
(
this
->
pos
());
copy
->
setZValue
(
this
->
zValue
());
// copy->setZValue(this->zValue());
UBGraphicsItem
::
assignZValue
(
copy
,
this
->
zValue
());
copy
->
setTransform
(
this
->
transform
());
copy
->
setFlag
(
QGraphicsItem
::
ItemIsMovable
,
true
);
copy
->
setFlag
(
QGraphicsItem
::
ItemIsSelectable
,
true
);
...
...
src/domain/UBGraphicsPolygonItem.cpp
View file @
c9d41663
...
...
@@ -153,7 +153,9 @@ UBGraphicsPolygonItem* UBGraphicsPolygonItem::deepCopy(const QPolygonF& pol) con
copy
->
setPen
(
this
->
pen
());
copy
->
mHasAlpha
=
this
->
mHasAlpha
;
copy
->
setZValue
(
this
->
zValue
());
// copy->setZValue(this->zValue());
UBGraphicsItem
::
assignZValue
(
copy
,
this
->
zValue
());
copy
->
setColorOnDarkBackground
(
this
->
colorOnDarkBackground
());
copy
->
setColorOnLightBackground
(
this
->
colorOnLightBackground
());
...
...
src/domain/UBGraphicsScene.cpp
View file @
c9d41663
...
...
@@ -75,6 +75,8 @@ qreal UBGraphicsScene::toolOffsetEraser = 200;
qreal
UBGraphicsScene
::
toolOffsetCurtain
=
1000
;
qreal
UBGraphicsScene
::
toolOffsetPointer
=
1100
;
qreal
UBGraphicsScene
::
toolOffsetCache
=
1000
;
//Didier please define offset you want
UBGraphicsScene
::
UBGraphicsScene
(
UBDocumentProxy
*
parent
)
:
UBCoreGraphicsScene
(
parent
)
,
mEraser
(
0
)
...
...
@@ -824,8 +826,8 @@ void UBGraphicsScene::initPolygonItem(UBGraphicsPolygonItem* polygonItem)
polygonItem
->
setData
(
UBGraphicsItemData
::
ItemLayerType
,
QVariant
(
UBItemLayerType
::
Graphic
));
polygonItem
->
setZValue
(
getNextDrawingZIndex
());
//
polygonItem->setZValue(getNextDrawingZIndex());
UBGraphicsItem
::
assignZValue
(
polygonItem
,
getNextDrawingZIndex
());
}
...
...
@@ -1035,7 +1037,8 @@ UBGraphicsPixmapItem* UBGraphicsScene::addPixmap(const QPixmap& pPixmap, const Q
pixmapItem
->
setFlag
(
QGraphicsItem
::
ItemIsMovable
,
true
);
pixmapItem
->
setFlag
(
QGraphicsItem
::
ItemIsSelectable
,
true
);
pixmapItem
->
setZValue
(
getNextObjectZIndex
());
// pixmapItem->setZValue(getNextObjectZIndex());
UBGraphicsItem
::
assignZValue
(
pixmapItem
,
getNextObjectZIndex
());
pixmapItem
->
setPixmap
(
pPixmap
);
...
...
@@ -1083,7 +1086,8 @@ UBGraphicsVideoItem* UBGraphicsScene::addVideo(const QUrl& pVideoFileUrl, bool s
videoItem
->
setFlag
(
QGraphicsItem
::
ItemIsMovable
,
true
);
videoItem
->
setFlag
(
QGraphicsItem
::
ItemIsSelectable
,
true
);
videoItem
->
setZValue
(
getNextObjectZIndex
());
// videoItem->setZValue(getNextObjectZIndex());
UBGraphicsItem
::
assignZValue
(
videoItem
,
getNextObjectZIndex
());
addItem
(
videoItem
);
...
...
@@ -1113,7 +1117,8 @@ UBGraphicsAudioItem* UBGraphicsScene::addAudio(const QUrl& pAudioFileUrl, bool s
audioItem
->
setFlag
(
QGraphicsItem
::
ItemIsMovable
,
true
);
audioItem
->
setFlag
(
QGraphicsItem
::
ItemIsSelectable
,
true
);
audioItem
->
setZValue
(
getNextObjectZIndex
());
// audioItem->setZValue(getNextObjectZIndex());
UBGraphicsItem
::
assignZValue
(
audioItem
,
getNextObjectZIndex
());
addItem
(
audioItem
);
...
...
@@ -1178,7 +1183,8 @@ UBGraphicsW3CWidgetItem* UBGraphicsScene::addW3CWidget(const QUrl& pWidgetUrl, c
void
UBGraphicsScene
::
addGraphicsWidget
(
UBGraphicsWidgetItem
*
graphicsWidget
,
const
QPointF
&
pPos
)
{
graphicsWidget
->
setFlag
(
QGraphicsItem
::
ItemIsSelectable
,
true
);
graphicsWidget
->
setZValue
(
getNextObjectZIndex
());
// graphicsWidget->setZValue(getNextObjectZIndex());
UBGraphicsItem
::
assignZValue
(
graphicsWidget
,
getNextObjectZIndex
());
addItem
(
graphicsWidget
);
...
...
@@ -1238,7 +1244,8 @@ UBGraphicsSvgItem* UBGraphicsScene::addSvg(const QUrl& pSvgFileUrl, const QPoint
svgItem
->
setFlag
(
QGraphicsItem
::
ItemIsMovable
,
true
);
svgItem
->
setFlag
(
QGraphicsItem
::
ItemIsSelectable
,
true
);
svgItem
->
setZValue
(
getNextObjectZIndex
());
// svgItem->setZValue(getNextObjectZIndex());
UBGraphicsItem
::
assignZValue
(
svgItem
,
getNextObjectZIndex
());
qreal
sscale
=
1
/
UBApplication
::
boardController
->
systemScaleFactor
();
svgItem
->
scale
(
sscale
,
sscale
);
...
...
@@ -1271,7 +1278,8 @@ UBGraphicsTextItem* UBGraphicsScene::addTextWithFont(const QString& pString, con
{
UBGraphicsTextItem
*
textItem
=
new
UBGraphicsTextItem
();
textItem
->
setPlainText
(
pString
);
textItem
->
setZValue
(
getNextObjectZIndex
());
// textItem->setZValue(getNextObjectZIndex());
UBGraphicsItem
::
assignZValue
(
textItem
,
getNextObjectZIndex
());
QFont
font
=
textItem
->
font
();
...
...
@@ -1326,7 +1334,8 @@ UBGraphicsTextItem *UBGraphicsScene::addTextHtml(const QString &pString, const Q
UBGraphicsTextItem
*
textItem
=
new
UBGraphicsTextItem
();
textItem
->
setPlainText
(
""
);
textItem
->
setHtml
(
pString
);
textItem
->
setZValue
(
getNextObjectZIndex
());
// textItem->setZValue(getNextObjectZIndex());
UBGraphicsItem
::
assignZValue
(
textItem
,
getNextObjectZIndex
());
addItem
(
textItem
);
textItem
->
show
();
...
...
@@ -1337,7 +1346,6 @@ UBGraphicsTextItem *UBGraphicsScene::addTextHtml(const QString &pString, const Q
connect
(
textItem
,
SIGNAL
(
textUndoCommandAdded
(
UBGraphicsTextItem
*
)),
this
,
SLOT
(
textUndoCommandAdded
(
UBGraphicsTextItem
*
)));
// textItem->setSelected(true);
textItem
->
setFocus
();
setDocumentUpdated
();
...
...
@@ -1425,7 +1433,8 @@ QGraphicsItem* UBGraphicsScene::setAsBackgroundObject(QGraphicsItem* item, bool
item
->
setAcceptedMouseButtons
(
Qt
::
NoButton
);
item
->
setData
(
UBGraphicsItemData
::
ItemLayerType
,
UBItemLayerType
::
FixedBackground
);
item
->
setZValue
(
backgroundLayerStart
);
// item->setZValue(backgroundLayerStart);
UBGraphicsItem
::
assignZValue
(
item
,
backgroundLayerStart
);
if
(
pAdaptTransformation
)
{
...
...
@@ -1529,7 +1538,9 @@ void UBGraphicsScene::addRuler(QPointF center)
QRectF
rect
=
ruler
->
rect
();
ruler
->
setRect
(
center
.
x
()
-
rect
.
width
()
/
2
,
center
.
y
()
-
rect
.
height
()
/
2
,
rect
.
width
(),
rect
.
height
());
ruler
->
setZValue
(
toolLayerStart
+
toolOffsetRuler
);
// ruler->setZValue(toolLayerStart + toolOffsetRuler);
UBGraphicsItem
::
assignZValue
(
ruler
,
toolLayerStart
+
toolOffsetRuler
);
ruler
->
setData
(
UBGraphicsItemData
::
ItemLayerType
,
QVariant
(
UBItemLayerType
::
Tool
));
addItem
(
ruler
);
...
...
@@ -1546,7 +1557,9 @@ void UBGraphicsScene::addProtractor(QPointF center)
UBGraphicsProtractor
*
protractor
=
new
UBGraphicsProtractor
();
// mem : owned and destroyed by the scene
mTools
<<
protractor
;
protractor
->
setZValue
(
toolLayerStart
+
toolOffsetProtractor
);
// protractor->setZValue(toolLayerStart + toolOffsetProtractor);
UBGraphicsItem
::
assignZValue
(
protractor
,
toolLayerStart
+
toolOffsetProtractor
);
protractor
->
setData
(
UBGraphicsItemData
::
ItemLayerType
,
QVariant
(
UBItemLayerType
::
Tool
));
addItem
(
protractor
);
...
...
@@ -1565,7 +1578,9 @@ void UBGraphicsScene::addTriangle(QPointF center)
UBGraphicsTriangle
*
triangle
=
new
UBGraphicsTriangle
();
// mem : owned and destroyed by the scene
mTools
<<
triangle
;
triangle
->
setZValue
(
toolLayerStart
+
toolOffsetProtractor
);
// triangle->setZValue(toolLayerStart + toolOffsetProtractor);
UBGraphicsItem
::
assignZValue
(
triangle
,
toolLayerStart
+
toolOffsetTriangle
);
triangle
->
setData
(
UBGraphicsItemData
::
ItemLayerType
,
QVariant
(
UBItemLayerType
::
Tool
));
addItem
(
triangle
);
...
...
@@ -1700,7 +1715,9 @@ void UBGraphicsScene::addCompass(QPointF center)
QRectF
rect
=
compass
->
rect
();
compass
->
setRect
(
center
.
x
()
-
rect
.
width
()
/
2
,
center
.
y
()
-
rect
.
height
()
/
2
,
rect
.
width
(),
rect
.
height
());
compass
->
setZValue
(
toolLayerStart
+
toolOffsetCompass
);
// compass->setZValue(toolLayerStart + toolOffsetCompass);
UBGraphicsItem
::
assignZValue
(
compass
,
toolLayerStart
+
toolOffsetCompass
);
compass
->
setData
(
UBGraphicsItemData
::
ItemLayerType
,
QVariant
(
UBItemLayerType
::
Tool
));
compass
->
setVisible
(
true
);
...
...
@@ -1740,7 +1757,10 @@ void UBGraphicsScene::addMask()
view
=
(
QGraphicsView
*
)
UBApplication
::
boardController
->
controlView
();
QPolygonF
polygon
=
view
->
mapToScene
(
view
->
rect
());
curtain
->
setZValue
(
toolLayerStart
+
toolOffsetCurtain
);
// curtain->setZValue(toolLayerStart + toolOffsetCurtain);
UBGraphicsItem
::
assignZValue
(
curtain
,
toolLayerStart
+
toolOffsetCurtain
);
QRectF
rect
=
polygon
.
boundingRect
();
qreal
xScale
=
view
->
matrix
().
m11
();
qreal
yScale
=
view
->
matrix
().
m22
();
...
...
src/domain/UBGraphicsSvgItem.cpp
View file @
c9d41663
...
...
@@ -132,7 +132,8 @@ UBItem* UBGraphicsSvgItem::deepCopy() const
UBGraphicsSvgItem
*
copy
=
new
UBGraphicsSvgItem
(
this
->
fileData
());
copy
->
setPos
(
this
->
pos
());
copy
->
setZValue
(
this
->
zValue
());
// copy->setZValue(this->zValue());
UBGraphicsItem
::
assignZValue
(
copy
,
this
->
zValue
());
copy
->
setTransform
(
this
->
transform
());
copy
->
setFlag
(
QGraphicsItem
::
ItemIsMovable
,
true
);
copy
->
setFlag
(
QGraphicsItem
::
ItemIsSelectable
,
true
);
...
...
@@ -186,7 +187,8 @@ UBGraphicsPixmapItem* UBGraphicsSvgItem::toPixmapItem() const
pixmapItem
->
setPixmap
(
QPixmap
::
fromImage
(
image
));
pixmapItem
->
setPos
(
this
->
pos
());
pixmapItem
->
setZValue
(
this
->
zValue
());
// pixmapItem->setZValue(this->zValue());
UBGraphicsItem
::
assignZValue
(
pixmapItem
,
this
->
zValue
());
pixmapItem
->
setTransform
(
this
->
transform
());
pixmapItem
->
setFlag
(
QGraphicsItem
::
ItemIsMovable
,
true
);
pixmapItem
->
setFlag
(
QGraphicsItem
::
ItemIsSelectable
,
true
);
...
...
src/domain/UBGraphicsTextItem.cpp
View file @
c9d41663
...
...
@@ -205,7 +205,8 @@ UBItem* UBGraphicsTextItem::deepCopy() const
copy
->
setHtml
(
toHtml
());
copy
->
setPos
(
this
->
pos
());
copy
->
setZValue
(
this
->
zValue
());
// copy->setZValue(this->zValue());
UBGraphicsItem
::
assignZValue
(
copy
,
this
->
zValue
());
copy
->
setTransform
(
this
->
transform
());
copy
->
setFlag
(
QGraphicsItem
::
ItemIsMovable
,
true
);
copy
->
setFlag
(
QGraphicsItem
::
ItemIsSelectable
,
true
);
...
...
src/domain/UBGraphicsVideoItem.cpp
View file @
c9d41663
...
...
@@ -68,7 +68,8 @@ UBItem* UBGraphicsVideoItem::deepCopy() const
UBGraphicsVideoItem
*
copy
=
new
UBGraphicsVideoItem
(
videoUrl
,
parentItem
());
copy
->
setPos
(
this
->
pos
());
copy
->
setZValue
(
this
->
zValue
());
// copy->setZValue(this->zValue());
UBGraphicsItem
::
assignZValue
(
copy
,
this
->
zValue
());
copy
->
setTransform
(
this
->
transform
());
copy
->
setFlag
(
QGraphicsItem
::
ItemIsMovable
,
true
);
copy
->
setFlag
(
QGraphicsItem
::
ItemIsSelectable
,
true
);
...
...
src/domain/UBGraphicsVideoItemDelegate.cpp
View file @
c9d41663
...
...
@@ -52,7 +52,8 @@ void UBGraphicsVideoItemDelegate::buildButtons()
mMuteButton
->
hide
();
mVideoControl
=
new
DelegateVideoControl
(
delegated
(),
mFrame
);
mVideoControl
->
setZValue
(
UBGraphicsScene
::
toolLayerStart
+
2
);
// mVideoControl->setZValue(UBGraphicsScene::toolLayerStart + 2);
UBGraphicsItem
::
assignZValue
(
mVideoControl
,
UBGraphicsScene
::
toolLayerStart
+
2
);
mVideoControl
->
setFlag
(
QGraphicsItem
::
ItemIsSelectable
,
true
);
connect
(
mPlayPauseButton
,
SIGNAL
(
clicked
(
bool
)),
this
,
SLOT
(
togglePlayPause
()));
...
...
src/domain/UBGraphicsWidgetItem.cpp
View file @
c9d41663
...
...
@@ -366,7 +366,8 @@ UBItem* UBGraphicsW3CWidgetItem::deepCopy() const
UBGraphicsW3CWidgetItem
*
copy
=
new
UBGraphicsW3CWidgetItem
(
mWebKitWidget
->
widgetUrl
(),
parentItem
());
copy
->
setPos
(
this
->
pos
());
copy
->
setZValue
(
this
->
zValue
());
// copy->setZValue(this->zValue());
UBGraphicsItem
::
assignZValue
(
copy
,
this
->
zValue
());
copy
->
setTransform
(
this
->
transform
());
copy
->
setFlag
(
QGraphicsItem
::
ItemIsMovable
,
true
);
copy
->
setFlag
(
QGraphicsItem
::
ItemIsSelectable
,
true
);
...
...
src/domain/UBItem.cpp
View file @
c9d41663
...
...
@@ -28,3 +28,9 @@ UBItem::~UBItem()
{
// NOOP
}
void
UBGraphicsItem
::
assignZValue
(
QGraphicsItem
*
item
,
int
value
)
{
item
->
setZValue
(
value
);
item
->
setData
(
UBGraphicsItemData
::
ItemOwnZValue
,
value
);
}
src/domain/UBItem.h
View file @
c9d41663
...
...
@@ -100,6 +100,7 @@ protected:
public
:
static
void
assignZValue
(
QGraphicsItem
*
,
int
value
);
virtual
UBGraphicsItemDelegate
*
Delegate
()
const
=
0
;
virtual
void
remove
()
=
0
;
...
...
src/gui/UBLibraryWidget.cpp
View file @
c9d41663
...
...
@@ -39,9 +39,9 @@
*/
UBLibraryWidget
::
UBLibraryWidget
(
QWidget
*
parent
,
const
char
*
name
)
:
UBThumbnailWidget
(
parent
)
,
chainedElements
(
NULL
)
,
mLibraryController
(
NULL
)
,
mpCrntDir
(
NULL
)
,
mpCrntElem
(
NULL
)
,
mLibraryController
(
NULL
)
,
mpTmpElem
(
NULL
)
{
setObjectName
(
name
);
...
...
src/gui/UBThumbnailWidget.h
View file @
c9d41663
...
...
@@ -23,6 +23,7 @@
#include "frameworks/UBCoreGraphicsScene.h"
#include "core/UBSettings.h"
#include "domain/UBItem.h"
#define STARTDRAGTIME 1000000
#define BUTTONSIZE 48
...
...
@@ -147,7 +148,8 @@ class UBThumbnail
if
(
!
mSelectionItem
->
scene
())
{
item
->
scene
()
->
addItem
(
mSelectionItem
);
mSelectionItem
->
setZValue
(
item
->
zValue
()
-
1
);
// mSelectionItem->setZValue(item->zValue() - 1);
UBGraphicsItem
::
assignZValue
(
mSelectionItem
,
item
->
zValue
()
-
1
);
mAddedToScene
=
true
;
}
...
...
src/pdf-merger/Object.h
View file @
c9d41663
...
...
@@ -48,7 +48,7 @@ namespace merge_lib
std
::
string
fileName
=
""
,
std
::
pair
<
unsigned
int
,
unsigned
int
>
streamBounds
=
std
::
make_pair
((
unsigned
int
)
0
,(
unsigned
int
)
0
),
bool
hasStream
=
false
)
:
_number
(
objectNumber
),
_generationNumber
(
generationNumber
),
_oldNumber
(
objectNumber
),
_content
(
objectContent
),
_parents
(),
_children
(),
_isPassed
(
false
),
_fileName
(
fileName
),
_streamBounds
(
streamBounds
),
_hasStream
(
hasStream
),
_hasStreamInContent
(
false
)
_streamBounds
(
streamBounds
),
_fileName
(
fileName
),
_hasStream
(
hasStream
),
_hasStreamInContent
(
false
)
{
}
virtual
~
Object
();
...
...
src/tools/UBGraphicsCache.cpp
View file @
c9d41663
...
...
@@ -33,7 +33,8 @@ UBGraphicsCache::UBGraphicsCache():QGraphicsRectItem()
// Get the board size and pass it to the shape
QRect
boardRect
=
UBApplication
::
boardController
->
displayView
()
->
rect
();
setRect
(
-
15
*
boardRect
.
width
(),
-
15
*
boardRect
.
height
(),
30
*
boardRect
.
width
(),
30
*
boardRect
.
height
());
setZValue
(
CACHE_ZVALUE
);
// setZValue(CACHE_ZVALUE);
UBGraphicsItem
::
assignZValue
(
this
,
CACHE_ZVALUE
);
setData
(
Qt
::
UserRole
,
QVariant
(
"Cache"
));
}
...
...
@@ -48,7 +49,8 @@ UBItem* UBGraphicsCache::deepCopy() const
copy
->
setPos
(
this
->
pos
());
copy
->
setRect
(
this
->
rect
());
copy
->
setZValue
(
this
->
zValue
());
// copy->setZValue(this->zValue());
UBGraphicsItem
::
assignZValue
(
copy
,
this
->
zValue
());
copy
->
setTransform
(
this
->
transform
());
// TODO UB 4.7 ... complete all members ?
...
...
@@ -90,7 +92,8 @@ void UBGraphicsCache::paint(QPainter *painter, const QStyleOptionGraphicsItem *o
//Q_UNUSED(option);
Q_UNUSED
(
widget
);
setZValue
(
CACHE_ZVALUE
);
// setZValue(CACHE_ZVALUE);
UBGraphicsItem
::
assignZValue
(
this
,
CACHE_ZVALUE
);
painter
->
setBrush
(
mMaskColor
);
painter
->
setPen
(
mMaskColor
);
...
...
src/tools/UBGraphicsCompass.cpp
View file @
c9d41663
...
...
@@ -85,7 +85,8 @@ UBItem* UBGraphicsCompass::deepCopy() const
copy
->
setPos
(
this
->
pos
());
copy
->
setRect
(
this
->
rect
());
copy
->
setZValue
(
this
->
zValue
());
// copy->setZValue(this->zValue());
UBGraphicsItem
::
assignZValue
(
copy
,
this
->
zValue
());
copy
->
setTransform
(
this
->
transform
());
// TODO UB 4.7 ... complete all members ?
...
...
src/tools/UBGraphicsCurtainItem.cpp
View file @
c9d41663
...
...
@@ -57,8 +57,8 @@ UBGraphicsCurtainItem::~UBGraphicsCurtainItem()
QVariant
UBGraphicsCurtainItem
::
itemChange
(
GraphicsItemChange
change
,
const
QVariant
&
value
)
{
if
(
change
==
QGraphicsItem
::
ItemSelectedHasChanged
&&
QGraphicsRectItem
::
scene
()
&&
isSelected
())
setZValue
(
UBGraphicsScene
::
toolLayerStart
+
UBGraphicsScene
::
toolOffsetCurtain
);
//
if (change == QGraphicsItem::ItemSelectedHasChanged && QGraphicsRectItem::scene() && isSelected())
//
setZValue(UBGraphicsScene::toolLayerStart + UBGraphicsScene::toolOffsetCurtain);
QVariant
newValue
=
value
;
...
...
@@ -130,7 +130,8 @@ UBItem* UBGraphicsCurtainItem::deepCopy() const
copy
->
setPos
(
this
->
pos
());
copy
->
setBrush
(
this
->
brush
());
copy
->
setPen
(
this
->
pen
());
copy
->
setZValue
(
this
->
zValue
());
// copy->setZValue(this->zValue());
UBGraphicsItem
::
assignZValue
(
copy
,
this
->
zValue
());
copy
->
setTransform
(
this
->
transform
());
copy
->
setFlag
(
QGraphicsItem
::
ItemIsMovable
,
true
);
copy
->
setFlag
(
QGraphicsItem
::
ItemIsSelectable
,
true
);
...
...
src/tools/UBGraphicsCurtainItemDelegate.cpp
View file @
c9d41663
...
...
@@ -52,7 +52,7 @@ bool UBGraphicsCurtainItemDelegate::mousePressEvent(QGraphicsSceneMouseEvent *ev
if
(
!
mDelegated
->
isSelected
())
{
mDelegated
->
setSelected
(
true
);
mDelegated
->
setZValue
(
UBGraphicsScene
::
toolLayerStart
+
UBGraphicsScene
::
toolOffsetCurtain
);
//
mDelegated->setZValue(UBGraphicsScene::toolLayerStart + UBGraphicsScene::toolOffsetCurtain);
positionHandles
();
return
true
;
...
...
@@ -69,13 +69,13 @@ QVariant UBGraphicsCurtainItemDelegate::itemChange(QGraphicsItem::GraphicsItemCh
{
if
(
change
==
QGraphicsItem
::
ItemZValueHasChanged
)
{
mFrame
->
setZValue
(
mDelegated
->
zValue
()
+
1
);
//
mFrame->setZValue(mDelegated->zValue() + 1);
foreach
(
DelegateButton
*
button
,
mButtons
)
{
button
->
setZValue
(
mDelegated
->
zValue
()
+
2
);
button
->
setZValue
(
mDelegated
->
zValue
()
+
2
);
}
//
foreach(DelegateButton* button, mButtons)
//
{
//
button->setZValue(mDelegated->zValue() + 2);
//
button->setZValue(mDelegated->zValue() + 2);
//
}
}
if
(
change
==
QGraphicsItem
::
ItemVisibleHasChanged
)
...
...
src/tools/UBGraphicsProtractor.cpp
View file @
c9d41663
...
...
@@ -580,7 +580,8 @@ UBItem* UBGraphicsProtractor::deepCopy() const
copy
->
setPos
(
this
->
pos
());
copy
->
setRect
(
this
->
rect
());
copy
->
setZValue
(
this
->
zValue
());
// copy->setZValue(this->zValue());
UBGraphicsItem
::
assignZValue
(
copy
,
this
->
zValue
());
copy
->
setTransform
(
this
->
transform
());
copy
->
mCurrentAngle
=
this
->
mCurrentAngle
;
...
...
src/tools/UBGraphicsRuler.cpp
View file @
c9d41663
...
...
@@ -74,7 +74,8 @@ UBItem* UBGraphicsRuler::deepCopy() const
copy
->
setPos
(
this
->
pos
());
copy
->
setRect
(
this
->
rect
());
copy
->
setZValue
(
this
->
zValue
());
// copy->setZValue(this->zValue());
UBGraphicsItem
::
assignZValue
(
copy
,
this
->
zValue
());
copy
->
setTransform
(
this
->
transform
());
// TODO UB 4.7 ... complete all members ?
...
...
src/tools/UBGraphicsTriangle.cpp
View file @
c9d41663
...
...
@@ -93,7 +93,8 @@ UBItem* UBGraphicsTriangle::deepCopy(void) const
copy
->
setPos
(
this
->
pos
());
copy
->
setPolygon
(
this
->
polygon
());
copy
->
setZValue
(
this
->
zValue
());
// copy->setZValue(this->zValue());
UBGraphicsItem
::
assignZValue
(
copy
,
this
->
zValue
());
copy
->
setTransform
(
this
->
transform
());
// TODO UB 4.7 ... complete all members ?
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment