Commit Graph

238 Commits

Author SHA1 Message Date
Tats
4d71dc575e Integrated support for shape translation in undo commands. 2015-07-19 22:08:59 -06:00
Tats
5e45437d83 New feature: undo stack available in the interface. 2015-07-18 14:12:36 -06:00
Tats
52b6d58451 Removed the unused quitMapmap() function. 2015-07-17 14:36:46 -06:00
Tats
46d7523160 Bug fix: upon quitting the output window prevented the app to actually quit. 2015-07-17 14:36:33 -06:00
Tats
460e346ddd Removed unused updatePaint signal/slots. 2015-07-17 14:26:24 -06:00
Tats
c652730fd5 Integrated shared pointers in Mapper for holding property browser and graphics items. 2015-07-17 14:24:50 -06:00
Tats
aef4f2d8d8 Changed tr1 shared_ptr for QSharedPointers and QWeakPointers. 2015-07-17 13:41:55 -06:00
Tats
64bbd94f9a Re-enable toggle of display controls. 2015-07-11 16:29:06 -06:00
Tats
017e8bdc7b Fixed bug: scenes were not updated properly resulting in no automatic video frame update. 2015-07-06 21:24:06 -06:00
Tats
7e85ab493c Merge branch 'spike-qgraphicsview-zoom-and-scroll' into spike-qgraphicsview-zoom-and-scroll-merge-develop
Conflicts:
	DestinationGLCanvas.cpp
	DestinationGLCanvas.h
	MainWindow.cpp
	MainWindow.h
	MapperGLCanvas.cpp
	MapperGLCanvas.h
2015-07-06 20:38:51 -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
36c2c2b539 Implemented MainWindow singleton pattern. 2015-07-03 17:20:42 -06:00
Bay Dam
6577add891 Merge pull request #121 from baydam/feature-context-menu
Add context menu for duplicate, delete and rename mapping
2015-05-02 11:54:56 +00:00
baydam
36b89fa60a Bug #99 fix and improvements 2015-04-02 17:11:58 +00:00
baydam
8300c10599 Add context menu for duplicate, delete and rename mapping 2015-03-30 20:54:15 +00:00
baydam
a39fa73118 Resolved conflict about last merge 2015-03-03 11:52:44 +00:00
baydam
8842064af9 Merge branch 'feature-undo-commands' into 'develop' 2015-03-02 10:40:49 +00:00
Tats
e22075d6ad Base working integration of destination and output window (with crosshair working in fullscreen). 2015-02-15 17:46:54 -05:00
baydam
6a3545ff47 Segmentation fault fixed 2015-01-29 20:39:49 +00:00
baydam
4bd5e456e0 Fixed bug #99 about exiting fullscreen 2015-01-24 13:43:09 +00:00
baydam
1a5497d245 Disable Test signal when add Shapes 2015-01-23 21:02:29 +00:00
baydam
c79e873fd3 Clear UndoStack when select a new file or project 2015-01-23 20:45:12 +00:00
baydam
4d6caf2cfb Optimization of Undo Command 2015-01-23 20:36:30 +00:00
baydam
e4ce6eab42 Command to restore deleted mapping 2015-01-19 21:08:02 +00:00
baydam
146a7e4a43 Add Undo and Redo Command to Mesh, Triangle and Ellipse 2015-01-16 17:39:38 +00:00
Alexandre Quessy
9878e8a878 OSC: implement fullscreen and quit 2015-01-11 19:16:59 -05:00
Alexandre Quessy
608d216eaa use native color dialog 2014-12-31 13:34:52 -05:00
Alexandre Quessy
b18b2af45a use green as default color + remember last choice 2014-12-31 13:32:30 -05:00
Tats
c0b6bee45b Implemented working zoom with wheel mouse. 2014-12-28 21:05:49 -05:00
Vasilis Liaskovitis
f6711ed7a8 Control mapping visibility from OSC (bug #43)
Controlled with /mapmap/mapping/visible mappingId visibility (type ii)
e.g.
oscsend localhost 7000 /mapmap/mapping/visible ii "3" "0"
to make mapping with id 3 invisible
oscsend localhost 7000 /mapmap/mapping/visible ii "0" "1"
to make mapping with id 3 visible

QListWidgetItem checkstate is also changed accordingly
2014-11-01 02:50:30 +02: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
e8870db92a Replaced Shape by MShape to avoid name conflicts. 2014-10-31 17:03:18 -04:00
baydam
9636ece1c9 Disable Test signal when start mapping 2014-10-29 21:25:06 +00:00
baydam
ed9cca4ded Definitively resolve the bug with ESC 2014-10-29 21:06:58 +00:00
Alexandre Quessy
9143e309f7 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop 2014-10-27 19:53:27 -04:00
Alexandre Quessy
aab266b843 Can change OSC port via preferences dialog 2014-10-27 15:25:41 -04:00
baydam
248cc8494c All menubar shortcut work when output window is displayed 2014-10-27 19:15:39 +00:00
Alexandre Quessy
be0053764d add PreferencesDialog - not yet effective 2014-10-27 14:05:36 -04:00
Alexandre Quessy
09bf633000 make sure settings exist before reading them 2014-10-27 07:36:39 -04:00
Alexandre Quessy
3bcbbc7697 Display test signal 2014-10-27 06:04:12 -04:00
baydam
d3b676f01c Merge branch 'develop' of github.com:mapmapteam/mapmap into develop 2014-10-22 10:15:16 +00:00
baydam
427d3e52c7 Merge branch 'features-options' into develop 2014-10-21 18:20:56 +00:00
Tats
c8e0c23858 Allow for live changing of video rate with osc. 2014-10-21 17:47:43 +00:00
Tats
82aad45a97 Fixed support for read/write of mapping visibility (solo and locked are still incomplete). 2014-10-21 17:18:25 +00:00
baydam
01ad2f9f41 Merge branch 'develop' of github.com:mapmapteam/mapmap into features-options 2014-10-21 13:15:33 +00:00
baydam
ffb27c7af2 File chooser maynow remember the last directory 2014-10-21 12:45:44 +00:00
Alexandre Quessy
afc84bb692 Fix logic in setCursorVisible + make it visible if controls are 2014-10-21 01:52:03 -04:00
Alexandre Quessy
af84795c78 Try to hide cursor in output window, when desired 2014-10-20 17:13:37 -04:00
Alexandre Quessy
363b5795ba Fix delete menu option 2014-10-20 13:54:06 -04:00