krolyxon
/
jcal
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix x^n evalutation and add '^' button

This commit is contained in:
krolxon 2024-02-17 23:35:57 +05:30
parent 0777aca0bf
commit 17a6e4575d
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/GFrame.java
View File

@ -72,7 +72,7 @@ public class GFrame extends JFrame {
tf.setBackground(Color.decode("#2B2B2B")); tf.setBackground(Color.decode("#2B2B2B"));
tf.setForeground(Color.decode("#e5e5e5")); tf.setForeground(Color.decode("#e5e5e5"));
tf.setMargin(new Insets(0, 10, 0, 10)); tf.setMargin(new Insets(0, 10, 0, 10));
tf.setBounds(40, 50, 310, 40); tf.setBounds(40, 50, 240, 40);
tf.setFont((new Font("Times New Roman", Font.PLAIN, 20))); tf.setFont((new Font("Times New Roman", Font.PLAIN, 20)));
tf.setBorder(new RoundBtn(5)); tf.setBorder(new RoundBtn(5));
@ -89,7 +89,8 @@ public class GFrame extends JFrame {
tHist.setMargin(new Insets(0, 10, 0, 10)); tHist.setMargin(new Insets(0, 10, 0, 10));
// Buttons // Buttons
JButton bEval = newButton("=", 250, 100, 100, 40); JButton bEval= newButton("=", 290, 50, 60, 40);
JButton bExp= newButton("^", 250, 100, 100, 40);
JButton bClear = newButton("CL", 180, 100, 60, 40); JButton bClear = newButton("CL", 180, 100, 60, 40);
JButton bClearHistory = newButton("Clear History", 380, 300, 200, 40); JButton bClearHistory = newButton("Clear History", 380, 300, 200, 40);
JButton bAdd = newButton("+", 250, 300, 100, 40); JButton bAdd = newButton("+", 250, 300, 100, 40);
@ -113,6 +114,7 @@ public class GFrame extends JFrame {
JButton bNine = newButton("9", 180, 150, 60, 40); JButton bNine = newButton("9", 180, 150, 60, 40);
// Add the buttons to the Frame // Add the buttons to the Frame
this.add(bExp);
this.add(bEval); this.add(bEval);
this.add(bClear); this.add(bClear);
this.add(bClearHistory); this.add(bClearHistory);
@ -172,6 +174,7 @@ public class GFrame extends JFrame {
}); });
// Common actions that just appends the symbols to the text field // Common actions that just appends the symbols to the text field
actionAdderForTextField(bExp, "^");
actionAdderForTextField(bAdd, "+"); actionAdderForTextField(bAdd, "+");
actionAdderForTextField(bSub, "-"); actionAdderForTextField(bSub, "-");
actionAdderForTextField(bMul, "*"); actionAdderForTextField(bMul, "*");

2
src/Parser.java
View File

@ -132,7 +132,7 @@ public class Parser {
case '/': case '/':
return op1 / op2; return op1 / op2;
case '^': case '^':
return (Math.pow(op2, op1)); return (Math.pow(op1, op2));
default: default:
return 0.0; return 0.0;
} }