Add flush button

diff --git a/vis/logger.py b/vis/logger.py
index 81e34919d13ea502d75ad483012306cb589c85af..84b6e0d5e24d3da740dd75287bddfb84a5bd3065 100644 (file)
--- a/vis/logger.py
+++ b/vis/logger.py
@@ -51,6 +51,9 @@ class Logger:
                        stream.datapoints = points
                        return stream
 
+               if not self.running() or len(self.queue) == 0:
+                       return
+
                self.feed.datastreams = [
                        get(self.queue, 'acc'),
                        get(self.queue, 'mag'),

diff --git a/vis/visual.py b/vis/visual.py
index bd52be967b6da0ec7b9fce077be4be8d857adf9b..3d93bcbe01f536d4d9c0c2877821af9718f158bf 100644 (file)
--- a/vis/visual.py
+++ b/vis/visual.py
@@ -48,6 +48,9 @@ class Visual:
                        self.status(self.logger.disconnect())
                return True
 
+       def on_flush(self, act):
+               self.logger.flush()
+
        def on_enable(self, _):
                print("Unimplemented: on_enable")
                return True

diff --git a/vis/visual.ui b/vis/visual.ui
index ea9b741bad60677ff1c2100074e03597dd60537f..32e83c41229b0928d3d764998bbb827466d61359 100644 (file)
--- a/vis/visual.ui
+++ b/vis/visual.ui
@@ -19,45 +19,50 @@
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkAdjustment" id="mag_adj">
-    <property name="upper">100</property>
-    <property name="value">1</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkToggleAction" id="serial_act">
-    <property name="label" translatable="yes">Serial</property>
-    <property name="stock_id">gtk-connect</property>
-    <signal name="activate" handler="on_serial" swapped="no"/>
-  </object>
-  <object class="GtkToggleAction" id="xively_act">
-    <property name="label" translatable="yes">Xively</property>
-    <property name="stock_id">gtk-connect</property>
-    <signal name="activate" handler="on_xively" swapped="no"/>
-  </object>
   <object class="GtkAdjustment" id="datab_adj">
     <property name="lower">6</property>
     <property name="upper">8</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
+  <object class="GtkAction" id="flush_act">
+    <property name="label" translatable="yes">Upload</property>
+    <property name="stock_id">gtk-floppy</property>
+    <signal name="activate" handler="on_flush" swapped="no"/>
+  </object>
   <object class="GtkAdjustment" id="light_adj">
     <property name="upper">100</property>
     <property name="value">1</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
+  <object class="GtkAdjustment" id="mag_adj">
+    <property name="upper">100</property>
+    <property name="value">1</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
   <object class="GtkAdjustment" id="rate_adj">
     <property name="upper">100</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
+  <object class="GtkToggleAction" id="serial_act">
+    <property name="label" translatable="yes">Serial</property>
+    <property name="stock_id">gtk-connect</property>
+    <signal name="activate" handler="on_serial" swapped="no"/>
+  </object>
   <object class="GtkTextBuffer" id="serial_buf"/>
   <object class="GtkAction" id="settings_act">
     <property name="label" translatable="yes">Settings</property>
     <property name="stock_id">gtk-preferences</property>
     <signal name="activate" handler="on_show" swapped="no"/>
   </object>
+  <object class="GtkToggleAction" id="xively_act">
+    <property name="label" translatable="yes">Xively</property>
+    <property name="stock_id">gtk-connect</property>
+    <signal name="activate" handler="on_xively" swapped="no"/>
+  </object>
   <object class="GtkDialog" id="settings">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
@@ -497,7 +502,29 @@
               </packing>
             </child>
             <child>
-              <object class="GtkSeparatorToolItem" id="sep">
+              <object class="GtkSeparatorToolItem" id="sep0">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkToolButton" id="flush_btn">
+                <property name="related_action">flush_act</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSeparatorToolItem" id="sep1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
               </object>