comparison grid.mm @ 45:c2fffc8ea84d

10 timbre params.
author Robert Tubb <rt300@eecs.qmul.ac.uk>
date Tue, 23 Apr 2013 18:29:55 +0100
parents a1e75b94c505
children 1e266647840d
comparison
equal deleted inserted replaced
44:a1e75b94c505 45:c2fffc8ea84d
533 return cPreset; 533 return cPreset;
534 } 534 }
535 //-------------------------------------------------------------- 535 //--------------------------------------------------------------
536 void Grid::snapCheck(){ 536 void Grid::snapCheck(){
537 lEvent *closestEvalPt; 537 lEvent *closestEvalPt;
538 if(interpolateMode == INTERPOLATE_GRID){ 538
539 snapped = false;
540 closestPreset = NULL;
541 snapCentre = centre;
542 return;
543 } // no presets visible
544 539
545 // check environs for presets. 540 // check environs for presets.
546 541
547 vector<Preset *> closePresets = presetManager.getPresetsInRange(centre - snapDist*scale, centre + snapDist*scale); 542 vector<Preset *> closePresets = presetManager.getPresetsInRange(centre - snapDist*scale, centre + snapDist*scale);
548 if(closePresets.size() > 0){ 543 if(closePresets.size() > 0){
544 if(interpolateMode == INTERPOLATE_GRID){
545 snapped = false;
546 closestPreset = NULL;
547 snapCentre = centre;
548 return;
549 } // no presets visible
550
549 snapped = true; 551 snapped = true;
550 presetWasTapped = false; 552 presetWasTapped = false;
551 closestPreset = getClosestPresetOf(closePresets); 553 closestPreset = getClosestPresetOf(closePresets);
552 snapCentre = closestPreset->coordinates; 554 snapCentre = closestPreset->coordinates;
553 eventLogger.logEvent(SNAPPED_TO_PRESET, getCoord(),closestPreset->creationTime ); 555 eventLogger.logEvent(SNAPPED_TO_PRESET, getCoord(),closestPreset->creationTime );
554 556
555 557
556 }else{ 558 }else{
559 // look for evaluation points
557 // do an evaluation snap check . duplicate code >:[ 560 // do an evaluation snap check . duplicate code >:[
558 561
559 vector<lEvent *> closeEvalPoints = eventLogger.getEvaluationPointsInRange(centre - snapDist*scale, centre + snapDist*scale); 562 vector<lEvent *> closeEvalPoints = eventLogger.getEvaluationPointsInRange(centre - snapDist*scale, centre + snapDist*scale);
560 if(closeEvalPoints.size() > 0){ 563 if(closeEvalPoints.size() > 0){
561 snapped = true; 564 snapped = true;