Commit Graph

476 Commits

Author SHA1 Message Date
Tats 2ede19425b Fixed bug in ellipse creation: two last points of input ellipse were wrong 2014-06-26 00:27:15 -04:00
Tats 45535c80a1 Cleanup debug message 2014-06-26 00:13:42 -04:00
Tats 054a6d2b37 Save and load image paints 2014-06-26 00:13:12 -04:00
Tats 376c7e4983 Fixed major bug: all media shared the same opengl texture (!) 2014-06-26 00:09:11 -04:00
Tats bbc0eeb6ae Added option to import image files using QImage 2014-06-26 00:08:46 -04:00
Tats 2cbab1bf2d Some cleanup in MapperGLCanvas 2014-06-25 23:00:39 -04:00
Tats bcdfed3aca Start timer after creating everything 2014-06-25 23:00:24 -04:00
Tats c0683b9d98 More minimalist icon for control points 2014-06-25 21:31:41 -04:00
Tats 8d8d29e045 Roll paint image for color adding 2014-06-25 21:29:25 -04:00
Tats ab2df9a00f Make icons invisible in menus (not working on Ubuntu Unity but maybe somewhere else) 2014-06-25 21:28:42 -04:00
Tats fd54928169 Renamed some images + added a new one 2014-06-25 16:40:23 -04:00
Tats 19de5e2355 Update icon base 2014-06-25 14:22:04 -04:00
Tats a6868a2713 Added custom style (round edges, gradients) 2014-06-24 00:43:40 -04:00
Tats 1e1b7ae221 Integrated new set of icons 2014-06-24 00:43:00 -04:00
Tats 00a437864d Integration of toolbars in a single mainToolBar, with runToolBar at the top-right end 2014-06-24 00:39:38 -04:00
Tats f5c05a2e15 Play button replaces pause, pause replaces play 2014-06-24 00:38:02 -04:00
Tats ad96d87cf0 Removed useless waiting for splash screen 2014-06-23 21:50:18 -04:00
Tats d9d42eb556 Deleted unused image 2014-06-23 21:48:32 -04:00
Tats 7c37c0ede9 Added new toolbars and their appropriate placement 2014-06-23 21:48:05 -04:00
Tats da07d1003d Minor adjustments to style sheet 2014-06-23 21:47:41 -04:00
Tats 7fc4f711c5 Integration of new icons 2014-06-23 21:47:29 -04:00
Tats 670a686c37 Merge branch 'mike-style-integration' into develop 2014-06-23 18:37:07 -04:00
Tats 4a4b1f05b2 Cosmetic refactoring and variable inits 2014-06-23 18:30:49 -04:00
Tats 0748eda051 Added output window actions to toolbar + dummy buttons 2014-06-23 17:26:20 -04:00
Tats 96ae61cea8 Play disables pause and vice-versa 2014-06-23 17:09:29 -04:00
Tats cb0deae5f1 Base implementation of play/pause/rewind (working, still adjustments to do in the GUI) 2014-06-23 16:54:44 -04:00
Tats b02dc5e622 Bug fix: in Qt5 the layoutChanged() did not work anymore for the layer reordering 2014-06-23 16:20:52 -04:00
Alexandre Quessy 64889af9a9 Fixed OSX-related runtime errors that were making the application crash 2014-06-23 14:53:29 -04:00
Tats a596f319fe Added some documentation comments 2014-06-23 10:29:45 -04:00
Tats fae18b4606 Save display output window state in settings to preserve preference / last saved state of the user 2014-06-11 14:42:34 -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 011790372b Comments added 2014-06-10 22:24:54 -04:00
Tats 20c0ca4cd1 Remove unused glPopMatrix() (had no corresponding glPushMatrix()). 2014-06-10 22:24:05 -04:00
Tats fe91045741 Removed unused file Defs.h 2014-06-10 16:55:16 -04:00
Tats 9dedaea443 Small potential problem fix in OscReceiver.cpp (potential mem issue detected using valgrind). 2014-06-08 22:55:54 -04:00
Tats aa2b0847a7 Correct listing of gstreamer1.0 packages to install under Ubuntu 2014-06-08 22:54:58 -04:00
Alexandre Quessy acba98a9cf Merge branch 'develop' of github.com:mapmapteam/mapmap into develop 2014-05-28 15:38:23 -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 33f0625005 update build.sh to use macdeployqt 2014-05-21 16:06:57 -04:00
Alexandre Quessy 0d51f784e4 update packaging for OS X 2014-05-21 14:34:06 -04:00
Alexandre Quessy 1da6d0479a Add arabic translation file 2014-05-15 19:16:31 -04:00
Vasilis Liaskovitis 78d8f88e52 MediaImpl: Do buffer pull in "new-sample" gstreamer callback
Doing the buffer pull in the gstreamer "new-buffer" callback decreases the work
needed to be done by the videoPull() thread. This seems to give lower average
timestamps between successive draw/updatecanvas() calls, so perhaps better
framerates can be achieved.

In order to decouple videoPull from pulling the buffer, an async queue is
introduced between the gstreamer "new-sample" callback and the qt videoPull
function. On the release path, gst_sample_unref is decoupled from the qt side by
putting the already used frame in an output async queue. The bffers in the queue
are unreferenced in the gst "new-sample" callback.
2014-05-10 16:26:37 +02:00
Vasilis Liaskovitis e3da235a82 add AsyncQueue (needed for VIdeoImpl)
taken from gst-plugins-gl/tests/examples/qt/qglwtextureshare
2014-05-10 16:12:03 +02:00
Vasilis Liaskovitis 4c80d2c543 MediaImpl: ALways do memcpy, no conversion needed
Because of the RGBA caps, bpp will always be 32
2014-05-10 16:11:59 +02:00
Alexandre Quessy dc25c2a874 Merge branch 'gst-1.0' into develop 2014-05-09 20:24:35 -04:00
Alexandre Quessy 4776dd2717 fix 2014-05-09 20:20:43 -04:00
Vasilis Liaskovitis 7177796844 MediaImpl: always set bitsChanged to true to avoid texture "flickering" 2014-05-09 14:57:30 -04:00
Vasilis Liaskovitis f914b84be6 MediaImpl: remove gst_sample_ref to avoid leak
The gst_sample pulled from the appsink is already reference counted. We just
need to unref it after copying it, which we do.

If we reference it again, the sample/buffer is not freed - I have seen the app
crashing while consuming most of system memory (can lead OS to out-of-memory
condition) before this commit.
2014-05-09 14:57:15 -04:00
Vasilis Liaskovitis b818fd3926 "new-sample" callback should return GstFlowReturn 2014-05-09 14:57:00 -04:00