From da33dae6c1dc45ed6eafb94976d50fa7303ca7d6 Mon Sep 17 00:00:00 2001 From: Patrick Linstruth Date: Tue, 2 Apr 2019 18:03:47 -0700 Subject: [PATCH] Added bool itemHasCodes(int itemnumber,QStringList test_codes) Cleaned up formatting --- lib/schedcartlist.cpp | 199 ++++++++++++++++++++++-------------------- lib/schedcartlist.h | 6 +- 2 files changed, 108 insertions(+), 97 deletions(-) diff --git a/lib/schedcartlist.cpp b/lib/schedcartlist.cpp index 8b81f3f7..8c79c42b 100644 --- a/lib/schedcartlist.cpp +++ b/lib/schedcartlist.cpp @@ -18,162 +18,171 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // -#include +#include +#include "schedcartlist.h" SchedCartList::SchedCartList(int listsize) { - cartnum=new unsigned[listsize]; - cartlen=new int[listsize]; - stackid=new int[listsize]; - artist=new QString[listsize]; - sched_codes=new QString[listsize]; - itemcounter=0; + cartnum=new unsigned[listsize]; + cartlen=new int[listsize]; + stackid=new int[listsize]; + artist=new QString[listsize]; + sched_codes=new QString[listsize]; + itemcounter=0; } SchedCartList::~SchedCartList() { - delete []cartnum; - delete []cartlen; - delete []stackid; - delete []artist; - delete []sched_codes; + delete []cartnum; + delete []cartlen; + delete []stackid; + delete []artist; + delete []sched_codes; } -// -// stack_schedcodes should no longer be needed. Possibly remove at a later date. P. Linstruth 01/12/2019 -// void SchedCartList::insertItem(unsigned cartnumber,int cartlength,int stack_id,QString stack_artist,QString stack_schedcodes) { - cartnum[itemcounter]=cartnumber; - cartlen[itemcounter]=cartlength; - stackid[itemcounter]=stack_id; - artist[itemcounter]=stack_artist.lower().replace(" ",""); - sched_codes[itemcounter]=stack_schedcodes; - itemcounter++; + cartnum[itemcounter]=cartnumber; + cartlen[itemcounter]=cartlength; + stackid[itemcounter]=stack_id; + artist[itemcounter]=stack_artist.lower().replace(" ",""); + if(stack_schedcodes=="") { + stack_schedcodes="."; + } + sched_codes[itemcounter]=stack_schedcodes; + itemcounter++; } void SchedCartList::removeItem(int itemnumber) { - for(int i=itemnumber;i<(itemcounter-1);i++) - { - cartnum[i]=cartnum[i+1]; - cartlen[i]=cartlen[i+1]; - stackid[i]=stackid[i+1]; - artist[i]=artist[i+1]; - sched_codes[i]=sched_codes[i+1]; - } - itemcounter--; + for(int i=itemnumber;i<(itemcounter-1);i++) { + cartnum[i]=cartnum[i+1]; + cartlen[i]=cartlen[i+1]; + stackid[i]=stackid[i+1]; + artist[i]=artist[i+1]; + sched_codes[i]=sched_codes[i+1]; + } + itemcounter--; } bool SchedCartList::removeIfCode(int itemnumber,QString test_code) { - QString test = test_code; - test+=" "; - test=test.left(11); + QString test = test_code; + test+=" "; + test=test.left(11); - if (sched_codes[itemnumber].find(test)!=-1) - { - for(int i=itemnumber;i<(itemcounter-1);i++) - { - cartnum[i]=cartnum[i+1]; - cartlen[i]=cartlen[i+1]; - stackid[i]=stackid[i+1]; - artist[i]=artist[i+1]; - sched_codes[i]=sched_codes[i+1]; - } - itemcounter--; - return true; - } - return false; + if (sched_codes[itemnumber].find(test)!=-1) { + for(int i=itemnumber;i<(itemcounter-1);i++) { + cartnum[i]=cartnum[i+1]; + cartlen[i]=cartlen[i+1]; + stackid[i]=stackid[i+1]; + artist[i]=artist[i+1]; + sched_codes[i]=sched_codes[i+1]; + } + itemcounter--; + return true; + } + return false; } bool SchedCartList::itemHasCode(int itemnumber,QString test_code) { - QString test=test_code; - test+=" "; - test=test.left(11); + QString test=test_code; + test+=" "; + test=test.left(11); - if (sched_codes[itemnumber].find(test)!=-1) - return true; - else - return false; + if (sched_codes[itemnumber].find(test)!=-1) { + return true; + } + else { + return false; + } } +bool SchedCartList::itemHasCodes(int itemnumber,QStringList test_codes) +{ + for (int i=0;i +#include class SchedCartList { @@ -32,8 +33,9 @@ class SchedCartList void removeItem(int itemnumber); bool removeIfCode(int itemnumber,QString test_code); bool itemHasCode(int itemnumber,QString test_code); - unsigned getItemCartnumber(int itemnumber); - int getItemCartlength(int itemnumber); + bool itemHasCodes(int itemnumber,QStringList test_codes); + unsigned getItemCartNumber(int itemnumber); + int getItemCartLength(int itemnumber); int getItemStackid(int itemnumber); QString getItemArtist(int itemnumber); QString getItemSchedCodes(int itemnumber);