Merged in qgsproject-branch changes.

Also made QgsRasterLayer more robust in light of files with poor "no data" and "min/max" value information. Note that this hasn't been tested with windows versions. git-svn-id: http://svn.osgeo.org/qgis/trunk@2156 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Oct 21, 2004 · c149b14 · c149b14
1 parent 5b73ddf
commit c149b14
Show file tree

Hide file tree

Showing 70 changed files with 3,924 additions and 2,304 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,8 +1,13 @@
 QGIS Change Log
-ChangeLog,v 1.199 2004/10/19 11:51:43 larsl Exp
+ChangeLog,v 1.200 2004/10/21 17:27:35 mcoletti Exp
 ------------------------------------------------------------------------------
+
+
 Version 0.6 'Simon' .... development version
 
+2004-10-20 [mcoletti] 0.5.0devel10
+** merged in qgsproject-branch
+
 2004-10-19 [larsl] 0.5.0devel9
 ** Changed GPX attribute names from three letter abbreviations to more
    userfriendly whole words

diff --git a/configure.in b/configure.in
@@ -1,6 +1,6 @@
 
 dnl Process this file with autoconf to produce a configure script.
-dnl configure.in,v 1.203 2004/10/19 11:51:43 larsl Exp
+dnl configure.in,v 1.204 2004/10/21 17:27:35 mcoletti Exp
 
 
 
@@ -26,7 +26,7 @@ dnl ---------------------------------------------------------------------------
 MAJOR_VERSION=0
 MINOR_VERSION=5
 MICRO_VERSION=0
-EXTRA_VERSION=9
+EXTRA_VERSION=10
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}
 else

diff --git a/plugins/geoprocessing/qgspggeoprocessing.cpp b/plugins/geoprocessing/qgspggeoprocessing.cpp
@@ -147,7 +147,7 @@ void QgsPgGeoprocessing::buffer()
         // set a default output table name
         bb->setBufferLayerName(tableName.mid(tableName.find(".") + 1) + "_buffer");
         // set the fields on the dialog box drop-down
-        QgsVectorDataProvider *dp = lyr->getDataProvider();
+        QgsVectorDataProvider *dp = dynamic_cast<QgsVectorDataProvider *>(lyr->getDataProvider());
         std::vector < QgsField > flds = dp->fields();
         for (int i = 0; i < flds.size(); i++) {
           // check the field type -- if its int we can use it

diff --git a/plugins/grass/Makefile.am b/plugins/grass/Makefile.am
@@ -10,6 +10,8 @@
 #
 # $Id$
 
+INCLUDES = -I../../src
+
 plugindir = ${pkglibdir}
 
 %.moc.cpp: %.h
@@ -80,8 +82,8 @@ qgsgrassregionbase.h: qgsgrassregionbase.ui
 BUILT_SOURCES = $(plugin_MOC) $(plugin_UI)
 
 
-grassplugin_la_LIBADD = $(QT_LDADD)  -L../../providers/grass/${objdir} -lgrassprovider $(GRASS_LIB) $(PG_LIB)
+grassplugin_la_LIBADD = $(QT_LDADD)  -L../../providers/grass/${objdir} -lgrassprovider $(GRASS_LIB) $(PG_LIB)   $(GDAL_LDADD)
 grassplugin_la_LDFLAGS = -avoid-version -module
-grassplugin_la_CXXFLAGS = $(CXXFLAGS) -I$(GRASS_INC) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) -I$(PG_INC) -I../../src/
+grassplugin_la_CXXFLAGS = $(CXXFLAGS) -I$(GRASS_INC) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) -I$(PG_INC)  $(GDAL_CFLAGS)
 
 EXTRA_DIST = $(plugin_UIC) add_vector.xpm add_raster.xpm grass_edit.xpm grass_region.xpm grass_region_edit.xpm
diff --git a/plugins/grass/qgsgrassedit.cpp b/plugins/grass/qgsgrassedit.cpp
@@ -1416,7 +1416,8 @@ void QgsGrassEdit::mouseEventReceiverMove ( QgsPoint & newPoint )
 		/* Draw the line with new segment */
 		Vect_reset_line ( mPoints );
 		Vect_append_points ( mPoints, mEditPoints, GV_FORWARD );
-		Vect_append_point ( mPoints, newPoint.xToInt(), newPoint.yToInt(), 0.0 );
+		Vect_append_point ( mPoints, static_cast<int>(newPoint.x()), 
+                                             static_cast<int>(newPoint.y()), 0.0 );
                 displayDynamic ( mPoints );
 	    }
 	    break;
@@ -1622,7 +1623,8 @@ void QgsGrassEdit::displayElement ( int line, const QPen & pen, int size, QPaint
 	    point.setX(mPoints->x[i]);
 	    point.setY(mPoints->y[i]);
 	    mTransform->transform(&point);
-	    pointArray.setPoint( i, point.xToInt(), point.yToInt() ); 
+	    pointArray.setPoint( i, static_cast<int>(point.x()), 
+                                    static_cast<int>(point.y()) ); 
 	}
 
 	myPainter->setPen ( pen );
@@ -1700,7 +1702,8 @@ void QgsGrassEdit::displayDynamic ( struct line_pnts *Points, double x, double y
 	    point.setX(Points->x[i]);
 	    point.setY(Points->y[i]);
 	    mTransform->transform(&point);
-	    mLastDynamicPoints.setPoint( i, point.xToInt(), point.yToInt() ); 
+	    mLastDynamicPoints.setPoint( i, static_cast<int>(point.x()), 
+                                            static_cast<int>(point.y()) ); 
 	}
     } else {
 	mLastDynamicPoints.resize(0);
@@ -1769,8 +1772,8 @@ void QgsGrassEdit::displayIcon ( double x, double y, const QPen & pen,
     point.setY(y);
     mTransform->transform(&point);
 
-    int px = point.xToInt();
-    int py = point.yToInt();
+    int px = static_cast<int>(point.x());
+    int py = static_cast<int>(point.y());
     int m = (size-1)/2;
 
     QPainter *myPainter;

diff --git a/plugins/grass/qgsgrassplugin.cpp b/plugins/grass/qgsgrassplugin.cpp
@@ -325,7 +325,9 @@ void QgsGrassPlugin::displayRegion(QPainter *painter)
 
     for ( int i = 0; i < 5; i++ ) {
         transform->transform( &(points[i]) );
-        pointArray.setPoint( i, points[i].xToInt(), points[i].yToInt() );
+        pointArray.setPoint( i, 
+                             static_cast<int>(points[i].x()), 
+                             static_cast<int>(points[i].y()) );
     }
 
     painter->setPen ( mRegionPen );

diff --git a/plugins/grass/qgsgrassregion.cpp b/plugins/grass/qgsgrassregion.cpp
@@ -388,7 +388,8 @@ void QgsGrassRegion::displayRegion()
 
     for ( int i = 0; i < 5; i++ ) {
         transform->transform( &(points[i]) );
-        mPointArray.setPoint( i, points[i].xToInt(), points[i].yToInt() );
+        mPointArray.setPoint( i, static_cast<int>(points[i].x()), 
+                                 static_cast<int>(points[i].y()) );
     }
 
     painter->drawPolyline ( mPointArray );

diff --git a/providers/delimitedtext/Makefile.am b/providers/delimitedtext/Makefile.am
@@ -1,5 +1,7 @@
 ## $Id$
 
+INCLUDES = -I../../src
+
 plugindir = ${pkglibdir}
 plugin_LTLIBRARIES = delimitedtextprovider.la 
 
@@ -13,6 +15,6 @@ delimitedtextprovider_la_SOURCES = qgsdelimitedtextprovider.cpp		\
 
 delimitedtextprovider_la_LIBADD = $(QT_LDADD)  $(GDAL_LIB)
 delimitedtextprovider_la_LDFLAGS = -avoid-version -module
-delimitedtextprovider_la_CXXFLAGS = $(CXXFLAGS) $(GDAL_CFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS)
+delimitedtextprovider_la_CXXFLAGS = $(GDAL_CFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS)
 
 EXTRA_DIST = qgsdelimitedtextprovider.h
diff --git a/providers/gpx/Makefile.am b/providers/gpx/Makefile.am
@@ -1,5 +1,7 @@
 ## $Id$
 
+INCLUDES = -I../../src
+
 plugindir = ${pkglibdir}
 plugin_LTLIBRARIES = gpxprovider.la 
 
@@ -14,6 +16,6 @@ gpxprovider_la_SOURCES = qgsgpxprovider.cpp		\
 
 gpxprovider_la_LIBADD = $(QT_LDADD)
 gpxprovider_la_LDFLAGS = -avoid-version -module
-gpxprovider_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS)
+gpxprovider_la_CXXFLAGS = $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS)
 
 EXTRA_DIST = qgsgpxprovider.h gpsdata.h
