GRASS 7 raster provider

blazek · blazek · commit bf6effdd67b8 · 2014-05-22T15:16:15.000+02:00
diff --git a/src/providers/grass/CMakeLists.txt b/src/providers/grass/CMakeLists.txt
@@ -570,36 +570,49 @@ TARGET_LINK_LIBRARIES(grassrasterprovider qgisgrass qgis_core)
 # the modules go under libexec subdir
 SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${QGIS_OUTPUT_DIRECTORY}/${QGIS_LIBEXEC_SUBDIR}/grass/modules)
 
-# TODO: upgrade to GRASS 7
+#
+# grass raster display module
+#
+ADD_EXECUTABLE(qgis.d.rast qgis.d.rast.c)
 IF (GRASS_MAJOR_VERSION LESS 7 )
-
-  #
-  # grass raster display module
-  #
-
-  ADD_EXECUTABLE(qgis.d.rast qgis.d.rast.c)
   TARGET_LINK_LIBRARIES(qgis.d.rast
     ${GRASS_LIBRARY_gis}
     ${GRASS_LIBRARY_datetime}
     ${GDAL_LIBRARY}
   )
+ELSE (GRASS_MAJOR_VERSION LESS 7 )
+  TARGET_LINK_LIBRARIES(qgis.d.rast
+    ${GRASS_LIBRARY_gis}
+    ${GRASS_LIBRARY_datetime}
+    ${GRASS_LIBRARY_raster}
+    ${GDAL_LIBRARY}
+  )
+ENDIF (GRASS_MAJOR_VERSION LESS 7 )
 
-  #
-  # grass info module
-  #
+#
+# grass info module
+#
 
-  ADD_EXECUTABLE(qgis.g.info qgis.g.info.c)
+ADD_EXECUTABLE(qgis.g.info qgis.g.info.c)
+IF (GRASS_MAJOR_VERSION LESS 7 )
   TARGET_LINK_LIBRARIES(qgis.g.info
     ${GRASS_LIBRARY_gis}
     ${GRASS_LIBRARY_datetime}
     ${GRASS_LIBRARY_gproj}
     ${GDAL_LIBRARY}
   )
-  IF (UNIX)
-    TARGET_LINK_LIBRARIES(qgis.g.info m)
-  ENDIF (UNIX)
-
+ELSE (GRASS_MAJOR_VERSION LESS 7 )
+  TARGET_LINK_LIBRARIES(qgis.g.info
+    ${GRASS_LIBRARY_gis}
+    ${GRASS_LIBRARY_datetime}
+    ${GRASS_LIBRARY_gproj}
+    ${GRASS_LIBRARY_raster}
+    ${GDAL_LIBRARY}
+  )
 ENDIF (GRASS_MAJOR_VERSION LESS 7 )
+IF (UNIX)
+  TARGET_LINK_LIBRARIES(qgis.g.info m)
+ENDIF (UNIX)
 
 ########################################################
 # Install
@@ -617,14 +630,11 @@ INSTALL(TARGETS grassprovider
   RUNTIME DESTINATION ${QGIS_PLUGIN_DIR}
   LIBRARY DESTINATION ${QGIS_PLUGIN_DIR})
 
-# TODO: upgrade to GRASS 7
-IF (GRASS_MAJOR_VERSION LESS 7 )
-  INSTALL(TARGETS grassrasterprovider
-    RUNTIME DESTINATION ${QGIS_PLUGIN_DIR}
-    LIBRARY DESTINATION ${QGIS_PLUGIN_DIR})
+INSTALL(TARGETS grassrasterprovider
+  RUNTIME DESTINATION ${QGIS_PLUGIN_DIR}
+  LIBRARY DESTINATION ${QGIS_PLUGIN_DIR})
 
