diff options
Diffstat (limited to 'lib/taurus/qt/qtgui/table')
-rw-r--r-- | lib/taurus/qt/qtgui/table/qlogtable.py | 38 | ||||
-rw-r--r--[-rwxr-xr-x] | lib/taurus/qt/qtgui/table/taurusdevicepropertytable.py | 3 | ||||
-rw-r--r-- | lib/taurus/qt/qtgui/table/taurusgrid.py | 6 | ||||
-rw-r--r--[-rwxr-xr-x] | lib/taurus/qt/qtgui/table/taurusvaluestable.py | 0 |
4 files changed, 43 insertions, 4 deletions
diff --git a/lib/taurus/qt/qtgui/table/qlogtable.py b/lib/taurus/qt/qtgui/table/qlogtable.py index 3c61cb8d..f0de1be3 100644 --- a/lib/taurus/qt/qtgui/table/qlogtable.py +++ b/lib/taurus/qt/qtgui/table/qlogtable.py @@ -36,6 +36,7 @@ import logging.handlers import datetime import threading import socket +import click import taurus from taurus.core.util.log import Logger @@ -597,5 +598,42 @@ def main(): app.exec_() w.stop_logging() + +@click.command('qlogmon') +@click.option('--port', 'port', type=int, + default=logging.handlers.DEFAULT_TCP_LOGGING_PORT, + show_default=True, + help='port where log server is running') +@click.option('--log-name', 'log_name', default=None, + help='filter specific log object') +@click.option('--log-level', 'log_level', + type=click.Choice(['critical', 'error', 'warning', 'info', + 'debug', 'trace']), + default='debug', show_default=True, + help='filter specific log level') +def qlogmon_cmd(port, log_name, log_level): + """Show the Taurus Remote Log Monitor""" + import taurus + host = socket.gethostname() + level = getattr(taurus, log_level.capitalize(), taurus.Trace) + + from taurus.qt.qtgui.application import TaurusApplication + app = TaurusApplication(cmd_line_parser=None, + app_name="Taurus remote logger") + w = QLoggingWidget(perspective="Remote") + w.setMinimumSize(1024, 600) + + filterbar = w.getFilterBar() + filterbar.setLogLevel(level) + if log_name is not None: + filterbar.setFilterText(log_name) + w.getPerspectiveBar().setEnabled(False) + w.getQModel().connect_logging(host, port) + w.show() + app.exec_() + w.getQModel().disconnect_logging() + + if __name__ == '__main__': main() + # qlogmon_cmd diff --git a/lib/taurus/qt/qtgui/table/taurusdevicepropertytable.py b/lib/taurus/qt/qtgui/table/taurusdevicepropertytable.py index 74f5565b..c256fcca 100755..100644 --- a/lib/taurus/qt/qtgui/table/taurusdevicepropertytable.py +++ b/lib/taurus/qt/qtgui/table/taurusdevicepropertytable.py @@ -436,7 +436,8 @@ class Delegate(QtGui.QItemDelegate): if __name__ == '__main__': import sys from taurus.qt.qtgui.application import TaurusApplication - app = TaurusApplication(app_name="TaurusDevice property table") + app = TaurusApplication(app_name="TaurusDevice property table", + cmd_line_parser=None) widget = TaurusPropTable() args = sys.argv if len(args) == 1: diff --git a/lib/taurus/qt/qtgui/table/taurusgrid.py b/lib/taurus/qt/qtgui/table/taurusgrid.py index a061968d..b9570a6c 100644 --- a/lib/taurus/qt/qtgui/table/taurusgrid.py +++ b/lib/taurus/qt/qtgui/table/taurusgrid.py @@ -299,7 +299,7 @@ class TaurusGrid(QtGui.QFrame, TaurusBaseWidget): 'labels': self._show_attr_labels, 'units': self._show_attr_units, 'others': self._show_others } - f = open(filename, 'w') + f = open(filename, 'wb') pickle.dump(d, f) f.close() @@ -308,7 +308,7 @@ class TaurusGrid(QtGui.QFrame, TaurusBaseWidget): if not isinstance(filename, dict): manual = False import pickle - f = open(filename) + f = open(filename, 'rb') d = pickle.load(f) f.close() else: @@ -1060,7 +1060,7 @@ if __name__ == '__main__': print('\t/usr/bin/python taurusgrid.py "model=lt.*/VC.*/.*/((C*)|(P*)|(I*))" cols=IP,CCG,PNV rows=LT01,LT02 others=False rowframe=True colframe=False') exit() - app = TaurusApplication(sys.argv[0:1]) + app = TaurusApplication(sys.argv[0:1], cmd_line_parser=None) gui = TaurusGrid() try: # first try if argument is a file to be opened diff --git a/lib/taurus/qt/qtgui/table/taurusvaluestable.py b/lib/taurus/qt/qtgui/table/taurusvaluestable.py index 567ea37c..567ea37c 100755..100644 --- a/lib/taurus/qt/qtgui/table/taurusvaluestable.py +++ b/lib/taurus/qt/qtgui/table/taurusvaluestable.py |