On Fri, 4 Nov 2011, Oliver Eichler wrote:
Can't ignore. It's already in svn
ok, here's the (small) followup
Michael
--
fjelljo.puffin.lb.shuttle.de:~ > uptime
20:50 up 24 days, 4 mins, 4 users, load averages: 1.62 1.50 1.28
From 1e53a7f62a4946ef91887c7cf8000f56bbe0c41c Mon Sep 17 00:00:00 2001
From: Michael Klein <[email protected]>
Date: Fri, 4 Nov 2011 20:49:10 +0100
Subject: [PATCH] polyline optimization patch followup
---
src/CMapTDB.cpp | 7 ++++++-
src/CResources.cpp | 4 ----
src/CResources.h | 2 --
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/CMapTDB.cpp b/src/CMapTDB.cpp
index 9c5a99c..8978112 100644
--- a/src/CMapTDB.cpp
+++ b/src/CMapTDB.cpp
@@ -51,7 +51,12 @@
#undef DEBUG_SHOW_SECTION_BORDERS
#define DEBUG_SHOW_MAPLEVELS
+// epsilon for douglas-peucker polyline simplification
+#define POLYLINE_SIMPLIFICATION_EPSILON 1.9
+
+// disable polyline simplification for close-up zoom
#define POLYLINE_SIMPLIFICATION_THRESHOLD 1.0
+
#define STREETNAME_THRESHOLD 5.0
#define TEXTWIDTH 300
@@ -1979,7 +1984,7 @@ void CMapTDB::simplifyPolyline(QPolygonF::iterator begin,
QPolygonF::iterator en
}
}
- if (max_dist >= CResources::self().polylineSimplificationEpsilon())
+ if (max_dist >= POLYLINE_SIMPLIFICATION_EPSILON)
{
simplifyPolyline(max_pos, end);
simplifyPolyline(begin, max_pos + 1);
diff --git a/src/CResources.cpp b/src/CResources.cpp
index ae30b3f..bb4ca21 100644
--- a/src/CResources.cpp
+++ b/src/CResources.cpp
@@ -64,7 +64,6 @@ CResources::CResources(QObject * parent)
, m_showZoomLevel(true)
, m_useAntiAliasing(true)
, m_reducePoiIcons(true)
-, m_polylineSimplificationEpsilon(2.5)
, m_WptTextColor(Qt::black)
{
@@ -140,8 +139,6 @@ CResources::CResources(QObject * parent)
m_useAntiAliasing =
cfg.value("environment/useAntiAliasing",m_useAntiAliasing).toBool();
m_reducePoiIcons =
cfg.value("environment/reducePoiIcons",m_reducePoiIcons).toBool();
- m_polylineSimplificationEpsilon =
cfg.value("environment/polylineSimplificationEpsilon",m_polylineSimplificationEpsilon).toDouble();
-
m_WptTextColor = QColor(cfg.value("environment/wptTextColor",
m_WptTextColor.name()).toString());
QDir dirWeb(QDir::home().filePath(CONFIGDIR));
@@ -206,7 +203,6 @@ CResources::~CResources()
cfg.setValue("environment/showZoomLevel",m_showZoomLevel);
cfg.setValue("environment/useAntiAliasing",m_useAntiAliasing);
cfg.setValue("environment/reducePoiIcons",m_reducePoiIcons);
-
cfg.setValue("environment/polylineSimplificationEpsilon",m_polylineSimplificationEpsilon);
cfg.setValue("environment/wptTextColor", m_WptTextColor.name());
}
diff --git a/src/CResources.h b/src/CResources.h
index ba5bde6..e25cd1b 100644
--- a/src/CResources.h
+++ b/src/CResources.h
@@ -72,7 +72,6 @@ class CResources : public QObject
bool playSound(){return m_playSound;}
bool useAntiAliasing(){return m_useAntiAliasing;}
bool reducePoiIcons(){return m_reducePoiIcons;}
- double polylineSimplificationEpsilon(){return
m_polylineSimplificationEpsilon;}
QColor wptTextColor(){return m_WptTextColor;}
@@ -146,7 +145,6 @@ class CResources : public QObject
bool m_showZoomLevel;
bool m_useAntiAliasing;
bool m_reducePoiIcons;
- double m_polylineSimplificationEpsilon;
QColor m_WptTextColor;
--
1.7.6.1
------------------------------------------------------------------------------
RSA(R) Conference 2012
Save $700 by Nov 18
Register now
http://p.sf.net/sfu/rsa-sfdev2dev1
_______________________________________________
Qlandkartegt-users mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/qlandkartegt-users
