Commit Graph

221 Commits

Author SHA1 Message Date
Tats dcdd67e0dd Merge branch 'ellipseshape' of github.com:libremapping/libremapping into ellipseshape
Conflicts:
	Shape.h
2014-02-09 02:57:06 -05:00
Tats b0f9a8ca5b Draws ellipse control points in a better, uniform way. 2014-02-09 02:39:51 -05:00
Tats 8964876b0a Ellipse overrides setVertex() in order to limit placement of vertices correctly. 2014-02-09 02:39:29 -05:00
Tats 02fe8650c5 Fixed small error in the way color ellipses were drawn (wrong coordinates). 2014-02-09 01:36:23 -05:00
Tats 9938793ddd Adapted ellipse code to latest changes (Point -> QPointF). 2014-02-09 01:21:22 -05:00
Tats 1dbb174d86 Merge branch 'develop' into ellipseshape
Conflicts:
	Shape.h
2014-02-09 01:20:54 -05:00
Tats a19714b919 Merge branch 'develop' into ellipseshape
Conflicts:
	Shape.h
2014-02-09 01:05:48 -05:00
Tats 89a5ce8787 Use the containsPoint() method of polygon to test point inclusion inside shape. 2014-02-09 01:03:16 -05:00
Tats e36cb1a991 Replace std::vector and std::map by QVector and QMap (not everywhere yet). 2014-02-09 01:02:54 -05:00
Tats 195c426991 Removed the Point class and replace all instances by QPointF. 2014-02-09 01:02:13 -05:00
Tats 61c20158d0 Cosmetic changes (variable and interface names). 2014-02-08 23:46:50 -05:00
Tats 00dc18249d Fixed potential bug: DestinationGLCanvas was still interpreting all mappings as TextureMappings 2014-02-08 23:46:25 -05:00
Tats ac555b7b10 Added basic support for color ellipses 2014-02-08 23:44:56 -05:00
Tats 34156f4129 Fixed problem: clearProject() was throwing a bad_alloc() 2014-01-23 23:24:49 -05:00
Tats a539023a30 Created a class MainApplication to handle notify() 2014-01-23 23:24:20 -05:00
Tats 18f6160507 Mapper frees memory of its property browser 2014-01-23 23:23:57 -05:00
Tats e91fe5d862 Statesaving of color paints / mappings 2014-01-23 22:01:21 -05:00
Tats 9a9ba71eff Integrated color paint / mapping to the main window 2014-01-22 15:01:28 -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 3692565d94 Comment cleanup in Shape 2014-01-22 14:59:54 -05:00
Tats 3de61fc6dc Some accessor functions in the Mesh class 2014-01-22 14:59:45 -05:00
Tats 478e5681a7 Added a toPolygon() method to Shape 2014-01-22 14:59:18 -05:00
Tats f7cdb15754 Added a method that returns an enclosing polygon based on a shape. 2014-01-22 13:30:39 -05:00
Tats e671ffe958 Added a ColorMapping class 2014-01-22 13:29:06 -05:00
Tats c87a397844 Added a Color paint 2014-01-22 13:28:42 -05:00
Tats b2ac8e9423 Bug fixed: clear project functionality implemented 2014-01-12 04:15:04 -05:00
Tats c4889055bf Merge branch 'statesaving' of github.com:libremapping/libremapping into statesaving 2014-01-11 23:03:22 -05:00
Tats bd6fff9979 Stub for clearProject() 2014-01-11 23:03:13 -05:00
Tats 9219cee81c Add save/load of meshes 2014-01-11 23:02:52 -05:00
Tats 34a5f6e36c Fixed bug: wrong shape were selected when the mappings were reordered 2014-01-11 23:02:05 -05:00
Tats 11734f8d5b Actual implementation of createTriangleTextureMapping() 2014-01-11 22:01:52 -05:00
Tats 78a944e82a Check type instead of n vertices to display correct icon 2014-01-11 22:01:23 -05:00
Tats daaceef671 Disable addTriangle/Mesh for when no paint is selected 2014-01-11 22:01:07 -05:00
Tats 62492a9c41 Minor: added some Q_UNUSED() to prevent warnings 2014-01-11 21:59:56 -05:00
Tats c973e0e766 Minor: added some Q_UNUSED() to prevent warnings 2014-01-11 21:57:46 -05:00
Tats 2fb214060b Reading and writing of triangle mappings 2014-01-11 21:56:18 -05:00
Tats 8c7f5b16c1 Implement CRUD method createImagePaint in MainWindow and use it 2014-01-11 18:56:28 -05:00
Tats dbab46565c Use UID allocators for Paint and Mapping 2014-01-11 18:55:26 -05:00
Tats d5c9a7a156 Merge branch 'translation' into statesaving 2014-01-11 16:56:06 -05:00
Tats 7d94a26071 Fixed the documentation for class Mapping 2014-01-11 16:38:23 -05:00
Tats da0048b4ac Changed sourceList to paintList 2014-01-11 16:38:07 -05:00
Tats c29f42c20f Removed the Layers (moved all layer stuff to Mappings) 2014-01-11 16:36:59 -05:00
Alexandre Quessy e3029309c0 progress in translation 2014-01-08 12:51:40 -05:00
Alexandre Quessy 65872bd138 update README with info on translations 2014-01-05 18:56:18 -05:00
Alexandre Quessy 69c1ebc648 add language tool thing to build.sh 2014-01-05 18:55:28 -05:00
Alexandre Quessy 72ae5da080 Merge branch 'statesaving' into translation 2014-01-05 18:54:53 -05:00
Tats 27089582d5 Proof of concept: runs in french 2014-01-05 18:50:32 -05:00
Alexandre Quessy 81b7e769b3 git ignore more files 2014-01-05 18:40:00 -05:00
Alexandre Quessy cc57c3b9b0 more bugs to fix 2014-01-05 18:38:17 -05:00
Alexandre Quessy d9c9816ab6 rename organization for preferences saving 2014-01-05 18:37:54 -05:00