[xiph-commits] r18435 - trunk/spectrum

[xiphmont at svn.xiph.org]

Author: xiphmont
Date: 2012-07-01 12:58:26 -0700 (Sun, 01 Jul 2012)
New Revision: 18435

Modified:
   trunk/spectrum/version.h
   trunk/spectrum/wave_panel.c
Log:
Remove vestigal scale label code



Modified: trunk/spectrum/version.h
===================================================================
--- trunk/spectrum/version.h	2012-07-01 19:49:17 UTC (rev 18434)
+++ trunk/spectrum/version.h	2012-07-01 19:58:26 UTC (rev 18435)
@@ -1,2 +1,2 @@
 #define VERSION "$Id$ "
-/* DO NOT EDIT: Automated versioning hack [Sun Jul  1 15:48:57 EDT 2012] */
+/* DO NOT EDIT: Automated versioning hack [Sun Jul  1 15:57:37 EDT 2012] */

Modified: trunk/spectrum/wave_panel.c
===================================================================
--- trunk/spectrum/wave_panel.c	2012-07-01 19:49:17 UTC (rev 18434)
+++ trunk/spectrum/wave_panel.c	2012-07-01 19:58:26 UTC (rev 18435)
@@ -46,9 +46,6 @@
 GtkWidget *scalemenu;
 GtkWidget *rangemenu;
 
-GtkWidget *scale_label1;
-GtkWidget *scale_label2;
-
 int plot_ch=0;
 int plot_inputs=0;
 
@@ -176,23 +173,6 @@
     }
     replot();
   }
-
-#if 0
-  {
-    char b[80];
-    if(plot_schoice==0)
-      if(plot_range/2>=.99){
-        snprintf(b,80,"%gFS/div ",plot_range/2);
-      }else if(plot_range/2>=.00099){
-        snprintf(b,80,"%gmFS/div ",plot_range*500);
-      }else{
-        snprintf(b,80,"%g\xCE\xBC""FS/div ",plot_range*500000);
-      }
-    else
-      snprintf(b,80,"%.2gdBFS/div ",todB((plot_range)-todB(plot_scale))/2);
-    gtk_label_set_text(GTK_LABEL(scale_label1),b);
-  }
-#endif
 }
 
 static void scalechange(GtkWidget *widget,gpointer in){
@@ -311,17 +291,6 @@
 
   replot();
 
-#if 0
-  {
-    char b[80];
-    if(plot_span>=10000){
-      snprintf(b,80,"%gms/div",plot_span/10000.);
-    }else{
-      snprintf(b,80,"%g\xCE\xBCs/div",plot_span/10.);
-    }
-    gtk_label_set_text(GTK_LABEL(scale_label2),b);
-  }
-#endif
 }
 
 static void intervalchange(GtkWidget *widget,gpointer in){
@@ -603,28 +572,6 @@
     gtk_widget_add_accelerator (trace_sep, "activate", group, GDK_s, 0, 0);
   }
 
-  /* plot informational labels */
-  {
-    char buf[80];
-    GtkWidget *al=gtk_alignment_new(1,.5,0,0);
-    GtkWidget *box=gtk_hbox_new(0,2);
-    GtkWidget *text1=gtk_label_new("scales:");
-    GtkWidget *text2=scale_label1=gtk_label_new("");
-    GtkWidget *text3=scale_label2=gtk_label_new("");
-
-    gtk_table_attach(GTK_TABLE (lefttable), al,2,3,1,2,GTK_FILL,GTK_FILL,0,0);
-    gtk_container_add(GTK_CONTAINER (al),box);
-
-    gtk_box_pack_end(GTK_BOX(box),text3,0,0,0);
-    gtk_box_pack_end(GTK_BOX(box),text2,0,0,0);
-    gtk_box_pack_end(GTK_BOX(box),text1,0,0,0);
-
-    gtk_widget_set_name(text1,"top-label");
-    gtk_widget_set_name(text2,"top-readout");
-    gtk_widget_set_name(text3,"top-readout");
-
-  }
-
   /* add the waveform plot box */
   plot=plot_new();
   gtk_table_attach_defaults (GTK_TABLE (lefttable), plot,1,3,2,3);