Device_Simulator_DTS_Tester/bin/com/dev/bts/data/FBS9100_DeviceInf.classBinary files differ
Device_Simulator_DTS_Tester/bin/com/dev/bts4810/CommBTS4810.classBinary files differ
Device_Simulator_DTS_Tester/bin/com/dev/fbs9600_zdhj/zdhj_page_base$1$1.classBinary files differ
Device_Simulator_DTS_Tester/bin/com/dev/fbs9600_zdhj/zdhj_page_base$1.classBinary files differ
Device_Simulator_DTS_Tester/bin/com/dev/fbs9600_zdhj/zdhj_page_base$10.classBinary files differ
Device_Simulator_DTS_Tester/bin/com/dev/fbs9600_zdhj/zdhj_page_base$11.classBinary files differ
Device_Simulator_DTS_Tester/bin/com/dev/fbs9600_zdhj/zdhj_page_base$2.classBinary files differ
Device_Simulator_DTS_Tester/bin/com/dev/fbs9600_zdhj/zdhj_page_base$3.classBinary files differ
Device_Simulator_DTS_Tester/bin/com/dev/fbs9600_zdhj/zdhj_page_base$4.classBinary files differ
Device_Simulator_DTS_Tester/bin/com/dev/fbs9600_zdhj/zdhj_page_base$5.classBinary files differ
Device_Simulator_DTS_Tester/bin/com/dev/fbs9600_zdhj/zdhj_page_base$6.classBinary files differ
Device_Simulator_DTS_Tester/bin/com/dev/fbs9600_zdhj/zdhj_page_base$7.classBinary files differ
Device_Simulator_DTS_Tester/bin/com/dev/fbs9600_zdhj/zdhj_page_base$8.classBinary files differ
Device_Simulator_DTS_Tester/bin/com/dev/fbs9600_zdhj/zdhj_page_base$9.classBinary files differ
Device_Simulator_DTS_Tester/bin/com/dev/fbs9600_zdhj/zdhj_page_base.classBinary files differ
Device_Simulator_DTS_Tester/bin/com/dev/fbs9600_zdhj/zdhj_page_chart.classBinary files differ
Device_Simulator_DTS_Tester/bin/icon/alarm_param.png
Device_Simulator_DTS_Tester/bin/icon/alarm_remote.png
Device_Simulator_DTS_Tester/bin/icon/batt_remote.png
Device_Simulator_DTS_Tester/bin/icon/dev_remote.png
Device_Simulator_DTS_Tester/bin/icon/ip_param.png
Device_Simulator_DTS_Tester/bin/main/FontUtils$MyFont.classBinary files differ
Device_Simulator_DTS_Tester/bin/main/FontUtils.classBinary files differ
Device_Simulator_DTS_Tester/bin/main/main_window_computer$1.classBinary files differ
Device_Simulator_DTS_Tester/bin/main/main_window_computer$10.classBinary files differ
Device_Simulator_DTS_Tester/bin/main/main_window_computer$11.classBinary files differ
Device_Simulator_DTS_Tester/bin/main/main_window_computer$12.classBinary files differ
Device_Simulator_DTS_Tester/bin/main/main_window_computer$13.classBinary files differ
Device_Simulator_DTS_Tester/bin/main/main_window_computer$14.classBinary files differ
Device_Simulator_DTS_Tester/bin/main/main_window_computer$15.classBinary files differ
Device_Simulator_DTS_Tester/bin/main/main_window_computer$16.classBinary files differ
Device_Simulator_DTS_Tester/bin/main/main_window_computer$17.classBinary files differ
Device_Simulator_DTS_Tester/bin/main/main_window_computer$18.classBinary files differ
Device_Simulator_DTS_Tester/bin/main/main_window_computer$19.classBinary files differ
Device_Simulator_DTS_Tester/bin/main/main_window_computer$2.classBinary files differ
Device_Simulator_DTS_Tester/bin/main/main_window_computer$20.classBinary files differ
Device_Simulator_DTS_Tester/bin/main/main_window_computer$21.classBinary files differ
Device_Simulator_DTS_Tester/bin/main/main_window_computer$22.classBinary files differ
Device_Simulator_DTS_Tester/bin/main/main_window_computer$23.classBinary files differ
Device_Simulator_DTS_Tester/bin/main/main_window_computer$24.classBinary files differ
Device_Simulator_DTS_Tester/bin/main/main_window_computer$25.classBinary files differ
Device_Simulator_DTS_Tester/bin/main/main_window_computer$26.classBinary files differ
Device_Simulator_DTS_Tester/bin/main/main_window_computer$3.classBinary files differ
Device_Simulator_DTS_Tester/bin/main/main_window_computer$4.classBinary files differ
Device_Simulator_DTS_Tester/bin/main/main_window_computer$5.classBinary files differ
Device_Simulator_DTS_Tester/bin/main/main_window_computer$6.classBinary files differ
Device_Simulator_DTS_Tester/bin/main/main_window_computer$7.classBinary files differ
Device_Simulator_DTS_Tester/bin/main/main_window_computer$8.classBinary files differ
Device_Simulator_DTS_Tester/bin/main/main_window_computer$9.classBinary files differ
Device_Simulator_DTS_Tester/bin/main/main_window_computer.classBinary files differ
Device_Simulator_DTS_Tester/bin/png_16x16/mon_table.png
Device_Simulator_DTS_Tester/bin/png_16x16/monchar_bar.png
Device_Simulator_DTS_Tester/bin/png_32x32/bar_char.png
Device_Simulator_DTS_Tester/bin/png_32x32/connect_61850.png
Device_Simulator_DTS_Tester/bin/png_32x32/disconnect_61850.png
Device_Simulator_DTS_Tester/bin/png_32x32/model_home.png
Device_Simulator_DTS_Tester/bin/png_32x32/sysparam_set.png
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$10.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$11$1.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$11.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$12.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$13.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$14.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$15.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$16.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$17.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$18.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$19.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$2.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$20.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$21.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$22.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$23.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$24.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$25.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$26.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$27.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$28.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$29.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$3.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$30.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$31.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$32.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$33.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$34.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$35.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$36.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$37.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$38.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$39.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$4.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$40.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$41.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$42.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$43.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$44.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$45.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$46.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$47.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$48.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$49.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$5.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$50.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$51.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$52.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$53.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$54.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$55.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$56.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$57.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$6.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$7.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$8.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base$9.classBinary files differ
Device_Simulator_DTS_Tester/bin/user_app_form/iec61850_page_base.classBinary files differ
Device_Simulator_DTS_Tester/src/com/dev/bts/data/FBS9100_DeviceInf.java
@@ -104,7 +104,29 @@ return bytebuffer; } /** * 获取设备ID号 * @return */ public int getDeviceId() { return BackUp6*256*256*256 + BackUp5*256*256 + BackUp4*256 + BackUp3; } public String getBTSDevTypeStr() { int dev_id = getDeviceId(); String str = "" + dev_id; if(dev_id/1000000 == 910) { str = "常规BTS"; }else if(dev_id/1000000 == 911) { str = "假负载BTS"; }else if(dev_id/1000000 == 912) { str = "逆变BTS"; } return str; } @Override @@ -126,5 +148,8 @@ FBS9100_DeviceInf f2 =new FBS9100_DeviceInf(); System.out.println(f2.putByteBuffer(f1.getByteBuffer())); System.out.println(f2); System.out.println(910000003/910); } } Device_Simulator_DTS_Tester/src/com/dev/bts4810/CommBTS4810.java
@@ -144,6 +144,8 @@ public FBS9100S_SystemControl m_FBS_SysControlFromDev = new FBS9100S_SystemControl(); //从设备读取的控制参数 public FBS9100_DeviceInf deviceinf = new FBS9100_DeviceInf(); public FBS9100_ParamCharge m_FBS_ChargeParam = new FBS9100_ParamCharge(); public FBS9100_ResState m_ResTestState = new FBS9100_ResState(); public FBS9100_CapState m_CapTestState = new FBS9100_CapState(); @@ -818,18 +820,19 @@ msg = "Get MonomerCAP or MonomerRES from FBS9100 OK!!!"; } }else if(FBS9100_ComBase.CMD_GetDeviceInf == m_FBS_Cmd.CMD) { FBS9100_DeviceInf deviceinf = new FBS9100_DeviceInf(); if(true == deviceinf.putByteBuffer(bf)) { comm_res = true; m_BTSDevSoftType = deviceinf.DeviceType; dev_stat_version = deviceinf.SoftwareVersion; dev_stat_version_Str = String.format("V%d.%02d.%02d-%s", dev_stat_version_Str = String.format("%s-V%d.%02d.%02d-%s", deviceinf.getBTSDevTypeStr(), deviceinf.DeviceVersion, deviceinf.HardwareVersion, deviceinf.SoftwareVersion, checkDevAESVer()); //System.out.println(dev_stat_version_Str); msg = "Get CMD_GetDeviceInf From FBS9100 OK: " + dev_stat_version_Str; System.err.println("DevId:" + deviceinf.getDeviceId()); } }else if(FBS9100_ComBase.CMD_GetDeviceTaskInf == m_FBS_Cmd.CMD){ //------------------- 读取FBS9100任务列表 ------------------------- Device_Simulator_DTS_Tester/src/com/dev/fbs9600_zdhj/zdhj_page_base.java
@@ -44,6 +44,8 @@ import org.apache.logging.log4j.Logger; import main.FontUtils; import main.FontUtils.MyFont; import main.main_window_computer; import main.page_debug_inf; @@ -273,7 +275,8 @@ JPanel panel_11 = new JPanel(); //模块数据 tabbedPane.addTab("\u6a21\u5757\u6570\u636e", new ImageIcon(zdhj_page_base.class.getResource("/png_16x16/target.png")), panel_11, null); tabbedPane.addTab("\u6a21\u5757\u6570\u636e", new ImageIcon(zdhj_page_base.class.getResource("/png_32x32/model_home.png")), panel_11, null); // tabbedPane.addTab("\u6a21\u5757\u6570\u636e", new ImageIcon(zdhj_page_base.class.getResource("/png_16x16/target.png")), panel_11, null); panel_11.setLayout(new BorderLayout(0, 0)); JPanel panel_1 = new JPanel(); @@ -296,10 +299,10 @@ JPanel panel_2 = new JPanel(); panel.add(panel_2, BorderLayout.NORTH); panel_2.setLayout(new GridLayout(5, 2, 0, 0)); panel_2.setLayout(new GridLayout(0, 1, 0, 0)); JPanel panel_4 = new JPanel(); panel_4.setBorder(new TitledBorder(null, "\u6A21\u5757\u7248\u672C", TitledBorder.LEADING, TitledBorder.TOP, null, null)); panel_4.setBorder(new TitledBorder(null, "\u6A21\u5757\u7248\u672C", TitledBorder.LEADING, TitledBorder.TOP, FontUtils.getMyFont(MyFont.BorderFont), null)); panel_2.add(panel_4); panel_4.setLayout(new BorderLayout(0, 0)); @@ -308,7 +311,7 @@ tf_zdhj_version.setColumns(10); JPanel panel_3 = new JPanel(); panel_3.setBorder(new TitledBorder(null, "\u5355\u4F53\u603B\u6570", TitledBorder.LEADING, TitledBorder.TOP, null, null)); panel_3.setBorder(new TitledBorder(null, "\u5355\u4F53\u603B\u6570", TitledBorder.LEADING, TitledBorder.TOP, FontUtils.getMyFont(MyFont.BorderFont), null)); panel_2.add(panel_3); panel_3.setLayout(new BorderLayout(0, 0)); @@ -317,7 +320,7 @@ tf_zdhj_moncount.setColumns(10); JPanel panel_5 = new JPanel(); panel_5.setBorder(new TitledBorder(null, "\u7EC4\u7AEF\u7535\u538B(V) / \u7535\u6D41(A)", TitledBorder.LEADING, TitledBorder.TOP, null, null)); panel_5.setBorder(new TitledBorder(null, "\u7EC4\u7AEF\u7535\u538B(V)", TitledBorder.LEADING, TitledBorder.TOP, FontUtils.getMyFont(MyFont.BorderFont), null)); panel_2.add(panel_5); panel_5.setLayout(new GridLayout(0, 1, 0, 0)); @@ -325,12 +328,17 @@ panel_5.add(tf_zdhj_zdvol); tf_zdhj_zdvol.setColumns(10); JPanel panel_20 = new JPanel(); panel_20.setBorder(new TitledBorder(null, "\u7EC4\u7AEF\u7535\u6D41(A)", TitledBorder.LEADING, TitledBorder.TOP, FontUtils.getMyFont(MyFont.BorderFont), null)); panel_2.add(panel_20); panel_20.setLayout(new BorderLayout(0, 0)); tf_zdhj_curr = new JTextField(); panel_5.add(tf_zdhj_curr); panel_20.add(tf_zdhj_curr); tf_zdhj_curr.setColumns(10); JPanel panel_6 = new JPanel(); panel_6.setBorder(new TitledBorder(null, "\u6A21\u5757\u72B6\u6001", TitledBorder.LEADING, TitledBorder.TOP, null, null)); panel_6.setBorder(new TitledBorder(null, "\u6A21\u5757\u72B6\u6001", TitledBorder.LEADING, TitledBorder.TOP, FontUtils.getMyFont(MyFont.BorderFont), null)); panel_2.add(panel_6); panel_6.setLayout(new BorderLayout(0, 0)); @@ -339,7 +347,7 @@ panel_6.add(cb_zdhj_state); JPanel panel_7 = new JPanel(); panel_7.setBorder(new TitledBorder(null, "\u7535\u6D41\u65B9\u5411", TitledBorder.LEADING, TitledBorder.TOP, null, null)); panel_7.setBorder(new TitledBorder(null, "\u7535\u6D41\u65B9\u5411", TitledBorder.LEADING, TitledBorder.TOP, FontUtils.getMyFont(MyFont.BorderFont), null)); panel_2.add(panel_7); panel_7.setLayout(new BorderLayout(0, 0)); @@ -348,7 +356,7 @@ panel_7.add(cb_zdhj_curr_dir); JPanel panel_8 = new JPanel(); panel_8.setBorder(new TitledBorder(null, "\u7535\u6C60\u72B6\u6001", TitledBorder.LEADING, TitledBorder.TOP, null, null)); panel_8.setBorder(new TitledBorder(null, "\u7535\u6C60\u72B6\u6001", TitledBorder.LEADING, TitledBorder.TOP, FontUtils.getMyFont(MyFont.BorderFont), null)); panel_2.add(panel_8); panel_8.setLayout(new BorderLayout(0, 0)); @@ -357,7 +365,7 @@ panel_8.add(cb_zdhj_batt_state); JPanel panel_9 = new JPanel(); panel_9.setBorder(new TitledBorder(null, "\u5E73\u5747\u56E0\u5B50", TitledBorder.LEADING, TitledBorder.TOP, null, null)); panel_9.setBorder(new TitledBorder(null, "\u5E73\u5747\u56E0\u5B50", TitledBorder.LEADING, TitledBorder.TOP, FontUtils.getMyFont(MyFont.BorderFont), null)); //panel_2.add(panel_9); panel_9.setLayout(new BorderLayout(0, 0)); @@ -366,7 +374,7 @@ tf_wenbo_curr_avg.setColumns(10); JPanel panel_10 = new JPanel(); panel_10.setBorder(new TitledBorder(null, "\u5CF0\u503C\u56E0\u5B50", TitledBorder.LEADING, TitledBorder.TOP, null, null)); panel_10.setBorder(new TitledBorder(null, "\u5CF0\u503C\u56E0\u5B50", TitledBorder.LEADING, TitledBorder.TOP, FontUtils.getMyFont(MyFont.BorderFont), null)); //panel_2.add(panel_10); panel_10.setLayout(new BorderLayout(0, 0)); @@ -379,7 +387,7 @@ panel_13.setLayout(new GridLayout(2, 0, 0, 0)); JPanel panel_14 = new JPanel(); panel_14.setBorder(new TitledBorder(UIManager.getBorder("TitledBorder.border"), "\u5185\u963B\u6D4B\u8BD5\u65B9\u6CD5 / \u5185\u963B\u5DF2\u6D4B\u6B21\u6570 / \u64CD\u4F5C", TitledBorder.LEADING, TitledBorder.TOP, null, new Color(0, 0, 0))); panel_14.setBorder(new TitledBorder(UIManager.getBorder("TitledBorder.border"), "\u5185\u963B\u6D4B\u8BD5\u65B9\u6CD5 / \u5185\u963B\u5DF2\u6D4B\u6B21\u6570 / \u64CD\u4F5C", TitledBorder.LEADING, TitledBorder.TOP, FontUtils.getMyFont(MyFont.BorderFont), new Color(0, 0, 0))); panel_13.add(panel_14); panel_14.setLayout(new BoxLayout(panel_14, BoxLayout.X_AXIS)); @@ -425,7 +433,7 @@ JPanel panel_15 = new JPanel(); //操作结果信息 panel_15.setBorder(new TitledBorder(null, "\u64CD\u4F5C\u7ED3\u679C\u4FE1\u606F", TitledBorder.LEADING, TitledBorder.TOP, null, null)); panel_15.setBorder(new TitledBorder(null, "\u64CD\u4F5C\u7ED3\u679C\u4FE1\u606F", TitledBorder.LEADING, TitledBorder.TOP, FontUtils.getMyFont(MyFont.BorderFont), null)); panel_13.add(panel_15); panel_15.setLayout(new BorderLayout(0, 0)); @@ -436,16 +444,16 @@ /***********************************************************************************************/ JPanel panel_right = new JPanel(); panel_right.setBorder(new TitledBorder(null, "\u6a21\u5757\u6821\u51c6", TitledBorder.LEADING, TitledBorder.TOP, null, null)); panel_right.setBorder(new TitledBorder(null, "\u6a21\u5757\u6821\u51c6", TitledBorder.LEADING, TitledBorder.TOP, FontUtils.getMyFont(MyFont.BorderFont), null)); panel_1.add(panel_right,BorderLayout.CENTER); panel_right.setLayout(new GridLayout(6,1,10,10)); panel_right.setLayout(new GridLayout(4,1,10,10)); JPanel panel_52 = new JPanel(); zdhj_title = "实测电压(V) / 校准电压(V)"; if(LANG_TYPE_EN == LANG_TYPE) { zdhj_title = "Measure Vol(V) / Standerd Vol(V)"; } panel_52.setBorder(new TitledBorder(UIManager.getBorder("TitledBorder.border"), zdhj_title, TitledBorder.LEADING, TitledBorder.TOP, null, new Color(0, 0, 0))); panel_52.setBorder(new TitledBorder(UIManager.getBorder("TitledBorder.border"), zdhj_title, TitledBorder.LEADING, TitledBorder.TOP, FontUtils.getMyFont(MyFont.BorderFont), new Color(0, 0, 0))); panel_right.add(panel_52); panel_52.setLayout(new FlowLayout(FlowLayout.LEFT, 5, 5)); @@ -483,8 +491,9 @@ res_type_tag, res_type_tag.length); } }); btn_zdhj_volcal_offset.setFont(new Font("宋体", Font.PLAIN, 12)); btn_zdhj_volcal_offset.setFont(FontUtils.getMyFont(MyFont.DeFault)); panel_52.add(btn_zdhj_volcal_offset); btn_zdhj_volcal_offset.setPreferredSize(new Dimension(100, 35)); zdhj_title = "斜率校准"; if(LANG_TYPE_EN == LANG_TYPE) { @@ -534,7 +543,8 @@ res_type_tag, res_type_tag.length); } }); btn_zdhj_volcal_slope.setFont(new Font("宋体", Font.PLAIN, 12)); btn_zdhj_volcal_slope.setFont(FontUtils.getMyFont(MyFont.DeFault)); btn_zdhj_volcal_slope.setPreferredSize(new Dimension(100, 35)); panel_52.add(btn_zdhj_volcal_slope); zdhj_title = "重置"; @@ -565,7 +575,8 @@ res_type_tag, res_type_tag.length); } }); btn_zdhj_volcal_reset.setFont(new Font("宋体", Font.PLAIN, 12)); btn_zdhj_volcal_reset.setFont(FontUtils.getMyFont(MyFont.DeFault)); btn_zdhj_volcal_reset.setPreferredSize(new Dimension(60, 35)); panel_52.add(btn_zdhj_volcal_reset); JPanel panel_53 = new JPanel(); @@ -573,7 +584,7 @@ if(LANG_TYPE_EN == LANG_TYPE) { zdhj_title = "Measure Curr(A) / Standerd Curr(A)"; } panel_53.setBorder(new TitledBorder(UIManager.getBorder("TitledBorder.border"), zdhj_title, TitledBorder.LEADING, TitledBorder.TOP, null, new Color(0, 0, 0))); panel_53.setBorder(new TitledBorder(UIManager.getBorder("TitledBorder.border"), zdhj_title, TitledBorder.LEADING, TitledBorder.TOP, FontUtils.getMyFont(MyFont.BorderFont), new Color(0, 0, 0))); panel_right.add(panel_53); panel_53.setLayout(new FlowLayout(FlowLayout.LEFT, 5, 5)); @@ -622,7 +633,8 @@ res_type_tag, res_type_tag.length); } }); btn_zdhj_currcal_offset.setFont(new Font("宋体", Font.PLAIN, 12)); btn_zdhj_currcal_offset.setFont(FontUtils.getMyFont(MyFont.DeFault)); btn_zdhj_currcal_offset.setPreferredSize(new Dimension(100, 35)); panel_53.add(btn_zdhj_currcal_offset); zdhj_title = "У"; @@ -672,7 +684,8 @@ res_type_tag, res_type_tag.length); } }); btn_zdhj_currcal_slope.setFont(new Font("宋体", Font.PLAIN, 12)); btn_zdhj_currcal_slope.setFont(FontUtils.getMyFont(MyFont.DeFault)); btn_zdhj_currcal_slope.setPreferredSize(new Dimension(100, 35)); panel_53.add(btn_zdhj_currcal_slope); zdhj_title = "重置"; @@ -704,11 +717,12 @@ res_type_tag, res_type_tag.length); } }); btn_zdhj_currcal_reset.setFont(new Font("宋体", Font.PLAIN, 12)); btn_zdhj_currcal_reset.setFont(FontUtils.getMyFont(MyFont.DeFault)); btn_zdhj_currcal_reset.setPreferredSize(new Dimension(60, 35)); panel_53.add(btn_zdhj_currcal_reset); JPanel panel_82 = new JPanel(); panel_82.setBorder(new TitledBorder(UIManager.getBorder("TitledBorder.border"), "\u73AF\u5883\u6E29\u5EA6(\u2103) / \u6821\u51C6\u6E29\u5EA6(\u2103)", TitledBorder.LEADING, TitledBorder.TOP, null, new Color(0, 0, 0))); panel_82.setBorder(new TitledBorder(UIManager.getBorder("TitledBorder.border"), "\u73AF\u5883\u6E29\u5EA6(\u2103) / \u6821\u51C6\u6E29\u5EA6(\u2103)", TitledBorder.LEADING, TitledBorder.TOP, FontUtils.getMyFont(MyFont.BorderFont), new Color(0, 0, 0))); panel_right.add(panel_82); panel_82.setLayout(new FlowLayout(FlowLayout.LEFT, 5, 5)); @@ -728,7 +742,8 @@ main_window_computer.addFocusListener(tf_zdhj_tmp_cal); btn_zdhj_temp_cal = new JButton("\u6E29\u5EA6\u6821\u51C6"); btn_zdhj_temp_cal.setFont(new Font("宋体", Font.PLAIN, 12)); btn_zdhj_temp_cal.setFont(FontUtils.getMyFont(MyFont.DeFault)); btn_zdhj_temp_cal.setPreferredSize(new Dimension(100, 35)); btn_zdhj_temp_cal.setEnabled(false); btn_zdhj_temp_cal.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -806,7 +821,8 @@ panel_82.add(btn_zdhj_temp_cal); btn_zdhj_temp_cal_reset = new JButton("\u6E29\u5EA6\u91CD\u7F6E"); btn_zdhj_temp_cal_reset.setFont(new Font("宋体", Font.PLAIN, 12)); btn_zdhj_temp_cal_reset.setFont(FontUtils.getMyFont(MyFont.DeFault)); btn_zdhj_temp_cal_reset.setPreferredSize(new Dimension(100, 35)); btn_zdhj_temp_cal_reset.setEnabled(false); btn_zdhj_temp_cal_reset.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { @@ -844,11 +860,13 @@ panel_ZDHJ_chart = new zdhj_page_chart(); //图形数据-单体数据 tabbedPane.addTab("\u5355\u4f53\u6570\u636e", new ImageIcon(zdhj_page_base.class.getResource("/png_16x16/chart_bar.png")), panel_ZDHJ_chart, null); tabbedPane.addTab("\u5355\u4f53\u6570\u636e", new ImageIcon(zdhj_page_base.class.getResource("/png_32x32/bar_char.png")), panel_ZDHJ_chart, null); // tabbedPane.addTab("\u5355\u4f53\u6570\u636e", new ImageIcon(zdhj_page_base.class.getResource("/png_16x16/chart_bar.png")), panel_ZDHJ_chart, null); panel_ZDHJ_param = new zdhj_page_param(); //参数设置 tabbedPane.addTab("\u53C2\u6570\u8BBE\u7F6E", new ImageIcon(zdhj_page_base.class.getResource("/png_16x16/application_edit.png")), panel_ZDHJ_param, null); tabbedPane.addTab("\u53C2\u6570\u8BBE\u7F6E", new ImageIcon(zdhj_page_base.class.getResource("/png_32x32/sysparam_set.png")), panel_ZDHJ_param, null); // tabbedPane.addTab("\u53C2\u6570\u8BBE\u7F6E", new ImageIcon(zdhj_page_base.class.getResource("/png_16x16/application_edit.png")), panel_ZDHJ_param, null); panel_ZDHJ_record = new zdhj_page_record(); //tabbedPane.addTab("\u6570\u636E\u8BB0\u5F55", new ImageIcon(zdhj_page_base.class.getResource("/png_16x16/disk.png")), panel_ZDHJ_record, null); Device_Simulator_DTS_Tester/src/com/dev/fbs9600_zdhj/zdhj_page_chart.java
@@ -311,8 +311,10 @@ JPanel panel_10 = new JPanel(); panel_10.setLayout(new BorderLayout(10, 10)); tabbedPane.addTab("条形图", new ImageIcon(zdhj_page_base.class.getResource("/png_16x16/target.png")), barchars_panel, null); tabbedPane.addTab("表格", new ImageIcon(zdhj_page_base.class.getResource("/png_16x16/target.png")), panel_10, null); //tabbedPane.addTab("条形图", new ImageIcon(zdhj_page_base.class.getResource("/png_16x16/target.png")), barchars_panel, null); tabbedPane.addTab("条形图", new ImageIcon(zdhj_page_base.class.getResource("/png_16x16/monchar_bar.png")), barchars_panel, null); // tabbedPane.addTab("表格", new ImageIcon(zdhj_page_base.class.getResource("/png_16x16/target.png")), panel_10, null); tabbedPane.addTab("表格", new ImageIcon(zdhj_page_base.class.getResource("/png_16x16/mon_table.png")), panel_10, null); panel_10.add(scrollPane_2,BorderLayout.CENTER); Device_Simulator_DTS_Tester/src/icon/alarm_param.png
Device_Simulator_DTS_Tester/src/icon/alarm_remote.png
Device_Simulator_DTS_Tester/src/icon/batt_remote.png
Device_Simulator_DTS_Tester/src/icon/dev_remote.png
Device_Simulator_DTS_Tester/src/icon/ip_param.png
Device_Simulator_DTS_Tester/src/main/FontUtils.java
New file @@ -0,0 +1,47 @@ package main; import java.awt.Font; import java.util.HashMap; import java.util.Map; public class FontUtils { public static Map<MyFont,Font> myFonts = new HashMap<>(); public enum MyFont{ DeFault, //默认字体 HomeBtn, //首页按钮字体 BorderFont, //边框字体 } static { /** * 默认字体 */ myFonts.put(MyFont.DeFault, new Font("宋体", Font.PLAIN, 16)); /** * 首页按钮字体 */ myFonts.put(MyFont.HomeBtn, new Font("宋体", Font.PLAIN, 32)); /** * 边框字体 */ myFonts.put(MyFont.BorderFont, new Font("宋体", Font.PLAIN, 18)); } public static Font getMyFont(MyFont fontName) { Font font = myFonts.get(fontName); if(null == font) { myFonts.get(MyFont.DeFault); } return font; } } Device_Simulator_DTS_Tester/src/main/main_window_computer.java
@@ -71,6 +71,8 @@ import com.dev.switchdev.SwitchDevice_page_base; import com.ueky.ukeycfg_page_base; import main.FontUtils.MyFont; import javax.swing.BorderFactory; import javax.swing.Box; import javax.swing.BoxLayout; @@ -1303,6 +1305,7 @@ panel_9.add(tf_txcnt); tf_txcnt.setColumns(12); tf_rxcnt = new JTextField(); tf_rxcnt.setFont(new Font("宋体", Font.PLAIN, 16)); panel_9.add(tf_rxcnt); @@ -2095,7 +2098,7 @@ button.setHorizontalTextPosition(SwingConstants.CENTER); button.setVerticalTextPosition(SwingConstants.BOTTOM); button.setFont(new Font("宋体", Font.PLAIN, 18)); button.setFont(FontUtils.getMyFont(MyFont.HomeBtn)); } public void setJTableSelectIndex(int jt_index) { Device_Simulator_DTS_Tester/src/png_16x16/mon_table.png
Device_Simulator_DTS_Tester/src/png_16x16/monchar_bar.png
Device_Simulator_DTS_Tester/src/png_32x32/bar_char.png
Device_Simulator_DTS_Tester/src/png_32x32/connect_61850.png
Device_Simulator_DTS_Tester/src/png_32x32/disconnect_61850.png
Device_Simulator_DTS_Tester/src/png_32x32/model_home.png
Device_Simulator_DTS_Tester/src/png_32x32/sysparam_set.png
Device_Simulator_DTS_Tester/src/user_app_form/iec61850_page_base.java
@@ -308,6 +308,8 @@ tf_host_ip.setText(m_Config.serverIp); tf_host_ip.setColumns(10); panel_2.setPreferredSize(new Dimension(140, 60)); JPopupMenu popupMenu = new JPopupMenu(); JMenuItem tableItem_lan1 = null; @@ -403,6 +405,9 @@ tf_port.setEditable(false); panel_3.setPreferredSize(new Dimension(60, 60)); JPanel panel_4 = new JPanel(); panel_4.setBorder(new TitledBorder(UIManager.getBorder("TitledBorder.border"), "\u534f\u8f6c\u901A\u4FE1\u8BA1\u6570(Tx/Rx)", TitledBorder.LEADING, TitledBorder.TOP, null, new Color(0, 0, 0))); panel.add(panel_4); @@ -415,6 +420,8 @@ tf_rx_cnt = new JTextField(); panel_4.add(tf_rx_cnt); tf_rx_cnt.setColumns(5); panel_4.setPreferredSize(new Dimension(140, 60)); JPanel panel_110 = new JPanel(); panel_110.setBorder(new TitledBorder(UIManager.getBorder("TitledBorder.border"), "\u4e3b\u673a\u901A\u4FE1\u8BA1\u6570(Tx/Rx)", TitledBorder.LEADING, TitledBorder.TOP, null, new Color(0, 0, 0))); @@ -431,6 +438,9 @@ JPanel panel_99 = new JPanel(); panel_99.setBorder(new TitledBorder(null, "\u8C03\u8BD5\u6A21\u5F0F", TitledBorder.LEADING, TitledBorder.TOP, null, null)); panel.add(panel_99); @@ -441,9 +451,10 @@ setDebugPanelStat(cb_DebugMode.getSelectedIndex()); } }); cb_DebugMode.setPreferredSize(new Dimension(80, 38)); panel_99.setLayout(new BorderLayout(0, 0)); cb_DebugMode.setModel(new DefaultComboBoxModel<String>(new String[] {"ģʽ1 ", "ģʽ2 "})); panel_99.add(cb_DebugMode); panel_99.add(cb_DebugMode,BorderLayout.CENTER); JPanel panel_23 = new JPanel(); panel_23.setBorder(new TitledBorder(UIManager.getBorder("TitledBorder.border"), "\u534F\u8F6C\u901A\u4FE1", TitledBorder.LEADING, TitledBorder.TOP, null, new Color(0, 0, 0))); @@ -451,12 +462,16 @@ panel_23.setLayout(new GridLayout(1, 0, 4, 0)); btn_connect = new JButton("\u8FDE\u63A5"); btn_connect.setIcon(new ImageIcon(main_form.class.getResource("/icon/connect.png"))); btn_connect.setIcon(new ImageIcon(main_form.class.getResource("/png_32x32/connect_61850.png"))); // btn_connect.setIcon(new ImageIcon(main_form.class.getResource("/icon/connect.png"))); btn_connect.setFont(new Font("宋体", Font.PLAIN, 12)); panel_23.add(btn_connect); btn_connect.setPreferredSize(new Dimension(120, 38)); JButton btn_break = new JButton("\u65AD\u5F00"); btn_break.setIcon(new ImageIcon(main_form.class.getResource("/icon/disconnect.png"))); btn_break.setIcon(new ImageIcon(main_form.class.getResource("/png_32x32/disconnect_61850.png"))); // btn_break.setIcon(new ImageIcon(main_form.class.getResource("/icon/disconnect.png"))); btn_break.setFont(new Font("宋体", Font.PLAIN, 12)); panel_23.add(btn_break); @@ -464,6 +479,8 @@ panel_29.setBorder(new TitledBorder(null, "\u901A\u4FE1\u95F4\u9694(ms)", TitledBorder.LEADING, TitledBorder.TOP, null, null)); panel.add(panel_29); panel_29.setLayout(new BorderLayout(0, 0)); panel_29.setPreferredSize(new Dimension(100, 62)); comboBox_rate = new JComboBox<String>(); comboBox_rate.setModel(new DefaultComboBoxModel<String>(new String[] {"100", "200", "300", "500", "1000", "2000 "})); @@ -1268,7 +1285,7 @@ panel_groupinf.add(tabbedPane, BorderLayout.CENTER); JPanel panel_58 = new JPanel(); tabbedPane.addTab("设备遥测", null, panel_58, null); tabbedPane.addTab("设备遥测", new ImageIcon(main_form.class.getResource("/icon/dev_remote.png")), panel_58, null); panel_58.setLayout(new BorderLayout(0, 0)); JScrollPane scrollPane = new JScrollPane(); @@ -1284,7 +1301,7 @@ scrollPane.setViewportView(table_dev_inf); JPanel panel_59 = new JPanel(); tabbedPane.addTab("电池遥测", null, panel_59, null); tabbedPane.addTab("电池遥测", new ImageIcon(main_form.class.getResource("/icon/batt_remote.png")), panel_59, null); panel_59.setLayout(new BorderLayout(0, 0)); JScrollPane scrollPane_1 = new JScrollPane(); panel_59.add(scrollPane_1, BorderLayout.CENTER); @@ -1298,7 +1315,7 @@ scrollPane_1.setViewportView(table_batt_inf); JPanel panel_93 = new JPanel(); tabbedPane.addTab("告警遥信", null, panel_93, null); tabbedPane.addTab("告警遥信", new ImageIcon(main_form.class.getResource("/icon/alarm_remote.png")), panel_93, null); panel_93.setLayout(new BorderLayout(0, 0)); JScrollPane scrollPane_3 = new JScrollPane(); @@ -1737,9 +1754,9 @@ JPanel panel_11 = new JPanel(); //panel_11.setBorder(new TitledBorder(null, "\u8BBE\u7F6E\u534F\u8F6CIP", TitledBorder.LEADING, TitledBorder.TOP, null, null)); tabbedPane_set.addTab("设置协转IP", null, panel_11, null); tabbedPane_set.addTab("设置协转IP", new ImageIcon(main_form.class.getResource("/icon/ip_param.png")), panel_11, null); tabbedPane_set.addTab("设置告警参数", null, panel_22, null); tabbedPane_set.addTab("设置告警参数", new ImageIcon(main_form.class.getResource("/icon/alarm_param.png")), panel_22, null); //panel_sysinf.add(panel_11); panel_11.setLayout(new BorderLayout(0, 0));