Revived globe, compatible with OsgEarth 2.7

qgis · May 28, 2016 · 90887f460f9f1285632ab55859d469acd4188419 · 90887f4
1 parent ed1235d
commit 90887f460f9f1285632ab55859d469acd4188419
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
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="sync_views.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4158">
+      <stop
+         style="stop-color:#0000ff;stop-opacity:1"
+         offset="0"
+         id="stop4160" />
+      <stop
+         style="stop-color:#0000a9;stop-opacity:1"
+         offset="1"
+         id="stop4162" />
+    </linearGradient>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Mend"
+       style="overflow:visible;"
+       inkscape:isstock="true">
+      <path
+         id="path4171"
+         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         transform="scale(0.6) rotate(180) translate(0,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Mend-8"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         inkscape:connector-curvature="0"
+         id="path4171-2"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6,-0.6)" />
+    </marker>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4158"
+       id="radialGradient4178"
+       cx="7.9999766"
+       cy="1040.8622"
+       fx="7.9999766"
+       fy="1040.8622"
+       r="6.9999766"
+       gradientTransform="matrix(1,0,0,0.49999621,0,520.43504)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4158"
+       id="radialGradient4178-3"
+       cx="7.9999766"
+       cy="1040.8622"
+       fx="7.9999766"
+       fy="1040.8622"
+       r="6.9999766"
+       gradientTransform="matrix(-1,0,0,0.49999621,16,527.43502)"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="18.5"
+     inkscape:cx="0.59568033"
+     inkscape:cy="10.721345"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:window-width="1600"
+     inkscape:window-height="829"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4136" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <g
+       id="g4865">
+      <path
+         style="fill:url(#radialGradient4178);fill-opacity:1;fill-rule:evenodd;stroke:#0000a9;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 1.5,1040.8622 0,1 8,0 0,2 5,-3 -5,-3 0,2 -8,0 z"
+         id="path4156"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccccc" />
+      <path
+         style="fill:url(#radialGradient4178-3);fill-opacity:1;fill-rule:evenodd;stroke:#0000a9;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 14.5,1047.8622 0,1 -7.9999996,0 0,2 -5,-3 5,-3 0,2 7.9999996,0 z"
+         id="path4156-7"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccccc" />
+    </g>
+  </g>
+</svg>
diff --git a/python/core/core.sip b/python/core/core.sip
@@ -103,6 +103,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/qgsmapsettings.sip b/python/core/qgsmapsettings.sip
@@ -60,6 +60,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,25 @@
+/***************************************************************************
+    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.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+class QgsPluginInterface : QObject
+{
+%TypeHeaderCode
+#include "qgsplugininterface.h"
+%End
+
+  // Should only be instantiated from subclasses
+  private:
+    QgsPluginInterface( QObject* parent = 0 );
+};
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,15 @@
+/** \ingroup gui
+ * \note added in 2.1
+ */
+class QgsMapLayerPropertiesFactory
+{
+%TypeHeaderCode
+#include <qgsmaplayerpropertiesfactory.h>
+%End
+
+  public:
+    QgsMapLayerPropertiesFactory();
+
+    virtual QgsVectorLayerPropertiesPage* createVectorLayerPropertiesPage( QgsVectorLayer* layer, QWidget* parent ) = 0;
+    virtual QListWidgetItem* createVectorLayerPropertiesItem( QgsVectorLayer* layer, QListWidget* view ) = 0;
+};
diff --git a/python/gui/qgsvectorlayerpropertiespage.sip b/python/gui/qgsvectorlayerpropertiespage.sip
@@ -0,0 +1,15 @@
+/** \ingroup gui
+ * \note added in 2.1
+ */
+class QgsVectorLayerPropertiesPage : QWidget
+{
+%TypeHeaderCode
+#include <qgsvectorlayerpropertiespage.h>
+%End
+
+  public:
+    explicit QgsVectorLayerPropertiesPage( QWidget *parent = 0 );
+
+  public slots:
+    virtual void apply() = 0;
+};
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -8841,6 +8841,16 @@ void QgisApp::openURL( QString url, bool useQgisDocDirectory )
 #endif
 }
 
