Commit Graph

640 Commits

Author SHA1 Message Date
Tats
082bf2d009 Removed rubberband selection (for now). 2015-07-03 21:51:58 -06:00
Tats
67628915a3 Handle mapping selection change on pressing mouse on a shape. 2015-07-03 21:51:38 -06:00
Tats
522ecac194 Cosmetic change. 2015-07-03 21:51:01 -06:00
Tats
93edb4e41a Bug fix: tried to addItem() twice on outputwindow scene. 2015-07-03 19:04:52 -06:00
Tats
9ba817847f Bugfix: Infinite call loop created by shared scene in destination and outputwindow canvases and the updateCanvas() slot. 2015-07-03 19:01:51 -06:00
Tats
f0c4bb1fa9 Allow display of controls only in currently selected mapping. 2015-07-03 17:21:11 -06:00
Tats
36c2c2b539 Implemented MainWindow singleton pattern. 2015-07-03 17:20:42 -06:00
Tats
e22075d6ad Base working integration of destination and output window (with crosshair working in fullscreen). 2015-02-15 17:46:54 -05:00
Tats
067a84cf12 Changing the ordering of mappings now changes the order in which they are actually displayed (layers). 2014-12-28 22:29:47 -05:00
Tats
7c642e8570 Commented out remaining Mapper code from old approach. 2014-12-28 22:28:08 -05:00
Tats
c6a3de501f Added comment for zoom level. 2014-12-28 21:51:44 -05:00
Tats
3e7fd351cf Bug fix: once we reach max or min zoom we still record the scroll events which results in a weird behavior. 2014-12-28 21:51:34 -05:00
Tats
c0b6bee45b Implemented working zoom with wheel mouse. 2014-12-28 21:05:49 -05:00
Tats
191f0f9aba Fixed wrongful use of static const floats in class MM. 2014-12-28 21:05:28 -05:00
Tats
a84888467b Fixed drawing of texture in input mapping. 2014-12-28 20:50:17 -05:00
Tats
2b7a6e82a5 Fixed translation and display of controls of triangle texture. 2014-12-28 19:53:36 -05:00
Tats
78294f2ef0 Fixed correct translation of color shapes. 2014-12-28 19:44:46 -05:00
Tats
b35ce293bf Sync of vertices control points retroactive (to make ellipse works) (not fully working yet). 2014-12-28 18:01:39 -05:00
Tats
31e315363e Major refactoring: moved too long methods from Mapper.h to Mapper.cpp and removed unused drawing code from Mapper classes. 2014-12-28 18:01:02 -05:00
Tats
5cf9294dc7 Only update vertex coordinates when control point is actually moved (as opposed to on any event). 2014-12-28 16:16:21 -05:00
Tats
965a26edd6 Extremely rough patch for manipulating mapping texture shapes (works only for triangles). 2014-12-28 15:58:06 -05:00
Tats
6843ecd882 Integrated view items for selecing and dragging shapes in the QGraphicsView; not completely tied to model yet. 2014-10-31 17:05:32 -04:00
Tats
cbfe3981c0 Started using QGraphicsView in canvases instead of QGLWidget. 2014-10-31 17:04:28 -04:00
Tats
e8870db92a Replaced Shape by MShape to avoid name conflicts. 2014-10-31 17:03:18 -04:00
Tats
8c3a66344a Added some elements to .gitignore 2014-10-27 00:14:01 +00:00
Tats
093a10de7b Removed unused variable _currentMovie. 2014-10-23 16:37:08 +00:00
Tats
5cb66e6175 Don't ask to change movie rate if calling setRate() with the same rate to avoid pausing and playing pipeline. 2014-10-23 16:36:55 +00:00
Tats
d075bdedad Added detailed comments (documentation) in MapperGlCanvas. 2014-10-23 14:02:49 +00:00
Tats
3496bd1315 Allows displacement of selected vertex with arrow keys. 2014-10-23 13:41:08 +00:00
Tats
07e1b26436 Allows individual selection of a vertex to be shown on screen. 2014-10-23 13:40:01 +00:00
Alexandre Quessy
e232976849 Merge branch 'develop' of https://github.com/mapmapteam/mapmap into develop 2014-10-22 19:01:21 +00:00
Alexandre Quessy
3e791997a5 update INSTALL 2014-10-22 18:59:23 +00:00
baydam
0aad565fe3 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop 2014-10-22 17:26:33 +00:00
baydam
d9bce3aac3 Fix menubar on fullscreen when plug a second screen and Crosshair 2014-10-22 17:25:55 +00:00
Tats
3acb257cf0 Cleanup in MapperGLCanvas.cpp mousePressedEvent. 2014-10-22 17:18:49 +00:00
Tats
29253351e0 Fixed bug where new media had rate of 1%. 2014-10-22 16:12:13 +00:00
baydam
4107d2c199 Merge branch 'features-options' into develop 2014-10-22 11:17:40 +00:00
baydam
c1c8287aed Inverted order in which fullscreen and escape key are called (escape only works in fullscreen). 2014-10-22 11:17:01 +00:00
baydam
d3b676f01c Merge branch 'develop' of github.com:mapmapteam/mapmap into develop 2014-10-22 10:15:16 +00:00
Tats
dc976794d9 Added crosshair in fullscreen mode (automatic). 2014-10-21 20:16:23 +00:00
Tats
a50d44da23 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop 2014-10-21 20:14:07 +00:00
Vasilis Liaskovitis
c4c7d9a8ef MediaImpl:: do not call updateRate() on GST_MESSAGE_ASYNC_DONE (bug #51)
GST_MESSAGE_ASYNC_DONE is received when elements finish changing state. If we
initiate an updateRate here, we keep generating seek events in a loop forever,
pausing and re-starting the pipeline without reason.
2014-10-21 21:47:09 +02:00
Tats
c6373b458f Bug fix in media paint gui to allow playback rate in file loading. 2014-10-21 19:33:41 +00:00
Tats
818d985ad1 Uniformize rate to be in % (except in MediaImpl). 2014-10-21 19:33:03 +00:00
Tats
898eb67f9d Fixed bug where movie was constantly polled for seeking and paused/played. 2014-10-21 19:24:56 +00:00
baydam
427d3e52c7 Merge branch 'features-options' into develop 2014-10-21 18:20:56 +00:00
Tats
fa400b9788 File save/load of rate. 2014-10-21 17:47:55 +00:00
Tats
c8e0c23858 Allow for live changing of video rate with osc. 2014-10-21 17:47:43 +00:00
Tats
58d61bfc25 Made color of controls more visible (white). 2014-10-21 17:47:08 +00:00
baydam
7d1ba1e756 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop 2014-10-21 17:44:33 +00:00