Merge branch 'dev-win' into dev-winXbee

lib/QMapControl/COPYING.LESSER

-                GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions.
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version.
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.

lib/QMapControl/QMapControl.kdevelop

-<?xml version = '1.0'?>
-<kdevelop>
-  <general>
-    <author>Kai Winter</author>
-    <email>kaiwinter@gmx.de</email>
-    <version>1</version>
-    <projectmanagement>KDevTrollProject</projectmanagement>
-    <primarylanguage>C++</primarylanguage>
-    <keywords>
-      <keyword>Qt</keyword>
-    </keywords>
-    <projectname>QMapControl</projectname>
-    <ignoreparts/>
-    <projectdirectory>src</projectdirectory>
-    <absoluteprojectpath>false</absoluteprojectpath>
-    <description/>
-    <defaultencoding/>
-  </general>
-  <kdevfileview>
-    <groups>
-      <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
-      <group pattern="*.ui" name="User Interface" />
-      <group pattern="*.png" name="Icons" />
-      <group pattern="*" name="Others" />
-      <hidenonprojectfiles>false</hidenonprojectfiles>
-      <hidenonlocation>false</hidenonlocation>
-    </groups>
-    <tree>
-      <hidepatterns>*.o,*.lo,CVS</hidepatterns>
-      <hidenonprojectfiles>false</hidenonprojectfiles>
-    </tree>
-  </kdevfileview>
-  <kdevdoctreeview>
-    <ignoretocs>
-      <toc>bash</toc>
-      <toc>bash_bugs</toc>
-      <toc>clanlib</toc>
-      <toc>w3c-dom-level2-html</toc>
-      <toc>fortran_bugs_gcc</toc>
-      <toc>gnome1</toc>
-      <toc>gnustep</toc>
-      <toc>gtk</toc>
-      <toc>gtk_bugs</toc>
-      <toc>haskell</toc>
-      <toc>haskell_bugs_ghc</toc>
-      <toc>java_bugs_gcc</toc>
-      <toc>java_bugs_sun</toc>
-      <toc>kde2book</toc>
-      <toc>opengl</toc>
-      <toc>pascal_bugs_fp</toc>
-      <toc>php</toc>
-      <toc>php_bugs</toc>
-      <toc>perl</toc>
-      <toc>perl_bugs</toc>
-      <toc>python</toc>
-      <toc>python_bugs</toc>
-      <toc>qt-kdev3</toc>
-      <toc>ruby</toc>
-      <toc>ruby_bugs</toc>
-      <toc>sdl</toc>
-      <toc>stl</toc>
-      <toc>w3c-svg</toc>
-      <toc>sw</toc>
-      <toc>w3c-uaag10</toc>
-      <toc>wxwidgets_bugs</toc>
-    </ignoretocs>
-    <ignoredoxygen>
-      <toc>KDE Libraries (Doxygen)</toc>
-    </ignoredoxygen>
-  </kdevdoctreeview>
-  <kdevdebugger>
-    <general>
-      <dbgshell/>
-      <gdbpath/>
-      <configGdbScript/>
-      <runShellScript/>
-      <runGdbScript/>
-      <breakonloadinglibs>true</breakonloadinglibs>
-      <separatetty>false</separatetty>
-      <floatingtoolbar>false</floatingtoolbar>
-      <raiseGDBOnStart>false</raiseGDBOnStart>
-    </general>
-    <display>
-      <staticmembers>false</staticmembers>
-      <demanglenames>true</demanglenames>
-      <outputradix>10</outputradix>
-    </display>
-  </kdevdebugger>
-  <kdevcppsupport>
-    <qt>
-      <version>4</version>
-      <used>true</used>
-      <includestyle>4</includestyle>
-      <designerintegration>ExternalDesigner</designerintegration>
-      <root>/usr/lib/qt4</root>
-      <qmake>/usr/lib/qt4/bin/qmake-qt4</qmake>
-      <designer>/usr/lib/qt4/bin/designer-qt4</designer>
-      <designerpluginpaths/>
-    </qt>
-    <codecompletion>
-      <automaticCodeCompletion>false</automaticCodeCompletion>
-      <automaticArgumentsHint>true</automaticArgumentsHint>
-      <automaticHeaderCompletion>true</automaticHeaderCompletion>
-      <codeCompletionDelay>250</codeCompletionDelay>
-      <argumentsHintDelay>400</argumentsHintDelay>
-      <headerCompletionDelay>250</headerCompletionDelay>
-      <showOnlyAccessibleItems>false</showOnlyAccessibleItems>
-      <completionBoxItemOrder>0</completionBoxItemOrder>
-      <howEvaluationContextMenu>true</howEvaluationContextMenu>
-      <showCommentWithArgumentHint>true</showCommentWithArgumentHint>
-      <statusBarTypeEvaluation>false</statusBarTypeEvaluation>
-      <namespaceAliases>std=_GLIBCXX_STD;__gnu_cxx=std</namespaceAliases>
-      <processPrimaryTypes>true</processPrimaryTypes>
-      <processFunctionArguments>false</processFunctionArguments>
-      <preProcessAllHeaders>false</preProcessAllHeaders>
-      <parseMissingHeadersExperimental>false</parseMissingHeadersExperimental>
-      <resolveIncludePathsUsingMakeExperimental>false</resolveIncludePathsUsingMakeExperimental>
-      <alwaysParseInBackground>true</alwaysParseInBackground>
-      <usePermanentCaching>true</usePermanentCaching>
-      <alwaysIncludeNamespaces>false</alwaysIncludeNamespaces>
-      <includePaths>.;</includePaths>
-    </codecompletion>
-    <creategettersetter>
-      <prefixGet/>
-      <prefixSet>set</prefixSet>
-      <prefixVariable>m_,_</prefixVariable>
-      <parameterName>theValue</parameterName>
-      <inlineGet>true</inlineGet>
-      <inlineSet>true</inlineSet>
-    </creategettersetter>
-    <splitheadersource>
-      <enabled>false</enabled>
-      <synchronize>true</synchronize>
-      <orientation>Vertical</orientation>
-    </splitheadersource>
-    <references>
-      <pcs>Qt4</pcs>
-    </references>
-  </kdevcppsupport>
-  <kdevfilecreate>
-    <filetypes/>
-    <useglobaltypes>
-      <type ext="ui" />
-      <type ext="qrc" />
-      <type ext="cpp" />
-      <type ext="h" />
-    </useglobaltypes>
-  </kdevfilecreate>
-  <kdevtrollproject>
-    <general>
-      <activedir></activedir>
-    </general>
-    <run>
-      <directoryradio>executable</directoryradio>
-      <mainprogram>.</mainprogram>
-      <programargs/>
-      <globaldebugarguments/>
-      <globalcwd>.</globalcwd>
-      <useglobalprogram>true</useglobalprogram>
-      <terminal>false</terminal>
-      <autocompile>false</autocompile>
-      <autoinstall>false</autoinstall>
-      <autokdesu>false</autokdesu>
-      <envvars/>
-    </run>
-    <make>
-      <abortonerror>true</abortonerror>
-      <runmultiplejobs>false</runmultiplejobs>
-      <numberofjobs>1</numberofjobs>
-      <dontact>false</dontact>
-      <makebin/>
-      <prio>0</prio>
-      <envvars/>
-    </make>
-    <qmake>
-      <savebehaviour>2</savebehaviour>
-      <replacePaths>false</replacePaths>
-      <disableDefaultOpts>true</disableDefaultOpts>
-      <enableFilenamesOnly>false</enableFilenamesOnly>
-    </qmake>
-  </kdevtrollproject>
-  <cppsupportpart>
-    <filetemplates>
-      <interfacesuffix>.h</interfacesuffix>
-      <implementationsuffix>.cpp</implementationsuffix>
-    </filetemplates>
-  </cppsupportpart>
-  <ctagspart>
-    <customArguments/>
-    <customTagfilePath>.</customTagfilePath>
-    <activeTagsFiles/>
-  </ctagspart>
-</kdevelop>

