moteus-gui 0.3.87__py3-none-any.whl → 0.3.89__py3-none-any.whl

moteus_gui/tview.py

@@ -25,6 +25,7 @@ import moteus.moteus_tool
 import numpy
 import os
 import re
+import signal
 import struct
 import sys
 import time
@@ -74,6 +75,14 @@ import asyncqt
 import moteus.reader as reader
 
 
+try:
+    from . import version
+except ImportError:
+    class Version:
+        VERSION = 'dev'
+    version = Version()
+
+
 LEFT_LEGEND_LOC = 3
 RIGHT_LEGEND_LOC = 2
 
@@ -184,9 +193,9 @@ class RecordSignal(object):
 
         return Connection(self, result)
 
-    def update(self, value):
+    def update(self, value, now):
         for handler in self._callbacks.values():
-            handler(value)
+            handler(value, now)
         return len(self._callbacks) != 0
 
 
@@ -225,14 +234,13 @@ class PlotItem(object):
             self.axis.legend(loc=self.axis.legend_loc)
         self.plot_widget.canvas.draw()
 
-    def _handle_update(self, value):
+    def _handle_update(self, value, now):
         if self.plot_widget.paused:
             return
 
         if self.line is None:
             self._make_line()
 
-        now = time.time()
         self.xdata.append(now)
         self.ydata.append(value)
 
@@ -403,7 +411,7 @@ class Record:
 
         return self.signals[name]
 
-    def update(self, struct):
+    def update(self, struct, now):
         count = 0
         self.history.append(struct)
         if len(self.history) > MAX_HISTORY_SIZE:
@@ -420,7 +428,7 @@ class Record:
                 value = numpy.mean(values)
             else:
                 value = _get_data(struct, key)
-            if signal.update(value):
+            if signal.update(value, now):
                 count += 1
         return count != 0
 
@@ -754,6 +762,8 @@ class Device:
         return await self.read_sized_block()
 
     async def do_data(self, name):
+        now = time.time()
+
         data = await self.read_sized_block()
         if not data:
             return
@@ -764,7 +774,7 @@ class Device:
         record = self._telemetry_records[name]
         if record:
             struct = record.archive.read(reader.Stream(io.BytesIO(data)))
-            record.update(struct)
+            record.update(struct, now)
             _set_tree_widget_data(record.tree_item, struct, record.archive)
 
             self._data[name] = struct
@@ -1269,8 +1279,11 @@ class TviewMainWindow():
 
 
 def main():
+    signal.signal(signal.SIGINT, signal.SIG_DFL)
     parser = argparse.ArgumentParser(description=__doc__)
 
+    parser.add_argument('--version', action='store_true')
+
     # These two commands are aliases.
     parser.add_argument('-d', '--devices', '-t', '--target',
                         action='append', type=str, default=[])
@@ -1282,6 +1295,10 @@ def main():
 
     args = parser.parse_args()
 
+    if args.version:
+        print(f"tview version '{version.VERSION}'")
+        sys.exit(0)
+
     app = QtWidgets.QApplication(sys.argv)
     loop = asyncqt.QEventLoop(app)
     asyncio.set_event_loop(loop)

moteus_gui/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-VERSION="0.3.87"
+VERSION="0.3.89"

{moteus_gui-0.3.87.dist-info → moteus_gui-0.3.89.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: moteus-gui
-Version: 0.3.87
+Version: 0.3.89
 Summary: moteus brushless controller graphical user interfaces
 Home-page: https://github.com/mjbots/moteus
 Author: mjbots Robotic Systems

moteus_gui-0.3.89.dist-info/RECORD

@@ -0,0 +1,9 @@
+moteus_gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+moteus_gui/tview.py,sha256=OHpdvy3wdPYzmIMU0zRx4e7rjMRru__JEaOkD9djH7Q,42379
+moteus_gui/tview_main_window.ui,sha256=q_qA1sooIWzprVT8eYAe0EH9lfu7zg-QP1diETCNFh8,5556
+moteus_gui/version.py,sha256=awY4LvZ9OK5lPoCwGam-n3a3hS_9hqodOOLIH3OHQCw,627
+moteus_gui-0.3.89.dist-info/METADATA,sha256=fNJiyXORfbOvdBmtWIaR-L7ux6nKzIlpCb1ICNrdh2M,996
+moteus_gui-0.3.89.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+moteus_gui-0.3.89.dist-info/entry_points.txt,sha256=Y9PnhK_gNxr8CO7_POHieVaK1U_4fgu2EYoS6TyzSgk,48
+moteus_gui-0.3.89.dist-info/top_level.txt,sha256=oPOkXR-zpPFhGiDcbnDY6scvNqQQAXWzV7oPD_GHMns,11
+moteus_gui-0.3.89.dist-info/RECORD,,

moteus_gui-0.3.87.dist-info/RECORD

@@ -1,9 +0,0 @@
-moteus_gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-moteus_gui/tview.py,sha256=DANIKJVpSC893A1reUb6a144dVrjo6okaRvN-L46BEA,42012
-moteus_gui/tview_main_window.ui,sha256=q_qA1sooIWzprVT8eYAe0EH9lfu7zg-QP1diETCNFh8,5556
-moteus_gui/version.py,sha256=0H-9-BkLhMrpt7WebRlIy2uP-2RmS0Y-oPCO-T9QBJY,627
-moteus_gui-0.3.87.dist-info/METADATA,sha256=q6P8h11Vhi-0BsDPGycKdf55KI_VPzxZrW8r7LgDuow,996
-moteus_gui-0.3.87.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-moteus_gui-0.3.87.dist-info/entry_points.txt,sha256=Y9PnhK_gNxr8CO7_POHieVaK1U_4fgu2EYoS6TyzSgk,48
-moteus_gui-0.3.87.dist-info/top_level.txt,sha256=oPOkXR-zpPFhGiDcbnDY6scvNqQQAXWzV7oPD_GHMns,11
-moteus_gui-0.3.87.dist-info/RECORD,,