QTfrontend/drawmapscene.cpp
author Simon McVittie <smcv@debian.org>
Mon, 12 Sep 2022 10:40:53 -0400
branch1.0.0
changeset 15859 7b1d6dfa3173
parent 13910 6c8d4e140f27
permissions -rw-r--r--
Remove FindSDL2 find-module, use sdl2-config.cmake instead This requires SDL >= 2.0.4. Since <https://bugzilla.libsdl.org/show_bug.cgi?id=2464> was fixed in SDL 2.0.4, SDL behaves as a CMake "config-file package", even if it was not itself built using CMake: it installs a sdl2-config.cmake file to ${libdir}/cmake/SDL2, which tells CMake where to find SDL's headers and library, analogous to a pkg-config .pc file. As a result, we no longer need to copy/paste a "find-module package" to be able to find a system copy of SDL >= 2.0.4 with find_package(SDL2). Find-module packages are now discouraged by the CMake developers, in favour of having upstream projects behave as config-file packages. This results in a small API change: FindSDL2 used to set SDL2_INCLUDE_DIR and SDL2_LIBRARY, but the standard behaviour for config-file packages is to set <name>_INCLUDE_DIRS and <name>_LIBRARIES. Use the CONFIG keyword to make sure we search in config-file package mode, and will not find a FindSDL2.cmake in some other directory that implements the old interface. In addition to deleting redundant code, this avoids some assumptions in FindSDL2 about the layout of a SDL installation. The current libsdl2-dev package in Debian breaks those assumptions; this is considered a bug and will hopefully be fixed soon, but it illustrates how fragile these assumptions can be. We can be more robust against different installation layouts by relying on SDL's own CMake integration. When linking to a copy of CMake in a non-standard location, users can now set the SDL2_DIR or CMAKE_PREFIX_PATH environment variable to point to it; previously, these users would have used the SDL2DIR environment variable. This continues to be unnecessary if using matching system-wide installations of CMake and SDL2, for example both from Debian.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4976
088d40d8aba2 Happy 2011 :)
koda
parents: 4938
diff changeset
     1
/*
088d40d8aba2 Happy 2011 :)
koda
parents: 4938
diff changeset
     2
 * Hedgewars, a free turn based strategy game
11046
47a8c19ecb60 more copyright fixes
sheepluva
parents: 10235
diff changeset
     3
 * Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com>
4976
088d40d8aba2 Happy 2011 :)
koda
parents: 4938
diff changeset
     4
 *
088d40d8aba2 Happy 2011 :)
koda
parents: 4938
diff changeset
     5
 * This program is free software; you can redistribute it and/or modify
088d40d8aba2 Happy 2011 :)
koda
parents: 4938
diff changeset
     6
 * it under the terms of the GNU General Public License as published by
088d40d8aba2 Happy 2011 :)
koda
parents: 4938
diff changeset
     7
 * the Free Software Foundation; version 2 of the License
088d40d8aba2 Happy 2011 :)
koda
parents: 4938
diff changeset
     8
 *
088d40d8aba2 Happy 2011 :)
koda
parents: 4938
diff changeset
     9
 * This program is distributed in the hope that it will be useful,
088d40d8aba2 Happy 2011 :)
koda
parents: 4938
diff changeset
    10
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
088d40d8aba2 Happy 2011 :)
koda
parents: 4938
diff changeset
    11
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
088d40d8aba2 Happy 2011 :)
koda
parents: 4938
diff changeset
    12
 * GNU General Public License for more details.
088d40d8aba2 Happy 2011 :)
koda
parents: 4938
diff changeset
    13
 *
088d40d8aba2 Happy 2011 :)
koda
parents: 4938
diff changeset
    14
 * You should have received a copy of the GNU General Public License
088d40d8aba2 Happy 2011 :)
koda
parents: 4938
diff changeset
    15
 * along with this program; if not, write to the Free Software
10108
c68cf030eded update FSF address. note: two sdl include files (by Sam Lantinga) still have the old FSF address in their copyright - but I ain't gonna touch their copyright headers
sheepluva
parents: 10002
diff changeset
    16
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
4976
088d40d8aba2 Happy 2011 :)
koda
parents: 4938
diff changeset
    17
 */
088d40d8aba2 Happy 2011 :)
koda
parents: 4938
diff changeset
    18
4423
4391526e436e Initial commit of the Draw Map Scene
unc0rr
parents:
diff changeset
    19
#include <QGraphicsSceneMouseEvent>
4426
969e411c72aa Improve map editor a bit
unc0rr
parents: 4424
diff changeset
    20
#include <QGraphicsPathItem>
4427
c5193713055f Basic encoding of drawn map
unc0rr
parents: 4426
diff changeset
    21
#include <QtEndian>
4937
55b9145fea94 Draw straight lines while holding Alt key
unc0rr
parents: 4666
diff changeset
    22
#include <QDebug>
9555
485b424be769 uhm... a feature
unc0rr
parents: 9553
diff changeset
    23
#include <QTransform>
9551
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
    24
#include <math.h>
4423
4391526e436e Initial commit of the Draw Map Scene
unc0rr
parents:
diff changeset
    25
4391526e436e Initial commit of the Draw Map Scene
unc0rr
parents:
diff changeset
    26
#include "drawmapscene.h"
4391526e436e Initial commit of the Draw Map Scene
unc0rr
parents:
diff changeset
    27
13204
9565569e410c Drawn map page: Enable antialiasing, turn eraser cursor red
Wuzzy <Wuzzy2@mail.ru>
parents: 13203
diff changeset
    28
#define DRAWN_MAP_COLOR_LAND (Qt::yellow)
9565569e410c Drawn map page: Enable antialiasing, turn eraser cursor red
Wuzzy <Wuzzy2@mail.ru>
parents: 13203
diff changeset
    29
#define DRAWN_MAP_COLOR_CURSOR_PEN (Qt::green)
9565569e410c Drawn map page: Enable antialiasing, turn eraser cursor red
Wuzzy <Wuzzy2@mail.ru>
parents: 13203
diff changeset
    30
#define DRAWN_MAP_COLOR_CURSOR_ERASER (Qt::red)
9565569e410c Drawn map page: Enable antialiasing, turn eraser cursor red
Wuzzy <Wuzzy2@mail.ru>
parents: 13203
diff changeset
    31
13910
6c8d4e140f27 fix frontend compatibility issues
alfadur
parents: 13236
diff changeset
    32
#ifndef M_PI
6c8d4e140f27 fix frontend compatibility issues
alfadur
parents: 13236
diff changeset
    33
#define M_PI 3.14159265358979323846
6c8d4e140f27 fix frontend compatibility issues
alfadur
parents: 13236
diff changeset
    34
#endif
6c8d4e140f27 fix frontend compatibility issues
alfadur
parents: 13236
diff changeset
    35
4434
34c305fbc63c Simple simplify() function
unc0rr
parents: 4427
diff changeset
    36
template <class T> T sqr(const T & x)
34c305fbc63c Simple simplify() function
unc0rr
parents: 4427
diff changeset
    37
{
34c305fbc63c Simple simplify() function
unc0rr
parents: 4427
diff changeset
    38
    return x*x;
34c305fbc63c Simple simplify() function
unc0rr
parents: 4427
diff changeset
    39
}
34c305fbc63c Simple simplify() function
unc0rr
parents: 4427
diff changeset
    40
4423
4391526e436e Initial commit of the Draw Map Scene
unc0rr
parents:
diff changeset
    41
DrawMapScene::DrawMapScene(QObject *parent) :
4424
3225ea34e415 Some basic functionality
unc0rr
parents: 4423
diff changeset
    42
    QGraphicsScene(parent),
13204
9565569e410c Drawn map page: Enable antialiasing, turn eraser cursor red
Wuzzy <Wuzzy2@mail.ru>
parents: 13203
diff changeset
    43
    m_pen(DRAWN_MAP_COLOR_LAND),
9565569e410c Drawn map page: Enable antialiasing, turn eraser cursor red
Wuzzy <Wuzzy2@mail.ru>
parents: 13203
diff changeset
    44
    m_brush(DRAWN_MAP_COLOR_LAND),
13203
eaa494f0b19e Fix cursor circle being too large in drawn map editor
Wuzzy <Wuzzy2@mail.ru>
parents: 11046
diff changeset
    45
    m_cursor(new QGraphicsEllipseItem(-5, -5, 5, 5))
