|
@@ -149,7 +149,7 @@ namespace HOZProject
|
|
void CompletedWork(object sender, RunWorkerCompletedEventArgs e)
|
|
void CompletedWork(object sender, RunWorkerCompletedEventArgs e)
|
|
{
|
|
{
|
|
//设置控件操作
|
|
//设置控件操作
|
|
- MessageBox.Show("线程已完成!", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
|
|
|
|
|
|
+ MessageBox.Show("测量已完成!", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
|
|
SetWinControlMeasureState(true);
|
|
SetWinControlMeasureState(true);
|
|
}
|
|
}
|
|
#endregion
|
|
#endregion
|
|
@@ -315,7 +315,7 @@ namespace HOZProject
|
|
{
|
|
{
|
|
if (m_Ms != null)
|
|
if (m_Ms != null)
|
|
{
|
|
{
|
|
- if (!m_Ms.key_stop)
|
|
|
|
|
|
+ if (m_BackgroundWorker.IsBusy)
|
|
{
|
|
{
|
|
if (MessageBox.Show("当前测量正在运行,是否关闭此窗体?", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
|
|
if (MessageBox.Show("当前测量正在运行,是否关闭此窗体?", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
|
|
{
|
|
{
|