Commit 5a2fce42 authored by wangjunqiang's avatar wangjunqiang

修复一些bug

parent ccb3e4a3
...@@ -123,13 +123,6 @@ namespace GcDevicePc ...@@ -123,13 +123,6 @@ namespace GcDevicePc
{ {
ret = mainclient.WtClientCopyfromServer(filename[i], getfile, foldername[i]); ret = mainclient.WtClientCopyfromServer(filename[i], getfile, foldername[i]);
Thread.Sleep(500);
//checkflag = filecheck.IsUse(getfile);
//while (checkflag != 0)
//{
// Thread.Sleep(200);
// checkflag = filecheck.IsUse(getfile);
//}
if (ret == 0) if (ret == 0)
{ {
Log.Info(filename[i].ToString() + " 同步成功"); Log.Info(filename[i].ToString() + " 同步成功");
...@@ -271,10 +264,5 @@ namespace GcDevicePc ...@@ -271,10 +264,5 @@ namespace GcDevicePc
} }
} }
public void InitDB()
{
}
} }
} }
...@@ -27,6 +27,7 @@ namespace GcDevicePc ...@@ -27,6 +27,7 @@ namespace GcDevicePc
| System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.Controls.Add(curdisp); this.Controls.Add(curdisp);
CheckForIllegalCrossThreadCalls = false;
} }
} }
} }
...@@ -400,7 +400,7 @@ namespace GcDevicePc ...@@ -400,7 +400,7 @@ namespace GcDevicePc
public void WaitHMIFree() public void WaitHMIFree()
{ {
if (globaldata.m_hmibuffer.gcinfo.hmistatus != 0) // if (globaldata.m_hmibuffer.gcinfo.hmistatus != 0)
{ {
this.backgroundWorker1.RunWorkerAsync(); this.backgroundWorker1.RunWorkerAsync();
WaitForm form = new WaitForm(this.backgroundWorker1, "Free"); WaitForm form = new WaitForm(this.backgroundWorker1, "Free");
...@@ -465,7 +465,7 @@ namespace GcDevicePc ...@@ -465,7 +465,7 @@ namespace GcDevicePc
} }
public void WaitHMIWork() public void WaitHMIWork()
{ {
if (globaldata.m_hmibuffer.gcinfo.methodstatus < 0 || globaldata.m_hmibuffer.gcinfo.methodstatus > 5) // if (globaldata.m_hmibuffer.gcinfo.methodstatus < 0 || globaldata.m_hmibuffer.gcinfo.methodstatus > 5)
{ {
this.backgroundWorker2.RunWorkerAsync(); this.backgroundWorker2.RunWorkerAsync();
WaitForm form = new WaitForm(this.backgroundWorker2, "Work"); WaitForm form = new WaitForm(this.backgroundWorker2, "Work");
......
using System; using System;
using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using System.Data; using System.Data;
using System.Drawing; using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading; using System.Threading;
using System.Windows.Forms; using System.Windows.Forms;
using WeifenLuo.WinFormsUI.Docking;
using GcDevicePc.IniParam;
using System.IO; using System.IO;
using System.Runtime.InteropServices;
using GcDevicePc.ProThread; using GcDevicePc.ProThread;
using System.Security.Cryptography;
using System.Diagnostics; using System.Diagnostics;
using GcDevicePc.Common; using GcDevicePc.Common;
......
...@@ -101,7 +101,6 @@ namespace GcDevicePc.ProThread ...@@ -101,7 +101,6 @@ namespace GcDevicePc.ProThread
NowTimeOld = globaldata.m_hmibuffer.gcinfo.NowStartTime; NowTimeOld = globaldata.m_hmibuffer.gcinfo.NowStartTime;
CurveDisPlay.curdisp.cleardata(); CurveDisPlay.curdisp.cleardata();
} }
else else
{ {
...@@ -191,9 +190,6 @@ namespace GcDevicePc.ProThread ...@@ -191,9 +190,6 @@ namespace GcDevicePc.ProThread
{ {
listPoint.Add(new double[] { Math.Round(time, 4), Math.Round(value, 6) }); listPoint.Add(new double[] { Math.Round(time, 4), Math.Round(value, 6) });
listRaw.Add(new double[] {((SignalBuffer.Channel_XY)globaldata.m_signalbuffer.Draw_Port[i]).ctimer, Math.Round(value, 6) }); listRaw.Add(new double[] {((SignalBuffer.Channel_XY)globaldata.m_signalbuffer.Draw_Port[i]).ctimer, Math.Round(value, 6) });
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment