Commit Graph

177 Commits

Author SHA1 Message Date
Alexandre Quessy 69c1ebc648 add language tool thing to build.sh 2014-01-05 18:55:28 -05:00
Alexandre Quessy 72ae5da080 Merge branch 'statesaving' into translation 2014-01-05 18:54:53 -05:00
Tats 27089582d5 Proof of concept: runs in french 2014-01-05 18:50:32 -05:00
Alexandre Quessy 81b7e769b3 git ignore more files 2014-01-05 18:40:00 -05:00
Alexandre Quessy cc57c3b9b0 more bugs to fix 2014-01-05 18:38:17 -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
Alexandre Quessy ed09b8cc7c update Facade.h with things to do 2014-01-05 16:45:07 -05:00
Alexandre Quessy a8389680e3 start to implement Facade.cpp 2014-01-05 16:30:25 -05:00
Alexandre Quessy 613d385932 Add Facade.h 2014-01-05 16:28:03 -05:00
Alexandre Quessy 7f99061cf0 minor edits 2014-01-05 15:48:53 -05:00
Alexandre Quessy 73df26092b Update .gitignore 2014-01-05 15:29:07 -05:00
Alexandre Quessy 6d0710db8c Merge branch 'statesaving' of github.com:libremapping/libremapping into statesaving 2014-01-05 15:27:26 -05:00
Vasilis Liaskovitis 5852cde869 Shape: Convert Point to QObject / QPointF
Also add one Q_PROPERTY for each coordinate (x and y) of a Point. This will
enable the controller to set and get these properties.

Since QObjects cannot be copied, we also need to change the Shape class to have
a vector of pointers to Points, instead of actual Point structs.
2013-12-24 13:50:20 +02:00
Vasilis Liaskovitis 92f5d171db Controller: initial commit
This adds a QVariant/QMetaObject based controller for object and properties
manipulation. Object types and objects are stored in std::map structures for
now. The API is based on the prototype controller. The get/set properties only
handle a single QVariant argument instead of a QVariantList argument as in the
prototype but this can be changed.
2013-12-23 02:20:49 +02:00
Tats 9962c56ba7 Removed remaining dynamic cast type checking in *GLCanvas (for drawing shape contours) 2013-12-16 01:37:54 -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 6b864b64ed Removed some debugging code 2013-12-15 23:12:44 -05:00
Tats f47ee7765b Merge branch 'develop' 2013-12-12 21:39:58 -05:00
Tats b535ca00a2 Merge branch 'master' of github.com:libremapping/libremapping 2013-12-12 21:39:14 -05:00
Tats 245a74c5c9 Transferred implementations of Shape methods to .cpp file 2013-12-12 21:38:13 -05:00
Tats 7d9d899a37 Fixed small casting error 2013-12-12 21:37:18 -05:00
Alexandre Quessy 0577bec754 fix doc 2013-12-11 08:46:24 -05:00
Tats 88bc2dd745 Mesh properties allows one to add columns and rows 2013-12-11 00:10:04 -05:00
Tats 6595d9911a Replaced Quads by Meshes 2013-12-10 22:37:45 -05:00
Tats f66f67c654 Better managing of vertex selection 2013-12-10 22:27:39 -05:00
Tats b808c982f8 Implemented support for meshes: allows for adding columns and rows to meshes 2013-12-10 22:27:06 -05:00
Tats 2afee94e0e Minor fix: wrong cast types 2013-12-10 22:26:04 -05:00
Alexandre Quessy 3842c1b013 add controller.h prototype 2013-12-10 14:38:26 -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
Alexandre Quessy 55b6cc2385 XML parsing: progress reading elements 2013-12-09 23:30:26 -05:00
Alexandre Quessy 8c2b7fddd6 Load: 50% done. Fix shortcuts. 2013-12-09 17:33:35 -05:00
Alexandre Quessy 597df8ad2b add the mappings and paints tags 2013-12-09 16:13:31 -05:00
Alexandre Quessy 3d9a7874c5 move example images to examples/ 2013-12-09 16:08:46 -05:00
Alexandre Quessy b0763be6a0 paint have ids 2013-12-09 16:06:01 -05:00
Alexandre Quessy dce8f0b35d Saves an XML file. 2013-12-09 15:20:33 -05:00
Alexandre Quessy 7bd6768918 add a prototype of properties 2013-12-09 13:59:19 -05:00
Tats 14278e1d1f Fix save + load of splitter states 2013-12-08 14:57:39 -05:00
Tats 0e1658c9c3 Replace property browser by tree browser in TextureMapper 2013-12-08 14:55:58 -05:00
Tats 176a1831ae Adjust bottom splitter elements min. widths 2013-12-08 14:55:39 -05:00
Tats a03ad557ec Small changes to UML (cosmetic) 2013-12-08 14:46:05 -05:00