diff --git a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe index 8ce2a7f..3502ee5 100644 --- a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe +++ b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe Binary files differ diff --git a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe index 8ce2a7f..3502ee5 100644 --- a/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe +++ b/RbFreqStandMeasure/bin/Debug/RbFreqStandMeasure.exe Binary files differ diff --git a/RbFreqStandMeasure/counter/CounterCtrlForm.cs b/RbFreqStandMeasure/counter/CounterCtrlForm.cs index c3d14de..2962c42 100644 --- a/RbFreqStandMeasure/counter/CounterCtrlForm.cs +++ b/RbFreqStandMeasure/counter/CounterCtrlForm.cs @@ -542,6 +542,17 @@ benDelete.Enabled = false; btn_dropDetecModel.Enabled = false; string[] ids = gPIBService.getId(); + int connect = isConnect(text_signal.Text, text_counterIp.Text); + if (connect == -1) + { + MessageBox.Show("未连接信号源"); + return; + } + else if (connect == -2) + { + MessageBox.Show("未连接计数器"); + return; + } //string[] ips = tcpService.getId(); /*if (ids != null && ids.Length > 0) { @@ -564,7 +575,7 @@ } else {*/ - string[] arr = text_counterIp.Text.Split('.'); + string[] arr = text_counterIp.Text.Split('.'); if (arr.Length != 4) { MessageBox.Show("请输入正确的频率计数器IP!"); @@ -858,5 +869,15 @@ } } + private int isConnect(string id, string ip) + { + int result = 0; + if (gPIBService.open(id) == -1) + result = -1; + else if (tcpService.open(ip) == -1) + result = -2; + return result; + } + } }