diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml index 1c25545403e29532d5f255f12806ee7446995346..7d65f89f3f75365b6ce423e300fc2e4f3428d8f4 100644 --- a/conda.recipe/meta.yaml +++ b/conda.recipe/meta.yaml @@ -1,6 +1,6 @@ package: name: mseedpeek - version: 2024.4.0.0 + version: 2024.4.0.1 source: path: ../ diff --git a/mseedpeek/__init__.py b/mseedpeek/__init__.py index 61e14ca2683f9646370b49a7d127fb5835bed9c1..ae0ce9f1a6a390ca385a4dfc376a0283163b50f9 100644 --- a/mseedpeek/__init__.py +++ b/mseedpeek/__init__.py @@ -4,4 +4,4 @@ __author__ = """EPIC""" __email__ = 'software-support@passcal.nmt.edu' -__version__ = '2024.4.0.0' +__version__ = '2024.4.0.1' diff --git a/mseedpeek/mseedpeek.py b/mseedpeek/mseedpeek.py index 2cf2ae86f311c02fa8211a76be08eea7c9b7d65d..9f76942a4f36e86fcd132bd889ee29b41e524cb9 100644 --- a/mseedpeek/mseedpeek.py +++ b/mseedpeek/mseedpeek.py @@ -161,7 +161,7 @@ from PySide6.QtGui import QColor, QBrush from mseedpeek.libtrace import * from mseedpeek.mseedInfo import * -VERSION = "2024.4.0.0" +VERSION = "2024.4.0.1" def main(): @@ -291,16 +291,37 @@ class MainWindow(QWidget): self.infobar.setReadOnly(True) self.infobar.setAlignment(Qt.AlignCenter) + # slider + self.slider_box = SliderBox() + self.tabwidget.currentChanged.connect( + self.set_slider_visibility) + self.slider_box.slider.valueChanged.connect( + lambda: self.update_slider("slider")) + self.slider_box.jump_menu.currentTextChanged.connect( + lambda: self.update_slider("menu")) + # main window layout self.window_layout = QVBoxLayout() self.setLayout(self.window_layout) # add tab widget and info bar to main window layout self.window_layout.addWidget(self.tabwidget) + self.window_layout.addWidget(self.slider_box) self.build_trace_headers() # build widgets for Trace Headers tab self.window_layout.addWidget(self.infobar) self.window_layout.setContentsMargins(0, 0, 0, 0) # set spacing + def set_slider_visibility(self): + # hide slider if user in help tab + if self.tabwidget.currentIndex() == 2: + self.slider_box.hide() + else: + if self.tabwidget.currentIndex() == 0 and \ + self.verb_var == 3: + self.slider_box.hide() + else: + self.slider_box.show() + def build_help(self): """ Build Help tab @@ -681,6 +702,10 @@ class MainWindow(QWidget): self.vv_box = VVBox( self.first_vv_vars, self.standard_vars, self.v_vars, self.vv_vars) self.unique_box = UniqueBox() + self.unique_box.unique_jump.currentIndexChanged.connect( + lambda: self.update_slider("unique")) + self.unique_box.keys_menu.currentIndexChanged.connect( + self.select_keys) self.jump_box = QStackedWidget() self.jump_box.setStyleSheet("QGroupBox{border:0;}") @@ -690,24 +715,12 @@ class MainWindow(QWidget): self.jump_box.addWidget(self.vv_box) self.jump_box.addWidget(self.unique_box) - # slider - self.slider_box = SliderBox() - self.slider_box.slider.valueChanged.connect( - lambda: self.update_slider("slider")) - self.slider_box.jump_menu.currentTextChanged.connect( - 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) self.trace_headers_layout.addWidget(self.stations_box) self.trace_headers_layout.addWidget(self.radio_box) self.trace_headers_layout.addWidget(self.dir_trace_box) self.trace_headers_layout.addWidget(self.jump_box) - self.trace_headers_layout.addWidget(self.slider_box) # set data directory widget to display cwd default_dir = os.getcwd() diff --git a/setup.py b/setup.py index 4ce897a36ea106973816854576150105634d642e..bc569ac389a1e5769811bcdbd77c7746b31f07bf 100644 --- a/setup.py +++ b/setup.py @@ -45,6 +45,6 @@ setup( name='mseedpeek', packages=find_packages(include=['mseedpeek']), url='https://git.passcal.nmt.edu/software_public/passoft/mseedpeek', - version='2024.4.0.0', + version='2024.4.0.1', zip_safe=False, )