Merge branch 'develop' into main

CPrescher · Oct 31, 2023 · 8dd252e · 8dd252e
2 parents 14a11a6 + f5846e1
commit 8dd252e
Show file tree

Hide file tree

Showing 6 changed files with 883 additions and 832 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-[![Coverage Status](https://coveralls.io/repos/github/Luindil/Glassure/badge.svg?branch=develop)](https://coveralls.io/github/Luindil/Glassure?branch=develop)
+[![codecov](https://codecov.io/gh/CPrescher/Glassure/graph/badge.svg?token=H7XYCD78TT)](https://codecov.io/gh/CPrescher/Glassure)
 [![DOI](https://zenodo.org/badge/24698239.svg)](https://zenodo.org/badge/latestdoi/24698239)
 
 # Glassure

diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,9 @@
+## 1.4.2 (2023/10/31)
+
+### Bug fixes:
+- not specifically dependent on pyside anymore, glassure should now also work with pyqt6, pyqt5 or pyside2, default
+  is still pyside6
+
 ## 1.4.1 (2023/10/27)
 
 ### Bug fixes:

diff --git a/glassure/__init__.py b/glassure/__init__.py
@@ -1,3 +1,3 @@
 # -*- coding: utf8 -*-
-__version__ = '1.4.1'
+__version__ = '1.4.2'
 
diff --git a/glassure/gui/controller/glassure_controller.py b/glassure/gui/controller/glassure_controller.py
@@ -2,7 +2,6 @@
 
 import os
 
-from PySide6.QtCore import Slot
 from qtpy import QtCore, QtWidgets
 import pyqtgraph as pg
 
@@ -165,7 +164,7 @@ def delete_element_btn_clicked(self):
     def update_sample(self, sample: Sample):
         self.model.sample_config = sample
 
-    @Slot()
+    @QtCore.Slot()
     def update_model(self):
         sample_config = self.main_widget.get_sample_config()
         transform_config = self.main_widget.get_transform_config()