<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="8" style="border: 1px #c9c399 solid;">
<tr>
<td>
This is an automatically generated e-mail. To reply, visit:
<a href="https://git.reviewboard.kde.org/r/118174/">https://git.reviewboard.kde.org/r/118174/</a>
</td>
</tr>
</table>
<br />
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<p style="margin-top: 0;">On May 17th, 2014, 7:46 p.m. CCT, <b>Torsten Rahn</b> wrote:</p>
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; border-collapse: collapse; margin: 2px padding: 2px;">
<thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; font-size: 9pt; padding: 4px 8px; text-align: left;">
<a href="https://git.reviewboard.kde.org/r/118174/diff/1/?file=273122#file273122line328" style="color: black; font-weight: bold; text-decoration: underline;">src/lib/marble/MarbleModel.cpp</a>
<span style="font-weight: normal;">
(Diff revision 1)
</span>
</th>
</tr>
</thead>
<tbody style="background-color: #e4d9cb; padding: 4px 8px; text-align: center;">
<tr>
<td colspan="4"><pre style="font-size: 8pt; line-height: 140%; margin: 0; ">void MarbleModel::setMapThemeId( const QString &mapThemeId )</pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2"></font></th>
<td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td>
<th bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2">328</font></th>
<td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="kt">int</span> <span class="n">pos</span> <span class="o">=</span> <span class="o">-</span><span class="mi">1</span><span class="p">;</span></pre></td>
</tr>
</tbody>
</table>
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">This isn't very descriptive - what would be a better name? datasetPosition or datasetIndex maybe?</pre>
</blockquote>
</blockquote>
<pre style="margin-left: 1em; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">I used datasetIndex :)</pre>
<br />
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<p style="margin-top: 0;">On May 17th, 2014, 7:46 p.m. CCT, <b>Torsten Rahn</b> wrote:</p>
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; border-collapse: collapse; margin: 2px padding: 2px;">
<thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; font-size: 9pt; padding: 4px 8px; text-align: left;">
<a href="https://git.reviewboard.kde.org/r/118174/diff/1/?file=273122#file273122line379" style="color: black; font-weight: bold; text-decoration: underline;">src/lib/marble/MarbleModel.cpp</a>
<span style="font-weight: normal;">
(Diff revision 1)
</span>
</th>
</tr>
</thead>
<tbody style="background-color: #e4d9cb; padding: 4px 8px; text-align: center;">
<tr>
<td colspan="4"><pre style="font-size: 8pt; line-height: 140%; margin: 0; ">void MarbleModel::setMapThemeId( const QString &mapThemeId )</pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2"></font></th>
<td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td>
<th bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2">379</font></th>
<td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="n">lineStyle</span> <span class="o">=</span> <span class="k">new</span> <span class="n">GeoDataLineStyle</span><span class="p">(</span> <span class="n">pen</span><span class="p">.</span><span class="n">color</span><span class="p">()</span> <span class="p">);</span></pre></td>
</tr>
</tbody>
</table>
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">Has lineStyle pointed to some other object before? Are we leaking that one? :-)</pre>
</blockquote>
<p>On May 20th, 2014, 7:18 p.m. CCT, <b>Abhinav Gangwar</b> wrote:</p>
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">lineStyle is set to style. This style is further set to GeoDataDocument/GeoDataPlacemark. The destructor ~GeoDataFeature() deletes it :)</pre>
</blockquote>
</blockquote>
<pre style="margin-left: 1em; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">Sorry for the previous ( wrong ) comment. Yes, there is memory leak as a copy of lineStyle or polyStyle is being assigned( Thanks to Dennis ) :)</pre>
<br />
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<p style="margin-top: 0;">On May 17th, 2014, 7:46 p.m. CCT, <b>Torsten Rahn</b> wrote:</p>
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; border-collapse: collapse; margin: 2px padding: 2px;">
<thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; font-size: 9pt; padding: 4px 8px; text-align: left;">
<a href="https://git.reviewboard.kde.org/r/118174/diff/1/?file=273131#file273131line100" style="color: black; font-weight: bold; text-decoration: underline;">src/plugins/runner/shp/ShpRunner.cpp</a>
<span style="font-weight: normal;">
(Diff revision 1)
</span>
</th>
</tr>
</thead>
<tbody style="background-color: #e4d9cb; padding: 4px 8px; text-align: center;">
<tr>
<td colspan="4"><pre style="font-size: 8pt; line-height: 140%; margin: 0; ">void ShpRunner::parseFile( const QString &fileName, DocumentRole role = UnknownDocument )</pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2"></font></th>
<td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td>
<th bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2">100</font></th>
<td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="n">quint8</span> <span class="n">colorIndex</span> <span class="o">=</span> <span class="mi">99</span><span class="p">;</span> <span class="c1">// mapColor is undefined in this case</span></pre></td>
</tr>
</tbody>
</table>
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">why 99 ? :)</pre>
</blockquote>
</blockquote>
<pre style="margin-left: 1em; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">Initially I used 99 to indicate an undefined color index but now in updated patch every color index which is not range [0,255] is treated as undefined color index. To any undefined color index we assign it the first color in colorMap.</pre>
<br />
<p>- Abhinav</p>
<br />
<p>On May 17th, 2014, 7:51 p.m. CCT, Abhinav Gangwar wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" style="background-image: url('https://git.reviewboard.kde.org/static/rb/images/review_request_box_top_bg.ab6f3b1072c9.png'); background-position: left top; background-repeat: repeat-x; border: 1px black solid;">
<tr>
<td>
<div>Review request for Marble, Dennis Nienhüser, Torsten Rahn, and Thibaut Gridel.</div>
<div>By Abhinav Gangwar.</div>
<p style="color: grey;"><i>Updated May 17, 2014, 7:51 p.m.</i></p>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt;">Repository: </b>
marble
</div>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Description </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: 1px solid #b8b5a0">
<tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">This patch contains the following cahnges:
1. Modified pn2 format, shp runner, pn2 runner and shp2pn2 tool so that we can parse mapcolor field from shapefile and store it in pn2 format.
2. Added support to parse new attribute colorMap in <brush> tag for .dgml files.
3. Modified GeoDataPolyStyle to add one more data member to store this mapcolor( or color index ) value.
4. Changed MarbleModel
4.1 not to parse the same sourcefile again on theme change in case the GeoSceneGeoData objects in two themes differ only by <brush> and
<pen>. Just the assign new style to already parsed file. ( so patch https://git.reviewboard.kde.org/r/117978/ can be ignored ).
4.2 Handle the case when <brush> has colorMap attribute and assign the placemarks appropriate style based on its color index( or mapcolor).
5. Added a new theme file political.dgml.</pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Testing </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: 1px solid #b8b5a0">
<tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">Works fine on my system.</pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>data/maps/earth/political/political-preview.png <span style="color: grey">(PRE-CREATION)</span></li>
<li>data/maps/earth/political/political.dgml <span style="color: grey">(PRE-CREATION)</span></li>
<li>data/naturalearth/ne_10m_admin_0_boundary_lines_land.pn2 <span style="color: grey">(7ab70bb)</span></li>
<li>data/naturalearth/ne_10m_rivers_lake_centerlines.pn2 <span style="color: grey">(3ffcf84)</span></li>
<li>data/naturalearth/ne_50m_admin_0_boundary_lines_land.pn2 <span style="color: grey">(25406b0)</span></li>
<li>data/naturalearth/ne_50m_admin_0_boundary_lines_maritime_indicator.pn2 <span style="color: grey">(58f9538)</span></li>
<li>data/naturalearth/ne_50m_admin_0_breakaway_disputed_areas.pn2 <span style="color: grey">(c1e317b)</span></li>
<li>data/naturalearth/ne_50m_admin_0_countries.pn2 <span style="color: grey">(PRE-CREATION)</span></li>
<li>data/naturalearth/ne_50m_admin_0_pacific_groupings.pn2 <span style="color: grey">(33e2112)</span></li>
<li>data/naturalearth/ne_50m_admin_1_states_provinces_lines.pn2 <span style="color: grey">(637c2ea)</span></li>
<li>data/naturalearth/ne_50m_antarctic_ice_shelves_lines.pn2 <span style="color: grey">(83c859a)</span></li>
<li>data/naturalearth/ne_50m_antarctic_ice_shelves_polys.pn2 <span style="color: grey">(8201bbc)</span></li>
<li>data/naturalearth/ne_50m_coastline.pn2 <span style="color: grey">(91bddc9)</span></li>
<li>data/naturalearth/ne_50m_glaciated_areas.pn2 <span style="color: grey">(1c58348)</span></li>
<li>data/naturalearth/ne_50m_lakes.pn2 <span style="color: grey">(af0859c)</span></li>
<li>data/naturalearth/ne_50m_lakes_historic.pn2 <span style="color: grey">(d5272db)</span></li>
<li>data/naturalearth/ne_50m_land.pn2 <span style="color: grey">(ed343a3)</span></li>
<li>data/naturalearth/ne_50m_playas.pn2 <span style="color: grey">(5eeadc8)</span></li>
<li>data/naturalearth/ne_50m_rivers_lake_centerlines.pn2 <span style="color: grey">(5298ed6)</span></li>
<li>data/naturalearth/ne_50m_urban_areas.pn2 <span style="color: grey">(ad80107)</span></li>
<li>src/lib/marble/MarbleModel.h <span style="color: grey">(3470b0e)</span></li>
<li>src/lib/marble/MarbleModel.cpp <span style="color: grey">(83493c3)</span></li>
<li>src/lib/marble/geodata/data/GeoDataPolyStyle.h <span style="color: grey">(d38e07e)</span></li>
<li>src/lib/marble/geodata/data/GeoDataPolyStyle.cpp <span style="color: grey">(d7377c0)</span></li>
<li>src/lib/marble/geodata/handlers/dgml/DgmlAttributeDictionary.h <span style="color: grey">(9c66830)</span></li>
<li>src/lib/marble/geodata/handlers/dgml/DgmlAttributeDictionary.cpp <span style="color: grey">(b250dc1)</span></li>
<li>src/lib/marble/geodata/handlers/dgml/DgmlBrushTagHandler.cpp <span style="color: grey">(8460c4c)</span></li>
<li>src/lib/marble/geodata/scene/GeoSceneGeodata.h <span style="color: grey">(7c9c462)</span></li>
<li>src/lib/marble/geodata/scene/GeoSceneGeodata.cpp <span style="color: grey">(6bd1885)</span></li>
<li>src/plugins/runner/pn2/Pn2Runner.cpp <span style="color: grey">(877abe1)</span></li>
<li>src/plugins/runner/shp/ShpRunner.cpp <span style="color: grey">(cad23e9)</span></li>
<li>tools/shp2pn2/shp2pn2.cpp <span style="color: grey">(4e0dc7b)</span></li>
</ul>
<p><a href="https://git.reviewboard.kde.org/r/118174/diff/" style="margin-left: 3em;">View Diff</a></p>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">File Attachments </h1>
<ul>
<li><a href="https://git.reviewboard.kde.org/media/uploaded/files/2014/05/17/01c743cf-e12b-4046-bdf4-076a4f2600d4__political-preview1.png">political-preview1.png</a></li>
<li><a href="https://git.reviewboard.kde.org/media/uploaded/files/2014/05/17/2ddfe907-2fa0-4bca-be9e-26196f918d39__political-preview2.png">political-preview2.png</a></li>
<li><a href="https://git.reviewboard.kde.org/media/uploaded/files/2014/05/17/b1142299-b618-4fb8-b23d-91e66d5d2156__naturalearth.zip">naturalearth.zip</a></li>
</ul>
</td>
</tr>
</table>
</div>
</body>
</html>