eessppeelllloo/mapmap
1
0
Fork 0
mirror of https://github.com/mapmapteam/mapmap.git synced 2026-04-13 02:59:12 +02:00
Code Issues Packages Projects Releases Wiki Activity
517 Commits 60 Branches 10 Tags
4e8a2c19f1e1bd355cfc5fa564b0676a928d6832
Commit Graph

80 Commits

Author SHA1 Message Date
Tats
ac29ca5c1f Merged latest changes from develop 2014-10-15 13:42:32 +00:00
Tats
55e909dc69 Introduced a property panel for paints and managed the case of color (disabling double-click feature in the process) 2014-10-14 22:36:54 +00:00
Tats
5640e5b471 Put some long method definitions in the .cpp 2014-10-14 22:36:03 +00:00
Alexandre Quessy
1b73d45a89 New feature: menu option toggle sticky vertices 2014-10-14 01:48:00 -04:00
Tats
0306a300f0 Reorganized elements in window 2014-10-13 23:05:33 -04:00
Tats
df3e12db04 Removed old remainder of singleton code 2014-06-26 01:26:59 -04:00
Tats
e8f7f44493 Moved MAPMAP_VERSION and MAPMAP_EXTENSION as part of static class MM 2014-06-26 00:56:24 -04:00
Tats
bbc0eeb6ae Added option to import image files using QImage 2014-06-26 00:08:46 -04:00
Tats
00a437864d Integration of toolbars in a single mainToolBar, with runToolBar at the top-right end 2014-06-24 00:39:38 -04:00
Tats
7c37c0ede9 Added new toolbars and their appropriate placement 2014-06-23 21:48:05 -04:00
Tats
96ae61cea8 Play disables pause and vice-versa 2014-06-23 17:09:29 -04:00
Tats
cb0deae5f1 Base implementation of play/pause/rewind (working, still adjustments to do in the GUI) 2014-06-23 16:54:44 -04:00
Vasilis Liaskovitis
1aace8a578 Change the uri of existing media or color paint with double-click 
When double-clicking a paint QListWidgetItem, the uri of that paint can be
altered.

A new signal is sent to ColorMapper and TextureMapper objects so that they can
update heir color and texture paints respectively. Mappings of the old paint are
transferred to the new paint.

TODO: the active mapping may be lost in some cases, needs some more testing.
 2014-05-22 11:30:25 +02:00
Tats
f1e4c3465e Included MM.h in MainWindow.h 2014-05-02 14:12:45 -04:00
Alexandre Quessy
bf05ca0cd9 post-release version bump 2014-04-30 23:52:53 -04:00
Alexandre Quessy
5ce262be15 Merge branch 'develop' into release-0.1.0 2014-04-30 22:48:06 -04:00
Tats
786fca080a Added splash screen to the app 2014-04-30 20:06:35 -04:00
Alexandre Quessy
73308ab117 Prepare 0.1.0: update version number 2014-04-30 14:14:22 -04:00
Tats
df73b0b631 Fixed problem with full screen in Linux 2014-04-29 16:45:03 -04:00
Alexandre Quessy
348ffcb37e Implement OSC callback to set video URI 2014-04-26 19:20:21 +01:00
Tats
d276c6a126 Changed extension for mapmap 2014-04-26 12:37:51 +01:00
Tats
430b0f223a Refactor Video -> Media 2014-04-26 12:22:33 +01:00
Tats
26e709c5c6 Replaced updateAll() by updateCanvases() 2014-04-26 12:08:00 +01:00
Alexandre Quessy
e91496b96a Merge branch 'spike-video-drone' into gst-osx 2014-04-25 20:52:49 -04:00
Tats
6e58f94a48 Simple "hack" with a QTimer to time the video 2014-04-26 01:01:44 +01:00
Tats
4d3694fe28 Added an option to toggle the display of shape control points 2014-04-10 18:27:40 -04:00
Tats
419834b0ee Removed MainWindow singleton, replacing it with much more appropriate member pointers in custom widgets 2014-04-10 17:39:37 -04:00
Alexandre Quessy
f7bfeb415d Use major.minor.micro for version number. 2014-03-21 22:34:20 -04:00
Tats
ff1d98e1a8 Created a method addPaintId similar to the addMappingId to reuse some code. 2014-03-18 23:26:17 -04:00
Tats
7425d65832 Methods removeCurrent*() reset uids to NULL_UID. 2014-03-18 23:02:10 -04:00
Tats
540ae8a983 Allow the seamless removal of both paint and mappings. 2014-03-16 19:31:20 -04:00
Tats
7c52f13f16 Major cleanup in MainWindow 2014-03-16 15:47:14 -04:00
Tats
338a32af60 Cleanup of comments 2014-03-16 01:12:43 -04:00
Tats
20c603b995 Implement working mapping removal 2014-03-16 01:12:32 -04:00
Tats
3910302f80 Replaced STL vectors and maps by Qt-style 2014-03-16 01:11:38 -04:00
Tats
392869f56f Manage appropriate layout and resizing of output GL canvas 2014-03-15 23:37:54 -04:00
Tats
81e519d366 Added an output GL window that reproduces the destination (refresh still not working). 
Window can be toggled on/off.
 2014-03-15 23:01:37 -04:00
Tats
07c6293dc7 Load and save of ellipses. 2014-03-02 22:29:10 -05:00
Tats
0b027f29f3 Implemented basic support for texture ellipse (works, default center point, no drawing of control points). 2014-03-02 17:02:52 -05:00
Tats
1dbb174d86 Merge branch 'develop' into ellipseshape 
Conflicts:
	Shape.h
 2014-02-09 01:20:54 -05:00
Tats
e36cb1a991 Replace std::vector and std::map by QVector and QMap (not everywhere yet). 2014-02-09 01:02:54 -05:00
Tats
ac555b7b10 Added basic support for color ellipses 2014-02-08 23:44:56 -05:00
Tats
34156f4129 Fixed problem: clearProject() was throwing a bad_alloc() 2014-01-23 23:24:49 -05:00
Tats
e91fe5d862 Statesaving of color paints / mappings 2014-01-23 22:01:21 -05:00
Tats
9a9ba71eff Integrated color paint / mapping to the main window 2014-01-22 15:01:28 -05:00
Tats
bd6fff9979 Stub for clearProject() 2014-01-11 23:03:13 -05:00
Tats
9219cee81c Add save/load of meshes 2014-01-11 23:02:52 -05:00
Tats
2fb214060b Reading and writing of triangle mappings 2014-01-11 21:56:18 -05:00
Tats
8c7f5b16c1 Implement CRUD method createImagePaint in MainWindow and use it 2014-01-11 18:56:28 -05:00
Tats
da0048b4ac Changed sourceList to paintList 2014-01-11 16:38:07 -05:00