[GRASS-SVN] r52082 - grass-addons/grass7/imagery/i.segment

[svn_grass at osgeo.org]

Author: momsen
Date: 2012-06-15 09:32:58 -0700 (Fri, 15 Jun 2012)
New Revision: 52082

Modified:
   grass-addons/grass7/imagery/i.segment/create_isegs.c
   grass-addons/grass7/imagery/i.segment/parse_args.c
Log:
compiles without error, region_growing() quits part way now.  Will write linked list test code...

Modified: grass-addons/grass7/imagery/i.segment/create_isegs.c
===================================================================
--- grass-addons/grass7/imagery/i.segment/create_isegs.c	2012-06-15 16:26:44 UTC (rev 52081)
+++ grass-addons/grass7/imagery/i.segment/create_isegs.c	2012-06-15 16:32:58 UTC (rev 52082)
@@ -36,7 +36,7 @@
 	successflag = io_debug(files, functions);	/* TODO: why does it want `&files` in main, but `files` here ??? */
     else if (functions->method == 1) {
 	G_debug(1, "starting region_growing()");
-	//      successflag = region_growing(files, functions);
+	successflag = region_growing(files, functions);
     }
 
     /* end outer loop for processing polygons */

Modified: grass-addons/grass7/imagery/i.segment/parse_args.c
===================================================================
--- grass-addons/grass7/imagery/i.segment/parse_args.c	2012-06-15 16:26:44 UTC (rev 52081)
+++ grass-addons/grass7/imagery/i.segment/parse_args.c	2012-06-15 16:32:58 UTC (rev 52082)
@@ -33,7 +33,7 @@
     method->type = TYPE_STRING;
     method->required = NO;
     method->answer = "region_growing";
-    method->options = "region_growing, io_debug";	/*io_debug just writes row+col to each output pixel */
+    method->options = "region_growing, io_debug, ll_test";	/*io_debug just writes row+col to each output pixel, ll_test for testing linked list data structure */
     method->description = _("Segmentation method.");
 
     threshold = G_define_option();
@@ -96,6 +96,8 @@
 	functions->method = 0;
     else if (strncmp(method->answer, "region_growing", 10) == 0)
 	functions->method = 1;
+    else if (strncmp(method->answer, "ll_list", 5) == 0)
+	functions->method = 2;
     else
 	G_fatal_error("Couldn't assign segmentation method.");	/*shouldn't be able to get here */