From 5720d587bcd92747ad6f400a9ef8bf9349fe32fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=9F=E7=BE=BD=E5=8D=83=E6=A2=A6?= <鏄熺窘鍗冩ⅵ@LAPTOP-TB0O0H5M> Date: Sun, 6 Jun 2021 21:10:32 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E7=AC=AC=E4=B8=80=E6=AC=A1=E4=B8=8A?= =?UTF-8?q?=E4=BA=A4=EF=BC=8C=E8=AE=BE=E8=AE=A1=E4=BA=86=E7=AA=97=E5=8F=A3?= =?UTF-8?q?=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/java2020spring/Cauculater.java | 81 ++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 src/java2020spring/Cauculater.java diff --git a/src/java2020spring/Cauculater.java b/src/java2020spring/Cauculater.java new file mode 100644 index 0000000..f78a4f1 --- /dev/null +++ b/src/java2020spring/Cauculater.java @@ -0,0 +1,81 @@ +package java2020spring; + + +import javax.swing.*; +import java.awt.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +public class Cauculater extends JFrame implements ActionListener{ + private final String keys[]={"%","√","x^2","1/x","CE","C","<-","/","7","8","9","*","4","5","6","-","1","2","3","+","+/-","0",".","="}; + private final String Rom[]={"MC","MR","M+","M-","MS","M"}; + private JButton Keys[]=new JButton[keys.length]; + private JButton rom[]=new JButton[Rom.length]; + static JMenuBar menuBar=new JMenuBar(); + JPanel CenterPanel=new JPanel(); + JPanel NorthPanel=new JPanel(); + JPanel SouthPanel=new JPanel(); + JTextField textField=new JTextField(17); + JTextField textFieldUp=new JTextField(17); + private double result; + private String Result; + private String t=""; + private static int option; + private static String t1=""; + public static void main(String[] args) { + Cauculater window=new Cauculater(); + window.setSize(500,300); + window.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); + window.pack(); + window.setJMenuBar(menuBar); + window.setVisible(true); + } + public Cauculater(){ + JMenu fileItem=new JMenu("标准"); + JMenuItem card1=new JMenuItem("科学"); + JMenuItem card2=new JMenuItem("程序员"); + JMenu fileItem1=new JMenu("编辑"); + JMenu fileItem2=new JMenu("查看"); + JMenu fileItem3=new JMenu("帮助"); + menuBar.add(fileItem); + menuBar.add(fileItem1); + menuBar.add(fileItem2); + menuBar.add(fileItem3); + fileItem.add(card1); + fileItem.add(card2); + + SouthPanel.setLayout(new GridLayout(2,1)); + CenterPanel.setLayout(new GridLayout(6,4)); + NorthPanel.setLayout(new GridLayout(1,6)); + CenterPanel.setPreferredSize(new Dimension(400,300)); + NorthPanel.setPreferredSize(new Dimension(50,50)); + addRom(Rom); + for(int i=0;i Date: Mon, 7 Jun 2021 23:56:08 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=861~9=E7=9A=84?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/java2020spring/Cauculater.java | 74 ++++++++++++++++++++++++------ 1 file changed, 60 insertions(+), 14 deletions(-) diff --git a/src/java2020spring/Cauculater.java b/src/java2020spring/Cauculater.java index f78a4f1..0cc3217 100644 --- a/src/java2020spring/Cauculater.java +++ b/src/java2020spring/Cauculater.java @@ -6,16 +6,18 @@ import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; public class Cauculater extends JFrame implements ActionListener{ - private final String keys[]={"%","√","x^2","1/x","CE","C","<-","/","7","8","9","*","4","5","6","-","1","2","3","+","+/-","0",".","="}; - private final String Rom[]={"MC","MR","M+","M-","MS","M"}; - private JButton Keys[]=new JButton[keys.length]; - private JButton rom[]=new JButton[Rom.length]; + private final String key[]={"%","√","x^2","1/x","CE","C","<-","/","7","8","9","*","4","5","6","-","1","2","3","+","+/-","0",".","="}; + private final String com[]={"MC","MR","M+","M-","MS","M"}; + private JButton Key[]=new JButton[key.length]; + private JButton Com[]=new JButton[com.length]; static JMenuBar menuBar=new JMenuBar(); JPanel CenterPanel=new JPanel(); JPanel NorthPanel=new JPanel(); JPanel SouthPanel=new JPanel(); JTextField textField=new JTextField(17); JTextField textFieldUp=new JTextField(17); + private double left; + private double right; private double result; private String Result; private String t=""; @@ -48,34 +50,78 @@ public class Cauculater extends JFrame implements ActionListener{ NorthPanel.setLayout(new GridLayout(1,6)); CenterPanel.setPreferredSize(new Dimension(400,300)); NorthPanel.setPreferredSize(new Dimension(50,50)); - addRom(Rom); - for(int i=0;i Date: Mon, 7 Jun 2021 23:59:17 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=861~9=E7=9A=84?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/java2020spring/Cauculater.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/java2020spring/Cauculater.java b/src/java2020spring/Cauculater.java index 0cc3217..2d104a0 100644 --- a/src/java2020spring/Cauculater.java +++ b/src/java2020spring/Cauculater.java @@ -15,9 +15,7 @@ public class Cauculater extends JFrame implements ActionListener{ JPanel NorthPanel=new JPanel(); JPanel SouthPanel=new JPanel(); JTextField textField=new JTextField(17); - JTextField textFieldUp=new JTextField(17); - private double left; - private double right; + JTextField textFieldUp=new JTextField(17); private double result; private String Result; private String t=""; -- Gitee From 1fd305361aab9746e711ed8459b17c5611d1ac32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=9F=E7=BE=BD=E5=8D=83=E6=A2=A6?= <鏄熺窘鍗冩ⅵ@LAPTOP-TB0O0H5M> Date: Tue, 8 Jun 2021 23:55:06 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E4=B8=80?= =?UTF-8?q?=E4=BA=9B=E6=8C=89=E9=94=AE=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/java2020spring/Cauculater.java | 124 ++++++++++++++++++++++++++++- 1 file changed, 123 insertions(+), 1 deletion(-) diff --git a/src/java2020spring/Cauculater.java b/src/java2020spring/Cauculater.java index 2d104a0..a452581 100644 --- a/src/java2020spring/Cauculater.java +++ b/src/java2020spring/Cauculater.java @@ -16,11 +16,14 @@ public class Cauculater extends JFrame implements ActionListener{ JPanel SouthPanel=new JPanel(); JTextField textField=new JTextField(17); JTextField textFieldUp=new JTextField(17); + private double m; + private double n; private double result; private String Result; private String t=""; private static int option; private static String t1=""; + public static void main(String[] args) { Cauculater window=new Cauculater(); window.setSize(500,300); @@ -73,7 +76,7 @@ public class Cauculater extends JFrame implements ActionListener{ NorthPanel.add(Com[i]); } } - @Override + public void actionPerformed(ActionEvent e) { if(e.getSource()==Key[8]){ t1+="7"; @@ -120,6 +123,125 @@ public class Cauculater extends JFrame implements ActionListener{ t+="3"; textField.setText(t); } + else if(e.getSource()==Key[21]){ + t1+="0"; + t+="0"; + textField.setText(t); + } + if(e.getSource()==Key[0]){ + m=Double.parseDouble(textField.getText()); + textField.setText(""); + t=""; + t1+="%"; + textFieldUp.setText(t1); + option=2; + } + else if(e.getSource()==Key[23]){ + if(option==1){ + String N=textField.getText(); + n=Double.parseDouble(N); + result=m+n; + Result=""+result; + } + else if (option==2){ + n=Double.parseDouble(textField.getText()); + result=m%n; + Result=""+result; + } + else if(option==3){ + n=Double.parseDouble(textField.getText()); + result=m/n; + Result=""+result; + } + else if(option==4){ + n=Double.parseDouble(textField.getText()); + result=m*n; + Result=""+result; + } + else if(option==5){ + n=Double.parseDouble(textField.getText()); + result=m-n; + Result=""+result; + } + textField.setText(Result); + } + else if (e.getSource()==Key[1]){ + m=Double.parseDouble(textField.getText()); + textField.setText(""); + t=""; + result=Math.sqrt(m); + Result=""+result; + textFieldUp.setText(Result); + } + else if(e.getSource()==Key[2]){ + m=Double.parseDouble(textField.getText()); + textField.setText(""); + t=""; + result=m*m; + Result=""+result; + textFieldUp.setText(Result); + } + else if(e.getSource()==Key[3]) { + m=Double.parseDouble(textField.getText()); + textField.setText(""); + t=""; + result=1/m; + Result=""+result; + textFieldUp.setText(Result); + } + else if(e.getSource()==Key[4]){ + textField.setText(""); + t=""; + t1=""; + } + else if(e.getSource()==Key[5]){ + textField.setText(""); + t=""; + t1=""; + } + else if(e.getSource()==Key[6]){ + textField.setText(""); + t=""; + t1=""; + } + else if(e.getSource()==Key[7]){ + m=Double.parseDouble(textField.getText()); + t1+="/"; + textFieldUp.setText(t1); + textField.setText(""); + t=""; + option=3; + } + else if(e.getSource()==Key[11]){ + m=Double.parseDouble(textField.getText()); + t1+="*"; + textFieldUp.setText(t1); + textField.setText(""); + t=""; + option=4; + } + else if(e.getSource()==Key[15]){ + m=Double.parseDouble(textField.getText()); + t1+="-"; + textFieldUp.setText(t1); + textField.setText(""); + t=""; + option=5; + } + + else if(e.getSource()==Key[19]){ + m=Double.parseDouble(textField.getText()); + t1+="+"; + textFieldUp.setText(t1); + textField.setText(""); + t=""; + option=1; + } + else if(e.getSource()==Key[22]){ + t1+="."; + t+="."; + textField.setText(t); + } } } \ No newline at end of file -- Gitee From e0bcdaab8544d02b80e36fdc2d58969cd3893056 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=9F=E7=BE=BD=E5=8D=83=E6=A2=A6?= <鏄熺窘鍗冩ⅵ@LAPTOP-TB0O0H5M> Date: Wed, 9 Jun 2021 23:54:51 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E7=A8=8D=E5=BE=AE=E9=AB=98=E4=BC=B0?= =?UTF-8?q?=E8=87=AA=E5=B7=B1=E4=BA=86=EF=BC=8C=E5=85=A8=E9=83=A8=E6=8E=A8?= =?UTF-8?q?=E7=BF=BB=E4=BB=8E=E5=A4=B4=E6=9D=A5=E8=BF=87=EF=BC=8C=E5=81=9A?= =?UTF-8?q?=E7=AE=80=E5=8D=95=E4=B8=80=E7=82=B9=E7=9A=84=EF=BC=8C=E8=BF=99?= =?UTF-8?q?=E4=B8=80=E7=89=88=E7=9A=84=E5=AE=8C=E6=88=90=E5=BA=A6=E6=AF=94?= =?UTF-8?q?=E8=BE=83=E9=AB=98=EF=BC=8C=E4=BD=86=E6=98=AFM=E6=89=93?= =?UTF-8?q?=E5=A4=B4=E7=9A=84=E5=8A=9F=E8=83=BD=E9=94=AE=E5=A5=BD=E5=83=8F?= =?UTF-8?q?=E8=BF=98=E6=9C=89=E7=82=B9=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/java2020spring/Cauculater.java | 486 +++++++++++++++-------------- 1 file changed, 257 insertions(+), 229 deletions(-) diff --git a/src/java2020spring/Cauculater.java b/src/java2020spring/Cauculater.java index a452581..2842b95 100644 --- a/src/java2020spring/Cauculater.java +++ b/src/java2020spring/Cauculater.java @@ -1,247 +1,275 @@ package java2020spring; -import javax.swing.*; import java.awt.*; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -public class Cauculater extends JFrame implements ActionListener{ - private final String key[]={"%","√","x^2","1/x","CE","C","<-","/","7","8","9","*","4","5","6","-","1","2","3","+","+/-","0",".","="}; - private final String com[]={"MC","MR","M+","M-","MS","M"}; - private JButton Key[]=new JButton[key.length]; - private JButton Com[]=new JButton[com.length]; - static JMenuBar menuBar=new JMenuBar(); - JPanel CenterPanel=new JPanel(); - JPanel NorthPanel=new JPanel(); - JPanel SouthPanel=new JPanel(); - JTextField textField=new JTextField(17); - JTextField textFieldUp=new JTextField(17); - private double m; - private double n; - private double result; - private String Result; - private String t=""; - private static int option; - private static String t1=""; +import java.awt.event.*; +import javax.swing.*; + +public class Cauculater extends JFrame implements ActionListener{ + private String[] KEY= { "7", "8", "9", "/", "sqrt", "4", "5", "6", "*", "%", "1", "2", "3", "-", "1/x", "0", "+/-", ".", "+", "="}; + private String[] COM = {"Backspace", "CE", "C"}; + private String[] M = {" ", "MC", "MR", "MS", "M+"}; + private JButton key[] = new JButton[KEY.length]; + private JButton com[] = new JButton[COM.length]; + private JButton m[] = new JButton[M.length]; + private JTextField resultText = new JTextField("0"); + private boolean first = true; + private double resultNum = 0.0; + private String operator = "="; + private boolean operateFlag = true; - public static void main(String[] args) { - Cauculater window=new Cauculater(); - window.setSize(500,300); - window.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); - window.pack(); - window.setJMenuBar(menuBar); - window.setVisible(true); - } - public Cauculater(){ - JMenu fileItem=new JMenu("标准"); - JMenuItem card1=new JMenuItem("科学"); - JMenuItem card2=new JMenuItem("程序员"); - JMenu fileItem1=new JMenu("编辑"); - JMenu fileItem2=new JMenu("查看"); - JMenu fileItem3=new JMenu("帮助"); - menuBar.add(fileItem); - menuBar.add(fileItem1); - menuBar.add(fileItem2); - menuBar.add(fileItem3); - fileItem.add(card1); - fileItem.add(card2); + private JTextField text1= new JTextField(""); + private String storage = ""; + private double n = 0.0; + + JMenuBar menubar; + + + public Cauculater() { + super(); + init(); + setTitle("计算器"); + setLocation(100, 100); + pack(); + menubar=new JMenuBar(); + setJMenuBar(menubar); + + JMenu mnNewMenu = new JMenu("编辑"); + menubar.add(mnNewMenu); + + JMenu mnNewMenu_1 = new JMenu("查看"); + menubar.add(mnNewMenu_1); + + JMenu mnNewMenu_2 = new JMenu("帮助"); + menubar.add(mnNewMenu_2); - SouthPanel.setLayout(new GridLayout(2,1)); - CenterPanel.setLayout(new GridLayout(6,4)); - NorthPanel.setLayout(new GridLayout(1,6)); - CenterPanel.setPreferredSize(new Dimension(400,300)); - NorthPanel.setPreferredSize(new Dimension(50,50)); - addRom(com); - for(int i=0;i= 0) { + Number(label); + } + + else { + Operator(label); + } + + } + + + private void MC() { + storage=""; + text1.setText(null); + } + - }else if(e.getSource()==Key[9]){ - t1+="8"; - t+="8"; - textField.setText(t); + private void MR() { + + resultText.setText(storage); + } - }else if(e.getSource()==Key[10]){ - t1+="9"; - t+="9"; - textField.setText(t); - }else if(e.getSource()==Key[12]){ - t1+="4"; - t+="4"; - textField.setText(t); + private void MS() { + storage = resultText.getText(); + text1.setText("M"); + } - }else if(e.getSource()==Key[13]){ - t1+="5"; - t+="5"; - textField.setText(t); - }else if(e.getSource()==Key[14]){ - t1+="6"; - t+="6"; - textField.setText(t); + private void Madd() { + n=Double.parseDouble(storage); + n+=n; + String storage=""+n; + text1.setText("M"); + } - }else if(e.getSource()==Key[16]){ - t1+="1"; - t+="1"; - textField.setText(t); - } - else if(e.getSource()==Key[17]){ - t1+="2"; - t+="2"; - textField.setText(t); - } - else if(e.getSource()==Key[18]){ - t1+="3"; - t+="3"; - textField.setText(t); - } - else if(e.getSource()==Key[21]){ - t1+="0"; - t+="0"; - textField.setText(t); - } + + private void Operator(String key) { + if(operator.equals("/")) { + if(getNumberFromText() == 0.0) { + operateFlag = false; + resultText.setText("除数不能为零"); + } + else { + resultNum /= getNumberFromText(); + } + } + else if (operator.equals("1/x")) { + if (resultNum == 0.0) { + operateFlag = false; + resultText.setText("零没有倒数"); + } + else { + resultNum = 1 / resultNum; + } + } + else if (operator.equals("+")) { + resultNum += getNumberFromText(); + } + else if (operator.equals("-")) { + resultNum -= getNumberFromText(); + } + else if (operator.equals("*")) { + resultNum *= getNumberFromText(); + } + else if (operator.equals("sqrt")) { + resultNum = Math.sqrt(resultNum); + } + else if (operator.equals("%")) { + resultNum = resultNum / 100; + } + else if (operator.equals("+/-")) { + resultNum = resultNum * (-1); + } + else if (operator.equals("=")) { + resultNum = getNumberFromText(); + } + + if (operateFlag) { + long t1; + double t2; + t1 = (long) resultNum; + t2 = resultNum - t1; + if (t2 == 0) { + resultText.setText(String.valueOf(t1)); + } + else { + resultText.setText(String.valueOf(resultNum)); + } + } + operator = key; + first = true; + operateFlag = true; + + } + + private void Number(String key) { + if(first) { + resultText.setText(key); + } + else if ((key.equals(".")) && (resultText.getText().indexOf(".") < 0)) { + resultText.setText(resultText.getText() + "."); + } + else if (!key.equals(".")) { + resultText.setText(resultText.getText() + key); + } + first = false; + } + + + private void C() { + resultText.setText("0"); + first = true; + operator = "="; - if(e.getSource()==Key[0]){ - m=Double.parseDouble(textField.getText()); - textField.setText(""); - t=""; - t1+="%"; - textFieldUp.setText(t1); - option=2; - } - else if(e.getSource()==Key[23]){ - if(option==1){ - String N=textField.getText(); - n=Double.parseDouble(N); - result=m+n; - Result=""+result; - } - else if (option==2){ - n=Double.parseDouble(textField.getText()); - result=m%n; - Result=""+result; - } - else if(option==3){ - n=Double.parseDouble(textField.getText()); - result=m/n; - Result=""+result; - } - else if(option==4){ - n=Double.parseDouble(textField.getText()); - result=m*n; - Result=""+result; - } - else if(option==5){ - n=Double.parseDouble(textField.getText()); - result=m-n; - Result=""+result; - } - textField.setText(Result); - } - else if (e.getSource()==Key[1]){ - m=Double.parseDouble(textField.getText()); - textField.setText(""); - t=""; - result=Math.sqrt(m); - Result=""+result; - textFieldUp.setText(Result); - } - else if(e.getSource()==Key[2]){ - m=Double.parseDouble(textField.getText()); - textField.setText(""); - t=""; - result=m*m; - Result=""+result; - textFieldUp.setText(Result); - } - else if(e.getSource()==Key[3]) { - m=Double.parseDouble(textField.getText()); - textField.setText(""); - t=""; - result=1/m; - Result=""+result; - textFieldUp.setText(Result); - } - else if(e.getSource()==Key[4]){ - textField.setText(""); - t=""; - t1=""; - } - else if(e.getSource()==Key[5]){ - textField.setText(""); - t=""; - t1=""; - } - else if(e.getSource()==Key[6]){ - textField.setText(""); - t=""; - t1=""; - } - else if(e.getSource()==Key[7]){ - m=Double.parseDouble(textField.getText()); - t1+="/"; - textFieldUp.setText(t1); - textField.setText(""); - t=""; - option=3; - } - else if(e.getSource()==Key[11]){ - m=Double.parseDouble(textField.getText()); - t1+="*"; - textFieldUp.setText(t1); - textField.setText(""); - t=""; - option=4; - } - else if(e.getSource()==Key[15]){ - m=Double.parseDouble(textField.getText()); - t1+="-"; - textFieldUp.setText(t1); - textField.setText(""); - t=""; - option=5; - } - - else if(e.getSource()==Key[19]){ - m=Double.parseDouble(textField.getText()); - t1+="+"; - textFieldUp.setText(t1); - textField.setText(""); - t=""; - option=1; - } - else if(e.getSource()==Key[22]){ - t1+="."; - t+="."; - textField.setText(t); - } } + + + private void Backspace() { + String text = resultText.getText(); + int i =text.length(); + if(i>0) { + text =text.substring(0,i-1); + } + else if(i==0) { + resultText.setText("0"); + first = true; + operator = "="; + } + else { + resultText.setText(text); + } + } + + + private double getNumberFromText() { + double result = 0; + try { + result = Double.valueOf(resultText.getText()).doubleValue(); + } catch (NumberFormatException e) { + + } + return result; + } + + + public static void main(String[] args) { + Cauculater calculator = new Cauculater(); + calculator.setVisible(true); + calculator.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + } + } \ No newline at end of file -- Gitee From d9c5d2b299d54b43175286c72f9c016955909563 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=9F=E7=BE=BD=E5=8D=83=E6=A2=A6?= <鏄熺窘鍗冩ⅵ@LAPTOP-TB0O0H5M> Date: Thu, 10 Jun 2021 13:08:40 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=9E=8B=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E5=99=A8=E5=A4=A7=E8=87=B4=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/java2020spring/Cauculater.java | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/src/java2020spring/Cauculater.java b/src/java2020spring/Cauculater.java index 2842b95..ab6a063 100644 --- a/src/java2020spring/Cauculater.java +++ b/src/java2020spring/Cauculater.java @@ -32,16 +32,26 @@ public class Cauculater extends JFrame implements ActionListener{ setLocation(100, 100); pack(); menubar=new JMenuBar(); - setJMenuBar(menubar); + setJMenuBar(menubar); JMenu mnNewMenu = new JMenu("编辑"); menubar.add(mnNewMenu); + JMenuItem card1=new JMenuItem("复制"); + JMenuItem card2=new JMenuItem("粘贴"); + mnNewMenu.add(card1); + mnNewMenu.add(card2); JMenu mnNewMenu_1 = new JMenu("查看"); menubar.add(mnNewMenu_1); + JMenuItem card3=new JMenuItem("科学型"); + JMenuItem card4=new JMenuItem("标准型"); + mnNewMenu_1.add(card3); + mnNewMenu_1.add(card4); JMenu mnNewMenu_2 = new JMenu("帮助"); menubar.add(mnNewMenu_2); + JMenuItem card5=new JMenuItem("关于"); + mnNewMenu_2.add(card5); } @@ -108,6 +118,9 @@ public class Cauculater extends JFrame implements ActionListener{ else if (label.equals(COM[2])) { C(); } + else if (label.equals(M[0])) { + resultText.setText("祝你快乐！"); + } else if(label.equals(M[1])){ MC(); } @@ -151,9 +164,10 @@ public class Cauculater extends JFrame implements ActionListener{ private void Madd() { n=Double.parseDouble(storage); - n+=n; + double x=Double.parseDouble(resultText.getText()); + n=x+n; String storage=""+n; - text1.setText("M"); + text1.setText("M"); } @@ -244,7 +258,7 @@ public class Cauculater extends JFrame implements ActionListener{ if(i>0) { text =text.substring(0,i-1); } - else if(i==0) { + if(i==0) { resultText.setText("0"); first = true; operator = "="; @@ -268,8 +282,8 @@ public class Cauculater extends JFrame implements ActionListener{ public static void main(String[] args) { Cauculater calculator = new Cauculater(); - calculator.setVisible(true); - calculator.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + calculator.setVisible(true); + calculator.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); } } \ No newline at end of file -- Gitee