From 5634a9b9aeb7cd3fd679a6b792b7f2ac37f6a3c4 Mon Sep 17 00:00:00 2001
From: XJH040985927 <1759361294@qq.com>
Date: Tue, 31 May 2022 00:31:00 +0800
Subject: [PATCH 01/13] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=B8=80=E6=AC=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 readme.md                                  |  2 -
 src/java2022spring/ComputerWindowMenu.java | 45 ++++++++++++++++++++++
 src/java2022spring/Main.java               |  8 ++++
 src/java2022spring/Test.java               |  7 ----
 4 files changed, 53 insertions(+), 9 deletions(-)
 delete mode 100644 readme.md
 create mode 100644 src/java2022spring/ComputerWindowMenu.java
 create mode 100644 src/java2022spring/Main.java
 delete mode 100644 src/java2022spring/Test.java

diff --git a/readme.md b/readme.md
deleted file mode 100644
index 4af16ad..0000000
--- a/readme.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# 科学计算器
-0103 张三
\ No newline at end of file
diff --git a/src/java2022spring/ComputerWindowMenu.java b/src/java2022spring/ComputerWindowMenu.java
new file mode 100644
index 0000000..8c7441b
--- /dev/null
+++ b/src/java2022spring/ComputerWindowMenu.java
@@ -0,0 +1,45 @@
+package java2022spring;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.*;
+public class ComputerWindowMenu extends JFrame{
+	private static final long serialVersionUID = 1L;
+	JMenuBar menubar=new JMenuBar();
+	JMenu menu1=new JMenu("编辑(E)");
+	JMenu menu2=new JMenu("查找(Y)");
+	JMenu menu3=new JMenu("帮助(H)");
+	
+	public ComputerWindowMenu(int x,int y,int z,int h) {
+		setTitle("计算器");
+		init();
+		setLocation(x,y);
+		setSize(z,h);
+		setVisible(true);
+		setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+	
+	}	
+void init() {
+	this.menubar.add(menu2);
+	this.menubar.add(menu1);
+	this.menubar.add(menu3);
+	this.setJMenuBar(menubar);
+	JPanel panel1=new JPanel();
+	JPanel panel2=new JPanel();
+	JTextArea text=new JTextArea();
+	this.setLayout(new BorderLayout());
+	text.setPreferredSize(new Dimension (370,60));
+	panel1.add(text);
+	add(panel1,BorderLayout.NORTH);
+	panel2.setLayout(new FlowLayout());
+	panel2.setLayout(new GridLayout(5,4));
+	JButton button[]=new JButton[20];
+	String name[]= {"C","CE","%","÷","7","8","9","x","4","5","6","-","1","2","3","3","+","e","0",".","="};
+	int i;
+	for(i=0;i<=19;i++) {
+		button[i]=new JButton(name[i]);
+	}
+	for(i=0;i<=19;i++ )
+		panel2.add(button[i]);
+	add(panel2,BorderLayout.CENTER);
+}
+}
diff --git a/src/java2022spring/Main.java b/src/java2022spring/Main.java
new file mode 100644
index 0000000..b95d082
--- /dev/null
+++ b/src/java2022spring/Main.java
@@ -0,0 +1,8 @@
+package java2022spring;
+public class Main {
+	public static void main(String args[]) {
+		ComputerWindowMenu win1=new ComputerWindowMenu(100,100,400,400);
+	}
+
+}
+
diff --git a/src/java2022spring/Test.java b/src/java2022spring/Test.java
deleted file mode 100644
index 24deb29..0000000
--- a/src/java2022spring/Test.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package java2022spring;
-
-public class Test {
-	public static void main(String[] args) {
-		System.out.println("Hello world!");
-	}
-}
-- 
Gitee


From 8ce689f3805d6cc17fadfcc376da1cc339e4b6d9 Mon Sep 17 00:00:00 2001
From: XJH040985927 <1759361294@qq.com>
Date: Thu, 2 Jun 2022 23:48:12 +0800
Subject: [PATCH 02/13] =?UTF-8?q?=E6=94=B9=E4=B8=8B=E6=A1=86=E6=9E=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/java2022spring/Main.class               | Bin 0 -> 562 bytes
 bin/java2022spring/StandardCalculator.class | Bin 0 -> 2802 bytes
 src/java2022spring/ComputerWindowMenu.java  |  45 --------------------
 src/java2022spring/Main.java                |   2 +-
 4 files changed, 1 insertion(+), 46 deletions(-)
 create mode 100644 bin/java2022spring/Main.class
 create mode 100644 bin/java2022spring/StandardCalculator.class
 delete mode 100644 src/java2022spring/ComputerWindowMenu.java

