Skip to content

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

1.版本变更至1.9.0 

2.选项添加"云盒子"控制开关,勾选后发送相关仪器信息到云平台
3.选项添加"nmhc测定方式","间接"等于以前的状态,"直测"会将thc改为nmhc+ch4;nmhc直接测定(包括用户界面,调试界面,上传上位机)
4.优化联机
5.辅助工具-温度趋势,扩展到六路,增加跟随分析启动,增加占空比趋势线等
parent 1961b0e8
Show whitespace changes
Inline Side-by-side
Showing with 5592 additions and 2572 deletions
GcDevicePc/CK_UI/CurveDisPlay.cs
View file @ 5587fca6
......@@ -13,11 +13,19 @@ namespace GcDevicePc
{
public partial class CurveDisPlay : DockContent
{
public class DrawingSubform
{
public CKVocAnalyzer.CtrlWaveCurrent curdisp;
}
public static CKVocAnalyzer.CtrlWaveCurrent curdisp = new CKVocAnalyzer.CtrlWaveCurrent();
/// <summary>
/// 强制清除绘图数据
/// </summary>
public static bool forcePurge = false;
/// <summary>
/// NMHC测定方式
/// </summary>
public static CKVocAnalyzer.CtrlWaveCurrent.NMHCCal nMHCCal;
public CurveDisPlay()
{
InitializeComponent();
......
GcDevicePc/CK_UI/UserCtl.cs
View file @ 5587fca6
......@@ -415,20 +415,37 @@ namespace GcDevicePc.CK_UI
//嵌套for循环,解决"CKVocAnalyzer.GlobalCKV.IngredientList"直接定值索引引起的越界问题
for (int j = 0; j < CKVocAnalyzer.GlobalCKV.IngredientList.Count; j++)
{
if (CKVocAnalyzer.GlobalCKV.vocparamlist[i].Name == CKVocAnalyzer.GlobalCKV.IngredientList[j].name&&listTHC.Count>=1&&listCH4.Count>=1)
if (CKVocAnalyzer.GlobalCKV.vocparamlist[i].Name == CKVocAnalyzer.GlobalCKV.IngredientList[j].name && listTHC.Count >= 1 && listCH4.Count >= 1)
{
switch (j)
{
case 0:
if (isppm)
{
//textBox1.Text = Math.Round(listNmoc[listNmoc.Count - 1].Y, 2).ToString();
if (CurveDisPlay.nMHCCal == CKVocAnalyzer.CtrlWaveCurrent.NMHCCal.NMHC_direct)
{
//直接测定
textBox1.Text = Math.Round(listNmoc[listNmoc.Count - 1].Y, 2).ToString();
}
else if (CurveDisPlay.nMHCCal == CKVocAnalyzer.CtrlWaveCurrent.NMHCCal.NMHC_indirect)
{
//间接测定
textBox1.Text = Math.Round(listTHC[listTHC.Count - 1].Y * fAutoDisO2Product - listCH4[listCH4.Count - 1].Y, 2).ToString();
}
//textBox1.Text = Math.Round(listNmoc[listNmoc.Count - 1].Y, 2).ToString();
}
else
{//此处计算成mg/m3 nmhc
//textBox1.Text = Math.Round(listNmoc[listNmoc.Count - 1].Y, 2).ToString();
if (CurveDisPlay.nMHCCal == CKVocAnalyzer.CtrlWaveCurrent.NMHCCal.NMHC_direct)
{
textBox1.Text = Math.Round(listNmoc[listNmoc.Count - 1].Y, 2).ToString();
}
else if (CurveDisPlay.nMHCCal == CKVocAnalyzer.CtrlWaveCurrent.NMHCCal.NMHC_indirect)
{
textBox1.Text = Math.Round(listTHC[listTHC.Count - 1].Y * fAutoDisO2Product - listCH4[listCH4.Count - 1].Y, 2).ToString();
}
//textBox1.Text = Math.Round(listNmoc[listNmoc.Count - 1].Y / (CKVocAnalyzer.GlobalCKV.vocparamlist[i].MWeight / 12) * (CKVocAnalyzer.GlobalCKV.vocparamlist[i].MWeight / 22.4), 2).ToString() + "mg/m³";
}
......@@ -441,13 +458,27 @@ namespace GcDevicePc.CK_UI
break;
case 1:
if (isppm)
{
if (CurveDisPlay.nMHCCal == CKVocAnalyzer.CtrlWaveCurrent.NMHCCal.NMHC_direct)
{
//因为是直测,一根PQ,无需再考虑氧干扰
textBox2.Text = Math.Round(listNmoc[listNmoc.Count - 1].Y + listCH4[listCH4.Count - 1].Y, 2).ToString();
}
else if (CurveDisPlay.nMHCCal == CKVocAnalyzer.CtrlWaveCurrent.NMHCCal.NMHC_indirect)
{
textBox2.Text = Math.Round(listTHC[listTHC.Count - 1].Y * fAutoDisO2Product, 2).ToString();
}
}
else
{
if (CurveDisPlay.nMHCCal == CKVocAnalyzer.CtrlWaveCurrent.NMHCCal.NMHC_direct)
{
textBox2.Text = Math.Round(listNmoc[listNmoc.Count - 1].Y + listCH4[listCH4.Count - 1].Y, 2).ToString();
}
else if (CurveDisPlay.nMHCCal == CKVocAnalyzer.CtrlWaveCurrent.NMHCCal.NMHC_indirect)
{
textBox2.Text = Math.Round(listTHC[listTHC.Count - 1].Y * fAutoDisO2Product, 2).ToString();
}
//textBox2.Text = Math.Round(listTHC[listTHC.Count - 1].Y / (CKVocAnalyzer.GlobalCKV.vocparamlist[i].MWeight / 12) * (CKVocAnalyzer.GlobalCKV.vocparamlist[i].MWeight / 22.4), 2).ToString() + "mg/m³";
}
......
GcDevicePc/CloudBox/DataInstance.cs
View file @ 5587fca6
......@@ -22,21 +22,37 @@ namespace CloudBox
/// </summary>
public DataInstance()
{
//HMI ip和端口,HMI-云盒子-色谱上位机
IP = "192.168.1.58";
Port = 911;
isService = false;
Init();
Thread thread = new Thread(() => { Init(); });
thread.Start();
}
///<summary>
///初始化
///初始化,socket开机失败则不会进行循环发送
///</summary>
private void Init()
{
ISResetID = Encoding.ASCII.GetBytes("0")[0];
timer_send.Interval = 1000;
timer_send.AutoReset = true;
timer_send.Elapsed += new System.Timers.ElapsedEventHandler(Timer_Send);
//配置信息
hwconfig = new HWConfig(globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.StatusFolder, "DevStatus.ini");
//hmi数据接口
mymodbus = new GcDataTh(globaldata.connection_ip, globaldata.datamodbusport);
//从dll委托更新谱图数据
CKVocAnalyzer.CtrlWaveCurrent.del_Vocentity += new CKVocAnalyzer.Del_Vocentity(Data_Vocentity);
Consumer();
//HMI ip和端口,HMI-云盒子-色谱上位机
if (globaldata.DeviceList.Count > 0)
{
for (int i = 0; i < globaldata.CanSearchDeviceList.Count; i++)
{
if (globaldata.CanSearchDeviceList[i].MacAddr == hwconfig.hwconfiginfo.GCNum)
{
IP = globaldata.CanSearchDeviceList[i].IpAddr;
Port = 666;
}
}
}
if (IP != null)
{
if (isService)
{
#region 作为服务端
......@@ -47,13 +63,8 @@ namespace CloudBox
socketServer.Bind(new IPEndPoint(IPAddress.Parse(IP), Port));
Thread threadListenAccept = new Thread(new ThreadStart(ListenAccept));
threadListenAccept.Start();
//配置信息
hwconfig = new HWConfig(globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.StatusFolder, "DevStatus.ini");
//hmi数据接口
mymodbus = new GcDataTh(globaldata.connection_ip, globaldata.datamodbusport);
//从dll委托更新谱图数据
CKVocAnalyzer.CtrlWaveCurrent.del_Vocentity += new CKVocAnalyzer.Del_Vocentity(Data_Vocentity);
Consumer();
Thread thread = new Thread(() => { Timer_Send(); });
thread.Start();
}
catch (ArgumentNullException e)
{
......@@ -70,32 +81,26 @@ namespace CloudBox
else
{
#region 作为客户端
socketServer = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
try
{
//sockt
socketServer = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
socketServer.Connect(IPAddress.Parse(IP), Port);
//配置信息
hwconfig = new HWConfig(globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.StatusFolder, "DevStatus.ini");
//hmi数据接口
mymodbus = new GcDataTh(globaldata.connection_ip, globaldata.datamodbusport);
//从dll委托更新谱图数据
CKVocAnalyzer.CtrlWaveCurrent.del_Vocentity += new CKVocAnalyzer.Del_Vocentity(Data_Vocentity);
Consumer();
}
catch (ArgumentNullException e)
{
MessageBox.Show(e.ToString());
socketServer.Close();
Thread thread = new Thread(() => { Timer_Send(); });
thread.Start();
}
catch (SocketException e)
catch (Exception)
{
MessageBox.Show(e.ToString());
//HMI没有启动,或者端口被占用
socketServer.Close();
return;
}
#endregion
}
}
}
#region 色谱数据模型和打包解析方法
/// <summary>
/// 发送实例,内含包装好的数据模型和解析和打包方法
......@@ -132,14 +137,14 @@ namespace CloudBox
/// </summary>
private void Consumer()
{
timer_send.Start();
Thread Consumer_Thread = new Thread(() =>
{
while (!QueueCollection.IsCompleted)
{
try
{
Thread.Sleep(100);
Thread.Sleep(2000);
//队列取出
send_Instruction = QueueCollection.Take();
//进行该命令下的数据更新
......@@ -176,6 +181,9 @@ namespace CloudBox
/// 依据指令标识,分别更新云数据
/// </summary>
private void UpdateData(GCData.Instruction instruction)
{
if (mymodbus != null && hwconfig != null)
// if(false)
{
switch (instruction)
{
......@@ -329,6 +337,8 @@ namespace CloudBox
break;
}
}
}
/// <summary>
/// 温控信息更新方法
/// </summary>
......@@ -1098,7 +1108,7 @@ namespace CloudBox
/// </summary>
private bool isService;
/// <summary>
/// 监听sockt
/// 监听/连接sockt
/// </summary>
private Socket socketServer;
/// <summary>
......@@ -1122,6 +1132,16 @@ namespace CloudBox
sTemp = socketServer.Accept();
}
/// <summary>
/// 关闭连接
/// </summary>
public void CloseSocket()
{
if (socketServer != null)
{
socketServer.Close();
}
}
/// <summary>
/// socket发送
/// </summary>
private void Send()
......@@ -1150,10 +1170,14 @@ namespace CloudBox
#endregion
#region 定时发送(暂时只有)
private System.Timers.Timer timer_send = new System.Timers.Timer();
#region 排队发送
int acc = 0;
private void Timer_Send(object sender, EventArgs e)
/// <summary>
/// 循环加入生产(消费控制了间隔1S,上一个生产未消费,则下一个生产等待)
/// </summary>
private void Timer_Send()
{
while (true)
{
Producer(GCData.Instruction.TEMPINFO);
Producer(GCData.Instruction.DETINFO);
......@@ -1166,9 +1190,12 @@ namespace CloudBox
Producer(GCData.Instruction.SYSTEMSTATE);
}
}
}
#endregion
/// <summary>
/// 模式测试
/// 模拟测试
/// </summary>
public void DeData()
{
......
GcDevicePc/Common/NModbusSlave.cs
View file @ 5587fca6
......@@ -812,7 +812,6 @@ namespace GcDevicePc.Common
if (address == 2 || address == 3)
{
index = SharedSpace.Data.listValue.FindIndex(lv => lv.name == "THC");
}
if (address == 4 || address == 5)
......@@ -826,6 +825,27 @@ namespace GcDevicePc.Common
if (index > -1)
{
f[0] = float.Parse(SharedSpace.Data.listValue[index].vale.ToString());
if (CurveDisPlay.nMHCCal == CKVocAnalyzer.CtrlWaveCurrent.NMHCCal.NMHC_direct)
{
//直测不需要氧校准,THC需要加法计算,其他原值输出
if (index == SharedSpace.Data.listValue.FindIndex(lv => lv.name == "THC"))
{
float fTHCValue, fNMHCValue, fCH4Value;
int sTHCIndex, sNMHCIndex, sCH4Index;
sTHCIndex = SharedSpace.Data.listValue.FindIndex(lv => lv.name == "THC");
sNMHCIndex = SharedSpace.Data.listValue.FindIndex(lv => lv.name == "NMHC");
sCH4Index = SharedSpace.Data.listValue.FindIndex(lv => lv.name == "CH4");
fTHCValue = float.Parse(SharedSpace.Data.listValue[sTHCIndex].vale.ToString());
fNMHCValue = float.Parse(SharedSpace.Data.listValue[sNMHCIndex].vale.ToString());
fCH4Value = float.Parse(SharedSpace.Data.listValue[sCH4Index].vale.ToString());
f[0] = fNMHCValue + fCH4Value;
}
}
else if (CurveDisPlay.nMHCCal == CKVocAnalyzer.CtrlWaveCurrent.NMHCCal.NMHC_indirect)
{
if (index == SharedSpace.Data.listValue.FindIndex(lv => lv.name == "THC"))
{
f[0] = vRead_AutoDisO2Input_Reault(f[0]);
......@@ -845,6 +865,7 @@ namespace GcDevicePc.Common
f[0] = vRead_AutoDisO2Input_Reault(fTHCValue) - fCH4Value;
}
}
}
else
{
f[0] = 0;
......
GcDevicePc/Common/sys_ini.cs
View file @ 5587fca6
......@@ -45,6 +45,7 @@ namespace GcDevicePc.Common
infile.WriteBoolean("TempTrend", "显示节点数据",false);
infile.WriteString("TempTrend", "背景颜色","White");
infile.WriteString("TempTrend", "上次加载数据","");
infile.WriteString("TempTrend", "跟随分析启动","0");
}
/// <summary>
/// 写入氧校准-斜率
......@@ -314,6 +315,26 @@ namespace GcDevicePc.Common
}
}
/// <summary>
/// 写入绘图(温控趋势)信息-跟随启动
/// </summary>
/// <param name="node"></param>
public static void Set_Sys_TempTrend_FollowStart(string node)
{
if (File.Exists(file))
{
infile.WriteString("TempTrend", "跟随分析启动",node);
}
else
{
Directory.CreateDirectory(folder);
using (FileStream nfile=new FileStream(file,FileMode.Create))
{
}
infile.WriteString("TempTrend", "跟随分析启动",node);
}
}
/// <summary>
/// 读取氧校准-斜率
/// </summary>
public static double Get_Sys_CpdCount_OxygenSlope()
......@@ -575,6 +596,24 @@ namespace GcDevicePc.Common
return node;
}
/// <summary>
/// /读取温控趋势信息-是否跟随分析启动
/// </summary>
/// <returns></returns>
public static string Get_Sys_TempTrend_FollowStart()
{
string node;
if (File.Exists(file))
{
node=infile.ReadString("TempTrend", "跟随分析启动");
}
else
{
node="";
Save_Setting_Init();
}
return node;
}
/// <summary>
/// 读取绘图(温控趋势)信息-上次加载数据
/// </summary>
public static string Get_Sys_TempTrend_LastLoadedData()
......
GcDevicePc/DrawUI/TempTrend.Designer.cs → GcDevicePc/ExpansionMethod/TempTrend.Designer.cs
View file @ 5587fca6
......@@ -33,8 +33,38 @@
System.Windows.Forms.DataVisualization.Charting.Legend legend1 = new System.Windows.Forms.DataVisualization.Charting.Legend();
System.Windows.Forms.DataVisualization.Charting.Series series1 = new System.Windows.Forms.DataVisualization.Charting.Series();
System.Windows.Forms.DataVisualization.Charting.Series series2 = new System.Windows.Forms.DataVisualization.Charting.Series();
System.Windows.Forms.DataVisualization.Charting.Series series3 = new System.Windows.Forms.DataVisualization.Charting.Series();
System.Windows.Forms.DataVisualization.Charting.Title title1 = new System.Windows.Forms.DataVisualization.Charting.Title();
this.cat_TempTrend = new System.Windows.Forms.DataVisualization.Charting.Chart();
System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea2 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
System.Windows.Forms.DataVisualization.Charting.Legend legend2 = new System.Windows.Forms.DataVisualization.Charting.Legend();
System.Windows.Forms.DataVisualization.Charting.Series series4 = new System.Windows.Forms.DataVisualization.Charting.Series();
System.Windows.Forms.DataVisualization.Charting.Series series5 = new System.Windows.Forms.DataVisualization.Charting.Series();
System.Windows.Forms.DataVisualization.Charting.Series series6 = new System.Windows.Forms.DataVisualization.Charting.Series();
System.Windows.Forms.DataVisualization.Charting.Title title2 = new System.Windows.Forms.DataVisualization.Charting.Title();
System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea3 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
System.Windows.Forms.DataVisualization.Charting.Legend legend3 = new System.Windows.Forms.DataVisualization.Charting.Legend();
System.Windows.Forms.DataVisualization.Charting.Series series7 = new System.Windows.Forms.DataVisualization.Charting.Series();
System.Windows.Forms.DataVisualization.Charting.Series series8 = new System.Windows.Forms.DataVisualization.Charting.Series();
System.Windows.Forms.DataVisualization.Charting.Series series9 = new System.Windows.Forms.DataVisualization.Charting.Series();
System.Windows.Forms.DataVisualization.Charting.Title title3 = new System.Windows.Forms.DataVisualization.Charting.Title();
System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea4 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
System.Windows.Forms.DataVisualization.Charting.Legend legend4 = new System.Windows.Forms.DataVisualization.Charting.Legend();
System.Windows.Forms.DataVisualization.Charting.Series series10 = new System.Windows.Forms.DataVisualization.Charting.Series();
System.Windows.Forms.DataVisualization.Charting.Series series11 = new System.Windows.Forms.DataVisualization.Charting.Series();
System.Windows.Forms.DataVisualization.Charting.Series series12 = new System.Windows.Forms.DataVisualization.Charting.Series();
System.Windows.Forms.DataVisualization.Charting.Title title4 = new System.Windows.Forms.DataVisualization.Charting.Title();
System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea5 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
System.Windows.Forms.DataVisualization.Charting.Legend legend5 = new System.Windows.Forms.DataVisualization.Charting.Legend();
System.Windows.Forms.DataVisualization.Charting.Series series13 = new System.Windows.Forms.DataVisualization.Charting.Series();
System.Windows.Forms.DataVisualization.Charting.Series series14 = new System.Windows.Forms.DataVisualization.Charting.Series();
System.Windows.Forms.DataVisualization.Charting.Series series15 = new System.Windows.Forms.DataVisualization.Charting.Series();
System.Windows.Forms.DataVisualization.Charting.Title title5 = new System.Windows.Forms.DataVisualization.Charting.Title();
System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea6 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
System.Windows.Forms.DataVisualization.Charting.Legend legend6 = new System.Windows.Forms.DataVisualization.Charting.Legend();
System.Windows.Forms.DataVisualization.Charting.Series series16 = new System.Windows.Forms.DataVisualization.Charting.Series();
System.Windows.Forms.DataVisualization.Charting.Series series17 = new System.Windows.Forms.DataVisualization.Charting.Series();
System.Windows.Forms.DataVisualization.Charting.Series series18 = new System.Windows.Forms.DataVisualization.Charting.Series();
System.Windows.Forms.DataVisualization.Charting.Title title6 = new System.Windows.Forms.DataVisualization.Charting.Title();
this.cms_Chart = new System.Windows.Forms.ContextMenuStrip(this.components);
this.清除显示ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.x网格显示ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
......@@ -42,28 +72,47 @@
this.节点数据显示ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.满屏量程ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.btn_TimeRendering = new System.Windows.Forms.Button();
this.tim_UpdateState = new System.Windows.Forms.Timer(this.components);
this.btn_Full = new System.Windows.Forms.Button();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.textBox_FilePath = new System.Windows.Forms.TextBox();
this.button_LoadFile = new System.Windows.Forms.Button();
this.button_PostAcquisitionDuration = new System.Windows.Forms.Button();
this.label2 = new System.Windows.Forms.Label();
this.textBox1 = new System.Windows.Forms.TextBox();
this.btn_ReadInterval = new System.Windows.Forms.Button();
this.label1 = new System.Windows.Forms.Label();
this.txb_ReadInterval = new System.Windows.Forms.TextBox();
this.txb_ReadIcnterval = new System.Windows.Forms.TextBox();
this.chb_FollowStart = new System.Windows.Forms.CheckBox();
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
this.textBox_SetTemp = new System.Windows.Forms.TextBox();
this.label3 = new System.Windows.Forms.Label();
this.textBox_CurPow = new System.Windows.Forms.TextBox();
this.label6 = new System.Windows.Forms.Label();
this.textBox_CurTemp = new System.Windows.Forms.TextBox();
this.label5 = new System.Windows.Forms.Label();
this.textBox_CurTime = new System.Windows.Forms.TextBox();
this.label4 = new System.Windows.Forms.Label();
this.tvw_TempTrendFile = new System.Windows.Forms.TreeView();
this.btn_ScaleFileTable = new System.Windows.Forms.Button();
this.label_XY = new System.Windows.Forms.Label();
this.label_Y1Y3 = new System.Windows.Forms.Label();
this.tabControl_TempList = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.cat_TempTrend1 = new System.Windows.Forms.DataVisualization.Charting.Chart();
this.tabPage2 = new System.Windows.Forms.TabPage();
this.cat_TempTrend2 = new System.Windows.Forms.DataVisualization.Charting.Chart();
this.tabPage3 = new System.Windows.Forms.TabPage();
this.cat_TempTrend3 = new System.Windows.Forms.DataVisualization.Charting.Chart();
this.tabPage4 = new System.Windows.Forms.TabPage();
this.cat_TempTrend4 = new System.Windows.Forms.DataVisualization.Charting.Chart();
this.tabPage5 = new System.Windows.Forms.TabPage();
this.cat_TempTrend5 = new System.Windows.Forms.DataVisualization.Charting.Chart();
this.tabPage6 = new System.Windows.Forms.TabPage();
this.cat_TempTrend6 = new System.Windows.Forms.DataVisualization.Charting.Chart();
this.tim_ReadInterval = new System.Windows.Forms.Timer(this.components);
this.cms_file = new System.Windows.Forms.ContextMenuStrip(this.components);
this.批量操作ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.删除选中ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.打开文件所在ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.tip_ = new System.Windows.Forms.ToolTip(this.components);
this.textBox_FilePath = new System.Windows.Forms.TextBox();
((System.ComponentModel.ISupportInitialize)(this.cat_TempTrend)).BeginInit();
this.cms_Chart.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
......@@ -73,52 +122,22 @@
this.splitContainer2.Panel1.SuspendLayout();
this.splitContainer2.Panel2.SuspendLayout();
this.splitContainer2.SuspendLayout();
this.tabControl_TempList.SuspendLayout();
this.tabPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.cat_TempTrend1)).BeginInit();
this.tabPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.cat_TempTrend2)).BeginInit();
this.tabPage3.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.cat_TempTrend3)).BeginInit();
this.tabPage4.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.cat_TempTrend4)).BeginInit();
this.tabPage5.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.cat_TempTrend5)).BeginInit();
this.tabPage6.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.cat_TempTrend6)).BeginInit();
this.cms_file.SuspendLayout();
this.SuspendLayout();
//
// cat_TempTrend
//
this.cat_TempTrend.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
chartArea1.AxisX.MajorGrid.Enabled = false;
chartArea1.AxisX.MinorTickMark.Enabled = true;
chartArea1.AxisX.Title = "时间(min)";
chartArea1.AxisY.MajorGrid.Enabled = false;
chartArea1.AxisY.TextOrientation = System.Windows.Forms.DataVisualization.Charting.TextOrientation.Stacked;
chartArea1.AxisY.Title = "温度(℃)";
chartArea1.CursorX.IsUserEnabled = true;
chartArea1.CursorX.IsUserSelectionEnabled = true;
chartArea1.CursorY.IsUserEnabled = true;
chartArea1.CursorY.IsUserSelectionEnabled = true;
chartArea1.Name = "ChartArea1";
this.cat_TempTrend.ChartAreas.Add(chartArea1);
this.cat_TempTrend.ContextMenuStrip = this.cms_Chart;
legend1.Name = "Legend1";
this.cat_TempTrend.Legends.Add(legend1);
this.cat_TempTrend.Location = new System.Drawing.Point(3, 12);
this.cat_TempTrend.Name = "cat_TempTrend";
series1.ChartArea = "ChartArea1";
series1.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Spline;
series1.Legend = "Legend1";
series1.Name = "实际温度";
series2.ChartArea = "ChartArea1";
series2.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Spline;
series2.Legend = "Legend1";
series2.Name = "设定温度";
this.cat_TempTrend.Series.Add(series1);
this.cat_TempTrend.Series.Add(series2);
this.cat_TempTrend.Size = new System.Drawing.Size(847, 501);
this.cat_TempTrend.TabIndex = 0;
this.cat_TempTrend.Text = "温度趋势";
title1.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
title1.Name = "Title1";
title1.Text = "温度趋势";
this.cat_TempTrend.Titles.Add(title1);
this.cat_TempTrend.CursorPositionChanged += new System.EventHandler<System.Windows.Forms.DataVisualization.Charting.CursorEventArgs>(this.cat_TempTrend_CursorPositionChanged);
this.cat_TempTrend.AxisViewChanged += new System.EventHandler<System.Windows.Forms.DataVisualization.Charting.ViewEventArgs>(this.cat_TempTrend_AxisViewChanged);
this.cat_TempTrend.DoubleClick += new System.EventHandler(this.cat_TempTrend_DoubleClick);
//
// cms_Chart
//
this.cms_Chart.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
......@@ -167,7 +186,7 @@
//
// btn_TimeRendering
//
this.btn_TimeRendering.Location = new System.Drawing.Point(16, 187);
this.btn_TimeRendering.Location = new System.Drawing.Point(17, 65);
this.btn_TimeRendering.Name = "btn_TimeRendering";
this.btn_TimeRendering.Size = new System.Drawing.Size(85, 23);
this.btn_TimeRendering.TabIndex = 3;
......@@ -175,21 +194,6 @@
this.btn_TimeRendering.UseVisualStyleBackColor = true;
this.btn_TimeRendering.Click += new System.EventHandler(this.btn_TimeRendering_Click);
//
// tim_UpdateState
//
this.tim_UpdateState.Enabled = true;
this.tim_UpdateState.Tick += new System.EventHandler(this.tim_UpdateState_Tick);
//
// btn_Full
//
this.btn_Full.Location = new System.Drawing.Point(16, 216);
this.btn_Full.Name = "btn_Full";
this.btn_Full.Size = new System.Drawing.Size(85, 23);
this.btn_Full.TabIndex = 4;
this.btn_Full.Text = "满屏量程";
this.btn_Full.UseVisualStyleBackColor = true;
this.btn_Full.Click += new System.EventHandler(this.btn_Full_Click);
//
// splitContainer1
//
this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
......@@ -205,9 +209,8 @@
this.splitContainer1.Panel1.Controls.Add(this.textBox1);
this.splitContainer1.Panel1.Controls.Add(this.btn_ReadInterval);
this.splitContainer1.Panel1.Controls.Add(this.label1);
this.splitContainer1.Panel1.Controls.Add(this.txb_ReadInterval);
this.splitContainer1.Panel1.Controls.Add(this.txb_ReadIcnterval);
this.splitContainer1.Panel1.Controls.Add(this.chb_FollowStart);
this.splitContainer1.Panel1.Controls.Add(this.btn_Full);
this.splitContainer1.Panel1.Controls.Add(this.btn_TimeRendering);
//
// splitContainer1.Panel2
......@@ -217,9 +220,17 @@
this.splitContainer1.SplitterDistance = 116;
this.splitContainer1.TabIndex = 7;
//
// textBox_FilePath
//
this.textBox_FilePath.Location = new System.Drawing.Point(17, 123);
this.textBox_FilePath.Multiline = true;
this.textBox_FilePath.Name = "textBox_FilePath";
this.textBox_FilePath.Size = new System.Drawing.Size(80, 304);
this.textBox_FilePath.TabIndex = 16;
//
// button_LoadFile
//
this.button_LoadFile.Location = new System.Drawing.Point(16, 251);
this.button_LoadFile.Location = new System.Drawing.Point(16, 94);
this.button_LoadFile.Name = "button_LoadFile";
this.button_LoadFile.Size = new System.Drawing.Size(85, 23);
this.button_LoadFile.TabIndex = 15;
......@@ -229,7 +240,7 @@
//
// button_PostAcquisitionDuration
//
this.button_PostAcquisitionDuration.Location = new System.Drawing.Point(16, 133);
this.button_PostAcquisitionDuration.Location = new System.Drawing.Point(12, 495);
this.button_PostAcquisitionDuration.Name = "button_PostAcquisitionDuration";
this.button_PostAcquisitionDuration.Size = new System.Drawing.Size(85, 23);
this.button_PostAcquisitionDuration.TabIndex = 14;
......@@ -240,15 +251,16 @@
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(85, 109);
this.label2.Location = new System.Drawing.Point(79, 471);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(23, 12);
this.label2.TabIndex = 13;
this.label2.Text = "min";
this.label2.Visible = false;
//
// textBox1
//
this.textBox1.Location = new System.Drawing.Point(17, 106);
this.textBox1.Location = new System.Drawing.Point(12, 468);
this.textBox1.Name = "textBox1";
this.textBox1.Size = new System.Drawing.Size(62, 21);
this.textBox1.TabIndex = 12;
......@@ -256,29 +268,33 @@
//
// btn_ReadInterval
//
this.btn_ReadInterval.Location = new System.Drawing.Point(16, 68);
this.btn_ReadInterval.Enabled = false;
this.btn_ReadInterval.Location = new System.Drawing.Point(15, 36);
this.btn_ReadInterval.Name = "btn_ReadInterval";
this.btn_ReadInterval.Size = new System.Drawing.Size(85, 23);
this.btn_ReadInterval.TabIndex = 11;
this.btn_ReadInterval.Text = "设定采集间隔";
this.btn_ReadInterval.UseVisualStyleBackColor = true;
this.btn_ReadInterval.Visible = false;
this.btn_ReadInterval.Click += new System.EventHandler(this.btn_ReadInterval_Click);
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(85, 44);
this.label1.Location = new System.Drawing.Point(84, 12);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(17, 12);
this.label1.TabIndex = 10;
this.label1.Text = "ms";
//
// txb_ReadInterval
// txb_ReadIcnterval
//
this.txb_ReadInterval.Location = new System.Drawing.Point(17, 41);
this.txb_ReadInterval.Name = "txb_ReadInterval";
this.txb_ReadInterval.Size = new System.Drawing.Size(62, 21);
this.txb_ReadInterval.TabIndex = 9;
this.txb_ReadIcnterval.Enabled = false;
this.txb_ReadIcnterval.Location = new System.Drawing.Point(16, 9);
this.txb_ReadIcnterval.Name = "txb_ReadIcnterval";
this.txb_ReadIcnterval.Size = new System.Drawing.Size(62, 21);
this.txb_ReadIcnterval.TabIndex = 9;
this.txb_ReadIcnterval.Text = "1000";
//
// chb_FollowStart
//
......@@ -289,7 +305,6 @@
this.chb_FollowStart.TabIndex = 8;
this.chb_FollowStart.Text = "跟随分析启动";
this.chb_FollowStart.UseVisualStyleBackColor = true;
this.chb_FollowStart.Visible = false;
this.chb_FollowStart.CheckedChanged += new System.EventHandler(this.chb_FollowStart_CheckedChanged);
//
// splitContainer2
......@@ -300,16 +315,90 @@
//
// splitContainer2.Panel1
//
this.splitContainer2.Panel1.Controls.Add(this.textBox_SetTemp);
this.splitContainer2.Panel1.Controls.Add(this.label3);
this.splitContainer2.Panel1.Controls.Add(this.textBox_CurPow);
this.splitContainer2.Panel1.Controls.Add(this.label6);
this.splitContainer2.Panel1.Controls.Add(this.textBox_CurTemp);
this.splitContainer2.Panel1.Controls.Add(this.label5);
this.splitContainer2.Panel1.Controls.Add(this.textBox_CurTime);
this.splitContainer2.Panel1.Controls.Add(this.label4);
this.splitContainer2.Panel1.Controls.Add(this.tvw_TempTrendFile);
this.splitContainer2.Panel1.Controls.Add(this.btn_ScaleFileTable);
//
// splitContainer2.Panel2
//
this.splitContainer2.Panel2.Controls.Add(this.cat_TempTrend);
this.splitContainer2.Panel2.Controls.Add(this.label_XY);
this.splitContainer2.Panel2.Controls.Add(this.label_Y1Y3);
this.splitContainer2.Panel2.Controls.Add(this.tabControl_TempList);
this.splitContainer2.Size = new System.Drawing.Size(1028, 525);
this.splitContainer2.SplitterDistance = 162;
this.splitContainer2.TabIndex = 1;
//
// textBox_SetTemp
//
this.textBox_SetTemp.Location = new System.Drawing.Point(18, 97);
this.textBox_SetTemp.Name = "textBox_SetTemp";
this.textBox_SetTemp.Size = new System.Drawing.Size(84, 21);
this.textBox_SetTemp.TabIndex = 26;
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(18, 83);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(53, 12);
this.label3.TabIndex = 25;
this.label3.Text = "设定温度";
//
// textBox_CurPow
//
this.textBox_CurPow.Location = new System.Drawing.Point(18, 134);
this.textBox_CurPow.Name = "textBox_CurPow";
this.textBox_CurPow.Size = new System.Drawing.Size(84, 21);
this.textBox_CurPow.TabIndex = 24;
//
// label6
//
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(18, 120);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(53, 12);
this.label6.TabIndex = 23;
this.label6.Text = "当前功率";
//
// textBox_CurTemp
//
this.textBox_CurTemp.Location = new System.Drawing.Point(18, 60);
this.textBox_CurTemp.Name = "textBox_CurTemp";
this.textBox_CurTemp.Size = new System.Drawing.Size(84, 21);
this.textBox_CurTemp.TabIndex = 22;
//
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(18, 46);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(53, 12);
this.label5.TabIndex = 21;
this.label5.Text = "当前温度";
//
// textBox_CurTime
//
this.textBox_CurTime.Location = new System.Drawing.Point(18, 23);
this.textBox_CurTime.Name = "textBox_CurTime";
this.textBox_CurTime.Size = new System.Drawing.Size(84, 21);
this.textBox_CurTime.TabIndex = 20;
//
// label4
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(18, 9);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(53, 12);
this.label4.TabIndex = 19;
this.label4.Text = "当前时间";
//
// tvw_TempTrendFile
//
this.tvw_TempTrendFile.Dock = System.Windows.Forms.DockStyle.Fill;
......@@ -331,6 +420,382 @@
this.btn_ScaleFileTable.UseVisualStyleBackColor = true;
this.btn_ScaleFileTable.Click += new System.EventHandler(this.btn_ScaleFileTable_Click);
//
// label_XY
//
this.label_XY.AutoSize = true;
this.label_XY.Location = new System.Drawing.Point(20, 490);
this.label_XY.Name = "label_XY";
this.label_XY.Size = new System.Drawing.Size(89, 12);
this.label_XY.TabIndex = 1;
this.label_XY.Text = "鼠标所在x=;y=;";
//
// label_Y1Y3
//
this.label_Y1Y3.AutoSize = true;
this.label_Y1Y3.Location = new System.Drawing.Point(500, 490);
this.label_Y1Y3.Name = "label_Y1Y3";
this.label_Y1Y3.Size = new System.Drawing.Size(191, 12);
this.label_Y1Y3.TabIndex = 2;
this.label_Y1Y3.Text = "左键点击处 当前温度=;当前功率=;";
//
// tabControl_TempList
//
this.tabControl_TempList.Controls.Add(this.tabPage1);
this.tabControl_TempList.Controls.Add(this.tabPage2);
this.tabControl_TempList.Controls.Add(this.tabPage3);
this.tabControl_TempList.Controls.Add(this.tabPage4);
this.tabControl_TempList.Controls.Add(this.tabPage5);
this.tabControl_TempList.Controls.Add(this.tabPage6);
this.tabControl_TempList.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabControl_TempList.Location = new System.Drawing.Point(0, 0);
this.tabControl_TempList.Name = "tabControl_TempList";
this.tabControl_TempList.SelectedIndex = 0;
this.tabControl_TempList.Size = new System.Drawing.Size(862, 525);
this.tabControl_TempList.TabIndex = 25;
this.tabControl_TempList.SelectedIndexChanged += new System.EventHandler(this.tabControl_TempList_SelectedIndexChanged);
//
// tabPage1
//
this.tabPage1.Controls.Add(this.cat_TempTrend1);
this.tabPage1.Location = new System.Drawing.Point(4, 22);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(854, 499);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "前进样";
this.tabPage1.UseVisualStyleBackColor = true;
//
// cat_TempTrend1
//
chartArea1.AxisX.MajorGrid.Enabled = false;
chartArea1.AxisX.MinorTickMark.Enabled = true;
chartArea1.AxisX.Title = "时间(min)";
chartArea1.AxisY.MajorGrid.Enabled = false;
chartArea1.AxisY.TextOrientation = System.Windows.Forms.DataVisualization.Charting.TextOrientation.Stacked;
chartArea1.AxisY.Title = "温度(℃)";
chartArea1.CursorX.IsUserEnabled = true;
chartArea1.CursorX.IsUserSelectionEnabled = true;
chartArea1.CursorY.IsUserEnabled = true;
chartArea1.CursorY.IsUserSelectionEnabled = true;
chartArea1.Name = "ChartArea1";
this.cat_TempTrend1.ChartAreas.Add(chartArea1);
this.cat_TempTrend1.ContextMenuStrip = this.cms_Chart;
this.cat_TempTrend1.Dock = System.Windows.Forms.DockStyle.Fill;
legend1.Name = "Legend1";
this.cat_TempTrend1.Legends.Add(legend1);
this.cat_TempTrend1.Location = new System.Drawing.Point(3, 3);
this.cat_TempTrend1.Name = "cat_TempTrend1";
series1.ChartArea = "ChartArea1";
series1.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Spline;
series1.Legend = "Legend1";
series1.Name = "实际温度";
series2.ChartArea = "ChartArea1";
series2.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Spline;
series2.Legend = "Legend1";
series2.Name = "设定温度";
series3.ChartArea = "ChartArea1";
series3.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Spline;
series3.Legend = "Legend1";
series3.Name = "占空比";
this.cat_TempTrend1.Series.Add(series1);
this.cat_TempTrend1.Series.Add(series2);
this.cat_TempTrend1.Series.Add(series3);
this.cat_TempTrend1.Size = new System.Drawing.Size(848, 493);
this.cat_TempTrend1.TabIndex = 1;
this.cat_TempTrend1.Text = "温度趋势";
title1.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
title1.Name = "Title1";
title1.Text = "温度趋势";
this.cat_TempTrend1.Titles.Add(title1);
this.cat_TempTrend1.CursorPositionChanged += new System.EventHandler<System.Windows.Forms.DataVisualization.Charting.CursorEventArgs>(this.cat_TempTrend1_CursorPositionChanged);
this.cat_TempTrend1.Click += new System.EventHandler(this.cat_TempTrend_Click);
this.cat_TempTrend1.DoubleClick += new System.EventHandler(this.cat_TempTrend1_DoubleClick);
//
// tabPage2
//
this.tabPage2.Controls.Add(this.cat_TempTrend2);
this.tabPage2.Location = new System.Drawing.Point(4, 22);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
this.tabPage2.Size = new System.Drawing.Size(854, 499);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "后进样";
this.tabPage2.UseVisualStyleBackColor = true;
//
// cat_TempTrend2
//
chartArea2.AxisX.MajorGrid.Enabled = false;
chartArea2.AxisX.MinorTickMark.Enabled = true;
chartArea2.AxisX.Title = "时间(min)";
chartArea2.AxisY.MajorGrid.Enabled = false;
chartArea2.AxisY.TextOrientation = System.Windows.Forms.DataVisualization.Charting.TextOrientation.Stacked;
chartArea2.AxisY.Title = "温度(℃)";
chartArea2.CursorX.IsUserEnabled = true;
chartArea2.CursorX.IsUserSelectionEnabled = true;
chartArea2.CursorY.IsUserEnabled = true;
chartArea2.CursorY.IsUserSelectionEnabled = true;
chartArea2.Name = "ChartArea1";
this.cat_TempTrend2.ChartAreas.Add(chartArea2);
this.cat_TempTrend2.ContextMenuStrip = this.cms_Chart;
this.cat_TempTrend2.Dock = System.Windows.Forms.DockStyle.Fill;
legend2.Name = "Legend1";
this.cat_TempTrend2.Legends.Add(legend2);
this.cat_TempTrend2.Location = new System.Drawing.Point(3, 3);
this.cat_TempTrend2.Name = "cat_TempTrend2";
series4.ChartArea = "ChartArea1";
series4.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Spline;
series4.Legend = "Legend1";
series4.Name = "实际温度";
series5.ChartArea = "ChartArea1";
series5.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Spline;
series5.Legend = "Legend1";
series5.Name = "设定温度";
series6.ChartArea = "ChartArea1";
series6.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Spline;
series6.Legend = "Legend1";
series6.Name = "占空比";
this.cat_TempTrend2.Series.Add(series4);
this.cat_TempTrend2.Series.Add(series5);
this.cat_TempTrend2.Series.Add(series6);
this.cat_TempTrend2.Size = new System.Drawing.Size(848, 493);
this.cat_TempTrend2.TabIndex = 2;
this.cat_TempTrend2.Text = "温度趋势";
title2.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
title2.Name = "Title1";
title2.Text = "温度趋势";
this.cat_TempTrend2.Titles.Add(title2);
this.cat_TempTrend2.CursorPositionChanged += new System.EventHandler<System.Windows.Forms.DataVisualization.Charting.CursorEventArgs>(this.cat_TempTrend1_CursorPositionChanged);
this.cat_TempTrend2.Click += new System.EventHandler(this.cat_TempTrend_Click);
this.cat_TempTrend2.DoubleClick += new System.EventHandler(this.cat_TempTrend1_DoubleClick);
//
// tabPage3
//
this.tabPage3.Controls.Add(this.cat_TempTrend3);
this.tabPage3.Location = new System.Drawing.Point(4, 22);
this.tabPage3.Name = "tabPage3";
this.tabPage3.Padding = new System.Windows.Forms.Padding(3);
this.tabPage3.Size = new System.Drawing.Size(854, 499);
this.tabPage3.TabIndex = 2;
this.tabPage3.Text = "检测1";
this.tabPage3.UseVisualStyleBackColor = true;
//
// cat_TempTrend3
//
chartArea3.AxisX.MajorGrid.Enabled = false;
chartArea3.AxisX.MinorTickMark.Enabled = true;
chartArea3.AxisX.Title = "时间(min)";
chartArea3.AxisY.MajorGrid.Enabled = false;
chartArea3.AxisY.TextOrientation = System.Windows.Forms.DataVisualization.Charting.TextOrientation.Stacked;
chartArea3.AxisY.Title = "温度(℃)";
chartArea3.CursorX.IsUserEnabled = true;
chartArea3.CursorX.IsUserSelectionEnabled = true;
chartArea3.CursorY.IsUserEnabled = true;
chartArea3.CursorY.IsUserSelectionEnabled = true;
chartArea3.Name = "ChartArea1";
this.cat_TempTrend3.ChartAreas.Add(chartArea3);
this.cat_TempTrend3.ContextMenuStrip = this.cms_Chart;
this.cat_TempTrend3.Dock = System.Windows.Forms.DockStyle.Fill;
legend3.Name = "Legend1";
this.cat_TempTrend3.Legends.Add(legend3);
this.cat_TempTrend3.Location = new System.Drawing.Point(3, 3);
this.cat_TempTrend3.Name = "cat_TempTrend3";
series7.ChartArea = "ChartArea1";
series7.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Spline;
series7.Legend = "Legend1";
series7.Name = "实际温度";
series8.ChartArea = "ChartArea1";
series8.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Spline;
series8.Legend = "Legend1";
series8.Name = "设定温度";
series9.ChartArea = "ChartArea1";
series9.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Spline;
series9.Legend = "Legend1";
series9.Name = "占空比";
this.cat_TempTrend3.Series.Add(series7);
this.cat_TempTrend3.Series.Add(series8);
this.cat_TempTrend3.Series.Add(series9);
this.cat_TempTrend3.Size = new System.Drawing.Size(848, 493);
this.cat_TempTrend3.TabIndex = 2;
this.cat_TempTrend3.Text = "温度趋势";
title3.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
title3.Name = "Title1";
title3.Text = "温度趋势";
this.cat_TempTrend3.Titles.Add(title3);
this.cat_TempTrend3.CursorPositionChanged += new System.EventHandler<System.Windows.Forms.DataVisualization.Charting.CursorEventArgs>(this.cat_TempTrend1_CursorPositionChanged);
this.cat_TempTrend3.Click += new System.EventHandler(this.cat_TempTrend_Click);
this.cat_TempTrend3.DoubleClick += new System.EventHandler(this.cat_TempTrend1_DoubleClick);
//
// tabPage4
//
this.tabPage4.Controls.Add(this.cat_TempTrend4);
this.tabPage4.Location = new System.Drawing.Point(4, 22);
this.tabPage4.Name = "tabPage4";
this.tabPage4.Padding = new System.Windows.Forms.Padding(3);
this.tabPage4.Size = new System.Drawing.Size(854, 499);
this.tabPage4.TabIndex = 3;
this.tabPage4.Text = "检测2";
this.tabPage4.UseVisualStyleBackColor = true;
//
// cat_TempTrend4
//
chartArea4.AxisX.MajorGrid.Enabled = false;
chartArea4.AxisX.MinorTickMark.Enabled = true;
chartArea4.AxisX.Title = "时间(min)";
chartArea4.AxisY.MajorGrid.Enabled = false;
chartArea4.AxisY.TextOrientation = System.Windows.Forms.DataVisualization.Charting.TextOrientation.Stacked;
chartArea4.AxisY.Title = "温度(℃)";
chartArea4.CursorX.IsUserEnabled = true;
chartArea4.CursorX.IsUserSelectionEnabled = true;
chartArea4.CursorY.IsUserEnabled = true;
chartArea4.CursorY.IsUserSelectionEnabled = true;
chartArea4.Name = "ChartArea1";
this.cat_TempTrend4.ChartAreas.Add(chartArea4);
this.cat_TempTrend4.ContextMenuStrip = this.cms_Chart;
this.cat_TempTrend4.Dock = System.Windows.Forms.DockStyle.Fill;
legend4.Name = "Legend1";
this.cat_TempTrend4.Legends.Add(legend4);
this.cat_TempTrend4.Location = new System.Drawing.Point(3, 3);
this.cat_TempTrend4.Name = "cat_TempTrend4";
series10.ChartArea = "ChartArea1";
series10.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Spline;
series10.Legend = "Legend1";
series10.Name = "实际温度";
series11.ChartArea = "ChartArea1";
series11.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Spline;
series11.Legend = "Legend1";
series11.Name = "设定温度";
series12.ChartArea = "ChartArea1";
series12.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Spline;
series12.Legend = "Legend1";
series12.Name = "占空比";
this.cat_TempTrend4.Series.Add(series10);
this.cat_TempTrend4.Series.Add(series11);
this.cat_TempTrend4.Series.Add(series12);
this.cat_TempTrend4.Size = new System.Drawing.Size(848, 493);
this.cat_TempTrend4.TabIndex = 2;
this.cat_TempTrend4.Text = "温度趋势";
title4.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
title4.Name = "Title1";
title4.Text = "温度趋势";
this.cat_TempTrend4.Titles.Add(title4);
this.cat_TempTrend4.CursorPositionChanged += new System.EventHandler<System.Windows.Forms.DataVisualization.Charting.CursorEventArgs>(this.cat_TempTrend1_CursorPositionChanged);
this.cat_TempTrend4.Click += new System.EventHandler(this.cat_TempTrend_Click);
this.cat_TempTrend4.DoubleClick += new System.EventHandler(this.cat_TempTrend1_DoubleClick);
//
// tabPage5
//
this.tabPage5.Controls.Add(this.cat_TempTrend5);
this.tabPage5.Location = new System.Drawing.Point(4, 22);
this.tabPage5.Name = "tabPage5";
this.tabPage5.Padding = new System.Windows.Forms.Padding(3);
this.tabPage5.Size = new System.Drawing.Size(854, 499);
this.tabPage5.TabIndex = 4;
this.tabPage5.Text = "检测3";
this.tabPage5.UseVisualStyleBackColor = true;
//
// cat_TempTrend5
//
chartArea5.AxisX.MajorGrid.Enabled = false;
chartArea5.AxisX.MinorTickMark.Enabled = true;
chartArea5.AxisX.Title = "时间(min)";
chartArea5.AxisY.MajorGrid.Enabled = false;
chartArea5.AxisY.TextOrientation = System.Windows.Forms.DataVisualization.Charting.TextOrientation.Stacked;
chartArea5.AxisY.Title = "温度(℃)";
chartArea5.CursorX.IsUserEnabled = true;
chartArea5.CursorX.IsUserSelectionEnabled = true;
chartArea5.CursorY.IsUserEnabled = true;
chartArea5.CursorY.IsUserSelectionEnabled = true;
chartArea5.Name = "ChartArea1";
this.cat_TempTrend5.ChartAreas.Add(chartArea5);
this.cat_TempTrend5.ContextMenuStrip = this.cms_Chart;
this.cat_TempTrend5.Dock = System.Windows.Forms.DockStyle.Fill;
legend5.Name = "Legend1";
this.cat_TempTrend5.Legends.Add(legend5);
this.cat_TempTrend5.Location = new System.Drawing.Point(3, 3);
this.cat_TempTrend5.Name = "cat_TempTrend5";
series13.ChartArea = "ChartArea1";
series13.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Spline;
series13.Legend = "Legend1";
series13.Name = "实际温度";
series14.ChartArea = "ChartArea1";
series14.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Spline;
series14.Legend = "Legend1";
series14.Name = "设定温度";
series15.ChartArea = "ChartArea1";
series15.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Spline;
series15.Legend = "Legend1";
series15.Name = "占空比";
this.cat_TempTrend5.Series.Add(series13);
this.cat_TempTrend5.Series.Add(series14);
this.cat_TempTrend5.Series.Add(series15);
this.cat_TempTrend5.Size = new System.Drawing.Size(848, 493);
this.cat_TempTrend5.TabIndex = 2;
this.cat_TempTrend5.Text = "温度趋势";
title5.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
title5.Name = "Title1";
title5.Text = "温度趋势";
this.cat_TempTrend5.Titles.Add(title5);
this.cat_TempTrend5.CursorPositionChanged += new System.EventHandler<System.Windows.Forms.DataVisualization.Charting.CursorEventArgs>(this.cat_TempTrend1_CursorPositionChanged);
this.cat_TempTrend5.Click += new System.EventHandler(this.cat_TempTrend_Click);
this.cat_TempTrend5.DoubleClick += new System.EventHandler(this.cat_TempTrend1_DoubleClick);
//
// tabPage6
//
this.tabPage6.Controls.Add(this.cat_TempTrend6);
this.tabPage6.Location = new System.Drawing.Point(4, 22);
this.tabPage6.Name = "tabPage6";
this.tabPage6.Padding = new System.Windows.Forms.Padding(3);
this.tabPage6.Size = new System.Drawing.Size(854, 499);
this.tabPage6.TabIndex = 5;
this.tabPage6.Text = "柱箱";
this.tabPage6.UseVisualStyleBackColor = true;
//
// cat_TempTrend6
//
chartArea6.AxisX.MajorGrid.Enabled = false;
chartArea6.AxisX.MinorTickMark.Enabled = true;
chartArea6.AxisX.Title = "时间(min)";
chartArea6.AxisY.MajorGrid.Enabled = false;
chartArea6.AxisY.TextOrientation = System.Windows.Forms.DataVisualization.Charting.TextOrientation.Stacked;
chartArea6.AxisY.Title = "温度(℃)";
chartArea6.CursorX.IsUserEnabled = true;
chartArea6.CursorX.IsUserSelectionEnabled = true;
chartArea6.CursorY.IsUserEnabled = true;
chartArea6.CursorY.IsUserSelectionEnabled = true;
chartArea6.Name = "ChartArea1";
this.cat_TempTrend6.ChartAreas.Add(chartArea6);
this.cat_TempTrend6.ContextMenuStrip = this.cms_Chart;
this.cat_TempTrend6.Dock = System.Windows.Forms.DockStyle.Fill;
legend6.Name = "Legend1";
this.cat_TempTrend6.Legends.Add(legend6);
this.cat_TempTrend6.Location = new System.Drawing.Point(3, 3);
this.cat_TempTrend6.Name = "cat_TempTrend6";
series16.ChartArea = "ChartArea1";
series16.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Spline;
series16.Legend = "Legend1";
series16.Name = "实际温度";
series17.ChartArea = "ChartArea1";
series17.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Spline;
series17.Legend = "Legend1";
series17.Name = "设定温度";
series18.ChartArea = "ChartArea1";
series18.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Spline;
series18.Legend = "Legend1";
series18.Name = "占空比";
this.cat_TempTrend6.Series.Add(series16);
this.cat_TempTrend6.Series.Add(series17);
this.cat_TempTrend6.Series.Add(series18);
this.cat_TempTrend6.Size = new System.Drawing.Size(848, 493);
this.cat_TempTrend6.TabIndex = 2;
this.cat_TempTrend6.Text = "温度趋势";
title6.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
title6.Name = "Title1";
title6.Text = "温度趋势";
this.cat_TempTrend6.Titles.Add(title6);
this.cat_TempTrend6.CursorPositionChanged += new System.EventHandler<System.Windows.Forms.DataVisualization.Charting.CursorEventArgs>(this.cat_TempTrend1_CursorPositionChanged);
this.cat_TempTrend6.Click += new System.EventHandler(this.cat_TempTrend_Click);
this.cat_TempTrend6.DoubleClick += new System.EventHandler(this.cat_TempTrend1_DoubleClick);
//
// tim_ReadInterval
//
this.tim_ReadInterval.Interval = 1000;
......@@ -364,14 +829,6 @@
this.打开文件所在ToolStripMenuItem.Size = new System.Drawing.Size(148, 22);
this.打开文件所在ToolStripMenuItem.Text = "打开文件所在";
//
// textBox_FilePath
//
this.textBox_FilePath.Location = new System.Drawing.Point(12, 310);
this.textBox_FilePath.Multiline = true;
this.textBox_FilePath.Name = "textBox_FilePath";
this.textBox_FilePath.Size = new System.Drawing.Size(89, 85);
this.textBox_FilePath.TabIndex = 16;
//
// TempTrend
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
......@@ -381,7 +838,8 @@
this.Name = "TempTrend";
this.Text = "温度趋势";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.TempTrend_FormClosing);
((System.ComponentModel.ISupportInitialize)(this.cat_TempTrend)).EndInit();
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.TempTrend_FormClosed);
this.Load += new System.EventHandler(this.TempTrend_Load);
this.cms_Chart.ResumeLayout(false);
this.splitContainer1.Panel1.ResumeLayout(false);
this.splitContainer1.Panel1.PerformLayout();
......@@ -389,25 +847,36 @@
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
this.splitContainer1.ResumeLayout(false);
this.splitContainer2.Panel1.ResumeLayout(false);
this.splitContainer2.Panel1.PerformLayout();
this.splitContainer2.Panel2.ResumeLayout(false);
this.splitContainer2.Panel2.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit();
this.splitContainer2.ResumeLayout(false);
this.tabControl_TempList.ResumeLayout(false);
this.tabPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.cat_TempTrend1)).EndInit();
this.tabPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.cat_TempTrend2)).EndInit();
this.tabPage3.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.cat_TempTrend3)).EndInit();
this.tabPage4.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.cat_TempTrend4)).EndInit();
this.tabPage5.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.cat_TempTrend5)).EndInit();
this.tabPage6.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.cat_TempTrend6)).EndInit();
this.cms_file.ResumeLayout(false);
this.ResumeLayout(false);
}
#endregion
private System.Windows.Forms.DataVisualization.Charting.Chart cat_TempTrend;
private System.Windows.Forms.Button btn_TimeRendering;
private System.Windows.Forms.Timer tim_UpdateState;
private System.Windows.Forms.Button btn_Full;
private System.Windows.Forms.SplitContainer splitContainer1;
private System.Windows.Forms.CheckBox chb_FollowStart;
private System.Windows.Forms.Button btn_ReadInterval;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.TextBox txb_ReadInterval;
private System.Windows.Forms.TextBox txb_ReadIcnterval;
private System.Windows.Forms.SplitContainer splitContainer2;
private System.Windows.Forms.Button btn_ScaleFileTable;
private System.Windows.Forms.Timer tim_ReadInterval;
......@@ -425,8 +894,30 @@
private System.Windows.Forms.Button button_PostAcquisitionDuration;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.TextBox textBox1;
private System.Windows.Forms.ToolTip tip_;
private System.Windows.Forms.Button button_LoadFile;
private System.Windows.Forms.TextBox textBox_FilePath;
private System.Windows.Forms.Label label_XY;
private System.Windows.Forms.TextBox textBox_CurPow;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.TextBox textBox_CurTemp;
private System.Windows.Forms.Label label5;
private System.Windows.Forms.TextBox textBox_CurTime;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.TabControl tabControl_TempList;
private System.Windows.Forms.TabPage tabPage1;
private System.Windows.Forms.DataVisualization.Charting.Chart cat_TempTrend1;
private System.Windows.Forms.TabPage tabPage2;
private System.Windows.Forms.DataVisualization.Charting.Chart cat_TempTrend2;
private System.Windows.Forms.TabPage tabPage3;
private System.Windows.Forms.DataVisualization.Charting.Chart cat_TempTrend3;
private System.Windows.Forms.TabPage tabPage4;
private System.Windows.Forms.DataVisualization.Charting.Chart cat_TempTrend4;
private System.Windows.Forms.TabPage tabPage5;
private System.Windows.Forms.DataVisualization.Charting.Chart cat_TempTrend5;
private System.Windows.Forms.TabPage tabPage6;
private System.Windows.Forms.DataVisualization.Charting.Chart cat_TempTrend6;
private System.Windows.Forms.Label label_Y1Y3;
private System.Windows.Forms.TextBox textBox_SetTemp;
private System.Windows.Forms.Label label3;
}
}
\ No newline at end of file
GcDevicePc/DrawUI/TempTrend.cs → GcDevicePc/ExpansionMethod/TempTrend.cs
View file @ 5587fca6
using C1.Win.C1Chart;
using GcDevicePc.Common;
using GcDevicePc.IniParam;
using GcDevicePc.ProThread;
using System;
using System.Collections;
using System.Collections.Concurrent;
......@@ -18,6 +19,7 @@ using System.Windows.Forms.DataVisualization.Charting;
namespace GcDevicePc.DrawUI
{
public partial class TempTrend : Form
{
public TempTrend()
......@@ -55,17 +57,21 @@ namespace GcDevicePc.DrawUI
/// </summary>
private static string LastLoadedData;
/// <summary>
/// /是否跟随启动
/// </summary>
private static string iFollowStart;
/// <summary>
/// 是否开始了采集
/// </summary>
private static bool ISRun;
/// <summary>
/// 缩放次数
/// </summary>
private static int ScalingTimes = 0;
private static int[] ScalingTimes = { 0, 0, 0, 0, 0, 0 };
/// <summary>
/// X轴
/// </summary>
private static double curX;
private static float curX;
/// <summary>
/// 储存树状节点状态
/// </summary>
......@@ -75,6 +81,16 @@ namespace GcDevicePc.DrawUI
/// 记录文件列表分离器状态
/// </summary>
private static int splitExpandDis;
/// <summary>
/// 当前显示温控标签索引
/// </summary>
private static int CurTempPosition;
/// <summary>
/// 当前激活chart
/// </summary>
private static Chart CurChart;
private static int Det2OrOV1 = 0;
private static int Det3OrOV2 = 0;
/// //////////////////////温度趋势文件///////////////////
private void InitTempTrendFile()
{
......@@ -310,12 +326,32 @@ namespace GcDevicePc.DrawUI
DisplayData = Sys_ini.Get_Sys_TempTrend_DisplayData();
BackgroundColor = Sys_ini.Get_Sys_TempTrend_BackgroundColor();
LastLoadedData = Sys_ini.Get_Sys_TempTrend_LastLoadedData();
cat_TempTrend.ChartAreas[0].AxisY.IsLabelAutoFit = true;//设置是否自动调整轴标签
cat_TempTrend.ChartAreas[0].AxisY.IsStartedFromZero = true;//设置是否自动将数据值均为正值时轴的最小值设置为0，存在负数据值时，将使用数据轴最小值
cat_TempTrend.ChartAreas[0].AxisX.Minimum = System.Double.NaN * 0.95;
cat_TempTrend.ChartAreas[0].AxisX.Maximum = System.Double.NaN * 1.05;
cat_TempTrend.ChartAreas[0].AxisY.Minimum = System.Double.NaN * 0.95;
cat_TempTrend.ChartAreas[0].AxisY.Maximum = System.Double.NaN * 1.05;
iFollowStart = Sys_ini.Get_Sys_TempTrend_FollowStart();
if (iFollowStart == "1")
{
chb_FollowStart.Checked = true;
}
else
{
chb_FollowStart.Checked = false;
}
foreach (TabPage page in tabControl_TempList.TabPages)
{
foreach (Control control in page.Controls)
{
if (control is Chart)
{
Chart chart = control as Chart;
chart.ChartAreas[0].AxisY.IsLabelAutoFit = true;//设置是否自动调整轴标签
chart.ChartAreas[0].AxisY.IsStartedFromZero = true;//设置是否自动将数据值均为正值时轴的最小值设置为0，存在负数据值时，将使用数据轴最小值
chart.ChartAreas[0].AxisX.Minimum = System.Double.NaN * 0.95;
chart.ChartAreas[0].AxisX.Maximum = System.Double.NaN * 1.05;
chart.ChartAreas[0].AxisY.Minimum = System.Double.NaN * 0.95;
chart.ChartAreas[0].AxisY.Maximum = System.Double.NaN * 1.05;
}
}
}
//cat_TempTrend.ChartAreas[0].AxisY.Interval//轴间隔大小
}
/// <summary>
......@@ -323,10 +359,10 @@ namespace GcDevicePc.DrawUI
/// </summary>
private void Set_Chart()
{
cat_TempTrend.Series[0].IsValueShownAsLabel = DisplayData;//节点数据显示
cat_TempTrend.Series[1].IsValueShownAsLabel = DisplayData;//节点数据显示
cat_TempTrend.ChartAreas[0].AxisX.MajorGrid.Enabled = EnableGriX;//网格线显示X轴
cat_TempTrend.ChartAreas[0].AxisY.MajorGrid.Enabled = EnableGriY;//网格线显示Y轴
cat_TempTrend1.Series[0].IsValueShownAsLabel = DisplayData;//节点数据显示
cat_TempTrend1.Series[1].IsValueShownAsLabel = DisplayData;//节点数据显示
cat_TempTrend1.ChartAreas[0].AxisX.MajorGrid.Enabled = EnableGriX;//网格线显示X轴
cat_TempTrend1.ChartAreas[0].AxisY.MajorGrid.Enabled = EnableGriY;//网格线显示Y轴
#region 暂未实现
/*
......@@ -374,23 +410,83 @@ namespace GcDevicePc.DrawUI
}
/// <summary>
/// 实时采集
/// 委托跟随分析启动
/// </summary>
private void FollowStart(bool b)
{
if (iFollowStart == "1")
{
if (b)
{
//触发开始
if (btn_TimeRendering.Text == "开始采集")
{
btn_TimeRendering_Click(null, null);
}
else
{
//如果已经开始,先停止,再重新开始
btn_TimeRendering_Click(null, null);
btn_TimeRendering_Click(null, null);
}
}
else
{
//触发停止
if (btn_TimeRendering.Text == "停止采集")
{
btn_TimeRendering_Click(null, null);
}
}
}
}
/// <summary>
/// 开始/停止采集
/// </summary>
private void btn_TimeRendering_Click(object sender, EventArgs e)
{
if (btn_TimeRendering.Text == "开始采集")
{
cat_TempTrend.Series[0].Points.Clear();
cat_TempTrend.Series[1].Points.Clear();
tempWrite.Clear();
ISRun = true;
cat_TempTrend1.Series[0].Points.Clear();
cat_TempTrend1.Series[1].Points.Clear();
cat_TempTrend1.Series[2].Points.Clear();
cat_TempTrend2.Series[0].Points.Clear();
cat_TempTrend2.Series[1].Points.Clear();
cat_TempTrend2.Series[2].Points.Clear();
cat_TempTrend3.Series[0].Points.Clear();
cat_TempTrend3.Series[1].Points.Clear();
cat_TempTrend3.Series[2].Points.Clear();
cat_TempTrend4.Series[0].Points.Clear();
cat_TempTrend4.Series[1].Points.Clear();
cat_TempTrend4.Series[2].Points.Clear();
cat_TempTrend5.Series[0].Points.Clear();
cat_TempTrend5.Series[1].Points.Clear();
cat_TempTrend5.Series[2].Points.Clear();
cat_TempTrend6.Series[0].Points.Clear();
cat_TempTrend6.Series[1].Points.Clear();
cat_TempTrend6.Series[2].Points.Clear();
foreach (var item in tempWrite)
{
item.Value.Clear();
}
curX = 0;
ISRun = true;
btn_TimeRendering.Text = "停止采集";
btn_ReadInterval.Enabled = false;
tim_ReadInterval.Enabled = true;
chb_FollowStart.Enabled = false;
清除显示ToolStripMenuItem.Enabled = false;
}
else
{
CreatFile();
InitWriteFileData(); //结束写入,准备保存数据
ISRun = false;
btn_TimeRendering.Text = "开始采集";
btn_ReadInterval.Enabled = true;
tim_ReadInterval.Enabled = false;
chb_FollowStart.Enabled = true;
清除显示ToolStripMenuItem.Enabled = true;
}
}
private void Runing()
......@@ -407,20 +503,27 @@ namespace GcDevicePc.DrawUI
/// <summary>
/// 更改缩放
/// </summary>
private void ChangeZoom()
private void ChangeZoom(int CurTempPosition)
{
//ScalingTimes每次缩放会++2次
cat_TempTrend.ChartAreas[0].AxisX.ScaleView.ZoomReset(ScalingTimes / 2);//为0时撤销所有放大动作
cat_TempTrend.ChartAreas[0].AxisY.ScaleView.ZoomReset(ScalingTimes / 2);//为0时撤销所有放大动作
if (ScalingTimes[CurTempPosition] > 0)
{
CurChart.ChartAreas[0].AxisX.ScaleView.ZoomReset(1);
CurChart.ChartAreas[0].AxisY.ScaleView.ZoomReset(1);
}
else
{
CurChart.ChartAreas[0].AxisX.ScaleView.ZoomReset(0);
CurChart.ChartAreas[0].AxisY.ScaleView.ZoomReset(0);
}
//CurChart.ChartAreas[0].AxisX.ScaleView.ZoomReset(ScalingTimes[CurTempPosition] / 2);//为0时撤销所有放大动作
//CurChart.ChartAreas[0].AxisY.ScaleView.ZoomReset(ScalingTimes[CurTempPosition] / 2);//为0时撤销所有放大动作
}
private void TempTrend_FormClosing(object sender, FormClosingEventArgs e)
{
//关闭窗体时,停用工作
if (tim_UpdateState.Enabled)
{
tim_UpdateState.Stop();
}
if (tim_UpdateState.Enabled)
if (tim_ReadInterval.Enabled)
{
tim_ReadInterval.Stop();
}
......@@ -432,6 +535,12 @@ namespace GcDevicePc.DrawUI
/// </summary>
private void Save_CurChart()
{
if (btn_TimeRendering.Text == "停止采集")
{
CreatFile();
InitWriteFileData(); //结束写入,准备保存数据
ISRun = false;
}
}
/// <summary>
......@@ -441,13 +550,7 @@ namespace GcDevicePc.DrawUI
{
}
/// <summary>
/// 缩放次数记录增加
/// </summary>
private void cat_TempTrend_CursorPositionChanged(object sender, CursorEventArgs e)
{
ScalingTimes++;
}
/// <summary>
/// 勾选跟随分析启动
/// </summary>
......@@ -455,11 +558,14 @@ namespace GcDevicePc.DrawUI
{
if (chb_FollowStart.Checked)
{
btn_TimeRendering.Enabled = false;
iFollowStart = "1";
Sys_ini.Set_Sys_TempTrend_FollowStart(iFollowStart);
}
else
{
btn_TimeRendering.Enabled = true;
iFollowStart = "0";
Sys_ini.Set_Sys_TempTrend_FollowStart(iFollowStart);
}
}
......@@ -488,40 +594,124 @@ namespace GcDevicePc.DrawUI
清除显示ToolStripMenuItem.Enabled = true;
}
txb_ReadInterval.Text = tim_ReadInterval.Interval.ToString();
// txb_ReadInterval.Text = tim_ReadInterval.Interval.ToString();
}
private void tim_ReadInterval_Tick(object sender, EventArgs e)
float[] CurTemp = new float[6];
float[] SetTemp = new float[6];
float[] CurPow = new float[6];
private float FloatConvert(float f)
{
curX += tim_ReadInterval.Interval / 1000;//依据间隔换算对应秒,这里换算成分钟会变为0
double CurColTemp = globaldata.m_dpbuffer.ShowList.showtemp.ColActualTemp;
double SetColTemp = CProfileDevice.m_DevParam.col.fColTempSet;
cat_TempTrend.Series[0].Points.AddXY(curX / 60, CurColTemp);
cat_TempTrend.Series[1].Points.AddXY(curX / 60, SetColTemp);
string str = (curX / 60).ToString("0.00") + "," + CurColTemp.ToString("0.00") + "," + SetColTemp.ToString("0.00");
tempWrite.Add(str);//开始写入数据
f = Convert.ToSingle(f.ToString("#0.00"));
return f;
}
/// <summary>
/// 设定更新读取间隔
/// 读取温度
/// </summary>
private void btn_ReadInterval_Click(object sender, EventArgs e)
private void ReadTemp()
{
CurTemp[0] = FloatConvert(globaldata.m_dpbuffer.ShowList.showtemp.FPActualTemp);
SetTemp[0] = globaldata.m_dpbuffer.ShowList.showtemp.FPSetTemp;
CurPow[0] = FloatConvert(globaldata.m_dpbuffer.ShowList.pwmInfo.bSPower / 17);
CurTemp[1] = FloatConvert(globaldata.m_dpbuffer.ShowList.showtemp.BPActualTemp);
SetTemp[1] = globaldata.m_dpbuffer.ShowList.showtemp.BPSetTemp;
CurPow[1] = FloatConvert(globaldata.m_dpbuffer.ShowList.pwmInfo.fSPower / 17);
CurTemp[2] = FloatConvert(globaldata.m_dpbuffer.ShowList.showtemp.fDetActualTemp);
SetTemp[2] = globaldata.m_dpbuffer.ShowList.showtemp.fDetSetTemp;
CurPow[2] = FloatConvert(globaldata.m_dpbuffer.ShowList.pwmInfo.fDPower / 17);
if (Det2OrOV1 == 0)
{
CurTemp[3] = FloatConvert(globaldata.m_dpbuffer.ShowList.showtemp.iDetActualTemp);
SetTemp[3] = globaldata.m_dpbuffer.ShowList.showtemp.iDetSetTemp;
}
else
{
CurTemp[3] = FloatConvert(globaldata.m_dpbuffer.ShowList.showtemp.AuxActualTemp1);
SetTemp[3] = globaldata.m_dpbuffer.ShowList.showtemp.AuxSetTemp1;
}
CurPow[3] = FloatConvert(globaldata.m_dpbuffer.ShowList.pwmInfo.iDPower / 17);
if (Det3OrOV2 == 0)
{
CurTemp[4] = FloatConvert(globaldata.m_dpbuffer.ShowList.showtemp.iDetActualTemp);
SetTemp[4] = globaldata.m_dpbuffer.ShowList.showtemp.bDetSetTemp;
}
else
{
CurTemp[4] = FloatConvert(globaldata.m_dpbuffer.ShowList.showtemp.AuxActualTemp2);
SetTemp[4] = globaldata.m_dpbuffer.ShowList.showtemp.AuxSetTemp2;
}
CurPow[4] = FloatConvert(globaldata.m_dpbuffer.ShowList.pwmInfo.bDPower / 17);
CurTemp[5] = FloatConvert(globaldata.m_dpbuffer.ShowList.showtemp.ColActualTemp);
SetTemp[5] = CProfileDevice.m_DevParam.col.fColTempSet;
CurPow[5] = FloatConvert(globaldata.m_dpbuffer.ShowList.pwmInfo.CbPower / 17);
}
private void tim_ReadInterval_Tick(object sender, EventArgs e)
{
tim_ReadInterval.Interval = Convert.ToInt32(txb_ReadInterval.Text);
curX += FloatConvert(tim_ReadInterval.Interval / 1000);//依据间隔换算对应秒,这里换算成分钟会变为0
ReadTemp();
Task.Run(() =>
{
cat_TempTrend1.Series[0].Points.AddXY(curX / 60, CurTemp[0]);
cat_TempTrend1.Series[1].Points.AddXY(curX / 60, SetTemp[0]);
cat_TempTrend1.Series[2].Points.AddXY(curX / 60, CurPow[0]);
string str = (curX / 60).ToString("0.00") + "," + CurTemp[0].ToString("0.00") + "," + SetTemp[0].ToString("0.00") + "," + CurPow[0].ToString("0.00");
tempWrite["第一路"].Add(str);//开始写入数据
});
Task.Run(() =>
{
cat_TempTrend2.Series[0].Points.AddXY(curX / 60, CurTemp[1]);
cat_TempTrend2.Series[1].Points.AddXY(curX / 60, SetTemp[1]);
cat_TempTrend2.Series[2].Points.AddXY(curX / 60, CurPow[1]);
string str = (curX / 60).ToString("0.00") + "," + CurTemp[1].ToString("0.00") + "," + SetTemp[1].ToString("0.00") + "," + CurPow[1].ToString("0.00");
tempWrite["第二路"].Add(str);//开始写入数据
});
Task.Run(() =>
{
cat_TempTrend3.Series[0].Points.AddXY(curX / 60, CurTemp[2]);
cat_TempTrend3.Series[1].Points.AddXY(curX / 60, SetTemp[2]);
cat_TempTrend3.Series[2].Points.AddXY(curX / 60, CurPow[2]);
string str = (curX / 60).ToString("0.00") + "," + CurTemp[2].ToString("0.00") + "," + SetTemp[2].ToString("0.00") + "," + CurPow[2].ToString("0.00");
tempWrite["第三路"].Add(str);//开始写入数据
});
Task.Run(() =>
{
cat_TempTrend4.Series[0].Points.AddXY(curX / 60, CurTemp[3]);
cat_TempTrend4.Series[1].Points.AddXY(curX / 60, SetTemp[3]);
cat_TempTrend4.Series[2].Points.AddXY(curX / 60, CurPow[3]);
string str = (curX / 60).ToString("0.00") + "," + CurTemp[3].ToString("0.00") + "," + SetTemp[3].ToString("0.00") + "," + CurPow[3].ToString("0.00");
tempWrite["第四路"].Add(str);//开始写入数据
});
Task.Run(() =>
{
cat_TempTrend5.Series[0].Points.AddXY(curX / 60, CurTemp[4]);
cat_TempTrend5.Series[1].Points.AddXY(curX / 60, SetTemp[4]);
cat_TempTrend5.Series[2].Points.AddXY(curX / 60, CurPow[4]);
string str = (curX / 60).ToString("0.00") + "," + CurTemp[4].ToString("0.00") + "," + SetTemp[4].ToString("0.00") + "," + CurPow[4].ToString("0.00");
tempWrite["第五路"].Add(str);//开始写入数据
});
Task.Run(() =>
{
cat_TempTrend6.Series[0].Points.AddXY(curX / 60, CurTemp[5]);
cat_TempTrend6.Series[1].Points.AddXY(curX / 60, SetTemp[5]);
cat_TempTrend6.Series[2].Points.AddXY(curX / 60, CurPow[5]);
string str = (curX / 60).ToString("0.00") + "," + CurTemp[5].ToString("0.00") + "," + SetTemp[5].ToString("0.00") + "," + CurPow[5].ToString("0.00");
tempWrite["第六路"].Add(str);//开始写入数据
});
textBox_SetTemp.Text = SetTemp[CurTempPosition].ToString("0.00");
textBox_CurTime.Text = (curX / 60).ToString("0.00");
textBox_CurTemp.Text = CurTemp[CurTempPosition].ToString("0.00");
textBox_CurPow.Text = CurPow[CurTempPosition].ToString("0.00");
}
/// <summary>
/// 双击触发返回上一级方法
/// 设定更新读取间隔
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void cat_TempTrend_DoubleClick(object sender, EventArgs e)
{
if (ScalingTimes > 0)
private void btn_ReadInterval_Click(object sender, EventArgs e)
{
ScalingTimes -= 2;
}
ChangeZoom();
tim_ReadInterval.Interval = Convert.ToInt32(txb_ReadIcnterval.Text);
}
/// <summary>
/// 缩放隐藏文件列表
/// </summary>
......@@ -543,22 +733,49 @@ namespace GcDevicePc.DrawUI
if (!ISRun)
{
cat_TempTrend.Series[0].Points.Clear();
cat_TempTrend.Series[1].Points.Clear();
cat_TempTrend1.Series[0].Points.Clear();
cat_TempTrend1.Series[1].Points.Clear();
cat_TempTrend1.Series[2].Points.Clear();
cat_TempTrend2.Series[0].Points.Clear();
cat_TempTrend2.Series[1].Points.Clear();
cat_TempTrend2.Series[2].Points.Clear();
cat_TempTrend3.Series[0].Points.Clear();
cat_TempTrend3.Series[1].Points.Clear();
cat_TempTrend3.Series[2].Points.Clear();
cat_TempTrend4.Series[0].Points.Clear();
cat_TempTrend4.Series[1].Points.Clear();
cat_TempTrend4.Series[2].Points.Clear();
cat_TempTrend5.Series[0].Points.Clear();
cat_TempTrend5.Series[1].Points.Clear();
cat_TempTrend5.Series[2].Points.Clear();
cat_TempTrend6.Series[0].Points.Clear();
cat_TempTrend6.Series[1].Points.Clear();
cat_TempTrend6.Series[2].Points.Clear();
}
}
private void x网格显示ToolStripMenuItem_Click(object sender, EventArgs e)
{
bool b = cat_TempTrend.ChartAreas[0].AxisX.MajorGrid.Enabled;
bool b = cat_TempTrend1.ChartAreas[0].AxisX.MajorGrid.Enabled;
if (b)
{
cat_TempTrend.ChartAreas[0].AxisX.MajorGrid.Enabled = false;
cat_TempTrend1.ChartAreas[0].AxisX.MajorGrid.Enabled = false;
cat_TempTrend2.ChartAreas[0].AxisX.MajorGrid.Enabled = false;
cat_TempTrend3.ChartAreas[0].AxisX.MajorGrid.Enabled = false;
cat_TempTrend4.ChartAreas[0].AxisX.MajorGrid.Enabled = false;
cat_TempTrend5.ChartAreas[0].AxisX.MajorGrid.Enabled = false;
cat_TempTrend6.ChartAreas[0].AxisX.MajorGrid.Enabled = false;
x网格显示ToolStripMenuItem.Checked = false;
}
else
{
cat_TempTrend.ChartAreas[0].AxisX.MajorGrid.Enabled = true;
cat_TempTrend1.ChartAreas[0].AxisX.MajorGrid.Enabled = true;
cat_TempTrend2.ChartAreas[0].AxisX.MajorGrid.Enabled = true;
cat_TempTrend3.ChartAreas[0].AxisX.MajorGrid.Enabled = true;
cat_TempTrend4.ChartAreas[0].AxisX.MajorGrid.Enabled = true;
cat_TempTrend5.ChartAreas[0].AxisX.MajorGrid.Enabled = true;
cat_TempTrend6.ChartAreas[0].AxisX.MajorGrid.Enabled = true;
x网格显示ToolStripMenuItem.Checked = true;
}
Sys_ini.Set_Sys_TempTrend_EnableGrid_X(b);
......@@ -566,15 +783,25 @@ namespace GcDevicePc.DrawUI
private void y网格显示ToolStripMenuItem_Click(object sender, EventArgs e)
{
bool b = cat_TempTrend.ChartAreas[0].AxisY.MajorGrid.Enabled;
bool b = cat_TempTrend1.ChartAreas[0].AxisY.MajorGrid.Enabled;
if (b)
{
cat_TempTrend.ChartAreas[0].AxisY.MajorGrid.Enabled = false;
cat_TempTrend1.ChartAreas[0].AxisY.MajorGrid.Enabled = false;
cat_TempTrend2.ChartAreas[0].AxisY.MajorGrid.Enabled = false;
cat_TempTrend3.ChartAreas[0].AxisY.MajorGrid.Enabled = false;
cat_TempTrend4.ChartAreas[0].AxisY.MajorGrid.Enabled = false;
cat_TempTrend5.ChartAreas[0].AxisY.MajorGrid.Enabled = false;
cat_TempTrend6.ChartAreas[0].AxisY.MajorGrid.Enabled = false;
y网格显示ToolStripMenuItem.Checked = false;
}
else
{
cat_TempTrend.ChartAreas[0].AxisY.MajorGrid.Enabled = true;
cat_TempTrend1.ChartAreas[0].AxisY.MajorGrid.Enabled = true;
cat_TempTrend2.ChartAreas[0].AxisY.MajorGrid.Enabled = true;
cat_TempTrend3.ChartAreas[0].AxisY.MajorGrid.Enabled = true;
cat_TempTrend4.ChartAreas[0].AxisY.MajorGrid.Enabled = true;
cat_TempTrend5.ChartAreas[0].AxisY.MajorGrid.Enabled = true;
cat_TempTrend6.ChartAreas[0].AxisY.MajorGrid.Enabled = true;
y网格显示ToolStripMenuItem.Checked = true;
}
Sys_ini.Set_Sys_TempTrend_EnableGrid_Y(b);
......@@ -582,17 +809,49 @@ namespace GcDevicePc.DrawUI
private void 节点数据显示ToolStripMenuItem_Click(object sender, EventArgs e)
{
bool b = cat_TempTrend.Series[0].IsValueShownAsLabel;
bool b = cat_TempTrend1.Series[0].IsValueShownAsLabel;
if (b)
{
cat_TempTrend.Series[0].IsValueShownAsLabel = false;
cat_TempTrend.Series[1].IsValueShownAsLabel = false;
cat_TempTrend1.Series[0].IsValueShownAsLabel = false;
cat_TempTrend1.Series[1].IsValueShownAsLabel = false;
cat_TempTrend1.Series[2].IsValueShownAsLabel = false;
cat_TempTrend2.Series[0].IsValueShownAsLabel = false;
cat_TempTrend2.Series[1].IsValueShownAsLabel = false;
cat_TempTrend2.Series[2].IsValueShownAsLabel = false;
cat_TempTrend3.Series[0].IsValueShownAsLabel = false;
cat_TempTrend3.Series[1].IsValueShownAsLabel = false;
cat_TempTrend3.Series[2].IsValueShownAsLabel = false;
cat_TempTrend4.Series[0].IsValueShownAsLabel = false;
cat_TempTrend4.Series[1].IsValueShownAsLabel = false;
cat_TempTrend4.Series[2].IsValueShownAsLabel = false;
cat_TempTrend5.Series[0].IsValueShownAsLabel = false;
cat_TempTrend5.Series[1].IsValueShownAsLabel = false;
cat_TempTrend5.Series[2].IsValueShownAsLabel = false;
cat_TempTrend6.Series[0].IsValueShownAsLabel = false;
cat_TempTrend6.Series[1].IsValueShownAsLabel = false;
cat_TempTrend6.Series[2].IsValueShownAsLabel = false;
节点数据显示ToolStripMenuItem.Checked = false;
}
else
{
cat_TempTrend.Series[0].IsValueShownAsLabel = true;
cat_TempTrend.Series[1].IsValueShownAsLabel = true;
cat_TempTrend1.Series[0].IsValueShownAsLabel = true;
cat_TempTrend1.Series[1].IsValueShownAsLabel = true;
cat_TempTrend1.Series[2].IsValueShownAsLabel = true;
cat_TempTrend2.Series[0].IsValueShownAsLabel = true;
cat_TempTrend2.Series[1].IsValueShownAsLabel = true;
cat_TempTrend2.Series[2].IsValueShownAsLabel = true;
cat_TempTrend3.Series[0].IsValueShownAsLabel = true;
cat_TempTrend3.Series[1].IsValueShownAsLabel = true;
cat_TempTrend3.Series[2].IsValueShownAsLabel = true;
cat_TempTrend4.Series[0].IsValueShownAsLabel = true;
cat_TempTrend4.Series[1].IsValueShownAsLabel = true;
cat_TempTrend4.Series[2].IsValueShownAsLabel = true;
cat_TempTrend5.Series[0].IsValueShownAsLabel = true;
cat_TempTrend5.Series[1].IsValueShownAsLabel = true;
cat_TempTrend5.Series[2].IsValueShownAsLabel = true;
cat_TempTrend6.Series[0].IsValueShownAsLabel = true;
cat_TempTrend6.Series[1].IsValueShownAsLabel = true;
cat_TempTrend6.Series[2].IsValueShownAsLabel = true;
节点数据显示ToolStripMenuItem.Checked = true;
}
Sys_ini.Set_Sys_TempTrend_DisplayData(b);
......@@ -615,16 +874,29 @@ namespace GcDevicePc.DrawUI
private void 满屏量程ToolStripMenuItem_Click(object sender, EventArgs e)
{
ScalingTimes = 0;//缩放记录重置为0
ChangeZoom();
for (int i = 0; i < ScalingTimes.Length; i++)
{
ScalingTimes[i] = 0;//缩放记录重置为0
}
ChangeZoom(CurTempPosition);
}
//读取写入文件
private static string filename;
private static string folder = Path.GetDirectoryName(Application.StartupPath) + "\\温度趋势";
private List<double> tempX =new List<double>();//读取X
private List<double>tempY1 = new List<double>();//读取当前温度
private List<double>tempY2 = new List<double>();//读取设定温度
private List<string> tempWrite = new List<string>();
private List<double> tempX = new List<double>();//读取X
/// <summary>
/// 实际温度
/// </summary>
private List<List<double>> tempY1 = new List<List<double>>() { new List<double>(), new List<double>(), new List<double>(), new List<double>(), new List<double>(), new List<double>() };//读取当前温度
/// <summary>
/// 设定温度
/// </summary>
private List<List<double>> tempY2 = new List<List<double>>() { new List<double>(), new List<double>(), new List<double>(), new List<double>(), new List<double>(), new List<double>() };//读取设定温度
/// <summary>
/// 占空比
/// </summary>
private List<List<double>> tempY3 = new List<List<double>>() { new List<double>(), new List<double>(), new List<double>(), new List<double>(), new List<double>(), new List<double>() };//读取当前功率
private ConcurrentDictionary<string, List<string>> tempWrite = new ConcurrentDictionary<string, List<string>>();
private void CreatFile()
{
filename = Path.GetDirectoryName(Application.StartupPath) + "\\温度趋势\\" + DateTime.Now.ToString("yyyy-MM-d_H_mm_ss") + ".txt";
......@@ -643,20 +915,192 @@ namespace GcDevicePc.DrawUI
if (ofd.ShowDialog() == DialogResult.OK)
{
tempX.Clear();
tempY1.Clear();
tempY2.Clear();
foreach (var item in tempY1)
{
item.Clear();
}
foreach (var item in tempY2)
{
item.Clear();
}
textBox_FilePath.Text = ofd.FileName;
FileStream fs = new FileStream(ofd.FileName, FileMode.Open, FileAccess.Read);
StreamReader sr = new StreamReader(fs);
string[] strLine;
//读取第一行,然后依据名称,写入到不同的chart
string strHead = sr.ReadLine();
while (sr.EndOfStream == false)
{
bool bReadLine = true;
switch (strHead)
{
case "第一路":
while (bReadLine)
{
if (sr.EndOfStream == false)
{
strLine = sr.ReadLine().Split(',');
if (!double.TryParse(strLine[0], out double x))
{
//更新头文件名称
strHead = strLine[0];
bReadLine = false;
}
else
{
//x共用,只需一次//tempX.Add(x);
tempY1[0].Add(Convert.ToDouble(strLine[1]));
tempY2[0].Add(Convert.ToDouble(strLine[2]));
tempY3[0].Add(Convert.ToDouble(strLine[3]));
}
}
else
{
break;
}
}
break;
case "第二路":
while (bReadLine)
{
if (sr.EndOfStream == false)
{
strLine = sr.ReadLine().Split(',');
tempX.Add( Convert.ToDouble(strLine[0]));
tempY1.Add( Convert.ToDouble(strLine[1]));
tempY2.Add( Convert.ToDouble(strLine[2]));
if (!double.TryParse(strLine[0], out double x))
{
//更新头文件名称
strHead = strLine[0];
bReadLine = false;
}
else
{
//x共用,只需一次//tempX.Add(x);
tempY1[1].Add(Convert.ToDouble(strLine[1]));
tempY2[1].Add(Convert.ToDouble(strLine[2]));
tempY3[1].Add(Convert.ToDouble(strLine[3]));
}
}
else
{
break;
}
}
break;
case "第三路":
while (bReadLine)
{
if (sr.EndOfStream == false)
{
strLine = sr.ReadLine().Split(',');
if (!double.TryParse(strLine[0], out double x))
{
//更新头文件名称
strHead = strLine[0];
bReadLine = false;
}
else
{
//x共用,只需一次//tempX.Add(x);
tempY1[2].Add(Convert.ToDouble(strLine[1]));
tempY2[2].Add(Convert.ToDouble(strLine[2]));
tempY3[2].Add(Convert.ToDouble(strLine[3]));
}
}
else
{
break;
}
}
break;
case "第四路":
while (bReadLine)
{
if (sr.EndOfStream == false)
{
strLine = sr.ReadLine().Split(',');
if (!double.TryParse(strLine[0], out double x))
{
//更新头文件名称
strHead = strLine[0];
bReadLine = false;
}
else
{
//x共用,只需一次//tempX.Add(x);
tempY1[3].Add(Convert.ToDouble(strLine[1]));
tempY2[3].Add(Convert.ToDouble(strLine[2]));
tempY3[3].Add(Convert.ToDouble(strLine[3]));
}
}
else
{
break;
}
}
break;
case "第五路":
while (bReadLine)
{
if (sr.EndOfStream == false)
{
strLine = sr.ReadLine().Split(',');
if (!double.TryParse(strLine[0], out double x))
{
//更新头文件名称
strHead = strLine[0];
bReadLine = false;
}
else
{
//x共用,只需一次//tempX.Add(x);
tempY1[4].Add(Convert.ToDouble(strLine[1]));
tempY2[4].Add(Convert.ToDouble(strLine[2]));
tempY3[4].Add(Convert.ToDouble(strLine[3]));
}
}
else
{
break;
}
}
break;
case "第六路":
while (bReadLine)
{
if (sr.EndOfStream == false)
{
strLine = sr.ReadLine().Split(',');
if (!double.TryParse(strLine[0], out double x))
{
//更新头文件名称
strHead = strLine[0];
bReadLine = false;
}
else
{
tempX.Add(x);
tempY1[5].Add(Convert.ToDouble(strLine[1]));
tempY2[5].Add(Convert.ToDouble(strLine[2]));
tempY3[5].Add(Convert.ToDouble(strLine[3]));
}
}
else
{
break;
}
}
break;
default:
break;
}
}
sr.Dispose();
fs.Dispose();
......@@ -668,8 +1112,24 @@ namespace GcDevicePc.DrawUI
{
for (int pointIndex = 0; pointIndex < tempX.Count; pointIndex++)
{
cat_TempTrend.Series[0].Points.AddXY(tempX[pointIndex], tempY1[pointIndex]);
cat_TempTrend.Series[1].Points.AddXY(tempX[pointIndex], tempY2[pointIndex]);
cat_TempTrend1.Series[0].Points.AddXY(tempX[pointIndex], tempY1[0][pointIndex]);
cat_TempTrend1.Series[1].Points.AddXY(tempX[pointIndex], tempY2[0][pointIndex]);
cat_TempTrend1.Series[2].Points.AddXY(tempX[pointIndex], tempY3[0][pointIndex]);
cat_TempTrend2.Series[0].Points.AddXY(tempX[pointIndex], tempY1[1][pointIndex]);
cat_TempTrend2.Series[1].Points.AddXY(tempX[pointIndex], tempY2[1][pointIndex]);
cat_TempTrend2.Series[2].Points.AddXY(tempX[pointIndex], tempY3[1][pointIndex]);
cat_TempTrend3.Series[0].Points.AddXY(tempX[pointIndex], tempY1[2][pointIndex]);
cat_TempTrend3.Series[1].Points.AddXY(tempX[pointIndex], tempY2[2][pointIndex]);
cat_TempTrend3.Series[2].Points.AddXY(tempX[pointIndex], tempY3[2][pointIndex]);
cat_TempTrend4.Series[0].Points.AddXY(tempX[pointIndex], tempY1[3][pointIndex]);
cat_TempTrend4.Series[1].Points.AddXY(tempX[pointIndex], tempY2[3][pointIndex]);
cat_TempTrend4.Series[2].Points.AddXY(tempX[pointIndex], tempY3[3][pointIndex]);
cat_TempTrend5.Series[0].Points.AddXY(tempX[pointIndex], tempY1[4][pointIndex]);
cat_TempTrend5.Series[1].Points.AddXY(tempX[pointIndex], tempY2[4][pointIndex]);
cat_TempTrend5.Series[2].Points.AddXY(tempX[pointIndex], tempY3[4][pointIndex]);
cat_TempTrend6.Series[0].Points.AddXY(tempX[pointIndex], tempY1[5][pointIndex]);
cat_TempTrend6.Series[1].Points.AddXY(tempX[pointIndex], tempY2[5][pointIndex]);
cat_TempTrend6.Series[2].Points.AddXY(tempX[pointIndex], tempY3[5][pointIndex]);
}
}
......@@ -703,10 +1163,15 @@ namespace GcDevicePc.DrawUI
sw.BaseStream.Seek(0, SeekOrigin.Begin);
for (int i = 0; i < tempWrite.Count; i++)
foreach (var item in tempWrite)
{
sw.WriteLine(tempWrite[i]);
sw.WriteLine(item.Key);
for (int i = 0; i < item.Value.Count; i++)
{
sw.WriteLine(item.Value[i]);
}
}
//关闭此文件
sw.Flush();
......@@ -715,5 +1180,116 @@ namespace GcDevicePc.DrawUI
fs.Close();
}
private void TempTrend_Load(object sender, EventArgs e)
{
CKvocUpdataSum.delTriggerAntiControl += new DelTriggerAntiControl(FollowStart);
txb_ReadIcnterval.Text = "1000";
cat_TempTrend1.MouseMove += new MouseEventHandler(cat_TempTrend_MouseMove);
cat_TempTrend2.MouseMove += new MouseEventHandler(cat_TempTrend_MouseMove);
cat_TempTrend3.MouseMove += new MouseEventHandler(cat_TempTrend_MouseMove);
cat_TempTrend4.MouseMove += new MouseEventHandler(cat_TempTrend_MouseMove);
cat_TempTrend5.MouseMove += new MouseEventHandler(cat_TempTrend_MouseMove);
cat_TempTrend6.MouseMove += new MouseEventHandler(cat_TempTrend_MouseMove);
if (globaldata.m_hwconfig.hwconfiginfo.u16DetInter == 1)
{
//检测2还是辅助1
Det2OrOV1 = 1;
}
if (globaldata.m_hwconfig.hwconfiginfo.u16DetBehind == 1)
{
//检测3还是辅助2
Det3OrOV2 = 1;
}
CurChart = cat_TempTrend1;
tempWrite.TryAdd("第一路", new List<string>());
tempWrite.TryAdd("第二路", new List<string>());
tempWrite.TryAdd("第三路", new List<string>());
tempWrite.TryAdd("第四路", new List<string>());
tempWrite.TryAdd("第五路", new List<string>());
tempWrite.TryAdd("第六路", new List<string>());
}
double xValue;
double yValue;
private void cat_TempTrend_MouseMove(object sender, MouseEventArgs e)
{
try
{
var area = CurChart.ChartAreas[0];
xValue = area.AxisX.PixelPositionToValue(e.X);
yValue = area.AxisY.PixelPositionToValue(e.Y);
label_XY.Text = string.Format("鼠标所在x={0},y={1}", String.Format("{0:F}", xValue), String.Format("{0:F}", yValue));
}
catch (Exception)
{
//无法得知如何避免"计算所有图表区元素的位置之前无法调用PositionToValue"
}
}
private void cat_TempTrend_Click(object sender, EventArgs e)
{
try
{
//获取数据点
double Y1 = 0;
double Y2 = 0;
for (int i = 0; i < CurChart.Series[0].Points.Count; i++)
{
if (CurChart.Series[0].Points[i].XValue <= xValue && xValue <= CurChart.Series[0].Points[i + 1].XValue)
{
Y1 = CurChart.Series[0].Points[i].YValues[0];
}
}
for (int i = 0; i < CurChart.Series[2].Points.Count; i++)
{
if (CurChart.Series[2].Points[i].XValue <= xValue && xValue <= CurChart.Series[2].Points[i + 1].XValue)
{
Y2 = CurChart.Series[2].Points[i].YValues[0];
}
}
label_Y1Y3.Text = string.Format("左键点击处 当前温度={0},当前功率={1}", String.Format("{0:F2}", Y1), String.Format("{0:F2}", Y2));
}
catch (Exception)
{
}
}
private void tabControl_TempList_SelectedIndexChanged(object sender, EventArgs e)
{
CurTempPosition = tabControl_TempList.SelectedIndex;
CurChart = tabControl_TempList.TabPages[CurTempPosition].Controls[0] as Chart;
}
/// <summary>
/// 双击触发返回上一级缩放
/// </summary>
private void cat_TempTrend1_DoubleClick(object sender, EventArgs e)
{
if (ScalingTimes[CurTempPosition] > 0)
{
ScalingTimes[CurTempPosition] -= 2;
}
ChangeZoom(CurTempPosition);
}
/// <summary>
/// 缩放次数记录增加
/// </summary>
private void cat_TempTrend1_CursorPositionChanged(object sender, CursorEventArgs e)
{
ScalingTimes[CurTempPosition]++;
}
private void TempTrend_FormClosed(object sender, FormClosedEventArgs e)
{
this.Dispose();
}
}
}
GcDevicePc/DrawUI/TempTrend.resx → GcDevicePc/ExpansionMethod/TempTrend.resx
View file @ 5587fca6
......@@ -120,16 +120,10 @@
<metadata name="cms_Chart.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>367, 22</value>
</metadata>
<metadata name="tim_UpdateState.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="tim_ReadInterval.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>216, 22</value>
</metadata>
<metadata name="cms_file.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>480, 22</value>
</metadata>
<metadata name="tip_.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>578, 22</value>
</metadata>
</root>
\ No newline at end of file
GcDevicePc/Formdebug.cs
View file @ 5587fca6
......@@ -179,6 +179,7 @@ namespace GcDevicePc
Console.WriteLine("绘图show");
this.dockPanel1.Contains(curdisplay);
curdisplay.Show(this.dockPanel1);
CurveDisPlay.nMHCCal=CurveDisPlay.curdisp.nMHCCal;
curdisplay.CloseButtonVisible = false;
}
else
......
GcDevicePc/GCBuffer/DPBuffer.cs
View file @ 5587fca6
......@@ -202,14 +202,14 @@ namespace GcDevicePc.GCBuffer
public struct PwmInfo
{
public int fDPower;
public int iDPower;
public int bDPower;
public int fDPower;//前检测
public int iDPower;//中检测/辅助1
public int bDPower;//后检测/辅助2
public int fSPower;
public int bSPower;
public int fSPower;//后进样,确实是
public int bSPower;//前进样
public int CbPower;
public int CbPower;//柱箱
}
......
GcDevicePc/GcDevicePc.csproj
View file @ 5587fca6
......@@ -181,6 +181,10 @@
<Reference Include="WeifenLuo.WinFormsUI.Docking">
<HintPath>..\dll\WeifenLuo.WinFormsUI.Docking.dll</HintPath>
</Reference>
<Reference Include="WindowsFormsControlLibrary_PopUp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\dll\WindowsFormsControlLibrary_PopUp\bin\Debug\WindowsFormsControlLibrary_PopUp.dll</HintPath>
</Reference>
<Reference Include="WitiumControl">
<HintPath>..\dll\WitiumControl.dll</HintPath>
</Reference>
......@@ -573,10 +577,10 @@
<Compile Include="DeviceConfigUI\Sampling.Designer.cs">
<DependentUpon>Sampling.cs</DependentUpon>
</Compile>
<Compile Include="DrawUI\TempTrend.cs">
<Compile Include="ExpansionMethod\TempTrend.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="DrawUI\TempTrend.Designer.cs">
<Compile Include="ExpansionMethod\TempTrend.Designer.cs">
<DependentUpon>TempTrend.cs</DependentUpon>
</Compile>
<Compile Include="EPCTips.cs">
......@@ -1054,7 +1058,7 @@
<EmbeddedResource Include="DeviceConfigUI\Sampling.resx">
<DependentUpon>Sampling.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DrawUI\TempTrend.resx">
<EmbeddedResource Include="ExpansionMethod\TempTrend.resx">
<DependentUpon>TempTrend.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="EPCTips.resx">
......@@ -1179,6 +1183,9 @@
<DependentUpon>SysConfig.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="SysConfigSecondary.zh-Hans.resx">
<DependentUpon>SysConfigSecondary.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="SysConfigSecondary.zh.resx">
<DependentUpon>SysConfigSecondary.cs</DependentUpon>
</EmbeddedResource>
......@@ -1243,7 +1250,7 @@
</ItemGroup>
<ItemGroup>
<Folder Include="Components\" />
<Folder Include="ExpansionMethod\" />
<Folder Include="DrawUI\" />
<Folder Include="UI\configmenu\" />
<Folder Include="UI\ico\" />
<Folder Include="UI\menu\" />
......@@ -1258,10 +1265,6 @@
<Content Include="UI\picture\色谱3.png" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\WindowsFormsControlLibrary_PopUp\WindowsFormsControlLibrary_PopUp.csproj">
<Project>{AFC4DDC8-D40D-481E-AE7A-5AFB73C88E78}</Project>
<Name>WindowsFormsControlLibrary_PopUp</Name>
</ProjectReference>
<ProjectReference Include="..\SharedSpace\SharedSpace.csproj">
<Project>{5498f944-5721-461b-b07f-3105ef0bf643}</Project>
<Name>SharedSpace</Name>
......
GcDevicePc/MDIBase.Designer.cs
View file @ 5587fca6
......@@ -452,6 +452,7 @@
this.MainMenuStrip = this.menuStrip;
this.Name = "MDIBase";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MDIBase_FormClosing);
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.MDIBase_FormClosed);
this.Load += new System.EventHandler(this.MDIBase_Load);
this.menuStrip.ResumeLayout(false);
this.menuStrip.PerformLayout();
......
GcDevicePc/MDIBase.cs
View file @ 5587fca6
......@@ -66,7 +66,7 @@ namespace GcDevicePc
/// <summary>
/// PC版本号,主界面显示,关于显示
/// </summary>
public static string PCVersion = "1.8.8";
public static string PCVersion = "1.9.0";
/// <summary>
/// 云盒子接口
......@@ -376,7 +376,7 @@ namespace GcDevicePc
{
IniFile ini = new IniFile(file);
globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.DataFolder = ini.ReadString("DataFolder", "历史数据");
globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.FileClassification=ini.ReadString("DataFolder", "分级文件夹");
globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.FileClassification = ini.ReadString("DataFolder", "分级文件夹");
}
}
/// <summary>
......@@ -386,7 +386,7 @@ namespace GcDevicePc
/// <param name="e"></param>
private void MDIBase_Load(object sender, EventArgs e)
{
CKVocAnalyzer.CtrlWaveHistory.delChange+=new CKVocAnalyzer.DelChange(DllChange);
CKVocAnalyzer.CtrlWaveHistory.delChange += new CKVocAnalyzer.DelChange(DllChange);
_userForm = new FormUser();
......@@ -518,8 +518,10 @@ namespace GcDevicePc
// X = this.Width; Y = this.Height; setTag(this); MDIBase_Resize(new object(), new EventArgs());//x,y可在实例化时赋值,最后这句是新加的，在MDI时有用
// b_load = true;
// dataInstance=new DataInstance();
if (ini.ReadString("StartUp", "启用云盒子")=="1")
{
dataInstance = new DataInstance();
}
}
private void MDIBase_SizeChanged(object sender, EventArgs e)
{
......@@ -932,9 +934,12 @@ namespace GcDevicePc
toolStripStatusLabelusertime.Text = bEnglishLanguage == false ? String.Format("运行时间：{0}", timespan.Days.ToString() + "天" + timespan.Hours.ToString() + "时" + timespan.Minutes.ToString() + "分" + timespan.Seconds.ToString() + "秒") :
String.Format("Running time：{0}", timespan.Days.ToString() + "Days" + timespan.Hours.ToString() + "Hours" + timespan.Minutes.ToString() + "Minutes" + timespan.Seconds.ToString() + "Seconds");
if (statestr!=null)
{
//反控,发送状态
Task.Run(() => { SendCounterControlState(); ReconnectionTimes = 0; });
}
switch (CKVocAnalyzer.GlobalCKV.adjustType)
{
case CKVocAnalyzer.GlobalCKV.AdjustType.AT_Zero:
......@@ -4107,6 +4112,21 @@ namespace GcDevicePc
}
private void button1_Click_1(object sender, EventArgs e)
{
}
private void MDIBase_FormClosed(object sender, FormClosedEventArgs e)
{
//停止云盒子数据发送
if (dataInstance!=null)
{
dataInstance.CloseSocket();
}
}
// private bool b_load;
//private float X;
......
GcDevicePc/MDIBase.resx
View file @ 5587fca6
......@@ -121,6 +121,40 @@
<value>17, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="menuStrip.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="menuStrip.Size" type="System.Drawing.Size, System.Drawing">
<value>1083, 29</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="menuStrip.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="menuStrip.Text" xml:space="preserve">
<value>MenuStrip</value>
</data>
<data name="&gt;&gt;menuStrip.Name" xml:space="preserve">
<value>menuStrip</value>
</data>
<data name="&gt;&gt;menuStrip.Type" xml:space="preserve">
<value>System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;menuStrip.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;menuStrip.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="UserMainMenu.Font" type="System.Drawing.Font, System.Drawing">
<value>Microsoft YaHei UI, 12pt</value>
</data>
<data name="UserMainMenu.Size" type="System.Drawing.Size, System.Drawing">
<value>86, 25</value>
</data>
<data name="UserMainMenu.Text" xml:space="preserve">
<value>用户管理</value>
</data>
<data name="UserLoginMenu.Size" type="System.Drawing.Size, System.Drawing">
<value>144, 26</value>
</data>
......@@ -133,14 +167,14 @@
<data name="UserLogoutMenu.Text" xml:space="preserve">
<value>用户注销</value>
</data>
<data name="UserMainMenu.Font" type="System.Drawing.Font, System.Drawing">
<data name="SystemMainMenu.Font" type="System.Drawing.Font, System.Drawing">
<value>Microsoft YaHei UI, 12pt</value>
</data>
<data name="UserMainMenu.Size" type="System.Drawing.Size, System.Drawing">
<value>86, 25</value>
<data name="SystemMainMenu.Size" type="System.Drawing.Size, System.Drawing">
<value>54, 25</value>
</data>
<data name="UserMainMenu.Text" xml:space="preserve">
<value>用户管理</value>
<data name="SystemMainMenu.Text" xml:space="preserve">
<value>系统</value>
</data>
<data name="SystemStartMenu.Size" type="System.Drawing.Size, System.Drawing">
<value>144, 26</value>
......@@ -184,14 +218,14 @@
<data name="sysconfigpSec.Text" xml:space="preserve">
<value>选项</value>
</data>
<data name="SystemMainMenu.Font" type="System.Drawing.Font, System.Drawing">
<data name="SettingMainMenu.Font" type="System.Drawing.Font, System.Drawing">
<value>Microsoft YaHei UI, 12pt</value>
</data>
<data name="SystemMainMenu.Size" type="System.Drawing.Size, System.Drawing">
<data name="SettingMainMenu.Size" type="System.Drawing.Size, System.Drawing">
<value>54, 25</value>
</data>
<data name="SystemMainMenu.Text" xml:space="preserve">
<value>系统</value>
<data name="SettingMainMenu.Text" xml:space="preserve">
<value>设置</value>
</data>
<data name="NetWorkMenu.Size" type="System.Drawing.Size, System.Drawing">
<value>144, 26</value>
......@@ -232,14 +266,14 @@
<data name="GCConfigMenuItem.Text" xml:space="preserve">
<value>仪器配置</value>
</data>
<data name="SettingMainMenu.Font" type="System.Drawing.Font, System.Drawing">
<data name="DataMainMenu.Font" type="System.Drawing.Font, System.Drawing">
<value>Microsoft YaHei UI, 12pt</value>
</data>
<data name="SettingMainMenu.Size" type="System.Drawing.Size, System.Drawing">
<value>54, 25</value>
<data name="DataMainMenu.Size" type="System.Drawing.Size, System.Drawing">
<value>86, 25</value>
</data>
<data name="SettingMainMenu.Text" xml:space="preserve">
<value>设置</value>
<data name="DataMainMenu.Text" xml:space="preserve">
<value>数据查看</value>
</data>
<data name="HistoryDataMenu.Size" type="System.Drawing.Size, System.Drawing">
<value>144, 26</value>
......@@ -259,14 +293,14 @@
<data name="HistoryPicMenu.Text" xml:space="preserve">
<value>历史谱图</value>
</data>
<data name="DataMainMenu.Font" type="System.Drawing.Font, System.Drawing">
<data name="DebugMainMenu.Font" type="System.Drawing.Font, System.Drawing">
<value>Microsoft YaHei UI, 12pt</value>
</data>
<data name="DataMainMenu.Size" type="System.Drawing.Size, System.Drawing">
<value>86, 25</value>
<data name="DebugMainMenu.Size" type="System.Drawing.Size, System.Drawing">
<value>54, 25</value>
</data>
<data name="DataMainMenu.Text" xml:space="preserve">
<value>数据查看</value>
<data name="DebugMainMenu.Text" xml:space="preserve">
<value>调试</value>
</data>
<data name="testToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>112, 26</value>
......@@ -274,7 +308,6 @@
<data name="testToolStripMenuItem.Text" xml:space="preserve">
<value>test</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="testToolStripMenuItem.Visible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
......@@ -296,14 +329,14 @@
<data name="取消ToolStripMenuItem.Text" xml:space="preserve">
<value>取消</value>
</data>
<data name="DebugMainMenu.Font" type="System.Drawing.Font, System.Drawing">
<data name="HelpMainMenu.Font" type="System.Drawing.Font, System.Drawing">
<value>Microsoft YaHei UI, 12pt</value>
</data>
<data name="DebugMainMenu.Size" type="System.Drawing.Size, System.Drawing">
<data name="HelpMainMenu.Size" type="System.Drawing.Size, System.Drawing">
<value>54, 25</value>
</data>
<data name="DebugMainMenu.Text" xml:space="preserve">
<value>调试</value>
<data name="HelpMainMenu.Text" xml:space="preserve">
<value>帮助</value>
</data>
<data name="AboutMenu.Size" type="System.Drawing.Size, System.Drawing">
<value>160, 26</value>
......@@ -338,57 +371,48 @@
<data name="说明ToolStripMenuItem.Text" xml:space="preserve">
<value>软件说明</value>
</data>
<data name="邮箱ToolStripMenuItem.Font" type="System.Drawing.Font, System.Drawing">
<value>Microsoft YaHei UI, 9pt</value>
</data>
<data name="邮箱ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>180, 23</value>
</data>
<data name="反馈ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>160, 26</value>
</data>
<data name="反馈ToolStripMenuItem.Text" xml:space="preserve">
<value>反馈</value>
</data>
<data name="HelpMainMenu.Font" type="System.Drawing.Font, System.Drawing">
<value>Microsoft YaHei UI, 12pt</value>
</data>
<data name="HelpMainMenu.Size" type="System.Drawing.Size, System.Drawing">
<value>54, 25</value>
<data name="邮箱ToolStripMenuItem.Font" type="System.Drawing.Font, System.Drawing">
<value>Microsoft YaHei UI, 9pt</value>
</data>
<data name="HelpMainMenu.Text" xml:space="preserve">
<value>帮助</value>
<data name="邮箱ToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>180, 23</value>
</data>
<data name="menuStrip.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
<metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>244, 17</value>
</metadata>
<metadata name="statusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>130, 17</value>
</metadata>
<data name="statusStrip.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 487</value>
</data>
<data name="menuStrip.Size" type="System.Drawing.Size, System.Drawing">
<value>1083, 29</value>
<data name="statusStrip.Size" type="System.Drawing.Size, System.Drawing">
<value>1083, 32</value>
</data>
<data name="menuStrip.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
<data name="statusStrip.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
</data>
<data name="menuStrip.Text" xml:space="preserve">
<value>MenuStrip</value>
<data name="statusStrip.Text" xml:space="preserve">
<value>StatusStrip</value>
</data>
<data name="&gt;&gt;menuStrip.Name" xml:space="preserve">
<value>menuStrip</value>
<data name="&gt;&gt;statusStrip.Name" xml:space="preserve">
<value>statusStrip</value>
</data>
<data name="&gt;&gt;menuStrip.Type" xml:space="preserve">
<value>System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="&gt;&gt;statusStrip.Type" xml:space="preserve">
<value>System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;menuStrip.Parent" xml:space="preserve">
<data name="&gt;&gt;statusStrip.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;menuStrip.ZOrder" xml:space="preserve">
<value>2</value>
<data name="&gt;&gt;statusStrip.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>244, 17</value>
</metadata>
<metadata name="statusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>130, 17</value>
</metadata>
<data name="toolStripStatusLabelusertime.AutoSize" type="System.Boolean, mscorlib">
<value>False</value>
</data>
......@@ -482,30 +506,6 @@
<data name="MacToolStripStatusLabel1.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
<value>MiddleLeft</value>
</data>
<data name="statusStrip.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 487</value>
</data>
<data name="statusStrip.Size" type="System.Drawing.Size, System.Drawing">
<value>1083, 32</value>
</data>
<data name="statusStrip.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
</data>
<data name="statusStrip.Text" xml:space="preserve">
<value>StatusStrip</value>
</data>
<data name="&gt;&gt;statusStrip.Name" xml:space="preserve">
<value>statusStrip</value>
</data>
<data name="&gt;&gt;statusStrip.Type" xml:space="preserve">
<value>System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;statusStrip.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;statusStrip.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>337, 17</value>
</metadata>
......
GcDevicePc/ProThread/CKvocUpdataSum.cs
View file @ 5587fca6
......@@ -13,12 +13,56 @@ using System.Threading.Tasks;
namespace GcDevicePc.ProThread
{
//委托告知开始和停止
public delegate void DelTriggerAntiControl(bool b);
class CKvocUpdataSum
{
public static event DelTriggerAntiControl delTriggerAntiControl;
ManualResetEvent datamre = new ManualResetEvent(false);
// CurveDisPlaySum CurveDisPlay= new CurveDisPlaySum(null);
class Mapping
{
/// <summary>
/// 是否是开始
/// </summary>
int isstart = 0;
/// <summary>
/// 当前停止状态
/// </summary>
bool bNowStopFlag;
/// <summary>
/// 之前停止状态
/// </summary>
bool bBeforeStopFlag;
/// <summary>
/// 检测器位置
/// </summary>
string type;
/// <summary>
/// 是否清除绘图
/// </summary>
bool ClearData;
/// <summary>
/// 信号集合
/// </summary>
ArrayList Save_PortSumList;
/// <summary>
/// 绘图对象
/// </summary>
CKVocAnalyzer.CtrlWaveCurrent curdisp;
/// <summary>
/// 执行开始的窗口数量
/// </summary>
int DetStart = 0;
/// <summary>
/// 执行停止的窗口数量
/// </summary>
int DetStop = 0;
/// <summary>
/// 检测器数量
/// </summary>
ushort pagenum;
}
public static int isstart = 0;
/// <summary>
/// 执行开始的窗口数量
......@@ -340,6 +384,7 @@ namespace GcDevicePc.ProThread
// t_DataSave = new Thread(Monitor_DataList);
// t_DataSave.IsBackground = true;
// t_DataSave.Start();
(new Task(() => Monitor_DataList(type, false, Save_PortSumList, curdisp))).Start();
}
......
GcDevicePc/ProThread/HMISearch.cs
View file @ 5587fca6
......@@ -274,11 +274,8 @@ namespace GcDevicePc.ProThread
bool IsOnline = false;
try
{
if (b==false)
{
GetHmiIp();
}
ushort countDown = usSearchTime;//限定时间,用于倒计时判定
ushort countDown = (ushort)(usSearchTime / 10);//限定时间,用于倒计时判定
while (countDown > 0)
{
for (int i = 0; i < _localip.Count; i++)
......@@ -318,11 +315,11 @@ namespace GcDevicePc.ProThread
continue;
// break;
} // continue;
if (countDown > 20)
if (countDown > 2 || countDown == 2)
{
countDown -= 20;//既不能让搜索时长过长,也要保证HMI更新搜索IP时足够
countDown -= 2;
}
break;
}
else
{
......@@ -344,17 +341,18 @@ namespace GcDevicePc.ProThread
}
}
if (!IsOnline && countDown <= 0)
if (!IsOnline)
{
//重新获取一次_localip,以解决先开启软件,后开启色谱无法联机的问题(当然总搜索时长至少坚持到色谱开机完成)
//也解决了HMI更新搜索不到的问题(需要重置网络信息)
GetHmiIp();
}
else if (IsOnline&&b)
else if (IsOnline && b)
{
//已经搜索到HMI,并且不是hmi更新类型的搜索,则跳出
break;
}
else if (!SysConfig.UpdateHMI_Stop&&!b)
else if (!SysConfig.UpdateHMI_Stop && !b)
{
//hmi更新类型的搜索,点击了停止搜索
break;
......
GcDevicePc/StartForm.cs
View file @ 5587fca6
......@@ -267,6 +267,7 @@ namespace GcDevicePc
}
if (bNoSearchOK == true)
{
//超时未连接到设备,处理
bNoSearchOK= false;
DialogResult dr = new ConnTimeOut().ShowDialog();
if (dr == DialogResult.OK)
......
GcDevicePc/SysConfigSecondary.cs
View file @ 5587fca6
......@@ -25,10 +25,10 @@ namespace GcDevicePc
public partial class SysConfigSecondary : Form
{
private string HmiIP = null;
// private string HmiIP = null;
private ushort HmiPort = 911;
// private ushort HmiPort = 911;
private bool bEnglishLanguage = Thread.CurrentThread.CurrentUICulture == CultureInfo.GetCultureInfo("en") ? true : false;
private ArrayList SearchRet = new ArrayList();
......@@ -135,6 +135,7 @@ namespace GcDevicePc
IniFile ini = new IniFile(file);
string value = ini.ReadString("StartUp", "自启动");
string str_Cloud=ini.ReadString("StartUp", "启用云盒子");
string opensys = ini.ReadString("StartUp", "打开系统");
string runtype = ini.ReadString("StartUp", "运行类型");
string info_log = ini.ReadString("Logs", "InfoLog");
......@@ -143,6 +144,7 @@ namespace GcDevicePc
string strAntiControlMode=ini.ReadString("反控", "反控模式");
string strAntiControlFormName=ini.ReadString("反控", "反控进程名称");
string strStartStopTrigger=ini.ReadString("反控", "开始停止触发");
string strNMHC=ini.ReadString("NMHC", "测定方式");
int Version = ini.ReadInteger("Version", "VersionType");
string appname = ini.ReadString("Version", "AppName");
......@@ -191,6 +193,16 @@ namespace GcDevicePc
{
this.comboBox_FollowStop.Text=strStartStopTrigger;
}
if (strNMHC=="")
{
//兼容
this.comboBox1.Text="间接";
ini.WriteString("NMHC", "测定方式","间接");
}
else
{
this.comboBox1.Text=strNMHC;
}
if (ushort.TryParse(strHMISearchTime, out usHMISearchTime) == true)
{
this.SerachHMINumericUpDown1.Value = usHMISearchTime;
......@@ -204,7 +216,14 @@ namespace GcDevicePc
{
this.appstartup.Checked = false;
}
if (str_Cloud=="1")
{
this.checkBox_Cloud.Checked=true;
}
else
{
this.checkBox_Cloud.Checked=false;
}
if (Convert.ToInt32(opensys) == 1)
{
if (Convert.ToInt32(runtype) == 1)
......@@ -611,6 +630,14 @@ namespace GcDevicePc
rk2.DeleteValue("JcShutdown", false);
rk2.Close();
rk.Close();
}
if (checkBox_Cloud.Checked)
{
ini.WriteString("StartUp", "启用云盒子", "1");
}
else
{
ini.WriteString("StartUp", "启用云盒子", "0");
}
if (runbat.Checked)
{
......@@ -692,6 +719,15 @@ namespace GcDevicePc
{
ini.WriteString("SendData", "Foreign", "2");//无
}
if (comboBox1.Text==""||comboBox1.Text=="间接")
{
ini.WriteString("NMHC", "测定方式", "间接");//NMHC测定方式
}
else
{
ini.WriteString("NMHC", "测定方式", "直测");
}
//发送信号类型
if (radioButton13.Checked)
{
......
GcDevicePc/SysConfigSecondary.en.resx
View file @ 5587fca6
......@@ -166,7 +166,7 @@
<value>22, 113</value>
</data>
<data name="groupBox8.Size" type="System.Drawing.Size, System.Drawing">
<value>436, 85</value>
<value>533, 85</value>
</data>
<data name="groupBox8.Text" xml:space="preserve">
<value>Signal transmission type</value>
......@@ -184,11 +184,26 @@
<value>Default</value>
</data>
<data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
<value>436, 85</value>
<value>530, 85</value>
</data>
<data name="groupBox1.Text" xml:space="preserve">
<value>Third party communication</value>
</data>
<data name="label12.Size" type="System.Drawing.Size, System.Drawing">
<value>29, 12</value>
</data>
<data name="label12.Text" xml:space="preserve">
<value>NMHC</value>
</data>
<data name="comboBox1.Items" xml:space="preserve">
<value>indirect</value>
</data>
<data name="comboBox1.Items1" xml:space="preserve">
<value>direct</value>
</data>
<data name="comboBox1.Location" type="System.Drawing.Point, System.Drawing">
<value>266, 19</value>
</data>
<data name="radioButton5.Size" type="System.Drawing.Size, System.Drawing">
<value>179, 16</value>
</data>
......@@ -211,7 +226,7 @@
<value>25, 208</value>
</data>
<data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing">
<value>436, 131</value>
<value>530, 131</value>
</data>
<data name="groupBox2.Text" xml:space="preserve">
<value>External communication protocol</value>
......@@ -244,7 +259,7 @@
<value>57, 20</value>
</data>
<data name="groupBox9.Location" type="System.Drawing.Point, System.Drawing">
<value>296, 36</value>
<value>296, 37</value>
</data>
<data name="groupBox9.Text" xml:space="preserve">
<value>AntiControlSetting</value>
......@@ -256,10 +271,10 @@
<value>Record per minute</value>
</data>
<data name="groupBox7.Location" type="System.Drawing.Point, System.Drawing">
<value>22, 160</value>
<value>22, 161</value>
</data>
<data name="groupBox7.Size" type="System.Drawing.Size, System.Drawing">
<value>256, 47</value>
<value>258, 47</value>
</data>
<data name="groupBox7.Text" xml:space="preserve">
<value>Status record</value>
......@@ -319,10 +334,10 @@
<value>Automatic ignition</value>
</data>
<data name="groupBox6.Location" type="System.Drawing.Point, System.Drawing">
<value>25, 264</value>
<value>25, 265</value>
</data>
<data name="groupBox6.Size" type="System.Drawing.Size, System.Drawing">
<value>583, 98</value>
<value>585, 98</value>
</data>
<data name="groupBox6.Text" xml:space="preserve">
<value>Detecto</value>
......@@ -370,10 +385,10 @@
<value>Save ZB Graph</value>
</data>
<data name="groupBox5.Location" type="System.Drawing.Point, System.Drawing">
<value>22, 213</value>
<value>22, 214</value>
</data>
<data name="groupBox5.Size" type="System.Drawing.Size, System.Drawing">
<value>584, 45</value>
<value>586, 45</value>
</data>
<data name="groupBox5.Text" xml:space="preserve">
<value>Miscellaneous</value>
......@@ -400,22 +415,28 @@
<value>System On</value>
</data>
<data name="groupBox3.Location" type="System.Drawing.Point, System.Drawing">
<value>22, 105</value>
<value>22, 106</value>
</data>
<data name="groupBox3.Size" type="System.Drawing.Size, System.Drawing">
<value>584, 49</value>
<value>586, 49</value>
</data>
<data name="groupBox3.Text" xml:space="preserve">
<value>Sart up automatically</value>
</data>
<data name="checkBox_Cloud.Size" type="System.Drawing.Size, System.Drawing">
<value>54, 16</value>
</data>
<data name="checkBox_Cloud.Text" xml:space="preserve">
<value>Cloud</value>
</data>
<data name="appstartup.Text" xml:space="preserve">
<value>Autostarts</value>
</data>
<data name="groupBox4.Location" type="System.Drawing.Point, System.Drawing">
<value>22, 36</value>
<value>22, 37</value>
</data>
<data name="groupBox4.Size" type="System.Drawing.Size, System.Drawing">
<value>256, 60</value>
<value>258, 60</value>
</data>
<data name="groupBox4.Text" xml:space="preserve">
<value>Boot configuration</value>
......@@ -454,10 +475,10 @@
<value>Reserved space</value>
</data>
<data name="groupBox11.Location" type="System.Drawing.Point, System.Drawing">
<value>34, 157</value>
<value>34, 158</value>
</data>
<data name="groupBox11.Size" type="System.Drawing.Size, System.Drawing">
<value>569, 67</value>
<value>571, 67</value>
</data>
<data name="groupBox11.Text" xml:space="preserve">
<value>Historical data</value>
......@@ -493,22 +514,22 @@
<value>114, 26</value>
</data>
<data name="label6.Location" type="System.Drawing.Point, System.Drawing">
<value>565, 118</value>
<value>567, 118</value>
</data>
<data name="label5.Location" type="System.Drawing.Point, System.Drawing">
<value>566, 78</value>
<value>568, 78</value>
</data>
<data name="label4.Location" type="System.Drawing.Point, System.Drawing">
<value>566, 41</value>
<value>568, 41</value>
</data>
<data name="textBox3.Location" type="System.Drawing.Point, System.Drawing">
<value>394, 109</value>
<value>396, 109</value>
</data>
<data name="textBox2.Location" type="System.Drawing.Point, System.Drawing">
<value>394, 70</value>
<value>396, 70</value>
</data>
<data name="textBox1.Location" type="System.Drawing.Point, System.Drawing">
<value>394, 33</value>
<value>396, 33</value>
</data>
<data name="label3.Size" type="System.Drawing.Size, System.Drawing">
<value>77, 12</value>
......
GcDevicePc/SysConfigSecondary.resx
View file @ 5587fca6
This source diff could not be displayed because it is too large. You can view the blob instead.
GcDevicePc/SysConfigSecondary.zh-Hans.resx 0 → 100644
View file @ 5587fca6
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="groupBox8.Size" type="System.Drawing.Size, System.Drawing">
<value>471, 110</value>
</data>
<data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
<value>474, 81</value>
</data>
<data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing">
<value>471, 117</value>
</data>
</root>
\ No newline at end of file
GcDevicePc/SysConfigsecondary.Designer.cs
View file @ 5587fca6
......@@ -33,6 +33,21 @@
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.splitter1 = new System.Windows.Forms.Splitter();
this.listBox1 = new System.Windows.Forms.ListBox();
this.panel3 = new System.Windows.Forms.Panel();
this.groupBox8 = new System.Windows.Forms.GroupBox();
this.radioButton14 = new System.Windows.Forms.RadioButton();
this.radioButton13 = new System.Windows.Forms.RadioButton();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.radioButton3 = new System.Windows.Forms.RadioButton();
this.radioButton2 = new System.Windows.Forms.RadioButton();
this.radioButton1 = new System.Windows.Forms.RadioButton();
this.radioButton4 = new System.Windows.Forms.RadioButton();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.label12 = new System.Windows.Forms.Label();
this.comboBox1 = new System.Windows.Forms.ComboBox();
this.radioButton5 = new System.Windows.Forms.RadioButton();
this.radioButton6 = new System.Windows.Forms.RadioButton();
this.radioButton7 = new System.Windows.Forms.RadioButton();
this.panel1 = new System.Windows.Forms.Panel();
this.groupBox9 = new System.Windows.Forms.GroupBox();
this.textBox_AntiControlFormName = new System.Windows.Forms.TextBox();
......@@ -69,6 +84,7 @@
this.runbat = new System.Windows.Forms.CheckBox();
this.runsingle = new System.Windows.Forms.CheckBox();
this.groupBox4 = new System.Windows.Forms.GroupBox();
this.checkBox_Cloud = new System.Windows.Forms.CheckBox();
this.appstartup = new System.Windows.Forms.CheckBox();
this.panel6 = new System.Windows.Forms.Panel();
this.groupBox11 = new System.Windows.Forms.GroupBox();
......@@ -99,19 +115,6 @@
this.label3 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
this.panel3 = new System.Windows.Forms.Panel();
this.groupBox8 = new System.Windows.Forms.GroupBox();
this.radioButton14 = new System.Windows.Forms.RadioButton();
this.radioButton13 = new System.Windows.Forms.RadioButton();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.radioButton3 = new System.Windows.Forms.RadioButton();
this.radioButton2 = new System.Windows.Forms.RadioButton();
this.radioButton1 = new System.Windows.Forms.RadioButton();
this.radioButton4 = new System.Windows.Forms.RadioButton();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.radioButton5 = new System.Windows.Forms.RadioButton();
this.radioButton6 = new System.Windows.Forms.RadioButton();
this.radioButton7 = new System.Windows.Forms.RadioButton();
this.panel8 = new System.Windows.Forms.Panel();
this.label24 = new System.Windows.Forms.Label();
this.label23 = new System.Windows.Forms.Label();
......@@ -132,6 +135,10 @@
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
this.splitContainer1.SuspendLayout();
this.panel3.SuspendLayout();
this.groupBox8.SuspendLayout();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
this.panel1.SuspendLayout();
this.groupBox9.SuspendLayout();
this.groupBox7.SuspendLayout();
......@@ -147,50 +154,40 @@
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
this.CmsDeletRow.SuspendLayout();
this.panel2.SuspendLayout();
this.panel3.SuspendLayout();
this.groupBox8.SuspendLayout();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
this.panel8.SuspendLayout();
this.panel4.SuspendLayout();
this.SuspendLayout();
//
// splitContainer1
//
resources.ApplyResources(this.splitContainer1, "splitContainer1");
this.splitContainer1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
resources.ApplyResources(this.splitContainer1, "splitContainer1");
this.splitContainer1.Name = "splitContainer1";
//
// splitContainer1.Panel1
//
resources.ApplyResources(this.splitContainer1.Panel1, "splitContainer1.Panel1");
this.splitContainer1.Panel1.Controls.Add(this.splitter1);
this.splitContainer1.Panel1.Controls.Add(this.listBox1);
this.ToolTip1.SetToolTip(this.splitContainer1.Panel1, resources.GetString("splitContainer1.Panel1.ToolTip"));
//
// splitContainer1.Panel2
//
resources.ApplyResources(this.splitContainer1.Panel2, "splitContainer1.Panel2");
this.splitContainer1.Panel2.Controls.Add(this.panel1);
this.splitContainer1.Panel2.Controls.Add(this.panel3);
this.splitContainer1.Panel2.Controls.Add(this.panel6);
this.splitContainer1.Panel2.Controls.Add(this.panel7);
this.splitContainer1.Panel2.Controls.Add(this.panel2);
this.splitContainer1.Panel2.Controls.Add(this.panel3);
this.splitContainer1.Panel2.Controls.Add(this.panel8);
this.ToolTip1.SetToolTip(this.splitContainer1.Panel2, resources.GetString("splitContainer1.Panel2.ToolTip"));
this.ToolTip1.SetToolTip(this.splitContainer1, resources.GetString("splitContainer1.ToolTip"));
//
// splitter1
//
resources.ApplyResources(this.splitter1, "splitter1");
this.splitter1.Name = "splitter1";
this.splitter1.TabStop = false;
this.ToolTip1.SetToolTip(this.splitter1, resources.GetString("splitter1.ToolTip"));
//
// listBox1
//
resources.ApplyResources(this.listBox1, "listBox1");
this.listBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
resources.ApplyResources(this.listBox1, "listBox1");
this.listBox1.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawVariable;
this.listBox1.FormattingEnabled = true;
this.listBox1.Items.AddRange(new object[] {
......@@ -201,14 +198,131 @@
resources.GetString("listBox1.Items4"),
resources.GetString("listBox1.Items5")});
this.listBox1.Name = "listBox1";
this.ToolTip1.SetToolTip(this.listBox1, resources.GetString("listBox1.ToolTip"));
this.listBox1.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.ListBox1_DrawItem);
this.listBox1.MeasureItem += new System.Windows.Forms.MeasureItemEventHandler(this.ListBox1_MeasureItem);
this.listBox1.SelectedIndexChanged += new System.EventHandler(this.ListBox1_SelectedIndexChanged);
//
// panel3
//
this.panel3.Controls.Add(this.groupBox8);
this.panel3.Controls.Add(this.groupBox1);
this.panel3.Controls.Add(this.groupBox2);
resources.ApplyResources(this.panel3, "panel3");
this.panel3.Name = "panel3";
//
// groupBox8
//
this.groupBox8.Controls.Add(this.radioButton14);
this.groupBox8.Controls.Add(this.radioButton13);
resources.ApplyResources(this.groupBox8, "groupBox8");
this.groupBox8.Name = "groupBox8";
this.groupBox8.TabStop = false;
//
// radioButton14
//
resources.ApplyResources(this.radioButton14, "radioButton14");
this.radioButton14.Name = "radioButton14";
this.radioButton14.TabStop = true;
this.radioButton14.UseVisualStyleBackColor = true;
//
// radioButton13
//
resources.ApplyResources(this.radioButton13, "radioButton13");
this.radioButton13.Name = "radioButton13";
this.radioButton13.TabStop = true;
this.radioButton13.UseVisualStyleBackColor = true;
//
// groupBox1
//
this.groupBox1.Controls.Add(this.radioButton3);
this.groupBox1.Controls.Add(this.radioButton2);
this.groupBox1.Controls.Add(this.radioButton1);
this.groupBox1.Controls.Add(this.radioButton4);
resources.ApplyResources(this.groupBox1, "groupBox1");
this.groupBox1.Name = "groupBox1";
this.groupBox1.TabStop = false;
//
// radioButton3
//
resources.ApplyResources(this.radioButton3, "radioButton3");
this.radioButton3.Name = "radioButton3";
this.radioButton3.TabStop = true;
this.radioButton3.UseVisualStyleBackColor = true;
this.radioButton3.CheckedChanged += new System.EventHandler(this.Thirdparty_CheckedChanged);
//
// radioButton2
//
resources.ApplyResources(this.radioButton2, "radioButton2");
this.radioButton2.Name = "radioButton2";
this.radioButton2.TabStop = true;
this.radioButton2.UseVisualStyleBackColor = true;
this.radioButton2.CheckedChanged += new System.EventHandler(this.Thirdparty_CheckedChanged);
//
// radioButton1
//
resources.ApplyResources(this.radioButton1, "radioButton1");
this.radioButton1.Name = "radioButton1";
this.radioButton1.TabStop = true;
this.radioButton1.UseVisualStyleBackColor = true;
this.radioButton1.CheckedChanged += new System.EventHandler(this.Thirdparty_CheckedChanged);
//
// radioButton4
//
resources.ApplyResources(this.radioButton4, "radioButton4");
this.radioButton4.Name = "radioButton4";
this.radioButton4.TabStop = true;
this.radioButton4.UseVisualStyleBackColor = true;
//
// groupBox2
//
this.groupBox2.Controls.Add(this.label12);
this.groupBox2.Controls.Add(this.comboBox1);
this.groupBox2.Controls.Add(this.radioButton5);
this.groupBox2.Controls.Add(this.radioButton6);
this.groupBox2.Controls.Add(this.radioButton7);
resources.ApplyResources(this.groupBox2, "groupBox2");
this.groupBox2.Name = "groupBox2";
this.groupBox2.TabStop = false;
//
// label12
//
resources.ApplyResources(this.label12, "label12");
this.label12.Name = "label12";
//
// comboBox1
//
this.comboBox1.FormattingEnabled = true;
this.comboBox1.Items.AddRange(new object[] {
resources.GetString("comboBox1.Items"),
resources.GetString("comboBox1.Items1")});
resources.ApplyResources(this.comboBox1, "comboBox1");
this.comboBox1.Name = "comboBox1";
//
// radioButton5
//
resources.ApplyResources(this.radioButton5, "radioButton5");
this.radioButton5.Name = "radioButton5";
this.radioButton5.TabStop = true;
this.radioButton5.UseVisualStyleBackColor = true;
this.radioButton5.CheckedChanged += new System.EventHandler(this.Foreign_CheckedChanged);
//
// radioButton6
//
resources.ApplyResources(this.radioButton6, "radioButton6");
this.radioButton6.Name = "radioButton6";
this.radioButton6.TabStop = true;
this.radioButton6.UseVisualStyleBackColor = true;
this.radioButton6.CheckedChanged += new System.EventHandler(this.Foreign_CheckedChanged);
//
// radioButton7
//
resources.ApplyResources(this.radioButton7, "radioButton7");
this.radioButton7.Name = "radioButton7";
this.radioButton7.TabStop = true;
this.radioButton7.UseVisualStyleBackColor = true;
//
// panel1
//
resources.ApplyResources(this.panel1, "panel1");
this.panel1.Controls.Add(this.groupBox9);
this.panel1.Controls.Add(this.groupBox7);
this.panel1.Controls.Add(this.EmailGroupBox13);
......@@ -216,8 +330,8 @@
this.panel1.Controls.Add(this.groupBox5);
this.panel1.Controls.Add(this.groupBox3);
this.panel1.Controls.Add(this.groupBox4);
resources.ApplyResources(this.panel1, "panel1");
this.panel1.Name = "panel1";
this.ToolTip1.SetToolTip(this.panel1, resources.GetString("panel1.ToolTip"));
//
// groupBox9
//
......@@ -229,47 +343,41 @@
this.groupBox9.Controls.Add(this.comboBox_AntiControlMode);
this.groupBox9.Name = "groupBox9";
this.groupBox9.TabStop = false;
this.ToolTip1.SetToolTip(this.groupBox9, resources.GetString("groupBox9.ToolTip"));
//
// textBox_AntiControlFormName
//
resources.ApplyResources(this.textBox_AntiControlFormName, "textBox_AntiControlFormName");
this.textBox_AntiControlFormName.Name = "textBox_AntiControlFormName";
this.ToolTip1.SetToolTip(this.textBox_AntiControlFormName, resources.GetString("textBox_AntiControlFormName.ToolTip"));
//
// comboBox_FollowStop
//
resources.ApplyResources(this.comboBox_FollowStop, "comboBox_FollowStop");
this.comboBox_FollowStop.FormattingEnabled = true;
this.comboBox_FollowStop.Items.AddRange(new object[] {
resources.GetString("comboBox_FollowStop.Items"),
resources.GetString("comboBox_FollowStop.Items1")});
resources.ApplyResources(this.comboBox_FollowStop, "comboBox_FollowStop");
this.comboBox_FollowStop.Name = "comboBox_FollowStop";
this.ToolTip1.SetToolTip(this.comboBox_FollowStop, resources.GetString("comboBox_FollowStop.ToolTip"));
this.comboBox_FollowStop.MouseHover += new System.EventHandler(this.comboBox_FollowStop_MouseHover);
//
// label11
//
resources.ApplyResources(this.label11, "label11");
this.label11.Name = "label11";
this.ToolTip1.SetToolTip(this.label11, resources.GetString("label11.ToolTip"));
//
// label10
//
resources.ApplyResources(this.label10, "label10");
this.label10.Name = "label10";
this.ToolTip1.SetToolTip(this.label10, resources.GetString("label10.ToolTip"));
//
// comboBox_AntiControlMode
//
resources.ApplyResources(this.comboBox_AntiControlMode, "comboBox_AntiControlMode");
this.comboBox_AntiControlMode.FormattingEnabled = true;
this.comboBox_AntiControlMode.Items.AddRange(new object[] {
resources.GetString("comboBox_AntiControlMode.Items"),
resources.GetString("comboBox_AntiControlMode.Items1"),
resources.GetString("comboBox_AntiControlMode.Items2")});
resources.ApplyResources(this.comboBox_AntiControlMode, "comboBox_AntiControlMode");
this.comboBox_AntiControlMode.Name = "comboBox_AntiControlMode";
this.ToolTip1.SetToolTip(this.comboBox_AntiControlMode, resources.GetString("comboBox_AntiControlMode.ToolTip"));
//
// groupBox7
//
......@@ -277,35 +385,30 @@
this.groupBox7.Controls.Add(this.permin);
this.groupBox7.Name = "groupBox7";
this.groupBox7.TabStop = false;
this.ToolTip1.SetToolTip(this.groupBox7, resources.GetString("groupBox7.ToolTip"));
//
// permin
//
resources.ApplyResources(this.permin, "permin");
this.permin.Name = "permin";
this.ToolTip1.SetToolTip(this.permin, resources.GetString("permin.ToolTip"));
this.permin.UseVisualStyleBackColor = true;
//
// EmailGroupBox13
//
resources.ApplyResources(this.EmailGroupBox13, "EmailGroupBox13");
this.EmailGroupBox13.Controls.Add(this.EmailLabel27);
this.EmailGroupBox13.Controls.Add(this.EmailTextBox13);
resources.ApplyResources(this.EmailGroupBox13, "EmailGroupBox13");
this.EmailGroupBox13.Name = "EmailGroupBox13";
this.EmailGroupBox13.TabStop = false;
this.ToolTip1.SetToolTip(this.EmailGroupBox13, resources.GetString("EmailGroupBox13.ToolTip"));
//
// EmailLabel27
//
resources.ApplyResources(this.EmailLabel27, "EmailLabel27");
this.EmailLabel27.Name = "EmailLabel27";
this.ToolTip1.SetToolTip(this.EmailLabel27, resources.GetString("EmailLabel27.ToolTip"));
//
// EmailTextBox13
//
resources.ApplyResources(this.EmailTextBox13, "EmailTextBox13");
this.EmailTextBox13.Name = "EmailTextBox13";
this.ToolTip1.SetToolTip(this.EmailTextBox13, resources.GetString("EmailTextBox13.ToolTip"));
//
// groupBox6
//
......@@ -322,31 +425,26 @@
this.groupBox6.Controls.Add(this.checkBox4);
this.groupBox6.Name = "groupBox6";
this.groupBox6.TabStop = false;
this.ToolTip1.SetToolTip(this.groupBox6, resources.GetString("groupBox6.ToolTip"));
//
// label9
//
resources.ApplyResources(this.label9, "label9");
this.label9.Name = "label9";
this.ToolTip1.SetToolTip(this.label9, resources.GetString("label9.ToolTip"));
//
// label8
//
resources.ApplyResources(this.label8, "label8");
this.label8.Name = "label8";
this.ToolTip1.SetToolTip(this.label8, resources.GetString("label8.ToolTip"));
//
// label7
//
resources.ApplyResources(this.label7, "label7");
this.label7.Name = "label7";
this.ToolTip1.SetToolTip(this.label7, resources.GetString("label7.ToolTip"));
//
// textBox6
//
resources.ApplyResources(this.textBox6, "textBox6");
this.textBox6.Name = "textBox6";
this.ToolTip1.SetToolTip(this.textBox6, resources.GetString("textBox6.ToolTip"));
this.textBox6.TextChanged += new System.EventHandler(this.vInput_Integer_Limit_TextChange);
this.textBox6.MouseLeave += new System.EventHandler(this.vInput_Limit_MouseLeave);
//
......@@ -354,7 +452,6 @@
//
resources.ApplyResources(this.textBox5, "textBox5");
this.textBox5.Name = "textBox5";
this.ToolTip1.SetToolTip(this.textBox5, resources.GetString("textBox5.ToolTip"));
this.textBox5.TextChanged += new System.EventHandler(this.vInput_Integer_Limit_TextChange);
this.textBox5.MouseLeave += new System.EventHandler(this.vInput_Limit_MouseLeave);
//
......@@ -362,7 +459,6 @@
//
resources.ApplyResources(this.textBox4, "textBox4");
this.textBox4.Name = "textBox4";
this.ToolTip1.SetToolTip(this.textBox4, resources.GetString("textBox4.ToolTip"));
this.textBox4.TextChanged += new System.EventHandler(this.vInput_Integer_Limit_TextChange);
this.textBox4.MouseLeave += new System.EventHandler(this.vInput_Limit_MouseLeave);
//
......@@ -370,28 +466,24 @@
//
resources.ApplyResources(this.checkBox7, "checkBox7");
this.checkBox7.Name = "checkBox7";
this.ToolTip1.SetToolTip(this.checkBox7, resources.GetString("checkBox7.ToolTip"));
this.checkBox7.UseVisualStyleBackColor = true;
//
// checkBox6
//
resources.ApplyResources(this.checkBox6, "checkBox6");
this.checkBox6.Name = "checkBox6";
this.ToolTip1.SetToolTip(this.checkBox6, resources.GetString("checkBox6.ToolTip"));
this.checkBox6.UseVisualStyleBackColor = true;
//
// checkBox5
//
resources.ApplyResources(this.checkBox5, "checkBox5");
this.checkBox5.Name = "checkBox5";
this.ToolTip1.SetToolTip(this.checkBox5, resources.GetString("checkBox5.ToolTip"));
this.checkBox5.UseVisualStyleBackColor = true;
//
// checkBox4
//
resources.ApplyResources(this.checkBox4, "checkBox4");
this.checkBox4.Name = "checkBox4";
this.ToolTip1.SetToolTip(this.checkBox4, resources.GetString("checkBox4.ToolTip"));
this.checkBox4.UseVisualStyleBackColor = true;
//
// groupBox5
......@@ -404,13 +496,11 @@
this.groupBox5.Controls.Add(this.checkBox3);
this.groupBox5.Name = "groupBox5";
this.groupBox5.TabStop = false;
this.ToolTip1.SetToolTip(this.groupBox5, resources.GetString("groupBox5.ToolTip"));
//
// textBox10
//
resources.ApplyResources(this.textBox10, "textBox10");
this.textBox10.Name = "textBox10";
this.ToolTip1.SetToolTip(this.textBox10, resources.GetString("textBox10.ToolTip"));
this.textBox10.TextChanged += new System.EventHandler(this.vTextBox_Char_Limit_TextChange);
this.textBox10.MouseLeave += new System.EventHandler(this.vInput_Limit_MouseLeave);
//
......@@ -418,20 +508,17 @@
//
resources.ApplyResources(this.label20, "label20");
this.label20.Name = "label20";
this.ToolTip1.SetToolTip(this.label20, resources.GetString("label20.ToolTip"));
//
// checkBox8
//
resources.ApplyResources(this.checkBox8, "checkBox8");
this.checkBox8.Name = "checkBox8";
this.ToolTip1.SetToolTip(this.checkBox8, resources.GetString("checkBox8.ToolTip"));
this.checkBox8.UseVisualStyleBackColor = true;
//
// checkBox2
//
resources.ApplyResources(this.checkBox2, "checkBox2");
this.checkBox2.Name = "checkBox2";
this.ToolTip1.SetToolTip(this.checkBox2, resources.GetString("checkBox2.ToolTip"));
this.checkBox2.UseVisualStyleBackColor = true;
this.checkBox2.CheckedChanged += new System.EventHandler(this.CheckBox2_CheckedChanged);
//
......@@ -439,7 +526,6 @@
//
resources.ApplyResources(this.checkBox3, "checkBox3");
this.checkBox3.Name = "checkBox3";
this.ToolTip1.SetToolTip(this.checkBox3, resources.GetString("checkBox3.ToolTip"));
this.checkBox3.UseVisualStyleBackColor = true;
//
// groupBox3
......@@ -452,13 +538,11 @@
this.groupBox3.Controls.Add(this.runsingle);
this.groupBox3.Name = "groupBox3";
this.groupBox3.TabStop = false;
this.ToolTip1.SetToolTip(this.groupBox3, resources.GetString("groupBox3.ToolTip"));
//
// label26
//
resources.ApplyResources(this.label26, "label26");
this.label26.Name = "label26";
this.ToolTip1.SetToolTip(this.label26, resources.GetString("label26.ToolTip"));
//
// SerachHMINumericUpDown1
//
......@@ -474,7 +558,6 @@
0,
0});
this.SerachHMINumericUpDown1.Name = "SerachHMINumericUpDown1";
this.ToolTip1.SetToolTip(this.SerachHMINumericUpDown1, resources.GetString("SerachHMINumericUpDown1.ToolTip"));
this.SerachHMINumericUpDown1.Value = new decimal(new int[] {
10,
0,
......@@ -485,14 +568,12 @@
//
resources.ApplyResources(this.label25, "label25");
this.label25.Name = "label25";
this.ToolTip1.SetToolTip(this.label25, resources.GetString("label25.ToolTip"));
//
// runbat
//
resources.ApplyResources(this.runbat, "runbat");
this.runbat.Name = "runbat";
this.runbat.Tag = "2";
this.ToolTip1.SetToolTip(this.runbat, resources.GetString("runbat.ToolTip"));
this.runbat.UseVisualStyleBackColor = true;
this.runbat.CheckedChanged += new System.EventHandler(this.Runbat_CheckedChanged);
//
......@@ -501,31 +582,34 @@
resources.ApplyResources(this.runsingle, "runsingle");
this.runsingle.Name = "runsingle";
this.runsingle.Tag = "0";
this.ToolTip1.SetToolTip(this.runsingle, resources.GetString("runsingle.ToolTip"));
this.runsingle.UseVisualStyleBackColor = true;
this.runsingle.CheckedChanged += new System.EventHandler(this.Runsingle_CheckedChanged);
//
// groupBox4
//
resources.ApplyResources(this.groupBox4, "groupBox4");
this.groupBox4.Controls.Add(this.checkBox_Cloud);
this.groupBox4.Controls.Add(this.appstartup);
this.groupBox4.Name = "groupBox4";
this.groupBox4.TabStop = false;
this.ToolTip1.SetToolTip(this.groupBox4, resources.GetString("groupBox4.ToolTip"));
//
// checkBox_Cloud
//
resources.ApplyResources(this.checkBox_Cloud, "checkBox_Cloud");
this.checkBox_Cloud.Name = "checkBox_Cloud";
this.checkBox_Cloud.UseVisualStyleBackColor = true;
//
// appstartup
//
resources.ApplyResources(this.appstartup, "appstartup");
this.appstartup.Name = "appstartup";
this.ToolTip1.SetToolTip(this.appstartup, resources.GetString("appstartup.ToolTip"));
this.appstartup.UseVisualStyleBackColor = true;
//
// panel6
//
resources.ApplyResources(this.panel6, "panel6");
this.panel6.Controls.Add(this.groupBox11);
resources.ApplyResources(this.panel6, "panel6");
this.panel6.Name = "panel6";
this.ToolTip1.SetToolTip(this.panel6, resources.GetString("panel6.ToolTip"));
//
// groupBox11
//
......@@ -538,54 +622,45 @@
this.groupBox11.Controls.Add(this.label18);
this.groupBox11.Name = "groupBox11";
this.groupBox11.TabStop = false;
this.ToolTip1.SetToolTip(this.groupBox11, resources.GetString("groupBox11.ToolTip"));
//
// textBox7
//
resources.ApplyResources(this.textBox7, "textBox7");
this.textBox7.Name = "textBox7";
this.ToolTip1.SetToolTip(this.textBox7, resources.GetString("textBox7.ToolTip"));
//
// textBox8
//
resources.ApplyResources(this.textBox8, "textBox8");
this.textBox8.Name = "textBox8";
this.ToolTip1.SetToolTip(this.textBox8, resources.GetString("textBox8.ToolTip"));
//
// label15
//
resources.ApplyResources(this.label15, "label15");
this.label15.Name = "label15";
this.ToolTip1.SetToolTip(this.label15, resources.GetString("label15.ToolTip"));
//
// label16
//
resources.ApplyResources(this.label16, "label16");
this.label16.Name = "label16";
this.ToolTip1.SetToolTip(this.label16, resources.GetString("label16.ToolTip"));
//
// label17
//
resources.ApplyResources(this.label17, "label17");
this.label17.Name = "label17";
this.ToolTip1.SetToolTip(this.label17, resources.GetString("label17.ToolTip"));
//
// label18
//
resources.ApplyResources(this.label18, "label18");
this.label18.Name = "label18";
this.ToolTip1.SetToolTip(this.label18, resources.GetString("label18.ToolTip"));
//
// panel7
//
resources.ApplyResources(this.panel7, "panel7");
this.panel7.Controls.Add(this.dataGridView1);
resources.ApplyResources(this.panel7, "panel7");
this.panel7.Name = "panel7";
this.ToolTip1.SetToolTip(this.panel7, resources.GetString("panel7.ToolTip"));
//
// dataGridView1
//
resources.ApplyResources(this.dataGridView1, "dataGridView1");
this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.Column1,
......@@ -596,9 +671,9 @@
this.Column5,
this.Column6});
this.dataGridView1.ContextMenuStrip = this.CmsDeletRow;
resources.ApplyResources(this.dataGridView1, "dataGridView1");
this.dataGridView1.Name = "dataGridView1";
this.dataGridView1.RowTemplate.Height = 23;
this.ToolTip1.SetToolTip(this.dataGridView1, resources.GetString("dataGridView1.ToolTip"));
this.dataGridView1.CellMouseUp += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dataGridView1_CellMouseUp);
this.dataGridView1.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.DataGridView1_RowPostPaint);
//
......@@ -639,22 +714,20 @@
//
// CmsDeletRow
//
resources.ApplyResources(this.CmsDeletRow, "CmsDeletRow");
this.CmsDeletRow.ImageScalingSize = new System.Drawing.Size(20, 20);
this.CmsDeletRow.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.TsmiDeletRow});
this.CmsDeletRow.Name = "CmsDeletRow";
this.ToolTip1.SetToolTip(this.CmsDeletRow, resources.GetString("CmsDeletRow.ToolTip"));
resources.ApplyResources(this.CmsDeletRow, "CmsDeletRow");
//
// TsmiDeletRow
//
resources.ApplyResources(this.TsmiDeletRow, "TsmiDeletRow");
this.TsmiDeletRow.Name = "TsmiDeletRow";
resources.ApplyResources(this.TsmiDeletRow, "TsmiDeletRow");
this.TsmiDeletRow.Click += new System.EventHandler(this.TsmiDeletRow_Click);
//
// panel2
//
resources.ApplyResources(this.panel2, "panel2");
this.panel2.Controls.Add(this.label6);
this.panel2.Controls.Add(this.label5);
this.panel2.Controls.Add(this.label4);
......@@ -664,188 +737,62 @@
this.panel2.Controls.Add(this.label3);
this.panel2.Controls.Add(this.label2);
this.panel2.Controls.Add(this.label1);
resources.ApplyResources(this.panel2, "panel2");
this.panel2.Name = "panel2";
this.ToolTip1.SetToolTip(this.panel2, resources.GetString("panel2.ToolTip"));
//
// label6
//
resources.ApplyResources(this.label6, "label6");
this.label6.ForeColor = System.Drawing.Color.Red;
this.label6.Name = "label6";
this.ToolTip1.SetToolTip(this.label6, resources.GetString("label6.ToolTip"));
//
// label5
//
resources.ApplyResources(this.label5, "label5");
this.label5.ForeColor = System.Drawing.Color.Red;
this.label5.Name = "label5";
this.ToolTip1.SetToolTip(this.label5, resources.GetString("label5.ToolTip"));
//
// label4
//
resources.ApplyResources(this.label4, "label4");
this.label4.ForeColor = System.Drawing.Color.Red;
this.label4.Name = "label4";
this.ToolTip1.SetToolTip(this.label4, resources.GetString("label4.ToolTip"));
//
// textBox3
//
resources.ApplyResources(this.textBox3, "textBox3");
this.textBox3.Name = "textBox3";
this.ToolTip1.SetToolTip(this.textBox3, resources.GetString("textBox3.ToolTip"));
this.textBox3.TextChanged += new System.EventHandler(this.TextBox3_TextChanged);
//
// textBox2
//
resources.ApplyResources(this.textBox2, "textBox2");
this.textBox2.Name = "textBox2";
this.ToolTip1.SetToolTip(this.textBox2, resources.GetString("textBox2.ToolTip"));
this.textBox2.TextChanged += new System.EventHandler(this.TextBox2_TextChanged);
//
// textBox1
//
resources.ApplyResources(this.textBox1, "textBox1");
this.textBox1.Name = "textBox1";
this.ToolTip1.SetToolTip(this.textBox1, resources.GetString("textBox1.ToolTip"));
this.textBox1.TextChanged += new System.EventHandler(this.TextBox1_TextChanged);
//
// label3
//
resources.ApplyResources(this.label3, "label3");
this.label3.Name = "label3";
this.ToolTip1.SetToolTip(this.label3, resources.GetString("label3.ToolTip"));
//
// label2
//
resources.ApplyResources(this.label2, "label2");
this.label2.Name = "label2";
this.ToolTip1.SetToolTip(this.label2, resources.GetString("label2.ToolTip"));
//
// label1
//
resources.ApplyResources(this.label1, "label1");
this.label1.Name = "label1";
this.ToolTip1.SetToolTip(this.label1, resources.GetString("label1.ToolTip"));
//
// panel3
//
resources.ApplyResources(this.panel3, "panel3");
this.panel3.Controls.Add(this.groupBox8);
this.panel3.Controls.Add(this.groupBox1);
this.panel3.Controls.Add(this.groupBox2);
this.panel3.Name = "panel3";
this.ToolTip1.SetToolTip(this.panel3, resources.GetString("panel3.ToolTip"));
//
// groupBox8
//
resources.ApplyResources(this.groupBox8, "groupBox8");
this.groupBox8.Controls.Add(this.radioButton14);
this.groupBox8.Controls.Add(this.radioButton13);
this.groupBox8.Name = "groupBox8";
this.groupBox8.TabStop = false;
this.ToolTip1.SetToolTip(this.groupBox8, resources.GetString("groupBox8.ToolTip"));
//
// radioButton14
//
resources.ApplyResources(this.radioButton14, "radioButton14");
this.radioButton14.Name = "radioButton14";
this.radioButton14.TabStop = true;
this.ToolTip1.SetToolTip(this.radioButton14, resources.GetString("radioButton14.ToolTip"));
this.radioButton14.UseVisualStyleBackColor = true;
//
// radioButton13
//
resources.ApplyResources(this.radioButton13, "radioButton13");
this.radioButton13.Name = "radioButton13";
this.radioButton13.TabStop = true;
this.ToolTip1.SetToolTip(this.radioButton13, resources.GetString("radioButton13.ToolTip"));
this.radioButton13.UseVisualStyleBackColor = true;
//
// groupBox1
//
resources.ApplyResources(this.groupBox1, "groupBox1");
this.groupBox1.Controls.Add(this.radioButton3);
this.groupBox1.Controls.Add(this.radioButton2);
this.groupBox1.Controls.Add(this.radioButton1);
this.groupBox1.Controls.Add(this.radioButton4);
this.groupBox1.Name = "groupBox1";
this.groupBox1.TabStop = false;
this.ToolTip1.SetToolTip(this.groupBox1, resources.GetString("groupBox1.ToolTip"));
//
// radioButton3
//
resources.ApplyResources(this.radioButton3, "radioButton3");
this.radioButton3.Name = "radioButton3";
this.radioButton3.TabStop = true;
this.ToolTip1.SetToolTip(this.radioButton3, resources.GetString("radioButton3.ToolTip"));
this.radioButton3.UseVisualStyleBackColor = true;
this.radioButton3.CheckedChanged += new System.EventHandler(this.Thirdparty_CheckedChanged);
//
// radioButton2
//
resources.ApplyResources(this.radioButton2, "radioButton2");
this.radioButton2.Name = "radioButton2";
this.radioButton2.TabStop = true;
this.ToolTip1.SetToolTip(this.radioButton2, resources.GetString("radioButton2.ToolTip"));
this.radioButton2.UseVisualStyleBackColor = true;
this.radioButton2.CheckedChanged += new System.EventHandler(this.Thirdparty_CheckedChanged);
//
// radioButton1
//
resources.ApplyResources(this.radioButton1, "radioButton1");
this.radioButton1.Name = "radioButton1";
this.radioButton1.TabStop = true;
this.ToolTip1.SetToolTip(this.radioButton1, resources.GetString("radioButton1.ToolTip"));
this.radioButton1.UseVisualStyleBackColor = true;
this.radioButton1.CheckedChanged += new System.EventHandler(this.Thirdparty_CheckedChanged);
//
// radioButton4
//
resources.ApplyResources(this.radioButton4, "radioButton4");
this.radioButton4.Name = "radioButton4";
this.radioButton4.TabStop = true;
this.ToolTip1.SetToolTip(this.radioButton4, resources.GetString("radioButton4.ToolTip"));
this.radioButton4.UseVisualStyleBackColor = true;
//
// groupBox2
//
resources.ApplyResources(this.groupBox2, "groupBox2");
this.groupBox2.Controls.Add(this.radioButton5);
this.groupBox2.Controls.Add(this.radioButton6);
this.groupBox2.Controls.Add(this.radioButton7);
this.groupBox2.Name = "groupBox2";
this.groupBox2.TabStop = false;
this.ToolTip1.SetToolTip(this.groupBox2, resources.GetString("groupBox2.ToolTip"));
//
// radioButton5
//
resources.ApplyResources(this.radioButton5, "radioButton5");
this.radioButton5.Name = "radioButton5";
this.radioButton5.TabStop = true;
this.ToolTip1.SetToolTip(this.radioButton5, resources.GetString("radioButton5.ToolTip"));
this.radioButton5.UseVisualStyleBackColor = true;
this.radioButton5.CheckedChanged += new System.EventHandler(this.Foreign_CheckedChanged);
//
// radioButton6
//
resources.ApplyResources(this.radioButton6, "radioButton6");
this.radioButton6.Name = "radioButton6";
this.radioButton6.TabStop = true;
this.ToolTip1.SetToolTip(this.radioButton6, resources.GetString("radioButton6.ToolTip"));
this.radioButton6.UseVisualStyleBackColor = true;
this.radioButton6.CheckedChanged += new System.EventHandler(this.Foreign_CheckedChanged);
//
// radioButton7
//
resources.ApplyResources(this.radioButton7, "radioButton7");
this.radioButton7.Name = "radioButton7";
this.radioButton7.TabStop = true;
this.ToolTip1.SetToolTip(this.radioButton7, resources.GetString("radioButton7.ToolTip"));
this.radioButton7.UseVisualStyleBackColor = true;
//
// panel8
//
resources.ApplyResources(this.panel8, "panel8");
this.panel8.Controls.Add(this.label24);
this.panel8.Controls.Add(this.label23);
this.panel8.Controls.Add(this.radioButton11);
......@@ -856,27 +803,24 @@
this.panel8.Controls.Add(this.buttonA);
this.panel8.Controls.Add(this.label22);
this.panel8.Controls.Add(this.label21);
resources.ApplyResources(this.panel8, "panel8");
this.panel8.Name = "panel8";
this.ToolTip1.SetToolTip(this.panel8, resources.GetString("panel8.ToolTip"));
//
// label24
//
resources.ApplyResources(this.label24, "label24");
this.label24.Name = "label24";
this.ToolTip1.SetToolTip(this.label24, resources.GetString("label24.ToolTip"));
//
// label23
//
resources.ApplyResources(this.label23, "label23");
this.label23.Name = "label23";
this.ToolTip1.SetToolTip(this.label23, resources.GetString("label23.ToolTip"));
//
// radioButton11
//
resources.ApplyResources(this.radioButton11, "radioButton11");
this.radioButton11.Name = "radioButton11";
this.radioButton11.TabStop = true;
this.ToolTip1.SetToolTip(this.radioButton11, resources.GetString("radioButton11.ToolTip"));
this.radioButton11.UseVisualStyleBackColor = true;
this.radioButton11.CheckedChanged += new System.EventHandler(this.radioButton11_CheckedChanged);
//
......@@ -885,7 +829,6 @@
resources.ApplyResources(this.radioButton10, "radioButton10");
this.radioButton10.Name = "radioButton10";
this.radioButton10.TabStop = true;
this.ToolTip1.SetToolTip(this.radioButton10, resources.GetString("radioButton10.ToolTip"));
this.radioButton10.UseVisualStyleBackColor = true;
this.radioButton10.CheckedChanged += new System.EventHandler(this.radioButton10_CheckedChanged);
//
......@@ -893,13 +836,11 @@
//
resources.ApplyResources(this.richTextBox1, "richTextBox1");
this.richTextBox1.Name = "richTextBox1";
this.ToolTip1.SetToolTip(this.richTextBox1, resources.GetString("richTextBox1.ToolTip"));
//
// textBox12
//
resources.ApplyResources(this.textBox12, "textBox12");
this.textBox12.Name = "textBox12";
this.ToolTip1.SetToolTip(this.textBox12, resources.GetString("textBox12.ToolTip"));
this.textBox12.TextChanged += new System.EventHandler(this.vInput_Limit_TextChange);
this.textBox12.MouseLeave += new System.EventHandler(this.vInput_Limit_MouseLeave);
//
......@@ -907,7 +848,6 @@
//
resources.ApplyResources(this.textBox11, "textBox11");
this.textBox11.Name = "textBox11";
this.ToolTip1.SetToolTip(this.textBox11, resources.GetString("textBox11.ToolTip"));
this.textBox11.TextChanged += new System.EventHandler(this.vInput_Limit_TextChange);
this.textBox11.MouseLeave += new System.EventHandler(this.vInput_Limit_MouseLeave);
//
......@@ -915,7 +855,6 @@
//
resources.ApplyResources(this.buttonA, "buttonA");
this.buttonA.Name = "buttonA";
this.ToolTip1.SetToolTip(this.buttonA, resources.GetString("buttonA.ToolTip"));
this.buttonA.UseVisualStyleBackColor = true;
this.buttonA.Click += new System.EventHandler(this.buttonA_Click);
//
......@@ -923,26 +862,22 @@
//
resources.ApplyResources(this.label22, "label22");
this.label22.Name = "label22";
this.ToolTip1.SetToolTip(this.label22, resources.GetString("label22.ToolTip"));
//
// label21
//
resources.ApplyResources(this.label21, "label21");
this.label21.Name = "label21";
this.ToolTip1.SetToolTip(this.label21, resources.GetString("label21.ToolTip"));
//
// panel4
//
resources.ApplyResources(this.panel4, "panel4");
this.panel4.Controls.Add(this.splitContainer1);
this.panel4.Name = "panel4";
this.ToolTip1.SetToolTip(this.panel4, resources.GetString("panel4.ToolTip"));
//
// button1
//
resources.ApplyResources(this.button1, "button1");
this.button1.Name = "button1";
this.ToolTip1.SetToolTip(this.button1, resources.GetString("button1.ToolTip"));
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.Button1_Click);
//
......@@ -950,7 +885,6 @@
//
resources.ApplyResources(this.button2, "button2");
this.button2.Name = "button2";
this.ToolTip1.SetToolTip(this.button2, resources.GetString("button2.ToolTip"));
this.button2.UseVisualStyleBackColor = true;
this.button2.Click += new System.EventHandler(this.Button2_Click);
//
......@@ -966,12 +900,17 @@
this.Controls.Add(this.button1);
this.Controls.Add(this.panel4);
this.Name = "SysConfigSecondary";
this.ToolTip1.SetToolTip(this, resources.GetString("$this.ToolTip"));
this.Load += new System.EventHandler(this.SysConfigSecondary_Load);
this.splitContainer1.Panel1.ResumeLayout(false);
this.splitContainer1.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
this.splitContainer1.ResumeLayout(false);
this.panel3.ResumeLayout(false);
this.groupBox8.ResumeLayout(false);
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.groupBox2.ResumeLayout(false);
this.groupBox2.PerformLayout();
this.panel1.ResumeLayout(false);
this.groupBox9.ResumeLayout(false);
this.groupBox9.PerformLayout();
......@@ -996,12 +935,6 @@
this.CmsDeletRow.ResumeLayout(false);
this.panel2.ResumeLayout(false);
this.panel2.PerformLayout();
this.panel3.ResumeLayout(false);
this.groupBox8.ResumeLayout(false);
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.groupBox2.ResumeLayout(false);
this.groupBox2.PerformLayout();
this.panel8.ResumeLayout(false);
this.panel8.PerformLayout();
this.panel4.ResumeLayout(false);
......@@ -1109,5 +1042,8 @@
private System.Windows.Forms.ComboBox comboBox_AntiControlMode;
private System.Windows.Forms.TextBox textBox_AntiControlFormName;
private System.Windows.Forms.ComboBox comboBox_FollowStop;
private System.Windows.Forms.CheckBox checkBox_Cloud;
private System.Windows.Forms.Label label12;
private System.Windows.Forms.ComboBox comboBox1;
}
}
\ No newline at end of file
GcDevicePc/auxtool.cs
View file @ 5587fca6
......@@ -682,11 +682,21 @@ namespace GcDevicePc
else
ToolTip1.Show("TCD reference setting:\nN2 70mA\nAr 100mA\nH2 100mA\nHe 100mA", lab_tcdHelp, 10000);
}
TempTrend temp ;
private void btn_TempTrend_Click(object sender, EventArgs e)
{
TempTrend temp = new TempTrend();
if (temp==null||temp.IsDisposed)
{
temp = new TempTrend();
temp.Show();
temp.Activate();
}
else
{
temp.Activate();
}
}
#region 云盒子模拟测试,可删除
DataInstance dataInstance;
......
GcDevicePc/auxtool.resx
View file @ 5587fca6
......@@ -822,6 +822,9 @@
<data name="button_CloudBox.Text" xml:space="preserve">
<value>模拟初拟化</value>
</data>
<data name="button_CloudBox.Visible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="&gt;&gt;button_CloudBox.Name" xml:space="preserve">
<value>button_CloudBox</value>
</data>
......@@ -984,6 +987,9 @@
<data name="comboBox1.Text" xml:space="preserve">
<value>仪器信息</value>
</data>
<data name="comboBox1.Visible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="&gt;&gt;comboBox1.Name" xml:space="preserve">
<value>comboBox1</value>
</data>
......@@ -1011,6 +1017,9 @@
<data name="button_Send.Text" xml:space="preserve">
<value>发送选择项</value>
</data>
<data name="button_Send.Visible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="&gt;&gt;button_Send.Name" xml:space="preserve">
<value>button_Send</value>
</data>
......@@ -1035,9 +1044,6 @@
<data name="groupBox2.Text" xml:space="preserve">
<value>调试</value>
</data>
<data name="groupBox2.Visible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="&gt;&gt;groupBox2.Name" xml:space="preserve">
<value>groupBox2</value>
</data>
......
VocsSetup/GC_Config/GC_CfgBak/GC_DataPro/Calibrationdel_20220321133655.std 0 → 100644
View file @ 5587fca6
[SYSINFO]
ECOUNT=3
[ENTITY0]
ECC=NMHC,0,2,0,0,0,-2147483648,0,0,0,1,mV,1000,uV,ppm,0,0,0,0,0
ECCD0=1,浓度1,1,,0,,1
ECCD0_Orig0=0,uV*sec,0529094515,D:\work\Vocs\VocsSetup\GC_User\原始数据\0529094515.raw
[ENTITY1]
ECC=THC,0,2,0,6.092811E-05,2.535293E-08,-2147483648,0,0,1,1,mV,1000,uV,ppm,0,0,0,0,0
ECCD0=1,浓度1,2,,32825.57,,1
ECCD0_Orig0=32825.57,uV*sec,0529094515,D:\work\Vocs\VocsSetup\GC_User\原始数据\0529094515.raw
[ENTITY2]
ECC=CH4,0,2,0,1.708479E-05,-1.103432E-08,-2147483648,0,0,1,1,mV,1000,uV,ppm,0,0,0,0,0
ECCD0=1,浓度1,1,,58531.58,,1
ECCD0_Orig0=58531.58,uV*sec,0529094515,D:\work\Vocs\VocsSetup\GC_User\原始数据\0529094515.raw
VocsSetup/GC_Config/GC_DataPro/AutoAdjust.ini
View file @ 5587fca6
[SYSINFO]
ECOUNT=3
[ENTITY0]
ECC=NMHC,1,0,0,1
[ENTITY1]
ECC=THC,1,0,0,1
[ENTITY1]
ECC=NMHC,1,0,0,1
[ENTITY2]
ECC=CH4,1,0,0,1
VocsSetup/GC_Config/GC_DataPro/Calibrationdel.std
View file @ 5587fca6
[SYSINFO]
ECOUNT=3
[ENTITY0]
ECC=NMHC,0,2,0,0,0,-2147483648,0,0,0,1,mV,1000,uV,ppm,0,0,0,0,0
ECCD0=1,浓度1,1,,0,,1
ECCD0_Orig0=0,uV*sec,0529094515,D:\work\Vocs\VocsSetup\GC_User\原始数据\0529094515.raw
ECC=THC,0,2,0,0,0,-2147483648,0,0,0,1,mV,1000,uV,ppm,0,0,0,0,0
ECCD0=1,浓度1,30,,0,,1
ECCD0_Orig0=0,uV*sec,0321110304-A,D:\work\色谱\Vocs\VocsSetup\GC_User\原始数据\0321110304-A.raw
[ENTITY1]
ECC=THC,0,2,0,6.092811E-05,2.535293E-08,-2147483648,0,0,1,1,mV,1000,uV,ppm,0,0,0,0,0
ECCD0=1,浓度1,2,,32825.57,,1
ECCD0_Orig0=32825.57,uV*sec,0529094515,D:\work\Vocs\VocsSetup\GC_User\原始数据\0529094515.raw
ECC=NMHC,0,2,0,0.01228547,1.780032E-07,-2147483648,0,0,1,1,mV,1000,uV,ppm,0,0,0,0,0
ECCD0=1,浓度1,10,,813.97,,1
ECCD0_Orig0=813.97,uV*sec,0321110304-A,D:\work\色谱\Vocs\VocsSetup\GC_User\原始数据\0321110304-A.raw
[ENTITY2]
ECC=CH4,0,2,0,1.708479E-05,-1.103432E-08,-2147483648,0,0,1,1,mV,1000,uV,ppm,0,0,0,0,0
ECCD0=1,浓度1,1,,58531.58,,1
ECCD0_Orig0=58531.58,uV*sec,0529094515,D:\work\Vocs\VocsSetup\GC_User\原始数据\0529094515.raw
ECC=CH4,0,2,0,0.009859211,-5.3182E-07,-2147483648,0,0,1,1,mV,1000,uV,ppm,0,0,0,0,0
ECCD0=1,浓度1,20,,2028.56,,1
ECCD0_Orig0=2028.56,uV*sec,0321110304-A,D:\work\色谱\Vocs\VocsSetup\GC_User\原始数据\0321110304-A.raw
VocsSetup/GC_Config/GC_DataPro/Ingredient.ini
View file @ 5587fca6
[SYSINFO]
ECOUNT=64
[ENTITY0]
ID=1
NAME=NMHC
[ENTITY1]
ID=2
NAME=THC
[ENTITY2]
ID=3
NAME=CH4
[ENTITY3]
ID=4
NAME=Benzene
[ENTITY4]
ID=5
NAME=Toluene
[ENTITY5]
ID=6
NAME=Xylene
[ENTITY6]
ID=7
NAME=Acrolein
[ENTITY7]
ID=8
NAME=bimethyl
[ENTITY8]
ID=9
NAME=Ethene
[ENTITY9]
ID=10
NAME=1-Propene
[ENTITY10]
ID=11
NAME=2-methyl-Propane
[ENTITY11]
ID=12
NAME=n-Butane
[ENTITY12]
ID=13
NAME=Acetylene
[ENTITY13]
ID=14
NAME=(E)-2-Butene
[ENTITY14]
ID=15
NAME=1-Butene
[ENTITY15]
ID=16
NAME=(Z)-2-Butene
[ENTITY16]
ID=17
NAME=Cyclopentane
[ENTITY17]
ID=18
NAME=2-Methylbutane
[ENTITY18]
ID=19
NAME=Pentane
[ENTITY19]
ID=20
NAME=TRANS-2-PENTENE
[ENTITY20]
ID=21
NAME=1-Pentene
[ENTITY21]
ID=22
NAME=2-PENTENENITRILE
[ENTITY22]
ID=23
NAME=2,2-Dimethylbutane
[ENTITY23]
ID=24
NAME=2,3-DIMETHYLBUTANE
[ENTITY24]
ID=25
NAME=2-methylpentane
[ENTITY25]
ID=26
NAME=3-METHYLPENTANE
[ENTITY26]
ID=27
NAME=Isoprene
[ENTITY27]
ID=28
NAME=Hexane
[ENTITY28]
ID=29
NAME=1-Hexene
[ENTITY29]
ID=30
NAME=Methylcyclopentane
[ENTITY30]
ID=31
NAME=2,4-DIMETHYLPENTANE
[ENTITY31]
ID=32
NAME=Cyclohexane
[ENTITY32]
ID=33
NAME=ISOHEPTANE
[ENTITY33]
ID=34
NAME=2,3-Dimethylpentane
[ENTITY34]
ID=35
NAME=3-METHYLHEXANE
[ENTITY35]
ID=36
NAME=2,2,4-Trimethylpentane
[ENTITY36]
ID=37
NAME=Heptane
[ENTITY37]
ID=38
NAME=Methylcyclohexane
[ENTITY38]
ID=39
NAME=2,3,4-TRIMETHYLPENTANE
[ENTITY39]
ID=40
NAME=2-METHYLHEPTANE
[ENTITY40]
ID=41
NAME=3-METHYLHEPTANE
[ENTITY41]
ID=42
NAME=N-OCTANE
[ENTITY42]
ID=43
NAME=Styrene
[ENTITY43]
ID=44
NAME=o-Xylene
[ENTITY44]
ID=45
NAME=N-NONANE
[ENTITY45]
ID=46
NAME=Cumene
[ENTITY46]
ID=47
NAME=N-PROPYLBENZENE
[ENTITY47]
ID=48
NAME=3-ETHYLTOLUENE
[ENTITY48]
ID=49
NAME=4-ETHYLTOLUENE
[ENTITY49]
ID=50
NAME=Mesitylene
[ENTITY50]
ID=51
NAME=1,2,4-Trimethylbenzene
[ENTITY51]
ID=52
NAME=1,2,3-Trimethylbenzene
[ENTITY52]
ID=53
NAME=2-ETHYLTOLUENE
[ENTITY53]
ID=54
NAME=Decane
[ENTITY54]
ID=55
NAME=1,3-Diethylbenzene
[ENTITY55]
ID=56
NAME=1,4-DIETHYLBENZENE
[ENTITY56]
ID=57
NAME=n-Hendecane
[ENTITY57]
ID=58
NAME=Dodecane
[ENTITY58]
ID=59
NAME=Default
[ENTITY59]
ID=60
NAME=Oxygen
[ENTITY60]
ID=61
NAME=Propane
[ENTITY61]
ID=62
NAME=m-Xylene
[ENTITY62]
ID=63
NAME=P-XYLENE
[ENTITY63]
ID=64
NAME=Methanol
[ENTITY64]
ID=65
NAME=Ethylbenzene
[ENTITY65]
ID=66
NAME=DIPENTENE
[ENTITY66]
ID=67
NAME=Acetaldehyde
\ No newline at end of file
VocsSetup/GC_Config/GC_DataPro/SpectralDefault.comp
View file @ 5587fca6
......@@ -2,8 +2,8 @@
ECOUNT=3
COEF=1
[ENTITY0]
ETXT=0,NMHC,0,0,0,0,255,0,0,100000,1,0,0
ETXT=0,NMHC,0.04,0.25,0,0,255,0,0,100000,1,0,0
[ENTITY1]
ETXT=0,THC,0.01,0.1,0,0,255,0,0,100000,1,0,0
ETXT=0,THC,0,0,0,0,255,0,0,100000,1,0,0
[ENTITY2]
ETXT=0,CH4,0.1,0.15,0,0,255,0,0,100000,1,0,0
ETXT=0,CH4,0.27,0.4,0,0,255,0,0,100000,1,0,0
VocsSetup/GC_Config/GC_Set/Startup/startup.ini
View file @ 5587fca6
[NetWorkConfig]
MAC地址=F8:02:78:60:74:58
网口=以太网 2
MAC地址=F8:02:78:60:70:76
网口=WLAN
搜索时间=60
[StartUp]
自启动=0
......@@ -11,6 +11,7 @@ space=500
Datetime=1
TdName=TVOC5.7
开机界面=1
启用云盒子=1
[DataFolder]
历史数据=D:\work\Vocs\VocsSetup\GC_Config\GC_Set\Historical Data
分级文件夹=0
......@@ -26,7 +27,7 @@ Name=admin
Password=123456
[SendData]
Thirdparty=1
Foreign=2
Foreign=1
SendType=Routine
[SaveData]
ZBSaveData=1
......@@ -37,3 +38,5 @@ ZBSaveData=1
反控模式=被控
反控进程名称=SmartSampler
开始停止触发=触发开始和停止
[NMHC]
测定方式=直测
VocsSetup/GC_Config/GC_Set/Startup/sys.ini
View file @ 5587fca6
......@@ -8,11 +8,12 @@ Count3=FALSE
[O2CpdCount]
O2value=21
[免登录]
锚点日期=2022/3/9
锚点日期=2022/3/22
勾选类型=2
[TempTrend]
启用网格X=FALSE
启用网格Y=FALSE
显示节点数据=FALSE
显示节点数据=TRUE
背景颜色=White
上次加载数据=
跟随分析启动=1
VocsSetup/GC_Config/GC_Set/tmpfile/58/DevStatus.iniᯘʾ纐¹ deleted 100644 → 0
View file @ 1961b0e8
Binary files "a/VocsSetup/GC_Config/GC_Set/tmpfile/58/DevStatus.ini\341\257\230\312\276\347\272\220\302\271" and /dev/null differ
dll/CKVocAlgorithm.dll
View file @ 5587fca6
No preview for this file type
dll/CKVocAnalyzer.dll
View file @ 5587fca6
No preview for this file type
dll/WindowsFormsControlLibrary_PopUp/Properties/AssemblyInfo.cs 0 → 100644
View file @ 5587fca6
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// 有关程序集的一般信息由以下
// 控制。更改这些特性值可修改
// 与程序集关联的信息。
[assembly: AssemblyTitle("WindowsFormsControlLibrary_PopUp")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("WindowsFormsControlLibrary_PopUp")]
[assembly: AssemblyCopyright("Copyright © 2022")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// 将 ComVisible 设置为 false 会使此程序集中的类型
//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
//请将此类型的 ComVisible 特性设置为 true。
[assembly: ComVisible(false)]
// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
[assembly: Guid("afc4ddc8-d40d-481e-ae7a-5afb73c88e78")]
// 程序集的版本信息由下列四个值组成:
//
// 主版本
// 次版本
// 生成号
// 修订号
//
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
dll/WindowsFormsControlLibrary_PopUp/UserControl_PopUp.Designer.cs 0 → 100644
View file @ 5587fca6
namespace WindowsFormsControlLibrary_PopUp
{
partial class UserControl_PopUp
{
/// <summary>
/// 必需的设计器变量。
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// 清理所有正在使用的资源。
/// </summary>
/// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region 组件设计器生成的代码
/// <summary>
/// 设计器支持所需的方法 - 不要修改
/// 使用代码编辑器修改此方法的内容。
/// </summary>
private void InitializeComponent()
{
this.lab_Close = new System.Windows.Forms.Label();
this.label_Suggerimenti = new System.Windows.Forms.Label();
this.timer1 = new System.Windows.Forms.Timer();
this.SuspendLayout();
//
// lab_Close
//
this.lab_Close.AutoSize = true;
this.lab_Close.BackColor = System.Drawing.Color.Transparent;
this.lab_Close.Dock = System.Windows.Forms.DockStyle.Top;
this.lab_Close.Location = new System.Drawing.Point(0, 0);
this.lab_Close.Name = "lab_Close";
this.lab_Close.Size = new System.Drawing.Size(53, 12);
this.lab_Close.TabIndex = 2;
this.lab_Close.Text = "我知道了";
this.lab_Close.Click += new System.EventHandler(this.lab_Close_Click);
//
// label_Suggerimenti
//
this.label_Suggerimenti.AutoSize = true;
this.label_Suggerimenti.BackColor = System.Drawing.Color.Transparent;
this.label_Suggerimenti.Location = new System.Drawing.Point(19, 27);
this.label_Suggerimenti.Name = "label_Suggerimenti";
this.label_Suggerimenti.Size = new System.Drawing.Size(23, 12);
this.label_Suggerimenti.TabIndex = 3;
this.label_Suggerimenti.Text = "cs2";
//
// timer1
//
this.timer1.Interval = 5000;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
// UserControl_PopUp
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoSize = true;
this.Controls.Add(this.label_Suggerimenti);
this.Controls.Add(this.lab_Close);
this.Name = "UserControl_PopUp";
this.Size = new System.Drawing.Size(251, 70);
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private System.Windows.Forms.Label label_Suggerimenti;
public System.Windows.Forms.Label lab_Close;
private System.Windows.Forms.Timer timer1;
}
}
dll/WindowsFormsControlLibrary_PopUp/UserControl_PopUp.cs 0 → 100644
View file @ 5587fca6
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Data;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace WindowsFormsControlLibrary_PopUp
{
delegate void DelChangePopUpMsg(string txt);
delegate void DelPopUpAction();
public partial class UserControl_PopUp : UserControl
{
private event DelChangePopUpMsg delChangePopUpMsg;
private event DelPopUpAction delPopUpHide;
private event DelPopUpAction delPopUpShow;
public UserControl_PopUp()
{
InitializeComponent();
delChangePopUpMsg += new DelChangePopUpMsg(ChangePopUpMsg);
delPopUpHide += new DelPopUpAction(PopUpHide);
delPopUpShow += new DelPopUpAction(PopUpShow);
}
//private string s_PopUpMsg;
//[Description("弹窗true弹出,false收回")] // 显示在属性设计视图中的描述
private bool b_PopUpInOut;
//public bool PopUpInOut
//{
// get
// {
// return b_PopUpInOut;
// }
// set
// {
// b_PopUpInOut = value;
// if (b_PopUpInOut)
// {
// PopUpShow();
// }
// else
// {
// PopUpHide();
// }
// }
//}
[Description("弹窗展示消息")]
public string PopUpMsg
{
get
{
return label_Suggerimenti.Text;
}
set
{
ChangePopUpMsg(value);
if (b_PopUpInOut)
{
PopUpHide();
PopUpShow();
}
else
{
PopUpShow();
}
}
}
private void ChangePopUpMsg(string msg)
{
if (label_Suggerimenti.InvokeRequired)
{
label_Suggerimenti.Invoke(delChangePopUpMsg, msg);
}
else
{
label_Suggerimenti.Text = msg;
}
}
/// <summary>
/// 事件
/// </summary>
public event EventHandler BtnTestClick;
private void lab_Close_Click(object sender, EventArgs e)
{
PopUpHide();
}
/// <summary>
/// 隐藏弹窗
/// </summary>
public void PopUpHide()
{
if (this.InvokeRequired)
{
this.Invoke(delPopUpHide);
}
else
{
b_PopUpInOut = false;
SamplerCounterControl.CounterControl.FormOut(this.Handle);
timer1.Stop();
}
}
/// <summary>
/// 打开弹窗
/// </summary>
public void PopUpShow()
{
if (this.InvokeRequired)
{
this.Invoke(delPopUpShow);
}
else
{
b_PopUpInOut = true;
SamplerCounterControl.CounterControl.FormIn(this.Handle);
timer1.Start();
}
}
private void timer1_Tick(object sender, EventArgs e)
{
if (b_PopUpInOut)
{
PopUpHide();
}
}
}
}
dll/WindowsFormsControlLibrary_PopUp/UserControl_PopUp.resx 0 → 100644
View file @ 5587fca6
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>
\ No newline at end of file
dll/WindowsFormsControlLibrary_PopUp/WindowsFormsControlLibrary_PopUp.csproj 0 → 100644
View file @ 5587fca6
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{AFC4DDC8-D40D-481E-AE7A-5AFB73C88E78}</ProjectGuid>
<OutputType>Library</OutputType>
<RootNamespace>WindowsFormsControlLibrary_PopUp</RootNamespace>
<AssemblyName>WindowsFormsControlLibrary_PopUp</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="SamplerCounterControl">
<HintPath>..\..\..\Program Files (x86)\SQLite.NET\bin\x64\SamplerCounterControl.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="UserControl_PopUp.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="UserControl_PopUp.Designer.cs">
<DependentUpon>UserControl_PopUp.cs</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Service Include="{94E38DFF-614B-4cbd-B67C-F211BB35CE8B}" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="UserControl_PopUp.resx">
<DependentUpon>UserControl_PopUp.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
\ No newline at end of file
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