Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Education
Marble
Commits
06658a44
Commit
06658a44
authored
Jul 03, 2016
by
Dennis Nienhüser
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reduce memory consumption a bit
parent
b4dd2682
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
12 deletions
+14
-12
src/lib/marble/geodata/data/GeoDataCoordinates.cpp
src/lib/marble/geodata/data/GeoDataCoordinates.cpp
+3
-3
src/lib/marble/geodata/data/GeoDataCoordinates.h
src/lib/marble/geodata/data/GeoDataCoordinates.h
+2
-2
src/lib/marble/geodata/data/GeoDataCoordinates_p.h
src/lib/marble/geodata/data/GeoDataCoordinates_p.h
+1
-1
src/lib/marble/geodata/data/GeoDataLineString.cpp
src/lib/marble/geodata/data/GeoDataLineString.cpp
+4
-4
src/lib/marble/geodata/data/GeoDataLineString_p.h
src/lib/marble/geodata/data/GeoDataLineString_p.h
+4
-2
No files found.
src/lib/marble/geodata/data/GeoDataCoordinates.cpp
View file @
06658a44
...
...
@@ -1285,15 +1285,15 @@ qreal GeoDataCoordinates::utmNorthing() const{
return
GeoDataCoordinatesPrivate
::
lonLatToNorthing
(
d
->
m_lon
,
d
->
m_lat
);
}
int
GeoDataCoordinates
::
detail
()
const
qu
int
8
GeoDataCoordinates
::
detail
()
const
{
return
d
->
m_detail
;
}
void
GeoDataCoordinates
::
setDetail
(
const
int
det
)
void
GeoDataCoordinates
::
setDetail
(
qu
int
8
det
ail
)
{
detach
();
d
->
m_detail
=
det
;
d
->
m_detail
=
det
ail
;
}
GeoDataCoordinates
GeoDataCoordinates
::
rotateAround
(
const
GeoDataCoordinates
&
axis
,
qreal
angle
,
Unit
unit
)
const
...
...
src/lib/marble/geodata/data/GeoDataCoordinates.h
View file @
06658a44
...
...
@@ -255,13 +255,13 @@ class GEODATA_EXPORT GeoDataCoordinates
* @brief return the detail flag
* detail range: 0 for most important points, 5 for least important
*/
int
detail
()
const
;
qu
int
8
detail
()
const
;
/**
* @brief set the detail flag
* @param det detail
*/
void
setDetail
(
const
int
detail
);
void
setDetail
(
qu
int
8
detail
);
/**
* @brief Rotates one coordinate around another.
...
...
src/lib/marble/geodata/data/GeoDataCoordinates_p.h
View file @
06658a44
...
...
@@ -206,7 +206,7 @@ class GeoDataCoordinatesPrivate
qreal
m_lon
;
qreal
m_lat
;
qreal
m_altitude
;
// in meters above sea level
int
m_detail
;
qu
int
8
m_detail
;
QAtomicInt
ref
;
/* UTM Ellipsoid model constants (actual values here are for WGS84) */
...
...
src/lib/marble/geodata/data/GeoDataLineString.cpp
View file @
06658a44
...
...
@@ -132,7 +132,7 @@ GeoDataCoordinates GeoDataLineStringPrivate::findDateLine( const GeoDataCoordina
return
findDateLine
(
previousCoords
,
interpolatedCoords
,
recursionCounter
);
}
int
GeoDataLineStringPrivate
::
levelForResolution
(
qreal
resolution
)
const
{
qu
int
8
GeoDataLineStringPrivate
::
levelForResolution
(
qreal
resolution
)
const
{
if
(
m_previousResolution
==
resolution
)
return
m_level
;
m_previousResolution
=
resolution
;
...
...
@@ -227,10 +227,10 @@ void GeoDataLineStringPrivate::optimize (GeoDataLineString& lineString) const
if
(
lineString
.
size
()
<
2
)
return
;
// Calculate the least non-zero detail-level by checking the bounding box
int
startLevel
=
levelForResolution
(
(
lineString
.
latLonAltBox
().
width
()
+
lineString
.
latLonAltBox
().
height
()
)
/
2
);
qu
int
8
startLevel
=
levelForResolution
(
(
lineString
.
latLonAltBox
().
width
()
+
lineString
.
latLonAltBox
().
height
()
)
/
2
);
int
currentLevel
=
startLevel
;
int
maxLevel
=
startLevel
;
qu
int
8
currentLevel
=
startLevel
;
qu
int
8
maxLevel
=
startLevel
;
GeoDataCoordinates
currentCoords
;
lineString
.
first
().
setDetail
(
startLevel
);
...
...
src/lib/marble/geodata/data/GeoDataLineString_p.h
View file @
06658a44
...
...
@@ -87,7 +87,7 @@ class GeoDataLineStringPrivate : public GeoDataGeometryPrivate
const
GeoDataCoordinates
&
currentCoords
,
int
recursionCounter
)
const
;
int
levelForResolution
(
qreal
resolution
)
const
;
qu
int
8
levelForResolution
(
qreal
resolution
)
const
;
qreal
resolutionForLevel
(
int
level
)
const
;
void
optimize
(
GeoDataLineString
&
lineString
)
const
;
...
...
@@ -101,7 +101,9 @@ class GeoDataLineStringPrivate : public GeoDataGeometryPrivate
// been calculated. Saves performance.
TessellationFlags
m_tessellationFlags
;
mutable
qreal
m_previousResolution
;
mutable
qreal
m_level
;};
mutable
quint8
m_level
;
};
}
// namespace Marble
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment