ENH: Kore LST support, release info for v2.1.0 (#71)

trappitsch · web-flow · commit 5148a12cb19c · 2025-08-27T11:40:11.000+02:00
* add kore lst converter entry with `Ctrl+K` shortcut

* explicitly call `write_crd()` in KORE2LST routine

* swtich rimseval req to kore_lst_support branch

* update release information to prepare for 2.1.0
diff --git a/.github/workflows/release_multi_os.yml b/.github/workflows/release_multi_os.yml
@@ -12,12 +12,12 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        python-version: [3.11]
+        python-version: [3.12]
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v5
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
@@ -57,12 +57,12 @@ jobs:
     runs-on: macos-latest
     strategy:
       matrix:
-        python-version: [3.11]
+        python-version: [3.12]
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v5
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
@@ -83,60 +83,23 @@ jobs:
           tag: ${{ github.ref }}
           overwrite: true
 
-  build-ubuntu-20-04:
-    needs: build-windows
-    name: Ubuntu Packaging 20.04
-    runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        python-version: [ 3.11 ]
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Install fpm (required for fbs)
-        run: |
-          sudo apt-get install ruby ruby-dev rubygems build-essential
-          sudo gem install --no-document fpm
-          fpm --version
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install -r requirements.txt
-          pip install ${{ secrets.FBS_DL }}
-      - name: Run fbs and freeze application
-        run: |
-          fbs freeze
-          fbs installer
-      - name: Upload binaries to release
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: target/RIMSEvaluation.deb
-          asset_name: RIMSEvaluation_Ubuntu_20.04.deb
-          tag: ${{ github.ref }}
-          overwrite: true
-
   build-ubuntu-22-04:
     needs: build-windows
     name: Ubuntu Packaging 22.04
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        python-version: [ 3.11 ]
+        python-version: [ 3.12 ]
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v5
       - name: Install fpm (required for fbs)
         run: |
           sudo apt-get install ruby ruby-dev rubygems build-essential
           sudo gem install --no-document fpm
           fpm --version
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
diff --git a/release_text.md b/release_text.md
@@ -1,9 +1,9 @@
-# RIMSEvalGUI v2.0.14
+# RIMSEvalGUI v2.1.0
 
-RIMSEvalGUI release based on the latest `rimseval` version `v2.0.2`.
+RIMSEvalGUI release based on the latest `rimseval` version `v2.1.0`.
 
 **Main Changes to GUI:**
-- Peak overlaps now only trigger a question to the user to confirm the intention.
+- KORE LST files can now be converted to CRD files.
 
 
-Changes in `rimseval` package since last version: see [here](https://github.com/RIMS-Code/RIMSEval/releases/tag/v2.0.2).
+Changes in `rimseval` package since last version: see [here](https://github.com/RIMS-Code/RIMSEval/releases/tag/v2.1.0).
diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,7 @@
 PyQt6
 pyqtdarktheme
-rimseval>=2.0.2
-git+https://github.com/trappitsch/pyqtconfig@DialogBox_fixes_for_PyQt6
+rimseval~=2.1
+pyqtconfig
 matplotlib
 numpy
 requests
diff --git a/src/build/settings/base.json b/src/build/settings/base.json
@@ -2,5 +2,5 @@
     "app_name": "RIMSEvaluation",
     "author": "Reto Trappitsch",
     "main_module": "src/main/python/main.py",
-    "version": "2.0.14"
+    "version": "2.1.0"
 }
diff --git a/src/main/python/dialogs.py b/src/main/python/dialogs.py
@@ -67,7 +67,7 @@ def about_text(self):
         )
         layout.addWidget(issues)
 
-        author = QtWidgets.QLabel("Reto Trappitsch, 2022")
+        author = QtWidgets.QLabel("Reto Trappitsch")
         layout.addWidget(author)
 
         button_box = QtWidgets.QDialogButtonBox(
diff --git a/src/main/python/main.py b/src/main/python/main.py
@@ -1,5 +1,6 @@
 """Main RIMSEval graphical user interface."""
 
+from importlib import metadata
 import itertools
 import json
 from pathlib import Path
@@ -72,7 +73,7 @@ def __init__(self, appctxt, is_windows: bool = False):
         self.init_config_manager()
 
         # window titles and geometry
-        self.version = f"v{rimseval.__version__}"
+        self.version = f"v{metadata.version('rimseval')}"
         self.setWindowTitle(f"RIMS Evaluation {self.version}")
         self.setGeometry(QtCore.QRect(310, 100, 700, 100))
 
@@ -193,7 +194,7 @@ def __init__(self, appctxt, is_windows: bool = False):
 
         # welcome the user
         self.status_bar.showMessage(
-            f"Welcome to RIMSEval v{rimseval.__version__}", msecs=self.status_bar_time
+            f"Welcome to RIMSEval v{self.version}", msecs=self.status_bar_time
         )
 
         # update actions
@@ -770,6 +771,18 @@ def init_menu_toolbar(self):
 
         # LST FILE ACTIONS #
 
+        kore_convert_action = QtGui.QAction(
+            QtGui.QIcon(self.appctxt.get_resource("icons/blue-folder-import.png")),
+            "Convert KORE to CRD",
+            self,
+        )
+        kore_convert_action.setStatusTip("Convert KORE to CRD file(s)")
+        kore_convert_action.setShortcut(QtGui.QKeySequence("Ctrl+k"))
+        kore_convert_action.triggered.connect(self.convert_kore_to_crd)
+        self.lst_menu.addAction(kore_convert_action)
+        tool_bar.addSeparator()
+        tool_bar.addAction(kore_convert_action)
+
         lst_convert_action = QtGui.QAction(
             QtGui.QIcon(self.appctxt.get_resource("icons/blue-folder-import.png")),
             "Convert LST to CRD",
@@ -1637,6 +1650,36 @@ def calculate_batch(self):
 
     # LST FILE FUNCTIONS #
 
+    def convert_kore_to_crd(self):
+        """Convert a KORE LST file to CRD File(s)."""
+        query = QtWidgets.QFileDialog.getOpenFileNames(
+            self,
+            "Open LST File(s)",
+            directory=str(self.user_folder),
+            filter="KORE LST Files (*.lst)",
+        )[0]
+
+        if len(query) > 0:
+            fnames = [Path(it) for it in query]
+            for it, fname in enumerate(fnames):
+                try:
+                    lst = rimseval.data_io.kore_to_crd.KORE2CRD(file_name=fname)
+                    lst.write_crd()
+
+                    self.status_bar.showMessage(
+                        f"{fname.name} converted, {it + 1}/{len(fnames)} done.",
+                        msecs=self.status_bar_time,
+                    )
+                    QtWidgets.QApplication.processEvents()
+
+                except OSError as err:
+                    QtWidgets.QMessageBox.warning(
+                        self, "KORE LST File error", err.args[0]
+                    )
+
+            # set user path to this folder
+            self.user_folder = fname.parent
+
     def convert_lst_to_crd(self, tagged=False):
         """Convert LST to CRD File(s).
 
@@ -1665,7 +1708,7 @@ def convert_lst_to_crd(self, tagged=False):
                     lst.write_crd()
 
                     self.status_bar.showMessage(
-                        f"{fname.name} converted, {it+1}/{len(fnames)} done.",
+                        f"{fname.name} converted, {it + 1}/{len(fnames)} done.",
                         msecs=self.status_bar_time,
                     )
                     QtWidgets.QApplication.processEvents()
diff --git a/src/requirements/base.txt b/src/requirements/base.txt
@@ -1,7 +1,7 @@
 PyQt6
 pyqtdarktheme
-rimseval==2.0.2
-git+https://github.com/trappitsch/pyqtconfig@DialogBox_fixes_for_PyQt6
+rimseval==2.1.0
+pyqtconfig
 matplotlib
 numpy
 requests

Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@`
`2`	`2`	`"app_name": "RIMSEvaluation",`
`3`	`3`	`"author": "Reto Trappitsch",`
`4`	`4`	`"main_module": "src/main/python/main.py",`
`5`		`- "version": "2.0.14"`
	`5`	`+ "version": "2.1.0"`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ def about_text(self):`
`67`	`67`	`)`
`68`	`68`	`layout.addWidget(issues)`
`69`	`69`
`70`		`- author = QtWidgets.QLabel("Reto Trappitsch, 2022")`
	`70`	`+ author = QtWidgets.QLabel("Reto Trappitsch")`
`71`	`71`	`layout.addWidget(author)`
`72`	`72`
`73`	`73`	`button_box = QtWidgets.QDialogButtonBox(`