eessppeelllloo/mapmap
1
0
Fork 0
mirror of https://github.com/mapmapteam/mapmap.git synced 2026-04-17 21:19:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Changing the ordering of mappings now changes the order in which they are actually displayed (layers).

Browse Source
This commit is contained in:
Tats
2014-12-28 22:29:47 -05:00
parent 7c642e8570
commit 067a84cf12
5 changed files with 48 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Mapper.cpp
View File

@@ -74,6 +74,17 @@ void ShapeGraphicsItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
_syncShape();
}
void ShapeGraphicsItem::paint(QPainter *painter,
const QStyleOptionGraphicsItem *option, QWidget *widget)
{
// Sync depth of figure with that of mapping (for layered output).
setZValue(_mapping->getDepth());
// Paint if visible.
if (_mapping->isVisible())
_doPaint(painter, option);
}
//QVariant ShapeGraphicsItem::itemChange(GraphicsItemChange change, const QVariant &value)
//{
// if (change == ItemPositionChange)
@@ -137,11 +148,9 @@ QRectF PolygonColorGraphicsItem::boundingRect() const
return shape().boundingRect();
}
void PolygonColorGraphicsItem::paint(QPainter *painter,
const QStyleOptionGraphicsItem *option, QWidget *widget)
void PolygonColorGraphicsItem::_doPaint(QPainter *painter,
const QStyleOptionGraphicsItem *option)
{
Q_UNUSED(widget);
Color* color = static_cast<Color*>(_mapping->getPaint().get());
Q_ASSERT(color);
@@ -177,8 +186,8 @@ QRectF EllipseColorGraphicsItem::boundingRect() const
return shape().boundingRect();
}
void EllipseColorGraphicsItem::paint(QPainter* painter,
const QStyleOptionGraphicsItem* option, QWidget* widget)
void EllipseColorGraphicsItem::_doPaint(QPainter* painter,
const QStyleOptionGraphicsItem* option)
{
Color* color = static_cast<Color*>(_mapping->getPaint().get());
Q_ASSERT(color);
@@ -207,11 +216,9 @@ TextureGraphicsItem::TextureGraphicsItem(Mapping::ptr mapping, bool output)
Q_CHECK_PTR(_inputShape);
}
void TextureGraphicsItem::paint(QPainter *painter,
const QStyleOptionGraphicsItem *option, QWidget *widget)
void TextureGraphicsItem::_doPaint(QPainter *painter,
const QStyleOptionGraphicsItem *option)
{
Q_UNUSED(widget);
bool selected = option->state & QStyle::State_Selected;
// Prepare drawing.
@@ -279,7 +286,6 @@ QRectF PolygonTextureGraphicsItem::boundingRect() const {
return shape().boundingRect();
}
void TriangleTextureGraphicsItem::_doDraw(QPainter* painter, bool selected)
{
Q_UNUSED(painter);