falkTX
/
Carla
mirror of https://github.com/falkTX/Carla
1
0
Fork 0
Code Releases 42 Activity
Browse Source

Fixup ScalableDial to be compatible with old pixmaps 

Signed-off-by: falkTX <falktx@falktx.com>
tags/v2.2.0-RC1
falkTX 5 years ago
parent
c093190584
commit
b63bb4ffc8
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
3 changed files with 101 additions and 72 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +16
    -11
      source/frontend/carla_skin.py
  2. +5
    -5
      source/frontend/carla_widgets.py
  3. +80
    -56
      source/frontend/widgets/scalabledial.py

+ 16
- 11
source/frontend/carla_skin.py View File

@@ -161,16 +161,16 @@ def getColorFromCategory(category):
def setScalableDialStyle(widget, parameterId, parameterCount, whiteLabels, skinStyle):
if skinStyle.startswith("calf"):
widget.setCustomPaintMode(ScalableDial.CUSTOM_PAINT_MODE_NO_GRADIENT)
widget.setSvg(7)
widget.setImage(7)

elif skinStyle.startswith("openav"):
widget.setCustomPaintMode(ScalableDial.CUSTOM_PAINT_MODE_NO_GRADIENT)
if parameterId == PARAMETER_DRYWET:
widget.setSvg(13)
widget.setImage(13)
elif parameterId == PARAMETER_VOLUME:
widget.setSvg(12)
widget.setImage(12)
else:
widget.setSvg(11)
widget.setImage(11)

else:
if parameterId == PARAMETER_DRYWET:
@@ -194,7 +194,7 @@ def setScalableDialStyle(widget, parameterId, parameterCount, whiteLabels, skinS
colorDisabled = QColor("#AAA")

widget.setLabelColor(colorEnabled, colorDisabled)
widget.setSvg(3)
widget.setImage(3)

# ------------------------------------------------------------------------------------------------------------
# Abstract plugin slot
@@ -402,9 +402,14 @@ class AbstractPluginSlot(QFrame, PluginEditParentMeta):
":/scalable/button_file_down-{}.svg".format(imageSuffix),
":/scalable/button_file_hover-{}.svg".format(imageSuffix))
else:
self.b_gui.setSvgs(":/scalable/button_gui-{}.svg".format(imageSuffix),
":/scalable/button_gui_down-{}.svg".format(imageSuffix),
":/scalable/button_gui_hover-{}.svg".format(imageSuffix))
if imageSuffix == "black": # TODO
self.b_gui.setSvgs(":/bitmaps/button_gui-{}.png".format(imageSuffix),
":/bitmaps/button_gui_down-{}.png".format(imageSuffix),
":/bitmaps/button_gui_hover-{}.png".format(imageSuffix))
else:
self.b_gui.setSvgs(":/scalable/button_gui-{}.svg".format(imageSuffix),
":/scalable/button_gui_down-{}.svg".format(imageSuffix),
":/scalable/button_gui_hover-{}.svg".format(imageSuffix))

if self.b_edit is not None:
self.b_edit.clicked.connect(self.slot_showEditDialog)
@@ -1942,7 +1947,7 @@ class PluginSlot_Presets(AbstractPluginSlot):
widget.setLabel(paramName)
widget.setMinimum(paramRanges['min'])
widget.setMaximum(paramRanges['max'])
widget.setSvg(3)
widget.setImage(3)
widget.setCustomPaintColor(QColor(83, 173, 10))
widget.setCustomPaintMode(ScalableDial.CUSTOM_PAINT_MODE_COLOR)
widget.forceWhiteLabelGradientText()
@@ -1959,7 +1964,7 @@ class PluginSlot_Presets(AbstractPluginSlot):
widget.setLabel("Wet")
widget.setMinimum(0.0)
widget.setMaximum(1.0)
widget.setSvg(3)
widget.setImage(3)
widget.setCustomPaintMode(ScalableDial.CUSTOM_PAINT_MODE_CARLA_WET)
widget.forceWhiteLabelGradientText()

@@ -1971,7 +1976,7 @@ class PluginSlot_Presets(AbstractPluginSlot):
widget.setLabel("Volume")
widget.setMinimum(0.0)
widget.setMaximum(1.27)
widget.setSvg(3)
widget.setImage(3)
widget.setCustomPaintMode(ScalableDial.CUSTOM_PAINT_MODE_CARLA_VOL)
widget.forceWhiteLabelGradientText()



+ 5
- 5
source/frontend/carla_widgets.py View File

@@ -601,35 +601,35 @@ class PluginEdit(QDialog):
self.ui.label_plugin.setFont(labelPluginFont)

self.ui.dial_drywet.setCustomPaintMode(self.ui.dial_drywet.CUSTOM_PAINT_MODE_CARLA_WET)
self.ui.dial_drywet.setSvg(3)
self.ui.dial_drywet.setImage(3)
self.ui.dial_drywet.setLabel("Dry/Wet")
self.ui.dial_drywet.setMinimum(0.0)
self.ui.dial_drywet.setMaximum(1.0)
self.ui.dial_drywet.setValue(host.get_internal_parameter_value(pluginId, PARAMETER_DRYWET))

self.ui.dial_vol.setCustomPaintMode(self.ui.dial_vol.CUSTOM_PAINT_MODE_CARLA_VOL)
self.ui.dial_vol.setSvg(3)
self.ui.dial_vol.setImage(3)
self.ui.dial_vol.setLabel("Volume")
self.ui.dial_vol.setMinimum(0.0)
self.ui.dial_vol.setMaximum(1.27)
self.ui.dial_vol.setValue(host.get_internal_parameter_value(pluginId, PARAMETER_VOLUME))

self.ui.dial_b_left.setCustomPaintMode(self.ui.dial_b_left.CUSTOM_PAINT_MODE_CARLA_L)
self.ui.dial_b_left.setSvg(4)
self.ui.dial_b_left.setImage(4)
self.ui.dial_b_left.setLabel("L")
self.ui.dial_b_left.setMinimum(-1.0)
self.ui.dial_b_left.setMaximum(1.0)
self.ui.dial_b_left.setValue(host.get_internal_parameter_value(pluginId, PARAMETER_BALANCE_LEFT))

self.ui.dial_b_right.setCustomPaintMode(self.ui.dial_b_right.CUSTOM_PAINT_MODE_CARLA_R)
self.ui.dial_b_right.setSvg(4)
self.ui.dial_b_right.setImage(4)
self.ui.dial_b_right.setLabel("R")
self.ui.dial_b_right.setMinimum(-1.0)
self.ui.dial_b_right.setMaximum(1.0)
self.ui.dial_b_right.setValue(host.get_internal_parameter_value(pluginId, PARAMETER_BALANCE_RIGHT))

self.ui.dial_pan.setCustomPaintMode(self.ui.dial_b_right.CUSTOM_PAINT_MODE_CARLA_PAN)
self.ui.dial_pan.setSvg(4)
self.ui.dial_pan.setImage(4)
self.ui.dial_pan.setLabel("Pan")
self.ui.dial_pan.setMinimum(-1.0)
self.ui.dial_pan.setMaximum(1.0)


+ 80
- 56
source/frontend/widgets/scalabledial.py View File

@@ -1,8 +1,8 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-

# Svg Dial, a custom Qt widget
# Copyright (C) 2011-2019 Filipe Coelho <falktx@falktx.com>
# Scalable Dial, a custom Qt widget
# Copyright (C) 2011-2020 Filipe Coelho <falktx@falktx.com>
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
@@ -23,7 +23,7 @@ from math import cos, floor, pi, sin, isnan

from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt, QEvent, QPointF, QRectF, QTimer, QSize
from PyQt5.QtGui import QColor, QConicalGradient, QFont, QFontMetrics
from PyQt5.QtGui import QLinearGradient, QPainter, QPainterPath, QPen
from PyQt5.QtGui import QLinearGradient, QPainter, QPainterPath, QPen, QPixmap
from PyQt5.QtSvg import QSvgWidget
from PyQt5.QtWidgets import QDial

@@ -74,14 +74,14 @@ class ScalableDial(QDial):
self.fLastDragPos = None
self.fLastDragValue = 0.0

self.fIndex = index
self.fSvg = QSvgWidget(":/scalable/dial_03.svg")
self.fSvgNum = "01"
self.fIndex = index
self.fImage = QSvgWidget(":/scalable/dial_03.svg")
self.fImageNum = "01"

if self.fSvg.sizeHint().width() > self.fSvg.sizeHint().height():
self.fSvgOrientation = self.HORIZONTAL
if self.fImage.sizeHint().width() > self.fImage.sizeHint().height():
self.fImageOrientation = self.HORIZONTAL
else:
self.fSvgOrientation = self.VERTICAL
self.fImageOrientation = self.VERTICAL

self.fLabel = ""
self.fLabelPos = QPointF(0.0, 0.0)
@@ -125,7 +125,7 @@ class ScalableDial(QDial):
return self.fIndex

def getBaseSize(self):
return self.fSvgBaseSize
return self.fImageBaseSize

