marakaner/Calculator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

finished the ability to type in numbers with the keyboard.

Browse Source
This commit is contained in:
Alex 2024-03-14 05:27:35 +01:00
parent c85a85e8f5
commit 02165bd184
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/main/java/net/marakaner/calc/CalcController.java
View File

@ -19,13 +19,8 @@ public class CalcController implements Initializable {
private String lastChar = ""; private String lastChar = "";
private void addChar(String next, boolean spacing) { private void addChar(String next, boolean spacing) {
if(lastChar.equals("(") || lastChar.equals(")")) { lastChar = next;
if(!next.matches("\\d")) { this.label.setText(this.label.getText() + (spacing ? " " : "") + next + (spacing ? " " : ""));
return;
}
}
this.label.setText((spacing ? " " : "") + next + (spacing ? " " : ""));
} }
private void addChar(String next) { private void addChar(String next) {
@ -100,18 +95,7 @@ public class CalcController implements Initializable {
} }
public void onSum(ActionEvent actionEvent) { public void onSum(ActionEvent actionEvent) {
Expression expression = new ExpressionBuilder(this.label.getText()).build(); calculate();
double result = expression.evaluate();
System.out.println(result % 1);
if(result % 1.0 == 0.0) {
int intResult = (int) result;
this.label.setText("" + intResult);
} else {
this.label.setText("" + result);
}
} }
public void onPlus(ActionEvent actionEvent) { public void onPlus(ActionEvent actionEvent) {
@ -128,10 +112,27 @@ public class CalcController implements Initializable {
addChar(keyEvent.getText()); addChar(keyEvent.getText());
} else if(keyEvent.getText().matches("[+\\-*/]")) { } else if(keyEvent.getText().matches("[+\\-*/]")) {
addChar(keyEvent.getText(), true); addChar(keyEvent.getText(), true);
} else if(keyEvent.getCode() == KeyCode.ENTER) {
calculate();
} }
}); });
} }
private void calculate() {
Expression expression = new ExpressionBuilder(this.label.getText()).build();
double result = expression.evaluate();
System.out.println(result % 1);
if(result % 1.0 == 0.0) {
int intResult = (int) result;
this.label.setText("" + intResult);
} else {
this.label.setText("" + result);
}
}
public void onKeyPressed(KeyEvent keyEvent) { public void onKeyPressed(KeyEvent keyEvent) {
System.out.println(keyEvent.getText()); System.out.println(keyEvent.getText());
} }