moved include of QgsAttributeDialog out of QgsFeature such that it is…

… a gui independent class now git-svn-id: http://svn.osgeo.org/qgis/trunk@4812 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Feb 7, 2006 · 2b6e03d · 2b6e03d
1 parent ff653af
commit 2b6e03d
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 34 deletions.
diff --git a/src/gui/qgsattributedialog.cpp b/src/gui/qgsattributedialog.cpp
@@ -16,16 +16,17 @@
  ***************************************************************************/
 /* $Id$ */
 #include "qgsattributedialog.h"
+#include "qgsfeature.h"
 #include <QTableWidgetItem>
 
-QgsAttributeDialog::QgsAttributeDialog(std::vector<QgsFeatureAttribute>* attributes)
+QgsAttributeDialog::QgsAttributeDialog(const std::vector<QgsFeatureAttribute>* attributes)
 : QDialog()
 {
     setupUi(this);
     mTable->setRowCount(attributes->size());
 
     int index=0;
-    for(std::vector<QgsFeatureAttribute>::iterator it=attributes->begin();it!=attributes->end();++it)
+    for(std::vector<QgsFeatureAttribute>::const_iterator it=attributes->begin();it!=attributes->end();++it)
     {
       QTableWidgetItem * myFieldItem = new QTableWidgetItem((*it).fieldName());
       mTable->setItem(index, 0, myFieldItem);
@@ -44,3 +45,21 @@ QString QgsAttributeDialog::value(int row)
 {
     return mTable->item(row,1)->text();
 }
+
+bool QgsAttributeDialog::queryAttributes(QgsFeature& f)
+{
+  const std::vector<QgsFeatureAttribute> featureAttributes = f.attributeMap();
+  QgsAttributeDialog attdialog(&featureAttributes);
+  if(attdialog.exec()==QDialog::Accepted)
+    {
+      for(int i=0;i<featureAttributes.size();++i)
+	{
+	  f.changeAttributeValue(featureAttributes[i].fieldName(), attdialog.value(i));
+	}
+      return true;
+    }
+  else
+    {
+      return false;
+    }
+}
diff --git a/src/gui/qgsattributedialog.h b/src/gui/qgsattributedialog.h
@@ -24,15 +24,20 @@
 #include <vector>
 
 class QDialog;
+class QgsFeature;
 
 class QgsAttributeDialog: public QDialog, private Ui::QgsAttributeDialogBase
 {
     Q_OBJECT
 	public:
-    QgsAttributeDialog(std::vector<QgsFeatureAttribute>* attributes);
+    QgsAttributeDialog(const std::vector<QgsFeatureAttribute>* attributes);
     ~QgsAttributeDialog();
     /**Returns the field value of a row*/
     QString value(int row);
+    /**Opens an attribute dialog and queries the attributes for a given feature. The
+     attribute values are set to the feature if the dialog is accepted.
+    Returns true if accepted and false if canceled*/
+    static bool queryAttributes(QgsFeature& f);
 };
 
 #endif
diff --git a/src/gui/qgsfeature.cpp b/src/gui/qgsfeature.cpp
@@ -15,7 +15,6 @@ email                : sherman at mrcc.com
 /* $Id$ */
 
 #include "qgsfeature.h"
-#include "qgsattributedialog.h"
 #include "qgsrect.h"
 #include <iostream>
 #include <cfloat>
@@ -812,24 +811,6 @@ void QgsFeature::resetDirty()
   mDirty = FALSE;
 }
 
-
-bool QgsFeature::attributeDialog()
-{
-    QgsAttributeDialog attdialog(&attributes);
-    if(attdialog.exec()==QDialog::Accepted)
-    {
-	for(int i=0;i<attributes.size();++i)
-	{
-	    attributes[i].setFieldValue(attdialog.value(i));
-	}
-	return true;
-    }
-    else
-    {
-	return false;
-    }
-}
-
 // bool QgsFeature::intersects(QgsRect* r) const
 // {
 //     bool returnval=false;

diff --git a/src/gui/qgsfeature.h b/src/gui/qgsfeature.h
@@ -205,10 +205,6 @@ class QgsFeature {
      *  to the given coordinates
      */
 /*    bool vertexAt(double &x, double &y, int atVertex = 0, int atRing = 0, int atItem = 0) const;*/
-
-    /**Shows a popup dialog to change attribute values
-     @return true if dialog is accepted, false if rejected*/
-    bool attributeDialog();
 
 //     /**Test for intersection with a rectangle (uses GEOS)*/
 //     bool intersects(QgsRect* r) const;

diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp
@@ -2052,10 +2052,10 @@ void QgsMapCanvas::mouseReleaseEvent(QMouseEvent * e)
               }
 
               //show the dialog to enter attribute values
-              if(f->attributeDialog())
-              {
-                vlayer->addFeature(f);
-              }
+	      if(QgsAttributeDialog::queryAttributes(*f))
+	      {
+		vlayer->addFeature(f);
+	      }
               refresh();
             }
           }
@@ -2247,10 +2247,11 @@ void QgsMapCanvas::mouseReleaseEvent(QMouseEvent * e)
               f->addAttribute((*it).name(),vlayer->getDefaultValue(it->name(), f));
             }
 
-            if(f->attributeDialog())
-            {
-              vlayer->addFeature(f);
-            }
+	    //show the dialog to enter attribute values
+	    if(QgsAttributeDialog::queryAttributes(*f))
+	    {
+	      vlayer->addFeature(f);
+	    }
 
             // delete the elements of mCaptureList
             mCaptureList.clear();