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,095 Commits 60 Branches 10 Tags
mac-bundle
Commit Graph

62 Commits

Author SHA1 Message Date
baydam
b375367811 Integrate all code inside a namespace 2016-03-16 18:05:47 +00: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
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
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
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
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
02f411bc0e Further improvements on mesh drawing performance: resolution is heightened on mouse release while during edit resolution is kept lower (closes #161). 2015-12-26 19:25:16 -05:00
Tats
e76bdf1d9f Renamed Mapper to MappingGui (to correspond to Paint -> PaintGui). 2015-12-11 00:43:47 -05: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
c4fefb2015 Used shared pointers in MapperGLCanvas base accessor functions. 2015-07-18 12:54:39 -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
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
57fe2607a9 Renamed shapeChanged(Shape*) for shapeChanged(MShape*). 2015-07-06 21:26:20 -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
e22075d6ad Base working integration of destination and output window (with crosshair working in fullscreen). 2015-02-15 17:46:54 -05:00
baydam
f335127369 Can restore last position of moved shapes 2015-01-21 12:47:17 +00:00
Tats
c6a3de501f Added comment for zoom level. 2014-12-28 21:51:44 -05:00
Tats
c0b6bee45b Implemented working zoom with wheel mouse. 2014-12-28 21:05:49 -05:00
baydam
539d189f9d Fixed issue Adjust position of vertices using arrow keys not working on output display #77 2014-11-05 17:17:37 +00: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
Alexandre Quessy
3bcbbc7697 Display test signal 2014-10-27 06:04:12 -04:00
Tats
d075bdedad Added detailed comments (documentation) in MapperGlCanvas. 2014-10-23 14:02:49 +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
5e6e4909e1 Fix: radius for dragging vertices. Drag shape with left click. 2014-10-14 06:20:22 -04:00
Alexandre Quessy
1b73d45a89 New feature: menu option toggle sticky vertices 2014-10-14 01:48:00 -04:00
Tats
4a4b1f05b2 Cosmetic refactoring and variable inits 2014-06-23 18:30:49 -04:00
Tats
27b41db8af Renamed _active_vertex to _activeVertex. 2014-05-03 13:30:00 -04:00
Tats
4d3694fe28 Added an option to toggle the display of shape control points 2014-04-10 18:27:40 -04:00
Tats
419834b0ee Removed MainWindow singleton, replacing it with much more appropriate member pointers in custom widgets 2014-04-10 17:39:37 -04:00
Tats
195c426991 Removed the Point class and replace all instances by QPointF. 2014-02-09 01:02:13 -05:00
Tats
0ff52de66a Major reconfiguration of the GL canvases and the Mapper interface to allow for the use of a QPainter and for integrating ColorPaint mappings 2014-01-22 15:01:00 -05:00
Tats
34a5f6e36c Fixed bug: wrong shape were selected when the mappings were reordered 2014-01-11 23:02:05 -05:00
Tats
f66f67c654 Better managing of vertex selection 2013-12-10 22:27:39 -05:00
Tats
cd2639812d Replaced signal quadChanged for shapeChanged 2013-12-08 11:56:55 -05:00
Tats
4a80c0a328 Merge branch 'sticky-vertices' of github.com:vliaskov/libremapping into develop 
Conflicts:
	Shape.h
	SourceGLCanvas.cpp
 2013-12-06 18:06:28 -05:00
Vasilis Liaskovitis
b3340e2633 GLCanvas: Implement sticky vertex movement 
If the vertex of the current Shape is being moved, it may be useful to "glue" it
to a vertex of another shape, if the 2 vertices are close together. This patch
implements this. THe sticky-sensitivity is controlled by the dist_stick
variable, which is currently hardcoded but could be made configurable e.g.
through the GUI.

The patch also uses a new pure virtual method called getShapeFromMappingId(),
which is implemented by Source / Dest Canvas subclasses. getCurrentShape() is
now using this function, so it is now a non-virtual function in MapperGLCanvas.
 2013-12-05 23:48:16 +02:00
Tats
3e34947a88 Merge branch 'shape-drag' of github.com:vliaskov/libremapping 
Conflicts:
	MapperGLCanvas.h
	Shape.h
 2013-12-04 23:02:47 -05:00
Vasilis Liaskovitis
d7c09a5426 Move active_vertex from Shape to MapperGLCanvas 2013-12-03 01:34:49 +02:00