diff --git a/B12NumbersV3/B12NumbersV3.pde b/B12NumbersV3/B12NumbersV3.pde index 29e625d..35e2696 100644 --- a/B12NumbersV3/B12NumbersV3.pde +++ b/B12NumbersV3/B12NumbersV3.pde @@ -1,3 +1,16 @@ +/** + * Nayan Sawyer ns9573@bard.edu + * May 21 2022 + * CMSC 141 + * Final Project: Base 12 Toolkit + * + * Comments/Reflections: The calculator uses B12Expression, MathPad, B12Button, and MathDisplay. + * The clock app uses Clock, Stopwatch, Timer, and TimeDisplay + * + * Collaboration Statement: I used the processing docs, method relay code by Quark - see https://forum.processing.org/two/discussion/13093/how-to-call-function-by-string-content.html + * and the exp4j library see - https://www.objecthunter.net/exp4j/index.html + */ + import net.objecthunter.exp4j.*; // Math expression evaluation library // B12NumbersV3 // diff --git a/B12NumbersV3/B12NumbersV3.zip b/B12NumbersV3/B12NumbersV3.zip new file mode 100644 index 0000000..7d7da06 Binary files /dev/null and b/B12NumbersV3/B12NumbersV3.zip differ diff --git a/B12NumbersV3/MathPad.pde b/B12NumbersV3/MathPad.pde index 14d85f0..d8ca978 100644 --- a/B12NumbersV3/MathPad.pde +++ b/B12NumbersV3/MathPad.pde @@ -24,7 +24,7 @@ class MathPad{ } - void initialize(){ + private void initialize(){ buttons = new Button[0]; // Create numpad buttons for(int i = 0; i < 12; i++){ diff --git a/B12NumbersV3/Timer.pde b/B12NumbersV3/Timer.pde index dfd33e9..1cfae1d 100644 --- a/B12NumbersV3/Timer.pde +++ b/B12NumbersV3/Timer.pde @@ -35,7 +35,7 @@ class Timer{ Timer setPos(PVector _pos){pos = _pos.copy(); initialize(); return this;} Timer setPos(float x, float y){pos = new PVector(x,y); initialize(); return this;} - void initialize(){ + private void initialize(){ buttons = new Button[0]; td.setPos(pos.x + 13*4 + 2,pos.y-2); // Create numpad buttons @@ -119,11 +119,11 @@ class Timer{ colorMode(RGB,255); fill(255,0,0); rectMode(CORNERS); - rect(-13*5,-20,13*5,0); + rect(pos.x - 13*5,pos.y - 20,pos.x + 13*5,pos.y); fill(0); textSize(16); textAlign(CENTER,BOTTOM); - text("Timer Done!",0,0); + text("Timer Done!",pos.x,pos.y); } } } diff --git a/B12NumbersV3/zchangelog.pde b/B12NumbersV3/zchangelog.pde index 63f39c1..4b61fc6 100644 --- a/B12NumbersV3/zchangelog.pde +++ b/B12NumbersV3/zchangelog.pde @@ -3,7 +3,7 @@ Beta version of a clock in base 12. by Nayan Sawyer started Mar 2022 - version 1.0.0.0 May 20 2022 + version 1.0.0.1 May 20 2022 Characters are a variation of Kaktovik Inupiaq numerals reversed and in base 12 instead of 20. I take no credit @@ -28,6 +28,12 @@ - Time48 does not check its inputs in some constructors - renderPriority in Button is only half implemented - negative signs when timer ends (not urgent) + - B12Digit.setValue() does not check input and only accepts ints + - B12Digit.getValue() returns int not byte + + changelog 1.0.0.1 + - Some bug fixes, made more things private, and fixed + timer changelog 1.0.0.0 - Finished project to fully working state. Still lots of