----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/124781/ -----------------------------------------------------------
(Updated Aug. 26, 2015, 3:06 p.m.) Status ------ This change has been marked as submitted. Review request for Marble. Changes ------- Submitted with commit ce7381a5b7090d1c4544defb4d940ec4e207f4e0 by Marius Stanciu to branch master. Repository: marble Description ------- !! Due to dependency issues on reviewboard, could not include the final version of src/lib/marble/osm/CMakeLists.txt I've included this file separately ===TagEditor=== Tags can now be edited for text, polyline and polygon annotations. The style changing occurs in the following manner: Text annotations: If the icon link is empty, an icon is chosen from the current tags ( if available ) If the icon link is not empty, the custom icon is used. Polylines and polygons: If the default style is initialized( #polygon and #polyline ) and there is a tag-based style available, the tag-based style is used. If the style is not default, then the custom one is used. ===RelationEditor=== The annotate plugin keeps a hash of all the relations loaded( from parsing, newly created relations ) Relations from this list are suggested in the Relations tab for all placemarks. Normal use case: 1) Create a placemark 2) Add a new relation in the Relations tab 3) Create a new placemark 4) Add the relation created eariler for this placemark as well Done! A relation with two members has been created This might not be the final behaviour. Please do suggest a better rendering behaviour! !TODO: gotta modify the parser and the writer to deal with these relations ( they can't be imported/exported atm ). Will do this in the next patch. Diffs ----- src/lib/marble/EditPlacemarkDialog.h 1ff59c2 src/lib/marble/EditPlacemarkDialog.cpp ef295bb src/lib/marble/FileViewWidget.cpp b1c77c7 src/lib/marble/TourItemDelegate.cpp 834f1a7 src/lib/marble/osm/OsmRelationManagerWidget.h PRE-CREATION src/plugins/render/annotate/AnnotatePlugin.h dd29ee6 src/plugins/render/annotate/AnnotatePlugin.cpp e98043b src/plugins/render/annotate/EditPolygonDialog.h 6c58caa src/plugins/render/annotate/EditPolygonDialog.cpp 28815a5 src/plugins/render/annotate/EditPolylineDialog.h ae9177f src/plugins/render/annotate/EditPolylineDialog.cpp bacc6df Diff: https://git.reviewboard.kde.org/r/124781/diff/ Testing ------- Created placemarks, polylines, polygons, added tags, removed tags, changed styles... works as expected. Created placemarks, created relations, added placemarks to relations, removed relations, edited relations.... works as expected. File Attachments ---------------- final version of osm/CMakeLists.txt https://git.reviewboard.kde.org/media/uploaded/files/2015/08/25/b3f1ecf8-b6d1-4bec-b38a-5017f039042a__CMakeLists.txt Thanks, Marius Stanciu
_______________________________________________ Marble-devel mailing list [email protected] https://mail.kde.org/mailman/listinfo/marble-devel