lib/QMapControl/QMapControl.kdevses

-<?xml version = '1.0' encoding = 'UTF-8'?>
-<!DOCTYPE KDevPrjSession>
-<KDevPrjSession>
- <DocsAndViews NumberOfDocuments="12" >
-  <Doc0 NumberOfViews="1" URL="file:///home/kai/work/qmapcontrol/QMapControl/src/imagepoint.cpp" >
-   <View0 Encoding="" Type="Source" />
-  </Doc0>
-  <Doc1 NumberOfViews="1" URL="file:///home/kai/work/qmapcontrol/QMapControl/src/imagepoint.h" >
-   <View0 Encoding="" Type="Source" />
-  </Doc1>
-  <Doc2 NumberOfViews="1" URL="file:///home/kai/work/qmapcontrol/QMapControl/src/point.cpp" >
-   <View0 Encoding="" Type="Source" />
-  </Doc2>
-  <Doc3 NumberOfViews="1" URL="file:///home/kai/work/qmapcontrol/QMapControl/src/point.h" >
-   <View0 Encoding="" Type="Source" />
-  </Doc3>
-  <Doc4 NumberOfViews="1" URL="file:///home/kai/work/qmapcontrol/QMapControl/src/layer.cpp" >
-   <View0 Encoding="" Type="Source" />
-  </Doc4>
-  <Doc5 NumberOfViews="1" URL="file:///home/kai/work/qmapcontrol/QMapControl/src/layer.h" >
-   <View0 Encoding="" Type="Source" />
-  </Doc5>
-  <Doc6 NumberOfViews="1" URL="file:///home/kai/work/qmapcontrol/QMapControl/src/fixedimagepoint.h" >
-   <View0 Encoding="" line="55" Type="Source" />
-  </Doc6>
-  <Doc7 NumberOfViews="1" URL="file:///home/kai/work/qmapcontrol/QMapControl/src/fixedimagepoint.cpp" >
-   <View0 Encoding="" Type="Source" />
-  </Doc7>
-  <Doc8 NumberOfViews="1" URL="file:///home/kai/work/qmapcontrol/QMapControl/qmapcontrol.h" >
-   <View0 Encoding="" Type="Source" />
-  </Doc8>
-  <Doc9 NumberOfViews="1" URL="file:///home/kai/work/qmapcontrol/QMapControl/QMapControl.pro" >
-   <View0 Encoding="" Type="Source" />
-  </Doc9>
-  <Doc10 NumberOfViews="1" URL="file:///home/kai/work/qmapcontrol/QMapControl/QMapControl.pri" >
-   <View0 Encoding="" Type="Source" />
-  </Doc10>
-  <Doc11 NumberOfViews="1" URL="file:///home/kai/work/qmapcontrol/QMapControl/src/circlepoint.h" >
-   <View0 Encoding="" line="29" Type="Source" />
-  </Doc11>
- </DocsAndViews>
- <pluginList>
-  <kdevdebugger>
-   <breakpointList/>
-   <showInternalCommands value="0" />
-  </kdevdebugger>
-  <kdevastyle>
-   <Extensions ext="*.cpp *.h,*.c *.h,*.cxx *.hxx,*.c++ *.h++,*.cc *.hh,*.C *.H,*.diff,*.inl,*.java,*.moc,*.patch,*.tlh,*.xpm" />
-   <AStyle IndentPreprocessors="0" FillCount="4" PadParenthesesOut="1" IndentNamespaces="1" IndentLabels="1" Fill="Tabs" MaxStatement="40" Brackets="Break" MinConditional="-1" IndentBrackets="0" PadParenthesesUn="1" BlockBreak="0" KeepStatements="1" KeepBlocks="1" BlockIfElse="0" IndentSwitches="1" PadOperators="0" FStyle="UserDefined" IndentCases="0" FillEmptyLines="0" BracketsCloseHeaders="0" BlockBreakAll="0" PadParenthesesIn="1" IndentClasses="1" IndentBlocks="0" FillForce="0" />
-  </kdevastyle>
-  <kdevbookmarks>
-   <bookmarks/>
-  </kdevbookmarks>
-  <kdevvalgrind>
-   <executable path="" params="" />
-   <valgrind path="" params="" />
-   <calltree path="" params="" />
-   <kcachegrind path="" />
-  </kdevvalgrind>
- </pluginList>
-</KDevPrjSession>

