diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 113549d7bbdd4e8529b787a6f375ff65eca3f8bd..dae6f391d6be34b13edc0a18e512ddabc47f4548 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,3 +38,11 @@ python3.9:
stage: test
script:
- python -m unittest
+
+python3.10:
+ image: python:3.10
+ tags:
+ - passoft
+ stage: test
+ script:
+ - python -m unittest
diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml
index 3fcee5f663548ab7e0a5977f6da00552348a47a5..4278af9234b716c9cf08a63e7d54a6b5d838efd5 100644
--- a/conda.recipe/meta.yaml
+++ b/conda.recipe/meta.yaml
@@ -1,6 +1,6 @@
package:
name: mseedpeek
- version: 2023.3.0.0
+ version: 2023.3.1.0
source:
path: ../
diff --git a/docs/Makefile b/docs/Makefile
deleted file mode 100644
index fa5a7fd0033469d07fd1571f4e3b42169fa67600..0000000000000000000000000000000000000000
--- a/docs/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# Minimal makefile for Sphinx documentation
-#
-
-# You can set these variables from the command line.
-SPHINXOPTS =
-SPHINXBUILD = python -msphinx
-SPHINXPROJ = mseedpeek
-SOURCEDIR = .
-BUILDDIR = _build
-
-# Put it first so that "make" without argument is like "make help".
-help:
- @$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
-
-.PHONY: help Makefile
-
-# Catch-all target: route all unknown targets to Sphinx using the new
-# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
-%: Makefile
- @$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
diff --git a/docs/authors.rst b/docs/authors.rst
deleted file mode 100644
index e122f914a87b277e565fc9567af1a7545ec9872b..0000000000000000000000000000000000000000
--- a/docs/authors.rst
+++ /dev/null
@@ -1 +0,0 @@
-.. include:: ../AUTHORS.rst
diff --git a/docs/conf.py b/docs/conf.py
deleted file mode 100755
index 7571621bb85a6280146838fa2d33858fc7034144..0000000000000000000000000000000000000000
--- a/docs/conf.py
+++ /dev/null
@@ -1,163 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
-# mseedpeek documentation build configuration file, created by
-# sphinx-quickstart on Fri Jun 9 13:47:02 2017.
-#
-# This file is execfile()d with the current directory set to its
-# containing dir.
-#
-# Note that not all possible configuration values are present in this
-# autogenerated file.
-#
-# All configuration values have a default; values that are commented out
-# serve to show the default.
-
-# If extensions (or modules to document with autodoc) are in another
-# directory, add these directories to sys.path here. If the directory is
-# relative to the documentation root, use os.path.abspath to make it
-# absolute, like shown here.
-#
-import os
-import sys
-sys.path.insert(0, os.path.abspath('..'))
-
-import mseedpeek
-
-# -- General configuration ---------------------------------------------
-
-# If your documentation needs a minimal Sphinx version, state it here.
-#
-# needs_sphinx = '1.0'
-
-# Add any Sphinx extension module names here, as strings. They can be
-# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.viewcode']
-
-# Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
-
-# The suffix(es) of source filenames.
-# You can specify multiple suffix as a list of string:
-#
-# source_suffix = ['.rst', '.md']
-source_suffix = '.rst'
-
-# The master toctree document.
-master_doc = 'index'
-
-# General information about the project.
-project = 'mseedpeek'
-copyright = "2018, IRIS PASSCAL"
-author = "IRIS PASSCAL"
-
-# The version info for the project you're documenting, acts as replacement
-# for |version| and |release|, also used in various other places throughout
-# the built documents.
-#
-# The short X.Y version.
-version = mseedpeek.__version__
-# The full version, including alpha/beta/rc tags.
-release = mseedpeek.__version__
-
-# The language for content autogenerated by Sphinx. Refer to documentation
-# for a list of supported languages.
-#
-# This is also used if you do content translation via gettext catalogs.
-# Usually you set "language" from the command line for these cases.
-language = None
-
-# List of patterns, relative to source directory, that match files and
-# directories to ignore when looking for source files.
-# This patterns also effect to html_static_path and html_extra_path
-exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
-
-# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
-
-# If true, `todo` and `todoList` produce output, else they produce nothing.
-todo_include_todos = False
-
-
-# -- Options for HTML output -------------------------------------------
-
-# The theme to use for HTML and HTML Help pages. See the documentation for
-# a list of builtin themes.
-#
-html_theme = 'alabaster'
-
-# Theme options are theme-specific and customize the look and feel of a
-# theme further. For a list of options available for each theme, see the
-# documentation.
-#
-# html_theme_options = {}
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
-
-
-# -- Options for HTMLHelp output ---------------------------------------
-
-# Output file base name for HTML help builder.
-htmlhelp_basename = 'mseedpeekdoc'
-
-
-# -- Options for LaTeX output ------------------------------------------
-
-latex_elements = {
- # The paper size ('letterpaper' or 'a4paper').
- #
- # 'papersize': 'letterpaper',
-
- # The font size ('10pt', '11pt' or '12pt').
- #
- # 'pointsize': '10pt',
-
- # Additional stuff for the LaTeX preamble.
- #
- # 'preamble': '',
-
- # Latex figure (float) alignment
- #
- # 'figure_align': 'htbp',
-}
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title, author, documentclass
-# [howto, manual, or own class]).
-latex_documents = [
- (master_doc, 'mseedpeek.tex',
- 'mseedpeek Documentation',
- 'IRIS PASSCAL', 'manual'),
-]
-
-
-# -- Options for manual page output ------------------------------------
-
-# One entry per manual page. List of tuples
-# (source start file, name, description, authors, manual section).
-man_pages = [
- (master_doc, 'mseedpeek',
- 'mseedpeek Documentation',
- [author], 1)
-]
-
-
-# -- Options for Texinfo output ----------------------------------------
-
-# Grouping the document tree into Texinfo files. List of tuples
-# (source start file, target name, title, author,
-# dir menu entry, description, category)
-texinfo_documents = [
- (master_doc, 'mseedpeek',
- 'mseedpeek Documentation',
- author,
- 'mseedpeek',
- 'One line description of project.',
- 'Miscellaneous'),
-]
-
-
-
diff --git a/docs/contributing.rst b/docs/contributing.rst
deleted file mode 100644
index e582053ea018c369be05aae96cf730744f1dc616..0000000000000000000000000000000000000000
--- a/docs/contributing.rst
+++ /dev/null
@@ -1 +0,0 @@
-.. include:: ../CONTRIBUTING.rst
diff --git a/docs/history.rst b/docs/history.rst
deleted file mode 100644
index 250649964bbc36f4bec2942f69238aa6f7c02c1a..0000000000000000000000000000000000000000
--- a/docs/history.rst
+++ /dev/null
@@ -1 +0,0 @@
-.. include:: ../HISTORY.rst
diff --git a/docs/index.rst b/docs/index.rst
deleted file mode 100644
index 602ab19aee92b7a96c3eeb95ef310e9b32ce7eaa..0000000000000000000000000000000000000000
--- a/docs/index.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-Welcome to mseedpeek's documentation!
-======================================
-
-.. toctree::
- :maxdepth: 2
- :caption: Contents:
-
- readme
- installation
- usage
- modules
- contributing
- authors
- history
-
-Indices and tables
-==================
-* :ref:`genindex`
-* :ref:`modindex`
-* :ref:`search`
diff --git a/docs/installation.rst b/docs/installation.rst
deleted file mode 100644
index 8a3665d9cf174768b8912cb057ae7b7d1543eec0..0000000000000000000000000000000000000000
--- a/docs/installation.rst
+++ /dev/null
@@ -1,32 +0,0 @@
-.. highlight:: shell
-
-============
-Installation
-============
-
-Fom sources
-------------
-
-The sources for mseedpeek can be downloaded from the `Github repo`_.
-
-You can either clone the public repository:
-
-.. code-block:: console
-
- $ git clone https://git.passcal.nmt.edu/passoft/mseedpeek
-
-Or download the `tarball`_:
-
-.. code-block:: console
-
- $ curl -OL https://git.passcal.nmt.edu/passoft/mseedpeek/tarball/master
-
-Once you have a copy of the source, you can install it with:
-
-.. code-block:: console
-
- $ python setup.py install
-
-
-.. _Github repo: https://git.passcal.nmt.edu/passoft/mseedpeek
-.. _tarball: https://git.passcal.nmt.edu/passoft/mseedpeek/tarball/master
diff --git a/docs/make.bat b/docs/make.bat
deleted file mode 100644
index d5cc6b3803c487069dd8ef99a260fcc60333daea..0000000000000000000000000000000000000000
--- a/docs/make.bat
+++ /dev/null
@@ -1,36 +0,0 @@
-@ECHO OFF
-
-pushd %~dp0
-
-REM Command file for Sphinx documentation
-
-if "%SPHINXBUILD%" == "" (
- set SPHINXBUILD=python -msphinx
-)
-set SOURCEDIR=.
-set BUILDDIR=_build
-set SPHINXPROJ=mseedpeek
-
-if "%1" == "" goto help
-
-%SPHINXBUILD% >NUL 2>NUL
-if errorlevel 9009 (
- echo.
- echo.The Sphinx module was not found. Make sure you have Sphinx installed,
- echo.then set the SPHINXBUILD environment variable to point to the full
- echo.path of the 'sphinx-build' executable. Alternatively you may add the
- echo.Sphinx directory to PATH.
- echo.
- echo.If you don't have Sphinx installed, grab it from
- echo.http://sphinx-doc.org/
- exit /b 1
-)
-
-%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
-goto end
-
-:help
-%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
-
-:end
-popd
diff --git a/docs/readme.rst b/docs/readme.rst
deleted file mode 100644
index 72a33558153fb57def85612b021ec596ef2a51b9..0000000000000000000000000000000000000000
--- a/docs/readme.rst
+++ /dev/null
@@ -1 +0,0 @@
-.. include:: ../README.rst
diff --git a/docs/usage.rst b/docs/usage.rst
deleted file mode 100644
index ec9ecaa6ad92b0fc559c8a76e5b6c5af2de0f16f..0000000000000000000000000000000000000000
--- a/docs/usage.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-=====
-Usage
-=====
-
-To use mseedpeek in a project::
-
- import mseedpeek
diff --git a/mseedpeek/__init__.py b/mseedpeek/__init__.py
index 67272133110e2b720ee9ba2fc3d0fb940e177e20..1c06f1d4ee0e2d9b6bb7c5aa068e9644b2f2e487 100644
--- a/mseedpeek/__init__.py
+++ b/mseedpeek/__init__.py
@@ -4,4 +4,4 @@
__author__ = """IRIS PASSCAL"""
__email__ = 'software-support@passcal.nmt.edu'
-__version__ = '2023.3.0.0'
+__version__ = '2023.3.1.0'
diff --git a/mseedpeek/mseedpeek.py b/mseedpeek/mseedpeek.py
index ab77ac912ff39530d5b081045bbc24369bca38e2..613ac0cde2eb53bc9f8a23302f07baa80e03a0ce 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,17 +139,26 @@ 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, QTreeWidget,
+ QTreeWidgetItem)
+from PySide2.QtCore import (Qt, QObject, Signal, QThread, QTimer, QEventLoop)
+from PySide2.QtGui import QColor
from mseedpeek.libtrace import *
from mseedpeek.mseedInfo import *
-VERSION = "2023.3.0.0"
+VERSION = "2023.3.1.0"
def main():
"""
- Main class for mseedpeek
+ Get commandline args and launch mseedpeek
"""
# return version number if -# command line option
file_list = []
@@ -169,7 +179,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 +189,7 @@ def main():
sys.exit(app.exec_())
-class MainWindow(QtWidgets.QWidget):
+class MainWindow(QWidget):
"""
Main class for mseedpeek
"""
@@ -259,22 +269,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 +298,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 +490,39 @@ 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.currentIndexChanged.connect(
+ lambda: self.fill_blockettes_tab(
+ 0,
+ blk_menu.currentText()))
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 +534,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 +591,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 +611,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 +622,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 +654,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 +674,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)
@@ -676,6 +690,8 @@ class MainWindow(QtWidgets.QWidget):
lambda: self.update_slider("menu"))
self.unique_box.unique_jump.currentIndexChanged.connect(
lambda: self.update_slider("unique"))
+ self.unique_box.keys_menu.currentIndexChanged.connect(
+ self.select_keys)
# add everything to trace headers layout
self.trace_headers_layout.addWidget(self.datadir_box)
@@ -697,13 +713,19 @@ class MainWindow(QtWidgets.QWidget):
self.jump_box.setCurrentIndex(self.verb_var)
if self.trace_menu.isHidden():
self.jump_box.hide()
+ else:
+ self.jump_box.show()
+ if self.verb_var == 3:
+ self.slider_box.hide()
+ else:
+ self.slider_box.show()
self.maybe_read_hdrs()
def clicked_find(self):
"""
Open file dialogue to search for mseed files
"""
- search = QtWidgets.QFileDialog.getExistingDirectory()
+ search = QFileDialog.getExistingDirectory()
directories = self.dd_text.text()
if search:
@@ -719,11 +741,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 +759,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 +769,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 +777,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()
@@ -774,15 +792,16 @@ class MainWindow(QtWidgets.QWidget):
self.blktype_box.hide()
self.blkinfo_box.hide()
self.blk_vars_box.hide()
+ self.slider_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()
@@ -790,10 +809,22 @@ class MainWindow(QtWidgets.QWidget):
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.run_find_trace = 1
+ 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 +841,13 @@ class MainWindow(QtWidgets.QWidget):
print("Directory Read Error: %s" % e)
for file in listfiles:
- if mod(cnt, 25):
+ if not self.run_find_trace:
+ break
+ 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 +897,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):
"""
@@ -896,6 +941,7 @@ class MainWindow(QtWidgets.QWidget):
self.hide_show("show")
self.header_endianess_text.setText(self.byte_order)
self.jump_box.setCurrentIndex(self.verb_var)
+ self.jump_box.show()
self.update_infobar("", "yellow")
# hack, widget was behaving weird for some reason
@@ -956,7 +1002,7 @@ class MainWindow(QtWidgets.QWidget):
lastkey = key
if key not in self.unique_select_list:
self.unique_select_list.append(key)
- key = str(blk) + ":" + key
+ key = str(n) + ":" + key
self.unique_list.append(key)
# build Blockette dictionary keyed to block number
@@ -1065,17 +1111,22 @@ class MainWindow(QtWidgets.QWidget):
"""
clears/initializes entry fields in Blockettes tab
"""
+
for block in self.blockettes_dict[key]:
- if block[0] == blktype:
+ if int(block[0]) == int(blktype):
blocktuple = block
for key, values in BlkVars.items():
- if blktype == key:
- boxes = self.blockettes_tab.findChildren(QtWidgets.QGroupBox)
+ if int(blktype) == int(key):
+ 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.blockSignals(True)
menu.clear()
- menu.insertItem(0, str(blktype))
+ for blk in self.blockettes_list:
+ menu.addItem(str(blk))
+ menu.setCurrentText(str(blktype))
+ menu.blockSignals(False)
elif box.objectName() == "Box2":
layout = box.layout()
# delete previous labels if they exist
@@ -1086,7 +1137,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 +1153,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 +1162,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 +1203,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 +1231,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 +1261,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
@@ -1238,18 +1289,52 @@ class MainWindow(QtWidgets.QWidget):
except Exception:
return
+ # def update_unique_block(self):
+ # """
+ # Update selected item in Unique's tree widget
+ # """
+
+ # row_num = int(self.unique_box.unique_jump.currentText())
+ # items = self.unique_box.unique_info_tree.findItems(
+ # str(row_num), Qt.MatchExactly, 0)
+ # self.unique_box.unique_info_tree.clearSelection()
+ # for i in items:
+ # self.unique_box.unique_info_tree.setItemSelected(i, True)
+ # self.unique_box.unique_info_tree.scrollToItem(i)
+
+ def select_keys(self):
+ """
+ """
+
+ selectkey = self.unique_box.keys_menu.currentText().split(":")
+ if selectkey[0] == "*":
+ self.fill_unique()
+ return
+ unique_item = QTreeWidgetItem()
+ line = []
+ self.unique_box.unique_info_tree.clear()
+ for key in self.unique_list:
+ if selectkey == key.split(":")[1:]:
+ for var in key.split(":"):
+ line.append(var)
+ for i in range(len(line)):
+ unique_item.setText(i, line[i])
+ unique_item.setBackgroundColor(i, Qt.white)
+ self.unique_box.unique_info_tree.addTopLevelItem(unique_item)
+ return
+
def fill_unique(self):
"""
Fills unique info on HdrDisplay
"""
- # text colors
- Blue = QtGui.QColor(0, 0, 153)
- Black = QtGui.QColor(0, 0, 0)
# fill drop down menus
+ self.unique_box.keys_menu.blockSignals(True)
self.unique_box.keys_menu.clear()
self.unique_box.keys_menu.addItem("*")
- self.unique_box.keys_menu.addItem(f'{self.unique_select_list[0]}')
+ for key in self.unique_select_list:
+ self.unique_box.keys_menu.addItem(key)
+ self.unique_box.keys_menu.blockSignals(False)
self.unique_box.unique_jump.blockSignals(True)
i = 0
@@ -1258,16 +1343,26 @@ class MainWindow(QtWidgets.QWidget):
i += 1
self.unique_box.unique_jump.blockSignals(False)
- # fill text box
- text = "Block\tStat\tChan\tLoc\tNet\tRate"
- 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)
+ # fill tree
+ self.unique_box.unique_info_tree.clear()
+ c = 0
+ for key in self.unique_list:
+ unique_item = QTreeWidgetItem()
+ line = []
+ for var in key.split(":"):
+ line.append(var)
+ if c:
+ for i in range(len(line)):
+ unique_item.setText(i, line[i])
+ unique_item.setBackgroundColor(i, Qt.cyan)
+ else:
+ for i in range(len(line)):
+ unique_item.setText(i, line[i])
+ self.unique_box.unique_info_tree.addTopLevelItem(unique_item)
+ if c:
+ c = 0
+ else:
+ c += 1
def wait(self, words, cnt):
"""
@@ -1305,7 +1400,8 @@ class MainWindow(QtWidgets.QWidget):
"""
self.infobar.setText(text)
self.infobar.setStyleSheet("background-color:" + color)
- QtWidgets.QApplication.beep()
+ if color != "yellow":
+ QApplication.beep()
def update_slider(self, widget):
"""
@@ -1365,10 +1461,90 @@ 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)
-class SliderBox(QtWidgets.QGroupBox):
+ # 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))
+
+ # 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_find_trace = 0
+
+
+class SliderBox(QGroupBox):
"""
Box that holds all the blockette slider widgets
"""
@@ -1379,21 +1555,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 +1578,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 +1589,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 +1610,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 +1620,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 +1658,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 +1668,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 +1699,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 +1710,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 +1736,7 @@ class VVBox(QtWidgets.QGroupBox):
v_layout.addStretch()
-class UniqueBox(QtWidgets.QGroupBox):
+class UniqueBox(QGroupBox):
"""
Box that holds all the unique info widgets
"""
@@ -1569,22 +1745,39 @@ 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()
- self.keys_menu.setEditable(True)
- jump_label = QtWidgets.QLabel("Jump To Block #:")
- self.unique_jump = QtWidgets.QComboBox()
+ layout = QVBoxLayout(self)
+ select_keys_label = QLabel("Select Keys:")
+ self.keys_menu = QComboBox()
+ # self.keys_menu.setEditable(True)
+ jump_label = QLabel("Jump To Block #:")
+ self.unique_jump = QComboBox()
self.unique_jump.setEditable(True)
- self.unique_infobox = QtWidgets.QTextEdit()
+ self.unique_info_tree = QTreeWidget()
+ self.unique_info_tree.setRootIsDecorated(False)
+ self.unique_info_tree.setColumnCount(6)
+ self.unique_info_tree.setHeaderLabels(
+ ['Block', 'Stat', 'Chan', 'Loc', 'Net', 'Rate'])
layout.addWidget(select_keys_label)
layout.addWidget(self.keys_menu)
layout.addWidget(jump_label)
layout.addWidget(self.unique_jump)
- layout.addWidget(self.unique_infobox)
+ layout.addWidget(self.unique_info_tree)
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()
diff --git a/setup.py b/setup.py
index 908ab3c4479d8d91261ce07b7aed0132d1a86d6b..b9b080e8714f1d23665a5f84598bf79e0f1f6383 100644
--- a/setup.py
+++ b/setup.py
@@ -44,6 +44,6 @@ setup(
name='mseedpeek',
packages=find_packages(include=['mseedpeek']),
url='https://git.passcal.nmt.edu/software_public/passoft/mseedpeek',
- version='2023.3.0.0',
+ version='2023.3.1.0',
zip_safe=False,
)
diff --git a/tox.ini b/tox.ini
index 2f1ef0ccee9f1d8c231993850923ea7e5f597020..10760b0e3ae453f9ae4d704e9d5672e6b22c3390 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-envlist = py39, flake8
+envlist = py39, py310, flake8
[testenv:flake8]
basepython = python