Merge pull request #3126 from manisandro/globe

Revived globe, compatible with OsgEarth 2.7
qgis · May 29, 2016 · 87121d6 · nyalldawson · May 30, 2016 · m-kuhn
2 parents 79d6407 + cdbd4e4
commit 87121d6
Show file tree

Hide file tree

Showing 102 changed files with 6,093 additions and 6,460 deletions.
diff --git a/cmake/FindOSGEARTH.cmake b/cmake/FindOSGEARTH.cmake
@@ -96,6 +96,9 @@ FIND_OSGEARTH_LIBRARY( OSGEARTHSYMBOLOGY_LIBRARY_DEBUG osgEarthSymbologyd )
 FIND_OSGEARTH_LIBRARY( OSGEARTHQT_LIBRARY osgEarthQt )
 FIND_OSGEARTH_LIBRARY( OSGEARTHQT_LIBRARY_DEBUG osgEarthQtd )
 
+FIND_OSGEARTH_LIBRARY( OSGEARTHANNOTATION_LIBRARY osgEarthAnnotation )
+FIND_OSGEARTH_LIBRARY( OSGEARTHANNOTATION_LIBRARY_DEBUG osgEarthAnnotationd )
+
 
 SET( OSGEARTH_FOUND "NO" )
 IF( OSGEARTH_LIBRARY AND OSGEARTH_INCLUDE_DIR )

diff --git a/images/images.qrc b/images/images.qrc
@@ -522,6 +522,7 @@
         <file>themes/default/symbologyRemove.svg</file>
         <file>themes/default/symbologyUp.png</file>
         <file>themes/default/symbologyUp.svg</file>
+        <file>themes/default/sync_views.svg</file>
         <file>themes/default/text.png</file>
         <file>themes/default/tracking.png</file>
         <file>themes/default/transformed.png</file>

diff --git a/images/themes/default/sync_views.svg b/images/themes/default/sync_views.svg
diff --git a/python/core/core.sip b/python/core/core.sip
@@ -24,6 +24,7 @@
 %Include qgsaggregatecalculator.sip
 %Include qgsattributeaction.sip
 %Include qgsattributetableconfig.sip
+%Include qgsbillboardregistry.sip
 %Include qgsbrowsermodel.sip
 %Include qgsclipper.sip
 %Include qgscolorscheme.sip
@@ -103,6 +104,7 @@
 %Include qgsowsconnection.sip
 %Include qgspaintenginehack.sip
 %Include qgspallabeling.sip
+%Include qgsplugininterface.sip
 %Include qgspluginlayer.sip
 %Include qgspluginlayerregistry.sip
 %Include qgspoint.sip

diff --git a/python/core/qgsbillboardregistry.sip b/python/core/qgsbillboardregistry.sip
@@ -0,0 +1,56 @@
+/** Billboard items stored in the QgsBillBoardRegistry */
+class QgsBillBoardItem
+{
+%TypeHeaderCode
+#include <qgsbillboardregistry.h>
+%End
+  public:
+    QImage image; /* The image of the billboard */
+    QgsPoint worldPos; /* The WGS84 world position of the billboard */
+    QString layerId; /* The layer which the image is part of, if any */
+};
+
+/**
+ * @brief The QgsBillBoardRegistry class stores images which should
+ * be displayed as billboards in the globe plugin.
+ * Map canvas items and layers may decide to add items which should
+ * be drawn as billboards in the globe.
+ *
+ * Retreive the instance pointer to a QgsBillBoardRegistry for a
+ * project via QgsProject::instance()->billboardRegistry().
+ */
+class QgsBillBoardRegistry : public QObject
+{
+%TypeHeaderCode
+#include <qgsbillboardregistry.h>
+%End
+  public:
+    /**
+     * @brief Adds a billboard to the registry
+     * @param parent The parent (i.e. a QgsMapLayer or a QgsMapCanvasItem) which is creating the billboard
+     * @param image The billboard image
+     * @param worldPos The geo position of the image, in WGS84
+     * @param layerId The id of the layer to which the item belongs, if any
+     */
+    void addItem( void* parent, const QImage& image, const QgsPoint& worldPos, const QString& layerId = QString() );
+    /**
+     * @brief Removes all billboards which were created by the specified parent
+     * @param parent The parent
+     */
+    void removeItem( void* parent );
+
+    /**
+     * @brief Retreive all registered billboard items
+     * @return List of registered billboard items
+     */
+    QList<QgsBillBoardItem*> items() const;
+
+  signals:
+    /** Emitted when an item is added to the registry */
+    void itemAdded( QgsBillBoardItem* item );
+    /** Emitted when an item is removed from the registry */
+    void itemRemoved( QgsBillBoardItem* item );
+
+  private:
+    QgsBillBoardRegistry( QObject* parent = 0 );
+};
diff --git a/python/core/qgsmapsettings.sip b/python/core/qgsmapsettings.sip
@@ -66,6 +66,11 @@ class QgsMapSettings
     //! @note added in 2.8
     void setLayerStyleOverrides( const QMap<QString, QString>& overrides );
 
+    //! Get custom rendering flags, separated by ';'. Layers might honour these to alter their rendering.
+    const QString& customRenderFlags() const;
+    //! Set custom rendering flags, separated by ';'. Layers might honour these to alter their rendering.
+    void setCustomRenderFlags( const QString& customRenderFlags );
+
     //! sets whether to use projections for this layer set
     void setCrsTransformEnabled( bool enabled );
     //! returns true if projections are enabled for this layer set

