Commit Graph

67 Commits

Author SHA1 Message Date
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
Tats c29f42c20f Removed the Layers (moved all layer stuff to Mappings) 2014-01-11 16:36:59 -05:00
Tats 0a45fdfdc3 Merge branch 'statesaving' of github.com:libremapping/libremapping into statesaving
Conflicts:
	MainWindow.cpp
	Shape.h
2014-01-05 18:14:08 -05:00
Tats 4639a228c6 Resolved all compilation errors from merging 2014-01-05 18:07:19 -05:00
Tats 559a7ebf90 Merge branch 'develop' into statesaving
Conflicts:
	DestinationGLCanvas.cpp
	MainWindow.cpp
	MainWindow.h
	Mapper.h
	MappingManager.cpp
	MappingManager.h
	Paint.h
	Shape.h
	SourceGLCanvas.cpp
	Util.cpp
	libremapping.pro
	main.cpp
2014-01-05 18:06:41 -05:00
Alexandre Quessy f4bef80559 main window owns the facade. 2014-01-05 17:10:13 -05:00
Tats 6595d9911a Replaced Quads by Meshes 2013-12-10 22:37:45 -05:00
Alexandre Quessy 31de8211cd Add optional OSC support
Add OSC receiver

add BUGS

fix README

OSC: use QVariantList to send messages to the main window

show text under icons in toolbar

remove deprecated class

detect liblo and make it optional
2013-12-10 04:55:22 -05:00
Tats 176a1831ae Adjust bottom splitter elements min. widths 2013-12-08 14:55:39 -05:00
Tats 8502ef3b37 Added basic properties widget for current selected mapper (bidirectional update of input shape vertices, though wrongly initialized) 2013-12-08 11:58:05 -05:00
Tats 26866dc9ab Add map of mappers (forgot to include it in earlier commit) 2013-12-08 11:56:02 -05:00
Tats 8caab2875b Added method MainWindow::updateAll() to update the canvases 2013-12-08 11:54:39 -05:00
Tats 3517b7a71d Generalized the use of Mapper from within DestinationGLCanvas 2013-12-08 11:53:49 -05:00
Tats 2960144393 Fixed seg fault on exit due to MainWindow singleton 2013-12-07 17:41:19 -05:00