[Marble-commits] branches/KDE/4.3/kdeedu/marble/src/bindings/python/sip

Simon Edwards simon at simonzone.com
Wed Jul 15 22:14:28 CEST 2009


SVN commit 997429 by sedwards:

Python bindings updates for Marble.



 M  +2 -2      AbstractDataPlugin.sip  
 M  +0 -4      AbstractProjection.sip  
 M  +0 -5      GeoDataContainer.sip  
 M  +0 -1      GeoDataDocument.sip  
 M  +0 -1      GeoDataFolder.sip  
 M  +2 -0      GeoDataGeometry.sip  
 M  +0 -1      GeoDataLatLonAltBox.sip  
 M  +0 -1      GeoDataLatLonBox.sip  
 M  +10 -7     GeoDataLineString.sip  
 M  +3 -0      GeoDataLinearRing.sip  
 M  +0 -2      GeoGraphicsItem.sip  
 M  +0 -5      MarbleControlBox.sip  
 M  +0 -3      MarbleDataFacade.sip  
 M  +0 -1      MarbleGraphicsItem.sip  
 M  +0 -3      MarbleWidget.sip  


--- branches/KDE/4.3/kdeedu/marble/src/bindings/python/sip/AbstractDataPlugin.sip #997428:997429
@@ -39,13 +39,13 @@
 
 
     virtual void            initialize () = 0;
-    bool                    isInitialized () const;
+    virtual bool            isInitialized () const;
     Marble::AbstractDataPluginModel*  model () const;
     void                    setModel (Marble::AbstractDataPluginModel* model);
     void                    setNameId (const QString& name);
     QString                 nameId () const;
+    void                    setNumberOfItems (quint32 number);
     quint32                 numberOfItems () const;
-    void                    setNumberOfItems (quint32 number);
     QList<Marble::AbstractDataPluginItem*>  whichItemAt (const QPoint& curpos);
 };   // AbstractDataPlugin
 
--- branches/KDE/4.3/kdeedu/marble/src/bindings/python/sip/AbstractProjection.sip #997428:997429
@@ -45,10 +45,6 @@
     };
 
                             AbstractProjection ();
-    virtual qreal           maxLat () const;
-    virtual qreal           minLat () const;
-    virtual bool            repeatX () const;
-    virtual void            setRepeatX (bool val);
     virtual bool            traversablePoles () const;
     virtual bool            traversableDateLine () const;
     virtual Marble::AbstractProjection::SurfaceType  surfaceType () const = 0;
--- branches/KDE/4.3/kdeedu/marble/src/bindings/python/sip/GeoDataContainer.sip #997428:997429
@@ -51,11 +51,6 @@
 
 private:
 //ig                            GeoDataContainer (Marble::GeoDataContainerPrivate* priv);
-
-public:
-    virtual Marble::GeoDataObject*  child (int);
-    virtual int             childPosition (Marble::GeoDataObject*);
-    virtual int             childCount ();
 };   // GeoDataContainer
 
 };   // Marble
--- branches/KDE/4.3/kdeedu/marble/src/bindings/python/sip/GeoDataDocument.sip #997428:997429
@@ -42,7 +42,6 @@
     QList<Marble::GeoDataStyleMap>  styleMaps () const;
     virtual void            pack (QDataStream& stream) const;
     virtual void            unpack (QDataStream& stream);
-    virtual EnumFeatureId   featureId () const;
 };   // GeoDataDocument
 
 };   // Marble
--- branches/KDE/4.3/kdeedu/marble/src/bindings/python/sip/GeoDataFolder.sip #997428:997429
@@ -30,7 +30,6 @@
                             GeoDataFolder (const Marble::GeoDataFolder& other);
                             GeoDataFolder (const Marble::GeoDataFeature& other);
     virtual bool            isFolder () const;
-    virtual EnumFeatureId   featureId () const;
 };   // GeoDataFolder
 
 };   // Marble
--- branches/KDE/4.3/kdeedu/marble/src/bindings/python/sip/GeoDataGeometry.sip #997428:997429
@@ -43,6 +43,8 @@
     virtual void            unpack (QDataStream& stream);
     void                    detach ();
 
+private:
+//ig                            GeoDataGeometry (Marble::GeoDataGeometryPrivate* priv);
 };   // GeoDataGeometry
 
 };   // Marble
--- branches/KDE/4.3/kdeedu/marble/src/bindings/python/sip/GeoDataLatLonAltBox.sip #997428:997429
@@ -29,7 +29,6 @@
                             GeoDataLatLonAltBox ();
                             GeoDataLatLonAltBox (const Marble::GeoDataLatLonAltBox&);
                             GeoDataLatLonAltBox (const Marble::GeoDataLatLonBox&);
-    virtual bool            isFolder () const;
     qreal                   minAltitude () const;
     void                    setMinAltitude (const qreal minAltitude);
     qreal                   maxAltitude () const;
--- branches/KDE/4.3/kdeedu/marble/src/bindings/python/sip/GeoDataLatLonBox.sip #997428:997429
@@ -29,7 +29,6 @@
                             GeoDataLatLonBox ();
                             GeoDataLatLonBox (qreal north, qreal south, qreal east, qreal west, Marble::GeoDataCoordinates::Unit unit = Marble::GeoDataCoordinates::Radian);
                             GeoDataLatLonBox (const Marble::GeoDataLatLonBox&);
