Remove CondVar (#132)

* removed from FluidWaveform

* typo
nix
Ted Moore 3 years ago committed by GitHub
parent d0d5dfa9ec
commit c54f43ad2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -58,7 +58,7 @@ FluidWaveformIndicesLayer : FluidViewer {
draw { draw {
var userView; var userView;
var condition = CondVar(); var condition = Condition();
var slices_fa = nil; var slices_fa = nil;
var numChannels = indicesBuffer.numChannels; var numChannels = indicesBuffer.numChannels;
@ -81,9 +81,10 @@ FluidWaveformIndicesLayer : FluidViewer {
indicesBuffer.loadToFloatArray(action: { indicesBuffer.loadToFloatArray(action: {
arg v; arg v;
slices_fa = v; slices_fa = v;
condition.signalOne; condition.test = true;
condition.signal;
}); });
condition.wait { slices_fa.notNil }; condition.wait;
userView.drawFunc = numChannels.switch( userView.drawFunc = numChannels.switch(
1, {{ 1, {{
@ -132,7 +133,7 @@ FluidWaveformFeaturesLayer : FluidViewer {
draw { draw {
var userView = UserView(); var userView = UserView();
var condition = CondVar(); var condition = Condition();
var fa = nil; var fa = nil;
forkIfNeeded({ forkIfNeeded({
@ -141,9 +142,10 @@ FluidWaveformFeaturesLayer : FluidViewer {
featuresBuffer.loadToFloatArray(action:{ featuresBuffer.loadToFloatArray(action:{
arg v; arg v;
fa = v; fa = v;
condition.signalOne condition.test = true;
condition.signal;
}); });
condition.wait { fa.notNil }; condition.wait;
if(normalizeFeaturesIndependently.not,{ if(normalizeFeaturesIndependently.not,{
minVal = fa.minItem; minVal = fa.minItem;
@ -209,7 +211,7 @@ FluidWaveformImageLayer {
draw { draw {
var colors = this.prGetColorsFromScheme(imageColorScheme); var colors = this.prGetColorsFromScheme(imageColorScheme);
var condition = CondVar(); var condition = Condition();
var vals = nil; var vals = nil;
var userView = UserView(); var userView = UserView();
@ -218,9 +220,10 @@ FluidWaveformImageLayer {
imageBuffer.loadToFloatArray(action: { imageBuffer.loadToFloatArray(action: {
arg v; arg v;
vals = v; vals = v;
condition.signalOne; condition.test = true;
condition.signal;
}); });
condition.wait { vals.notNil }; condition.wait;
imageColorScaling.switch( imageColorScaling.switch(
FluidWaveform.lin,{ FluidWaveform.lin,{

Loading…
Cancel
Save