From c8893e80838d776a8228b04a4b85f0a6891d55e9 Mon Sep 17 00:00:00 2001 From: Stefan Nussbaumer Date: Sun, 22 Jul 2018 20:52:10 +0200 Subject: [PATCH] fix the fix... a point's properties are x and y, not hi and lo Signed-off-by: Stefan Nussbaumer --- CVCenter/CVCenter.sc | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/CVCenter/CVCenter.sc b/CVCenter/CVCenter.sc index eb8f0b0..4ed3d0d 100644 --- a/CVCenter/CVCenter.sc +++ b/CVCenter/CVCenter.sc @@ -1662,7 +1662,7 @@ CVCenter { connectSliders, connectNumBoxes | var lib, successFunc, toBeRemoved; - var caibrationConstraints; + var calibrationConstraints; var calibrationReset = Point(0.0001, 0.0001); successFunc = { |f| @@ -1723,16 +1723,16 @@ CVCenter { cvWidgets[key].setOscMapping(v[hilo].osc.oscMapping, hilo); if (activateCalibration, { if (resetCalibration or: { v[hilo].osc.calibConstraints.isNil }) { - caibrationConstraints = Point(0.0001, 0.0001); + calibrationConstraints = Point(0.0001, 0.0001); } { - caibrationConstraints = Point( + calibrationConstraints = Point( v[hilo].osc.calibConstraints.lo, v[hilo].osc.calibConstraints.hi ) }; - cvWidgets[key].setOscInputConstraints(caibrationConstraints, hilo); + cvWidgets[key].setOscInputConstraints(calibrationConstraints, hilo); cvWidgets[key].wdgtControllersAndModels[hilo].oscInputRange.model.value_( - [caibrationConstraints] + [calibrationConstraints.x, calibrationConstraints.y] ).changedKeys(cvWidgets[key].synchKeys); }, { v[hilo].osc.calibConstraints !? { @@ -1768,7 +1768,6 @@ CVCenter { }) }) }); - "added a CVWidget2D: '%'\n".postf(key); }, CVWidgetKnob, { this.prAdd(key, v.spec, v.val, v.tabLabel); @@ -1810,16 +1809,16 @@ CVCenter { cvWidgets[key].setOscMapping(v.osc.oscMapping); if (activateCalibration, { if (resetCalibration or: { v.osc.calibConstraints.isNil }) { - caibrationConstraints = Point(0.0001, 0.0001); + calibrationConstraints = Point(0.0001, 0.0001); } { - caibrationConstraints = Point( + calibrationConstraints = Point( v.osc.calibConstraints.lo, v.osc.calibConstraints.hi ) }; - cvWidgets[key].setOscInputConstraints(caibrationConstraints); + cvWidgets[key].setOscInputConstraints(calibrationConstraints); cvWidgets[key].wdgtControllersAndModels.oscInputRange.model.value_( - [caibrationConstraints] + [calibrationConstraints.x, calibrationConstraints.y] ).changedKeys(cvWidgets[key].synchKeys); }, { v.osc.calibConstraints !? { @@ -1899,18 +1898,18 @@ CVCenter { cvWidgets[key].setOscMapping(v.osc[sl].oscMapping, sl); if (activateCalibration, { if (resetCalibration or: { v.osc[sl].calibConstraints.isNil }) { - caibrationConstraints = Point(0.0001, 0.0001); + calibrationConstraints = Point(0.0001, 0.0001); } { - caibrationConstraints = Point( + calibrationConstraints = Point( v.osc[sl].calibConstraints.lo, v.osc[sl].calibConstraints.hi ) }; cvWidgets[key].setOscInputConstraints( - caibrationConstraints, sl + calibrationConstraints, sl ); cvWidgets[key].wdgtControllersAndModels.slots[sl].oscInputRange.model.value_( - [caibrationConstraints] + [calibrationConstraints.x, calibrationConstraints.y] ).changedKeys(cvWidgets[key].synchKeys); }, { v.osc[sl].calibConstraints !? {