From 1b209e712586d1d15e4fcef55bdbfb959c74e5fb Mon Sep 17 00:00:00 2001 From: Rong-Eru027 <2198183021@qq.com> Date: Tue, 31 May 2022 10:48:06 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/calculatorRw/Start.java | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 src/calculatorRw/Start.java diff --git a/src/calculatorRw/Start.java b/src/calculatorRw/Start.java new file mode 100644 index 0000000..334edd5 --- /dev/null +++ b/src/calculatorRw/Start.java @@ -0,0 +1,10 @@ +package calculatorRw; + +public class Start { + + public static void main(String[] args) { + // TODO 自动生成的方法存根 + System.out.println("test"); + } + +} -- Gitee From dd4d336548e8c484f0ae5b8c095b96b4c2ae3397 Mon Sep 17 00:00:00 2001 From: Rong-Eru027 <2198183021@qq.com> Date: Tue, 31 May 2022 10:50:13 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/calculatorRw/Start.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/calculatorRw/Start.java b/src/calculatorRw/Start.java index 334edd5..577e752 100644 --- a/src/calculatorRw/Start.java +++ b/src/calculatorRw/Start.java @@ -5,6 +5,7 @@ public class Start { public static void main(String[] args) { // TODO 自动生成的方法存根 System.out.println("test"); + System.out.println("test"); } } -- Gitee From b8cefa47a84e71a3d2d55bccf938d3f617518c30 Mon Sep 17 00:00:00 2001 From: Rong-Eru027 <2198183021@qq.com> Date: Tue, 31 May 2022 10:51:26 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E6=B5=8B=E8=AF=953?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/calculatorRw/Start.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/calculatorRw/Start.java b/src/calculatorRw/Start.java index 577e752..710fa0b 100644 --- a/src/calculatorRw/Start.java +++ b/src/calculatorRw/Start.java @@ -6,6 +6,7 @@ public class Start { // TODO 自动生成的方法存根 System.out.println("test"); System.out.println("test"); + System.out.println("test"); } } -- Gitee From 32abe2e327187d33d7be02ef5c1daa12559a0d08 Mon Sep 17 00:00:00 2001 From: Rong-Eru027 <2198183021@qq.com> Date: Tue, 31 May 2022 10:51:59 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E6=B5=8B=E8=AF=95222?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/calculatorRw/Start.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calculatorRw/Start.java b/src/calculatorRw/Start.java index 710fa0b..e8cf440 100644 --- a/src/calculatorRw/Start.java +++ b/src/calculatorRw/Start.java @@ -6,7 +6,7 @@ public class Start { // TODO 自动生成的方法存根 System.out.println("test"); System.out.println("test"); - System.out.println("test"); + System.out.println("tet"); } } -- Gitee From 071b51e212060bd70e545d40177c0ff36b8c8580 Mon Sep 17 00:00:00 2001 From: Rong-Eru027 <2198183021@qq.com> Date: Tue, 31 May 2022 11:00:07 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E5=88=9D=E7=89=88=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E6=9C=BA-=E5=AE=B9=E4=B8=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/calculatorRw/Start.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/calculatorRw/Start.java b/src/calculatorRw/Start.java index e8cf440..81d9558 100644 --- a/src/calculatorRw/Start.java +++ b/src/calculatorRw/Start.java @@ -1,12 +1,7 @@ package calculatorRw; public class Start { - - public static void main(String[] args) { - // TODO 自动生成的方法存根 - System.out.println("test"); - System.out.println("test"); - System.out.println("tet"); - } - + public static void main(String[] args) { + new RWCalculator(); + } } -- Gitee From 01eb1b81101070afa81be3f4727de2d9e9de3fe4 Mon Sep 17 00:00:00 2001 From: Rong-Eru027 <2198183021@qq.com> Date: Tue, 31 May 2022 18:05:49 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E6=B5=8B=E8=AF=952?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/calculatorRw/RWCalculator.java | 232 +++++++++++++++++++++++++++++ 1 file changed, 232 insertions(+) create mode 100644 src/calculatorRw/RWCalculator.java diff --git a/src/calculatorRw/RWCalculator.java b/src/calculatorRw/RWCalculator.java new file mode 100644 index 0000000..32e79eb --- /dev/null +++ b/src/calculatorRw/RWCalculator.java @@ -0,0 +1,232 @@ +package calculatorRw; + +//娴嬭瘯1 +import javax.swing.*; +import java.awt.*; +import java.awt.Font; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.text.DecimalFormat; //璁＄畻缁撴灉淇濈暀3浣嶅皬鏁颁娇鐢 + +public class RWCalculator extends JFrame implements ActionListener { + JFrame jf = new JFrame(); + String[] keys = {"%","CE","C","Back","1/x","X^2","鈭歺","梅","7","8","9","X","4","5","6","-","1","2","3","+","+/-","0",".","="}; + //璁＄畻鍣ㄤ笂鍚勬寜閿殑鍚嶅瓧 + JButton buttons[] = new JButton[keys.length]; //璁＄畻鍣ㄤ笂鎸夐敭鐨勬寜閽 娣诲姞锛坘ey.length锛変釜鏁颁釜鎸夐敭 + JTextField resultText = new JTextField("0"); //鏄剧ず璁＄畻缁撴灉鏂囨湰妗 + boolean firstDigit = true; // 鏍囧織鐢ㄦ埛鎸夌殑鏄惁鏄暣涓〃杈惧紡鐨勭涓涓暟瀛,鎴栬呮槸杩愮畻绗﹀悗鐨勭涓涓暟瀛 + double resultNumber = 0.000; // 璁＄畻鐨勪腑闂寸粨鏋 + String operator = "="; // 褰撳墠杩愮畻鐨勮繍绠楃锛堟寜"C"鏃堕渶瑕佸皢鍏惰繕鍘熶负"="锛 + boolean operateValidFlag = true; // 鍒ゆ柇鎿嶄綔鏄惁鍚堟硶 + + //鏋勯犲嚱鏁 + public RWCalculator() { + init(); // 鍒濆鍖栬绠楀櫒 + jf.setTitle("RW-璁＄畻鍣"); //璁＄畻鍣ㄥ懡鍚 + jf.setSize(400, 550); //绐楀彛闀垮 闀550 瀹400 + jf.setLocation(700, 200); //绐楀彛鍑虹幇浣嶇疆锛700锛200锛 灞忓箷鍙充晶 + + JMenuBar jMenuBar = new JMenuBar(); + JMenu jm = new JMenu("鏌ョ湅(V)"); + JMenu jm1 = new JMenu("缂栬緫(E)"); + JMenu jm2 = new JMenu("甯姪(H)"); + jMenuBar.add(jm); + jMenuBar.add(jm1); + jMenuBar.add(jm2); + this.setJMenuBar(jMenuBar); + + jf.setResizable(true); // 鍙互淇敼璁＄畻鍣ㄧ獥鍙ｅぇ灏 + jf.setVisible(true); //绐楀彛鍙 + + jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + } + + //鍒濆鍖栬绠楀櫒 + private void init() { + Color color1 = new Color(64,64,64); //娣辩伆鑹 + Color color2 = new Color(255,130,10); //姗欒壊 255 200 0 + Color color3 = new Color(130,130,130); //鐏拌壊 192 192 192 + Color color4 = new Color(50,50,50); //榛戣壊 + Color color5 = new Color(192,192,192); //娴呯伆鑹 + + JPanel textPanel = new JPanel(); // 寤虹珛涓涓敾鏉挎斁鏂囨湰妗 + textPanel.setLayout(new BorderLayout()); //杈圭晫甯冨眬 + textPanel.add(resultText); + resultText.setFont(new Font("榛戜綋",Font.BOLD,50)); //Font mf = new Font(String 瀛椾綋锛宨nt 椋庢牸锛宨nt 瀛楀彿) + resultText.setForeground(Color.WHITE); //璁剧疆瀛椾綋棰滆壊涓虹櫧鑹 + resultText.setHorizontalAlignment(JTextField.RIGHT); //鏂囨湰妗嗕腑鐨勫唴瀹归噰鐢ㄥ彸瀵归綈 + resultText.setEditable(false); //涓嶈兘淇敼缁撴灉鏂囨湰妗 + resultText.setBorder(null); //鍒犻櫎鏂囨湰妗嗙殑杈规 + resultText.setBackground(color4); // 璁剧疆鏂囨湰妗嗚儗鏅鑹 + + JPanel keysPanel = new JPanel(); // 鍒濆鍖栬绠楀櫒涓婇敭鐨勬寜閽紝灏嗛敭鏀惧湪涓涓敾鏉垮唴 + keysPanel.setLayout(new GridLayout(6, 4, 2, 2)); // 鐢ㄧ綉鏍煎竷灞鍣紝6琛岋紝4鍒楃殑缃戞牸锛岀綉鏍间箣闂寸殑姘村钩鏂瑰悜鍨傜洿鏂瑰悜闂撮殧鍧囦负2涓儚绱 + for(int i = 0; i < keys.length; i++) { //鍒濆鍖栧姛鑳芥寜閽 + buttons[i] = new JButton(keys[i]); + buttons[1].setBackground(Color.WHITE); + buttons[i].setForeground(Color.black); + buttons[i].setFont(new Font("榛戜綋", Font.PLAIN, 18)); //Font mf = new Font(String 瀛椾綋锛宨nt 椋庢牸锛宨nt 瀛楀彿) + buttons[i].setBorderPainted(true); //淇濈暀鎸夐挳鐨勮竟妗 + keysPanel.add(buttons[i]); + } + + //鍒濆鍖栬繍绠楃鍙婃暟瀛楅敭鎸夐挳 + keysPanel.setBackground(color1); //鎸夐敭澶栨璁剧疆棰滆壊 + jf.getContentPane().add("North", textPanel);//灏唗extPanel闈㈡澘鏀惧湪鍖楅儴 + jf.getContentPane().add("Center", keysPanel);//灏唊eysPanel闈㈡澘鏀惧湪涓儴 + textPanel.setBorder(BorderFactory.createMatteBorder(5,3,1,4,color1));//璁剧疆涓や釜闈㈡澘鐨勮竟妗 + keysPanel.setBorder(BorderFactory.createMatteBorder(1,1,3,3,color4)); + + + // 涓哄悇鎸夐挳娣诲姞浜嬩欢鐩戝惉鍣 + for (int i = 0; i < keys.length; i++) { + buttons[i].addActionListener(this); + } + } + + //浠庢枃鏈涓幏鍙栨暟瀛 + private double getNumberFromText() { + double result = 0; + try{ + result = Double.valueOf(resultText.getText()).doubleValue(); + } + catch (NumberFormatException e){ + } + return result; + } + + public void actionPerformed(ActionEvent ev) { + String command = ev.getActionCommand(); // 鑾峰彇浜嬩欢婧 + if (command.equals(keys[3])) { + // 鐢ㄦ埛鎸変簡"Back"閿 + doBack(); + } else if (command.equals(keys[1])) { + // 鐢ㄦ埛鎸変簡"CE"閿 + resultText.setText("0"); + } else if (command.equals(keys[2])) { + // 鐢ㄦ埛鎸変簡"C"閿 + doC(); + } else if ("0123456789.".indexOf(command) >= 0) { + // 鐢ㄦ埛鎸変簡鏁板瓧閿垨鑰呭皬鏁扮偣閿 + doNumber(command); + } else if(command.equals(keys[0]) || command.equals(keys[4]) || command.equals(keys[5]) || + command.equals(keys[6]) || command.equals(keys[20])) { + // 鐢ㄦ埛鎸変簡鍙渶涓涓暟鐨勮繍绠楅敭 + do1(command); + } else { + do2(command); + } + } + + //back閿 + private void doBack() { + String text = resultText.getText(); + int i = text.length(); + if (i > 0) { + text = text.substring(0, i - 1); // 閫鏍硷紝灏嗘枃鏈渶鍚庝竴涓瓧绗﹀幓鎺 + if (text.length() == 0) { + // 濡傛灉鏂囨湰娌℃湁鍐呭浜嗭紝鍒欏垵濮嬪寲璁＄畻鍣ㄧ殑鍚勭鍊 + resultText.setText("0"); + firstDigit = true; + operator = "="; + } else { + // 鏄剧ず鏂扮殑鏂囨湰 + resultText.setText(text); + } + } + } + + //C閿 + private void doC() { + // 鍒濆鍖栬绠楀櫒鐨勫悇绉嶅 + resultText.setText("0"); + firstDigit = true; + operator = "="; + } + + //鏁板瓧閿 + private void doNumber(String key) { + if (firstDigit) { + // 杈撳叆鐨勪负绗竴涓暟 + resultText.setText(key); + } else if ((key.equals(".")) && (resultText.getText().indexOf(".") < 0)) { + // 杈撳叆鐨勬槸灏忔暟鐐癸紝骞朵笖涔嬪墠娌℃湁灏忔暟鐐癸紝鍒欏皢灏忔暟鐐归檮鍦ㄧ粨鏋滄枃鏈鐨勫悗闈 + resultText.setText(resultText.getText() + "."); + } else if (!key.equals(".")) { + // 濡傛灉杈撳叆鐨勪笉鏄皬鏁扮偣锛屽垯灏嗘暟瀛楅檮鍦ㄧ粨鏋滄枃鏈鐨勫悗闈 + resultText.setText(resultText.getText() + key); + } + firstDigit = false; + } + + //鍙渶涓涓暟鐨勮繍绠 + private void do1(String key) { + operator = key; // 杩愮畻绗︿负鐢ㄦ埛鎸夌殑鎸夐挳 + if (operator.equals("1/x")) { + // 鍊掓暟杩愮畻 + if (resultNumber == 0) { + operateValidFlag = false; //鎿嶄綔閿欒 + resultText.setText("鎿嶄綔閿欒,0娌℃湁鍊掓暟"); + } else { + resultNumber = 1 / getNumberFromText(); + } + } + else if (operator.equals("鈭歺")) { + // 骞虫柟鏍 + if (resultNumber < 0) { + operateValidFlag = false; //鎿嶄綔閿欒 + resultText.setText("鎿嶄綔閿欒,璐熸暟涓嶈兘寮鏍瑰彿"); + } else { + resultNumber = Math.sqrt(getNumberFromText()); + } + } + else if (operator.equals("X虏")) { + // 骞虫柟 + resultNumber = getNumberFromText()*getNumberFromText(); + } + else if (operator.equals("%")) { + // 闄や互100 + resultNumber = getNumberFromText() / 100; + } + else if (operator.equals("+/-")) { + // 姝ｈ礋鏁拌浆鍖 + resultNumber = getNumberFromText() * (-1); + if (operateValidFlag) { + resultText.setText(String.valueOf(new DecimalFormat("0.000").format(resultNumber)));//淇濈暀灏忔暟鐐瑰悗3浣 + } + firstDigit = true; + operateValidFlag = true; + } + } + + //闇瑕佷袱涓暟鐨勮繍绠 + private void do2(String key) { + if (operator.equals("梅")) { + // 闄ゆ硶 + // 濡傛灉褰撳墠缁撴灉鏂囨湰妗嗕腑鐨勫肩瓑浜0 + if (getNumberFromText() == 0.0) { + operateValidFlag = false; //鎿嶄綔閿欒 + resultText.setText("鎿嶄綔閿欒,闄ゆ暟涓嶈兘涓洪浂"); + } else { + resultNumber /= getNumberFromText(); + } + } else if (operator.equals("+")) { + // 鍔犳硶 + resultNumber += getNumberFromText(); + } else if (operator.equals("-")) { + // 鍑忔硶 + resultNumber -= getNumberFromText(); + } else if (operator.equals("X")) { + // 涔樻硶 + resultNumber *= getNumberFromText(); + } else if (operator.equals("=")) { + resultNumber = getNumberFromText(); + } + if (operateValidFlag) { + resultText.setText(String.valueOf(new DecimalFormat("0.000").format(resultNumber)));//淇濈暀3浣嶅皬鏁 + } + operator = key; // 杩愮畻绗︿负鐢ㄦ埛鎸夌殑鎸夐挳 + firstDigit = true; + operateValidFlag = true; + } +} -- Gitee From 3f4c557f7ad2883cd13e1437dc2b23989f493945 Mon Sep 17 00:00:00 2001 From: Rong-Eru027 <2198183021@qq.com> Date: Wed, 1 Jun 2022 13:24:43 +0800 Subject: [PATCH 07/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/calculatorRw/RWCalculator.java | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/calculatorRw/RWCalculator.java b/src/calculatorRw/RWCalculator.java index 32e79eb..73a3419 100644 --- a/src/calculatorRw/RWCalculator.java +++ b/src/calculatorRw/RWCalculator.java @@ -44,10 +44,10 @@ public class RWCalculator extends JFrame implements ActionListener { //鍒濆鍖栬绠楀櫒 private void init() { Color color1 = new Color(64,64,64); //娣辩伆鑹 - Color color2 = new Color(255,130,10); //姗欒壊 255 200 0 - Color color3 = new Color(130,130,130); //鐏拌壊 192 192 192 + Color color2 = new Color(245,120,10); //姗欒壊 255 130 10 + Color color3 = new Color(120,120,120); //鐏拌壊 192 192 192 Color color4 = new Color(50,50,50); //榛戣壊 - Color color5 = new Color(192,192,192); //娴呯伆鑹 + Color color5 = new Color(150,150,150); //娴呯伆鑹 JPanel textPanel = new JPanel(); // 寤虹珛涓涓敾鏉挎斁鏂囨湰妗 textPanel.setLayout(new BorderLayout()); //杈圭晫甯冨眬 @@ -63,8 +63,17 @@ public class RWCalculator extends JFrame implements ActionListener { keysPanel.setLayout(new GridLayout(6, 4, 2, 2)); // 鐢ㄧ綉鏍煎竷灞鍣紝6琛岋紝4鍒楃殑缃戞牸锛岀綉鏍间箣闂寸殑姘村钩鏂瑰悜鍨傜洿鏂瑰悜闂撮殧鍧囦负2涓儚绱 for(int i = 0; i < keys.length; i++) { //鍒濆鍖栧姛鑳芥寜閽 buttons[i] = new JButton(keys[i]); - buttons[1].setBackground(Color.WHITE); - buttons[i].setForeground(Color.black); + + if(i==0||i==1||i==2||i==4||i==5||i==6) { + buttons[i].setBackground(color3); + } + else if(i==3||i==7||i==11||i==15||i==19||i==23) { + buttons[i].setBackground(color2); + } + else if(i==8||i==9||i==10||i==12||i==13||i==14||i==16||i==17||i==18||i==20||i==21||i==22) { + buttons[i].setBackground(color5); + } + buttons[i].setForeground(Color.white); buttons[i].setFont(new Font("榛戜綋", Font.PLAIN, 18)); //Font mf = new Font(String 瀛椾綋锛宨nt 椋庢牸锛宨nt 瀛楀彿) buttons[i].setBorderPainted(true); //淇濈暀鎸夐挳鐨勮竟妗 keysPanel.add(buttons[i]); -- Gitee From 6a1bb1910fb917285fdef37a30d8556af048212d Mon Sep 17 00:00:00 2001 From: Rong-Eru027 <2198183021@qq.com> Date: Thu, 2 Jun 2022 16:14:45 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BE=A7=E8=BE=B9?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E9=94=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/calculatorRw/RWCalculator.java | 39 ++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/src/calculatorRw/RWCalculator.java b/src/calculatorRw/RWCalculator.java index 73a3419..9fb6b49 100644 --- a/src/calculatorRw/RWCalculator.java +++ b/src/calculatorRw/RWCalculator.java @@ -16,6 +16,7 @@ public class RWCalculator extends JFrame implements ActionListener { JTextField resultText = new JTextField("0"); //鏄剧ず璁＄畻缁撴灉鏂囨湰妗 boolean firstDigit = true; // 鏍囧織鐢ㄦ埛鎸夌殑鏄惁鏄暣涓〃杈惧紡鐨勭涓涓暟瀛,鎴栬呮槸杩愮畻绗﹀悗鐨勭涓涓暟瀛 double resultNumber = 0.000; // 璁＄畻鐨勪腑闂寸粨鏋 + JMenuBar jMenuBar = new JMenuBar(); String operator = "="; // 褰撳墠杩愮畻鐨勮繍绠楃锛堟寜"C"鏃堕渶瑕佸皢鍏惰繕鍘熶负"="锛 boolean operateValidFlag = true; // 鍒ゆ柇鎿嶄綔鏄惁鍚堟硶 @@ -26,15 +27,6 @@ public class RWCalculator extends JFrame implements ActionListener { jf.setSize(400, 550); //绐楀彛闀垮 闀550 瀹400 jf.setLocation(700, 200); //绐楀彛鍑虹幇浣嶇疆锛700锛200锛 灞忓箷鍙充晶 - JMenuBar jMenuBar = new JMenuBar(); - JMenu jm = new JMenu("鏌ョ湅(V)"); - JMenu jm1 = new JMenu("缂栬緫(E)"); - JMenu jm2 = new JMenu("甯姪(H)"); - jMenuBar.add(jm); - jMenuBar.add(jm1); - jMenuBar.add(jm2); - this.setJMenuBar(jMenuBar); - jf.setResizable(true); // 鍙互淇敼璁＄畻鍣ㄧ獥鍙ｅぇ灏 jf.setVisible(true); //绐楀彛鍙 @@ -52,7 +44,7 @@ public class RWCalculator extends JFrame implements ActionListener { JPanel textPanel = new JPanel(); // 寤虹珛涓涓敾鏉挎斁鏂囨湰妗 textPanel.setLayout(new BorderLayout()); //杈圭晫甯冨眬 textPanel.add(resultText); - resultText.setFont(new Font("榛戜綋",Font.BOLD,50)); //Font mf = new Font(String 瀛椾綋锛宨nt 椋庢牸锛宨nt 瀛楀彿) + resultText.setFont(new Font("榛戜綋",Font.BOLD,50)); //Font font = new Font(String 瀛椾綋锛宨nt 椋庢牸锛宨nt 瀛楀彿) resultText.setForeground(Color.WHITE); //璁剧疆瀛椾綋棰滆壊涓虹櫧鑹 resultText.setHorizontalAlignment(JTextField.RIGHT); //鏂囨湰妗嗕腑鐨勫唴瀹归噰鐢ㄥ彸瀵归綈 resultText.setEditable(false); //涓嶈兘淇敼缁撴灉鏂囨湰妗 @@ -60,7 +52,7 @@ public class RWCalculator extends JFrame implements ActionListener { resultText.setBackground(color4); // 璁剧疆鏂囨湰妗嗚儗鏅鑹 JPanel keysPanel = new JPanel(); // 鍒濆鍖栬绠楀櫒涓婇敭鐨勬寜閽紝灏嗛敭鏀惧湪涓涓敾鏉垮唴 - keysPanel.setLayout(new GridLayout(6, 4, 2, 2)); // 鐢ㄧ綉鏍煎竷灞鍣紝6琛岋紝4鍒楃殑缃戞牸锛岀綉鏍间箣闂寸殑姘村钩鏂瑰悜鍨傜洿鏂瑰悜闂撮殧鍧囦负2涓儚绱 + keysPanel.setLayout(new GridLayout(6, 4, 2, 2)); // 鐢ㄧ綉鏍煎竷灞锛6琛岋紝4鍒楃殑缃戞牸锛岀綉鏍间箣闂寸殑姘村钩鏂瑰悜鍨傜洿鏂瑰悜闂撮殧鍧囦负2涓儚绱 for(int i = 0; i < keys.length; i++) { //鍒濆鍖栧姛鑳芥寜閽 buttons[i] = new JButton(keys[i]); @@ -74,17 +66,38 @@ public class RWCalculator extends JFrame implements ActionListener { buttons[i].setBackground(color5); } buttons[i].setForeground(Color.white); - buttons[i].setFont(new Font("榛戜綋", Font.PLAIN, 18)); //Font mf = new Font(String 瀛椾綋锛宨nt 椋庢牸锛宨nt 瀛楀彿) + buttons[i].setFont(new Font("榛戜綋", Font.PLAIN, 18)); //Font font = new Font(String 瀛椾綋锛宨nt 椋庢牸锛宨nt 瀛楀彿) buttons[i].setBorderPainted(true); //淇濈暀鎸夐挳鐨勮竟妗 keysPanel.add(buttons[i]); } + JPanel menuPanel = new JPanel(); + menuPanel.setLayout(new FlowLayout(FlowLayout.LEFT)); + JMenu menu1 = new JMenu("杞崲鍣"); + JMenuItem item1 = new JMenuItem("鏃堕棿"); + JMenuItem item2 = new JMenuItem("闀垮害"); + JMenuItem item3 = new JMenuItem("娓╁害"); + menu1.add(item1); + menu1.add(item2); + menu1.add(item3); + jMenuBar.add(menu1); + menuPanel.add(jMenuBar); + menu1.setFont(new Font("榛戜綋",Font.PLAIN,15)); + menu1.setForeground(Color.white); //璁剧疆瀛椾綋棰滆壊涓虹櫧鑹 + jMenuBar.setBackground(color4); + menuPanel.setBackground(color4); + menu1.setBorder(null); //鍒犻櫎鏂囨湰妗嗙殑杈规 + + + //鍒濆鍖栬繍绠楃鍙婃暟瀛楅敭鎸夐挳 keysPanel.setBackground(color1); //鎸夐敭澶栨璁剧疆棰滆壊 jf.getContentPane().add("North", textPanel);//灏唗extPanel闈㈡澘鏀惧湪鍖楅儴 jf.getContentPane().add("Center", keysPanel);//灏唊eysPanel闈㈡澘鏀惧湪涓儴 - textPanel.setBorder(BorderFactory.createMatteBorder(5,3,1,4,color1));//璁剧疆涓や釜闈㈡澘鐨勮竟妗 + jf.getContentPane().add("West", menuPanel);//灏唊eysPanel闈㈡澘鏀惧湪鍖楅儴 + textPanel.setBorder(BorderFactory.createMatteBorder(5,3,1,4,color1));//璁剧疆闈㈡澘鐨勮竟妗 keysPanel.setBorder(BorderFactory.createMatteBorder(1,1,3,3,color4)); + menuPanel.setBorder(BorderFactory.createMatteBorder(1,1,3,3,color4)); // 涓哄悇鎸夐挳娣诲姞浜嬩欢鐩戝惉鍣 -- Gitee From c4c03c4eb9ca2699a10bedb1a809932f462bebdb Mon Sep 17 00:00:00 2001 From: Rong-Eru027 <2198183021@qq.com> Date: Fri, 3 Jun 2022 11:31:21 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BE=A7=E8=BE=B9?= =?UTF-8?q?=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/calculatorRw/RWCalculator.java | 55 ++++++++++++++++++------------ 1 file changed, 34 insertions(+), 21 deletions(-) diff --git a/src/calculatorRw/RWCalculator.java b/src/calculatorRw/RWCalculator.java index 9fb6b49..823db44 100644 --- a/src/calculatorRw/RWCalculator.java +++ b/src/calculatorRw/RWCalculator.java @@ -71,39 +71,32 @@ public class RWCalculator extends JFrame implements ActionListener { keysPanel.add(buttons[i]); } - JPanel menuPanel = new JPanel(); - menuPanel.setLayout(new FlowLayout(FlowLayout.LEFT)); - JMenu menu1 = new JMenu("杞崲鍣"); - JMenuItem item1 = new JMenuItem("鏃堕棿"); - JMenuItem item2 = new JMenuItem("闀垮害"); - JMenuItem item3 = new JMenuItem("娓╁害"); - menu1.add(item1); - menu1.add(item2); - menu1.add(item3); - jMenuBar.add(menu1); - menuPanel.add(jMenuBar); - menu1.setFont(new Font("榛戜綋",Font.PLAIN,15)); - menu1.setForeground(Color.white); //璁剧疆瀛椾綋棰滆壊涓虹櫧鑹 - jMenuBar.setBackground(color4); - menuPanel.setBackground(color4); - menu1.setBorder(null); //鍒犻櫎鏂囨湰妗嗙殑杈规 - + JPanel buttonChangePanel = new JPanel(); + buttonChangePanel.setLayout(new FlowLayout(FlowLayout.LEFT)); + JButton buttonChange = new JButton("杩涘埗杞寲"); + buttonChangePanel.add(buttonChange); + buttonChange.setFont(new Font("榛戜綋",Font.PLAIN,10)); + buttonChange.setForeground(Color.white); + buttonChange.setBackground(color4); + buttonChangePanel.setBackground(color4); + buttonChange.setBorderPainted(true); //淇濈暀鎸夐挳鐨勮竟妗 //鍒濆鍖栬繍绠楃鍙婃暟瀛楅敭鎸夐挳 keysPanel.setBackground(color1); //鎸夐敭澶栨璁剧疆棰滆壊 jf.getContentPane().add("North", textPanel);//灏唗extPanel闈㈡澘鏀惧湪鍖楅儴 jf.getContentPane().add("Center", keysPanel);//灏唊eysPanel闈㈡澘鏀惧湪涓儴 - jf.getContentPane().add("West", menuPanel);//灏唊eysPanel闈㈡澘鏀惧湪鍖楅儴 + jf.getContentPane().add("West", buttonChangePanel);//灏唊eysPanel闈㈡澘鏀惧湪鍖楅儴 textPanel.setBorder(BorderFactory.createMatteBorder(5,3,1,4,color1));//璁剧疆闈㈡澘鐨勮竟妗 keysPanel.setBorder(BorderFactory.createMatteBorder(1,1,3,3,color4)); - menuPanel.setBorder(BorderFactory.createMatteBorder(1,1,3,3,color4)); - + buttonChangePanel.setBorder(BorderFactory.createMatteBorder(1,1,3,3,color4)); + // 涓哄悇鎸夐挳娣诲姞浜嬩欢鐩戝惉鍣 for (int i = 0; i < keys.length; i++) { buttons[i].addActionListener(this); } + buttonChange.addActionListener(this); } //浠庢枃鏈涓幏鍙栨暟瀛 @@ -135,7 +128,26 @@ public class RWCalculator extends JFrame implements ActionListener { command.equals(keys[6]) || command.equals(keys[20])) { // 鐢ㄦ埛鎸変簡鍙渶涓涓暟鐨勮繍绠楅敭 do1(command); - } else { + } + + else if ("杩涘埗杞寲".indexOf(command) >= 0) { + // 鐢ㄦ埛鎸変簡鏁板瓧閿垨鑰呭皬鏁扮偣閿 + JDialog frameChange = new JDialog();//鏋勯犱竴涓柊鐨凧Frame锛屼綔涓烘柊绐楀彛銆 + frameChange.setTitle("杩涘埗杞寲"); //璁＄畻鍣ㄥ懡鍚 + frameChange.setSize(400, 250); //绐楀彛闀垮 闀550 瀹400 + frameChange.setLocation(1100, 200); //绐楀彛鍑虹幇浣嶇疆锛700锛200锛 灞忓箷鍙充晶 + frameChange.setResizable(true); // 鍙互淇敼璁＄畻鍣ㄧ獥鍙ｅぇ灏 + frameChange.setVisible(true); //绐楀彛鍙 + JLabel jl = new JLabel();// 娉ㄦ剰绫诲悕鍒啓閿欎簡銆 + frameChange.getContentPane().add(jl); + jl.setText("杩涘埗杞寲鏂囨湰"); + jl.setVerticalAlignment(JLabel.CENTER); + jl.setHorizontalAlignment(JLabel.CENTER);// 娉ㄦ剰鏂规硶鍚嶅埆鍐欓敊浜嗐 + // 鍙傛暟 APPLICATION_MODAL锛氶樆濉炲悓涓 Java 搴旂敤绋嬪簭涓殑鎵鏈夐《灞傜獥鍙(瀹冭嚜宸辩殑瀛愬眰娆 + frameChange.setModalityType(Dialog.ModalityType.APPLICATION_MODAL); // 璁剧疆妯″紡绫诲瀷銆 + } + + else { do2(command); } } @@ -252,3 +264,4 @@ public class RWCalculator extends JFrame implements ActionListener { operateValidFlag = true; } } + -- Gitee From 2383689e90608774b426ad9529b4010d567b2042 Mon Sep 17 00:00:00 2001 From: Rong-Eru027 <2198183021@qq.com> Date: Sat, 4 Jun 2022 11:48:15 +0800 Subject: [PATCH 10/15] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E6=8C=89=E9=94=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/calculatorRw/RWCalculator.java | 190 ++++++++++++++++++++++++++--- 1 file changed, 176 insertions(+), 14 deletions(-) diff --git a/src/calculatorRw/RWCalculator.java b/src/calculatorRw/RWCalculator.java index 823db44..37b2127 100644 --- a/src/calculatorRw/RWCalculator.java +++ b/src/calculatorRw/RWCalculator.java @@ -72,16 +72,51 @@ public class RWCalculator extends JFrame implements ActionListener { } JPanel buttonChangePanel = new JPanel(); - buttonChangePanel.setLayout(new FlowLayout(FlowLayout.LEFT)); + buttonChangePanel.setLayout(new GridLayout(6, 4, 2, 2)); + buttonChangePanel.setBackground(color4); + JButton buttonChange = new JButton("杩涘埗杞寲"); buttonChangePanel.add(buttonChange); buttonChange.setFont(new Font("榛戜綋",Font.PLAIN,10)); buttonChange.setForeground(Color.white); buttonChange.setBackground(color4); - buttonChangePanel.setBackground(color4); buttonChange.setBorderPainted(true); //淇濈暀鎸夐挳鐨勮竟妗 + JButton buttonChange2 = new JButton("娓╁害杞寲"); + buttonChangePanel.add(buttonChange2); + buttonChange2.setFont(new Font("榛戜綋",Font.PLAIN,10)); + buttonChange2.setForeground(Color.white); + buttonChange2.setBackground(color4); + buttonChange2.setBorderPainted(true); //淇濈暀鎸夐挳鐨勮竟妗 + + JButton buttonChange3 = new JButton("闀垮害杞寲"); + buttonChangePanel.add(buttonChange3); + buttonChange3.setFont(new Font("榛戜綋",Font.PLAIN,10)); + buttonChange3.setForeground(Color.white); + buttonChange3.setBackground(color4); + buttonChange3.setBorderPainted(true); //淇濈暀鎸夐挳鐨勮竟妗 + JButton buttonChange4 = new JButton("閲嶉噺杞寲"); + buttonChangePanel.add(buttonChange4); + buttonChange4.setFont(new Font("榛戜綋",Font.PLAIN,10)); + buttonChange4.setForeground(Color.white); + buttonChange4.setBackground(color4); + buttonChange4.setBorderPainted(true); //淇濈暀鎸夐挳鐨勮竟妗 + + JButton buttonChange5 = new JButton("鏃堕棿杞寲"); + buttonChangePanel.add(buttonChange5); + buttonChange5.setFont(new Font("榛戜綋",Font.PLAIN,10)); + buttonChange5.setForeground(Color.white); + buttonChange5.setBackground(color4); + buttonChange5.setBorderPainted(true); //淇濈暀鎸夐挳鐨勮竟妗 + + JButton buttonChange6 = new JButton("闈㈢Н杞寲"); + buttonChangePanel.add(buttonChange6); + buttonChange6.setFont(new Font("榛戜綋",Font.PLAIN,10)); + buttonChange6.setForeground(Color.white); + buttonChange6.setBackground(color4); + buttonChange6.setBorderPainted(true); //淇濈暀鎸夐挳鐨勮竟妗 + //鍒濆鍖栬繍绠楃鍙婃暟瀛楅敭鎸夐挳 keysPanel.setBackground(color1); //鎸夐敭澶栨璁剧疆棰滆壊 jf.getContentPane().add("North", textPanel);//灏唗extPanel闈㈡澘鏀惧湪鍖楅儴 @@ -97,6 +132,11 @@ public class RWCalculator extends JFrame implements ActionListener { buttons[i].addActionListener(this); } buttonChange.addActionListener(this); + buttonChange2.addActionListener(this); + buttonChange3.addActionListener(this); + buttonChange4.addActionListener(this); + buttonChange5.addActionListener(this); + buttonChange6.addActionListener(this); } //浠庢枃鏈涓幏鍙栨暟瀛 @@ -122,34 +162,145 @@ public class RWCalculator extends JFrame implements ActionListener { // 鐢ㄦ埛鎸変簡"C"閿 doC(); } else if ("0123456789.".indexOf(command) >= 0) { - // 鐢ㄦ埛鎸変簡鏁板瓧閿垨鑰呭皬鏁扮偣閿 doNumber(command); } else if(command.equals(keys[0]) || command.equals(keys[4]) || command.equals(keys[5]) || command.equals(keys[6]) || command.equals(keys[20])) { // 鐢ㄦ埛鎸変簡鍙渶涓涓暟鐨勮繍绠楅敭 do1(command); } - else if ("杩涘埗杞寲".indexOf(command) >= 0) { - // 鐢ㄦ埛鎸変簡鏁板瓧閿垨鑰呭皬鏁扮偣閿 - JDialog frameChange = new JDialog();//鏋勯犱竴涓柊鐨凧Frame锛屼綔涓烘柊绐楀彛銆 - frameChange.setTitle("杩涘埗杞寲"); //璁＄畻鍣ㄥ懡鍚 + doChange1(); + } + else if ("娓╁害杞寲".indexOf(command) >= 0) { + doChange2(); + } + else if ("闀垮害杞寲".indexOf(command) >= 0) { + doChange3(); + } + else if ("閲嶉噺杞寲".indexOf(command) >= 0) { + doChange4(); + } + else if ("鏃堕棿杞寲".indexOf(command) >= 0) { + doChange5(); + } + else if ("闈㈢Н杞寲".indexOf(command) >= 0) { + doChange6(); + } + else if ("浜岃繘鍒".indexOf(command) >= 0) { + do1(command); + } + else if ("鍏繘鍒".indexOf(command) >= 0) { + do1(command); + } + else if ("鍗佸叚杩涘埗".indexOf(command) >= 0) { + do1(command); + } + else { + do2(command); + } + } + //杩涘埗杞寲 + private void doChange1(){ + JDialog frameChange = new JDialog();//鏋勯犱竴涓柊鐨凧Frame锛屼綔涓烘柊绐楀彛銆 + frameChange.setTitle("鏃堕棿杞寲"); //璁＄畻鍣ㄥ懡鍚 + frameChange.setSize(350, 100); //绐楀彛闀垮 闀550 瀹400 + frameChange.setLocation(1100, 200); //绐楀彛鍑虹幇浣嶇疆锛700锛200锛 灞忓箷鍙充晶 + frameChange.setResizable(true); // 鍙互淇敼璁＄畻鍣ㄧ獥鍙ｅぇ灏 + frameChange.setVisible(true); //绐楀彛鍙 + JPanel panel = new JPanel(); + panel.setLayout(new GridLayout(1, 3, 1, 1)); + JButton button1 = new JButton("浜岃繘鍒"); + JButton button2 = new JButton("鍏繘鍒"); + JButton button3 = new JButton("鍗佸叚杩涘埗"); + panel.add(button1); + panel.add(button2); + panel.add(button3); + frameChange.add(panel); + button1.addActionListener(this); + button2.addActionListener(this); + button3.addActionListener(this); + } + + private void doChange2(){ + JDialog frameChange2 = new JDialog();//鏋勯犱竴涓柊鐨凧Frame锛屼綔涓烘柊绐楀彛銆 + frameChange2.setTitle("娓╁害杞寲"); //璁＄畻鍣ㄥ懡鍚 + frameChange2.setSize(400, 250); //绐楀彛闀垮 闀550 瀹400 + frameChange2.setLocation(1100, 200); //绐楀彛鍑虹幇浣嶇疆锛700锛200锛 灞忓箷鍙充晶 + frameChange2.setResizable(true); // 鍙互淇敼璁＄畻鍣ㄧ獥鍙ｅぇ灏 + frameChange2.setVisible(true); //绐楀彛鍙 + JLabel jl = new JLabel();// 娉ㄦ剰绫诲悕鍒啓閿欎簡銆 + frameChange2.getContentPane().add(jl); + jl.setText("娓╁害杞寲鏂囨湰"); + jl.setVerticalAlignment(JLabel.CENTER); + jl.setHorizontalAlignment(JLabel.CENTER);// 娉ㄦ剰鏂规硶鍚嶅埆鍐欓敊浜嗐 + // 鍙傛暟 APPLICATION_MODAL锛氶樆濉炲悓涓 Java 搴旂敤绋嬪簭涓殑鎵鏈夐《灞傜獥鍙(瀹冭嚜宸辩殑瀛愬眰娆 + frameChange2.setModalityType(Dialog.ModalityType.APPLICATION_MODAL); // 璁剧疆妯″紡绫诲瀷銆 + } + + private void doChange3(){ + JDialog frameChange = new JDialog();//鏋勯犱竴涓柊鐨凧Frame锛屼綔涓烘柊绐楀彛銆 + frameChange.setTitle("闀垮害杞寲"); //璁＄畻鍣ㄥ懡鍚 frameChange.setSize(400, 250); //绐楀彛闀垮 闀550 瀹400 frameChange.setLocation(1100, 200); //绐楀彛鍑虹幇浣嶇疆锛700锛200锛 灞忓箷鍙充晶 frameChange.setResizable(true); // 鍙互淇敼璁＄畻鍣ㄧ獥鍙ｅぇ灏 frameChange.setVisible(true); //绐楀彛鍙 JLabel jl = new JLabel();// 娉ㄦ剰绫诲悕鍒啓閿欎簡銆 frameChange.getContentPane().add(jl); - jl.setText("杩涘埗杞寲鏂囨湰"); + jl.setText("闀垮害杞寲鏂囨湰"); + jl.setVerticalAlignment(JLabel.CENTER); + jl.setHorizontalAlignment(JLabel.CENTER);// 娉ㄦ剰鏂规硶鍚嶅埆鍐欓敊浜嗐 + // 鍙傛暟 APPLICATION_MODAL锛氶樆濉炲悓涓 Java 搴旂敤绋嬪簭涓殑鎵鏈夐《灞傜獥鍙(瀹冭嚜宸辩殑瀛愬眰娆 + frameChange.setModalityType(Dialog.ModalityType.APPLICATION_MODAL); // 璁剧疆妯″紡绫诲瀷銆 + } + + private void doChange4(){ + JDialog frameChange = new JDialog();//鏋勯犱竴涓柊鐨凧Frame锛屼綔涓烘柊绐楀彛銆 + frameChange.setTitle("閲嶉噺杞寲"); //璁＄畻鍣ㄥ懡鍚 + frameChange.setSize(400, 250); //绐楀彛闀垮 闀550 瀹400 + frameChange.setLocation(1100, 200); //绐楀彛鍑虹幇浣嶇疆锛700锛200锛 灞忓箷鍙充晶 + frameChange.setResizable(true); // 鍙互淇敼璁＄畻鍣ㄧ獥鍙ｅぇ灏 + frameChange.setVisible(true); //绐楀彛鍙 + JLabel jl = new JLabel();// 娉ㄦ剰绫诲悕鍒啓閿欎簡銆 + frameChange.getContentPane().add(jl); + jl.setText("閲嶉噺杞寲鏂囨湰"); + jl.setVerticalAlignment(JLabel.CENTER); + jl.setHorizontalAlignment(JLabel.CENTER);// 娉ㄦ剰鏂规硶鍚嶅埆鍐欓敊浜嗐 + // 鍙傛暟 APPLICATION_MODAL锛氶樆濉炲悓涓 Java 搴旂敤绋嬪簭涓殑鎵鏈夐《灞傜獥鍙(瀹冭嚜宸辩殑瀛愬眰娆 + frameChange.setModalityType(Dialog.ModalityType.APPLICATION_MODAL); // 璁剧疆妯″紡绫诲瀷銆 + } + + private void doChange5(){ + JDialog frameChange = new JDialog();//鏋勯犱竴涓柊鐨凧Frame锛屼綔涓烘柊绐楀彛銆 + frameChange.setTitle("鏃堕棿杞寲"); //璁＄畻鍣ㄥ懡鍚 + frameChange.setSize(400, 250); //绐楀彛闀垮 闀550 瀹400 + frameChange.setLocation(1100, 200); //绐楀彛鍑虹幇浣嶇疆锛700锛200锛 灞忓箷鍙充晶 + frameChange.setResizable(true); // 鍙互淇敼璁＄畻鍣ㄧ獥鍙ｅぇ灏 + frameChange.setVisible(true); //绐楀彛鍙 + JPanel panel = new JPanel(); + panel.setLayout(new GridLayout(1, 3, 2, 2)); + JButton button1 = new JButton("浜岃繘鍒"); + JButton button2 = new JButton("鍏繘鍒"); + JButton button3 = new JButton("鍗佸叚杩涘埗"); + panel.add(button1); + panel.add(button2); + panel.add(button3); + frameChange.add(panel); + } + + private void doChange6(){ + JDialog frameChange = new JDialog();//鏋勯犱竴涓柊鐨凧Frame锛屼綔涓烘柊绐楀彛銆 + frameChange.setTitle("闈㈢Н杞寲"); //璁＄畻鍣ㄥ懡鍚 + frameChange.setSize(400, 250); //绐楀彛闀垮 闀550 瀹400 + frameChange.setLocation(1100, 200); //绐楀彛鍑虹幇浣嶇疆锛700锛200锛 灞忓箷鍙充晶 + frameChange.setResizable(true); // 鍙互淇敼璁＄畻鍣ㄧ獥鍙ｅぇ灏 + frameChange.setVisible(true); //绐楀彛鍙 + JLabel jl = new JLabel();// 娉ㄦ剰绫诲悕鍒啓閿欎簡銆 + frameChange.getContentPane().add(jl); + jl.setText("闈㈢Н杞寲鏂囨湰"); jl.setVerticalAlignment(JLabel.CENTER); jl.setHorizontalAlignment(JLabel.CENTER);// 娉ㄦ剰鏂规硶鍚嶅埆鍐欓敊浜嗐 // 鍙傛暟 APPLICATION_MODAL锛氶樆濉炲悓涓 Java 搴旂敤绋嬪簭涓殑鎵鏈夐《灞傜獥鍙(瀹冭嚜宸辩殑瀛愬眰娆 frameChange.setModalityType(Dialog.ModalityType.APPLICATION_MODAL); // 璁剧疆妯″紡绫诲瀷銆 - } - - else { - do2(command); - } } //back閿 @@ -231,6 +382,18 @@ public class RWCalculator extends JFrame implements ActionListener { firstDigit = true; operateValidFlag = true; } + else if (operator.equals("浜岃繘鍒")) { + // 浜岃繘鍒 + resultNumber = getNumberFromText()*getNumberFromText(); + } + else if (operator.equals("鍏繘鍒")) { + // 鍏繘鍒 + resultNumber = getNumberFromText()*getNumberFromText(); + } + else if (operator.equals("鍗佸叚杩涘埗")) { + // 鍗佸叚杩涘埗 + resultNumber = getNumberFromText()*getNumberFromText(); + } } //闇瑕佷袱涓暟鐨勮繍绠 @@ -264,4 +427,3 @@ public class RWCalculator extends JFrame implements ActionListener { operateValidFlag = true; } } - -- Gitee From 23b9ddc40cf973539e7c85626fc27b64e2a9f7de Mon Sep 17 00:00:00 2001 From: Rong-Eru027 <2198183021@qq.com> Date: Sat, 4 Jun 2022 12:41:10 +0800 Subject: [PATCH 11/15] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E9=94=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/calculatorRw/RWCalculator.java | 168 ++++++++++++++++++----------- 1 file changed, 108 insertions(+), 60 deletions(-) diff --git a/src/calculatorRw/RWCalculator.java b/src/calculatorRw/RWCalculator.java index 37b2127..c9b54cb 100644 --- a/src/calculatorRw/RWCalculator.java +++ b/src/calculatorRw/RWCalculator.java @@ -7,6 +7,7 @@ import java.awt.Font; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.text.DecimalFormat; //璁＄畻缁撴灉淇濈暀3浣嶅皬鏁颁娇鐢 +import java.lang.*; public class RWCalculator extends JFrame implements ActionListener { JFrame jf = new JFrame(); @@ -202,7 +203,7 @@ public class RWCalculator extends JFrame implements ActionListener { //杩涘埗杞寲 private void doChange1(){ JDialog frameChange = new JDialog();//鏋勯犱竴涓柊鐨凧Frame锛屼綔涓烘柊绐楀彛銆 - frameChange.setTitle("鏃堕棿杞寲"); //璁＄畻鍣ㄥ懡鍚 + frameChange.setTitle("杩涘埗杞寲"); //璁＄畻鍣ㄥ懡鍚 frameChange.setSize(350, 100); //绐楀彛闀垮 闀550 瀹400 frameChange.setLocation(1100, 200); //绐楀彛鍑虹幇浣嶇疆锛700锛200锛 灞忓箷鍙充晶 frameChange.setResizable(true); // 鍙互淇敼璁＄畻鍣ㄧ獥鍙ｅぇ灏 @@ -224,83 +225,130 @@ public class RWCalculator extends JFrame implements ActionListener { private void doChange2(){ JDialog frameChange2 = new JDialog();//鏋勯犱竴涓柊鐨凧Frame锛屼綔涓烘柊绐楀彛銆 frameChange2.setTitle("娓╁害杞寲"); //璁＄畻鍣ㄥ懡鍚 - frameChange2.setSize(400, 250); //绐楀彛闀垮 闀550 瀹400 + frameChange2.setSize(350, 100); //绐楀彛闀垮 闀550 瀹400 frameChange2.setLocation(1100, 200); //绐楀彛鍑虹幇浣嶇疆锛700锛200锛 灞忓箷鍙充晶 frameChange2.setResizable(true); // 鍙互淇敼璁＄畻鍣ㄧ獥鍙ｅぇ灏 frameChange2.setVisible(true); //绐楀彛鍙 - JLabel jl = new JLabel();// 娉ㄦ剰绫诲悕鍒啓閿欎簡銆 - frameChange2.getContentPane().add(jl); - jl.setText("娓╁害杞寲鏂囨湰"); - jl.setVerticalAlignment(JLabel.CENTER); - jl.setHorizontalAlignment(JLabel.CENTER);// 娉ㄦ剰鏂规硶鍚嶅埆鍐欓敊浜嗐 - // 鍙傛暟 APPLICATION_MODAL锛氶樆濉炲悓涓 Java 搴旂敤绋嬪簭涓殑鎵鏈夐《灞傜獥鍙(瀹冭嚜宸辩殑瀛愬眰娆 - frameChange2.setModalityType(Dialog.ModalityType.APPLICATION_MODAL); // 璁剧疆妯″紡绫诲瀷銆 + JPanel panel = new JPanel(); + panel.setLayout(new GridLayout(1, 2, 1, 1)); + JButton button1 = new JButton("鎽勬皬搴﹁浆鍗庢憚姘忓害"); + JButton button2 = new JButton("鍗庢憚姘忓害杞憚姘忓害"); + panel.add(button1); + panel.add(button2); + frameChange2.add(panel); + button1.addActionListener(this); + button2.addActionListener(this); } private void doChange3(){ - JDialog frameChange = new JDialog();//鏋勯犱竴涓柊鐨凧Frame锛屼綔涓烘柊绐楀彛銆 - frameChange.setTitle("闀垮害杞寲"); //璁＄畻鍣ㄥ懡鍚 - frameChange.setSize(400, 250); //绐楀彛闀垮 闀550 瀹400 - frameChange.setLocation(1100, 200); //绐楀彛鍑虹幇浣嶇疆锛700锛200锛 灞忓箷鍙充晶 - frameChange.setResizable(true); // 鍙互淇敼璁＄畻鍣ㄧ獥鍙ｅぇ灏 - frameChange.setVisible(true); //绐楀彛鍙 - JLabel jl = new JLabel();// 娉ㄦ剰绫诲悕鍒啓閿欎簡銆 - frameChange.getContentPane().add(jl); - jl.setText("闀垮害杞寲鏂囨湰"); - jl.setVerticalAlignment(JLabel.CENTER); - jl.setHorizontalAlignment(JLabel.CENTER);// 娉ㄦ剰鏂规硶鍚嶅埆鍐欓敊浜嗐 - // 鍙傛暟 APPLICATION_MODAL锛氶樆濉炲悓涓 Java 搴旂敤绋嬪簭涓殑鎵鏈夐《灞傜獥鍙(瀹冭嚜宸辩殑瀛愬眰娆 - frameChange.setModalityType(Dialog.ModalityType.APPLICATION_MODAL); // 璁剧疆妯″紡绫诲瀷銆 + JDialog frameChange3 = new JDialog();//鏋勯犱竴涓柊鐨凧Frame锛屼綔涓烘柊绐楀彛銆 + frameChange3.setTitle("闀垮害杞寲"); //璁＄畻鍣ㄥ懡鍚 + frameChange3.setSize(400, 250); //绐楀彛闀垮 闀550 瀹400 + frameChange3.setLocation(1100, 200); //绐楀彛鍑虹幇浣嶇疆锛700锛200锛 灞忓箷鍙充晶 + frameChange3.setResizable(true); // 鍙互淇敼璁＄畻鍣ㄧ獥鍙ｅぇ灏 + frameChange3.setVisible(true); //绐楀彛鍙 + JPanel panel = new JPanel(); + panel.setLayout(new GridLayout(2, 3, 1, 1)); + JButton button1 = new JButton("鍘樼背杞背"); + JButton button2 = new JButton("鍘樼背杞绫"); + JButton button3 = new JButton("鍘樼背杞叕閲"); + JButton button4 = new JButton("绫宠浆鍏噷"); + JButton button5 = new JButton("绫宠浆鍘樼背"); + JButton button6 = new JButton("鍏噷杞背"); + panel.add(button1); + panel.add(button2); + panel.add(button3); + panel.add(button4); + panel.add(button5); + panel.add(button6); + frameChange3.add(panel); + button1.addActionListener(this); + button2.addActionListener(this); + button3.addActionListener(this); + button4.addActionListener(this); + button5.addActionListener(this); + button6.addActionListener(this); } private void doChange4(){ - JDialog frameChange = new JDialog();//鏋勯犱竴涓柊鐨凧Frame锛屼綔涓烘柊绐楀彛銆 - frameChange.setTitle("閲嶉噺杞寲"); //璁＄畻鍣ㄥ懡鍚 - frameChange.setSize(400, 250); //绐楀彛闀垮 闀550 瀹400 - frameChange.setLocation(1100, 200); //绐楀彛鍑虹幇浣嶇疆锛700锛200锛 灞忓箷鍙充晶 - frameChange.setResizable(true); // 鍙互淇敼璁＄畻鍣ㄧ獥鍙ｅぇ灏 - frameChange.setVisible(true); //绐楀彛鍙 - JLabel jl = new JLabel();// 娉ㄦ剰绫诲悕鍒啓閿欎簡銆 - frameChange.getContentPane().add(jl); - jl.setText("閲嶉噺杞寲鏂囨湰"); - jl.setVerticalAlignment(JLabel.CENTER); - jl.setHorizontalAlignment(JLabel.CENTER);// 娉ㄦ剰鏂规硶鍚嶅埆鍐欓敊浜嗐 - // 鍙傛暟 APPLICATION_MODAL锛氶樆濉炲悓涓 Java 搴旂敤绋嬪簭涓殑鎵鏈夐《灞傜獥鍙(瀹冭嚜宸辩殑瀛愬眰娆 - frameChange.setModalityType(Dialog.ModalityType.APPLICATION_MODAL); // 璁剧疆妯″紡绫诲瀷銆 + JDialog frameChange4 = new JDialog();//鏋勯犱竴涓柊鐨凧Frame锛屼綔涓烘柊绐楀彛銆 + frameChange4.setTitle("閲嶉噺杞寲"); //璁＄畻鍣ㄥ懡鍚 + frameChange4.setSize(400, 250); //绐楀彛闀垮 闀550 瀹400 + frameChange4.setLocation(1100, 200); //绐楀彛鍑虹幇浣嶇疆锛700锛200锛 灞忓箷鍙充晶 + frameChange4.setResizable(true); // 鍙互淇敼璁＄畻鍣ㄧ獥鍙ｅぇ灏 + frameChange4.setVisible(true); //绐楀彛鍙 + JPanel panel = new JPanel(); + panel.setLayout(new GridLayout(2, 3, 1, 1)); + JButton button1 = new JButton("鍏嬭浆鍗冨厠"); + JButton button2 = new JButton("鍏嬭浆鍚"); + JButton button3 = new JButton("鍚ㄨ浆鍗冨厠"); + JButton button4 = new JButton("鍚ㄨ浆鍏"); + JButton button5 = new JButton("鍗冨厠杞惃"); + JButton button6 = new JButton("鍗冨厠杞厠"); + panel.add(button1); + panel.add(button2); + panel.add(button3); + panel.add(button4); + panel.add(button5); + panel.add(button6); + frameChange4.add(panel); + button1.addActionListener(this); + button2.addActionListener(this); + button3.addActionListener(this); + button4.addActionListener(this); + button5.addActionListener(this); + button6.addActionListener(this); } private void doChange5(){ - JDialog frameChange = new JDialog();//鏋勯犱竴涓柊鐨凧Frame锛屼綔涓烘柊绐楀彛銆 - frameChange.setTitle("鏃堕棿杞寲"); //璁＄畻鍣ㄥ懡鍚 - frameChange.setSize(400, 250); //绐楀彛闀垮 闀550 瀹400 - frameChange.setLocation(1100, 200); //绐楀彛鍑虹幇浣嶇疆锛700锛200锛 灞忓箷鍙充晶 - frameChange.setResizable(true); // 鍙互淇敼璁＄畻鍣ㄧ獥鍙ｅぇ灏 - frameChange.setVisible(true); //绐楀彛鍙 + JDialog frameChange5 = new JDialog();//鏋勯犱竴涓柊鐨凧Frame锛屼綔涓烘柊绐楀彛銆 + frameChange5.setTitle("鏃堕棿杞寲"); //璁＄畻鍣ㄥ懡鍚 + frameChange5.setSize(400, 250); //绐楀彛闀垮 闀550 瀹400 + frameChange5.setLocation(1100, 200); //绐楀彛鍑虹幇浣嶇疆锛700锛200锛 灞忓箷鍙充晶 + frameChange5.setResizable(true); // 鍙互淇敼璁＄畻鍣ㄧ獥鍙ｅぇ灏 + frameChange5.setVisible(true); //绐楀彛鍙 JPanel panel = new JPanel(); - panel.setLayout(new GridLayout(1, 3, 2, 2)); - JButton button1 = new JButton("浜岃繘鍒"); - JButton button2 = new JButton("鍏繘鍒"); - JButton button3 = new JButton("鍗佸叚杩涘埗"); + panel.setLayout(new GridLayout(2, 3, 1, 1)); + JButton button1 = new JButton("绉掕浆鍒嗛挓"); + JButton button2 = new JButton("绉掕浆灏忔椂"); + JButton button3 = new JButton("鍒嗛挓杞皬鏃"); + JButton button4 = new JButton("鍒嗛挓杞"); + JButton button5 = new JButton("灏忔椂杞"); + JButton button6 = new JButton("灏忔椂杞垎閽"); panel.add(button1); panel.add(button2); panel.add(button3); - frameChange.add(panel); + panel.add(button4); + panel.add(button5); + panel.add(button6); + frameChange5.add(panel); + button1.addActionListener(this); + button2.addActionListener(this); + button3.addActionListener(this); + button4.addActionListener(this); + button5.addActionListener(this); + button6.addActionListener(this); } private void doChange6(){ - JDialog frameChange = new JDialog();//鏋勯犱竴涓柊鐨凧Frame锛屼綔涓烘柊绐楀彛銆 - frameChange.setTitle("闈㈢Н杞寲"); //璁＄畻鍣ㄥ懡鍚 - frameChange.setSize(400, 250); //绐楀彛闀垮 闀550 瀹400 - frameChange.setLocation(1100, 200); //绐楀彛鍑虹幇浣嶇疆锛700锛200锛 灞忓箷鍙充晶 - frameChange.setResizable(true); // 鍙互淇敼璁＄畻鍣ㄧ獥鍙ｅぇ灏 - frameChange.setVisible(true); //绐楀彛鍙 - JLabel jl = new JLabel();// 娉ㄦ剰绫诲悕鍒啓閿欎簡銆 - frameChange.getContentPane().add(jl); - jl.setText("闈㈢Н杞寲鏂囨湰"); - jl.setVerticalAlignment(JLabel.CENTER); - jl.setHorizontalAlignment(JLabel.CENTER);// 娉ㄦ剰鏂规硶鍚嶅埆鍐欓敊浜嗐 - // 鍙傛暟 APPLICATION_MODAL锛氶樆濉炲悓涓 Java 搴旂敤绋嬪簭涓殑鎵鏈夐《灞傜獥鍙(瀹冭嚜宸辩殑瀛愬眰娆 - frameChange.setModalityType(Dialog.ModalityType.APPLICATION_MODAL); // 璁剧疆妯″紡绫诲瀷銆 + JDialog frameChange6 = new JDialog();//鏋勯犱竴涓柊鐨凧Frame锛屼綔涓烘柊绐楀彛銆 + frameChange6.setTitle("闈㈢Н杞寲"); //璁＄畻鍣ㄥ懡鍚 + frameChange6.setSize(400, 250); //绐楀彛闀垮 闀550 瀹400 + frameChange6.setLocation(1100, 200); //绐楀彛鍑虹幇浣嶇疆锛700锛200锛 灞忓箷鍙充晶 + frameChange6.setResizable(true); // 鍙互淇敼璁＄畻鍣ㄧ獥鍙ｅぇ灏 + frameChange6.setVisible(true); //绐楀彛鍙 + JPanel panel = new JPanel(); + panel.setLayout(new GridLayout(1, 3, 1, 1)); + JButton button1 = new JButton("骞虫柟鍘樼背杞钩鏂圭背"); + JButton button2 = new JButton("骞虫柟绫宠浆骞虫柟鍘樼背"); + JButton button3 = new JButton("骞虫柟绫宠浆浜"); + panel.add(button1); + panel.add(button2); + panel.add(button3); + frameChange6.add(panel); + button1.addActionListener(this); + button2.addActionListener(this); + button3.addActionListener(this); } //back閿 @@ -384,7 +432,7 @@ public class RWCalculator extends JFrame implements ActionListener { } else if (operator.equals("浜岃繘鍒")) { // 浜岃繘鍒 - resultNumber = getNumberFromText()*getNumberFromText(); + resultNumber = getNumberFromText()*getNumberFromText(); } else if (operator.equals("鍏繘鍒")) { // 鍏繘鍒 -- Gitee From 0707dc5e7ac7056fcbbce977b81274a48f2e2a08 Mon Sep 17 00:00:00 2001 From: Rong-Eru027 <2198183021@qq.com> Date: Sat, 4 Jun 2022 13:34:47 +0800 Subject: [PATCH 12/15] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E9=94=AE2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/calculatorRw/RWCalculator.java | 139 ++++++++++++++++++++++++----- 1 file changed, 117 insertions(+), 22 deletions(-) diff --git a/src/calculatorRw/RWCalculator.java b/src/calculatorRw/RWCalculator.java index c9b54cb..6e30aaf 100644 --- a/src/calculatorRw/RWCalculator.java +++ b/src/calculatorRw/RWCalculator.java @@ -76,7 +76,7 @@ public class RWCalculator extends JFrame implements ActionListener { buttonChangePanel.setLayout(new GridLayout(6, 4, 2, 2)); buttonChangePanel.setBackground(color4); - JButton buttonChange = new JButton("杩涘埗杞寲"); + JButton buttonChange = new JButton("閫熷害杞寲"); buttonChangePanel.add(buttonChange); buttonChange.setFont(new Font("榛戜綋",Font.PLAIN,10)); buttonChange.setForeground(Color.white); @@ -169,7 +169,7 @@ public class RWCalculator extends JFrame implements ActionListener { // 鐢ㄦ埛鎸変簡鍙渶涓涓暟鐨勮繍绠楅敭 do1(command); } - else if ("杩涘埗杞寲".indexOf(command) >= 0) { + else if ("閫熷害杞寲".indexOf(command) >= 0) { doChange1(); } else if ("娓╁害杞寲".indexOf(command) >= 0) { @@ -187,39 +187,46 @@ public class RWCalculator extends JFrame implements ActionListener { else if ("闈㈢Н杞寲".indexOf(command) >= 0) { doChange6(); } - else if ("浜岃繘鍒".indexOf(command) >= 0) { + else if (("km/h杞琺/s".indexOf(command) >= 0)||("m/s杞琸m/h".indexOf(command) >= 0)){ do1(command); } - else if ("鍏繘鍒".indexOf(command) >= 0) { + else if (("鎽勬皬搴﹁浆鍗庢憚姘忓害".indexOf(command) >= 0)||("鍗庢憚姘忓害杞憚姘忓害".indexOf(command) >= 0)){ do1(command); } - else if ("鍗佸叚杩涘埗".indexOf(command) >= 0) { + else if (("鍘樼背杞背".indexOf(command) >= 0)||("鍘樼背杞绫".indexOf(command) >= 0) ||("鍘樼背杞叕閲".indexOf(command) >= 0)||("绫宠浆鍏噷".indexOf(command) >= 0)||("绫宠浆鍘樼背".indexOf(command) >= 0) ||("鍏噷杞背".indexOf(command) >= 0)){ + do1(command); + } + else if (("鍏嬭浆鍗冨厠".indexOf(command) >= 0)||("鍏嬭浆鍚".indexOf(command) >= 0) ||("鍚ㄨ浆鍗冨厠".indexOf(command) >= 0)||("鍚ㄨ浆鍏".indexOf(command) >= 0)||("鍗冨厠杞惃".indexOf(command) >= 0) ||("鍗冨厠杞厠".indexOf(command) >= 0)){ + do1(command); + } + else if (("绉掕浆鍒嗛挓".indexOf(command) >= 0)||("绉掕浆灏忔椂".indexOf(command) >= 0) ||("鍒嗛挓杞皬鏃".indexOf(command) >= 0)||("鍒嗛挓杞".indexOf(command) >= 0)||("灏忔椂杞".indexOf(command) >= 0) ||("灏忔椂杞垎閽".indexOf(command) >= 0)){ + do1(command); + } + else if (("骞虫柟鍘樼背杞钩鏂圭背".indexOf(command) >= 0)||("骞虫柟绫宠浆骞虫柟鍘樼背".indexOf(command) >= 0) ||("骞虫柟绫宠浆浜".indexOf(command) >= 0) ){ do1(command); } else { do2(command); } } - //杩涘埗杞寲 + + //杞寲 private void doChange1(){ JDialog frameChange = new JDialog();//鏋勯犱竴涓柊鐨凧Frame锛屼綔涓烘柊绐楀彛銆 - frameChange.setTitle("杩涘埗杞寲"); //璁＄畻鍣ㄥ懡鍚 + frameChange.setTitle("閫熷害杞寲"); //璁＄畻鍣ㄥ懡鍚 frameChange.setSize(350, 100); //绐楀彛闀垮 闀550 瀹400 frameChange.setLocation(1100, 200); //绐楀彛鍑虹幇浣嶇疆锛700锛200锛 灞忓箷鍙充晶 frameChange.setResizable(true); // 鍙互淇敼璁＄畻鍣ㄧ獥鍙ｅぇ灏 frameChange.setVisible(true); //绐楀彛鍙 JPanel panel = new JPanel(); - panel.setLayout(new GridLayout(1, 3, 1, 1)); - JButton button1 = new JButton("浜岃繘鍒"); - JButton button2 = new JButton("鍏繘鍒"); - JButton button3 = new JButton("鍗佸叚杩涘埗"); + panel.setLayout(new GridLayout(1, 2, 1, 1)); + JButton button1 = new JButton("km/h杞琺/s"); + JButton button2 = new JButton("m/s杞琸m/h"); panel.add(button1); panel.add(button2); - panel.add(button3); frameChange.add(panel); button1.addActionListener(this); button2.addActionListener(this); - button3.addActionListener(this); } private void doChange2(){ @@ -430,17 +437,105 @@ public class RWCalculator extends JFrame implements ActionListener { firstDigit = true; operateValidFlag = true; } - else if (operator.equals("浜岃繘鍒")) { - // 浜岃繘鍒 - resultNumber = getNumberFromText()*getNumberFromText(); + else if (operator.equals("km/h杞琺/s")) { + // km/h杞琺/s + resultNumber = getNumberFromText()*3.6; + } + else if (operator.equals("m/s杞琸m/h")) { + // m/s杞琸m/h + resultNumber = getNumberFromText()/3.6; + } + else if (operator.equals("鎽勬皬搴﹁浆鍗庢憚姘忓害")) { + // 鎽勬皬搴﹁浆鍗庢憚姘忓害 + resultNumber = getNumberFromText()*9/5+32; } - else if (operator.equals("鍏繘鍒")) { - // 鍏繘鍒 - resultNumber = getNumberFromText()*getNumberFromText(); + else if (operator.equals("鍗庢憚姘忓害杞憚姘忓害")) { + // 鍗庢憚姘忓害杞憚姘忓害 + resultNumber = (getNumberFromText()-32)*5/9; } - else if (operator.equals("鍗佸叚杩涘埗")) { - // 鍗佸叚杩涘埗 - resultNumber = getNumberFromText()*getNumberFromText(); + else if (operator.equals("鍘樼背杞背")) { + // 鍘樼背杞背 + resultNumber = getNumberFromText()*0.01; + } + else if (operator.equals("鍘樼背杞绫")) { + // 鍘樼背杞绫 + resultNumber = getNumberFromText()*10; + } + else if (operator.equals("鍘樼背杞叕閲")) { + // 鍘樼背杞叕閲 + resultNumber = getNumberFromText()*0.01*0.001; + } + else if (operator.equals("绫宠浆鍏噷")) { + // 绫宠浆鍏噷 + resultNumber = getNumberFromText()*0.001; + } + else if (operator.equals("绫宠浆鍘樼背")) { + // 绫宠浆鍘樼背 + resultNumber = getNumberFromText()*100; + } + else if (operator.equals("鍏噷杞背")) { + // 鍏噷杞背 + resultNumber = getNumberFromText()*1000; + } + else if (operator.equals("鍏嬭浆鍗冨厠")) { + // 鍏嬭浆鍗冨厠 + resultNumber = getNumberFromText()*0.001; + } + else if (operator.equals("鍏嬭浆鍚")) { + // 鍏嬭浆鍚 + resultNumber = getNumberFromText()*0.001*0.001; + } + else if (operator.equals("鍚ㄨ浆鍗冨厠")) { + //鍚ㄨ浆鍗冨厠 + resultNumber = getNumberFromText()*1000; + } + else if (operator.equals("鍚ㄨ浆鍏")) { + // 鍚ㄨ浆鍏 + resultNumber = getNumberFromText()*1000*1000; + } + else if (operator.equals("鍗冨厠杞惃")) { + // 鍗冨厠杞浘 + resultNumber = getNumberFromText()*0.001; + } + else if (operator.equals("鍗冨厠杞厠")) { + // 鍗冨厠杞厠 + resultNumber = getNumberFromText()*1000; + } + else if (operator.equals("绉掕浆鍒嗛挓")) { + // 绉掕浆鍒嗛挓 + resultNumber = getNumberFromText()/60; + } + else if (operator.equals("绉掕浆灏忔椂")) { + // 绉掕浆灏忔椂 + resultNumber = getNumberFromText()/3600; + } + else if (operator.equals("鍒嗛挓杞皬鏃")) { + // 鍒嗛挓杞皬鏃 + resultNumber = getNumberFromText()/60; + } + else if (operator.equals("鍒嗛挓杞")) { + // 鍒嗛挓杞 + resultNumber = getNumberFromText()*60; + } + else if (operator.equals("灏忔椂杞")) { + // 灏忔椂杞 + resultNumber = getNumberFromText()*3600; + } + else if (operator.equals("灏忔椂杞垎閽")) { + // 灏忔椂杞垎閽 + resultNumber = getNumberFromText()*60; + } + else if (operator.equals("骞虫柟鍘樼背杞钩鏂圭背")) { + // 骞虫柟鍘樼背杞钩鏂圭背 + resultNumber = getNumberFromText()*0.01*0.01; + } + else if (operator.equals("骞虫柟绫宠浆骞虫柟鍘樼背")) { + // 骞虫柟绫宠浆骞虫柟鍘樼背 + resultNumber = getNumberFromText()*100*100; + } + else if (operator.equals("骞虫柟绫宠浆浜")) { + // 骞虫柟绫宠浆浜 + resultNumber = getNumberFromText()*0.0015; } } -- Gitee From 6a1be6f0fba65296969d7f93fd3261dda302bf30 Mon Sep 17 00:00:00 2001 From: Rong-Eru027 <2198183021@qq.com> Date: Sun, 5 Jun 2022 21:33:15 +0800 Subject: [PATCH 13/15] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/calculatorRw/RWCalculator.java | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/calculatorRw/RWCalculator.java b/src/calculatorRw/RWCalculator.java index 6e30aaf..efdc2db 100644 --- a/src/calculatorRw/RWCalculator.java +++ b/src/calculatorRw/RWCalculator.java @@ -210,7 +210,7 @@ public class RWCalculator extends JFrame implements ActionListener { } } - //杞寲 + //閫熷害杞寲 private void doChange1(){ JDialog frameChange = new JDialog();//鏋勯犱竴涓柊鐨凧Frame锛屼綔涓烘柊绐楀彛銆 frameChange.setTitle("閫熷害杞寲"); //璁＄畻鍣ㄥ懡鍚 @@ -228,7 +228,7 @@ public class RWCalculator extends JFrame implements ActionListener { button1.addActionListener(this); button2.addActionListener(this); } - + //娓╁害杞寲 private void doChange2(){ JDialog frameChange2 = new JDialog();//鏋勯犱竴涓柊鐨凧Frame锛屼綔涓烘柊绐楀彛銆 frameChange2.setTitle("娓╁害杞寲"); //璁＄畻鍣ㄥ懡鍚 @@ -246,11 +246,11 @@ public class RWCalculator extends JFrame implements ActionListener { button1.addActionListener(this); button2.addActionListener(this); } - + //闀垮害杞寲 private void doChange3(){ JDialog frameChange3 = new JDialog();//鏋勯犱竴涓柊鐨凧Frame锛屼綔涓烘柊绐楀彛銆 frameChange3.setTitle("闀垮害杞寲"); //璁＄畻鍣ㄥ懡鍚 - frameChange3.setSize(400, 250); //绐楀彛闀垮 闀550 瀹400 + frameChange3.setSize(350, 200); //绐楀彛闀垮 闀550 瀹400 frameChange3.setLocation(1100, 200); //绐楀彛鍑虹幇浣嶇疆锛700锛200锛 灞忓箷鍙充晶 frameChange3.setResizable(true); // 鍙互淇敼璁＄畻鍣ㄧ獥鍙ｅぇ灏 frameChange3.setVisible(true); //绐楀彛鍙 @@ -276,11 +276,11 @@ public class RWCalculator extends JFrame implements ActionListener { button5.addActionListener(this); button6.addActionListener(this); } - + //閲嶉噺杞寲 private void doChange4(){ JDialog frameChange4 = new JDialog();//鏋勯犱竴涓柊鐨凧Frame锛屼綔涓烘柊绐楀彛銆 frameChange4.setTitle("閲嶉噺杞寲"); //璁＄畻鍣ㄥ懡鍚 - frameChange4.setSize(400, 250); //绐楀彛闀垮 闀550 瀹400 + frameChange4.setSize(300,200); //绐楀彛闀垮 闀550 瀹400 frameChange4.setLocation(1100, 200); //绐楀彛鍑虹幇浣嶇疆锛700锛200锛 灞忓箷鍙充晶 frameChange4.setResizable(true); // 鍙互淇敼璁＄畻鍣ㄧ獥鍙ｅぇ灏 frameChange4.setVisible(true); //绐楀彛鍙 @@ -306,11 +306,11 @@ public class RWCalculator extends JFrame implements ActionListener { button5.addActionListener(this); button6.addActionListener(this); } - + //鏃堕棿杞寲 private void doChange5(){ JDialog frameChange5 = new JDialog();//鏋勯犱竴涓柊鐨凧Frame锛屼綔涓烘柊绐楀彛銆 frameChange5.setTitle("鏃堕棿杞寲"); //璁＄畻鍣ㄥ懡鍚 - frameChange5.setSize(400, 250); //绐楀彛闀垮 闀550 瀹400 + frameChange5.setSize(350, 200); //绐楀彛闀垮 闀550 瀹400 frameChange5.setLocation(1100, 200); //绐楀彛鍑虹幇浣嶇疆锛700锛200锛 灞忓箷鍙充晶 frameChange5.setResizable(true); // 鍙互淇敼璁＄畻鍣ㄧ獥鍙ｅぇ灏 frameChange5.setVisible(true); //绐楀彛鍙 @@ -336,14 +336,14 @@ public class RWCalculator extends JFrame implements ActionListener { button5.addActionListener(this); button6.addActionListener(this); } - + //闈㈢Н杞寲 private void doChange6(){ JDialog frameChange6 = new JDialog();//鏋勯犱竴涓柊鐨凧Frame锛屼綔涓烘柊绐楀彛銆 frameChange6.setTitle("闈㈢Н杞寲"); //璁＄畻鍣ㄥ懡鍚 - frameChange6.setSize(400, 250); //绐楀彛闀垮 闀550 瀹400 - frameChange6.setLocation(1100, 200); //绐楀彛鍑虹幇浣嶇疆锛700锛200锛 灞忓箷鍙充晶 - frameChange6.setResizable(true); // 鍙互淇敼璁＄畻鍣ㄧ獥鍙ｅぇ灏 - frameChange6.setVisible(true); //绐楀彛鍙 + frameChange6.setSize(425, 100); //绐楀彛闀垮 闀550 瀹400 + frameChange6.setLocation(1100, 200); + frameChange6.setResizable(true); + frameChange6.setVisible(true); JPanel panel = new JPanel(); panel.setLayout(new GridLayout(1, 3, 1, 1)); JButton button1 = new JButton("骞虫柟鍘樼背杞钩鏂圭背"); -- Gitee From bc2378181adc2a11c08f33a3b9c9c955b90f2dce Mon Sep 17 00:00:00 2001 From: Rong-Eru027 <2198183021@qq.com> Date: Mon, 6 Jun 2022 08:18:21 +0800 Subject: [PATCH 14/15] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/calculatorRw/RWCalculator.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/calculatorRw/RWCalculator.java b/src/calculatorRw/RWCalculator.java index efdc2db..be9f46d 100644 --- a/src/calculatorRw/RWCalculator.java +++ b/src/calculatorRw/RWCalculator.java @@ -7,7 +7,6 @@ import java.awt.Font; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.text.DecimalFormat; //璁＄畻缁撴灉淇濈暀3浣嶅皬鏁颁娇鐢 -import java.lang.*; public class RWCalculator extends JFrame implements ActionListener { JFrame jf = new JFrame(); -- Gitee From 6d7a86f22f90cd2df5310a6cb3663aa0f731f859 Mon Sep 17 00:00:00 2001 From: Rong-Eru027 <2198183021@qq.com> Date: Mon, 6 Jun 2022 19:57:22 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/calculatorRw/RWCalculator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calculatorRw/RWCalculator.java b/src/calculatorRw/RWCalculator.java index be9f46d..36d47d7 100644 --- a/src/calculatorRw/RWCalculator.java +++ b/src/calculatorRw/RWCalculator.java @@ -419,7 +419,7 @@ public class RWCalculator extends JFrame implements ActionListener { resultNumber = Math.sqrt(getNumberFromText()); } } - else if (operator.equals("X虏")) { + else if (operator.equals("X^2")) { // 骞虫柟 resultNumber = getNumberFromText()*getNumberFromText(); } -- Gitee