From c3fea70173d4bc2bfe2d641bd3c5acd415b197c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E7=A1=95?= <mu'zi@LAPTOP-1G36GT8Q>
Date: Wed, 9 Jun 2021 22:39:54 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E7=AC=AC=E4=B8=80=E6=AC=A1=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=EF=BC=8C=E5=9F=BA=E6=9C=AC=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/java2020spring/Calculator.java          |  58 +++++
 src/java2020spring/CalculatorMainClass.java |   7 +
 src/java2020spring/KeXueCalculator.java     | 271 ++++++++++++++++++++
 src/java2020spring/WindowCalculator.java    | 203 +++++++++++++++
 4 files changed, 539 insertions(+)
 create mode 100644 src/java2020spring/Calculator.java
 create mode 100644 src/java2020spring/CalculatorMainClass.java
 create mode 100644 src/java2020spring/KeXueCalculator.java
 create mode 100644 src/java2020spring/WindowCalculator.java

diff --git a/src/java2020spring/Calculator.java b/src/java2020spring/Calculator.java
new file mode 100644
index 0000000..ce869ed
--- /dev/null
+++ b/src/java2020spring/Calculator.java
@@ -0,0 +1,58 @@
+package java2020spring;
+import java.awt.*;
+import javax.swing.*;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+
+public class Calculator extends JFrame{  //创建一个窗口
+	WindowCalculator biaoZhun; 
+	KeXueCalculator keXue;
+	JTabbedPane p;
+	Calculator(){
+		biaoZhun=new WindowCalculator();  //创建biaoZhun这个面板对象
+		keXue=new KeXueCalculator();  //创建keXue这个面板对象
+		p=new JTabbedPane();  //创建一个选项卡容器
+		p.add("标准计算器",biaoZhun); //将biaoZhun这个面板放在容器中
+		p.add("科学计算器",keXue);  //将keXue这个面板放在容器中
+		p.addChangeListener(new ChangeListener() {     //创建改变面板监视器
+			
+			@Override
+			public void stateChanged(ChangeEvent e) {
+				String name =String.valueOf(p.getSelectedComponent());
+				String []item1= {"2nd","sin","cos","tan","hyp","sec","csc","cot"};
+				String []item2= {"|x|","┕x┘","┍x┐","rand","→dms","→deg"};
+				JMenuItem []item3=new JMenuItem[8];
+				JMenuItem []item4=new JMenuItem[6];
+				if(name.equals("java2020spring.KeXueCalculator[,2,27,527x573,invalid,layout=java.awt.BorderLayout,alignmentX=0.0,alignmentY=0.0,border=,flags=9,"
+						+ "maximumSize=,minimumSize=,preferredSize=]")) {   //如果是科学计算器面板，就加上有“三角学”、“函数”的菜单条 
+	             JMenuBar menuBar=new JMenuBar();
+	             JMenu menu1=new JMenu("三角学");
+	             JMenu menu2=new JMenu("函数");
+	             for(int i=0;i<item1.length;i++) {
+	            	 item3[i]=new JMenuItem(item1[i]);
+	            	 menu1.add(item3[i]);
+	             }
+	             for(int k=0;k<item2.length;k++) {
+	            	 item4[k]=new JMenuItem(item1[k]);
+	            	 menu2.add(item4[k]);
+	             }
+	             menuBar.add(menu1);
+	             menuBar.add(menu2);
+	             setJMenuBar(menuBar);
+				}
+				else{
+					JMenuBar menuBar=new JMenuBar();
+		             JMenu menu1=new JMenu("");
+		             menuBar.add(menu1);
+		             setJMenuBar(menuBar);
+				}
+			}
+		});
+		add(p);  //将容器p放到窗口中
+		setTitle("计算器");
+		setBounds(200,200,550,650);
+		setVisible(true);
+		setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+		validate();
+	}
+}
diff --git a/src/java2020spring/CalculatorMainClass.java b/src/java2020spring/CalculatorMainClass.java
new file mode 100644
index 0000000..4bf4e2c
--- /dev/null
+++ b/src/java2020spring/CalculatorMainClass.java
@@ -0,0 +1,7 @@
+package java2020spring;
+
+public class CalculatorMainClass {
+	 public static void main(String args[]) {
+	     new Calculator(); 
+ }
+}
diff --git a/src/java2020spring/KeXueCalculator.java b/src/java2020spring/KeXueCalculator.java
new file mode 100644
index 0000000..ca5fdf8
--- /dev/null
+++ b/src/java2020spring/KeXueCalculator.java
@@ -0,0 +1,271 @@
+package java2020spring;
+import javax.swing.*;
+import javax.swing.border.*;
+import java.awt.*;
+import java.awt.event.*;
+import java.io.*;
+import java.util.*;
+import java.math.*;
+
+//澶ч儴鍒嗘牸寮忓拰鏍囧噯璁＄畻鍣ㄧ殑鏍煎紡涓�鏍�
+public class KeXueCalculator extends JPanel implements ActionListener{  
+	JButton []button=new JButton[35];
+	boolean boo=true;
+	String str1="",str2="";
+	JLabel label1 = new JLabel("",SwingConstants.RIGHT);// 鍒涘缓鏍囩骞惰缃彸瀵归綈
+    JLabel label2 = new JLabel("0", SwingConstants.RIGHT);// 鍒涘缓鏍囩骞惰缃彸瀵归綈
+    double result=0;
+	KeXueCalculator(){
+		setLayout(new BorderLayout());
+		JPanel p=new JPanel();
+		p.setLayout(new GridLayout(7,5));
+		String []c= {"2^nd","螤","e","C","DE","x虏","1/x","|x|","exp","mod","鈭�","(",")","n!","梅","x^y","7","8","9","脳","10^x","4","5","6","锛�","log","1","2","3","锛�","ln","卤","0",".","="};
+		for(int i=0;i<35;i++) {
+			button[i]=new JButton(c[i]);
+		}
+		for(int i=0;i<34;i++) {
+			button[i].setPreferredSize(new Dimension(40, 40));
+			button[i].setFont(new Font("瀹嬩綋", 1, 30));
+			button[i].setBackground(Color.white);
+		    button[i].addActionListener(this);
+		    p.add(button[i]);
+		}
+		button[34].setBackground(Color.cyan);
+		button[34].setBorder(new SoftBevelBorder(BevelBorder.RAISED));
+	    button[34].setFont(new Font("瀹嬩綋",1,30));
+		button[34].addActionListener(this);
+	    label1.setFont(new Font("瀹嬩綋", 1, 30));
+		label2.setFont(new Font("瀹嬩綋", 1, 40));
+	    p.add(button[34]);
+	   add(label1,BorderLayout.NORTH);
+	   add(label2,BorderLayout.CENTER);
+	    add(p,BorderLayout.SOUTH);
+	}
+	public void actionPerformed(ActionEvent e) {
+		try{if(e.getActionCommand().equals("0")) {
+			 if(label2.getText().equals("0"))
+				 str2="0";
+			 else {
+				 str2=str2+"0";
+			   label2.setText(str2);
+			 }
+		 }
+	     if(e.getActionCommand().equals(".")&&(boo=true)) {
+					str2=str2+".";
+					boo=false;
+					label2.setText(str2);
+				}
+		 if((e.getActionCommand()).equals("CE")) {
+			 str2="0";
+			 label2.setText(str2);
+		 }
+			
+		 if((e.getActionCommand()).equals("C")) {
+			 str2="0";
+			 str1="";
+			 label2.setText(str2);
+			 label1.setText(str1);
+		 }
+			 
+		 if((e.getActionCommand()).equals("DE")) {
+			 String a = "";
+				char[] ch = label2.getText().toCharArray();
+				for (int i = 0; i < label2.getText().length() - 1; i++)
+					a += ch[i];
+				str2=a;
+				label2.setText(str2);
+		 }
+		 if(e.getActionCommand().equals("卤")) {
+			 BigDecimal num1=new BigDecimal(str2);
+			 BigDecimal num2 = num1.negate();
+			 str2=""+num2;
+			 label2.setText(str2);
+		 }
+		 if(e.getActionCommand().equals("x虏")) {
+			 double num1=Double.parseDouble(str2);
+			 str1="sqr("+num1+")";
+			 label1.setText(str1);
+			 double num2=Math.pow(num1,2);
+			 str2=String.valueOf(num2);
+			 label2.setText(str2);
+		 }
+		 if(e.getActionCommand().equals("鈭�")) {
+			 double num1=Double.parseDouble(str2);
+			 if(num1<0) {
+				 label1.setText("");
+				 label2.setText("璐熸暟涓嶈兘寮�鏍�");
+			 }
+			 else {
+			 str1="鈭�("+num1+")";
+			 label1.setText(str1);
+			 double num2=Math.sqrt(num1);
+			 str2=String.valueOf(num2);
+			 label2.setText(str2);
+		 }
+		 }
+		 if(e.getActionCommand().equals("1/x")) {
+			 double num1=Double.parseDouble(str2);
+			 if(num1==0) {
+				 label1.setText("");
+				 label2.setText("闄ゆ暟涓嶈兘涓洪浂");
+				 label1.setText("1/("+num1+")");
+			 }
+			 else {
+				 double num2=1/num1;
+				 str2=String.valueOf(num2);
+				 label2.setText(str2);
+				 label1.setText("1/("+num1+")");
+			 }
+		 }
+		 if(e.getActionCommand().equals("螤")) {
+			 label2.setText("3.1415926535897932384626433832795");
+		 }
+		 if(e.getActionCommand().equals("e")) {
+			 label2.setText("2.7182818284590452353602874713527");
+		 }
+		 if(e.getActionCommand().equals("|x|")) {
+			 if(Double.parseDouble(str2)<0) {
+				 BigDecimal num1=new BigDecimal(str2);
+				 BigDecimal num2 = num1.negate();
+				 label1.setText("abs("+Double.parseDouble(str2)+")");
+				 label2.setText(""+num2);
+			 }
+			 else {
+				 label1.setText("abs("+Double.parseDouble(str2)+")");
+				 label2.setText(str2);
+			 }
+		 }
+		 if(e.getActionCommand().equals("n!")) {
+			 double result=0;
+			 double number=Double.parseDouble(str2);
+		      result=Result(number);      //璋冪敤Result鏂规硶锛屽皢杈撳叆鐨勬暟瀛梟umber浼犻�掔粰Result鏂规硶锛屽苟灏哛esult鏂规硶杩斿洖鐨勫�兼斁鍦╮esult杩欎釜鍙橀噺涓�
+			 label1.setText("fact("+Double.parseDouble(str2)+")");
+			 label2.setText(Double.valueOf(result)+"");   //灏嗙粨鏋滆浆鍖栦负瀛楃涓诧紝骞舵樉绀哄湪label2涓�
+		 }
+		 if(e.getActionCommand().equals("%")) {
+			 double num1=Double.parseDouble(str2);
+			 double num2=num1/100;
+			 str2=String.valueOf(num2);
+			 label2.setText(str2+"%");
+		 }
+		 if(e.getActionCommand().equals("10^x")) {
+			 double number=Double.parseDouble(str2);
+			 label1.setText("10^("+number+")");
+			 double result=0;
+		      result=Plus(number);  //璋冪敤Plus杩欎釜鏂规硶锛屽皢杈撳叆鐨勬暟瀛椾紶缁欒鏂规硶锛屽苟灏嗚繑鍥炵殑缁撴灉璧嬪�肩粰result
+			 label2.setText(Double.valueOf(result)+"");  //灏嗙粨鏋滄樉绀哄湪label2涓�
+		 }
+		 if(e.getActionCommand().equals("log")) {
+			 double num1=Double.parseDouble(str2);
+			 if(num1<0) {
+				 label1.setText("log("+num1+")");
+				 label2.setText("鏃犳晥杈撳叆锛�");
+			 }
+			 else {
+			 str1="log("+num1+")";
+			 label1.setText(str1);
+			 double num2=Math.log(num1)/Math.log(10);
+			 str2=String.valueOf(num2);
+			 label2.setText(str2);
+		 }
+		 }
+		 if(e.getActionCommand().equals("ln")) {
+			 double num1=Double.parseDouble(str2);
+			 if(num1<0) {
+				 label1.setText("log("+num1+")");
+				 label2.setText("鏃犳晥杈撳叆锛�");
+			 }
+			 else {
+			 str1="log("+num1+")";
+			 label1.setText(str1);
+			 double num2=Math.log(num1);
+			 str2=String.valueOf(num2);
+			 label2.setText(str2);
+		 }
+		 }
+		 if(e.getActionCommand().equals("x^y")) {
+			 double num1=Double.parseDouble(str2);
+			 str2=num1+"^";  //灏嗚緭鍏ョ殑x鏀惧湪str2涓紝骞舵樉绀哄湪label1涓�
+			 label1.setText(str2);
+		 }
+		 if(e.getActionCommand().equals("1")||e.getActionCommand().equals("2")||e.getActionCommand().equals("3")||e.getActionCommand().equals("4")||e.getActionCommand().equals("5")
+				 ||e.getActionCommand().equals("6")||e.getActionCommand().equals("7")||e.getActionCommand().equals("8")||e.getActionCommand().equals("9")) {
+			 Number(e.getActionCommand());
+		 }
+		if(e.getActionCommand().equals("锛�")||e.getActionCommand().equals("锛�")||e.getActionCommand().equals("脳")||e.getActionCommand().equals("梅")) {
+			        CalculateButton(e.getActionCommand());
+			}
+		if(e.getActionCommand().equals("=")) {
+			double result=Calculate(str2);   //璋冪敤杩愮畻鏂规硶锛屽皢str2杩欎釜瀛楃涓蹭紶缁欒鏂规硶锛屽緱鍒拌繍绠楃粨鏋�
+			label1.setText(str2 + "锛�");
+			label2.setText(Double.valueOf(result) + "");
+			str1 = str2 = "";
+}
+		}catch(Exception exp) {}
+}
+	public double Calculate(String str) {  
+		try{int index = str.indexOf("锛�");
+		     if(index!=-1) {
+		     return Calculate(str.substring(0, index))+Calculate(str.substring(index + 1));
+		 }
+		  index=str.indexOf("锛�");
+		  if(index!=-1) {
+			  return Calculate(str.substring(0, index))-Calculate(str.substring(index + 1));
+		}
+		  index=str.indexOf("脳");
+		  if(index!=-1) {
+			  return Calculate(str.substring(0, index))*Calculate(str.substring(index + 1));
+		  }
+		  index=str.indexOf("梅");
+		  if(index!=-1) {
+			  return Calculate(str.substring(0, index))/Calculate(str.substring(index + 1));
+			  }
+		  index=str.indexOf("^");
+		  if(index!=-1) {
+			  return Exponential(Double.valueOf(str.substring(0,index)),Double.valueOf(str.substring(index + 1)));  //璋冪敤Exponential杩欎釜鏂规硶锛屽皢x^y鐨剎鍜寉浼犵粰璇ユ柟娉曚腑鐩稿簲鐨勫弬鏁�
+		  }
+		 }
+		 catch(Exception exp) {}
+		 return Double.parseDouble(str);  //灏嗘渶缁堣繍绠楃殑缁撴灉杩斿洖缁欌��=鈥濇柟娉�
+	}
+	public void CalculateButton(String str) {
+		str2=str2+str;
+		label1.setText(str2);
+		label2.setText(str1);
+	}
+	public void Number(String str) {
+		 if(str2.equals("0")) {
+			 str2=str;
+		 }
+		 else {
+		 str2=str2+str;
+	 }
+		 label2.setText(str2);
+	}
+	public double Result(double number) {   //閫氳繃寰幆璋冪敤鑷韩锛屾潵瀹炵幇闃朵箻
+		double result=0;
+		if(number==0||number==1) 
+			result=1;
+		else 
+			result=Result(number-1)*number;
+		return result;
+		
+	}
+	public double Plus(double count) {  //閫氳繃while寰幆锛屽疄鐜癱ount涓�10鐩镐箻
+		double result=10;
+		while(count!=1) {
+			count--;
+		   result=result*10;
+		}
+		return result;
+	}
+	public double  Exponential(double number,double count) {  //number璐熻矗鎺ユ敹x锛宑ount璐熻矗鎺ユ敹y锛岄�氳繃while寰幆锛屾潵瀹炵幇count涓猲umber鐩镐箻
+		double result=number;
+		while(count!=1) {
+			count--;
+		   result=result*number;
+		}
+		return result;
+	}
+	
+}
diff --git a/src/java2020spring/WindowCalculator.java b/src/java2020spring/WindowCalculator.java
new file mode 100644
index 0000000..034ab8c
--- /dev/null
+++ b/src/java2020spring/WindowCalculator.java
@@ -0,0 +1,203 @@
+package java2020spring;
+import javax.swing.*;
+import javax.swing.border.*;
+import java.awt.*;
+import java.awt.event.*;
+import java.io.*;
+import java.util.*;
+import java.math.*;
+
+public class WindowCalculator extends JPanel implements ActionListener{  
+	JButton []button=new JButton[24];
+	boolean boo=true;
+	String str1="",str2="";
+	JLabel label1 = new JLabel("", SwingConstants.RIGHT);// 鍒涘缓鏍囩骞惰缃彸瀵归綈
+    JLabel label2 = new JLabel("0", SwingConstants.RIGHT);// 鍒涘缓鏍囩骞惰缃彸瀵归綈
+	WindowCalculator() {
+		setLayout(new BorderLayout());
+		JPanel p=new JPanel();
+		p.setLayout(new GridLayout(6,4));//灏嗛潰鏉胯缃负6琛�4鍒楃殑缃戞牸缁撴瀯
+		button[0]=new JButton("%");        //鍒涘缓鎸夐挳
+		button[1]=new JButton("CE");
+		button[2]=new JButton("C");
+		button[3]=new JButton("DE");
+		button[4]=new JButton("1/x");
+		button[5]=new JButton("x虏");
+		button[6]=new JButton("鈭�");
+		button[7]=new JButton("梅");
+		button[8]=new JButton("7");
+		button[9]=new JButton("8");
+		button[10]=new JButton("9");
+		button[11]=new JButton("脳");
+		button[12]=new JButton("4");
+		button[13]=new JButton("5");
+		button[14]=new JButton("6");
+		button[15]=new JButton("锛�");
+		button[16]=new JButton("1");
+		button[17]=new JButton("2");
+		button[18]=new JButton("3");
+		button[19]=new JButton("锛�");
+		button[20]=new JButton("卤");
+		button[21]=new JButton("0");
+		button[22]=new JButton(".");
+		button[23]=new JButton("=");
+		for(int i=0;i<23;i++) {                //涓烘寜閽缃ぇ灏忓拰瀛椾綋锛屽苟鍔犱笂鐩戣鍣�
+			button[i].setPreferredSize(new Dimension(40, 40));
+			button[i].setFont(new Font("瀹嬩綋", 1, 30));
+			button[i].setBackground(Color.white);
+		    button[i].addActionListener(this);
+		   p.add(button[i]);
+		}
+		button[23].setBackground(Color.cyan);      //绛変簬鍙疯鍗曠嫭璁剧疆锛堝洜涓烘寜閽殑棰滆壊涓嶄竴鏍凤級
+		button[23].setBorder(new SoftBevelBorder(BevelBorder.RAISED));
+	    button[23].setFont(new Font("瀹嬩綋",1,30));
+		button[23].addActionListener(this);
+	    label1.setFont(new Font("瀹嬩綋", 1, 30));
+		label2.setFont(new Font("瀹嬩綋", 1, 40));
+	    p.add(button[23]);
+	    add(p,BorderLayout.SOUTH);
+	    add(label1,BorderLayout.NORTH);
+	    add(label2,BorderLayout.CENTER);
+	}
+	public void actionPerformed(ActionEvent e){
+		try{if(e.getActionCommand().equals("0")) {    //瀹炵幇0杩欎釜鎸夐挳
+			 if(label2.getText().equals("0"))
+				 str2="0";
+			 else {
+				 str2=str2+"0";
+			   label2.setText(str2);
+			 }
+		 }
+	     if(e.getActionCommand().equals(".")&&(boo=true)) {    //瀹炵幇鍔犲叆灏忔暟鐐�
+					str2=str2+".";
+					boo=false;
+					label2.setText(str2);
+				}
+		 if((e.getActionCommand()).equals("CE")) {   //瀹炵幇CE鎸夐挳
+			 str2="0";
+			 label2.setText(str2);
+		 }
+			
+		 if((e.getActionCommand()).equals("C")) {   //瀹炵幇C鍒犻櫎鎸夐挳
+			 str2="0";
+			 str1="";
+			 label2.setText(str2);
+			 label1.setText(str1);
+		 }
+			 
+		 if((e.getActionCommand()).equals("DE")) {   //瀹炵幇Delete鎸夐挳
+			 String a = "";
+			 char[] ch = label2.getText().toCharArray();
+			 for (int i = 0; i < label2.getText().length() - 1; i++)
+					a += ch[i];
+			 str2=a;
+			 label2.setText(str2);
+		 }
+		 if(e.getActionCommand().equals("卤")) {  //瀹炵幇姝ｈ礋鍙疯浆鍙樻寜閽�
+			 BigDecimal num1=new BigDecimal(str2);
+			 BigDecimal num2 = num1.negate();
+			 str2=""+num2;
+			 label2.setText(str2);
+		 }
+		 if(e.getActionCommand().equals("x虏")) {  //瀹炵幇涓�涓暟鐨勫钩鏂规寜閽�
+			 double num1=Double.parseDouble(str2);
+			 str1="sqr("+num1+")";
+			 label1.setText(str1);
+			 double num2=Math.pow(num1,2);
+			 str2=String.valueOf(num2);
+			 label2.setText(str2);
+		 }
+		 if(e.getActionCommand().equals("鈭�")) {  //瀹炵幇寮�鏍�
+			 double num1=Double.parseDouble(str2);  //灏嗚緭鍏ョ殑鏀惧湪str2涓殑鏁板瓧鐢卞瓧绗﹀舰寮忚浆鍖栦负鏁板瓧
+			 if(num1<0) {
+				 label1.setText("");
+				 label2.setText("璐熸暟涓嶈兘寮�鏍�");
+			 }
+			 else {
+			 str1="鈭�("+num1+")";
+			 label1.setText(str1);
+			 double num2=Math.sqrt(num1);   
+			 str2=String.valueOf(num2);      //灏嗚繍绠楃粨鏋渘um2鐢辨暟瀛楀舰寮忚浆涓哄瓧绗︿覆锛屽苟鏀惧湪str2涓�
+			 label2.setText(str2);
+		 }
+		 }
+		 if(e.getActionCommand().equals("%")) {  //瀹炵幇鐧惧垎鍙�
+			 double num1=Double.parseDouble(str2);
+			 double num2=num1/100;
+			 str2=String.valueOf(num2);
+			 label2.setText(str2+"%");
+		 }
+		 if(e.getActionCommand().equals("1/x")) {  //瀹炵幇姹傚�掓暟
+			 double num1=Double.parseDouble(str2);
+			 if(num1==0) {
+				 label2.setText("闄ゆ暟涓嶈兘涓洪浂");
+				 label1.setText("1/("+num1+")");
+			 }
+			 else {
+				 double num2=1/num1;
+				 str2=String.valueOf(num2);
+				 label2.setText(str2);
+				 label1.setText("1/("+num1+")");
+			 }
+		 }
+		 //瀹炵幇1~9鏁板瓧鐨勬寜閽�
+		 if(e.getActionCommand().equals("1")||e.getActionCommand().equals("2")||e.getActionCommand().equals("3")||e.getActionCommand().equals("4")||e.getActionCommand().equals("5")
+				 ||e.getActionCommand().equals("6")||e.getActionCommand().equals("7")||e.getActionCommand().equals("8")||e.getActionCommand().equals("9")) {
+			 Number(e.getActionCommand());                   //璋冪敤Number鏂规硶瀹炵幇灏嗘暟瀛楁樉绀哄湪label涓�
+		 }
+		 
+		if(e.getActionCommand().equals("锛�")||e.getActionCommand().equals("锛�")||e.getActionCommand().equals("脳")||e.getActionCommand().equals("梅")) {
+			        label1.setText(str2);               //瀹炵幇涓�鐐瑰姞鍑忎箻闄ゆ寜閽紝灏卞皢str2閲岀殑瀛楃涓叉斁鍒發abel1涓�
+			        CalculateButton(e.getActionCommand());     //璋冪敤CalculateButton鏂规硶灏嗗姞鍑忎箻闄ゆ寜閽樉绀哄湪label1涓�
+			}
+		//瀹炵幇绛変簬鎸夐挳
+		if(e.getActionCommand().equals("=")) {
+			double result=Calculate(str2);  //璋冪敤杩愮畻鏂规硶锛屽皢str2杩欎釜瀛楃涓蹭紶缁欒鏂规硶锛屽緱鍒拌繍绠楃粨鏋�
+			label1.setText(str2 + "锛�");
+			label2.setText(Double.valueOf(result) + "");
+			str1 = str2 = "";
+}
+		}catch (Exception exp) {}
+}
+	//瀹炵幇杩愮畻鎸夐挳
+	public double Calculate(String str) {
+		try{int index = str.indexOf("锛�");
+		 if(index!=-1) {
+		      return Calculate(str.substring(0, index))+Calculate(str.substring(index + 1));
+		 }
+		  index=str.indexOf("锛�");
+		  if(index!=-1) {
+			  return Calculate(str.substring(0, index))-Calculate(str.substring(index + 1));
+		}
+		  index=str.indexOf("脳");
+		  if(index!=-1) {
+			  return Calculate(str.substring(0, index))*Calculate(str.substring(index + 1));
+		  }
+		  index=str.indexOf("梅");
+		  if(index!=-1) {
+			  return Calculate(str.substring(0, index))/Calculate(str.substring(index + 1));
+			  }
+		 }
+		 catch(Exception exp) {}
+		 return Double.parseDouble(str);   //灏嗘渶缁堣繍绠楃殑缁撴灉杩斿洖缁欌��=鈥濇柟娉�
+	}
+	//灏嗗姞鍑忎箻闄ゆ寜閽樉绀簂abel1涓婏紝鍚屾椂灏唋abel2缃┖
+	public void CalculateButton(String str) {
+		try{str2=str2+str;
+		   label1.setText(str2);
+		   label2.setText(str1);
+	}catch(Exception exp) {}
+	}
+	//灏嗘暟瀛楁樉绀哄湪label2涓�
+	public void Number(String str) {
+		 try{if(str2.equals("0")) {
+			 str2=str;
+		 }
+		 else {
+		 str2=str2+str;
+	 }
+		 label2.setText(str2);
+	}catch(Exception exp) {}
+	}
+}
+	
-- 
Gitee