4423
4391526e436e Initial commit of the Draw Map Scene
unc0rr
parents:
diff changeset
    46
{
4391526e436e Initial commit of the Draw Map Scene
unc0rr
parents:
diff changeset
    47
    setSceneRect(0, 0, 4096, 2048);
4424
3225ea34e415 Some basic functionality
unc0rr
parents: 4423
diff changeset
    48
3225ea34e415 Some basic functionality
unc0rr
parents: 4423
diff changeset
    49
    QLinearGradient gradient(0, 0, 0, 2048);
4426
969e411c72aa Improve map editor a bit
unc0rr
parents: 4424
diff changeset
    50
    gradient.setColorAt(0, QColor(60, 60, 155));
969e411c72aa Improve map editor a bit
unc0rr
parents: 4424
diff changeset
    51
    gradient.setColorAt(1, QColor(155, 155, 60));
6873
30840365af0a Eraser tool
unc0rr
parents: 6784
diff changeset
    52
30840365af0a Eraser tool
unc0rr
parents: 6784
diff changeset
    53
    m_eraser = QBrush(gradient);
30840365af0a Eraser tool
unc0rr
parents: 6784
diff changeset
    54
    setBackgroundBrush(m_eraser);
30840365af0a Eraser tool
unc0rr
parents: 6784
diff changeset
    55
    m_isErasing = false;
4424
3225ea34e415 Some basic functionality
unc0rr
parents: 4423
diff changeset
    56
9551
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
    57
    m_pathType = Polyline;
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
    58
13209
f5d36be88c61 Drawn map menu: Add spin box to change brush size by hand
Wuzzy <Wuzzy2@mail.ru>
parents: 13204
diff changeset
    59
    m_pen.setWidth(DRAWN_MAP_BRUSH_SIZE_START);
4426
969e411c72aa Improve map editor a bit
unc0rr
parents: 4424
diff changeset
    60
    m_pen.setJoinStyle(Qt::RoundJoin);
969e411c72aa Improve map editor a bit
unc0rr
parents: 4424
diff changeset
    61
    m_pen.setCapStyle(Qt::RoundCap);
969e411c72aa Improve map editor a bit
unc0rr
parents: 4424
diff changeset
    62
    m_currPath = 0;
6934
14a230552c2e Cursor for DrawMapScene. Feel free to ajust its look.
unc0rr
parents: 6873
diff changeset
    63
14a230552c2e Cursor for DrawMapScene. Feel free to ajust its look.
unc0rr
parents: 6873
diff changeset
    64
    m_isCursorShown = false;
13204
9565569e410c Drawn map page: Enable antialiasing, turn eraser cursor red
Wuzzy <Wuzzy2@mail.ru>
parents: 13203
diff changeset
    65
    QPen cursorPen = QPen(DRAWN_MAP_COLOR_CURSOR_PEN);
13203
eaa494f0b19e Fix cursor circle being too large in drawn map editor
Wuzzy <Wuzzy2@mail.ru>
parents: 11046
diff changeset
    66
    cursorPen.setJoinStyle(Qt::RoundJoin);
eaa494f0b19e Fix cursor circle being too large in drawn map editor
Wuzzy <Wuzzy2@mail.ru>
parents: 11046
diff changeset
    67
    cursorPen.setCapStyle(Qt::RoundCap);
13209
f5d36be88c61 Drawn map menu: Add spin box to change brush size by hand
Wuzzy <Wuzzy2@mail.ru>
parents: 13204
diff changeset
    68
    cursorPen.setWidth(brushSize());
13203
eaa494f0b19e Fix cursor circle being too large in drawn map editor
Wuzzy <Wuzzy2@mail.ru>
parents: 11046
diff changeset
    69
    m_cursor->setPen(cursorPen);
6934
14a230552c2e Cursor for DrawMapScene. Feel free to ajust its look.
unc0rr
parents: 6873
diff changeset
    70
    m_cursor->setZValue(1);
4423
4391526e436e Initial commit of the Draw Map Scene
unc0rr
parents:
diff changeset
    71
}
4391526e436e Initial commit of the Draw Map Scene
unc0rr
parents:
diff changeset
    72
4391526e436e Initial commit of the Draw Map Scene
unc0rr
parents:
diff changeset
    73
void DrawMapScene::mouseMoveEvent(QGraphicsSceneMouseEvent * mouseEvent)
4391526e436e Initial commit of the Draw Map Scene
unc0rr
parents:
diff changeset
    74
{
4426
969e411c72aa Improve map editor a bit
unc0rr
parents: 4424
diff changeset
    75
    if(m_currPath && (mouseEvent->buttons() & Qt::LeftButton))
969e411c72aa Improve map editor a bit
unc0rr
parents: 4424
diff changeset
    76
    {
969e411c72aa Improve map editor a bit
unc0rr
parents: 4424
diff changeset
    77
        QPainterPath path = m_currPath->path();
9555
485b424be769 uhm... a feature
unc0rr
parents: 9553
diff changeset
    78
        QPointF currentPos = mouseEvent->scenePos();
485b424be769 uhm... a feature
unc0rr
parents: 9553
diff changeset
    79
485b424be769 uhm... a feature
unc0rr
parents: 9553
diff changeset
    80
        if(mouseEvent->modifiers() & Qt::ControlModifier)
485b424be769 uhm... a feature
unc0rr
parents: 9553
diff changeset
    81
            currentPos = putSomeConstraints(paths.first().initialPoint, currentPos);
4937
55b9145fea94 Draw straight lines while holding Alt key
unc0rr
parents: 4666
diff changeset
    82
9551
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
    83
        switch (m_pathType)
4937
55b9145fea94 Draw straight lines while holding Alt key
unc0rr
parents: 4666
diff changeset
    84
        {
9551
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
    85
        case Polyline:
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
    86
            if(mouseEvent->modifiers() & Qt::ControlModifier)
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
    87
            {
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
    88
                int c = path.elementCount();
9555
485b424be769 uhm... a feature
unc0rr
parents: 9553
diff changeset
    89
                path.setElementPositionAt(c - 1, currentPos.x(), currentPos.y());
4937
55b9145fea94 Draw straight lines while holding Alt key
unc0rr
parents: 4666
diff changeset
    90
9551
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
    91
            }
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
    92
            else
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
    93
            {
9555
485b424be769 uhm... a feature
unc0rr
parents: 9553
diff changeset
    94
                path.lineTo(currentPos);
9551
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
    95
                paths.first().points.append(mouseEvent->scenePos().toPoint());
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
    96
            }
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
    97
            break;
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
    98
        case Rectangle: {
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
    99
            path = QPainterPath();
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   100
            QPointF p1 = paths.first().initialPoint;
9555
485b424be769 uhm... a feature
unc0rr
parents: 9553
diff changeset
   101
            QPointF p2 = currentPos;
9551
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   102
            path.moveTo(p1);
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   103
            path.lineTo(p1.x(), p2.y());
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   104
            path.lineTo(p2);
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   105
            path.lineTo(p2.x(), p1.y());
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   106
            path.lineTo(p1);
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   107
            break;
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   108
            }
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   109
        case Ellipse: {
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   110
            path = QPainterPath();
9555
485b424be769 uhm... a feature
unc0rr
parents: 9553
diff changeset
   111
            QList<QPointF> points = makeEllipse(paths.first().initialPoint, currentPos);
9551
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   112
            path.addPolygon(QPolygonF(QVector<QPointF>::fromList(points)));
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   113
            break;
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 5858
diff changeset
   114
        }
4937
55b9145fea94 Draw straight lines while holding Alt key
unc0rr
parents: 4666
diff changeset
   115
        }
9551
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   116
4426
969e411c72aa Improve map editor a bit
unc0rr
parents: 4424
diff changeset
   117
        m_currPath->setPath(path);
4427
c5193713055f Basic encoding of drawn map
unc0rr
parents: 4426
diff changeset
   118
c5193713055f Basic encoding of drawn map
unc0rr
parents: 4426
diff changeset
   119
        emit pathChanged();
4426
969e411c72aa Improve map editor a bit
unc0rr
parents: 4424
diff changeset
   120
    }
6934
14a230552c2e Cursor for DrawMapScene. Feel free to ajust its look.
unc0rr
parents: 6873
diff changeset
   121
14a230552c2e Cursor for DrawMapScene. Feel free to ajust its look.
unc0rr
parents: 6873
diff changeset
   122
    if(!m_isCursorShown)
14a230552c2e Cursor for DrawMapScene. Feel free to ajust its look.
unc0rr
parents: 6873
diff changeset
   123
        showCursor();
14a230552c2e Cursor for DrawMapScene. Feel free to ajust its look.
unc0rr
parents: 6873
diff changeset
   124
    m_cursor->setPos(mouseEvent->scenePos());
4423
4391526e436e Initial commit of the Draw Map Scene
unc0rr
parents:
diff changeset
   125
}
4391526e436e Initial commit of the Draw Map Scene
unc0rr
parents:
diff changeset
   126
4391526e436e Initial commit of the Draw Map Scene
unc0rr
parents:
diff changeset
   127
void DrawMapScene::mousePressEvent(QGraphicsSceneMouseEvent * mouseEvent)
4391526e436e Initial commit of the Draw Map Scene
unc0rr
parents:
diff changeset
   128
{
4426
969e411c72aa Improve map editor a bit
unc0rr
parents: 4424
diff changeset
   129
    m_currPath = addPath(QPainterPath(), m_pen);
969e411c72aa Improve map editor a bit
unc0rr
parents: 4424
diff changeset
   130
969e411c72aa Improve map editor a bit
unc0rr
parents: 4424
diff changeset
   131
    QPainterPath path = m_currPath->path();
969e411c72aa Improve map editor a bit
unc0rr
parents: 4424
diff changeset
   132
    QPointF p = mouseEvent->scenePos();
969e411c72aa Improve map editor a bit
unc0rr
parents: 4424
diff changeset
   133
    p += QPointF(0.01, 0.01);
969e411c72aa Improve map editor a bit
unc0rr
parents: 4424
diff changeset
   134
    path.moveTo(p);
969e411c72aa Improve map editor a bit
unc0rr
parents: 4424
diff changeset
   135
    path.lineTo(mouseEvent->scenePos());
6873
30840365af0a Eraser tool
unc0rr
parents: 6784
diff changeset
   136
30840365af0a Eraser tool
unc0rr
parents: 6784
diff changeset
   137
    PathParams params;
13209
f5d36be88c61 Drawn map menu: Add spin box to change brush size by hand
Wuzzy <Wuzzy2@mail.ru>
parents: 13204
diff changeset
   138
    params.width = serializePenWidth(brushSize());
6873
30840365af0a Eraser tool
unc0rr
parents: 6784
diff changeset
   139
    params.erasing = m_isErasing;
9551
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   140
    params.initialPoint = mouseEvent->scenePos().toPoint();
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   141
    params.points = QList<QPoint>() << params.initialPoint;
6873
30840365af0a Eraser tool
unc0rr
parents: 6784
diff changeset
   142
    paths.prepend(params);
4426
969e411c72aa Improve map editor a bit
unc0rr
parents: 4424
diff changeset
   143
    m_currPath->setPath(path);
969e411c72aa Improve map editor a bit
unc0rr
parents: 4424
diff changeset
   144
4427
c5193713055f Basic encoding of drawn map
unc0rr
parents: 4426
diff changeset
   145
    emit pathChanged();
4423
4391526e436e Initial commit of the Draw Map Scene
unc0rr
parents:
diff changeset
   146
}
4391526e436e Initial commit of the Draw Map Scene
unc0rr
parents:
diff changeset
   147
