[GRASS-SVN] r38015 - in grass/trunk: display/d.barscale
display/d.colors display/d.colortable display/d.erase
display/d.extract display/d.font display/d.fontlist
display/d.geodesic display/d.graph display/d.grid
display/d.his display/d.histogram display/d.info
display/d.labels display/d.legend display/d.linegraph
display/d.measure display/d.nviz display/d.path
display/d.profile display/d.rast display/d.rast.arrow
display/d.rast.num display/d.rgb display/d.rhumbline
display/d.text display/d.thematic.area display/d.title
display/d.vect display/d.vect.chart display/d.what.rast
display/d.what.vect display/d.where display/d.zoom
imagery/i.class imagery/i.points imagery/i.vpoints include
lib/display raster/r.digit raster/r.his
raster/r.le/r.le.setup raster/r.le/r.le.trace raster/r.spread
swig/python vector/v.label vector/v.what
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Jun 22 01:09:29 EDT 2009
Author: glynn
Date: 2009-06-22 01:09:28 -0400 (Mon, 22 Jun 2009)
New Revision: 38015
Removed:
grass/trunk/include/display_raster.h
Modified:
grass/trunk/display/d.barscale/draw_scale.c
grass/trunk/display/d.barscale/main.c
grass/trunk/display/d.colors/get_info.c
grass/trunk/display/d.colors/interact.c
grass/trunk/display/d.colors/main.c
grass/trunk/display/d.colortable/main.c
grass/trunk/display/d.erase/main.c
grass/trunk/display/d.extract/extract.c
grass/trunk/display/d.extract/main.c
grass/trunk/display/d.font/main.c
grass/trunk/display/d.fontlist/main.c
grass/trunk/display/d.geodesic/main.c
grass/trunk/display/d.geodesic/plot.c
grass/trunk/display/d.graph/do_graph.c
grass/trunk/display/d.graph/main.c
grass/trunk/display/d.grid/main.c
grass/trunk/display/d.grid/plot.c
grass/trunk/display/d.his/main.c
grass/trunk/display/d.histogram/bar.c
grass/trunk/display/d.histogram/draw_slice.c
grass/trunk/display/d.histogram/main.c
grass/trunk/display/d.histogram/pie.c
grass/trunk/display/d.info/main.c
grass/trunk/display/d.labels/do_labels.c
grass/trunk/display/d.labels/main.c
grass/trunk/display/d.legend/main.c
grass/trunk/display/d.linegraph/main.c
grass/trunk/display/d.measure/draw_line.c
grass/trunk/display/d.measure/main.c
grass/trunk/display/d.measure/msurements.c
grass/trunk/display/d.nviz/main.c
grass/trunk/display/d.path/main.c
grass/trunk/display/d.path/select.c
grass/trunk/display/d.profile/main.c
grass/trunk/display/d.rast.arrow/main.c
grass/trunk/display/d.rast.num/main.c
grass/trunk/display/d.rast/display.c
grass/trunk/display/d.rast/main.c
grass/trunk/display/d.rgb/main.c
grass/trunk/display/d.rhumbline/main.c
grass/trunk/display/d.rhumbline/plot.c
grass/trunk/display/d.text/main.c
grass/trunk/display/d.thematic.area/area.c
grass/trunk/display/d.thematic.area/main.c
grass/trunk/display/d.thematic.area/plot1.c
grass/trunk/display/d.title/main.c
grass/trunk/display/d.vect.chart/bar.c
grass/trunk/display/d.vect.chart/main.c
grass/trunk/display/d.vect.chart/pie.c
grass/trunk/display/d.vect.chart/plot.c
grass/trunk/display/d.vect/area.c
grass/trunk/display/d.vect/attr.c
grass/trunk/display/d.vect/dir.c
grass/trunk/display/d.vect/label.c
grass/trunk/display/d.vect/main.c
grass/trunk/display/d.vect/plot1.c
grass/trunk/display/d.vect/topo.c
grass/trunk/display/d.vect/utils.c
grass/trunk/display/d.vect/zcoor.c
grass/trunk/display/d.what.rast/main.c
grass/trunk/display/d.what.rast/what.c
grass/trunk/display/d.what.vect/main.c
grass/trunk/display/d.what.vect/what.c
grass/trunk/display/d.where/main.c
grass/trunk/display/d.zoom/box.c
grass/trunk/display/d.zoom/center.c
grass/trunk/display/d.zoom/main.c
grass/trunk/display/d.zoom/pan.c
grass/trunk/display/d.zoom/print.c
grass/trunk/display/d.zoom/quit.c
grass/trunk/display/d.zoom/redraw.c
grass/trunk/display/d.zoom/set.c
grass/trunk/display/d.zoom/zoom.c
grass/trunk/imagery/i.class/add_point.c
grass/trunk/imagery/i.class/del_point.c
grass/trunk/imagery/i.class/draw_cell.c
grass/trunk/imagery/i.class/draw_reg.c
grass/trunk/imagery/i.class/graphics.c
grass/trunk/imagery/i.class/histograms.c
grass/trunk/imagery/i.class/input.c
grass/trunk/imagery/i.class/main.c
grass/trunk/imagery/i.class/mouse.c
grass/trunk/imagery/i.class/redisplay.c
grass/trunk/imagery/i.class/title.c
grass/trunk/imagery/i.class/view.c
grass/trunk/imagery/i.class/zoom_box.c
grass/trunk/imagery/i.points/analyze.c
grass/trunk/imagery/i.points/ask.c
grass/trunk/imagery/i.points/ask_mag.c
grass/trunk/imagery/i.points/call.c
grass/trunk/imagery/i.points/debug.c
grass/trunk/imagery/i.points/dot.c
grass/trunk/imagery/i.points/drawcell.c
grass/trunk/imagery/i.points/graphics.c
grass/trunk/imagery/i.points/input.c
grass/trunk/imagery/i.points/main.c
grass/trunk/imagery/i.points/mark.c
grass/trunk/imagery/i.points/mouse.c
grass/trunk/imagery/i.points/points.c
grass/trunk/imagery/i.points/title.c
grass/trunk/imagery/i.points/view.c
grass/trunk/imagery/i.points/zoom_box.c
grass/trunk/imagery/i.points/zoom_pnt.c
grass/trunk/imagery/i.vpoints/analyze.c
grass/trunk/imagery/i.vpoints/ask.c
grass/trunk/imagery/i.vpoints/ask_mag.c
grass/trunk/imagery/i.vpoints/call.c
grass/trunk/imagery/i.vpoints/debug.c
grass/trunk/imagery/i.vpoints/dot.c
grass/trunk/imagery/i.vpoints/drawcell.c
grass/trunk/imagery/i.vpoints/drawvect.c
grass/trunk/imagery/i.vpoints/graphics.c
grass/trunk/imagery/i.vpoints/input.c
grass/trunk/imagery/i.vpoints/main.c
grass/trunk/imagery/i.vpoints/mark.c
grass/trunk/imagery/i.vpoints/mouse.c
grass/trunk/imagery/i.vpoints/points.c
grass/trunk/imagery/i.vpoints/setup.c
grass/trunk/imagery/i.vpoints/title.c
grass/trunk/imagery/i.vpoints/view.c
grass/trunk/imagery/i.vpoints/zoom_box.c
grass/trunk/imagery/i.vpoints/zoom_pnt.c
grass/trunk/include/display.h
grass/trunk/lib/display/clip.c
grass/trunk/lib/display/draw2.c
grass/trunk/lib/display/r_raster.c
grass/trunk/lib/display/raster.c
grass/trunk/lib/display/raster2.c
grass/trunk/lib/display/setup.c
grass/trunk/lib/display/tran_colr.c
grass/trunk/lib/display/window.c
grass/trunk/raster/r.digit/bnw_line.c
grass/trunk/raster/r.digit/get_area.c
grass/trunk/raster/r.digit/get_circle.c
grass/trunk/raster/r.digit/get_label.c
grass/trunk/raster/r.digit/get_line.c
grass/trunk/raster/r.digit/get_point.c
grass/trunk/raster/r.digit/main.c
grass/trunk/raster/r.his/main.c
grass/trunk/raster/r.le/r.le.setup/main.c
grass/trunk/raster/r.le/r.le.setup/mv_wind.c
grass/trunk/raster/r.le/r.le.setup/sample.c
grass/trunk/raster/r.le/r.le.setup/setup.c
grass/trunk/raster/r.le/r.le.trace/main.c
grass/trunk/raster/r.spread/display.c
grass/trunk/swig/python/Makefile
grass/trunk/vector/v.label/main.c
grass/trunk/vector/v.what/main.c
grass/trunk/vector/v.what/what.c
Log:
Remove display_raster.h; merged with display.h
Remove unused R__* functions
Rename remaining R_* functions to D_*
Modified: grass/trunk/display/d.barscale/draw_scale.c
===================================================================
--- grass/trunk/display/d.barscale/draw_scale.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.barscale/draw_scale.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -6,7 +6,6 @@
#include <string.h>
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include "options.h"
#define NUMSCALES 16
@@ -74,7 +73,7 @@
/* Establish text size */
size = 14;
- R_text_size(size, size);
+ D_text_size(size, size);
D_setup_unity(0);
D_get_src(&t, &b, &l, &r);
@@ -117,7 +116,7 @@
/* actual text width is 81% of size? from d.legend */
D_pos_abs(pl + w / 2 - 7 * .81, pt + 14);
- R_text("N");
+ D_text("N");
return 0;
}
@@ -248,11 +247,11 @@
D_pos_abs(x_pos + 25 - draw * 10 + line_len / 2.
- strlen(scales[incr].name) * size * 0.81 / 2,
y_pos);
- R_text(scales[incr].name);
+ D_text(scales[incr].name);
}
else {
D_pos_abs(x_pos + 35 - draw * 10 + line_len, y_pos + 20);
- R_text(scales[incr].name);
+ D_text(scales[incr].name);
}
return (0);
Modified: grass/trunk/display/d.barscale/main.c
===================================================================
--- grass/trunk/display/d.barscale/main.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.barscale/main.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -26,7 +26,6 @@
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include "options.h"
#include <grass/glocale.h>
@@ -115,7 +114,7 @@
sscanf(opt3->answers[1], "%lf", &north);
- if (R_open_driver() != 0)
+ if (D_open_driver() != 0)
G_fatal_error(_("No graphics device selected"));
D_setup(0);
@@ -131,7 +130,7 @@
/* Draw the scale */
draw_scale(top->answer);
- R_close_driver();
+ D_close_driver();
exit(EXIT_SUCCESS);
}
Modified: grass/trunk/display/d.colors/get_info.c
===================================================================
--- grass/trunk/display/d.colors/get_info.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.colors/get_info.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -2,7 +2,6 @@
#include <stdio.h>
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include <grass/colors.h>
#include "colors.h"
Modified: grass/trunk/display/d.colors/interact.c
===================================================================
--- grass/trunk/display/d.colors/interact.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.colors/interact.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -1,7 +1,6 @@
#include <unistd.h>
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include "graphics.h"
#include "colors.h"
Modified: grass/trunk/display/d.colors/main.c
===================================================================
--- grass/trunk/display/d.colors/main.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.colors/main.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -20,7 +20,6 @@
#include <grass/gis.h>
#include <grass/glocale.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include "colors.h"
int main(int argc, char **argv)
Modified: grass/trunk/display/d.colortable/main.c
===================================================================
--- grass/trunk/display/d.colortable/main.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.colortable/main.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -25,7 +25,6 @@
#include <grass/display.h>
#include <grass/gis.h>
#include <grass/raster.h>
-#include <grass/display_raster.h>
#include <grass/glocale.h>
int main(int argc, char **argv)
@@ -133,7 +132,7 @@
G_fatal_error(_("Color file for <%s> not available"), map_name);
if (Rast_read_fp_range(map_name, "", &fp_range) == -1)
G_fatal_error(_("Range file for <%s> not available"), map_name);
- if (R_open_driver() != 0)
+ if (D_open_driver() != 0)
G_fatal_error(_("No graphics device selected"));
D_setup_unity(0);
@@ -261,7 +260,7 @@
}
}
- R_close_driver();
+ D_close_driver();
return 0;
}
Modified: grass/trunk/display/d.erase/main.c
===================================================================
--- grass/trunk/display/d.erase/main.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.erase/main.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -15,7 +15,6 @@
#include <stdlib.h>
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include <grass/glocale.h>
int main(int argc, char *argv[])
@@ -47,7 +46,7 @@
if (G_parser(argc, argv))
exit(1);
- if (R_open_driver() != 0)
+ if (D_open_driver() != 0)
G_fatal_error(_("No graphics device selected"));
D_setup_unity(0);
@@ -55,9 +54,9 @@
D_erase(color->answer);
if (eraseframe->answer)
- R_erase();
+ D__erase();
- R_close_driver();
+ D_close_driver();
exit(0);
}
Modified: grass/trunk/display/d.extract/extract.c
===================================================================
--- grass/trunk/display/d.extract/extract.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.extract/extract.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -4,7 +4,6 @@
#include <math.h>
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include <grass/colors.h>
#include <grass/Vect.h>
#include <grass/glocale.h>
Modified: grass/trunk/display/d.extract/main.c
===================================================================
--- grass/trunk/display/d.extract/main.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.extract/main.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -20,7 +20,6 @@
#include <string.h>
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include <grass/colors.h>
#include <grass/Vect.h>
#include <grass/dbmi.h>
Modified: grass/trunk/display/d.font/main.c
===================================================================
--- grass/trunk/display/d.font/main.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.font/main.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -24,7 +24,6 @@
#include <errno.h>
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include <grass/glocale.h>
static char **fonts;
@@ -82,18 +81,18 @@
exit(EXIT_FAILURE);
/* load the font */
- if (R_open_driver() != 0)
+ if (D_open_driver() != 0)
G_fatal_error(_("No graphics device selected"));
if (flag1->answer) { /* List font names */
print_font_list(stdout, 0);
- R_close_driver();
+ D_close_driver();
exit(EXIT_SUCCESS);
}
if (flag2->answer) { /* List fonts verbosely */
print_font_list(stdout, 1);
- R_close_driver();
+ D_close_driver();
exit(EXIT_SUCCESS);
}
@@ -108,7 +107,7 @@
if (!S_ISREG(info.st_mode))
G_fatal_error(_("Font path %s is not a file"), opt2->answer);
else
- R_font(opt2->answer);
+ D_font(opt2->answer);
}
else if (opt1->answer) { /* Font name from fontcap */
int i = 0;
@@ -117,7 +116,7 @@
read_freetype_fonts(0);
while (i < num_fonts) {
if (strcmp(opt1->answer, fonts[i]) == 0) {
- R_font(opt1->answer);
+ D_font(opt1->answer);
break;
}
i++;
@@ -128,10 +127,10 @@
}
if (opt3->answer) /* Set character encoding */
- R_encoding(opt3->answer);
+ D_encoding(opt3->answer);
/* add this command to the list */
- R_close_driver();
+ D_close_driver();
exit(EXIT_SUCCESS);
}
@@ -143,9 +142,9 @@
int i;
if (verbose)
- R_font_info(&list, &count);
+ D_font_info(&list, &count);
else
- R_font_list(&list, &count);
+ D_font_list(&list, &count);
if (max_fonts < num_fonts + count) {
max_fonts = num_fonts + count;
Modified: grass/trunk/display/d.fontlist/main.c
===================================================================
--- grass/trunk/display/d.fontlist/main.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.fontlist/main.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -21,7 +21,7 @@
#include <stdlib.h>
#include <string.h>
#include <grass/gis.h>
-#include <grass/display_raster.h>
+#include <grass/display.h>
#include <grass/glocale.h>
int main(int argc, char **argv)
@@ -49,18 +49,18 @@
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
- if (R_open_driver() != 0)
+ if (D_open_driver() != 0)
G_fatal_error(_("No graphics device selected"));
if (flagL->answer)
- R_font_info(&list, &count);
+ D_font_info(&list, &count);
else
- R_font_list(&list, &count);
+ D_font_list(&list, &count);
for (i = 0; i < count; i++)
fprintf(stdout, "%s\n", list[i]);
- R_close_driver();
+ D_close_driver();
exit(EXIT_SUCCESS);
}
Modified: grass/trunk/display/d.geodesic/main.c
===================================================================
--- grass/trunk/display/d.geodesic/main.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.geodesic/main.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -22,7 +22,6 @@
#include <string.h>
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include <grass/glocale.h>
#include "local_proto.h"
@@ -92,7 +91,7 @@
G_fatal_error(_("%s - illegal longitude"), parm.coor->answers[3]);
- if (R_open_driver() != 0)
+ if (D_open_driver() != 0)
G_fatal_error(_("No graphics device selected"));
line_color = D_translate_color(parm.lcolor->answer);
@@ -114,7 +113,7 @@
plot(lon1, lat1, lon2, lat2, line_color, text_color);
- R_close_driver();
+ D_close_driver();
exit(EXIT_SUCCESS);
}
Modified: grass/trunk/display/d.geodesic/plot.c
===================================================================
--- grass/trunk/display/d.geodesic/plot.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.geodesic/plot.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -1,6 +1,5 @@
#include <string.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include <grass/gis.h>
#include <stdio.h>
#include "local_proto.h"
@@ -56,7 +55,7 @@
double t, b, l, r;
char buf[100];
- R_text_size(10, 10);
+ D_text_size(10, 10);
distance = G_geodesic_distance(lon1, lat1, lon2, lat2);
sprintf(buf, "%.0f miles", METERS_TO_MILES(distance));
@@ -76,6 +75,6 @@
D_use_color(text_color);
D_pos_abs(text_x, text_y);
- R_text(buf);
+ D_text(buf);
}
}
Modified: grass/trunk/display/d.graph/do_graph.c
===================================================================
--- grass/trunk/display/d.graph/do_graph.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.graph/do_graph.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -3,7 +3,6 @@
#include <grass/gis.h>
#include <grass/raster.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include <grass/symbol.h>
#include <grass/glocale.h>
@@ -50,7 +49,7 @@
int set_text_size(void)
{
if (hsize >= 0. && vsize >= 0. && hsize <= 100. && vsize <= 100.) {
- R_text_size(hsize * xincr, vsize * yincr);
+ D_text_size(hsize * xincr, vsize * yincr);
G_debug(3, "text size initialized to [%.1f,%.1f]",
hsize * xincr, vsize * yincr);
}
@@ -203,7 +202,7 @@
if (xper < 0. || yper < 0. || xper > 100. || yper > 100.)
return (-1);
- R_text_size(xper * xincr, yper * yincr);
+ D_text_size(xper * xincr, yper * yincr);
G_debug(3, "text size set to [%.1f,%.1f]",
xper * xincr, yper * yincr);
@@ -217,7 +216,7 @@
return (-1);
}
- R_text_rotation(rotation);
+ D_text_rotation(rotation);
G_debug(3, "rotation set to %.1f degrees", rotation);
return (0);
@@ -232,7 +231,7 @@
;
for (; *ptr == ' '; ptr++)
;
- R_text(ptr);
+ D_text(ptr);
return 0;
}
Modified: grass/trunk/display/d.graph/main.c
===================================================================
--- grass/trunk/display/d.graph/main.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.graph/main.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -33,7 +33,6 @@
#include <grass/gis.h>
#include <grass/raster.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include <grass/glocale.h>
#include "options.h"
@@ -96,7 +95,7 @@
infile = stdin;
/* open graphics window */
- if (R_open_driver() != 0)
+ if (D_open_driver() != 0)
G_fatal_error(_("No graphics device selected"));
/* Parse and select color */
@@ -128,7 +127,7 @@
set_text_size();
graphics(infile);
- R_close_driver();
+ D_close_driver();
exit(EXIT_SUCCESS);
}
Modified: grass/trunk/display/d.grid/main.c
===================================================================
--- grass/trunk/display/d.grid/main.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.grid/main.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -23,7 +23,6 @@
#include <grass/gis.h>
#include <grass/raster.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include <grass/gprojects.h>
#include <grass/glocale.h>
@@ -207,7 +206,7 @@
}
/* Setup driver and check important information */
- if (R_open_driver() != 0)
+ if (D_open_driver() != 0)
G_fatal_error(_("No graphics device selected"));
@@ -245,7 +244,7 @@
plot_border(size, east, north);
}
- R_close_driver();
+ D_close_driver();
exit(EXIT_SUCCESS);
}
Modified: grass/trunk/display/d.grid/plot.c
===================================================================
--- grass/trunk/display/d.grid/plot.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.grid/plot.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -4,7 +4,6 @@
#include <grass/gis.h>
#include <grass/raster.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include <grass/gprojects.h>
#include <grass/glocale.h>
@@ -45,8 +44,8 @@
if (do_text) {
D_use_color(tcolor);
G_format_easting(x, text, G_projection());
- R_text_rotation(270.0);
- R_text_size(fontsize, fontsize);
+ D_text_rotation(270.0);
+ D_text_size(fontsize, fontsize);
/* Positioning -
x: 4 pixels to the right of the grid line, + 0.5 rounding factor.
@@ -57,11 +56,11 @@
D_get_u_south()
- D_get_d_to_u_yconv() * (strlen(text) * fontsize * 0.81) - 7.5);
- R_text(text);
+ D_text(text);
}
x += grid_size;
}
- R_text_rotation(0.0); /* reset */
+ D_text_rotation(0.0); /* reset */
/* Draw horizontal grids
@@ -89,7 +88,7 @@
if (do_text) {
D_use_color(tcolor);
G_format_northing(y, text, G_projection());
- R_text_size(fontsize, fontsize);
+ D_text_size(fontsize, fontsize);
/* Positioning -
x: End of text is 7 pixels left from right edge of screen, +.5 rounding.
@@ -101,7 +100,7 @@
- D_get_d_to_u_xconv() * (strlen(text) * fontsize * 0.81 - 7.5),
y + D_get_d_to_u_yconv() * 4.5);
- R_text(text);
+ D_text(text);
}
y += grid_size;
}
@@ -209,11 +208,11 @@
D_use_color(tcolor);
G_format_northing(g, text, PROJECTION_LL);
- R_text_rotation(font_angle);
- R_text_size(fontsize, fontsize);
+ D_text_rotation(font_angle);
+ D_text_size(fontsize, fontsize);
D_pos_abs(D_get_u_west() + D_get_d_to_u_xconv() * border_off,
start_coord - D_get_d_to_u_yconv() * grid_off);
- R_text(text);
+ D_text(text);
}
}
@@ -261,15 +260,15 @@
D_use_color(tcolor);
G_format_easting(g, text, PROJECTION_LL);
- R_text_rotation(font_angle);
- R_text_size(fontsize, fontsize);
+ D_text_rotation(font_angle);
+ D_text_size(fontsize, fontsize);
D_pos_abs(start_coord + D_get_d_to_u_xconv() * (grid_off + 1.5),
D_get_u_north() + D_get_d_to_u_yconv() * border_off);
- R_text(text);
+ D_text(text);
}
}
- R_text_rotation(0.0); /* reset */
+ D_text_rotation(0.0); /* reset */
return 0;
Modified: grass/trunk/display/d.his/main.c
===================================================================
--- grass/trunk/display/d.his/main.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.his/main.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -25,7 +25,6 @@
#include <grass/gis.h>
#include <grass/raster.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include <grass/glocale.h>
#include "his.h"
@@ -111,7 +110,7 @@
/* Do screen initializing stuff */
- if (R_open_driver() != 0)
+ if (D_open_driver() != 0)
G_fatal_error(_("No graphics device selected"));
/* Prepare the raster cell drawing functions */
@@ -244,7 +243,7 @@
D_cell_draw_end();
/* Close down connection to display driver */
- R_close_driver();
+ D_close_driver();
/* Close the raster maps */
Rast_close_cell(hue_file);
Modified: grass/trunk/display/d.histogram/bar.c
===================================================================
--- grass/trunk/display/d.histogram/bar.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.histogram/bar.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -30,7 +30,6 @@
#include <grass/raster.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include "bar.h"
@@ -317,17 +316,17 @@
sprintf(txt, "%d", (int)(i / tic_unit));
text_height = (b - t) * TEXT_HEIGHT;
text_width = (r - l) * TEXT_WIDTH;
- R_text_size(text_width, text_height);
+ D_text_size(text_width, text_height);
D_get_text_box(txt, &tt, &tb, &tl, &tr);
while ((tr - tl) > XTIC_DIST) {
text_width *= 0.75;
text_height *= 0.75;
- R_text_size(text_width, text_height);
+ D_text_size(text_width, text_height);
D_get_text_box(txt, &tt, &tb, &tl, &tr);
}
D_pos_abs(xoffset + (i - dist_stats->mincat) * xscale - 0.5 * xscale - (tr - tl) / 2,
b - XNUMS_Y * (b - t));
- R_text(txt);
+ D_text(txt);
}
else if (rem(i, tic_unit) == 0.0) {
/* draw a tic-mark */
@@ -348,12 +347,12 @@
sprintf(xlabel, "X-AXIS: Cell Values");
text_height = (b - t) * TEXT_HEIGHT;
text_width = (r - l) * TEXT_WIDTH;
- R_text_size(text_width, text_height);
+ D_text_size(text_width, text_height);
D_get_text_box(xlabel, &tt, &tb, &tl, &tr);
D_pos_abs(l + (r - l) / 2 - (tr - tl) / 2,
b - LABEL_1 * (b - t));
D_use_color(color);
- R_text(xlabel);
+ D_text(xlabel);
/* DRAW Y-AXIS TIC-MARKS AND NUMBERS
*
@@ -393,17 +392,17 @@
sprintf(txt, "%d", (int)(i / tic_unit));
text_height = (b - t) * TEXT_HEIGHT;
text_width = (r - l) * TEXT_WIDTH;
- R_text_size(text_width, text_height);
+ D_text_size(text_width, text_height);
D_get_text_box(txt, &tt, &tb, &tl, &tr);
while ((tt - tb) > YTIC_DIST) {
text_width *= 0.75;
text_height *= 0.75;
- R_text_size(text_width, text_height);
+ D_text_size(text_width, text_height);
D_get_text_box(txt, &tt, &tb, &tl, &tr);
}
D_pos_abs(l + (r - l) * YNUMS_X - (tr - tl) / 2,
yoffset - (yscale * i + 0.5 * (tt - tb)));
- R_text(txt);
+ D_text(txt);
}
else if (rem(i, tic_unit) == 0.0) {
/* draw a tic-mark */
@@ -431,12 +430,12 @@
text_height = (b - t) * TEXT_HEIGHT;
text_width = (r - l) * TEXT_WIDTH;
- R_text_size(text_width, text_height);
+ D_text_size(text_width, text_height);
D_get_text_box(ylabel, &tt, &tb, &tl, &tr);
D_pos_abs(l + (r - l) / 2 - (tr - tl) / 2,
b - LABEL_2 * (b - t));
D_use_color(color);
- R_text(ylabel);
+ D_text(ylabel);
/* draw x and y axis lines */
D_use_color(color);
Modified: grass/trunk/display/d.histogram/draw_slice.c
===================================================================
--- grass/trunk/display/d.histogram/draw_slice.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.histogram/draw_slice.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -1,5 +1,4 @@
#include <math.h>
-#include <grass/display_raster.h>
#include <grass/display.h>
#include <grass/gis.h>
#include <grass/raster.h>
@@ -80,7 +79,7 @@
ly = y[0] - (r + 0.03) * (height) * sin(arc / 57.296) + (tb - tt) / 2;
D_pos_abs(lx, ly);
D_use_color(txt_color);
- R_text(txt);
+ D_text(txt);
}
return 0;
Modified: grass/trunk/display/d.histogram/main.c
===================================================================
--- grass/trunk/display/d.histogram/main.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.histogram/main.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -36,7 +36,6 @@
#include <grass/gis.h>
#include <grass/raster.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include <grass/glocale.h>
#include "options.h"
@@ -185,7 +184,7 @@
/* set up the graphics driver and initialize its color-table */
- if (R_open_driver() != 0)
+ if (D_open_driver() != 0)
G_fatal_error(_("No graphics device selected"));
D_setup_unity(0); /* 0 = don't clear frame */
@@ -199,12 +198,12 @@
sprintf(title, "%s", map_name);
text_height = (b - t) * 0.05;
text_width = (r - l) * 0.05 * 0.50;
- R_text_size(text_width, text_height);
+ D_text_size(text_width, text_height);
D_get_text_box(title, &tt, &tb, &tl, &tr);
D_pos_abs(l + (r - l) / 2 - (tr - tl) / 2,
t + (b - t) * 0.07);
D_use_color(color);
- R_text(title);
+ D_text(title);
/* plot the distributrion statistics */
if (style == PIE)
@@ -212,7 +211,7 @@
else
bar(&dist_stats, &pcolors);
- R_close_driver();
+ D_close_driver();
exit(EXIT_SUCCESS);
}
Modified: grass/trunk/display/d.histogram/pie.c
===================================================================
--- grass/trunk/display/d.histogram/pie.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.histogram/pie.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -32,7 +32,6 @@
#include <grass/raster.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include "pie.h"
@@ -150,7 +149,7 @@
for (i = dist_stats->mincat; i <= dist_stats->maxcat; i++) {
text_height = height * 0.7 * TEXT_HEIGHT;
text_width = width * 0.7 * TEXT_WIDTH;
- R_text_size(text_width, text_height);
+ D_text_size(text_width, text_height);
draw = NO;
/* figure color and height of the slice of pie
*
@@ -346,12 +345,12 @@
sprintf(txt, "%d", (int)(i / tic_unit));
text_height = height * TEXT_HEIGHT;
text_width = width * TEXT_WIDTH;
- R_text_size(text_width, text_height);
+ D_text_size(text_width, text_height);
D_get_text_box(txt, &tt, &tb, &tl, &tr);
while ((tr - tl) > XTIC_DIST) {
text_width *= 0.95;
text_height *= 0.95;
- R_text_size(text_width, text_height);
+ D_text_size(text_width, text_height);
D_get_text_box(txt, &tt, &tb, &tl, &tr);
}
D_pos_abs(xoffset
@@ -359,7 +358,7 @@
- 0.5 * xscale
- (tr - tl) / 2,
b - XNUMS_Y * height);
- R_text(txt);
+ D_text(txt);
}
else if (rem(i, tic_unit) == 0.0) {
/* draw a tic-mark */
@@ -390,12 +389,12 @@
sprintf(xlabel, "Cell Values");
text_height = height * TEXT_HEIGHT;
text_width = width * TEXT_WIDTH;
- R_text_size(text_width, text_height);
+ D_text_size(text_width, text_height);
D_get_text_box(xlabel, &tt, &tb, &tl, &tr);
D_pos_abs(l + width / 2 - (tr - tl) / 2,
b - LABEL * height);
D_use_color(color);
- R_text(xlabel);
+ D_text(xlabel);
return 0;
}
Modified: grass/trunk/display/d.info/main.c
===================================================================
--- grass/trunk/display/d.info/main.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.info/main.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -15,7 +15,6 @@
#include <stdlib.h>
#include <stdio.h>
#include <grass/gis.h>
-#include <grass/display_raster.h>
#include <grass/display.h>
#include <grass/glocale.h>
@@ -64,12 +63,12 @@
exit(EXIT_FAILURE);
}
- if (R_open_driver() != 0)
+ if (D_open_driver() != 0)
G_fatal_error(_("No graphics device selected"));
if (rflag->answer || dflag->answer || fflag->answer)
- R_get_window(&t, &b, &l, &r);
+ D_get_window(&t, &b, &l, &r);
if (rflag->answer)
@@ -109,7 +108,7 @@
fprintf(stdout, "nsres=%.15g\n", (n-s)/(b-t) );
}
- R_close_driver();
+ D_close_driver();
return EXIT_SUCCESS;
}
Modified: grass/trunk/display/d.labels/do_labels.c
===================================================================
--- grass/trunk/display/d.labels/do_labels.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.labels/do_labels.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -5,7 +5,6 @@
#include <grass/gis.h>
#include <grass/raster.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include <grass/glocale.h>
#include "local_proto.h"
@@ -185,7 +184,7 @@
Y0 = north;
/* Set font */
- R_font(font);
+ D_font(font);
/* Set text size */
if (fontsize) {
@@ -199,7 +198,7 @@
line_size = text_size * 1.2;
- R_text_size(d_text_size, d_text_size);
+ D_text_size(d_text_size, d_text_size);
/* Find extent of all text (assume ref point is upper left) */
T = -1e300;
@@ -238,7 +237,7 @@
Y = north - (line_size * 1.2) - ((n_lines - 1) * line_size);
D_pos_abs(X, Y);
- R_text_rotation(0.0); /* reset */
+ D_text_rotation(0.0); /* reset */
D_get_text_box(line, &t, &b, &l, &r);
if (T < t)
@@ -339,7 +338,7 @@
}
/* Set font rotation */
- R_text_rotation(rotation);
+ D_text_rotation(rotation);
G_debug(3, " rotation = %.2f", rotation);
/**** draw highlighted text background ****/
@@ -373,22 +372,22 @@
for (j = 1; j <= highlight_width; j++) {
/* smear it around. probably a better way (knight's move? rand?) */
D_pos_abs(text_x + Xoffset, text_y + Yoffset + j);
- R_text(line);
+ D_text(line);
D_pos_abs(text_x + Xoffset, text_y + Yoffset - j);
- R_text(line);
+ D_text(line);
D_pos_abs(text_x + Xoffset + j, text_y + Yoffset);
- R_text(line);
+ D_text(line);
D_pos_abs(text_x + Xoffset - j, text_y + Yoffset);
- R_text(line);
+ D_text(line);
D_pos_abs(text_x + Xoffset + j, text_y + Yoffset + j);
- R_text(line);
+ D_text(line);
D_pos_abs(text_x + Xoffset - j, text_y + Yoffset - j);
- R_text(line);
+ D_text(line);
D_pos_abs(text_x + Xoffset + j, text_y + Yoffset - j);
- R_text(line);
+ D_text(line);
D_pos_abs(text_x + Xoffset - j, text_y + Yoffset + j);
- R_text(line);
+ D_text(line);
}
if ((*tptr == '\0') || (*tptr == NL))
@@ -427,7 +426,7 @@
G_rotate_around_point(X, Y0, &text_x, &text_y, -1 * rotation);
D_pos_abs(text_x + Xoffset, text_y + Yoffset);
- R_text(line);
+ D_text(line);
if ((*tptr == '\0') || (*tptr == NL))
break;
Modified: grass/trunk/display/d.labels/main.c
===================================================================
--- grass/trunk/display/d.labels/main.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.labels/main.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -21,7 +21,6 @@
#include <grass/gis.h>
#include <grass/raster.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include "local_proto.h"
#include <grass/glocale.h>
@@ -96,7 +95,7 @@
minreg = atof(minreg_opt->answer);
if (reg < minreg) {
G_warning(_("Region size is lower than minreg, nothing displayed."));
- R_close_driver();
+ D_close_driver();
exit(0);
}
}
@@ -104,7 +103,7 @@
maxreg = atof(maxreg_opt->answer);
if (reg > maxreg) {
G_warning(_("Region size is greater than maxreg, nothing displayed."));
- R_close_driver();
+ D_close_driver();
exit(0);
}
}
@@ -114,7 +113,7 @@
if (infile == NULL)
G_fatal_error(_("Unable to open label file <%s>"), label_name);
- if (R_open_driver() != 0)
+ if (D_open_driver() != 0)
G_fatal_error(_("No graphics device selected"));
D_setup(0);
@@ -122,7 +121,7 @@
/* Go draw the raster map */
do_labels(infile, !horiz_flag->answer);
- R_close_driver();
+ D_close_driver();
exit(0);
}
Modified: grass/trunk/display/d.legend/main.c
===================================================================
--- grass/trunk/display/d.legend/main.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.legend/main.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -30,7 +30,6 @@
#include <math.h>
#include <grass/gis.h>
#include <grass/raster.h>
-#include <grass/display_raster.h>
#include <grass/display.h>
#include <grass/glocale.h>
#include "local_proto.h"
@@ -259,7 +258,7 @@
Rast_set_c_null_value(&null_cell, 1);
- if (R_open_driver() != 0)
+ if (D_open_driver() != 0)
G_fatal_error(_("No graphics device selected"));
white = D_translate_color(DEFAULT_FG_COLOR);
@@ -464,7 +463,7 @@
y0 = ((b - t) - (dots_per_line * lines)) / 2;
}
- /* R_text_size((int)(dots_per_line*4/5), (int)(dots_per_line*4/5)) ; redundant */
+ /* D_text_size((int)(dots_per_line*4/5), (int)(dots_per_line*4/5)) ; redundant */
/* if(Rast_is_c_null_value(&min_ind) && Rast_is_c_null_value(&max_ind))
{
min_ind = 1;
@@ -656,7 +655,7 @@
if (txsiz < 0)
txsiz = 0; /* keep it sane */
- R_text_size(txsiz, txsiz);
+ D_text_size(txsiz, txsiz);
D_use_color(color);
ppl = (lleg) / (steps - 1);
@@ -671,7 +670,7 @@
}
else {
/* text width is 0.81 of text height? so even though we set width
- to txsiz with R_text_size(), we still have to reduce.. hmmm */
+ to txsiz with D_text_size(), we still have to reduce.. hmmm */
if (!k) /* first */
D_pos_abs(x0 - (strlen(buff) * txsiz * .81 / 2),
y1 + 4 + txsiz);
@@ -684,7 +683,7 @@
y1 + 4 + txsiz);
}
- R_text(buff);
+ D_text(buff);
} /*for */
@@ -751,7 +750,7 @@
if (dots_per_line < txsiz)
txsiz = dots_per_line;
- R_text_size(txsiz, txsiz);
+ D_text_size(txsiz, txsiz);
/* Set up box arrays */
@@ -863,7 +862,7 @@
}
D_pos_abs((l + 3 + dots_per_line), (cur_dot_row) - 3);
- R_text(buff);
+ D_text(buff);
}
if (0 == k)
@@ -881,14 +880,14 @@
ScaleFactor = ((true_r - true_l) / (MaxLabelLen * txsiz * 0.81)); /* ?? txsiz*.81=actual text width. */
if (ScaleFactor < 1.0) {
txsiz = (int)floor(txsiz * ScaleFactor);
- R_text_size(txsiz, txsiz);
+ D_text_size(txsiz, txsiz);
}
D_use_color(white);
D_pos_abs((l + 3 + dots_per_line), (cur_dot_row));
- R_text(buff);
+ D_text(buff);
}
}
- R_close_driver();
+ D_close_driver();
exit(EXIT_SUCCESS);
}
Modified: grass/trunk/display/d.linegraph/main.c
===================================================================
--- grass/trunk/display/d.linegraph/main.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.linegraph/main.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -33,7 +33,6 @@
#include <stdlib.h>
#include <math.h>
#include <grass/gis.h>
-#include <grass/display_raster.h>
#include <grass/display.h>
#include <grass/colors.h>
#include <grass/glocale.h>
@@ -254,7 +253,7 @@
}
/* get coordinates of current screen window, in pixels */
- if (R_open_driver() != 0)
+ if (D_open_driver() != 0)
G_fatal_error(_("No graphics device selected"));
D_setup_unity(0);
D_get_src(&t, &b, &l, &r);
@@ -268,7 +267,7 @@
y_line[1] = y_line[2] = b - (ORIGIN_Y * height);
text_height = (b - t) * TEXT_HEIGHT;
text_width = (r - l) * TEXT_WIDTH;
- R_text_size(text_width, text_height);
+ D_text_size(text_width, text_height);
/* read thru each data file in turn, find max and min values for
each, count lines, find x min and max, find overall y min and
@@ -340,7 +339,7 @@
for (i = 0; i <= num_y_files; i++) {
if ((in[i].fp = fopen(in[i].full_name, "r")) == NULL) {
- R_close_driver();
+ D_close_driver();
G_fatal_error(_("Unable to open input file <%s>"), in[i].full_name);
}
}
@@ -359,7 +358,7 @@
/* didn't find a number or hit EOF before our time */
if ((err != 1) || (err == EOF)) {
- R_close_driver();
+ D_close_driver();
G_fatal_error(_("Problem reading X data file at line %d"), line);
}
@@ -369,7 +368,7 @@
if (line < in[i].num_pnts) {
err = fscanf(in[i].fp, "%f", &in[i].value);
if ((in[i].num_pnts >= line) && (err != 1)) {
- R_close_driver();
+ D_close_driver();
G_fatal_error(_("Problem reading <%s> data file at line %d"),
in[i].name, line);
}
@@ -432,17 +431,17 @@
sprintf(txt, "%.2f", (in[0].value));
text_height = (b - t) * TEXT_HEIGHT;
text_width = (r - l) * TEXT_WIDTH;
- R_text_size(text_width, text_height);
+ D_text_size(text_width, text_height);
D_get_text_box(txt, &tt, &tb, &tl, &tr);
while ((tr - tl) > XTIC_DIST) {
text_width *= 0.75;
text_height *= 0.75;
- R_text_size(text_width, text_height);
+ D_text_size(text_width, text_height);
D_get_text_box(txt, &tt, &tb, &tl, &tr);
}
D_pos_abs((xoffset + (line * xscale - (tr - tl) / 2)),
(b - XNUMS_Y * (b - t)));
- R_text(txt);
+ D_text(txt);
}
else if (rem(line, tic_unit) == 0.0) {
@@ -470,12 +469,12 @@
sprintf(xlabel, "X: %s %s", title[0]->answer, tic_name);
text_height = (b - t) * TEXT_HEIGHT;
text_width = (r - l) * TEXT_WIDTH * 1.5;
- R_text_size(text_width, text_height);
+ D_text_size(text_width, text_height);
D_get_text_box(xlabel, &tt, &tb, &tl, &tr);
D_pos_abs((l + (r - l) / 2 - (tr - tl) / 2),
(b - LABEL_1 * (b - t)));
D_use_color(title_color);
- R_text(xlabel);
+ D_text(xlabel);
/* DRAW Y-AXIS TIC-MARKS AND NUMBERS
first, figure tic_every and tic_units for the x-axis of the bar-chart.
@@ -514,17 +513,17 @@
sprintf(txt, "%d", (i / tic_unit));
text_height = (b - t) * TEXT_HEIGHT;
text_width = (r - l) * TEXT_WIDTH;
- R_text_size(text_width, text_height);
+ D_text_size(text_width, text_height);
D_get_text_box(txt, &tt, &tb, &tl, &tr);
while ((tt - tb) > YTIC_DIST) {
text_width *= 0.75;
text_height *= 0.75;
- R_text_size(text_width, text_height);
+ D_text_size(text_width, text_height);
D_get_text_box(txt, &tt, &tb, &tl, &tr);
}
D_pos_abs(l + (r - l) * YNUMS_X - (tr - tl) / 2,
yoffset - (yscale * (i - min_y) + 0.5 * (tt - tb)));
- R_text(txt);
+ D_text(txt);
}
else if (rem(i, tic_unit) == 0.0) {
/* draw a tic-mark */
@@ -543,31 +542,31 @@
sprintf(xlabel, "Y: %s %s", title[1]->answer, tic_name);
text_height = (b - t) * TEXT_HEIGHT;
text_width = (r - l) * TEXT_WIDTH * 1.5;
- R_text_size(text_width, text_height);
+ D_text_size(text_width, text_height);
D_get_text_box(xlabel, &tt, &tb, &tl, &tr);
D_pos_abs(l + (r - l) / 2 - (tr - tl) / 2, b - LABEL_2 * (b - t));
D_use_color(title_color);
- R_text(xlabel);
+ D_text(xlabel);
/* top label */
sprintf(xlabel, title[2]->answer);
text_height = (b - t) * TEXT_HEIGHT;
text_width = (r - l) * TEXT_WIDTH * 2.0;
- R_text_size(text_width, text_height);
+ D_text_size(text_width, text_height);
D_get_text_box(xlabel, &tt, &tb, &tl, &tr);
/*
- R_move_abs((int)(((r-l)/2)-(tr-tl)/2),
+ D_move_abs((int)(((r-l)/2)-(tr-tl)/2),
(int) (t+ (b-t)*.07) );
*/
D_pos_abs(l + (r - l) / 2 - (tr - tl) / 2, t + (b - t) * .07);
D_use_color(title_color);
- R_text(xlabel);
+ D_text(xlabel);
/* draw x and y axis lines */
D_use_color(title_color);
D_polyline_abs(x_line, y_line, 3);
- R_close_driver();
+ D_close_driver();
exit(EXIT_SUCCESS);
}
Modified: grass/trunk/display/d.measure/draw_line.c
===================================================================
--- grass/trunk/display/d.measure/draw_line.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.measure/draw_line.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -1,5 +1,5 @@
#include <stdlib.h>
-#include <grass/display_raster.h>
+#include <grass/display.h>
#include "local_proto.h"
int
Modified: grass/trunk/display/d.measure/main.c
===================================================================
--- grass/trunk/display/d.measure/main.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.measure/main.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -23,7 +23,6 @@
#include <stdlib.h>
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include <grass/glocale.h>
#include "local_proto.h"
Modified: grass/trunk/display/d.measure/msurements.c
===================================================================
--- grass/trunk/display/d.measure/msurements.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.measure/msurements.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -1,6 +1,5 @@
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include "local_proto.h"
Modified: grass/trunk/display/d.nviz/main.c
===================================================================
--- grass/trunk/display/d.nviz/main.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.nviz/main.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -26,7 +26,6 @@
#include <grass/gis.h>
#include <grass/raster.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include "local.h"
#include <grass/glocale.h>
Modified: grass/trunk/display/d.path/main.c
===================================================================
--- grass/trunk/display/d.path/main.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.path/main.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -21,7 +21,6 @@
#include <string.h>
#include <grass/gis.h>
#include <grass/raster.h>
-#include <grass/display_raster.h>
#include <grass/display.h>
#include <grass/colors.h>
#include <grass/Vect.h>
@@ -149,7 +148,7 @@
G_fatal_error(_("%s - illegal y value"), coor_opt->answers[3]);
- if (R_open_driver() != 0)
+ if (D_open_driver() != 0)
G_fatal_error(_("No graphics device selected"));
color = G_standard_color_rgb(BLACK);
@@ -192,7 +191,7 @@
coor_path(&Map, &hcolor, bold_f->answer, x1, y1, x2, y2);
- R_close_driver();
+ D_close_driver();
Vect_close(&Map);
Modified: grass/trunk/display/d.path/select.c
===================================================================
--- grass/trunk/display/d.path/select.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.path/select.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -4,7 +4,6 @@
#include <math.h>
#include <grass/gis.h>
#include <grass/raster.h>
-#include <grass/display_raster.h>
#include <grass/display.h>
#include <grass/Vect.h>
#include <grass/colors.h>
Modified: grass/trunk/display/d.profile/main.c
===================================================================
--- grass/trunk/display/d.profile/main.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.profile/main.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -24,7 +24,6 @@
#include <math.h>
#include <grass/gis.h>
#include <grass/raster.h>
-#include <grass/display_raster.h>
#include <grass/display.h>
#include <grass/glocale.h>
@@ -101,19 +100,19 @@
/* set text size for y-axis labels */
scale = fabs(D_get_u_to_d_yconv());
- R_text_size(scale * 0.04, scale * 0.05);
+ D_text_size(scale * 0.04, scale * 0.05);
/* plot y-axis label (bottom) */
sprintf(str, "%.1f", min);
D_get_text_box(str, &t, &b, &l, &r);
D_pos_abs(-0.02 - (r - l), 0 - (t - b) / 2);
- R_text(str);
+ D_text(str);
/* plot y-axis label (top) */
sprintf(str, "%.1f", max);
D_get_text_box(str, &t, &b, &l, &r);
D_pos_abs(-0.02 - (r - l), 1 - (t - b) / 2);
- R_text(str);
+ D_text(str);
}
static int get_cell(DCELL *result, int fd, double x, double y)
@@ -259,7 +258,7 @@
G_fatal_error(_("At least two points are required"));
/* establish connection with graphics driver */
- if (R_open_driver() != 0)
+ if (D_open_driver() != 0)
G_fatal_error(_("No graphics device selected"));
D_setup2(1, 0, 1.05, -0.05, -0.15, 1.05);
@@ -314,7 +313,7 @@
D_end();
D_stroke();
- R_close_driver();
+ D_close_driver();
exit(EXIT_SUCCESS);
}
Modified: grass/trunk/display/d.rast/display.c
===================================================================
--- grass/trunk/display/d.rast/display.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.rast/display.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -2,7 +2,6 @@
#include <grass/gis.h>
#include <grass/raster.h>
-#include <grass/display_raster.h>
#include <grass/display.h>
#include <grass/glocale.h>
Modified: grass/trunk/display/d.rast/main.c
===================================================================
--- grass/trunk/display/d.rast/main.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.rast/main.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -21,7 +21,7 @@
#include <stdlib.h>
#include <grass/gis.h>
#include <grass/raster.h>
-#include <grass/display_raster.h>
+#include <grass/display.h>
#include "mask.h"
#include "local_proto.h"
@@ -101,7 +101,7 @@
overlay = !flag_n->answer;
invert = flag_i->answer;
- if (R_open_driver() != 0)
+ if (D_open_driver() != 0)
G_fatal_error(_("No graphics device selected"));
fp = Rast_raster_map_is_fp(name, "");
@@ -125,7 +125,7 @@
else
display(name, overlay, bg->answer, CELL_TYPE, invert);
- R_close_driver();
+ D_close_driver();
exit(EXIT_SUCCESS);
}
Modified: grass/trunk/display/d.rast.arrow/main.c
===================================================================
--- grass/trunk/display/d.rast.arrow/main.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.rast.arrow/main.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -39,7 +39,6 @@
#include <math.h>
#include <grass/gis.h>
#include <grass/raster.h>
-#include <grass/display_raster.h>
#include <grass/display.h>
#include <grass/colors.h>
#include <grass/glocale.h>
@@ -221,7 +220,7 @@
/* Setup driver and check important information */
- if (R_open_driver() != 0)
+ if (D_open_driver() != 0)
G_fatal_error(_("No graphics device selected"));
D_setup(0);
@@ -506,7 +505,7 @@
if (opt7->answer)
Rast_close_cell(mag_fd);
- R_close_driver();
+ D_close_driver();
exit(0);
}
Modified: grass/trunk/display/d.rast.num/main.c
===================================================================
--- grass/trunk/display/d.rast.num/main.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.rast.num/main.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -39,7 +39,6 @@
#include <math.h>
#include <grass/gis.h>
#include <grass/raster.h>
-#include <grass/display_raster.h>
#include <grass/display.h>
#include <grass/colors.h>
#include <grass/glocale.h>
@@ -192,7 +191,7 @@
/* Setup driver and check important information */
- if (R_open_driver() != 0)
+ if (D_open_driver() != 0)
G_fatal_error(_("No graphics device selected"));
D_setup2(0, 0, t, b, l, r);
@@ -244,7 +243,7 @@
Rast_close_cell(layer_fd);
- R_close_driver();
+ D_close_driver();
exit(EXIT_SUCCESS);
}
@@ -288,14 +287,14 @@
rite = text_size * len;
}
- R_text_size(text_size, text_size);
+ D_text_size(text_size, text_size);
D_pos_abs(col, row + 0.7);
D_get_text_box(no, &tt, &tb, &tl, &tr);
dx = (tr + tl) / 2 - (col + 0.5);
D_pos_abs(col - dx, row + 0.7);
- R_text(no);
+ D_text(no);
return 0;
}
Modified: grass/trunk/display/d.rgb/main.c
===================================================================
--- grass/trunk/display/d.rgb/main.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.rgb/main.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -23,7 +23,6 @@
#include <grass/gis.h>
#include <grass/raster.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include <grass/glocale.h>
struct band
@@ -79,7 +78,7 @@
exit(EXIT_FAILURE);
/* Do screen initializing stuff */
- if (R_open_driver() != 0)
+ if (D_open_driver() != 0)
G_fatal_error(_("No graphics device selected"));
D_setup(0);
@@ -129,7 +128,7 @@
G_percent(window.rows, window.rows, 5);
D_cell_draw_end();
- R_close_driver();
+ D_close_driver();
/* Close the raster maps */
for (i = 0; i < 3; i++)
Modified: grass/trunk/display/d.rhumbline/main.c
===================================================================
--- grass/trunk/display/d.rhumbline/main.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.rhumbline/main.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -23,7 +23,6 @@
#include <stdlib.h>
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include <grass/glocale.h>
#include "local_proto.h"
@@ -92,7 +91,7 @@
G_fatal_error(_("%s - illegal longitude"), parm.coor->answers[3]);
- if (R_open_driver() != 0)
+ if (D_open_driver() != 0)
G_fatal_error(_("No graphics device selected"));
line_color = D_translate_color(parm.lcolor->answer);
@@ -115,7 +114,7 @@
plot(lon1, lat1, lon2, lat2, line_color, text_color);
- R_close_driver();
+ D_close_driver();
exit(EXIT_SUCCESS);
}
Modified: grass/trunk/display/d.rhumbline/plot.c
===================================================================
--- grass/trunk/display/d.rhumbline/plot.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.rhumbline/plot.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -2,7 +2,6 @@
#include <math.h>
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include "local_proto.h"
void plot(double lon1, double lat1, double lon2, double lat2,
Modified: grass/trunk/display/d.text/main.c
===================================================================
--- grass/trunk/display/d.text/main.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.text/main.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -58,7 +58,6 @@
#include <unistd.h>
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include <grass/colors.h>
#include <grass/glocale.h>
@@ -276,17 +275,17 @@
bold = flag.b->answer;
- if (R_open_driver() != 0)
+ if (D_open_driver() != 0)
G_fatal_error(_("No graphics device selected"));
if (opt.font->answer)
- R_font(opt.font->answer);
+ D_font(opt.font->answer);
else if (opt.path->answer)
- R_font(opt.path->answer);
+ D_font(opt.path->answer);
if (opt.charset->answer)
- R_encoding(opt.charset->answer);
+ D_encoding(opt.charset->answer);
D_setup_unity(0);
@@ -322,8 +321,8 @@
prev_x = x;
prev_y = y;
- R_text_size(size, size);
- R_text_rotation(rotation * 180.0 / M_PI);
+ D_text_size(size, size);
+ D_text_rotation(rotation * 180.0 / M_PI);
if (text) {
double x2, y2;
@@ -335,10 +334,10 @@
draw_text(text, &x2, &y2, size, align, rotation, bold);
/* reset */
- R_text_size(5, 5);
- R_text_rotation(0.0);
+ D_text_size(5, 5);
+ D_text_rotation(0.0);
- R_close_driver();
+ D_close_driver();
exit(EXIT_SUCCESS);
}
@@ -380,9 +379,9 @@
/* font */
if ((ptr = strchr(buf_ptr, ':')))
*ptr = 0;
- R_font(buf_ptr);
+ D_font(buf_ptr);
if (ptr)
- R_encoding(ptr + 1);
+ D_encoding(ptr + 1);
break;
case 'C':
/* color */
@@ -401,7 +400,7 @@
d *= (win.b - win.t) / 100.0;
#endif
size = d + (i ? size : 0);
- R_text_size(size, size);
+ D_text_size(size, size);
break;
case 'B':
/* bold */
@@ -423,7 +422,7 @@
rotation = fmod(d, 2.0 * M_PI);
if (rotation < 0.0)
rotation += 2.0 * M_PI;
- R_text_rotation(rotation * 180.0 / M_PI);
+ D_text_rotation(rotation * 180.0 / M_PI);
break;
case 'I':
/* linespacing */
@@ -517,10 +516,10 @@
fclose(cmd_fp);
/* reset */
- R_text_size(5, 5);
- R_text_rotation(0.0);
+ D_text_size(5, 5);
+ D_text_rotation(0.0);
- R_close_driver();
+ D_close_driver();
exit(EXIT_SUCCESS);
}
@@ -598,23 +597,23 @@
/* R_get_text_box() does not work with rotation and returns a little bit
* bigger dimension than actual text size */
if (rotation != 0.0)
- R_text_rotation(0.0);
+ D_text_rotation(0.0);
D_get_text_box(text, &t, &b, &l, &r);
if (rotation != 0.0)
- R_text_rotation(rotation * 180.0 / M_PI);
+ D_text_rotation(rotation * 180.0 / M_PI);
w = r - l;
h = b - t;
if (w > 0)
w += 0.2 * size;
else
- /* R_text() does not draw " ". */
+ /* D_text() does not draw " ". */
w = 0.8 * size;
if (h > 0)
h += 0.2 * size;
else
- /* R_text() does not draw " ". */
+ /* D_text() does not draw " ". */
h = 0.8 * size;
c = cos(rotation);
@@ -649,13 +648,13 @@
}
D_pos_abs(*x, *y);
- R_text(text);
+ D_text(text);
if (bold) {
D_pos_abs(*x, *y + 1);
- R_text(text);
+ D_text(text);
D_pos_abs(*x + 1, *y);
- R_text(text);
+ D_text(text);
}
*x += w * c;
Modified: grass/trunk/display/d.thematic.area/area.c
===================================================================
--- grass/trunk/display/d.thematic.area/area.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.thematic.area/area.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -7,7 +7,6 @@
#include <grass/raster.h>
#include <grass/Vect.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include <grass/colors.h>
#include <grass/dbmi.h>
#include <grass/glocale.h>
Modified: grass/trunk/display/d.thematic.area/main.c
===================================================================
--- grass/trunk/display/d.thematic.area/main.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.thematic.area/main.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -20,7 +20,6 @@
#include <grass/config.h>
#include <grass/gis.h>
#include <grass/raster.h>
-#include <grass/display_raster.h>
#include <grass/display.h>
#include <grass/Vect.h>
#include <grass/colors.h>
@@ -362,7 +361,7 @@
if (!nodraw_flag->answer) {
/* Now's let's prepare the actual plotting */
- if (R_open_driver() != 0)
+ if (D_open_driver() != 0)
G_fatal_error(_("No graphics device selected"));
D_setup(0);
@@ -407,7 +406,7 @@
} /* end window check if */
- R_close_driver();
+ D_close_driver();
} /* end of nodraw_flag condition */
Modified: grass/trunk/display/d.thematic.area/plot1.c
===================================================================
--- grass/trunk/display/d.thematic.area/plot1.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.thematic.area/plot1.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -5,7 +5,6 @@
#include <grass/raster.h>
#include <grass/Vect.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include "plot.h"
#include "local_proto.h"
#include <grass/symbol.h>
Modified: grass/trunk/display/d.title/main.c
===================================================================
--- grass/trunk/display/d.title/main.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.title/main.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -19,7 +19,6 @@
#include <stdlib.h>
#include <unistd.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include <grass/gis.h>
#include <grass/raster.h>
#include <grass/glocale.h>
Modified: grass/trunk/display/d.vect/area.c
===================================================================
--- grass/trunk/display/d.vect/area.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.vect/area.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -7,7 +7,6 @@
#include <grass/raster.h>
#include <grass/Vect.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include <grass/colors.h>
#include <grass/dbmi.h>
#include <grass/glocale.h>
Modified: grass/trunk/display/d.vect/attr.c
===================================================================
--- grass/trunk/display/d.vect/attr.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.vect/attr.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -3,7 +3,6 @@
#include <grass/raster.h>
#include <grass/Vect.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include <grass/dbmi.h>
#include <grass/glocale.h>
#include "local_proto.h"
@@ -60,11 +59,11 @@
continue; /* used for both lines and labels */
D_RGB_color(lattr->color.R, lattr->color.G, lattr->color.B);
- R_text_size(lattr->size, lattr->size);
+ D_text_size(lattr->size, lattr->size);
if (lattr->font)
- R_font(lattr->font);
+ D_font(lattr->font);
if (lattr->enc)
- R_encoding(lattr->enc);
+ D_encoding(lattr->enc);
if (chcat) {
int found = 0;
Modified: grass/trunk/display/d.vect/dir.c
===================================================================
--- grass/trunk/display/d.vect/dir.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.vect/dir.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -2,7 +2,6 @@
#include <grass/raster.h>
#include <grass/Vect.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include <grass/glocale.h>
#include "plot.h"
Modified: grass/trunk/display/d.vect/label.c
===================================================================
--- grass/trunk/display/d.vect/label.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.vect/label.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -2,7 +2,6 @@
#include <grass/raster.h>
#include <grass/Vect.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include <grass/glocale.h>
#include "local_proto.h"
#include "plot.h"
@@ -34,11 +33,11 @@
continue; /* used for both lines and labels */
D_RGB_color(lattr->color.R, lattr->color.G, lattr->color.B);
- R_text_size(lattr->size, lattr->size);
+ D_text_size(lattr->size, lattr->size);
if (lattr->font)
- R_font(lattr->font);
+ D_font(lattr->font);
if (lattr->enc)
- R_encoding(lattr->enc);
+ D_encoding(lattr->enc);
if (chcat) {
int found = 0;
Modified: grass/trunk/display/d.vect/main.c
===================================================================
--- grass/trunk/display/d.vect/main.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.vect/main.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -19,7 +19,6 @@
#include <dirent.h>
#include <grass/gis.h>
#include <grass/raster.h>
-#include <grass/display_raster.h>
#include <grass/display.h>
#include <grass/Vect.h>
#include <grass/colors.h>
@@ -355,7 +354,7 @@
G_get_set_window(&window);
- if (R_open_driver() != 0)
+ if (D_open_driver() != 0)
G_fatal_error(_("No graphics device selected"));
/* Read map options */
@@ -675,7 +674,7 @@
}
}
- R_close_driver();
+ D_close_driver();
if (verbose)
G_done_msg(" ");
Modified: grass/trunk/display/d.vect/plot1.c
===================================================================
--- grass/trunk/display/d.vect/plot1.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.vect/plot1.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -5,7 +5,6 @@
#include <grass/raster.h>
#include <grass/Vect.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include "plot.h"
#include "local_proto.h"
#include <grass/symbol.h>
Modified: grass/trunk/display/d.vect/topo.c
===================================================================
--- grass/trunk/display/d.vect/topo.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.vect/topo.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -2,7 +2,6 @@
#include <grass/raster.h>
#include <grass/Vect.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include <grass/glocale.h>
#include "local_proto.h"
#include "plot.h"
@@ -22,11 +21,11 @@
Cats = Vect_new_cats_struct();
D_RGB_color(lattr->color.R, lattr->color.G, lattr->color.B);
- R_text_size(lattr->size, lattr->size);
+ D_text_size(lattr->size, lattr->size);
if (lattr->font)
- R_font(lattr->font);
+ D_font(lattr->font);
if (lattr->enc)
- R_encoding(lattr->enc);
+ D_encoding(lattr->enc);
Vect_rewind(Map);
Modified: grass/trunk/display/d.vect/utils.c
===================================================================
--- grass/trunk/display/d.vect/utils.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.vect/utils.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -2,7 +2,6 @@
#include <grass/raster.h>
#include <grass/Vect.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include <grass/glocale.h>
#include "local_proto.h"
#include "plot.h"
@@ -58,7 +57,7 @@
}
D_pos_abs(X + Xoffset, Y + Yoffset);
- R_text(text);
+ D_text(text);
}
void show_label_line(const struct line_pnts *Points, int ltype, LATTR *lattr, const char *text)
Modified: grass/trunk/display/d.vect/zcoor.c
===================================================================
--- grass/trunk/display/d.vect/zcoor.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.vect/zcoor.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -4,7 +4,6 @@
#include <grass/raster.h>
#include <grass/Vect.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include "local_proto.h"
#include "plot.h"
@@ -21,11 +20,11 @@
Cats = Vect_new_cats_struct();
D_RGB_color(lattr->color.R, lattr->color.G, lattr->color.B);
- R_text_size(lattr->size, lattr->size);
+ D_text_size(lattr->size, lattr->size);
if (lattr->font)
- R_font(lattr->font);
+ D_font(lattr->font);
if (lattr->enc)
- R_encoding(lattr->enc);
+ D_encoding(lattr->enc);
Vect_rewind(Map);
Modified: grass/trunk/display/d.vect.chart/bar.c
===================================================================
--- grass/trunk/display/d.vect.chart/bar.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.vect.chart/bar.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -3,7 +3,6 @@
#include <grass/Vect.h>
#include <grass/dbmi.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include <grass/symbol.h>
#include "global.h"
Modified: grass/trunk/display/d.vect.chart/main.c
===================================================================
--- grass/trunk/display/d.vect.chart/main.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.vect.chart/main.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -19,7 +19,6 @@
#include <string.h>
#include <grass/gis.h>
#include <grass/raster.h>
-#include <grass/display_raster.h>
#include <grass/display.h>
#include <grass/Vect.h>
#include <grass/colors.h>
@@ -249,7 +248,7 @@
if (ctype_opt->answer[0] == 'b')
ctype = CTYPE_BAR;
- if (R_open_driver() != 0)
+ if (D_open_driver() != 0)
G_fatal_error(_("No graphics device selected"));
/* should we plot the maximum reference on bar plots? */
@@ -272,7 +271,7 @@
sizecol_opt->answer, size, scale,
&ocolor, colors, y_center, max_reference);
- R_close_driver();
+ D_close_driver();
Vect_close(&Map);
Modified: grass/trunk/display/d.vect.chart/pie.c
===================================================================
--- grass/trunk/display/d.vect.chart/pie.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.vect.chart/pie.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -4,7 +4,6 @@
#include <grass/Vect.h>
#include <grass/dbmi.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include <grass/symbol.h>
#include "global.h"
Modified: grass/trunk/display/d.vect.chart/plot.c
===================================================================
--- grass/trunk/display/d.vect.chart/plot.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.vect.chart/plot.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -3,7 +3,6 @@
#include <grass/Vect.h>
#include <grass/dbmi.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include <grass/symbol.h>
#include <grass/glocale.h>
Modified: grass/trunk/display/d.what.rast/main.c
===================================================================
--- grass/trunk/display/d.what.rast/main.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.what.rast/main.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -23,7 +23,6 @@
#include <string.h>
#include "what.h"
#include <grass/display.h>
-#include <grass/display_raster.h>
#include <grass/glocale.h>
#include "local_proto.h"
Modified: grass/trunk/display/d.what.rast/what.c
===================================================================
--- grass/trunk/display/d.what.rast/what.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.what.rast/what.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -1,5 +1,4 @@
#include <string.h>
-#include <grass/display_raster.h>
#include <grass/display.h>
#include <grass/glocale.h>
#include "what.h"
Modified: grass/trunk/display/d.what.vect/main.c
===================================================================
--- grass/trunk/display/d.what.vect/main.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.what.vect/main.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -30,7 +30,6 @@
#include <grass/gis.h>
#include <grass/display.h>
#include <grass/Vect.h>
-#include <grass/display_raster.h>
#include "what.h"
#include <grass/dbmi.h>
#include <grass/glocale.h>
Modified: grass/trunk/display/d.what.vect/what.c
===================================================================
--- grass/trunk/display/d.what.vect/what.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.what.vect/what.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -2,7 +2,6 @@
#include <unistd.h>
#include <math.h>
#include <grass/gis.h>
-#include <grass/display_raster.h>
#include <grass/display.h>
#include <grass/colors.h>
#include <grass/Vect.h>
Modified: grass/trunk/display/d.where/main.c
===================================================================
--- grass/trunk/display/d.where/main.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.where/main.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -23,7 +23,6 @@
#include <grass/gis.h>
#include <grass/gprojects.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include "local_proto.h"
#include <grass/glocale.h>
@@ -164,11 +163,11 @@
else
fp = stdin;
- if (R_open_driver() != 0)
+ if (D_open_driver() != 0)
G_fatal_error(_("No graphics device selected"));
D_setup(0);
where_am_i(coords->answers, fp, have_spheroid, decimal->answer, dcoord->answer);
- R_close_driver();
+ D_close_driver();
exit(EXIT_SUCCESS);
}
Modified: grass/trunk/display/d.zoom/box.c
===================================================================
--- grass/trunk/display/d.zoom/box.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.zoom/box.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -3,7 +3,6 @@
#include <math.h>
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include "local_proto.h"
int make_window_box(struct Cell_head *window, double magnify, int full,
Modified: grass/trunk/display/d.zoom/center.c
===================================================================
--- grass/trunk/display/d.zoom/center.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.zoom/center.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -1,6 +1,5 @@
#include <string.h>
#include <grass/gis.h>
-#include <grass/display_raster.h>
#include <grass/display.h>
#include "local_proto.h"
Modified: grass/trunk/display/d.zoom/main.c
===================================================================
--- grass/trunk/display/d.zoom/main.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.zoom/main.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -24,7 +24,6 @@
#include <string.h>
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include <grass/Vect.h>
#include "local_proto.h"
Modified: grass/trunk/display/d.zoom/pan.c
===================================================================
--- grass/trunk/display/d.zoom/pan.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.zoom/pan.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -2,7 +2,6 @@
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include "local_proto.h"
#include <grass/glocale.h>
Modified: grass/trunk/display/d.zoom/print.c
===================================================================
--- grass/trunk/display/d.zoom/print.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.zoom/print.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -1,7 +1,6 @@
#include <string.h>
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include "local_proto.h"
static int max(int a, int b)
Modified: grass/trunk/display/d.zoom/quit.c
===================================================================
--- grass/trunk/display/d.zoom/quit.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.zoom/quit.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -3,7 +3,6 @@
#include <math.h>
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include "local_proto.h"
#include <grass/glocale.h>
Modified: grass/trunk/display/d.zoom/redraw.c
===================================================================
--- grass/trunk/display/d.zoom/redraw.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.zoom/redraw.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -1,5 +1,4 @@
#include <stdlib.h>
-#include <grass/display_raster.h>
#include <grass/display.h>
#include <grass/glocale.h>
#include "local_proto.h"
Modified: grass/trunk/display/d.zoom/set.c
===================================================================
--- grass/trunk/display/d.zoom/set.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.zoom/set.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -3,7 +3,6 @@
#include <math.h>
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include "local_proto.h"
static double round_to(double in, int sd)
Modified: grass/trunk/display/d.zoom/zoom.c
===================================================================
--- grass/trunk/display/d.zoom/zoom.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/display/d.zoom/zoom.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -1,6 +1,5 @@
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include "local_proto.h"
#include <grass/glocale.h>
Modified: grass/trunk/imagery/i.class/add_point.c
===================================================================
--- grass/trunk/imagery/i.class/add_point.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/imagery/i.class/add_point.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -6,7 +6,7 @@
*************************************************************/
#include "globals.h"
-#include <grass/display_raster.h>
+#include <grass/display.h>
#include <grass/glocale.h>
Modified: grass/trunk/imagery/i.class/del_point.c
===================================================================
--- grass/trunk/imagery/i.class/del_point.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/imagery/i.class/del_point.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -1,6 +1,6 @@
#include "globals.h"
-#include <grass/display_raster.h>
+#include <grass/display.h>
Modified: grass/trunk/imagery/i.class/draw_cell.c
===================================================================
--- grass/trunk/imagery/i.class/draw_cell.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/imagery/i.class/draw_cell.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -2,7 +2,6 @@
#include <grass/gis.h>
#include "globals.h"
#include <grass/display.h>
-#include <grass/display_raster.h>
#include "local_proto.h"
int draw_cell(View * view, int overlay)
Modified: grass/trunk/imagery/i.class/draw_reg.c
===================================================================
--- grass/trunk/imagery/i.class/draw_reg.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/imagery/i.class/draw_reg.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -1,4 +1,4 @@
-#include <grass/display_raster.h>
+#include <grass/display.h>
#include <grass/glocale.h>
#include "globals.h"
#include "local_proto.h"
Modified: grass/trunk/imagery/i.class/graphics.c
===================================================================
--- grass/trunk/imagery/i.class/graphics.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/imagery/i.class/graphics.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -1,6 +1,5 @@
#include "globals.h"
#include <grass/display.h>
-#include <grass/display_raster.h>
#include "local_proto.h"
static View *makeview(double bottom, double top, double left, double right)
Modified: grass/trunk/imagery/i.class/histograms.c
===================================================================
--- grass/trunk/imagery/i.class/histograms.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/imagery/i.class/histograms.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -1,6 +1,6 @@
#include <math.h>
#include "globals.h"
-#include <grass/display_raster.h>
+#include <grass/display.h>
#include "local_proto.h"
#define MU 'l' /* these are the characters that are printed as */
Modified: grass/trunk/imagery/i.class/input.c
===================================================================
--- grass/trunk/imagery/i.class/input.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/imagery/i.class/input.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -1,5 +1,5 @@
#include "globals.h"
-#include <grass/display_raster.h>
+#include <grass/display.h>
#include "local_proto.h"
static int active = 0;
Modified: grass/trunk/imagery/i.class/main.c
===================================================================
--- grass/trunk/imagery/i.class/main.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/imagery/i.class/main.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -22,7 +22,7 @@
#include <stdlib.h>
#include <string.h>
#include <grass/gis.h>
-#include <grass/display_raster.h>
+#include <grass/display.h>
#include <grass/glocale.h>
#include "globals.h"
#include "local_proto.h"
Modified: grass/trunk/imagery/i.class/mouse.c
===================================================================
--- grass/trunk/imagery/i.class/mouse.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/imagery/i.class/mouse.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -1,5 +1,5 @@
#include "globals.h"
-#include <grass/display_raster.h>
+#include <grass/display.h>
static int first = 1;
static int curx, cury;
Modified: grass/trunk/imagery/i.class/redisplay.c
===================================================================
--- grass/trunk/imagery/i.class/redisplay.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/imagery/i.class/redisplay.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -1,5 +1,5 @@
#include "globals.h"
-#include <grass/display_raster.h>
+#include <grass/display.h>
#include <grass/glocale.h>
#include "local_proto.h"
Modified: grass/trunk/imagery/i.class/title.c
===================================================================
--- grass/trunk/imagery/i.class/title.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/imagery/i.class/title.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -1,4 +1,4 @@
-#include <grass/display_raster.h>
+#include <grass/display.h>
#include "globals.h"
#include "local_proto.h"
Modified: grass/trunk/imagery/i.class/view.c
===================================================================
--- grass/trunk/imagery/i.class/view.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/imagery/i.class/view.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -1,5 +1,5 @@
#include <string.h>
-#include <grass/display_raster.h>
+#include <grass/display.h>
#include "globals.h"
#include "local_proto.h"
Modified: grass/trunk/imagery/i.class/zoom_box.c
===================================================================
--- grass/trunk/imagery/i.class/zoom_box.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/imagery/i.class/zoom_box.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -1,4 +1,4 @@
-#include <grass/display_raster.h>
+#include <grass/display.h>
#include <grass/glocale.h>
#include "globals.h"
#include "local_proto.h"
Modified: grass/trunk/imagery/i.points/analyze.c
===================================================================
--- grass/trunk/imagery/i.points/analyze.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/imagery/i.points/analyze.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -3,7 +3,7 @@
#include <math.h>
#include <stdlib.h>
#include <grass/gis.h>
-#include <grass/display_raster.h>
+#include <grass/display.h>
#include "globals.h"
#include "local_proto.h"
Modified: grass/trunk/imagery/i.points/ask.c
===================================================================
--- grass/trunk/imagery/i.points/ask.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/imagery/i.points/ask.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -1,7 +1,7 @@
#include <string.h>
#include <stdlib.h>
#include <grass/gis.h>
-#include <grass/display_raster.h>
+#include <grass/display.h>
#include "globals.h"
#include "local_proto.h"
#define NLINES 18
Modified: grass/trunk/imagery/i.points/ask_mag.c
===================================================================
--- grass/trunk/imagery/i.points/ask_mag.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/imagery/i.points/ask_mag.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -1,6 +1,6 @@
#include "globals.h"
#include "local_proto.h"
-#include <grass/display_raster.h>
+#include <grass/display.h>
struct box
{
Modified: grass/trunk/imagery/i.points/call.c
===================================================================
--- grass/trunk/imagery/i.points/call.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/imagery/i.points/call.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -8,7 +8,7 @@
#endif
#include "globals.h"
#include "local_proto.h"
-#include <grass/display_raster.h>
+#include <grass/display.h>
/*
* call a subroutine, but as a child process
* allowing interrupts for the child
Modified: grass/trunk/imagery/i.points/debug.c
===================================================================
--- grass/trunk/imagery/i.points/debug.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/imagery/i.points/debug.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -1,7 +1,7 @@
#include "globals.h"
#include "local_proto.h"
-#include <grass/display_raster.h>
+#include <grass/display.h>
int debug(char *msg)
{
R_stabilize();
Modified: grass/trunk/imagery/i.points/dot.c
===================================================================
--- grass/trunk/imagery/i.points/dot.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/imagery/i.points/dot.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -1,5 +1,5 @@
#include "globals.h"
-#include <grass/display_raster.h>
+#include <grass/display.h>
int dot(int x, int y)
{
double vx[5], vy[5];
Modified: grass/trunk/imagery/i.points/drawcell.c
===================================================================
--- grass/trunk/imagery/i.points/drawcell.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/imagery/i.points/drawcell.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -2,7 +2,6 @@
#include <grass/gis.h>
#include "globals.h"
#include <grass/display.h>
-#include <grass/display_raster.h>
#include "local_proto.h"
int drawcell(View * view)
Modified: grass/trunk/imagery/i.points/graphics.c
===================================================================
--- grass/trunk/imagery/i.points/graphics.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/imagery/i.points/graphics.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -1,7 +1,6 @@
#include "globals.h"
#include "local_proto.h"
#include <grass/display.h>
-#include <grass/display_raster.h>
static View *makeview(double bottom, double top, double left, double right)
{
Modified: grass/trunk/imagery/i.points/input.c
===================================================================
--- grass/trunk/imagery/i.points/input.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/imagery/i.points/input.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -1,6 +1,6 @@
#include "globals.h"
#include "local_proto.h"
-#include <grass/display_raster.h>
+#include <grass/display.h>
static int active = 0;
static int replot;
Modified: grass/trunk/imagery/i.points/main.c
===================================================================
--- grass/trunk/imagery/i.points/main.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/imagery/i.points/main.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -23,7 +23,7 @@
#include <string.h>
#include <signal.h>
#include <grass/gis.h>
-#include <grass/display_raster.h>
+#include <grass/display.h>
#include <grass/glocale.h>
#include "globals.h"
Modified: grass/trunk/imagery/i.points/mark.c
===================================================================
--- grass/trunk/imagery/i.points/mark.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/imagery/i.points/mark.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -1,6 +1,6 @@
#include "globals.h"
#include "local_proto.h"
-#include <grass/display_raster.h>
+#include <grass/display.h>
static int get_point2(double *, double *);
static int keyboard(void);
Modified: grass/trunk/imagery/i.points/mouse.c
===================================================================
--- grass/trunk/imagery/i.points/mouse.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/imagery/i.points/mouse.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -1,5 +1,5 @@
#include "globals.h"
-#include <grass/display_raster.h>
+#include <grass/display.h>
static int first = 1;
static int curx, cury;
Modified: grass/trunk/imagery/i.points/points.c
===================================================================
--- grass/trunk/imagery/i.points/points.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/imagery/i.points/points.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -1,6 +1,6 @@
#include "globals.h"
#include "local_proto.h"
-#include <grass/display_raster.h>
+#include <grass/display.h>
int display_points(int in_color)
{
Modified: grass/trunk/imagery/i.points/title.c
===================================================================
--- grass/trunk/imagery/i.points/title.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/imagery/i.points/title.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -1,6 +1,6 @@
#include "globals.h"
#include "local_proto.h"
-#include <grass/display_raster.h>
+#include <grass/display.h>
int display_title(View * view)
{
Modified: grass/trunk/imagery/i.points/view.c
===================================================================
--- grass/trunk/imagery/i.points/view.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/imagery/i.points/view.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -1,5 +1,5 @@
#include <string.h>
-#include <grass/display_raster.h>
+#include <grass/display.h>
#include "globals.h"
#include "local_proto.h"
Modified: grass/trunk/imagery/i.points/zoom_box.c
===================================================================
--- grass/trunk/imagery/i.points/zoom_box.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/imagery/i.points/zoom_box.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -1,6 +1,6 @@
#include "globals.h"
#include "local_proto.h"
-#include <grass/display_raster.h>
+#include <grass/display.h>
static int zoom1(int, int);
static int zoom2(int, int);
Modified: grass/trunk/imagery/i.points/zoom_pnt.c
===================================================================
--- grass/trunk/imagery/i.points/zoom_pnt.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/imagery/i.points/zoom_pnt.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -1,6 +1,6 @@
#include "globals.h"
#include "local_proto.h"
-#include <grass/display_raster.h>
+#include <grass/display.h>
static int zoom1(int, int);
static int cancel(void);
Modified: grass/trunk/imagery/i.vpoints/analyze.c
===================================================================
--- grass/trunk/imagery/i.vpoints/analyze.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/imagery/i.vpoints/analyze.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -3,7 +3,7 @@
#include <math.h>
#include <grass/gis.h>
#include "globals.h"
-#include <grass/display_raster.h>
+#include <grass/display.h>
#include "crs.h"
#define NLINES 18
Modified: grass/trunk/imagery/i.vpoints/ask.c
===================================================================
--- grass/trunk/imagery/i.vpoints/ask.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/imagery/i.vpoints/ask.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -1,5 +1,5 @@
#include <string.h>
-#include <grass/display_raster.h>
+#include <grass/display.h>
#include "globals.h"
#define NLINES 18
Modified: grass/trunk/imagery/i.vpoints/ask_mag.c
===================================================================
--- grass/trunk/imagery/i.vpoints/ask_mag.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/imagery/i.vpoints/ask_mag.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -1,5 +1,5 @@
#include "globals.h"
-#include <grass/display_raster.h>
+#include <grass/display.h>
struct box
{
Modified: grass/trunk/imagery/i.vpoints/call.c
===================================================================
--- grass/trunk/imagery/i.vpoints/call.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/imagery/i.vpoints/call.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -8,7 +8,7 @@
#include <sys/wait.h>
#endif
#include <grass/gis.h>
-#include <grass/display_raster.h>
+#include <grass/display.h>
#include "globals.h"
/*
* call a subroutine, but as a child process
Modified: grass/trunk/imagery/i.vpoints/debug.c
===================================================================
--- grass/trunk/imagery/i.vpoints/debug.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/imagery/i.vpoints/debug.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -1,5 +1,5 @@
#include "globals.h"
-#include <grass/display_raster.h>
+#include <grass/display.h>
int debug(char *msg, ...)
{
Modified: grass/trunk/imagery/i.vpoints/dot.c
===================================================================
--- grass/trunk/imagery/i.vpoints/dot.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/imagery/i.vpoints/dot.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -1,5 +1,5 @@
#include "globals.h"
-#include <grass/display_raster.h>
+#include <grass/display.h>
int dot(int x, int y)
{
Modified: grass/trunk/imagery/i.vpoints/drawcell.c
===================================================================
--- grass/trunk/imagery/i.vpoints/drawcell.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/imagery/i.vpoints/drawcell.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -1,5 +1,4 @@
#include "globals.h"
-#include <grass/display_raster.h>
#include <grass/display.h>
#include <stdlib.h>
Modified: grass/trunk/imagery/i.vpoints/drawvect.c
===================================================================
--- grass/trunk/imagery/i.vpoints/drawvect.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/imagery/i.vpoints/drawvect.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -1,5 +1,4 @@
#include <string.h>
-#include <grass/display_raster.h>
#include <grass/display.h>
#include "vectpoints.h"
#include <grass/Vect.h>
Modified: grass/trunk/imagery/i.vpoints/graphics.c
===================================================================
--- grass/trunk/imagery/i.vpoints/graphics.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/imagery/i.vpoints/graphics.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -1,6 +1,5 @@
#include "globals.h"
#include <grass/display.h>
-#include <grass/display_raster.h>
static View *makeview(double bottom, double top, double left, double right)
{
Modified: grass/trunk/imagery/i.vpoints/input.c
===================================================================
--- grass/trunk/imagery/i.vpoints/input.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/imagery/i.vpoints/input.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -1,5 +1,5 @@
#include "globals.h"
-#include <grass/display_raster.h>
+#include <grass/display.h>
static int active = 0;
static int replot;
Modified: grass/trunk/imagery/i.vpoints/main.c
===================================================================
--- grass/trunk/imagery/i.vpoints/main.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/imagery/i.vpoints/main.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -28,7 +28,7 @@
#include <string.h>
#include <signal.h>
#include <grass/gis.h>
-#include <grass/display_raster.h>
+#include <grass/display.h>
#include <grass/glocale.h>
#include "globals.h"
Modified: grass/trunk/imagery/i.vpoints/mark.c
===================================================================
--- grass/trunk/imagery/i.vpoints/mark.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/imagery/i.vpoints/mark.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -1,5 +1,5 @@
#include "globals.h"
-#include <grass/display_raster.h>
+#include <grass/display.h>
static int get_point2(double *, double *);
static int keyboard(void);
Modified: grass/trunk/imagery/i.vpoints/mouse.c
===================================================================
--- grass/trunk/imagery/i.vpoints/mouse.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/imagery/i.vpoints/mouse.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -1,5 +1,5 @@
#include "globals.h"
-#include <grass/display_raster.h>
+#include <grass/display.h>
static int first = 1;
static int curx, cury;
Modified: grass/trunk/imagery/i.vpoints/points.c
===================================================================
--- grass/trunk/imagery/i.vpoints/points.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/imagery/i.vpoints/points.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -1,5 +1,5 @@
#include "globals.h"
-#include <grass/display_raster.h>
+#include <grass/display.h>
/* overlay ground control points on the display */
Modified: grass/trunk/imagery/i.vpoints/setup.c
===================================================================
--- grass/trunk/imagery/i.vpoints/setup.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/imagery/i.vpoints/setup.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -1,6 +1,5 @@
#include <string.h>
#include <grass/gis.h>
-#include <grass/display_raster.h>
#include <grass/display.h>
#include "globals.h"
Modified: grass/trunk/imagery/i.vpoints/title.c
===================================================================
--- grass/trunk/imagery/i.vpoints/title.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/imagery/i.vpoints/title.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -1,6 +1,6 @@
#include <stdlib.h>
#include "globals.h"
-#include <grass/display_raster.h>
+#include <grass/display.h>
int display_title(View * view)
{
Modified: grass/trunk/imagery/i.vpoints/view.c
===================================================================
--- grass/trunk/imagery/i.vpoints/view.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/imagery/i.vpoints/view.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -1,6 +1,6 @@
#include "globals.h"
#include <string.h>
-#include <grass/display_raster.h>
+#include <grass/display.h>
int Configure_view(View * view, char *name, char *mapset, double ns_res, double ew_res /* original map resolution */
)
Modified: grass/trunk/imagery/i.vpoints/zoom_box.c
===================================================================
--- grass/trunk/imagery/i.vpoints/zoom_box.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/imagery/i.vpoints/zoom_box.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -1,5 +1,5 @@
#include "globals.h"
-#include <grass/display_raster.h>
+#include <grass/display.h>
static int x1, y1, x2, y2;
static View *pick_view, *zoom_view, *main_view;
Modified: grass/trunk/imagery/i.vpoints/zoom_pnt.c
===================================================================
--- grass/trunk/imagery/i.vpoints/zoom_pnt.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/imagery/i.vpoints/zoom_pnt.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -1,6 +1,6 @@
#include <math.h>
#include "globals.h"
-#include <grass/display_raster.h>
+#include <grass/display.h>
static View *pick_view, *zoom_view, *main_view;
static int target_flag;
Modified: grass/trunk/include/display.h
===================================================================
--- grass/trunk/include/display.h 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/include/display.h 2009-06-22 05:09:28 UTC (rev 38015)
@@ -153,4 +153,22 @@
/* window.c */
void D_erase(const char *);
+/* r_raster.c */
+
+int D_open_driver(void);
+void D_close_driver(void);
+
+void D_get_window(double *, double *, double *, double *);
+
+void D__erase(void);
+
+void D_text_size(double, double);
+void D_text_rotation(double);
+void D_text(const char *);
+
+void D_font(const char *);
+void D_encoding(const char *);
+void D_font_list(char ***, int *);
+void D_font_info(char ***, int *);
+
#endif /* GRASS_DISPLAY_H */
Deleted: grass/trunk/include/display_raster.h
===================================================================
--- grass/trunk/include/display_raster.h 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/include/display_raster.h 2009-06-22 05:09:28 UTC (rev 38015)
@@ -1,39 +0,0 @@
-#ifndef _GRASS_DISPLAY_RASTER_H
-#define _GRASS_DISPLAY_RASTER_H
-
-void R__line_width(double);
-void R__get_text_box(const char *, double *, double *, double *, double *);
-void R__pos_abs(double, double);
-void R__begin(void);
-void R__move(double, double);
-void R__cont(double, double);
-void R__close(void);
-void R__stroke(void);
-void R__fill(void);
-void R__point(double, double);
-void R__RGB_color(int, int, int);
-int R__scaled_raster(int, int,
- const unsigned char *,
- const unsigned char *,
- const unsigned char *, const unsigned char *);
-void R__begin_scaled_raster(int, int[2][2], double[2][2]);
-void R__end_scaled_raster(void);
-void R__standard_color(int);
-
-int R_open_driver(void);
-void R_close_driver(void);
-
-void R_get_window(double *, double *, double *, double *);
-
-void R_erase(void);
-
-void R_text_size(double, double);
-void R_text_rotation(double);
-void R_text(const char *);
-
-void R_font(const char *);
-void R_encoding(const char *);
-void R_font_list(char ***, int *);
-void R_font_info(char ***, int *);
-
-#endif
Modified: grass/trunk/lib/display/clip.c
===================================================================
--- grass/trunk/lib/display/clip.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/lib/display/clip.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -3,7 +3,6 @@
#include <string.h>
#include <grass/gis.h>
-#include <grass/display_raster.h>
#include <grass/display.h>
#include <grass/glocale.h>
#include "path.h"
Modified: grass/trunk/lib/display/draw2.c
===================================================================
--- grass/trunk/lib/display/draw2.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/lib/display/draw2.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -4,8 +4,8 @@
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include <grass/glocale.h>
+#include "driver.h"
#include "path.h"
#include "clip.h"
@@ -186,14 +186,14 @@
void D_line_width(double d)
{
- R__line_width(d > 0 ? d : 0);
+ COM_Line_width(d > 0 ? d : 0);
}
void D_get_text_box(const char *text, double *t, double *b, double *l, double *r)
{
double T, B, L, R;
- R__get_text_box(text, &T, &B, &L, &R);
+ COM_Get_text_box(text, &T, &B, &L, &R);
*t = D_d_to_u_row(T);
*b = D_d_to_u_row(B);
@@ -219,7 +219,7 @@
x = D_u_to_d_col(x);
y = D_u_to_d_row(y);
- R__pos_abs(x, y);
+ COM_Pos_abs(x, y);
}
void D_pos_rel(double x, double y)
@@ -266,19 +266,19 @@
p = &eps_path;
}
- R__begin();
+ COM_Begin();
for (i = 0; i < p->count; i++) {
struct vertex *v = &p->vertices[i];
switch (v->mode)
{
case P_MOVE:
- R__move(v->x, v->y);
+ COM_Move(v->x, v->y);
break;
case P_CONT:
- R__cont(v->x, v->y);
+ COM_Cont(v->x, v->y);
break;
case P_CLOSE:
- R__close();
+ COM_Close();
break;
}
}
@@ -317,13 +317,13 @@
void D_stroke(void)
{
do_path(0);
- R__stroke();
+ COM_Stroke();
}
void D_fill(void)
{
do_path(1);
- R__fill();
+ COM_Fill();
}
void D_dots(void)
@@ -352,7 +352,7 @@
x = D_u_to_d_col(x);
y = D_u_to_d_row(y);
- R__point(x, y);
+ COM_Point(x, y);
}
}
Modified: grass/trunk/lib/display/r_raster.c
===================================================================
--- grass/trunk/lib/display/r_raster.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/lib/display/r_raster.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -22,7 +22,7 @@
#include <grass/gis.h>
#include <grass/glocale.h>
-#include <grass/display_raster.h>
+#include <grass/display.h>
#include "driver.h"
@@ -34,8 +34,6 @@
extern const struct driver *Cairo_Driver(void);
#endif
-static void set_window(double, double, double, double);
-
static void init(void)
{
const char *fenc = getenv("GRASS_ENCODING");
@@ -44,29 +42,29 @@
const char *text_size = getenv("GRASS_TEXT_SIZE");
const char *frame = getenv("GRASS_FRAME");
- R_font(font ? font : "romans");
+ D_font(font ? font : "romans");
if (fenc)
- R_encoding(fenc);
+ D_encoding(fenc);
if (line_width)
- R__line_width(atof(line_width));
+ COM_Line_width(atof(line_width));
if (text_size) {
double s = atof(text_size);
- R_text_size(s, s);
+ D_text_size(s, s);
}
- R_text_rotation(0);
+ D_text_rotation(0);
if (frame) {
double t, b, l, r;
sscanf(frame, "%lf,%lf,%lf,%lf", &t, &b, &l, &r);
- set_window(t, b, l, r);
+ COM_Set_window(t, b, l, r);
}
}
-int R_open_driver(void)
+int D_open_driver(void)
{
const char *p = getenv("GRASS_RENDER_IMMEDIATE");
const struct driver *drv =
@@ -87,7 +85,7 @@
return 0;
}
-void R_close_driver(void)
+void D_close_driver(void)
{
const char *cmd = getenv("GRASS_NOTIFY");
@@ -97,87 +95,12 @@
system(cmd);
}
-/*!
- * \brief select standard color
- *
- * Selects the
- * standard <b>color</b> to be used in subsequent draw commands. The
- * <b>color</b> value is best retrieved using <i>D_translate_color.</i>
- * See Display_Graphics_Library.
- *
- * \param index
- * \return void
- */
-
-void R__standard_color(int index)
+void D__erase(void)
{
- COM_Standard_color(index);
-}
-
-/*!
- * \brief select color
- *
- * When in
- * float mode (see <i>R_color_table_float</i>), this call selects the color
- * most closely matched to the <b>red, grn</b>, and <b>blue</b> intensities
- * requested. These values must be in the range of 0-255.
- *
- * \param red
- * \param grn
- * \param blue
- * \return void
- */
-
-void R__RGB_color(int red, int grn, int blu)
-{
- COM_Color_RGB(red, grn, blu);
-}
-
-/*!
- * \brief change the width of line
- *
- * Changes the <b>width</b> of line to be used in subsequent draw commands.
- *
- * \param width
- * \return void
- */
-
-void R__line_width(double width)
-{
- COM_Line_width(width);
-}
-
-/*!
- * \brief erase screen
- *
- * Erases the entire screen to black.
- *
- * \param void
- * \return void
- */
-
-void R_erase(void)
-{
COM_Erase();
}
/*!
- * \brief move current location
- *
- * Move the current location to the absolute screen coordinate <b>x,y.</b>
- * Nothing is drawn on the screen.
- *
- * \param x
- * \param y
- * \return void
- */
-
-void R__pos_abs(double x, double y)
-{
- COM_Pos_abs(x, y);
-}
-
-/*!
* \brief set text size
*
* Sets text pixel width and height to <b>width</b> and <b>height.</b>
@@ -187,35 +110,17 @@
* \return void
*/
-void R_text_size(double width, double height)
+void D_text_size(double width, double height)
{
COM_Text_size(width, height);
}
-void R_text_rotation(double rotation)
+void D_text_rotation(double rotation)
{
COM_Text_rotation(rotation);
}
/*!
- * \brief set clipping frame
- *
- * Subsequent drawing operations will be clipped to the screen frame
- * defined by <b>top, bottom, left, right.</b>
- *
- * \param t top
- * \param b bottom
- * \param l left
- * \param r right
- * \return void
- */
-
-void set_window(double t, double b, double l, double r)
-{
- COM_Set_window(t, b, l, r);
-}
-
-/*!
* \brief get clipping frame
*
* Retrieve clipping frame
@@ -227,7 +132,7 @@
* \return void
*/
-void R_get_window(double *t, double *b, double *l, double *r)
+void D_get_window(double *t, double *b, double *l, double *r)
{
return COM_Get_window(t, b, l, r);
}
@@ -242,34 +147,12 @@
* \return void
*/
-void R_text(const char *text)
+void D_text(const char *text)
{
COM_Text(text);
}
/*!
- * \brief get text extents
- *
- * The extent of the area enclosing the <b>text</b>
- * is returned in the integer pointers <b>top, bottom, left</b>, and
- * <b>right.</b> No text is actually drawn. This is useful for capturing the
- * text extent so that the text location can be prepared with proper background
- * or border.
- *
- * \param sometext
- * \param t top
- * \param b bottom
- * \param l left
- * \param r right
- * \return void
- */
-
-void R__get_text_box(const char *text, double *t, double *b, double *l, double *r)
-{
- COM_Get_text_box(text, t, b, l, r);
-}
-
-/*!
* \brief choose font
*
* Set current font to <b>font name</b>.
@@ -278,75 +161,23 @@
* \return void
*/
-void R_font(const char *name)
+void D_font(const char *name)
{
COM_Set_font(name);
}
-void R_encoding(const char *name)
+void D_encoding(const char *name)
{
COM_Set_encoding(name);
}
-void R_font_list(char ***list, int *count)
+void D_font_list(char ***list, int *count)
{
COM_Font_list(list, count);
}
-void R_font_info(char ***list, int *count)
+void D_font_info(char ***list, int *count)
{
COM_Font_info(list, count);
}
-void R__begin_scaled_raster(int mask, int src[2][2], double dst[2][2])
-{
- COM_begin_raster(mask, src, dst);
-}
-
-int R__scaled_raster(int n, int row,
- const unsigned char *red, const unsigned char *grn,
- const unsigned char *blu, const unsigned char *nul)
-{
- return COM_raster(n, row, red, grn, blu, nul);
-}
-
-void R__end_scaled_raster(void)
-{
- COM_end_raster();
-}
-
-void R__begin(void)
-{
- COM_Begin();
-}
-
-void R__move(double x, double y)
-{
- COM_Move(x, y);
-}
-
-void R__cont(double x, double y)
-{
- COM_Cont(x, y);
-}
-
-void R__close(void)
-{
- COM_Close();
-}
-
-void R__stroke(void)
-{
- COM_Stroke();
-}
-
-void R__fill(void)
-{
- COM_Fill();
-}
-
-void R__point(double x, double y)
-{
- COM_Point(x, y);
-}
-
Modified: grass/trunk/lib/display/raster.c
===================================================================
--- grass/trunk/lib/display/raster.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/lib/display/raster.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -28,8 +28,8 @@
#include <grass/gis.h>
#include <grass/raster.h>
-#include <grass/display_raster.h>
#include <grass/display.h>
+#include "driver.h"
extern int D__overlay_mode;
@@ -110,8 +110,7 @@
}
A_row =
- R__scaled_raster(ncols, A_row, red, grn, blu,
- D__overlay_mode ? set : NULL);
+ COM_raster(ncols, A_row, red, grn, blu, D__overlay_mode ? set : NULL);
return (A_row < src[1][1])
? A_row : -1;
@@ -137,7 +136,7 @@
/* Set up the screen for drawing map */
D_get_a(src);
D_get_d(dst);
- R__begin_scaled_raster(D__overlay_mode, src, dst);
+ COM_begin_raster(D__overlay_mode, src, dst);
}
int D_draw_raster_RGB(int A_row,
@@ -184,9 +183,8 @@
b_raster = Rast_incr_void_ptr(b_raster, b_size);
}
- A_row =
- R__scaled_raster(ncols, A_row, r_buf, g_buf, b_buf,
- D__overlay_mode ? n_buf : NULL);
+ A_row = COM_raster(ncols, A_row, r_buf, g_buf, b_buf,
+ D__overlay_mode ? n_buf : NULL);
return (A_row < src[1][1])
? A_row : -1;
@@ -194,5 +192,5 @@
void D_cell_draw_end(void)
{
- R__end_scaled_raster();
+ COM_end_raster();
}
Modified: grass/trunk/lib/display/raster2.c
===================================================================
--- grass/trunk/lib/display/raster2.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/lib/display/raster2.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -32,7 +32,6 @@
#include <grass/gis.h>
#include <grass/raster.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
int D__overlay_mode = 0; /* external for now, but to be fixed later */
@@ -139,7 +138,7 @@
int r, g, b;
Rast_get_raster_color(raster, &r, &g, &b, colors, data_type);
- R__RGB_color((unsigned char)r, (unsigned char)g, (unsigned char)b);
+ D_RGB_color((unsigned char)r, (unsigned char)g, (unsigned char)b);
return 0;
}
Modified: grass/trunk/lib/display/setup.c
===================================================================
--- grass/trunk/lib/display/setup.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/lib/display/setup.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -13,7 +13,6 @@
#include <grass/gis.h>
#include <grass/raster.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
/*!
@@ -41,7 +40,7 @@
struct Cell_head region;
double dt, db, dl, dr;
- R_get_window(&dt, &db, &dl, &dr);
+ D_get_window(&dt, &db, &dl, &dr);
G_get_set_window(®ion);
if (Rast_set_window(®ion) < 0)
@@ -71,7 +70,7 @@
{
double dt, db, dl, dr;
- R_get_window(&dt, &db, &dl, &dr);
+ D_get_window(&dt, &db, &dl, &dr);
D_set_src(dt, db, dl, dr);
D_set_dst(dt, db, dl, dr);
@@ -105,7 +104,7 @@
{
double dt, db, dl, dr;
- R_get_window(&dt, &db, &dl, &dr);
+ D_get_window(&dt, &db, &dl, &dr);
D_set_src(st, sb, sl, sr);
D_set_dst(dt, db, dl, dr);
Modified: grass/trunk/lib/display/tran_colr.c
===================================================================
--- grass/trunk/lib/display/tran_colr.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/lib/display/tran_colr.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -7,8 +7,8 @@
#include <grass/display.h>
#include <grass/colors.h>
#include <grass/raster.h>
-#include <grass/display_raster.h>
#include <grass/glocale.h>
+#include "driver.h"
static struct color_rgb *colors;
static int ncolors;
@@ -146,14 +146,14 @@
return 0;
if (color < G_num_standard_colors()) {
- R__standard_color(color);
+ COM_Standard_color(color);
return 1;
}
if (color < ncolors) {
const struct color_rgb *c = &colors[color];
- R__RGB_color(c->r, c->g, c->b);
+ D_RGB_color(c->r, c->g, c->b);
return 1;
}
@@ -213,6 +213,6 @@
void D_RGB_color(int red, int grn, int blu)
{
- R__RGB_color(red, grn, blu);
+ COM_Color_RGB(red, grn, blu);
}
Modified: grass/trunk/lib/display/window.c
===================================================================
--- grass/trunk/lib/display/window.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/lib/display/window.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -7,7 +7,7 @@
#include <grass/colors.h>
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
+#include "driver.h"
void D_erase(const char *color)
{
@@ -21,12 +21,12 @@
D_use_color(colorindex);
/* Do the plotting */
- R__begin();
- R__move(l, b);
- R__cont(r, b);
- R__cont(r, t);
- R__cont(l, t);
- R__close();
- R__fill();
+ COM_Begin();
+ COM_Move(l, b);
+ COM_Cont(r, b);
+ COM_Cont(r, t);
+ COM_Cont(l, t);
+ COM_Close();
+ COM_Fill();
}
Modified: grass/trunk/raster/r.digit/bnw_line.c
===================================================================
--- grass/trunk/raster/r.digit/bnw_line.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/raster/r.digit/bnw_line.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -19,7 +19,6 @@
#include <stdlib.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
int
Modified: grass/trunk/raster/r.digit/get_area.c
===================================================================
--- grass/trunk/raster/r.digit/get_area.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/raster/r.digit/get_area.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -18,7 +18,7 @@
***************************************************************************/
#include <grass/gis.h>
-#include <grass/display_raster.h>
+#include <grass/display.h>
#include "local_proto.h"
Modified: grass/trunk/raster/r.digit/get_circle.c
===================================================================
--- grass/trunk/raster/r.digit/get_circle.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/raster/r.digit/get_circle.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -19,7 +19,7 @@
#include <math.h>
#include <grass/gis.h>
-#include <grass/display_raster.h>
+#include <grass/display.h>
#include "local_proto.h"
Modified: grass/trunk/raster/r.digit/get_label.c
===================================================================
--- grass/trunk/raster/r.digit/get_label.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/raster/r.digit/get_label.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -18,7 +18,7 @@
***************************************************************************/
#include <grass/gis.h>
-#include <grass/display_raster.h>
+#include <grass/display.h>
#include <grass/glocale.h>
Modified: grass/trunk/raster/r.digit/get_line.c
===================================================================
--- grass/trunk/raster/r.digit/get_line.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/raster/r.digit/get_line.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -18,7 +18,7 @@
***************************************************************************/
#include <grass/gis.h>
-#include <grass/display_raster.h>
+#include <grass/display.h>
#include "local_proto.h"
Modified: grass/trunk/raster/r.digit/get_point.c
===================================================================
--- grass/trunk/raster/r.digit/get_point.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/raster/r.digit/get_point.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -18,7 +18,7 @@
***************************************************************************/
#include <stdio.h>
-#include <grass/display_raster.h>
+#include <grass/display.h>
#include "local_proto.h"
Modified: grass/trunk/raster/r.digit/main.c
===================================================================
--- grass/trunk/raster/r.digit/main.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/raster/r.digit/main.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -21,7 +21,7 @@
#include <string.h>
#include <unistd.h>
#include <grass/gis.h>
-#include <grass/display_raster.h>
+#include <grass/display.h>
#include "local_proto.h"
#include <grass/glocale.h>
Modified: grass/trunk/raster/r.his/main.c
===================================================================
--- grass/trunk/raster/r.his/main.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/raster/r.his/main.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -19,7 +19,6 @@
#include <grass/gis.h>
#include <grass/raster.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include "his.h"
#include <grass/glocale.h>
Modified: grass/trunk/raster/r.le/r.le.setup/main.c
===================================================================
--- grass/trunk/raster/r.le/r.le.setup/main.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/raster/r.le/r.le.setup/main.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -28,7 +28,6 @@
#include <grass/config.h>
#include <grass/gis.h>
-#include <grass/display_raster.h>
#include <grass/display.h>
#include <grass/glocale.h>
#include "setup.h"
Modified: grass/trunk/raster/r.le/r.le.setup/mv_wind.c
===================================================================
--- grass/trunk/raster/r.le/r.le.setup/mv_wind.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/raster/r.le/r.le.setup/mv_wind.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -20,7 +20,6 @@
* *
************************************************************/
-#include <grass/display_raster.h>
#include <grass/display.h>
#include "setup.h"
#include <grass/config.h>
Modified: grass/trunk/raster/r.le/r.le.setup/sample.c
===================================================================
--- grass/trunk/raster/r.le/r.le.setup/sample.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/raster/r.le/r.le.setup/sample.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -24,7 +24,6 @@
#include <grass/gis.h>
#include <grass/Vect.h>
#include <grass/config.h>
-#include <grass/display_raster.h>
#include <grass/display.h>
#include <grass/glocale.h>
#include "setup.h"
Modified: grass/trunk/raster/r.le/r.le.setup/setup.c
===================================================================
--- grass/trunk/raster/r.le/r.le.setup/setup.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/raster/r.le/r.le.setup/setup.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -24,7 +24,6 @@
#include <stdlib.h>
#include <unistd.h>
#include <grass/gis.h>
-#include <grass/display_raster.h>
#include <grass/display.h>
#include "setup.h"
#include <grass/config.h>
Modified: grass/trunk/raster/r.le/r.le.trace/main.c
===================================================================
--- grass/trunk/raster/r.le/r.le.trace/main.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/raster/r.le/r.le.trace/main.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -23,7 +23,6 @@
#include <unistd.h>
#include <grass/config.h>
#include <grass/gis.h>
-#include <grass/display_raster.h>
#include <grass/display.h>
#include <grass/glocale.h>
Modified: grass/trunk/raster/r.spread/display.c
===================================================================
--- grass/trunk/raster/r.spread/display.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/raster/r.spread/display.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -5,7 +5,6 @@
#include <grass/gis.h>
#include <grass/raster.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include "cmd_line.h"
#include "local_proto.h"
Modified: grass/trunk/swig/python/Makefile
===================================================================
--- grass/trunk/swig/python/Makefile 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/swig/python/Makefile 2009-06-22 05:09:28 UTC (rev 38015)
@@ -95,7 +95,6 @@
vector_wrap.c: $(GISBASE)/include/grass/vect/dig_defines.h
vector_wrap.c: $(GISBASE)/include/grass/vect/dig_structs.h
display_wrap.c: $(GISBASE)/include/grass/display.h
-display_wrap.c: $(GISBASE)/include/grass/display_raster.h
stats_wrap.c: $(GISBASE)/include/grass/stats.h
dbmi_wrap.c: $(GISBASE)/include/grass/dbmi.h
dbmi_wrap.c: $(GISBASE)/include/grass/proto_dbmi.h
Modified: grass/trunk/vector/v.label/main.c
===================================================================
--- grass/trunk/vector/v.label/main.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/vector/v.label/main.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -16,7 +16,6 @@
#include <math.h>
#include <grass/gis.h>
#include <grass/display.h>
-#include <grass/display_raster.h>
#include <grass/Vect.h>
#include <grass/dbmi.h>
#include <grass/glocale.h>
@@ -229,14 +228,14 @@
/* figure out space param dynamically from current dispay */
/* don't bother if Space was explicitly given (bypasses xmon req) */
if (Along_flag->answer && !Space->answer) {
- if (R_open_driver() != 0) /* connect to the driver */
+ if (D_open_driver() != 0) /* connect to the driver */
G_fatal_error(_("No graphics device selected"));
/* Read in the map region associated with graphics window */
D_setup(0);
space = fontsize / D_get_u_to_d_xconv(); /* in earth units */
- R_close_driver();
+ D_close_driver();
}
}
else
Modified: grass/trunk/vector/v.what/main.c
===================================================================
--- grass/trunk/vector/v.what/main.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/vector/v.what/main.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -23,7 +23,6 @@
#include <grass/glocale.h>
#include <grass/gis.h>
#include <grass/Vect.h>
-#include <grass/display_raster.h>
#include <grass/display.h>
#include <grass/dbmi.h>
#include <grass/glocale.h>
Modified: grass/trunk/vector/v.what/what.c
===================================================================
--- grass/trunk/vector/v.what/what.c 2009-06-22 01:49:13 UTC (rev 38014)
+++ grass/trunk/vector/v.what/what.c 2009-06-22 05:09:28 UTC (rev 38015)
@@ -2,7 +2,6 @@
#include <unistd.h>
#include <math.h>
#include <grass/gis.h>
-#include <grass/display_raster.h>
#include <grass/display.h>
#include <grass/colors.h>
#include <grass/Vect.h>
More information about the grass-commit
mailing list