fix and sync QgsAttributeEditorContext sip bindings

qgis · Sep 13, 2014 · 17669b5 · 17669b5
1 parent 9945a6d
commit 17669b5
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 9 deletions.
diff --git a/python/gui/qgsattributeeditorcontext.sip b/python/gui/qgsattributeeditorcontext.sip
@@ -10,19 +10,31 @@ class QgsAttributeEditorContext
 #include "qgsattributeeditorcontext.h"
 %End
   public:
+    /**
+     * Determines in which direction a relation was resolved.
+     */
+    enum RelationMode
+    {
+      Undefined,       //!< This context is not defined by a relation
+      EmbedMultiple,   //!< When embedding a list of features (e.g. houses as an embedded form in a district form)
+      EmbedSingle,     //!< When embedding a single feature (e.g. district information when looking at the form of a house)
+      StandaloneSingle //!< When showing a new dialog for a single feature (e.g. district information when looking at the form of a house)
+    };
+
     QgsAttributeEditorContext();
 
+    QgsAttributeEditorContext( const QgsAttributeEditorContext& parentContext, const QgsRelation& relation, RelationMode mode );
+
     void setDistanceArea( const QgsDistanceArea& distanceArea );
+
     const QgsDistanceArea& distanceArea();
 
     void setVectorLayerTools( QgsVectorLayerTools* vlTools );
-    QgsVectorLayerTools* vectorLayerTools();
+    const QgsVectorLayerTools* vectorLayerTools() const;
 
-    /**
+    void setRelation( const QgsRelation& relation, RelationMode mode );
-     * When copying the context for another layer,  call this.
+    const QgsRelation& relation() const;
-     * Will adjast the distance area for this layer
+    RelationMode relationMode() const;
-     *
+
-     * @param layer The layer to adjust for.
+    const QgsAttributeEditorContext* parentContext() const;
-     */
-    // void adjustForLayer( QgsVectorLayer* layer );
 };
diff --git a/src/gui/qgsattributeeditorcontext.h b/src/gui/qgsattributeeditorcontext.h
@@ -44,7 +44,6 @@ class GUI_EXPORT QgsAttributeEditorContext
       StandaloneSingle //!< When showing a new dialog for a single feature (e.g. district information when looking at the form of a house)
     };
 
-  public:
     QgsAttributeEditorContext()
         : mParentContext( 0 )
         , mLayer( 0 )