Symbology-NG branch merged to trunk. This includes also work on label…

…ing done during my GSoC'09. git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12139 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Nov 16, 2009 · a986a7d · a986a7d
2 parents 4f73f65 + 4b644b7
commit a986a7d
Show file tree

Hide file tree

Showing 165 changed files with 18,563 additions and 3,624 deletions.
diff --git a/images/themes/default/cap_flat.png b/images/themes/default/cap_flat.png
diff --git a/images/themes/default/cap_round.png b/images/themes/default/cap_round.png
diff --git a/images/themes/default/cap_square.png b/images/themes/default/cap_square.png
diff --git a/images/themes/default/cap_style.svg b/images/themes/default/cap_style.svg
diff --git a/images/themes/default/join_bevel.png b/images/themes/default/join_bevel.png
diff --git a/images/themes/default/join_miter.png b/images/themes/default/join_miter.png
diff --git a/images/themes/default/join_round.png b/images/themes/default/join_round.png
diff --git a/images/themes/default/join_style.svg b/images/themes/default/join_style.svg
diff --git a/images/themes/default/rendererCategorizedSymbol.png b/images/themes/default/rendererCategorizedSymbol.png
diff --git a/images/themes/default/rendererGraduatedSymbol.png b/images/themes/default/rendererGraduatedSymbol.png
diff --git a/images/themes/default/rendererSingleSymbol.png b/images/themes/default/rendererSingleSymbol.png
diff --git a/images/themes/default/symbologyAdd.png b/images/themes/default/symbologyAdd.png
diff --git a/images/themes/default/symbologyDown.png b/images/themes/default/symbologyDown.png
diff --git a/images/themes/default/symbologyEdit.png b/images/themes/default/symbologyEdit.png
diff --git a/images/themes/default/symbologyLock.png b/images/themes/default/symbologyLock.png
diff --git a/images/themes/default/symbologyRemove.png b/images/themes/default/symbologyRemove.png
diff --git a/images/themes/default/symbologyUp.png b/images/themes/default/symbologyUp.png
diff --git a/python/configure.py.in b/python/configure.py.in
@@ -154,6 +154,7 @@ for mk in [ makefile_core, makefile_gui, makefile_analysis ]:
                            src_path+"/src/core/renderer",
                            src_path+"/src/core/spatialindex",
                            src_path+"/src/core/symbology",
+                           src_path+"/src/core/symbology-ng",
                            build_path, # qgsconfig.h, qgssvnversion.h
                            gdal_inc_dir,
                            geos_inc_dir]
@@ -163,6 +164,7 @@ for mk in [ makefile_core, makefile_gui, makefile_analysis ]:
 makefile_gui.extra_libs.append("qgis_gui")
 makefile_gui.extra_lib_dirs.append(build_path+"/src/gui"+intdir)
 makefile_gui.extra_include_dirs.append(src_path+"/src/gui")
+makefile_gui.extra_include_dirs.append(src_path+"/src/gui/symbology-ng")
 makefile_gui.extra_include_dirs.append(build_path+"/src/gui")
 makefile_gui.extra_include_dirs.append(build_path+"/src/ui")
 makefile_gui.extra_include_dirs.append(src_path+"/src/plugins") # because of qgisplugin.h TODO: sort out

diff --git a/python/core/conversions.sip b/python/core/conversions.sip
@@ -3,6 +3,7 @@ This file contains code for conversion between various (often nested) mapped typ
 which are not wrapped by PyQt:
 - QVector< QVector<TYPE> >
 - QVector< QVector< QVector<TYPE> > >
+- QList< QList<TYPE> >
 - QSet<int>
 - QSet<TYPE>
 - QMap<int, QMap<int, TYPE> >
@@ -19,6 +20,7 @@ which are not wrapped by PyQt:
 #if (PY_VERSION_HEX < 0x02050000)
 typedef int Py_ssize_t;
 #endif
+
 %End
 
 
@@ -183,6 +185,85 @@ template <TYPE>
 };
 
 