From 5b5cf6d99847ab143ce905e68d73eb0e2fac7b8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E7=A1=95?= <mu'zi@LAPTOP-1G36GT8Q>
Date: Thu, 10 Jun 2021 09:56:08 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E4=B8=80?=
 =?UTF-8?q?=E4=BA=9B=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/java2020spring/KeXueCalculator.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/java2020spring/KeXueCalculator.java b/src/java2020spring/KeXueCalculator.java
index ca5fdf8..f848e1b 100644
--- a/src/java2020spring/KeXueCalculator.java
+++ b/src/java2020spring/KeXueCalculator.java
@@ -157,7 +157,7 @@ public class KeXueCalculator extends JPanel implements ActionListener{
 		 }
 		 if(e.getActionCommand().equals("log")) {
 			 double num1=Double.parseDouble(str2);
-			 if(num1<0) {
+			 if(num1<=0) {
 				 label1.setText("log("+num1+")");
 				 label2.setText("鏃犳晥杈撳叆锛�");
 			 }
@@ -171,8 +171,8 @@ public class KeXueCalculator extends JPanel implements ActionListener{
 		 }
 		 if(e.getActionCommand().equals("ln")) {
 			 double num1=Double.parseDouble(str2);
-			 if(num1<0) {
-				 label1.setText("log("+num1+")");
+			 if(num1<=0) {
+				 label1.setText("ln("+num1+")");
 				 label2.setText("鏃犳晥杈撳叆锛�");
 			 }
 			 else {
-- 
Gitee


From 357b1d8fa0cadbee15f179cccfe35b253c63ad20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E7=A1=95?= <mu'zi@LAPTOP-1G36GT8Q>
Date: Thu, 10 Jun 2021 13:52:48 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E4=B8=80?=
 =?UTF-8?q?=E4=BA=9B=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/java2020spring/KeXueCalculator.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/java2020spring/KeXueCalculator.java b/src/java2020spring/KeXueCalculator.java
index f848e1b..d52651c 100644
--- a/src/java2020spring/KeXueCalculator.java
+++ b/src/java2020spring/KeXueCalculator.java
@@ -176,7 +176,7 @@ public class KeXueCalculator extends JPanel implements ActionListener{
 				 label2.setText("鏃犳晥杈撳叆锛�");
 			 }
 			 else {
-			 str1="log("+num1+")";
+			 str1="ln("+num1+")";
 			 label1.setText(str1);
 			 double num2=Math.log(num1);
 			 str2=String.valueOf(num2);
-- 
Gitee


From b7c204073f97d0b90f392c96176db24f5847a8c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E7=A1=95?= <mu'zi@LAPTOP-1G36GT8Q>
Date: Thu, 10 Jun 2021 18:01:11 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E4=B8=80?=
 =?UTF-8?q?=E4=BA=9B=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/java2020spring/KeXueCalculator.java  | 10 +++++-----
 src/java2020spring/WindowCalculator.java |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/java2020spring/KeXueCalculator.java b/src/java2020spring/KeXueCalculator.java
index d52651c..eefd3ba 100644
--- a/src/java2020spring/KeXueCalculator.java
+++ b/src/java2020spring/KeXueCalculator.java
@@ -204,23 +204,23 @@ public class KeXueCalculator extends JPanel implements ActionListener{
 		}catch(Exception exp) {}
 }
 	public double Calculate(String str) {  
-		try{int index = str.indexOf("锛�");
+		try{int index = str.lastIndexOf("锛�");
 		     if(index!=-1) {
 		     return Calculate(str.substring(0, index))+Calculate(str.substring(index + 1));
 		 }
-		  index=str.indexOf("锛�");
+		  index=str.lastIndexOf("锛�");
 		  if(index!=-1) {
 			  return Calculate(str.substring(0, index))-Calculate(str.substring(index + 1));
 		}
-		  index=str.indexOf("脳");
+		  index=str.lastIndexOf("脳");
 		  if(index!=-1) {
 			  return Calculate(str.substring(0, index))*Calculate(str.substring(index + 1));
 		  }
-		  index=str.indexOf("梅");
+		  index=str.lastIndexOf("梅");
 		  if(index!=-1) {
 			  return Calculate(str.substring(0, index))/Calculate(str.substring(index + 1));
 			  }
-		  index=str.indexOf("^");
+		  index=str.lastIndexOf("^");
 		  if(index!=-1) {
 			  return Exponential(Double.valueOf(str.substring(0,index)),Double.valueOf(str.substring(index + 1)));  //璋冪敤Exponential杩欎釜鏂规硶锛屽皢x^y鐨剎鍜寉浼犵粰璇ユ柟娉曚腑鐩稿簲鐨勫弬鏁�
 		  }
diff --git a/src/java2020spring/WindowCalculator.java b/src/java2020spring/WindowCalculator.java
index 034ab8c..651448e 100644
--- a/src/java2020spring/WindowCalculator.java
+++ b/src/java2020spring/WindowCalculator.java
@@ -161,19 +161,19 @@ public class WindowCalculator extends JPanel implements ActionListener{
 }
 	//瀹炵幇杩愮畻鎸夐挳
 	public double Calculate(String str) {
-		try{int index = str.indexOf("锛�");
+		try{int index = str.lastIndexOf("锛�");
 		 if(index!=-1) {
 		      return Calculate(str.substring(0, index))+Calculate(str.substring(index + 1));
 		 }
-		  index=str.indexOf("锛�");
+		  index=str.lastIndexOf("锛�");
 		  if(index!=-1) {
 			  return Calculate(str.substring(0, index))-Calculate(str.substring(index + 1));
 		}
-		  index=str.indexOf("脳");
+		  index=str.lastIndexOf("脳");
 		  if(index!=-1) {
 			  return Calculate(str.substring(0, index))*Calculate(str.substring(index + 1));
 		  }
-		  index=str.indexOf("梅");
+		  index=str.lastIndexOf("梅");
 		  if(index!=-1) {
 			  return Calculate(str.substring(0, index))/Calculate(str.substring(index + 1));
 			  }
-- 
Gitee