4391526e436e Initial commit of the Draw Map Scene
unc0rr
parents:
diff changeset
   148
void DrawMapScene::mouseReleaseEvent(QGraphicsSceneMouseEvent * mouseEvent)
4391526e436e Initial commit of the Draw Map Scene
unc0rr
parents:
diff changeset
   149
{
5108
b7483e29ea8c Fixing issue 211. Check to see if m_currPath is NULL before doing anything in mouseReleaseEvent. Multiple mouse release events can occur after a mouse press and before the next mouse press if you mouse-click really fast.
Zorg <zorgiepoo@gmail.com>
parents: 5040
diff changeset
   150
    if (m_currPath)
b7483e29ea8c Fixing issue 211. Check to see if m_currPath is NULL before doing anything in mouseReleaseEvent. Multiple mouse release events can occur after a mouse press and before the next mouse press if you mouse-click really fast.
Zorg <zorgiepoo@gmail.com>
parents: 5040
diff changeset
   151
    {
9555
485b424be769 uhm... a feature
unc0rr
parents: 9553
diff changeset
   152
        QPointF currentPos = mouseEvent->scenePos();
485b424be769 uhm... a feature
unc0rr
parents: 9553
diff changeset
   153
485b424be769 uhm... a feature
unc0rr
parents: 9553
diff changeset
   154
        if(mouseEvent->modifiers() & Qt::ControlModifier)
485b424be769 uhm... a feature
unc0rr
parents: 9553
diff changeset
   155
            currentPos = putSomeConstraints(paths.first().initialPoint, currentPos);
485b424be769 uhm... a feature
unc0rr
parents: 9553
diff changeset
   156
9551
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   157
        switch (m_pathType)
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   158
        {
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   159
        case Polyline: {
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   160
            QPainterPath path = m_currPath->path();
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   161
            path.lineTo(mouseEvent->scenePos());
9555
485b424be769 uhm... a feature
unc0rr
parents: 9553
diff changeset
   162
            paths.first().points.append(currentPos.toPoint());
9551
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   163
            m_currPath->setPath(path);
9553
f92d43816186 Some tweaks to ellipse code to produce less points
unc0rr
parents: 9551
diff changeset
   164
            simplifyLast();
9551
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   165
            break;
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   166
        }
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   167
        case Rectangle: {
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   168
            QPoint p1 = paths.first().initialPoint;
9555
485b424be769 uhm... a feature
unc0rr
parents: 9553
diff changeset
   169
            QPoint p2 = currentPos.toPoint();
9551
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   170
            QList<QPoint> rpoints;
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   171
            rpoints << p1 << QPoint(p1.x(), p2.y()) << p2 << QPoint(p2.x(), p1.y()) << p1;
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   172
            paths.first().points = rpoints;
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   173
            break;
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   174
        }
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   175
        case Ellipse:
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   176
            QPoint p1 = paths.first().initialPoint;
9555
485b424be769 uhm... a feature
unc0rr
parents: 9553
diff changeset
   177
            QPoint p2 = currentPos.toPoint();
9551
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   178
            QList<QPointF> points = makeEllipse(p1, p2);
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   179
            QList<QPoint> epoints;
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   180
            foreach(const QPointF & p, points)
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   181
                epoints.append(p.toPoint());
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   182
            paths.first().points = epoints;
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   183
            break;
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   184
        }
4560
5d6c7f88db73 - Some work on drawMap widget and scene to allow undo, clear, save and load operations
unc0rr
parents: 4520
diff changeset
   185
9553
f92d43816186 Some tweaks to ellipse code to produce less points
unc0rr
parents: 9551
diff changeset
   186
        m_currPath = 0;
4439
27a896207aae Some more improvements
unC0Rr
parents: 4434
diff changeset
   187
9553
f92d43816186 Some tweaks to ellipse code to produce less points
unc0rr
parents: 9551
diff changeset
   188
        emit pathChanged();
5108
b7483e29ea8c Fixing issue 211. Check to see if m_currPath is NULL before doing anything in mouseReleaseEvent. Multiple mouse release events can occur after a mouse press and before the next mouse press if you mouse-click really fast.
Zorg <zorgiepoo@gmail.com>
parents: 5040
diff changeset
   189
    }
4423
4391526e436e Initial commit of the Draw Map Scene
unc0rr
parents:
diff changeset
   190
}
4424
3225ea34e415 Some basic functionality
unc0rr
parents: 4423
diff changeset
   191
13209
f5d36be88c61 Drawn map menu: Add spin box to change brush size by hand
Wuzzy <Wuzzy2@mail.ru>
parents: 13204
diff changeset
   192
void DrawMapScene::setBrushSize(int newBrushSize)
6781
23f627ba8ee9 Variable pen width
unc0rr
parents: 6700
diff changeset
   193
{
13209
f5d36be88c61 Drawn map menu: Add spin box to change brush size by hand
Wuzzy <Wuzzy2@mail.ru>
parents: 13204
diff changeset
   194
    if(newBrushSize > DRAWN_MAP_BRUSH_SIZE_MAX)
f5d36be88c61 Drawn map menu: Add spin box to change brush size by hand
Wuzzy <Wuzzy2@mail.ru>
parents: 13204
diff changeset
   195
        newBrushSize = DRAWN_MAP_BRUSH_SIZE_MAX;
f5d36be88c61 Drawn map menu: Add spin box to change brush size by hand
Wuzzy <Wuzzy2@mail.ru>
parents: 13204
diff changeset
   196
    if(newBrushSize < DRAWN_MAP_BRUSH_SIZE_MIN)
f5d36be88c61 Drawn map menu: Add spin box to change brush size by hand
Wuzzy <Wuzzy2@mail.ru>
parents: 13204
diff changeset
   197
        newBrushSize = DRAWN_MAP_BRUSH_SIZE_MIN;
6781
23f627ba8ee9 Variable pen width
unc0rr
parents: 6700
diff changeset
   198
13209
f5d36be88c61 Drawn map menu: Add spin box to change brush size by hand
Wuzzy <Wuzzy2@mail.ru>
parents: 13204
diff changeset
   199
    m_pen.setWidth(newBrushSize);
13203
eaa494f0b19e Fix cursor circle being too large in drawn map editor
Wuzzy <Wuzzy2@mail.ru>
parents: 11046
diff changeset
   200
    QPen cursorPen = m_cursor->pen();
eaa494f0b19e Fix cursor circle being too large in drawn map editor
Wuzzy <Wuzzy2@mail.ru>
parents: 11046
diff changeset
   201
    cursorPen.setWidth(m_pen.width());
eaa494f0b19e Fix cursor circle being too large in drawn map editor
Wuzzy <Wuzzy2@mail.ru>
parents: 11046
diff changeset
   202
    m_cursor->setPen(cursorPen);
6781
23f627ba8ee9 Variable pen width
unc0rr
parents: 6700
diff changeset
   203
    if(m_currPath)
23f627ba8ee9 Variable pen width
unc0rr
parents: 6700
diff changeset
   204
    {
23f627ba8ee9 Variable pen width
unc0rr
parents: 6700
diff changeset
   205
        m_currPath->setPen(m_pen);
6873
30840365af0a Eraser tool
unc0rr
parents: 6784
diff changeset
   206
        paths.first().width = serializePenWidth(m_pen.width());
6781
23f627ba8ee9 Variable pen width
unc0rr
parents: 6700
diff changeset
   207
    }
13209
f5d36be88c61 Drawn map menu: Add spin box to change brush size by hand
Wuzzy <Wuzzy2@mail.ru>
parents: 13204
diff changeset
   208
f5d36be88c61 Drawn map menu: Add spin box to change brush size by hand
Wuzzy <Wuzzy2@mail.ru>
parents: 13204
diff changeset
   209
    emit brushSizeChanged(newBrushSize);
f5d36be88c61 Drawn map menu: Add spin box to change brush size by hand
Wuzzy <Wuzzy2@mail.ru>
parents: 13204
diff changeset
   210
}
f5d36be88c61 Drawn map menu: Add spin box to change brush size by hand
Wuzzy <Wuzzy2@mail.ru>
parents: 13204
diff changeset
   211
f5d36be88c61 Drawn map menu: Add spin box to change brush size by hand
Wuzzy <Wuzzy2@mail.ru>
parents: 13204
diff changeset
   212
int DrawMapScene::brushSize()
f5d36be88c61 Drawn map menu: Add spin box to change brush size by hand
Wuzzy <Wuzzy2@mail.ru>
parents: 13204
diff changeset
   213
{
f5d36be88c61 Drawn map menu: Add spin box to change brush size by hand
Wuzzy <Wuzzy2@mail.ru>
parents: 13204
diff changeset
   214
    return m_pen.width();
f5d36be88c61 Drawn map menu: Add spin box to change brush size by hand
Wuzzy <Wuzzy2@mail.ru>
parents: 13204
diff changeset
   215
}
f5d36be88c61 Drawn map menu: Add spin box to change brush size by hand
Wuzzy <Wuzzy2@mail.ru>
parents: 13204
diff changeset
   216
