parameters.yaml

@@ -1,6 +1,5 @@
 # Parameters file for Surveillance Bot
 datapath: '/data/SDS/'      # SC3 Datapath
-outpath_html: '/home/marcel/tmp/survBot_out.html' # output of HTML table
 networks: ['1Y', 'HA']
 stations: '*'
 locations: '*'

submit_bot.sh

@@ -8,7 +8,6 @@ ulimit -s 8192
 ##$ -q "*@minos15"
 
 export PYTHONPATH="$PYTHONPATH:/home/marcel/git/"
-export PYTHONPATH="$PYTHONPATH:/home/marcel/git/code_base/"
 
 source /opt/anaconda3/etc/profile.d/conda.sh
 conda activate py37

survBot.py

@@ -13,14 +13,11 @@ import numpy as np
 from obspy import read, UTCDateTime, Stream
 from obspy.clients.filesystem.sds import Client
 
-from write_utils import get_print_title_str
-
 pjoin = os.path.join
 UP = "\x1B[{length}A"
 CLR = "\x1B[0K"
 deg_str = '\N{DEGREE SIGN}C'
 
-
 def read_yaml(file_path):
     with open(file_path, "r") as f:
         return yaml.safe_load(f)
@@ -186,13 +183,11 @@ class SurveillanceBot(object):
         if len(times) > 0:
             return min(times)
 
-    def print_analysis_html(self, filename):
-        with open(filename, 'w') as outfile:
-            pass
-
     def print_analysis(self):
+        timespan = self.parameters.get('timespan') * 24 * 3600
         self.print(200*'+')
-        title_str = get_print_title_str(self.parameters)
+        tdelta_str = str(timedelta(seconds=int(timespan)))
+        title_str = f'Analysis table of router quality within the last {tdelta_str}'
         self.print(title_str)
         if self.refresh_period > 0:
             self.print(f'Refreshing every {self.refresh_period}s.')

survBotGUI.py

@@ -9,7 +9,7 @@ __author__ = 'Marcel Paffrath'
 import os
 import sys
 import traceback
-import argparse
+from datetime import timedelta
 
 try:
     from PySide2 import QtGui, QtCore, QtWidgets
@@ -34,7 +34,6 @@ else:
 from obspy import UTCDateTime
 
 from survBot import SurveillanceBot
-from write_utils import *
 
 try:
     from rest_api.utils import get_station_iccid
@@ -96,7 +95,6 @@ class MainWindow(QtWidgets.QMainWindow):
         # init some attributes
         self.dt_thresh = dt_thresh
         self.last_mouse_loc = None
-        self.status_message = ''
         self.starttime = UTCDateTime()
 
         # setup main layout of the GUI
@@ -183,41 +181,6 @@ class MainWindow(QtWidgets.QMainWindow):
             self.last_mouse_loc = event.pos()
         return super(QtWidgets.QMainWindow, self).eventFilter(object, event)
 
-    def write_html_table(self):
-        fnout = self.parameters.get('outpath_html')
-        if not fnout:
-            return
-        try:
-            with open(fnout, 'w') as outfile:
-                write_html_header(outfile)
-                #write_html_table_title(outfile, self.parameters)
-                init_html_table(outfile)
-                nrows = self.table.rowCount()
-                ncolumns = self.table.columnCount()
-
-                # add header item 0 fix default black bg color for headers
-                station_header = QtWidgets.QTableWidgetItem(text='Station')
-                station_header.setText('Station')
-                header_items = [station_header]
-                for column in range(ncolumns):
-                    hheader = self.table.horizontalHeaderItem(column)
-                    header_items.append(hheader)
-                write_html_row(outfile, header_items, html_key='th')
-
-                for row in range(nrows):
-                    vheader = self.table.verticalHeaderItem(row)
-                    col_items = [vheader]
-                    for column in range(ncolumns):
-                        col_items.append(self.table.item(row, column))
-                    write_html_row(outfile, col_items)
-
-                finish_html_table(outfile)
-                write_html_text(outfile, self.status_message)
-                write_html_footer(outfile)
-        except Exception as e:
-            print(f'Could not write HTML table to {fnout}:')
-            print(e)
-
     def sms_context_menu(self, row_ind):
         """ Open a context menu when left-clicking vertical header item """
         header_item = self.table.verticalHeaderItem(row_ind)
@@ -262,13 +225,11 @@ class MainWindow(QtWidgets.QMainWindow):
 
     def fill_status_bar(self):
         """ Set status bar text """
-        timespan = timedelta(seconds=int(self.parameters.get('timespan') * 24 * 3600))
-        self.status_message = f'Program starttime (UTC) {self.starttime.strftime("%Y-%m-%d %H:%M:%S")} | ' \
-                              f'Current time (UTC) {UTCDateTime().strftime("%Y-%m-%d %H:%M:%S")} | ' \
-                              f'Refresh period: {self.refresh_period}s | '\
-                              f'Showing data of last {timespan}'
         status_bar = self.statusBar()
-        status_bar.showMessage(self.status_message)
+        timespan = timedelta(seconds=int(self.parameters.get('timespan') * 24 * 3600))
+        status_bar.showMessage(f'Program starttime (UTC) {self.starttime.strftime("%Y-%m-%d %H:%M:%S")} | '
+                               f'Refresh period: {self.refresh_period}s | '
+                               f'Showing data of last {timespan}')
 
     def fill_table(self):
         """ Fills the table with most recent information. Executed after execute_qc thread is done or on refresh. """
@@ -330,8 +291,6 @@ class MainWindow(QtWidgets.QMainWindow):
 
         # table filling/refreshing done, set clear_on_refresh to False
         self.clear_on_refresh = False
-        # write html output if parameter is set
-        self.write_html_table()
 
     def get_time_delay_color(self, dt):
         """ Set color of time delay after thresholds specified in self.dt_thresh """

write_utils.py

@@ -1,48 +0,0 @@
-from datetime import timedelta
-
-def write_html_table_title(fobj, parameters):
-    title = get_print_title_str(parameters)
-    fobj.write(f'<h3>{title}</h3>\n')
-
-def write_html_text(fobj, text):
-    fobj.write(f'<p>{text}</p>\n')
-
-def write_html_header(fobj):
-    header = ['<!DOCTYPE html>',
-              '<html>',
-              '<style>',
-              'table, th, td {',
-              'border:1px solid black;',
-              '}',
-              '</style>',
-              '<body>']
-    for item in header:
-        fobj.write(item + '\n')
-
-def init_html_table(fobj):
-    fobj.write('<table style="width:100%">\n')
-
-def finish_html_table(fobj):
-    fobj.write('</table>\n')
-
-def write_html_footer(fobj):
-    footer = ['</body>',
-              '</html>']
-    for item in footer:
-        fobj.write(item + '\n')
-
-def write_html_row(fobj, items, html_key='td'):
-    fobj.write('<tr>\n')
-    for item in items:
-        text = item.text()
-        color = item.backgroundColor().name()
-        # fix for black background of headers
-        color = '#e6e6e6' if color == '#000000' else color
-        fobj.write(f'<{html_key} bgcolor="{color}">' + text + f'</{html_key}>\n')
-    fobj.write('</tr>\n')
-
-def get_print_title_str(parameters):
-    timespan = parameters.get('timespan') * 24 * 3600
-    tdelta_str = str(timedelta(seconds=int(timespan)))
-    return f'Analysis table of router quality within the last {tdelta_str}'
-