Browse Source

Skin fixes

tags/1.9.4
falkTX 10 years ago
parent
commit
afca3686e8
2 changed files with 18 additions and 15 deletions
  1. +10
    -7
      source/carla_skin.py
  2. +8
    -8
      source/carla_widgets.py

+ 10
- 7
source/carla_skin.py View File

@@ -168,10 +168,10 @@ class AbstractPluginSlot(QFrame):
self.peak_out.setOrientation(self.peak_out.HORIZONTAL)

for paramIndex, paramWidget in self.fParameterList:
paramWidget.valueChanged.connect(self.slot_parameterValueChanged)
paramWidget.realValueChanged.connect(self.slot_parameterValueChanged)

if paramIndex >= 0 and gCarla.host is not None:
paramWidget.setValue(gCarla.host.get_current_parameter_value(self.fPluginId, paramIndex) * 1000)
paramWidget.setValue(gCarla.host.get_current_parameter_value(self.fPluginId, paramIndex))

#------------------------------------------------------------------

@@ -546,7 +546,6 @@ class AbstractPluginSlot(QFrame):
@pyqtSlot(int)
def slot_parameterValueChanged(self, value):
index = self.sender().getIndex()
value = float(value)/1000.0

if index < 0:
self.setInternalParameter(index, value)
@@ -795,7 +794,7 @@ class PluginSlot_BasicFX(AbstractPluginSlot):
widget.setLabel(paramName)
widget.setCustomPaintColor(QColor(_r, _g, _b))
widget.setCustomPaintMode(PixmapDial.CUSTOM_PAINT_MODE_COLOR)
widget.setWhiteText()
widget.forceWhiteLabelGradientText()

widget.setMinimum(paramRanges['min'])
widget.setMaximum(paramRanges['max'])
@@ -812,13 +811,17 @@ class PluginSlot_BasicFX(AbstractPluginSlot):
self.ui.dial_drywet.setPixmap(3)
self.ui.dial_drywet.setLabel("Dry/Wet")
self.ui.dial_drywet.setCustomPaintMode(PixmapDial.CUSTOM_PAINT_MODE_CARLA_WET)
#self.ui.dial_drywet.setWhiteText()
self.ui.dial_drywet.setMinimum(0.0)
self.ui.dial_drywet.setMaximum(1.0)
#self.ui.dial_drywet.forceWhiteLabelGradientText()

self.ui.dial_vol.setIndex(PARAMETER_VOLUME)
self.ui.dial_vol.setPixmap(3)
self.ui.dial_vol.setLabel("Volume")
self.ui.dial_vol.setCustomPaintMode(PixmapDial.CUSTOM_PAINT_MODE_CARLA_VOL)
#self.ui.dial_vol.setWhiteText()
self.ui.dial_drywet.setMinimum(0.0)
self.ui.dial_drywet.setMaximum(1.27)
#self.ui.dial_vol.forceWhiteLabelGradientText()

self.fParameterList.append([PARAMETER_DRYWET, self.ui.dial_drywet])
self.fParameterList.append([PARAMETER_VOLUME, self.ui.dial_vol])
@@ -1311,7 +1314,7 @@ def createPluginSlot(parent, pluginId):
if pluginName.split(" ", 1)[0].lower() == "calf":
return PluginSlot_Calf(parent, pluginId)

#return PluginSlot_BasicFX(parent, pluginId)
return PluginSlot_BasicFX(parent, pluginId)
return PluginSlot_Default(parent, pluginId)

# ------------------------------------------------------------------------------------------------------------


+ 8
- 8
source/carla_widgets.py View File

@@ -997,27 +997,27 @@ class PluginEdit(QDialog):
for index, value in self.fParametersToUpdate:
if index == PARAMETER_DRYWET:
self.ui.dial_drywet.blockSignals(True)
self.ui.dial_drywet.setValue(value * 1000)
self.ui.dial_drywet.setValue(value)
self.ui.dial_drywet.blockSignals(False)

elif index == PARAMETER_VOLUME:
self.ui.dial_vol.blockSignals(True)
self.ui.dial_vol.setValue(value * 1000)
self.ui.dial_vol.setValue(value)
self.ui.dial_vol.blockSignals(False)

elif index == PARAMETER_BALANCE_LEFT:
self.ui.dial_b_left.blockSignals(True)
self.ui.dial_b_left.setValue(value * 1000)
self.ui.dial_b_left.setValue(value)
self.ui.dial_b_left.blockSignals(False)

elif index == PARAMETER_BALANCE_RIGHT:
self.ui.dial_b_right.blockSignals(True)
self.ui.dial_b_right.setValue(value * 1000)
self.ui.dial_b_right.setValue(value)
self.ui.dial_b_right.blockSignals(False)

elif index == PARAMETER_PANNING:
self.ui.dial_pan.blockSignals(True)
self.ui.dial_pan.setValue(value * 1000)
self.ui.dial_pan.setValue(value)
self.ui.dial_pan.blockSignals(False)

elif index == PARAMETER_CTRL_CHANNEL:
@@ -1158,17 +1158,17 @@ class PluginEdit(QDialog):
@pyqtSlot(int)
def slot_balanceRightChanged(self, value):
if gCarla.host is not None:
gCarla.host.set_balance_right(self.fPluginId, float(value)/1000)
gCarla.host.set_balance_right(self.fPluginId, value)

@pyqtSlot(int)
def slot_panChanged(self, value):
if gCarla.host is not None:
gCarla.host.set_panning(self.fPluginId, float(value)/1000)
gCarla.host.set_panning(self.fPluginId, value)

@pyqtSlot(int)
def slot_panningChanged(self, value):
if gCarla.host is not None:
gCarla.host.set_panning(self.fPluginId, float(value)/1000)
gCarla.host.set_panning(self.fPluginId, value)

@pyqtSlot(int)
def slot_ctrlChannelChanged(self, value):


Loading…
Cancel
Save