lib/QMapControl/QMapControl.pri

-DEPENDPATH += src
-INCLUDEPATH += src
-
-# Input
-HEADERS += curve.h \
-    geometry.h \
-    imagemanager.h \
-    layer.h \
-    layermanager.h \
-    linestring.h \
-    mapadapter.h \
-    mapcontrol.h \
-    mapnetwork.h \
-    point.h \
-    tilemapadapter.h \
-    wmsmapadapter.h \
-    circlepoint.h \
-    imagepoint.h \
-    gps_position.h \
-    osmmapadapter.h \
-    maplayer.h \
-    geometrylayer.h \
-    yahoomapadapter.h \
-    googlemapadapter.h \
-    googlesatmapadapter.h \
-    openaerialmapadapter.h \
-    fixedimageoverlay.h \
-    emptymapadapter.h
-SOURCES += curve.cpp \
-    geometry.cpp \
-    imagemanager.cpp \
-    layer.cpp \
-    layermanager.cpp \
-    linestring.cpp \
-    mapadapter.cpp \
-    mapcontrol.cpp \
-    mapnetwork.cpp \
-    point.cpp \
-    tilemapadapter.cpp \
-    wmsmapadapter.cpp \
-    circlepoint.cpp \
-    imagepoint.cpp \
-    gps_position.cpp \
-    osmmapadapter.cpp \
-    maplayer.cpp \
-    geometrylayer.cpp \
-    yahoomapadapter.cpp \
-    googlemapadapter.cpp \
-    googlesatmapadapter.cpp \
-    openaerialmapadapter.cpp \
-    fixedimageoverlay.cpp \
-    emptymapadapter.cpp

