From 7aa4498a47c8b7c5847f1ce092995d3f74d3b526 Mon Sep 17 00:00:00 2001 From: Pete R Jemian Date: Tue, 27 Feb 2024 20:45:52 -0600 Subject: [PATCH 1/6] MNT #188 #189 --- gemviz/bluesky_runs_catalog.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gemviz/bluesky_runs_catalog.py b/gemviz/bluesky_runs_catalog.py index f69bbe5..46ad341 100644 --- a/gemviz/bluesky_runs_catalog.py +++ b/gemviz/bluesky_runs_catalog.py @@ -15,7 +15,6 @@ import yaml from PyQt5 import QtWidgets -from . import tapi from . import utils PAGE_START = -1 @@ -132,7 +131,13 @@ def doRunSelectedSlot(self, run): run_md = run.run_md self.brc_run_viz.setMetadata(yaml.dump(dict(run_md), indent=4)) - self.brc_run_viz.setData(self.getDataDescription(run)) + try: + self.brc_run_viz.setData(self.getDataDescription(run)) + except (KeyError, ValueError) as exinfo: + self.setStatus( + f"Can't select that run: ({exinfo.__class__.__name__}) {exinfo}" + ) + return self.setStatus(run.summary()) self.selected_run_uid = run.get_run_md("start", "uid") From 759954d28e331eeee6d05394d2fc01debae7ff83 Mon Sep 17 00:00:00 2001 From: Pete R Jemian Date: Tue, 27 Feb 2024 22:52:24 -0600 Subject: [PATCH 2/6] DOC #209 --- gemviz/LICENSE | 2 +- gemviz/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gemviz/LICENSE b/gemviz/LICENSE index d08349a..f766ef5 100644 --- a/gemviz/LICENSE +++ b/gemviz/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2023, UChicago Argonne, LLC +Copyright (c) 2023-2024, UChicago Argonne, LLC All Rights Reserved diff --git a/gemviz/__init__.py b/gemviz/__init__.py index 7dcbb52..d227aea 100644 --- a/gemviz/__init__.py +++ b/gemviz/__init__.py @@ -34,7 +34,7 @@ # fmt: off COPYRIGHT_TEXT = ( - "(c) 2023, UChicago Argonne, LLC" + "(c) 2023-2024, UChicago Argonne, LLC" ", (see LICENSE file for details)" ) # fmt: on From 0c73c24c1ac0f7a8548447ae610ac86d3add1f16 Mon Sep 17 00:00:00 2001 From: Pete R Jemian Date: Tue, 27 Feb 2024 23:10:33 -0600 Subject: [PATCH 3/6] PKG #182 --- pyproject.toml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 7d4c7d7..89593cc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,11 +1,7 @@ [build-system] -# qt ==5 -# pyqt ==5 requires = [ - "pyRestTable", - "setuptools>=61.0", - "setuptools_scm[toml]>=6.2", - "tiled" + "setuptools>=64", + "setuptools_scm[toml]>=8", ] build-backend = "setuptools.build_meta" @@ -23,7 +19,7 @@ maintainers = [ ] dynamic = ["version"] readme = "README.md" -requires-python = ">=3.8" +requires-python = ">=3.8, <3.12" keywords = ["bluesky", "databroker", "tiled", "catalog"] # https://packaging.python.org/en/latest/specifications/declaring-project-metadata/?highlight=license license = {file = "gemviz/LICENSE"} @@ -51,6 +47,14 @@ classifiers = [ "Topic :: Utilities", ] +# qt ==5 +# pyqt ==5 +dependencies = [ + "pyqtgraph", + "pyRestTable", + "tiled", +] + [project.urls] "Homepage" = "https://github.com/BCDA-APS/gemviz" "Bug Tracker" = "https://github.com/BCDA-APS/gemviz/issues" From 60de48a5cd20c1f8112ff2167ec0270ddb8037c8 Mon Sep 17 00:00:00 2001 From: Pete R Jemian Date: Wed, 28 Feb 2024 09:08:11 -0600 Subject: [PATCH 4/6] MNT #209 add opyrights to other Py files --- gemviz/__init__.py | 8 +++++ gemviz/aboutdialog.py | 8 +++++ gemviz/app.py | 8 +++++ gemviz/bluesky_runs_catalog.py | 8 +++++ gemviz/bluesky_runs_catalog_run_viz.py | 8 +++++ gemviz/bluesky_runs_catalog_search.py | 8 +++++ gemviz/bluesky_runs_catalog_table_model.py | 8 +++++ gemviz/bluesky_runs_catalog_table_view.py | 8 +++++ gemviz/chartview.py | 8 +++++ gemviz/date_time_range_slider.py | 8 +++++ gemviz/licensedialog.py | 8 +++++ gemviz/mainwindow.py | 8 +++++ gemviz/range_slider.py | 8 +++++ gemviz/select_fields_tablemodel.py | 8 +++++ gemviz/select_fields_tableview.py | 8 +++++ gemviz/select_stream_fields.py | 8 +++++ gemviz/tapi.py | 8 +++++ gemviz/tiledserverdialog.py | 8 +++++ gemviz/user_settings.py | 42 +++++++++++++--------- gemviz/utils.py | 8 +++++ 20 files changed, 177 insertions(+), 17 deletions(-) diff --git a/gemviz/__init__.py b/gemviz/__init__.py index d227aea..5035efb 100644 --- a/gemviz/__init__.py +++ b/gemviz/__init__.py @@ -41,3 +41,11 @@ DOCS_URL = "https://github.com/BCDA-APS/gemviz/blob/main/README.md" ISSUES_URL = "https://github.com/BCDA-APS/gemviz/issues" LICENSE_FILE = ROOT_DIR / "LICENSE" + +# ----------------------------------------------------------------------------- +# :copyright: (c) 2023-2024, UChicago Argonne, LLC +# +# Distributed under the terms of the Argonne National Laboratory Open Source License. +# +# The full license is in the file LICENSE.txt, distributed with this software. +# ----------------------------------------------------------------------------- diff --git a/gemviz/aboutdialog.py b/gemviz/aboutdialog.py index 5fc1f2b..68456a7 100644 --- a/gemviz/aboutdialog.py +++ b/gemviz/aboutdialog.py @@ -88,3 +88,11 @@ def clearStatus(self): def setStatus(self, text): self.parent.setStatus(text) + +# ----------------------------------------------------------------------------- +# :copyright: (c) 2023-2024, UChicago Argonne, LLC +# +# Distributed under the terms of the Argonne National Laboratory Open Source License. +# +# The full license is in the file LICENSE.txt, distributed with this software. +# ----------------------------------------------------------------------------- diff --git a/gemviz/app.py b/gemviz/app.py index 4da316b..d9a9db5 100644 --- a/gemviz/app.py +++ b/gemviz/app.py @@ -67,3 +67,11 @@ def main(): if __name__ == "__main__": main() + +# ----------------------------------------------------------------------------- +# :copyright: (c) 2023-2024, UChicago Argonne, LLC +# +# Distributed under the terms of the Argonne National Laboratory Open Source License. +# +# The full license is in the file LICENSE.txt, distributed with this software. +# ----------------------------------------------------------------------------- diff --git a/gemviz/bluesky_runs_catalog.py b/gemviz/bluesky_runs_catalog.py index f69bbe5..75d1b86 100644 --- a/gemviz/bluesky_runs_catalog.py +++ b/gemviz/bluesky_runs_catalog.py @@ -215,3 +215,11 @@ def splitter_wait_changes(self, key): def setStatus(self, text): self.parent.setStatus(text) + +# ----------------------------------------------------------------------------- +# :copyright: (c) 2023-2024, UChicago Argonne, LLC +# +# Distributed under the terms of the Argonne National Laboratory Open Source License. +# +# The full license is in the file LICENSE.txt, distributed with this software. +# ----------------------------------------------------------------------------- diff --git a/gemviz/bluesky_runs_catalog_run_viz.py b/gemviz/bluesky_runs_catalog_run_viz.py index ff2a508..e19db7d 100644 --- a/gemviz/bluesky_runs_catalog_run_viz.py +++ b/gemviz/bluesky_runs_catalog_run_viz.py @@ -43,3 +43,11 @@ def setPlot(self, plot_widget): def setStatus(self, text): self.parent.setStatus(text) + +# ----------------------------------------------------------------------------- +# :copyright: (c) 2023-2024, UChicago Argonne, LLC +# +# Distributed under the terms of the Argonne National Laboratory Open Source License. +# +# The full license is in the file LICENSE.txt, distributed with this software. +# ----------------------------------------------------------------------------- diff --git a/gemviz/bluesky_runs_catalog_search.py b/gemviz/bluesky_runs_catalog_search.py index 2937a53..9785f39 100644 --- a/gemviz/bluesky_runs_catalog_search.py +++ b/gemviz/bluesky_runs_catalog_search.py @@ -96,3 +96,11 @@ def filteredCatalog(self): def setStatus(self, text): self.parent.setStatus(text) + +# ----------------------------------------------------------------------------- +# :copyright: (c) 2023-2024, UChicago Argonne, LLC +# +# Distributed under the terms of the Argonne National Laboratory Open Source License. +# +# The full license is in the file LICENSE.txt, distributed with this software. +# ----------------------------------------------------------------------------- diff --git a/gemviz/bluesky_runs_catalog_table_model.py b/gemviz/bluesky_runs_catalog_table_model.py index 03bae7e..eb10f14 100644 --- a/gemviz/bluesky_runs_catalog_table_model.py +++ b/gemviz/bluesky_runs_catalog_table_model.py @@ -109,3 +109,11 @@ def setRuns(self, runs): """ self.runs = runs self.layoutChanged.emit() # Tell the view there is new data. + +# ----------------------------------------------------------------------------- +# :copyright: (c) 2023-2024, UChicago Argonne, LLC +# +# Distributed under the terms of the Argonne National Laboratory Open Source License. +# +# The full license is in the file LICENSE.txt, distributed with this software. +# ----------------------------------------------------------------------------- diff --git a/gemviz/bluesky_runs_catalog_table_view.py b/gemviz/bluesky_runs_catalog_table_view.py index a0529b4..6fd0ee5 100644 --- a/gemviz/bluesky_runs_catalog_table_view.py +++ b/gemviz/bluesky_runs_catalog_table_view.py @@ -214,3 +214,11 @@ def catalogLength(self): def setStatus(self, text): self.parent.setStatus(text) + +# ----------------------------------------------------------------------------- +# :copyright: (c) 2023-2024, UChicago Argonne, LLC +# +# Distributed under the terms of the Argonne National Laboratory Open Source License. +# +# The full license is in the file LICENSE.txt, distributed with this software. +# ----------------------------------------------------------------------------- diff --git a/gemviz/chartview.py b/gemviz/chartview.py index db33a25..c915c74 100644 --- a/gemviz/chartview.py +++ b/gemviz/chartview.py @@ -138,3 +138,11 @@ def setLeftAxisUnits(self, text): def setPlotTitle(self, text): self.plot_widget.plotItem.setTitle(text) + +# ----------------------------------------------------------------------------- +# :copyright: (c) 2023-2024, UChicago Argonne, LLC +# +# Distributed under the terms of the Argonne National Laboratory Open Source License. +# +# The full license is in the file LICENSE.txt, distributed with this software. +# ----------------------------------------------------------------------------- diff --git a/gemviz/date_time_range_slider.py b/gemviz/date_time_range_slider.py index 090efca..35735be 100644 --- a/gemviz/date_time_range_slider.py +++ b/gemviz/date_time_range_slider.py @@ -200,3 +200,11 @@ def setLimits(self, low, high): # main.raise_() app.exec() print(f"{main.low()=} {main.high()=}") + +# ----------------------------------------------------------------------------- +# :copyright: (c) 2023-2024, UChicago Argonne, LLC +# +# Distributed under the terms of the Argonne National Laboratory Open Source License. +# +# The full license is in the file LICENSE.txt, distributed with this software. +# ----------------------------------------------------------------------------- diff --git a/gemviz/licensedialog.py b/gemviz/licensedialog.py index 99fd29d..d2121cc 100644 --- a/gemviz/licensedialog.py +++ b/gemviz/licensedialog.py @@ -22,3 +22,11 @@ def setup(self): self.setModal(True) license_text = open(LICENSE_FILE, "r").read() self.license.setText(license_text) + +# ----------------------------------------------------------------------------- +# :copyright: (c) 2023-2024, UChicago Argonne, LLC +# +# Distributed under the terms of the Argonne National Laboratory Open Source License. +# +# The full license is in the file LICENSE.txt, distributed with this software. +# ----------------------------------------------------------------------------- diff --git a/gemviz/mainwindow.py b/gemviz/mainwindow.py index 15276d1..2b6f3b1 100644 --- a/gemviz/mainwindow.py +++ b/gemviz/mainwindow.py @@ -229,3 +229,11 @@ def setServer(self, uri, server): """Define the tiled server URI.""" self._server = server self.setCatalogs(list(server)) + +# ----------------------------------------------------------------------------- +# :copyright: (c) 2023-2024, UChicago Argonne, LLC +# +# Distributed under the terms of the Argonne National Laboratory Open Source License. +# +# The full license is in the file LICENSE.txt, distributed with this software. +# ----------------------------------------------------------------------------- diff --git a/gemviz/range_slider.py b/gemviz/range_slider.py index c1500d9..d6008b7 100644 --- a/gemviz/range_slider.py +++ b/gemviz/range_slider.py @@ -275,3 +275,11 @@ def __pixelPosToRangeValue(self, pos): slider_max - slider_min, opt.upsideDown, ) + +# ----------------------------------------------------------------------------- +# :copyright: (c) 2023-2024, UChicago Argonne, LLC +# +# Distributed under the terms of the Argonne National Laboratory Open Source License. +# +# The full license is in the file LICENSE.txt, distributed with this software. +# ----------------------------------------------------------------------------- diff --git a/gemviz/select_fields_tablemodel.py b/gemviz/select_fields_tablemodel.py index f01a451..00e1b0a 100644 --- a/gemviz/select_fields_tablemodel.py +++ b/gemviz/select_fields_tablemodel.py @@ -361,3 +361,11 @@ def plotFields(self): elif column_number in self.multipleSelectionColumns: choices[column_name].append(field_name) return choices + +# ----------------------------------------------------------------------------- +# :copyright: (c) 2023-2024, UChicago Argonne, LLC +# +# Distributed under the terms of the Argonne National Laboratory Open Source License. +# +# The full license is in the file LICENSE.txt, distributed with this software. +# ----------------------------------------------------------------------------- diff --git a/gemviz/select_fields_tableview.py b/gemviz/select_fields_tableview.py index c25e051..8fa3d4f 100644 --- a/gemviz/select_fields_tableview.py +++ b/gemviz/select_fields_tableview.py @@ -44,3 +44,11 @@ def displayTable(self, columns, fields): def responder(self, action): """Modify the plot with the described action.""" self.selected.emit(action, self.tableView.model().plotFields()) + +# ----------------------------------------------------------------------------- +# :copyright: (c) 2023-2024, UChicago Argonne, LLC +# +# Distributed under the terms of the Argonne National Laboratory Open Source License. +# +# The full license is in the file LICENSE.txt, distributed with this software. +# ----------------------------------------------------------------------------- diff --git a/gemviz/select_stream_fields.py b/gemviz/select_stream_fields.py index 66fc955..630d1e7 100644 --- a/gemviz/select_stream_fields.py +++ b/gemviz/select_stream_fields.py @@ -189,3 +189,11 @@ def to_datasets(run, stream_name, selections, scan_id=None): } return datasets, plot_options + +# ----------------------------------------------------------------------------- +# :copyright: (c) 2023-2024, UChicago Argonne, LLC +# +# Distributed under the terms of the Argonne National Laboratory Open Source License. +# +# The full license is in the file LICENSE.txt, distributed with this software. +# ----------------------------------------------------------------------------- diff --git a/gemviz/tapi.py b/gemviz/tapi.py index eb88582..1937368 100644 --- a/gemviz/tapi.py +++ b/gemviz/tapi.py @@ -349,3 +349,11 @@ def get_tiled_runs(cat, since=None, until=None, text=[], text_case=[], **keys): for v in text_case: cat = cat.search(tiled.queries.FullText(v, case_sensitive=True)) return cat + +# ----------------------------------------------------------------------------- +# :copyright: (c) 2023-2024, UChicago Argonne, LLC +# +# Distributed under the terms of the Argonne National Laboratory Open Source License. +# +# The full license is in the file LICENSE.txt, distributed with this software. +# ----------------------------------------------------------------------------- diff --git a/gemviz/tiledserverdialog.py b/gemviz/tiledserverdialog.py index 011b959..68449d0 100644 --- a/gemviz/tiledserverdialog.py +++ b/gemviz/tiledserverdialog.py @@ -65,3 +65,11 @@ def getServer(parent): selected = dialog.other_url.text() return selected + +# ----------------------------------------------------------------------------- +# :copyright: (c) 2023-2024, UChicago Argonne, LLC +# +# Distributed under the terms of the Argonne National Laboratory Open Source License. +# +# The full license is in the file LICENSE.txt, distributed with this software. +# ----------------------------------------------------------------------------- diff --git a/gemviz/user_settings.py b/gemviz/user_settings.py index ce76777..77fea53 100644 --- a/gemviz/user_settings.py +++ b/gemviz/user_settings.py @@ -253,20 +253,28 @@ def restoreSplitter(self, splitter, label): settings = ApplicationQSettings(__settings_orgName__, __package_name__) -def main(): - ss = settings - print(f"{ss=}") - - print(f"{ss.fileName()=}") - print(f"{ss.applicationName()=}") - print(f"{ss.organizationName()=}") - print(f"{ss.status()=}") - ss.setKey("billy/goat", "gruff") - for key in ss.allKeys(): - print(f"{key=} {ss.getKey(key)=} {ss._keySplit_(key)=}") - print(f"{ss.getKey(None)=}") - ss.resetDefaults() - - -if __name__ == "__main__": - main() +# def main(): +# ss = settings +# print(f"{ss=}") + +# print(f"{ss.fileName()=}") +# print(f"{ss.applicationName()=}") +# print(f"{ss.organizationName()=}") +# print(f"{ss.status()=}") +# ss.setKey("billy/goat", "gruff") +# for key in ss.allKeys(): +# print(f"{key=} {ss.getKey(key)=} {ss._keySplit_(key)=}") +# print(f"{ss.getKey(None)=}") +# ss.resetDefaults() + + +# if __name__ == "__main__": +# main() + +# ----------------------------------------------------------------------------- +# :copyright: (c) 2023-2024, UChicago Argonne, LLC +# +# Distributed under the terms of the Argonne National Laboratory Open Source License. +# +# The full license is in the file LICENSE.txt, distributed with this software. +# ----------------------------------------------------------------------------- diff --git a/gemviz/utils.py b/gemviz/utils.py index cd800bf..43e18b5 100644 --- a/gemviz/utils.py +++ b/gemviz/utils.py @@ -106,3 +106,11 @@ def myLoadUi(ui_file, baseinstance=None, **kw): def getUiFileName(py_file_name): """UI file name matches the Python file, different extension.""" return f"{pathlib.Path(py_file_name).stem}.ui" + +# ----------------------------------------------------------------------------- +# :copyright: (c) 2023-2024, UChicago Argonne, LLC +# +# Distributed under the terms of the Argonne National Laboratory Open Source License. +# +# The full license is in the file LICENSE.txt, distributed with this software. +# ----------------------------------------------------------------------------- From 4ce118d546348bef7ab68cbfb727550d7c2b2221 Mon Sep 17 00:00:00 2001 From: Pete R Jemian Date: Wed, 28 Feb 2024 09:11:01 -0600 Subject: [PATCH 5/6] MNT #209 per ruff (identical with other PRs) --- gemviz/bluesky_runs_catalog.py | 1 - 1 file changed, 1 deletion(-) diff --git a/gemviz/bluesky_runs_catalog.py b/gemviz/bluesky_runs_catalog.py index 75d1b86..f3290a4 100644 --- a/gemviz/bluesky_runs_catalog.py +++ b/gemviz/bluesky_runs_catalog.py @@ -15,7 +15,6 @@ import yaml from PyQt5 import QtWidgets -from . import tapi from . import utils PAGE_START = -1 From 9feb7fd038f24a505bdc1139d896770cc4af09dc Mon Sep 17 00:00:00 2001 From: Pete R Jemian Date: Wed, 28 Feb 2024 09:18:55 -0600 Subject: [PATCH 6/6] STY #209 per 'black' --- gemviz/aboutdialog.py | 1 + gemviz/bluesky_runs_catalog.py | 1 + gemviz/bluesky_runs_catalog_run_viz.py | 1 + gemviz/bluesky_runs_catalog_search.py | 1 + gemviz/bluesky_runs_catalog_table_model.py | 1 + gemviz/bluesky_runs_catalog_table_view.py | 1 + gemviz/chartview.py | 1 + gemviz/licensedialog.py | 1 + gemviz/mainwindow.py | 1 + gemviz/range_slider.py | 1 + gemviz/select_fields_tablemodel.py | 1 + gemviz/select_fields_tableview.py | 1 + gemviz/select_stream_fields.py | 1 + gemviz/tapi.py | 1 + gemviz/tiledserverdialog.py | 1 + gemviz/utils.py | 1 + 16 files changed, 16 insertions(+) diff --git a/gemviz/aboutdialog.py b/gemviz/aboutdialog.py index 68456a7..95a3f7f 100644 --- a/gemviz/aboutdialog.py +++ b/gemviz/aboutdialog.py @@ -89,6 +89,7 @@ def clearStatus(self): def setStatus(self, text): self.parent.setStatus(text) + # ----------------------------------------------------------------------------- # :copyright: (c) 2023-2024, UChicago Argonne, LLC # diff --git a/gemviz/bluesky_runs_catalog.py b/gemviz/bluesky_runs_catalog.py index f3290a4..0b6f1e9 100644 --- a/gemviz/bluesky_runs_catalog.py +++ b/gemviz/bluesky_runs_catalog.py @@ -215,6 +215,7 @@ def splitter_wait_changes(self, key): def setStatus(self, text): self.parent.setStatus(text) + # ----------------------------------------------------------------------------- # :copyright: (c) 2023-2024, UChicago Argonne, LLC # diff --git a/gemviz/bluesky_runs_catalog_run_viz.py b/gemviz/bluesky_runs_catalog_run_viz.py index e19db7d..2193902 100644 --- a/gemviz/bluesky_runs_catalog_run_viz.py +++ b/gemviz/bluesky_runs_catalog_run_viz.py @@ -44,6 +44,7 @@ def setPlot(self, plot_widget): def setStatus(self, text): self.parent.setStatus(text) + # ----------------------------------------------------------------------------- # :copyright: (c) 2023-2024, UChicago Argonne, LLC # diff --git a/gemviz/bluesky_runs_catalog_search.py b/gemviz/bluesky_runs_catalog_search.py index 9785f39..12eb6fd 100644 --- a/gemviz/bluesky_runs_catalog_search.py +++ b/gemviz/bluesky_runs_catalog_search.py @@ -97,6 +97,7 @@ def filteredCatalog(self): def setStatus(self, text): self.parent.setStatus(text) + # ----------------------------------------------------------------------------- # :copyright: (c) 2023-2024, UChicago Argonne, LLC # diff --git a/gemviz/bluesky_runs_catalog_table_model.py b/gemviz/bluesky_runs_catalog_table_model.py index eb10f14..266d8ed 100644 --- a/gemviz/bluesky_runs_catalog_table_model.py +++ b/gemviz/bluesky_runs_catalog_table_model.py @@ -110,6 +110,7 @@ def setRuns(self, runs): self.runs = runs self.layoutChanged.emit() # Tell the view there is new data. + # ----------------------------------------------------------------------------- # :copyright: (c) 2023-2024, UChicago Argonne, LLC # diff --git a/gemviz/bluesky_runs_catalog_table_view.py b/gemviz/bluesky_runs_catalog_table_view.py index 6fd0ee5..23e2f6a 100644 --- a/gemviz/bluesky_runs_catalog_table_view.py +++ b/gemviz/bluesky_runs_catalog_table_view.py @@ -215,6 +215,7 @@ def catalogLength(self): def setStatus(self, text): self.parent.setStatus(text) + # ----------------------------------------------------------------------------- # :copyright: (c) 2023-2024, UChicago Argonne, LLC # diff --git a/gemviz/chartview.py b/gemviz/chartview.py index c915c74..6d79beb 100644 --- a/gemviz/chartview.py +++ b/gemviz/chartview.py @@ -139,6 +139,7 @@ def setLeftAxisUnits(self, text): def setPlotTitle(self, text): self.plot_widget.plotItem.setTitle(text) + # ----------------------------------------------------------------------------- # :copyright: (c) 2023-2024, UChicago Argonne, LLC # diff --git a/gemviz/licensedialog.py b/gemviz/licensedialog.py index d2121cc..5a4cdfa 100644 --- a/gemviz/licensedialog.py +++ b/gemviz/licensedialog.py @@ -23,6 +23,7 @@ def setup(self): license_text = open(LICENSE_FILE, "r").read() self.license.setText(license_text) + # ----------------------------------------------------------------------------- # :copyright: (c) 2023-2024, UChicago Argonne, LLC # diff --git a/gemviz/mainwindow.py b/gemviz/mainwindow.py index 2b6f3b1..3a50a9e 100644 --- a/gemviz/mainwindow.py +++ b/gemviz/mainwindow.py @@ -230,6 +230,7 @@ def setServer(self, uri, server): self._server = server self.setCatalogs(list(server)) + # ----------------------------------------------------------------------------- # :copyright: (c) 2023-2024, UChicago Argonne, LLC # diff --git a/gemviz/range_slider.py b/gemviz/range_slider.py index d6008b7..126ca1f 100644 --- a/gemviz/range_slider.py +++ b/gemviz/range_slider.py @@ -276,6 +276,7 @@ def __pixelPosToRangeValue(self, pos): opt.upsideDown, ) + # ----------------------------------------------------------------------------- # :copyright: (c) 2023-2024, UChicago Argonne, LLC # diff --git a/gemviz/select_fields_tablemodel.py b/gemviz/select_fields_tablemodel.py index 00e1b0a..67398b6 100644 --- a/gemviz/select_fields_tablemodel.py +++ b/gemviz/select_fields_tablemodel.py @@ -362,6 +362,7 @@ def plotFields(self): choices[column_name].append(field_name) return choices + # ----------------------------------------------------------------------------- # :copyright: (c) 2023-2024, UChicago Argonne, LLC # diff --git a/gemviz/select_fields_tableview.py b/gemviz/select_fields_tableview.py index 8fa3d4f..0257674 100644 --- a/gemviz/select_fields_tableview.py +++ b/gemviz/select_fields_tableview.py @@ -45,6 +45,7 @@ def responder(self, action): """Modify the plot with the described action.""" self.selected.emit(action, self.tableView.model().plotFields()) + # ----------------------------------------------------------------------------- # :copyright: (c) 2023-2024, UChicago Argonne, LLC # diff --git a/gemviz/select_stream_fields.py b/gemviz/select_stream_fields.py index 630d1e7..16dcd72 100644 --- a/gemviz/select_stream_fields.py +++ b/gemviz/select_stream_fields.py @@ -190,6 +190,7 @@ def to_datasets(run, stream_name, selections, scan_id=None): return datasets, plot_options + # ----------------------------------------------------------------------------- # :copyright: (c) 2023-2024, UChicago Argonne, LLC # diff --git a/gemviz/tapi.py b/gemviz/tapi.py index 1937368..8cc0f77 100644 --- a/gemviz/tapi.py +++ b/gemviz/tapi.py @@ -350,6 +350,7 @@ def get_tiled_runs(cat, since=None, until=None, text=[], text_case=[], **keys): cat = cat.search(tiled.queries.FullText(v, case_sensitive=True)) return cat + # ----------------------------------------------------------------------------- # :copyright: (c) 2023-2024, UChicago Argonne, LLC # diff --git a/gemviz/tiledserverdialog.py b/gemviz/tiledserverdialog.py index 68449d0..226e0bb 100644 --- a/gemviz/tiledserverdialog.py +++ b/gemviz/tiledserverdialog.py @@ -66,6 +66,7 @@ def getServer(parent): return selected + # ----------------------------------------------------------------------------- # :copyright: (c) 2023-2024, UChicago Argonne, LLC # diff --git a/gemviz/utils.py b/gemviz/utils.py index 43e18b5..dfed470 100644 --- a/gemviz/utils.py +++ b/gemviz/utils.py @@ -107,6 +107,7 @@ def getUiFileName(py_file_name): """UI file name matches the Python file, different extension.""" return f"{pathlib.Path(py_file_name).stem}.ui" + # ----------------------------------------------------------------------------- # :copyright: (c) 2023-2024, UChicago Argonne, LLC #