Fixing

source/carla_skin.py

@@ -356,7 +356,7 @@ class AbstractPluginSlot(QFrame):
                 continue
 
             paramWidget.blockSignals(True)
-            paramWidget.setValue(value*1000)
+            paramWidget.setValue(value)
             paramWidget.blockSignals(False)
             break
 
@@ -793,13 +793,12 @@ class PluginSlot_BasicFX(AbstractPluginSlot):
             widget = PixmapDial(self, i)
             widget.setPixmap(3)
             widget.setLabel(paramName)
-            widget.setCustomColor(QColor(_r, _g, _b))
-            widget.setCustomPaint(PixmapDial.CUSTOM_PAINT_COLOR)
+            widget.setCustomPaintColor(QColor(_r, _g, _b))
+            widget.setCustomPaintMode(PixmapDial.CUSTOM_PAINT_MODE_COLOR)
             widget.setWhiteText()
 
-            widget.setMinimum(paramRanges['min']*1000)
-            widget.setMaximum(paramRanges['max']*1000)
-            widget.setSingleStep(paramRanges['step']*1000)
+            widget.setMinimum(paramRanges['min'])
+            widget.setMaximum(paramRanges['max'])
 
             if (paramData['hints'] & PARAMETER_IS_ENABLED) == 0:
                 widget.setEnabled(False)
@@ -812,14 +811,14 @@ class PluginSlot_BasicFX(AbstractPluginSlot):
         self.ui.dial_drywet.setIndex(PARAMETER_DRYWET)
         self.ui.dial_drywet.setPixmap(3)
         self.ui.dial_drywet.setLabel("Dry/Wet")
-        self.ui.dial_drywet.setCustomPaint(PixmapDial.CUSTOM_PAINT_CARLA_WET)
-        self.ui.dial_drywet.setWhiteText()
+        self.ui.dial_drywet.setCustomPaintMode(PixmapDial.CUSTOM_PAINT_MODE_CARLA_WET)
+        #self.ui.dial_drywet.setWhiteText()
 
         self.ui.dial_vol.setIndex(PARAMETER_VOLUME)
         self.ui.dial_vol.setPixmap(3)
         self.ui.dial_vol.setLabel("Volume")
-        self.ui.dial_vol.setCustomPaint(PixmapDial.CUSTOM_PAINT_CARLA_VOL)
-        self.ui.dial_vol.setWhiteText()
+        self.ui.dial_vol.setCustomPaintMode(PixmapDial.CUSTOM_PAINT_MODE_CARLA_VOL)
+        #self.ui.dial_vol.setWhiteText()
 
         self.fParameterList.append([PARAMETER_DRYWET, self.ui.dial_drywet])
         self.fParameterList.append([PARAMETER_VOLUME, self.ui.dial_vol])
@@ -1008,63 +1007,63 @@ class PluginSlot_ZitaRev(AbstractPluginSlot):
 
         self.fKnobDelay = PixmapDial(self, 0)
         self.fKnobDelay.setPixmap(6)
-        self.fKnobDelay.setCustomPaint(PixmapDial.CUSTOM_PAINT_ZITA)
-        self.fKnobDelay.setMinimum(0.02*1000)
-        self.fKnobDelay.setMaximum(0.10*1000)
+        self.fKnobDelay.setCustomPaintMode(PixmapDial.CUSTOM_PAINT_MODE_ZITA)
+        self.fKnobDelay.setMinimum(0.02)
+        self.fKnobDelay.setMaximum(0.10)
 
         self.fKnobXover = PixmapDial(self, 1)
         self.fKnobXover.setPixmap(6)
-        self.fKnobXover.setCustomPaint(PixmapDial.CUSTOM_PAINT_ZITA)
-        self.fKnobXover.setMinimum(50*1000)
-        self.fKnobXover.setMaximum(1000*1000)
+        self.fKnobXover.setCustomPaintMode(PixmapDial.CUSTOM_PAINT_MODE_ZITA)
+        self.fKnobXover.setMinimum(50.0)
+        self.fKnobXover.setMaximum(1000.0)
 
         self.fKnobRtLow = PixmapDial(self, 2)
         self.fKnobRtLow.setPixmap(6)
-        self.fKnobRtLow.setCustomPaint(PixmapDial.CUSTOM_PAINT_ZITA)
-        self.fKnobRtLow.setMinimum(1*1000)
-        self.fKnobRtLow.setMaximum(8*1000)
+        self.fKnobRtLow.setCustomPaintMode(PixmapDial.CUSTOM_PAINT_MODE_ZITA)
+        self.fKnobRtLow.setMinimum(1.0)
+        self.fKnobRtLow.setMaximum(8.0)
 
         self.fKnobRtMid = PixmapDial(self, 3)
         self.fKnobRtMid.setPixmap(6)
-        self.fKnobRtMid.setCustomPaint(PixmapDial.CUSTOM_PAINT_ZITA)
-        self.fKnobRtMid.setMinimum(1*1000)
-        self.fKnobRtMid.setMaximum(8*1000)
+        self.fKnobRtMid.setCustomPaintMode(PixmapDial.CUSTOM_PAINT_MODE_ZITA)
+        self.fKnobRtMid.setMinimum(1.0)
+        self.fKnobRtMid.setMaximum(8.0)
 
         self.fKnobDamping = PixmapDial(self, 4)
         self.fKnobDamping.setPixmap(6)
-        self.fKnobDamping.setCustomPaint(PixmapDial.CUSTOM_PAINT_ZITA)
-        self.fKnobDamping.setMinimum(1500*1000)
-        self.fKnobDamping.setMaximum(24000*1000)
+        self.fKnobDamping.setCustomPaintMode(PixmapDial.CUSTOM_PAINT_MODE_ZITA)
+        self.fKnobDamping.setMinimum(1500.0)
+        self.fKnobDamping.setMaximum(24000.0)
 
         self.fKnobEq1Freq = PixmapDial(self, 5)
         self.fKnobEq1Freq.setPixmap(6)
-        self.fKnobEq1Freq.setCustomPaint(PixmapDial.CUSTOM_PAINT_ZITA)
-        self.fKnobEq1Freq.setMinimum(40*1000)
-        self.fKnobEq1Freq.setMaximum(10000*1000)
+        self.fKnobEq1Freq.setCustomPaintMode(PixmapDial.CUSTOM_PAINT_MODE_ZITA)
+        self.fKnobEq1Freq.setMinimum(40.0)
+        self.fKnobEq1Freq.setMaximum(10000.0)
 
         self.fKnobEq1Gain = PixmapDial(self, 6)
         self.fKnobEq1Gain.setPixmap(6)
-        self.fKnobEq1Gain.setCustomPaint(PixmapDial.CUSTOM_PAINT_ZITA)
-        self.fKnobEq1Gain.setMinimum(-20*1000)
-        self.fKnobEq1Gain.setMaximum(20*1000)
+        self.fKnobEq1Gain.setCustomPaintMode(PixmapDial.CUSTOM_PAINT_MODE_ZITA)
+        self.fKnobEq1Gain.setMinimum(-20.0)
+        self.fKnobEq1Gain.setMaximum(20.0)
 
         self.fKnobEq2Freq = PixmapDial(self, 7)
         self.fKnobEq2Freq.setPixmap(6)
-        self.fKnobEq2Freq.setCustomPaint(PixmapDial.CUSTOM_PAINT_ZITA)
-        self.fKnobEq2Freq.setMinimum(40*1000)
-        self.fKnobEq2Freq.setMaximum(10000*1000)
+        self.fKnobEq2Freq.setCustomPaintMode(PixmapDial.CUSTOM_PAINT_MODE_ZITA)
+        self.fKnobEq2Freq.setMinimum(40.0)
+        self.fKnobEq2Freq.setMaximum(10000.0)
 
         self.fKnobEq2Gain = PixmapDial(self, 8)
         self.fKnobEq2Gain.setPixmap(6)
-        self.fKnobEq2Gain.setCustomPaint(PixmapDial.CUSTOM_PAINT_ZITA)
-        self.fKnobEq2Gain.setMinimum(-20*1000)
-        self.fKnobEq2Gain.setMaximum(20*1000)
+        self.fKnobEq2Gain.setCustomPaintMode(PixmapDial.CUSTOM_PAINT_MODE_ZITA)
+        self.fKnobEq2Gain.setMinimum(-20.0)
+        self.fKnobEq2Gain.setMaximum(20.0)
 
         self.fKnobMix = PixmapDial(self, 9)
         self.fKnobMix.setPixmap(6)
-        self.fKnobMix.setCustomPaint(PixmapDial.CUSTOM_PAINT_ZITA)
-        self.fKnobMix.setMinimum(0.0*1000)
-        self.fKnobMix.setMaximum(1.0*1000)
+        self.fKnobMix.setCustomPaintMode(PixmapDial.CUSTOM_PAINT_MODE_ZITA)
+        self.fKnobMix.setMinimum(0.0)
+        self.fKnobMix.setMaximum(1.0)
 
         self.fParameterList.append([0, self.fKnobDelay])
         self.fParameterList.append([1, self.fKnobXover])
@@ -1225,14 +1224,12 @@ class PluginSlot_ZynFX(AbstractPluginSlot):
             widget.setEnabled(True)
 
             widget.setPixmap(5)
-            #widget.setPixmap(5)
             widget.setLabel(paramName)
-            widget.setCustomPaint(PixmapDial.CUSTOM_PAINT_NO_GRADIENT)
-            widget.setMidWhiteText()
+            widget.setCustomPaintMode(PixmapDial.CUSTOM_PAINT_MODE_NO_GRADIENT)
+            #widget.setMidWhiteText()
 
-            widget.setSingleStep(paramRanges['step']*1000)
-            widget.setMinimum(paramRanges['min']*1000)
-            widget.setMaximum(paramRanges['max']*1000)
+            widget.setMinimum(paramRanges['min'])
+            widget.setMaximum(paramRanges['max'])
 
             #if (paramData['hints'] & PARAMETER_IS_ENABLED) == 0:
                 #widget.setEnabled(False)