57 Commits

Author SHA1 Message Date
Tats 07e1b26436 Allows individual selection of a vertex to be shown on screen. 2014-10-23 13:40:01 +00:00
Tats 7fe2a1f1a7 Bugfix #30 : Reimplemented MediaImpl removing the defective queue system and implementing a thread-safe system. Removed the memory leaks previously shown by valgrind. 2014-10-20 17:00:22 +00:00
Tats abb62dc1f2 Integrated file choosing pop-up for images and media in property browser. 2014-10-16 20:56:02 +00:00
Tats 4a4b1f05b2 Cosmetic refactoring and variable inits 2014-06-23 18:30:49 -04:00
Tats aa39752b98 Some cleanup / reorganization of code 2014-06-10 22:27:12 -04:00
Tats 66dc735861 Added _preDraw() and _postDraw() methods to avoid repetition of code in TextureMapper 2014-06-10 22:26:41 -04:00
Tats 20c0ca4cd1 Remove unused glPopMatrix() (had no corresponding glPushMatrix()). 2014-06-10 22:24:05 -04:00
Vasilis Liaskovitis 1aace8a578 Change the uri of existing media or color paint with double-click
When double-clicking a paint QListWidgetItem, the uri of that paint can be
altered.

A new signal is sent to ColorMapper and TextureMapper objects so that they can
update heir color and texture paints respectively. Mappings of the old paint are
transferred to the new paint.

TODO: the active mapping may be lost in some cases, needs some more testing.
2014-05-22 11:30:25 +02:00
Alexandre Quessy 7177d62f90 remove useless endl in prints 2014-05-08 16:06:31 -04:00
Tats ca78874387 Cosmetic changes 2014-05-03 13:17:00 -04:00
Tats 2285716ed2 Fix bug and potential bugs with painters not being reset between draws. 2014-05-03 13:10:46 -04:00
Tats f5d375442a Improved the style of the control rendering. 2014-05-03 00:26:02 -04:00
Tats dab1928a90 Small potential error fix 2014-04-30 20:06:51 -04:00
Tats 05c1bf3a5c Major cleanup / redesign in the source canvas to make the Mapper class draw the inputs (more generic) 2014-04-30 13:21:57 -04:00
Tats ca9ba38682 Performance improvement: copy texture bits to video card only if they have changed 2014-04-26 13:32:27 +01:00
Tats 0295d50779 Removed unused.h 2014-04-26 12:38:11 +01:00
Alexandre Quessy e91496b96a Merge branch 'spike-video-drone' into gst-osx 2014-04-25 20:52:49 -04: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 4e4483c56c Replaced UNUSED(x) by Q_UNUSED(x). 2014-04-10 01:07:24 -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
Alexandre Quessy 8652e9555e get rid of warnings 2014-03-14 11:47:58 -04:00
Alexandre Quessy dfed5c10be get rid of warnings 2014-03-05 23:13:13 -05:00
Tats bdfa20ecda Implemented method drawControls() for EllipseColorMapper. 2014-03-02 21:13:39 -05:00
Tats 880b23cb8a Add control center. 2014-03-02 17:54:18 -05:00
Tats b6bab4357f Inversion of rotation small change in _setPointOfEllipseAtAngle() method. 2014-03-02 17:36:27 -05:00
Tats 4bbe4df115 Added methods to directly access the horizontal / vertical radius of an ellipse. 2014-03-02 17:35:54 -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 72be4f2599 Created a setGlTexPoint() to facilitate projection of textures on vertex. 2014-03-02 17:01:55 -05:00
Tats b0f9a8ca5b Draws ellipse control points in a better, uniform way. 2014-02-09 02:39:51 -05:00
Tats 02fe8650c5 Fixed small error in the way color ellipses were drawn (wrong coordinates). 2014-02-09 01:36:23 -05:00
Tats 9938793ddd Adapted ellipse code to latest changes (Point -> QPointF). 2014-02-09 01:21:22 -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 195c426991 Removed the Point class and replace all instances by QPointF. 2014-02-09 01:02:13 -05:00
Tats ac555b7b10 Added basic support for color ellipses 2014-02-08 23:44:56 -05:00
Tats 18f6160507 Mapper frees memory of its property browser 2014-01-23 23:23:57 -05:00
Tats 0ff52de66a Major reconfiguration of the GL canvases and the Mapper interface to allow for the use of a QPainter and for integrating ColorPaint mappings 2014-01-22 15:01:00 -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
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
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 7d9d899a37 Fixed small casting error 2013-12-12 21:37:18 -05:00
Tats 88bc2dd745 Mesh properties allows one to add columns and rows 2013-12-11 00:10:04 -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 dce8f0b35d Saves an XML file. 2013-12-09 15:20:33 -05:00
Tats 0e1658c9c3 Replace property browser by tree browser in TextureMapper 2013-12-08 14:55:58 -05:00
Tats e206ce6108 Code refactoring to add output shape to property editor 2013-12-08 14:45:41 -05:00