Permalink
Browse files

fix the fix...

a point's properties are x and y, not hi and lo

Signed-off-by: Stefan Nussbaumer <st9fan@gmail.com>
  • Loading branch information...
nuss committed Jul 22, 2018
1 parent 80a72bc commit c8893e80838d776a8228b04a4b85f0a6891d55e9
Showing with 13 additions and 14 deletions.
  1. +13 −14 CVCenter/CVCenter.sc
View
@@ -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 !? {

0 comments on commit c8893e8

Please sign in to comment.