+
+template <TYPE>
+%MappedType QList< QList<TYPE> >
+{
+%TypeHeaderCode
+#include <QList>
+%End
+
+%ConvertFromTypeCode
+  // Create the list.
+  PyObject *l;
+
+  if ((l = PyList_New(sipCpp->size())) == NULL)
+    return NULL;
+
+  const sipMappedType* qlist_type = sipFindMappedType("QList<TYPE>");
+
+  // Set the list elements.
+  for (int i = 0; i < sipCpp->size(); ++i)
+  {
+    QList<TYPE>* t = new QList<TYPE>(sipCpp->at(i));
+    PyObject *tobj;
+
+    if ((tobj = sipConvertFromMappedType(t, qlist_type, sipTransferObj)) == NULL)
+    {
+      Py_DECREF(l);
+      delete t;
+      return NULL;
+    }
+    PyList_SET_ITEM(l, i, tobj);
+  }
+
+  return l;
+%End
+
+%ConvertToTypeCode
+  const sipMappedType* qlist_type = sipFindMappedType("QList<TYPE>");
+
+  // Check the type if that is all that is required.
+  if (sipIsErr == NULL)
+  {
+    if (!PyList_Check(sipPy))
+      return 0;
+
+    for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
+      if (!sipCanConvertToMappedType(PyList_GET_ITEM(sipPy, i), qlist_type, SIP_NOT_NONE))
+        return 0;
+
+    return 1;
+  }
+
+
+  QList< QList<TYPE> > *ql = new QList< QList<TYPE> >;
+
+  for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
+  {
+    int state;
+    //TYPE *t = reinterpret_cast<TYPE *>(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
+    QList<TYPE> * t = reinterpret_cast< QList<TYPE> * >(sipConvertToMappedType(PyList_GET_ITEM(sipPy, i), qlist_type, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
+
+    if (*sipIsErr)
+    {
+      sipReleaseInstance(t, sipClass_TYPE, state);
+      delete ql;
+      return 0;
+    }
+    ql->append(*t);
+    sipReleaseInstance(t, sipClass_TYPE, state);
+  }
+
+  *sipCppPtr = ql;
+  return sipGetState(sipTransferObj);
+%End
+
+};
+
+
+
+
 %MappedType QSet<int>
 {
 %TypeHeaderCode

diff --git a/python/core/core.sip b/python/core/core.sip
@@ -74,3 +74,4 @@
 %Include qgsvectorlayer.sip
 %Include qgsvectoroverlay.sip
 
+%Include symbology-ng-core.sip
diff --git a/python/core/qgsapplication.sip b/python/core/qgsapplication.sip
@@ -156,6 +156,12 @@ static void qtgui_UpdatePyArgv(PyObject *argvlist, int argc, char **argv)
     //! @note deprecated
     static const QString svgPath();
 
+    //! Returns the path to user's style. Added in QGIS 1.2
+    static const QString userStyleV2Path();
+
+    //! Returns the path to default style (works as a starting point). Added in QGIS 1.2
+    static const QString defaultStyleV2Path();
+
     //! Returns the path to the application prefix directory.
     static const QString prefixPath();
 

diff --git a/python/core/qgsmaplayer.sip b/python/core/qgsmaplayer.sip
@@ -144,6 +144,16 @@ public:
     */
     bool writeXML(QDomNode & layer_node, QDomDocument & document) const;
 
+    /** Set a custom property for layer. Properties are stored in a map and saved in project file.
+     *  @note Added in v1.3 */
+    void setCustomProperty( const QString& key, const QVariant& value );
+    /** Read a custom property from layer. Properties are stored in a map and saved in project file.
+     *  @note Added in v1.3 */
+    QVariant customProperty( const QString& value, const QVariant& defaultValue = QVariant() ) const;
+    /** Remove a custom property from layer. Properties are stored in a map and saved in project file.
+     *  @note Added in v1.3 */
+    void removeCustomProperty( const QString& key );
+
     /** Read the symbology for the current layer from the Dom node supplied. 
      * @param QDomNode node that will contain the symbology definition for this layer.
      * @param errorMessage reference to string that will be updated with any error messages

diff --git a/python/core/qgsrenderer.sip b/python/core/qgsrenderer.sip
@@ -52,6 +52,8 @@ class QgsRenderer
     virtual QgsRenderer* clone() const=0;
     /** Change selection color */
     static void setSelectionColor(QColor color);
+    /** Get selection color */
+    static QColor selectionColor();
     /**Returns true if this renderer returns a pixmap in the render method (e.g. for point data or diagrams)*/
     virtual bool containsPixmap() const;
     /**Returns true if this renderer uses its own transparency settings, e.g. differentiated by classification.

diff --git a/python/core/qgsvectorlayer.sip b/python/core/qgsvectorlayer.sip
@@ -101,6 +101,18 @@ public:
   /** Sets the renderer. If a renderer is already present, it is deleted */
   void setRenderer(QgsRenderer * r /Transfer/);
 
+  /** Return renderer V2. Added in QGIS 1.2 */
+  QgsFeatureRendererV2* rendererV2();
+  /** Set renderer V2. Added in QGIS 1.2 */
+  void setRendererV2(QgsFeatureRendererV2* r);
+  /** Return whether using renderer V2. Added in QGIS 1.2 */
+  bool isUsingRendererV2();
+  /** set whether to use renderer V2 for drawing. Added in QGIS 1.2 */
+  void setUsingRendererV2(bool usingRendererV2);
+
+  void drawRendererV2( QgsRenderContext& rendererContext, bool labeling );
+  void drawRendererV2Levels( QgsRenderContext& rendererContext, bool labeling );
+
   /** Returns point, line or polygon */
   QGis::GeometryType geometryType() const;