Commit Graph

16 Commits

Author SHA1 Message Date
Tats c87a397844 Added a Color paint 2014-01-22 13:28:42 -05:00
Tats 2fb214060b Reading and writing of triangle mappings 2014-01-11 21:56:18 -05:00
Tats dbab46565c Use UID allocators for Paint and Mapping 2014-01-11 18:55:26 -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 b0763be6a0 paint have ids 2013-12-09 16:06:01 -05:00
Tats 6b8912d03f Merge branch 'master' into develop 2013-12-06 23:43:09 -05:00
Tats ef05550a53 Fixed to make it work under OSX 2013-12-06 23:42:45 -05:00
Tats 80f2d92eab Added unique ids to Mapping and Paint 2013-12-05 00:16:37 -05:00
Tats fd958cecf2 Merge branch 'master' of github.com:libremapping/libremapping
Conflicts:
	Common.cpp
	Common.h
	DestinationGLCanvas.cpp
	SourceGLCanvas.cpp
	main.cpp
2013-11-29 12:09:49 -05:00
Alexandre Quessy 0e73f157f8 Document with Doxygen 2013-11-27 01:33:04 -05:00
Alexandre Quessy 944ede8587 Add typedefs for std::tr1::shared_ptr<*> 2013-11-26 22:25:11 -05:00
Tats 89f8ba130b Automatically added pre-loaded source images to list view 2013-11-25 23:43:59 -05:00
Tats 0ff60f6108 - Added an empty QListView in the layout, with two splitters
- Also created a class for the main window
2013-11-25 23:16:32 -05:00
Tats 4310f297d1 Done: reproduced the wxwidgets prototype in Qt 2013-11-23 23:16:04 -05:00
Tats 5c1ec14662 Basic switch from wxWidget to Qt (not working yet) 2013-11-23 17:37:59 -05:00
Tats 32924471e0 Copy wx-02-input-output to root 2013-11-15 16:12:22 +01:00