[xiph-commits] r18245 - trunk/spectrum

[xiphmont at svn.xiph.org]

Author: xiphmont
Date: 2012-04-22 22:32:31 -0700 (Sun, 22 Apr 2012)
New Revision: 18245

Modified:
   trunk/spectrum/spec_panel.c
   trunk/spectrum/spec_plot.c
   trunk/spectrum/version.h
Log:
Fix a pango layout bug on log X scale
remove 'sample noise floor' button until such time that it's implemented


Modified: trunk/spectrum/spec_panel.c
===================================================================
--- trunk/spectrum/spec_panel.c	2012-04-22 02:27:21 UTC (rev 18244)
+++ trunk/spectrum/spec_panel.c	2012-04-23 05:32:31 UTC (rev 18245)
@@ -579,7 +579,7 @@
   /* scale */
   {
     GtkWidget *menu=gtk_combo_box_new_text();
-    char *entries[]={"single-pixel","1/24th octave","1/12th octave","1/3 octave"};
+    char *entries[]={"unsmoothed","1/24th octave","1/12th octave","1/3 octave"};
     for(i=0;i<4;i++)
       gtk_combo_box_append_text (GTK_COMBO_BOX (menu), entries[i]);
     gtk_combo_box_set_active(GTK_COMBO_BOX(menu),plot_res);
@@ -699,12 +699,14 @@
   }
 
   /* noise floor */
+#if 0
   {
     GtkWidget *button=gtk_toggle_button_new_with_mnemonic("sample _noise floor");
     gtk_widget_add_accelerator (button, "activate", panel->group, GDK_n, 0, 0);
     g_signal_connect (G_OBJECT (button), "toggled", G_CALLBACK (noise), panel);
     gtk_box_pack_start(GTK_BOX(bbox),button,0,0,0);
   }
+#endif
 
   gtk_box_pack_end(GTK_BOX(rightbox),bbox,0,0,0);
   gtk_box_pack_start(GTK_BOX(mainbox),rightbox,0,0,0);

Modified: trunk/spectrum/spec_plot.c
===================================================================
--- trunk/spectrum/spec_plot.c	2012-04-22 02:27:21 UTC (rev 18244)
+++ trunk/spectrum/spec_plot.c	2012-04-23 05:32:31 UTC (rev 18245)
@@ -29,9 +29,9 @@
 #include "spec_plot.h"
 
 static double log_lfreqs[5]={10.,100.,1000.,10000.,100000};
-static double log_llfreqs[18]={10.,20.,30.,50.,100.,200.,300.,500.,
+static double log_llfreqs[15]={10.,20.,30.,50.,100.,200.,300.,500.,
                               1000.,2000.,3000.,5000.,10000.,
-                              20000.,30000.,50000.,100000};
+                              20000.,30000.};
 static double log_tfreqs[37]={5.,6.,7.,8.,9.,20.,30.,40.,50.,60.,70.,80.,90.
 			 ,200.,300.,400.,500.,600.,700.,800.,900.,
 			 2000.,3000.,4000.,5000.,6000.,7000.,8000.,9000.,
@@ -94,7 +94,7 @@
         if(log_lfreqs[i]<(nyq-.1))
           p->xgrids=i+1;
       }
-      for(i=0;i<18;i++){
+      for(i=0;i<15;i++){
         if(log_llfreqs[i]<(nyq-.1))
           p->xlgrids=i+1;
       }
@@ -874,12 +874,12 @@
   }
   /* log X scale */
   {
-    char *labels[17]={"10Hz","20Hz","30Hz","50Hz","100Hz",
+    char *labels[15]={"10Hz","20Hz","30Hz","50Hz","100Hz",
                      "200Hz","300Hz","500Hz","1kHz",
                      "2kHz","3kHz","5kHz","10kHz",
-                     "20kHz","30kHz",""};
-    p->log_layout=calloc(18,sizeof(*p->log_layout));
-    for(i=0;i<17;i++)
+                     "20kHz","30kHz"};
+    p->log_layout=calloc(16,sizeof(*p->log_layout));
+    for(i=0;i<15;i++)
       p->log_layout[i]=gtk_widget_create_pango_layout(ret,labels[i]);
   }
   /* Impedence Y scale */

Modified: trunk/spectrum/version.h
===================================================================
--- trunk/spectrum/version.h	2012-04-22 02:27:21 UTC (rev 18244)
+++ trunk/spectrum/version.h	2012-04-23 05:32:31 UTC (rev 18245)
@@ -1,2 +1,2 @@
 #define VERSION "$Id$ "
-/* DO NOT EDIT: Automated versioning hack [Sat Apr 21 22:27:03 EDT 2012] */
+/* DO NOT EDIT: Automated versioning hack [Mon Apr 23 01:09:25 EDT 2012] */