[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [marble/KDE/4.11] src/bindings/python/sip: Python bindings update.
From: Simon Edwards <simon () simonzone ! com>
Date: 2013-08-11 9:54:01
Message-ID: E1V8SLZ-0003mo-Qm () scm ! kde ! org
[Download RAW message or body]
Git commit 909b7e9bfb425106d5afdc0fe55fd9e1f96f51b5 by Simon Edwards.
Committed on 11/08/2013 at 09:48.
Pushed by sedwards into branch 'KDE/4.11'.
Python bindings update.
Phase 2: update from current header files.
M +5 -3 src/bindings/python/sip/AbstractDataPlugin.sip
M +17 -1 src/bindings/python/sip/AbstractDataPluginItem.sip
M +8 -4 src/bindings/python/sip/AbstractDataPluginModel.sip
M +5 -1 src/bindings/python/sip/AbstractFloatItem.sip
M +1 -1 src/bindings/python/sip/AbstractProjection.sip
M +1 -0 src/bindings/python/sip/AlternativeRoutesModel.sip
M +3 -0 src/bindings/python/sip/BillboardGraphicsItem.sip
M +2 -1 src/bindings/python/sip/FileViewWidget.sip
M +2 -1 src/bindings/python/sip/FrameGraphicsItem.sip
M +8 -0 src/bindings/python/sip/GeoDataAbstractView.sip
A +49 -0 src/bindings/python/sip/GeoDataBalloonStyle.sip
M +1 -0 src/bindings/python/sip/GeoDataColorStyle.sip
M +2 -1 src/bindings/python/sip/GeoDataContainer.sip
M +5 -1 src/bindings/python/sip/GeoDataCoordinates.sip
M +6 -0 src/bindings/python/sip/GeoDataDocument.sip
M +7 -3 src/bindings/python/sip/GeoDataFeature.sip
M +22 -0 src/bindings/python/sip/GeoDataGroundOverlay.sip
M +2 -0 src/bindings/python/sip/GeoDataIconStyle.sip
C +22 -20 src/bindings/python/sip/GeoDataItemIcon.sip [from: src/bindings/python/sip/GeoWriter.sip - \
050% similarity] M +4 -0 src/bindings/python/sip/GeoDataLatLonAltBox.sip
M +6 -0 src/bindings/python/sip/GeoDataLineString.sip
A +70 -0 src/bindings/python/sip/GeoDataListStyle.sip
M +1 -0 src/bindings/python/sip/GeoDataLookAt.sip
M +1 -0 src/bindings/python/sip/GeoDataObject.sip
M +4 -0 src/bindings/python/sip/GeoDataPlacemark.sip
M +3 -0 src/bindings/python/sip/GeoDataPoint.sip
M +19 -3 src/bindings/python/sip/GeoDataPolygon.sip
M +6 -0 src/bindings/python/sip/GeoDataStyle.sip
C +8 -7 src/bindings/python/sip/GeoDataTimePrimitive.sip [from: \
src/bindings/python/sip/ParseRunnerPlugin.sip - 067% similarity] C +12 -7 \
src/bindings/python/sip/GeoDataTimeSpan.sip [from: src/bindings/python/sip/ParseRunnerPlugin.sip - 058% \
similarity] C +19 -12 src/bindings/python/sip/GeoDataTimeStamp.sip [from: \
src/bindings/python/sip/ReverseGeocodingRunnerPlugin.sip - 051% similarity] M +4 -2 \
src/bindings/python/sip/GeoDataTreeModel.sip M +32 -1 src/bindings/python/sip/GeoDocument.sip
M +3 -1 src/bindings/python/sip/GeoGraphicsItem.sip
M +2 -1 src/bindings/python/sip/GeoGraphicsScene.sip
M +2 -19 src/bindings/python/sip/GeoPainter.sip
M +1 -1 src/bindings/python/sip/GeoWriter.sip
M +1 -1 src/bindings/python/sip/LayerInterface.sip
C +5 -5 src/bindings/python/sip/MapThemeDownloadDialog.sip [from: \
src/bindings/python/sip/GeoDataAbstractView.sip - 076% similarity] M +1 -0 \
src/bindings/python/sip/MapThemeManager.sip M +4 -0 src/bindings/python/sip/MapViewWidget.sip
M +8 -0 src/bindings/python/sip/MarbleAboutDialog.sip
A +97 -0 src/bindings/python/sip/MarbleColors.sip
M +2 -1 src/bindings/python/sip/MarbleGlobal.sip
M +1 -1 src/bindings/python/sip/MarbleGraphicsItem.sip
M +4 -0 src/bindings/python/sip/MarbleMap.sip
M +5 -2 src/bindings/python/sip/MarbleModel.sip
C +0 -0 src/bindings/python/sip/MarbleWebView.sip [from: \
src/bindings/python/sip/GeoDataGroundOverlay.sip - 100% similarity] M +8 -0 \
src/bindings/python/sip/MarbleWidget.sip M +1 -0 src/bindings/python/sip/ParseRunnerPlugin.sip
C +6 -7 src/bindings/python/sip/ParsingRunner.sip [from: \
src/bindings/python/sip/ParseRunnerPlugin.sip - 069% similarity] M +4 -0 \
src/bindings/python/sip/Planet.sip M +1 -0 src/bindings/python/sip/QtMarbleConfigDialog.sip
M +15 -0 src/bindings/python/sip/RenderPlugin.sip
C +9 -9 src/bindings/python/sip/ReverseGeocodingRunner.sip [from: \
src/bindings/python/sip/GeoGraphicsScene.sip - 061% similarity] M +2 -0 \
src/bindings/python/sip/ReverseGeocodingRunnerPlugin.sip M +1 -1 \
src/bindings/python/sip/RoutingModel.sip C +9 -7 src/bindings/python/sip/RoutingRunner.sip [from: \
src/bindings/python/sip/BillboardGraphicsItem.sip - 066% similarity] M +2 -0 \
src/bindings/python/sip/RoutingRunnerPlugin.sip M +2 -1 \
src/bindings/python/sip/ScreenGraphicsItem.sip C +10 -9 src/bindings/python/sip/SearchRunner.sip \
[from: src/bindings/python/sip/GeoGraphicsScene.sip - 064% similarity] M +2 -0 \
src/bindings/python/sip/SearchRunnerPlugin.sip A +47 -0 src/bindings/python/sip/TileId.sip
M +1 -0 src/bindings/python/sip/ViewportParams.sip
C +0 -0 src/bindings/python/sip/WikipediaService.sip [from: \
src/bindings/python/sip/GeoDataGroundOverlay.sip - 100% similarity] M +17 -3 \
src/bindings/python/sip/marblemod.sip
http://commits.kde.org/marble/909b7e9bfb425106d5afdc0fe55fd9e1f96f51b5
diff --git a/src/bindings/python/sip/AbstractDataPlugin.sip \
b/src/bindings/python/sip/AbstractDataPlugin.sip index 1b13b91..4fcc0d6 100644
--- a/src/bindings/python/sip/AbstractDataPlugin.sip
+++ b/src/bindings/python/sip/AbstractDataPlugin.sip
@@ -41,17 +41,19 @@ public:
signals:
void changedNumberOfItems (quint32 number);
public:
-//ig PluginManager* pluginManager () const;
AbstractDataPlugin (const Marble::MarbleModel* marbleModel);
bool isInitialized () const;
- void setDelegate (QDeclarativeComponent* delegate, QGraphicsItem* parent);
+// FIXME
+//ig void setDelegate (QDeclarativeComponent* delegate, QGraphicsItem* parent);
void setFavoriteItemsOnly (bool favoriteOnly);
bool isFavoriteItemsOnly () const;
QObject* favoritesModel ();
- void handleViewportChange (Marble::ViewportParams* viewport);
signals:
void favoriteItemsOnlyChanged ();
void favoritesModelChanged ();
+public:
+ virtual Marble::RenderPlugin::RenderType renderType () const;
+ void handleViewportChange (const Marble::ViewportParams* viewport);
};
// AbstractDataPlugin
diff --git a/src/bindings/python/sip/AbstractDataPluginItem.sip \
b/src/bindings/python/sip/AbstractDataPluginItem.sip index 7cabb01..604b3ed 100644
--- a/src/bindings/python/sip/AbstractDataPluginItem.sip
+++ b/src/bindings/python/sip/AbstractDataPluginItem.sip
@@ -39,6 +39,7 @@
#include <LatLonBoxWidget.h>
#include <LatLonEdit.h>
#include <LegendWidget.h>
+#include <MapThemeDownloadDialog.h>
#include <MapThemeManager.h>
#include <MapViewWidget.h>
#include <MapWizard.h>
@@ -51,14 +52,18 @@
#include <MarbleWidget.h>
#include <NavigationWidget.h>
#include <ParseRunnerPlugin.h>
+#include <ParsingRunner.h>
#include <PluginAboutDialog.h>
#include <PositionTracking.h>
#include <QtMarbleConfigDialog.h>
#include <RenderPlugin.h>
+#include <ReverseGeocodingRunner.h>
#include <ReverseGeocodingRunnerPlugin.h>
#include <routing/RouteRequest.h>
#include <routing/RoutingModel.h>
+#include <RoutingRunner.h>
#include <RoutingRunnerPlugin.h>
+#include <SearchRunner.h>
#include <SearchRunnerPlugin.h>
#include <SunLocator.h>
#include <TileCreator.h>
@@ -86,7 +91,6 @@ public:
void setAddedAngularResolution (qreal resolution);
virtual QAction* action ()=0;
virtual QString itemType () const=0;
- virtual bool initialized ()=0;
virtual void addDownloadedFile (const QString& url, const QString& type)=0;
//ig virtual bool operator < (const Marble::AbstractDataPluginItem* other) const;
@@ -121,6 +125,8 @@ public:
sipType = sipType_Marble_MarbleRunnerManager;
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::PositionTracking*>(sipCpp))
sipType = sipType_Marble_PositionTracking;
else if (dynamic_cast<Marble::RenderPlugin*>(sipCpp))
@@ -131,12 +137,18 @@ public:
else if (dynamic_cast<Marble::AbstractFloatItem*>(sipCpp))
sipType = sipType_Marble_AbstractFloatItem;
}
+ else if (dynamic_cast<Marble::ReverseGeocodingRunner*>(sipCpp))
+ sipType = sipType_Marble_ReverseGeocodingRunner;
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::RoutingRunnerPlugin*>(sipCpp))
sipType = sipType_Marble_RoutingRunnerPlugin;
+ else if (dynamic_cast<Marble::SearchRunner*>(sipCpp))
+ sipType = sipType_Marble_SearchRunner;
else if (dynamic_cast<Marble::SearchRunnerPlugin*>(sipCpp))
sipType = sipType_Marble_SearchRunnerPlugin;
else if (dynamic_cast<Marble::SunLocator*>(sipCpp))
@@ -175,6 +187,8 @@ public:
sipType = sipType_Marble_TileLevelRangeWidget;
else if (dynamic_cast<Marble::DownloadRegionDialog*>(sipCpp))
sipType = sipType_Marble_DownloadRegionDialog;
+ else if (dynamic_cast<Marble::MapThemeDownloadDialog*>(sipCpp))
+ sipType = sipType_Marble_MapThemeDownloadDialog;
else if (dynamic_cast<Marble::MarbleAboutDialog*>(sipCpp))
sipType = sipType_Marble_MarbleAboutDialog;
else if (dynamic_cast<Marble::PluginAboutDialog*>(sipCpp))
@@ -206,6 +220,8 @@ public:
signals:
void idChanged ();
void stickyChanged ();
+public:
+ virtual bool initialized () const=0;
};
// AbstractDataPluginItem
diff --git a/src/bindings/python/sip/AbstractDataPluginModel.sip \
b/src/bindings/python/sip/AbstractDataPluginModel.sip index 95a34c7..52d1f9d 100644
--- a/src/bindings/python/sip/AbstractDataPluginModel.sip
+++ b/src/bindings/python/sip/AbstractDataPluginModel.sip
@@ -47,10 +47,7 @@ protected:
bool itemExists (const QString& id) const;
signals:
void itemsUpdated ();
-protected:
- virtual void getAdditionalItems (const Marble::GeoDataLatLonAltBox& box, const \
Marble::MarbleModel* model, qint32 number = 10)=0; public:
-//ig explicit AbstractDataPluginModel (const QString& name, const PluginManager* \
pluginManager, QObject* parent /TransferThis/ = 0); virtual void setFavoriteItems (const \
QStringList& list); QStringList favoriteItems () const;
virtual void setFavoriteItemsOnly (bool favoriteOnly);
@@ -63,10 +60,17 @@ public:
QObject* favoritesModel ();
void addItemsToList (const QList<Marble::AbstractDataPluginItem*>& items);
protected:
- virtual void getItem (const QString& id, const Marble::MarbleModel* model);
void registerItemProperties (const QMetaObject& item);
signals:
void favoriteItemsOnlyChanged ();
+public:
+ explicit AbstractDataPluginModel (const QString& name, const Marble::MarbleModel* \
marbleModel, QObject* parent /TransferThis/ = 0); + const Marble::MarbleModel* marbleModel () const;
+ QList<Marble::AbstractDataPluginItem*> items (const Marble::ViewportParams* viewport, qint32 number \
= 10); +protected:
+ virtual void getAdditionalItems (const Marble::GeoDataLatLonAltBox& box, qint32 number = \
10)=0; + virtual void getItem (const QString& id);
+ void downloadItem (const QUrl& url, const QString& type, \
Marble::AbstractDataPluginItem* item); };
// AbstractDataPluginModel
diff --git a/src/bindings/python/sip/AbstractFloatItem.sip \
b/src/bindings/python/sip/AbstractFloatItem.sip index 16d7f56..aa1242b 100644
--- a/src/bindings/python/sip/AbstractFloatItem.sip
+++ b/src/bindings/python/sip/AbstractFloatItem.sip
@@ -44,7 +44,6 @@ public:
bool render (Marble::GeoPainter* painter, Marble::ViewportParams* viewport, const \
QString& renderPos = "FLOAT_ITEM", Marble::GeoSceneLayer* layer = 0); void setVisible \
(bool visible); bool visible () const;
- bool positionLocked ();
void show ();
void hide ();
protected:
@@ -55,6 +54,11 @@ public:
explicit AbstractFloatItem (const Marble::MarbleModel* marbleModel, const QPointF& \
point = QPointF(10.0,10.0), const QSizeF& size = QSizeF(150.0,50.0)); protected:
virtual void changeViewport (Marble::ViewportParams* viewport);
+public:
+ virtual QHash<QString,QVariant> settings () const;
+ virtual void setSettings (const QHash<QString,QVariant>& settings);
+ virtual Marble::RenderPlugin::RenderType renderType () const;
+ bool positionLocked () const;
};
// AbstractFloatItem
diff --git a/src/bindings/python/sip/AbstractProjection.sip \
b/src/bindings/python/sip/AbstractProjection.sip index 29ccbe8..33c8e52 100644
--- a/src/bindings/python/sip/AbstractProjection.sip
+++ b/src/bindings/python/sip/AbstractProjection.sip
@@ -72,6 +72,6 @@ public:
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;
virtual Marble::GeoDataLatLonAltBox latLonAltBox (const QRect& screenRect, const \
Marble::ViewportParams* viewport) const; protected:
-//ig AbstractProjection (AbstractProjectionPrivate& dd);
+//ig AbstractProjection (AbstractProjectionPrivate* dd);
};
};
diff --git a/src/bindings/python/sip/AlternativeRoutesModel.sip \
b/src/bindings/python/sip/AlternativeRoutesModel.sip index 6b0df79..47a466b 100644
--- a/src/bindings/python/sip/AlternativeRoutesModel.sip
+++ b/src/bindings/python/sip/AlternativeRoutesModel.sip
@@ -47,5 +47,6 @@ public:
static QVector<qreal> deviation (const Marble::GeoDataDocument* routeA, const \
Marble::GeoDataDocument* routeB); signals:
void currentRouteChanged (Marble::GeoDataDocument* newRoute);
+ void currentRouteChanged (int index);
};
};
diff --git a/src/bindings/python/sip/BillboardGraphicsItem.sip \
b/src/bindings/python/sip/BillboardGraphicsItem.sip index 536f3f0..7ec7f66 100644
--- a/src/bindings/python/sip/BillboardGraphicsItem.sip
+++ b/src/bindings/python/sip/BillboardGraphicsItem.sip
@@ -31,5 +31,8 @@ public:
void setCoordinate (const Marble::GeoDataCoordinates& coordinates);
QList<QPointF> positions () const;
QList<QRectF> boundingRects () const;
+ Qt::Alignment alignment () const;
+ void setAlignment (Qt::Alignment alignment);
+ QRectF containsRect (const QPointF& point) const;
};
};
diff --git a/src/bindings/python/sip/FileViewWidget.sip b/src/bindings/python/sip/FileViewWidget.sip
index 23e3cc3..60dda41 100644
--- a/src/bindings/python/sip/FileViewWidget.sip
+++ b/src/bindings/python/sip/FileViewWidget.sip
@@ -28,9 +28,10 @@ class FileViewWidget : QWidget
public:
FileViewWidget (QWidget* parent /TransferThis/ = 0, Qt::WindowFlags f = 0);
~FileViewWidget ();
-//ig void setFileViewModel (FileViewModel* model);
signals:
void centerOn (const Marble::GeoDataPlacemark&, bool animated);
void centerOn (const Marble::GeoDataLatLonBox&, bool animated);
+public:
+ void setMarbleWidget (Marble::MarbleWidget* widget);
};
};
diff --git a/src/bindings/python/sip/FrameGraphicsItem.sip \
b/src/bindings/python/sip/FrameGraphicsItem.sip index ddc9303..5eb3c3d 100644
--- a/src/bindings/python/sip/FrameGraphicsItem.sip
+++ b/src/bindings/python/sip/FrameGraphicsItem.sip
@@ -30,7 +30,8 @@ public:
{
NoFrame,
RectFrame,
- RoundedRectFrame
+ RoundedRectFrame,
+ ShadowFrame
};
explicit FrameGraphicsItem (Marble::MarbleGraphicsItem* parent = 0);
virtual ~FrameGraphicsItem ();
diff --git a/src/bindings/python/sip/GeoDataAbstractView.sip \
b/src/bindings/python/sip/GeoDataAbstractView.sip index 65fb8da..4bf760a 100644
--- a/src/bindings/python/sip/GeoDataAbstractView.sip
+++ b/src/bindings/python/sip/GeoDataAbstractView.sip
@@ -28,5 +28,13 @@ class GeoDataAbstractView : Marble::GeoDataObject /Abstract/
public:
GeoDataAbstractView ();
~GeoDataAbstractView ();
+ GeoDataAbstractView (const Marble::GeoDataAbstractView& other);
+ virtual Marble::GeoDataAbstractView* copy () const=0;
+ const Marble::GeoDataTimeSpan& timeSpan () const;
+//ig Marble::GeoDataTimeSpan& timeSpan ();
+ void setTimeSpan (const Marble::GeoDataTimeSpan& timeSpan);
+//ig Marble::GeoDataTimeStamp& timeStamp ();
+ const Marble::GeoDataTimeStamp& timeStamp () const;
+ void setTimeStamp (const Marble::GeoDataTimeStamp& timeStamp);
};
};
diff --git a/src/bindings/python/sip/GeoDataBalloonStyle.sip \
b/src/bindings/python/sip/GeoDataBalloonStyle.sip new file mode 100644
index 0000000..9223740
--- /dev/null
+++ b/src/bindings/python/sip/GeoDataBalloonStyle.sip
@@ -0,0 +1,49 @@
+// 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 GeoDataBalloonStyle : Marble::GeoDataColorStyle
+{
+%TypeHeaderCode
+#include <GeoDataBalloonStyle.h>
+%End
+
+public:
+ GeoDataBalloonStyle ();
+ GeoDataBalloonStyle (const Marble::GeoDataBalloonStyle& other);
+ ~GeoDataBalloonStyle ();
+ virtual const char* nodeType () const;
+ enum DisplayMode
+ {
+ Default,
+ Hide
+ };
+ QColor backgroundColor () const;
+ void setBackgroundColor (const QColor& color);
+ QColor textColor () const;
+ void setTextColor (const QColor& color);
+ QString text () const;
+ void setText (const QString& text);
+ Marble::GeoDataBalloonStyle::DisplayMode displayMode () const;
+ void setDisplayMode (const Marble::GeoDataBalloonStyle::DisplayMode& mode);
+ virtual void pack (QDataStream& stream) const;
+ virtual void unpack (QDataStream& stream);
+};
+};
diff --git a/src/bindings/python/sip/GeoDataColorStyle.sip \
b/src/bindings/python/sip/GeoDataColorStyle.sip index 878269b..ddce9ae 100644
--- a/src/bindings/python/sip/GeoDataColorStyle.sip
+++ b/src/bindings/python/sip/GeoDataColorStyle.sip
@@ -42,6 +42,7 @@ public:
GeoDataColorStyle (const Marble::GeoDataColorStyle& other);
virtual ~GeoDataColorStyle ();
virtual const char* nodeType () const;
+ QColor paintedColor () const;
};
// GeoDataColorStyle
diff --git a/src/bindings/python/sip/GeoDataContainer.sip b/src/bindings/python/sip/GeoDataContainer.sip
index a2d2107..1a41c0f 100644
--- a/src/bindings/python/sip/GeoDataContainer.sip
+++ b/src/bindings/python/sip/GeoDataContainer.sip
@@ -53,11 +53,12 @@ public:
//ig QVector<Marble::GeoDataFeature*> featureList () const;
//ig QVector<Marble::GeoDataPlacemark*> placemarkList () const;
Marble::GeoDataFeature* child (int);
- int childPosition (Marble::GeoDataFeature* child);
void append (Marble::GeoDataFeature* other);
void remove (int index);
Marble::GeoDataLatLonAltBox latLonAltBox () const;
//ig const Marble::GeoDataFeature* child (int) const;
+ int childPosition (const Marble::GeoDataFeature* child) const;
+ void insert (Marble::GeoDataFeature* other, int index);
};
// GeoDataContainer
diff --git a/src/bindings/python/sip/GeoDataCoordinates.sip \
b/src/bindings/python/sip/GeoDataCoordinates.sip index 950430a..e83efca 100644
--- a/src/bindings/python/sip/GeoDataCoordinates.sip
+++ b/src/bindings/python/sip/GeoDataCoordinates.sip
@@ -38,7 +38,10 @@ public:
{
Decimal,
DMS,
- DM
+ DM,
+ UTM,
+ MGRS,
+ Astro
};
typedef QVector<Marble::GeoDataCoordinates> Vector;
@@ -84,6 +87,7 @@ public:
bool isValid () const;
qreal bearing (const Marble::GeoDataCoordinates& other, \
Marble::GeoDataCoordinates::Unit unit = Marble::GeoDataCoordinates::Radian, \
Marble::GeoDataCoordinates::BearingType type = Marble::GeoDataCoordinates::InitialBearing) const; //ig \
void geoCoordinates (qreal& lon, qreal& lat, qreal& alt, \
Marble::GeoDataCoordinates::Unit unit = GeoDataCoordinates::Radian) const; +//ig virtual bool \
operator != (const Marble::GeoDataCoordinates&) const; };
// GeoDataCoordinates
diff --git a/src/bindings/python/sip/GeoDataDocument.sip b/src/bindings/python/sip/GeoDataDocument.sip
index d8d0c0d..82f73b6 100644
--- a/src/bindings/python/sip/GeoDataDocument.sip
+++ b/src/bindings/python/sip/GeoDataDocument.sip
@@ -44,6 +44,12 @@ public:
~GeoDataDocument ();
//ig DocumentRole documentRole () const;
void setDocumentRole (Marble::DocumentRole role);
+ QString property () const;
+ void setProperty (QString property);
+ QString baseUri () const;
+ void setBaseUri (const QString& baseUri);
+//ig Marble::GeoDataNetworkLinkControl networkLinkControl () const;
+//ig void setNetworkLinkControl (const Marble::GeoDataNetworkLinkControl& \
networkLinkControl); };
// GeoDataDocument
diff --git a/src/bindings/python/sip/GeoDataFeature.sip b/src/bindings/python/sip/GeoDataFeature.sip
index d8b5a08..5d147d2 100644
--- a/src/bindings/python/sip/GeoDataFeature.sip
+++ b/src/bindings/python/sip/GeoDataFeature.sip
@@ -194,7 +194,7 @@ public:
void setStyleUrl (const QString& value);
bool isVisible () const;
void setVisible (bool value);
- const Marble::GeoDataStyle* style () const;
+ const Marble::GeoDataStyle* style () const;
Marble::GeoDataFeature::GeoDataVisualCategory visualCategory () const;
void setVisualCategory (Marble::GeoDataFeature::GeoDataVisualCategory category);
//ig const QChar role () const;
@@ -220,11 +220,9 @@ protected:
public:
//ig Marble::GeoDataTimeSpan& timeSpan () const;
//ig GeoDataTimeStamp& timeStamp () const;
-//ig void setTimeStamp (GeoDataTimeStamp timeStamp);
//ig GeoDataExtendedData& extendedData () const;
//ig void setExtendedData (const GeoDataExtendedData& extendedData);
void setRole (const QString& role);
-//ig void setTimeSpan (GeoDataTimeSpan timeSpan);
static Marble::GeoDataFeature::GeoDataVisualCategory OsmVisualCategory (const QString& keyValue);
bool isGloballyVisible () const;
const QImage symbol () const;
@@ -233,6 +231,12 @@ public:
static QColor defaultLabelColor ();
static void setDefaultLabelColor (const QColor& color);
void setStyleMap (const Marble::GeoDataStyleMap* map);
+ const Marble::GeoDataAbstractView* abstractView () const;
+//ig Marble::GeoDataAbstractView* abstractView ();
+ void setAbstractView (Marble::GeoDataAbstractView* abstractView);
+ void setTimeSpan (const Marble::GeoDataTimeSpan& timeSpan);
+ void setTimeStamp (const Marble::GeoDataTimeStamp& timeStamp);
+ void setStyle (Marble::GeoDataStyle* style);
};
// GeoDataFeature
diff --git a/src/bindings/python/sip/GeoDataGroundOverlay.sip \
b/src/bindings/python/sip/GeoDataGroundOverlay.sip index 5e96560..7c330a7 100644
--- a/src/bindings/python/sip/GeoDataGroundOverlay.sip
+++ b/src/bindings/python/sip/GeoDataGroundOverlay.sip
@@ -17,3 +17,25 @@
// Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+namespace Marble
+{
+class GeoDataGroundOverlay : Marble::GeoDataOverlay
+{
+%TypeHeaderCode
+#include <GeoDataOverlay.h>
+#include <GeoDataGroundOverlay.h>
+%End
+
+public:
+ GeoDataGroundOverlay ();
+ GeoDataGroundOverlay (const Marble::GeoDataGroundOverlay& other);
+ ~GeoDataGroundOverlay ();
+ virtual const char* nodeType () const;
+ double altitude () const;
+ void setAltitude (double altitude);
+ Marble::AltitudeMode altitudeMode () const;
+ void setAltitudeMode (const Marble::AltitudeMode altitudeMode);
+ Marble::GeoDataLatLonBox& latLonBox () const;
+ void setLatLonBox (const Marble::GeoDataLatLonBox& box);
+};
+};
diff --git a/src/bindings/python/sip/GeoDataIconStyle.sip b/src/bindings/python/sip/GeoDataIconStyle.sip
index b7b605c..8071be9 100644
--- a/src/bindings/python/sip/GeoDataIconStyle.sip
+++ b/src/bindings/python/sip/GeoDataIconStyle.sip
@@ -42,6 +42,8 @@ public:
void setIcon (const QImage& icon);
QString iconPath () const;
//ig QPointF hotSpot (Marble::GeoDataHotSpot::Units& xunits, \
Marble::GeoDataHotSpot::Units& yunits) const; + int heading () const;
+ void setHeading (int heading);
};
// GeoDataIconStyle
diff --git a/src/bindings/python/sip/GeoWriter.sip b/src/bindings/python/sip/GeoDataItemIcon.sip
similarity index 50%
copy from src/bindings/python/sip/GeoWriter.sip
copy to src/bindings/python/sip/GeoDataItemIcon.sip
index 9ed3c22..d63f3cb 100644
--- a/src/bindings/python/sip/GeoWriter.sip
+++ b/src/bindings/python/sip/GeoDataItemIcon.sip
@@ -19,30 +19,32 @@
namespace Marble
{
-class GeoWriter : QXmlStreamWriter
+class GeoDataItemIcon : Marble::GeoDataObject
{
%TypeHeaderCode
-#include <GeoWriter.h>
+#include <GeoDataItemIcon.h>
%End
public:
- GeoWriter ();
- bool write (QIODevice* device, const Marble::GeoNode* feature);
- void setDocumentType (const QString& documentType);
- void writeElement (const QString& namespaceUri, const QString& key, const \
QString& value);
- void writeElement (const QString& key, const QString& value);
- void writeOptionalElement (const QString& key, const QString& value);
-%ConvertToSubClassCode
- // CTSCC for subclasses of 'QXmlStreamWriter'
- sipType = NULL;
-
- if (dynamic_cast<Marble::GeoWriter*>(sipCpp))
- sipType = sipType_Marble_GeoWriter;
-%End
+ GeoDataItemIcon ();
+ GeoDataItemIcon (const Marble::GeoDataItemIcon& other);
+ ~GeoDataItemIcon ();
+ virtual const char* nodeType () const;
+ enum ItemIconState
+ {
+ Open,
+ Closed,
+ Error,
+ Fetching0,
+ Fetching1,
+ Fetching2
+ };
+ typedef QFlags<Marble::GeoDataItemIcon::ItemIconState> ItemIconStates;
+ Marble::GeoDataItemIcon::ItemIconStates state () const;
+ void setState (const Marble::GeoDataItemIcon::ItemIconStates& state);
+ QString iconPath () const;
+ void setIconPath (const QString& path);
+ QImage icon () const;
+ void setIcon (const QImage& icon);
};
};
-%ModuleHeaderCode
-//ctscc
-#include <GeoWriter.h>
-#include <qxmlstream.h>
-%End
diff --git a/src/bindings/python/sip/GeoDataLatLonAltBox.sip \
b/src/bindings/python/sip/GeoDataLatLonAltBox.sip index f80aab0..08364ac 100644
--- a/src/bindings/python/sip/GeoDataLatLonAltBox.sip
+++ b/src/bindings/python/sip/GeoDataLatLonAltBox.sip
@@ -46,10 +46,14 @@ public:
virtual const char* nodeType () const;
virtual Marble::GeoDataCoordinates center () const;
virtual void clear ();
+ GeoDataLatLonAltBox (const Marble::GeoDataLatLonBox& other, qreal \
minAltitude, qreal maxAltitude); + explicit GeoDataLatLonAltBox (const \
Marble::GeoDataCoordinates& coordinates); +//ig uint qHash (const \
Marble::GeoDataLatLonAltBox&); };
// GeoDataLatLonAltBox
//ig bool operator == (const Marble::GeoDataLatLonAltBox& lhs, const \
Marble::GeoDataLatLonAltBox& rhs); +//ig uint qHash (const \
Marble::GeoDataLatLonAltBox& r); };
// Marble
diff --git a/src/bindings/python/sip/GeoDataLineString.sip \
b/src/bindings/python/sip/GeoDataLineString.sip index d5a84dd..c6a722d 100644
--- a/src/bindings/python/sip/GeoDataLineString.sip
+++ b/src/bindings/python/sip/GeoDataLineString.sip
@@ -74,6 +74,12 @@ public:
void remove (int i);
protected:
//ig GeoDataLineString (GeoDataLineStringPrivate* priv);
+public:
+
+// FIXME
+//ig QVector<GeoDataCoordinates>::ConstIterator begin () const;
+//ig QVector<GeoDataCoordinates>::ConstIterator end () const;
+
};
// GeoDataLineString
diff --git a/src/bindings/python/sip/GeoDataListStyle.sip b/src/bindings/python/sip/GeoDataListStyle.sip
new file mode 100644
index 0000000..e687a91
--- /dev/null
+++ b/src/bindings/python/sip/GeoDataListStyle.sip
@@ -0,0 +1,70 @@
+// 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 GeoDataListStyle : Marble::GeoDataObject
+{
+%TypeHeaderCode
+#include <GeoDataListStyle.h>
+%End
+
+public:
+ GeoDataListStyle ();
+ GeoDataListStyle (const Marble::GeoDataListStyle& other);
+ ~GeoDataListStyle ();
+ virtual const char* nodeType () const;
+ enum ListItemType
+ {
+ Check,
+ RadioFolder,
+ CheckOffOnly,
+ CheckHideChildren
+ };
+ Marble::GeoDataListStyle::ListItemType listItemType () const;
+ void setListItemType (const Marble::GeoDataListStyle::ListItemType& type);
+ QColor backgroundColor () const;
+ void setBackgroundColor (const QColor& color);
+//FIXME
+//ig QVector<Marble::GeoDataItemIcon*> itemIconList () const;
+
+//ig Marble::GeoDataItemIcon* child (int);
+ const Marble::GeoDataItemIcon* child (int) const;
+ int childPosition (Marble::GeoDataItemIcon* child);
+ void append (Marble::GeoDataItemIcon* other);
+ void remove (int index);
+ int size () const;
+//ig Marble::GeoDataItemIcon& at (int pos);
+ const Marble::GeoDataItemIcon& at (int pos) const;
+//ig Marble::GeoDataItemIcon& last ();
+ const Marble::GeoDataItemIcon& last () const;
+//ig Marble::GeoDataItemIcon& first ();
+ const Marble::GeoDataItemIcon& first () const;
+
+// FIXME
+// QVector<GeoDataItemIcon*>::Iterator begin ();
+// QVector<GeoDataItemIcon*>::Iterator end ();
+// QVector<GeoDataItemIcon*>::ConstIterator constBegin () const;
+// QVector<GeoDataItemIcon*>::ConstIterator constEnd () const;
+
+ void clear ();
+ virtual void pack (QDataStream& stream) const;
+ virtual void unpack (QDataStream& stream);
+};
+};
diff --git a/src/bindings/python/sip/GeoDataLookAt.sip b/src/bindings/python/sip/GeoDataLookAt.sip
index 7db3bf9..467a680 100644
--- a/src/bindings/python/sip/GeoDataLookAt.sip
+++ b/src/bindings/python/sip/GeoDataLookAt.sip
@@ -41,5 +41,6 @@ public:
void setCoordinates (const Marble::GeoDataCoordinates& coordinates);
virtual const char* nodeType () const;
void detach ();
+ Marble::GeoDataAbstractView* copy () const;
};
};
diff --git a/src/bindings/python/sip/GeoDataObject.sip b/src/bindings/python/sip/GeoDataObject.sip
index 44b39c7..ed1b2dd 100644
--- a/src/bindings/python/sip/GeoDataObject.sip
+++ b/src/bindings/python/sip/GeoDataObject.sip
@@ -40,6 +40,7 @@ public:
virtual Marble::GeoDataObject* parent () const;
virtual void setParent (Marble::GeoDataObject* parent);
+ QString resolvePath (const QString& relativePath) const;
};
// GeoDataObject
diff --git a/src/bindings/python/sip/GeoDataPlacemark.sip b/src/bindings/python/sip/GeoDataPlacemark.sip
index 627b9e5..9cd22c6 100644
--- a/src/bindings/python/sip/GeoDataPlacemark.sip
+++ b/src/bindings/python/sip/GeoDataPlacemark.sip
@@ -48,6 +48,10 @@ public:
void setGeometry (Marble::GeoDataGeometry* entry);
const QString state () const;
void setState (const QString& state);
+ void setCoordinate (qreal longitude, qreal latitude, qreal altitude = 0, \
Marble::GeoDataCoordinates::Unit _unit = Marble::GeoDataCoordinates::Radian); + void \
setCoordinate (const Marble::GeoDataCoordinates& coordinate); + const Marble::GeoDataLookAt* lookAt \
() const; +//ig Marble::GeoDataLookAt* lookAt ();
};
// GeoDataPlacemark
diff --git a/src/bindings/python/sip/GeoDataPoint.sip b/src/bindings/python/sip/GeoDataPoint.sip
index 296760c..78131f1 100644
--- a/src/bindings/python/sip/GeoDataPoint.sip
+++ b/src/bindings/python/sip/GeoDataPoint.sip
@@ -41,6 +41,9 @@ public:
GeoDataPoint (const Marble::GeoDataCoordinates& other);
~GeoDataPoint ();
virtual const char* nodeType () const;
+ GeoDataPoint (qreal lon, qreal lat, qreal alt = 0, \
Marble::GeoDataPoint::Unit _unit = Marble::GeoDataCoordinates::Radian); + void \
setCoordinates (const Marble::GeoDataCoordinates& coordinates); + const Marble::GeoDataCoordinates& \
coordinates () const; };
// GeoDataPoint
diff --git a/src/bindings/python/sip/GeoDataPolygon.sip b/src/bindings/python/sip/GeoDataPolygon.sip
index ff0efe2..e1621ba 100644
--- a/src/bindings/python/sip/GeoDataPolygon.sip
+++ b/src/bindings/python/sip/GeoDataPolygon.sip
@@ -33,10 +33,10 @@ public:
void setTessellate (bool tessellate);
Marble::TessellationFlags tessellationFlags () const;
void setTessellationFlags (Marble::TessellationFlags f);
- virtual const Marble::GeoDataLatLonAltBox& latLonAltBox () const;
- Marble::GeoDataLinearRing& outerBoundary ();
+ virtual const Marble::GeoDataLatLonAltBox& latLonAltBox () const;
+//ig Marble::GeoDataLinearRing& outerBoundary ();
void setOuterBoundary (const Marble::GeoDataLinearRing& boundary);
- QVector<Marble::GeoDataLinearRing>& innerBoundaries ();
+//ig QVector<Marble::GeoDataLinearRing>& innerBoundaries ();
void appendInnerBoundary (const Marble::GeoDataLinearRing& boundary);
virtual void pack (QDataStream& stream) const;
virtual void unpack (QDataStream& stream);
@@ -45,9 +45,25 @@ protected:
//ig GeoDataPolygonPrivate* p () const;
public:
virtual bool contains (const Marble::GeoDataCoordinates& coordinates) const;
+ const Marble::GeoDataLinearRing& outerBoundary () const;
+ const QVector<Marble::GeoDataLinearRing>& innerBoundaries () const;
};
// GeoDataPolygon
+class GeoDataOuterBoundary : Marble::GeoDataPolygon
+{
+%TypeHeaderCode
+#include <GeoDataPolygon.h>
+%End
+
+};
+class GeoDataInnerBoundary : Marble::GeoDataPolygon
+{
+%TypeHeaderCode
+#include <GeoDataPolygon.h>
+%End
+
+};
};
// Marble
diff --git a/src/bindings/python/sip/GeoDataStyle.sip b/src/bindings/python/sip/GeoDataStyle.sip
index 02bd992..d10b5ef 100644
--- a/src/bindings/python/sip/GeoDataStyle.sip
+++ b/src/bindings/python/sip/GeoDataStyle.sip
@@ -42,6 +42,12 @@ public:
virtual void unpack (QDataStream& stream);
virtual const char* nodeType () const;
GeoDataStyle (const QImage& icon, const QFont& font, const QColor& color);
+ void setBalloonStyle (const Marble::GeoDataBalloonStyle& style);
+//ig Marble::GeoDataBalloonStyle& balloonStyle ();
+ const Marble::GeoDataBalloonStyle& balloonStyle () const;
+ void setListStyle (const Marble::GeoDataListStyle& style);
+//ig Marble::GeoDataListStyle& listStyle ();
+ const Marble::GeoDataListStyle& listStyle () const;
};
// GeoDataStyle
diff --git a/src/bindings/python/sip/ParseRunnerPlugin.sip \
b/src/bindings/python/sip/GeoDataTimePrimitive.sip similarity index 67%
copy from src/bindings/python/sip/ParseRunnerPlugin.sip
copy to src/bindings/python/sip/GeoDataTimePrimitive.sip
index 24da447..94faf2f 100644
--- a/src/bindings/python/sip/ParseRunnerPlugin.sip
+++ b/src/bindings/python/sip/GeoDataTimePrimitive.sip
@@ -19,17 +19,18 @@
namespace Marble
{
-class ParseRunnerPlugin : QObject, Marble::PluginInterface /Abstract/
+class GeoDataTimePrimitive : Marble::GeoDataObject
{
%TypeHeaderCode
-#include <ParseRunnerPlugin.h>
+#include <GeoDataTimePrimitive.h>
%End
public:
- explicit ParseRunnerPlugin (QObject* parent /TransferThis/ = 0);
- virtual ~ParseRunnerPlugin ();
- virtual QString fileFormatDescription () const=0;
- virtual QStringList fileExtensions () const=0;
- virtual QIcon icon () const;
+ virtual const char* nodeType () const;
+ virtual void pack (QDataStream& stream) const;
+ virtual void unpack (QDataStream& stream);
+ GeoDataTimePrimitive ();
+ GeoDataTimePrimitive (const Marble::GeoDataTimePrimitive& other);
+ ~GeoDataTimePrimitive ();
};
};
diff --git a/src/bindings/python/sip/ParseRunnerPlugin.sip b/src/bindings/python/sip/GeoDataTimeSpan.sip
similarity index 58%
copy from src/bindings/python/sip/ParseRunnerPlugin.sip
copy to src/bindings/python/sip/GeoDataTimeSpan.sip
index 24da447..52b751f 100644
--- a/src/bindings/python/sip/ParseRunnerPlugin.sip
+++ b/src/bindings/python/sip/GeoDataTimeSpan.sip
@@ -19,17 +19,22 @@
namespace Marble
{
-class ParseRunnerPlugin : QObject, Marble::PluginInterface /Abstract/
+class GeoDataTimeSpan : Marble::GeoDataTimePrimitive
{
%TypeHeaderCode
-#include <ParseRunnerPlugin.h>
+#include <GeoDataTimeSpan.h>
%End
public:
- explicit ParseRunnerPlugin (QObject* parent /TransferThis/ = 0);
- virtual ~ParseRunnerPlugin ();
- virtual QString fileFormatDescription () const=0;
- virtual QStringList fileExtensions () const=0;
- virtual QIcon icon () const;
+ GeoDataTimeSpan ();
+ GeoDataTimeSpan (const Marble::GeoDataTimeSpan& other);
+ ~GeoDataTimeSpan ();
+ virtual const char* nodeType () const;
+ QDateTime begin () const;
+ void setBegin (const QDateTime& begin);
+ QDateTime end () const;
+ void setEnd (const QDateTime& end);
+ virtual void pack (QDataStream& stream) const;
+ virtual void unpack (QDataStream& stream);
};
};
diff --git a/src/bindings/python/sip/ReverseGeocodingRunnerPlugin.sip \
b/src/bindings/python/sip/GeoDataTimeStamp.sip similarity index 51%
copy from src/bindings/python/sip/ReverseGeocodingRunnerPlugin.sip
copy to src/bindings/python/sip/GeoDataTimeStamp.sip
index 4642de9..1b3b6a5 100644
--- a/src/bindings/python/sip/ReverseGeocodingRunnerPlugin.sip
+++ b/src/bindings/python/sip/GeoDataTimeStamp.sip
@@ -19,22 +19,29 @@
namespace Marble
{
-class ReverseGeocodingRunnerPlugin : QObject, Marble::PluginInterface /Abstract/
+class GeoDataTimeStamp : Marble::GeoDataTimePrimitive
{
%TypeHeaderCode
-#include <ReverseGeocodingRunnerPlugin.h>
+#include <GeoDataTimeStamp.h>
%End
public:
- explicit ReverseGeocodingRunnerPlugin (QObject* parent /TransferThis/ = 0);
- virtual ~ReverseGeocodingRunnerPlugin ();
- virtual QString guiString () const=0;
- bool supportsCelestialBody (const QString& celestialBodyId) const;
- bool canWorkOffline () const;
- virtual bool canWork () const;
- virtual QIcon icon () const;
-protected:
- void setSupportedCelestialBodies (const QStringList& celestialBodies);
- void setCanWorkOffline (bool canWorkOffline);
+ enum TimeResolution
+ {
+ SecondResolution,
+ DayResolution,
+ MonthResolution,
+ YearResolution
+ };
+ GeoDataTimeStamp ();
+ GeoDataTimeStamp (const Marble::GeoDataTimeStamp& other);
+ virtual ~GeoDataTimeStamp ();
+ virtual const char* nodeType () const;
+ QDateTime when () const;
+ void setWhen (const QDateTime& when);
+ void setResolution (Marble::GeoDataTimeStamp::TimeResolution resolution);
+ Marble::GeoDataTimeStamp::TimeResolution resolution () const;
+ virtual void pack (QDataStream& stream) const;
+ virtual void unpack (QDataStream& stream);
};
};
diff --git a/src/bindings/python/sip/GeoDataTreeModel.sip b/src/bindings/python/sip/GeoDataTreeModel.sip
index 8457f13..26bbaa5 100644
--- a/src/bindings/python/sip/GeoDataTreeModel.sip
+++ b/src/bindings/python/sip/GeoDataTreeModel.sip
@@ -41,9 +41,8 @@ public:
void reset ();
void setRootDocument (Marble::GeoDataDocument* document);
Marble::GeoDataDocument* rootDocument ();
- int addFeature (Marble::GeoDataContainer* parent, Marble::GeoDataFeature* \
feature); + int addFeature (Marble::GeoDataContainer* parent, \
Marble::GeoDataFeature* feature, int row = -1);
bool removeFeature (Marble::GeoDataContainer* parent, int index);
- bool removeFeature (Marble::GeoDataFeature* feature);
void updateFeature (Marble::GeoDataFeature* feature);
int addDocument (Marble::GeoDataDocument* document);
void removeDocument (int index);
@@ -52,5 +51,8 @@ public:
signals:
void removed (Marble::GeoDataObject* object);
void added (Marble::GeoDataObject* object);
+public:
+ QItemSelectionModel* selectionModel ();
+ int removeFeature (const Marble::GeoDataFeature* feature);
};
};
diff --git a/src/bindings/python/sip/GeoDocument.sip b/src/bindings/python/sip/GeoDocument.sip
index 95e0d12..e4e3f0c 100644
--- a/src/bindings/python/sip/GeoDocument.sip
+++ b/src/bindings/python/sip/GeoDocument.sip
@@ -60,7 +60,9 @@ protected:
else if (dynamic_cast<Marble::GeoDataColorStyle*>(sipCpp))
{
sipType = sipType_Marble_GeoDataColorStyle;
- if (dynamic_cast<Marble::GeoDataIconStyle*>(sipCpp))
+ if (dynamic_cast<Marble::GeoDataBalloonStyle*>(sipCpp))
+ sipType = sipType_Marble_GeoDataBalloonStyle;
+ else if (dynamic_cast<Marble::GeoDataIconStyle*>(sipCpp))
sipType = sipType_Marble_GeoDataIconStyle;
else if (dynamic_cast<Marble::GeoDataLabelStyle*>(sipCpp))
sipType = sipType_Marble_GeoDataLabelStyle;
@@ -81,7 +83,11 @@ protected:
sipType = sipType_Marble_GeoDataFolder;
}
else if (dynamic_cast<Marble::GeoDataOverlay*>(sipCpp))
+ {
sipType = sipType_Marble_GeoDataOverlay;
+ if (dynamic_cast<Marble::GeoDataGroundOverlay*>(sipCpp))
+ sipType = sipType_Marble_GeoDataGroundOverlay;
+ }
else if (dynamic_cast<Marble::GeoDataPlacemark*>(sipCpp))
sipType = sipType_Marble_GeoDataPlacemark;
}
@@ -99,18 +105,28 @@ protected:
else if (dynamic_cast<Marble::GeoDataPoint*>(sipCpp))
sipType = sipType_Marble_GeoDataPoint;
else if (dynamic_cast<Marble::GeoDataPolygon*>(sipCpp))
+ {
sipType = sipType_Marble_GeoDataPolygon;
+ if (dynamic_cast<Marble::GeoDataInnerBoundary*>(sipCpp))
+ sipType = sipType_Marble_GeoDataInnerBoundary;
+ else if (dynamic_cast<Marble::GeoDataOuterBoundary*>(sipCpp))
+ sipType = sipType_Marble_GeoDataOuterBoundary;
+ }
else if (dynamic_cast<Marble::GeoDataTrack*>(sipCpp))
sipType = sipType_Marble_GeoDataTrack;
}
else if (dynamic_cast<Marble::GeoDataHotSpot*>(sipCpp))
sipType = sipType_Marble_GeoDataHotSpot;
+ else if (dynamic_cast<Marble::GeoDataItemIcon*>(sipCpp))
+ sipType = sipType_Marble_GeoDataItemIcon;
else if (dynamic_cast<Marble::GeoDataLatLonBox*>(sipCpp))
{
sipType = sipType_Marble_GeoDataLatLonBox;
if (dynamic_cast<Marble::GeoDataLatLonAltBox*>(sipCpp))
sipType = sipType_Marble_GeoDataLatLonAltBox;
}
+ else if (dynamic_cast<Marble::GeoDataListStyle*>(sipCpp))
+ sipType = sipType_Marble_GeoDataListStyle;
else if (dynamic_cast<Marble::GeoDataLod*>(sipCpp))
sipType = sipType_Marble_GeoDataLod;
else if (dynamic_cast<Marble::GeoDataRegion*>(sipCpp))
@@ -123,6 +139,14 @@ protected:
else if (dynamic_cast<Marble::GeoDataStyleMap*>(sipCpp))
sipType = sipType_Marble_GeoDataStyleMap;
}
+ else if (dynamic_cast<Marble::GeoDataTimePrimitive*>(sipCpp))
+ {
+ sipType = sipType_Marble_GeoDataTimePrimitive;
+ if (dynamic_cast<Marble::GeoDataTimeSpan*>(sipCpp))
+ sipType = sipType_Marble_GeoDataTimeSpan;
+ else if (dynamic_cast<Marble::GeoDataTimeStamp*>(sipCpp))
+ sipType = sipType_Marble_GeoDataTimeStamp;
+ }
}
%End
public:
@@ -138,20 +162,24 @@ public:
%ModuleHeaderCode
//ctscc
#include <GeoDataAbstractView.h>
+#include <GeoDataBalloonStyle.h>
#include <GeoDataColorStyle.h>
#include <GeoDataContainer.h>
#include <GeoDataDocument.h>
#include <GeoDataFeature.h>
#include <GeoDataFolder.h>
#include <GeoDataGeometry.h>
+#include <GeoDataGroundOverlay.h>
#include <GeoDataHotSpot.h>
#include <GeoDataIconStyle.h>
+#include <GeoDataItemIcon.h>
#include <GeoDataLabelStyle.h>
#include <GeoDataLatLonAltBox.h>
#include <GeoDataLatLonBox.h>
#include <GeoDataLineString.h>
#include <GeoDataLineStyle.h>
#include <GeoDataLinearRing.h>
+#include <GeoDataListStyle.h>
#include <GeoDataLod.h>
#include <GeoDataLookAt.h>
#include <GeoDataMultiGeometry.h>
@@ -165,6 +193,9 @@ public:
#include <GeoDataStyle.h>
#include <GeoDataStyleMap.h>
#include <GeoDataStyleSelector.h>
+#include <GeoDataTimePrimitive.h>
+#include <GeoDataTimeSpan.h>
+#include <GeoDataTimeStamp.h>
#include <GeoDataTrack.h>
#include <GeoDocument.h>
%End
diff --git a/src/bindings/python/sip/GeoGraphicsItem.sip b/src/bindings/python/sip/GeoGraphicsItem.sip
index 39c7372..2a50695 100644
--- a/src/bindings/python/sip/GeoGraphicsItem.sip
+++ b/src/bindings/python/sip/GeoGraphicsItem.sip
@@ -28,7 +28,7 @@ class GeoGraphicsItem
%End
public:
- GeoGraphicsItem (const Marble::GeoDataFeature *x);
+ GeoGraphicsItem (const Marble::GeoDataFeature* feature);
virtual ~GeoGraphicsItem ();
enum GeoGraphicsItemFlag
{
@@ -54,6 +54,8 @@ public:
virtual void paint (Marble::GeoPainter* painter, const Marble::ViewportParams* \
viewport)=0; protected:
//ig GeoGraphicsItemPrivate* p () const;
+public:
+ const Marble::GeoDataFeature* feature () const;
};
// GeoGraphicsItem
diff --git a/src/bindings/python/sip/GeoGraphicsScene.sip b/src/bindings/python/sip/GeoGraphicsScene.sip
index 5ad03e1..1ec1d2e 100644
--- a/src/bindings/python/sip/GeoGraphicsScene.sip
+++ b/src/bindings/python/sip/GeoGraphicsScene.sip
@@ -29,9 +29,10 @@ public:
GeoGraphicsScene (QObject* parent /TransferThis/ = 0);
~GeoGraphicsScene ();
void clear ();
- QList<Marble::GeoGraphicsItem*> items (const Marble::GeoDataLatLonAltBox& box, int maxZoomLevel) \
const; //ig static int s_tileZoomLevel;
void addItem (Marble::GeoGraphicsItem* item);
void eraseAll ();
+ void removeItem (const Marble::GeoDataFeature* feature);
+ QList<Marble::GeoGraphicsItem*> items (const Marble::GeoDataLatLonBox& box, int maxZoomLevel) \
const; };
};
diff --git a/src/bindings/python/sip/GeoPainter.sip b/src/bindings/python/sip/GeoPainter.sip
index 75295c2..3bfc7f5 100644
--- a/src/bindings/python/sip/GeoPainter.sip
+++ b/src/bindings/python/sip/GeoPainter.sip
@@ -36,34 +36,17 @@ public:
void drawPolygon (const Marble::GeoDataLinearRing& linearRing, Qt::FillRule \
fillRule = Qt::OddEvenFill);
void drawPolygon (const Marble::GeoDataPolygon& polygon, Qt::FillRule fillRule = \
Qt::OddEvenFill);
void drawRect (const Marble::GeoDataCoordinates& centerPosition, qreal width, \
qreal height, bool isGeoProjected = 0);
- void drawText (int x, int y, const QString& text);
- void drawText (const QPointF& position, const QString& text);
- void drawText (const QPoint& position, const QString& text);
- void drawText (const QRect& rectangle, int flags, const QString& text, QRect* \
boundingRect = 0);
- void drawEllipse (int x, int y, int width, int height);
- void drawEllipse (const QRectF& rectangle);
- void drawImage (const QRect& target, const QImage& image, const QRect& source, \
Qt::ImageConversionFlags flags = Qt::AutoColor);
- void drawPixmap (int x, int y, const QPixmap& pixmap);
- void drawPixmap (const QPointF& point, const QPixmap& pixmap);
- void drawPixmap (const QPoint& point, const QPixmap& pixmap);
- void drawPoint (int x, int y);
- void drawPolyline (const QPolygonF& polyline);
- void drawPolygon (const QPolygonF& polygon);
- void drawLine (int x1, int y1, int x2, int y2);
- void drawRect (const QRectF& rectangle);
- void drawRect (const QRect& rectangle);
- void drawRect (int x, int y, int width, int height);
~GeoPainter ();
void drawPoint (const Marble::GeoDataPoint& point);
- void drawImage (const QRect& rect, const QImage& image);
- void drawImage (const QRectF& rect, const QImage& image);
QRegion regionFromPoint (const Marble::GeoDataCoordinates& position, qreal \
strokeWidth = 3) const;
QRegion regionFromPoint (const Marble::GeoDataPoint& point, qreal strokeWidth = 3) \
const; QRegion regionFromEllipse (const Marble::GeoDataCoordinates& centerPosition, \
qreal width, qreal height, bool isGeoProjected = 0, qreal strokeWidth = 3) const;
QRegion regionFromPolyline (const Marble::GeoDataLineString& lineString, qreal \
strokeWidth = 3) const;
QRegion regionFromPolygon (const Marble::GeoDataLinearRing& linearRing, Qt::FillRule \
fillRule, qreal strokeWidth = 3) const; QRegion regionFromRect (const \
Marble::GeoDataCoordinates& centerPosition, qreal width, qreal height, bool isGeoProjected = 0, qreal \
strokeWidth = 3) const; + GeoPainter (QPaintDevice* paintDevice, const \
Marble::ViewportParams* viewportParams, Marble::MapQuality mapQuality = NormalQuality); + void \
drawRoundRect (const Marble::GeoDataCoordinates& centerPosition, int width, int height, int xRnd = 25, \
int yRnd = 25); };
// GeoPainter
diff --git a/src/bindings/python/sip/GeoWriter.sip b/src/bindings/python/sip/GeoWriter.sip
index 9ed3c22..60b9416 100644
--- a/src/bindings/python/sip/GeoWriter.sip
+++ b/src/bindings/python/sip/GeoWriter.sip
@@ -31,7 +31,7 @@ public:
void setDocumentType (const QString& documentType);
void writeElement (const QString& namespaceUri, const QString& key, const \
QString& value);
void writeElement (const QString& key, const QString& value);
- void writeOptionalElement (const QString& key, const QString& value);
+ void writeOptionalElement (const QString& key, const QString& value, const \
QString& defaultValue = QString()); %ConvertToSubClassCode
// CTSCC for subclasses of 'QXmlStreamWriter'
sipType = NULL;
diff --git a/src/bindings/python/sip/LayerInterface.sip b/src/bindings/python/sip/LayerInterface.sip
index 59f4680..8aa1bc6 100644
--- a/src/bindings/python/sip/LayerInterface.sip
+++ b/src/bindings/python/sip/LayerInterface.sip
@@ -29,7 +29,7 @@ public:
virtual ~LayerInterface ();
virtual QStringList renderPosition () const=0;
virtual qreal zValue () const;
- virtual bool render (Marble::GeoPainter* painter, Marble::ViewportParams* viewport, const \
QString& renderPos, Marble::GeoSceneLayer* layer)=0; virtual QString runtimeTrace () const;
+ virtual bool render (Marble::GeoPainter* painter, Marble::ViewportParams* viewport, const \
QString& renderPos, Marble::GeoSceneLayer* layer)=0; };
};
diff --git a/src/bindings/python/sip/GeoDataAbstractView.sip \
b/src/bindings/python/sip/MapThemeDownloadDialog.sip similarity index 76%
copy from src/bindings/python/sip/GeoDataAbstractView.sip
copy to src/bindings/python/sip/MapThemeDownloadDialog.sip
index 65fb8da..e496adf 100644
--- a/src/bindings/python/sip/GeoDataAbstractView.sip
+++ b/src/bindings/python/sip/MapThemeDownloadDialog.sip
@@ -1,4 +1,4 @@
-// Copyright 2009 Simon Edwards <simon@simonzone.com>
+// Copyright 2011 Simon Edwards <simon@simonzone.com>
// Generated by twine2
@@ -19,14 +19,14 @@
namespace Marble
{
-class GeoDataAbstractView : Marble::GeoDataObject /Abstract/
+class MapThemeDownloadDialog : QDialog
{
%TypeHeaderCode
-#include <GeoDataAbstractView.h>
+#include <MapThemeDownloadDialog.h>
%End
public:
- GeoDataAbstractView ();
- ~GeoDataAbstractView ();
+ explicit MapThemeDownloadDialog (Marble::MarbleWidget* marbleWidget);
+ ~MapThemeDownloadDialog ();
};
};
diff --git a/src/bindings/python/sip/MapThemeManager.sip b/src/bindings/python/sip/MapThemeManager.sip
index cabf20b..8adc717 100644
--- a/src/bindings/python/sip/MapThemeManager.sip
+++ b/src/bindings/python/sip/MapThemeManager.sip
@@ -35,6 +35,7 @@ public:
QStringList mapThemeIds () const;
//ig GeoSceneDocument* loadMapTheme (const QString& mapThemeStringID) const;
static void deleteMapTheme (const QString& mapThemeId);
+ QStandardItemModel* celestialBodiesModel ();
};
// MapThemeManager
diff --git a/src/bindings/python/sip/MapViewWidget.sip b/src/bindings/python/sip/MapViewWidget.sip
index bbc0f35..b9b0d42 100644
--- a/src/bindings/python/sip/MapViewWidget.sip
+++ b/src/bindings/python/sip/MapViewWidget.sip
@@ -39,5 +39,9 @@ signals:
void mapThemeIdChanged (const QString&);
void projectionChanged (Marble::Projection);
void celestialBodyChanged (const QString&);
+protected:
+ void resizeEvent (QResizeEvent* event);
+signals:
+ void mapThemeDeleted ();
};
};
diff --git a/src/bindings/python/sip/MarbleAboutDialog.sip \
b/src/bindings/python/sip/MarbleAboutDialog.sip index d797d27..d793095 100644
--- a/src/bindings/python/sip/MarbleAboutDialog.sip
+++ b/src/bindings/python/sip/MarbleAboutDialog.sip
@@ -29,6 +29,14 @@ public:
~MarbleAboutDialog ();
void setApplicationTitle (const QString& title);
+ enum Tab
+ {
+ About,
+ Authors,
+ Data,
+ License
+ };
+ void setInitialTab (Marble::MarbleAboutDialog::Tab tab);
};
// MarbleAboutDialog
diff --git a/src/bindings/python/sip/MarbleColors.sip b/src/bindings/python/sip/MarbleColors.sip
new file mode 100644
index 0000000..c444c27
--- /dev/null
+++ b/src/bindings/python/sip/MarbleColors.sip
@@ -0,0 +1,97 @@
+// 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
+{
+namespace Oxygen
+{
+const QColor woodBrown6;
+const QColor woodBrown5;
+const QColor woodBrown4;
+const QColor woodBrown3;
+const QColor woodBrown2;
+const QColor woodBrown1;
+const QColor brickRed6;
+const QColor brickRed5;
+const QColor brickRed4;
+const QColor brickRed3;
+const QColor brickRed2;
+const QColor brickRed1;
+const QColor raspberryPink6;
+const QColor raspberryPink5;
+const QColor raspberryPink4;
+const QColor raspberryPink3;
+const QColor raspberryPink2;
+const QColor raspberryPink1;
+const QColor burgundyPurple6;
+const QColor burgundyPurple5;
+const QColor burgundyPurple4;
+const QColor burgundyPurple3;
+const QColor burgundyPurple2;
+const QColor burgundyPurple1;
+const QColor grapeViolet6;
+const QColor grapeViolet5;
+const QColor grapeViolet4;
+const QColor grapeViolet3;
+const QColor grapeViolet2;
+const QColor grapeViolet1;
+const QColor skyBlue6;
+const QColor skyBlue5;
+const QColor skyBlue4;
+const QColor skyBlue3;
+const QColor skyBlue2;
+const QColor skyBlue1;
+const QColor seaBlue6;
+const QColor seaBlue5;
+const QColor seaBlue4;
+const QColor seaBlue3;
+const QColor seaBlue2;
+const QColor seaBlue1;
+const QColor emeraldGreen6;
+const QColor emeraldGreen5;
+const QColor emeraldGreen4;
+const QColor emeraldGreen3;
+const QColor emeraldGreen2;
+const QColor emeraldGreen1;
+const QColor forestGreen6;
+const QColor forestGreen5;
+const QColor forestGreen4;
+const QColor forestGreen3;
+const QColor forestGreen2;
+const QColor forestGreen1;
+const QColor sunYellow6;
+const QColor sunYellow5;
+const QColor sunYellow4;
+const QColor sunYellow3;
+const QColor sunYellow2;
+const QColor sunYellow1;
+const QColor hotOrange6;
+const QColor hotOrange5;
+const QColor hotOrange4;
+const QColor hotOrange3;
+const QColor hotOrange2;
+const QColor hotOrange1;
+const QColor aluminumGray6;
+const QColor aluminumGray5;
+const QColor aluminumGray4;
+const QColor aluminumGray3;
+const QColor aluminumGray2;
+const QColor aluminumGray1;
+};
+};
diff --git a/src/bindings/python/sip/MarbleGlobal.sip b/src/bindings/python/sip/MarbleGlobal.sip
index 5dd45b1..c42c721 100644
--- a/src/bindings/python/sip/MarbleGlobal.sip
+++ b/src/bindings/python/sip/MarbleGlobal.sip
@@ -59,7 +59,8 @@ enum AngleUnit
{
DMSDegree,
DecimalDegree,
- UTM
+ UTM,
+ MGRS
};
diff --git a/src/bindings/python/sip/MarbleGraphicsItem.sip \
b/src/bindings/python/sip/MarbleGraphicsItem.sip index a97b300..b69ee6a 100644
--- a/src/bindings/python/sip/MarbleGraphicsItem.sip
+++ b/src/bindings/python/sip/MarbleGraphicsItem.sip
@@ -85,7 +85,7 @@ private:
%End
public:
bool paintEvent (QPainter* painter, const Marble::ViewportParams* viewport);
- void setProjection (Marble::ViewportParams* viewport);
+ virtual void setProjection (const Marble::ViewportParams* viewport);
};
// MarbleGraphicsItem
diff --git a/src/bindings/python/sip/MarbleMap.sip b/src/bindings/python/sip/MarbleMap.sip
index 8d0dcb9..7c5e653 100644
--- a/src/bindings/python/sip/MarbleMap.sip
+++ b/src/bindings/python/sip/MarbleMap.sip
@@ -149,6 +149,10 @@ public:
//ig const TextureLayer* textureLayer () const;
void setShowRuntimeTrace (bool visible);
void downloadRegion (const QVector<Marble::TileCoordsPyramid>&);
+ bool isLockedToSubSolarPoint () const;
+ bool isSubSolarPointIconVisible () const;
+ void setLockToSubSolarPoint (bool visible);
+ void setSubSolarPointIconVisible (bool visible);
};
// MarbleMap
diff --git a/src/bindings/python/sip/MarbleModel.sip b/src/bindings/python/sip/MarbleModel.sip
index 93139a9..8374c89 100644
--- a/src/bindings/python/sip/MarbleModel.sip
+++ b/src/bindings/python/sip/MarbleModel.sip
@@ -63,14 +63,13 @@ public:
QString planetId () const;
explicit MarbleModel (QObject* parent /TransferThis/ = 0);
//ig GeoDataTreeModel* treeModel ();
- QAbstractItemModel* placemarkModel ();
+//ig QAbstractItemModel* placemarkModel ();
QItemSelectionModel* placemarkSelectionModel ();
//ig GeoSceneDocument* mapTheme ();
void home (qreal& lon, qreal& lat, int& zoom) const;
Marble::MapThemeManager* mapThemeManager ();
//ig HttpDownloadManager* downloadManager ();
//ig FileManager* fileManager ();
-//ig FileViewModel* fileViewModel ();
//ig MarbleClock* clock ();
//ig Marble::SunLocator* sunLocator ();
//ig const RoutingManager* routingManager () const;
@@ -89,6 +88,10 @@ public:
//ig PluginManager* pluginManager ();
signals:
void homeChanged (const Marble::GeoDataCoordinates newHomePoint);
+public:
+ const Marble::GeoDataTreeModel* treeModel () const;
+ const QAbstractItemModel* placemarkModel () const;
+ void updateProperty (const QString& property, bool value);
};
// MarbleModel
diff --git a/src/bindings/python/sip/GeoDataGroundOverlay.sip b/src/bindings/python/sip/MarbleWebView.sip
similarity index 100%
copy from src/bindings/python/sip/GeoDataGroundOverlay.sip
copy to src/bindings/python/sip/MarbleWebView.sip
diff --git a/src/bindings/python/sip/MarbleWidget.sip b/src/bindings/python/sip/MarbleWidget.sip
index f67b4a3..ede7fbb 100644
--- a/src/bindings/python/sip/MarbleWidget.sip
+++ b/src/bindings/python/sip/MarbleWidget.sip
@@ -186,6 +186,14 @@ public:
//ig const TextureLayer* textureLayer () const;
void setShowRuntimeTrace (bool visible);
void downloadRegion (const QVector<Marble::TileCoordsPyramid>&);
+
+// FIXME
+//ig PopupLayer* popupLayer ();
+ bool isLockedToSubSolarPoint () const;
+ bool isSubSolarPointIconVisible () const;
+ void setZoom (int zoom, Marble::FlyToMode mode = Marble::Instant);
+ void setLockToSubSolarPoint (bool visible);
+ void setSubSolarPointIconVisible (bool visible);
};
// MarbleWidget
diff --git a/src/bindings/python/sip/ParseRunnerPlugin.sip \
b/src/bindings/python/sip/ParseRunnerPlugin.sip index 24da447..262eaf5 100644
--- a/src/bindings/python/sip/ParseRunnerPlugin.sip
+++ b/src/bindings/python/sip/ParseRunnerPlugin.sip
@@ -31,5 +31,6 @@ public:
virtual QString fileFormatDescription () const=0;
virtual QStringList fileExtensions () const=0;
virtual QIcon icon () const;
+ virtual Marble::ParsingRunner* newRunner () const=0;
};
};
diff --git a/src/bindings/python/sip/ParseRunnerPlugin.sip b/src/bindings/python/sip/ParsingRunner.sip
similarity index 69%
copy from src/bindings/python/sip/ParseRunnerPlugin.sip
copy to src/bindings/python/sip/ParsingRunner.sip
index 24da447..ce098e3 100644
--- a/src/bindings/python/sip/ParseRunnerPlugin.sip
+++ b/src/bindings/python/sip/ParsingRunner.sip
@@ -19,17 +19,16 @@
namespace Marble
{
-class ParseRunnerPlugin : QObject, Marble::PluginInterface /Abstract/
+class ParsingRunner : QObject
{
%TypeHeaderCode
-#include <ParseRunnerPlugin.h>
+#include <ParsingRunner.h>
%End
public:
- explicit ParseRunnerPlugin (QObject* parent /TransferThis/ = 0);
- virtual ~ParseRunnerPlugin ();
- virtual QString fileFormatDescription () const=0;
- virtual QStringList fileExtensions () const=0;
- virtual QIcon icon () const;
+ explicit ParsingRunner (QObject* parent /TransferThis/ = 0);
+ virtual void parseFile (const QString& fileName, Marble::DocumentRole role)=0;
+signals:
+ void parsingFinished (Marble::GeoDataDocument* document, const QString& error = \
QString()); };
};
diff --git a/src/bindings/python/sip/Planet.sip b/src/bindings/python/sip/Planet.sip
index 26f2afb..87f80fc 100644
--- a/src/bindings/python/sip/Planet.sip
+++ b/src/bindings/python/sip/Planet.sip
@@ -64,6 +64,10 @@ public:
static QString name (const QString& id);
~Planet ();
static QStringList planetList ();
+ bool hasAtmosphere () const;
+ void setHasAtmosphere (bool enabled);
+ QColor atmosphereColor () const;
+ void setAtmosphereColor (const QColor& color);
};
// Planet
diff --git a/src/bindings/python/sip/QtMarbleConfigDialog.sip \
b/src/bindings/python/sip/QtMarbleConfigDialog.sip index 804ad10..befd09a 100644
--- a/src/bindings/python/sip/QtMarbleConfigDialog.sip
+++ b/src/bindings/python/sip/QtMarbleConfigDialog.sip
@@ -61,5 +61,6 @@ public:
int chosenTimezone () const;
void initializeCustomTimezone ();
QLocale::MeasurementSystem measurementSystem () const;
+ bool inertialEarthRotation () const;
};
};
diff --git a/src/bindings/python/sip/RenderPlugin.sip b/src/bindings/python/sip/RenderPlugin.sip
index f7bed99..f8504ea 100644
--- a/src/bindings/python/sip/RenderPlugin.sip
+++ b/src/bindings/python/sip/RenderPlugin.sip
@@ -62,6 +62,21 @@ public:
QStringList settingKeys ();
bool setSetting (const QString& key, const QVariant& value);
QVariant setting (const QString& key);
+ enum RenderType
+ {
+ UnknownRenderType,
+ TopLevelRenderType,
+ PanelRenderType,
+ OnlineRenderType,
+ ThemeRenderType
+ };
+ virtual const QList<QActionGroup*>* actionGroups () const;
+ virtual const QList<QActionGroup*>* toolbarActionGroups () const;
+ bool isUserCheckable () const;
+ virtual Marble::RenderPlugin::RenderType renderType () const;
+ void setUserCheckable (bool isUserCheckable);
+signals:
+ void userCheckableChanged (bool isUserCheckable);
};
// RenderPlugin
diff --git a/src/bindings/python/sip/GeoGraphicsScene.sip \
b/src/bindings/python/sip/ReverseGeocodingRunner.sip similarity index 61%
copy from src/bindings/python/sip/GeoGraphicsScene.sip
copy to src/bindings/python/sip/ReverseGeocodingRunner.sip
index 5ad03e1..887f063 100644
--- a/src/bindings/python/sip/GeoGraphicsScene.sip
+++ b/src/bindings/python/sip/ReverseGeocodingRunner.sip
@@ -19,19 +19,19 @@
namespace Marble
{
-class GeoGraphicsScene : QObject
+class ReverseGeocodingRunner : QObject
{
%TypeHeaderCode
-#include <GeoGraphicsScene.h>
+#include <ReverseGeocodingRunner.h>
%End
public:
- GeoGraphicsScene (QObject* parent /TransferThis/ = 0);
- ~GeoGraphicsScene ();
- void clear ();
- QList<Marble::GeoGraphicsItem*> items (const Marble::GeoDataLatLonAltBox& box, int maxZoomLevel) \
const;
-//ig static int s_tileZoomLevel;
- void addItem (Marble::GeoGraphicsItem* item);
- void eraseAll ();
+ explicit ReverseGeocodingRunner (QObject* parent /TransferThis/);
+ void setModel (const Marble::MarbleModel* model);
+ virtual void reverseGeocoding (const Marble::GeoDataCoordinates& coordinates)=0;
+signals:
+ void reverseGeocodingFinished (const Marble::GeoDataCoordinates& coordinates, \
const Marble::GeoDataPlacemark& placemark); +protected:
+ const Marble::MarbleModel* model () const;
};
};
diff --git a/src/bindings/python/sip/ReverseGeocodingRunnerPlugin.sip \
b/src/bindings/python/sip/ReverseGeocodingRunnerPlugin.sip index 4642de9..d1f7252 100644
--- a/src/bindings/python/sip/ReverseGeocodingRunnerPlugin.sip
+++ b/src/bindings/python/sip/ReverseGeocodingRunnerPlugin.sip
@@ -36,5 +36,7 @@ public:
protected:
void setSupportedCelestialBodies (const QStringList& celestialBodies);
void setCanWorkOffline (bool canWorkOffline);
+public:
+ virtual Marble::ReverseGeocodingRunner* newRunner () const=0;
};
};
diff --git a/src/bindings/python/sip/RoutingModel.sip b/src/bindings/python/sip/RoutingModel.sip
index c2d8ac5..1da2865 100644
--- a/src/bindings/python/sip/RoutingModel.sip
+++ b/src/bindings/python/sip/RoutingModel.sip
@@ -49,6 +49,6 @@ signals:
void deviatedFromRoute (bool deviated);
void currentRouteChanged ();
public:
- int rightNeighbor (const Marble::GeoDataCoordinates& position, const \
Marble::RouteRequest * route) const; + int rightNeighbor (const \
Marble::GeoDataCoordinates& position, const Marble::RouteRequest* route) const; };
};
diff --git a/src/bindings/python/sip/BillboardGraphicsItem.sip \
b/src/bindings/python/sip/RoutingRunner.sip similarity index 66%
copy from src/bindings/python/sip/BillboardGraphicsItem.sip
copy to src/bindings/python/sip/RoutingRunner.sip
index 536f3f0..a91f943 100644
--- a/src/bindings/python/sip/BillboardGraphicsItem.sip
+++ b/src/bindings/python/sip/RoutingRunner.sip
@@ -19,17 +19,19 @@
namespace Marble
{
-class BillboardGraphicsItem : Marble::MarbleGraphicsItem
+class RoutingRunner : QObject
{
%TypeHeaderCode
-#include <BillboardGraphicsItem.h>
+#include <RoutingRunner.h>
%End
public:
- BillboardGraphicsItem ();
- Marble::GeoDataCoordinates coordinate () const;
- void setCoordinate (const Marble::GeoDataCoordinates& coordinates);
- QList<QPointF> positions () const;
- QList<QRectF> boundingRects () const;
+ explicit RoutingRunner (QObject* parent /TransferThis/);
+ void setModel (const Marble::MarbleModel* model);
+ virtual void retrieveRoute (const Marble::RouteRequest* request)=0;
+signals:
+ void routeCalculated (Marble::GeoDataDocument* route);
+protected:
+ const Marble::MarbleModel* model () const;
};
};
diff --git a/src/bindings/python/sip/RoutingRunnerPlugin.sip \
b/src/bindings/python/sip/RoutingRunnerPlugin.sip index b8381eb..3ea0313 100644
--- a/src/bindings/python/sip/RoutingRunnerPlugin.sip
+++ b/src/bindings/python/sip/RoutingRunnerPlugin.sip
@@ -41,5 +41,7 @@ protected:
void setStatusMessage (const QString& message);
void setSupportedCelestialBodies (const QStringList& celestialBodies);
void setCanWorkOffline (bool canWorkOffline);
+public:
+ virtual Marble::RoutingRunner* newRunner () const=0;
};
};
diff --git a/src/bindings/python/sip/ScreenGraphicsItem.sip \
b/src/bindings/python/sip/ScreenGraphicsItem.sip index eace811..fffebb9 100644
--- a/src/bindings/python/sip/ScreenGraphicsItem.sip
+++ b/src/bindings/python/sip/ScreenGraphicsItem.sip
@@ -35,7 +35,8 @@ public:
enum GraphicsItemFlag
{
- ItemIsMovable
+ ItemIsMovable,
+ ItemIsHideable
};
typedef QFlags<Marble::ScreenGraphicsItem::GraphicsItemFlag> GraphicsItemFlags;
virtual ~ScreenGraphicsItem ();
diff --git a/src/bindings/python/sip/GeoGraphicsScene.sip b/src/bindings/python/sip/SearchRunner.sip
similarity index 64%
copy from src/bindings/python/sip/GeoGraphicsScene.sip
copy to src/bindings/python/sip/SearchRunner.sip
index 5ad03e1..b8f7009 100644
--- a/src/bindings/python/sip/GeoGraphicsScene.sip
+++ b/src/bindings/python/sip/SearchRunner.sip
@@ -19,19 +19,20 @@
namespace Marble
{
-class GeoGraphicsScene : QObject
+class SearchRunner : QObject
{
%TypeHeaderCode
-#include <GeoGraphicsScene.h>
+#include <SearchRunner.h>
%End
public:
- GeoGraphicsScene (QObject* parent /TransferThis/ = 0);
- ~GeoGraphicsScene ();
- void clear ();
- QList<Marble::GeoGraphicsItem*> items (const Marble::GeoDataLatLonAltBox& box, int maxZoomLevel) \
const;
-//ig static int s_tileZoomLevel;
- void addItem (Marble::GeoGraphicsItem* item);
- void eraseAll ();
+ 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;
};
};
diff --git a/src/bindings/python/sip/SearchRunnerPlugin.sip \
b/src/bindings/python/sip/SearchRunnerPlugin.sip index 2924e79..874e74f 100644
--- a/src/bindings/python/sip/SearchRunnerPlugin.sip
+++ b/src/bindings/python/sip/SearchRunnerPlugin.sip
@@ -36,5 +36,7 @@ public:
protected:
void setSupportedCelestialBodies (const QStringList& celestialBodies);
void setCanWorkOffline (bool canWorkOffline);
+public:
+ virtual Marble::SearchRunner* newRunner () const=0;
};
};
diff --git a/src/bindings/python/sip/TileId.sip b/src/bindings/python/sip/TileId.sip
new file mode 100644
index 0000000..0f709bd
--- /dev/null
+++ b/src/bindings/python/sip/TileId.sip
@@ -0,0 +1,47 @@
+// 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 TileId
+{
+%TypeHeaderCode
+#include <TileId.h>
+%End
+
+public:
+ TileId (const QString& mapThemeId, int zoomLevel, int tileX, int tileY);
+ TileId (uint mapThemeIdHash, int zoomLevel, int tileX, int tileY);
+ TileId ();
+ int zoomLevel () const;
+ int x () const;
+ int y () const;
+ uint mapThemeIdHash () const;
+ bool operator == (const Marble::TileId& rhs) const;
+ bool operator < (const Marble::TileId& rhs) const;
+ static Marble::TileId fromCoordinates (const Marble::GeoDataCoordinates& coords, int popularity);
+};
+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 QDebug operator << (QDebug, const Marble::TileId&);
diff --git a/src/bindings/python/sip/ViewportParams.sip b/src/bindings/python/sip/ViewportParams.sip
index a2d4b45..b33406b 100644
--- a/src/bindings/python/sip/ViewportParams.sip
+++ b/src/bindings/python/sip/ViewportParams.sip
@@ -76,6 +76,7 @@ public:
//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)); };
// ViewportParams
diff --git a/src/bindings/python/sip/GeoDataGroundOverlay.sip \
b/src/bindings/python/sip/WikipediaService.sip similarity index 100%
copy from src/bindings/python/sip/GeoDataGroundOverlay.sip
copy to src/bindings/python/sip/WikipediaService.sip
diff --git a/src/bindings/python/sip/marblemod.sip b/src/bindings/python/sip/marblemod.sip
index 9dc7f09..9baccd4 100644
--- a/src/bindings/python/sip/marblemod.sip
+++ b/src/bindings/python/sip/marblemod.sip
@@ -27,10 +27,9 @@
%Import QtGui/QtGuimod.sip
%Import QtWebKit/QtWebKitmod.sip
%Import QtXml/QtXmlmod.sip
-%Import QtDeclarative/QtDeclarativemod.sip
%Include AbstractLayerInterface.sip
-%Include GeoDataGroundOverlay.sip
+%Include CylindricalProjection.sip
%Include TileCreatorDialog.sip
%Include AbstractDataPlugin.sip
%Include AbstractDataPluginItem.sip
@@ -44,7 +43,6 @@
%Include BookmarkManager.sip
%Include ClipPainter.sip
%Include CurrentLocationWidget.sip
-%Include CylindricalProjection.sip
%Include DialogConfigurationInterface.sip
%Include DownloadRegion.sip
%Include DownloadRegionDialog.sip
@@ -53,6 +51,7 @@
%Include FrameGraphicsItem.sip
%Include GeoDataAbstractView.sip
%Include GeoDataAccuracy.sip
+%Include GeoDataBalloonStyle.sip
%Include GeoDataColorStyle.sip
%Include GeoDataContainer.sip
%Include GeoDataCoordinates.sip
@@ -62,17 +61,20 @@
%Include GeoDataGeometry.sip
%Include GeoDataHotSpot.sip
%Include GeoDataIconStyle.sip
+%Include GeoDataItemIcon.sip
%Include GeoDataLabelStyle.sip
%Include GeoDataLatLonAltBox.sip
%Include GeoDataLatLonBox.sip
%Include GeoDataLineString.sip
%Include GeoDataLineStyle.sip
%Include GeoDataLinearRing.sip
+%Include GeoDataListStyle.sip
%Include GeoDataLod.sip
%Include GeoDataLookAt.sip
%Include GeoDataMultiGeometry.sip
%Include GeoDataObject.sip
%Include GeoDataOverlay.sip
+%Include GeoDataGroundOverlay.sip
%Include GeoDataPlacemark.sip
%Include GeoDataPoint.sip
%Include GeoDataPolyStyle.sip
@@ -81,6 +83,9 @@
%Include GeoDataStyle.sip
%Include GeoDataStyleMap.sip
%Include GeoDataStyleSelector.sip
+%Include GeoDataTimePrimitive.sip
+%Include GeoDataTimeSpan.sip
+%Include GeoDataTimeStamp.sip
%Include GeoDataTrack.sip
%Include GeoDataTreeModel.sip
%Include GeoDocument.sip
@@ -93,10 +98,12 @@
%Include LatLonEdit.sip
%Include LayerInterface.sip
%Include LegendWidget.sip
+%Include MapThemeDownloadDialog.sip
%Include MapThemeManager.sip
%Include MapViewWidget.sip
%Include MapWizard.sip
%Include MarbleAboutDialog.sip
+%Include MarbleColors.sip
%Include MarbleControlBox.sip
%Include MarbleDirs.sip
%Include MarbleGlobal.sip
@@ -106,9 +113,11 @@
%Include MarbleModel.sip
%Include MarbleNavigator.sip
%Include MarbleRunnerManager.sip
+%Include MarbleWebView.sip
%Include MarbleWidget.sip
%Include NavigationWidget.sip
%Include ParseRunnerPlugin.sip
+%Include ParsingRunner.sip
%Include Planet.sip
%Include PluginAboutDialog.sip
%Include PluginInterface.sip
@@ -119,18 +128,23 @@
%Include Quaternion.sip
%Include RenderPlugin.sip
%Include RenderPluginInterface.sip
+%Include ReverseGeocodingRunner.sip
%Include ReverseGeocodingRunnerPlugin.sip
+%Include RoutingRunner.sip
%Include RoutingRunnerPlugin.sip
%Include ScreenGraphicsItem.sip
+%Include SearchRunner.sip
%Include SearchRunnerPlugin.sip
%Include Serializable.sip
%Include SunLocator.sip
%Include TileCoordsPyramid.sip
%Include TileCreator.sip
+%Include TileId.sip
%Include TileLevelRangeWidget.sip
%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