def forceWhiteLabelGradientText(self):
self.fLabelGradientColor1 = QColor(0, 0, 0, 255)
@@ -138,24 +138,28 @@ class ScalableDial(QDial):
self.fLabelGradientColorT = [enabled, disabled]

def updateSizes(self):
self.fSvgWidth = self.fSvg.sizeHint().width()
self.fSvgHeight = self.fSvg.sizeHint().height()
if isinstance(self.fImage, QPixmap):
self.fImageWidth = self.fImage.width()
self.fImageHeight = self.fImage.height()
else:
self.fImageWidth = self.fImage.sizeHint().width()
self.fImageHeight = self.fImage.sizeHint().height()

if self.fSvgWidth < 1:
self.fSvgWidth = 1
if self.fImageWidth < 1:
self.fImageWidth = 1

if self.fSvgHeight < 1:
self.fSvgHeight = 1
if self.fImageHeight < 1:
self.fImageHeight = 1

if self.fSvgOrientation == self.HORIZONTAL:
self.fSvgBaseSize = self.fSvgHeight
self.fSvgLayersCount = self.fSvgWidth / self.fSvgHeight
if self.fImageOrientation == self.HORIZONTAL:
self.fImageBaseSize = self.fImageHeight
self.fImageLayersCount = self.fImageWidth / self.fImageHeight
else:
self.fSvgBaseSize = self.fSvgWidth
self.fSvgLayersCount = self.fSvgHeight / self.fSvgWidth
self.fImageBaseSize = self.fImageWidth
self.fImageLayersCount = self.fImageHeight / self.fImageWidth

self.setMinimumSize(self.fSvgBaseSize, self.fSvgBaseSize + self.fLabelHeight + 5)
self.setMaximumSize(self.fSvgBaseSize, self.fSvgBaseSize + self.fLabelHeight + 5)
self.setMinimumSize(self.fImageBaseSize, self.fImageBaseSize + self.fLabelHeight + 5)
self.setMaximumSize(self.fImageBaseSize, self.fImageBaseSize + self.fLabelHeight + 5)

if not self.fLabel:
self.fLabelHeight = 0
@@ -165,20 +169,20 @@ class ScalableDial(QDial):
self.fLabelWidth = QFontMetrics(self.fLabelFont).width(self.fLabel)
self.fLabelHeight = QFontMetrics(self.fLabelFont).height()

self.fLabelPos.setX(float(self.fSvgBaseSize)/2.0 - float(self.fLabelWidth)/2.0)
self.fLabelPos.setX(float(self.fImageBaseSize)/2.0 - float(self.fLabelWidth)/2.0)

if self.fSvgNum in ("01", "02", "07", "08", "09", "10"):
self.fLabelPos.setY(self.fSvgBaseSize + self.fLabelHeight)
elif self.fSvgNum in ("11",):
self.fLabelPos.setY(self.fSvgBaseSize + self.fLabelHeight*2/3)
if self.fImageNum in ("01", "02", "07", "08", "09", "10"):
self.fLabelPos.setY(self.fImageBaseSize + self.fLabelHeight)
elif self.fImageNum in ("11",):
self.fLabelPos.setY(self.fImageBaseSize + self.fLabelHeight*2/3)
else:
self.fLabelPos.setY(self.fSvgBaseSize + self.fLabelHeight/2)
self.fLabelPos.setY(self.fImageBaseSize + self.fLabelHeight/2)

self.fLabelGradient.setStart(0, float(self.fSvgBaseSize)/2.0)
self.fLabelGradient.setFinalStop(0, self.fSvgBaseSize + self.fLabelHeight + 5)
self.fLabelGradient.setStart(0, float(self.fImageBaseSize)/2.0)
self.fLabelGradient.setFinalStop(0, self.fImageBaseSize + self.fLabelHeight + 5)

self.fLabelGradientRect = QRectF(float(self.fSvgBaseSize)/8.0, float(self.fSvgBaseSize)/2.0,
float(self.fSvgBaseSize*3)/4.0, self.fSvgBaseSize+self.fLabelHeight+5)
self.fLabelGradientRect = QRectF(float(self.fImageBaseSize)/8.0, float(self.fImageBaseSize)/2.0,
float(self.fImageBaseSize*3)/4.0, self.fImageBaseSize+self.fLabelHeight+5)

def setCustomPaintMode(self, paintMode):
if self.fCustomPaintMode == paintMode:
@@ -205,27 +209,39 @@ class ScalableDial(QDial):
def setIndex(self, index):
self.fIndex = index

