add GUI_EXPORT and sip bindings to QgsExtentGroupBox,

fix sip binding of QgsRasterLayerSaveAsDialog
qgis · Mar 4, 2014 · 100f972 · 100f972
1 parent ec3f7f6
commit 100f972
Show file tree

Hide file tree

Showing 4 changed files with 75 additions and 7 deletions.
diff --git a/python/gui/gui.sip b/python/gui/gui.sip
@@ -82,6 +82,7 @@
 %Include qgshighlight.sip
 %Include qgsoptionsdialogbase.sip
 %Include qgssvgannotationitem.sip
+%Include qgsextentgroupbox.sip
 
 %Include attributetable/qgsattributetabledelegate.sip
 %Include attributetable/qgsattributetablefiltermodel.sip

diff --git a/python/gui/qgsextentgroupbox.sip b/python/gui/qgsextentgroupbox.sip
@@ -0,0 +1,72 @@
+/**
+ * Collapsible group box for configuration of extent, typically for a save operation.
+ *
+ * Besides allowing the user to enter the extent manually, it comes with options to use
+ * original extent or extent defined by the current view in map canvas.
+ *
+ * When using the widget, make sure to call setOriginalExtent(), setCurrentExtent() and setOutputCrs() during initialization.
+ *
+ * @note added in 2.4
+ */
+class QgsExtentGroupBox : QgsCollapsibleGroupBox
+{
+%TypeHeaderCode
+#include <qgsextentgroupbox.h>
+%End
+  public:
+    explicit QgsExtentGroupBox( QWidget* parent = 0 );
+
+    enum ExtentState
+    {
+      OriginalExtent,  //!<  layer's extent
+      CurrentExtent,   //!<  map canvas extent
+      UserExtent,      //!<  extent manually entered/modified by the user
+    };
+
+    //! Setup original extent - should be called as part of initialization
+    void setOriginalExtent( const QgsRectangle& originalExtent, const QgsCoordinateReferenceSystem& originalCrs );
+
+    QgsRectangle originalExtent() const;
+    const QgsCoordinateReferenceSystem& originalCrs() const;
+
+    //! Setup current extent - should be called as part of initialization (or whenever current extent changes)
+    void setCurrentExtent( const QgsRectangle& currentExtent, const QgsCoordinateReferenceSystem& currentCrs );
+
+    QgsRectangle currentExtent() const;
+    const QgsCoordinateReferenceSystem& currentCrs() const;
+
+    //! Set the output CRS - may need to be used for transformation from original/current extent.
+    //! Should be called as part of initialization and whenever the the output CRS is changed
+    void setOutputCrs( const QgsCoordinateReferenceSystem& outputCrs );
+
+    //! Get the resulting extent - in output CRS coordinates
+    QgsRectangle outputExtent() const;
+
+    QgsExtentGroupBox::ExtentState extentState() const;
+
+  public slots:
+    //! set output extent to be the same as original extent (may be transformed to output CRS)
+    void setOutputExtentFromOriginal();
+
+    //! set output extent to be the same as current extent (may be transformed to output CRS)
+    void setOutputExtentFromCurrent();
+
+    //! set output extent to custom extent (may be transformed to outut CRS)
+    void setOutputExtentFromUser( const QgsRectangle& extent, const QgsCoordinateReferenceSystem& crs );
+
+  signals:
+    //! emitted when extent is changed
+    void extentChanged( const QgsRectangle& r );
+
+  protected slots:
+
+    void on_mXMinLineEdit_textEdited( const QString & );
+    void on_mXMaxLineEdit_textEdited( const QString & );
+    void on_mYMinLineEdit_textEdited( const QString & );
+    void on_mYMaxLineEdit_textEdited( const QString & );
+
+  protected:
+    void setOutputExtent( const QgsRectangle& r, const QgsCoordinateReferenceSystem& srcCrs, QgsExtentGroupBox::ExtentState state );
+    void setOutputExtentFromLineEdit();
+    void updateTitle();
+};
diff --git a/python/gui/qgsrasterlayersaveasdialog.sip b/python/gui/qgsrasterlayersaveasdialog.sip
@@ -1,6 +1,7 @@
 class QgsRasterLayerSaveAsDialog : QDialog
 {
 %TypeHeaderCode
+#include <qgsextentgroupbox.h>
 #include <qgsrasterlayersaveasdialog.h>
 %End
   public:
@@ -15,12 +16,6 @@ class QgsRasterLayerSaveAsDialog : QDialog
       CurrentCrs,
       UserCrs
     };
-    enum ExtentState
-    {
-      OriginalExtent,
-      CurrentExtent,
-      UserExtent,
-    };
     enum ResolutionState
     {
       OriginalResolution,

diff --git a/src/gui/qgsextentgroupbox.h b/src/gui/qgsextentgroupbox.h
@@ -20,7 +20,7 @@ class QgsCoordinateReferenceSystem;
  *
  * @note added in 2.4
  */
-class QgsExtentGroupBox : public QgsCollapsibleGroupBox, private Ui::QgsExtentGroupBoxWidget
+class GUI_EXPORT QgsExtentGroupBox : public QgsCollapsibleGroupBox, private Ui::QgsExtentGroupBoxWidget
 {
     Q_OBJECT
   public: