[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [marble/KDE/4.12] src/bindings/python/sip: Python bindings update for 4.12.
From: Simon Edwards <simon () simonzone ! com>
Date: 2013-11-26 20:20:56
Message-ID: E1VlP7w-0004JG-6s () scm ! kde ! org
[Download RAW message or body]
Git commit ae5e650857826d239109126c80faaa6183a78ac9 by Simon Edwards.
Committed on 26/11/2013 at 20:17.
Pushed by sedwards into branch 'KDE/4.12'.
Python bindings update for 4.12.
M +1 -1 src/bindings/python/sip/AbstractDataPlugin.sip
M +21 -3 src/bindings/python/sip/AbstractDataPluginItem.sip
M +0 -4 src/bindings/python/sip/AbstractProjection.sip
M +0 -1 src/bindings/python/sip/GeoDataCoordinates.sip
M +1 -1 src/bindings/python/sip/GeoDataDocument.sip
M +0 -2 src/bindings/python/sip/GeoDataFeature.sip
M +3 -1 src/bindings/python/sip/GeoDataGroundOverlay.sip
M +0 -1 src/bindings/python/sip/GeoDataIconStyle.sip
M +1 -0 src/bindings/python/sip/GeoDataLatLonBox.sip
M +1 -1 src/bindings/python/sip/GeoDataLineString.sip
M +0 -1 src/bindings/python/sip/GeoDataLinearRing.sip
M +4 -0 src/bindings/python/sip/GeoDataListStyle.sip
M +0 -11 src/bindings/python/sip/GeoDataOverlay.sip
M +2 -0 src/bindings/python/sip/GeoDocument.sip
M +1 -1 src/bindings/python/sip/MapThemeManager.sip
M +2 -1 src/bindings/python/sip/MapViewWidget.sip
C +5 -10 src/bindings/python/sip/MarbleDebug.sip [from: src/bindings/python/sip/SearchRunner.sip - \
064% similarity] M +1 -2 src/bindings/python/sip/MarbleGlobal.sip
M +2 -1 src/bindings/python/sip/MarbleModel.sip
C +10 -9 src/bindings/python/sip/MarbleWidgetPopupMenu.sip [from: \
src/bindings/python/sip/SearchRunner.sip - 061% similarity] C +8 -9 \
src/bindings/python/sip/ParsingRunnerManager.sip [from: src/bindings/python/sip/SearchRunner.sip - 057% \
similarity] M +5 -0 src/bindings/python/sip/PluginInterface.sip
A +52 -0 src/bindings/python/sip/PluginManager.sip
C +10 -8 src/bindings/python/sip/PositionProviderPlugin.sip [from: \
src/bindings/python/sip/SearchRunner.sip - 057% similarity] M +3 -2 \
src/bindings/python/sip/PositionTracking.sip M +9 -2 \
src/bindings/python/sip/QtMarbleConfigDialog.sip C +8 -9 \
src/bindings/python/sip/ReverseGeocodingRunnerManager.sip [from: src/bindings/python/sip/SearchRunner.sip \
- 056% similarity] M +3 -0 src/bindings/python/sip/RouteRequest.sip
M +2 -1 src/bindings/python/sip/RoutingModel.sip
C +8 -9 src/bindings/python/sip/RoutingRunnerManager.sip [from: \
src/bindings/python/sip/SearchRunner.sip - 061% similarity] M +1 -1 \
src/bindings/python/sip/SearchRunner.sip C +10 -9 src/bindings/python/sip/SearchRunnerManager.sip \
[from: src/bindings/python/sip/SearchRunner.sip - 050% similarity] M +2 -1 \
src/bindings/python/sip/TileId.sip M +0 -2 src/bindings/python/sip/ViewportParams.sip
M +12 -5 src/bindings/python/sip/marblemod.sip
http://commits.kde.org/marble/ae5e650857826d239109126c80faaa6183a78ac9
diff --git a/src/bindings/python/sip/AbstractDataPlugin.sip \
b/src/bindings/python/sip/AbstractDataPlugin.sip index 4fcc0d6..63a3710 100644
--- a/src/bindings/python/sip/AbstractDataPlugin.sip
+++ b/src/bindings/python/sip/AbstractDataPlugin.sip
@@ -44,7 +44,6 @@ public:
AbstractDataPlugin (const Marble::MarbleModel* marbleModel);
bool isInitialized () const;
// FIXME
-//ig void setDelegate (QDeclarativeComponent* delegate, QGraphicsItem* parent);
void setFavoriteItemsOnly (bool favoriteOnly);
bool isFavoriteItemsOnly () const;
QObject* favoritesModel ();
@@ -54,6 +53,7 @@ signals:
public:
virtual Marble::RenderPlugin::RenderType renderType () const;
void handleViewportChange (const Marble::ViewportParams* viewport);
+//ig void setDelegate (QQmlComponent* delegate, QGraphicsItem* parent);
};
// AbstractDataPlugin
diff --git a/src/bindings/python/sip/AbstractDataPluginItem.sip \
b/src/bindings/python/sip/AbstractDataPluginItem.sip index 604b3ed..8593d9e 100644
--- a/src/bindings/python/sip/AbstractDataPluginItem.sip
+++ b/src/bindings/python/sip/AbstractDataPluginItem.sip
@@ -48,22 +48,28 @@
#include <MarbleMap.h>
#include <MarbleModel.h>
#include <MarbleNavigator.h>
-#include <MarbleRunnerManager.h>
#include <MarbleWidget.h>
+#include <MarbleWidgetPopupMenu.h>
#include <NavigationWidget.h>
#include <ParseRunnerPlugin.h>
#include <ParsingRunner.h>
+#include <ParsingRunnerManager.h>
#include <PluginAboutDialog.h>
+#include <PluginManager.h>
+#include <PositionProviderPlugin.h>
#include <PositionTracking.h>
#include <QtMarbleConfigDialog.h>
#include <RenderPlugin.h>
#include <ReverseGeocodingRunner.h>
+#include <ReverseGeocodingRunnerManager.h>
#include <ReverseGeocodingRunnerPlugin.h>
#include <routing/RouteRequest.h>
#include <routing/RoutingModel.h>
#include <RoutingRunner.h>
+#include <RoutingRunnerManager.h>
#include <RoutingRunnerPlugin.h>
#include <SearchRunner.h>
+#include <SearchRunnerManager.h>
#include <SearchRunnerPlugin.h>
#include <SunLocator.h>
#include <TileCreator.h>
@@ -121,12 +127,18 @@ public:
sipType = sipType_Marble_MarbleMap;
else if (dynamic_cast<Marble::MarbleModel*>(sipCpp))
sipType = sipType_Marble_MarbleModel;
- else if (dynamic_cast<Marble::MarbleRunnerManager*>(sipCpp))
- sipType = sipType_Marble_MarbleRunnerManager;
+ else if (dynamic_cast<Marble::MarbleWidgetPopupMenu*>(sipCpp))
+ sipType = sipType_Marble_MarbleWidgetPopupMenu;
else if (dynamic_cast<Marble::ParseRunnerPlugin*>(sipCpp))
sipType = sipType_Marble_ParseRunnerPlugin;
else if (dynamic_cast<Marble::ParsingRunner*>(sipCpp))
sipType = sipType_Marble_ParsingRunner;
+ else if (dynamic_cast<Marble::ParsingRunnerManager*>(sipCpp))
+ sipType = sipType_Marble_ParsingRunnerManager;
+ else if (dynamic_cast<Marble::PluginManager*>(sipCpp))
+ sipType = sipType_Marble_PluginManager;
+ else if (dynamic_cast<Marble::PositionProviderPlugin*>(sipCpp))
+ sipType = sipType_Marble_PositionProviderPlugin;
else if (dynamic_cast<Marble::PositionTracking*>(sipCpp))
sipType = sipType_Marble_PositionTracking;
else if (dynamic_cast<Marble::RenderPlugin*>(sipCpp))
@@ -139,16 +151,22 @@ public:
}
else if (dynamic_cast<Marble::ReverseGeocodingRunner*>(sipCpp))
sipType = sipType_Marble_ReverseGeocodingRunner;
+ else if (dynamic_cast<Marble::ReverseGeocodingRunnerManager*>(sipCpp))
+ sipType = sipType_Marble_ReverseGeocodingRunnerManager;
else if (dynamic_cast<Marble::ReverseGeocodingRunnerPlugin*>(sipCpp))
sipType = sipType_Marble_ReverseGeocodingRunnerPlugin;
else if (dynamic_cast<Marble::RouteRequest*>(sipCpp))
sipType = sipType_Marble_RouteRequest;
else if (dynamic_cast<Marble::RoutingRunner*>(sipCpp))
sipType = sipType_Marble_RoutingRunner;
+ else if (dynamic_cast<Marble::RoutingRunnerManager*>(sipCpp))
+ sipType = sipType_Marble_RoutingRunnerManager;
else if (dynamic_cast<Marble::RoutingRunnerPlugin*>(sipCpp))
sipType = sipType_Marble_RoutingRunnerPlugin;
else if (dynamic_cast<Marble::SearchRunner*>(sipCpp))
sipType = sipType_Marble_SearchRunner;
+ else if (dynamic_cast<Marble::SearchRunnerManager*>(sipCpp))
+ sipType = sipType_Marble_SearchRunnerManager;
else if (dynamic_cast<Marble::SearchRunnerPlugin*>(sipCpp))
sipType = sipType_Marble_SearchRunnerPlugin;
else if (dynamic_cast<Marble::SunLocator*>(sipCpp))
diff --git a/src/bindings/python/sip/AbstractProjection.sip \
b/src/bindings/python/sip/AbstractProjection.sip index 33c8e52..3a82bd9 100644
--- a/src/bindings/python/sip/AbstractProjection.sip
+++ b/src/bindings/python/sip/AbstractProjection.sip
@@ -52,8 +52,6 @@ public:
qreal minLat () const;
void setMinLat (qreal minLat);
virtual bool repeatableX () const;
- bool repeatX () const;
- void setRepeatX (bool repeatX);
virtual bool traversablePoles () const;
virtual bool traversableDateLine () const;
virtual Marble::AbstractProjection::SurfaceType surfaceType () const=0;
@@ -65,8 +63,6 @@ public:
virtual bool screenCoordinates (const qreal lon, const qreal lat, const \
Marble::ViewportParams* viewport, qreal& x, qreal& y) const=0; virtual bool screenCoordinates \
(const Marble::GeoDataCoordinates& geopoint, const Marble::ViewportParams* viewport, qreal& x, qreal& y, \
bool& globeHidesPoint) const=0; //ig bool screenCoordinates (const \
Marble::GeoDataCoordinates& geopoint, const Marble::ViewportParams* viewport, qreal& x, \
qreal& y) const;
- bool screenCoordinates (const Marble::GeoDataCoordinates& geopoint, const \
Marble::ViewportParams* viewport, QPointF& screenpoint) const;
-//ig bool screenCoordinates (const Marble::GeoDataCoordinates& coordinates, const \
Marble::ViewportParams* viewport, qreal* x, qreal& y, int& pointRepeatNum, bool& globeHidesPoint) const; \
virtual bool screenCoordinates (const Marble::GeoDataCoordinates& coordinates, const \
Marble::ViewportParams* viewport, qreal* x, qreal& y, int& pointRepeatNum, const QSizeF& size, bool& \
globeHidesPoint) const=0; //ig bool screenCoordinates (const \
Marble::GeoDataLineString& lineString, const Marble::ViewportParams* viewport, QVector<QPolygonF*>& \
polygons) const; virtual bool geoCoordinates (const int x, const int y, const \
Marble::ViewportParams* viewport, qreal& lon, qreal& lat, Marble::GeoDataCoordinates::Unit unit = \
Marble::GeoDataCoordinates::Degree) const=0;
diff --git a/src/bindings/python/sip/GeoDataCoordinates.sip \
b/src/bindings/python/sip/GeoDataCoordinates.sip index e83efca..0d27d3c 100644
--- a/src/bindings/python/sip/GeoDataCoordinates.sip
+++ b/src/bindings/python/sip/GeoDataCoordinates.sip
@@ -40,7 +40,6 @@ public:
DMS,
DM,
UTM,
- MGRS,
Astro
};
diff --git a/src/bindings/python/sip/GeoDataDocument.sip b/src/bindings/python/sip/GeoDataDocument.sip
index 82f73b6..1e28d91 100644
--- a/src/bindings/python/sip/GeoDataDocument.sip
+++ b/src/bindings/python/sip/GeoDataDocument.sip
@@ -49,7 +49,7 @@ public:
QString baseUri () const;
void setBaseUri (const QString& baseUri);
//ig Marble::GeoDataNetworkLinkControl networkLinkControl () const;
-//ig void setNetworkLinkControl (const Marble::GeoDataNetworkLinkControl& \
networkLinkControl); +//ig void setNetworkLinkControl (const \
GeoDataNetworkLinkControl& networkLinkControl); };
// GeoDataDocument
diff --git a/src/bindings/python/sip/GeoDataFeature.sip b/src/bindings/python/sip/GeoDataFeature.sip
index 5d147d2..bdfb052 100644
--- a/src/bindings/python/sip/GeoDataFeature.sip
+++ b/src/bindings/python/sip/GeoDataFeature.sip
@@ -201,7 +201,6 @@ public:
qint64 popularity () const;
void setPopularity (qint64 popularity);
const Marble::GeoDataStyleMap* styleMap () const;
- const QSize symbolSize () const;
static void resetDefaultStyles ();
virtual void pack (QDataStream& stream) const;
virtual void unpack (QDataStream& stream);
@@ -225,7 +224,6 @@ public:
void setRole (const QString& role);
static Marble::GeoDataFeature::GeoDataVisualCategory OsmVisualCategory (const QString& keyValue);
bool isGloballyVisible () const;
- const QImage symbol () const;
int zoomLevel () const;
void setZoomLevel (int index);
static QColor defaultLabelColor ();
diff --git a/src/bindings/python/sip/GeoDataGroundOverlay.sip \
b/src/bindings/python/sip/GeoDataGroundOverlay.sip index 7c330a7..10ade1d 100644
--- a/src/bindings/python/sip/GeoDataGroundOverlay.sip
+++ b/src/bindings/python/sip/GeoDataGroundOverlay.sip
@@ -22,7 +22,6 @@ namespace Marble
class GeoDataGroundOverlay : Marble::GeoDataOverlay
{
%TypeHeaderCode
-#include <GeoDataOverlay.h>
#include <GeoDataGroundOverlay.h>
%End
@@ -37,5 +36,8 @@ public:
void setAltitudeMode (const Marble::AltitudeMode altitudeMode);
Marble::GeoDataLatLonBox& latLonBox () const;
void setLatLonBox (const Marble::GeoDataLatLonBox& box);
+//ig const GeoDataLatLonQuad& latLonQuad () const;
+//ig GeoDataLatLonQuad& latLonQuad ();
+//ig void setLatLonQuad (const GeoDataLatLonQuad& quad);
};
};
diff --git a/src/bindings/python/sip/GeoDataIconStyle.sip b/src/bindings/python/sip/GeoDataIconStyle.sip
index 8071be9..a35e5f6 100644
--- a/src/bindings/python/sip/GeoDataIconStyle.sip
+++ b/src/bindings/python/sip/GeoDataIconStyle.sip
@@ -31,7 +31,6 @@ public:
QImage icon () const;
void setIconPath (const QString& filename);
void setHotSpot (const QPointF& hotSpot, Marble::GeoDataHotSpot::Units xunits, \
Marble::GeoDataHotSpot::Units yunits);
- const QPointF& hotSpot () const;
void setScale (const float& scale /in/);
float scale () const;
virtual void pack (QDataStream& stream) const;
diff --git a/src/bindings/python/sip/GeoDataLatLonBox.sip b/src/bindings/python/sip/GeoDataLatLonBox.sip
index eeab93e..62acdd1 100644
--- a/src/bindings/python/sip/GeoDataLatLonBox.sip
+++ b/src/bindings/python/sip/GeoDataLatLonBox.sip
@@ -65,6 +65,7 @@ public:
Marble::GeoDataLatLonBox& operator |= (const Marble::GeoDataLatLonBox& other);
void boundaries (qreal& north, qreal& south, qreal& east, qreal& west, \
Marble::GeoDataCoordinates::Unit unit = Marble::GeoDataCoordinates::Radian) const; virtual void \
clear (); + Marble::GeoDataLatLonBox toCircumscribedRectangle () const;
};
// GeoDataLatLonBox
diff --git a/src/bindings/python/sip/GeoDataLineString.sip \
b/src/bindings/python/sip/GeoDataLineString.sip index c6a722d..e13720b 100644
--- a/src/bindings/python/sip/GeoDataLineString.sip
+++ b/src/bindings/python/sip/GeoDataLineString.sip
@@ -74,9 +74,9 @@ public:
void remove (int i);
protected:
//ig GeoDataLineString (GeoDataLineStringPrivate* priv);
-public:
// FIXME
+public:
//ig QVector<GeoDataCoordinates>::ConstIterator begin () const;
//ig QVector<GeoDataCoordinates>::ConstIterator end () const;
diff --git a/src/bindings/python/sip/GeoDataLinearRing.sip \
b/src/bindings/python/sip/GeoDataLinearRing.sip index dc6254a..50143c7 100644
--- a/src/bindings/python/sip/GeoDataLinearRing.sip
+++ b/src/bindings/python/sip/GeoDataLinearRing.sip
@@ -30,7 +30,6 @@ public:
virtual bool isClosed () const;
GeoDataLinearRing (const Marble::GeoDataGeometry& other);
virtual qreal length (qreal planetRadius, int offset = 0) const;
-//ig virtual QVector<Marble::GeoDataLineString*> toRangeCorrected () const;
virtual bool contains (const Marble::GeoDataCoordinates& coordinates) const;
};
// GeoDataLinearRing
diff --git a/src/bindings/python/sip/GeoDataListStyle.sip b/src/bindings/python/sip/GeoDataListStyle.sip
index e687a91..454d6ca 100644
--- a/src/bindings/python/sip/GeoDataListStyle.sip
+++ b/src/bindings/python/sip/GeoDataListStyle.sip
@@ -66,5 +66,9 @@ public:
void clear ();
virtual void pack (QDataStream& stream) const;
virtual void unpack (QDataStream& stream);
+//ig QVector<GeoDataItemIcon*>::Iterator begin ();
+//ig QVector<GeoDataItemIcon*>::Iterator end ();
+//ig QVector<GeoDataItemIcon*>::ConstIterator constBegin () const;
+//ig QVector<GeoDataItemIcon*>::ConstIterator constEnd () const;
};
};
diff --git a/src/bindings/python/sip/GeoDataOverlay.sip b/src/bindings/python/sip/GeoDataOverlay.sip
index 0d73915..6054c74 100644
--- a/src/bindings/python/sip/GeoDataOverlay.sip
+++ b/src/bindings/python/sip/GeoDataOverlay.sip
@@ -27,16 +27,5 @@ class GeoDataOverlay : Marble::GeoDataFeature
public:
GeoDataOverlay ();
- ~GeoDataOverlay ();
- GeoDataOverlay (const Marble::GeoDataOverlay& other);
- QColor color () const;
- void setColor (const QColor& color);
- int drawOrder () const;
- void setDrawOrder (int order);
- QImage icon () const;
- void setIcon (const QImage& icon);
- void setIconFile (const QString& path);
- QString iconFile () const;
- QString absoluteIconFile () const;
};
};
diff --git a/src/bindings/python/sip/GeoDocument.sip b/src/bindings/python/sip/GeoDocument.sip
index e4e3f0c..78a7c28 100644
--- a/src/bindings/python/sip/GeoDocument.sip
+++ b/src/bindings/python/sip/GeoDocument.sip
@@ -87,6 +87,8 @@ protected:
sipType = sipType_Marble_GeoDataOverlay;
if (dynamic_cast<Marble::GeoDataGroundOverlay*>(sipCpp))
sipType = sipType_Marble_GeoDataGroundOverlay;
+ else if (dynamic_cast<Marble::GeoDataGroundOverlay*>(sipCpp))
+ sipType = sipType_Marble_GeoDataGroundOverlay;
}
else if (dynamic_cast<Marble::GeoDataPlacemark*>(sipCpp))
sipType = sipType_Marble_GeoDataPlacemark;
diff --git a/src/bindings/python/sip/MapThemeManager.sip b/src/bindings/python/sip/MapThemeManager.sip
index 8adc717..8d7d946 100644
--- a/src/bindings/python/sip/MapThemeManager.sip
+++ b/src/bindings/python/sip/MapThemeManager.sip
@@ -33,9 +33,9 @@ signals:
void themesChanged ();
public:
QStringList mapThemeIds () const;
-//ig GeoSceneDocument* loadMapTheme (const QString& mapThemeStringID) const;
static void deleteMapTheme (const QString& mapThemeId);
QStandardItemModel* celestialBodiesModel ();
+//ig static GeoSceneDocument* loadMapTheme (const QString& mapThemeStringID);
};
// MapThemeManager
diff --git a/src/bindings/python/sip/MapViewWidget.sip b/src/bindings/python/sip/MapViewWidget.sip
index b9b0d42..5c0b9bd 100644
--- a/src/bindings/python/sip/MapViewWidget.sip
+++ b/src/bindings/python/sip/MapViewWidget.sip
@@ -28,7 +28,6 @@ class MapViewWidget : QWidget
public:
MapViewWidget (QWidget* parent /TransferThis/ = 0, Qt::WindowFlags f = 0);
~MapViewWidget ();
- void setMarbleWidget (Marble::MarbleWidget* widget);
signals:
void showMapWizard ();
void showUploadDialog ();
@@ -43,5 +42,7 @@ protected:
void resizeEvent (QResizeEvent* event);
signals:
void mapThemeDeleted ();
+public:
+ void setMarbleWidget (Marble::MarbleWidget* widget, Marble::MapThemeManager* \
mapThemeManager); };
};
diff --git a/src/bindings/python/sip/SearchRunner.sip b/src/bindings/python/sip/MarbleDebug.sip
similarity index 64%
copy from src/bindings/python/sip/SearchRunner.sip
copy to src/bindings/python/sip/MarbleDebug.sip
index b8f7009..672d473 100644
--- a/src/bindings/python/sip/SearchRunner.sip
+++ b/src/bindings/python/sip/MarbleDebug.sip
@@ -19,20 +19,15 @@
namespace Marble
{
-class SearchRunner : QObject
+class MarbleDebug
{
%TypeHeaderCode
-#include <SearchRunner.h>
+#include <MarbleDebug.h>
%End
public:
- explicit SearchRunner (QObject* parent /TransferThis/ = 0);
- void setModel (const Marble::MarbleModel* model);
- virtual void search (const QString& searchTerm, const Marble::GeoDataLatLonAltBox& \
preferred)=0;
-signals:
-// FIXME
-//ig void searchFinished (QVector<Marble::GeoDataPlacemark*> result);
-protected:
- const Marble::MarbleModel* model () const;
+ static bool isEnabled ();
+ static void setEnabled (bool enabled);
};
+//ig QDebug mDebug ();
};
diff --git a/src/bindings/python/sip/MarbleGlobal.sip b/src/bindings/python/sip/MarbleGlobal.sip
index c42c721..5dd45b1 100644
--- a/src/bindings/python/sip/MarbleGlobal.sip
+++ b/src/bindings/python/sip/MarbleGlobal.sip
@@ -59,8 +59,7 @@ enum AngleUnit
{
DMSDegree,
DecimalDegree,
- UTM,
- MGRS
+ UTM
};
diff --git a/src/bindings/python/sip/MarbleModel.sip b/src/bindings/python/sip/MarbleModel.sip
index 8374c89..ca383e3 100644
--- a/src/bindings/python/sip/MarbleModel.sip
+++ b/src/bindings/python/sip/MarbleModel.sip
@@ -67,7 +67,6 @@ public:
QItemSelectionModel* placemarkSelectionModel ();
//ig GeoSceneDocument* mapTheme ();
void home (qreal& lon, qreal& lat, int& zoom) const;
- Marble::MapThemeManager* mapThemeManager ();
//ig HttpDownloadManager* downloadManager ();
//ig FileManager* fileManager ();
//ig MarbleClock* clock ();
@@ -92,6 +91,8 @@ public:
const Marble::GeoDataTreeModel* treeModel () const;
const QAbstractItemModel* placemarkModel () const;
void updateProperty (const QString& property, bool value);
+//ig QAbstractItemModel* groundOverlayModel ();
+ const QAbstractItemModel* groundOverlayModel () const;
};
// MarbleModel
diff --git a/src/bindings/python/sip/SearchRunner.sip b/src/bindings/python/sip/MarbleWidgetPopupMenu.sip
similarity index 61%
copy from src/bindings/python/sip/SearchRunner.sip
copy to src/bindings/python/sip/MarbleWidgetPopupMenu.sip
index b8f7009..9027d59 100644
--- a/src/bindings/python/sip/SearchRunner.sip
+++ b/src/bindings/python/sip/MarbleWidgetPopupMenu.sip
@@ -19,20 +19,21 @@
namespace Marble
{
-class SearchRunner : QObject
+class MarbleWidgetPopupMenu : QObject
{
%TypeHeaderCode
-#include <SearchRunner.h>
+#include <MarbleWidgetPopupMenu.h>
%End
public:
- explicit SearchRunner (QObject* parent /TransferThis/ = 0);
- void setModel (const Marble::MarbleModel* model);
- virtual void search (const QString& searchTerm, const Marble::GeoDataLatLonAltBox& \
preferred)=0; + MarbleWidgetPopupMenu (Marble::MarbleWidget*, const \
Marble::MarbleModel*); + virtual ~MarbleWidgetPopupMenu ();
+ void addAction (Qt::MouseButton button, QAction* action);
+ QPoint mousePosition () const;
signals:
-// FIXME
-//ig void searchFinished (QVector<Marble::GeoDataPlacemark*> result);
-protected:
- const Marble::MarbleModel* model () const;
+ void trackPlacemark (const Marble::GeoDataPlacemark* placemark);
+public:
+ void showLmbMenu (int, int);
+ void showRmbMenu (int, int);
};
};
diff --git a/src/bindings/python/sip/SearchRunner.sip b/src/bindings/python/sip/ParsingRunnerManager.sip
similarity index 57%
copy from src/bindings/python/sip/SearchRunner.sip
copy to src/bindings/python/sip/ParsingRunnerManager.sip
index b8f7009..3086858 100644
--- a/src/bindings/python/sip/SearchRunner.sip
+++ b/src/bindings/python/sip/ParsingRunnerManager.sip
@@ -19,20 +19,19 @@
namespace Marble
{
-class SearchRunner : QObject
+class ParsingRunnerManager : QObject
{
%TypeHeaderCode
-#include <SearchRunner.h>
+#include <ParsingRunnerManager.h>
%End
public:
- explicit SearchRunner (QObject* parent /TransferThis/ = 0);
- void setModel (const Marble::MarbleModel* model);
- virtual void search (const QString& searchTerm, const Marble::GeoDataLatLonAltBox& \
preferred)=0; + explicit ParsingRunnerManager (const Marble::PluginManager* \
pluginManager, QObject* parent /TransferThis/ = 0); + ~ParsingRunnerManager ();
+ void parseFile (const QString& fileName, Marble::DocumentRole role = \
Marble::UserDocument); + Marble::GeoDataDocument* openFile (const QString& fileName, \
Marble::DocumentRole role = Marble::UserDocument, int timeout = 30000); signals:
-// FIXME
-//ig void searchFinished (QVector<Marble::GeoDataPlacemark*> result);
-protected:
- const Marble::MarbleModel* model () const;
+ void parsingFinished (Marble::GeoDataDocument* document, const QString& error = \
QString()); + void parsingFinished ();
};
};
diff --git a/src/bindings/python/sip/PluginInterface.sip b/src/bindings/python/sip/PluginInterface.sip
index a251a28..19f1e34 100644
--- a/src/bindings/python/sip/PluginInterface.sip
+++ b/src/bindings/python/sip/PluginInterface.sip
@@ -40,7 +40,11 @@ public:
if (dynamic_cast<Marble::ParseRunnerPlugin*>(sipCpp))
sipType = sipType_Marble_ParseRunnerPlugin;
else if (dynamic_cast<Marble::PositionProviderPluginInterface*>(sipCpp))
+ {
sipType = sipType_Marble_PositionProviderPluginInterface;
+ if (dynamic_cast<Marble::PositionProviderPlugin*>(sipCpp))
+ sipType = sipType_Marble_PositionProviderPlugin;
+ }
else if (dynamic_cast<Marble::RenderPlugin*>(sipCpp))
{
sipType = sipType_Marble_RenderPlugin;
@@ -81,6 +85,7 @@ class PluginAuthor
#include <AbstractFloatItem.h>
#include <ParseRunnerPlugin.h>
#include <PluginInterface.h>
+#include <PositionProviderPlugin.h>
#include <PositionProviderPluginInterface.h>
#include <RenderPlugin.h>
#include <ReverseGeocodingRunnerPlugin.h>
diff --git a/src/bindings/python/sip/PluginManager.sip b/src/bindings/python/sip/PluginManager.sip
new file mode 100644
index 0000000..ae1f21f
--- /dev/null
+++ b/src/bindings/python/sip/PluginManager.sip
@@ -0,0 +1,52 @@
+// Copyright 2011 Simon Edwards <simon@simonzone.com>
+
+// Generated by twine2
+
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU Library General Public License as
+// published by the Free Software Foundation; either version 2, 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 General Public License for more details
+
+// You should have received a copy of the GNU Library General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc.,
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+namespace Marble
+{
+class PluginManager : QObject
+{
+%TypeHeaderCode
+#include <PluginManager.h>
+%End
+
+public:
+ explicit PluginManager (QObject* parent /TransferThis/ = 0);
+ ~PluginManager ();
+//FIXME
+//ig QList<const Marble::RenderPlugin*> renderPlugins () const;
+ void addRenderPlugin (const Marble::RenderPlugin* plugin);
+ QList<const Marble::PositionProviderPlugin*> positionProviderPlugins () const;
+ void addPositionProviderPlugin (const Marble::PositionProviderPlugin* plugin);
+ QList<const Marble::SearchRunnerPlugin*> searchRunnerPlugins () const;
+ void addSearchRunnerPlugin (const Marble::SearchRunnerPlugin* plugin);
+ QList<const Marble::ReverseGeocodingRunnerPlugin*> reverseGeocodingRunnerPlugins () const;
+ void addReverseGeocodingRunnerPlugin (const Marble::ReverseGeocodingRunnerPlugin* \
plugin); + QList<Marble::RoutingRunnerPlugin*> routingRunnerPlugins () const;
+ void addRoutingRunnerPlugin (Marble::RoutingRunnerPlugin* plugin);
+ QList<const Marble::ParseRunnerPlugin*> parsingRunnerPlugins () const;
+ void addParseRunnerPlugin (const Marble::ParseRunnerPlugin* plugin);
+signals:
+ void renderPluginsChanged ();
+ void positionProviderPluginsChanged ();
+ void searchRunnerPluginsChanged ();
+ void reverseGeocodingRunnerPluginsChanged ();
+ void routingRunnerPluginsChanged ();
+ void parseRunnerPluginsChanged ();
+};
+};
diff --git a/src/bindings/python/sip/SearchRunner.sip \
b/src/bindings/python/sip/PositionProviderPlugin.sip similarity index 57%
copy from src/bindings/python/sip/SearchRunner.sip
copy to src/bindings/python/sip/PositionProviderPlugin.sip
index b8f7009..cf1e7bb 100644
--- a/src/bindings/python/sip/SearchRunner.sip
+++ b/src/bindings/python/sip/PositionProviderPlugin.sip
@@ -19,20 +19,22 @@
namespace Marble
{
-class SearchRunner : QObject
+class PositionProviderPlugin : QObject, Marble::PositionProviderPluginInterface
{
%TypeHeaderCode
-#include <SearchRunner.h>
+#include <PositionProviderPlugin.h>
%End
public:
- explicit SearchRunner (QObject* parent /TransferThis/ = 0);
- void setModel (const Marble::MarbleModel* model);
- virtual void search (const QString& searchTerm, const Marble::GeoDataLatLonAltBox& \
preferred)=0; + virtual ~PositionProviderPlugin ();
+ const Marble::MarbleModel* marbleModel () const;
+ void setMarbleModel (const Marble::MarbleModel*);
+ virtual QString guiString () const=0;
+ virtual Marble::PositionProviderPlugin* newInstance () const=0;
signals:
-// FIXME
-//ig void searchFinished (QVector<Marble::GeoDataPlacemark*> result);
+ void statusChanged (Marble::PositionProviderStatus status) const;
+ void positionChanged (Marble::GeoDataCoordinates position, \
Marble::GeoDataAccuracy accuracy) const; protected:
- const Marble::MarbleModel* model () const;
+ PositionProviderPlugin ();
};
};
diff --git a/src/bindings/python/sip/PositionTracking.sip b/src/bindings/python/sip/PositionTracking.sip
index f612f27..479389d 100644
--- a/src/bindings/python/sip/PositionTracking.sip
+++ b/src/bindings/python/sip/PositionTracking.sip
@@ -27,7 +27,6 @@ class PositionTracking : QObject /Abstract/
public:
~PositionTracking ();
-//ig void setPositionProviderPlugin (PositionProviderPlugin* plugin);
//ig PositionProviderPlugin* positionProviderPlugin ();
QString error () const;
qreal speed () const;
@@ -40,7 +39,6 @@ public:
void clearTrack ();
signals:
void gpsLocation (Marble::GeoDataCoordinates, qreal);
-//ig void positionProviderPluginChanged (PositionProviderPlugin* activePlugin);
public:
bool isTrackEmpty () const;
explicit PositionTracking (Marble::GeoDataTreeModel* model);
@@ -52,5 +50,8 @@ public:
void readSettings ();
void writeSettings ();
bool saveTrack (const QString& fileName);
+ void setPositionProviderPlugin (Marble::PositionProviderPlugin* plugin);
+signals:
+ void positionProviderPluginChanged (Marble::PositionProviderPlugin* \
activePlugin); };
};
diff --git a/src/bindings/python/sip/QtMarbleConfigDialog.sip \
b/src/bindings/python/sip/QtMarbleConfigDialog.sip index befd09a..9c2331d 100644
--- a/src/bindings/python/sip/QtMarbleConfigDialog.sip
+++ b/src/bindings/python/sip/QtMarbleConfigDialog.sip
@@ -31,10 +31,8 @@ public:
Marble::AngleUnit angleUnit () const;
Marble::MapQuality stillQuality () const;
Marble::MapQuality animationQuality () const;
- int labelLocalization () const;
QFont mapFont () const;
Marble::GraphicsSystem graphicsSystem () const;
- int dragLocation () const;
int onStartup () const;
bool animateTargetVoyage () const;
int volatileTileCacheLimit () const;
@@ -62,5 +60,14 @@ public:
void initializeCustomTimezone ();
QLocale::MeasurementSystem measurementSystem () const;
bool inertialEarthRotation () const;
+ bool syncEnabled () const;
+ QString syncBackend () const;
+ bool syncBookmarks () const;
+ bool syncRoutes () const;
+ QString owncloudServer () const;
+ QString owncloudUsername () const;
+ QString owncloudPassword () const;
+signals:
+ void syncNowClicked ();
};
};
diff --git a/src/bindings/python/sip/SearchRunner.sip \
b/src/bindings/python/sip/ReverseGeocodingRunnerManager.sip similarity index 56%
copy from src/bindings/python/sip/SearchRunner.sip
copy to src/bindings/python/sip/ReverseGeocodingRunnerManager.sip
index b8f7009..569212b 100644
--- a/src/bindings/python/sip/SearchRunner.sip
+++ b/src/bindings/python/sip/ReverseGeocodingRunnerManager.sip
@@ -19,20 +19,19 @@
namespace Marble
{
-class SearchRunner : QObject
+class ReverseGeocodingRunnerManager : QObject
{
%TypeHeaderCode
-#include <SearchRunner.h>
+#include <ReverseGeocodingRunnerManager.h>
%End
public:
- explicit SearchRunner (QObject* parent /TransferThis/ = 0);
- void setModel (const Marble::MarbleModel* model);
- virtual void search (const QString& searchTerm, const Marble::GeoDataLatLonAltBox& \
preferred)=0; + explicit ReverseGeocodingRunnerManager (const Marble::MarbleModel* \
marbleModel, QObject* parent /TransferThis/ = 0); + ~ReverseGeocodingRunnerManager ();
+ void reverseGeocoding (const Marble::GeoDataCoordinates& coordinates);
+ QString searchReverseGeocoding (const Marble::GeoDataCoordinates& coordinates, int \
timeout = 30000); signals:
-// FIXME
-//ig void searchFinished (QVector<Marble::GeoDataPlacemark*> result);
-protected:
- const Marble::MarbleModel* model () const;
+ void reverseGeocodingFinished (const Marble::GeoDataCoordinates& coordinates, \
const Marble::GeoDataPlacemark& placemark); + void reverseGeocodingFinished ();
};
};
diff --git a/src/bindings/python/sip/RouteRequest.sip b/src/bindings/python/sip/RouteRequest.sip
index ec6ca21..981fa66 100644
--- a/src/bindings/python/sip/RouteRequest.sip
+++ b/src/bindings/python/sip/RouteRequest.sip
@@ -52,5 +52,8 @@ public:
void append (const Marble::GeoDataCoordinates& coordinates, const QString& name = \
QString());
void insert (int index, const Marble::GeoDataCoordinates& coordinates, const \
QString& name = QString());
void setPosition (int index, const Marble::GeoDataCoordinates& position, const \
QString& name = QString()); + void append (const Marble::GeoDataPlacemark& \
placemark); +//ig Marble::GeoDataPlacemark& operator [] (int index);
+ const Marble::GeoDataPlacemark& operator [] (int index) const;
};
};
diff --git a/src/bindings/python/sip/RoutingModel.sip b/src/bindings/python/sip/RoutingModel.sip
index 1da2865..dad921a 100644
--- a/src/bindings/python/sip/RoutingModel.sip
+++ b/src/bindings/python/sip/RoutingModel.sip
@@ -49,6 +49,7 @@ signals:
void deviatedFromRoute (bool deviated);
void currentRouteChanged ();
public:
- int rightNeighbor (const Marble::GeoDataCoordinates& position, const \
Marble::RouteRequest* route) const; + QHash<int,QByteArray> roleNames () const;
+ int rightNeighbor (const Marble::GeoDataCoordinates& position, const \
Marble::RouteRequest * route) const; };
};
diff --git a/src/bindings/python/sip/SearchRunner.sip b/src/bindings/python/sip/RoutingRunnerManager.sip
similarity index 61%
copy from src/bindings/python/sip/SearchRunner.sip
copy to src/bindings/python/sip/RoutingRunnerManager.sip
index b8f7009..f10fd08 100644
--- a/src/bindings/python/sip/SearchRunner.sip
+++ b/src/bindings/python/sip/RoutingRunnerManager.sip
@@ -19,20 +19,19 @@
namespace Marble
{
-class SearchRunner : QObject
+class RoutingRunnerManager : QObject
{
%TypeHeaderCode
-#include <SearchRunner.h>
+#include <RoutingRunnerManager.h>
%End
public:
- explicit SearchRunner (QObject* parent /TransferThis/ = 0);
- void setModel (const Marble::MarbleModel* model);
- virtual void search (const QString& searchTerm, const Marble::GeoDataLatLonAltBox& \
preferred)=0; + explicit RoutingRunnerManager (const Marble::MarbleModel* marbleModel, \
QObject* parent /TransferThis/ = 0); + ~RoutingRunnerManager ();
+ void retrieveRoute (const Marble::RouteRequest* request);
+//ig QVector<Marble::GeoDataDocument*> searchRoute (const Marble::RouteRequest* request, int timeout \
= 30000); signals:
-// FIXME
-//ig void searchFinished (QVector<Marble::GeoDataPlacemark*> result);
-protected:
- const Marble::MarbleModel* model () const;
+ void routeRetrieved (Marble::GeoDataDocument* route);
+ void routingFinished ();
};
};
diff --git a/src/bindings/python/sip/SearchRunner.sip b/src/bindings/python/sip/SearchRunner.sip
index b8f7009..568be5b 100644
--- a/src/bindings/python/sip/SearchRunner.sip
+++ b/src/bindings/python/sip/SearchRunner.sip
@@ -29,8 +29,8 @@ public:
explicit SearchRunner (QObject* parent /TransferThis/ = 0);
void setModel (const Marble::MarbleModel* model);
virtual void search (const QString& searchTerm, const Marble::GeoDataLatLonAltBox& \
preferred)=0;
-signals:
// FIXME
+signals:
//ig void searchFinished (QVector<Marble::GeoDataPlacemark*> result);
protected:
const Marble::MarbleModel* model () const;
diff --git a/src/bindings/python/sip/SearchRunner.sip b/src/bindings/python/sip/SearchRunnerManager.sip
similarity index 50%
copy from src/bindings/python/sip/SearchRunner.sip
copy to src/bindings/python/sip/SearchRunnerManager.sip
index b8f7009..2de4cde 100644
--- a/src/bindings/python/sip/SearchRunner.sip
+++ b/src/bindings/python/sip/SearchRunnerManager.sip
@@ -19,20 +19,21 @@
namespace Marble
{
-class SearchRunner : QObject
+class SearchRunnerManager : QObject
{
%TypeHeaderCode
-#include <SearchRunner.h>
+#include <SearchRunnerManager.h>
%End
public:
- explicit SearchRunner (QObject* parent /TransferThis/ = 0);
- void setModel (const Marble::MarbleModel* model);
- virtual void search (const QString& searchTerm, const Marble::GeoDataLatLonAltBox& \
preferred)=0; + explicit SearchRunnerManager (const Marble::MarbleModel* marbleModel, \
QObject* parent /TransferThis/ = 0); + ~SearchRunnerManager ();
+ void findPlacemarks (const QString& searchTerm, const \
Marble::GeoDataLatLonAltBox& preferred = Marble::GeoDataLatLonAltBox()); +//ig \
QVector<Marble::GeoDataPlacemark*> searchPlacemarks (const QString& searchTerm, const \
Marble::GeoDataLatLonAltBox& preferred = Marble::GeoDataLatLonAltBox(), int timeout = 30000); signals:
-// FIXME
-//ig void searchFinished (QVector<Marble::GeoDataPlacemark*> result);
-protected:
- const Marble::MarbleModel* model () const;
+ void searchResultChanged (QAbstractItemModel* model);
+//ig void searchResultChanged (const QVector<Marble::GeoDataPlacemark*>& result);
+ void searchFinished (const QString& searchTerm);
+ void placemarkSearchFinished ();
};
};
diff --git a/src/bindings/python/sip/TileId.sip b/src/bindings/python/sip/TileId.sip
index 0f709bd..d8aece9 100644
--- a/src/bindings/python/sip/TileId.sip
+++ b/src/bindings/python/sip/TileId.sip
@@ -36,12 +36,13 @@ public:
bool operator == (const Marble::TileId& rhs) const;
bool operator < (const Marble::TileId& rhs) const;
static Marble::TileId fromCoordinates (const Marble::GeoDataCoordinates& coords, int popularity);
+//ig Marble::GeoDataLatLonBox toLatLonBox (const GeoSceneTiled* textureLayer) const;
};
uint qHash (const Marble::TileId&);
//ig int TileId::zoomLevel () const;
//ig int TileId::x () const;
//ig int TileId::y () const;
//ig uint TileId::mapThemeIdHash () const;
-//ig uint qHash (const Marble::TileId& tid);
+//ig uint qHash (const Marble::TileId&);
};
//ig QDebug operator << (QDebug, const Marble::TileId&);
diff --git a/src/bindings/python/sip/ViewportParams.sip b/src/bindings/python/sip/ViewportParams.sip
index b33406b..8904072 100644
--- a/src/bindings/python/sip/ViewportParams.sip
+++ b/src/bindings/python/sip/ViewportParams.sip
@@ -64,7 +64,6 @@ public:
bool screenCoordinates (const qreal lon, const qreal lat, qreal& x, qreal& y) \
const;
bool screenCoordinates (const Marble::GeoDataCoordinates& geopoint, qreal& x, \
qreal& y, bool& globeHidesPoint) const; // bool screenCoordinates (const \
Marble::GeoDataCoordinates& geopoint, qreal& x, qreal& y) const;
- bool screenCoordinates (const Marble::GeoDataCoordinates& geopoint, QPointF& \
screenpoint) const; // bool screenCoordinates (const Marble::GeoDataCoordinates& \
coordinates, qreal* x, qreal& y, int& pointRepeatNum, bool& globeHidesPoint) const; // bool \
screenCoordinates (const Marble::GeoDataCoordinates& coordinates, qreal* x, qreal& y, int& \
pointRepeatNum, const QSizeF& size, bool& globeHidesPoint) const; // bool \
screenCoordinates (const Marble::GeoDataLineString& lineString, QVector<QPolygonF*>& polygons) const; @@ \
-73,7 +72,6 @@ public: QRegion mapRegion () const;
//ig bool screenCoordinates (const Marble::GeoDataCoordinates& geopoint, qreal& x, \
qreal& y) const;
-//ig bool screenCoordinates (const Marble::GeoDataCoordinates& coordinates, qreal* \
x, qreal& y, int& pointRepeatNum, bool& globeHidesPoint) const; bool \
screenCoordinates (const Marble::GeoDataCoordinates& coordinates, qreal* x, qreal& y, int& \
pointRepeatNum, const QSizeF& size, bool& globeHidesPoint) const; //ig bool \
screenCoordinates (const Marble::GeoDataLineString& lineString, QVector<QPolygonF*>& polygons) const; \
explicit ViewportParams (Marble::Projection projection, qreal centerLongitude = 0, qreal \
centerLatatitude = 0, int radius = 2000, const QSize& size = QSize(100,100));
diff --git a/src/bindings/python/sip/marblemod.sip b/src/bindings/python/sip/marblemod.sip
index 9baccd4..563dc0d 100644
--- a/src/bindings/python/sip/marblemod.sip
+++ b/src/bindings/python/sip/marblemod.sip
@@ -30,7 +30,10 @@
%Include AbstractLayerInterface.sip
%Include CylindricalProjection.sip
+%Include MarbleColors.sip
+%Include MarbleWebView.sip
%Include TileCreatorDialog.sip
+%Include WikipediaService.sip
%Include AbstractDataPlugin.sip
%Include AbstractDataPluginItem.sip
%Include AbstractDataPluginModel.sip
@@ -59,6 +62,7 @@
%Include GeoDataFeature.sip
%Include GeoDataFolder.sip
%Include GeoDataGeometry.sip
+%Include GeoDataGroundOverlay.sip
%Include GeoDataHotSpot.sip
%Include GeoDataIconStyle.sip
%Include GeoDataItemIcon.sip
@@ -74,7 +78,6 @@
%Include GeoDataMultiGeometry.sip
%Include GeoDataObject.sip
%Include GeoDataOverlay.sip
-%Include GeoDataGroundOverlay.sip
%Include GeoDataPlacemark.sip
%Include GeoDataPoint.sip
%Include GeoDataPolyStyle.sip
@@ -103,8 +106,8 @@
%Include MapViewWidget.sip
%Include MapWizard.sip
%Include MarbleAboutDialog.sip
-%Include MarbleColors.sip
%Include MarbleControlBox.sip
+%Include MarbleDebug.sip
%Include MarbleDirs.sip
%Include MarbleGlobal.sip
%Include MarbleGraphicsGridLayout.sip
@@ -112,15 +115,17 @@
%Include MarbleMap.sip
%Include MarbleModel.sip
%Include MarbleNavigator.sip
-%Include MarbleRunnerManager.sip
-%Include MarbleWebView.sip
%Include MarbleWidget.sip
+%Include MarbleWidgetPopupMenu.sip
%Include NavigationWidget.sip
%Include ParseRunnerPlugin.sip
%Include ParsingRunner.sip
+%Include ParsingRunnerManager.sip
%Include Planet.sip
%Include PluginAboutDialog.sip
%Include PluginInterface.sip
+%Include PluginManager.sip
+%Include PositionProviderPlugin.sip
%Include PositionProviderPluginInterface.sip
%Include PositionTracking.sip
%Include QtMarbleConfigDialog.sip
@@ -129,11 +134,14 @@
%Include RenderPlugin.sip
%Include RenderPluginInterface.sip
%Include ReverseGeocodingRunner.sip
+%Include ReverseGeocodingRunnerManager.sip
%Include ReverseGeocodingRunnerPlugin.sip
%Include RoutingRunner.sip
+%Include RoutingRunnerManager.sip
%Include RoutingRunnerPlugin.sip
%Include ScreenGraphicsItem.sip
%Include SearchRunner.sip
+%Include SearchRunnerManager.sip
%Include SearchRunnerPlugin.sip
%Include Serializable.sip
%Include SunLocator.sip
@@ -144,7 +152,6 @@
%Include TinyWebBrowser.sip
%Include ViewportParams.sip
%Include WidgetGraphicsItem.sip
-%Include WikipediaService.sip
%Include AlternativeRoutesModel.sip
%Include Maneuver.sip
%Include Route.sip
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic