Merge remote-tracking branch 'anntzer/up' into qt6-integration

Re-integrating changes from
<#62>

Thank you, @anntzer!

Author: mfisher87

README.rst

@@ -19,6 +19,7 @@ Dependencies:
   * Matplotlib 3.5+
   * NumPy 1.22+
   * SciPy 1.8+
+  * one of PyQt6, PySide6
 
 License:
   MIT, see `LICENSE <LICENSE>`__ for details.

viscm/bezierbuilder/__init__.py

@@ -32,6 +32,8 @@
 from viscm.bezierbuilder.curve import curve_method
 from viscm.minimvc import Trigger
 
+Qt = QtCore.Qt
+
 
 class ControlPointModel:
     def __init__(self, xp, yp, fixed=None):
@@ -104,12 +106,14 @@ def on_button_press(self, event):
         if event.inaxes != self.ax:
             return
         res, ind = self.control_polygon.contains(event)
-        if res and modkey == QtCore.Qt.NoModifier:
+        if res and modkey == Qt.KeyboardModifier.NoModifier:
             self._index = ind["ind"][0]
-        if res and (modkey == QtCore.Qt.ControlModifier or self.mode == "remove"):
+        if res and (
+            modkey == Qt.KeyboardModifier.ControlModifier or self.mode == "remove"
+        ):
             # Control-click deletes
             self.control_point_model.remove_point(ind["ind"][0])
-        if modkey == QtCore.Qt.ShiftModifier or self.mode == "add":
+        if modkey == Qt.KeyboardModifier.ShiftModifier or self.mode == "add":
             # Adding a new point. Find the two closest points and insert it in
             # between them.
             total_squared_dists = []

viscm/cli.py

@@ -111,7 +111,7 @@ def cli():
 
     signal.signal(signal.SIGINT, signal.SIG_DFL)
 
