otomatalabs/furnace
7
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

implement undo in find and replace

Browse source
This commit is contained in:
tildearrow 2022-06-17 02:21:07 -05:00
parent d8513e0856
commit 02d4712e9c
1 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/gui/findReplace.cpp
View file

@ -190,7 +190,6 @@ void FurnaceGUI::doFind() {
} }
/* issues with the find and replace function: /* issues with the find and replace function:
- doesn't mark the module as modified
- can't undo - can't undo
- replace notes to anything starting from C-0 to lower notes will have an octave higher, so set it to replace to C-0 it will becom C-1, b_1 will become B-0 and so on - replace notes to anything starting from C-0 to lower notes will have an octave higher, so set it to replace to C-0 it will becom C-1, b_1 will become B-0 and so on
*/ */
@ -202,6 +201,12 @@ void FurnaceGUI::doReplace() {
bool* touched[DIV_MAX_CHANS]; bool* touched[DIV_MAX_CHANS];
memset(touched,0,DIV_MAX_CHANS*sizeof(bool*)); memset(touched,0,DIV_MAX_CHANS*sizeof(bool*));
UndoStep us;
us.type=GUI_UNDO_REPLACE;
short prevVal[32];
memset(prevVal,0,32*sizeof(short));
for (FurnaceGUIQueryResult& i: curQueryResults) { for (FurnaceGUIQueryResult& i: curQueryResults) {
int patIndex=e->song.subsong[i.subsong]->orders.ord[i.x][i.order]; int patIndex=e->song.subsong[i.subsong]->orders.ord[i.x][i.order];
DivPattern* p=e->song.subsong[i.subsong]->pat[i.x].getPattern(patIndex,true); DivPattern* p=e->song.subsong[i.subsong]->pat[i.x].getPattern(patIndex,true);
@ -211,6 +216,9 @@ void FurnaceGUI::doReplace() {
} }
if (touched[i.x][(patIndex<<8)|i.y]) continue; if (touched[i.x][(patIndex<<8)|i.y]) continue;
touched[i.x][(patIndex<<8)|i.y]=true; touched[i.x][(patIndex<<8)|i.y]=true;
memcpy(prevVal,p->data[i.y],32*sizeof(short));
if (queryReplaceNoteDo) { if (queryReplaceNoteDo) {
switch (queryReplaceNoteMode) { switch (queryReplaceNoteMode) {
case GUI_QUERY_REPLACE_SET: case GUI_QUERY_REPLACE_SET:
@ -400,6 +408,13 @@ void FurnaceGUI::doReplace() {
} }
} }
} }
// issue undo step
for (int j=0; j<32; j++) {
if (p->data[i.y][j]!=prevVal[j]) {
us.pat.push_back(UndoPatternData(i.subsong,i.x,patIndex,i.y,j,prevVal[j],p->data[i.y][j]));
}
}
} }
for (int i=0; i<DIV_MAX_CHANS; i++) { for (int i=0; i<DIV_MAX_CHANS; i++) {
@ -409,6 +424,13 @@ void FurnaceGUI::doReplace() {
if (!curQueryResults.empty()) { if (!curQueryResults.empty()) {
MARK_MODIFIED; MARK_MODIFIED;
} }
if (!us.pat.empty()) {
printf("pusher\n");
undoHist.push_back(us);
redoHist.clear();
if (undoHist.size()>settings.maxUndoSteps) undoHist.pop_front();
}
} }
#define FIRST_VISIBLE(x) (x==GUI_QUERY_MATCH || x==GUI_QUERY_MATCH_NOT || x==GUI_QUERY_RANGE || x==GUI_QUERY_RANGE_NOT) #define FIRST_VISIBLE(x) (x==GUI_QUERY_MATCH || x==GUI_QUERY_MATCH_NOT || x==GUI_QUERY_RANGE || x==GUI_QUERY_RANGE_NOT)