[xiph-commits] r12469 - trunk/sushivision

[xiphmont at svn.xiph.org]

Author: xiphmont
Date: 2007-02-14 00:55:59 -0800 (Wed, 14 Feb 2007)
New Revision: 12469

Modified:
   trunk/sushivision/panel-1d.c
Log:
Back out unneccasry change in 1d panels (scale guarding message)



Modified: trunk/sushivision/panel-1d.c
===================================================================
--- trunk/sushivision/panel-1d.c	2007-02-14 08:53:01 UTC (rev 12468)
+++ trunk/sushivision/panel-1d.c	2007-02-14 08:55:59 UTC (rev 12469)
@@ -580,13 +580,10 @@
   int w = plot->w.allocation.width;
   int h = plot->w.allocation.height;
   int dw = w;
-  int dwt;
   sushiv_panel_t *link = (p1->link_x ? p1->link_x : p1->link_y);
   sushiv_panel2d_t *p2 = (link?link->subtype->p2:NULL);
   int i,j;
 
-  scalespace sx,sx_v,sx_i,sy;
-
   if(p1->link_x){
     dw = p2->x_v.pixels;
     p1->x_d = p2->x_d;
@@ -600,55 +597,40 @@
 
   if(plot && GTK_WIDGET_REALIZED(GTK_WIDGET(plot))){
     if(p1->flip){
-      dwt = _sushiv_dimension_scales(p1->x_d, 
+      dw = _sushiv_dimension_scales(p1->x_d, 
 				    p1->x_d->bracket[1],
 				    p1->x_d->bracket[0],
 				    h,dw,
 				    plot->scalespacing,
 				    p1->x_d->name,
-				    &sx,
-				    &sx_v,
-				    &sx_i);
+				    &p1->x,
+				    &p1->x_v,
+				    &p1->x_i);
       
-      sy = scalespace_linear(p1->range_bracket[0],
-			     p1->range_bracket[1],
-			     w,
-			     plot->scalespacing,
-			     p1->range_scale->legend);
-    
+      p1->y = scalespace_linear(p1->range_bracket[0],
+				p1->range_bracket[1],
+				w,
+				plot->scalespacing,
+				p1->range_scale->legend);
+      
     }else{
-      dwt = _sushiv_dimension_scales(p1->x_d, 
+      dw = _sushiv_dimension_scales(p1->x_d, 
 				    p1->x_d->bracket[0],
 				    p1->x_d->bracket[1],
 				    w,dw,
 				    plot->scalespacing,
 				    p1->x_d->name,
-				    &sx,
-				    &sx_v,
-				    &sx_i);
+				    &p1->x,
+				    &p1->x_v,
+				    &p1->x_i);
 
-      sy = scalespace_linear(p1->range_bracket[1],
-			     p1->range_bracket[0],
-			     h,
-			     plot->scalespacing,
-			     p1->range_scale->legend);
+      p1->y = scalespace_linear(p1->range_bracket[1],
+				p1->range_bracket[0],
+				h,
+				plot->scalespacing,
+				p1->range_scale->legend);
     }
-    
-    if(sx.massaged || sx_v.massaged || sx_i.massaged){
-      fprintf(stderr,"\nX axis resolution exceeded; keeping old X.\n");
-    }else{
-      p1->x = sx;
-      p1->x_v = sx_v;
-      p1->x_i = sx_i;
-      dw=dwt;
-    }
 
-    if(sy.massaged){
-      fprintf(stderr,"\nY axis resolution exceeded; keeping old Y.\n");
-    }else{
-      p1->y = sy;
-    }
-
     if(p1->data_size != dw){
       if(p1->data_vec){