diff --git a/python/core/qgsplugininterface.sip b/python/core/qgsplugininterface.sip
@@ -0,0 +1,28 @@
+/***************************************************************************
+    qgsplugininterface.sip
+     --------------------------------------
+    Date                 : 21.8.2013
+    Copyright            : (C) 2013 Matthias Kuhn
+    Email                : matthias dot kuhn at gmx dot ch
+ ***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+/**
+ * @brief Trivial base class for plugin interfaces
+ */
+class QgsPluginInterface : QObject
+{
+%TypeHeaderCode
+#include "qgsplugininterface.h"
+%End
+
+  protected:
+    /** Should only be instantiated from subclasses */
+    QgsPluginInterface( QObject* parent = 0 );
+};
diff --git a/python/core/qgsproject.sip b/python/core/qgsproject.sip
@@ -275,6 +275,11 @@ class QgsProject : QObject
 
     QgsRelationManager* relationManager() const;
 
+    /** Return the project's billboard manager instance pointer
+     * @note added in QGIS 2.16
+     */
+    QgsBillBoardRegistry* billboardRegistry() const;
+
     /** Return pointer to the root (invisible) node of the project's layer tree
      * @note added in 2.4
      */

diff --git a/python/core/qgsrectangle.sip b/python/core/qgsrectangle.sip
@@ -74,7 +74,7 @@ class QgsRectangle
     //! return true when rectangle contains a point
     bool contains( const QgsPoint &p ) const;
     //! expand the rectangle so that covers both the original rectangle and the given rectangle
-    void combineExtentWith( QgsRectangle *rect );
+    void combineExtentWith( const QgsRectangle& rect );
     //! expand the rectangle so that covers both the original rectangle and the given point
     void combineExtentWith( double x, double y );
     //! test if rectangle is empty.

diff --git a/python/gui/gui.sip b/python/gui/gui.sip
@@ -102,6 +102,7 @@
 %Include qgsmaplayeractionregistry.sip
 %Include qgsmaplayercombobox.sip
 %Include qgsmaplayermodel.sip
+%Include qgsmaplayerpropertiesfactory.sip
 %Include qgsmaplayerproxymodel.sip
 %Include qgsmapmouseevent.sip
 %Include qgsmapoverviewcanvas.sip
@@ -155,6 +156,7 @@
 %Include qgsunitselectionwidget.sip
 %Include qgsuserinputdockwidget.sip
 %Include qgsvariableeditorwidget.sip
+%Include qgsvectorlayerpropertiespage.sip
 %Include qgsvectorlayertools.sip
 %Include qgsvertexmarker.sip
 

diff --git a/python/gui/qgisinterface.sip b/python/gui/qgisinterface.sip
@@ -279,6 +279,12 @@ class QgisInterface : QObject
     /** Unregister a previously registered action. (e.g. when plugin is going to be unloaded) */
     virtual bool unregisterMainWindowAction( QAction* action ) = 0;
 
+    /** Register a new tab in the vector layer properties dialog */
+    virtual void registerMapLayerPropertiesFactory( QgsMapLayerPropertiesFactory* factory ) = 0;
+
+    /** Unregister a previously registered tab in the layer properties dialog */
+    virtual void unregisterMapLayerPropertiesFactory( QgsMapLayerPropertiesFactory* factory ) = 0;
+
     // @todo is this deprecated in favour of QgsContextHelp?
     /** Open a url in the users browser. By default the QGIS doc directory is used
      * as the base for the URL. To open a URL that is not relative to the installed

diff --git a/python/gui/qgsmaplayerpropertiesfactory.sip b/python/gui/qgsmaplayerpropertiesfactory.sip
@@ -0,0 +1,32 @@
+/** \ingroup gui
+ * \note added in 2.1
+ */
+class QgsMapLayerPropertiesFactory
+{
+%TypeHeaderCode
+#include <qgsmaplayerpropertiesfactory.h>
+%End
+
+  public:
+    /** Constructor */
+    QgsMapLayerPropertiesFactory();
+
+    /** Destructor */
+    virtual ~QgsMapLayerPropertiesFactory();
+
+    /**
+     * @brief Create a new properties page
+     * @param layer The layer for which to create the page
+     * @param parent The parent widget
+     * @return The new properties page instance
+     */
+    virtual QgsVectorLayerPropertiesPage* createVectorLayerPropertiesPage( QgsVectorLayer* layer, QWidget* parent ) = 0;
+
+    /**
+     * @brief Creates the QListWidgetItem for the properties page
+     * @param layer The layer for which to create the item
+     * @param view The parent QListView
+     * @return The QListWidgetItem for the properties page
+     */
+    virtual QListWidgetItem* createVectorLayerPropertiesItem( QgsVectorLayer* layer, QListWidget* view ) = 0;
+};
diff --git a/python/gui/qgsvectorlayerpropertiespage.sip b/python/gui/qgsvectorlayerpropertiespage.sip
@@ -0,0 +1,21 @@
+/** \ingroup gui
+ * \note added in 2.1
+ */
+
+/**
+ * @brief Base class for custom vector layer property pages
+ */
+class QgsVectorLayerPropertiesPage : QWidget
+{
+%TypeHeaderCode
+#include <qgsvectorlayerpropertiespage.h>
+%End
+
+  public:
+    /** Constructor */
+    explicit QgsVectorLayerPropertiesPage( QWidget *parent = 0 );
+
+  public slots:
+    /** Apply changes */
+    virtual void apply() = 0;
+};