organising the program better

14 files changed, 65 insertions, 15 deletions

diff --git a/draw_grid b/draw_grid
new file mode 100755
index 0000000..90934a4
--- /dev/null
+++ b/draw_grid
diff --git a/draw_grid.cpp b/draw_grid.cpp
index de67681..45fdbcb 100644
--- a/draw_grid.cpp
+++ b/draw_grid.cpp
@@ -19,7 +19,7 @@ int main(int argc, char** argv) {
 	fstream inputBits;
 
 	// get input
-	inputBits.open("noteBits1.txt");
+	inputBits.open("./program_files/noteBits1.txt");
 	inputBits >> noteNum;
 
 	int notes[BOXWIDTH][BOXHEIGHT];
@@ -34,7 +34,7 @@ int main(int argc, char** argv) {
 	inputBits.close();
 	
 	int tmpNote = noteNum;
-	inputBits.open("noteBits2.txt");
+	inputBits.open("./program_files/noteBits2.txt");
 	inputBits >> noteNum;
 
 	for(int i = tmpNote; i < noteNum+tmpNote; ++i) {
@@ -58,7 +58,7 @@ int main(int argc, char** argv) {
 		}
 	}
 
-	imwrite("A4Grid.jpg", A4Grid);
+	imwrite("./program_files/A4Grid.jpg", A4Grid);
 	return 0;
 }
 
diff --git a/get_notes.sh b/get_notes.sh
index 3df958f..ecfaabd 100755
--- a/get_notes.sh
+++ b/get_notes.sh
@@ -1,8 +1,8 @@
-convert -interlace none -density 150x150 -quality 50 "$1" "./score.jpg";
+convert -interlace none -density 150x150 -quality 50 "$1" "./program_files/score.jpg";
 g++ note_detection.cpp -o note_detection -fpermissive `pkg-config --libs opencv`;
 g++ draw_grid.cpp -o draw_grid -fpermissive `pkg-config --libs opencv`;
-./note_detection score.jpg 0;
-mv "./noteBits.txt" "./noteBits1.txt";
-./note_detection score.jpg 1;
-mv "./noteBits.txt" "./noteBits2.txt";
+./note_detection "./program_files/score.jpg" 0;
+mv "./program_files/noteBits.txt" "./program_files/noteBits1.txt";
+./note_detection "./program_files/score.jpg" 1;
+mv "./program_files/noteBits.txt" "./program_files/noteBits2.txt";
 ./draw_grid
diff --git a/note_detection b/note_detection
new file mode 100755
index 0000000..f4406d6
--- /dev/null
+++ b/note_detection
diff --git a/note_detection.cpp b/note_detection.cpp
index b3ceaa3..d1cda19 100644
--- a/note_detection.cpp
+++ b/note_detection.cpp
@@ -107,20 +107,20 @@ int main(int argc, char** argv) {
 	drawNoteLoc(notes, finalNotes, noteNum);
 
 	// Writing all the outputs to files for logging
-	imwrite("cut_out.jpg", cut_offbw);
-	imwrite("cut_hist_horiz.jpg", cut);
-	imwrite("cut_hist_vert.jpg", cut2);
-	imwrite("note_detected.jpg", notes);
-	imwrite("pitch_detect.jpg", notesbw);
+	imwrite("./program_files/cut_out.jpg", cut_offbw);
+	imwrite("./program_files/cut_hist_horiz.jpg", cut);
+	imwrite("./program_files/cut_hist_vert.jpg", cut2);
+	imwrite("./program_files/note_detected.jpg", notes);
+	imwrite("./program_fiels/pitch_detect.jpg", notesbw);
 
 	// Creating text files with the data for external access
-	noteStream.open("note.txt");
+	noteStream.open("./program_files/note.txt");
 	for(int i = 0; i < noteRestNum; ++i) {
 		noteStream << noteRests[i][0] << " " << noteRests[i][1] << endl;
 	}  
 	noteStream.close();
 
-	noteStream.open("noteBits.txt");
+	noteStream.open("./program_files/noteBits.txt");
 	noteStream << noteRestNum << endl;
 	for(int i = 0; i < noteRestNum; ++i) {
 		for(int j = 0; j < NOTEBIT; ++j) {
diff --git a/program_files/A4Grid.jpg b/program_files/A4Grid.jpg
new file mode 100644
index 0000000..f5d2d32
--- /dev/null
+++ b/program_files/A4Grid.jpg
diff --git a/program_files/cut_hist_horiz.jpg b/program_files/cut_hist_horiz.jpg
new file mode 100644
index 0000000..efce3ab
--- /dev/null
+++ b/program_files/cut_hist_horiz.jpg
diff --git a/program_files/cut_hist_vert.jpg b/program_files/cut_hist_vert.jpg
new file mode 100644
index 0000000..4438bb4
--- /dev/null
+++ b/program_files/cut_hist_vert.jpg
diff --git a/program_files/cut_out.jpg b/program_files/cut_out.jpg
new file mode 100644
index 0000000..6f32566
--- /dev/null
+++ b/program_files/cut_out.jpg
diff --git a/program_files/note.txt b/program_files/note.txt
new file mode 100644
index 0000000..bbf228e
--- /dev/null
+++ b/program_files/note.txt
@@ -0,0 +1,16 @@
+0 5
+0 31
+0 4
+0 31
+0 3
+0 31
+1 2
+1 2
+0 5
+0 31
+0 4
+0 31
+0 3
+0 31
+1 2
+1 2
diff --git a/program_files/noteBits1.txt b/program_files/noteBits1.txt
new file mode 100644
index 0000000..d215158
--- /dev/null
+++ b/program_files/noteBits1.txt
@@ -0,0 +1,17 @@
+16
+00111
+11111
+01110
+11111
+10000
+11111
+01110
+01110
+01100
+11111
+01011
+11111
+01001
+11111
+00111
+00111
diff --git a/program_files/noteBits2.txt b/program_files/noteBits2.txt
new file mode 100644
index 0000000..84003e5
--- /dev/null
+++ b/program_files/noteBits2.txt
@@ -0,0 +1,17 @@
+16
+01110
+11111
+01100
+11111
+01011
+11111
+01001
+01001
+01110
+11111
+01100
+11111
+01011
+11111
+01001
+01001
diff --git a/program_files/note_detected.jpg b/program_files/note_detected.jpg
new file mode 100644
index 0000000..e0f7c99
--- /dev/null
+++ b/program_files/note_detected.jpg
diff --git a/program_files/score.jpg b/program_files/score.jpg
new file mode 100644
index 0000000..2ad555b
--- /dev/null
+++ b/program_files/score.jpg