Skip to content

G
GC_Branch
Commit e66588c8 authored by 周磊's avatar 周磊
Browse files
Options

1.版本变更2.0.2 

2.方法界面UI动态加载
3.方法界面标题栏显示当前方法文件路径信息,可双击打开本地所在
4.组分增加"强制积分",勾选后该组分(只针对当前设置化合物)会将寻峰开始和结束时间强制视为起点和终点
5.移除方法界面下半部分
6.修复前检测hw谱图不保存问题,通过更改hw谱图保存方式:之前是边采集边写入到文件,现在是raw谱图生成的时候直接转为hw谱图
7.增加取消功能:运行中不可使用,使用时清除所有采集窗口数据
8.增加因为物理按键开始出现的2500一些补救措施(太过频繁出现时会失效)
9.增加一些软件启动提示:网段不同,提示并进入通讯设置;HMI配置为空,提示并进入仪器配置
10.历史谱图界面增加一些功能(导出为hw,打开本地所在,打开路径具体化等)
11.修复方法名称含有小数点时,hw谱图不能正常保存的问题,同时增加非法字符判断
12.主界面灵敏度增加悬浮显示放大倍数
13.修复nmhc直测上传数据不对的问题
14.仪器配置中默认配置改为写入默认保护温度(300℃)
parent 4b7b7ca4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 32500 additions and 20193 deletions
GcDevicePc/AppInit.cs
View file @ e66588c8
This diff is collapsed.
GcDevicePc/CK_UI/CurveDisPlay.cs
View file @ e66588c8
...@@ -25,9 +25,9 @@ namespace GcDevicePc ...@@ -25,9 +25,9 @@ namespace GcDevicePc
public CurveDisPlay() public CurveDisPlay()
{ {
InitializeComponent(); InitializeComponent();
nMHCCal=curdisp.nMHCCal;
curdisp.Location = new Point(5, 5); curdisp.Location = new Point(5, 5);
curdisp.Fidname = "A"; curdisp.Fidname = "前";
Size size = curdisp.Size; Size size = curdisp.Size;
size.Width = size.Width - 20; size.Width = size.Width - 20;
......
GcDevicePc/CK_UI/CurveDisPlay2.cs
View file @ e66588c8
...@@ -18,7 +18,7 @@ namespace GcDevicePc.CK_UI ...@@ -18,7 +18,7 @@ namespace GcDevicePc.CK_UI
InitializeComponent(); InitializeComponent();
curdisp2.Location = new Point(5, 5); curdisp2.Location = new Point(5, 5);
curdisp2.Fidname = "B"; curdisp2.Fidname = "中";
Size size = curdisp2.Size; Size size = curdisp2.Size;
size.Width = size.Width - 20; size.Width = size.Width - 20;
......
GcDevicePc/CK_UI/CurveDisPlay3.cs
View file @ e66588c8
...@@ -18,7 +18,7 @@ namespace GcDevicePc.CK_UI ...@@ -18,7 +18,7 @@ namespace GcDevicePc.CK_UI
InitializeComponent(); InitializeComponent();
curdisp3.Location = new Point(5, 5); curdisp3.Location = new Point(5, 5);
curdisp3.Fidname = "C"; curdisp3.Fidname = "后";
Size size = curdisp3.Size; Size size = curdisp3.Size;
size.Width = size.Width - 20; size.Width = size.Width - 20;
......
GcDevicePc/Common/NModbusSlave.cs
View file @ e66588c8
...@@ -46,7 +46,7 @@ namespace GcDevicePc.Common ...@@ -46,7 +46,7 @@ namespace GcDevicePc.Common
~NModbusSlave() ~NModbusSlave()
{ {
listener.Stop(); listener.Stop();
slave.Dispose(); slave?.Dispose();
} }
private readonly TcpListener listener; private readonly TcpListener listener;
...@@ -806,7 +806,6 @@ namespace GcDevicePc.Common ...@@ -806,7 +806,6 @@ namespace GcDevicePc.Common
if (address == 0 || address == 1) if (address == 0 || address == 1)
{ {
index = SharedSpace.Data.listValue.FindIndex(lv => lv.name == "NMHC"); index = SharedSpace.Data.listValue.FindIndex(lv => lv.name == "NMHC");
} }
if (address == 2 || address == 3) if (address == 2 || address == 3)
...@@ -825,7 +824,7 @@ namespace GcDevicePc.Common ...@@ -825,7 +824,7 @@ namespace GcDevicePc.Common
if (index > -1) if (index > -1)
{ {
f[0] = float.Parse(SharedSpace.Data.listValue[index].vale.ToString()); f[0] = float.Parse(SharedSpace.Data.listValue[index].vale.ToString());
if (CurveDisPlay.nMHCCal == CKVocAnalyzer.CtrlWaveCurrent.NMHCCal.NMHC_direct) if (CurveDisPlay.curdisp.nMHCCal == CKVocAnalyzer.CtrlWaveCurrent.NMHCCal.NMHC_direct)
{ {
//直测不需要氧校准,THC需要加法计算,其他原值输出 //直测不需要氧校准,THC需要加法计算,其他原值输出
if (index == SharedSpace.Data.listValue.FindIndex(lv => lv.name == "THC")) if (index == SharedSpace.Data.listValue.FindIndex(lv => lv.name == "THC"))
...@@ -843,7 +842,7 @@ namespace GcDevicePc.Common ...@@ -843,7 +842,7 @@ namespace GcDevicePc.Common
f[0] = fNMHCValue + fCH4Value; f[0] = fNMHCValue + fCH4Value;
} }
} }
else if (CurveDisPlay.nMHCCal == CKVocAnalyzer.CtrlWaveCurrent.NMHCCal.NMHC_indirect) else if (CurveDisPlay.curdisp.nMHCCal == CKVocAnalyzer.CtrlWaveCurrent.NMHCCal.NMHC_indirect)
{ {
if (index == SharedSpace.Data.listValue.FindIndex(lv => lv.name == "THC")) if (index == SharedSpace.Data.listValue.FindIndex(lv => lv.name == "THC"))
......
GcDevicePc/ConfigMethod/MethodMain.cs
View file @ e66588c8
This diff is collapsed.
GcDevicePc/ConfigMethod/MethodMain.resx
View file @ e66588c8
This diff is collapsed.
GcDevicePc/Controls/PictureMenu.cs
View file @ e66588c8
...@@ -52,14 +52,16 @@ namespace GcDevicePc.Controls ...@@ -52,14 +52,16 @@ namespace GcDevicePc.Controls
((PictureBox)PMPanel.Controls[0]).Enabled = false; ((PictureBox)PMPanel.Controls[0]).Enabled = false;
((PictureBox)PMPanel.Controls[1]).Image = pmoptimage.Images[7]; ((PictureBox)PMPanel.Controls[1]).Image = pmoptimage.Images[7];
((PictureBox)PMPanel.Controls[1]).Enabled = false; ((PictureBox)PMPanel.Controls[1]).Enabled = false;
((PictureBox)PMPanel.Controls[2]).Image = pmoptimage.Images[8]; //取消依据调用时的方法状态,决定是否执行(运行中以外状态可执行)
((PictureBox)PMPanel.Controls[2]).Enabled = false; ((PictureBox)PMPanel.Controls[2]).Image = pmoptimage.Images[2];
((PictureBox)PMPanel.Controls[2]).Enabled = true;
break; break;
case 3://停止亮 case 3://停止亮
((PictureBox)PMPanel.Controls[0]).Image = pmoptimage.Images[6]; ((PictureBox)PMPanel.Controls[0]).Image = pmoptimage.Images[6];
((PictureBox)PMPanel.Controls[0]).Enabled = false; ((PictureBox)PMPanel.Controls[0]).Enabled = false;
((PictureBox)PMPanel.Controls[1]).Image = pmoptimage.Images[1]; ((PictureBox)PMPanel.Controls[1]).Image = pmoptimage.Images[1];
((PictureBox)PMPanel.Controls[1]).Enabled = true; ((PictureBox)PMPanel.Controls[1]).Enabled = true;
//取消依据调用时的方法状态,决定是否执行(运行中以外状态可执行)
((PictureBox)PMPanel.Controls[2]).Image = pmoptimage.Images[2]; ((PictureBox)PMPanel.Controls[2]).Image = pmoptimage.Images[2];
((PictureBox)PMPanel.Controls[2]).Enabled = true; ((PictureBox)PMPanel.Controls[2]).Enabled = true;
break; break;
...@@ -68,8 +70,9 @@ namespace GcDevicePc.Controls ...@@ -68,8 +70,9 @@ namespace GcDevicePc.Controls
((PictureBox)PMPanel.Controls[0]).Enabled = true; ((PictureBox)PMPanel.Controls[0]).Enabled = true;
((PictureBox)PMPanel.Controls[1]).Image = pmoptimage.Images[7]; ((PictureBox)PMPanel.Controls[1]).Image = pmoptimage.Images[7];
((PictureBox)PMPanel.Controls[1]).Enabled = false; ((PictureBox)PMPanel.Controls[1]).Enabled = false;
((PictureBox)PMPanel.Controls[2]).Image = pmoptimage.Images[8]; //取消依据调用时的方法状态,决定是否执行(运行中以外状态可执行)
((PictureBox)PMPanel.Controls[2]).Enabled = false; ((PictureBox)PMPanel.Controls[2]).Image = pmoptimage.Images[2];
((PictureBox)PMPanel.Controls[2]).Enabled = true;
break; break;
} }
} }
......
GcDevicePc/DataState.cs
View file @ e66588c8
This diff is collapsed.
GcDevicePc/DeviceConfigUI/ConfigDevice.cs
View file @ e66588c8
...@@ -12,6 +12,7 @@ using System.Threading; ...@@ -12,6 +12,7 @@ using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
using GcDevicePc.GCBuffer; using GcDevicePc.GCBuffer;
using TTControl;
namespace GcDevicePc.DeviceConfigUI namespace GcDevicePc.DeviceConfigUI
{ {
...@@ -197,7 +198,9 @@ namespace GcDevicePc.DeviceConfigUI ...@@ -197,7 +198,9 @@ namespace GcDevicePc.DeviceConfigUI
private void ConfigDevice_Load(object sender, EventArgs e) private void ConfigDevice_Load(object sender, EventArgs e)
{ {
//左侧树
InitSysConfigTree(); InitSysConfigTree();
//右侧树
UpdateHMIConfigTree(0); UpdateHMIConfigTree(0);
} }
...@@ -345,13 +348,14 @@ namespace GcDevicePc.DeviceConfigUI ...@@ -345,13 +348,14 @@ namespace GcDevicePc.DeviceConfigUI
string sendfilename; string sendfilename;
public event UpdataHMIOP upho; public event UpdataHMIOP upho;
private void savebtn_Click(object sender, EventArgs e) private void savebtn_Click(object sender, EventArgs e)
{ {
try try
{ {
sendfilename = Path.Combine(globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.SubStatusFolder,"DevStatus.ini"); sendfilename = Path.Combine(globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.SubStatusFolder, "DevStatus.ini");
if (File.Exists(sendfilename)) if (File.Exists(sendfilename))
{ {
...@@ -524,11 +528,8 @@ namespace GcDevicePc.DeviceConfigUI ...@@ -524,11 +528,8 @@ namespace GcDevicePc.DeviceConfigUI
private void DefaultCogfigButton1_Click(object sender, EventArgs e) private void DefaultCogfigButton1_Click(object sender, EventArgs e)
{ {
DialogResult result = MessageBox.Show(bEnglishLanguage == false ? "是否重置为默认配置？" : "Whether to reset to the default configuration", bEnglishLanguage == false ? "提示信息" : "Tips", MessageBoxButtons.OKCancel, MessageBoxIcon.None, MessageBoxDefaultButton.Button1, MessageBoxOptions.ServiceNotification); if (UniversalPopUpWindow.DoubleSelectPopup(bEnglishLanguage == false ? "写入默认保护温度？" : "Whether to reset to the default configuration", this, true))
if (result == DialogResult.OK)
{ {
//if (!string.IsNullOrEmpty(sendfilename))
//{
hWConfig.hwconfiginfo.u16InjPortFPTemp = 300; //前进样口保护温度 hWConfig.hwconfiginfo.u16InjPortFPTemp = 300; //前进样口保护温度
hWConfig.hwconfiginfo.u16InjPortBPTemp = 300; //后进样口保护温度 hWConfig.hwconfiginfo.u16InjPortBPTemp = 300; //后进样口保护温度
...@@ -543,13 +544,21 @@ namespace GcDevicePc.DeviceConfigUI ...@@ -543,13 +544,21 @@ namespace GcDevicePc.DeviceConfigUI
hWConfig.hwconfiginfo.u16AuxHeaterPTemp1 = 300; //辅助1保护温度 hWConfig.hwconfiginfo.u16AuxHeaterPTemp1 = 300; //辅助1保护温度
hWConfig.hwconfiginfo.u16AuxHeaterPTemp2 = 300; //辅助2保护温度 hWConfig.hwconfiginfo.u16AuxHeaterPTemp2 = 300; //辅助2保护温度
savebtn_Click(savebtn, null); UniversalPopUpWindow.DoubleSelectPopup("写入完成",this,true);
// } //savebtn_Click(savebtn, null);
}
else if (result == DialogResult.Cancel)
{
} }
//DialogResult result = MessageBox.Show(bEnglishLanguage == false ? "是否重置为默认配置？" : "Whether to reset to the default configuration", bEnglishLanguage == false ? "提示信息" : "Tips", MessageBoxButtons.OKCancel, MessageBoxIcon.None, MessageBoxDefaultButton.Button1, MessageBoxOptions.ServiceNotification);
//if (result == DialogResult.OK)
//{
// //if (!string.IsNullOrEmpty(sendfilename))
// //{
// // }
//}
//else if (result == DialogResult.Cancel)
//{
//}
} }
} }
......
GcDevicePc/GCBuffer/HWConfig.cs
View file @ e66588c8
...@@ -695,7 +695,7 @@ namespace GcDevicePc.GCBuffer ...@@ -695,7 +695,7 @@ namespace GcDevicePc.GCBuffer
#endregion #endregion
/// <summary> /// <summary>
/// /// 截止20221008使用的配置模型
/// </summary> /// </summary>
/// <param name="folder"></param> /// <param name="folder"></param>
/// <param name="filename"></param> /// <param name="filename"></param>
......
GcDevicePc/GCBuffer/SignalBuffer.cs
View file @ e66588c8
...@@ -24,15 +24,15 @@ namespace GcDevicePc.GCBuffer ...@@ -24,15 +24,15 @@ namespace GcDevicePc.GCBuffer
public Channel_XY Channel1_Port = new Channel_XY(); public Channel_XY Channel1_Port = new Channel_XY();
public ArrayList Draw_Port = new ArrayList(); public ArrayList Draw_Port = new ArrayList();
public ArrayList Save_Port = new ArrayList(); //public ArrayList Save_Port = new ArrayList();
public Channel_XY Channel2_Port = new Channel_XY(); public Channel_XY Channel2_Port = new Channel_XY();
public ArrayList Draw_Port2 = new ArrayList(); public ArrayList Draw_Port2 = new ArrayList();
public ArrayList Save_Port2 = new ArrayList(); //public ArrayList Save_Port2 = new ArrayList();
public Channel_XY Channel3_Port = new Channel_XY(); public Channel_XY Channel3_Port = new Channel_XY();
public ArrayList Draw_Port3 = new ArrayList(); public ArrayList Draw_Port3 = new ArrayList();
public ArrayList Save_Port3 = new ArrayList(); //public ArrayList Save_Port3 = new ArrayList();
public TCP_Channel TCPChannel_Port = new TCP_Channel(); public TCP_Channel TCPChannel_Port = new TCP_Channel();
public ArrayList TCP_Port = new ArrayList(); public ArrayList TCP_Port = new ArrayList();
......
GcDevicePc/GcDevicePc.csproj
View file @ e66588c8
...@@ -123,6 +123,9 @@ ...@@ -123,6 +123,9 @@
<Reference Include="log4net"> <Reference Include="log4net">
<HintPath>..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath> <HintPath>..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
</Reference> </Reference>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NModbus4, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="NModbus4, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\NModbus4.2.1.0\lib\net40\NModbus4.dll</HintPath> <HintPath>..\packages\NModbus4.2.1.0\lib\net40\NModbus4.dll</HintPath>
</Reference> </Reference>
...@@ -183,17 +186,31 @@ ...@@ -183,17 +186,31 @@
<Compile Include="..\..\..\..\TTControl\CounterControl.cs"> <Compile Include="..\..\..\..\TTControl\CounterControl.cs">
<Link>TTControl\CounterControl.cs</Link> <Link>TTControl\CounterControl.cs</Link>
</Compile> </Compile>
<Compile Include="..\..\..\..\TTControl\UniversalPopUpWindow.cs"> <Compile Include="..\..\..\..\TTControl\IOOperations.cs">
<Link>TTControl\UniversalPopUpWindow.cs</Link> <Link>TTControl\IOOperations.cs</Link>
<SubType>Form</SubType>
</Compile> </Compile>
<Compile Include="..\..\..\..\TTControl\UserControl_PopUp.cs"> <Compile Include="..\..\..\..\TTControl\LeftLowerPopUpWindow.cs">
<Link>TTControl\UserControl_PopUp.cs</Link> <Link>TTControl\LeftLowerPopUpWindow.cs</Link>
<SubType>UserControl</SubType> <SubType>UserControl</SubType>
</Compile> </Compile>
<Compile Include="..\..\..\..\TTControl\UserControl_PopUp.designer.cs"> <Compile Include="..\..\..\..\TTControl\LeftLowerPopUpWindow.designer.cs">
<Link>TTControl\UserControl_PopUp.designer.cs</Link> <Link>TTControl\LeftLowerPopUpWindow.designer.cs</Link>
<DependentUpon>UserControl_PopUp.cs</DependentUpon> <DependentUpon>LeftLowerPopUpWindow.cs</DependentUpon>
</Compile>
<Compile Include="..\..\..\..\TTControl\MouseMoveController.cs">
<Link>TTControl\MouseMoveController.cs</Link>
<SubType>Component</SubType>
</Compile>
<Compile Include="..\..\..\..\TTControl\MouseMoveController.designer.cs">
<Link>TTControl\MouseMoveController.designer.cs</Link>
<DependentUpon>MouseMoveController.cs</DependentUpon>
</Compile>
<Compile Include="..\..\..\..\TTControl\Tool.cs">
<Link>TTControl\Tool.cs</Link>
</Compile>
<Compile Include="..\..\..\..\TTControl\UniversalPopUpWindow.cs">
<Link>TTControl\UniversalPopUpWindow.cs</Link>
<SubType>Form</SubType>
</Compile> </Compile>
<Compile Include="..\..\..\..\TTControl\WindowsAPI.cs"> <Compile Include="..\..\..\..\TTControl\WindowsAPI.cs">
<Link>TTControl\WindowsAPI.cs</Link> <Link>TTControl\WindowsAPI.cs</Link>
...@@ -788,9 +805,9 @@ ...@@ -788,9 +805,9 @@
<Compile Include="WaitForm.Designer.cs"> <Compile Include="WaitForm.Designer.cs">
<DependentUpon>WaitForm.cs</DependentUpon> <DependentUpon>WaitForm.cs</DependentUpon>
</Compile> </Compile>
<EmbeddedResource Include="..\..\..\..\TTControl\UserControl_PopUp.resx"> <EmbeddedResource Include="..\..\..\..\TTControl\LeftLowerPopUpWindow.resx">
<Link>TTControl\UserControl_PopUp.resx</Link> <Link>TTControl\LeftLowerPopUpWindow.resx</Link>
<DependentUpon>UserControl_PopUp.cs</DependentUpon> <DependentUpon>LeftLowerPopUpWindow.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="AboutForm.en.resx"> <EmbeddedResource Include="AboutForm.en.resx">
<DependentUpon>AboutForm.cs</DependentUpon> <DependentUpon>AboutForm.cs</DependentUpon>
......
GcDevicePc/IniParam/IniOp.cs
View file @ e66588c8
This diff is collapsed.
GcDevicePc/MDIBase.cs
View file @ e66588c8
This diff is collapsed.
GcDevicePc/ProThread/CKvocUpdataSum.cs
View file @ e66588c8
This diff is collapsed.
GcDevicePc/ProThread/ChannelDataSaveSum.cs
View file @ e66588c8
This diff is collapsed.
GcDevicePc/ProThread/GcDataTh.cs
View file @ e66588c8
...@@ -272,47 +272,8 @@ namespace GcDevicePc.ProThread ...@@ -272,47 +272,8 @@ namespace GcDevicePc.ProThread
} }
#endregion #endregion
#region 本地hw谱图原始数据（具体传输在ChannelDataSaveSum子类中）
lock (globaldata.m_signalbuffer.Save_Port)
{
Thread.Sleep(1);
if (globaldata.m_signalbuffer.Save_Port.Count < globaldata.MAX_ARRAY_LEN)
{
globaldata.m_signalbuffer.Save_Port.Add(globaldata.m_signalbuffer.Channel1_Port);
}
else
{
globaldata.m_signalbuffer.Save_Port.Clear();
}
}
#endregion
// public static ArrayList channelSum = new ArrayList() {channelA_A,channelA_B,channelA_C,channelB_A,channelB_B,channelB_C };
#region 是否向第三方工作站（HL3000和ZB2040）传输所有信号值（具体传输频率在各自senddata子类中）
//if (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.sendtohw || globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.sendtoZb)
//{
// lock (globaldata.channelA_A)
// {
// Thread.Sleep(1);
// if (globaldata.channelA_A.Count < globaldata.MAX_ARRAY_LEN)
// {
// globaldata.channelA_A.Add((long)(fidv[i] * 1000000));
// }
// }
// lock (globaldata.channelB_A)
// {
// Thread.Sleep(1);
// if (globaldata.channelB_A.Count < globaldata.MAX_ARRAY_LEN)
// {
// globaldata.channelB_A.Add((long)(fidv[i] * 1000000));
// }
// }
//}
#endregion
} }
else else
{ {
...@@ -388,29 +349,14 @@ namespace GcDevicePc.ProThread ...@@ -388,29 +349,14 @@ namespace GcDevicePc.ProThread
{ {
globaldata.m_signalbuffer.Draw_Port2.Add(globaldata.m_signalbuffer.Channel2_Port); globaldata.m_signalbuffer.Draw_Port2.Add(globaldata.m_signalbuffer.Channel2_Port);
} }
if (globaldata.m_signalbuffer.Save_Port2.Count < globaldata.MAX_ARRAY_LEN)
}
else
{
if (Math.Abs(tmp - iDetMax_Time) < 0x00FFFFFF)
{ {
globaldata.m_signalbuffer.Save_Port2.Add(globaldata.m_signalbuffer.Channel2_Port); bFirstMaxTim2 = true;
} }
//if (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.sendtohw || globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.sendtoZb)
//{
// lock (globaldata.channelA_B)
// {
// Thread.Sleep(1);
// if (globaldata.channelA_B.Count < globaldata.MAX_ARRAY_LEN)
// {
// globaldata.channelA_B.Add((long)(fidv[i] * 1000000));
// }
// }
// lock (globaldata.channelB_B)
// {
// if (globaldata.channelB_B.Count < globaldata.MAX_ARRAY_LEN)
// {
// globaldata.channelB_B.Add((long)(fidv[i] * 1000000));
// }
// }
//}
} }
} }
} }
...@@ -482,32 +428,15 @@ namespace GcDevicePc.ProThread ...@@ -482,32 +428,15 @@ namespace GcDevicePc.ProThread
{ {
globaldata.m_signalbuffer.Draw_Port3.Add(globaldata.m_signalbuffer.Channel3_Port); globaldata.m_signalbuffer.Draw_Port3.Add(globaldata.m_signalbuffer.Channel3_Port);
} }
if (globaldata.m_signalbuffer.Save_Port3.Count < globaldata.MAX_ARRAY_LEN)
}
else
{
if (Math.Abs(tmp - bDetMax_Time) < 0x00FFFFFF)
{ {
globaldata.m_signalbuffer.Save_Port3.Add(globaldata.m_signalbuffer.Channel3_Port); bFirstMaxTim3 = true;
} }
//if (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.sendtohw || globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.sendtoZb)
//{
// lock (globaldata.channelA_C)
// {
// Thread.Sleep(1);
// if (globaldata.channelA_C.Count < globaldata.MAX_ARRAY_LEN)
// {
// globaldata.channelA_C.Add((long)(fidv[i] * 1000000));
// }
// }
// lock (globaldata.channelB_C)
// {
// Thread.Sleep(1);
// if (globaldata.channelB_C.Count < globaldata.MAX_ARRAY_LEN)
// {
// globaldata.channelB_C.Add((long)(fidv[i] * 1000000));
// }
// }
//}
} }
} }
} }
...@@ -752,7 +681,7 @@ namespace GcDevicePc.ProThread ...@@ -752,7 +681,7 @@ namespace GcDevicePc.ProThread
ret = GetState(600, 6, ref state); ret = GetState(600, 6, ref state);
return ret == 0 ? true : false; return ret == 0 ? true : false;
} }
/// <summary> /// <summary>
/// epc_进样2 /// epc_进样2
/// </summary> /// </summary>
public bool GetEPC_Inj2(ref ushort[] state) public bool GetEPC_Inj2(ref ushort[] state)
...@@ -761,37 +690,37 @@ namespace GcDevicePc.ProThread ...@@ -761,37 +690,37 @@ namespace GcDevicePc.ProThread
ret = GetState(606, 6, ref state); ret = GetState(606, 6, ref state);
return ret == 0 ? true : false; return ret == 0 ? true : false;
} }
/// <summary> /// <summary>
/// epc_检测1 /// epc_检测1
/// </summary> /// </summary>
public bool GetEPC_Det1(ref ushort[] state) public bool GetEPC_Det1(ref ushort[] state)
{ {
int ret = -1; int ret = -1;
ret = GetState(612, 6, ref state); ret = GetState(612, 6, ref state);
return ret == 0 ? true : false; return ret == 0 ? true : false;
} }
/// <summary> /// <summary>
/// epc_检测2 /// epc_检测2
/// </summary> /// </summary>
public bool GetEPC_Det2(ref ushort[] state) public bool GetEPC_Det2(ref ushort[] state)
{ {
int ret = -1; int ret = -1;
ret = GetState(618, 6, ref state); ret = GetState(618, 6, ref state);
return ret == 0 ? true : false; return ret == 0 ? true : false;
} }
/// <summary> /// <summary>
/// epc_检测3 /// epc_检测3
/// </summary> /// </summary>
public bool GetEPC_Det3(ref ushort[] state) public bool GetEPC_Det3(ref ushort[] state)
{ {
int ret = -1; int ret = -1;
ret = GetState(624, 6, ref state); ret = GetState(624, 6, ref state);
return ret == 0 ? true : false; return ret == 0 ? true : false;
} }
/// <summary> /// <summary>
/// epc_辅助1 /// epc_辅助1
/// </summary> /// </summary>
public bool GetEPC_Aux1(ref ushort[] state) public bool GetEPC_Aux1(ref ushort[] state)
{ {
int ret = -1; int ret = -1;
ret = GetState(630, 6, ref state); ret = GetState(630, 6, ref state);
......
GcDevicePc/SaveDialog.cs
View file @ e66588c8
...@@ -9,15 +9,19 @@ using System.Linq; ...@@ -9,15 +9,19 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading; using System.Threading;
using System.Windows.Forms; using System.Windows.Forms;
using TTControl;
namespace GcDevicePc namespace GcDevicePc
{ {
/// <summary>
/// 新建方法,方法另存为,新建配置UI
/// </summary>
public partial class SaveDialog : Form public partial class SaveDialog : Form
{ {
public String filename; public String filename;
private String checkfolder; private String checkfolder;
private bool bEnglishLanguage = Thread.CurrentThread.CurrentUICulture == CultureInfo.GetCultureInfo("en") ? true :false; private bool bEnglishLanguage = Thread.CurrentThread.CurrentUICulture == CultureInfo.GetCultureInfo("en") ? true : false;
public SaveDialog() public SaveDialog()
{ {
InitializeComponent(); InitializeComponent();
...@@ -28,30 +32,30 @@ namespace GcDevicePc ...@@ -28,30 +32,30 @@ namespace GcDevicePc
/// </summary> /// </summary>
/// <param name="Folder"></param> /// <param name="Folder"></param>
/// <param name="type">0-新建方法 1-方法另存为 2-新建配置</param> /// <param name="type">0-新建方法 1-方法另存为 2-新建配置</param>
public SaveDialog(String Folder,int type) public SaveDialog(String Folder, int type)
{ {
InitializeComponent(); InitializeComponent();
this.checkfolder = Folder; this.checkfolder = Folder;
this.nameverify.Text = "请输入名称";
okbth.Enabled = false;
switch (type) switch (type)
{ {
case 0: case 0:
this.Text = bEnglishLanguage == false ? "新方法创建" : "New Method"; this.Text = bEnglishLanguage == false ? "新方法创建" : "New Method";
namegroup.Text = bEnglishLanguage == false ?"新建方法" : "New Method"; namegroup.Text = bEnglishLanguage == false ? "新建方法" : "New Method";
break; break;
case 1: case 1:
this.Text = bEnglishLanguage == false ? "方法另存为": "Method Saved As"; this.Text = bEnglishLanguage == false ? "方法另存为" : "Method Saved As";
namegroup.Text = bEnglishLanguage == false ? "新建方法": "New Method"; namegroup.Text = bEnglishLanguage == false ? "新建方法" : "New Method";
break; break;
case 2: case 2:
this.Text = bEnglishLanguage == false ? "新配置创建": "New Configuration Creation"; this.Text = bEnglishLanguage == false ? "新配置创建" : "New Configuration Creation";
namegroup.Text = bEnglishLanguage == false ? "新建配置": "New Configuration"; namegroup.Text = bEnglishLanguage == false ? "新建配置" : "New Configuration";
break; break;
default: default:
break; break;
} }
} }
public bool IsExist;
bool VerifyName() bool VerifyName()
{ {
string strtmp; string strtmp;
...@@ -72,11 +76,23 @@ namespace GcDevicePc ...@@ -72,11 +76,23 @@ namespace GcDevicePc
private void savefilename_TextChanged(object sender, EventArgs e) private void savefilename_TextChanged(object sender, EventArgs e)
{ {
if (VerifyName()) if (VerifyName())
{ {
this.nameverify.Text = bEnglishLanguage == false ? "文件名可用":"Filename Is Available"; if (IOOperations.Folderillegalchar(savefilename.Text))
this.nameverify.ForeColor = Color.Green; {
this.prompt.Text = ""; this.nameverify.Text = bEnglishLanguage == false ? "文件名可用" : "Filename Is Available";
this.nameverify.ForeColor = Color.Green;
this.prompt.Text = "";
okbth.Enabled = true;
}
else
{
this.nameverify.Text = bEnglishLanguage == false ? "存在非法字符" : "Illegal characters exist";
this.nameverify.ForeColor = Color.Red;
okbth.Enabled = false;
}
} }
else else
{ {
...@@ -87,7 +103,7 @@ namespace GcDevicePc ...@@ -87,7 +103,7 @@ namespace GcDevicePc
if (this.savefilename.Text == "") if (this.savefilename.Text == "")
{ {
this.nameverify.Text = ""; this.nameverify.Text = "请输入名称";
} }
} }
......
GcDevicePc/SysConfigSecondary.cs
View file @ e66588c8
...@@ -25,10 +25,22 @@ namespace GcDevicePc ...@@ -25,10 +25,22 @@ namespace GcDevicePc
public partial class SysConfigSecondary : Form public partial class SysConfigSecondary : Form
{ {
// private string HmiIP = null; /********************************************************************************
描述:
使用:
// private ushort HmiPort = 911; 注意:
panel1 常规设置
panel2 账号安全
panel3 通讯协议
panel4
panel5
panel6
*********************************************************************************/
// private string HmiIP = null;
// private ushort HmiPort = 911;
private bool bEnglishLanguage = Thread.CurrentThread.CurrentUICulture == CultureInfo.GetCultureInfo("en") ? true : false; private bool bEnglishLanguage = Thread.CurrentThread.CurrentUICulture == CultureInfo.GetCultureInfo("en") ? true : false;
private ArrayList SearchRet = new ArrayList(); private ArrayList SearchRet = new ArrayList();
...@@ -722,7 +734,7 @@ namespace GcDevicePc ...@@ -722,7 +734,7 @@ namespace GcDevicePc
ini.WriteString("SendData", "Thirdparty", "3");//无 ini.WriteString("SendData", "Thirdparty", "3");//无
} }
//通讯协议
if (radioButton5.Checked) if (radioButton5.Checked)
{ {
ini.WriteString("SendData", "Foreign", "0");//默认 ini.WriteString("SendData", "Foreign", "0");//默认
......
GcDevicePc/SysConfigSecondary.resx
View file @ e66588c8
This diff is collapsed.
GcDevicePc/SysConfigsecondary.Designer.cs
View file @ e66588c8
This diff is collapsed.
GcDevicePc/globaldata.cs
View file @ e66588c8
...@@ -80,8 +80,10 @@ namespace GcDevicePc ...@@ -80,8 +80,10 @@ namespace GcDevicePc
public static string UserName;//用户名 public static string UserName;//用户名
public static string UserPwd;//密码 public static string UserPwd;//密码
/// <summary>
public static int Foreign;//对外通信 /// 对外通信协议(1=环空,0=污染源)
/// </summary>
public static int Foreign;
public static bool ZbDataSave;//zb数据保存 public static bool ZbDataSave;//zb数据保存
public static string AppName;//应用程序名称 public static string AppName;//应用程序名称
//public static bool system_Statue; //系统开启状态 //public static bool system_Statue; //系统开启状态
...@@ -185,9 +187,6 @@ namespace GcDevicePc ...@@ -185,9 +187,6 @@ namespace GcDevicePc
public static bool startclear3 = false; //清除开始按键之前的数据 public static bool startclear3 = false; //清除开始按键之前的数据
public static bool stopflag = false; //停止按键的标志位 public static bool stopflag = false; //停止按键的标志位
public static bool cancelflag = false; //取消按键的标志位 public static bool cancelflag = false; //取消按键的标志位
public static bool cancelflag1 = false; //取消按键的标志位
public static bool cancelflag2 = false; //取消按键的标志位
public static bool cancelflag3 = false; //取消按键的标志位
public static int TYPE_TCD = 0; public static int TYPE_TCD = 0;
......
GcDevicePc/packages.config
View file @ e66588c8
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
<package id="ini.net" version="1.1.0" targetFramework="net45" /> <package id="ini.net" version="1.1.0" targetFramework="net45" />
<package id="log4net" version="2.0.8" targetFramework="net45" /> <package id="log4net" version="2.0.8" targetFramework="net45" />
<package id="M2Mqtt" version="4.3.0.0" targetFramework="net45" /> <package id="M2Mqtt" version="4.3.0.0" targetFramework="net45" />
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net45" />
<package id="NModbus4" version="2.1.0" targetFramework="net45" /> <package id="NModbus4" version="2.1.0" targetFramework="net45" />
<package id="WinFormAnimation" version="1.5.6298.3372" targetFramework="net40" /> <package id="WinFormAnimation" version="1.5.6298.3372" targetFramework="net40" />
</packages> </packages>
\ No newline at end of file
VocsSetup/GC_Config/GC_DataPro/SpectralDefault.comp
View file @ e66588c8
[SYSINFO] [SYSINFO]
ECOUNT=2 ECOUNT=3
COEF=1 COEF=1
[ENTITY0] [ENTITY0]
ETXT=0,NMHC,0,0,0,0,255,0,0,100000,1,0,0,0 ETXT=0,NMHC,0,0,0,0,255,0,0,100000,1,0,0,0
[ENTITY1] [ENTITY1]
ETXT=0,CH4,1,1,0,0,255,0,0,100000,1,0,0,0 ETXT=0,CH4,1,1,0,0,255,0,0,100000,1,0,0,0
[ENTITY2] [ENTITY2]
ETXT=0,NMHC,0.9,1.3,0,0,255,0,0,100000,1,0,0 ETXT=0,NMHC,0,0,0,0,255,0,0,100000,1,0,0,100
VocsSetup/GC_Config/GC_Set/Startup/startup.ini
View file @ e66588c8
[NetWorkConfig] [NetWorkConfig]
MAC地址=F8:02:78:60:0F:40 MAC地址=F8:02:78:60:74:B7
网口=以太网 2 网口=以太网 2
搜索时间=60 搜索时间=60
[StartUp] [StartUp]
...@@ -14,7 +14,7 @@ TdName=TVOC5.7 ...@@ -14,7 +14,7 @@ TdName=TVOC5.7
启用云盒子=0 启用云盒子=0
[DataFolder] [DataFolder]
历史数据=D:\work\Vocs\VocsSetup\GC_Config\GC_Set\Historical Data 历史数据=D:\work\Vocs\VocsSetup\GC_Config\GC_Set\Historical Data
分级文件夹=0 分级文件夹=1
[Logs] [Logs]
InfoLog=1 InfoLog=1
ErrLog=1 ErrLog=1
...@@ -27,7 +27,7 @@ Name=admin ...@@ -27,7 +27,7 @@ Name=admin
Password=123456 Password=123456
[SendData] [SendData]
Thirdparty=1 Thirdparty=1
Foreign=2 Foreign=1
SendType=Routine SendType=Routine
[SaveData] [SaveData]
ZBSaveData=1 ZBSaveData=1
......
VocsSetup/GC_Config/GC_Set/Startup/sys.ini
View file @ e66588c8
...@@ -8,7 +8,7 @@ Count3=FALSE ...@@ -8,7 +8,7 @@ Count3=FALSE
[O2CpdCount] [O2CpdCount]
O2value=21 O2value=21
[免登录] [免登录]
锚点日期=2022/9/21 锚点日期=2022/10/9
勾选类型=2 勾选类型=2
[TempTrend] [TempTrend]
启用网格X=FALSE 启用网格X=FALSE
......
VocsSetup/GC_Control/Newtonsoft.Json.xml 0 → 100644
View file @ e66588c8
This diff is collapsed.
VocsSetup/GC_User/Operation Log/ErrLog/ErrLog.txt
View file @ e66588c8
...@@ -509,3 +509,42 @@ NOT NULL constraint failed: EntityRecord.time ...@@ -509,3 +509,42 @@ NOT NULL constraint failed: EntityRecord.time
在 CKVocAnalyzer.CtrlWaveCurrent.addpointList(List`1 point) 位置 D:\work\色谱\Vocs20220915-1.9.9\Vocs\gcdevicepc_nmoc8-16\CKVocAnalyzer\CtrlWaveCurrent.cs:行号 1203 在 CKVocAnalyzer.CtrlWaveCurrent.addpointList(List`1 point) 位置 D:\work\色谱\Vocs20220915-1.9.9\Vocs\gcdevicepc_nmoc8-16\CKVocAnalyzer\CtrlWaveCurrent.cs:行号 1203
【2022-09-21 10:31:29】SQLite error (5): database is locked 【2022-09-21 10:31:29】SQLite error (5): database is locked
【2022-09-21 10:31:29】SQLite error (5): database is locked 【2022-09-21 10:31:29】SQLite error (5): database is locked
【2022-10-08 18:28:31】SQLite error (5): database is locked
【2022-10-08 20:15:02】SQLite error (5): database is locked
【2022-10-08 20:52:58】SQLite error (5): database is locked
【2022-10-08 21:01:04】SQLite error (5): database is locked
【2022-10-08 21:13:43】SQLite error (5): database is locked
【2022-10-08 21:44:47】SQLite error (5): database is locked
【2022-10-08 21:58:36】SQLite error (5): database is locked
【2022-10-08 21:58:36】SQLite error (5): database is locked
【2022-10-08 21:58:36】SQLite error (5): database is locked
【2022-10-08 22:56:06】SQLite error (5): database is locked
【2022-10-09 00:23:41】System.InvalidOperationException: 此 BackgroundWorker 当前正忙，无法同时运行多个任务。
在 System.ComponentModel.BackgroundWorker.RunWorkerAsync(Object argument)
在 CKVocAnalyzer.CtrlWaveCurrent.addPoint(List`1 pointlist, Boolean endflag, ArrayList ThirdPartyA, ArrayList ThirdPartyB) 位置 D:\work\色谱\Vocs-1.9.1分支\Vocs\gcdevicepc_nmoc8-16\CKVocAnalyzer\CtrlWaveCurrent.cs:行号 1211
【2022-10-09 01:10:53】SQLite error (5): database is locked
【2022-10-09 01:10:53】SQLite error (5): database is locked
【2022-10-09 01:10:53】SQLite error (5): database is locked
【2022-10-09 01:10:53】SQLite error (5): database is locked
【2022-10-09 01:10:53】SQLite error (5): database is locked
【2022-10-09 01:10:54】SQLite error (5): database is locked
【2022-10-09 01:10:54】SQLite error (5): database is locked
【2022-10-09 01:10:54】SQLite error (5): database is locked
【2022-10-09 01:10:54】SQLite error (5): database is locked
【2022-10-09 03:23:27】System.NullReferenceException: 未将对象引用设置到对象的实例。
在 CKVocAnalyzer.CtrlCurChart.CKSimpleChart_Paint(Object sender, PaintEventArgs e) 位置 D:\work\色谱\Vocs-1.9.1分支\Vocs\gcdevicepc_nmoc8-16\CKVocAnalyzer\CtrlCurChart.cs:行号 2345
【2022-10-09 04:11:41】SQLite error (5): database is locked
【2022-10-09 04:39:22】SQLite error (5): database is locked
【2022-10-09 06:19:36】System.NullReferenceException: 未将对象引用设置到对象的实例。
在 CKVocAnalyzer.CtrlCurChart.CKSimpleChart_Paint(Object sender, PaintEventArgs e) 位置 D:\work\色谱\Vocs-1.9.1分支\Vocs\gcdevicepc_nmoc8-16\CKVocAnalyzer\CtrlCurChart.cs:行号 2344
【2022-10-09 07:34:33】System.ArgumentOutOfRangeException: 索引超出范围。必须为非负值并小于集合大小。
参数名: index
在 System.ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument argument, ExceptionResource resource)
在 System.Collections.Generic.List`1.get_Item(Int32 index)
在 CKVocAnalyzer.CtrlCurChart.CKSimpleChart_Paint(Object sender, PaintEventArgs e) 位置 D:\work\色谱\Vocs-1.9.1分支\Vocs\gcdevicepc_nmoc8-16\CKVocAnalyzer\CtrlCurChart.cs:行号 2328
【2022-10-09 08:11:11】SQLite error (5): database is locked
【2022-10-09 08:11:11】SQLite error (5): database is locked
【2022-10-09 08:11:11】SQLite error (5): database is locked
【2022-10-09 15:00:05】SQLite error (5): database is locked
【2022-10-09 16:24:27】SQLite error (5): database is locked
【2022-10-09 16:42:04】SQLite error (5): database is locked
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