Skip to content

李娜 / Line-Smart-Workstation

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 8a4709b0 由 LN
选项

增加gerber导入图片功能

1 个父辈 3b4dc4a9
全部展开
内嵌 并排
正在显示 15 个修改的文件 包含 426 行增加 和 17 行删除
Line-Smart-Workstation.sln
 
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15 # Visual Studio Version 17
VisualStudioVersion = 15.0.27428.2043 VisualStudioVersion = 17.7.34221.43
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Smart-Workstation", "TSA-V\Smart-Workstation.csproj", "{EBFB33FA-28A0-41E4-854A-5052CAE4CDFF}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Smart-Workstation", "TSA-V\Smart-Workstation.csproj", "{EBFB33FA-28A0-41E4-854A-5052CAE4CDFF}"
EndProject EndProject
......
TSA-V/App.config
...@@ -122,21 +122,23 @@ ...@@ -122,21 +122,23 @@
<!--点位描述显示类型--> <!--点位描述显示类型-->
<add key="PointDisplayType" value="1" /> <add key="PointDisplayType" value="1" />
<add key="DisableSideCylinder" value="1" />
<!--禁用底部气缸--> <!--禁用底部气缸-->
<add key="DisableBottomCylinder" value="1" /> <add key="DisableBottomCylinder" value="1" />
<add key="SMF_Serverurl" value ="http://localhost:8800/"/> <add key="SMF_Serverurl" value="http://localhost:8800/" />
<add key="SMF_CID" value ="NEOSTATION001"/> <add key="SMF_CID" value="NEOSTATION001" />
<!--禁用 继续未完成工作功能--> <!--禁用 继续未完成工作功能-->
<add key ="DisContinueWorking" value ="1"/> <add key="DisContinueWorking" value="1" />
<add key ="DisShowScreenAlarm" value ="1"/> <add key="DisShowScreenAlarm" value="1" />
<!--显示实时视频浮窗--> <!--显示实时视频浮窗-->
<add key ="VideoForm_Show" value ="1"/> <add key="VideoForm_Show" value="1" />
<add key ="ProjectorScreen_Index" value ="1"/> <add key="ProjectorScreen_Index" value="1" />
<add key="Device_AutoGuoBan" value="1 " />
</appSettings> </appSettings>
<log4net> <log4net>
<appender name="defaultAppender" type="log4net.Appender.RollingFileAppender"> <appender name="defaultAppender" type="log4net.Appender.RollingFileAppender">
<file value="logs/TSA_V.log" /> <file value="logs/NW.log" />
<param name="Encoding" value="UTF-8" /> <param name="Encoding" value="UTF-8" />
<appendToFile value="true" /> <appendToFile value="true" />
<rollingStyle value="Date" /> <rollingStyle value="Date" />
...@@ -146,7 +148,7 @@ ...@@ -146,7 +148,7 @@
</layout> </layout>
</appender> </appender>
<appender name="MetcalLogAppender" type="log4net.Appender.RollingFileAppender"> <appender name="MetcalLogAppender" type="log4net.Appender.RollingFileAppender">
<file value="logs/metcal/revicedata.log" /> <file value="logs/metcal/NW_revicedata.log" />
<param name="Encoding" value="UTF-8" /> <param name="Encoding" value="UTF-8" />
<appendToFile value="true" /> <appendToFile value="true" />
<rollingStyle value="Date" /> <rollingStyle value="Date" />
...@@ -165,7 +167,7 @@ ...@@ -165,7 +167,7 @@
</logger> </logger>
</log4net> </log4net>
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" /> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
</startup> </startup>
<runtime> <runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
...@@ -178,7 +180,7 @@ ...@@ -178,7 +180,7 @@
<bindingRedirect oldVersion="0.0.0.0-2.0.12.0" newVersion="2.0.12.0" /> <bindingRedirect oldVersion="0.0.0.0-2.0.12.0" newVersion="2.0.12.0" />
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <!--<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Collections.Concurrent" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Collections.Concurrent" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" /> <bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
...@@ -495,6 +497,6 @@ ...@@ -495,6 +497,6 @@
<assemblyIdentity name="System.Xml.XPath.XDocument" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Xml.XPath.XDocument" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" /> <bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>-->
</runtime> </runtime>
</configuration> </configuration>
TSA-V/FrmAddBoard.Designer.cs
...@@ -65,6 +65,8 @@ ...@@ -65,6 +65,8 @@
this.xyMoveControl1 = new UserFromControl.ProjectorControl(); this.xyMoveControl1 = new UserFromControl.ProjectorControl();
this.openFileDialogCsv = new System.Windows.Forms.OpenFileDialog(); this.openFileDialogCsv = new System.Windows.Forms.OpenFileDialog();
this.groupBox_new = new System.Windows.Forms.GroupBox(); this.groupBox_new = new System.Windows.Forms.GroupBox();
this.linkLabel3 = new System.Windows.Forms.LinkLabel();
this.linkLabel2 = new System.Windows.Forms.LinkLabel();
this.groupBoxSelCom.SuspendLayout(); this.groupBoxSelCom.SuspendLayout();
this.groupBox_new.SuspendLayout(); this.groupBox_new.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
...@@ -431,6 +433,8 @@ ...@@ -431,6 +433,8 @@
// //
// groupBox_new // groupBox_new
// //
this.groupBox_new.Controls.Add(this.linkLabel3);
this.groupBox_new.Controls.Add(this.linkLabel2);
this.groupBox_new.Controls.Add(this.cmbOrgType); this.groupBox_new.Controls.Add(this.cmbOrgType);
this.groupBox_new.Controls.Add(this.linkLabel1); this.groupBox_new.Controls.Add(this.linkLabel1);
this.groupBox_new.Controls.Add(this.label2); this.groupBox_new.Controls.Add(this.label2);
...@@ -455,6 +459,29 @@ ...@@ -455,6 +459,29 @@
this.groupBox_new.TabIndex = 303; this.groupBox_new.TabIndex = 303;
this.groupBox_new.TabStop = false; this.groupBox_new.TabStop = false;
this.groupBox_new.Text = "程序"; this.groupBox_new.Text = "程序";
this.groupBox_new.Enter += new System.EventHandler(this.groupBox_new_Enter);
//
// linkLabel3
//
this.linkLabel3.AutoSize = true;
this.linkLabel3.Location = new System.Drawing.Point(50, 297);
this.linkLabel3.Name = "linkLabel3";
this.linkLabel3.Size = new System.Drawing.Size(41, 12);
this.linkLabel3.TabIndex = 304;
this.linkLabel3.TabStop = true;
this.linkLabel3.Text = "viewer";
this.linkLabel3.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel3_LinkClicked);
//
// linkLabel2
//
this.linkLabel2.AutoSize = true;
this.linkLabel2.Location = new System.Drawing.Point(204, 297);
this.linkLabel2.Name = "linkLabel2";
this.linkLabel2.Size = new System.Drawing.Size(89, 12);
this.linkLabel2.TabIndex = 303;
this.linkLabel2.TabStop = true;
this.linkLabel2.Text = "选择Gerber文件";
this.linkLabel2.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel2_LinkClicked);
// //
// FrmAddBoard // FrmAddBoard
// //
...@@ -519,5 +546,7 @@ ...@@ -519,5 +546,7 @@
private System.Windows.Forms.LinkLabel linkLabel1; private System.Windows.Forms.LinkLabel linkLabel1;
private System.Windows.Forms.OpenFileDialog openFileDialogCsv; private System.Windows.Forms.OpenFileDialog openFileDialogCsv;
private System.Windows.Forms.GroupBox groupBox_new; private System.Windows.Forms.GroupBox groupBox_new;
private System.Windows.Forms.LinkLabel linkLabel2;
private System.Windows.Forms.LinkLabel linkLabel3;
} }
} }
\ No newline at end of file \ No newline at end of file
TSA-V/FrmAddBoard.cs
...@@ -5,6 +5,7 @@ using System.ComponentModel; ...@@ -5,6 +5,7 @@ using System.ComponentModel;
using System.Data; using System.Data;
using System.Drawing; using System.Drawing;
using System.IO; using System.IO;
using System.IO.Compression;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
...@@ -137,7 +138,7 @@ namespace TSA_V ...@@ -137,7 +138,7 @@ namespace TSA_V
string imagePath = Path.GetFullPath(txtImagePath.Text); string imagePath = Path.GetFullPath(txtImagePath.Text);
ProcessPictures.copyImage(Application.StartupPath, board.boardName, imagePath); ProcessPictures.copyImage(Application.StartupPath, board.boardName, imagePath);
board.imgName = board.boardName + Path.GetExtension(openFileDialogImg.FileName); board.imgName = board.boardName + Path.GetExtension(imagePath);
return true; return true;
} }
private BoardInfo SaveBoard() private BoardInfo SaveBoard()
...@@ -501,5 +502,55 @@ namespace TSA_V ...@@ -501,5 +502,55 @@ namespace TSA_V
this.txtCsvFileName.Text = fileName; this.txtCsvFileName.Text = fileName;
} }
private void linkLabel2_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
using (OpenFileDialog openFileDialog = new OpenFileDialog())
{
openFileDialog.Title = "Open Gerber File(s)";
openFileDialog.RestoreDirectory = true;
openFileDialog.Multiselect = true;
if (openFileDialog.ShowDialog() == DialogResult.OK)
{
//List<string> newFiles = FileUtil.FileProcess(openFileDialog.FileNames);
bool result = GerberVS.AGerberController.OpenLayers(openFileDialog.FileNames, out string filename);
if (result && File.Exists(filename))
{
FrmImageViewer imageViewer = new FrmImageViewer(filename);
DialogResult sureresult = imageViewer.ShowDialog();
if (!sureresult.Equals(DialogResult.Cancel))
{
this.txtImagePath.Text = filename;
}
}
else
{
MessageBox.Show(ResourceCulture.GetString(ResourceCulture.SelectRightFile, "请选择正确的文件 "));
}
}
}
}
private void linkLabel3_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
string fileName = this.txtImagePath.Text;
if ( File.Exists(fileName))
{
FrmImageViewer imageViewer = new FrmImageViewer(fileName);
DialogResult sureresult = imageViewer.ShowDialog();
if (sureresult.Equals(DialogResult.Cancel))
{
this.txtImagePath.Text = "";
}
}
}
private void groupBox_new_Enter(object sender, EventArgs e)
{
}
} }
} }
TSA-V/FrmImageViewer.Designer.cs 0 → 100644
namespace TSA_V
{
partial class FrmImageViewer
{
/// <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()
{
this.panel1 = new System.Windows.Forms.Panel();
this.picViewer = new System.Windows.Forms.PictureBox();
this.btnOK = new System.Windows.Forms.Button();
this.btnCancel = new System.Windows.Forms.Button();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.picViewer)).BeginInit();
this.SuspendLayout();
//
// panel1
//
this.panel1.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)));
this.panel1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
this.panel1.Controls.Add(this.picViewer);
this.panel1.Location = new System.Drawing.Point(5, 5);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(995, 562);
this.panel1.TabIndex = 0;
//
// picViewer
//
this.picViewer.BackColor = System.Drawing.Color.Black;
this.picViewer.Dock = System.Windows.Forms.DockStyle.Fill;
this.picViewer.Location = new System.Drawing.Point(0, 0);
this.picViewer.Name = "picViewer";
this.picViewer.Size = new System.Drawing.Size(995, 562);
this.picViewer.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.picViewer.TabIndex = 298;
this.picViewer.TabStop = false;
//
// btnOK
//
this.btnOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnOK.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOK.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOK.Location = new System.Drawing.Point(749, 577);
this.btnOK.Name = "btnOK";
this.btnOK.Size = new System.Drawing.Size(120, 45);
this.btnOK.TabIndex = 284;
this.btnOK.Text = "确认";
this.btnOK.UseVisualStyleBackColor = true;
this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
//
// btnCancel
//
this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnCancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCancel.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCancel.Location = new System.Drawing.Point(875, 577);
this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(120, 45);
this.btnCancel.TabIndex = 285;
this.btnCancel.Text = "取消";
this.btnCancel.UseVisualStyleBackColor = true;
this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
//
// FrmImageViewer
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1007, 634);
this.Controls.Add(this.btnCancel);
this.Controls.Add(this.btnOK);
this.Controls.Add(this.panel1);
this.MaximizeBox = true;
this.MinimizeBox = true;
this.Name = "FrmImageViewer";
this.Text = "图片预览";
this.TopMost = true;
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
this.Load += new System.EventHandler(this.FrmImageViewer_Load);
this.panel1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.picViewer)).EndInit();
this.ResumeLayout(false);
}
#endregion
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Button btnOK;
private System.Windows.Forms.Button btnCancel;
private System.Windows.Forms.PictureBox picViewer;
}
}
\ No newline at end of file \ No newline at end of file
TSA-V/FrmImageViewer.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace TSA_V
{
public partial class FrmImageViewer : FrmBase
{
private string fileName = "";
public FrmImageViewer(string fileName)
{
InitializeComponent();
this.fileName = fileName;
}
private void FrmImageViewer_Load(object sender, EventArgs e)
{
if (fileName != null && File.Exists(fileName))
{
System.Drawing.Image img = System.Drawing.Image.FromFile(fileName);
Bitmap myImage = new System.Drawing.Bitmap(img);
this.picViewer.Image = myImage;
img.Dispose();
btnOK.Focus();
}
}
private void btnOK_Click(object sender, EventArgs e)
{
this.DialogResult = DialogResult.OK;
this.Close();
}
private void btnCancel_Click(object sender, EventArgs e)
{
this.DialogResult = DialogResult.Cancel;
this.Close();
}
}
}
TSA-V/FrmImageViewer.resx 0 → 100644
<?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>
</root>
\ No newline at end of file \ No newline at end of file
TSA-V/Properties/Resource.en-US.resx
...@@ -2635,4 +2635,9 @@ ...@@ -2635,4 +2635,9 @@
<data name="元器件数量不足" xml:space="preserve"> <data name="元器件数量不足" xml:space="preserve">
<value>Component out of stock</value> <value>Component out of stock</value>
</data> </data>
<data name = "FrmAddBoard_linkLabel3_Text" xml:space = "preserve"> <value> Previews </value> </data>
<data name = "FrmAddBoard_linkLabel2_Text" xml:space = "preserve"> <value> Select Gerber file </value> </data>
<data name = "FrmImageViewer_Text" xml:space = "preserve"> <value> Image Preview </value> </data>
<data name = "FrmImageViewer_btnCancel_Text" xml:space = "preserve"> <value> Cancel </value> </data>
<data name = "FrmImageViewer_btnOK_Text" xml:space = "preserve"> <value> Confirm </value> </data>
</root> </root>
\ No newline at end of file \ No newline at end of file
TSA-V/Properties/Resource.ru-RU.resx
...@@ -2619,4 +2619,9 @@ ...@@ -2619,4 +2619,9 @@
<data name="元器件数量不足" xml:space="preserve"> <data name="元器件数量不足" xml:space="preserve">
<value>元器件数量不足</value> <value>元器件数量不足</value>
</data> </data>
<data name = "FrmAddBoard_linkLabel3_Text" xml:space = "preserve"> <value> 预览 </value> </data>
<data name = "FrmAddBoard_linkLabel2_Text" xml:space = "preserve"> <value> 选择Gerber文件 </value> </data>
<data name = "FrmImageViewer_Text" xml:space = "preserve"> <value> 图片预览 </value> </data>
<data name = "FrmImageViewer_btnCancel_Text" xml:space = "preserve"> <value> 取消 </value> </data>
<data name = "FrmImageViewer_btnOK_Text" xml:space = "preserve"> <value> 确认 </value> </data>
</root> </root>
\ No newline at end of file \ No newline at end of file
TSA-V/Properties/Resource.zh-CN.resx
...@@ -2634,4 +2634,10 @@ ...@@ -2634,4 +2634,10 @@
<data name="元器件数量不足" xml:space="preserve"> <data name="元器件数量不足" xml:space="preserve">
<value>元器件数量不足</value> <value>元器件数量不足</value>
</data> </data>
<data name = "FrmAddBoard_linkLabel3_Text" xml:space = "preserve"> <value> 预览 </value> </data>
<data name = "FrmAddBoard_linkLabel2_Text" xml:space = "preserve"> <value> 选择Gerber文件 </value> </data>
<data name = "FrmImageViewer_Text" xml:space = "preserve"> <value> 图片预览 </value> </data>
<data name = "FrmImageViewer_btnCancel_Text" xml:space = "preserve"> <value> 取消 </value> </data>
<data name = "FrmImageViewer_btnOK_Text" xml:space = "preserve"> <value> 确认 </value> </data>
</root> </root>
\ No newline at end of file \ No newline at end of file
TSA-V/Smart-Workstation.csproj
...@@ -81,6 +81,9 @@ ...@@ -81,6 +81,9 @@
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\dll\halcondotnet.dll</HintPath> <HintPath>..\dll\halcondotnet.dll</HintPath>
</Reference> </Reference>
<Reference Include="LibGerberVS">
<HintPath>..\..\GerberView_1.4.0\LibGerberVS\bin\Debug\LibGerberVS.dll</HintPath>
</Reference>
<Reference Include="log4net"> <Reference Include="log4net">
<HintPath>..\dll\log4net.dll</HintPath> <HintPath>..\dll\log4net.dll</HintPath>
</Reference> </Reference>
...@@ -170,6 +173,12 @@ ...@@ -170,6 +173,12 @@
<Compile Include="FrmHistorySearch.Designer.cs"> <Compile Include="FrmHistorySearch.Designer.cs">
<DependentUpon>FrmHistorySearch.cs</DependentUpon> <DependentUpon>FrmHistorySearch.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="FrmImageViewer.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="FrmImageViewer.Designer.cs">
<DependentUpon>FrmImageViewer.cs</DependentUpon>
</Compile>
<Compile Include="FrmLogin.cs"> <Compile Include="FrmLogin.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
...@@ -352,6 +361,9 @@ ...@@ -352,6 +361,9 @@
<EmbeddedResource Include="FrmHistorySearch.resx"> <EmbeddedResource Include="FrmHistorySearch.resx">
<DependentUpon>FrmHistorySearch.cs</DependentUpon> <DependentUpon>FrmHistorySearch.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="FrmImageViewer.resx">
<DependentUpon>FrmImageViewer.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="FrmLogin.resx"> <EmbeddedResource Include="FrmLogin.resx">
<DependentUpon>FrmLogin.cs</DependentUpon> <DependentUpon>FrmLogin.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
......
TSA-V/记录.txt
...@@ -22,9 +22,24 @@ ...@@ -22,9 +22,24 @@
2.标签库位单独配置到config\LabelPositions.csv ， 判断库位中没有转盘位置时不需要初始化轴。 2.标签库位单独配置到config\LabelPositions.csv ， 判断库位中没有转盘位置时不需要初始化轴。
20240304 增加
<add key ="Device_AutoGuoBan" value ="1 "/>
默认进入过板模式。
1_1,1,2,0,0,99.21.50.95,192.168.1.200,,,
1_2,2,2,0,0,99.21.48.04,192.168.1.200,,,
1_3,3,2,0,0,99.21.46.17,192.168.1.200,,,
1_4,4,2,0,0,99.21.58.52,192.168.1.200,,,
1_5,5,2,0,0,99.21.49.32,192.168.1.200,,,
1_6,6,2,0,0,99.21.49.14,192.168.1.200,,,
1_7,7,2,0,0,99.21.58.66,192.168.1.200,,,
1_8,8,2,0,0,99.21.58.69,192.168.1.200,,,
1_9,9,2,0,0,99.21.48.70,192.168.1.200,,,
1_10,10,2,0,0,99.21.48.23,192.168.1.200,,,
1_11,11,2,0,0,99.21.50.16,192.168.1.200,,,
1_12,12,2,0,0,99.21.55.67,192.168.1.200,,,
......
dll/LibGerberVS.dll 0 → 100644
此文件类型无法预览
dll/LibGerberVS.pdb 0 → 100644
此文件类型无法预览
dll/LibGerberVS.xml 0 → 100644
此文件的差异被折叠， 点击展开。
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!