Milena Nowotarska: msg cleanup; HTML cleanup

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@47863 15284696-431f-4ddb-bdfa-cd5b030d7da7

raster3d/r3.out.vtk/main.c

@@ -94,7 +94,7 @@ input_maps *create_input_maps_struct(void)
 /* ************************************************************************* */
 int open_input_map(const char *name, const char *mapset)
 {
-    G_debug(3, "Open Raster file %s in Mapset %s", name, mapset);
+    G_debug(3, "Open raster file %s in mapset %s", name, mapset);
 
     /* open raster map */
     return Rast_open_old(name, mapset);
@@ -114,7 +114,7 @@ void check_input_maps(void)
     if (param.structgrid->answer) {
 
         if (!param.top->answer || !param.bottom->answer)
-            Rast3d_fatal_error(_("You have to specify top and bottom map"));
+            Rast3d_fatal_error(_("Specify top and bottom map"));
 
         mapset = NULL;
         name = NULL;
@@ -139,7 +139,7 @@ void check_input_maps(void)
     if (param.input->answers != NULL) {
         for (i = 0; param.input->answers[i] != NULL; i++) {
             if (NULL == G_find_raster3d(param.input->answers[i], ""))
-                Rast3d_fatal_error(_("Requested 3d raster map <%s> not found"),
+                Rast3d_fatal_error(_("3D raster map <%s> not found"),
                                param.input->answers[i]);
         }
     }
@@ -149,10 +149,10 @@ void check_input_maps(void)
         for (i = 0; i < 3; i++) {
             if (param.rgbmaps->answers[i] != NULL) {
                 if (NULL == G_find_raster3d(param.rgbmaps->answers[i], ""))
-                    Rast3d_fatal_error(_("Requested g3d RGB map <%s> not found"),
+                    Rast3d_fatal_error(_("3D raster map RGB map <%s> not found"),
                                    param.rgbmaps->answers[i]);
             } else {
-                Rast3d_fatal_error(_("Please provide three g3d RGB maps"));
+                Rast3d_fatal_error(_("Please provide three RGB 3D raster maps"));
             }
         }
     }
@@ -162,17 +162,17 @@ void check_input_maps(void)
         for (i = 0; i < 3; i++) {
             if (param.vectormaps->answers[i] != NULL) {
                 if (NULL == G_find_raster3d(param.vectormaps->answers[i], ""))
-                    Rast3d_fatal_error(_("Requested g3d vector map <%s> not found"),
+                    Rast3d_fatal_error(_("3D vector map <%s> not found"),
                                    param.vectormaps->answers[i]);
             } else {
-                Rast3d_fatal_error(_("Please provide three g3d vector maps [x,y,z]"));
+                Rast3d_fatal_error(_("Please provide three G3D vector maps [x,y,z]"));
             }
         }
     }
 
     if (param.input->answers == NULL && param.rgbmaps->answers == NULL &&
         param.vectormaps->answers == NULL) {
-        G_warning(_("No g3d data, RGB or xyz-vector maps are provided! Will only write the geometry."));
+        G_warning(_("No 3D raster data, RGB or xyz-vector maps are provided! Will only write the geometry."));
     }
 
     return;
@@ -193,7 +193,7 @@ void open_write_rgb_maps(input_maps * in, RASTER3D_Region region, FILE * fp,
 
         /*Loop over all input maps! */
         for (i = 0; i < 3; i++) {
-            G_debug(3, _("Open rgb 3d raster map %s"),
+            G_debug(3, "Open RGB 3D raster map <%s>",
                     param.rgbmaps->answers[i]);
 
             maprgb = NULL;
@@ -204,7 +204,7 @@ void open_write_rgb_maps(input_maps * in, RASTER3D_Region region, FILE * fp,
                                 &region, RASTER3D_TILE_SAME_AS_FILE,
                                 RASTER3D_USE_CACHE_DEFAULT);
             if (maprgb == NULL) {
-                G_warning(_("Error opening 3d raster map <%s>"),
+                G_warning(_("Unable to open 3D raster map <%s>"),
                           param.rgbmaps->answers[i]);
                 fatal_error(_("No RGB Data will be created."), in);
             }
@@ -249,7 +249,7 @@ void open_write_rgb_maps(input_maps * in, RASTER3D_Region region, FILE * fp,
             }
             /* Close the 3d raster map */
             if (!Rast3d_close(maprgb)) {
-                fatal_error(_("Error closing g3d rgb map."), in);
+                fatal_error(_("Unable to close 3D raster map"), in);
             }
 
             /*Set the pointer to null so we noe later that these files are already closed */
@@ -278,7 +278,7 @@ void open_write_vector_maps(input_maps * in, RASTER3D_Region region, FILE * fp,
 
         /*Loop over all input maps! */
         for (i = 0; i < 3; i++) {
-            G_debug(3, "Open vector 3d raster map %s",
+            G_debug(3, "Open vector 3D raster map <%s>",
                     param.vectormaps->answers[i]);
 
             mapvect = NULL;
@@ -289,7 +289,7 @@ void open_write_vector_maps(input_maps * in, RASTER3D_Region region, FILE * fp,
                                              ""), &region,
                                 RASTER3D_TILE_SAME_AS_FILE, RASTER3D_USE_CACHE_DEFAULT);
             if (mapvect == NULL) {
-                G_warning(_("Error opening 3d raster map <%s>"),
+                G_warning(_("Unable to open 3D raster map <%s>"),
                           param.vectormaps->answers[i]);
                 fatal_error(_("No vector data will be created."), in);
             }
@@ -335,7 +335,7 @@ void open_write_vector_maps(input_maps * in, RASTER3D_Region region, FILE * fp,
 
             /* Close the 3d raster map */
             if (!Rast3d_close(mapvect)) {
-                fatal_error(_("Error closing g3d vector map."), in);
+                fatal_error(_("Unable to close 3D raster map"), in);
             }
             /*Set the pointer to null so we know later that these files are already closed */
             if (i == 0)
@@ -500,7 +500,7 @@ int main(int argc, char *argv[])
     if (param.input->answers != NULL) {
         for (i = 0; param.input->answers[i] != NULL; i++) {
 
-            G_debug(3, "Open 3d raster map %s", param.input->answers[i]);
+            G_debug(3, "Open 3D raster map <%s>", param.input->answers[i]);
 
             /*Open the map */
             in->map =
@@ -509,7 +509,7 @@ int main(int argc, char *argv[])
                                 &region, RASTER3D_TILE_SAME_AS_FILE,
                                 RASTER3D_USE_CACHE_DEFAULT);
             if (in->map == NULL) {
-                G_warning(_("Error opening 3d raster map <%s>"),
+                G_warning(_("Unable to open 3D raster map <%s>"),
                           param.input->answers[i]);
                 fatal_error(" ", in);
             }
@@ -538,7 +538,7 @@ int main(int argc, char *argv[])
             /* Close the 3d raster map */
             if (!Rast3d_close(in->map)) {
                 in->map = NULL;
-                fatal_error(_("Error closing 3d raster map, the VTK file may be incomplete."),
+                fatal_error(_("Unable to close 3D raster map, the VTK file may be incomplete"),
                             in);
             }
 
@@ -553,7 +553,7 @@ int main(int argc, char *argv[])
     /*Close the output file */
     if (param.output->answer && fp != NULL)
         if (fclose(fp))
-            fatal_error(_("Error closing VTK-ASCII file"), in);
+            fatal_error(_("Unable to close VTK-ASCII file"), in);
 
     /*close all open maps and free memory */
     release_input_maps_struct(in);

raster3d/r3.out.vtk/parameters.c

@@ -79,7 +79,7 @@ void set_params()
     param.rgbmaps->multiple = YES;
     param.rgbmaps->guisection = "Advanced options";
     param.rgbmaps->description =
-	_("Three (r,g,b) 3d raster maps to create rgb values [redmap,greenmap,bluemap]");
+	_("Three (R,G,B) 3D raster maps to create RGB values [redmap,greenmap,bluemap]");
 
     param.vectormaps = G_define_option();
     param.vectormaps->key = "vectormaps";
@@ -89,7 +89,7 @@ void set_params()
     param.vectormaps->multiple = YES;
     param.vectormaps->guisection = "Advanced options";
     param.vectormaps->description =
-	_("Three (x,y,z) 3d raster maps to create vector values [xmap,ymap,zmap]");
+	_("Three (x,y,z) 3D raster maps to create vector values [xmap,ymap,zmap]");
 
 
     param.elevscale = G_define_option();
@@ -114,7 +114,7 @@ void set_params()
     param.mask = G_define_flag();
     param.mask->key = 'm';
     param.mask->guisection = "Advanced options";
-    param.mask->description = _("Use g3d mask (if exists) with input maps");
+    param.mask->description = _("Use 3D raster mask (if exists) with input maps");
 
     param.origin = G_define_flag();
     param.origin->key = 'o';

raster3d/r3.out.vtk/r3.out.vtk.html

@@ -87,7 +87,7 @@ r3.out.vtk -s input=map3d top=elevation.10m bottom=bottom output=/tmp/out.vtk
 paraview --data=/tmp/out.vtk
 </pre></div>
 
-<H3>Spearfish example with RGB data</H3>
+<h3>Spearfish example with RGB data</h3>
 
 <div class="code"><pre>
 #set the region
@@ -111,13 +111,14 @@ r.to.rast3 input=SatLandsatTM_IR1 output=SatLandsatTM_IR1
 r.to.rast3 input=SatLandsatTM_IR2 output=SatLandsatTM_IR2
 
 #export of volume to VTK:
-r3.out.vtk -s rgbmaps=SatLandsatTM_IR1,SatLandsatTM_IR2,SatLandsatTM_Red input=map3d top=elevation.10m bottom=bottom output=/tmp/out.vtk
+r3.out.vtk -s rgbmaps=SatLandsatTM_IR1,SatLandsatTM_IR2,SatLandsatTM_Red
+input=map3d top=elevation.10m bottom=bottom output=/tmp/out.vtk
 
 # visualize in paraview or other VTK viewer:
 paraview --data=/tmp/out.vtk 
 </pre></div>
 
-<H3>Spearfish example with vector data</H3>
+<h3>Spearfish example with vector data</h3>
 
 <div class="code"><pre>
 # set the region
@@ -137,7 +138,8 @@ r3.mapcalc "z_part = sin(depth())"
 
 
 # export the stuff data to VTK:
-r3.out.vtk -s vectormaps=x_part,y_part,z_part input=map3d top=elevation.10m bottom=bottom output=/tmp/out.vtk
+r3.out.vtk -s vectormaps=x_part,y_part,z_part input=map3d top=elevation.10m
+bottom=bottom output=/tmp/out.vtk
 
 # visualize in paraview or other VTK viewer:
 paraview --data=/tmp/out.vtk 
@@ -145,7 +147,7 @@ paraview --data=/tmp/out.vtk
 </pre></div>
 
 
-<H3>Slovakia3d example</H3>
+<h3>Slovakia3d example</h3>
 
 <div class="code"><pre>
 #reduce resolution:
@@ -153,7 +155,8 @@ g.region -dp3 res=1000 res3=1000
 r.mapcalc "bottom = 100"
 
 #export of volume to VTK:
-r3.out.vtk -s in=precip3d.500z50 top=dem500 bottom=bottom out=/tmp/slovakia3d.vtk
+r3.out.vtk -s in=precip3d.500z50 top=dem500 bottom=bottom
+out=/tmp/slovakia3d.vtk
 
 # visualize in paraview or other VTK viewer:
 paraview --data=/tmp/slovakia3d.vtk
@@ -161,14 +164,13 @@ paraview --data=/tmp/slovakia3d.vtk
 # set Actor Control z to 10
 </pre></div>
 
+<h2>SEE ALSO</h2>
 
-<H2>SEE ALSO</H2>
+<em><A HREF="r.out.vtk.html">r.out.vtk</a></em>,
+<em><A HREF="r3.out.ascii.html">r3.out.ascii</a></em>,
+<em><A HREF="g.region.html">g.region</a></em>
 
-<EM><A HREF="r.out.vtk.html">r.out.vtk</A></EM><br>
-<EM><A HREF="r3.out.ascii.html">r3.out.ascii</A></EM><br>
-<EM><A HREF="g.region.html">g.region</A></EM><br>
-
-<H2>AUTHOR</H2>
+<h2>AUTHOR</h2>
 Soeren Gebbert
 
 <p><i>Last changed: $Date$</i>

raster3d/r3.out.vtk/writeVTKData.c

@@ -392,7 +392,7 @@ void write_vtk_rgb_data(void *map_r, void *map_g, void *map_b,
     int typeIntern[3];
     void *maprgb = NULL;
 
-    G_debug(3, _("write_vtk_rgb_data: writing rgb data"));
+    G_debug(3, "write_vtk_rgb_data: Writing RGB data");
 
     rows = region.rows;
     cols = region.cols;
@@ -467,7 +467,7 @@ void write_vtk_vector_data(void *map_x, void *map_y, void *map_z,
     int typeIntern[3];
     void *mapvect = NULL;
 
-    G_debug(3, _("write_vtk_vector_data: writing vector data"));
+    G_debug(3, "write_vtk_vector_data: Writing vector data");
 
     rows = region.rows;
     cols = region.cols;