lib/QMapControl/QMapControl.pro

-######################################################################
-# Automatically generated by qmake (2.01a) Thu Nov 22 09:50:33 2007
-######################################################################
-
-TEMPLATE = subdirs
-SUBDIRS += Samples
\ No newline at end of file

lib/QMapControl/qmapcontrol.h

-#include "src/mapcontrol.h"
-#include "src/gps_position.h"
-#include "src/wmsmapadapter.h"
-#include "src/geometry.h"
-#include "src/point.h"
-#include "src/imagepoint.h"
-#include "src/circlepoint.h"
-#include "src/linestring.h"
-#include "src/gps_position.h"
-#include "src/osmmapadapter.h"
-#include "src/maplayer.h"
-#include "src/geometrylayer.h"
-#include "src/yahoomapadapter.h"
-#include "src/googlemapadapter.h"
-#include "src/googlesatmapadapter.h"
-#include "src/openaerialmapadapter.h"
-#include "src/fixedimageoverlay.h"
-#include "src/emptymapadapter.h"

lib/QMapControl/src/circlepoint.cpp

-/*
-*
-* This file is part of QMapControl,
-* an open-source cross-platform map widget
-*
-* Copyright (C) 2007 - 2008 Kai Winter
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public License
-* along with QMapControl. If not, see <http://www.gnu.org/licenses/>.
-*
-* Contact e-mail: kaiwinter@gmx.de
-* Program URL   : http://qmapcontrol.sourceforge.net/
-*
-*/
-
-#include "circlepoint.h"
-namespace qmapcontrol
-{
-    CirclePoint::CirclePoint(qreal x, qreal y, int radius, QString name, Alignment alignment, QPen* pen)
-        : Point(x, y, name, alignment)
-    {
-        size = QSize(radius, radius);
-        mypixmap = new QPixmap(radius+1, radius+1);
-        mypixmap->fill(Qt::transparent);
-        QPainter painter(mypixmap);
-        if (pen != 0)
-        {
-            painter.setPen(*pen);
-        }
-        painter.drawEllipse(0,0,radius, radius);
-    }
-
-    CirclePoint::CirclePoint(qreal x, qreal y, QString name, Alignment alignment, QPen* pen)
-        : Point(x, y, name, alignment)
-    {
-        int radius = 10;
-        size = QSize(radius, radius);
-        mypixmap = new QPixmap(radius+1, radius+1);
-        mypixmap->fill(Qt::transparent);
-        QPainter painter(mypixmap);
-        if (pen != 0)
-        {
-            painter.setPen(*pen);
-        }
-        painter.drawEllipse(0,0,radius, radius);
-    }
-
-    CirclePoint::~CirclePoint()
-    {
-        delete mypixmap;
-    }
-
-    void CirclePoint::setPen(QPen* pen)
-    {
-        mypen = pen;
-        mypixmap = new QPixmap(size.width()+1, size.height()+1);
-        mypixmap->fill(Qt::transparent);
-        QPainter painter(mypixmap);
-        painter.setPen(*pen);
-        painter.drawEllipse(0,0, size.width(), size.height());
-    }
-}

lib/QMapControl/src/circlepoint.h