diff --git a/bin/java2022spring/Main.class b/bin/java2022spring/Main.class
new file mode 100644
index 0000000000000000000000000000000000000000..632b8c8162506f1ce3584140724538e12b9d41ad
GIT binary patch
literal 562
zcmZvZOG^S#6vzM9*XU$9KFb~pX`?N&+*)mfAQ)?52+`{540dIliE*rtQP3i4*RGY+
zN+{?9^gYBrMRe{M1nDrGGyn6tzkBBM`|Sh3J~k8t7}8yS#Vb3NO8?RocBfqD!d4Js
z&}5=)af+R^x@OyBi0lblcn1u@VyVdxsyT+KB8XTVVMG`by0FdTL9b=Hr@UpE3@P1d
zbF0Z+A@y%C<Xwn9Lsp-2bd|>T2!SD2JogKx2n|otRZC3;Nru9|&W6WrgS$qJTkV0x
zJ;#kAO+4e5o5|zd*YIgFydOV2tI&{@tT~2!ad!F<J^sbG+abX8900<*7WOW~=70KG
z2D*#da0YJMJQQ*nF}d4qiH-tjiS!qM0DaN&$SS1D<Qe(!)(Fv8Kdq9LX<52JHa;yN
zzep;EB_t>!o9ko)<g@S4&QdAO(2OLzrFVpk{x?kZi$ciIxpH7`+Jt4Skjl`oJXXmv
JtdS02{Rc91e98a-

literal 0
HcmV?d00001

diff --git a/bin/java2022spring/StandardCalculator.class b/bin/java2022spring/StandardCalculator.class
new file mode 100644
index 0000000000000000000000000000000000000000..5a3e76e6aeaa01cc042f563b1d5c10b2f2805f37
GIT binary patch
literal 2802
zcmcImS$7mw5dNB(q%T7QNrx@$o0tsCkO4y2C4pct3E*IGK!wgs2Rck<Vo!$z1b4w5
zaYI}|Ru@2&OjOVZ&hdr+;A6l);G@fTZzp6R(c_CbXR7Mft*%>DU){R7`R9*616YM0
zbPUrlqt)7HMHfb+*>=}S?~cSgE1k65WQ~<dbfhdV<LU@%Fr`^nB-<%%HrBdUo2{cz
z!xX8HSe;(P-e;%1$l8SGWYYCc*0a;Lt3hwG(;dwgrE&FlxoDui+HzNDC}_)M_c$6#
z1{-j9xOCunc3Xvp@q;buxRY-c)e!XTE^m<WRw~!JwngK@b}MbC=x@y3{x(bXoqc-J
z7?oDX4^}#9$6Ku-P*&c=18Oo!JA?pA4UEM&9h2y4sN_PJh|=NEFx7w#p<}v+;z5Q2
zGkL_V3#WRo9}Qs|W=pU4X&76k!i%IV1&c&yMR}8ScfWz*2<a%N(I9uSA_8+YjJ|d9
zNbixuzg;?Y`_l2=6Bj}#!)*Ea0s|vp2rQ({?eoWaFP^(&Be$alM#9js_+Ib*B@AH^
zDrJyM30_%UogdUP1EVln2Mc(2v#7F$u-q@jY6C?mmghWR!1SeR10@*4XzHD`-PqCA
zY`a^n=9EoO^_hf~YO-8MuKSchZ;zAJFiVx^Ut5>4lnznFI{uY6g&0GffsL}(K?$%_
z)Ej7!d5y^0o;+K2v(#@guvzML>SN9U!mr_B12JsX5TdTh$vP_HVA*!xb(4W@cvQm#
z?yj?2td5jdlgec6P3^X;-15{ihQStNGUi~cxzWYne*O;dr^47}z>@I_I^F7cDPF=v
zA57{JR%hI#?bciSGaXE)8KpAL76ZGnhgXRo`CA$$^_4~5Twm8<rLEnz%NCPZwHnxq
z6g%EZCN+fftZOoD?U^+1`igQtX6a%;DUfDYG-h0Hk373w`gu}A`H&v+lHSzZYA5Kk
zNe9bOBHLPJRGZ3l_UGfue3qj{M`ymt2G>dUo9siS4wkD(Imo*@0tcDR!LEY>PgAIf
zbO}7mvepPZPb8|X#9o0HsaPs-n5;_RWwK=guaeCbc%5vqz?)=C1l}U66nL9#zQDU=
z6$0;*MFl<}TO{xySy<p>vV{Vlk}VK8Nw!MhbFzqzGks~?8LZVEo+lgbG-gY3-oOQX
z!J$DE?wzbN^C~*j>}4qhzT#x5Ay#q}2eKY%$&S3D$2>JvXw<9@=9Kog?+J+aXe1wo
z#NGz0U0p&Q7j<0bjkVOg-)y@r8Mn=5t4#Zcu-41xfiW?0-s{N&t&<<SZ^RoF%XGL2
zyVj92VEo`GX@Nu+GuU4N{t6)YpmD&GLQY1-IpP%OEK{7rNpVge#W{Nv=j0&|(hp}j
z>3FU#(WgefE8K$#;cJ)}@4@75Orba}ZqDeztZvNVqAYIGVqQ1q`-_NLRB*8<t{0W{
zU`aQsxLVHdS9W97fVd_c=*HSBJYyJYNW&`X(Tqc9oC1@XM>%zs9M$WX!6we+?HsT>
zxx0?`h94i+qn0Zf`vyODt(dVFQg`Tojy*g#hX=!xr{wTZcx-TNK@N@KU=CZtlpYyK
zY_%$T(SJy+7)d?|t$YexLej~U4iXTV>}o%uzGRsi;w**)=n!_$c9@bLqZClm<CKC*
zdV*2`B@X$%@|>kF?r9}5{+$G*nb;(Au)|l0&s9|A;A{)ah1r%vhQgX_aB1V^(BZH4
z#f9F3F0PBl{Dl4SfcaD`9yAZd;sxe2v3Q~RTr94eFT~=)d?^+$Dm0If>gFq?!hDT%
zxcLTY$UI6q!aPQ5nD3B|G~Xi~WgaITZJr=4GCv|MHa{UX&Cf_n%u}%jdG6^()k5b{
zHJ@Rvy@u2Ac~Xe>;A~8(qTw9Q$&me(N-R!`;4ZeFG%YGQ^Vcsj*EQys%vFLGP~GT*
zHi4xp<!e2W-8czzNEc%Y0hx;H{5RzWrsF2>;IEj8+n9ylF<ldUn@n0t(87M1`$5x6
z`arwRXYp%XBxpCVg*WXo&-{k=28R8Cn>w!O_;xYD`VLop$gqUF5@Kzjs|pqR<?5hu
T{$~F{-04P+R6~#Y@cX|3KYECM

literal 0
HcmV?d00001

diff --git a/src/java2022spring/ComputerWindowMenu.java b/src/java2022spring/ComputerWindowMenu.java
deleted file mode 100644
index 8c7441b..0000000
--- a/src/java2022spring/ComputerWindowMenu.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package java2022spring;
-import javax.swing.*;
-import java.awt.*;
-import java.awt.*;
-public class ComputerWindowMenu extends JFrame{
-	private static final long serialVersionUID = 1L;
-	JMenuBar menubar=new JMenuBar();
-	JMenu menu1=new JMenu("编辑(E)");
-	JMenu menu2=new JMenu("查找(Y)");
-	JMenu menu3=new JMenu("帮助(H)");
-	
-	public ComputerWindowMenu(int x,int y,int z,int h) {
-		setTitle("计算器");
-		init();
-		setLocation(x,y);
-		setSize(z,h);
-		setVisible(true);
-		setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
-	
-	}	
-void init() {
-	this.menubar.add(menu2);
-	this.menubar.add(menu1);
-	this.menubar.add(menu3);
-	this.setJMenuBar(menubar);
-	JPanel panel1=new JPanel();
-	JPanel panel2=new JPanel();
-	JTextArea text=new JTextArea();
-	this.setLayout(new BorderLayout());
-	text.setPreferredSize(new Dimension (370,60));
-	panel1.add(text);
-	add(panel1,BorderLayout.NORTH);
-	panel2.setLayout(new FlowLayout());
-	panel2.setLayout(new GridLayout(5,4));
-	JButton button[]=new JButton[20];
-	String name[]= {"C","CE","%","÷","7","8","9","x","4","5","6","-","1","2","3","3","+","e","0",".","="};
-	int i;
-	for(i=0;i<=19;i++) {
-		button[i]=new JButton(name[i]);
-	}
-	for(i=0;i<=19;i++ )
-		panel2.add(button[i]);
-	add(panel2,BorderLayout.CENTER);
-}
-}
diff --git a/src/java2022spring/Main.java b/src/java2022spring/Main.java
index b95d082..7d87196 100644
--- a/src/java2022spring/Main.java
+++ b/src/java2022spring/Main.java
@@ -1,7 +1,7 @@
 package java2022spring;
 public class Main {
 	public static void main(String args[]) {
-		ComputerWindowMenu win1=new ComputerWindowMenu(100,100,400,400);
+		StandardCalculator win1=new StandardCalculator("小皓计算器",100,100,400,400);
 	}
 
 }
-- 
Gitee


From 55f7a1590dd520f0285b0b0ec4a451720f7d5057 Mon Sep 17 00:00:00 2001
From: XJH040985927 <1759361294@qq.com>
Date: Sat, 4 Jun 2022 01:03:27 +0800
Subject: [PATCH 03/13] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=A7=91=E5=AD=A6?=
 =?UTF-8?q?=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/java2022spring/StandardCalculator.class  | Bin 2802 -> 4759 bytes
 src/java2022spring/ScientificCalculator.java |   5 +
 src/java2022spring/StandardCalculator.java   |  97 +++++++++++++++++++
 3 files changed, 102 insertions(+)
 create mode 100644 src/java2022spring/ScientificCalculator.java
 create mode 100644 src/java2022spring/StandardCalculator.java

diff --git a/bin/java2022spring/StandardCalculator.class b/bin/java2022spring/StandardCalculator.class
index 5a3e76e6aeaa01cc042f563b1d5c10b2f2805f37..fc34af9ffb81bd6628707b705f9cfcbf78820fe7 100644
GIT binary patch
literal 4759
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

literal 2802
zcmcImS$7mw5dNB(q%T7QNrx@$o0tsCkO4y2C4pct3E*IGK!wgs2Rck<Vo!$z1b4w5
zaYI}|Ru@2&OjOVZ&hdr+;A6l);G@fTZzp6R(c_CbXR7Mft*%>DU){R7`R9*616YM0
zbPUrlqt)7HMHfb+*>=}S?~cSgE1k65WQ~<dbfhdV<LU@%Fr`^nB-<%%HrBdUo2{cz
z!xX8HSe;(P-e;%1$l8SGWYYCc*0a;Lt3hwG(;dwgrE&FlxoDui+HzNDC}_)M_c$6#
z1{-j9xOCunc3Xvp@q;buxRY-c)e!XTE^m<WRw~!JwngK@b}MbC=x@y3{x(bXoqc-J
z7?oDX4^}#9$6Ku-P*&c=18Oo!JA?pA4UEM&9h2y4sN_PJh|=NEFx7w#p<}v+;z5Q2
zGkL_V3#WRo9}Qs|W=pU4X&76k!i%IV1&c&yMR}8ScfWz*2<a%N(I9uSA_8+YjJ|d9
zNbixuzg;?Y`_l2=6Bj}#!)*Ea0s|vp2rQ({?eoWaFP^(&Be$alM#9js_+Ib*B@AH^
zDrJyM30_%UogdUP1EVln2Mc(2v#7F$u-q@jY6C?mmghWR!1SeR10@*4XzHD`-PqCA
zY`a^n=9EoO^_hf~YO-8MuKSchZ;zAJFiVx^Ut5>4lnznFI{uY6g&0GffsL}(K?$%_
z)Ej7!d5y^0o;+K2v(#@guvzML>SN9U!mr_B12JsX5TdTh$vP_HVA*!xb(4W@cvQm#
z?yj?2td5jdlgec6P3^X;-15{ihQStNGUi~cxzWYne*O;dr^47}z>@I_I^F7cDPF=v
zA57{JR%hI#?bciSGaXE)8KpAL76ZGnhgXRo`CA$$^_4~5Twm8<rLEnz%NCPZwHnxq
z6g%EZCN+fftZOoD?U^+1`igQtX6a%;DUfDYG-h0Hk373w`gu}A`H&v+lHSzZYA5Kk
zNe9bOBHLPJRGZ3l_UGfue3qj{M`ymt2G>dUo9siS4wkD(Imo*@0tcDR!LEY>PgAIf
zbO}7mvepPZPb8|X#9o0HsaPs-n5;_RWwK=guaeCbc%5vqz?)=C1l}U66nL9#zQDU=
z6$0;*MFl<}TO{xySy<p>vV{Vlk}VK8Nw!MhbFzqzGks~?8LZVEo+lgbG-gY3-oOQX
z!J$DE?wzbN^C~*j>}4qhzT#x5Ay#q}2eKY%$&S3D$2>JvXw<9@=9Kog?+J+aXe1wo
z#NGz0U0p&Q7j<0bjkVOg-)y@r8Mn=5t4#Zcu-41xfiW?0-s{N&t&<<SZ^RoF%XGL2
zyVj92VEo`GX@Nu+GuU4N{t6)YpmD&GLQY1-IpP%OEK{7rNpVge#W{Nv=j0&|(hp}j
z>3FU#(WgefE8K$#;cJ)}@4@75Orba}ZqDeztZvNVqAYIGVqQ1q`-_NLRB*8<t{0W{
zU`aQsxLVHdS9W97fVd_c=*HSBJYyJYNW&`X(Tqc9oC1@XM>%zs9M$WX!6we+?HsT>
zxx0?`h94i+qn0Zf`vyODt(dVFQg`Tojy*g#hX=!xr{wTZcx-TNK@N@KU=CZtlpYyK
zY_%$T(SJy+7)d?|t$YexLej~U4iXTV>}o%uzGRsi;w**)=n!_$c9@bLqZClm<CKC*
zdV*2`B@X$%@|>kF?r9}5{+$G*nb;(Au)|l0&s9|A;A{)ah1r%vhQgX_aB1V^(BZH4
z#f9F3F0PBl{Dl4SfcaD`9yAZd;sxe2v3Q~RTr94eFT~=)d?^+$Dm0If>gFq?!hDT%
zxcLTY$UI6q!aPQ5nD3B|G~Xi~WgaITZJr=4GCv|MHa{UX&Cf_n%u}%jdG6^()k5b{
zHJ@Rvy@u2Ac~Xe>;A~8(qTw9Q$&me(N-R!`;4ZeFG%YGQ^Vcsj*EQys%vFLGP~GT*
zHi4xp<!e2W-8czzNEc%Y0hx;H{5RzWrsF2>;IEj8+n9ylF<ldUn@n0t(87M1`$5x6
z`arwRXYp%XBxpCVg*WXo&-{k=28R8Cn>w!O_;xYD`VLop$gqUF5@Kzjs|pqR<?5hu
T{$~F{-04P+R6~#Y@cX|3KYECM

diff --git a/src/java2022spring/ScientificCalculator.java b/src/java2022spring/ScientificCalculator.java
new file mode 100644
index 0000000..9dee9da
--- /dev/null
+++ b/src/java2022spring/ScientificCalculator.java
@@ -0,0 +1,5 @@
+package java2022spring;
+
+public class ScientificCalculator {
+
+}
diff --git a/src/java2022spring/StandardCalculator.java b/src/java2022spring/StandardCalculator.java
new file mode 100644
index 0000000..33a0902
--- /dev/null
+++ b/src/java2022spring/StandardCalculator.java
@@ -0,0 +1,97 @@
+package java2022spring;
+import javax.swing.*;
+import java.text.DecimalFormat;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+public class StandardCalculator extends JFrame implements ActionListener{
+	JMenuBar menubar=new JMenuBar();
+	JMenu moshi=new JMenu("模式");
+	JMenuItem menuitem1=new JMenuItem("标准计算器");
+	JMenuItem menuitem2=new JMenuItem("科学计算器");
+	JTextField text=new JTextField();
+	JPanel panel1=new JPanel();
+	JPanel panel2=new JPanel();
+	int i=0;
+	boolean first;
+	double result;
+	String operator = "=";
+	public StandardCalculator(){}
+		public StandardCalculator(String s,int x,int y,int z,int n) {
+			init(s);
+			setLocation(x,y);
+			setSize(z,n);
+			setVisible(true);
+			setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+		}
+		void init( String s) {
+			setTitle(s);
+			this.setJMenuBar(menubar);
+			menubar.add(moshi);
+			moshi.setFont(new Font("楷体", Font.BOLD, 20));
+			moshi.add(menuitem1);
+			moshi.add(menuitem2);
+			this.setLayout(new BorderLayout());
+			text.setHorizontalAlignment(JTextField.RIGHT); //
+			panel1.add(text);
+			text.setPreferredSize(new Dimension (370,60));
+			this.add(panel1,BorderLayout.NORTH);
+			panel2.setLayout(new FlowLayout());
+			panel2.setLayout(new GridLayout(5,4,2,2));// 用网格布局器，4行，4列的网格，网格之间的水平方向垂直方向间隔均为2个像素
+			String str[]= {"|x|","1/x","C","←","7","8","9","+","4","5","6","-","1","2","3","*","0",".","=","/"};
+			JButton button[]=new JButton[20];
+			for(i=0;i<=19;i++) {
+				button[i]=new JButton(str[i]);
+				button[i].setFont(new Font("楷体", Font.BOLD, 20));
+				button[i].setBorderPainted(false); //字体
+				button[i].addActionListener(this);//取消边界
+				panel2.add(button[i]);
+			}
+			add(panel2,BorderLayout.CENTER);
+			button[18].setBackground(Color.gray);
+		}
+	public void actionPerformed(ActionEvent e) {
+		String str=e.getActionCommand();
+		if(str.equals("←")) {
+			String str0=text.getText();
+			int i=str0.length();
+			if(i>0) {
+				if(i>1) {
+					str0= str0.substring(0, i-1);
+					text.setText(str0);
+				}
+				else
+				text.setText("0");
+				first = true;
+				operator = "=";
+			}
+			}
+		else if(str.equals("C")){
+			text.setText("0");
+			first = true;
+			operator = "=";
+		}
+		else if("0123456789.".indexOf(str) >= 0){
+			 if (first) {
+		            text.setText(str);
+		        } else if((str.equals(".")) && (text.getText().indexOf(".")<0)){
+		        	text.setText(text.getText() + ".");
+		        }
+		        else if (!str.equals(".")){
+		           text.setText(text.getText()+str);
+		        }
+		        	first=false;
+		}
+		else if(str.equals("|x|")||str.equals("1/x")){
+			if(str.equals("1/x")) {
+				result = Double.valueOf(text.getText()).doubleValue();
+				if(result== 0) {
+	                text.setText("错误");
+	            } else {
+	                result=1/result;
+	            }
+			}
+	}
+}
+}
+			
\ No newline at end of file
-- 
Gitee


From 8051c1692c0a09eb25de1660f9b8b5ed84267be1 Mon Sep 17 00:00:00 2001
From: XJH040985927 <1759361294@qq.com>
Date: Sun, 5 Jun 2022 13:35:38 +0800
Subject: [PATCH 04/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/java2022spring/StandardCalculator.java | 81 ++++++++++++++++++----
 1 file changed, 68 insertions(+), 13 deletions(-)

diff --git a/src/java2022spring/StandardCalculator.java b/src/java2022spring/StandardCalculator.java
index 33a0902..bc9aa80 100644
--- a/src/java2022spring/StandardCalculator.java
+++ b/src/java2022spring/StandardCalculator.java
@@ -1,6 +1,5 @@
 package java2022spring;
 import javax.swing.*;
-import java.text.DecimalFormat;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -15,7 +14,8 @@ public class StandardCalculator extends JFrame implements ActionListener{
 	int i=0;
 	boolean first;
 	double result;
-	String operator = "=";
+	String operator="=";
+	boolean operate;
 	public StandardCalculator(){}
 		public StandardCalculator(String s,int x,int y,int z,int n) {
 			init(s);
@@ -49,6 +49,12 @@ public class StandardCalculator extends JFrame implements ActionListener{
 			}
 			add(panel2,BorderLayout.CENTER);
 			button[18].setBackground(Color.gray);
+			menuitem2.addActionListener(new ActionListener() {
+				public void actionPerformed(ActionEvent arg0) {
+					StandardCalculator science = new StandardCalculator();
+					science.setVisible(true);
+					}
+		});
 		}
 	public void actionPerformed(ActionEvent e) {
 		String str=e.getActionCommand();
@@ -63,7 +69,7 @@ public class StandardCalculator extends JFrame implements ActionListener{
 				else
 				text.setText("0");
 				first = true;
-				operator = "=";
+			
 			}
 			}
 		else if(str.equals("C")){
@@ -81,17 +87,66 @@ public class StandardCalculator extends JFrame implements ActionListener{
 		           text.setText(text.getText()+str);
 		        }
 		        	first=false;
+		        	}
+		else
+			Operator(str);
+	}
+	private void Operator(String str) {
+		if (operator.equals("/")) {
+			if (getNumber() == 0.0) {
+				operate = false;
+				text.setText("错误:除数不能为零");
+			}
+			else 
+				result/= getNumber();
+		} 
+		else if (operator.equals("1/x")) {
+			if (result == 0.0) {
+				operate = false;
+				text.setText("零没有倒数");
+			}
+			else
+				result= 1 / result;
+			}
+		else if (operator.equals("+")) {
+			result+= getNumber();
+		}
+		else if (operator.equals("-")) {
+			result -= getNumber();
+		}
+		else if (operator.equals("*")) {
+			result *= getNumber();
 		}
-		else if(str.equals("|x|")||str.equals("1/x")){
-			if(str.equals("1/x")) {
-				result = Double.valueOf(text.getText()).doubleValue();
-				if(result== 0) {
-	                text.setText("错误");
-	            } else {
-	                result=1/result;
-	            }
+		else if (operator.equals("|x|")) {
+			result = Math.abs(result);
+		}
+		else if (operator.equals("=")) {
+			result= getNumber();
+		}
+		if (operate) {
+			long t1;
+			double t2;
+			t1 = (long) result;
+			t2 = result- t1;
+			if (t2 == 0) {
+				text.setText(String.valueOf(t1));
+			}
+			else {
+				text.setText(String.valueOf(result));
 			}
+		}
+		operator =str;
+		first= true;
+		operate= true;
 	}
+
+	public double getNumber() {
+		double result0= 0;
+		try {
+			result0= Double.valueOf(text.getText()).doubleValue();
+		} catch (NumberFormatException e) {}
+		return result0;
+	}
+	
 }
-}
-			
\ No newline at end of file
+			
-- 
Gitee


From e515df1a4c1a2b879f1d7252d3a0ee3ad813c9fb Mon Sep 17 00:00:00 2001
From: XJH040985927 <1759361294@qq.com>
Date: Sun, 5 Jun 2022 22:17:17 +0800
Subject: [PATCH 05/13] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=A7=91=E5=AD=A6?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=E5=99=A8=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/java2022spring/StandardCalculator.class  | Bin 4759 -> 5810 bytes
 src/java2022spring/Main2.java                |   5 +++
 src/java2022spring/ScientificCalculator.java |  40 +++++++++++++++++--
 3 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 src/java2022spring/Main2.java

diff --git a/bin/java2022spring/StandardCalculator.class b/bin/java2022spring/StandardCalculator.class
index fc34af9ffb81bd6628707b705f9cfcbf78820fe7..bfc18903aaa5e56652231f0d4ba220bb62c34e5f 100644
GIT binary patch
literal 5810
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

literal 4759
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

diff --git a/src/java2022spring/Main2.java b/src/java2022spring/Main2.java
new file mode 100644
index 0000000..8014c80
--- /dev/null
+++ b/src/java2022spring/Main2.java
@@ -0,0 +1,5 @@
+package java2022spring;
+
+public class Main2 {
+
+}
diff --git a/src/java2022spring/ScientificCalculator.java b/src/java2022spring/ScientificCalculator.java
index 9dee9da..4645267 100644
--- a/src/java2022spring/ScientificCalculator.java
+++ b/src/java2022spring/ScientificCalculator.java
@@ -1,5 +1,39 @@
 package java2022spring;
-
-public class ScientificCalculator {
-
+import java.awt.*;
+import java.awt.event.*;
+import javax.swing.*;
+public class ScientificCalculator extends JFrame{
+	JMenuBar menubar=new JMenuBar();
+	JMenu moshi=new JMenu("模式");
+	JMenuItem menuitem1=new JMenuItem("标准计算器");
+	JMenuItem menuitem2=new JMenuItem("科学计算器");
+	JTextField text=new JTextField();
+	JPanel panel1=new JPanel();
+	JPanel panel2=new JPanel();
+	int i=0;
+	boolean first;
+	double result;
+	String operator="=";
+	boolean operate;
+	public ScientificCalculator(String s,int x,int y,int z,int n) {
+		init(s);
+		this.setLocation(x,y);
+		setSize(z,n);
+		setVisible(true);
+		setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+	}
+	void init(String s) {
+		setTitle(s);
+		menubar.add(moshi);
+		moshi.setFont(new Font("楷体", Font.BOLD, 20));
+		moshi.add(menuitem1);
+		moshi.add(menuitem2);
+		this.setLayout(new BorderLayout());
+		text.setHorizontalAlignment(JTextField.RIGHT);
+		panel1.add(text);
+		text.setPreferredSize(new Dimension (370,60));
+		this.add(panel1,BorderLayout.NORTH);
+		panel2.setLayout(new FlowLayout());
+	}
+	
 }
-- 
Gitee


From f6ed0cbbcce7bb260f005fbe529c3f74cd534b1e Mon Sep 17 00:00:00 2001
From: XJH040985927 <1759361294@qq.com>
Date: Mon, 6 Jun 2022 18:45:02 +0800
Subject: [PATCH 06/13] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E7=A7=91?=
 =?UTF-8?q?=E5=AD=A6=E8=AE=A1=E7=AE=97=E5=99=A8=E7=AA=97=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/java2022spring/ScientificCalculator.java | 18 +++++++++++++++---
 src/java2022spring/{Main2.java => m.java}    |  0
 2 files changed, 15 insertions(+), 3 deletions(-)
 rename src/java2022spring/{Main2.java => m.java} (100%)

diff --git a/src/java2022spring/ScientificCalculator.java b/src/java2022spring/ScientificCalculator.java
index 4645267..a980352 100644
--- a/src/java2022spring/ScientificCalculator.java
+++ b/src/java2022spring/ScientificCalculator.java
@@ -2,7 +2,7 @@ package java2022spring;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
-public class ScientificCalculator extends JFrame{
+public class ScientificCalculator extends JFrame implements ActionListener{
 	JMenuBar menubar=new JMenuBar();
 	JMenu moshi=new JMenu("模式");
 	JMenuItem menuitem1=new JMenuItem("标准计算器");
@@ -29,11 +29,23 @@ public class ScientificCalculator extends JFrame{
 		moshi.add(menuitem1);
 		moshi.add(menuitem2);
 		this.setLayout(new BorderLayout());
-		text.setHorizontalAlignment(JTextField.RIGHT);
 		panel1.add(text);
-		text.setPreferredSize(new Dimension (370,60));
 		this.add(panel1,BorderLayout.NORTH);
+		text.setHorizontalAlignment(JTextField.RIGHT);
+		text.setPreferredSize(new Dimension (370,60));
 		panel2.setLayout(new FlowLayout());
+		JButton button1[]=new JButton[20];
+		String str0[]= {"|x|","1/x","C","←","7","8","9","+","4","5","6","-","1","2","3","*","0",".","=","/"};
+		String str1[]= {};
+		JButton button2[]=new JButton[str1.length];
+		for(i=0;i<=20;i++) {
+			button1[i].setFont(new Font("楷体", Font.BOLD, 20));
+			button1[i].setBorderPainted(false); //字体
+			button1[i].addActionListener(this);//取消边界
+			panel2.add(button1[i]);
+		}
+		add(panel2,BorderLayout.CENTER);
+		button1[18].setBackground(Color.gray);
 	}
 	
 }
diff --git a/src/java2022spring/Main2.java b/src/java2022spring/m.java
similarity index 100%
rename from src/java2022spring/Main2.java
rename to src/java2022spring/m.java
-- 
Gitee


From 297595c1c7007a1bd39977289924373f05e5c615 Mon Sep 17 00:00:00 2001
From: XJH040985927 <1759361294@qq.com>
Date: Mon, 6 Jun 2022 20:55:04 +0800
Subject: [PATCH 07/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E4=B8=8B=20?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E7=A7=91=E5=AD=A6=E8=AE=A1=E7=AE=97=E5=99=A8?=
 =?UTF-8?q?=E7=AA=97=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/java2022spring/Main.class                | Bin 562 -> 568 bytes
 src/java2022spring/Main.java                 |   2 +-
 src/java2022spring/ScientificCalculator.java |  10 +++++++++-
 src/java2022spring/m.java                    |   5 -----
 4 files changed, 10 insertions(+), 7 deletions(-)
 delete mode 100644 src/java2022spring/m.java

diff --git a/bin/java2022spring/Main.class b/bin/java2022spring/Main.class
index 632b8c8162506f1ce3584140724538e12b9d41ad..ac719d2f1aac118a881ca9753c7470a34b172af8 100644
GIT binary patch
delta 24
gcmdnQvV&#9YhKZ(8~UHmn*3}*`_uNejh`GC0iO5`D*ylh

delta 18
acmdnNvWaEFYj*yp8~UHmn!NFc10w)a{Rt)j

diff --git a/src/java2022spring/Main.java b/src/java2022spring/Main.java
index 7d87196..f1b3bd6 100644
--- a/src/java2022spring/Main.java
+++ b/src/java2022spring/Main.java
@@ -1,7 +1,7 @@
 package java2022spring;
 public class Main {
 	public static void main(String args[]) {
-		StandardCalculator win1=new StandardCalculator("小皓计算器",100,100,400,400);
+		StandardCalculator win1=new StandardCalculator("小皓标准计算器",100,100,400,400);
 	}
 
 }
diff --git a/src/java2022spring/ScientificCalculator.java b/src/java2022spring/ScientificCalculator.java
index a980352..b12e8fe 100644
--- a/src/java2022spring/ScientificCalculator.java
+++ b/src/java2022spring/ScientificCalculator.java
@@ -39,6 +39,7 @@ public class ScientificCalculator extends JFrame implements ActionListener{
 		String str1[]= {};
 		JButton button2[]=new JButton[str1.length];
 		for(i=0;i<=20;i++) {
+			button1[i]=new JButton(str0[i]);
 			button1[i].setFont(new Font("楷体", Font.BOLD, 20));
 			button1[i].setBorderPainted(false); //字体
 			button1[i].addActionListener(this);//取消边界
@@ -46,6 +47,13 @@ public class ScientificCalculator extends JFrame implements ActionListener{
 		}
 		add(panel2,BorderLayout.CENTER);
 		button1[18].setBackground(Color.gray);
+		menuitem1.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent arg0) {
+				StandardCalculator win1= new StandardCalculator();
+				win1.setVisible(true);
 	}
-	
+		});
+		}
 }
+
+	
\ No newline at end of file
diff --git a/src/java2022spring/m.java b/src/java2022spring/m.java
deleted file mode 100644
index 8014c80..0000000
--- a/src/java2022spring/m.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package java2022spring;
-
-public class Main2 {
-
-}
-- 
Gitee


From cfbcc7eaecc79579daaffc9ba3b89415b58876df Mon Sep 17 00:00:00 2001
From: XJH040985927 <1759361294@qq.com>
Date: Mon, 6 Jun 2022 21:05:12 +0800
Subject: [PATCH 08/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/java2022spring/0.txt                     | 0
 src/java2022spring/ScientificCalculator.java | 9 ++++++---
 src/java2022spring/StandardCalculator.java   | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 src/java2022spring/0.txt

diff --git a/src/java2022spring/0.txt b/src/java2022spring/0.txt
new file mode 100644
index 0000000..e69de29
diff --git a/src/java2022spring/ScientificCalculator.java b/src/java2022spring/ScientificCalculator.java
index b12e8fe..7785d67 100644
--- a/src/java2022spring/ScientificCalculator.java
+++ b/src/java2022spring/ScientificCalculator.java
@@ -34,11 +34,10 @@ public class ScientificCalculator extends JFrame implements ActionListener{
 		text.setHorizontalAlignment(JTextField.RIGHT);
 		text.setPreferredSize(new Dimension (370,60));
 		panel2.setLayout(new FlowLayout());
+		panel2.setLayout(new GridLayout(5, 4, 2, 2));
 		JButton button1[]=new JButton[20];
 		String str0[]= {"|x|","1/x","C","←","7","8","9","+","4","5","6","-","1","2","3","*","0",".","=","/"};
-		String str1[]= {};
-		JButton button2[]=new JButton[str1.length];
-		for(i=0;i<=20;i++) {
+		for(i=0;i<=19;i++) {
 			button1[i]=new JButton(str0[i]);
 			button1[i].setFont(new Font("楷体", Font.BOLD, 20));
 			button1[i].setBorderPainted(false); //字体
@@ -54,6 +53,10 @@ public class ScientificCalculator extends JFrame implements ActionListener{
 	}
 		});
 		}
+	public void actionPerformed(ActionEvent e) {
+		
+		
+	}
 }
 
 	
\ No newline at end of file
diff --git a/src/java2022spring/StandardCalculator.java b/src/java2022spring/StandardCalculator.java
index bc9aa80..f869f90 100644
--- a/src/java2022spring/StandardCalculator.java
+++ b/src/java2022spring/StandardCalculator.java
@@ -51,7 +51,7 @@ public class StandardCalculator extends JFrame implements ActionListener{
 			button[18].setBackground(Color.gray);
 			menuitem2.addActionListener(new ActionListener() {
 				public void actionPerformed(ActionEvent arg0) {
-					StandardCalculator science = new StandardCalculator();
+				ScientificCalculator science = new ScientificCalculator("小皓科学计算器",100,100,400,400);
 					science.setVisible(true);
 					}
 		});
-- 
Gitee


From 79b4f7bf5e91d79c324d9484ae1c619b81d8c54d Mon Sep 17 00:00:00 2001
From: XJH040985927 <1759361294@qq.com>
Date: Tue, 7 Jun 2022 19:08:24 +0800
Subject: [PATCH 09/13] =?UTF-8?q?=E7=A7=91=E5=AD=A6=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E5=99=A8=E7=AA=97=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/java2022spring/Main.class                | Bin 568 -> 570 bytes
 bin/java2022spring/StandardCalculator.class  | Bin 5810 -> 5917 bytes
 src/java2022spring/{0.txt => 1.txt}          |   0
 src/java2022spring/Main.java                 |   2 +-
 src/java2022spring/ScientificCalculator.java |  30 +++++++++++--------
 src/java2022spring/StandardCalculator.java   |   8 +++--
 6 files changed, 23 insertions(+), 17 deletions(-)
 rename src/java2022spring/{0.txt => 1.txt} (100%)

diff --git a/bin/java2022spring/Main.class b/bin/java2022spring/Main.class
index ac719d2f1aac118a881ca9753c7470a34b172af8..ed928912fe2251829519693975c49e9e911bfa0a 100644
GIT binary patch
delta 98
zcmdnNvWsQI1I8$S26hG}1_lQ4-3$VeLPCO!Uj!L-1R3K5nbfv3i1=&-N-;5T0ZA^f
jG8P6g237`cAYTlkjX|720?cD%kYtczU<5*GupSuz-4_Y>

delta 96
zcmdnRvV&#A1I7qn26hG}1_lPv-3$VeLP7#50x5!w6M$$tgNV;Ypac^G7m(xvD`H^~
iVPIw82J*!qni#|xB!D~-21W)+1}PxP$RG{YBLe{34hkv&

diff --git a/bin/java2022spring/StandardCalculator.class b/bin/java2022spring/StandardCalculator.class
index bfc18903aaa5e56652231f0d4ba220bb62c34e5f..b0fc308da9489e533a9ac2cd1966064141cf1f55 100644
GIT binary patch
delta 2720
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

delta 2597
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

diff --git a/src/java2022spring/0.txt b/src/java2022spring/1.txt
similarity index 100%
rename from src/java2022spring/0.txt
rename to src/java2022spring/1.txt
diff --git a/src/java2022spring/Main.java b/src/java2022spring/Main.java
index f1b3bd6..7610ab0 100644
--- a/src/java2022spring/Main.java
+++ b/src/java2022spring/Main.java
@@ -1,7 +1,7 @@
 package java2022spring;
 public class Main {
 	public static void main(String args[]) {
-		StandardCalculator win1=new StandardCalculator("小皓标准计算器",100,100,400,400);
+		StandardCalculator win1=new StandardCalculator("小皓标准计算器",500,300,350,550);
 	}
 
 }
diff --git a/src/java2022spring/ScientificCalculator.java b/src/java2022spring/ScientificCalculator.java
index 7785d67..a19fc76 100644
--- a/src/java2022spring/ScientificCalculator.java
+++ b/src/java2022spring/ScientificCalculator.java
@@ -4,9 +4,9 @@ import java.awt.event.*;
 import javax.swing.*;
 public class ScientificCalculator extends JFrame implements ActionListener{
 	JMenuBar menubar=new JMenuBar();
-	JMenu moshi=new JMenu("模式");
-	JMenuItem menuitem1=new JMenuItem("标准计算器");
-	JMenuItem menuitem2=new JMenuItem("科学计算器");
+	JMenu moshi=new JMenu("妯″紡");
+	JMenuItem menuitem1=new JMenuItem("鏍囧噯璁＄畻鍣�");
+	JMenuItem menuitem2=new JMenuItem("绉戝璁＄畻鍣�");
 	JTextField text=new JTextField();
 	JPanel panel1=new JPanel();
 	JPanel panel2=new JPanel();
@@ -25,27 +25,31 @@ public class ScientificCalculator extends JFrame implements ActionListener{
 	void init(String s) {
 		setTitle(s);
 		menubar.add(moshi);
-		moshi.setFont(new Font("楷体", Font.BOLD, 20));
+		moshi.setFont(new Font("妤蜂綋", Font.BOLD, 20));
 		moshi.add(menuitem1);
 		moshi.add(menuitem2);
 		this.setLayout(new BorderLayout());
 		panel1.add(text);
 		this.add(panel1,BorderLayout.NORTH);
 		text.setHorizontalAlignment(JTextField.RIGHT);
-		text.setPreferredSize(new Dimension (370,60));
+		text.setPreferredSize(new Dimension (340,70));
+		text.setFont(new Font("榛戜綋", Font.BOLD, 40));
+		panel1.add(text);
 		panel2.setLayout(new FlowLayout());
-		panel2.setLayout(new GridLayout(5, 4, 2, 2));
-		JButton button1[]=new JButton[20];
-		String str0[]= {"|x|","1/x","C","←","7","8","9","+","4","5","6","-","1","2","3","*","0",".","=","/"};
-		for(i=0;i<=19;i++) {
+		panel2.setLayout(new GridLayout(9, 4, 2, 2));
+		JButton button1[]=new JButton[36];
+		String str0[]= {"sin","cos","tan","x^2","x^3","x^y","蟺","e","e^x","sqrt","rt","x!","ln","lg","%","10^X","|x|","1/x","C","鈫�","7","8","9","+","4","5","6","-","1","2","3","*","0",".","=","/"};
+		String str1[]= {};
+		JButton button2[]=new JButton[15];
+		for(i=0;i<36;i++) {
 			button1[i]=new JButton(str0[i]);
-			button1[i].setFont(new Font("楷体", Font.BOLD, 20));
-			button1[i].setBorderPainted(false); //字体
-			button1[i].addActionListener(this);//取消边界
+			button1[i].setFont(new Font("妤蜂綋", Font.BOLD, 20));
+			button1[i].setBorderPainted(false); //瀛椾綋
+			button1[i].addActionListener(this);//鍙栨秷杈圭晫
 			panel2.add(button1[i]);
 		}
 		add(panel2,BorderLayout.CENTER);
-		button1[18].setBackground(Color.gray);
+		button1[34].setBackground(Color.gray);
 		menuitem1.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent arg0) {
 				StandardCalculator win1= new StandardCalculator();
diff --git a/src/java2022spring/StandardCalculator.java b/src/java2022spring/StandardCalculator.java
index f869f90..157c037 100644
--- a/src/java2022spring/StandardCalculator.java
+++ b/src/java2022spring/StandardCalculator.java
@@ -32,9 +32,11 @@ public class StandardCalculator extends JFrame implements ActionListener{
 			moshi.add(menuitem1);
 			moshi.add(menuitem2);
 			this.setLayout(new BorderLayout());
-			text.setHorizontalAlignment(JTextField.RIGHT); //
+			text.setHorizontalAlignment(JTextField.RIGHT); 
+			text.setPreferredSize(new Dimension (340,70));
+			text.setFont(new Font("黑体", Font.BOLD, 40));
 			panel1.add(text);
-			text.setPreferredSize(new Dimension (370,60));
+	        text.setBorder(null);  //删除文本框的边框
 			this.add(panel1,BorderLayout.NORTH);
 			panel2.setLayout(new FlowLayout());
 			panel2.setLayout(new GridLayout(5,4,2,2));// 用网格布局器，4行，4列的网格，网格之间的水平方向垂直方向间隔均为2个像素
@@ -51,7 +53,7 @@ public class StandardCalculator extends JFrame implements ActionListener{
 			button[18].setBackground(Color.gray);
 			menuitem2.addActionListener(new ActionListener() {
 				public void actionPerformed(ActionEvent arg0) {
-				ScientificCalculator science = new ScientificCalculator("小皓科学计算器",100,100,400,400);
+				ScientificCalculator science = new ScientificCalculator("小皓科学计算器",500,300,350,550);
 					science.setVisible(true);
 					}
 		});
-- 
Gitee


From 3f5b72a9fc5d938679f7fb5161952451d6cbfb42 Mon Sep 17 00:00:00 2001
From: XJH040985927 <1759361294@qq.com>
Date: Wed, 8 Jun 2022 00:03:54 +0800
Subject: [PATCH 10/13] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=A7=91=E5=AD=A6?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=E5=99=A8=E7=9A=84=E7=9B=91=E8=A7=86=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/java2022spring/Main.class                | Bin 570 -> 570 bytes
 bin/java2022spring/StandardCalculator.class  | Bin 5917 -> 5917 bytes
 src/java2022spring/{1.txt => 0.txt}          |   0
 src/java2022spring/Main.java                 |   2 +-
 src/java2022spring/ScientificCalculator.java | 164 ++++++++++++++++++-
 src/java2022spring/StandardCalculator.java   |   2 +-
 6 files changed, 160 insertions(+), 8 deletions(-)
 rename src/java2022spring/{1.txt => 0.txt} (100%)

diff --git a/bin/java2022spring/Main.class b/bin/java2022spring/Main.class
index ed928912fe2251829519693975c49e9e911bfa0a..6e544c9e8a3cdec2506f196e4b17a99eea284a24 100644
GIT binary patch
delta 13
VcmdnRvWsQIcSgoTlYcNe0RSls1-1YH

delta 13
UcmdnRvWsQIcSgpz$v+sK04Ep)QUCw|

diff --git a/bin/java2022spring/StandardCalculator.class b/bin/java2022spring/StandardCalculator.class
index b0fc308da9489e533a9ac2cd1966064141cf1f55..852e2db29240eec2b491476f5ee8306faf6b590f 100644
GIT binary patch
delta 16
XcmbQMH&<_ikpS~7fq>1X0x#GAFc<}F

delta 16
XcmbQMH&<_ikpOdufZJwMffsB5Evy9`

diff --git a/src/java2022spring/1.txt b/src/java2022spring/0.txt
similarity index 100%
rename from src/java2022spring/1.txt
rename to src/java2022spring/0.txt
diff --git a/src/java2022spring/Main.java b/src/java2022spring/Main.java
index 7610ab0..c9fcf67 100644
--- a/src/java2022spring/Main.java
+++ b/src/java2022spring/Main.java
@@ -1,7 +1,7 @@
 package java2022spring;
 public class Main {
 	public static void main(String args[]) {
-		StandardCalculator win1=new StandardCalculator("小皓标准计算器",500,300,350,550);
+		StandardCalculator win1=new StandardCalculator("小皓标准计算器",500,300,450,550);
 	}
 
 }
diff --git a/src/java2022spring/ScientificCalculator.java b/src/java2022spring/ScientificCalculator.java
index a19fc76..8c6197d 100644
--- a/src/java2022spring/ScientificCalculator.java
+++ b/src/java2022spring/ScientificCalculator.java
@@ -24,7 +24,12 @@ public class ScientificCalculator extends JFrame implements ActionListener{
 	}
 	void init(String s) {
 		setTitle(s);
+		this.setJMenuBar(menubar);
 		menubar.add(moshi);
+		menubar.add(moshi);
+		moshi.setFont(new Font("妤蜂綋", Font.BOLD, 20));
+		moshi.add(menuitem1);
+		moshi.add(menuitem2);
 		moshi.setFont(new Font("妤蜂綋", Font.BOLD, 20));
 		moshi.add(menuitem1);
 		moshi.add(menuitem2);
@@ -32,15 +37,13 @@ public class ScientificCalculator extends JFrame implements ActionListener{
 		panel1.add(text);
 		this.add(panel1,BorderLayout.NORTH);
 		text.setHorizontalAlignment(JTextField.RIGHT);
-		text.setPreferredSize(new Dimension (340,70));
+		text.setPreferredSize(new Dimension (340,90));
 		text.setFont(new Font("榛戜綋", Font.BOLD, 40));
 		panel1.add(text);
 		panel2.setLayout(new FlowLayout());
 		panel2.setLayout(new GridLayout(9, 4, 2, 2));
 		JButton button1[]=new JButton[36];
 		String str0[]= {"sin","cos","tan","x^2","x^3","x^y","蟺","e","e^x","sqrt","rt","x!","ln","lg","%","10^X","|x|","1/x","C","鈫�","7","8","9","+","4","5","6","-","1","2","3","*","0",".","=","/"};
-		String str1[]= {};
-		JButton button2[]=new JButton[15];
 		for(i=0;i<36;i++) {
 			button1[i]=new JButton(str0[i]);
 			button1[i].setFont(new Font("妤蜂綋", Font.BOLD, 20));
@@ -58,9 +61,158 @@ public class ScientificCalculator extends JFrame implements ActionListener{
 		});
 		}
 	public void actionPerformed(ActionEvent e) {
-		
-		
+		String str=e.getActionCommand();
+		if(str.equals("鈫�")) {
+			String str0=text.getText();
+			int i=str0.length();
+			if(i>0) {
+				if(i>1) {
+					str0= str0.substring(0, i-1);
+					text.setText(str0);
+				}
+				else
+				text.setText("0");
+				first = true;
+			
+			}
+			}
+		else if(str.equals("C")){
+			text.setText("0");
+			first = true;
+			operator = "=";
+		}
+		else if("0123456789.".indexOf(str) >= 0){
+			 if (first) {
+		            text.setText(str);
+		        } else if((str.equals(".")) && (text.getText().indexOf(".")<0)){
+		        	text.setText(text.getText() + ".");
+		        }
+		        else if (!str.equals(".")){
+		           text.setText(text.getText()+str);
+		        }
+		        	first=false;
+		        	}
+		else if(str.equals("蟺"))
+			text.setText(String.valueOf(3.14159265));
+		else if(str.equals("e"))
+			text.setText(String.valueOf(2.17828));
+		else
+			Operator(str);
 	}
+	private void Operator(String str) {
+		if (operator.equals("/")) {
+			if (getNumber() == 0.0) {
+				operate = false;
+				text.setText("閿欒:闄ゆ暟涓嶈兘涓洪浂");
+			}
+			else 
+				result/= getNumber();
+		} 
+		else if (operator.equals("1/x")) {
+			if (result == 0.0) {
+				operate = false;
+				text.setText("闆舵病鏈夊�掓暟");
+			}
+			else
+				result= 1 / result;
+			}
+		else if (operator.equals("+")) {
+			result+= getNumber();
+		}
+		else if (operator.equals("-")) {
+			result -= getNumber();
+		}
+		else if (operator.equals("*")) {
+			result *=getNumber();
+		}
+		else if (operator.equals("|x|")) {
+			result=Math.abs(result);
+		}
+		else if (operator.equals("=")) {
+			result=getNumber();
+		}
+		else if (operator.equals("x^2")) {
+			double o=result;
+			result=o*o;
+		}
+		else if (operator.equals("x^3")) {
+			double o=result;
+			result=o*o*o;
+		}
+		else if (operator.equals("x^y")) {
+			result=Math.pow(result,getNumber());
+		}
+		else if (operator.equals("sqrt")) {
+			result= Math.sqrt(result);
+		}
+		else if (operator.equals("rt")) {
+			result=result*57.3;
+		}
+		else if (operator.equals("x!")) {
+			double b=result;
+			int c=1;
+			for(i=1;i<=b;i++)
+			{
+				c=c*i;
+				result=c;}
+		}
+		else if (operator.equals("ln")) {
+			result=Math.log(result);
+		}
+		else if (operator.equals("lg")) {
+			result=Math.log10(result);
+		}
+		else if (operator.equals("%")) {
+			result%= getNumber();
+		}else if (operator.equals("sin")) {
+			result=Math.sin(result);
+		}
+		else if (operator.equals("cos")) {
+			result=Math.cos(result);
+		}
+		else if (operator.equals("tan")) {
+			result=Math.tan(result);
+		}
+		else if (operator.equals("e^X")) {
+			result= Math.exp(result);
+		}
+		else if (operator.equals("=")) {
+			result=getNumber();
+		}
+		if(operate=true) {
+			long t1;
+			double t2;
+			t1 = (long) result;
+			t2 = result- t1;
+			if (t2 == 0) {
+				text.setText(String.valueOf(t1));
+			}
+			else {
+				text.setText(String.valueOf(result));
+			}
+		}
+		operator =str;
+		first= true;
+		operate= true;
+	}
+	public double getNumber() {
+		double result0= 0;
+		try {
+			result0= Double.valueOf(text.getText()).doubleValue();
+		} catch (NumberFormatException e) {}
+		return result0;
+	}
+	public static void main(String args[]) {
+		EventQueue.invokeLater(new Runnable() {
+			public void run() {
+				try {
+					ScientificCalculator application = new ScientificCalculator("灏忕殦绉戝璁＄畻鍣�",500,300,350,550);
+					application.setVisible(true);
+					
+					} catch (Exception e) {
+						e.printStackTrace();
+}
+				}
+	});
 }
-
 	
\ No newline at end of file
diff --git a/src/java2022spring/StandardCalculator.java b/src/java2022spring/StandardCalculator.java
index 157c037..477dca8 100644
--- a/src/java2022spring/StandardCalculator.java
+++ b/src/java2022spring/StandardCalculator.java
@@ -33,7 +33,7 @@ public class StandardCalculator extends JFrame implements ActionListener{
 			moshi.add(menuitem2);
 			this.setLayout(new BorderLayout());
 			text.setHorizontalAlignment(JTextField.RIGHT); 
-			text.setPreferredSize(new Dimension (340,70));
+			text.setPreferredSize(new Dimension (410,80));
 			text.setFont(new Font("黑体", Font.BOLD, 40));
 			panel1.add(text);
 	        text.setBorder(null);  //删除文本框的边框
-- 
Gitee


From 2ec30915ecac4bf6bc457fae9fbda5589ff90c73 Mon Sep 17 00:00:00 2001
From: XJH040985927 <1759361294@qq.com>
Date: Wed, 8 Jun 2022 00:05:10 +0800
Subject: [PATCH 11/13] =?UTF-8?q?=E7=A7=91=E5=AD=A6=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E5=99=A8=E7=9B=91=E8=A7=86=E5=99=A8=E7=9A=84=E5=A2=9E=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...5\273\272\346\226\207\346\234\254\346\226\207\346\241\243.txt" | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/java2022spring/0.txt => "src/java2022spring/\346\226\260\345\273\272\346\226\207\346\234\254\346\226\207\346\241\243.txt" (100%)

diff --git a/src/java2022spring/0.txt "b/src/java2022spring/\346\226\260\345\273\272\346\226\207\346\234\254\346\226\207\346\241\243.txt"
similarity index 100%
rename from src/java2022spring/0.txt
rename to "src/java2022spring/\346\226\260\345\273\272\346\226\207\346\234\254\346\226\207\346\241\243.txt"
-- 
Gitee


From 4612c887a39cc394590ca815e1439318902f272d Mon Sep 17 00:00:00 2001
From: XJH040985927 <1759361294@qq.com>
Date: Wed, 8 Jun 2022 17:55:03 +0800
Subject: [PATCH 12/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=96=E8=A7=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/java2022spring/Main.class                 | Bin 570 -> 570 bytes
 bin/java2022spring/StandardCalculator.class   | Bin 5917 -> 6386 bytes
 .../java2022spring/0.txt                      |   0
 src/java2022spring/Main.java                  |   2 +-
 src/java2022spring/ScientificCalculator.java  |  46 ++++--
 src/java2022spring/StandardCalculator.java    | 148 ++++++++++--------
 6 files changed, 117 insertions(+), 79 deletions(-)
 rename "src/java2022spring/\346\226\260\345\273\272\346\226\207\346\234\254\346\226\207\346\241\243.txt" => src/java2022spring/0.txt (100%)

diff --git a/bin/java2022spring/Main.class b/bin/java2022spring/Main.class
index 6e544c9e8a3cdec2506f196e4b17a99eea284a24..26b85ed03693c5ec364f83ccfe1a968985290b37 100644
GIT binary patch
delta 16
YcmdnRvWsQIcSe>kf=m&Ue>2(x064G)RsaA1

delta 16
YcmdnRvWsQIcSe>&f=p_Ye>2(x05&EC@&Et;

diff --git a/bin/java2022spring/StandardCalculator.class b/bin/java2022spring/StandardCalculator.class
index 852e2db29240eec2b491476f5ee8306faf6b590f..dda976efb98619a2571b1d59a3810f5f258dcdd1 100644
GIT binary patch
literal 6386
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
Pwc#fK{ij0geDeH1c3u+~

literal 5917
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
D2x-Mj

diff --git "a/src/java2022spring/\346\226\260\345\273\272\346\226\207\346\234\254\346\226\207\346\241\243.txt" b/src/java2022spring/0.txt
similarity index 100%
rename from "src/java2022spring/\346\226\260\345\273\272\346\226\207\346\234\254\346\226\207\346\241\243.txt"
rename to src/java2022spring/0.txt
diff --git a/src/java2022spring/Main.java b/src/java2022spring/Main.java
index c9fcf67..6323eb4 100644
--- a/src/java2022spring/Main.java
+++ b/src/java2022spring/Main.java
@@ -1,7 +1,7 @@
 package java2022spring;
 public class Main {
 	public static void main(String args[]) {
-		StandardCalculator win1=new StandardCalculator("小皓标准计算器",500,300,450,550);
+		StandardCalculator win1=new StandardCalculator("小皓标准计算器",500,300,500,600);
 	}
 
 }
diff --git a/src/java2022spring/ScientificCalculator.java b/src/java2022spring/ScientificCalculator.java
index 8c6197d..0cfa9c7 100644
--- a/src/java2022spring/ScientificCalculator.java
+++ b/src/java2022spring/ScientificCalculator.java
@@ -23,6 +23,9 @@ public class ScientificCalculator extends JFrame implements ActionListener{
 		setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
 	}
 	void init(String s) {
+		Color color0=new Color(125,200,240);//
+		Color color1=new Color(255,255,255);
+		Color color2=new Color(192,192,192);
 		setTitle(s);
 		this.setJMenuBar(menubar);
 		menubar.add(moshi);
@@ -37,13 +40,13 @@ public class ScientificCalculator extends JFrame implements ActionListener{
 		panel1.add(text);
 		this.add(panel1,BorderLayout.NORTH);
 		text.setHorizontalAlignment(JTextField.RIGHT);
-		text.setPreferredSize(new Dimension (340,90));
+		text.setPreferredSize(new Dimension (450,100));
 		text.setFont(new Font("榛戜綋", Font.BOLD, 40));
 		panel1.add(text);
 		panel2.setLayout(new FlowLayout());
 		panel2.setLayout(new GridLayout(9, 4, 2, 2));
 		JButton button1[]=new JButton[36];
-		String str0[]= {"sin","cos","tan","x^2","x^3","x^y","蟺","e","e^x","sqrt","rt","x!","ln","lg","%","10^X","|x|","1/x","C","鈫�","7","8","9","+","4","5","6","-","1","2","3","*","0",".","=","/"};
+		String str0[]= {"sin","cos","tan","x^2","x^3","x^y","蟺","e","e^x","sqrt","rt","x!","ln","lg","%","10^X","|x|","CE","C","鈫�","7","8","9","+","4","5","6","-","1","2","3","*","0",".","=","/"};
 		for(i=0;i<36;i++) {
 			button1[i]=new JButton(str0[i]);
 			button1[i].setFont(new Font("妤蜂綋", Font.BOLD, 20));
@@ -51,11 +54,29 @@ public class ScientificCalculator extends JFrame implements ActionListener{
 			button1[i].addActionListener(this);//鍙栨秷杈圭晫
 			panel2.add(button1[i]);
 		}
+		for(i=0;i<20;i++) {
+			button1[i].setBackground(color2);
+		}
+		button1[23].setBackground(color2);
+		button1[27].setBackground(color2);
+		button1[31].setBackground(color2);
+		button1[35].setBackground(color2);
+		button1[20].setBackground(color1);
+		button1[21].setBackground(color1);
+		button1[22].setBackground(color1);
+		button1[24].setBackground(color1);
+		button1[25].setBackground(color1);
+		button1[26].setBackground(color1);
+		button1[28].setBackground(color1);
+		button1[29].setBackground(color1);
+		button1[30].setBackground(color1);
+		button1[32].setBackground(color1);
+		button1[33].setBackground(color1);
 		add(panel2,BorderLayout.CENTER);
-		button1[34].setBackground(Color.gray);
+		button1[34].setBackground(color0);
 		menuitem1.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent arg0) {
-				StandardCalculator win1= new StandardCalculator();
+				StandardCalculator win1= new StandardCalculator("灏忕殦鏍囧噯璁＄畻鍣�",500,300,500,600);
 				win1.setVisible(true);
 	}
 		});
@@ -96,6 +117,9 @@ public class ScientificCalculator extends JFrame implements ActionListener{
 			text.setText(String.valueOf(3.14159265));
 		else if(str.equals("e"))
 			text.setText(String.valueOf(2.17828));
+		else if(str.equals("CE")) {
+			text.setText(null);
+		}
 		else
 			Operator(str);
 	}
@@ -108,14 +132,6 @@ public class ScientificCalculator extends JFrame implements ActionListener{
 			else 
 				result/= getNumber();
 		} 
-		else if (operator.equals("1/x")) {
-			if (result == 0.0) {
-				operate = false;
-				text.setText("闆舵病鏈夊�掓暟");
-			}
-			else
-				result= 1 / result;
-			}
 		else if (operator.equals("+")) {
 			result+= getNumber();
 		}
@@ -206,7 +222,7 @@ public class ScientificCalculator extends JFrame implements ActionListener{
 		EventQueue.invokeLater(new Runnable() {
 			public void run() {
 				try {
-					ScientificCalculator application = new ScientificCalculator("灏忕殦绉戝璁＄畻鍣�",500,300,350,550);
+					ScientificCalculator application = new ScientificCalculator("灏忕殦绉戝璁＄畻鍣�",500,300,500,600);
 					application.setVisible(true);
 					
 					} catch (Exception e) {
@@ -214,5 +230,7 @@ public class ScientificCalculator extends JFrame implements ActionListener{
 }
 				}
 	});
-}
+	}
+	}
+	
 	
\ No newline at end of file
diff --git a/src/java2022spring/StandardCalculator.java b/src/java2022spring/StandardCalculator.java
index 477dca8..5cfc275 100644
--- a/src/java2022spring/StandardCalculator.java
+++ b/src/java2022spring/StandardCalculator.java
@@ -5,12 +5,13 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 public class StandardCalculator extends JFrame implements ActionListener{
 	JMenuBar menubar=new JMenuBar();
-	JMenu moshi=new JMenu("模式");
-	JMenuItem menuitem1=new JMenuItem("标准计算器");
-	JMenuItem menuitem2=new JMenuItem("科学计算器");
+	JMenu moshi=new JMenu("妯″紡");
+	JMenuItem menuitem1=new JMenuItem("鏍囧噯璁＄畻鍣�");
+	JMenuItem menuitem2=new JMenuItem("绉戝璁＄畻鍣�");
 	JTextField text=new JTextField();
 	JPanel panel1=new JPanel();
 	JPanel panel2=new JPanel();
+	Color color0= new Color(125, 200, 240);
 	int i=0;
 	boolean first;
 	double result;
@@ -25,42 +26,65 @@ public class StandardCalculator extends JFrame implements ActionListener{
 			setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
 		}
 		void init( String s) {
+			Color color0=new Color(125,200,240);//
+			Color color1=new Color(255,255,255);
+			Color color2=new Color(192,192,192);
 			setTitle(s);
 			this.setJMenuBar(menubar);
 			menubar.add(moshi);
-			moshi.setFont(new Font("楷体", Font.BOLD, 20));
+			moshi.setFont(new Font("妤蜂綋", Font.BOLD, 20));
 			moshi.add(menuitem1);
 			moshi.add(menuitem2);
 			this.setLayout(new BorderLayout());
 			text.setHorizontalAlignment(JTextField.RIGHT); 
-			text.setPreferredSize(new Dimension (410,80));
-			text.setFont(new Font("黑体", Font.BOLD, 40));
+			text.setPreferredSize(new Dimension (470,100));
+			text.setFont(new Font("榛戜綋", Font.BOLD, 40));
 			panel1.add(text);
-	        text.setBorder(null);  //删除文本框的边框
+	        text.setBorder(null);
+	        text.setBackground(color1);//鍒犻櫎鏂囨湰妗嗙殑杈规
 			this.add(panel1,BorderLayout.NORTH);
 			panel2.setLayout(new FlowLayout());
-			panel2.setLayout(new GridLayout(5,4,2,2));// 用网格布局器，4行，4列的网格，网格之间的水平方向垂直方向间隔均为2个像素
-			String str[]= {"|x|","1/x","C","←","7","8","9","+","4","5","6","-","1","2","3","*","0",".","=","/"};
+			panel2.setLayout(new GridLayout(5,4,2,2));// 鐢ㄧ綉鏍煎竷灞�鍣紝4琛岋紝4鍒楃殑缃戞牸锛岀綉鏍间箣闂寸殑姘村钩鏂瑰悜鍨傜洿鏂瑰悜闂撮殧鍧囦负2涓儚绱�
+			String str[]= {"|x|","CE","C","鈫�","7","8","9","+","4","5","6","-","1","2","3","*","0",".","=","/"};
 			JButton button[]=new JButton[20];
 			for(i=0;i<=19;i++) {
 				button[i]=new JButton(str[i]);
-				button[i].setFont(new Font("楷体", Font.BOLD, 20));
-				button[i].setBorderPainted(false); //字体
-				button[i].addActionListener(this);//取消边界
+				button[i].setFont(new Font("妤蜂綋", Font.BOLD, 20));
+				button[i].setBorderPainted(false); //瀛椾綋
+				button[i].addActionListener(this);//鍙栨秷杈圭晫
 				panel2.add(button[i]);
 			}
 			add(panel2,BorderLayout.CENTER);
-			button[18].setBackground(Color.gray);
+			button[4].setBackground(color1);
+			button[5].setBackground(color1);
+			button[6].setBackground(color1);
+			button[8].setBackground(color1);
+			button[9].setBackground(color1);
+			button[10].setBackground(color1);
+			button[12].setBackground(color1);
+			button[13].setBackground(color1);
+			button[16].setBackground(color1);
+			button[17].setBackground(color1);
+			button[14].setBackground(color1);
+			button[0].setBackground(color2);
+			button[1].setBackground(color2);
+			button[2].setBackground(color2);
+			button[3].setBackground(color2);
+			button[7].setBackground(color2);
+			button[11].setBackground(color2);
+			button[15].setBackground(color2);
+			button[18].setBackground(color0);
+			button[19].setBackground(color2);
 			menuitem2.addActionListener(new ActionListener() {
 				public void actionPerformed(ActionEvent arg0) {
-				ScientificCalculator science = new ScientificCalculator("小皓科学计算器",500,300,350,550);
+				ScientificCalculator science = new ScientificCalculator("灏忕殦绉戝璁＄畻鍣�",500,300,600,700);
 					science.setVisible(true);
 					}
 		});
 		}
 	public void actionPerformed(ActionEvent e) {
 		String str=e.getActionCommand();
-		if(str.equals("←")) {
+		if(str.equals("鈫�")) {
 			String str0=text.getText();
 			int i=str0.length();
 			if(i>0) {
@@ -78,7 +102,11 @@ public class StandardCalculator extends JFrame implements ActionListener{
 			text.setText("0");
 			first = true;
 			operator = "=";
+			result=0;
 		}
+		else if(str.equals("CE")){
+			text.setText(null);
+			}
 		else if("0123456789.".indexOf(str) >= 0){
 			 if (first) {
 		            text.setText(str);
@@ -90,58 +118,50 @@ public class StandardCalculator extends JFrame implements ActionListener{
 		        }
 		        	first=false;
 		        	}
-		else
-			Operator(str);
-	}
-	private void Operator(String str) {
-		if (operator.equals("/")) {
-			if (getNumber() == 0.0) {
-				operate = false;
-				text.setText("错误:除数不能为零");
-			}
-			else 
-				result/= getNumber();
-		} 
-		else if (operator.equals("1/x")) {
-			if (result == 0.0) {
-				operate = false;
-				text.setText("零没有倒数");
-			}
-			else
-				result= 1 / result;
-			}
-		else if (operator.equals("+")) {
-			result+= getNumber();
-		}
-		else if (operator.equals("-")) {
-			result -= getNumber();
-		}
-		else if (operator.equals("*")) {
-			result *= getNumber();
+		else if(str.equals("x^2")||str.equals("|x|")){
+			operate1(str);
 		}
-		else if (operator.equals("|x|")) {
-			result = Math.abs(result);
-		}
-		else if (operator.equals("=")) {
-			result= getNumber();
+		else
+			operate2(str);
 		}
-		if (operate) {
-			long t1;
-			double t2;
-			t1 = (long) result;
-			t2 = result- t1;
-			if (t2 == 0) {
-				text.setText(String.valueOf(t1));
-			}
-			else {
-				text.setText(String.valueOf(result));
+		private void operate2(String str) {
+				if (operator.equals("/")) {
+					if (getNumber() == 0.0) {
+						operate = false;
+						text.setText("閿欒:闄ゆ暟涓嶈兘涓洪浂");
+					}
+					else 
+						result/= getNumber();
+				} 
+			else if (operator.equals("+")) {
+					result+= getNumber();
+				}
+				else if (operator.equals("-")) {
+					result -= getNumber();
+				}
+				else if (operator.equals("*")) {
+					result *= getNumber();
+				}
+				
+				else if (operator.equals("=")) {
+					result= getNumber();
+				}if (operate) {
+					
+						text.setText(String.valueOf(result));
+					}
+				operator=str;
+				first= true;
+				operate= true;
 			}
-		}
-		operator =str;
-		first= true;
-		operate= true;
-	}
-
+			private void operate1(String str) {
+					 if (operator.equals("|x|")) {
+						result = Math.abs(result);
+							text.setText(String.valueOf(result));
+				 }
+					operator=str;
+					first= true;
+					operate= true;
+				}
 	public double getNumber() {
 		double result0= 0;
 		try {
-- 
Gitee


From 503d7b1c3f7990fa26d6972acd082522bb3b4260 Mon Sep 17 00:00:00 2001
From: XJH040985927 <1759361294@qq.com>
Date: Wed, 8 Jun 2022 20:34:41 +0800
Subject: [PATCH 13/13] =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/java2022spring/StandardCalculator.class  | Bin 6386 -> 6310 bytes
 src/java2022spring/{0.txt => 1.txt}          |   0
 src/java2022spring/ScientificCalculator.java | 111 +++++++++++--------
 src/java2022spring/StandardCalculator.java   |  36 +++---
 4 files changed, 81 insertions(+), 66 deletions(-)
 rename src/java2022spring/{0.txt => 1.txt} (100%)

diff --git a/bin/java2022spring/StandardCalculator.class b/bin/java2022spring/StandardCalculator.class
index dda976efb98619a2571b1d59a3810f5f258dcdd1..b0274c40b9e8112a0b3ecb18010d36fefa3bb2e5 100644
GIT binary patch
delta 202
zcmexlxXe)C)W2Q(7#J9A86(&km>3xpCnqv1ZZtf?vssEamP>Fd!xo0=3_BTSFzjQP
z$#9rq*5nTHR>?UGJPdOg#2Mx>s4^^I&|+A~pwF;~!GvM)WHkw+Vm}5Z24<j<LVO-t
zTNv!OF>>x;^xno8;Gw=AD9XeT3MBc!DwYCy%NPV0mNSF_#l(O-pe}}Rh6u1a0mfhk
fDF#LcX2uW@pD~mXq>2kD@(xG?0b@9jU;*&~@Czla

delta 280
zcmZ2x_{mV<)W2Q(7#J9A8Kc-4m>3xpCnqv1ZZtf?qsq=0!pI<>l~|UjpOcuEuJ2cx
zo0MAQmS2>cSmIidoLW$lnV+}$D^Dz!;53FU3^N#ZGR$Py$1scGFvIN0$>Ob&a~XIT
z<}rvf%x6$#SjeEou!upQVKIXV!;;C25=Ql<3``6xK#RrrJhZkj*l%Ox+`;I*jWNJu
zIRlHI`g#UNpu7NsFk>(SGeam)oe)^{GN9-Rp!iA#5r$O^VIciL5fB;95CNo_7(^ID
z8Ki)^e*t-d3{3wSgc+FF85o%v7}<elF)%ZNG%+zshcklIa{*Pp1JXdi7zrd;KzslV
CJ2*H1

diff --git a/src/java2022spring/0.txt b/src/java2022spring/1.txt
similarity index 100%
rename from src/java2022spring/0.txt
rename to src/java2022spring/1.txt
diff --git a/src/java2022spring/ScientificCalculator.java b/src/java2022spring/ScientificCalculator.java
index 0cfa9c7..ab736bd 100644
--- a/src/java2022spring/ScientificCalculator.java
+++ b/src/java2022spring/ScientificCalculator.java
@@ -2,6 +2,8 @@ package java2022spring;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
+import java.math.*;
+import java.text.*;
 public class ScientificCalculator extends JFrame implements ActionListener{
 	JMenuBar menubar=new JMenuBar();
 	JMenu moshi=new JMenu("妯″紡");
@@ -38,6 +40,7 @@ public class ScientificCalculator extends JFrame implements ActionListener{
 		moshi.add(menuitem2);
 		this.setLayout(new BorderLayout());
 		panel1.add(text);
+		text.setBorder(null);
 		this.add(panel1,BorderLayout.NORTH);
 		text.setHorizontalAlignment(JTextField.RIGHT);
 		text.setPreferredSize(new Dimension (450,100));
@@ -46,7 +49,7 @@ public class ScientificCalculator extends JFrame implements ActionListener{
 		panel2.setLayout(new FlowLayout());
 		panel2.setLayout(new GridLayout(9, 4, 2, 2));
 		JButton button1[]=new JButton[36];
-		String str0[]= {"sin","cos","tan","x^2","x^3","x^y","蟺","e","e^x","sqrt","rt","x!","ln","lg","%","10^X","|x|","CE","C","鈫�","7","8","9","+","4","5","6","-","1","2","3","*","0",".","=","/"};
+		String str0[]= {"sin","cos","tan","x^2","x^3","x^y","蟺","e","e^x","鈭歺","rt","x!","ln","lg","%","10^x","|x|","CE","C","鈫�","7","8","9","+","4","5","6","-","1","2","3","*","0",".","=","/"};
 		for(i=0;i<36;i++) {
 			button1[i]=new JButton(str0[i]);
 			button1[i].setFont(new Font("妤蜂綋", Font.BOLD, 20));
@@ -123,15 +126,21 @@ public class ScientificCalculator extends JFrame implements ActionListener{
 		else
 			Operator(str);
 	}
+	public double getNumber() {
+		double result0=0;
+			result0= Double.valueOf(text.getText()).doubleValue(); 
+	        return result0;
+	}
 	private void Operator(String str) {
 		if (operator.equals("/")) {
-			if (getNumber() == 0.0) {
-				operate = false;
+			if (getNumber()==0) {
+				operate =false;
 				text.setText("閿欒:闄ゆ暟涓嶈兘涓洪浂");
 			}
-			else 
+			else {
 				result/= getNumber();
 		} 
+		}
 		else if (operator.equals("+")) {
 			result+= getNumber();
 		}
@@ -141,6 +150,15 @@ public class ScientificCalculator extends JFrame implements ActionListener{
 		else if (operator.equals("*")) {
 			result *=getNumber();
 		}
+	    else if (operator.equals("sin")) {
+		result=Math.sin(result);
+	    }
+	else if (operator.equals("cos")) {
+		result=Math.cos(result);
+	    }
+	else if (operator.equals("tan")) {
+		result=Math.tan(result);
+	    }
 		else if (operator.equals("|x|")) {
 			result=Math.abs(result);
 		}
@@ -158,9 +176,13 @@ public class ScientificCalculator extends JFrame implements ActionListener{
 		else if (operator.equals("x^y")) {
 			result=Math.pow(result,getNumber());
 		}
-		else if (operator.equals("sqrt")) {
+		else if (operator.equals("鈭歺")) {
+			if(result<0) {
+				operate=false;
+			}else {
 			result= Math.sqrt(result);
 		}
+			}
 		else if (operator.equals("rt")) {
 			result=result*57.3;
 		}
@@ -172,6 +194,12 @@ public class ScientificCalculator extends JFrame implements ActionListener{
 				c=c*i;
 				result=c;}
 		}
+		else if(operator.equals("10^x")) {
+			int a=10;
+			double b=result;
+			double c=Math.pow(a, b);
+			result=c;
+		}
 		else if (operator.equals("ln")) {
 			result=Math.log(result);
 		}
@@ -180,57 +208,48 @@ public class ScientificCalculator extends JFrame implements ActionListener{
 		}
 		else if (operator.equals("%")) {
 			result%= getNumber();
-		}else if (operator.equals("sin")) {
-			result=Math.sin(result);
-		}
-		else if (operator.equals("cos")) {
-			result=Math.cos(result);
-		}
-		else if (operator.equals("tan")) {
-			result=Math.tan(result);
 		}
-		else if (operator.equals("e^X")) {
+		else if (operator.equals("e^x")) {
 			result= Math.exp(result);
 		}
 		else if (operator.equals("=")) {
 			result=getNumber();
 		}
-		if(operate=true) {
-			long t1;
-			double t2;
-			t1 = (long) result;
-			t2 = result- t1;
-			if (t2 == 0) {
-				text.setText(String.valueOf(t1));
-			}
-			else {
-				text.setText(String.valueOf(result));
-			}
-		}
+		isOperate(operate);
 		operator =str;
 		first= true;
 		operate= true;
 	}
-	public double getNumber() {
-		double result0= 0;
-		try {
-			result0= Double.valueOf(text.getText()).doubleValue();
-		} catch (NumberFormatException e) {}
-		return result0;
+	private void isOperate(boolean operate) {
+	if(operate=true) {
+		long a;
+		double b;
+		a=(long)result;
+		b=a-result;
+		BigDecimal num=new BigDecimal(String.valueOf(result));
+		if (b==0) {
+            text.setText(String.valueOf(a));
+        } else if (num.scale()==1) {
+            text.setText(String.valueOf(new DecimalFormat("0.0").format(result)));
+        } else if (num.scale() == 2) {
+            text.setText(String.valueOf(new DecimalFormat("0.00").format(result)));
+        } else if (num.scale() == 3) {
+            text.setText(String.valueOf(new DecimalFormat("0.000").format(result)));
+        } else if (num.scale() == 4) {
+            text.setText(String.valueOf(new DecimalFormat("0.0000").format(result)));
+        } else if (num.scale() == 5) {
+            text.setText(String.valueOf(new DecimalFormat("0.00000").format(result)));
+        } else if (num.scale() == 6) {
+            text.setText(String.valueOf(new DecimalFormat("0.000000").format(result)));
+        }
+        else 
+        	text.setText(String.valueOf(new DecimalFormat("0.0000000").format(result)));
 	}
+	else if(operate=false) {
+		 text.setText("鍑虹幇閿欒");
+	}
+    }
 	public static void main(String args[]) {
-		EventQueue.invokeLater(new Runnable() {
-			public void run() {
-				try {
-					ScientificCalculator application = new ScientificCalculator("灏忕殦绉戝璁＄畻鍣�",500,300,500,600);
-					application.setVisible(true);
-					
-					} catch (Exception e) {
-						e.printStackTrace();
+		ScientificCalculator win2=new ScientificCalculator("灏忕殦绉戝璁＄畻鍣�",500,300,500,600);
 }
-				}
-	});
-	}
-	}
-	
-	
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/java2022spring/StandardCalculator.java b/src/java2022spring/StandardCalculator.java
index 5cfc275..90b28c7 100644
--- a/src/java2022spring/StandardCalculator.java
+++ b/src/java2022spring/StandardCalculator.java
@@ -77,7 +77,7 @@ public class StandardCalculator extends JFrame implements ActionListener{
 			button[19].setBackground(color2);
 			menuitem2.addActionListener(new ActionListener() {
 				public void actionPerformed(ActionEvent arg0) {
-				ScientificCalculator science = new ScientificCalculator("灏忕殦绉戝璁＄畻鍣�",500,300,600,700);
+				ScientificCalculator science=new ScientificCalculator("灏忕殦绉戝璁＄畻鍣�",500,300,500,600);
 					science.setVisible(true);
 					}
 		});
@@ -126,49 +126,45 @@ public class StandardCalculator extends JFrame implements ActionListener{
 		}
 		private void operate2(String str) {
 				if (operator.equals("/")) {
-					if (getNumber() == 0.0) {
-						operate = false;
+					if (getNumber()==0.0) {
+						operate=false;
 						text.setText("閿欒:闄ゆ暟涓嶈兘涓洪浂");
 					}
 					else 
-						result/= getNumber();
+						result/=getNumber();
 				} 
 			else if (operator.equals("+")) {
-					result+= getNumber();
+					result+=getNumber();
 				}
 				else if (operator.equals("-")) {
-					result -= getNumber();
+					result -=getNumber();
 				}
 				else if (operator.equals("*")) {
-					result *= getNumber();
+					result *=getNumber();
 				}
 				
 				else if (operator.equals("=")) {
-					result= getNumber();
+					result=getNumber();
 				}if (operate) {
-					
-						text.setText(String.valueOf(result));
+					text.setText(String.valueOf(result));
 					}
 				operator=str;
-				first= true;
-				operate= true;
+				first=true;
+				operate=true;
 			}
 			private void operate1(String str) {
 					 if (operator.equals("|x|")) {
-						result = Math.abs(result);
+						result=Math.abs(result);
 							text.setText(String.valueOf(result));
 				 }
 					operator=str;
-					first= true;
-					operate= true;
+					first=true;
+					operate=true;
 				}
 	public double getNumber() {
-		double result0= 0;
-		try {
+		double result0=0;
 			result0= Double.valueOf(text.getText()).doubleValue();
-		} catch (NumberFormatException e) {}
 		return result0;
-	}
-	
+}
 }
 			
-- 
Gitee