[xiph-commits] r12210 - trunk/sushivision

[xiphmont at svn.xiph.org]

Author: xiphmont
Date: 2006-12-15 05:59:28 -0800 (Fri, 15 Dec 2006)
New Revision: 12210

Modified:
   trunk/sushivision/example_fractal.c
   trunk/sushivision/example_submain.c
   trunk/sushivision/panel-2d.c
   trunk/sushivision/sushivision.h
Log:
replace requirement of x/y rangable flags in dimension declarations
with a flag to specify not to add to x/y selection.

(flag indicates negative instead of positive)



Modified: trunk/sushivision/example_fractal.c
===================================================================
--- trunk/sushivision/example_fractal.c	2006-12-15 07:10:00 UTC (rev 12209)
+++ trunk/sushivision/example_fractal.c	2006-12-15 13:59:28 UTC (rev 12210)
@@ -49,21 +49,17 @@
 
   sushiv_new_dimension(s,0,"Re(c)",
 		       5,(double []){-2.25,-0.75,0,0.25,0.75},
-		       NULL,
-		       SUSHIV_X_RANGE|SUSHIV_Y_RANGE);
+		       NULL,0);
   sushiv_new_dimension(s,1,"Im(c)",
 		       5,(double []){-2,-1,0,1,2},
-		       NULL,
-		       SUSHIV_X_RANGE|SUSHIV_Y_RANGE);
+		       NULL,0);
 
   sushiv_new_dimension(s,2,"Re(z0)",
 		       5,(double []){-2.25,-1,0,1,2.25},
-		       NULL,
-		       SUSHIV_X_RANGE|SUSHIV_Y_RANGE);
+		       NULL,0);
   sushiv_new_dimension(s,3,"Im(z0)",
 		       5,(double []){-2.25,-1,0,1,2.25},
-		       NULL,
-		       SUSHIV_X_RANGE|SUSHIV_Y_RANGE);
+		       NULL,0);
   
   sushiv_new_objective(s,0,"fractal",
 		       4,(double []){0, .01, .1, 1.0},

Modified: trunk/sushivision/example_submain.c
===================================================================
--- trunk/sushivision/example_submain.c	2006-12-15 07:10:00 UTC (rev 12209)
+++ trunk/sushivision/example_submain.c	2006-12-15 13:59:28 UTC (rev 12210)
@@ -88,32 +88,27 @@
   sushiv_new_dimension(s,0,"time",
 		       4,(double []){0,1024,2048,4096},
 		       time_callback,
-		       0);
+		       SUSHIV_NO_X|SUSHIV_NO_Y);
   sushiv_new_dimension(s,1,"blocksize",
 		       8,(double []){64,128,256,512,1024,2048,4096,8192},
 		       blocksize_callback,
-		       0);
+		       SUSHIV_NO_X|SUSHIV_NO_Y);
 
   sushiv_new_dimension(s,2,"amplitude",
 		       9,(double []){-96,-84,-72,-60,-48,-36,-24,-12,0},
-		       NULL,
-		       SUSHIV_X_RANGE|SUSHIV_Y_RANGE);
+		       NULL,0);
   sushiv_new_dimension(s,3,"amplitude delta",
 		       9,(double []){-96,-48,-24,-12,0,12,24,48,96},
-		       NULL,
-		       SUSHIV_X_RANGE|SUSHIV_Y_RANGE);
+		       NULL,0);
   sushiv_new_dimension(s,4,"frequency",
 		       6,(double []){0,.1,.2,.3,.4,.5},
-		       NULL,
-		       SUSHIV_X_RANGE|SUSHIV_Y_RANGE);
+		       NULL,0);
   sushiv_new_dimension(s,5,"phase",
 		       3,(double []){-.5,0,.5},
-		       NULL,
-		       SUSHIV_X_RANGE|SUSHIV_Y_RANGE);
+		       NULL,0);
   sushiv_new_dimension(s,6,"phase delta",
 		       3,(double []){-10,0,10},
-		       NULL,
-		       SUSHIV_X_RANGE|SUSHIV_Y_RANGE);
+		       NULL,0);
   
   sushiv_new_objective(s,0,"fourier",
 		       8,(double []){-96,-48,-36,-24,-12,-6,0,6},

Modified: trunk/sushivision/panel-2d.c
===================================================================
--- trunk/sushivision/panel-2d.c	2006-12-15 07:10:00 UTC (rev 12209)
+++ trunk/sushivision/panel-2d.c	2006-12-15 13:59:28 UTC (rev 12210)
@@ -1426,7 +1426,7 @@
 		     0,0,10,0);
     
     /* x/y radio buttons */
-    if(d->flags & SUSHIV_X_RANGE){
+    if(!(d->flags & SUSHIV_NO_X)){
       if(first_x)
 	p2->dim_xb[i] = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(first_x),"X");
       else{
@@ -1437,7 +1437,7 @@
 		       0,0,10,0);
     }
     
-    if(d->flags & SUSHIV_Y_RANGE){
+    if(!(d->flags & SUSHIV_NO_Y)){
       if(first_y)
 	p2->dim_yb[i] = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(first_y),"Y");
       else

Modified: trunk/sushivision/sushivision.h
===================================================================
--- trunk/sushivision/sushivision.h	2006-12-15 07:10:00 UTC (rev 12209)
+++ trunk/sushivision/sushivision.h	2006-12-15 13:59:28 UTC (rev 12210)
@@ -39,8 +39,8 @@
   void *internal;
 } sushiv_instance_t;
 
-#define SUSHIV_X_RANGE 0x100
-#define SUSHIV_Y_RANGE 0x200
+#define SUSHIV_NO_X 0x100
+#define SUSHIV_NO_Y 0x200
 
 struct sushiv_dimension{ 
   int number;