Fix rebase problems

qgis · Mar 27, 2013 · bb360b8 · bb360b8
1 parent d6d5da4
commit bb360b8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/src/app/qgisappinterface.cpp b/src/app/qgisappinterface.cpp
@@ -30,6 +30,7 @@
 #include "qgsmaplayer.h"
 #include "qgsmaplayerregistry.h"
 #include "qgsmapcanvas.h"
+#include "qgsproject.h"
 #include "qgslegend.h"
 #include "qgsshortcutsmanager.h"
 #include "qgsattributedialog.h"
@@ -535,7 +536,13 @@ bool QgisAppInterface::openFeatureForm( QgsVectorLayer *vlayer, QgsFeature &f, b
 
 QDialog* QgisAppInterface::getFeatureForm( QgsVectorLayer *l, QgsFeature &f )
 {
-  QgsAttributeDialog *dialog = new QgsAttributeDialog( l, &f, false );
+  QgsDistanceArea myDa;
+
+  myDa.setSourceCrs( l->crs().srsid() );
+  myDa.setEllipsoidalMode( QgisApp::instance()->mapCanvas()->mapRenderer()->hasCrsTransformEnabled() );
+  myDa.setEllipsoid( QgsProject::instance()->readEntry( "Measure", "/Ellipsoid", GEO_NONE ) );
+
+  QgsAttributeDialog *dialog = new QgsAttributeDialog( l, &f, false, myDa );
   return dialog->dialog();
 }
 

diff --git a/src/gui/attributetable/qgsattributetablemodel.cpp b/src/gui/attributetable/qgsattributetablemodel.cpp
@@ -431,7 +431,7 @@ QVariant QgsAttributeTableModel::data( const QModelIndex &index, int role ) cons
     return role == Qt::DisplayRole ? rowId : QVariant();
 
   int fieldId = mAttributes[ index.column()];
-  const QgsField& field = mLayer->pendingFields()[ fieldId ];
+  const QgsField& field = layer()->pendingFields()[ fieldId ];
 
   QVariant::Type fldType = field.type();
   bool fldNumeric = ( fldType == QVariant::Int || fldType == QVariant::Double );
@@ -477,9 +477,9 @@ QVariant QgsAttributeTableModel::data( const QModelIndex &index, int role ) cons
       return mValueMaps[ fieldId ]->key( val.toString(), QString( "(%1)" ).arg( val.toString() ) );
     }
 
-    if ( mLayer->editType( fieldId ) == QgsVectorLayer::Calendar && val.canConvert( QVariant::Date ) )
+    if ( layer()->editType( fieldId ) == QgsVectorLayer::Calendar && val.canConvert( QVariant::Date ) )
     {
-      return val.toDate().toString( mLayer->dateFormat( fieldId ) );
+      return val.toDate().toString( layer()->dateFormat( fieldId ) );
     }
   }
 

diff --git a/src/gui/attributetable/qgsfeaturelistmodel.h b/src/gui/attributetable/qgsfeaturelistmodel.h
@@ -7,6 +7,8 @@
 #include <QVariant>
 #include <QItemSelectionModel>
 
+#include "qgsfeature.h" // QgsFeatureId
+
 class QgsAttributeTableFilterModel;
 class QgsAttributeTableModel;
 class QgsVectorLayerCache;