-/*
-*
-* This file is part of QMapControl,
-* an open-source cross-platform map widget
-*
-* Copyright (C) 2007 - 2008 Kai Winter
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public License
-* along with QMapControl. If not, see <http://www.gnu.org/licenses/>.
-*
-* Contact e-mail: kaiwinter@gmx.de
-* Program URL   : http://qmapcontrol.sourceforge.net/
-*
-*/
-
-#ifndef CIRCLEPOINT_H
-#define CIRCLEPOINT_H
-
-#include "point.h"
-
-namespace qmapcontrol
-{
-    //! Draws a circle into the map
-    /*! This is a conveniece class for Point.
-     * It configures the pixmap of a Point to draw a circle.
-     * A QPen could be used to change the color or line-width of the circle
-     *
-     * @author Kai Winter <kaiwinter@gmx.de>
-     */
-    class CirclePoint : public Point
-    {
-    public:
-        //!
-        /*!
-         *
-         * @param x longitude
-         * @param y latitude
-         * @param name name of the circle point
-         * @param alignment alignment (Middle or TopLeft)
-         * @param pen QPen for drawing
-         */
-        CirclePoint(qreal x, qreal y, QString name = QString(), Alignment alignment = Middle, QPen* pen=0);
-
-        //!
-        /*!
-         *
-         * @param x longitude
-         * @param y latitude
-         * @param radius the radius of the circle
-         * @param name name of the circle point
-         * @param alignment alignment (Middle or TopLeft)
-         * @param pen QPen for drawing
-         */
-        CirclePoint(qreal x, qreal y, int radius = 10, QString name = QString(), Alignment alignment = Middle, QPen* pen=0);
-        virtual ~CirclePoint();
-
-        //! sets the QPen which is used for drawing the circle
-        /*!
-         * A QPen can be used to modify the look of the drawn circle
-         * @param pen the QPen which should be used for drawing
-         * @see http://doc.trolltech.com/4.3/qpen.html
-         */
-        virtual void setPen(QPen* pen);
-
-    };
-}
-#endif

lib/QMapControl/src/curve.cpp

-/*
-*
-* This file is part of QMapControl,
-* an open-source cross-platform map widget
-*
-* Copyright (C) 2007 - 2008 Kai Winter
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public License
-* along with QMapControl. If not, see <http://www.gnu.org/licenses/>.
-*
-* Contact e-mail: kaiwinter@gmx.de
-* Program URL   : http://qmapcontrol.sourceforge.net/
-*
-*/
-
-#include "curve.h"
-namespace qmapcontrol
-{
-    Curve::Curve(QString name)
-        : Geometry(name)
-    {
-    }
-
-
-    Curve::~Curve()
-    {
-    }
-}
-// Geometry Curve::Clone(){}
-
-// QRectF Curve::GetBoundingBox(){}

lib/QMapControl/src/curve.h

-/*
-*
-* This file is part of QMapControl,
-* an open-source cross-platform map widget
-*
-* Copyright (C) 2007 - 2008 Kai Winter
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public License
-* along with QMapControl. If not, see <http://www.gnu.org/licenses/>.
-*
-* Contact e-mail: kaiwinter@gmx.de
-* Program URL   : http://qmapcontrol.sourceforge.net/
-*
-*/
-
-#ifndef CURVE_H
-#define CURVE_H
-
-#include "geometry.h"
-#include "point.h"
-
-namespace qmapcontrol
-{
-    //! A Curve Geometry, implemented to fullfil OGC Spec
-    /*!
-     * The Curve class is used by LineString as parent class.
-     * This class could not be used directly.
-     *
-     * From the OGC Candidate Implementation Specification:
-     * "A Curve is a 1-dimensional geometric object usually stored as a sequence of Points, with the subtype of Curve
-     * specifying the form of the interpolation between Points. This specification defines only one subclass of Curve,
-     * LineString, which uses a linear interpolation between Points."
-     *	@author Kai Winter <kaiwinter@gmx.de>
-     */
-    class Curve : public Geometry
-    {
-        Q_OBJECT
-    public:
-        virtual ~Curve();
-
-        double Length;
-
-        //  virtual Geometry Clone();
-        //  virtual QRectF GetBoundingBox();
-
-        //  virtual Point EndPoint() = 0;
-        //  virtual Point StartPoint() = 0;
-        //  virtual Point Value() = 0;
-
-    protected:
-        Curve(QString name = QString());
-        virtual void draw(QPainter* painter, const MapAdapter* mapadapter, const QRect &screensize, const QPoint offset) = 0;
-    };
-}
-#endif

