Commit Graph

276 Commits

Author SHA1 Message Date
baydam
3238efbdb4 Fix: #199 zoom toolbar moved into the visible area 2016-02-03 13:14:25 +00:00
baydam
39ccd56eef Fix: #197 Put the zoom toolbar in the bottom-right corner 2016-02-03 00:40:12 +00:00
baydam
6c723fddd9 Make the console and the application more readable 2016-02-02 18:35:47 +00:00
Alexandre Quessy
e52e929108 Add a macro to check for Qt >= 5.4 2016-01-27 10:35:03 -05:00
baydam
a98193c116 Close all top level window when the main window is closed 2016-01-25 19:53:47 +00:00
Tats
fe848a6355 Added actions directly to the MainWindow to allow top-level use of hot keys (closes #40). 2016-01-23 14:52:40 -05:00
Tats
990250ed13 Cosmetic change. 2016-01-23 14:51:32 -05:00
baydam
156e74acd5 Fix:#183 "Display logging output in a console and able to show and hide" 2016-01-21 21:54:34 +00:00
baydam
efe5c8f02a Improvements of the menu elements 2016-01-20 18:56:39 +00:00
baydam
d289851890 Merge branch 'feature-zoom-control' into develop 2016-01-15 16:05:25 +00:00
baydam
ffd9d8aadd Add dropdown menu to show or set zoom level 2016-01-15 16:03:13 +00:00
baydam
045c8a1055 Merge branch 'feature-zoom-control' into develop 2016-01-13 20:45:36 +00:00
baydam
4e3ccf45d4 Add "zoom in/out/reset and fit to content" buttons 2016-01-13 20:38:43 +00:00
baydam
b29207ccd7 Fix bug when display undo stack is unchecked 2016-01-12 18:28:24 +00:00
baydam
5afc6b3cb5 Fix: #181 Image glitch when undo stack not displayed 2016-01-07 18:42:26 +00:00
baydam
f03be893a3 Fix: #159 Handle corrupted files 2016-01-05 18:45:54 +00:00
baydam
03a66c5000 Merge branch 'develop' of https://github.com/mapmapteam/mapmap into develop 2016-01-05 12:19:38 +00:00
baydam
093fb3cd9d Fix: #179 Paints and mappings renamings are now saved in file 2016-01-05 12:10:54 +00:00
Tats
c3b57dcfe7 Fixed potentially unfreed QMenu. 2015-12-31 16:01:42 -06:00
baydam
a20beba15b Manage show and hide of Undo Stack tab #145 2015-12-31 15:46:56 +00:00
baydam
61a530375f Be able to rename paints and mappings OSC #72 2015-12-29 16:44:31 +00:00
baydam
73f28ae340 Can rename Paint with double click #174 2015-12-29 14:36:06 +00:00
Tats
41b1c87283 Merge branch 'develop' of github.com:mapmapteam/mapmap into develop
Conflicts:
	MainWindow.cpp
2015-12-28 16:25:20 -06:00
Tats
e0c53be751 Imperfect fix of ellipse conical projection (works better but still perspectively incorrect) (enhancement #177). 2015-12-28 16:24:22 -06:00
baydam
b30d2fac05 Fix merge conflict 2015-12-28 13:24:56 +00:00
Tats
fc627b2306 Compilation errors fix in MainWindow. 2015-12-26 19:25:37 -05:00
baydam
61528b3701 Fix merge bugs 2015-12-24 19:17:10 +00:00
baydam
038a705e5d Resolve merge conflicts 2015-12-24 18:51:59 +00:00
Tats
eb9a024635 Merge branch 'refactor-mapper-mapping-gui' into develop 2015-12-23 19:15:29 -05:00
baydam
41036354b8 Able to rename mapping with double click 2015-12-18 12:54:36 +00:00
baydam
66fc373e7b Fixed bug #101 Sending OSC visible parameter to paint that doesn't exist will not crash the software anymore 2015-12-14 15:14:05 +00:00
baydam
bafd700a1c Change shortcut for adding color paint #137 2015-12-11 23:32:10 +00:00
Tats
e76bdf1d9f Renamed Mapper to MappingGui (to correspond to Paint -> PaintGui). 2015-12-11 00:43:47 -05:00
baydam
317d87b2dd Fixed bug #149 Deleting a mapping actually deletes a paint when the paint tab is chosen 2015-12-09 18:30:39 +00:00
baydam
df6d56abd0 Fixed bug #152 that make the software frozen when we load a project and the video files are not found 2015-12-08 15:58:25 +00:00
baydam
092553a30b Add paint context menu 2015-09-01 12:27:41 +00:00
baydam
c732cbe28b Rearrange hotkeys 2015-08-24 17:25:20 +00:00
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