[QGIS Commit] r10359 - branches/analysis_branch/src/analysis/vector

[svn_qgis at osgeo.org]

Author: cfarmer
Date: 2009-03-21 11:18:31 -0400 (Sat, 21 Mar 2009)
New Revision: 10359

Modified:
   branches/analysis_branch/src/analysis/vector/qgsgeometryanalyzer.cpp
   branches/analysis_branch/src/analysis/vector/qgsgeometryanalyzer.h
Log:
another quick fix


Modified: branches/analysis_branch/src/analysis/vector/qgsgeometryanalyzer.cpp
===================================================================
--- branches/analysis_branch/src/analysis/vector/qgsgeometryanalyzer.cpp	2009-03-21 15:13:42 UTC (rev 10358)
+++ branches/analysis_branch/src/analysis/vector/qgsgeometryanalyzer.cpp	2009-03-21 15:18:31 UTC (rev 10359)
@@ -276,7 +276,7 @@
                              const QString& fileEncoding,
                              const double tolerance )
 {
-  QgsVectorDataProvider* provider = layer->dataProvider();
+/*  QgsVectorDataProvider* provider = layer->dataProvider();
   QgsAttributeList allAttrs = provider->attributeIndexes();
   provider->select( allAttrs, QgsRectangle(), true );
   QgsVectorFileWriter* writer = new QgsVectorFileWriter( shapefileName,
@@ -295,6 +295,7 @@
   }
   delete writer;
   return true;
+  */
 }
 
 bool QgsGeometryAnalyzer::polygonCentroids( QgsVectorLayer* layer,
@@ -332,6 +333,7 @@
                              const QString& shapefileName,
                              const QString& fileEncoding )
 {
+/*
   QgsFieldMap fields;
   fields.insert( 0 , QgsField( QString( "MINX" ), QVariant.Double ) );
   fields.insert( 1 , QgsField( QString( "MINY" ), QVariant.Double ) );
@@ -380,7 +382,7 @@
   writer.addFeature( feat );
   delete writer;
   return true
-  
+*/
 }
 
 QList<double> QgsGeometryAnalyzer::simpleMeasure( QgsGeometry& geometry )
@@ -466,6 +468,7 @@
 */
   
 }
+
 QgsGeometry QgsGeometryAnalyzer::extractLines( QgsGeometry& geometry )
 {
 /*
@@ -590,7 +593,7 @@
   */
 }
 
-QList<QgsPoint> QgsGeometryAnalyzer::extractPoints( QgsGeometry geometry* )
+QList<QgsPoint> QgsGeometryAnalyzer::extractPoints( QgsGeometry& geometry )
 {
 /*  QGis::WkbType wkbType = geometry.wkbType();
   QList<QgsPoint> pointList;

Modified: branches/analysis_branch/src/analysis/vector/qgsgeometryanalyzer.h
===================================================================
--- branches/analysis_branch/src/analysis/vector/qgsgeometryanalyzer.h	2009-03-21 15:13:42 UTC (rev 10358)
+++ branches/analysis_branch/src/analysis/vector/qgsgeometryanalyzer.h	2009-03-21 15:18:31 UTC (rev 10359)
@@ -106,11 +106,11 @@
     QList<double> simpleMeasure( QgsGeometry& geometry );
     double perimeterMeasure( QgsGeometry& geometry );
     QgsFieldMap checkGeometryFields( QgsGeometry& geometry, int index1, int index2 );
-    QgsPolyline extractAsLine( QgsGeometry& geometry );
+    QgsGeometry extractLines( QgsGeometry& geometry );
     QgsGeometry extractAsSingle( QgsGeometry& geometry );
     QgsGeometry extractAsMulti( QgsGeometry& geometry );
     QgsGeometry convertGeometry( QgsGeometry& geometry );
-    QgsPolyline extractPoints( QgsGeometry* geometry );
+    QList<QgsPoint> extractPoints( QgsGeometry& geometry );
 
 };
 #endif //QGSVECTORANALYZER