Commit Graph

765 Commits

Author SHA1 Message Date
Tats f3c199b3ce Resolved conflict 2015-09-17 09:12:43 -04:00
Tats a236cf1a22 Fixed bug: Adding and reducing rows/columns in meshes disordered the internal representation resulting in weird behavior when moving vertices. 2015-07-30 19:32:41 -04:00
Tats 9b6f49e9cc Fixed bug #128: Crash on changing mesh dimension. 2015-07-30 19:31:31 -04:00
Tats 68e506895c Fixed error-prone code in MShape::update(). 2015-07-20 00:14:10 -06:00
Tats 4d71dc575e Integrated support for shape translation in undo commands. 2015-07-19 22:08:59 -06:00
Tats 24575c1e55 Imlpemented common superclass for transformations of shapes undo commands. 2015-07-19 22:07:32 -06:00
Tats 5e45437d83 New feature: undo stack available in the interface. 2015-07-18 14:12:36 -06:00
Tats 974cb3f255 Compute key vertex moves in window (not scene) coordinates. 2015-07-18 13:26:56 -06:00
Tats ffe6ff76b8 Bug fix: update of control point positions in property browser goes both ways. 2015-07-18 13:12:56 -06:00
Tats 6e7fed17eb Merge branch 'develop' of github.com:mapmapteam/mapmap into develop 2015-07-18 12:55:53 -06:00
Tats 5ce318fab3 Added text to undo/redo commands. 2015-07-18 12:55:41 -06:00
Tats f9a98f0f09 Allow undo/redo of vertex move. 2015-07-18 12:55:28 -06:00
Tats c4fefb2015 Used shared pointers in MapperGLCanvas base accessor functions. 2015-07-18 12:54:39 -06:00
Tats e5d4463c32 Reintegrated highlighting of selected vertex. 2015-07-17 16:28:27 -06:00
Tats 425f544f66 Reintegrated vertex key movement in MapperGLCanvas. 2015-07-17 16:06:32 -06:00
Tats c910520530 Renamed some elements in MapperGLCanvas to be more eloquent. 2015-07-17 16:06:14 -06:00
Alexandre Quessy 623afc3b7e Merge branch 'release-0.3.0' into develop 2015-07-17 17:57:37 -04:00
Alexandre Quessy b548341a7f post-release version bump 2015-07-17 17:27:19 -04:00
Alexandre Quessy 351c10579e prepare 0.3.0 2015-07-17 17:20:08 -04:00
Tats 52b6d58451 Removed the unused quitMapmap() function. 2015-07-17 14:36:46 -06:00
Tats 46d7523160 Bug fix: upon quitting the output window prevented the app to actually quit. 2015-07-17 14:36:33 -06:00
Tats 460e346ddd Removed unused updatePaint signal/slots. 2015-07-17 14:26:24 -06:00
Tats c652730fd5 Integrated shared pointers in Mapper for holding property browser and graphics items. 2015-07-17 14:24:50 -06:00
Tats 7e5912b150 Replaced shared pointers by weak pointers in appropriate spots. Seems to have fixed the problem where memory was not freed because of cycling refs. 2015-07-17 13:59:25 -06:00
Tats aef4f2d8d8 Changed tr1 shared_ptr for QSharedPointers and QWeakPointers. 2015-07-17 13:41:55 -06:00
Tats fce0715c5a Cleared potential error in MediaImpl: resources were freed before setting play state to false. 2015-07-17 13:38:23 -06:00
Tats 7862010142 Allow remove of columns in rows in meshes. 2015-07-15 12:54:44 -06:00
Tats e2e3c4a415 Use trick to allow middle-button dragging of the canvas 2015-07-15 12:53:02 -06:00
Tats 9a6c38fa4b Added new render hints for aliasing 2015-07-15 12:52:37 -06:00
Tats b28c1475b0 Removed mouse-management events completely from ShapeGraphicsItem 2015-07-15 12:52:17 -06:00
Tats a970bbc660 - Manage properly the picking up of vertices and shapes
- Fix bug: in source canvas we could change mappings by clicking on shape
2015-07-15 12:50:24 -06:00
Tats 775cf739c6 - Moved the control of shapes outside of the scene items
- Introduced a specialized range of classes to deal with the drawing of controls
2015-07-14 13:24:36 -06:00
Tats d4facecb90 Disable scrollbars in output window. 2015-07-13 17:07:14 -06:00
Tats 3303e07056 Added support for scrolling in source+destination canvases by mid-button clicking. 2015-07-13 16:45:03 -06:00
Tats 8f13597451 Created a special class for output gl canvas to prevent some events (like zooming) to happen. 2015-07-13 16:44:41 -06:00
Tats 1074516b21 Bug fix: weird bleeds when selected zone out of texture due to deprecated use of GL_CLAMP. 2015-07-13 13:36:52 -06:00
Tats da02407485 Bugfix: control vertices not showing up in source canvas. 2015-07-13 13:36:20 -06:00
Tats bd1d14d38a Increased range of zoom levels. 2015-07-13 13:26:16 -06:00
Tats acca6059f6 Implemented invariant control points and lines wrt zoom level. 2015-07-13 13:25:18 -06:00
Tats 461c4562ff Merge branch 'develop' of github.com:mapmapteam/mapmap into develop
Conflicts:
	Mapper.cpp
2015-07-11 20:25:12 -06:00
Tats 344f375c53 Fixed perspective-correct textures (not optimized). 2015-07-11 20:24:06 -06:00
Tats 6db5aca879 Fixed perspective-correct textures (not optimized). 2015-07-11 20:12:29 -06:00
Tats c15f1025b9 Collapse input and output shape in property browser. 2015-07-11 18:14:31 -06:00
Tats 549c30fcd9 Re-enabled toggle of sticky vertices. 2015-07-11 16:30:30 -06:00
Tats 64bbd94f9a Re-enable toggle of display controls. 2015-07-11 16:29:06 -06:00
Tats 978b4ae7ae Added paint opacity. 2015-07-11 12:52:07 -06:00
Tats 0dd88cb68c Added mapping-level opacity setting. 2015-07-11 11:54:15 -06:00
Tats cf95cab6eb Reorganized painting process in Mapper to provide common pre-painting to ellipse and polygon color mappers. 2015-07-11 11:53:23 -06:00
Tats 2ab3b137d9 Integrate sticky vertices in new QGraphicsItem framework. 2015-07-06 21:58:48 -06:00
Tats 57fe2607a9 Renamed shapeChanged(Shape*) for shapeChanged(MShape*). 2015-07-06 21:26:20 -06:00