lib/QMapControl/src/emptymapadapter.cpp

-/*
-*
-* This file is part of QMapControl,
-* an open-source cross-platform map widget
-*
-* Copyright (C) 2007 - 2008 Kai Winter
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public License
-* along with QMapControl. If not, see <http://www.gnu.org/licenses/>.
-*
-* Contact e-mail: kaiwinter@gmx.de
-* Program URL   : http://qmapcontrol.sourceforge.net/
-*
-*/
-
-#include "emptymapadapter.h"
-namespace qmapcontrol
-{
-    EmptyMapAdapter::EmptyMapAdapter(int tileSize, int minZoom, int maxZoom)
-	:MapAdapter("", "", 256, minZoom, maxZoom)
-    {
-        Q_UNUSED(tileSize);
-        PI = acos(-1.0);
-
-	numberOfTiles = tilesonzoomlevel(minZoom);
-    }
-
-    EmptyMapAdapter::~EmptyMapAdapter()
-    {
-    }
-
-    void EmptyMapAdapter::zoom_in()
-    {
-	if (current_zoom < max_zoom)
-	{
-	    current_zoom = current_zoom + 1;
-        }
-	numberOfTiles = tilesonzoomlevel(current_zoom);
-    }
-
-    void EmptyMapAdapter::zoom_out()
-    {
-	if (current_zoom > min_zoom)
-	{
-	    current_zoom = current_zoom - 1;
-	}
-	numberOfTiles = tilesonzoomlevel(current_zoom);
-    }
-
-    qreal EmptyMapAdapter::deg_rad(qreal x) const
-    {
-        return x * (PI/180.0);
-    }
-    qreal EmptyMapAdapter::rad_deg(qreal x) const
-    {
-        return x * (180/PI);
-    }
-
-    QString EmptyMapAdapter::query(int x, int y, int z) const
-    {
-        Q_UNUSED(x);
-        Q_UNUSED(y);
-        Q_UNUSED(z);
-	return "";
-    }
-
-    QPoint EmptyMapAdapter::coordinateToDisplay(const QPointF& coordinate) const
-    {
-        qreal x = (coordinate.x()+180) * (numberOfTiles*mytilesize)/360.; // coord to pixel!
-        qreal y = (1-(log(tan(PI/4+deg_rad(coordinate.y())/2)) /PI)) /2  * (numberOfTiles*mytilesize);
-
-        return QPoint(int(x), int(y));
-    }
-
-    QPointF EmptyMapAdapter::displayToCoordinate(const QPoint& point) const
-    {
-        qreal longitude = (point.x()*(360/(numberOfTiles*mytilesize)))-180;
-        qreal latitude = rad_deg(atan(sinh((1-point.y()*(2/(numberOfTiles*mytilesize)))*PI)));
-
-        return QPointF(longitude, latitude);
-
-    }
-
-    bool EmptyMapAdapter::isValid(int x, int y, int z) const
-    {
-        if (max_zoom < min_zoom)
-        {
-            z= min_zoom - z;
-        }
-
-        if (x<0 || x>pow(2.0,z)-1 ||
-            y<0 || y>pow(2.0,z)-1)
-        {
-            return false;
-        }
-        return true;
-
-    }
-    int EmptyMapAdapter::tilesonzoomlevel(int zoomlevel) const
-    {
-        return int(pow(2.0, zoomlevel));
-    }
-    int EmptyMapAdapter::xoffset(int x) const
-    {
-        return x;
-    }
-    int EmptyMapAdapter::yoffset(int y) const
-    {
-        return y;
-    }
-}

lib/QMapControl/src/geometrylayer.cpp

-/*
-*
-* This file is part of QMapControl,
-* an open-source cross-platform map widget
-*
-* Copyright (C) 2007 - 2008 Kai Winter
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public License
-* along with QMapControl. If not, see <http://www.gnu.org/licenses/>.
-*
-* Contact e-mail: kaiwinter@gmx.de
-* Program URL   : http://qmapcontrol.sourceforge.net/
-*
-*/
-
-#include "geometrylayer.h"
-namespace qmapcontrol
-{
-    GeometryLayer::GeometryLayer(QString layername, MapAdapter* mapadapter, bool takeevents)
-        : Layer(layername, mapadapter, Layer::GeometryLayer, takeevents)
-    {
-    }
-
-
-    GeometryLayer::~GeometryLayer()
-    {
-    }
-}