etc
/
furnace
mirror of https://github.com/tildearrow/furnace.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

address the final find and replace issue

This commit is contained in:
tildearrow 2022-06-17 02:40:34 -05:00
parent 02d4712e9c
commit a8ae8f6e54
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/gui/findReplace.cpp
View File

@ -43,6 +43,7 @@ int queryNote(int note, int octave) {
} }
bool checkCondition(int mode, int arg, int argMax, int val, bool noteMode=false) { bool checkCondition(int mode, int arg, int argMax, int val, bool noteMode=false) {
const int emptyVal=noteMode?-61:-1;
switch (mode) { switch (mode) {
case GUI_QUERY_IGNORE: case GUI_QUERY_IGNORE:
return true; return true;
@ -51,19 +52,19 @@ bool checkCondition(int mode, int arg, int argMax, int val, bool noteMode=false)
return (val==arg); return (val==arg);
break; break;
case GUI_QUERY_MATCH_NOT: case GUI_QUERY_MATCH_NOT:
return (val!=-1 && val!=arg); return (val!=emptyVal && val!=arg);
break; break;
case GUI_QUERY_RANGE: case GUI_QUERY_RANGE:
return (val>=arg && val<=argMax); return (val>=arg && val<=argMax);
break; break;
case GUI_QUERY_RANGE_NOT: case GUI_QUERY_RANGE_NOT:
return (val!=-1 && (val<arg || val>argMax) && (!noteMode || val<120)); return (val!=emptyVal && (val<arg || val>argMax) && (!noteMode || val<120));
break; break;
case GUI_QUERY_ANY: case GUI_QUERY_ANY:
return (val!=-1); return (val!=emptyVal);
break; break;
case GUI_QUERY_NONE: case GUI_QUERY_NONE:
return (val==-1); return (val==emptyVal);
break; break;
} }
return false; return false;
@ -249,8 +250,11 @@ void FurnaceGUI::doReplace() {
if (note>119) note=119; if (note>119) note=119;
p->data[i.y][0]=(note+60)%12; p->data[i.y][0]=(note+60)%12;
if (p->data[i.y][0]==0) p->data[i.y][0]=12; p->data[i.y][1]=(unsigned char)(((note+60)/12)-5);
p->data[i.y][1]=(unsigned char)((note-1)/12); if (p->data[i.y][0]==0) {
p->data[i.y][0]=12;
p->data[i.y][1]=(unsigned char)(p->data[i.y][1]-1);
}
} }
} }
break; break;
@ -266,8 +270,11 @@ void FurnaceGUI::doReplace() {
} }
p->data[i.y][0]=(note+60)%12; p->data[i.y][0]=(note+60)%12;
if (p->data[i.y][0]==0) p->data[i.y][0]=12; p->data[i.y][1]=(unsigned char)(((note+60)/12)-5);
p->data[i.y][1]=(unsigned char)((note-1)/12); if (p->data[i.y][0]==0) {
p->data[i.y][0]=12;
p->data[i.y][1]=(unsigned char)(p->data[i.y][1]-1);
}
} }
} }
break; break;