[Marble-devel] Review Request 118717: Added 'highlight on click' feature.
Abhinav Gangwar
abhgang at gmail.com
Sun Jul 13 06:45:49 UTC 2014
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/118717/
-----------------------------------------------------------
(Updated July 13, 2014, 1:15 p.m.)
Review request for Marble, Dennis Nienhüser, Torsten Rahn, and Thibaut Gridel.
Changes
-------
Changes the updated patch introduces are :
1. Changed the name of attribute highlightColor ( used in dgml file in <map> ) to highlightBrush.
2. Added support to specify attrbute highlightPen ( in <map> tag ) which decides what GeoDataLineStyle to use in highlight style.
3. Also added MarbleWidget::setHighlight( bool ) which decides whether to pass the SIGNAL announceMouseClick(...) to trigger MarbleMap::announceMouseClick(...)
to enable highlight feature.
I needed to introduce this method in MarbleWidget because of the following use case :
In game ( identify country shapes ) a country is highlighted and possible answers option for it are displayed for user to select the right
one. Now, while user is playing the game and he clicks on map then the previosuly highlighted region ( which user is supposed to answer about ) shouldn't be
disturbed by this user click. So, During the game I disable the highlight feature.
Repository: marble
Description
-------
Modifications:
1. Added support to specify highlight color in dgml file.
2. Highlighting is done in the following way:
-> Input handler emits mouseClickGeoPostion( qreal lon, qreal lat, GeoDataCoordinates::Unit unit ) whenever a click
is detected on map.
-> Signal mouseClickGeoPostion(..) is connected to the signal MarbleMap::announceMouseClick(..) which
further triggers the slot GeometryLayer::hadnleHighlight(..) which iterates over the tree model to find the
placemarks, from all GeoDataDocuments in which any of its style map has an entry for highlight styleId, which
were under mouse when the click event happened.
-> After searching for all such placemarks GeometryLayer::hadnleHighlight(..) emits signal
announceHighlight(QVector<GeoDataPlacemarks*> which is caught by GeoGraphicsScene to execute the slot
GeoGraphicsScene::applyHighlight(QVector< GeoDataPlacemark* > selectedPlacemark).
-> GeoGraphicsScene::applyHighlight(..) we find all GeoGraphicsItems for a plcamark and execute
GeoGraphicsItem::setHighlightStyle( GeoDataStyle *highlightStyle ) for each graphics items if the corresponding
placemark's style url is set to a style map which has a entry for highlight styleId.
-> GeoGraphicsItem::setHighlightStyle(..) assigns this style to GeoGraphicsItemPrivate::m_highlightStyle makes
GeoGraphicsItemPrivate::m_isHighlighted true. m_isHighlight decides which style ( normal or highlight ) to use
to paint the graphics item.
That's it . Need feedback :)
Diffs (updated)
-----
src/lib/marble/geodata/scene/GeoSceneMap.h 498bb3a
src/lib/marble/geodata/scene/GeoSceneMap.cpp 7f94c11
src/lib/marble/graphicsview/GeoGraphicsItem.h 653fef0
src/lib/marble/graphicsview/GeoGraphicsItem.cpp 1227316
src/lib/marble/graphicsview/GeoGraphicsItem_p.h 618cddf
src/lib/marble/layers/GeometryLayer.h 8d86aed
src/lib/marble/layers/GeometryLayer.cpp fbfe9a3
data/maps/earth/political/political.dgml 3bf3b1b
src/lib/marble/GeoGraphicsScene.h 869c3d8
src/lib/marble/GeoGraphicsScene.cpp f84c532
src/lib/marble/MarbleInputHandler.h 58107e5
src/lib/marble/MarbleInputHandler.cpp 6a46a0d
src/lib/marble/MarbleMap.h ab51f62
src/lib/marble/MarbleMap.cpp 25007ac
src/lib/marble/MarbleModel.h 9643186
src/lib/marble/MarbleModel.cpp d240bac
src/lib/marble/MarbleWidget.h dfc1aa7
src/lib/marble/MarbleWidget.cpp d4c7ff4
src/lib/marble/geodata/graphicsitem/GeoPolygonGraphicsItem.cpp b161d06
src/lib/marble/geodata/handlers/dgml/DgmlAttributeDictionary.h cf4dd76
src/lib/marble/geodata/handlers/dgml/DgmlAttributeDictionary.cpp 85f10fb
src/lib/marble/geodata/handlers/dgml/DgmlMapTagHandler.cpp fb7ff0f
Diff: https://git.reviewboard.kde.org/r/118717/diff/
Testing
-------
File Attachments
----------------
pn2DataNew.zip
https://git.reviewboard.kde.org/media/uploaded/files/2014/06/13/e541a355-80be-40a8-8158-afea0677bd0e__pn2DataNew.zip
color10.png
https://git.reviewboard.kde.org/media/uploaded/files/2014/06/13/f04644e8-6318-4b9a-a8d1-2747b405f73b__color10.png
color11.png
https://git.reviewboard.kde.org/media/uploaded/files/2014/06/13/5f07bac3-3bcb-4086-b8d6-5b836b8f18dc__color11.png
Thanks,
Abhinav Gangwar
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/marble-devel/attachments/20140713/7d7020d7/attachment-0001.html>
More information about the Marble-devel
mailing list