eessppeelllloo/mapmap
1
0
Fork 0
mirror of https://github.com/mapmapteam/mapmap.git synced 2026-04-01 21:19:39 +02:00
Code Issues Packages Projects Releases Wiki Activity
1,132 Commits 60 Branches 10 Tags
2aecb8281ff192fa67e0dc7984dc3340176f970e
Commit Graph

122 Commits

Author SHA1 Message Date
baydam
2aecb8281f improve preferences system 2016-06-17 17:58:12 +00:00
baydam
3759184588 Small fix: Switch between vertex with Shift+Space keys 2016-05-13 13:08:01 +00:00
Tats
c9afeaf47b Fix bug: vertices were not sticking correctly on source. 2016-05-12 18:44:50 +00:00
Tats
2734624f61 Fixed bug introduced by paint control option (segfaulted with color paints). 2016-05-12 10:28:28 +00:00
Tats
bee45a3491 Enable display of controls of mappings related to current paint (closes #142). 2016-05-12 00:42:44 +00:00
Tats
de2ff27c51 Merged MapperGLCanvas.cpp 2016-05-05 11:28:41 +00:00
Alexandre Quessy
0ec61b193f Hide cursor when canvas controls are not shown 2016-04-19 12:23:46 -04:00
baydam
b375367811 Integrate all code inside a namespace 2016-03-16 18:05:47 +00:00
Bay Dam
c708fc24e4 Preparing for Windows operating system 2016-03-16 11:08:49 +01:00
Tats
20839efc05 Implemented new feature: holding the shift key while moving a vertex temporarily inverts sticky vertex condition (closes #226). 2016-03-11 10:21:33 -05:00
Tats
84ebb9d3ad Moved the zoom toolbar into a separate widget class, added them in the right spots and made them correctly interoperate with the canvases. 2016-03-06 01:22:34 -05:00
Tats
28261033c6 Removed DestinationGLCanvas and SourceGLCanvas which were not doing much: integrated them directly in MapperGLCanvas. 2016-03-06 00:43:01 -05:00
Tats
aaef36b1ab Fix shape lock check in MapperGLCanvas.h. 2016-02-16 08:47:52 -05:00
Tats
1146a6408e Merge branch 'develop' into feature/qt-properties 
# Conflicts:
#	Mapping.h
#	OscInterface.cpp
#	ProjectReader.cpp
#	ProjectWriter.cpp
#	Shape.h
#	main.cpp
 2016-02-15 13:16:04 -05:00
baydam
21c91295d1 Display lock/mute/solo options in the context menu 2016-02-11 21:24:08 +00:00
Tats
1309305614 Bug fix: when moving vertex pressing any key (eg. CTRL) added an extra command into the undo stack thus forcing the user who wanted to undo to press CTRL-Z twice. 2016-02-11 15:52:48 -05:00
Tats
b21c46b3d2 Fixed bug wrt wheel event scrolling (contains a compat. fix for Qt5/Qt4.8) (closes #198). 2016-02-11 14:26:01 -05:00
baydam
9fbb31d949 Switch between vertex to turn them active with Shift+Space shortcut 2016-02-04 16:47:22 +00:00
baydam
03eec503fc Able to speed up shifting of active vertex with SHIFT+ArrowKey 2016-02-04 14:02:08 +00:00
baydam
35ab79eb57 Translate the view with arrows keys and increase moving speed 2016-02-04 13:30:17 +00:00
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
Tats
cb07e630a2 Added CTRL+= for zoom-in (closes #192). 2016-01-30 18:57:19 -05:00
baydam
eeca30197a Fix zoom in key not working 2016-01-30 23:35:50 +00:00
baydam
e53ca4581f zoom toolbar margin enhancements 2016-01-18 15:02:50 +00:00
baydam
ffd9d8aadd Add dropdown menu to show or set zoom level 2016-01-15 16:03:13 +00:00
baydam
4e3ccf45d4 Add "zoom in/out/reset and fit to content" buttons 2016-01-13 20:38:43 +00:00
Tats
0bd893ee6a Bugfix: Zooming in the destination canvas changes the size of controls in output window. Closes #162. 2015-12-31 14:23:53 -06:00
Tats
4d71dc575e Integrated support for shape translation in undo commands. 2015-07-19 22:08:59 -06:00
Tats
24575c1e55 Imlpemented common superclass for transformations of shapes undo commands. 2015-07-19 22:07:32 -06:00
Tats
974cb3f255 Compute key vertex moves in window (not scene) coordinates. 2015-07-18 13:26:56 -06:00
Tats
ffe6ff76b8 Bug fix: update of control point positions in property browser goes both ways. 2015-07-18 13:12:56 -06:00
Tats
f9a98f0f09 Allow undo/redo of vertex move. 2015-07-18 12:55:28 -06:00
Tats
c4fefb2015 Used shared pointers in MapperGLCanvas base accessor functions. 2015-07-18 12:54:39 -06:00
Tats
e5d4463c32 Reintegrated highlighting of selected vertex. 2015-07-17 16:28:27 -06:00
Tats
425f544f66 Reintegrated vertex key movement in MapperGLCanvas. 2015-07-17 16:06:32 -06:00
Tats
c910520530 Renamed some elements in MapperGLCanvas to be more eloquent. 2015-07-17 16:06:14 -06:00
Tats
aef4f2d8d8 Changed tr1 shared_ptr for QSharedPointers and QWeakPointers. 2015-07-17 13:41:55 -06:00
Tats
e2e3c4a415 Use trick to allow middle-button dragging of the canvas 2015-07-15 12:53:02 -06:00
Tats
9a6c38fa4b Added new render hints for aliasing 2015-07-15 12:52:37 -06:00
Tats
a970bbc660 - Manage properly the picking up of vertices and shapes 
- Fix bug: in source canvas we could change mappings by clicking on shape
 2015-07-15 12:50:24 -06:00
Tats
775cf739c6 - Moved the control of shapes outside of the scene items 
- Introduced a specialized range of classes to deal with the drawing of controls
 2015-07-14 13:24:36 -06:00
Tats
3303e07056 Added support for scrolling in source+destination canvases by mid-button clicking. 2015-07-13 16:45:03 -06:00
Tats
8f13597451 Created a special class for output gl canvas to prevent some events (like zooming) to happen. 2015-07-13 16:44:41 -06:00
Tats
acca6059f6 Implemented invariant control points and lines wrt zoom level. 2015-07-13 13:25:18 -06:00
Tats
64bbd94f9a Re-enable toggle of display controls. 2015-07-11 16:29:06 -06:00
Tats
2ab3b137d9 Integrate sticky vertices in new QGraphicsItem framework. 2015-07-06 21:58:48 -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
082bf2d009 Removed rubberband selection (for now). 2015-07-03 21:51:58 -06:00