Skip to content

Commit da39dd4

Browse files
Harry121199Harry121199
committed
Digit 6 added to boomer
2 parents 520eff4 + 7c223e5 commit da39dd4

File tree

8 files changed

+730
-739
lines changed

8 files changed

+730
-739
lines changed

‎Fonts/Boomer/boomer.h

Lines changed: 58 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
class Boomer : public Fonts
66
{
7-
static const int rows = 8;
8-
static const int cols = 8;
7+
static const int rows = 7;
8+
static const int cols = 7;
99

1010
public:
1111
Boomer() : Fonts(rows, cols) {}
@@ -95,9 +95,12 @@ class Boomer : public Fonts
9595
character[1][0] = character[1][2] = character[1][4] = character[1][6] = character[2][0] = character[2][2] = character[2][4] = character[2][6] = character[3][0] = character[3][6] = character[4][0] = character[4][2] = character[4][4] = character[4][6] = character[5][2] = character[5][4] = '|';
9696
character[5][0] = '\\';
9797
character[5][6] = '/';
98+
character[5][0] = '\\';
99+
character[5][6] = '/';
98100

99101
return character;
100102
}
103+
101104
char **I()
102105
{
103106
char **character = getCharGrid();
@@ -147,7 +150,7 @@ class Boomer : public Fonts
147150

148151
char **M()
149152
{
150-
char **character = getCharGrid();
153+
char **character = getCharGrid(6, 8);
151154
character[0][0] = character[0][1] = character[0][2] = character[0][5] = character[0][6] = character[0][7] = character[5][1] = character[5][6] = '_';
152155
character[1][0] = character[2][0] = character[3][0] = character[4][0] = character[3][2] = character[4][2] = character[5][2] = character[3][5] = character[4][5] = character[5][5] = character[1][7] = character[2][7] = character[3][7] = character[4][7] = '|';
153156
character[2][2] = character[2][5] = '.';
@@ -259,7 +262,7 @@ class Boomer : public Fonts
259262

260263
char **W()
261264
{
262-
char **character = getCharGrid();
265+
char **character = getCharGrid(6, 8);
263266
character[0][1] = character[0][6] = '_';
264267
character[1][0] = character[1][2] = character[1][5] = character[1][7] = character[2][0] = character[2][2] = character[2][5] = character[2][7] = character[3][0] = character[3][2] = character[3][5] = character[3][7] = '|';
265268
character[3][4] = character[4][4] = character[4][0] = character[5][1] = character[5][5] = '\\';
@@ -356,6 +359,14 @@ class Boomer : public Fonts
356359
{
357360
char **character = getCharGrid();
358361

362+
character[0][0] = character[0][1] = character[0][2] = character[0][3] = character[0][4] = character[0][6] = character[1][0] = character[1][1] = character[1][2] = character[1][3] = character[1][5] = character[2][0] = character[2][1] = character[2][2] = character[2][3] = character[2][5] = ' ';
363+
character[0][5] = character[2][2] = character[2][3] = character[3][3] = character[4][3] = character[5][2] = character[5][3] = character[5][5] = '_';
364+
character[1][4] = character[1][6] = character[2][4] = character[2][6] = character[3][6] = character[4][0] = character[4][4] = character[4][6] = character[4][6] = character[5][6] = '|';
365+
character[4][2] = '(';
366+
character[5][4] = ',';
367+
character[3][4] = '`';
368+
character[5][1] = '\\';
369+
character[3][1] = '/';
359370
character[0][0] = character[0][1] = character[0][2] = character[0][3] = character[0][4] = character[0][6] = character[1][0] = character[1][1] = character[1][2] = character[1][3] = character[1][5] = character[2][0] = character[2][1] = character[2][2] = character[2][3] = character[2][5] = ' ';
360371
character[0][5] = character[2][2] = character[2][3] = character[3][3] = character[4][3] = character[5][2] = character[5][3] = character[5][5] = '_';
361372
character[1][4] = character[1][6] = character[2][4] = character[2][6] = character[3][6] = character[4][0] = character[4][4] = character[4][6] = character[4][6] = character[5][6] = '|';
@@ -392,18 +403,20 @@ class Boomer : public Fonts
392403

393404
char **g()
394405
{
395-
char **character = getCharGrid();
406+
char **character = getCharGrid(8, 7);
407+
408+
character[2][0] = character[2][1] = character[2][4] = character[2][6] = character[3][0] = character[3][2] = character[3][4] = character[3][5] = character[4][1] = character[4][5] = character[5][0] = character[5][5] = character[6][0] = character[6][1] = character[6][5] = character[7][0] = character[7][6] = ' ';
409+
character[2][2] = character[2][3] = character[2][5] = character[3][3] = character[4][3] = character[5][2] = character[5][3] = character[6][2] = character[6][3] = character[4][3] = character[7][2] = character[7][3] = character[7][4] = '_';
410+
character[3][6] = character[4][0] = character[4][4] = character[4][6] = character[5][6] = character[6][6] = character[7][1] = '|';
411+
character[3][1] = character[6][4] = character[7][5] = '/';
412+
character[5][1] = '\\';
413+
character[3][4] = '`';
414+
character[5][4] = ',';
415+
character[4][2] = '(';
396416

397-
character[0][0] = character[0][1] = character[0][4] = character[0][6] = character[1][0] = character[1][2] = character[1][4] = character[1][5] = character[2][1] = character[2][5] = character[3][0] = character[3][5] = character[4][0] = character[4][1] = character[4][5] = character[5][0] = character[5][6] = ' ';
398-
character[0][2] = character[0][3] = character[0][5] = character[1][3] = character[2][3] = character[3][2] = character[3][3] = character[4][2] = character[4][3] = character[2][3] = character[5][2] = character[5][3] = character[5][4] = '_';
399-
character[1][6] = character[2][0] = character[2][4] = character[2][6] = character[3][6] = character[4][6] = character[5][1] = '|';
400-
character[1][1] = character[4][4] = character[5][5] = '/';
401-
character[3][1] = '\\';
402-
character[1][4] = '`';
403-
character[3][4] = ',';
404-
character[2][2] = '(';
405417
return character;
406418
}
419+
407420
char **h()
408421
{
409422

@@ -427,11 +440,11 @@ class Boomer : public Fonts
427440

428441
char **j()
429442
{
430-
char **character = getCharGrid();
443+
char **character = getCharGrid(8, 5);
431444
character[0][0] = character[0][1] = character[0][2] = character[1][0] = character[1][1] = character[2][0] = character[2][1] = character[2][2] = character[3][0] = character[3][1] = character[3][3] = character[4][0] = character[4][1] = character[4][3] = character[5][0] = character[5][3] = ' ';
432-
character[0][3] = character[1][3] = character[2][3] = character[5][1] = character[6][1] = character[6][2] = '_';
433-
character[3][2] = character[3][4] = character[4][2] = character[4][4] = character[5][4] = character[6][0] = '|';
434-
character[5][2] = character[6][3] = '/';
445+
character[0][3] = character[1][3] = character[2][3] = character[6][1] = character[7][1] = character[7][2] = '_';
446+
character[3][2] = character[3][4] = character[4][2] = character[4][4] = character[5][2] = character[5][4] = character[6][4] = character[7][0] = '|';
447+
character[6][2] = character[7][3] = '/';
435448
character[1][2] = '(';
436449
character[1][4] = ')';
437450
return character;
@@ -451,7 +464,7 @@ class Boomer : public Fonts
451464
/*
452465
char **l()
453466
{
454-
char **character = getCharGrid();
467+
char **character = getCharGrid(ROWS,COLS);
455468
456469
//Enter the character grid in ROWS X COLS
457470
@@ -463,7 +476,7 @@ class Boomer : public Fonts
463476
/*
464477
char **m()
465478
{
466-
char **character = getCharGrid();
479+
char **character = getCharGrid(ROWS,COLS);
467480
468481
//Enter the character grid in ROWS X COLS
469482
@@ -520,7 +533,7 @@ class Boomer : public Fonts
520533
/*
521534
char **q()
522535
{
523-
char **character = getCharGrid();
536+
char **character = getCharGrid(ROWS,COLS);
524537
525538
//Enter the character grid in ROWS X COLS
526539
@@ -532,7 +545,7 @@ class Boomer : public Fonts
532545
/*
533546
char **r()
534547
{
535-
char **character = getCharGrid();
548+
char **character = getCharGrid(ROWS,COLS);
536549
537550
//Enter the character grid in ROWS X COLS
538551
@@ -597,7 +610,7 @@ class Boomer : public Fonts
597610
/*
598611
char **w()
599612
{
600-
char **character = getCharGrid();
613+
char **character = getCharGrid(ROWS,COLS);
601614
602615
//Enter the character grid in ROWS X COLS
603616
@@ -626,7 +639,7 @@ class Boomer : public Fonts
626639
/*
627640
char **y()
628641
{
629-
char **character = getCharGrid();
642+
char **character = getCharGrid(ROWS,COLS);
630643
631644
//Enter the character grid in ROWS X COLS
632645
@@ -664,7 +677,7 @@ class Boomer : public Fonts
664677
/*
665678
char **one()
666679
{
667-
char **character = getCharGrid();
680+
char **character = getCharGrid(ROWS,COLS);
668681
669682
//Enter the character grid in ROWS X COLS
670683
@@ -690,7 +703,7 @@ class Boomer : public Fonts
690703
/*
691704
char **three()
692705
{
693-
char **character = getCharGrid();
706+
char **character = getCharGrid(ROWS,COLS);
694707
695708
//Enter the character grid in ROWS X COLS
696709
@@ -712,7 +725,7 @@ class Boomer : public Fonts
712725
/*
713726
char **five()
714727
{
715-
char **character = getCharGrid();
728+
char **character = getCharGrid(ROWS,COLS);
716729
717730
//Enter the character grid in ROWS X COLS
718731
@@ -721,6 +734,7 @@ class Boomer : public Fonts
721734
722735
*/
723736

737+
<<<<<<< HEAD
724738
char **six()
725739
{
726740
char **character = getCharGrid();
@@ -736,6 +750,18 @@ class Boomer : public Fonts
736750

737751
return character;
738752
}
753+
=======
754+
/*
755+
char **six()
756+
{
757+
char **character = getCharGrid(ROWS,COLS);
758+
759+
//Enter the character grid in ROWS X COLS
760+
761+
return character;
762+
}
763+
*/
764+
>>>>>>> 7c223e56986dd2a63b8cb17a5fe7151e34e37cde
739765

740766
char **seven()
741767
{
@@ -748,6 +774,11 @@ class Boomer : public Fonts
748774
character[4][0] = '.';
749775
character[5][0] = '\\';
750776

777+
character[1][6] = character[2][3] = character[2][5] = character[3][2] = character[3][4] = character[4][1] = character[4][3] = character[5][2] = '/';
778+
character[1][0] = '|';
779+
character[4][0] = '.';
780+
character[5][0] = '\\';
781+
751782
character[1][6] = character[2][3] = character[2][5] = character[3][2] = character[3][4] = character[4][1] = character[4][3] = character[5][2] = '/';
752783

753784
return character;
@@ -756,7 +787,7 @@ class Boomer : public Fonts
756787
/*
757788
char **eight()
758789
{
759-
char **character = getCharGrid();
790+
char **character = getCharGrid(ROWS,COLS);
760791
761792
//Enter the character grid in ROWS X COLS
762793

0 commit comments

Comments
 (0)