diff --git a/raster/r.out.vtk/writeascii.c b/raster/r.out.vtk/writeascii.c index 27af75d4922..1a6297a4a91 100644 --- a/raster/r.out.vtk/writeascii.c +++ b/raster/r.out.vtk/writeascii.c @@ -76,7 +76,8 @@ write_vtk_normal_header(FILE * fp, struct Cell_head region, double elevation, /*Simple vtk ASCII header */ fprintf(fp, "# vtk DataFile Version 3.0\n"); - fprintf(fp, "GRASS GIS 7 Export\n"); + /* The header line describes the data. */ + fprintf(fp, "GRASS GIS Export\n"); fprintf(fp, "ASCII\n"); fprintf(fp, "DATASET STRUCTURED_POINTS\n"); /*We are using the structured point dataset. */ @@ -109,7 +110,7 @@ void write_vtk_structured_elevation_header(FILE * fp, struct Cell_head region) /*Simple vtk ASCII header */ fprintf(fp, "# vtk DataFile Version 3.0\n"); - fprintf(fp, "GRASS GIS 7 Export\n"); + fprintf(fp, "GRASS GIS Export\n"); fprintf(fp, "ASCII\n"); fprintf(fp, "DATASET STRUCTURED_GRID\n"); /*We are using the structured grid dataset. */ fprintf(fp, "DIMENSIONS %i %i %i\n", region.cols, region.rows, 1); @@ -125,7 +126,7 @@ void write_vtk_polygonal_elevation_header(FILE * fp, struct Cell_head region) /*Simple vtk ASCII header */ fprintf(fp, "# vtk DataFile Version 3.0\n"); - fprintf(fp, "GRASS GIS 7 Export\n"); + fprintf(fp, "GRASS GIS Export\n"); fprintf(fp, "ASCII\n"); fprintf(fp, "DATASET POLYDATA\n"); /*We are using polydataset. */ fprintf(fp, "POINTS %i float\n", region.cols * region.rows); diff --git a/raster3d/r3.out.vtk/test_volume_null_1_cells.ref b/raster3d/r3.out.vtk/test_volume_null_1_cells.ref index 15332af9ccd..815133ecac2 100644 --- a/raster3d/r3.out.vtk/test_volume_null_1_cells.ref +++ b/raster3d/r3.out.vtk/test_volume_null_1_cells.ref @@ -1,5 +1,5 @@ # vtk DataFile Version 3.0 -GRASS GIS 7 Export +GRASS GIS Export ASCII DATASET STRUCTURED_POINTS DIMENSIONS 13 9 6 diff --git a/raster3d/r3.out.vtk/test_volume_null_1_cells_elevation.ref b/raster3d/r3.out.vtk/test_volume_null_1_cells_elevation.ref index eb03eba7d2b..a60329adb72 100644 --- a/raster3d/r3.out.vtk/test_volume_null_1_cells_elevation.ref +++ b/raster3d/r3.out.vtk/test_volume_null_1_cells_elevation.ref @@ -1,5 +1,5 @@ # vtk DataFile Version 3.0 -GRASS GIS 7 Export +GRASS GIS Export ASCII DATASET UNSTRUCTURED_GRID POINTS 3840 float diff --git a/raster3d/r3.out.vtk/test_volume_null_1_cells_rgb_vect.ref b/raster3d/r3.out.vtk/test_volume_null_1_cells_rgb_vect.ref index 8695f74b811..b60c1e46734 100644 --- a/raster3d/r3.out.vtk/test_volume_null_1_cells_rgb_vect.ref +++ b/raster3d/r3.out.vtk/test_volume_null_1_cells_rgb_vect.ref @@ -1,5 +1,5 @@ # vtk DataFile Version 3.0 -GRASS GIS 7 Export +GRASS GIS Export ASCII DATASET STRUCTURED_POINTS DIMENSIONS 13 9 6 diff --git a/raster3d/r3.out.vtk/test_volume_null_1_points.ref b/raster3d/r3.out.vtk/test_volume_null_1_points.ref index 22442cbebcc..a22cb713cc9 100644 --- a/raster3d/r3.out.vtk/test_volume_null_1_points.ref +++ b/raster3d/r3.out.vtk/test_volume_null_1_points.ref @@ -1,5 +1,5 @@ # vtk DataFile Version 3.0 -GRASS GIS 7 Export +GRASS GIS Export ASCII DATASET STRUCTURED_POINTS DIMENSIONS 12 8 5 diff --git a/raster3d/r3.out.vtk/test_volume_null_1_points_elevation.ref b/raster3d/r3.out.vtk/test_volume_null_1_points_elevation.ref index b9e2da97096..41bd29af486 100644 --- a/raster3d/r3.out.vtk/test_volume_null_1_points_elevation.ref +++ b/raster3d/r3.out.vtk/test_volume_null_1_points_elevation.ref @@ -1,5 +1,5 @@ # vtk DataFile Version 3.0 -GRASS GIS 7 Export +GRASS GIS Export ASCII DATASET STRUCTURED_GRID DIMENSIONS 12 8 5 diff --git a/raster3d/r3.out.vtk/test_volume_null_1_points_rgb_vect.ref b/raster3d/r3.out.vtk/test_volume_null_1_points_rgb_vect.ref index 948aa8de4bf..2612ce6ce37 100644 --- a/raster3d/r3.out.vtk/test_volume_null_1_points_rgb_vect.ref +++ b/raster3d/r3.out.vtk/test_volume_null_1_points_rgb_vect.ref @@ -1,5 +1,5 @@ # vtk DataFile Version 3.0 -GRASS GIS 7 Export +GRASS GIS Export ASCII DATASET STRUCTURED_POINTS DIMENSIONS 12 8 5 diff --git a/raster3d/r3.out.vtk/writeVTKHead.c b/raster3d/r3.out.vtk/writeVTKHead.c index 4da457e0acd..167fc8c34eb 100644 --- a/raster3d/r3.out.vtk/writeVTKHead.c +++ b/raster3d/r3.out.vtk/writeVTKHead.c @@ -42,7 +42,8 @@ void write_vtk_structured_point_header(FILE * fp, char *vtkFile, /*Simple vtk ASCII header */ fprintf(fp, "# vtk DataFile Version 3.0\n"); - fprintf(fp, "GRASS GIS 7 Export\n"); + /* The header line describes the data. */ + fprintf(fp, "GRASS GIS Export\n"); fprintf(fp, "ASCII\n"); fprintf(fp, "DATASET STRUCTURED_POINTS\n"); /*We are using the structured point dataset. */ @@ -95,7 +96,7 @@ void write_vtk_structured_grid_header(FILE * fp, char *vtkFile, G_debug(3, "write_vtk_structured_grid_header: Writing VTKStructuredGrid-Header"); fprintf(fp, "# vtk DataFile Version 3.0\n"); - fprintf(fp, "GRASS GIS 7 Export\n"); + fprintf(fp, "GRASS GIS Export\n"); fprintf(fp, "ASCII\n"); fprintf(fp, "DATASET STRUCTURED_GRID\n"); /*We are using the structured grid dataset. */ fprintf(fp, "DIMENSIONS %i %i %i\n", region.cols, region.rows, @@ -117,7 +118,7 @@ void write_vtk_unstructured_grid_header(FILE * fp, char *vtkFile, G_debug(3, "write_vtk_unstructured_grid_header: Writing VTKUnstructuredGrid-Header"); fprintf(fp, "# vtk DataFile Version 3.0\n"); - fprintf(fp, "GRASS GIS 7 Export\n"); + fprintf(fp, "GRASS GIS Export\n"); fprintf(fp, "ASCII\n"); fprintf(fp, "DATASET UNSTRUCTURED_GRID\n"); /*We are using the unstructured grid dataset. */ /*Only cell data is available, because we creating a hexaeder/vtk-voxel for every voxel */ diff --git a/vector/v.out.vtk/head.c b/vector/v.out.vtk/head.c index c55fd128bc7..06e82cb4bc6 100644 --- a/vector/v.out.vtk/head.c +++ b/vector/v.out.vtk/head.c @@ -26,7 +26,8 @@ int write_vtk_head(FILE * fp, struct Map_info *Map) { G_debug(3, _("writeVTKHeader: Writing VTK-Header")); fprintf(fp, "# vtk DataFile Version 3.0\n"); - fprintf(fp, "GRASS GIS 7 vector map: %s\n", Map->name); + /* The header line describes the data. */ + fprintf(fp, "GRASS GIS vector map: %s\n", Map->name); fprintf(fp, "ASCII\n"); fprintf(fp, "DATASET POLYDATA\n"); /*We are using polydata. If Volume data is supported, uGrid should be used */ return (0);