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

Replaced Shape by MShape to avoid name conflicts.

Browse Source
This commit is contained in:
Tats
2014-10-31 17:03:18 -04:00
parent 8c3a66344a
commit e8870db92a
16 changed files with 66 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MapperGLCanvas.cpp
View File

@@ -351,12 +351,12 @@ void MapperGLCanvas::enableStickyVertices(bool value)
/* Stick vertex p of Shape orig to another Shape's vertex, if the 2 vertices are
* close enough. The distance per coordinate is currently set in dist_stick
* variable. Perhaps the sticky-sensitivity should be configurable through GUI */
void MapperGLCanvas::glueVertex(Shape *orig, QPointF *p)
void MapperGLCanvas::glueVertex(MShape *orig, QPointF *p)
{
MappingManager manager = getMainWindow()->getMappingManager();
for (int i = 0; i < manager.nMappings(); i++)
{
Shape *shape = getShapeFromMappingId(manager.getMapping(i)->getId());
MShape *shape = getShapeFromMappingId(manager.getMapping(i)->getId());
if (shape && shape != orig)
{
for (int vertex = 0; vertex < shape->nVertices(); vertex++)