Moved creation of expression from OGC filter to QgsOgcUtils

qgis · Mar 14, 2013 · 837ac4d · 837ac4d
1 parent 7e598f7
commit 837ac4d
Show file tree

Hide file tree

Showing 11 changed files with 583 additions and 578 deletions.
diff --git a/python/core/qgsexpression.sip b/python/core/qgsexpression.sip
@@ -182,7 +182,6 @@ class QgsExpression
         virtual QString dump() const = 0;
 
         virtual void toOgcFilter( QDomDocument &doc, QDomElement &element ) const;
-        static QgsExpression::Node* createFromOgcFilter( QDomElement &element, QString &errorMessage ) /Factory/;
 
         virtual QStringList referencedColumns() const = 0;
         virtual bool needsGeometry() const = 0;
@@ -237,7 +236,6 @@ class QgsExpression
         virtual QString dump() const;
 
         virtual void toOgcFilter( QDomDocument &doc, QDomElement &element ) const;
-        static QgsExpression::Node* createFromOgcFilter( QDomElement &element, QString &errorMessage ) /Factory/;
 
         virtual QStringList referencedColumns() const;
         virtual bool needsGeometry() const;
@@ -259,7 +257,6 @@ class QgsExpression
         virtual QString dump() const;
 
         virtual void toOgcFilter( QDomDocument &doc, QDomElement &element ) const;
-        static QgsExpression::Node* createFromOgcFilter( QDomElement &element, QString &errorMessage ) /Factory/;
 
         virtual QStringList referencedColumns() const;
         virtual bool needsGeometry() const;
@@ -302,7 +299,6 @@ class QgsExpression
         virtual QString dump() const;
 
         virtual void toOgcFilter( QDomDocument &doc, QDomElement &element ) const;
-        static QgsExpression::Node* createFromOgcFilter( QDomElement &element, QString &errorMessage ) /Factory/;
 
         virtual QStringList referencedColumns() const;
         virtual bool needsGeometry() const;
@@ -321,7 +317,6 @@ class QgsExpression
         virtual QString dump() const;
 
         virtual void toOgcFilter( QDomDocument &doc, QDomElement &element ) const;
-        static QgsExpression::Node* createFromOgcFilter( QDomElement &element, QString &errorMessage ) /Factory/;
 
         virtual QStringList referencedColumns() const;
         virtual bool needsGeometry() const;
@@ -340,7 +335,6 @@ class QgsExpression
         virtual QString dump() const;
 
         virtual void toOgcFilter( QDomDocument &doc, QDomElement &element ) const;
-        static QgsExpression::Node* createFromOgcFilter( QDomElement &element, QString &errorMessage ) /Factory/;
 
         virtual QStringList referencedColumns() const;
         virtual bool needsGeometry() const;
@@ -398,7 +392,6 @@ class QgsExpression
 
     // convert from/to OGC Filter
     void toOgcFilter( QDomDocument &doc, QDomElement &element ) const;
-    static QgsExpression* createFromOgcFilter( QDomElement &element ) /Factory/;
 
   protected:
     void initGeomCalculator();

diff --git a/python/core/qgsogcutils.sip b/python/core/qgsogcutils.sip
@@ -35,5 +35,20 @@ public:
       @return QDomElement
    */
   static QDomElement geometryToGML( QgsGeometry* geometry, QDomDocument& doc, QString Format );
+
+  /** Exports the rectangle to GML2 Box
+      @return QDomElement
+   */
+  static QDomElement rectangleToGMLBox( QgsRectangle* box, QDomDocument& doc );
+
+  /** Exports the rectangle to GML2 Envelope
+      @return QDomElement
+   */
+  static QDomElement rectangleToGMLEnvelope( QgsRectangle* env, QDomDocument& doc );
+
+
+  /** Parse XML with OGC filter into QGIS expression */
+  static QgsExpression* expressionFromOgcFilter( const QDomElement& element ) /Factory/;
+
 };