diff --git a/providers/grass/Makefile.am b/providers/grass/Makefile.am
@@ -1,3 +1,9 @@
+##
+## $Id$
+##
+
+INCLUDES = -I../../src
+
 #lib_LTLIBRARIES = libqgisgrass.la
 
 plugindir = ${pkglibdir}
@@ -37,6 +43,6 @@ libgrassprovider_la_SOURCES = provider.cpp \
 #libqgisgrass_la_LDFLAGS = -version-info $(INTERFACE_VERSION)
 #libqgisgrass_la_CXXFLAGS = $(CXXFLAGS) -I$(GRASS_INC) -I$(PG_INC) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) 
 
-libgrassprovider_la_LIBADD = $(QT_LDADD) $(GRASS_LIB)
+libgrassprovider_la_LIBADD = $(QT_LDADD) $(GRASS_LIB)  $(GDAL_LDADD)
 libgrassprovider_la_LDFLAGS = -avoid-version -module
-libgrassprovider_la_CXXFLAGS = $(CXXFLAGS) -I$(GRASS_INC) -I$(PG_INC) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) 
+libgrassprovider_la_CXXFLAGS = -I$(GRASS_INC) $(GDAL_CFLAGS) -I$(PG_INC) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) 
diff --git a/providers/ogr/Makefile.am b/providers/ogr/Makefile.am
@@ -1,16 +1,18 @@
+INCLUDES = -I../../src
+
 plugindir = ${pkglibdir}
 plugin_LTLIBRARIES = ogrprovider.la 
 
-ogrprovider_la_SOURCES = qgsshapefileprovider.cpp \
-                      	qgsshapefileprovider.h \
-												../../src/qgsfeature.cpp \
-												../../src/qgsfeatureattribute.cpp \
-												../../src/qgsrect.cpp \
-												../../src/qgspoint.cpp \
-												../../src/qgsfield.cpp
+ogrprovider_la_SOURCES = qgsshapefileprovider.cpp		\
+			 qgsshapefileprovider.h			\
+			 ../../src/qgsfeature.cpp		\
+			 ../../src/qgsfeatureattribute.cpp	\
+			 ../../src/qgsrect.cpp 			\
+			 ../../src/qgspoint.cpp			\
+	 		 ../../src/qgsfield.cpp
 
 
 ogrprovider_la_LIBADD = $(QT_LDADD)  $(GDAL_LDADD) $(GEOS_LDADD)
 ogrprovider_la_LDFLAGS = -avoid-version -module
-ogrprovider_la_CXXFLAGS := $(CXXFLAGS) $(GDAL_CFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GEOS_CFLAGS)
+ogrprovider_la_CXXFLAGS := $(GDAL_CFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GEOS_CFLAGS)
 
diff --git a/providers/postgres/Makefile.am b/providers/postgres/Makefile.am
@@ -1,14 +1,17 @@
+INCLUDES = -I../../src
+
 plugindir = ${pkglibdir}
 plugin_LTLIBRARIES     = postgresprovider.la
-
-postgresprovider_la_SOURCES = qgspostgresprovider.cpp \
-														qgspostgresprovider.h \
-														../../src/qgsfeature.cpp \
-														../../src/qgsfeatureattribute.cpp \
-														../../src/qgsrect.cpp \
-														../../src/qgspoint.cpp \
-														../../src/qgsfield.cpp       
-
+
+
+postgresprovider_la_SOURCES = qgspostgresprovider.cpp 		\
+			      qgspostgresprovider.h		\
+			      ../../src/qgsfeature.cpp		\
+			      ../../src/qgsfeatureattribute.cpp	\
+			      ../../src/qgsrect.cpp		\
+			      ../../src/qgspoint.cpp		\
+			      ../../src/qgsfield.cpp       
+
 postgresprovider_la_LIBADD = $(QT_LDADD) $(PG_LIB)
 postgresprovider_la_LDFLAGS = -avoid-version -module
-postgresprovider_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) -I$(PG_INC) $(DEBUG_QGIS)
+postgresprovider_la_CXXFLAGS = $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) -I$(PG_INC) $(DEBUG_QGIS)