[xiph-commits] r12299 - trunk/sushivision

[xiphmont at svn.xiph.org]

Author: xiphmont
Date: 2007-01-03 18:24:09 -0800 (Wed, 03 Jan 2007)
New Revision: 12299

Modified:
   trunk/sushivision/panel-1d.c
   trunk/sushivision/panel-1d.h
Log:
Remove point-mode disabling 'feature'; even in non-discrete,
non-linked I could see it still being occasionally useful.



Modified: trunk/sushivision/panel-1d.c
===================================================================
--- trunk/sushivision/panel-1d.c	2007-01-04 00:16:55 UTC (rev 12298)
+++ trunk/sushivision/panel-1d.c	2007-01-04 02:24:09 UTC (rev 12299)
@@ -101,7 +101,7 @@
 	int linetype = p1->linetype[j];
 	int pointtype = p1->pointtype[j];
 	u_int32_t color = mapping_calc(p1->mappings+j,1.,0);
-	
+
 	if(data_vec){
 	  double xv[dw];
 	  double yv[dw];
@@ -501,7 +501,7 @@
 
 static void update_x_sel(sushiv_panel_t *p){
   sushiv_panel1d_t *p1 = p->subtype->p1;
-  int i, flag=0;
+  int i;
 
   // enable/disable dimension slider thumbs
   // enable/disable objective 'point' dropdowns
@@ -514,10 +514,6 @@
       p1->x_d = p->dimension_list[i].d;
       p1->x_scale = p->private->dim_scales[i];
       p1->x_dnum = i;
-
-      // don't have linked panels to worry about here
-      if(p1->x_d->type == SUSHIV_DIM_DISCRETE)
-	flag = 1;
     }
     if(p1->dim_xb[i] &&
        gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(p1->dim_xb[i]))){
@@ -530,10 +526,6 @@
       _sushiv_dim_widget_set_thumb_active(p->private->dim_scales[i],2,0);
     }
   } 
-
-  p1->pointactive = flag;
-  for(i=0;i<p->objectives;i++)
-    gtk_combo_box_set_active(GTK_COMBO_BOX(p1->point_pulldowns[i]),flag);
 }
 
 static void compute_1d(sushiv_panel_t *p, 
@@ -1530,7 +1522,6 @@
 				       structure must be hidden */
   p->subtype->p1 = p1;
   p->type = SUSHIV_PANEL_1D;
-  p1->pointactive = 1;
   p1->range_scale = scale;
 
   if(flags && SUSHIV_PANEL_LINK_Y)

Modified: trunk/sushivision/panel-1d.h
===================================================================
--- trunk/sushivision/panel-1d.h	2007-01-04 00:16:55 UTC (rev 12298)
+++ trunk/sushivision/panel-1d.h	2007-01-04 02:24:09 UTC (rev 12299)
@@ -49,7 +49,6 @@
   Slider *range_slider;
   double range_bracket[2];
   
-  int pointactive;
   mapping *mappings;
   int *linetype;
   int *pointtype;