[GRASS-SVN] r33099 - grass/trunk/raster/wildfire/r.spread

[svn_grass at osgeo.org]

Author: glynn
Date: 2008-08-26 17:01:42 -0400 (Tue, 26 Aug 2008)
New Revision: 33099

Modified:
   grass/trunk/raster/wildfire/r.spread/Makefile
   grass/trunk/raster/wildfire/r.spread/collect_ori.c
   grass/trunk/raster/wildfire/r.spread/main.c
   grass/trunk/raster/wildfire/r.spread/spread.c
Log:
Disable live display feature


Modified: grass/trunk/raster/wildfire/r.spread/Makefile
===================================================================
--- grass/trunk/raster/wildfire/r.spread/Makefile	2008-08-26 20:45:41 UTC (rev 33098)
+++ grass/trunk/raster/wildfire/r.spread/Makefile	2008-08-26 21:01:42 UTC (rev 33099)
@@ -2,9 +2,15 @@
 
 PGM = r.spread
 
-LIBES = $(DISPLAYLIB) $(RASTERLIB) $(GISLIB)
-DEPENDENCIES = $(DISPLAYDEP) $(RASTERDEP) $(GISDEP)
+include $(MODULE_TOPDIR)/include/Make/Vars.make
 
+MOD_OBJS := $(filter-out display.o,$(AUTO_OBJS))
+
+# LIBES = $(DISPLAYLIB) $(RASTERLIB) $(GISLIB)
+# DEPENDENCIES = $(DISPLAYDEP) $(RASTERDEP) $(GISDEP)
+LIBES = $(GISLIB)
+DEPENDENCIES = $(GISDEP)
+
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
 default: cmd

Modified: grass/trunk/raster/wildfire/r.spread/collect_ori.c
===================================================================
--- grass/trunk/raster/wildfire/r.spread/collect_ori.c	2008-08-26 20:45:41 UTC (rev 33098)
+++ grass/trunk/raster/wildfire/r.spread/collect_ori.c	2008-08-26 21:01:42 UTC (rev 33099)
@@ -81,8 +81,10 @@
 		if (y_out)
 		    DATA(map_y_out, row, col) = row;
 		/*DEBUG printf("\norigin: row=%d col=%d\n", row, col); */
+#if 0
 		if (display)
 		    draw_a_burning_cell(row, col);
+#endif
 	    }
 	    else {
 		DATA(map_out, row, col) = neg;

Modified: grass/trunk/raster/wildfire/r.spread/main.c
===================================================================
--- grass/trunk/raster/wildfire/r.spread/main.c	2008-08-26 20:45:41 UTC (rev 33098)
+++ grass/trunk/raster/wildfire/r.spread/main.c	2008-08-26 21:01:42 UTC (rev 33099)
@@ -238,7 +238,11 @@
 
     flag.display = G_define_flag();
     flag.display->key = 'd';
+#if 0
     flag.display->description = _("DISPLAY 'live' spread process on screen");
+#else
+    flag.display->description = _("Live display - currently DISABLED");
+#endif
 
     flag.spotting = G_define_flag();
     flag.spotting->key = 's';
@@ -258,8 +262,11 @@
 		    "in future. Please use '--verbose' instead."));
     }
 
-
     display = flag.display->answer;
+#if 1
+    if (display)
+	G_fatal_error(_("The display feature is disabled"));
+#endif
     spotting = flag.spotting->answer;
 
     max_layer = parm.max->answer;
@@ -351,8 +358,10 @@
     window.ew_res = 100 * window.ew_res;
 
     /* Initialize display screens */
+#if 0
     if (display)
 	display_init();
+#endif
 
     /*  Check if input layers exists in data base  */
 
@@ -561,8 +570,10 @@
     }
 
     /* close graphics */
+#if 0
     if (display)
 	display_close();
+#endif
 
     exit(EXIT_SUCCESS);
 }

Modified: grass/trunk/raster/wildfire/r.spread/spread.c
===================================================================
--- grass/trunk/raster/wildfire/r.spread/spread.c	2008-08-26 20:45:41 UTC (rev 33098)
+++ grass/trunk/raster/wildfire/r.spread/spread.c	2008-08-26 21:01:42 UTC (rev 33099)
@@ -127,9 +127,11 @@
 
 	/*mark a visited cell */
 	DATA(map_visit, pres_cell->row, pres_cell->col) = YES;
+#if 0
 	if (display)
 	    draw_a_cell(pres_cell->row, pres_cell->col,
 			(int)pres_cell->min_cost);
+#endif
 
 	cell_count++;
 	if ((100 * cell_count / ncells) % 2 == 0 &&
@@ -258,8 +260,10 @@
 	    DATA(map_y_out, row, col) = pres_cell->row;
 
 	insertHa(min_cost, angle, row, col, heap, &heap_len);
+#if 0
 	if (display && min_cost < init_time + time_lag + 1.0)
 	    draw_a_burning_cell(row, col);
+#endif
     }
     else {
 	if (DATA(map_out, row, col) > min_cost + 0.001) {
@@ -272,8 +276,10 @@
 		DATA(map_y_out, row, col) = pres_cell->row;
 
 	    replaceHa(min_cost, angle, row, col, heap, &heap_len);
+#if 0
 	    if (display && min_cost < init_time + time_lag + 1.0)
 		draw_a_burning_cell(row, col);
+#endif
 	}
     }
 }