113 Commits

Author	SHA1	Message	Date
Tats	c6d9ca123c	Enable fullscreen action only if outputwindow is being displayed	2014-04-29 16:45:42 -04:00
Tats	df73b0b631	Fixed problem with full screen in Linux	2014-04-29 16:45:03 -04:00
Tats	4b681a3b28	Merge branch 'fullscreen' into develop	2014-04-28 19:24:02 -04:00
Tats	ff3fdf3aa6	Merge branch 'develop' of 10.10.10.103:git/mapmap into develop	2014-04-27 00:21:16 +01:00
Tats	2a08f32cc3	Stop and start video timer in dialogs to avoid freezing	2014-04-27 00:09:09 +01:00
Alexandre Quessy	26873722c9	towards a fullscreen output window	2014-04-26 20:06:29 +01: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
Tats	e2b7f9b982	Compilation fixes	2014-04-26 11:27:59 +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	ada827de41	Replaced images by videos + implemented hack on update() / runVideo() to quickly test gstreamer (works!)	2014-04-26 00:07:25 +01:00
Tats	ed3f476d6b	Brutal port of Drone code to try to make video work using gstreamer 0.10 using appsink	2014-04-25 23:38:46 +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	ad7bc89f28	thank you La Francophonie	2014-04-09 19:29:46 -04:00
Alexandre Quessy	74efb0dada	fix crash on Mac OS X	2014-04-04 00:29:41 -04:00
Tats	edc5f90a79	Merge branch 'master' of github.com:mapmapteam/mapmap	2014-03-22 02:03:25 -04:00
Alexandre Quessy	f7bfeb415d	Use major.minor.micro for version number.	2014-03-21 22:34:20 -04:00
Tats	441664e6f0	Added a Polygon shape and corresponding mappers (just used as a superclass of Quad and Triangle for now).	2014-03-19 22:34:34 -04:00
Tats	7602a77166	Allow reordering of sources in list	2014-03-19 15:01:18 -04:00
Tats	aa0dce3831	Cosmetic change.	2014-03-18 23:27:06 -04:00
Tats	08da5d4fa6	Properly manage the windowModified() calls to let the software know something has changed.	2014-03-18 23:26:58 -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	9c85eb17fc	Bug fix: once all mappings were destroyed, current ids were not reset (removed).	2014-03-18 23:03:08 -04:00
Tats	2da3f4a5a1	Added dialog when deleting paint.	2014-03-18 23:00:24 -04:00
Tats	63f59b4486	Enable/disable creation of mappings depending on whether a paint is selected.	2014-03-16 19:36:36 -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	712ec8cfbc	Added some shortcuts to add shapes	2014-03-16 12:36:35 -04:00
Tats	164023f1e9	Use CTRL-DEL instead of just DEL for deleting stuff	2014-03-16 12:34:03 -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	f0ca7124db	Small comment	2014-03-16 00:04:29 -04:00
Tats	dc202e1461	Reset focus on main window	2014-03-16 00:04:22 -04:00
Tats	3a2033a4e1	Save and restore geometry of output window	2014-03-16 00:03:19 -04:00
Tats	b313edc553	Manage close event (unchecks the menu item in main window)	2014-03-15 23:55:29 -04:00
Tats	14f35c640c	Synchronization of GL in destination and ouptut window	2014-03-15 23:37:36 -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
Alexandre Quessy	d11bc93496	re-implement and fix osc receiver	2014-03-14 11:51:52 -04:00
Alexandre Quessy	8224a64374	re-implement and fix osc receiver	2014-03-13 16:01:03 -04:00
Alexandre Quessy	93b55cb61a	Print GStreamer version	2014-03-05 23:43:39 -05:00
Alexandre Quessy	0cf4a5086c	Rename project to MapMap	2014-03-04 11:35:12 -05: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	61c20158d0	Cosmetic changes (variable and interface names).	2014-02-08 23:46:50 -05:00