+void QgisApp::registerMapLayerPropertiesFactory( QgsMapLayerPropertiesFactory* factory )
+{
+  mMapLayerPropertiesFactories << factory;
+}
+
+void QgisApp::unregisterMapLayerPropertiesFactory( QgsMapLayerPropertiesFactory* factory )
+{
+  mMapLayerPropertiesFactories.removeAll( factory );
+}
+
 /** Get a pointer to the currently selected map layer */
 QgsMapLayer *QgisApp::activeLayer()
 {
@@ -11052,6 +11062,10 @@ void QgisApp::showLayerProperties( QgsMapLayer *ml )
 #else
     QgsVectorLayerProperties *vlp = new QgsVectorLayerProperties( vlayer, this );
 #endif
+    foreach ( QgsMapLayerPropertiesFactory* factory, mMapLayerPropertiesFactories )
+    {
+      vlp->addPropertiesPageFactory( factory );
+    }
 
     if ( vlp->exec() )
     {

diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h
@@ -55,6 +55,7 @@ class QgsLayerTreeMapCanvasBridge;
 class QgsLayerTreeView;
 class QgsMapCanvas;
 class QgsMapLayer;
+class QgsMapLayerPropertiesFactory;
 class QgsMapTip;
 class QgsMapTool;
 class QgsMapToolAdvancedDigitizing;
@@ -502,6 +503,12 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
 
     void parseVersionInfo( QNetworkReply* reply, int& latestVersion, QStringList& versionInfo );
 
+    /** Register a new tab in the layer properties dialog */
+    void registerMapLayerPropertiesFactory( QgsMapLayerPropertiesFactory* factory );
+
+    /** Unregister a previously registered tab in the layer properties dialog */
+    void unregisterMapLayerPropertiesFactory( QgsMapLayerPropertiesFactory* factory );
+
   public slots:
     void layerTreeViewDoubleClicked( const QModelIndex& index );
     //! Make sure the insertion point for new layers is up-to-date with the current item in layer tree view
@@ -1753,6 +1760,8 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
 
     QgsSnappingUtils* mSnappingUtils;
 
+    QList<QgsMapLayerPropertiesFactory*> mMapLayerPropertiesFactories;
+
     QDateTime mProjectLastModified;
 
     QgsWelcomePage* mWelcomePage;

diff --git a/src/app/qgisappinterface.cpp b/src/app/qgisappinterface.cpp
@@ -475,6 +475,16 @@ bool QgisAppInterface::unregisterMainWindowAction( QAction* action )
   return QgsShortcutsManager::instance()->unregisterAction( action );
 }
 
+void QgisAppInterface::registerMapLayerPropertiesFactory( QgsMapLayerPropertiesFactory* factory )
+{
+  qgis->registerMapLayerPropertiesFactory( factory );
+}
+
+void QgisAppInterface::unregisterMapLayerPropertiesFactory( QgsMapLayerPropertiesFactory* factory )
+{
+  qgis->unregisterMapLayerPropertiesFactory( factory );
+}
+
 //! Menus
 Q_DECL_DEPRECATED QMenu *QgisAppInterface::fileMenu() { return qgis->projectMenu(); }
 QMenu *QgisAppInterface::projectMenu() { return qgis->projectMenu(); }

diff --git a/src/app/qgisappinterface.h b/src/app/qgisappinterface.h
@@ -288,6 +288,12 @@ class APP_EXPORT QgisAppInterface : public QgisInterface
     /** Unregister a previously registered action. (e.g. when plugin is going to be unloaded. */
     virtual bool unregisterMainWindowAction( QAction* action ) override;
 
+    /** Register a new tab in the layer properties dialog */
+    virtual void registerMapLayerPropertiesFactory( QgsMapLayerPropertiesFactory* factory ) override;
+
+    /** Unregister a previously registered tab in the layer properties dialog */
+    virtual void unregisterMapLayerPropertiesFactory( QgsMapLayerPropertiesFactory* factory ) override;
+
     /** Accessors for inserting items into menus and toolbars.
      * An item can be inserted before any existing action.
      */