-    virtual bool            isFolder () const;
     qreal                   north (Marble::GeoDataCoordinates::Unit unit = Marble::GeoDataCoordinates::Radian) const;
     void                    setNorth (const qreal north, Marble::GeoDataCoordinates::Unit unit = Marble::GeoDataCoordinates::Radian);
     qreal                   south (Marble::GeoDataCoordinates::Unit unit = Marble::GeoDataCoordinates::Radian) const;
--- branches/KDE/4.3/kdeedu/marble/src/bindings/python/sip/GeoDataLineString.sip #997428:997429
@@ -37,9 +37,16 @@
     Marble::TessellationFlags  tessellationFlags () const;
     void                    setTessellationFlags (Marble::TessellationFlags f);
     Marble::GeoDataLatLonAltBox  latLonAltBox () const;
-    QVector<Marble::GeoDataLineString>  toRangeCorrected () const;
-    Marble::GeoDataLineString  toPoleCorrected () const;
-    QVector<Marble::GeoDataLineString>  toDateLineCorrected () const;
+
+//FIXME mapped type needed.
+//    virtual QVector<Marble::GeoDataLineString *>  toRangeCorrected () const;
+
+    virtual Marble::GeoDataLineString  toNormalized () const;
+    virtual Marble::GeoDataLineString  toPoleCorrected () const;
+
+//FIXME mapped type needed.
+//    virtual QVector<Marble::GeoDataLineString>  toDateLineCorrected () const;
+
     int                     size () const;
 //FIXME Add the needed Python list methods.
 //ig    Marble::GeoDataCoordinates&  at (int pos);
@@ -65,10 +72,6 @@
 protected:
 //ig    Marble::GeoDataLineStringPrivate*  p () const;
 //ig                                       GeoDataLineString (Marble::GeoDataLineStringPrivate* priv);
-
-public:
-                            GeoDataLineString (const Marble::GeoDataLineString&);
-    virtual EnumGeometryId  geometryId () const;
 };   // GeoDataLineString
 
 };   // Marble
--- branches/KDE/4.3/kdeedu/marble/src/bindings/python/sip/GeoDataLinearRing.sip #997428:997429
@@ -26,7 +26,10 @@
 
 public:
     explicit                GeoDataLinearRing (Marble::TessellationFlags f = Marble::NoTessellation);
+                            GeoDataLinearRing (const Marble::GeoDataGeometry& other);
     virtual bool            isClosed () const;
+//FIXME mapped type needed
+//    virtual QVector<Marble::GeoDataLineString*>  toRangeCorrected () const;
 };   // GeoDataLinearRing
 
 };   // Marble
--- branches/KDE/4.3/kdeedu/marble/src/bindings/python/sip/GeoGraphicsItem.sip #997428:997429
@@ -41,8 +41,6 @@
 protected:
     virtual void            paint (Marble::GeoPainter* painter, Marble::ViewportParams* viewport, const QString& renderPos, Marble::GeoSceneLayer* layer = 0) = 0;
 
-public:
-    void                    setCoordinate (const Marble::GeoDataPoint& point);
 };   // GeoGraphicsItem
 
 };   // Marble
--- branches/KDE/4.3/kdeedu/marble/src/bindings/python/sip/MarbleControlBox.sip #997428:997429
@@ -49,20 +49,15 @@
 
 public:
     void                    selectTheme (const QString&);
-    void                    celestialBodySelected (const QString&);
     void                    selectProjection (Marble::Projection projection);
 // FIXME PlacemarkModel header isn't installed
 //    void                    setLocations (MarblePlacemarkModel* locations);
     void                    changeZoom (int zoom);
-    void                    disableGpsInput (bool);
-    void                    receiveGpsCoordinates (qreal, qreal, Marble::GeoDataCoordinates::Unit);
-    void                    receiveGpsCoordinates (Marble::GeoDataCoordinates in, qreal speed);
     void                    enableFileViewActions ();
     void                    setNavigationTabShown (bool show);
     void                    setLegendTabShown (bool show);
     void                    setMapViewTabShown (bool show);
     void                    setCurrentLocationTabShown (bool show);
-    void                    setCurrentLocation2TabShown (bool show);
     void                    setFileViewTabShown (bool show);
     void                    updateMapThemeView ();
     void                    projectionSelected (int projectionIndex);
--- branches/KDE/4.3/kdeedu/marble/src/bindings/python/sip/MarbleDataFacade.sip #997428:997429
@@ -46,9 +46,6 @@
 //mt     FileViewModel*     fileViewModel () const;
 
 
-
-private:
-                            MarbleDataFacade (const Marble::MarbleDataFacade&);
 };   // MarbleDataFacade
 
 };   // Marble
--- branches/KDE/4.3/kdeedu/marble/src/bindings/python/sip/MarbleGraphicsItem.sip #997428:997429
@@ -57,7 +57,6 @@
 
 
     virtual bool            eventFilter (QObject* object, QEvent* e);
-    bool                    needsUpdate ();
     void                    setSize (const QSize& size);
 };   // MarbleGraphicsItem
 
--- branches/KDE/4.3/kdeedu/marble/src/bindings/python/sip/MarbleWidget.sip #997428:997429
@@ -33,10 +33,7 @@
 // MarbleWidgetInputHandler isn't an exported class
 //ig    void                    setInputHandler (Marble::MarbleWidgetInputHandler* handler);
 
-//mt undefined symbol: HttpDownloadManager* downloadManager -- need mapped type?
-//mt     void               setDownloadManager (HttpDownloadManager* downloadManager);
 
-
     const QRegion           activeRegion ();
     const QRegion           mapRegion ();
     int                     radius () const;


More information about the Marble-commits mailing list