-  INSTALL(TARGETS qgis.d.rast qgis.g.info
-    RUNTIME DESTINATION ${QGIS_LIBEXEC_DIR}/grass/modules
-    PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+INSTALL(TARGETS qgis.d.rast qgis.g.info
+  RUNTIME DESTINATION ${QGIS_LIBEXEC_DIR}/grass/modules
+  PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
 )
-ENDIF (GRASS_MAJOR_VERSION LESS 7 )
diff --git a/src/providers/grass/qgis.d.rast.c b/src/providers/grass/qgis.d.rast.c
@@ -33,6 +33,7 @@
 #include <fcntl.h>
 #include <io.h>
 #endif
+#include <grass/version.h>
 #include <grass/gis.h>
 #include <grass/raster.h>
 #include <grass/display.h>
@@ -43,6 +44,23 @@
 #define NAN (INFINITY-INFINITY)
 #endif
 
+#if GRASS_VERSION_MAJOR >= 7
+#define G_allocate_raster_buf Rast_allocate_buf
+#define G_close_cell Rast_close
+#define G_free_colors Rast_free_colors
+#define G_get_cellhd Rast_get_cellhd
+#define G_get_raster_map_type Rast_get_map_type
+#define G_get_raster_row Rast_get_row
+#define G_is_null_value Rast_is_null_value
+#define G_lookup_raster_colors Rast_lookup_colors
+#define G_open_cell_old Rast_open_old
+#define G_raster_map_type Rast_map_type
+#define G_raster_size Rast_cell_size
+#define G_read_colors Rast_read_colors
+#define G_window_cols Rast_window_cols
+#define G_window_rows Rast_window_rows
+#endif
+
 int display( char *name, char *mapset, RASTER_MAP_TYPE data_type, char *format );
 
 int main( int argc, char **argv )
@@ -84,9 +102,13 @@ int main( int argc, char **argv )
   name = map->answer;
 
   /* Make sure map is available */
+#if GRASS_VERSION_MAJOR < 7
   mapset = G_find_cell2( name, "" );
   if ( mapset == NULL )
     G_fatal_error(( "Raster map <%s> not found" ), name );
+#else
+  mapset = "";
+#endif
 
   /* It can happen that GRASS data set is 'corrupted' and zone differs in WIND and
    * cellhd, and G_open_cell_old fails, so it is better to read window from map */
diff --git a/src/providers/grass/qgis.g.info.c b/src/providers/grass/qgis.g.info.c
@@ -28,11 +28,34 @@
 #include <stdio.h>
 #include <string.h>
 #include <float.h>
+#include <grass/version.h>
 #include <grass/gis.h>
 #include <grass/raster.h>
 #include <grass/display.h>
 #include <grass/gprojects.h>
 
+#if GRASS_VERSION_MAJOR >= 7
+#define G_allocate_c_raster_buf Rast_allocate_c_buf
+#define G_allocate_d_raster_buf Rast_allocate_d_buf
+#define G_close_cell Rast_close
+#define G_colors_count Rast_colors_count
+#define G_easting_to_col Rast_easting_to_col
+#define G_get_c_raster_row Rast_get_c_row
+#define G_get_cellhd Rast_get_cellhd
+#define G_get_d_raster_row Rast_get_d_row
+#define G_get_f_color_rule Rast_get_fp_color_rule
+#define G_get_fp_range_min_max Rast_get_fp_range_min_max
+#define G_get_raster_map_type Rast_get_map_type
+#define G_is_null_value Rast_is_null_value
+#define G_northing_to_row Rast_northing_to_row
+#define G_open_cell_old Rast_open_old
+#define G_raster_map_type Rast_map_type
+#define G_read_colors Rast_read_colors
+#define G_read_fp_range Rast_read_fp_range
+#define G_window_cols Rast_window_cols
+#define G_window_rows Rast_window_rows
+#endif
+
 int main( int argc, char **argv )
 {
   struct GModule *module;
@@ -226,21 +249,29 @@ int main( int argc, char **argv )
 
             if ( rast_type == CELL_TYPE )
             {
+#if GRASS_VERSION_MAJOR < 7
               if ( G_get_c_raster_row( fd, cell, row ) < 0 )
               {
                 G_fatal_error(( "Unable to read raster map <%s> row %d" ),
                               rast_opt->answer, row );
               }
+#else
+              G_get_c_raster_row( fd, cell, row );
+#endif
               val = cell[col];
               ptr = &( cell[col] );
             }
             else
             {
+#if GRASS_VERSION_MAJOR < 7
               if ( G_get_d_raster_row( fd, dcell, row ) < 0 )
               {
                 G_fatal_error(( "Unable to read raster map <%s> row %d" ),
                               rast_opt->answer, row );
               }
+#else
+              G_get_d_raster_row( fd, dcell, row );
+#endif
               val = dcell[col];
               ptr = &( dcell[col] );
             }
@@ -312,19 +343,27 @@ int main( int argc, char **argv )
       {
         if ( rast_type == CELL_TYPE )
         {
+#if GRASS_VERSION_MAJOR < 7
           if ( G_get_c_raster_row( fd, cell, row ) < 0 )
           {
             G_fatal_error(( "Unable to read raster map <%s> row %d" ),
                           rast_opt->answer, row );
           }
+#else
+          G_get_c_raster_row( fd, cell, row );
+#endif
         }
         else
         {
+#if GRASS_VERSION_MAJOR < 7
           if ( G_get_d_raster_row( fd, dcell, row ) < 0 )
           {
             G_fatal_error(( "Unable to read raster map <%s> row %d" ),
                           rast_opt->answer, row );
           }
+#else
+          G_get_d_raster_row( fd, dcell, row );
+#endif
         }
 
         for ( col = 0; col < ncols; col++ )
diff --git a/src/providers/grass/qgsgrassprovider.cpp b/src/providers/grass/qgsgrassprovider.cpp
@@ -1046,12 +1046,7 @@ struct Map_info *QgsGrassProvider::layerMap( int layerId )
 
 QgsCoordinateReferenceSystem QgsGrassProvider::crs()
 {
-// TODO7: enable/fix qgis.g.info
-#if GRASS_VERSION_MAJOR < 7
   return QgsGrass::crs( mGisdbase, mLocation );
-#else
-  return QgsCoordinateReferenceSystem();
-#endif
 }
 
 int QgsGrassProvider::grassLayer()

Original file line number	Diff line number	Diff line change
`@@ -28,11 +28,34 @@`
`28`	`28`	`#include <stdio.h>`
`29`	`29`	`#include <string.h>`
`30`	`30`	`#include <float.h>`
	`31`	`+#include <grass/version.h>`
`31`	`32`	`#include <grass/gis.h>`
`32`	`33`	`#include <grass/raster.h>`
`33`	`34`	`#include <grass/display.h>`
`34`	`35`	`#include <grass/gprojects.h>`
`35`	`36`
	`37`	`+#if GRASS_VERSION_MAJOR >= 7`
	`38`	`+#define G_allocate_c_raster_buf Rast_allocate_c_buf`
	`39`	`+#define G_allocate_d_raster_buf Rast_allocate_d_buf`
	`40`	`+#define G_close_cell Rast_close`
	`41`	`+#define G_colors_count Rast_colors_count`
	`42`	`+#define G_easting_to_col Rast_easting_to_col`
	`43`	`+#define G_get_c_raster_row Rast_get_c_row`
	`44`	`+#define G_get_cellhd Rast_get_cellhd`
	`45`	`+#define G_get_d_raster_row Rast_get_d_row`
	`46`	`+#define G_get_f_color_rule Rast_get_fp_color_rule`
	`47`	`+#define G_get_fp_range_min_max Rast_get_fp_range_min_max`
	`48`	`+#define G_get_raster_map_type Rast_get_map_type`
	`49`	`+#define G_is_null_value Rast_is_null_value`
	`50`	`+#define G_northing_to_row Rast_northing_to_row`
	`51`	`+#define G_open_cell_old Rast_open_old`
	`52`	`+#define G_raster_map_type Rast_map_type`
	`53`	`+#define G_read_colors Rast_read_colors`
	`54`	`+#define G_read_fp_range Rast_read_fp_range`
	`55`	`+#define G_window_cols Rast_window_cols`
	`56`	`+#define G_window_rows Rast_window_rows`
	`57`	`+#endif`
	`58`	`+`
`36`	`59`	`int main( int argc, char **argv )`
`37`	`60`	`{`
`38`	`61`	`struct GModule *module;`
`@@ -226,21 +249,29 @@ int main( int argc, char **argv )`
`226`	`249`
`227`	`250`	`if ( rast_type == CELL_TYPE )`
`228`	`251`	`{`
	`252`	`+#if GRASS_VERSION_MAJOR < 7`
`229`	`253`	`if ( G_get_c_raster_row( fd, cell, row ) < 0 )`
`230`	`254`	`{`
`231`	`255`	`G_fatal_error(( "Unable to read raster map <%s> row %d" ),`
`232`	`256`	`rast_opt->answer, row );`
`233`	`257`	`}`
	`258`	`+#else`
	`259`	`+ G_get_c_raster_row( fd, cell, row );`
	`260`	`+#endif`
`234`	`261`	`val = cell[col];`
`235`	`262`	`ptr = &( cell[col] );`
`236`	`263`	`}`
`237`	`264`	`else`
`238`	`265`	`{`
	`266`	`+#if GRASS_VERSION_MAJOR < 7`
`239`	`267`	`if ( G_get_d_raster_row( fd, dcell, row ) < 0 )`
`240`	`268`	`{`
`241`	`269`	`G_fatal_error(( "Unable to read raster map <%s> row %d" ),`
`242`	`270`	`rast_opt->answer, row );`
`243`	`271`	`}`
	`272`	`+#else`
	`273`	`+ G_get_d_raster_row( fd, dcell, row );`
	`274`	`+#endif`
`244`	`275`	`val = dcell[col];`
`245`	`276`	`ptr = &( dcell[col] );`
`246`	`277`	`}`
`@@ -312,19 +343,27 @@ int main( int argc, char **argv )`
`312`	`343`	`{`
`313`	`344`	`if ( rast_type == CELL_TYPE )`
`314`	`345`	`{`
	`346`	`+#if GRASS_VERSION_MAJOR < 7`
`315`	`347`	`if ( G_get_c_raster_row( fd, cell, row ) < 0 )`
`316`	`348`	`{`
`317`	`349`	`G_fatal_error(( "Unable to read raster map <%s> row %d" ),`
`318`	`350`	`rast_opt->answer, row );`
`319`	`351`	`}`
	`352`	`+#else`
	`353`	`+ G_get_c_raster_row( fd, cell, row );`
	`354`	`+#endif`
`320`	`355`	`}`
`321`	`356`	`else`
`322`	`357`	`{`
	`358`	`+#if GRASS_VERSION_MAJOR < 7`
`323`	`359`	`if ( G_get_d_raster_row( fd, dcell, row ) < 0 )`
`324`	`360`	`{`
`325`	`361`	`G_fatal_error(( "Unable to read raster map <%s> row %d" ),`
`326`	`362`	`rast_opt->answer, row );`
`327`	`363`	`}`
	`364`	`+#else`
	`365`	`+ G_get_d_raster_row( fd, dcell, row );`
	`366`	`+#endif`
`328`	`367`	`}`
`329`	`368`
`330`	`369`	`for ( col = 0; col < ncols; col++ )`
Original file line number	Diff line number	Diff line change
`@@ -1046,12 +1046,7 @@ struct Map_info *QgsGrassProvider::layerMap( int layerId )`
`1046`	`1046`
`1047`	`1047`	`QgsCoordinateReferenceSystem QgsGrassProvider::crs()`
`1048`	`1048`	`{`
`1049`		`-// TODO7: enable/fix qgis.g.info`
`1050`		`-#if GRASS_VERSION_MAJOR < 7`
`1051`	`1049`	`return QgsGrass::crs( mGisdbase, mLocation );`
`1052`		`-#else`
`1053`		`- return QgsCoordinateReferenceSystem();`
`1054`		`-#endif`
`1055`	`1050`	`}`
`1056`	`1051`
`1057`	`1052`	`int QgsGrassProvider::grassLayer()`