f5d36be88c61 Drawn map menu: Add spin box to change brush size by hand
Wuzzy <Wuzzy2@mail.ru>
parents: 13204
diff changeset
   217
void DrawMapScene::wheelEvent(QGraphicsSceneWheelEvent * wheelEvent)
f5d36be88c61 Drawn map menu: Add spin box to change brush size by hand
Wuzzy <Wuzzy2@mail.ru>
parents: 13204
diff changeset
   218
{
f5d36be88c61 Drawn map menu: Add spin box to change brush size by hand
Wuzzy <Wuzzy2@mail.ru>
parents: 13204
diff changeset
   219
    int b = brushSize();
f5d36be88c61 Drawn map menu: Add spin box to change brush size by hand
Wuzzy <Wuzzy2@mail.ru>
parents: 13204
diff changeset
   220
    if(wheelEvent->delta() > 0)
f5d36be88c61 Drawn map menu: Add spin box to change brush size by hand
Wuzzy <Wuzzy2@mail.ru>
parents: 13204
diff changeset
   221
        setBrushSize(b + DRAWN_MAP_BRUSH_SIZE_STEP);
f5d36be88c61 Drawn map menu: Add spin box to change brush size by hand
Wuzzy <Wuzzy2@mail.ru>
parents: 13204
diff changeset
   222
    else if(wheelEvent->delta() < 0 && b >= DRAWN_MAP_BRUSH_SIZE_MIN)
f5d36be88c61 Drawn map menu: Add spin box to change brush size by hand
Wuzzy <Wuzzy2@mail.ru>
parents: 13204
diff changeset
   223
        setBrushSize(b - DRAWN_MAP_BRUSH_SIZE_STEP);
6781
23f627ba8ee9 Variable pen width
unc0rr
parents: 6700
diff changeset
   224
}
23f627ba8ee9 Variable pen width
unc0rr
parents: 6700
diff changeset
   225
6934
14a230552c2e Cursor for DrawMapScene. Feel free to ajust its look.
unc0rr
parents: 6873
diff changeset
   226
void DrawMapScene::showCursor()
14a230552c2e Cursor for DrawMapScene. Feel free to ajust its look.
unc0rr
parents: 6873
diff changeset
   227
{
14a230552c2e Cursor for DrawMapScene. Feel free to ajust its look.
unc0rr
parents: 6873
diff changeset
   228
    if(!m_isCursorShown)
14a230552c2e Cursor for DrawMapScene. Feel free to ajust its look.
unc0rr
parents: 6873
diff changeset
   229
        addItem(m_cursor);
14a230552c2e Cursor for DrawMapScene. Feel free to ajust its look.
unc0rr
parents: 6873
diff changeset
   230
14a230552c2e Cursor for DrawMapScene. Feel free to ajust its look.
unc0rr
parents: 6873
diff changeset
   231
    m_isCursorShown = true;
14a230552c2e Cursor for DrawMapScene. Feel free to ajust its look.
unc0rr
parents: 6873
diff changeset
   232
}
14a230552c2e Cursor for DrawMapScene. Feel free to ajust its look.
unc0rr
parents: 6873
diff changeset
   233
14a230552c2e Cursor for DrawMapScene. Feel free to ajust its look.
unc0rr
parents: 6873
diff changeset
   234
void DrawMapScene::hideCursor()
14a230552c2e Cursor for DrawMapScene. Feel free to ajust its look.
unc0rr
parents: 6873
diff changeset
   235
{
14a230552c2e Cursor for DrawMapScene. Feel free to ajust its look.
unc0rr
parents: 6873
diff changeset
   236
    if(m_isCursorShown)
14a230552c2e Cursor for DrawMapScene. Feel free to ajust its look.
unc0rr
parents: 6873
diff changeset
   237
        removeItem(m_cursor);
14a230552c2e Cursor for DrawMapScene. Feel free to ajust its look.
unc0rr
parents: 6873
diff changeset
   238
14a230552c2e Cursor for DrawMapScene. Feel free to ajust its look.
unc0rr
parents: 6873
diff changeset
   239
    m_isCursorShown = false;
14a230552c2e Cursor for DrawMapScene. Feel free to ajust its look.
unc0rr
parents: 6873
diff changeset
   240
}
14a230552c2e Cursor for DrawMapScene. Feel free to ajust its look.
unc0rr
parents: 6873
diff changeset
   241
4426
969e411c72aa Improve map editor a bit
unc0rr
parents: 4424
diff changeset
   242
void DrawMapScene::undo()
4424
3225ea34e415 Some basic functionality
unc0rr
parents: 4423
diff changeset
   243
{
6934
14a230552c2e Cursor for DrawMapScene. Feel free to ajust its look.
unc0rr
parents: 6873
diff changeset
   244
    // cursor is a part of items()
14a230552c2e Cursor for DrawMapScene. Feel free to ajust its look.
unc0rr
parents: 6873
diff changeset
   245
    if(m_isCursorShown)
14a230552c2e Cursor for DrawMapScene. Feel free to ajust its look.
unc0rr
parents: 6873
diff changeset
   246
        return;
14a230552c2e Cursor for DrawMapScene. Feel free to ajust its look.
unc0rr
parents: 6873
diff changeset
   247
9472
265e5997580e Incomplete implementation of 'special points' in drawn maps (crashes engine)
unc0rr
parents: 9080
diff changeset
   248
    if(paths.size())
4427
c5193713055f Basic encoding of drawn map
unc0rr
parents: 4426
diff changeset
   249
    {
4426
969e411c72aa Improve map editor a bit
unc0rr
parents: 4424
diff changeset
   250
        removeItem(items().first());
4439
27a896207aae Some more improvements
unC0Rr
parents: 4434
diff changeset
   251
        paths.removeFirst();
4427
c5193713055f Basic encoding of drawn map
unc0rr
parents: 4426
diff changeset
   252
c5193713055f Basic encoding of drawn map
unc0rr
parents: 4426
diff changeset
   253
        emit pathChanged();
c5193713055f Basic encoding of drawn map
unc0rr
parents: 4426
diff changeset
   254
    }
5858
1f4a8cf9efcb hand drawn map editor: allow "undo" after "clear"
sheepluva
parents: 5108
diff changeset
   255
    else if(oldItems.size())
1f4a8cf9efcb hand drawn map editor: allow "undo" after "clear"
sheepluva
parents: 5108
diff changeset
   256
    {
1f4a8cf9efcb hand drawn map editor: allow "undo" after "clear"
sheepluva
parents: 5108
diff changeset
   257
        while(oldItems.size())
1f4a8cf9efcb hand drawn map editor: allow "undo" after "clear"
sheepluva
parents: 5108
diff changeset
   258
            addItem(oldItems.takeFirst());
1f4a8cf9efcb hand drawn map editor: allow "undo" after "clear"
sheepluva
parents: 5108
diff changeset
   259
        paths = oldPaths;
1f4a8cf9efcb hand drawn map editor: allow "undo" after "clear"
sheepluva
parents: 5108
diff changeset
   260
1f4a8cf9efcb hand drawn map editor: allow "undo" after "clear"
sheepluva
parents: 5108
diff changeset
   261
        emit pathChanged();
1f4a8cf9efcb hand drawn map editor: allow "undo" after "clear"
sheepluva
parents: 5108
diff changeset
   262
    }
4424
3225ea34e415 Some basic functionality
unc0rr
parents: 4423
diff changeset
   263
}
4427
c5193713055f Basic encoding of drawn map
unc0rr
parents: 4426
diff changeset
   264
4560
5d6c7f88db73 - Some work on drawMap widget and scene to allow undo, clear, save and load operations
unc0rr
parents: 4520
diff changeset
   265
