Skip to content

G
GC_Branch
Commit 5e1bfd33 authored by wangjunqiang's avatar wangjunqiang
Browse files
Options

添加了单次运行调试功能

parent d6c90070
Show whitespace changes
Inline Side-by-side
Showing with 931 additions and 167 deletions
GcDevicePc/AboutForm.Designer.cs 0 → 100644
View file @ 5e1bfd33
namespace GcDevicePc
{
partial class AboutForm
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AboutForm));
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
this.label6 = new System.Windows.Forms.Label();
this.tempver = new System.Windows.Forms.Label();
this.powerver = new System.Windows.Forms.Label();
this.PCver = new System.Windows.Forms.Label();
this.fid1ver = new System.Windows.Forms.Label();
this.fid2ver = new System.Windows.Forms.Label();
this.tcdver = new System.Windows.Forms.Label();
this.groupBox1.SuspendLayout();
this.SuspendLayout();
//
// groupBox1
//
this.groupBox1.Controls.Add(this.tcdver);
this.groupBox1.Controls.Add(this.fid2ver);
this.groupBox1.Controls.Add(this.fid1ver);
this.groupBox1.Controls.Add(this.PCver);
this.groupBox1.Controls.Add(this.powerver);
this.groupBox1.Controls.Add(this.tempver);
this.groupBox1.Controls.Add(this.label6);
this.groupBox1.Controls.Add(this.label5);
this.groupBox1.Controls.Add(this.label4);
this.groupBox1.Controls.Add(this.label3);
this.groupBox1.Controls.Add(this.label2);
this.groupBox1.Controls.Add(this.label1);
this.groupBox1.Location = new System.Drawing.Point(12, 12);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(380, 167);
this.groupBox1.TabIndex = 0;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "固件版本";
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(6, 29);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(71, 12);
this.label1.TabIndex = 0;
this.label1.Text = "温控板版本:";
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(6, 75);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(71, 12);
this.label2.TabIndex = 1;
this.label2.Text = "电源板版本:";
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(6, 121);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(113, 12);
this.label3.TabIndex = 2;
this.label3.Text = "软件版本(HMI/PC)：";
//
// label4
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(203, 29);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(59, 12);
this.label4.TabIndex = 3;
this.label4.Text = "FID1版本:";
//
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(203, 75);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(59, 12);
this.label5.TabIndex = 4;
this.label5.Text = "FID2版本:";
//
// label6
//
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(203, 121);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(53, 12);
this.label6.TabIndex = 5;
this.label6.Text = "TCD版本:";
//
// tempver
//
this.tempver.AutoSize = true;
this.tempver.Location = new System.Drawing.Point(96, 29);
this.tempver.Name = "tempver";
this.tempver.Size = new System.Drawing.Size(23, 12);
this.tempver.TabIndex = 6;
this.tempver.Text = "0.0";
//
// powerver
//
this.powerver.AutoSize = true;
this.powerver.Location = new System.Drawing.Point(96, 75);
this.powerver.Name = "powerver";
this.powerver.Size = new System.Drawing.Size(23, 12);
this.powerver.TabIndex = 7;
this.powerver.Text = "0.0";
//
// PCver
//
this.PCver.AutoSize = true;
this.PCver.Location = new System.Drawing.Point(116, 121);
this.PCver.Name = "PCver";
this.PCver.Size = new System.Drawing.Size(23, 12);
this.PCver.TabIndex = 8;
this.PCver.Text = "1.4";
//
// fid1ver
//
this.fid1ver.AutoSize = true;
this.fid1ver.Location = new System.Drawing.Point(268, 29);
this.fid1ver.Name = "fid1ver";
this.fid1ver.Size = new System.Drawing.Size(23, 12);
this.fid1ver.TabIndex = 9;
this.fid1ver.Text = "0.0";
//
// fid2ver
//
this.fid2ver.AutoSize = true;
this.fid2ver.Location = new System.Drawing.Point(268, 75);
this.fid2ver.Name = "fid2ver";
this.fid2ver.Size = new System.Drawing.Size(23, 12);
this.fid2ver.TabIndex = 10;
this.fid2ver.Text = "0.0";
//
// tcdver
//
this.tcdver.AutoSize = true;
this.tcdver.Location = new System.Drawing.Point(268, 121);
this.tcdver.Name = "tcdver";
this.tcdver.Size = new System.Drawing.Size(23, 12);
this.tcdver.TabIndex = 11;
this.tcdver.Text = "0.0";
//
// AboutForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(404, 191);
this.Controls.Add(this.groupBox1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "AboutForm";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "关于";
this.Load += new System.EventHandler(this.AboutForm_Load);
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.ResumeLayout(false);
}
#endregion
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.Label label5;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label tcdver;
private System.Windows.Forms.Label fid2ver;
private System.Windows.Forms.Label fid1ver;
private System.Windows.Forms.Label PCver;
private System.Windows.Forms.Label powerver;
private System.Windows.Forms.Label tempver;
}
}
\ No newline at end of file
GcDevicePc/AboutForm.cs 0 → 100644
View file @ 5e1bfd33
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace GcDevicePc
{
public partial class AboutForm : Form
{
private string Hmiversion = "";
private string Tempversion = "";
private string Powerversion = "";
private string FID1version = "";
private string FID2version = "";
private string TCD1version = "";
public AboutForm()
{
InitializeComponent();
}
public AboutForm(ushort[] buf)
{
InitializeComponent();
this.Hmiversion = buf[1].ToString() + "." + buf[0].ToString();
this.Tempversion = buf[3].ToString() + "." + buf[2].ToString();
this.Powerversion = buf[5].ToString() + "." + buf[4].ToString();
this.FID1version = buf[7].ToString() + "." + buf[6].ToString();
this.FID2version = buf[9].ToString() + "." + buf[8].ToString();
this.TCD1version = buf[11].ToString() + "." + buf[10].ToString();
}
private void AboutForm_Load(object sender, EventArgs e)
{
this.tempver.Text = this.Tempversion;
this.powerver.Text = this.Powerversion;
this.fid1ver.Text = this.FID1version;
this.fid2ver.Text = this.FID2version;
this.tcdver.Text = this.TCD1version;
this.PCver.Text = this.Hmiversion + "/1.4.8";
}
}
}
GcDevicePc/AboutForm.resx 0 → 100644
View file @ 5e1bfd33
<?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="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAEAMDAAAAEAIACoJQAAFgAAACgAAAAwAAAAYAAAAAEAIAAAAAAAACQAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAApItECKiPQRioj
0M0qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj
0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj
0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9D/KiPQ/yoj0P8qI9DNKiPQRiki
0QIpItFOKSLR7Ski0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki
0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki
0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki0f8pItH/KSLR/yki
0f8pItH/KSLR7Ski0U4pItPZKSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki
0/8pItP/KSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki
0/8pItP/KSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki0/8pItP/KSLT/yki
0/8pItP/KSLT/yki0/8pItP/KSLT/yki09kpItT9KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki
1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki
1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki
1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P8pItT/KSLU/yki1P0oIdb/KCHW/ygh1v8oIdb/KCHV+Skh
1acpIdVAKSLUJCki1CQpItQkKSLUJCki1CQpItQkKSLUJCki1CQpItQkKSLUJCki1CQpItQkKSLUJCki
1CQpItQkKSLUJCki1CQpItQkKSLUJCki1CQpItQkKSLUJCki1CQpItQkKSLUJCki1CQpItQkKSLUJCki
1CQpItQkKSLUJCki1CQpItQkKSHVJikh1UgpIdWnKCHV+Sgh1v8oIdb/KCHW/ygh1v8oIdf/KCHX/ygh
1/8oIdf/KCHXrSkh1ioAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAApIdYqKCHXrSgh1/8oIdf/KCHX/ygh
1/8oINj/KCDY/ygg2P8oINj/KCHYZgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKCHYZigg
2P8oINj/KCDY/ygg2P8nINr/JyDa/ycg2v8nINr/JyDZWAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAJyDZWCcg2v8nINr/JyDa/ycg2v8nINv/JyDb/ycg2/8nINv/JyDbXAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAJyDbXCcg2/8nINv/JyDb/ycg2/8nH93/Jx/d/ycf3f8nH93/Jx/dXAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJx/dXCcf3f8nH93/Jx/d/ycf3f8nH97/Jx/e/ycf
3v8nH97/Jx/eXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJx/eXCcf3v8nH97/Jx/e/ycf
3v8nH9//Jx/f/ycf3/8nH9//Jx/fXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJx/fXCcf
3/8nH9//Jx/f/ycf3/8mH+H/Jh/h/yYf4f8mH+H/Jh/hXCcg6/8nIOv/JyDr/ycg6/8nIOv/JyDr/ycg
6/8mIOv/Jh/r/ygi7GInIewEJyHsECYg67smH+v/JiDr/ycg6/8nIOv/JyDr/ycg6/8mH+v/Jh/r/yom
7A4oIuy/JyDr/ych7P8mH+v/Jh7q/yYf680lHeo8JR7q/yYe6v8mHur/JR3q/yUd6v8lHer/JBzq/yQc
6v8kHOr/Jh/hXCYf4f8mH+H/Jh/h/yYf4f8mHuL/Jh7i/yYe4v8mHuL/Jh7iXCkm7J8pJuyrKSbsqykm
7KspJuyrKSbsqykl7K0rKOzjKyjs/yso7M0tLO0ULSrsPCoo7NkrKOz9Kifszykl7KsqJuyrKSbsqykl
7K0rKeztKyjs/zM17kAvLu25LSrt/ysm7N0nIOnfJx/o/ycg6b8mHuk8JyDq9ygg6v8nH+rjJh7qxSYe
660mHuurJR3rqyQd66skHeufJh7iXCYe4v8mHuL/Jh7i/yYe4v8mHuT/Jh7k/yYe5P8mHuT/Jh7kXAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwMO1wMDHt9y8w7f80OO46MjTtcC8w7fswMe3nLi7tTAAA
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
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAPUbvXD1G7/89Ru//PUbv/z1G7/8/Su//P0rv/z9K7/8/Su//P0rvXAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0rvXD9K7/8/Su//P0rv/z9K7/9DT+//Q0/v/0NP
7/9DT+//Q0/vXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ0/vXENP7/9DT+//Q0/v/0NP
7/9GVPD/RlTw/0ZU8P9GVPD/RlTwXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARlTwXEZU
8P9GVPD/RlTw/0ZU8P9JWfD/SVnw/0lZ8P9JWfD/SVrwWAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAASVrwWElZ8P9JWfD/SVnw/0lZ8P9MX/H/TF/x/0xf8f9MXvH/TWHxZgAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAATWHxZkxe8f9MX/H/TF/x/0xf8f9PY/H/T2Px/09j8f9PY/H/T2LxrVBl
8SpTafEGU2nyBlNp8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp
8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp
8gZTafIGU2nyBlNp8gZTafIGU2nyBlNp8QZQZfEqT2LxrU9j8f9PY/H/T2Px/09j8f9SaPH/Umjx/1Jo
8f9SaPH/Umjx+VFo8aNTafFcU2nyXlNp8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp
8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp
8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp8l5TafJeU2nyXlNp8VxRaPGjUmjx+VJo8f9SaPH/Umjx/1Jo
8f9UbfL9VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt
8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt
8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt8v9UbfL/VG3y/1Rt
8v9UbfL/VG3y/1Rt8v1XcfLZV3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx
8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx
8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx
8v9XcfL/V3Hy/1dx8v9XcfL/V3Hy/1dx8tlZdfJOWnby7Vp28v9advL/Wnby/1p28v9advL/Wnby/1p2
8v9advL/Wnby/1p28v9advL/Wnby/1p28v9advL/Wnby/1p28v9advL/Wnby/1p28v9advL/Wnby/1p2
8v9advL/Wnby/1p28v9advL/Wnby/1p28v9advL/Wnby/1p28v9advL/Wnby/1p28v9advL/Wnby/1p2
8v9advL/Wnby/1p28v9advL/Wnby/1p28v9advL/Wnby7Vl18k5ZdfICXXnzRl17881dfPP/XXzz/118
8/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9dfPP/XXzz/118
8/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9dfPP/XXzz/118
8/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9dfPP/XXzz/1188/9de/PNXXnzRll18gIAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///////8AAP///////wAA////////
AAD///////8AAMAAAAAAAwAAgAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAA//////AAAAH/////+AAAA//
////8AAAD//////wAAAP//////AAAA//////8AAAD//////wAAAP//////AAAAgDgCBAEAAACAGAIEAQ
AAAP+Z8ER/AAAA/4H4RH8AAAD/gfhk/wAAAP/D/OT/AAAA/8P85P8AAAD/4//k/wAAAP/n/+X/AAAA//
//5f8AAAD////l/wAAAP///+H/AAAA////4f8AAAD////h/wAAAP///+P/AAAA////4/8AAAD//////w
AAAP//////AAAA//////8AAAD//////wAAAP//////AAAA//////8AAAB//////gAAAD/////8AAAAAA
AAAAAAAAAAAAAAAAAACAAAAAAAEAAMAAAAAAAwAA////////AAD///////8AAP///////wAA////////
AAA=
</value>
</data>
</root>
\ No newline at end of file
GcDevicePc/ConfigDlg/MethodBase.cs
View file @ 5e1bfd33
......@@ -332,9 +332,8 @@ namespace GcDevicePc.ConfigDlg
if (globaldata.m_pcbuffer.gcpcinfo.pcfileinfo.cur_MethodName != null)
globaldata.m_configDlg.Save_Method();
if (globaldata.connection_ip != "" && globaldata.connection_ip != null && globaldata.createfile == false)
if (!String.IsNullOrEmpty(globaldata.connection_ip) && globaldata.createfile == false)
{
//获取配置文件
try
{
FileServerClient mainclient = new FileServerClient();
......@@ -352,6 +351,7 @@ namespace GcDevicePc.ConfigDlg
if (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.system_Statue)
{
globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.RunType = 0;
sendupdatecmd(true);
}
......
GcDevicePc/DataState.cs
View file @ 5e1bfd33
......@@ -238,24 +238,11 @@ namespace GcDevicePc
tempshow = new ListViewItem();
if (CProfileDevice.m_DevParam.syspara.u16DetFrontType == 0) //TCD
{
tempshow.Text = "TCD1";
//if (CProfileDevice.m_DevParam.tcd[0].fHeaterTempSet == 0.0f)
// tempshow.SubItems.Add(CProfileDevice.m_DevParam.tcd[0].fHeaterTempActual.ToString("#0.00") + " / " + "等待读取");
//else
// tempshow.SubItems.Add(CProfileDevice.m_DevParam.tcd[0].fHeaterTempActual.ToString("#0.00") + " / " + CProfileDevice.m_DevParam.tcd[0].fHeaterTempSet.ToString("0"));
//this.datalist.Items.Add(tempshow);
}
else if (CProfileDevice.m_DevParam.syspara.u16DetFrontType == 1)
{
// tempshow = new ListViewItem();
tempshow.Text = "FID1";
//if (CProfileDevice.m_DevParam.fid[0].fHeaterTempSet == 0.0f)
// tempshow.SubItems.Add(CProfileDevice.m_DevParam.fid[0].fHeaterActualTemp.ToString("#0.00") + " / " + "等待读取");
//else
// tempshow.SubItems.Add(CProfileDevice.m_DevParam.fid[0].fHeaterActualTemp.ToString("#0.00") + " / " + CProfileDevice.m_DevParam.fid[0].fHeaterTempSet.ToString("0"));
//this.datalist.Items.Add(tempshow);
}
if (globaldata.m_dpbuffer.ShowList.showtemp.fDetSetTemp == 0.0f)
......@@ -356,13 +343,6 @@ namespace GcDevicePc
tempshow.SubItems.Add(globaldata.m_dpbuffer.ShowList.showtemp.AuxActualTemp2.ToString("#0.00") + " / " + globaldata.m_dpbuffer.ShowList.showtemp.AuxSetTemp2.ToString("0"));
this.datalist.Items.Add(tempshow);
}
//if (CProfileDevice.m_DevParam.aux.fSetTemp_HeatArea2 == 0.0f)
// tempshow.SubItems.Add(CProfileDevice.m_DevParam.aux.fActualTemp_HeatArea2.ToString("#0.00") + " / " + "等待读取");
//else
// tempshow.SubItems.Add(CProfileDevice.m_DevParam.aux.fActualTemp_HeatArea2.ToString("#0.00") + " / " + CProfileDevice.m_DevParam.aux.fSetTemp_HeatArea2.ToString("0"));
//this.datalist.Items.Add(tempshow);
}
}
......
GcDevicePc/GcDevicePc.csproj
View file @ 5e1bfd33
......@@ -146,6 +146,12 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="AboutForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="AboutForm.Designer.cs">
<DependentUpon>AboutForm.cs</DependentUpon>
</Compile>
<Compile Include="AppInit.cs" />
<Compile Include="auxtool.cs">
<SubType>Form</SubType>
......@@ -505,6 +511,9 @@
<Compile Include="WaitForm.Designer.cs">
<DependentUpon>WaitForm.cs</DependentUpon>
</Compile>
<EmbeddedResource Include="AboutForm.resx">
<DependentUpon>AboutForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="auxtool.resx">
<DependentUpon>auxtool.cs</DependentUpon>
</EmbeddedResource>
......
GcDevicePc/MDIBase.Designer.cs
View file @ 5e1bfd33
......@@ -38,6 +38,7 @@
this.SystemStartMenu = new System.Windows.Forms.ToolStripMenuItem();
this.SystemStopMenu = new System.Windows.Forms.ToolStripMenuItem();
this.AuxToolMenu = new System.Windows.Forms.ToolStripMenuItem();
this.ParameterSettingMenu = new System.Windows.Forms.ToolStripMenuItem();
this.运行ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.NetWorkMenu = new System.Windows.Forms.ToolStripMenuItem();
this.MethodBatMenu = new System.Windows.Forms.ToolStripMenuItem();
......@@ -53,6 +54,11 @@
this.HistoryDataMenu = new System.Windows.Forms.ToolStripMenuItem();
this.CalibrationMenu = new System.Windows.Forms.ToolStripMenuItem();
this.HistoryPicMenu = new System.Windows.Forms.ToolStripMenuItem();
this.DebugMainMenu = new System.Windows.Forms.ToolStripMenuItem();
this.SingleControlMenu = new System.Windows.Forms.ToolStripMenuItem();
this.SingleStart = new System.Windows.Forms.ToolStripMenuItem();
this.SingleStop = new System.Windows.Forms.ToolStripMenuItem();
this.SingleCancel = new System.Windows.Forms.ToolStripMenuItem();
this.statusStrip = new System.Windows.Forms.StatusStrip();
this.toolStripStatusLabelusertime = new System.Windows.Forms.ToolStripStatusLabel();
this.toolStripStatusLabelText = new System.Windows.Forms.ToolStripStatusLabel();
......@@ -60,7 +66,9 @@
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.backgroundWorker1 = new System.ComponentModel.BackgroundWorker();
this.backgroundWorker2 = new System.ComponentModel.BackgroundWorker();
this.参数设置ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.HmiStatus = new System.Windows.Forms.ToolStripStatusLabel();
this.HelpMainMenu = new System.Windows.Forms.ToolStripMenuItem();
this.AboutMenu = new System.Windows.Forms.ToolStripMenuItem();
this.menuStrip.SuspendLayout();
this.statusStrip.SuspendLayout();
this.SuspendLayout();
......@@ -72,11 +80,12 @@
this.用户管理ToolStripMenuItem,
this.系统ToolStripMenuItem,
this.运行ToolStripMenuItem,
this.窗口ToolStripMenuItem});
this.窗口ToolStripMenuItem,
this.DebugMainMenu,
this.HelpMainMenu});
this.menuStrip.Location = new System.Drawing.Point(0, 0);
this.menuStrip.Name = "menuStrip";
this.menuStrip.Padding = new System.Windows.Forms.Padding(8, 2, 0, 2);
this.menuStrip.Size = new System.Drawing.Size(997, 28);
this.menuStrip.Size = new System.Drawing.Size(748, 25);
this.menuStrip.TabIndex = 0;
this.menuStrip.Text = "MenuStrip";
//
......@@ -86,20 +95,20 @@
this.UserLoginMenu,
this.UserLogoutMenu});
this.用户管理ToolStripMenuItem.Name = "用户管理ToolStripMenuItem";
this.用户管理ToolStripMenuItem.Size = new System.Drawing.Size(81, 24);
this.用户管理ToolStripMenuItem.Size = new System.Drawing.Size(68, 21);
this.用户管理ToolStripMenuItem.Text = "用户管理";
//
// UserLoginMenu
//
this.UserLoginMenu.Name = "UserLoginMenu";
this.UserLoginMenu.Size = new System.Drawing.Size(144, 26);
this.UserLoginMenu.Size = new System.Drawing.Size(124, 22);
this.UserLoginMenu.Text = "用户登录";
this.UserLoginMenu.Click += new System.EventHandler(this.UserLoginMenu_Click);
//
// UserLogoutMenu
//
this.UserLogoutMenu.Name = "UserLogoutMenu";
this.UserLogoutMenu.Size = new System.Drawing.Size(144, 26);
this.UserLogoutMenu.Size = new System.Drawing.Size(124, 22);
this.UserLogoutMenu.Text = "用户注销";
this.UserLogoutMenu.Click += new System.EventHandler(this.UserLogoutMenu_Click);
//
......@@ -109,32 +118,39 @@
this.SystemStartMenu,
this.SystemStopMenu,
this.AuxToolMenu,
this.参数设置ToolStripMenuItem});
this.ParameterSettingMenu});
this.系统ToolStripMenuItem.Name = "系统ToolStripMenuItem";
this.系统ToolStripMenuItem.Size = new System.Drawing.Size(51, 24);
this.系统ToolStripMenuItem.Size = new System.Drawing.Size(44, 21);
this.系统ToolStripMenuItem.Text = "系统";
//
// SystemStartMenu
//
this.SystemStartMenu.Name = "SystemStartMenu";
this.SystemStartMenu.Size = new System.Drawing.Size(181, 26);
this.SystemStartMenu.Size = new System.Drawing.Size(124, 22);
this.SystemStartMenu.Text = "系统开启";
this.SystemStartMenu.Click += new System.EventHandler(this.SystemStartMenu_Click);
//
// SystemStopMenu
//
this.SystemStopMenu.Name = "SystemStopMenu";
this.SystemStopMenu.Size = new System.Drawing.Size(181, 26);
this.SystemStopMenu.Size = new System.Drawing.Size(124, 22);
this.SystemStopMenu.Text = "系统关闭";
this.SystemStopMenu.Click += new System.EventHandler(this.SystemStopMenu_Click);
//
// AuxToolMenu
//
this.AuxToolMenu.Name = "AuxToolMenu";
this.AuxToolMenu.Size = new System.Drawing.Size(181, 26);
this.AuxToolMenu.Size = new System.Drawing.Size(124, 22);
this.AuxToolMenu.Text = "辅助工具";
this.AuxToolMenu.Click += new System.EventHandler(this.AuxToolMenu_Click);
//
// ParameterSettingMenu
//
this.ParameterSettingMenu.Name = "ParameterSettingMenu";
this.ParameterSettingMenu.Size = new System.Drawing.Size(124, 22);
this.ParameterSettingMenu.Text = "参数设置";
this.ParameterSettingMenu.Click += new System.EventHandler(this.ParameterSettingMenu_Click);
//
// 运行ToolStripMenuItem
//
this.运行ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
......@@ -146,48 +162,48 @@
this.toolStripSeparator1,
this.GCConfigMenuItem});
this.运行ToolStripMenuItem.Name = "运行ToolStripMenuItem";
this.运行ToolStripMenuItem.Size = new System.Drawing.Size(51, 24);
this.运行ToolStripMenuItem.Size = new System.Drawing.Size(44, 21);
this.运行ToolStripMenuItem.Text = "设置";
//
// NetWorkMenu
//
this.NetWorkMenu.Name = "NetWorkMenu";
this.NetWorkMenu.Size = new System.Drawing.Size(174, 26);
this.NetWorkMenu.Size = new System.Drawing.Size(148, 22);
this.NetWorkMenu.Text = "网络配置";
this.NetWorkMenu.Click += new System.EventHandler(this.NetWorkMenu_Click);
//
// MethodBatMenu
//
this.MethodBatMenu.Name = "MethodBatMenu";
this.MethodBatMenu.Size = new System.Drawing.Size(174, 26);
this.MethodBatMenu.Size = new System.Drawing.Size(148, 22);
this.MethodBatMenu.Text = "方法批处理";
this.MethodBatMenu.Click += new System.EventHandler(this.MethodBatMenu_Click);
//
// NewMethodMenu
//
this.NewMethodMenu.Name = "NewMethodMenu";
this.NewMethodMenu.Size = new System.Drawing.Size(174, 26);
this.NewMethodMenu.Size = new System.Drawing.Size(148, 22);
this.NewMethodMenu.Text = "新建方法";
this.NewMethodMenu.Click += new System.EventHandler(this.NewMethodMenu_Click);
//
// OpenMethodMenu
//
this.OpenMethodMenu.Name = "OpenMethodMenu";
this.OpenMethodMenu.Size = new System.Drawing.Size(174, 26);
this.OpenMethodMenu.Size = new System.Drawing.Size(148, 22);
this.OpenMethodMenu.Text = "打开方法文件";
this.OpenMethodMenu.Click += new System.EventHandler(this.OpenMethodMenu_Click);
//
// MethodBrowseMenuItem
//
this.MethodBrowseMenuItem.Name = "MethodBrowseMenuItem";
this.MethodBrowseMenuItem.Size = new System.Drawing.Size(174, 26);
this.MethodBrowseMenuItem.Size = new System.Drawing.Size(148, 22);
this.MethodBrowseMenuItem.Text = "方法查阅";
this.MethodBrowseMenuItem.Click += new System.EventHandler(this.MethodBrowseMenuItem_Click);
//
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(171, 6);
this.toolStripSeparator1.Size = new System.Drawing.Size(145, 6);
//
// GCConfigMenuItem
//
......@@ -196,27 +212,27 @@
this.ConfigShowSubMenuItem,
this.ConfigSendSubMenuItem});
this.GCConfigMenuItem.Name = "GCConfigMenuItem";
this.GCConfigMenuItem.Size = new System.Drawing.Size(174, 26);
this.GCConfigMenuItem.Size = new System.Drawing.Size(148, 22);
this.GCConfigMenuItem.Text = "仪器配置";
//
// ConfigCreateSubMenuItem
//
this.ConfigCreateSubMenuItem.Name = "ConfigCreateSubMenuItem";
this.ConfigCreateSubMenuItem.Size = new System.Drawing.Size(144, 26);
this.ConfigCreateSubMenuItem.Size = new System.Drawing.Size(124, 22);
this.ConfigCreateSubMenuItem.Text = "配置创建";
this.ConfigCreateSubMenuItem.Click += new System.EventHandler(this.ConfigCreateSubMenuItem_Click);
//
// ConfigShowSubMenuItem
//
this.ConfigShowSubMenuItem.Name = "ConfigShowSubMenuItem";
this.ConfigShowSubMenuItem.Size = new System.Drawing.Size(144, 26);
this.ConfigShowSubMenuItem.Size = new System.Drawing.Size(124, 22);
this.ConfigShowSubMenuItem.Text = "配置查看";
this.ConfigShowSubMenuItem.Click += new System.EventHandler(this.ConfigShowSubMenuItem_Click);
//
// ConfigSendSubMenuItem
//
this.ConfigSendSubMenuItem.Name = "ConfigSendSubMenuItem";
this.ConfigSendSubMenuItem.Size = new System.Drawing.Size(144, 26);
this.ConfigSendSubMenuItem.Size = new System.Drawing.Size(124, 22);
this.ConfigSendSubMenuItem.Text = "配置发送";
this.ConfigSendSubMenuItem.Click += new System.EventHandler(this.ConfigSendSubMenuItem_Click);
//
......@@ -227,40 +243,79 @@
this.CalibrationMenu,
this.HistoryPicMenu});
this.窗口ToolStripMenuItem.Name = "窗口ToolStripMenuItem";
this.窗口ToolStripMenuItem.Size = new System.Drawing.Size(81, 24);
this.窗口ToolStripMenuItem.Size = new System.Drawing.Size(68, 21);
this.窗口ToolStripMenuItem.Text = "数据查看";
//
// HistoryDataMenu
//
this.HistoryDataMenu.Name = "HistoryDataMenu";
this.HistoryDataMenu.Size = new System.Drawing.Size(174, 26);
this.HistoryDataMenu.Size = new System.Drawing.Size(148, 22);
this.HistoryDataMenu.Text = "历史数据查询";
this.HistoryDataMenu.Click += new System.EventHandler(this.HistoryDataMenu_Click);
//
// CalibrationMenu
//
this.CalibrationMenu.Name = "CalibrationMenu";
this.CalibrationMenu.Size = new System.Drawing.Size(174, 26);
this.CalibrationMenu.Size = new System.Drawing.Size(148, 22);
this.CalibrationMenu.Text = "校准查看";
this.CalibrationMenu.Click += new System.EventHandler(this.CalibrationMenu_Click);
//
// HistoryPicMenu
//
this.HistoryPicMenu.Name = "HistoryPicMenu";
this.HistoryPicMenu.Size = new System.Drawing.Size(174, 26);
this.HistoryPicMenu.Size = new System.Drawing.Size(148, 22);
this.HistoryPicMenu.Text = "历史谱图";
this.HistoryPicMenu.Click += new System.EventHandler(this.HistoryPicMenu_Click);
//
// DebugMainMenu
//
this.DebugMainMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.SingleControlMenu});
this.DebugMainMenu.Name = "DebugMainMenu";
this.DebugMainMenu.Size = new System.Drawing.Size(44, 21);
this.DebugMainMenu.Text = "调试";
//
// SingleControlMenu
//
this.SingleControlMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.SingleStart,
this.SingleStop,
this.SingleCancel});
this.SingleControlMenu.Name = "SingleControlMenu";
this.SingleControlMenu.Size = new System.Drawing.Size(148, 22);
this.SingleControlMenu.Text = "单次流程控制";
//
// SingleStart
//
this.SingleStart.Name = "SingleStart";
this.SingleStart.Size = new System.Drawing.Size(100, 22);
this.SingleStart.Text = "开始";
this.SingleStart.Click += new System.EventHandler(this.SingleStart_Click);
//
// SingleStop
//
this.SingleStop.Name = "SingleStop";
this.SingleStop.Size = new System.Drawing.Size(100, 22);
this.SingleStop.Text = "停止";
this.SingleStop.Click += new System.EventHandler(this.SingleStop_Click);
//
// SingleCancel
//
this.SingleCancel.Name = "SingleCancel";
this.SingleCancel.Size = new System.Drawing.Size(100, 22);
this.SingleCancel.Text = "取消";
this.SingleCancel.Click += new System.EventHandler(this.SingleCancel_Click);
//
// statusStrip
//
this.statusStrip.ImageScalingSize = new System.Drawing.Size(20, 20);
this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripStatusLabelusertime,
this.toolStripStatusLabelText});
this.statusStrip.Location = new System.Drawing.Point(0, 620);
this.toolStripStatusLabelText,
this.HmiStatus});
this.statusStrip.Location = new System.Drawing.Point(0, 493);
this.statusStrip.Name = "statusStrip";
this.statusStrip.Padding = new System.Windows.Forms.Padding(1, 0, 19, 0);
this.statusStrip.Size = new System.Drawing.Size(997, 29);
this.statusStrip.Size = new System.Drawing.Size(748, 26);
this.statusStrip.TabIndex = 2;
this.statusStrip.Text = "StatusStrip";
//
......@@ -269,14 +324,14 @@
this.toolStripStatusLabelusertime.BorderSides = ((System.Windows.Forms.ToolStripStatusLabelBorderSides)((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left | System.Windows.Forms.ToolStripStatusLabelBorderSides.Right)));
this.toolStripStatusLabelusertime.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
this.toolStripStatusLabelusertime.Name = "toolStripStatusLabelusertime";
this.toolStripStatusLabelusertime.Size = new System.Drawing.Size(171, 24);
this.toolStripStatusLabelusertime.Size = new System.Drawing.Size(135, 21);
this.toolStripStatusLabelusertime.Text = "toolStripStatusLabel1";
//
// toolStripStatusLabelText
//
this.toolStripStatusLabelText.BorderSides = ((System.Windows.Forms.ToolStripStatusLabelBorderSides)((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left | System.Windows.Forms.ToolStripStatusLabelBorderSides.Right)));
this.toolStripStatusLabelText.Name = "toolStripStatusLabelText";
this.toolStripStatusLabelText.Size = new System.Drawing.Size(171, 24);
this.toolStripStatusLabelText.Size = new System.Drawing.Size(135, 21);
this.toolStripStatusLabelText.Text = "toolStripStatusLabel1";
//
// timer1
......@@ -299,25 +354,38 @@
this.backgroundWorker2.DoWork += new System.ComponentModel.DoWorkEventHandler(this.backgroundWorker2_DoWork);
this.backgroundWorker2.RunWorkerCompleted += new System.ComponentModel.RunWorkerCompletedEventHandler(this.backgroundWorker2_RunWorkerCompleted);
//
// 参数设置ToolStripMenuItem
// HmiStatus
//
this.HmiStatus.Name = "HmiStatus";
this.HmiStatus.Size = new System.Drawing.Size(66, 21);
this.HmiStatus.Text = "HmiStatus";
//
// HelpMainMenu
//
this.HelpMainMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.AboutMenu});
this.HelpMainMenu.Name = "HelpMainMenu";
this.HelpMainMenu.Size = new System.Drawing.Size(44, 21);
this.HelpMainMenu.Text = "帮助";
//
// AboutMenu
//
this.参数设置ToolStripMenuItem.Name = "参数设置ToolStripMenuItem";
this.参数设置ToolStripMenuItem.Size = new System.Drawing.Size(181, 26);
this.参数设置ToolStripMenuItem.Text = "参数设置";
this.参数设置ToolStripMenuItem.Click += new System.EventHandler(this.参数设置ToolStripMenuItem_Click);
this.AboutMenu.Name = "AboutMenu";
this.AboutMenu.Size = new System.Drawing.Size(180, 22);
this.AboutMenu.Text = "关于";
this.AboutMenu.Click += new System.EventHandler(this.AboutMenu_Click);
//
// MDIBase
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(997, 649);
this.ClientSize = new System.Drawing.Size(748, 519);
this.Controls.Add(this.statusStrip);
this.Controls.Add(this.menuStrip);
this.DoubleBuffered = true;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.IsMdiContainer = true;
this.MainMenuStrip = this.menuStrip;
this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "MDIBase";
this.Text = "MDIBase";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MDIBase_FormClosing);
......@@ -363,7 +431,15 @@
private System.Windows.Forms.ToolStripMenuItem ConfigCreateSubMenuItem;
private System.Windows.Forms.ToolStripMenuItem ConfigShowSubMenuItem;
private System.Windows.Forms.ToolStripMenuItem ConfigSendSubMenuItem;
private System.Windows.Forms.ToolStripMenuItem 参数设置ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem ParameterSettingMenu;
private System.Windows.Forms.ToolStripMenuItem DebugMainMenu;
private System.Windows.Forms.ToolStripMenuItem SingleControlMenu;
private System.Windows.Forms.ToolStripMenuItem SingleStart;
private System.Windows.Forms.ToolStripMenuItem SingleStop;
private System.Windows.Forms.ToolStripMenuItem SingleCancel;
private System.Windows.Forms.ToolStripStatusLabel HmiStatus;
private System.Windows.Forms.ToolStripMenuItem HelpMainMenu;
private System.Windows.Forms.ToolStripMenuItem AboutMenu;
}
}
......
GcDevicePc/MDIBase.cs
View file @ 5e1bfd33
......@@ -131,7 +131,7 @@ namespace GcDevicePc
// toolStripStatusLabeSystme.Text = string.Format("状态：{0}", Formstr);
timespan = System.DateTime.Now - startTime;
toolStripStatusLabelusertime.Text = string.Format("运行时间：{0}", timespan.Days.ToString() + "天" + timespan.Hours.ToString() + "时" + timespan.Minutes.ToString() + "分" + timespan.Seconds.ToString() + "秒");
toolStripStatusLabelusertime.Text = String.Format("运行时间：{0}", timespan.Days.ToString() + "天" + timespan.Hours.ToString() + "时" + timespan.Minutes.ToString() + "分" + timespan.Seconds.ToString() + "秒");
//显示方法名称
if (String.IsNullOrEmpty(globaldata.m_pcbuffer.gcpcinfo.pcfileinfo.cur_MethodName))
......@@ -284,7 +284,9 @@ namespace GcDevicePc
CalibrationMenu.Visible = true;
GCConfigMenuItem.Visible = true;
AuxToolMenu.Visible = true;
参数设置ToolStripMenuItem.Visible = true;
ParameterSettingMenu.Visible = true;
DebugMainMenu.Visible = true;
HmiStatus.Visible = true;
}else
......@@ -297,7 +299,9 @@ namespace GcDevicePc
CalibrationMenu.Visible = false;
GCConfigMenuItem.Visible = false;
AuxToolMenu.Visible = false;
参数设置ToolStripMenuItem.Visible = false;
ParameterSettingMenu.Visible = false;
DebugMainMenu.Visible = false;
HmiStatus.Visible = false;
}
}
......@@ -315,6 +319,8 @@ namespace GcDevicePc
private void timer1_Tick(object sender, EventArgs e)
{
this.Text = String.Format("VOCs在线监测-1.0.2.1 {0}",Formstr);
HmiStatus.Text = String.Format("状态：{0}", statestr);
// toolStripStatusLabeSystme.Text = String.Format("状态：{0}", statestr);
timespan = System.DateTime.Now - startTime;
toolStripStatusLabelusertime.Text = String.Format("运行时间：{0}",
......@@ -536,7 +542,7 @@ namespace GcDevicePc
{
globaldata.show_MethodName = tmpname;
SetMainFormMethodName(tmpname);
globaldata.m_pcbuffer.gcpcinfo.pcfileinfo.cur_MethodName = System.IO.Path.Combine(globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.MethodFolder, tmpname.ToString());
globaldata.m_pcbuffer.gcpcinfo.pcfileinfo.cur_MethodName = Path.Combine(globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.MethodFolder, tmpname.ToString());
globaldata.m_profileMethod.SetMethodFullName(globaldata.m_pcbuffer.gcpcinfo.pcfileinfo.cur_MethodName);
globaldata.m_profileMethod.GetDevInjPortAllPara();
globaldata.m_profileMethod.GetSampleAllPara("前进样器");
......@@ -790,6 +796,16 @@ namespace GcDevicePc
Common_HeadInfo();
break;
}
if (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.RunType == 0)
{
ButtonControl_Status(status_flag);
}
else
{
ButtonControl_Status(100);
}
Status_Show(status_flag, ref status_flag_old);
if (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.RunType == 2)
......@@ -864,35 +880,58 @@ namespace GcDevicePc
}
}
//void ButtonControl_Status(ushort flag, ushort runtype)
//{
// invokeDelegate update_ButtonStatus_UI = () =>
// {
// switch (flag)
// {
// case 0:
// case 1:
// case 2:
// // ChangeButton(0);
// break;
// case 3: //已就绪
// // if (runtype == 0 && globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.work_Statue != 1)
// // ChangeButton(1);
// break;
// case 4:
// case 5:
// //ChangeButton(2);
// break;
// case 6:
// // ChangeButton(0);
// break;
// case 7:
// // ChangeButton(0);
// break;
// }
// };
// Invoke(update_ButtonStatus_UI);
//}
/// <summary>
/// 控制调试按钮权限
/// </summary>
/// <param name="flag"></param>
void ButtonControl_Status(ushort flag)
{
this.Invoke(new Action(() =>
{
switch (flag)
{
case 0:
case 1:
case 2:
{
SingleCancel.Enabled = false;
SingleStop.Enabled = false;
SingleStart.Enabled = false;
}
break;
case 3: //已就绪
{
SingleCancel.Enabled = false;
SingleStop.Enabled = false;
SingleStart.Enabled = true;
}
break;
case 4:
case 5:
{
SingleCancel.Enabled = true;
SingleStop.Enabled = true;
SingleStart.Enabled = false;
}
break;
case 6:
case 7:
{
SingleCancel.Enabled = false;
SingleStop.Enabled = false;
SingleStart.Enabled = false;
}
break;
default:
{
SingleCancel.Enabled = false;
SingleStop.Enabled = false;
SingleStart.Enabled = false;
}
break;
}
}));
}
/// <summary>
/// 显示系统连接状态和方法运行
......@@ -1037,53 +1076,7 @@ namespace GcDevicePc
}
}
Thread t_checkcmd;
public void stopbtn()
{
globaldata.startflag = false;
globaldata.stopflag = true;
globaldata.cancelflag = false;
// globaldata.starttimer = 0x7FFFFFFF;
if (!String.IsNullOrEmpty(globaldata.connection_ip))
{
// globaldata.work_Statue = 2;
globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.work_Statue = 2;
}
if (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.RunType == 0)
{
if (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.system_Statue == true)
{
hmiopt.WriteOpenVal();
// singlemodbus.WriteOpenVal();
// WaitHMIWork();
t_checkcmd = new Thread(checkcmd);
t_checkcmd.IsBackground = true;
t_checkcmd.Start();
}
}
}
private void checkcmd()
{
while (globaldata.m_hmibuffer.gcinfo.methodstatus != 3)
{
if (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.RunType == 0)
{
hmiopt.WriteOpenVal();
}
else if (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.RunType == 1)
{
hmiopt.WriteSingleVal();
}
else
{
}
Thread.Sleep(1000);
}
}
private void MDIBase_FormClosing(object sender, FormClosingEventArgs e)
{
......@@ -1306,13 +1299,13 @@ namespace GcDevicePc
FileServerClient rtclient = new FileServerClient();
rtclient.WtClientInit(globaldata.connection_ip, globaldata.fileserverport);
for (int i = 1; i < runtable._methodname.Count; i++)
{
rfilename = runtable._methodname[i];
lfilename = Path.Combine(globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.MethodFolder, rfilename);
rtclient.WtClientCopytoServer(rfilename, lfilename, globaldata.remoteFolder + "仪器方法\\");
Thread.Sleep(200);
}
//for (int i = 1; i < runtable._methodname.Count; i++)
//{
// rfilename = runtable._methodname[i];
// lfilename = Path.Combine(globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.MethodFolder, rfilename);
// rtclient.WtClientCopytoServer(rfilename, lfilename, globaldata.remoteFolder + "仪器方法\\");
// Thread.Sleep(200);
//}
rtclient.WtClientCopytoServer("RunMethod.ini", Path.Combine(folder, runtablename), globaldata.remoteFolder + "运行表\\");
SendPCCMD(false);
globaldata.m_pcbuffer.gcpcinfo.pcfileinfo.cur_RunTab = Path.Combine(folder, runtablename);
......@@ -1338,13 +1331,13 @@ namespace GcDevicePc
FileServerClient rtclient = new FileServerClient();
rtclient.WtClientInit(globaldata.connection_ip, globaldata.fileserverport);
for (int i = 1; i < runtable._methodname.Count; i++)
{
rfilename = runtable._methodname[i];
lfilename = Path.Combine(globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.MethodFolder, rfilename);
rtclient.WtClientCopytoServer(rfilename, lfilename, globaldata.remoteFolder + "仪器方法\\");
Thread.Sleep(200);
}
//for (int i = 1; i < runtable._methodname.Count; i++)
//{
// rfilename = runtable._methodname[i];
// lfilename = Path.Combine(globaldata.m_pcbuffer.gcpcinfo.pcfolderinfo.MethodFolder, rfilename);
// rtclient.WtClientCopytoServer(rfilename, lfilename, globaldata.remoteFolder + "仪器方法\\");
// Thread.Sleep(200);
//}
rtclient.WtClientCopytoServer("RunMethodStd.ini", Path.Combine(folder, runtablename), globaldata.remoteFolder + "运行表\\");
hmiopt.SetBatCount(count);
......@@ -1739,7 +1732,7 @@ namespace GcDevicePc
}
}
private void 参数设置ToolStripMenuItem_Click(object sender, EventArgs e)
private void ParameterSettingMenu_Click(object sender, EventArgs e)
{
try
{
......@@ -1747,10 +1740,171 @@ namespace GcDevicePc
sf.Show();
}
catch(Exception ex)
catch (Exception ex)
{
Trace.Write(ex);
}
}
#region 单次处理控制
private void startbtn()
{
globaldata.startflag = true;
globaldata.stopflag = false;
globaldata.cancelflag = false;
globaldata.startclear = true;
globaldata.starttimer = 0;
globaldata.startimerIsSet = true;
globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.work_Statue = 1;
}
private void SingleStart_Click(object sender, EventArgs e)
{
if (!String.IsNullOrEmpty(globaldata.connection_ip))
{
if (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.system_Statue == true && globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.RunType == 0)
{
if (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.RunType == 0)
{
hmiopt.WriteOpenVal();
}
hmiopt.WriteStartVal();
startbtn();
}
}
}
Thread t_checkcmd;
public void stopbtn()
{
globaldata.startflag = false;
globaldata.stopflag = true;
globaldata.cancelflag = false;
if (!String.IsNullOrEmpty(globaldata.connection_ip))
{
globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.work_Statue = 2;
}
if (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.RunType == 0)
{
if (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.system_Statue == true)
{
hmiopt.WriteOpenVal();
t_checkcmd = new Thread(checkcmd);
t_checkcmd.IsBackground = true;
t_checkcmd.Start();
}
}
}
private void checkcmd()
{
while (globaldata.m_hmibuffer.gcinfo.methodstatus != 3)
{
if (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.RunType == 0)
{
hmiopt.WriteOpenVal();
}
else if (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.RunType == 1)
{
hmiopt.WriteSingleVal();
}
else
{
}
Thread.Sleep(1000);
}
}
private void SingleStop_Click(object sender, EventArgs e)
{
if (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.system_Statue == true)
{
hmiopt.WriteStopVal();
WaitHMIFree();
if (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.RunType == 0)
{
hmiopt.WriteOpenVal();
}
stopbtn();
}
}
private void cancelbtn()
{
globaldata.startflag = false;
globaldata.stopflag = false;
globaldata.cancelflag = true;
globaldata.starttimer = 0x7FFFFFFF;
if (!String.IsNullOrEmpty(globaldata.connection_ip))
{
globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.work_Statue = 3;
}
if (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.RunType == 0)
{
if (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.system_Statue == true)
{
hmiopt.WriteOpenVal();
t_checkcmd = new Thread(checkcmd);
t_checkcmd.IsBackground = true;
t_checkcmd.Start();
}
}
}
private void SingleCancel_Click(object sender, EventArgs e)
{
if (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.system_Statue == true)
{
hmiopt.WriteCancalVal();
WaitHMIFree();
if (globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.RunType == 0)
{
hmiopt.WriteOpenVal();
}
cancelbtn();
}
}
#endregion
AboutForm f_showcfg;
private void AboutMenu_Click(object sender, EventArgs e)
{
int ret = 0;
ushort[] version = new ushort[12];
ret = mymodbus.GetFireWareVersion(ref version);
if (f_showcfg == null)
{
f_showcfg = new AboutForm(version);
f_showcfg.Show();
}
else
{
if (f_showcfg.IsDisposed)
{
f_showcfg = new AboutForm(version);
f_showcfg.Show();
}
else
{
f_showcfg.Show();
}
}
}
}
}
GcDevicePc/ProThread/HMISearch.cs
View file @ 5e1bfd33
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Net;
using System.Net.Sockets;
using System.Threading;
using System.Text.RegularExpressions;
using System.Collections;
using System.Management;
using System.Net.NetworkInformation;
using GcDevicePc.Common;
......@@ -112,7 +108,8 @@ namespace GcDevicePc.ProThread
{
client = new UdpClient(new IPEndPoint(IPAddress.Any, 0));
// client = new UdpClient(new IPEndPoint(IPAddress.Parse(this._localip), 0));
endpoint = new IPEndPoint(IPAddress.Parse("255.255.255.255"), 233);
// endpoint = new IPEndPoint(IPAddress.Parse("255.255.255.255"), 233);
endpoint = new IPEndPoint(IPAddress.Parse("192.168.10.230"), 233);
client.Send(sendBytes, sendBytes.Length, endpoint);
Thread.Sleep(500);
......
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