diff --git a/.classpath b/.classpath index 6b12a3b..4636b79 100644 --- a/.classpath +++ b/.classpath @@ -2,8 +2,12 @@ - - - + + + + + + + diff --git a/src/Ui/Compare.java b/src/Ui/Compare.java deleted file mode 100644 index eb977db..0000000 --- a/src/Ui/Compare.java +++ /dev/null @@ -1,84 +0,0 @@ -package Ui; -import java.awt.Container; -import java.awt.Dimension; -import java.awt.FlowLayout; -import java.awt.GridLayout; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.util.List; - -import javax.swing.DefaultComboBoxModel; -import javax.swing.JButton; -import javax.swing.JComboBox; -import javax.swing.JFrame; -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.JTextField; - -import airdata.Cai; -import db.Air; - -public class Compare extends JFrame{ - - Compare(){ - setTitle("��� ������ ��"); - Container c = getContentPane(); - c.setLayout(new FlowLayout()); - JPanel jp1 = new JPanel(); - JPanel jp2 = new JPanel(); - jp1.setLayout(new GridLayout(6,2)); - jp2.setLayout(new GridLayout(1, 2)); - - JLabel inno2p = new JLabel("no2p�� �Է��ϼ���."); - JLabel ino3p = new JLabel("o3p�� �Է��ϼ���."); - JLabel incop = new JLabel("cop�� �Է��ϼ���."); - JLabel inso2p = new JLabel("so2p�� �Է��ϼ���."); - JLabel inpm10 = new JLabel("pm10�� �Է��ϼ���."); - JLabel inpm25 = new JLabel("pm25�� �Է��ϼ���."); - JTextField inputNo2p = new JTextField(); - JTextField inputO3p = new JTextField(); - JTextField inputCop = new JTextField(); - JTextField inputSo2p = new JTextField(); - JTextField inputPm10 = new JTextField(); - JTextField inputPm25 = new JTextField(); - JButton comp = new JButton("�Էµ� �����Ϳ� 2018�� ������ ���ϱ�"); - - jp1.add(inno2p); - jp1.add(inputNo2p); - jp1.add(ino3p); - jp1.add(inputO3p); - jp1.add(incop); - jp1.add(inputCop); - jp1.add(inso2p); - jp1.add(inputSo2p); - jp1.add(inpm10); - jp1.add(inputPm10); - jp1.add(inpm25); - jp1.add(inputPm25); - jp2.add(comp); - add(jp1); - add(jp2); - - comp.addActionListener(new ActionListener() { - - public void actionPerformed(ActionEvent e) { - double no2p, o3p, cop, so2p, pm10, pm25; - no2p = Double.valueOf(inputNo2p.getText()); - o3p = Double.valueOf(inputO3p.getText()); - cop = Double.valueOf(inputCop.getText()); - so2p = Double.valueOf(inputSo2p.getText()); - pm10 = Double.valueOf(inputPm10.getText()); - pm25 = Double.valueOf(inputPm25.getText()); - - CompareResult result = new CompareResult(no2p, o3p, cop, so2p, pm10, pm25); - } - - }); - - - setLocation(300,100); - setSize(300, 220); - setVisible(true); - - } -} diff --git a/src/Ui/CompareResult.java b/src/Ui/CompareResult.java deleted file mode 100644 index 11c9c4d..0000000 --- a/src/Ui/CompareResult.java +++ /dev/null @@ -1,117 +0,0 @@ -package Ui; -import java.awt.BorderLayout; -import java.awt.Container; -import java.awt.Dimension; -import java.awt.FlowLayout; -import java.awt.GridLayout; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.util.List; - -import javax.swing.DefaultComboBoxModel; -import javax.swing.JButton; -import javax.swing.JComboBox; -import javax.swing.JFrame; -import javax.swing.JLabel; -import javax.swing.JPanel; - -import airdata.Cai; -import db.Air; - -public class CompareResult extends JFrame { - - double no2pavr = 10; - double o3pavr = 10; - double copavr = 10; - double so2pavr = 10; - double pm10avr = 10; - double pm25avr = 10; - CompareResult(double no2p, double o3p, double cop, double so2p, double pm10, double pm25){ - setTitle("�� ���"); - Container c = getContentPane(); - c.setLayout(new BorderLayout()); - - JPanel jp1 = new JPanel(); - JPanel jp2 = new JPanel(); - JPanel jp3 = new JPanel(); - JPanel jp4 = new JPanel(); - JPanel jp5 = new JPanel(); - jp1.setLayout(new GridLayout(6, 1)); - jp2.setLayout(new GridLayout(6, 1)); - jp3.setLayout(new GridLayout(6, 1)); - jp4.setLayout(new BorderLayout()); - jp5.setLayout(new BorderLayout()); - - JLabel no2pC = new JLabel("no2p �񱳰�� :"); - JLabel o3pC = new JLabel("o3p �񱳰�� :"); - JLabel copC = new JLabel("cop �񱳰�� :"); - JLabel so2pC = new JLabel("so2p �񱳰�� :"); - JLabel pm10C = new JLabel("pm10 �񱳰�� :"); - JLabel pm25C = new JLabel("pm25 �񱳰�� :"); // - System.out.println(no2pavr); - - jp1.add(no2pC); - jp2.add(new JLabel("�Է��� �� "+ no2p+"�� 2018�� ��� "+ no2pavr)); - if(no2p>no2pavr) - jp3.add(new JLabel("2018���� �� �����մϴ�.")); - else if(no2po3pavr) - jp3.add(new JLabel("2018���� �� �����մϴ�.")); - else if(o3pcopavr) - jp3.add(new JLabel("2018���� �� �����մϴ�.")); - else if(copso2pavr) - jp3.add(new JLabel("2018���� �� �����մϴ�.")); - else if(so2ppm10avr) - jp3.add(new JLabel("2018���� �� �����մϴ�.")); - else if(pm10pm25avr) - jp3.add(new JLabel("2018���� �� �����մϴ�.")); - else if(pm25