Commit Graph

37 Commits

Author SHA1 Message Date
Tats
e22075d6ad Base working integration of destination and output window (with crosshair working in fullscreen). 2015-02-15 17:46:54 -05: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
07e1b26436 Allows individual selection of a vertex to be shown on screen. 2014-10-23 13:40:01 +00:00
baydam
d9bce3aac3 Fix menubar on fullscreen when plug a second screen and Crosshair 2014-10-22 17:25:55 +00:00
Tats
dc976794d9 Added crosshair in fullscreen mode (automatic). 2014-10-21 20:16:23 +00:00
Tats
2285716ed2 Fix bug and potential bugs with painters not being reset between draws. 2014-05-03 13:10:46 -04:00
Tats
05c1bf3a5c Major cleanup / redesign in the source canvas to make the Mapper class draw the inputs (more generic) 2014-04-30 13:21:57 -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
Alexandre Quessy
74efb0dada fix crash on Mac OS X 2014-04-04 00:29:41 -04:00
Tats
3910302f80 Replaced STL vectors and maps by Qt-style 2014-03-16 01:11:38 -04:00
Tats
00dc18249d Fixed potential bug: DestinationGLCanvas was still interpreting all mappings as TextureMappings 2014-02-08 23:46:25 -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
c29f42c20f Removed the Layers (moved all layer stuff to Mappings) 2014-01-11 16:36:59 -05:00
Tats
559a7ebf90 Merge branch 'develop' into statesaving
Conflicts:
	DestinationGLCanvas.cpp
	MainWindow.cpp
	MainWindow.h
	Mapper.h
	MappingManager.cpp
	MappingManager.h
	Paint.h
	Shape.h
	SourceGLCanvas.cpp
	Util.cpp
	libremapping.pro
	main.cpp
2014-01-05 18:06:41 -05:00
Vasilis Liaskovitis
5852cde869 Shape: Convert Point to QObject / QPointF
Also add one Q_PROPERTY for each coordinate (x and y) of a Point. This will
enable the controller to set and get these properties.

Since QObjects cannot be copied, we also need to change the Shape class to have
a vector of pointers to Points, instead of actual Point structs.
2013-12-24 13:50:20 +02:00
Tats
9962c56ba7 Removed remaining dynamic cast type checking in *GLCanvas (for drawing shape contours) 2013-12-16 01:37:54 -05:00
Tats
b808c982f8 Implemented support for meshes: allows for adding columns and rows to meshes 2013-12-10 22:27:06 -05:00
Alexandre Quessy
dce8f0b35d Saves an XML file. 2013-12-09 15:20:33 -05:00
Tats
3517b7a71d Generalized the use of Mapper from within DestinationGLCanvas 2013-12-08 11:53:49 -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
dd3189e847 Checkbox for toggling visibility of layers (+ some cleanup) 2013-12-05 01:38:03 -05:00
Tats
80f2d92eab Added unique ids to Mapping and Paint 2013-12-05 00:16:37 -05:00
Tats
0015e237c9 Added support for triangles 2013-11-30 23:55:25 -05:00
Tats
8b205526fe Completed integration of one source -> many quads (everything working) 2013-11-30 21:48:01 -05:00
Tats
5a999f1983 - Put all mappings and paints in a single MappingManager class
- Basic compiling / running program (no quads for now)
2013-11-30 19:19:29 -05:00
Tats
5bcefdcf16 Added import of image files (from File menu and toolbar) 2013-11-30 13:15:07 -05:00
Tats
fd958cecf2 Merge branch 'master' of github.com:libremapping/libremapping
Conflicts:
	Common.cpp
	Common.h
	DestinationGLCanvas.cpp
	SourceGLCanvas.cpp
	main.cpp
2013-11-29 12:09:49 -05:00
Alexandre Quessy
9d36bc4922 Use GL_CLAMP, not GL_REPEAT (and other changes)
And also:
* Use glVertex2f, not glVertex3f
* Opening curly brackets on a new line
* spaces between most operators
* avoir some very long lines, or indentations
2013-11-26 21:46:08 -05:00
Tats
0ff60f6108 - Added an empty QListView in the layout, with two splitters
- Also created a class for the main window
2013-11-25 23:16:32 -05:00
Tats
54c199f8fd Correct management of source<->destionation interaction using signals/slots 2013-11-24 09:27:28 -05:00
Tats
5c1ec14662 Basic switch from wxWidget to Qt (not working yet) 2013-11-23 17:37:59 -05:00
Tats
2be974744c Destination displays all input images 2013-11-16 11:55:58 +01:00
Tats
32924471e0 Copy wx-02-input-output to root 2013-11-15 16:12:22 +01:00