void DrawMapScene::clearMap()
5d6c7f88db73 - Some work on drawMap widget and scene to allow undo, clear, save and load operations
unc0rr
parents: 4520
diff changeset
   266
{
6934
14a230552c2e Cursor for DrawMapScene. Feel free to ajust its look.
unc0rr
parents: 6873
diff changeset
   267
    // cursor is a part of items()
14a230552c2e Cursor for DrawMapScene. Feel free to ajust its look.
unc0rr
parents: 6873
diff changeset
   268
    if(m_isCursorShown)
14a230552c2e Cursor for DrawMapScene. Feel free to ajust its look.
unc0rr
parents: 6873
diff changeset
   269
        return;
14a230552c2e Cursor for DrawMapScene. Feel free to ajust its look.
unc0rr
parents: 6873
diff changeset
   270
5858
1f4a8cf9efcb hand drawn map editor: allow "undo" after "clear"
sheepluva
parents: 5108
diff changeset
   271
    // don't clear if already cleared
1f4a8cf9efcb hand drawn map editor: allow "undo" after "clear"
sheepluva
parents: 5108
diff changeset
   272
    if(!items().size())
1f4a8cf9efcb hand drawn map editor: allow "undo" after "clear"
sheepluva
parents: 5108
diff changeset
   273
        return;
1f4a8cf9efcb hand drawn map editor: allow "undo" after "clear"
sheepluva
parents: 5108
diff changeset
   274
9472
265e5997580e Incomplete implementation of 'special points' in drawn maps (crashes engine)
unc0rr
parents: 9080
diff changeset
   275
    m_specialPoints.clear();
5858
1f4a8cf9efcb hand drawn map editor: allow "undo" after "clear"
sheepluva
parents: 5108
diff changeset
   276
    oldItems.clear();
1f4a8cf9efcb hand drawn map editor: allow "undo" after "clear"
sheepluva
parents: 5108
diff changeset
   277
1f4a8cf9efcb hand drawn map editor: allow "undo" after "clear"
sheepluva
parents: 5108
diff changeset
   278
    // do this since clear() would _destroy_ all items
9472
265e5997580e Incomplete implementation of 'special points' in drawn maps (crashes engine)
unc0rr
parents: 9080
diff changeset
   279
    for(int i = paths.size() - 1; i >= 0; --i)
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 5858
diff changeset
   280
    {
5858
1f4a8cf9efcb hand drawn map editor: allow "undo" after "clear"
sheepluva
parents: 5108
diff changeset
   281
        oldItems.push_front(items().first());
1f4a8cf9efcb hand drawn map editor: allow "undo" after "clear"
sheepluva
parents: 5108
diff changeset
   282
        removeItem(items().first());
1f4a8cf9efcb hand drawn map editor: allow "undo" after "clear"
sheepluva
parents: 5108
diff changeset
   283
    }
1f4a8cf9efcb hand drawn map editor: allow "undo" after "clear"
sheepluva
parents: 5108
diff changeset
   284
9483
14ad1ac00ac9 Modify Racer script so it could work with special points
unc0rr
parents: 9472
diff changeset
   285
    items().clear();
14ad1ac00ac9 Modify Racer script so it could work with special points
unc0rr
parents: 9472
diff changeset
   286
5858
1f4a8cf9efcb hand drawn map editor: allow "undo" after "clear"
sheepluva
parents: 5108
diff changeset
   287
    oldPaths = paths;
1f4a8cf9efcb hand drawn map editor: allow "undo" after "clear"
sheepluva
parents: 5108
diff changeset
   288
4560
5d6c7f88db73 - Some work on drawMap widget and scene to allow undo, clear, save and load operations
unc0rr
parents: 4520
diff changeset
   289
    paths.clear();
5d6c7f88db73 - Some work on drawMap widget and scene to allow undo, clear, save and load operations
unc0rr
parents: 4520
diff changeset
   290
5d6c7f88db73 - Some work on drawMap widget and scene to allow undo, clear, save and load operations
unc0rr
parents: 4520
diff changeset
   291
    emit pathChanged();
5d6c7f88db73 - Some work on drawMap widget and scene to allow undo, clear, save and load operations
unc0rr
parents: 4520
diff changeset
   292
}
5d6c7f88db73 - Some work on drawMap widget and scene to allow undo, clear, save and load operations
unc0rr
parents: 4520
diff changeset
   293
6873
30840365af0a Eraser tool
unc0rr
parents: 6784
diff changeset
   294
30840365af0a Eraser tool
unc0rr
parents: 6784
diff changeset
   295
void DrawMapScene::setErasing(bool erasing)
30840365af0a Eraser tool
unc0rr
parents: 6784
diff changeset
   296
{
30840365af0a Eraser tool
unc0rr
parents: 6784
diff changeset
   297
    m_isErasing = erasing;
13204
9565569e410c Drawn map page: Enable antialiasing, turn eraser cursor red
Wuzzy <Wuzzy2@mail.ru>
parents: 13203
diff changeset
   298
    QPen cursorPen = m_cursor->pen();
9565569e410c Drawn map page: Enable antialiasing, turn eraser cursor red
Wuzzy <Wuzzy2@mail.ru>
parents: 13203
diff changeset
   299
    if(erasing) {
6873
30840365af0a Eraser tool
unc0rr
parents: 6784
diff changeset
   300
        m_pen.setBrush(m_eraser);
13204
9565569e410c Drawn map page: Enable antialiasing, turn eraser cursor red
Wuzzy <Wuzzy2@mail.ru>
parents: 13203
diff changeset
   301
        cursorPen.setColor(DRAWN_MAP_COLOR_CURSOR_ERASER);
9565569e410c Drawn map page: Enable antialiasing, turn eraser cursor red
Wuzzy <Wuzzy2@mail.ru>
parents: 13203
diff changeset
   302
    } else {
6873
30840365af0a Eraser tool
unc0rr
parents: 6784
diff changeset
   303
        m_pen.setBrush(m_brush);
13204
9565569e410c Drawn map page: Enable antialiasing, turn eraser cursor red
Wuzzy <Wuzzy2@mail.ru>
parents: 13203
diff changeset
   304
        cursorPen.setColor(DRAWN_MAP_COLOR_CURSOR_PEN);
9565569e410c Drawn map page: Enable antialiasing, turn eraser cursor red
Wuzzy <Wuzzy2@mail.ru>
parents: 13203
diff changeset
   305
    }
9565569e410c Drawn map page: Enable antialiasing, turn eraser cursor red
Wuzzy <Wuzzy2@mail.ru>
parents: 13203
diff changeset
   306
    m_cursor->setPen(cursorPen);
6873
30840365af0a Eraser tool
unc0rr
parents: 6784
diff changeset
   307
}
30840365af0a Eraser tool
unc0rr
parents: 6784
diff changeset
   308
4427
c5193713055f Basic encoding of drawn map
unc0rr
parents: 4426
diff changeset
   309
QByteArray DrawMapScene::encode()
c5193713055f Basic encoding of drawn map
unc0rr
parents: 4426
diff changeset
   310
{
9472
265e5997580e Incomplete implementation of 'special points' in drawn maps (crashes engine)
unc0rr
parents: 9080
diff changeset
   311
    QByteArray b(m_specialPoints);
4427
c5193713055f Basic encoding of drawn map
unc0rr
parents: 4426
diff changeset
   312
4666
34551d8639cf - Fix encoding function to iterate reversed list
unc0rr
parents: 4658
diff changeset
   313
    for(int i = paths.size() - 1; i >= 0; --i)
4427
c5193713055f Basic encoding of drawn map
unc0rr
parents: 4426
diff changeset
   314
    {
c5193713055f Basic encoding of drawn map
unc0rr
parents: 4426
diff changeset
   315
        int cnt = 0;
6873
30840365af0a Eraser tool
unc0rr
parents: 6784
diff changeset
   316
        PathParams params = paths.at(i);
30840365af0a Eraser tool
unc0rr
parents: 6784
diff changeset
   317
        foreach(QPoint point, params.points)
4427
c5193713055f Basic encoding of drawn map
unc0rr
parents: 4426
diff changeset
   318
        {
c5193713055f Basic encoding of drawn map
unc0rr
parents: 4426
diff changeset
   319
            qint16 px = qToBigEndian((qint16)point.x());
c5193713055f Basic encoding of drawn map
unc0rr
parents: 4426
diff changeset
   320
            qint16 py = qToBigEndian((qint16)point.y());
6781
23f627ba8ee9 Variable pen width
unc0rr
parents: 6700
diff changeset
   321
            quint8 flags = 0;
7298
a5f2fa95e711 Don't set erasing flag when it is unnecessary so hwmap could compress better
unc0rr
parents: 7146
diff changeset
   322
            if(!cnt)
a5f2fa95e711 Don't set erasing flag when it is unnecessary so hwmap could compress better
unc0rr
parents: 7146
diff changeset
   323
            {
a5f2fa95e711 Don't set erasing flag when it is unnecessary so hwmap could compress better
unc0rr
parents: 7146
diff changeset
   324
                flags = 0x80 + params.width;
a5f2fa95e711 Don't set erasing flag when it is unnecessary so hwmap could compress better
unc0rr
parents: 7146
diff changeset
   325
                if(params.erasing) flags |= 0x40;
a5f2fa95e711 Don't set erasing flag when it is unnecessary so hwmap could compress better
unc0rr
parents: 7146
diff changeset
   326
            }
4427
c5193713055f Basic encoding of drawn map
unc0rr
parents: 4426
diff changeset
   327
            b.append((const char *)&px, 2);
c5193713055f Basic encoding of drawn map
unc0rr
parents: 4426
diff changeset
   328
            b.append((const char *)&py, 2);
4457
ffb766e85150 - Change painted map file format
unc0rr
parents: 4442
diff changeset
   329
            b.append((const char *)&flags, 1);
4427
c5193713055f Basic encoding of drawn map
unc0rr
parents: 4426
diff changeset
   330
c5193713055f Basic encoding of drawn map
unc0rr
parents: 4426
diff changeset
   331
            ++cnt;
c5193713055f Basic encoding of drawn map
unc0rr
parents: 4426
diff changeset
   332
        }
c5193713055f Basic encoding of drawn map
unc0rr
parents: 4426
diff changeset
   333
c5193713055f Basic encoding of drawn map
unc0rr
parents: 4426
diff changeset
   334
    }
c5193713055f Basic encoding of drawn map
unc0rr
parents: 4426
diff changeset
   335
c5193713055f Basic encoding of drawn map
unc0rr
parents: 4426
diff changeset
   336
    return b;
c5193713055f Basic encoding of drawn map
unc0rr
parents: 4426
diff changeset
   337
}
4434
34c305fbc63c Simple simplify() function
unc0rr
parents: 4427
diff changeset
   338
4442
f8424e1bc936 - Implement decode() function.
unc0rr
parents: 4439
diff changeset
   339