-    app.exec_()
+    app.exec()
 
 
 def _make_window(
@@ -145,7 +145,7 @@ def _make_window(
             v.figure.savefig(str(save))
     elif action == "edit":
         if not cm.can_edit:
-            sys.exit("Sorry, I don't know how to edit the specified colormap")
+            raise RuntimeError("Sorry, I don't know how to edit the specified colormap")
 
         v = gui.viscm_editor(
             figure=fig,
@@ -164,7 +164,8 @@ def _make_window(
         sys.exit()
 
     figure_canvas.setSizePolicy(
-        gui.QtWidgets.QSizePolicy.Expanding, gui.QtWidgets.QSizePolicy.Expanding
+        gui.QtWidgets.QSizePolicy.Policy.Expanding,
+        gui.QtWidgets.QSizePolicy.Policy.Expanding,
     )
     figure_canvas.updateGeometry()
 

viscm/gui.py

@@ -15,7 +15,7 @@
 # matplotlib.rcParams['backend'] = "QT4AGG"
 # Do this first before any other matplotlib imports, to force matplotlib to
 # use a Qt backend
-from matplotlib.backends.qt_compat import QtCore, QtGui, QtWidgets, _getSaveFileName
+from matplotlib.backends.qt_compat import QtCore, QtGui, QtWidgets
 
 try:
     from matplotlib.backends.backend_qtagg import FigureCanvasQTAgg as FigureCanvas
@@ -40,6 +40,9 @@
 
 from .minimvc import Trigger
 
+Qt = QtCore.Qt
+
+
 # The correct L_A value for the standard sRGB viewing conditions is:
 #   (64 / np.pi) / 5
 # Due to an error in our color conversion code, the matplotlib colormaps were
@@ -1075,18 +1078,16 @@ def about():
 class ViewerWindow(QtWidgets.QMainWindow):
     def __init__(self, figurecanvas, viscm, cmapname, parent=None):
         QtWidgets.QMainWindow.__init__(self, parent)
-        self.setAttribute(QtCore.Qt.WA_DeleteOnClose)
+        self.setAttribute(Qt.WidgetAttribute.WA_DeleteOnClose)
         self.main_widget = QtWidgets.QWidget(self)
         self.cmapname = cmapname
 
         file_menu = QtWidgets.QMenu("&File", self)
-        file_menu.addAction("&Save", self.save, QtCore.Qt.CTRL + QtCore.Qt.Key_S)
-        file_menu.addAction("&Quit", self.fileQuit, QtCore.Qt.CTRL + QtCore.Qt.Key_Q)
+        file_menu.addAction("&Save", self.save).setShortcut("Ctrl+S")
+        file_menu.addAction("&Quit", self.fileQuit).setShortcut("Ctrl+Q")
 
         options_menu = QtWidgets.QMenu("&Options", self)
-        options_menu.addAction(
-            "&Toggle Gamut", self.toggle_gamut, QtCore.Qt.CTRL + QtCore.Qt.Key_G
-        )
+        options_menu.addAction("&Toggle Gamut", self.toggle_gamut).setShortcut("Ctrl+G")
 
         help_menu = QtWidgets.QMenu("&Help", self)
         help_menu.addAction("&About", about)
@@ -1116,7 +1117,8 @@ def closeEvent(self, ce):
         self.fileQuit()
 
     def save(self):
-        fileName, _ = _getSaveFileName(
+        fileName, _ = QtWidgets.QFileDialog.getSaveFileName(
+            self,
             caption="Save file",
             directory=self.cmapname + ".png",
             filter="Image Files (*.png *.jpg *.bmp)",
@@ -1128,18 +1130,16 @@ def save(self):
 class EditorWindow(QtWidgets.QMainWindow):
     def __init__(self, figurecanvas, viscm_editor, parent=None):
         QtWidgets.QMainWindow.__init__(self, parent)
-        self.setAttribute(QtCore.Qt.WA_DeleteOnClose)
+        self.setAttribute(Qt.WidgetAttribute.WA_DeleteOnClose)
         self.viscm_editor = viscm_editor
 
         file_menu = QtWidgets.QMenu("&File", self)
-        file_menu.addAction("&Save", self.save, QtCore.Qt.CTRL + QtCore.Qt.Key_S)
+        file_menu.addAction("&Save", self.save).setShortcut("Ctrl+S")
         file_menu.addAction("&Export .py", self.export)
-        file_menu.addAction("&Quit", self.fileQuit, QtCore.Qt.CTRL + QtCore.Qt.Key_Q)
+        file_menu.addAction("&Quit", self.fileQuit).setShortcut("Ctrl+Q")
 
         options_menu = QtWidgets.QMenu("&Options", self)
-        options_menu.addAction(
-            "&Load in Viewer", self.loadviewer, QtCore.Qt.CTRL + QtCore.Qt.Key_V
-        )
+        options_menu.addAction("&Load in Viewer", self.loadviewer).setShortcut("Ctrl+V")
 
         help_menu = QtWidgets.QMenu("&Help", self)
         help_menu.addAction("&About", about)
@@ -1151,21 +1151,21 @@ def __init__(self, figurecanvas, viscm_editor, parent=None):
 
         self.main_widget = QtWidgets.QWidget(self)
 
-        self.max_slider = QtWidgets.QSlider(QtCore.Qt.Horizontal)
+        self.max_slider = QtWidgets.QSlider(Qt.Orientation.Horizontal)
         self.max_slider.setMinimum(0)
         self.max_slider.setMaximum(100)
         self.max_slider.setValue(int(viscm_editor.max_Jp))
-        self.max_slider.setTickPosition(QtWidgets.QSlider.TicksBelow)
+        self.max_slider.setTickPosition(QtWidgets.QSlider.TickPosition.TicksBelow)
         self.max_slider.setTickInterval(10)
         self.max_slider.valueChanged.connect(self.updatejp)
         self.max_slider_num = QtWidgets.QLabel(str(viscm_editor.max_Jp))
         self.max_slider_num.setFixedWidth(30)
 
-        self.min_slider = QtWidgets.QSlider(QtCore.Qt.Horizontal)
+        self.min_slider = QtWidgets.QSlider(Qt.Orientation.Horizontal)
         self.min_slider.setMinimum(0)
         self.min_slider.setMaximum(100)
         self.min_slider.setValue(int(viscm_editor.min_Jp))
-        self.min_slider.setTickPosition(QtWidgets.QSlider.TicksBelow)
+        self.min_slider.setTickPosition(QtWidgets.QSlider.TickPosition.TicksBelow)
         self.min_slider.setTickInterval(10)
         self.min_slider.valueChanged.connect(self.updatejp)
         self.min_slider_num = QtWidgets.QLabel(str(viscm_editor.min_Jp))
@@ -1189,7 +1189,7 @@ def __init__(self, figurecanvas, viscm_editor, parent=None):
         mainlayout.addLayout(min_slider_layout)
 
         if viscm_editor.cmtype == "diverging":
-            smoothness_slider = QtWidgets.QSlider(QtCore.Qt.Horizontal)
+            smoothness_slider = QtWidgets.QSlider(Qt.Horizontal)
             # We want the slider to vary filter_k exponentially between 5 and
             # 1000. So it should go from [log10(5), log10(1000)]
             # which is about [0.699, 3.0]
@@ -1206,7 +1206,7 @@ def __init__(self, figurecanvas, viscm_editor, parent=None):
             metrics = QtGui.QFontMetrics(smoothness_slider_num.font())
             max_width = metrics.width("1000.00")
             smoothness_slider_num.setFixedWidth(max_width)
-            smoothness_slider_num.setAlignment(QtCore.Qt.AlignRight)
+            smoothness_slider_num.setAlignment(Qt.AlignRight)
             self.smoothness_slider_num = smoothness_slider_num
 
             smoothness_slider_layout = QtWidgets.QHBoxLayout()
@@ -1221,41 +1221,32 @@ def __init__(self, figurecanvas, viscm_editor, parent=None):
                 self.update_smoothness_slider
             )
 
-        self.moveAction = QtWidgets.QAction("Drag points", self)
+        self.toolbar = self.addToolBar("Tools")
+        self.moveAction = self.toolbar.addAction("Drag points")
         self.moveAction.triggered.connect(self.set_move_mode)
         self.moveAction.setCheckable(True)
-
-        self.addAction = QtWidgets.QAction("Add points", self)
+        self.addAction = self.toolbar.addAction("Add points")
         self.addAction.triggered.connect(self.set_add_mode)
         self.addAction.setCheckable(True)
-
-        self.removeAction = QtWidgets.QAction("Remove points", self)
+        self.removeAction = self.toolbar.addAction("Remove points")
         self.removeAction.triggered.connect(self.set_remove_mode)
         self.removeAction.setCheckable(True)
 
-        self.swapAction = QtWidgets.QAction("Flip brightness", self)
+        self.toolbar.addSeparator()
+        self.swapAction = self.toolbar.addAction("Flip brightness")
         self.swapAction.triggered.connect(self.swapjp)
-        renameAction = QtWidgets.QAction("Rename colormap", self)
-        renameAction.triggered.connect(self.rename)
-
-        saveAction = QtWidgets.QAction("Save", self)
-        saveAction.triggered.connect(self.save)
 
-        self.toolbar = self.addToolBar("Tools")
-        self.toolbar.addAction(self.moveAction)
-        self.toolbar.addAction(self.addAction)
-        self.toolbar.addAction(self.removeAction)
         self.toolbar.addSeparator()
-        self.toolbar.addAction(self.swapAction)
-        self.toolbar.addSeparator()
-        self.toolbar.addAction(renameAction)
-        self.toolbar.addAction(saveAction)
+        renameAction = self.toolbar.addAction("Rename colormap")
+        renameAction.triggered.connect(self.rename)
+        saveAction = self.toolbar.addAction("Save")
+        saveAction.triggered.connect(self.save)
 
         self.moveAction.setChecked(True)
 
         self.main_widget.setFocus()
         figurecanvas.setFocus()
-        figurecanvas.setFocusPolicy(QtCore.Qt.StrongFocus)
+        figurecanvas.setFocusPolicy(Qt.FocusPolicy.StrongFocus)
         self.setCentralWidget(self.main_widget)
 
     def rename(self):
@@ -1304,7 +1295,8 @@ def set_remove_mode(self):
         self.viscm_editor.bezier_builder.mode = "remove"
 
     def export(self):
-        fileName, _ = _getSaveFileName(
+        fileName, _ = QtWidgets.QFileDialog.getSaveFileName(
+            self,
             caption="Export file",
             directory=self.viscm_editor.name + ".py",
             filter=".py (*.py)",
@@ -1319,7 +1311,8 @@ def closeEvent(self, ce):
         self.fileQuit()
 
     def save(self):
-        fileName, _ = _getSaveFileName(
+        fileName, _ = QtWidgets.QFileDialog.getSaveFileName(
+            self,
             caption="Save file",
             directory=self.viscm_editor.name + ".jscm",
             filter="JSCM Files (*.jscm)",
@@ -1334,7 +1327,8 @@ def loadviewer(self):
         v = viscm(cm, name=self.viscm_editor.name, figure=newfig)
 
         newcanvas.setSizePolicy(
-            QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding
+            QtWidgets.QSizePolicy.Policy.Expanding,
+            QtWidgets.QSizePolicy.Policy.Expanding,
         )
         newcanvas.updateGeometry()