def setSvg(self, SvgId):
self.fSvgNum = "%02i" % SvgId
self.fSvg.load(":/scalable/dial_%s%s.svg" % (self.fSvgNum, "" if self.isEnabled() else "d"))
def setImage(self, imageId):
self.fImageNum = "%02i" % imageId
if imageId in (6,7,8,9,10,11,12,13):
img = ":/bitmaps/dial_%s%s.png" % (self.fImageNum, "" if self.isEnabled() else "d")
else:
img = ":/scalable/dial_%s%s.svg" % (self.fImageNum, "" if self.isEnabled() else "d")

if img.endswith(".png"):
if not isinstance(self.fImage, QPixmap):
self.fImage = QPixmap()
else:
if not isinstance(self.fImage, QSvgWidget):
self.fImage = QSvgWidget()

self.fImage.load(img)

if self.fSvg.width() > self.fSvg.height():
self.fSvgOrientation = self.HORIZONTAL
if self.fImage.width() > self.fImage.height():
self.fImageOrientation = self.HORIZONTAL
else:
self.fSvgOrientation = self.VERTICAL
self.fImageOrientation = self.VERTICAL

# special svg
# special svgs
if self.fCustomPaintMode == self.CUSTOM_PAINT_MODE_NULL:
# reserved for carla-wet, carla-vol, carla-pan and color
if self.fSvgNum == "03":
if self.fImageNum == "03":
self.fCustomPaintMode = self.CUSTOM_PAINT_MODE_COLOR

# reserved for carla-L and carla-R
elif self.fSvgNum == "04":
elif self.fImageNum == "04":
self.fCustomPaintMode = self.CUSTOM_PAINT_MODE_CARLA_L

# reserved for zita
elif self.fSvgNum == "06":
elif self.fImageNum == "06":
self.fCustomPaintMode = self.CUSTOM_PAINT_MODE_ZITA

self.updateSizes()
@@ -272,21 +288,21 @@ class ScalableDial(QDial):
self.realValueChanged.emit(self.fRealValue)

@pyqtSlot()
def slot_updateSvg(self):
self.seSvg(int(self.fSvgNum))
def slot_updateImage(self):
self.setImage(int(self.fImageNum))

def minimumSizeHint(self):
return QSize(self.fSvgBaseSize, self.fSvgBaseSize)
return QSize(self.fImageBaseSize, self.fImageBaseSize)

def sizeHint(self):
return QSize(self.fSvgBaseSize, self.fSvgBaseSize)
return QSize(self.fImageBaseSize, self.fImageBaseSize)

def changeEvent(self, event):
QDial.changeEvent(self, event)

# Force svg update if enabled state changes
if event.type() == QEvent.EnabledChange:
self.setSvg(int(self.fSvgNum))
self.slot_updateImage()

def enterEvent(self, event):
self.fIsHovered = True
@@ -359,17 +375,22 @@ class ScalableDial(QDial):

if self.isEnabled():
normValue = float(self.fRealValue - self.fMinimum) / float(self.fMaximum - self.fMinimum)
curLayer = int((self.fSvgLayersCount - 1) * normValue)
curLayer = int((self.fImageLayersCount - 1) * normValue)

if self.fSvgOrientation == self.HORIZONTAL:
xpos = self.fSvgBaseSize * curLayer
if self.fImageOrientation == self.HORIZONTAL:
xpos = self.fImageBaseSize * curLayer
ypos = 0.0
else:
xpos = 0.0
ypos = self.fSvgBaseSize * curLayer
ypos = self.fImageBaseSize * curLayer

source = QRectF(xpos, ypos, self.fImageBaseSize, self.fImageBaseSize)

source = QRectF(xpos, ypos, self.fSvgBaseSize, self.fSvgBaseSize)
self.fSvg.renderer().render(painter, source)
if isinstance(self.fImage, QPixmap):
target = QRectF(0.0, 0.0, self.fImageBaseSize, self.fImageBaseSize)
painter.drawPixmap(target, self.fImage, source)
else:
self.fImage.renderer().render(painter, source)

# Custom knobs (Dry/Wet and Volume)
if self.fCustomPaintMode in (self.CUSTOM_PAINT_MODE_CARLA_WET, self.CUSTOM_PAINT_MODE_CARLA_VOL):
@@ -491,8 +512,11 @@ class ScalableDial(QDial):
QTimer.singleShot(20, self.update)

else: # isEnabled()
target = QRectF(0.0, 0.0, self.fSvgBaseSize, self.fSvgBaseSize)
self.fSvg.renderer().render(painter, target)
target = QRectF(0.0, 0.0, self.fImageBaseSize, self.fImageBaseSize)
if isinstance(self.fImage, QPixmap):
painter.drawPixmap(target, self.fImage, target)
else:
self.fImage.renderer().render(painter, target)

painter.restore()



Write Preview
Loading…
Cancel
Save