[GRASS-SVN] r37976 - in grass/trunk: display/d.barscale
display/d.colorlist 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/Make lib lib/display raster/r.digit
raster/r.le/r.le.setup raster/r.le/r.le.trace raster/r.spread
swig/python vector/v.label vector/v.label.sa
svn_grass at osgeo.org
svn_grass at osgeo.org
Fri Jun 19 17:03:03 EDT 2009
Author: martinl
Date: 2009-06-19 17:03:02 -0400 (Fri, 19 Jun 2009)
New Revision: 37976
Added:
grass/trunk/lib/display/r_raster.c
grass/trunk/lib/display/rastergraphicslib.dox
Removed:
grass/trunk/lib/raster/
Modified:
grass/trunk/display/d.barscale/Makefile
grass/trunk/display/d.colorlist/Makefile
grass/trunk/display/d.colors/Makefile
grass/trunk/display/d.colortable/Makefile
grass/trunk/display/d.erase/Makefile
grass/trunk/display/d.extract/Makefile
grass/trunk/display/d.font/Makefile
grass/trunk/display/d.fontlist/Makefile
grass/trunk/display/d.geodesic/Makefile
grass/trunk/display/d.graph/Makefile
grass/trunk/display/d.grid/Makefile
grass/trunk/display/d.his/Makefile
grass/trunk/display/d.histogram/Makefile
grass/trunk/display/d.info/Makefile
grass/trunk/display/d.labels/Makefile
grass/trunk/display/d.legend/Makefile
grass/trunk/display/d.linegraph/Makefile
grass/trunk/display/d.measure/Makefile
grass/trunk/display/d.nviz/Makefile
grass/trunk/display/d.path/Makefile
grass/trunk/display/d.profile/Makefile
grass/trunk/display/d.rast.arrow/Makefile
grass/trunk/display/d.rast.num/Makefile
grass/trunk/display/d.rast/Makefile
grass/trunk/display/d.rgb/Makefile
grass/trunk/display/d.rhumbline/Makefile
grass/trunk/display/d.text/Makefile
grass/trunk/display/d.thematic.area/Makefile
grass/trunk/display/d.title/Makefile
grass/trunk/display/d.vect.chart/Makefile
grass/trunk/display/d.vect/Makefile
grass/trunk/display/d.what.rast/Makefile
grass/trunk/display/d.what.vect/Makefile
grass/trunk/display/d.where/Makefile
grass/trunk/display/d.zoom/Makefile
grass/trunk/imagery/i.class/Makefile
grass/trunk/imagery/i.points/Makefile
grass/trunk/imagery/i.vpoints/Makefile
grass/trunk/include/Make/Grass.make
grass/trunk/lib/Makefile
grass/trunk/lib/display/Makefile
grass/trunk/raster/r.digit/Makefile
grass/trunk/raster/r.le/r.le.setup/Makefile
grass/trunk/raster/r.le/r.le.trace/Makefile
grass/trunk/raster/r.spread/Makefile
grass/trunk/swig/python/Makefile
grass/trunk/vector/v.label.sa/Makefile
grass/trunk/vector/v.label/Makefile
Log:
R_() fns moved to display library
Modified: grass/trunk/display/d.barscale/Makefile
===================================================================
--- grass/trunk/display/d.barscale/Makefile 2009-06-19 20:37:41 UTC (rev 37975)
+++ grass/trunk/display/d.barscale/Makefile 2009-06-19 21:03:02 UTC (rev 37976)
@@ -2,8 +2,8 @@
PGM = d.barscale
-LIBES = $(DISPLAYLIB) $(RASTERLIB) $(GISLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(RASTERDEP) $(GISDEP)
+LIBES = $(DISPLAYLIB) $(GISLIB)
+DEPENDENCIES= $(DISPLAYDEP) $(GISDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/display/d.colorlist/Makefile
===================================================================
--- grass/trunk/display/d.colorlist/Makefile 2009-06-19 20:37:41 UTC (rev 37975)
+++ grass/trunk/display/d.colorlist/Makefile 2009-06-19 21:03:02 UTC (rev 37976)
@@ -2,8 +2,8 @@
PGM = d.colorlist
-LIBES = $(DISPLAYLIB) $(RASTERLIB) $(GISLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(RASTERDEP) $(GISDEP)
+LIBES = $(DISPLAYLIB) $(GISLIB)
+DEPENDENCIES= $(DISPLAYDEP) $(GISDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/display/d.colors/Makefile
===================================================================
--- grass/trunk/display/d.colors/Makefile 2009-06-19 20:37:41 UTC (rev 37975)
+++ grass/trunk/display/d.colors/Makefile 2009-06-19 21:03:02 UTC (rev 37976)
@@ -2,8 +2,8 @@
PGM = d.colors
-LIBES = $(DISPLAYLIB) $(RASTERLIB) $(GISLIB) $(CURSES)
-DEPENDENCIES= $(DISPLAYDEP) $(RASTERDEP) $(GISDEP)
+LIBES = $(DISPLAYLIB) $(GISLIB) $(CURSES)
+DEPENDENCIES= $(DISPLAYDEP) $(GISDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/display/d.colortable/Makefile
===================================================================
--- grass/trunk/display/d.colortable/Makefile 2009-06-19 20:37:41 UTC (rev 37975)
+++ grass/trunk/display/d.colortable/Makefile 2009-06-19 21:03:02 UTC (rev 37976)
@@ -2,8 +2,8 @@
PGM = d.colortable
-LIBES = $(DISPLAYLIB) $(RASTERLIB) $(GISLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(RASTERDEP) $(GISDEP)
+LIBES = $(DISPLAYLIB) $(GISLIB)
+DEPENDENCIES= $(DISPLAYDEP) $(GISDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/display/d.erase/Makefile
===================================================================
--- grass/trunk/display/d.erase/Makefile 2009-06-19 20:37:41 UTC (rev 37975)
+++ grass/trunk/display/d.erase/Makefile 2009-06-19 21:03:02 UTC (rev 37976)
@@ -3,8 +3,8 @@
PGM = d.erase
-LIBES = $(DISPLAYLIB) $(RASTERLIB) $(GISLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(RASTERDEP) $(GISDEP)
+LIBES = $(DISPLAYLIB) $(GISLIB)
+DEPENDENCIES= $(DISPLAYDEP) $(GISDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/display/d.extract/Makefile
===================================================================
--- grass/trunk/display/d.extract/Makefile 2009-06-19 20:37:41 UTC (rev 37975)
+++ grass/trunk/display/d.extract/Makefile 2009-06-19 21:03:02 UTC (rev 37976)
@@ -2,8 +2,8 @@
PGM = d.extract
-LIBES = $(DISPLAYLIB) $(RASTERLIB) $(VECTLIB) $(GISLIB) $(DATETIMELIB)
-DEPENDENCIES= $(VECTDEP) $(GISDEP) $(DISPLAYDEP) $(RASTERDEP) $(DATETIMEDEP)
+LIBES = $(DISPLAYLIB) $(VECTLIB) $(GISLIB) $(DATETIMELIB)
+DEPENDENCIES= $(VECTDEP) $(GISDEP) $(DISPLAYDEP) $(DATETIMEDEP)
EXTRA_INC = $(VECT_INC)
EXTRA_CFLAGS = $(VECT_CFLAGS)
Modified: grass/trunk/display/d.font/Makefile
===================================================================
--- grass/trunk/display/d.font/Makefile 2009-06-19 20:37:41 UTC (rev 37975)
+++ grass/trunk/display/d.font/Makefile 2009-06-19 21:03:02 UTC (rev 37976)
@@ -2,8 +2,8 @@
PGM = d.font
-LIBES = $(DISPLAYLIB) $(RASTERLIB) $(GISLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(RASTERDEP) $(GISDEP)
+LIBES = $(DISPLAYLIB) $(GISLIB)
+DEPENDENCIES= $(DISPLAYDEP) $(GISDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/display/d.fontlist/Makefile
===================================================================
--- grass/trunk/display/d.fontlist/Makefile 2009-06-19 20:37:41 UTC (rev 37975)
+++ grass/trunk/display/d.fontlist/Makefile 2009-06-19 21:03:02 UTC (rev 37976)
@@ -2,8 +2,8 @@
PGM = d.fontlist
-LIBES = $(RASTERLIB) $(GISLIB)
-DEPENDENCIES= $(RASTERDEP) $(GISDEP)
+LIBES = $(DISPLAYLIB) $(GISLIB)
+DEPENDENCIES= $(GISDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/display/d.geodesic/Makefile
===================================================================
--- grass/trunk/display/d.geodesic/Makefile 2009-06-19 20:37:41 UTC (rev 37975)
+++ grass/trunk/display/d.geodesic/Makefile 2009-06-19 21:03:02 UTC (rev 37976)
@@ -2,8 +2,8 @@
PGM = d.geodesic
-LIBES = $(DISPLAYLIB) $(RASTERLIB) $(GISLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(RASTERDEP) $(GISDEP)
+LIBES = $(DISPLAYLIB) $(GISLIB)
+DEPENDENCIES= $(DISPLAYDEP) $(GISDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/display/d.graph/Makefile
===================================================================
--- grass/trunk/display/d.graph/Makefile 2009-06-19 20:37:41 UTC (rev 37975)
+++ grass/trunk/display/d.graph/Makefile 2009-06-19 21:03:02 UTC (rev 37976)
@@ -2,8 +2,8 @@
PGM = d.graph
-LIBES = $(SYMBLIB) $(DISPLAYLIB) $(RASTERLIB) $(GISLIB)
-DEPENDENCIES= $(SYMBDEP) $(DISPLAYDEP) $(RASTERDEP) $(GISDEP)
+LIBES = $(SYMBLIB) $(DISPLAYLIB) $(GISLIB)
+DEPENDENCIES= $(SYMBDEP) $(DISPLAYDEP) $(GISDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/display/d.grid/Makefile
===================================================================
--- grass/trunk/display/d.grid/Makefile 2009-06-19 20:37:41 UTC (rev 37975)
+++ grass/trunk/display/d.grid/Makefile 2009-06-19 21:03:02 UTC (rev 37976)
@@ -2,8 +2,8 @@
PGM = d.grid
-LIBES = $(SYMBLIB) $(DISPLAYLIB) $(RASTERLIB) $(GPROJLIB) $(GISLIB)
-DEPENDENCIES= $(SYMBDEP) $(DISPLAYDEP) $(RASTERDEP) $(GPROJDEP) $(GISDEP)
+LIBES = $(SYMBLIB) $(DISPLAYLIB) $(GPROJLIB) $(GISLIB)
+DEPENDENCIES= $(SYMBDEP) $(DISPLAYDEP) $(GPROJDEP) $(GISDEP)
EXTRA_INC = $(PROJINC)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/display/d.his/Makefile
===================================================================
--- grass/trunk/display/d.his/Makefile 2009-06-19 20:37:41 UTC (rev 37975)
+++ grass/trunk/display/d.his/Makefile 2009-06-19 21:03:02 UTC (rev 37976)
@@ -2,8 +2,8 @@
PGM = d.his
-LIBES = $(DISPLAYLIB) $(RASTERLIB) $(GISLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(RASTERDEP) $(GISDEP)
+LIBES = $(DISPLAYLIB) $(GISLIB)
+DEPENDENCIES= $(DISPLAYDEP) $(GISDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/display/d.histogram/Makefile
===================================================================
--- grass/trunk/display/d.histogram/Makefile 2009-06-19 20:37:41 UTC (rev 37975)
+++ grass/trunk/display/d.histogram/Makefile 2009-06-19 21:03:02 UTC (rev 37976)
@@ -2,8 +2,8 @@
PGM = d.histogram
-LIBES = $(DISPLAYLIB) $(RASTERLIB) $(GISLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(RASTERDEP) $(GISDEP)
+LIBES = $(DISPLAYLIB) $(GISLIB)
+DEPENDENCIES= $(DISPLAYDEP) $(GISDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/display/d.info/Makefile
===================================================================
--- grass/trunk/display/d.info/Makefile 2009-06-19 20:37:41 UTC (rev 37975)
+++ grass/trunk/display/d.info/Makefile 2009-06-19 21:03:02 UTC (rev 37976)
@@ -2,8 +2,8 @@
PGM = d.info
-LIBES = $(DISPLAYLIB) $(RASTERLIB) $(GISLIB)
-DEPENDENCIES = $(DISPLAYDEP) $(RASTERDEP) $(GISDEP)
+LIBES = $(DISPLAYLIB) $(GISLIB)
+DEPENDENCIES = $(DISPLAYDEP) $(GISDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/display/d.labels/Makefile
===================================================================
--- grass/trunk/display/d.labels/Makefile 2009-06-19 20:37:41 UTC (rev 37975)
+++ grass/trunk/display/d.labels/Makefile 2009-06-19 21:03:02 UTC (rev 37976)
@@ -3,9 +3,9 @@
PGM = d.labels
-LIBES = $(DISPLAYLIB) $(RASTERLIB) $(GISLIB)
+LIBES = $(DISPLAYLIB) $(GISLIB)
-DEPENDENCIES = $(DISPLAYDEP) $(RASTERDEP) $(GISDEP)
+DEPENDENCIES = $(DISPLAYDEP) $(GISDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/display/d.legend/Makefile
===================================================================
--- grass/trunk/display/d.legend/Makefile 2009-06-19 20:37:41 UTC (rev 37975)
+++ grass/trunk/display/d.legend/Makefile 2009-06-19 21:03:02 UTC (rev 37976)
@@ -2,8 +2,8 @@
PGM = d.legend
-LIBES = $(DISPLAYLIB) $(RASTERLIB) $(GISLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(RASTERDEP) $(GISDEP)
+LIBES = $(DISPLAYLIB) $(GISLIB)
+DEPENDENCIES= $(DISPLAYDEP) $(GISDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/display/d.linegraph/Makefile
===================================================================
--- grass/trunk/display/d.linegraph/Makefile 2009-06-19 20:37:41 UTC (rev 37975)
+++ grass/trunk/display/d.linegraph/Makefile 2009-06-19 21:03:02 UTC (rev 37976)
@@ -2,8 +2,8 @@
PGM = d.linegraph
-LIBES = $(DISPLAYLIB) $(RASTERLIB) $(GISLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(RASTERDEP) $(GISDEP)
+LIBES = $(DISPLAYLIB) $(GISLIB)
+DEPENDENCIES= $(DISPLAYDEP) $(GISDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/display/d.measure/Makefile
===================================================================
--- grass/trunk/display/d.measure/Makefile 2009-06-19 20:37:41 UTC (rev 37975)
+++ grass/trunk/display/d.measure/Makefile 2009-06-19 21:03:02 UTC (rev 37976)
@@ -2,8 +2,8 @@
PGM = d.measure
-LIBES = $(DISPLAYLIB) $(RASTERLIB) $(GISLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(RASTERDEP) $(GISDEP)
+LIBES = $(DISPLAYLIB) $(GISLIB)
+DEPENDENCIES= $(DISPLAYDEP) $(GISDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/display/d.nviz/Makefile
===================================================================
--- grass/trunk/display/d.nviz/Makefile 2009-06-19 20:37:41 UTC (rev 37975)
+++ grass/trunk/display/d.nviz/Makefile 2009-06-19 21:03:02 UTC (rev 37976)
@@ -2,9 +2,9 @@
PGM = d.nviz
-LIBES = $(DISPLAYLIB) $(RASTERLIB) $(GISLIB)
+LIBES = $(DISPLAYLIB) $(GISLIB)
-DEPENDENCIES = $(DISPLAYDEP) $(RASTERDEP) $(GISDEP)
+DEPENDENCIES = $(DISPLAYDEP) $(GISDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/display/d.path/Makefile
===================================================================
--- grass/trunk/display/d.path/Makefile 2009-06-19 20:37:41 UTC (rev 37975)
+++ grass/trunk/display/d.path/Makefile 2009-06-19 21:03:02 UTC (rev 37976)
@@ -3,8 +3,8 @@
PGM = d.path
-LIBES = $(DISPLAYLIB) $(RASTERLIB) $(VECTLIB) $(GRAPHLIB) $(DBMILIB) $(GISLIB)
-DEPENDENCIES = $(DISPLAYDEP) $(RASTERDEP) $(VECTDEP) $(DBMIDEP) $(GISDEP)
+LIBES = $(DISPLAYLIB) $(VECTLIB) $(GRAPHLIB) $(DBMILIB) $(GISLIB)
+DEPENDENCIES = $(DISPLAYDEP) $(VECTDEP) $(DBMIDEP) $(GISDEP)
EXTRA_INC = $(VECT_INC)
EXTRA_CFLAGS = $(VECT_CFLAGS)
Modified: grass/trunk/display/d.profile/Makefile
===================================================================
--- grass/trunk/display/d.profile/Makefile 2009-06-19 20:37:41 UTC (rev 37975)
+++ grass/trunk/display/d.profile/Makefile 2009-06-19 21:03:02 UTC (rev 37976)
@@ -2,8 +2,8 @@
PGM = d.profile
-LIBES = $(DISPLAYLIB) $(RASTERLIB) $(GISLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(RASTERDEP) $(GISDEP)
+LIBES = $(DISPLAYLIB) $(GISLIB)
+DEPENDENCIES= $(DISPLAYDEP) $(GISDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/display/d.rast/Makefile
===================================================================
--- grass/trunk/display/d.rast/Makefile 2009-06-19 20:37:41 UTC (rev 37975)
+++ grass/trunk/display/d.rast/Makefile 2009-06-19 21:03:02 UTC (rev 37976)
@@ -3,9 +3,9 @@
PGM = d.rast
-LIBES = $(DISPLAYLIB) $(RASTERLIB) $(GISLIB)
+LIBES = $(DISPLAYLIB) $(GISLIB)
-DEPENDENCIES = $(DISPLAYDEP) $(RASTERDEP) $(GISDEP)
+DEPENDENCIES = $(DISPLAYDEP) $(GISDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/display/d.rast.arrow/Makefile
===================================================================
--- grass/trunk/display/d.rast.arrow/Makefile 2009-06-19 20:37:41 UTC (rev 37975)
+++ grass/trunk/display/d.rast.arrow/Makefile 2009-06-19 21:03:02 UTC (rev 37976)
@@ -2,8 +2,8 @@
PGM = d.rast.arrow
-LIBES = $(DISPLAYLIB) $(RASTERLIB) $(GISLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(RASTERDEP) $(GISDEP)
+LIBES = $(DISPLAYLIB) $(GISLIB)
+DEPENDENCIES= $(DISPLAYDEP) $(GISDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/display/d.rast.num/Makefile
===================================================================
--- grass/trunk/display/d.rast.num/Makefile 2009-06-19 20:37:41 UTC (rev 37975)
+++ grass/trunk/display/d.rast.num/Makefile 2009-06-19 21:03:02 UTC (rev 37976)
@@ -2,8 +2,8 @@
PGM = d.rast.num
-LIBES = $(DISPLAYLIB) $(RASTERLIB) $(GISLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(RASTERDEP) $(GISDEP)
+LIBES = $(DISPLAYLIB) $(GISLIB)
+DEPENDENCIES= $(DISPLAYDEP) $(GISDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/display/d.rgb/Makefile
===================================================================
--- grass/trunk/display/d.rgb/Makefile 2009-06-19 20:37:41 UTC (rev 37975)
+++ grass/trunk/display/d.rgb/Makefile 2009-06-19 21:03:02 UTC (rev 37976)
@@ -2,8 +2,8 @@
PGM = d.rgb
-LIBES = $(DISPLAYLIB) $(RASTERLIB) $(GISLIB)
-DEPLIBS= $(DISPLAYDEP) $(RASTERDEP) $(GISDEP)
+LIBES = $(DISPLAYLIB) $(GISLIB)
+DEPLIBS= $(DISPLAYDEP) $(GISDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/display/d.rhumbline/Makefile
===================================================================
--- grass/trunk/display/d.rhumbline/Makefile 2009-06-19 20:37:41 UTC (rev 37975)
+++ grass/trunk/display/d.rhumbline/Makefile 2009-06-19 21:03:02 UTC (rev 37976)
@@ -2,8 +2,8 @@
PGM = d.rhumbline
-LIBES = $(DISPLAYLIB) $(RASTERLIB) $(GISLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(RASTERDEP) $(GISDEP)
+LIBES = $(DISPLAYLIB) $(GISLIB)
+DEPENDENCIES= $(DISPLAYDEP) $(GISDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/display/d.text/Makefile
===================================================================
--- grass/trunk/display/d.text/Makefile 2009-06-19 20:37:41 UTC (rev 37975)
+++ grass/trunk/display/d.text/Makefile 2009-06-19 21:03:02 UTC (rev 37976)
@@ -2,8 +2,8 @@
PGM = d.text
-LIBES = $(DISPLAYLIB) $(RASTERLIB) $(GISLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(RASTERDEP) $(GISDEP)
+LIBES = $(DISPLAYLIB) $(GISLIB)
+DEPENDENCIES= $(DISPLAYDEP) $(GISDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/display/d.thematic.area/Makefile
===================================================================
--- grass/trunk/display/d.thematic.area/Makefile 2009-06-19 20:37:41 UTC (rev 37975)
+++ grass/trunk/display/d.thematic.area/Makefile 2009-06-19 21:03:02 UTC (rev 37976)
@@ -3,8 +3,8 @@
PGM = d.thematic.area
-LIBES = $(ARRAYSTATSLIB) $(DISPLAYLIB) $(RASTERLIB) $(VECTLIB) $(DBMILIB) $(GISLIB) $(SYMBLIB)
-DEPENDENCIES = $(ARRAYSTATSDEP) $(DISPLAYDEP) $(RASTERDEP) $(VECTDEP) $(DBMIDEP) $(GISDEP) $(SYMBDEP)
+LIBES = $(ARRAYSTATSLIB) $(DISPLAYLIB) $(VECTLIB) $(DBMILIB) $(GISLIB) $(SYMBLIB)
+DEPENDENCIES = $(ARRAYSTATSDEP) $(DISPLAYDEP) $(VECTDEP) $(DBMIDEP) $(GISDEP) $(SYMBDEP)
EXTRA_INC = $(VECT_INC)
EXTRA_CFLAGS = $(VECT_CFLAGS)
Modified: grass/trunk/display/d.title/Makefile
===================================================================
--- grass/trunk/display/d.title/Makefile 2009-06-19 20:37:41 UTC (rev 37975)
+++ grass/trunk/display/d.title/Makefile 2009-06-19 21:03:02 UTC (rev 37976)
@@ -2,8 +2,8 @@
PGM = d.title
-LIBES = $(DISPLAYLIB) $(RASTERLIB) $(GISLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(RASTERDEP) $(GISDEP)
+LIBES = $(DISPLAYLIB) $(GISLIB)
+DEPENDENCIES= $(DISPLAYDEP) $(GISDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/display/d.vect/Makefile
===================================================================
--- grass/trunk/display/d.vect/Makefile 2009-06-19 20:37:41 UTC (rev 37975)
+++ grass/trunk/display/d.vect/Makefile 2009-06-19 21:03:02 UTC (rev 37976)
@@ -3,8 +3,8 @@
PGM = d.vect
-LIBES = $(DISPLAYLIB) $(RASTERLIB) $(VECTLIB) $(DBMILIB) $(GISLIB) $(SYMBLIB)
-DEPENDENCIES = $(DISPLAYDEP) $(RASTERDEP) $(VECTDEP) $(DBMIDEP) $(GISDEP) $(SYMBDEP)
+LIBES = $(DISPLAYLIB) $(VECTLIB) $(DBMILIB) $(GISLIB) $(SYMBLIB)
+DEPENDENCIES = $(DISPLAYDEP) $(VECTDEP) $(DBMIDEP) $(GISDEP) $(SYMBDEP)
EXTRA_INC = $(VECT_INC)
EXTRA_CFLAGS = $(VECT_CFLAGS)
Modified: grass/trunk/display/d.vect.chart/Makefile
===================================================================
--- grass/trunk/display/d.vect.chart/Makefile 2009-06-19 20:37:41 UTC (rev 37975)
+++ grass/trunk/display/d.vect.chart/Makefile 2009-06-19 21:03:02 UTC (rev 37976)
@@ -3,8 +3,8 @@
PGM = d.vect.chart
-LIBES = $(DISPLAYLIB) $(RASTERLIB) $(VECTLIB) $(DBMILIB) $(GISLIB)
-DEPENDENCIES = $(DISPLAYDEP) $(RASTERDEP) $(VECTDEP) $(DBMIDEP) $(GISDEP)
+LIBES = $(DISPLAYLIB) $(VECTLIB) $(DBMILIB) $(GISLIB)
+DEPENDENCIES = $(DISPLAYDEP) $(VECTDEP) $(DBMIDEP) $(GISDEP)
EXTRA_INC = $(VECT_INC)
EXTRA_CFLAGS = $(VECT_CFLAGS)
Modified: grass/trunk/display/d.what.rast/Makefile
===================================================================
--- grass/trunk/display/d.what.rast/Makefile 2009-06-19 20:37:41 UTC (rev 37975)
+++ grass/trunk/display/d.what.rast/Makefile 2009-06-19 21:03:02 UTC (rev 37976)
@@ -3,9 +3,9 @@
PGM = d.what.rast
-LIBES = $(DISPLAYLIB) $(RASTERLIB) $(GISLIB)
+LIBES = $(DISPLAYLIB) $(GISLIB)
-DEPENDENCIES = $(DISPLAYDEP) $(RASTERDEP) $(GISDEP)
+DEPENDENCIES = $(DISPLAYDEP) $(GISDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/display/d.what.vect/Makefile
===================================================================
--- grass/trunk/display/d.what.vect/Makefile 2009-06-19 20:37:41 UTC (rev 37975)
+++ grass/trunk/display/d.what.vect/Makefile 2009-06-19 21:03:02 UTC (rev 37976)
@@ -3,9 +3,9 @@
PGM = d.what.vect
-LIBES = $(DISPLAYLIB) $(RASTERLIB) $(VECTLIB) $(FORMLIB) $(DBMILIB) $(GISLIB)
+LIBES = $(DISPLAYLIB) $(VECTLIB) $(FORMLIB) $(DBMILIB) $(GISLIB)
-DEPENDENCIES = $(DISPLAYDEP) $(RASTERDEP) $(VECTDEP) $(DBMIDEP) $(FORMDEP) $(GISDEP)
+DEPENDENCIES = $(DISPLAYDEP) $(VECTDEP) $(DBMIDEP) $(FORMDEP) $(GISDEP)
EXTRA_CFLAGS = $(VECT_CFLAGS)
EXTRA_INC = $(VECT_INC)
Modified: grass/trunk/display/d.where/Makefile
===================================================================
--- grass/trunk/display/d.where/Makefile 2009-06-19 20:37:41 UTC (rev 37975)
+++ grass/trunk/display/d.where/Makefile 2009-06-19 21:03:02 UTC (rev 37976)
@@ -2,8 +2,8 @@
PGM = d.where
-LIBES = $(DISPLAYLIB) $(RASTERLIB) $(GPROJLIB) $(GISLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(RASTERDEP) $(GPROJDEP) $(GISDEP)
+LIBES = $(DISPLAYLIB) $(GPROJLIB) $(GISLIB)
+DEPENDENCIES= $(DISPLAYDEP) $(GPROJDEP) $(GISDEP)
EXTRA_INC = $(PROJINC)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/display/d.zoom/Makefile
===================================================================
--- grass/trunk/display/d.zoom/Makefile 2009-06-19 20:37:41 UTC (rev 37975)
+++ grass/trunk/display/d.zoom/Makefile 2009-06-19 21:03:02 UTC (rev 37976)
@@ -3,8 +3,8 @@
PGM = d.zoom
-LIBES = $(DISPLAYLIB) $(RASTERLIB) $(VECTLIB) $(GISLIB) $(DATETIMELIB)
-DEPENDENCIES= $(VECTDEP) $(GISDEP) $(DISPLAYDEP) $(RASTERDEP) $(DATETIMEDEP)
+LIBES = $(DISPLAYLIB) $(VECTLIB) $(GISLIB) $(DATETIMELIB)
+DEPENDENCIES= $(VECTDEP) $(GISDEP) $(DISPLAYDEP) $(DATETIMEDEP)
EXTRA_INC = $(VECT_INC)
EXTRA_CFLAGS = $(VECT_CFLAGS)
Modified: grass/trunk/imagery/i.class/Makefile
===================================================================
--- grass/trunk/imagery/i.class/Makefile 2009-06-19 20:37:41 UTC (rev 37975)
+++ grass/trunk/imagery/i.class/Makefile 2009-06-19 21:03:02 UTC (rev 37976)
@@ -2,8 +2,8 @@
PGM = i.class
-LIBES = $(IMAGERYLIB) $(DISPLAYLIB) $(RASTERLIB) $(GISLIB) $(GMATHLIB)
-DEPENDENCIES= $(IMAGERYDEP) $(DISPLAYDEP) $(RASTERDEP) $(GISDEP) $(GMATHDEP)
+LIBES = $(IMAGERYLIB) $(DISPLAYLIB) $(GISLIB) $(GMATHLIB)
+DEPENDENCIES= $(IMAGERYDEP) $(DISPLAYDEP) $(GISDEP) $(GMATHDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/imagery/i.points/Makefile
===================================================================
--- grass/trunk/imagery/i.points/Makefile 2009-06-19 20:37:41 UTC (rev 37975)
+++ grass/trunk/imagery/i.points/Makefile 2009-06-19 21:03:02 UTC (rev 37976)
@@ -2,8 +2,8 @@
PGM = i.points
-LIBES = $(IMAGERYLIB) $(DISPLAYLIB) $(RASTERLIB) $(GMATHLIB) $(GISLIB) $(CURSES)
-DEPENDENCIES= $(IMAGERYDEP) $(DISPLAYDEP) $(RASTERDEP) $(GMATHDEP) $(GISDEP)
+LIBES = $(IMAGERYLIB) $(DISPLAYLIB) $(GMATHLIB) $(GISLIB) $(CURSES)
+DEPENDENCIES= $(IMAGERYDEP) $(DISPLAYDEP) $(GMATHDEP) $(GISDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/imagery/i.vpoints/Makefile
===================================================================
--- grass/trunk/imagery/i.vpoints/Makefile 2009-06-19 20:37:41 UTC (rev 37975)
+++ grass/trunk/imagery/i.vpoints/Makefile 2009-06-19 21:03:02 UTC (rev 37976)
@@ -2,8 +2,8 @@
PGM = i.vpoints
-LIBES = $(IMAGERYLIB) $(SYMBLIB) $(DISPLAYLIB) $(RASTERLIB) $(VECTLIB) $(GISLIB) $(CURSES) $(GMATHLIB)
-DEPENDENCIES= $(IMAGERYDEP) $(SYMBDEP) $(DISPLAYDEP) $(RASTERDEP) $(VECTDEP) $(GISDEP) $(GMATHDEP)
+LIBES = $(IMAGERYLIB) $(SYMBLIB) $(DISPLAYLIB) $(VECTLIB) $(GISLIB) $(CURSES) $(GMATHLIB)
+DEPENDENCIES= $(IMAGERYDEP) $(SYMBDEP) $(DISPLAYDEP) $(VECTDEP) $(GISDEP) $(GMATHDEP)
EXTRA_INC = $(VECT_INC)
EXTRA_CFLAGS = $(VECT_CFLAGS)
Modified: grass/trunk/include/Make/Grass.make
===================================================================
--- grass/trunk/include/Make/Grass.make 2009-06-19 20:37:41 UTC (rev 37975)
+++ grass/trunk/include/Make/Grass.make 2009-06-19 21:03:02 UTC (rev 37976)
@@ -135,7 +135,6 @@
LINKM_LIBNAME = grass_linkm
LOCK_LIBNAME = grass_lock
MANAGE_LIBNAME = grass_manage
-RASTER_LIBNAME = grass_raster
ROWIO_LIBNAME = grass_rowio
SEGMENT_LIBNAME = grass_segment
STATS_LIBNAME = grass_stats
@@ -210,7 +209,7 @@
COORCNVLIB = -l$(COORCNV_LIBNAME)
DATETIMELIB = -l$(DATETIME_LIBNAME)
DBDIALOGLIB = -l$(DBDIALOG_LIBNAME)
-DISPLAYLIB = -l$(DISPLAY_LIBNAME) $(GISLIB) $(RASTERLIB)
+DISPLAYLIB = -l$(DISPLAY_LIBNAME) $(GISLIB) $(PNGDRIVERLIB) $(PSDRIVERLIB) $(DRIVERLIB)
DLGLIB = -l$(DLG_LIBNAME)
DSPFLIB = -l$(DSPF_LIBNAME)
DRIVERLIB = -l$(DRIVER_LIBNAME) $(GISLIB) $(FTLIB) $(ICONVLIB)
@@ -232,7 +231,6 @@
LINKMLIB = -l$(LINKM_LIBNAME)
LOCKLIB = -l$(LOCK_LIBNAME)
MANAGELIB = -l$(MANAGE_LIBNAME)
-RASTERLIB = -l$(RASTER_LIBNAME) $(PNGDRIVERLIB) $(PSDRIVERLIB) $(DRIVERLIB) $(GISLIB)
ROWIOLIB = -l$(ROWIO_LIBNAME)
SEGMENTLIB = -l$(SEGMENT_LIBNAME) $(GISLIB)
STATSLIB = -l$(STATS_LIBNAME) $(GISLIB)
@@ -328,7 +326,6 @@
IORTHODEP = $(BASE_LIBDIR)/$(LIB_PREFIX)$(IORTHO_LIBNAME)$(LIB_SUFFIX)
LINKMDEP = $(BASE_LIBDIR)/$(LIB_PREFIX)$(LINKM_LIBNAME)$(LIB_SUFFIX)
LOCKDEP = $(BASE_LIBDIR)/$(LIB_PREFIX)$(LOCK_LIBNAME)$(LIB_SUFFIX)
-RASTERDEP = $(BASE_LIBDIR)/$(LIB_PREFIX)$(RASTER_LIBNAME)$(LIB_SUFFIX)
ROWIODEP = $(BASE_LIBDIR)/$(LIB_PREFIX)$(ROWIO_LIBNAME)$(LIB_SUFFIX)
SEGMENTDEP = $(BASE_LIBDIR)/$(LIB_PREFIX)$(SEGMENT_LIBNAME)$(LIB_SUFFIX)
STATSDEP = $(BASE_LIBDIR)/$(LIB_PREFIX)$(STATS_LIBNAME)$(LIB_SUFFIX)
Modified: grass/trunk/lib/Makefile
===================================================================
--- grass/trunk/lib/Makefile 2009-06-19 20:37:41 UTC (rev 37975)
+++ grass/trunk/lib/Makefile 2009-06-19 21:03:02 UTC (rev 37976)
@@ -13,7 +13,6 @@
psdriver \
htmldriver \
cairodriver \
- raster \
bitmap \
btree \
display \
Modified: grass/trunk/lib/display/Makefile
===================================================================
--- grass/trunk/lib/display/Makefile 2009-06-19 20:37:41 UTC (rev 37975)
+++ grass/trunk/lib/display/Makefile 2009-06-19 21:03:02 UTC (rev 37976)
@@ -1,8 +1,13 @@
MODULE_TOPDIR = ../..
-EXTRA_LIBS=$(GISLIB) $(RASTERLIB)
+EXTRA_LIBS=$(GISLIB) $(DRIVERLIB) $(PNGDRIVERLIB) $(PSDRIVERLIB) $(HTMLDRIVERLIB)
EXTRA_INC = -I../driver
+ifneq ($(USE_CAIRO),)
+EXTRA_LIBS += $(CAIRODRIVERLIB)
+EXTRA_CFLAGS += -DUSE_CAIRO
+endif
+
LIB_NAME = $(DISPLAY_LIBNAME)
include $(MODULE_TOPDIR)/include/Make/Lib.make
Copied: grass/trunk/lib/display/r_raster.c (from rev 37974, grass/trunk/lib/raster/raster.c)
===================================================================
--- grass/trunk/lib/display/r_raster.c (rev 0)
+++ grass/trunk/lib/display/r_raster.c 2009-06-19 21:03:02 UTC (rev 37976)
@@ -0,0 +1,362 @@
+
+#include <grass/config.h>
+
+#include <errno.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <grass/gis.h>
+#include <grass/glocale.h>
+#include <grass/raster.h>
+
+#include "driver.h"
+
+
+extern const struct driver *PNG_Driver(void);
+extern const struct driver *PS_Driver(void);
+extern const struct driver *HTML_Driver(void);
+#ifdef USE_CAIRO
+extern const struct driver *Cairo_Driver(void);
+#endif
+
+static void init(void)
+{
+ const char *fenc = getenv("GRASS_ENCODING");
+ const char *font = getenv("GRASS_FONT");
+ const char *line_width = getenv("GRASS_LINE_WIDTH");
+ const char *text_size = getenv("GRASS_TEXT_SIZE");
+ const char *frame = getenv("GRASS_FRAME");
+
+ R_font(font ? font : "romans");
+
+ if (fenc)
+ R_encoding(fenc);
+
+ if (line_width)
+ R_line_width(atof(line_width));
+
+ if (text_size) {
+ double s = atof(text_size);
+ R_text_size(s, s);
+ }
+
+ R_text_rotation(0);
+
+ if (frame) {
+ double t, b, l, r;
+ sscanf(frame, "%lf,%lf,%lf,%lf", &t, &b, &l, &r);
+ R_set_window(t, b, l, r);
+ }
+}
+
+int R_open_driver(void)
+{
+ const char *p = getenv("GRASS_RENDER_IMMEDIATE");
+ const struct driver *drv =
+ (p && G_strcasecmp(p, "PNG") == 0) ? PNG_Driver() :
+ (p && G_strcasecmp(p, "PS") == 0) ? PS_Driver() :
+ (p && G_strcasecmp(p, "HTML") == 0) ? HTML_Driver() :
+#ifdef USE_CAIRO
+ (p && G_strcasecmp(p, "cairo") == 0) ? Cairo_Driver() :
+ Cairo_Driver();
+#else
+ PNG_Driver();
+#endif
+
+ LIB_init(drv);
+
+ init();
+
+ return 0;
+}
+
+void R_close_driver(void)
+{
+ const char *cmd = getenv("GRASS_NOTIFY");
+
+ COM_Graph_close();
+
+ if (cmd)
+ 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)
+{
+ 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 fill a box
+ *
+ * A box is drawn in the current color using the coordinates <b>x1,y1</b> and
+ * <b>x2,y2</b> as opposite corners of the box. The current location is undefined
+ * afterwards
+ *
+ * \param x1
+ * \param y1
+ * \param x2
+ * \param y2
+ * \return void
+ */
+
+void R_box_abs(double x1, double y1, double x2, double y2)
+{
+ COM_Box_abs(x1, y1, x2, y2);
+}
+
+/*!
+ * \brief set text size
+ *
+ * Sets text pixel width and height to <b>width</b> and <b>height.</b>
+ *
+ * \param width
+ * \param height
+ * \return void
+ */
+
+void R_text_size(double width, double height)
+{
+ COM_Text_size(width, height);
+}
+
+void R_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 R_set_window(double t, double b, double l, double r)
+{
+ COM_Set_window(t, b, l, r);
+}
+
+/*!
+ * \brief get clipping frame
+ *
+ * Retrieve clipping frame
+ *
+ * \param t top
+ * \param b bottom
+ * \param l left
+ * \param r right
+ * \return void
+ */
+
+void R_get_window(double *t, double *b, double *l, double *r)
+{
+ return COM_Get_window(t, b, l, r);
+}
+
+/*!
+ * \brief write text
+ *
+ * Writes <b>text</b> in the current color and font, at the current text
+ * width and height, starting at the current screen location.
+ *
+ * \param sometext
+ * \return void
+ */
+
+void R_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>.
+ *
+ * \param name
+ * \return void
+ */
+
+void R_font(const char *name)
+{
+ COM_Set_font(name);
+}
+
+void R_encoding(const char *name)
+{
+ COM_Set_encoding(name);
+}
+
+void R_font_list(char ***list, int *count)
+{
+ COM_Font_list(list, count);
+}
+
+void R_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_bitmap(int ncols, int nrows, int threshold, const unsigned char *buf)
+{
+ COM_Bitmap(ncols, nrows, threshold, buf);
+}
+
+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);
+}
+
Copied: grass/trunk/lib/display/rastergraphicslib.dox (from rev 37974, grass/trunk/lib/raster/rastergraphicslib.dox)
===================================================================
--- grass/trunk/lib/display/rastergraphicslib.dox (rev 0)
+++ grass/trunk/lib/display/rastergraphicslib.dox 2009-06-19 21:03:02 UTC (rev 37976)
@@ -0,0 +1,139 @@
+/*! \page rastergraphicslib GRASS Raster Graphics Library
+
+\section intro Introduction
+
+The <i>Raster Graphics Library</i> provides the programmer with access to
+the GRASS graphics devices. <b>All video graphics calls are made
+through this library (directly or indirectly)</b>. No
+standard/portable GRASS video graphics module drives any video display
+directly. This library provides a powerful, but limited number of graphics
+capabilities to the programmer. The tremendous benefit of this approach is
+seen in the ease with which GRASS graphics applications modules port to new
+machines or devices. Because no device-dependent code exists in application
+programs, virtually all GRASS graphics modules port without modification.
+Each graphics device must be provided a driver (or translator program). At
+run-time, GRASS graphics modules rendezvous with a user-selected driver
+module. Two significant prices are paid in this approach to graphics: 1)
+graphics displays run significantly slower, and 2) the programmer does not
+have access to fancy (and sometimes more efficient) resident library
+routines that have been specially created for the device.
+
+This library uses a couple of simple concepts. First, there is the idea of a
+current screen location. There is nothing which appears on the graphics
+monitor to indicate the current location, but many graphic commands begin
+their graphics at this location. It can, of course, be set explicitly.
+Second, there is always a current color. Many graphic commands will do their
+work in the currently chosen color. The programmer always works in the
+screen coordinate system. Unlike many graphics libraries developed to
+support CAD, there is no concept of a world coordinate system. The
+programmer must address graphics requests to explicit screen locations. This
+is necessary, especially in the interest of fast raster graphics.
+
+The upper left hand corner of the screen is the origin. The actual pixel
+rows and columns which define the edge of the video surface are returned
+with calls to <i>R_screen_left()</i>, <i>R_screen_rite(),
+R_screen_bot(), and R_screen_top().</i>
+
+<b>Note.</b> All routines and global variables in this library, documented
+or undocumented, start with the prefix <b>R_.</b> To avoid name
+conflicts, programmers should not create variables or routines in their own
+modules which use this prefix.
+
+
+\section conn Connecting to the Driver
+
+Before any other graphics calls can be made, a successful connection to a
+running and selected graphics driver must be made.
+
+- R_open_driver()
+
+- R_close_driver()
+
+\section col Colors
+
+Colors are set using integer values in the range of 0-255 to set the
+<b>red, green</b>, and <b>blue</b> intensities.
+
+- R_standard_color()
+
+- R_RGB_color()
+
+\section basic Basic Graphics
+
+- R_box_abs()
+
+- R_erase()
+
+\section poly Poly Calls
+
+In many cases strings of points are used to describe a complex line, a series of
+dots, or a solid polygon.
+
+- R_polydots_abs()
+
+- R_polygon_abs()
+
+- R_polyline_abs()
+
+\section text Text
+
+These calls provide access to built-in vector fonts which may be sized and
+clipped to the programmer's specifications.
+
+- R_set_window()
+
+- R_font()
+
+- R_text_size()
+
+- R_text()
+
+- R_get_text_box()
+
+\section font GRASS font support
+
+The current mechanism of GRASS font support is this (all files are in the
+directory display/drivers/lib unless stated otherwise):
+
+<ul>
+<li> A client calls R_font(), which sends the filename
+ ($GISBASE/fonts/font_name) to the display driver using the FONT command. See
+ lib/raster/Font.c.
+
+<li> The display driver receives the FONT command and the filename. See
+ command.c.
+
+<li> It passes the filename to Font_get() (Font_get.c), which passes it to
+ init_font() (font.c), which reads the file into memory.
+
+<li> A client draws text by calling R_text (lib/raster/Text.c), which
+ sends the string to the display driver using the TEXT command.
+
+<li> The display driver receives the TEXT command and the string. See command.c
+ (again).
+
+<li> It passes the string to Text() (Text.c) which calls soft_text() with the
+ string and several stored parameters.
+
+<li> soft_text() (Text2.c) calls drawchar() (same file), to draw each
+ character.
+
+<li> drawchar() calls get_char_vects() (font.c) to retrieve the actual vector
+ definitions. It then draws the character using text_move() and text_draw()
+ (same file), which use the Move_abs() and Cont_abs() functions (these are
+ implemented separately by each display driver, e.g. XDRIVER).
+</ul>
+
+\section load Loading the Raster Graphics Library
+
+The library is loaded by specifying $ (RASTERLIB) in the Makefile.
+
+<b>Note.</b> This library must be loaded with $(GISLIB) since it uses
+routines from that library. See \ref GIS_Library for details on that
+library. This library is usually loaded with the $(DISPLAYLIB). See
+\ref Display_Graphics_Library for details on that library.
+
+See \ref Compiling_and_Installing_GRASS_Modules for a complete
+discussion of Makefiles.
+
+*/
Modified: grass/trunk/raster/r.digit/Makefile
===================================================================
--- grass/trunk/raster/r.digit/Makefile 2009-06-19 20:37:41 UTC (rev 37975)
+++ grass/trunk/raster/r.digit/Makefile 2009-06-19 21:03:02 UTC (rev 37976)
@@ -2,8 +2,8 @@
PGM = r.digit
-LIBES = $(DISPLAYLIB) $(RASTERLIB) $(GISLIB)
-DEPENDENCIES = $(DISPLAYDEP) $(RASTERDEP) $(GISDEP)
+LIBES = $(DISPLAYLIB) $(GISLIB)
+DEPENDENCIES = $(DISPLAYDEP) $(GISDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.le/r.le.setup/Makefile
===================================================================
--- grass/trunk/raster/r.le/r.le.setup/Makefile 2009-06-19 20:37:41 UTC (rev 37975)
+++ grass/trunk/raster/r.le/r.le.setup/Makefile 2009-06-19 21:03:02 UTC (rev 37976)
@@ -2,8 +2,8 @@
PGM = r.le.setup
-LIBES = $(DISPLAYLIB) $(RASTERLIB) $(SITESLIB) $(VECTLIB) $(GISLIB) $(DATETIMELIB)
-DEPENDENCIES = $(RASTERDEP) $(DISPLAYDEP) $(SITESDEP) $(VECTDEP) $(GISDEP) $(DATETIMEDEP)
+LIBES = $(DISPLAYLIB) $(SITESLIB) $(VECTLIB) $(GISLIB) $(DATETIMELIB)
+DEPENDENCIES = $(DISPLAYDEP) $(SITESDEP) $(VECTDEP) $(GISDEP) $(DATETIMEDEP)
EXTRA_INC = $(VECT_INC)
EXTRA_CFLAGS = $(VECT_CFLAGS)
CLEAN_SUBDIRS = polytocell
Modified: grass/trunk/raster/r.le/r.le.trace/Makefile
===================================================================
--- grass/trunk/raster/r.le/r.le.trace/Makefile 2009-06-19 20:37:41 UTC (rev 37975)
+++ grass/trunk/raster/r.le/r.le.trace/Makefile 2009-06-19 21:03:02 UTC (rev 37976)
@@ -2,8 +2,8 @@
PGM = r.le.trace
-LIBES = $(DISPLAYLIB) $(RASTERLIB) $(GISLIB)
-DEPENDENCIES = $(DISPLAYDEP) $(RASTERDEP) $(GISDEP)
+LIBES = $(DISPLAYLIB) $(GISLIB)
+DEPENDENCIES = $(DISPLAYDEP) $(GISDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/r.spread/Makefile
===================================================================
--- grass/trunk/raster/r.spread/Makefile 2009-06-19 20:37:41 UTC (rev 37975)
+++ grass/trunk/raster/r.spread/Makefile 2009-06-19 21:03:02 UTC (rev 37976)
@@ -6,8 +6,8 @@
MOD_OBJS := $(filter-out display.o,$(AUTO_OBJS))
-# LIBES = $(DISPLAYLIB) $(RASTERLIB) $(GISLIB)
-# DEPENDENCIES = $(DISPLAYDEP) $(RASTERDEP) $(GISDEP)
+# LIBES = $(DISPLAYLIB) $(GISLIB)
+# DEPENDENCIES = $(DISPLAYDEP) $(GISDEP)
LIBES = $(GISLIB)
DEPENDENCIES = $(GISDEP)
Modified: grass/trunk/swig/python/Makefile
===================================================================
--- grass/trunk/swig/python/Makefile 2009-06-19 20:37:41 UTC (rev 37975)
+++ grass/trunk/swig/python/Makefile 2009-06-19 21:03:02 UTC (rev 37976)
@@ -19,7 +19,6 @@
proj_LIBS = $(GPROJLIB)
imagery_LIBS = $(IMAGERYLIB)
vector_LIBS = $(VECTLIB)
-raster_LIBS = $(RASTERLIB)
display_LIBS = $(DISPLAYLIB)
stats_LIBS = $(STATSLIB)
dbmi_LIBS = $(DBMILIB)
Modified: grass/trunk/vector/v.label/Makefile
===================================================================
--- grass/trunk/vector/v.label/Makefile 2009-06-19 20:37:41 UTC (rev 37975)
+++ grass/trunk/vector/v.label/Makefile 2009-06-19 21:03:02 UTC (rev 37976)
@@ -3,8 +3,8 @@
PGM = v.label
-LIBES = $(DISPLAYLIB) $(RASTERLIB) $(VECTLIB) $(GISLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(RASTERDEP) $(VECTDEP) $(GISDEP)
+LIBES = $(DISPLAYLIB) $(VECTLIB) $(GISLIB)
+DEPENDENCIES= $(DISPLAYDEP) $(VECTDEP) $(GISDEP)
EXTRA_INC = $(VECT_INC)
EXTRA_CFLAGS = $(VECT_CFLAGS)
Modified: grass/trunk/vector/v.label.sa/Makefile
===================================================================
--- grass/trunk/vector/v.label.sa/Makefile 2009-06-19 20:37:41 UTC (rev 37975)
+++ grass/trunk/vector/v.label.sa/Makefile 2009-06-19 21:03:02 UTC (rev 37976)
@@ -3,8 +3,8 @@
PGM = v.label.sa
-LIBES = $(DISPLAYLIB) $(RASTERLIB) $(VECTLIB) $(GISLIB) $(FTLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(RASTERDEP) $(VECTDEP) $(GISDEP)
+LIBES = $(DISPLAYLIB) $(VECTLIB) $(GISLIB) $(FTLIB)
+DEPENDENCIES= $(DISPLAYDEP) $(VECTDEP) $(GISDEP)
EXTRA_INC = $(VECT_INC) $(FTINC)
EXTRA_CFLAGS = $(VECT_CFLAGS)
More information about the grass-commit
mailing list