Compatibility fixes with python 3.10

Signed-off-by: falkTX <falktx@falktx.com>
falkTX · Jun 18, 2022 · e8172cd · e8172cd
1 parent c810989
commit e8172cd
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 16 deletions.
diff --git a/src/canvaspreviewframe.py b/src/canvaspreviewframe.py
@@ -166,6 +166,9 @@ def mouseReleaseEvent(self, event):
         QFrame.mouseReleaseEvent(self, event)
 
     def paintEvent(self, event):
+        if not self.fUseCustomPaint:
+            QFrame.paintEvent(self, event)
+
         painter = QPainter(self)
 
         if self.fUseCustomPaint:
@@ -200,11 +203,6 @@ def paintEvent(self, event):
         painter.setPen(self.fViewPen)
         painter.drawRect(QRectF(self.fViewRect[iX], self.fViewRect[iY], maxWidth, maxHeight))
 
-        if self.fUseCustomPaint:
-            event.accept()
-        else:
-            QFrame.paintEvent(self, event)
-
     def resizeEvent(self, event):
         self.fRenderSource = self.getRenderSource()
 

diff --git a/src/claudia.py b/src/claudia.py
@@ -2160,13 +2160,13 @@ def slot_verticalScrollBarChanged(self, value):
     @pyqtSlot()
     def slot_miniCanvasInit(self):
         settings = QSettings()
-        self.ui.graphicsView.horizontalScrollBar().setValue(settings.value("HorizontalScrollBarValue", DEFAULT_CANVAS_WIDTH / 3, type=int))
-        self.ui.graphicsView.verticalScrollBar().setValue(settings.value("VerticalScrollBarValue", DEFAULT_CANVAS_HEIGHT * 3 / 8, type=int))
+        self.ui.graphicsView.horizontalScrollBar().setValue(settings.value("HorizontalScrollBarValue", int(DEFAULT_CANVAS_WIDTH / 3), type=int))
+        self.ui.graphicsView.verticalScrollBar().setValue(settings.value("VerticalScrollBarValue", int(DEFAULT_CANVAS_HEIGHT * 3 / 8), type=int))
 
     @pyqtSlot(float, float)
     def slot_miniCanvasMoved(self, xp, yp):
-        self.ui.graphicsView.horizontalScrollBar().setValue(xp * DEFAULT_CANVAS_WIDTH)
-        self.ui.graphicsView.verticalScrollBar().setValue(yp * DEFAULT_CANVAS_HEIGHT)
+        self.ui.graphicsView.horizontalScrollBar().setValue(int(xp * DEFAULT_CANVAS_WIDTH))
+        self.ui.graphicsView.verticalScrollBar().setValue(int(yp * DEFAULT_CANVAS_HEIGHT))
 
     @pyqtSlot()
     def slot_miniCanvasCheckAll(self):
@@ -2176,7 +2176,8 @@ def slot_miniCanvasCheckAll(self):
 
     @pyqtSlot()
     def slot_miniCanvasCheckSize(self):
-        self.ui.miniCanvasPreview.setViewSize(float(self.ui.graphicsView.width()) / DEFAULT_CANVAS_WIDTH, float(self.ui.graphicsView.height()) / DEFAULT_CANVAS_HEIGHT)
+        self.ui.miniCanvasPreview.setViewSize(float(self.ui.graphicsView.width()) / DEFAULT_CANVAS_WIDTH,
+                                              float(self.ui.graphicsView.height()) / DEFAULT_CANVAS_HEIGHT)
 
     @pyqtSlot()
     def slot_handleCrash_jack(self):

diff --git a/src/jacksettings.py b/src/jacksettings.py
@@ -406,7 +406,7 @@ def loadServerSettings(self, reset=False, forceReset=False):
             elif attribute == "client-timeout":
                 self.setComboBoxValue(self.ui.obj_server_client_timeout, str(int(value)))
             elif attribute == "clock-source":
-                if len(str(value)) == 1 :
+                if len(str(value)) == 1 and not isinstance(value, dbus.UInt32):
                     value = str(value)
                     if value == "c":
                         self.ui.obj_server_clock_source_cycle.setChecked(True)

diff --git a/src/patchcanvas.py b/src/patchcanvas.py
@@ -2480,16 +2480,16 @@ def paint(self, painter, option, widget):
         else:
             painter.setBrush(canvas.theme.box_bg_1)
 
-        painter.drawRect(0, 0, self.p_width, self.p_height)
+        painter.drawRect(QRectF(0, 0, self.p_width, self.p_height))
 
         # Draw pixmap header
         if canvas.theme.box_header_pixmap:
             painter.setPen(Qt.NoPen)
             painter.setBrush(canvas.theme.box_bg_2)
-            painter.drawRect(1, 1, self.p_width-2, canvas.theme.box_header_height)
+            painter.drawRect(QRectF(1, 1, self.p_width-2, canvas.theme.box_header_height))
 
             headerPos  = QPointF(1, 1)
-            headerRect = QRectF(2, 2, self.p_width-4, canvas.theme.box_header_height-3)
+            headerRect = QRectF(2, 2, int(self.p_width-4), canvas.theme.box_header_height-3)
             painter.drawTiledPixmap(headerRect, canvas.theme.box_header_pixmap, headerPos)
 
         # Draw text

diff --git a/src/render.py b/src/render.py
@@ -349,7 +349,7 @@ def slot_transportChecked(self, yesNo):
 
     @pyqtSlot()
     def slot_updateProgressbar(self):
-        time = int(jacklib.get_current_transport_frame(self.fJackClient)) / self.fSampleRate
+        time = int(int(jacklib.get_current_transport_frame(self.fJackClient)) / self.fSampleRate)
         self.ui.progressBar.setValue(time)
 
         if time > self.fMaxTime or (self.fLastTime > time and not self.fFreewheel):

diff --git a/src/shared_canvasjack.py b/src/shared_canvasjack.py
@@ -515,7 +515,7 @@ def slot_canvasSaveImage(self):
             imgFormat = "PNG"
             newPath  += ".png"
 
-        self.fExportImage = QImage(self.scene.sceneRect().width(), self.scene.sceneRect().height(), QImage.Format_RGB32)
+        self.fExportImage = QImage(int(self.scene.sceneRect().width()), int(self.scene.sceneRect().height()), QImage.Format_RGB32)
         painter = QPainter(self.fExportImage)
         painter.save()
         painter.setRenderHint(QPainter.Antialiasing, True)