eessppeelllloo/mapmap
1
0
Fork 0
mirror of https://github.com/mapmapteam/mapmap.git synced 2026-06-16 12:33:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into ellipseshape

Browse Source 
Conflicts:
	Shape.h
This commit is contained in:
Tats
2014-02-09 01:20:54 -05:00
parent 61c20158d0 89a5ce8787
commit 1dbb174d86
11 changed files with 192 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MainWindow.cpp
+4 -4
View File
@@ -445,7 +445,7 @@ uid MainWindow::createColorPaint(uid paintId, QColor color)
uid MainWindow::createMeshTextureMapping(uid mappingId,
uid paintId,
int nColumns, int nRows,
const QList<QPointF> &src, const QList<QPointF> &dst)
const QVector<QPointF> &src, const QVector<QPointF> &dst)
{
// Cannot create element with already existing id or element for which no paint exists.
if (Mapping::getUidAllocator().exists(mappingId) ||
@@ -477,7 +477,7 @@ uid MainWindow::createMeshTextureMapping(uid mappingId,
uid MainWindow::createTriangleTextureMapping(uid mappingId,
uid paintId,
const QList<QPointF> &src, const QList<QPointF> &dst)
const QVector<QPointF> &src, const QVector<QPointF> &dst)
{
// Cannot create element with already existing id or element for which no paint exists.
if (Mapping::getUidAllocator().exists(mappingId) ||
@@ -507,7 +507,7 @@ uid MainWindow::createTriangleTextureMapping(uid mappingId,
uid MainWindow::createQuadColorMapping(uid mappingId,
uid paintId,
const QList<QPointF> &dst)
const QVector<QPointF> &dst)
{
// Cannot create element with already existing id or element for which no paint exists.
if (Mapping::getUidAllocator().exists(mappingId) ||
@@ -536,7 +536,7 @@ uid MainWindow::createQuadColorMapping(uid mappingId,
uid MainWindow::createTriangleColorMapping(uid mappingId,
uid paintId,
const QList<QPointF> &dst)
const QVector<QPointF> &dst)
{
// Cannot create element with already existing id or element for which no paint exists.
if (Mapping::getUidAllocator().exists(mappingId) ||