Commit Graph

185 Commits

Author SHA1 Message Date
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
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 b2ac8e9423 Bug fixed: clear project functionality implemented 2014-01-12 04:15:04 -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 11734f8d5b Actual implementation of createTriangleTextureMapping() 2014-01-11 22:01:52 -05:00
Tats 78a944e82a Check type instead of n vertices to display correct icon 2014-01-11 22:01:23 -05:00
Tats daaceef671 Disable addTriangle/Mesh for when no paint is selected 2014-01-11 22:01:07 -05:00
Tats 8c7f5b16c1 Implement CRUD method createImagePaint in MainWindow and use it 2014-01-11 18:56:28 -05:00
Tats d5c9a7a156 Merge branch 'translation' into statesaving 2014-01-11 16:56:06 -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
Alexandre Quessy e3029309c0 progress in translation 2014-01-08 12:51:40 -05:00
Alexandre Quessy d9c9816ab6 rename organization for preferences saving 2014-01-05 18:37:54 -05:00
Alexandre Quessy cfb7f6422d Merge branch 'statesaving' of github.com:libremapping/libremapping into statesaving 2014-01-05 18:26:08 -05:00
Alexandre Quessy bf59519e4b OscInterface now calls Facade 2014-01-05 18:24:34 -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 123ea0e49d OSC: port concurrentqueue to Qt. Fix duplicate OSC messages 2014-01-05 17:43:33 -05:00
Alexandre Quessy 217081b779 add missing include 2014-01-05 17:36:10 -05:00
Alexandre Quessy 586751cfab some progress in facade 2014-01-05 17:27:24 -05:00
Alexandre Quessy f4bef80559 main window owns the facade. 2014-01-05 17:10:13 -05:00
Alexandre Quessy bae2e74fde add a bit more to facade 2014-01-05 17:03:12 -05:00
Tats 3f99dbdebf Removed dynamic cast type checking in Mapper and used subclasses of TextureMapper instead 2013-12-16 00:50:31 -05:00
Tats f47ee7765b Merge branch 'develop' 2013-12-12 21:39:58 -05:00