added sample value to toolbar

4 files changed, 46 insertions, 1 deletions

diff --git a/NEWS b/NEWS
index b96e0f1..1af9717 100755
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@
 * fixed toolbar display bug
 * cleaned up sound record code
 * caught exception causing resume from journal crash
+* added display of sample value to toolbar
 
 25
 * Added invert button to invert time-based waveform
diff --git a/audiograb.py b/audiograb.py
index 89024e0..f9dd512 100755
--- a/audiograb.py
+++ b/audiograb.py
@@ -28,7 +28,6 @@ from struct import unpack
 from string import find
 import config 		#This has all the golabals
 
-
 class AudioGrab():
 
 
@@ -36,6 +35,7 @@ class AudioGrab():
 
         self.callable1 = callable1
         self.ji = journal
+        self.sensor = None
 
         self.temp_buffer = []
         self.picture_buffer = []
@@ -129,6 +129,9 @@ class AudioGrab():
         """Returns state of queueing the buffer"""
         return not self.dont_queue_the_buffer
 
+    def set_sensor(self, sensor):
+        self.sensor = sensor
+
     def _emit_for_logging(self, buf):
         """Sends the data for logging"""
         if self.buffer_interval_logging==0:
@@ -139,7 +142,13 @@ class AudioGrab():
                 self.waveform_id+=1
             else:
                 temp_buf = list(unpack( str(int(len(buf))/2)+'h' , buf))
+                # save value to Journal
                 self.ji.write_value(temp_buf[0])
+                # display value on Sensor toolbar
+                try:
+                    self.sensor.set_sample_value(str(temp_buf[0]))
+                except:
+                    pass
 
     def start_sound_device(self):
         """Start or Restart grabbing data from the audio capture"""
diff --git a/sensor_toolbar.py b/sensor_toolbar.py
index 81d8fc5..519d4df 100644
--- a/sensor_toolbar.py
+++ b/sensor_toolbar.py
@@ -51,6 +51,7 @@ class SensorToolbar(gtk.Toolbar):
 
         self.wave = wave
         self.ag = audiograb
+        self.ag.set_sensor(self)
         self.textbox_copy = textbox
         self.ji = journal
     
@@ -83,6 +84,11 @@ class SensorToolbar(gtk.Toolbar):
         self.wave.set_invert_state(False)
         ######################################################
 
+        separator = gtk.SeparatorToolItem()
+        separator.props.draw = True
+        self.insert(separator, -1)
+        separator.show()
+
         self.loginterval_img = gtk.Image()
         self.loginterval_img.set_from_file(config.ICONS_DIR + \
                                            '/sample_rate.svg')
@@ -119,6 +125,25 @@ class SensorToolbar(gtk.Toolbar):
         self._record.connect('clicked', self.record_control)
         ########################################################
 
+        ##################### Sample Value #####################
+        separator = gtk.SeparatorToolItem()
+        separator.props.draw = False
+        separator.set_expand(True)
+        self.insert(separator, -1)
+        separator.show()
+
+        self.sample_value = gtk.Label("-")
+        self.sample_value.show()
+        self.sample_value_toolitem = gtk.ToolItem()
+        self.sample_value_toolitem.add(self.sample_value)
+        self.insert(self.sample_value_toolitem, -1)
+        self.sample_value_toolitem.show()
+        ########################################################
+
+    def set_sample_value(self, label="x"):
+        self.sample_value.set_text(label)
+        self.sample_value.show()
+
     def record_control(self, data=None):
         """Depending upon the selected interval, does either
         a logging session, or just logs the current buffer"""
diff --git a/sound_toolbar.py b/sound_toolbar.py
index 67fc18e..4d3784a 100644
--- a/sound_toolbar.py
+++ b/sound_toolbar.py
@@ -114,6 +114,11 @@ class SoundToolbar(gtk.Toolbar):
         self.freq_low_img_tool.show()
         self.freq_high_img_tool.show()
 
+        separator = gtk.SeparatorToolItem()
+        separator.props.draw = True
+        self.insert(separator, -1)
+        separator.show()
+
         ################## pause button ####################
         self._pause = ToolButton('media-playback-pause')
         self.insert(self._pause, -1)
@@ -122,6 +127,11 @@ class SoundToolbar(gtk.Toolbar):
         self._pause.connect('clicked', self._pauseplay_control_cb)
         ####################################################
 
+        separator = gtk.SeparatorToolItem()
+        separator.props.draw = True
+        self.insert(separator, -1)
+        separator.show()
+
         self.loginterval_img = gtk.Image()
         self.loginterval_img.set_from_file(config.ICONS_DIR + \
                                            '/sample_rate.svg')