Merge 06d60e18b5 into 97acc1659b

README.md

@@ -2,9 +2,7 @@
 SPSPy is a Python based package of tools for use with the Super-Enge Split-Pole Spectrograph at FSU. Much of the code here is based on Java programs originally written at Yale University by D.W. Visser, C.M. Deibel, and others. Currently the package contains SPSPlot, a tool aimed at informing users which states should appear at the focal plane of the SESPS, and SPANC, a tool for calibrating the position spectra from the focal plane.
 
 ## Depencencies and Requirements
-The requirements for running SPSPy are outlined in the requirements.txt file located in the repository. It is recommended to install these to a local virtual environment using `pip install -r requirements.txt`. For conda use the environments.yml file to create a conda environment for SPSPy. Simply run `conda env create -f environment.yml` from the SPSPy directory. conda will make a new virtual environment named spsenv with the dependencies outlined in environments.yml. If you already have an environment named spsenv or would like to change the name simply edit the first line of the enviornments.yml.
-
-The recommended install for SPSPy dependencies is via pip. 
+To ensure capability, use python 3.14. The requirements for running SPSPy are outlined in the requirements.txt file located in the repository. It is recommended to install these to a local virtual environment using `pip install -r requirements.txt`.
 
 ### Creating a virtual environment with pip
 To create a virtual environment with pip in the terminal for MacOS or Linux use `python3 -m venv env` to create a local virtual environment named `env` (or whatever name you'd like), or on Windows use `py -m venv env` to do the same. To activate your new environment run `source env/bin/activate` in MacOS or Linux, or `.\env\Scripts\activate`. Now you can run the above `pip` command to install all dependencies to the virtual environment. To leave the virtual environment use the command `deactivate` in your terminal.

environment.yml

@@ -1,51 +0,0 @@
-name: spsenv
-channels:
-  - defaults
-dependencies:
-  - _libgcc_mutex=0.1=main
-  - _openmp_mutex=5.1=1_gnu
-  - bzip2=1.0.8=h7b6447c_0
-  - ca-certificates=2022.10.11=h06a4308_0
-  - certifi=2022.9.24=py310h06a4308_0
-  - ld_impl_linux-64=2.38=h1181459_1
-  - libffi=3.4.2=h6a678d5_6
-  - libgcc-ng=11.2.0=h1234567_1
-  - libgomp=11.2.0=h1234567_1
-  - libstdcxx-ng=11.2.0=h1234567_1
-  - libuuid=1.41.5=h5eee18b_0
-  - ncurses=6.3=h5eee18b_3
-  - openssl=1.1.1s=h7f8727e_0
-  - pip=22.2.2=py310h06a4308_0
-  - python=3.10.8=h7a1cb2a_1
-  - readline=8.2=h5eee18b_0
-  - setuptools=65.5.0=py310h06a4308_0
-  - sqlite=3.40.0=h5082296_0
-  - tk=8.6.12=h1ccaba5_0
-  - tzdata=2022f=h04d1e81_0
-  - wheel=0.37.1=pyhd3eb1b0_0
-  - xz=5.2.8=h5eee18b_0
-  - zlib=1.2.13=h5eee18b_0
-  - pip:
-    - charset-normalizer==2.1.1
-    - contourpy==1.0.6
-    - cycler==0.11.0
-    - fonttools==4.38.0
-    - idna==3.4
-    - kiwisolver==1.4.4
-    - lxml==4.9.1
-    - matplotlib==3.6.2
-    - numpy==1.23.5
-    - packaging==21.3
-    - pillow==9.3.0
-    - pycatima==1.71
-    - pyparsing==3.0.9
-    - pyqtdarktheme==1.2.1
-    - pyside6==6.4.1
-    - pyside6-addons==6.4.1
-    - pyside6-essentials==6.4.1
-    - python-dateutil==2.8.2
-    - requests==2.28.1
-    - scipy==1.9.3
-    - shiboken6==6.4.1
-    - six==1.16.0
-    - urllib3==1.26.13

requirements.txt

@@ -1,8 +1,25 @@
-lxml==4.9.1
-matplotlib==3.6.2
-numpy==1.23.5
-pycatima==1.71
-pyqtdarktheme==1.2.1
-PySide6==6.4.1
-requests==2.28.1
-scipy==1.9.3
+certifi==2025.11.12
+charset-normalizer==3.4.4
+contourpy==1.3.3
+cycler==0.12.1
+fonttools==4.61.0
+idna==3.11
+kiwisolver==1.4.9
+lxml==6.0.2
+matplotlib==3.10.7
+numpy==2.3.5
+packaging==25.0
+pillow==12.0.0
+pycatima==1.981
+pyparsing==3.2.5
+PySide6==6.10.1
+PySide6_Addons==6.10.1
+PySide6_Essentials==6.10.1
+python-dateutil==2.9.0.post0
+QDarkStyle==3.2.3
+QtPy==2.4.3
+requests==2.32.5
+scipy==1.16.3
+shiboken6==6.10.1
+six==1.17.0
+urllib3==2.5.0

spspy/Launcher.py

@@ -9,7 +9,7 @@ from .SpancUI import run_spanc_ui, SpancGUI
 
 import sys
 import matplotlib as mpl
-from qdarktheme import load_stylesheet
+import qdarkstyle
 
 class Launcher(QMainWindow):
     def __init__(self, parent=None):
@@ -43,6 +43,7 @@ def run_launcher() -> None:
     app = QApplication.instance()
     if not app:
         app = QApplication(sys.argv)
-        app.setStyleSheet(load_stylesheet())
+        # app.setStyleSheet(load_stylesheet())
+        app.setStyleSheet(qdarkstyle.load_stylesheet())
     window = Launcher()
     sys.exit(app.exec_())

spspy/SPSPlotUI.py

@@ -13,7 +13,7 @@ from PySide6.QtWidgets import QDoubleSpinBox
 from PySide6.QtWidgets import QFileDialog
 from PySide6.QtGui import QAction
 
-from qdarktheme import load_stylesheet
+import qdarkstyle
 from enum import Enum, auto
 import matplotlib as mpl
 import sys
@@ -299,6 +299,7 @@ def run_spsplot_ui():
     app = QApplication.instance()
     if not app:
         app = QApplication(sys.argv)
-        app.setStyleSheet(load_stylesheet())
+        # app.setStyleSheet(load_stylesheet())
+        app.setStyleSheet(qdarkstyle.load_stylesheet())
     window = SPSPlotGUI()
     sys.exit(app.exec_())

spspy/SpancUI.py

@@ -12,7 +12,7 @@ from PySide6.QtWidgets import QPushButton, QTextEdit, QSpinBox
 from PySide6.QtWidgets import QFileDialog
 from PySide6.QtGui import QAction
 
-from qdarktheme import load_stylesheet, load_palette
+import qdarkstyle
 import matplotlib as mpl
 import numpy as np
 from numpy.typing import NDArray
@@ -381,6 +381,7 @@ def run_spanc_ui() :
     app = QApplication.instance()
     if not app:
         app = QApplication(sys.argv)
-        app.setStyleSheet(load_stylesheet())
+        # app.setStyleSheet(load_stylesheet())
+        app.setStyleSheet(qdarkstyle.load_stylesheet())
     window = SpancGUI()
     sys.exit(app.exec_())