void DrawMapScene::decode(QByteArray data)
f8424e1bc936 - Implement decode() function.
unc0rr
parents: 4439
diff changeset
   340
{
10235
bafca1686867 Drawn maps optimizer - first steps:
unc0rr
parents: 10223
diff changeset
   341
    hideCursor();
bafca1686867 Drawn maps optimizer - first steps:
unc0rr
parents: 10223
diff changeset
   342
13236
ef1393c6bd12 Draw map page: Fix pen size being changed after loading a map
Wuzzy <Wuzzy2@mail.ru>
parents: 13209
diff changeset
   343
    // Remember erasing mode
6873
30840365af0a Eraser tool
unc0rr
parents: 6784
diff changeset
   344
    bool erasing = m_isErasing;
30840365af0a Eraser tool
unc0rr
parents: 6784
diff changeset
   345
13236
ef1393c6bd12 Draw map page: Fix pen size being changed after loading a map
Wuzzy <Wuzzy2@mail.ru>
parents: 13209
diff changeset
   346
    // Use seperate for decoding the map, don't mess with the user pen
ef1393c6bd12 Draw map page: Fix pen size being changed after loading a map
Wuzzy <Wuzzy2@mail.ru>
parents: 13209
diff changeset
   347
    QPen load_pen = QPen(m_pen);
ef1393c6bd12 Draw map page: Fix pen size being changed after loading a map
Wuzzy <Wuzzy2@mail.ru>
parents: 13209
diff changeset
   348
5858
1f4a8cf9efcb hand drawn map editor: allow "undo" after "clear"
sheepluva
parents: 5108
diff changeset
   349
    oldItems.clear();
1f4a8cf9efcb hand drawn map editor: allow "undo" after "clear"
sheepluva
parents: 5108
diff changeset
   350
    oldPaths.clear();
4442
f8424e1bc936 - Implement decode() function.
unc0rr
parents: 4439
diff changeset
   351
    clear();
f8424e1bc936 - Implement decode() function.
unc0rr
parents: 4439
diff changeset
   352
    paths.clear();
9472
265e5997580e Incomplete implementation of 'special points' in drawn maps (crashes engine)
unc0rr
parents: 9080
diff changeset
   353
    m_specialPoints.clear();
4442
f8424e1bc936 - Implement decode() function.
unc0rr
parents: 4439
diff changeset
   354
6873
30840365af0a Eraser tool
unc0rr
parents: 6784
diff changeset
   355
    PathParams params;
4442
f8424e1bc936 - Implement decode() function.
unc0rr
parents: 4439
diff changeset
   356
9472
265e5997580e Incomplete implementation of 'special points' in drawn maps (crashes engine)
unc0rr
parents: 9080
diff changeset
   357
    bool isSpecial = true;
265e5997580e Incomplete implementation of 'special points' in drawn maps (crashes engine)
unc0rr
parents: 9080
diff changeset
   358
4442
f8424e1bc936 - Implement decode() function.
unc0rr
parents: 4439
diff changeset
   359
    while(data.size() >= 5)
f8424e1bc936 - Implement decode() function.
unc0rr
parents: 4439
diff changeset
   360
    {
f8424e1bc936 - Implement decode() function.
unc0rr
parents: 4439
diff changeset
   361
        qint16 px = qFromBigEndian(*(qint16 *)data.data());
f8424e1bc936 - Implement decode() function.
unc0rr
parents: 4439
diff changeset
   362
        data.remove(0, 2);
f8424e1bc936 - Implement decode() function.
unc0rr
parents: 4439
diff changeset
   363
        qint16 py = qFromBigEndian(*(qint16 *)data.data());
f8424e1bc936 - Implement decode() function.
unc0rr
parents: 4439
diff changeset
   364
        data.remove(0, 2);
4457
ffb766e85150 - Change painted map file format
unc0rr
parents: 4442
diff changeset
   365
        quint8 flags = *(quint8 *)data.data();
ffb766e85150 - Change painted map file format
unc0rr
parents: 4442
diff changeset
   366
        data.remove(0, 1);
10235
bafca1686867 Drawn maps optimizer - first steps:
unc0rr
parents: 10223
diff changeset
   367
        //qDebug() << px << py;
6781
23f627ba8ee9 Variable pen width
unc0rr
parents: 6700
diff changeset
   368
        if(flags & 0x80)
4442
f8424e1bc936 - Implement decode() function.
unc0rr
parents: 4439
diff changeset
   369
        {
9472
265e5997580e Incomplete implementation of 'special points' in drawn maps (crashes engine)
unc0rr
parents: 9080
diff changeset
   370
            isSpecial = false;
265e5997580e Incomplete implementation of 'special points' in drawn maps (crashes engine)
unc0rr
parents: 9080
diff changeset
   371
6873
30840365af0a Eraser tool
unc0rr
parents: 6784
diff changeset
   372
            if(params.points.size())
6781
23f627ba8ee9 Variable pen width
unc0rr
parents: 6700
diff changeset
   373
            {
13236
ef1393c6bd12 Draw map page: Fix pen size being changed after loading a map
Wuzzy <Wuzzy2@mail.ru>
parents: 13209
diff changeset
   374
                addPath(pointsToPath(params.points), load_pen);
6781
23f627ba8ee9 Variable pen width
unc0rr
parents: 6700
diff changeset
   375
6873
30840365af0a Eraser tool
unc0rr
parents: 6784
diff changeset
   376
                paths.prepend(params);
4666
34551d8639cf - Fix encoding function to iterate reversed list
unc0rr
parents: 4658
diff changeset
   377
6873
30840365af0a Eraser tool
unc0rr
parents: 6784
diff changeset
   378
                params.points.clear();
6781
23f627ba8ee9 Variable pen width
unc0rr
parents: 6700
diff changeset
   379
            }
23f627ba8ee9 Variable pen width
unc0rr
parents: 6700
diff changeset
   380
6873
30840365af0a Eraser tool
unc0rr
parents: 6784
diff changeset
   381
            quint8 penWidth = flags & 0x3f;
13236
ef1393c6bd12 Draw map page: Fix pen size being changed after loading a map
Wuzzy <Wuzzy2@mail.ru>
parents: 13209
diff changeset
   382
            load_pen.setWidth(deserializePenWidth(penWidth));
7146
a822413207c9 Oops, forgot to set 'erasing' flag on decoding
unc0rr
parents: 6952
diff changeset
   383
            params.erasing = flags & 0x40;
a822413207c9 Oops, forgot to set 'erasing' flag on decoding
unc0rr
parents: 6952
diff changeset
   384
            if(params.erasing)
13236
ef1393c6bd12 Draw map page: Fix pen size being changed after loading a map
Wuzzy <Wuzzy2@mail.ru>
parents: 13209
diff changeset
   385
                load_pen.setBrush(m_eraser);
6873
30840365af0a Eraser tool
unc0rr
parents: 6784
diff changeset
   386
            else
13236
ef1393c6bd12 Draw map page: Fix pen size being changed after loading a map
Wuzzy <Wuzzy2@mail.ru>
parents: 13209
diff changeset
   387
                load_pen.setBrush(m_brush);
6873
30840365af0a Eraser tool
unc0rr
parents: 6784
diff changeset
   388
            params.width = penWidth;
9472
265e5997580e Incomplete implementation of 'special points' in drawn maps (crashes engine)
unc0rr
parents: 9080
diff changeset
   389
        } else
265e5997580e Incomplete implementation of 'special points' in drawn maps (crashes engine)
unc0rr
parents: 9080
diff changeset
   390
            if(isSpecial)
265e5997580e Incomplete implementation of 'special points' in drawn maps (crashes engine)
unc0rr
parents: 9080
diff changeset
   391
            {
265e5997580e Incomplete implementation of 'special points' in drawn maps (crashes engine)
unc0rr
parents: 9080
diff changeset
   392
                QPainterPath path;
265e5997580e Incomplete implementation of 'special points' in drawn maps (crashes engine)
unc0rr
parents: 9080
diff changeset
   393
                path.addEllipse(QPointF(px, py), 10, 10);
265e5997580e Incomplete implementation of 'special points' in drawn maps (crashes engine)
unc0rr
parents: 9080
diff changeset
   394
265e5997580e Incomplete implementation of 'special points' in drawn maps (crashes engine)
unc0rr
parents: 9080
diff changeset
   395
                addPath(path);
4442
f8424e1bc936 - Implement decode() function.
unc0rr
parents: 4439
diff changeset
   396
9472
265e5997580e Incomplete implementation of 'special points' in drawn maps (crashes engine)
unc0rr
parents: 9080
diff changeset
   397
                qint16 x = qToBigEndian(px);
265e5997580e Incomplete implementation of 'special points' in drawn maps (crashes engine)
unc0rr
parents: 9080
diff changeset
   398
                qint16 y = qToBigEndian(py);
265e5997580e Incomplete implementation of 'special points' in drawn maps (crashes engine)
unc0rr
parents: 9080
diff changeset
   399
                m_specialPoints.append((const char *)&x, 2);
265e5997580e Incomplete implementation of 'special points' in drawn maps (crashes engine)
unc0rr
parents: 9080
diff changeset
   400
                m_specialPoints.append((const char *)&y, 2);
265e5997580e Incomplete implementation of 'special points' in drawn maps (crashes engine)
unc0rr
parents: 9080
diff changeset
   401
                m_specialPoints.append((const char *)&flags, 1);
265e5997580e Incomplete implementation of 'special points' in drawn maps (crashes engine)
unc0rr
parents: 9080
diff changeset
   402
            }
265e5997580e Incomplete implementation of 'special points' in drawn maps (crashes engine)
unc0rr
parents: 9080
diff changeset
   403
265e5997580e Incomplete implementation of 'special points' in drawn maps (crashes engine)
unc0rr
parents: 9080
diff changeset
   404
        if(!isSpecial)
265e5997580e Incomplete implementation of 'special points' in drawn maps (crashes engine)
unc0rr
parents: 9080
diff changeset
   405
            params.points.append(QPoint(px, py));
4666
34551d8639cf - Fix encoding function to iterate reversed list
unc0rr
parents: 4658
diff changeset
   406
    }
34551d8639cf - Fix encoding function to iterate reversed list
unc0rr
parents: 4658
diff changeset
   407
6873
30840365af0a Eraser tool
unc0rr
parents: 6784
diff changeset
   408
    if(params.points.size())
4666
34551d8639cf - Fix encoding function to iterate reversed list
unc0rr
parents: 4658
diff changeset
   409
    {
13236
ef1393c6bd12 Draw map page: Fix pen size being changed after loading a map
Wuzzy <Wuzzy2@mail.ru>
parents: 13209
diff changeset
   410
        addPath(pointsToPath(params.points), load_pen);
6873
30840365af0a Eraser tool
unc0rr
parents: 6784
diff changeset
   411
        paths.prepend(params);
4442
f8424e1bc936 - Implement decode() function.
unc0rr
parents: 4439
diff changeset
   412
    }
4560
5d6c7f88db73 - Some work on drawMap widget and scene to allow undo, clear, save and load operations
unc0rr
parents: 4520
diff changeset
   413
5d6c7f88db73 - Some work on drawMap widget and scene to allow undo, clear, save and load operations
unc0rr
parents: 4520
diff changeset
   414
    emit pathChanged();
6873
30840365af0a Eraser tool
unc0rr
parents: 6784
diff changeset
   415
13236
ef1393c6bd12 Draw map page: Fix pen size being changed after loading a map
Wuzzy <Wuzzy2@mail.ru>
parents: 13209
diff changeset
   416
    // Restore erasing mode
6873
30840365af0a Eraser tool
unc0rr
parents: 6784
diff changeset
   417
    setErasing(erasing);
4442
f8424e1bc936 - Implement decode() function.
unc0rr
parents: 4439
diff changeset
   418
}
f8424e1bc936 - Implement decode() function.
unc0rr
parents: 4439
diff changeset
   419
