diff --git a/mseedpeek/mseedpeek.py b/mseedpeek/mseedpeek.py
index ab77ac912ff39530d5b081045bbc24369bca38e2..b6ab59306878b1f91bd07a7f43f3b4703fd1d9ad 100644
--- a/mseedpeek/mseedpeek.py
+++ b/mseedpeek/mseedpeek.py
@@ -129,6 +129,7 @@
# GUI updated to PySide2
# Pmw dependency dropped
# Version number updated
+# Run build trace to thread
"""
import sys
@@ -138,7 +139,15 @@ import itertools
from getopt import getopt
from glob import glob
from operator import mod
-from PySide2 import QtCore, QtGui, QtWidgets
+from PySide2.QtWidgets import (QApplication, QWidget, QTabWidget,
+ QLineEdit, QVBoxLayout, QHBoxLayout,
+ QTextEdit, QGroupBox, QLabel,
+ QComboBox, QPushButton, QSizePolicy,
+ QFormLayout, QRadioButton, QSlider,
+ QSpacerItem, QStackedWidget, QFileDialog,
+ QMessageBox, QProgressDialog)
+from PySide2.QtCore import (Qt, QObject, Signal, QThread, QTimer, QEventLoop)
+from PySide2.QtGui import QColor
from mseedpeek.libtrace import *
from mseedpeek.mseedInfo import *
@@ -148,7 +157,7 @@ VERSION = "2023.3.0.0"
def main():
"""
- Main class for mseedpeek
+ Get commandline args and launch mseedpeek
"""
# return version number if -# command line option
file_list = []
@@ -169,7 +178,7 @@ def main():
sys.exit(1)
print("\n", os.path.basename(sys.argv[0]), VERSION)
- app = QtWidgets.QApplication(sys.argv)
+ app = QApplication(sys.argv)
# mc = main class
if file_list:
mc = MainWindow("mseedpeek %s" % VERSION, file_list)
@@ -179,7 +188,7 @@ def main():
sys.exit(app.exec_())
-class MainWindow(QtWidgets.QWidget):
+class MainWindow(QWidget):
"""
Main class for mseedpeek
"""
@@ -259,22 +268,22 @@ class MainWindow(QtWidgets.QWidget):
Build tabs and info bar for root window
"""
# tab widget
- self.tabwidget = QtWidgets.QTabWidget()
- self.trace_headers_tab = QtWidgets.QWidget()
- self.blockettes_tab = QtWidgets.QWidget()
- self.help_tab = QtWidgets.QWidget()
+ self.tabwidget = QTabWidget()
+ self.trace_headers_tab = QWidget()
+ self.blockettes_tab = QWidget()
+ self.help_tab = QWidget()
self.tabwidget.addTab(self.trace_headers_tab, "Trace Headers")
self.tabwidget.addTab(self.blockettes_tab, "Blockettes")
self.tabwidget.addTab(self.help_tab, "Help")
# info bar widget
- self.infobar = QtWidgets.QLineEdit()
+ self.infobar = QLineEdit()
self.infobar.setStyleSheet("background-color:yellow")
self.infobar.setReadOnly(True)
- self.infobar.setAlignment(QtGui.Qt.AlignCenter)
+ self.infobar.setAlignment(Qt.AlignCenter)
# main window layout
- self.window_layout = QtWidgets.QVBoxLayout()
+ self.window_layout = QVBoxLayout()
self.setLayout(self.window_layout)
# add tab widget and info bar to main window layout
@@ -288,18 +297,18 @@ class MainWindow(QtWidgets.QWidget):
Build Help tab
"""
# init tab layout
- layout = QtWidgets.QVBoxLayout(self.help_tab)
+ layout = QVBoxLayout(self.help_tab)
# Help textbox
- Blue = QtGui.QColor(0, 0, 153)
- Green = QtGui.QColor(0, 100, 0)
- Red = QtGui.QColor(136, 8, 8)
- Black = QtGui.QColor(0, 0, 0)
+ Blue = QColor(0, 0, 153)
+ Green = QColor(0, 100, 0)
+ Red = QColor(136, 8, 8)
+ Black = QColor(0, 0, 0)
- help_text = QtWidgets.QTextEdit()
+ help_text = QTextEdit()
layout.addWidget(help_text)
help_text.setVerticalScrollBarPolicy(
- QtCore.Qt.ScrollBarPolicy.ScrollBarAlwaysOff)
+ Qt.ScrollBarPolicy.ScrollBarAlwaysOff)
help_text.setAcceptRichText(False)
# Name
@@ -480,35 +489,35 @@ class MainWindow(QtWidgets.QWidget):
Create initial widgets for Blockettes tab
"""
# data boxes
- self.blktype_box = QtWidgets.QGroupBox()
+ self.blktype_box = QGroupBox()
self.blktype_box.setObjectName("Box1")
- self.blkinfo_box = QtWidgets.QGroupBox()
- self.blkinfo_box.setLayout(QtWidgets.QHBoxLayout())
+ self.blkinfo_box = QGroupBox()
+ self.blkinfo_box.setLayout(QHBoxLayout())
self.blkinfo_box.setObjectName("Box2")
- self.blk_vars_box = QtWidgets.QGroupBox()
- self.blk_vars_box.setLayout(QtWidgets.QVBoxLayout())
+ self.blk_vars_box = QGroupBox()
+ self.blk_vars_box.setLayout(QVBoxLayout())
self.blk_vars_box.setObjectName("Box3")
# widgets
- blk_label = QtWidgets.QLabel("Blockette:")
- blk_menu = QtWidgets.QComboBox()
+ blk_label = QLabel("Blockette:")
+ blk_menu = QComboBox()
blk_menu.setObjectName("type_menu")
- self.blkinfo_btn = QtWidgets.QPushButton("Blockette Info")
+ self.blkinfo_btn = QPushButton("Blockette Info")
self.blkinfo_btn.setStyleSheet("QPushButton{background-color:lightblue;}\
QPushButton::hover{background-color:green;}")
self.blkinfo_btn.clicked.connect(self.blkinfo_window)
# box layouts
- l1 = QtWidgets.QHBoxLayout(self.blktype_box)
+ l1 = QHBoxLayout(self.blktype_box)
l1.addWidget(blk_label)
l1.addWidget(blk_menu)
l1.addStretch()
# add to tab's main layout
- main_layout = QtWidgets.QVBoxLayout()
+ main_layout = QVBoxLayout()
main_layout.addWidget(self.blktype_box)
main_layout.addWidget(self.blkinfo_box)
main_layout.addWidget(self.blk_vars_box)
@@ -520,56 +529,56 @@ class MainWindow(QtWidgets.QWidget):
Build widgets for Trace Headers tab
"""
# tab layout
- self.trace_headers_layout = QtWidgets.QVBoxLayout(
+ self.trace_headers_layout = QVBoxLayout(
self.trace_headers_tab)
# groupboxes for data fields
- self.datadir_box = QtWidgets.QGroupBox()
+ self.datadir_box = QGroupBox()
self.datadir_box.setCheckable(False)
sp = self.datadir_box.sizePolicy()
- sp.setVerticalPolicy(QtWidgets.QSizePolicy.Fixed)
+ sp.setVerticalPolicy(QSizePolicy.Fixed)
self.datadir_box.setSizePolicy(sp)
- self.stations_box = QtWidgets.QGroupBox()
+ self.stations_box = QGroupBox()
self.stations_box.setCheckable(False)
sp = self.stations_box.sizePolicy()
- sp.setVerticalPolicy(QtWidgets.QSizePolicy.Fixed)
+ sp.setVerticalPolicy(QSizePolicy.Fixed)
self.stations_box.setSizePolicy(sp)
- self.radio_box = QtWidgets.QGroupBox()
+ self.radio_box = QGroupBox()
self.radio_box.setCheckable(False)
sp = self.radio_box.sizePolicy()
- sp.setVerticalPolicy(QtWidgets.QSizePolicy.Fixed)
+ sp.setVerticalPolicy(QSizePolicy.Fixed)
self.radio_box.setSizePolicy(sp)
- self.dir_trace_box = QtWidgets.QGroupBox()
+ self.dir_trace_box = QGroupBox()
self.dir_trace_box.setCheckable(False)
sp = self.dir_trace_box.sizePolicy()
- sp.setVerticalPolicy(QtWidgets.QSizePolicy.Fixed)
+ sp.setVerticalPolicy(QSizePolicy.Fixed)
self.dir_trace_box.setSizePolicy(sp)
- self.flush_exit_box = QtWidgets.QGroupBox()
+ self.flush_exit_box = QGroupBox()
self.flush_exit_box.setCheckable(False)
sp = self.flush_exit_box.sizePolicy()
- sp.setVerticalPolicy(QtWidgets.QSizePolicy.Fixed)
+ sp.setVerticalPolicy(QSizePolicy.Fixed)
self.flush_exit_box.setSizePolicy(sp)
self.window_layout.addWidget(self.flush_exit_box)
# layouts for groupboxes
- datadir_layout = QtWidgets.QHBoxLayout(self.datadir_box)
- stations_layout = QtWidgets.QHBoxLayout(self.stations_box)
- rbuttons_layout = QtWidgets.QHBoxLayout(self.radio_box)
- flush_exit_layout = QtWidgets.QHBoxLayout(self.flush_exit_box)
+ datadir_layout = QHBoxLayout(self.datadir_box)
+ stations_layout = QHBoxLayout(self.stations_box)
+ rbuttons_layout = QHBoxLayout(self.radio_box)
+ flush_exit_layout = QHBoxLayout(self.flush_exit_box)
flush_exit_layout.setMargin(0)
flush_exit_layout.setSpacing(450)
- dir_trace_layout = QtWidgets.QFormLayout(self.dir_trace_box)
+ dir_trace_layout = QFormLayout(self.dir_trace_box)
# fill flush / exit groubpx
- self.exit_btn = QtWidgets.QPushButton("Exit")
+ self.exit_btn = QPushButton("Exit")
self.exit_btn.setStyleSheet(
"QPushButton::hover{background-color:darkred;}")
self.exit_btn.clicked.connect(lambda: quit())
- self.flush_btn = QtWidgets.QPushButton("Flush Directories")
+ self.flush_btn = QPushButton("Flush Directories")
self.flush_btn.clicked.connect(self.flush_dict)
self.flush_btn.setStyleSheet(
"QPushButton::hover{background-color:orange;}")
@@ -577,18 +586,18 @@ class MainWindow(QtWidgets.QWidget):
flush_exit_layout.addWidget(self.exit_btn)
# fill data dir groupbox
- self.dd_label = QtWidgets.QLabel("Data Directories:")
- self.dd_text = QtWidgets.QLineEdit()
- self.build_trace_btn = QtWidgets.QPushButton("Build Trace db")
+ self.dd_label = QLabel("Data Directories:")
+ self.dd_text = QLineEdit()
+ self.build_trace_btn = QPushButton("Build Trace db")
self.build_trace_btn.setStyleSheet(
"""
QPushButton{background-color:lightblue;}
QPushButton::hover {background-color:green;}
""")
self.build_trace_btn.clicked.connect(self.clicked_build_trace)
- self.find_btn = QtWidgets.QPushButton("Find")
+ self.find_btn = QPushButton("Find")
self.find_btn.clicked.connect(self.clicked_find)
- self.clear_btn = QtWidgets.QPushButton("Clear")
+ self.clear_btn = QPushButton("Clear")
self.clear_btn.clicked.connect(lambda: self.dd_text.clear())
datadir_layout.addWidget(self.dd_label)
datadir_layout.addWidget(self.dd_text)
@@ -597,10 +606,10 @@ class MainWindow(QtWidgets.QWidget):
datadir_layout.addWidget(self.clear_btn)
# stations widgets
- self.stations_label = QtWidgets.QLabel(
+ self.stations_label = QLabel(
"Find only stations (colon separated list):")
- self.stations_text = QtWidgets.QLineEdit()
- self.stations_clear_btn = QtWidgets.QPushButton("Clear")
+ self.stations_text = QLineEdit()
+ self.stations_clear_btn = QPushButton("Clear")
self.stations_clear_btn.clicked.connect(
lambda: self.stations_text.clear())
stations_layout.addWidget(self.stations_label)
@@ -608,27 +617,27 @@ class MainWindow(QtWidgets.QWidget):
stations_layout.addWidget(self.stations_clear_btn)
# fill stations groupbox
- self.standard_rbtn = QtWidgets.QRadioButton("Standard")
+ self.standard_rbtn = QRadioButton("Standard")
self.standard_rbtn.setChecked(True)
self.standard_rbtn.clicked.connect(lambda: self.clicked_scan_type(0))
- self.verbose_rbtn = QtWidgets.QRadioButton("Verbose")
+ self.verbose_rbtn = QRadioButton("Verbose")
self.verbose_rbtn.setChecked(False)
self.verbose_rbtn.clicked.connect(lambda: self.clicked_scan_type(1))
- self.vv_rbtn = QtWidgets.QRadioButton("Very Verbose")
+ self.vv_rbtn = QRadioButton("Very Verbose")
self.vv_rbtn.setChecked(False)
self.vv_rbtn.clicked.connect(lambda: self.clicked_scan_type(2))
- self.unique_rbtn = QtWidgets.QRadioButton("Unique")
+ self.unique_rbtn = QRadioButton("Unique")
self.unique_rbtn.setChecked(False)
self.unique_rbtn.clicked.connect(lambda: self.clicked_scan_type(3))
# spacer item
# adds distance between rbuttons and "Header Endianess"
- spacerItem = QtWidgets.QSpacerItem(250, 0,
- QtWidgets.QSizePolicy.Expanding,
- QtWidgets.QSizePolicy.Minimum)
+ spacerItem = QSpacerItem(250, 0,
+ QSizePolicy.Expanding,
+ QSizePolicy.Minimum)
- self.header_endianess_label = QtWidgets.QLabel("Header Endianess")
- self.header_endianess_text = QtWidgets.QLineEdit()
+ self.header_endianess_label = QLabel("Header Endianess")
+ self.header_endianess_text = QLineEdit()
self.header_endianess_text.setStyleSheet("background-color:yellow")
rbuttons_layout.addWidget(self.standard_rbtn)
@@ -640,11 +649,11 @@ class MainWindow(QtWidgets.QWidget):
rbuttons_layout.addWidget(self.header_endianess_text)
# fill dir / trace groupbox
- self.dir_label = QtWidgets.QLabel("Directory:")
- self.dir_menu = QtWidgets.QComboBox()
+ self.dir_label = QLabel("Directory:")
+ self.dir_menu = QComboBox()
self.dir_menu.activated.connect(lambda: self.select_dir_trace("dir"))
- self.trace_label = QtWidgets.QLabel("Trace:")
- self.trace_menu = QtWidgets.QComboBox()
+ self.trace_label = QLabel("Trace:")
+ self.trace_menu = QComboBox()
self.trace_menu.activated.connect(
lambda: self.select_dir_trace("trace"))
dir_trace_layout.addRow(self.dir_label, self.dir_menu)
@@ -660,7 +669,7 @@ class MainWindow(QtWidgets.QWidget):
self.first_vv_vars, self.standard_vars, self.v_vars, self.vv_vars)
self.unique_box = UniqueBox()
- self.jump_box = QtWidgets.QStackedWidget()
+ self.jump_box = QStackedWidget()
self.jump_box.setStyleSheet("QGroupBox{border:0;}")
self.jump_box.setMinimumSize(0, 200)
self.jump_box.addWidget(self.standard_box)
@@ -703,7 +712,7 @@ class MainWindow(QtWidgets.QWidget):
"""
Open file dialogue to search for mseed files
"""
- search = QtWidgets.QFileDialog.getExistingDirectory()
+ search = QFileDialog.getExistingDirectory()
directories = self.dd_text.text()
if search:
@@ -719,11 +728,11 @@ class MainWindow(QtWidgets.QWidget):
directories = self.dd_text.text()
if directories:
self.dir_list.clear()
- self.build_trace_list(directories)
self.hide_show("hide")
+ self.build_trace_list(directories)
else:
- error_msg = QtWidgets.QMessageBox()
- error_msg.setIcon(QtWidgets.QMessageBox.Critical)
+ error_msg = QMessageBox()
+ error_msg.setIcon(QMessageBox.Critical)
error_msg.setText("Error")
error_msg.setInformativeText("No directories listed.")
error_msg.setWindowTitle("Error")
@@ -737,7 +746,6 @@ class MainWindow(QtWidgets.QWidget):
if not os.path.isdir(dir):
err = "***WARNING*** Directory " + dir + " not found."
self.infobar(err, "red")
- QtWidgets.QApplication.beep()
else:
self.dir_list.append(dir)
@@ -748,10 +756,7 @@ class MainWindow(QtWidgets.QWidget):
self.stat_sel_list.append(statsel)
if self.dir_list:
- (num_files, err_files) = self.find_trace()
- text = ("Done. " + str(num_files) + " mseed files found. ***")
- text += (str(err_files) + " files with errors.")
- self.update_infobar(text, "green")
+ self.launch_find_trace()
def hide_show(self, action):
"""
@@ -759,13 +764,13 @@ class MainWindow(QtWidgets.QWidget):
"""
if action == "hide":
widget = self.jump_box.currentWidget()
- for child in widget.findChildren(QtWidgets.QWidget):
+ for child in widget.findChildren(QWidget):
if not child.isHidden():
child.hide()
- for child in self.slider_box.findChildren(QtWidgets.QWidget):
+ for child in self.slider_box.findChildren(QWidget):
if not child.isHidden():
child.hide()
- widgets = self.blockettes_tab.findChildren(QtWidgets.QGroupBox)
+ widgets = self.blockettes_tab.findChildren(QGroupBox)
for widget in widgets:
if not widget.isHidden():
widget.hide()
@@ -776,24 +781,35 @@ class MainWindow(QtWidgets.QWidget):
self.blk_vars_box.hide()
else:
widget = self.jump_box.currentWidget()
- for child in widget.findChildren(QtWidgets.QWidget):
+ for child in widget.findChildren(QWidget):
if child.isHidden():
child.show()
- for child in self.slider_box.findChildren(QtWidgets.QWidget):
+ for child in self.slider_box.findChildren(QWidget):
if child.isHidden():
child.show()
- widgets = self.blockettes_tab.findChildren(QtWidgets.QGroupBox)
+ widgets = self.blockettes_tab.findChildren(QGroupBox)
for widget in widgets:
if widget.isHidden():
widget.show()
self.blktype_box.show()
self.blkinfo_box.show()
self.blk_vars_box.show()
+
+ def launch_find_trace(self):
+ """
+ Separated out to run build trace list
+ as a thread
+ """
+
+ self.begin_thread("Find Trace",
+ self.find_trace,
+ self.after_find_trace)
def find_trace(self):
"""
based on traverse routine in "python standard library", Lundh pg 34
"""
+
stack = []
for k in range(len(self.dir_list)):
stack.append(self.dir_list[k])
@@ -810,10 +826,11 @@ class MainWindow(QtWidgets.QWidget):
print("Directory Read Error: %s" % e)
for file in listfiles:
- if mod(cnt, 25):
+ if mod(cnt, 5):
pass
else:
- self.wait("Examining File: ", cnt)
+ self.func_worker.update.emit(cnt)
+ # self.wait("Examining File: ", cnt)
fullname = os.path.join(directory, file)
if os.path.isfile(fullname):
if not os.access(fullname, 6):
@@ -863,8 +880,19 @@ class MainWindow(QtWidgets.QWidget):
self.dir_trace_dict = {}
self.dir_trace_dict = file_list
+ self.num_files = num_mseed_files
+ self.err_files = rw_error
+
+ def after_find_trace(self):
+ """
+ Function to run after find trace
+ to update some info
+ """
+
self.update_dir_list()
- return num_mseed_files, rw_error
+ text = ("Done. " + str(self.num_files) + " mseed files found. ***")
+ text += (str(self.err_files) + " files with errors.")
+ self.update_infobar(text, "green")
def select_dir_trace(self, menu):
"""
@@ -1070,10 +1098,10 @@ class MainWindow(QtWidgets.QWidget):
blocktuple = block
for key, values in BlkVars.items():
if blktype == key:
- boxes = self.blockettes_tab.findChildren(QtWidgets.QGroupBox)
+ boxes = self.blockettes_tab.findChildren(QGroupBox)
for box in boxes:
if box.objectName() == "Box1":
- menu = box.findChild(QtWidgets.QComboBox, "type_menu")
+ menu = box.findChild(QComboBox, "type_menu")
menu.clear()
menu.insertItem(0, str(blktype))
elif box.objectName() == "Box2":
@@ -1086,7 +1114,7 @@ class MainWindow(QtWidgets.QWidget):
if widget is not None:
widget.setParent(None)
# create new labels
- label = QtWidgets.QLabel()
+ label = QLabel()
label.setText(str(values[0]))
layout.addWidget(label)
layout.addWidget(self.blkinfo_btn)
@@ -1102,7 +1130,7 @@ class MainWindow(QtWidgets.QWidget):
widget.setParent(None)
# create new labels
for x in range(1, len(values)):
- label = QtWidgets.QLabel()
+ label = QLabel()
label.setText(str(values[x]) + " " +
str(blocktuple[x - 1]))
layout.addWidget(label)
@@ -1111,29 +1139,29 @@ class MainWindow(QtWidgets.QWidget):
"""
Popup window for blk info button
"""
- self.info_window = QtWidgets.QWidget()
+ self.info_window = QWidget()
self.info_window.resize(650, 400)
self.info_window.setWindowTitle("Blockette Information")
# widgets
- blk_label = QtWidgets.QLabel("Blockette:")
- blk_menu = QtWidgets.QComboBox()
+ blk_label = QLabel("Blockette:")
+ blk_menu = QComboBox()
blk_menu.activated.connect(
lambda: info_box.setText(BlkInfoDict[int(blk_menu.currentText())])
if blk_menu.currentText().isdigit()
else info_box.setText(BlkInfoDict[blk_menu.currentText()]))
- info_box = QtWidgets.QTextEdit()
- done_btn = QtWidgets.QPushButton("Done")
+ info_box = QTextEdit()
+ done_btn = QPushButton("Done")
done_btn.setStyleSheet("QPushButton{background-color:lightblue;}\
QPushButton::hover{background-color:red;}")
done_btn.clicked.connect(lambda: self.info_window.close())
- top_layout = QtWidgets.QHBoxLayout()
+ top_layout = QHBoxLayout()
top_layout.addWidget(blk_label)
top_layout.addWidget(blk_menu)
top_layout.addStretch()
- main_layout = QtWidgets.QVBoxLayout(self.info_window)
+ main_layout = QVBoxLayout(self.info_window)
main_layout.addLayout(top_layout)
main_layout.addWidget(info_box)
main_layout.addWidget(done_btn)
@@ -1152,7 +1180,7 @@ class MainWindow(QtWidgets.QWidget):
"""
try:
standard_widgets = self.standard_box.findChildren(
- QtWidgets.QLineEdit)
+ QLineEdit)
rate = self.rate_dict[key]
vars = []
# SeqNum, DHQual, res, Stat, Loc, Chan, Net
@@ -1180,7 +1208,7 @@ class MainWindow(QtWidgets.QWidget):
"""
try:
verbose_widgets = self.verbose_box.findChildren(
- QtWidgets.QLineEdit)
+ QLineEdit)
rate = self.rate_dict[key]
vars = []
# SeqNum, DHQual, res, Stat, Loc, Chan, Net
@@ -1210,7 +1238,7 @@ class MainWindow(QtWidgets.QWidget):
Fills very verbose info on HdrDisplay
"""
try:
- vv_widgets = self.vv_box.findChildren(QtWidgets.QLineEdit)
+ vv_widgets = self.vv_box.findChildren(QLineEdit)
rate = self.rate_dict[key]
vars = []
# SeqNum, DHQual, res, Stat, Loc, Chan, Net
@@ -1243,8 +1271,8 @@ class MainWindow(QtWidgets.QWidget):
Fills unique info on HdrDisplay
"""
# text colors
- Blue = QtGui.QColor(0, 0, 153)
- Black = QtGui.QColor(0, 0, 0)
+ Blue = QColor(0, 0, 153)
+ Black = QColor(0, 0, 0)
# fill drop down menus
self.unique_box.keys_menu.clear()
@@ -1263,11 +1291,13 @@ class MainWindow(QtWidgets.QWidget):
self.unique_box.unique_infobox.setTextColor(Blue)
self.unique_box.unique_infobox.setText(text)
self.unique_box.unique_infobox.setTextColor(Black)
- data = []
- data.append(self.unique_list[0].split(":"))
- data = list(itertools.chain.from_iterable(data))
- data = '\t'.join(str(i) for i in data)
- self.unique_box.unique_infobox.append(data)
+
+ for key in self.unique_list:
+ line = ""
+ for var in key.split(":"):
+ line += (var + "\t")
+ self.unique_box.unique_infobox.append(line)
+
def wait(self, words, cnt):
"""
@@ -1305,7 +1335,8 @@ class MainWindow(QtWidgets.QWidget):
"""
self.infobar.setText(text)
self.infobar.setStyleSheet("background-color:" + color)
- QtWidgets.QApplication.beep()
+ if color != "yellow" and color != "green":
+ QApplication.beep()
def update_slider(self, widget):
"""
@@ -1365,10 +1396,93 @@ class MainWindow(QtWidgets.QWidget):
self.clear_slider()
self.header_endianess_text.clear()
self.hide_show("hide")
- QtWidgets.QApplication.beep()
+ QApplication.beep()
+
+ def begin_thread(self, title, func, after_func=''):
+ """
+ Create thread to run function
+ """
+
+ # init thread and worker
+ self.thread = QThread(self)
+ self.func_worker = Worker(func)
+
+ # set signals/slots
+ self.func_worker.update.connect(self.update_progress_window)
+ self.thread.started.connect(self.func_worker.run)
+
+ # function to run after thread finishes
+ if after_func:
+ self.func_worker.finished.connect(after_func)
+
+ # delete worker and thread when done
+ self.func_worker.finished.connect(self.thread.quit)
+ self.func_worker.finished.connect(self.func_worker.deleteLater)
+ self.thread.finished.connect(self.thread.deleteLater)
+
+ # get file num for progress window
+ numfiles = 0
+ text = ""
+
+ if title == "Find Trace":
+ for dir in self.dir_list:
+ numfiles += (
+ sum([len(files) for r, d, files in os.walk(dir)]))
+ text = title + " is active. Please wait."
+ # launch progress window
+ self.build_progress_window(title, text, numfiles)
+ self.func_worker.finished.connect(
+ lambda: self.progress_window.done(0))
-class SliderBox(QtWidgets.QGroupBox):
+ # give progress window a small
+ # amount of time to finish
+ # loading before
+ # starting thread
+ loop = QEventLoop(self)
+ QTimer.singleShot(100, loop.quit)
+ loop.exec_()
+
+ self.thread.start()
+
+
+ def build_progress_window(self, title, text, max):
+ """
+ Create progress window to update user
+ on status of current process
+ """
+
+ self.progress_window = QProgressDialog(
+ labelText=text, minimum=0,
+ maximum=max, parent=self)
+
+ cancel_b = QPushButton("Cancel")
+ cancel_b.setStyleSheet(
+ "QPushButton::hover{background-color:red;}")
+ cancel_b.clicked.connect(
+ lambda: self.stop_thread(title))
+ self.progress_window.setCancelButton(cancel_b)
+ self.progress_window.open()
+
+
+ def update_progress_window(self, val):
+ """
+ Update progress window progress bar
+ """
+
+ self.progress_window.setValue(val)
+
+
+ def stop_thread(self, title):
+ """
+ Stop the currently running thread
+ """
+
+ if title == "Find Trace":
+ self.run_build_trace = 0
+
+
+class SliderBox(QGroupBox):
"""
Box that holds all the blockette slider widgets
"""
@@ -1379,21 +1493,21 @@ class SliderBox(QtWidgets.QGroupBox):
super().__init__()
self.setStyleSheet("QGroupBox{border:0;}")
# widgets
- label1 = QtWidgets.QLabel("Jump To Block #:")
- self.jump_menu = QtWidgets.QComboBox()
+ label1 = QLabel("Jump To Block #:")
+ self.jump_menu = QComboBox()
self.jump_menu.setMinimumWidth(100)
self.jump_menu.setEditable(True)
self.jump_menu.insertItem(0, "0")
- label2 = QtWidgets.QLabel("Block Number")
- self.slider = QtWidgets.QSlider(QtCore.Qt.Horizontal)
+ label2 = QLabel("Block Number")
+ self.slider = QSlider(Qt.Horizontal)
self.slider.setTickPosition(self.slider.NoTicks)
# layouts
- main_layout = QtWidgets.QVBoxLayout(self)
- menu_layout = QtWidgets.QVBoxLayout()
- slider_layout = QtWidgets.QHBoxLayout()
- menu_layout.addWidget(label1, alignment=QtCore.Qt.AlignCenter)
- menu_layout.addWidget(self.jump_menu, alignment=QtCore.Qt.AlignCenter)
+ main_layout = QVBoxLayout(self)
+ menu_layout = QVBoxLayout()
+ slider_layout = QHBoxLayout()
+ menu_layout.addWidget(label1, alignment=Qt.AlignCenter)
+ menu_layout.addWidget(self.jump_menu, alignment=Qt.AlignCenter)
slider_layout.addWidget(label2)
slider_layout.addWidget(self.slider)
@@ -1402,7 +1516,7 @@ class SliderBox(QtWidgets.QGroupBox):
main_layout.addLayout(slider_layout)
-class StandardBox(QtWidgets.QGroupBox):
+class StandardBox(QGroupBox):
"""
Box that holds all the standard info widgets
"""
@@ -1413,15 +1527,15 @@ class StandardBox(QtWidgets.QGroupBox):
super().__init__()
# layout
- v_layout = QtWidgets.QVBoxLayout(self)
- h_layout = QtWidgets.QHBoxLayout()
- col1 = QtWidgets.QVBoxLayout()
- col2 = QtWidgets.QVBoxLayout()
+ v_layout = QVBoxLayout(self)
+ h_layout = QHBoxLayout()
+ col1 = QVBoxLayout()
+ col2 = QVBoxLayout()
# widgets
for x in range(len(standard_vars)):
- label = QtWidgets.QLabel(str(standard_vars[x]))
- line_edit = QtWidgets.QLineEdit()
+ label = QLabel(str(standard_vars[x]))
+ line_edit = QLineEdit()
col1.addWidget(label)
col2.addWidget(line_edit)
@@ -1434,7 +1548,7 @@ class StandardBox(QtWidgets.QGroupBox):
v_layout.addStretch()
-class VerboseBox(QtWidgets.QGroupBox):
+class VerboseBox(QGroupBox):
"""
Box that holds all the verbose info widgets
"""
@@ -1444,24 +1558,24 @@ class VerboseBox(QtWidgets.QGroupBox):
"""
super().__init__()
# layout
- v_layout = QtWidgets.QVBoxLayout(self)
- h_layout = QtWidgets.QHBoxLayout()
- col1 = QtWidgets.QVBoxLayout()
- col2 = QtWidgets.QVBoxLayout()
- col3 = QtWidgets.QVBoxLayout()
- col4 = QtWidgets.QVBoxLayout()
+ v_layout = QVBoxLayout(self)
+ h_layout = QHBoxLayout()
+ col1 = QVBoxLayout()
+ col2 = QVBoxLayout()
+ col3 = QVBoxLayout()
+ col4 = QVBoxLayout()
# widgets
for x in range(len(standard_vars)):
- label = QtWidgets.QLabel(str(standard_vars[x]))
- line_edit = QtWidgets.QLineEdit()
+ label = QLabel(str(standard_vars[x]))
+ line_edit = QLineEdit()
col1.addWidget(label)
col2.addWidget(line_edit)
for x in range(len(v_vars)):
- label = QtWidgets.QLabel(str(v_vars[x]))
- line_edit = QtWidgets.QLineEdit()
+ label = QLabel(str(v_vars[x]))
+ line_edit = QLineEdit()
if x == 0:
col1.addWidget(label)
@@ -1482,7 +1596,7 @@ class VerboseBox(QtWidgets.QGroupBox):
v_layout.addStretch()
-class VVBox(QtWidgets.QGroupBox):
+class VVBox(QGroupBox):
"""
Box that holds all the very verbose info widgets
"""
@@ -1492,28 +1606,28 @@ class VVBox(QtWidgets.QGroupBox):
"""
super().__init__()
# layout
- v_layout = QtWidgets.QVBoxLayout(self)
- h_layout = QtWidgets.QHBoxLayout()
- col1 = QtWidgets.QVBoxLayout()
- col2 = QtWidgets.QVBoxLayout()
- col3 = QtWidgets.QVBoxLayout()
- col4 = QtWidgets.QVBoxLayout()
- col5 = QtWidgets.QVBoxLayout()
- col6 = QtWidgets.QVBoxLayout()
- col7 = QtWidgets.QVBoxLayout()
- col8 = QtWidgets.QVBoxLayout()
+ v_layout = QVBoxLayout(self)
+ h_layout = QHBoxLayout()
+ col1 = QVBoxLayout()
+ col2 = QVBoxLayout()
+ col3 = QVBoxLayout()
+ col4 = QVBoxLayout()
+ col5 = QVBoxLayout()
+ col6 = QVBoxLayout()
+ col7 = QVBoxLayout()
+ col8 = QVBoxLayout()
# widgets
for x in range(len(first_vv_vars)):
- label = QtWidgets.QLabel(str(first_vv_vars[x]))
- line_edit = QtWidgets.QLineEdit()
+ label = QLabel(str(first_vv_vars[x]))
+ line_edit = QLineEdit()
col1.addWidget(label)
col2.addWidget(line_edit)
for x in range(len(standard_vars)):
- label = QtWidgets.QLabel(str(standard_vars[x]))
- line_edit = QtWidgets.QLineEdit()
+ label = QLabel(str(standard_vars[x]))
+ line_edit = QLineEdit()
if x <= 2:
col1.addWidget(label)
@@ -1523,8 +1637,8 @@ class VVBox(QtWidgets.QGroupBox):
col4.addWidget(line_edit)
for x in range(len(v_vars)):
- label = QtWidgets.QLabel(str(v_vars[x]))
- line_edit = QtWidgets.QLineEdit()
+ label = QLabel(str(v_vars[x]))
+ line_edit = QLineEdit()
if x <= 3:
col3.addWidget(label)
@@ -1534,8 +1648,8 @@ class VVBox(QtWidgets.QGroupBox):
col6.addWidget(line_edit)
for x in range(len(vv_vars)):
- label = QtWidgets.QLabel(str(vv_vars[x]))
- line_edit = QtWidgets.QLineEdit()
+ label = QLabel(str(vv_vars[x]))
+ line_edit = QLineEdit()
if x <= 3:
col5.addWidget(label)
@@ -1560,7 +1674,7 @@ class VVBox(QtWidgets.QGroupBox):
v_layout.addStretch()
-class UniqueBox(QtWidgets.QGroupBox):
+class UniqueBox(QGroupBox):
"""
Box that holds all the unique info widgets
"""
@@ -1569,14 +1683,14 @@ class UniqueBox(QtWidgets.QGroupBox):
Create unique widgets
"""
super().__init__()
- layout = QtWidgets.QVBoxLayout(self)
- select_keys_label = QtWidgets.QLabel("Select Keys:")
- self.keys_menu = QtWidgets.QComboBox()
+ layout = QVBoxLayout(self)
+ select_keys_label = QLabel("Select Keys:")
+ self.keys_menu = QComboBox()
self.keys_menu.setEditable(True)
- jump_label = QtWidgets.QLabel("Jump To Block #:")
- self.unique_jump = QtWidgets.QComboBox()
+ jump_label = QLabel("Jump To Block #:")
+ self.unique_jump = QComboBox()
self.unique_jump.setEditable(True)
- self.unique_infobox = QtWidgets.QTextEdit()
+ self.unique_infobox = QTextEdit()
layout.addWidget(select_keys_label)
layout.addWidget(self.keys_menu)
@@ -1585,6 +1699,18 @@ class UniqueBox(QtWidgets.QGroupBox):
layout.addWidget(self.unique_infobox)
layout.addStretch()
+class Worker(QObject):
+ update = Signal(int)
+ finished = Signal()
+
+ def __init__(self, func):
+ super().__init__()
+ self.func = func
+
+ def run(self):
+ self.func()
+ self.finished.emit()
+
if __name__ == "__main__":
main()