4439
27a896207aae Some more improvements
unC0Rr
parents: 4434
diff changeset
   420
void DrawMapScene::simplifyLast()
4434
34c305fbc63c Simple simplify() function
unc0rr
parents: 4427
diff changeset
   421
{
4560
5d6c7f88db73 - Some work on drawMap widget and scene to allow undo, clear, save and load operations
unc0rr
parents: 4520
diff changeset
   422
    if(!paths.size()) return;
5d6c7f88db73 - Some work on drawMap widget and scene to allow undo, clear, save and load operations
unc0rr
parents: 4520
diff changeset
   423
6873
30840365af0a Eraser tool
unc0rr
parents: 6784
diff changeset
   424
    QList<QPoint> points = paths.at(0).points;
4439
27a896207aae Some more improvements
unC0Rr
parents: 4434
diff changeset
   425
27a896207aae Some more improvements
unC0Rr
parents: 4434
diff changeset
   426
    QPoint prevPoint = points.first();
27a896207aae Some more improvements
unC0Rr
parents: 4434
diff changeset
   427
    int i = 1;
27a896207aae Some more improvements
unC0Rr
parents: 4434
diff changeset
   428
    while(i < points.size())
4434
34c305fbc63c Simple simplify() function
unc0rr
parents: 4427
diff changeset
   429
    {
10223
b6b98dfa3807 Optimize out path closing point for one point paths
unc0rr
parents: 10108
diff changeset
   430
        if( ((i != points.size() - 1) || (prevPoint == points[i]))
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 5858
diff changeset
   431
                && (sqr(prevPoint.x() - points[i].x()) + sqr(prevPoint.y() - points[i].y()) < 1000)
4471
220d44cb8659 Always keep last point of drawn polyline
unc0rr
parents: 4457
diff changeset
   432
          )
4439
27a896207aae Some more improvements
unC0Rr
parents: 4434
diff changeset
   433
            points.removeAt(i);
27a896207aae Some more improvements
unC0Rr
parents: 4434
diff changeset
   434
        else
27a896207aae Some more improvements
unC0Rr
parents: 4434
diff changeset
   435
        {
27a896207aae Some more improvements
unC0Rr
parents: 4434
diff changeset
   436
            prevPoint = points[i];
27a896207aae Some more improvements
unC0Rr
parents: 4434
diff changeset
   437
            ++i;
27a896207aae Some more improvements
unC0Rr
parents: 4434
diff changeset
   438
        }
27a896207aae Some more improvements
unC0Rr
parents: 4434
diff changeset
   439
    }
4434
34c305fbc63c Simple simplify() function
unc0rr
parents: 4427
diff changeset
   440
6873
30840365af0a Eraser tool
unc0rr
parents: 6784
diff changeset
   441
    paths[0].points = points;
4439
27a896207aae Some more improvements
unC0Rr
parents: 4434
diff changeset
   442
27a896207aae Some more improvements
unC0Rr
parents: 4434
diff changeset
   443
27a896207aae Some more improvements
unC0Rr
parents: 4434
diff changeset
   444
    // redraw path
27a896207aae Some more improvements
unC0Rr
parents: 4434
diff changeset
   445
    {
6934
14a230552c2e Cursor for DrawMapScene. Feel free to ajust its look.
unc0rr
parents: 6873
diff changeset
   446
        QGraphicsPathItem * pathItem = static_cast<QGraphicsPathItem *>(items()[m_isCursorShown ? 1 : 0]);
6873
30840365af0a Eraser tool
unc0rr
parents: 6784
diff changeset
   447
        pathItem->setPath(pointsToPath(paths[0].points));
4434
34c305fbc63c Simple simplify() function
unc0rr
parents: 4427
diff changeset
   448
    }
34c305fbc63c Simple simplify() function
unc0rr
parents: 4427
diff changeset
   449
}
4442
f8424e1bc936 - Implement decode() function.
unc0rr
parents: 4439
diff changeset
   450
6935
472ed92c4173 Show number of points in drawn map
unc0rr
parents: 6934
diff changeset
   451
int DrawMapScene::pointsCount()
472ed92c4173 Show number of points in drawn map
unc0rr
parents: 6934
diff changeset
   452
{
472ed92c4173 Show number of points in drawn map
unc0rr
parents: 6934
diff changeset
   453
    int cnt = 0;
472ed92c4173 Show number of points in drawn map
unc0rr
parents: 6934
diff changeset
   454
    foreach(PathParams p, paths)
472ed92c4173 Show number of points in drawn map
unc0rr
parents: 6934
diff changeset
   455
        cnt += p.points.size();
472ed92c4173 Show number of points in drawn map
unc0rr
parents: 6934
diff changeset
   456
472ed92c4173 Show number of points in drawn map
unc0rr
parents: 6934
diff changeset
   457
    return cnt;
472ed92c4173 Show number of points in drawn map
unc0rr
parents: 6934
diff changeset
   458
}
472ed92c4173 Show number of points in drawn map
unc0rr
parents: 6934
diff changeset
   459
4442
f8424e1bc936 - Implement decode() function.
unc0rr
parents: 4439
diff changeset
   460
QPainterPath DrawMapScene::pointsToPath(const QList<QPoint> points)
f8424e1bc936 - Implement decode() function.
unc0rr
parents: 4439
diff changeset
   461
{
f8424e1bc936 - Implement decode() function.
unc0rr
parents: 4439
diff changeset
   462
    QPainterPath path;
f8424e1bc936 - Implement decode() function.
unc0rr
parents: 4439
diff changeset
   463
f8424e1bc936 - Implement decode() function.
unc0rr
parents: 4439
diff changeset
   464
    if(points.size())
f8424e1bc936 - Implement decode() function.
unc0rr
parents: 4439
diff changeset
   465
    {
f8424e1bc936 - Implement decode() function.
unc0rr
parents: 4439
diff changeset
   466
        QPointF p = points[0] + QPointF(0.01, 0.01);
f8424e1bc936 - Implement decode() function.
unc0rr
parents: 4439
diff changeset
   467
        path.moveTo(p);
f8424e1bc936 - Implement decode() function.
unc0rr
parents: 4439
diff changeset
   468
f8424e1bc936 - Implement decode() function.
unc0rr
parents: 4439
diff changeset
   469
        foreach(QPoint p, points)
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 5858
diff changeset
   470
        path.lineTo(p);
4442
f8424e1bc936 - Implement decode() function.
unc0rr
parents: 4439
diff changeset
   471
    }
f8424e1bc936 - Implement decode() function.
unc0rr
parents: 4439
diff changeset
   472
f8424e1bc936 - Implement decode() function.
unc0rr
parents: 4439
diff changeset
   473
    return path;
f8424e1bc936 - Implement decode() function.
unc0rr
parents: 4439
diff changeset
   474
}
6781
23f627ba8ee9 Variable pen width
unc0rr
parents: 6700
diff changeset
   475
23f627ba8ee9 Variable pen width
unc0rr
parents: 6700
diff changeset
   476
quint8 DrawMapScene::serializePenWidth(int width)
23f627ba8ee9 Variable pen width
unc0rr
parents: 6700
diff changeset
   477
{
23f627ba8ee9 Variable pen width
unc0rr
parents: 6700
diff changeset
   478
    return (width - 6) / 10;
23f627ba8ee9 Variable pen width
unc0rr
parents: 6700
diff changeset
   479
}
23f627ba8ee9 Variable pen width
unc0rr
parents: 6700
diff changeset
   480
23f627ba8ee9 Variable pen width
unc0rr
parents: 6700
diff changeset
   481
int DrawMapScene::deserializePenWidth(quint8 width)
23f627ba8ee9 Variable pen width
unc0rr
parents: 6700
diff changeset
   482
{
23f627ba8ee9 Variable pen width
unc0rr
parents: 6700
diff changeset
   483
    return width * 10 + 6;
23f627ba8ee9 Variable pen width
unc0rr
parents: 6700
diff changeset
   484
}
9551
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   485
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   486
void DrawMapScene::setPathType(PathType pathType)
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   487
{
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   488
    m_pathType = pathType;
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   489
}
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   490
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   491
QList<QPointF> DrawMapScene::makeEllipse(const QPointF &center, const QPointF &corner)
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   492
{
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   493
    QList<QPointF> l;
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   494
    qreal rx = qAbs(center.x() - corner.x());
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   495
    qreal ry = qAbs(center.y() - corner.y());
9553
f92d43816186 Some tweaks to ellipse code to produce less points
unc0rr
parents: 9551
diff changeset
   496
    qreal r = qMax(rx, ry);
9551
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   497
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   498
    if(r < 4)
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   499
    {
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   500
        l.append(center);
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   501
    } else
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   502
    {
9949
2aa9cf5badfc Added cast to qreal, avoiding ftbfs due to issue #758
Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
parents: 9555
diff changeset
   503
        qreal angleDelta = qMax(static_cast<qreal> (0.1), qMin(static_cast<qreal> (0.7), 120 / r));
9551
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   504
        for(qreal angle = 0.0; angle < 2*M_PI; angle += angleDelta)
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   505
            l.append(center + QPointF(rx * cos(angle), ry * sin(angle)));
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   506
        l.append(l.first());
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   507
    }
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   508
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   509
    return l;
61f160dfd0f1 Draw rectangles and ellipses!
unc0rr
parents: 9483
diff changeset
   510
}
9555
485b424be769 uhm... a feature
unc0rr
parents: 9553
diff changeset
   511
485b424be769 uhm... a feature
unc0rr
parents: 9553
diff changeset
   512
QPointF DrawMapScene::putSomeConstraints(const QPointF &initialPoint, const QPointF &point)
485b424be769 uhm... a feature
unc0rr
parents: 9553
diff changeset
   513
{
485b424be769 uhm... a feature
unc0rr
parents: 9553
diff changeset
   514
    QPointF vector = point - initialPoint;
485b424be769 uhm... a feature
unc0rr
parents: 9553
diff changeset
   515
485b424be769 uhm... a feature
unc0rr
parents: 9553
diff changeset
   516
    for(int angle = 0; angle < 180; angle += 15)
485b424be769 uhm... a feature
unc0rr
parents: 9553
diff changeset
   517
    {
485b424be769 uhm... a feature
unc0rr
parents: 9553
diff changeset
   518
        QTransform transform;
485b424be769 uhm... a feature
unc0rr
parents: 9553
diff changeset
   519
        transform.rotate(angle);
485b424be769 uhm... a feature
unc0rr
parents: 9553
diff changeset
   520
485b424be769 uhm... a feature
unc0rr
parents: 9553
diff changeset
   521
        QPointF rotated = transform.map(vector);
485b424be769 uhm... a feature
unc0rr
parents: 9553
diff changeset
   522
485b424be769 uhm... a feature
unc0rr
parents: 9553
diff changeset
   523
        if(rotated.x() == 0) return point;
485b424be769 uhm... a feature
unc0rr
parents: 9553
diff changeset
   524
        if(qAbs(rotated.y() / rotated.x()) < 0.05) return initialPoint + transform.inverted().map(QPointF(rotated.x(), 0));
485b424be769 uhm... a feature
unc0rr
parents: 9553
diff changeset
   525
    }
485b424be769 uhm... a feature
unc0rr
parents: 9553
diff changeset
   526
485b424be769 uhm... a feature
unc0rr
parents: 9553
diff changeset
   527
    return point;
485b424be769 uhm... a feature
unc0rr
parents: 9553
diff changeset
   528
}
10235
bafca1686867 Drawn maps optimizer - first steps:
unc0rr
parents: 10223
diff changeset
   529
bafca1686867 Drawn maps optimizer - first steps:
unc0rr
parents: 10223
diff changeset
   530
void DrawMapScene::optimize()
bafca1686867 Drawn maps optimizer - first steps:
unc0rr
parents: 10223
diff changeset
   531
{
bafca1686867 Drawn maps optimizer - first steps:
unc0rr
parents: 10223
diff changeset
   532
    if(!paths.size()) return;
bafca1686867 Drawn maps optimizer - first steps:
unc0rr
parents: 10223
diff changeset
   533
bafca1686867 Drawn maps optimizer - first steps:
unc0rr
parents: 10223
diff changeset
   534
    // break paths into segments
bafca1686867 Drawn maps optimizer - first steps:
unc0rr
parents: 10223
diff changeset
   535
    Paths pth;
bafca1686867 Drawn maps optimizer - first steps:
unc0rr
parents: 10223
diff changeset
   536
bafca1686867 Drawn maps optimizer - first steps:
unc0rr
parents: 10223
diff changeset
   537
    foreach(const PathParams & pp, paths)
bafca1686867 Drawn maps optimizer - first steps:
unc0rr
parents: 10223
diff changeset
   538
    {
bafca1686867 Drawn maps optimizer - first steps:
unc0rr
parents: 10223
diff changeset
   539
        int l = pp.points.size();
bafca1686867 Drawn maps optimizer - first steps:
unc0rr
parents: 10223
diff changeset
   540
bafca1686867 Drawn maps optimizer - first steps:
unc0rr
parents: 10223
diff changeset
   541
        if(l == 1)
bafca1686867 Drawn maps optimizer - first steps:
unc0rr
parents: 10223
diff changeset
   542
        {
bafca1686867 Drawn maps optimizer - first steps:
unc0rr
parents: 10223
diff changeset
   543
            pth.prepend(pp);
bafca1686867 Drawn maps optimizer - first steps:
unc0rr
parents: 10223
diff changeset
   544
        } else
bafca1686867 Drawn maps optimizer - first steps:
unc0rr
parents: 10223
diff changeset
   545
        {
bafca1686867 Drawn maps optimizer - first steps:
unc0rr
parents: 10223
diff changeset
   546
            for(int i = l - 2; i >= 0; --i)
bafca1686867 Drawn maps optimizer - first steps:
unc0rr
parents: 10223
diff changeset
   547
            {
bafca1686867 Drawn maps optimizer - first steps:
unc0rr
parents: 10223
diff changeset
   548
                PathParams p = pp;
bafca1686867 Drawn maps optimizer - first steps:
unc0rr
parents: 10223
diff changeset
   549
                p.points = QList<QPoint>() << p.points[i] << p.points[i + 1];
bafca1686867 Drawn maps optimizer - first steps:
unc0rr
parents: 10223
diff changeset
   550
                pth.prepend(pp);
bafca1686867 Drawn maps optimizer - first steps:
unc0rr
parents: 10223
diff changeset
   551
            }
bafca1686867 Drawn maps optimizer - first steps:
unc0rr
parents: 10223
diff changeset
   552
        }
bafca1686867 Drawn maps optimizer - first steps:
unc0rr
parents: 10223
diff changeset
   553
    }
bafca1686867 Drawn maps optimizer - first steps:
unc0rr
parents: 10223
diff changeset
   554
bafca1686867 Drawn maps optimizer - first steps:
unc0rr
parents: 10223
diff changeset
   555
    // clear the scene
bafca1686867 Drawn maps optimizer - first steps:
unc0rr
parents: 10223
diff changeset
   556
    oldItems.clear();
bafca1686867 Drawn maps optimizer - first steps:
unc0rr
parents: 10223
diff changeset
   557
    oldPaths.clear();
bafca1686867 Drawn maps optimizer - first steps:
unc0rr
parents: 10223
diff changeset
   558
    clear();
bafca1686867 Drawn maps optimizer - first steps:
unc0rr
parents: 10223
diff changeset
   559
    paths.clear();
bafca1686867 Drawn maps optimizer - first steps:
unc0rr
parents: 10223
diff changeset
   560
    m_specialPoints.clear();
bafca1686867 Drawn maps optimizer - first steps:
unc0rr
parents: 10223
diff changeset
   561
bafca1686867 Drawn maps optimizer - first steps:
unc0rr
parents: 10223
diff changeset
   562
    // render the result
bafca1686867 Drawn maps optimizer - first steps:
unc0rr
parents: 10223
diff changeset
   563
    foreach(const PathParams & p, pth)
bafca1686867 Drawn maps optimizer - first steps:
unc0rr
parents: 10223
diff changeset
   564
    {
bafca1686867 Drawn maps optimizer - first steps:
unc0rr
parents: 10223
diff changeset
   565
        if(p.erasing)
bafca1686867 Drawn maps optimizer - first steps:
unc0rr
parents: 10223
diff changeset
   566
            m_pen.setBrush(m_eraser);
bafca1686867 Drawn maps optimizer - first steps:
unc0rr
parents: 10223
diff changeset
   567
        else
bafca1686867 Drawn maps optimizer - first steps:
unc0rr
parents: 10223
diff changeset
   568
            m_pen.setBrush(m_brush);
bafca1686867 Drawn maps optimizer - first steps:
unc0rr
parents: 10223
diff changeset
   569
bafca1686867 Drawn maps optimizer - first steps:
unc0rr
parents: 10223
diff changeset
   570
        m_pen.setWidth(deserializePenWidth(p.width));
bafca1686867 Drawn maps optimizer - first steps:
unc0rr
parents: 10223
diff changeset
   571
bafca1686867 Drawn maps optimizer - first steps:
unc0rr
parents: 10223
diff changeset
   572
        addPath(pointsToPath(p.points), m_pen);
bafca1686867 Drawn maps optimizer - first steps:
unc0rr
parents: 10223
diff changeset
   573
    }
bafca1686867 Drawn maps optimizer - first steps:
unc0rr
parents: 10223
diff changeset
   574
bafca1686867 Drawn maps optimizer - first steps:
unc0rr
parents: 10223
diff changeset
   575
    emit pathChanged();
bafca1686867 Drawn maps optimizer - first steps:
unc0rr
parents: 10223
diff changeset
   576
}