Skip to content

李娜 / Line-Smart-Workstation

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

界面调整

1 个父辈 402da23d
内嵌 并排
正在显示 11 个修改的文件 包含 360 行增加 和 253 行删除
TSA-V/FrmMaintenance.Designer.cs
......@@ -120,7 +120,7 @@
this.btnPosition.Name = "btnPosition";
this.btnPosition.Size = new System.Drawing.Size(240, 70);
this.btnPosition.TabIndex = 6;
this.btnPosition.Text = "电机调试";
this.btnPosition.Text = "电机";
this.btnPosition.UseVisualStyleBackColor = false;
this.btnPosition.Click += new System.EventHandler(this.btnPosition_Click);
//
......@@ -168,7 +168,7 @@
this.btnWidthC.Name = "btnWidthC";
this.btnWidthC.Size = new System.Drawing.Size(240, 70);
this.btnWidthC.TabIndex = 20;
this.btnWidthC.Text = "轨道调宽";
this.btnWidthC.Text = "轨道";
this.btnWidthC.UseVisualStyleBackColor = false;
this.btnWidthC.Click += new System.EventHandler(this.btnWidthC_Click);
//
......
TSA-V/FrmMaintenance.resx
......@@ -997,7 +997,7 @@
RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEQAACxEBf2RfkQAA9UFJREFUeF7snYd620jT
j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALEAAACxABrSO9dQAA9UFJREFUeF7snYd620jT
rM/9X9v/7VpizsiZlC/hvNUNUrQs2RJJKO3U06YhhIndEwqDnv9X1u3h4eFnQMC7A8Wr233ZdPxerIQ8
yeNV010cBs/FZbtM20XaLbL9LG03eUOAFwTHEySDZ0kSwfZnAwJ+BXrS7Q9F3W6zepXWcdGibv21l4FG
pWW3TOpFXO3yGsO5WMdIADGi9vO4Gm/LeUwauro7DKGzWERSNKR5tiuV8qwu6q7bP1xmrQEBHw7sru32
......
TSA-V/Properties/Resource.en-US.resx
......@@ -610,7 +610,7 @@
<value>Exit</value>
</data>
<data name="FrmMaintenance_btnPosition_Text" xml:space="preserve">
<value>Motor Debug</value>
<value>Motor</value>
</data>
<data name="FrmMaintenance_btnDebug_Text" xml:space="preserve">
<value>I/O Module</value>
......@@ -1238,7 +1238,7 @@
<value>Foot Peddler</value>
</data>
<data name="FrmWork_radioButton2_Text" xml:space="preserve">
<value>Auto </value>
<value>Auto： </value>
</data>
<data name="NotOpen" xml:space="preserve">
<value>Temporarily isn't open.</value>
......@@ -1546,12 +1546,12 @@
<data name="WBasePointP" xml:space="preserve">
<value>Please enter a valid reference point coordinate.</value>
</data>
<data name="FrmAddBoard_label7_Text" xml:space="preserve">
<!--<data name="FrmAddBoard_label7_Text" xml:space="preserve">
<value>Left Distance</value>
</data>
<data name="FrmAddBoard_lblBaseImageY_Text" xml:space="preserve">
<value>Upward Side Distance</value>
</data>
</data>-->
<data name="FrmAddBoard_chbSort_Text" xml:space="preserve">
<value>Component Sequence Automation</value>
</data>
......@@ -2147,10 +2147,10 @@
<value>Motor Position</value>
</data>
<data name="FrmChangeWidth_Text" xml:space="preserve">
<value>Conveyor Control</value>
<value>Conveyor</value>
</data>
<data name="FrmMaintenance_btnWidthC_Text" xml:space="preserve">
<value>Conveyor Control</value>
<value>Conveyor</value>
</data>
<data name="FrmBoardSelect_chbGuoban_Text" xml:space="preserve">
<value>Inline Mode</value>
......@@ -2480,7 +2480,7 @@
<value> Select File </value>
</data>
<data name="FrmAddBoard_groupBoxSelCom_Text" xml:space="preserve">
<value> BOM </value>
<value> Data </value>
</data>
<data name="FrmAddBoard_likSelCsvFile_Text" xml:space="preserve">
<value> Select File </value>
......@@ -2658,10 +2658,10 @@
<data name = "CalMsg2" xml:space = "preserve"> <value> Step 2: Move the projection cursor to the lower right corner of the board </value> </data>
<data name = "CalMsg3" xml:space = "preserve"> <value> Step 3: Click the Start Calibration button </value> </data>
<data name = "Type_None" xml:space = "preserve"> <value> None </value> </data>
<data name = "FrmPointInfo_lblPolarities_Text" xml:space = "preserve"> <value> Polarity </value> </data>
<data name = "FrmPointInfo_lblPolarities_Text" xml:space = "preserve"> <value> Polarity： </value> </data>
<data name = "FrmAddBoard_linkDataViewer_Text" xml:space = "preserve"> <value> Data Preview </value> </data>
<data name = "FrmAddBoard_linkBomUpload_Text" xml:space = "preserve"> <value> data sheet upload </value> </data>
<data name = "FrmAddBoard_lblPolarities_Text" xml:space = "preserve"> <value> polarities </value> </data>
<data name = "FrmAddBoard_lblPolarities_Text" xml:space = "preserve"> <value> Polarity： </value> </data>
<data name = "FrmBomUpload_Text" xml:space = "preserve"> <value> data sheet upload </value> </data>
<data name = "FrmBomUpload_groupBox3_Text" xml:space = "preserve"> <value> Other settings </value> </data>
<data name = "FrmBomUpload_chbAutoPos_Text" xml:space = "preserve"> <value> Automatic consolidation of libraries </value> </data>
......
TSA-V/Properties/Resource.zh-CN.resx
......@@ -610,7 +610,7 @@
<value>返回</value>
</data>
<data name="FrmMaintenance_btnPosition_Text" xml:space="preserve">
<value>电机调试</value>
<value>电机</value>
</data>
<data name="FrmMaintenance_btnDebug_Text" xml:space="preserve">
<value>IO模块</value>
......@@ -1222,7 +1222,7 @@
<value>脚踏工作</value>
</data>
<data name="FrmWork_radioButton2_Text" xml:space="preserve">
<value>自动工作</value>
<value>自动工作：</value>
</data>
<data name="NotOpen" xml:space="preserve">
<value>暂未开放</value>
......@@ -1539,12 +1539,12 @@
<data name="WBasePointP" xml:space="preserve">
<value>请输入有效的基准点坐标</value>
</data>
<data name="FrmAddBoard_label7_Text" xml:space="preserve">
<!--<data name="FrmAddBoard_label7_Text" xml:space="preserve">
<value>基准点离左侧距离</value>
</data>
<data name="FrmAddBoard_lblBaseImageY_Text" xml:space="preserve">
<value>基准点离上方距离：</value>
</data>
</data>-->
<data name="FrmAddBoard_chbSort_Text" xml:space="preserve">
<value>自动排序</value>
</data>
......@@ -1750,7 +1750,7 @@
<value>显示点</value>
</data>
<data name="FrmGalvanometerTest_label5_Text" xml:space="preserve">
<value>点形状：</value>
<value>形状：</value>
</data>
<data name="FrmGalvanometerTest_label6_Text" xml:space="preserve">
<value>点大小 ：</value>
......@@ -1798,7 +1798,7 @@
<value>移动测试</value>
</data>
<data name="FrmPositionCalibration_lbltype_Text" xml:space="preserve">
<value>点形状：</value>
<value>形状：</value>
</data>
<data name="FrmPositionCalibration_lblSize_Text" xml:space="preserve">
<value>点大小 ：</value>
......@@ -1840,7 +1840,7 @@
<value>移动测试</value>
</data>
<data name="FrmPointInfo_lbltype_Text" xml:space="preserve">
<value>点形状：</value>
<value>形状：</value>
</data>
<data name="FrmPointInfo_lblSize_Text" xml:space="preserve">
<value>点大小 ：</value>
......@@ -1864,7 +1864,7 @@
<value>移动测试</value>
</data>
<data name="FrmAddBoard_lbltype_Text" xml:space="preserve">
<value>点形状：</value>
<value>形状：</value>
</data>
<data name="FrmAddBoard_lblSize_Text" xml:space="preserve">
<value>点大小 ：</value>
......@@ -2056,7 +2056,7 @@
<value>点大小：</value>
</data>
<data name="FrmDeviceConfig_lbltype_Text" xml:space="preserve">
<value>点形状：</value>
<value>形状：</value>
</data>
<data name="已取消更改" xml:space="preserve">
<value>已取消更改</value>
......@@ -2074,31 +2074,31 @@
<value>请输入正确的点大小</value>
</data>
<data name="FrmAddBoard_lblSizeLength_Text" xml:space="preserve">
<value>横向大小→：</value>
<value>宽→：</value>
</data>
<data name="FrmAddBoard_lblSizeWidth_Text" xml:space="preserve">
<value>纵向大小↓：</value>
<value>高↓：</value>
</data>
<data name="FrmAddBoard_lblStepValue_Text" xml:space="preserve">
<value>步进值：</value>
</data>
<data name="FrmPointInfo_lblSizeLength_Text" xml:space="preserve">
<value>横向大小→：</value>
<value>宽→：</value>
</data>
<data name="FrmPointInfo_lblSizeWidth_Text" xml:space="preserve">
<value>纵向大小↓：</value>
<value>高↓：</value>
</data>
<data name="FrmPointInfo_lblStepValue_Text" xml:space="preserve">
<value>步进值：</value>
</data>
<data name="FrmAddBoard_lblLineWidth_Text" xml:space="preserve">
<value>画笔宽度：</value>
<value>像素：</value>
</data>
<data name="FrmPointInfo_lblLineWidth_Text" xml:space="preserve">
<value>画笔宽度：</value>
<value>像素：</value>
</data>
<data name="FrmDeviceConfig_lblLineWidth_Text" xml:space="preserve">
<value>画笔宽度：</value>
<value>像素：</value>
</data>
<data name="FrmIoManager_btnBottomDown_Text" xml:space="preserve">
<value>底部气缸下降</value>
......@@ -2164,10 +2164,10 @@
<value>轨道电机位置</value>
</data>
<data name="FrmChangeWidth_Text" xml:space="preserve">
<value>轨道调宽</value>
<value>轨道</value>
</data>
<data name="FrmMaintenance_btnWidthC_Text" xml:space="preserve">
<value>轨道调宽</value>
<value>轨道</value>
</data>
<data name="FrmBoardSelect_chbGuoban_Text" xml:space="preserve">
<value>流水线过板模式</value>
......@@ -2344,10 +2344,10 @@
<value> 清零位置 </value>
</data>
<data name="LineWidth" xml:space="preserve">
<value>线体宽度</value>
<value>流水线宽度</value>
</data>
<data name="WriteLineWidth" xml:space="preserve">
<value>请输入线体宽度</value>
<value>请输入流水线宽度</value>
</data>
<data name="FrmBoardSelect_btnChangeW_Text" xml:space="preserve">
<value> 调宽 </value>
......@@ -2359,7 +2359,7 @@
<value> 投影文字： </value>
</data>
<data name="FrmBoardInfo_lblLineW_Text" xml:space="preserve">
<value> 线体宽度： </value>
<value> 流水线宽度： </value>
</data>
<data name="FrmBoardInfo_lbllinews_Text" xml:space="preserve">
<value> mm </value>
......@@ -2428,7 +2428,7 @@
<value>注意事项</value>
</data>
<data name="FrmAddBoard_lblWidth_Text" xml:space="preserve">
<value> 线体宽度： </value>
<value> 流水线宽度： </value>
</data>
<data name="FrmBoardSelect_chbWorkSingleStart_Text" xml:space="preserve">
<value> 启用工作区检测开始工作 </value>
......@@ -2497,7 +2497,7 @@
<value> 选择文件 </value>
</data>
<data name="FrmAddBoard_groupBoxSelCom_Text" xml:space="preserve">
<value> 请选择元器件库 </value>
<value> 数据 </value>
</data>
<data name="FrmAddBoard_likSelCsvFile_Text" xml:space="preserve">
<value> 选择文件 </value>
......@@ -2569,7 +2569,7 @@
<value>操作失败，当前为过板模式</value>
</data>
<data name="LineCheckHigh" xml:space="preserve">
<value>线体检测信号亮</value>
<value>流水线检测信号亮</value>
</data>
<data name="LineNotInitOk" xml:space="preserve">
<value>设备未初始化完成</value>
......@@ -2657,17 +2657,17 @@
<data name = "CalMsg2" xml:space = "preserve"> <value> 第二步：请将光标移动至如图示电路板右下角位置，确认后点击设置按钮 </value> </data>
<data name = "CalMsg3" xml:space = "preserve"> <value> 第三步：请点击开始校准按钮，自动计算投影坐标 </value> </data>
<data name = "Type_None" xml:space = "preserve"> <value> 无 </value> </data>
<data name = "FrmPointInfo_lblPolarities_Text" xml:space = "preserve"> <value> 极性 </value> </data>
<data name = "FrmPointInfo_lblPolarities_Text" xml:space = "preserve"> <value> 极性： </value> </data>
<data name = "FrmAddBoard_linkDataViewer_Text" xml:space = "preserve"> <value> 数据预览 </value> </data>
<data name = "FrmAddBoard_linkBomUpload_Text" xml:space = "preserve"> <value> 数据表上传 </value> </data>
<data name = "FrmAddBoard_lblPolarities_Text" xml:space = "preserve"> <value> 极性 </value> </data>
<data name = "FrmAddBoard_lblPolarities_Text" xml:space = "preserve"> <value> 极性： </value> </data>
<data name = "FrmBomUpload_Text" xml:space = "preserve"> <value> 数据表上传 </value> </data>
<data name = "FrmBomUpload_groupBox3_Text" xml:space = "preserve"> <value> 其他设置 </value> </data>
<data name = "FrmBomUpload_chbAutoPos_Text" xml:space = "preserve"> <value> 同物料自动合并库位 </value> </data>
<data name = "FrmBomUpload_label3_Text" xml:space = "preserve"> <value> 元器件默认数量： </value> </data>
<data name = "FrmBomUpload_btnCancel_Text" xml:space = "preserve"> <value> 取消 </value> </data>
<data name = "FrmBomUpload_btnUpload_Text" xml:space = "preserve"> <value> 确定上传 </value> </data>
<data name = "FrmBomUpload_groupBox2_Text" xml:space = "preserve"> <value> 请选择对应关系 </value> </data>
<data name = "FrmBomUpload_groupBox2_Text" xml:space = "preserve"> <value> 请选择映射关系 </value> </data>
<data name = "FrmBomUpload_label2_Text" xml:space = "preserve"> <value> BOM文件位号分隔符： </value> </data>
<data name = "FrmBomUpload_label5_Text" xml:space = "preserve"> <value> 位置文件位号： </value> </data>
<data name = "FrmBomUpload_label8_Text" xml:space = "preserve"> <value> X坐标： </value> </data>
......@@ -2700,7 +2700,7 @@
<data name = "FrmDeviceConfig_chbDisBottomCylinder_Text" xml:space = "preserve"> <value> 禁用底部气缸 </value> </data>
<data name = "FrmAddBoard_chbShowText_Text" xml:space = "preserve"> <value> 默认设置位号为投影文字 </value> </data>
<data name = "FrmAddBoard_groupBox4_Text" xml:space = "preserve"> <value> 点位默认设置 </value> </data>
<data name = "FrmAddBoard_label10_Text" xml:space = "preserve"> <value> 横向大小→： </value> </data>
<data name = "FrmAddBoard_label10_Text" xml:space = "preserve"> <value> 宽度→： </value> </data>
<data name = "FrmAddBoard_rdbData_Text" xml:space = "preserve"> <value> 数据表上传 </value> </data>
<data name = "FrmBoardInfo_linkDis_Text" xml:space = "preserve"> <value> 批量禁用 </value> </data>
<data name = "FrmBoardInfo_linkEnable_Text" xml:space = "preserve"> <value> 批量启用 </value> </data>
......
TSA-V/frmBoard/FrmAddBoard.Designer.cs
......@@ -75,7 +75,7 @@
this.numSizeX = new System.Windows.Forms.NumericUpDown();
this.numPenWidth = new System.Windows.Forms.NumericUpDown();
this.lblLineWidth = new System.Windows.Forms.Label();
this.label7 = new System.Windows.Forms.Label();
this.labelH = new System.Windows.Forms.Label();
this.cmbType = new System.Windows.Forms.ComboBox();
this.lbltype = new System.Windows.Forms.Label();
this.label10 = new System.Windows.Forms.Label();
......@@ -96,7 +96,7 @@
// txtCode
//
this.txtCode.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtCode.Location = new System.Drawing.Point(126, 58);
this.txtCode.Location = new System.Drawing.Point(126, 95);
this.txtCode.MaxLength = 40;
this.txtCode.Name = "txtCode";
this.txtCode.Size = new System.Drawing.Size(220, 26);
......@@ -105,7 +105,7 @@
// label6
//
this.label6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label6.Location = new System.Drawing.Point(3, 62);
this.label6.Location = new System.Drawing.Point(3, 99);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(118, 20);
this.label6.TabIndex = 286;
......@@ -154,7 +154,7 @@
// label5
//
this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.Location = new System.Drawing.Point(6, 135);
this.label5.Location = new System.Drawing.Point(3, 172);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(118, 20);
this.label5.TabIndex = 282;
......@@ -164,7 +164,7 @@
// label4
//
this.label4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.Location = new System.Drawing.Point(6, 175);
this.label4.Location = new System.Drawing.Point(3, 212);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(118, 20);
this.label4.TabIndex = 281;
......@@ -174,7 +174,7 @@
// txtBoardL
//
this.txtBoardL.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtBoardL.Location = new System.Drawing.Point(126, 172);
this.txtBoardL.Location = new System.Drawing.Point(126, 209);
this.txtBoardL.MaxLength = 8;
this.txtBoardL.Name = "txtBoardL";
this.txtBoardL.Size = new System.Drawing.Size(70, 26);
......@@ -183,7 +183,7 @@
// txtBoardW
//
this.txtBoardW.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtBoardW.Location = new System.Drawing.Point(126, 133);
this.txtBoardW.Location = new System.Drawing.Point(126, 170);
this.txtBoardW.MaxLength = 8;
this.txtBoardW.Name = "txtBoardW";
this.txtBoardW.Size = new System.Drawing.Size(70, 26);
......@@ -193,7 +193,7 @@
//
this.label25.AutoSize = true;
this.label25.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label25.Location = new System.Drawing.Point(203, 175);
this.label25.Location = new System.Drawing.Point(203, 212);
this.label25.Name = "label25";
this.label25.Size = new System.Drawing.Size(30, 17);
this.label25.TabIndex = 280;
......@@ -203,7 +203,7 @@
//
this.label24.AutoSize = true;
this.label24.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label24.Location = new System.Drawing.Point(203, 139);
this.label24.Location = new System.Drawing.Point(203, 176);
this.label24.Name = "label24";
this.label24.Size = new System.Drawing.Size(30, 17);
this.label24.TabIndex = 279;
......@@ -225,22 +225,24 @@
// txtImagePath
//
this.txtImagePath.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtImagePath.Location = new System.Drawing.Point(126, 244);
this.txtImagePath.Location = new System.Drawing.Point(126, 281);
this.txtImagePath.MaxLength = 20;
this.txtImagePath.Multiline = true;
this.txtImagePath.Name = "txtImagePath";
this.txtImagePath.Size = new System.Drawing.Size(220, 48);
this.txtImagePath.Size = new System.Drawing.Size(70, 24);
this.txtImagePath.TabIndex = 74;
this.txtImagePath.Visible = false;
//
// label1
//
this.label1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.Location = new System.Drawing.Point(3, 248);
this.label1.Location = new System.Drawing.Point(3, 285);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(118, 20);
this.label1.TabIndex = 73;
this.label1.Text = "导入图片：";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label1.Visible = false;
//
// label3
//
......@@ -258,7 +260,7 @@
this.cmbBomList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbBomList.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbBomList.FormattingEnabled = true;
this.cmbBomList.Location = new System.Drawing.Point(11, 179);
this.cmbBomList.Location = new System.Drawing.Point(11, 214);
this.cmbBomList.Name = "cmbBomList";
this.cmbBomList.Size = new System.Drawing.Size(256, 28);
this.cmbBomList.TabIndex = 71;
......@@ -266,7 +268,7 @@
// txtBoardName
//
this.txtBoardName.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtBoardName.Location = new System.Drawing.Point(126, 19);
this.txtBoardName.Location = new System.Drawing.Point(126, 56);
this.txtBoardName.MaxLength = 20;
this.txtBoardName.Name = "txtBoardName";
this.txtBoardName.Size = new System.Drawing.Size(220, 26);
......@@ -275,7 +277,7 @@
// label2
//
this.label2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.Location = new System.Drawing.Point(3, 21);
this.label2.Location = new System.Drawing.Point(3, 58);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(118, 20);
this.label2.TabIndex = 3;
......@@ -285,7 +287,7 @@
// label8
//
this.label8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label8.Location = new System.Drawing.Point(3, 103);
this.label8.Location = new System.Drawing.Point(3, 140);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(118, 20);
this.label8.TabIndex = 290;
......@@ -302,7 +304,7 @@
"左下角",
"右上角",
"右下角"});
this.cmbOrgType.Location = new System.Drawing.Point(126, 97);
this.cmbOrgType.Location = new System.Drawing.Point(126, 134);
this.cmbOrgType.Name = "cmbOrgType";
this.cmbOrgType.Size = new System.Drawing.Size(220, 28);
this.cmbOrgType.TabIndex = 289;
......@@ -323,7 +325,7 @@
// lblWidth
//
this.lblWidth.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblWidth.Location = new System.Drawing.Point(6, 213);
this.lblWidth.Location = new System.Drawing.Point(3, 250);
this.lblWidth.Name = "lblWidth";
this.lblWidth.Size = new System.Drawing.Size(118, 20);
this.lblWidth.TabIndex = 294;
......@@ -333,7 +335,7 @@
// txtLineWidth
//
this.txtLineWidth.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtLineWidth.Location = new System.Drawing.Point(126, 209);
this.txtLineWidth.Location = new System.Drawing.Point(126, 246);
this.txtLineWidth.MaxLength = 8;
this.txtLineWidth.Name = "txtLineWidth";
this.txtLineWidth.Size = new System.Drawing.Size(70, 26);
......@@ -343,7 +345,7 @@
//
this.label9.AutoSize = true;
this.label9.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label9.Location = new System.Drawing.Point(203, 215);
this.label9.Location = new System.Drawing.Point(203, 252);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(30, 17);
this.label9.TabIndex = 293;
......@@ -352,12 +354,13 @@
// txtCsvFileName
//
this.txtCsvFileName.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtCsvFileName.Location = new System.Drawing.Point(8, 53);
this.txtCsvFileName.Location = new System.Drawing.Point(116, 275);
this.txtCsvFileName.MaxLength = 20;
this.txtCsvFileName.Multiline = true;
this.txtCsvFileName.Name = "txtCsvFileName";
this.txtCsvFileName.Size = new System.Drawing.Size(259, 55);
this.txtCsvFileName.Size = new System.Drawing.Size(115, 36);
this.txtCsvFileName.TabIndex = 297;
this.txtCsvFileName.Visible = false;
//
// groupBoxSelCom
//
......@@ -376,12 +379,13 @@
this.groupBoxSelCom.Size = new System.Drawing.Size(273, 317);
this.groupBoxSelCom.TabIndex = 298;
this.groupBoxSelCom.TabStop = false;
this.groupBoxSelCom.Text = "请选择元器件库";
this.groupBoxSelCom.Text = "数据";
//
// rdbData
//
this.rdbData.AutoSize = true;
this.rdbData.Location = new System.Drawing.Point(11, 221);
this.rdbData.Checked = true;
this.rdbData.Location = new System.Drawing.Point(11, 22);
this.rdbData.Name = "rdbData";
this.rdbData.Size = new System.Drawing.Size(86, 21);
this.rdbData.TabIndex = 306;
......@@ -393,7 +397,7 @@
// linkDataViewer
//
this.linkDataViewer.AutoSize = true;
this.linkDataViewer.Location = new System.Drawing.Point(8, 294);
this.linkDataViewer.Location = new System.Drawing.Point(11, 278);
this.linkDataViewer.Name = "linkDataViewer";
this.linkDataViewer.Size = new System.Drawing.Size(56, 17);
this.linkDataViewer.TabIndex = 305;
......@@ -404,7 +408,7 @@
// linkBomUpload
//
this.linkBomUpload.AutoSize = true;
this.linkBomUpload.Location = new System.Drawing.Point(27, 253);
this.linkBomUpload.Location = new System.Drawing.Point(11, 62);
this.linkBomUpload.Name = "linkBomUpload";
this.linkBomUpload.Size = new System.Drawing.Size(68, 17);
this.linkBomUpload.TabIndex = 302;
......@@ -415,7 +419,7 @@
// likSelCsvFile
//
this.likSelCsvFile.AutoSize = true;
this.likSelCsvFile.Location = new System.Drawing.Point(29, 119);
this.likSelCsvFile.Location = new System.Drawing.Point(11, 138);
this.likSelCsvFile.Name = "likSelCsvFile";
this.likSelCsvFile.Size = new System.Drawing.Size(56, 17);
this.likSelCsvFile.TabIndex = 301;
......@@ -426,7 +430,7 @@
// likDownFile
//
this.likDownFile.AutoSize = true;
this.likDownFile.Location = new System.Drawing.Point(123, 119);
this.likDownFile.Location = new System.Drawing.Point(113, 138);
this.likDownFile.Name = "likDownFile";
this.likDownFile.Size = new System.Drawing.Size(56, 17);
this.likDownFile.TabIndex = 300;
......@@ -437,13 +441,11 @@
// rdbUpload
//
this.rdbUpload.AutoSize = true;
this.rdbUpload.Checked = true;
this.rdbUpload.Location = new System.Drawing.Point(11, 24);
this.rdbUpload.Location = new System.Drawing.Point(11, 98);
this.rdbUpload.Name = "rdbUpload";
this.rdbUpload.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.rdbUpload.Size = new System.Drawing.Size(98, 21);
this.rdbUpload.TabIndex = 299;
this.rdbUpload.TabStop = true;
this.rdbUpload.Text = "上传元件数据";
this.rdbUpload.UseVisualStyleBackColor = true;
this.rdbUpload.CheckedChanged += new System.EventHandler(this.rdbUpload_CheckedChanged);
......@@ -451,7 +453,7 @@
// rdbSelCom
//
this.rdbSelCom.AutoSize = true;
this.rdbSelCom.Location = new System.Drawing.Point(9, 150);
this.rdbSelCom.Location = new System.Drawing.Point(11, 174);
this.rdbSelCom.Name = "rdbSelCom";
this.rdbSelCom.Size = new System.Drawing.Size(98, 21);
this.rdbSelCom.TabIndex = 298;
......@@ -463,7 +465,7 @@
// linkLabel1
//
this.linkLabel1.AutoSize = true;
this.linkLabel1.Location = new System.Drawing.Point(124, 297);
this.linkLabel1.Location = new System.Drawing.Point(139, 26);
this.linkLabel1.Name = "linkLabel1";
this.linkLabel1.Size = new System.Drawing.Size(53, 12);
this.linkLabel1.TabIndex = 302;
......@@ -523,7 +525,7 @@
// linkLabel3
//
this.linkLabel3.AutoSize = true;
this.linkLabel3.Location = new System.Drawing.Point(50, 297);
this.linkLabel3.Location = new System.Drawing.Point(61, 27);
this.linkLabel3.Name = "linkLabel3";
this.linkLabel3.Size = new System.Drawing.Size(41, 12);
this.linkLabel3.TabIndex = 304;
......@@ -534,12 +536,13 @@
// linkLabel2
//
this.linkLabel2.AutoSize = true;
this.linkLabel2.Location = new System.Drawing.Point(204, 297);
this.linkLabel2.Location = new System.Drawing.Point(268, 19);
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.Visible = false;
this.linkLabel2.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel2_LinkClicked);
//
// groupBox4
......@@ -548,7 +551,7 @@
this.groupBox4.Controls.Add(this.numSizeX);
this.groupBox4.Controls.Add(this.numPenWidth);
this.groupBox4.Controls.Add(this.lblLineWidth);
this.groupBox4.Controls.Add(this.label7);
this.groupBox4.Controls.Add(this.labelH);
this.groupBox4.Controls.Add(this.cmbType);
this.groupBox4.Controls.Add(this.lbltype);
this.groupBox4.Controls.Add(this.label10);
......@@ -558,7 +561,7 @@
this.groupBox4.Size = new System.Drawing.Size(642, 168);
this.groupBox4.TabIndex = 304;
this.groupBox4.TabStop = false;
this.groupBox4.Text = "点位默认设置";
this.groupBox4.Text = "投影默认设置";
//
// numSizeY
//
......@@ -636,12 +639,12 @@
//
// label7
//
this.label7.Location = new System.Drawing.Point(60, 99);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(160, 17);
this.label7.TabIndex = 306;
this.label7.Text = "纵向大小↓：";
this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
this.labelH.Location = new System.Drawing.Point(60, 99);
this.labelH.Name = "label7";
this.labelH.Size = new System.Drawing.Size(160, 17);
this.labelH.TabIndex = 306;
this.labelH.Text = "高↓：";
this.labelH.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// cmbType
//
......@@ -667,7 +670,7 @@
this.lbltype.Name = "lbltype";
this.lbltype.Size = new System.Drawing.Size(160, 17);
this.lbltype.TabIndex = 304;
this.lbltype.Text = "点形状：";
this.lbltype.Text = "形状：";
this.lbltype.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// label10
......@@ -676,7 +679,7 @@
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(160, 17);
this.label10.TabIndex = 282;
this.label10.Text = "横向大小→：";
this.label10.Text = "宽→：";
this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// chbShowText
......@@ -768,7 +771,7 @@
private System.Windows.Forms.NumericUpDown numSizeX;
private System.Windows.Forms.NumericUpDown numPenWidth;
private System.Windows.Forms.Label lblLineWidth;
private System.Windows.Forms.Label label7;
private System.Windows.Forms.Label labelH;
private System.Windows.Forms.ComboBox cmbType;
private System.Windows.Forms.Label lbltype;
private System.Windows.Forms.Label label10;
......
TSA-V/frmBoard/FrmAddBoard.cs
......@@ -304,9 +304,9 @@ namespace TSA_V
private void FrmAddBoard_Load(object sender, EventArgs e)
{
label7.Text = ResourceCulture.GetString("FrmPointInfo_lblSizeWidth_Text", "纵向大小↓： ");
label10.Text = ResourceCulture.GetString("FrmPointInfo_lblSizeLength_Text", "横向大小→：");
lbltype.Text = ResourceCulture.GetString("FrmPointInfo_lbltype_Text", "坐标点形状：");
labelH.Text = ResourceCulture.GetString("FrmPointInfo_lblSizeWidth_Text", "高↓： ");
label10.Text = ResourceCulture.GetString("FrmPointInfo_lblSizeLength_Text", "宽→：");
lbltype.Text = ResourceCulture.GetString("FrmPointInfo_lbltype_Text", "形状：");
lblLineWidth.Text = ResourceCulture.GetString("FrmPointInfo_lblLineWidth_Text", "画笔宽度：");
this.timer1.Enabled = true;
......@@ -341,7 +341,7 @@ namespace TSA_V
xyMoveControl1.MaxY = (int)TSAVBean.Y_Max;
xyMoveControl1.ShowText = "";
cmbType.SelectedIndex= 0;
rdbUpload.Checked = true;
rdbData.Checked = true;
ComChange( );
if (IOBase.NoLine)
......@@ -378,7 +378,7 @@ namespace TSA_V
private void ComChange( )
{
txtCsvFileName.Visible = rdbUpload.Checked;
txtCsvFileName.Visible = false ;
likDownFile.Visible = rdbUpload.Checked;
likSelCsvFile.Visible = rdbUpload.Checked;
cmbBomList.Visible = rdbSelCom.Checked;
......@@ -401,18 +401,68 @@ namespace TSA_V
openFileDialogImg.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory);
//openFileDialogImg.DefaultExt = "jpg|gif|bmp|png|jpeg";
//openFileDialogImg.Filter = "jpg|*.jpg|gif|*.gif|bmp|*.bmp|png|*.png|jpeg|*.jpeg";
openFileDialogImg.Filter = "Image Files|*.bmp;*.jpg;*.gif;*.png;*jpeg";
openFileDialogImg.Filter = "Image Files|*.bmp;*.jpg;*.gif;*.png;*jpeg|gerber Files|*.*";
string directory = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory);//桌面路径
openFileDialogImg.InitialDirectory = directory;
if (openFileDialogImg.ShowDialog() == DialogResult.OK)
{
FrmImageViewer imageViewer = new FrmImageViewer(openFileDialogImg.FileName);
DialogResult sureresult = imageViewer.ShowDialog();
if (!sureresult.Equals(DialogResult.Cancel))
{
string[] files = openFileDialogImg.FileNames;
string defPath = Path.GetPathRoot(Application.StartupPath) + @"image\";
FrmImageViewer imageViewer;
//List<string> newFiles = FileUtil.FileProcess(openFileDialog.FileNames);
GerberVS.BoundingBox boxBound = GerberVS.AGerberController.OpenLayers(files, defPath, out string filename);
if (boxBound != null && File.Exists(filename))
{
double x = boxBound.Right - boxBound.Left;
double y = boxBound.Top - boxBound.Bottom;
string msg = $"位置左下角({Math.Round(boxBound.Left, 2)}，{Math.Round(boxBound.Bottom, 2)})，" +
$"右上角（{Math.Round(boxBound.Right, 2)},{Math.Round(boxBound.Top, 2)}）：尺寸：{Math.Round(x, 2)}X{Math.Round(y, 2)}";
LogUtil.info($"gerber文件【{string.Join(",", files)}】成功导入到文件：{filename}，{msg}");
imageViewer = new FrmImageViewer(filename);
if (!imageViewer.ShowDialog().Equals(DialogResult.Cancel))
{
int l = (int)Math.Round(x);
int w = (int)Math.Round(y);
if (x <= 10 || w <= 10)
{
l = (int)(x * 25.4);
w = (int)(y * 25.4);
}
this.txtImagePath.Text = filename;
int currl = FormUtil.GetIntValue(txtBoardL);
int currw = FormUtil.GetIntValue(txtBoardW);
if (currl <= 0)
{
txtBoardL.Text = l.ToString();
}
if (currw <= 0)
{
txtBoardW.Text = w.ToString();
}
}
}
else
{
openFileDialogImg.Tag = true;
this.txtImagePath.Text = openFileDialogImg.FileName;
List<string> fileTypes = new List<string>() { ".bmp", ".jpg", ".gif", ".png", ".jpeg" };
foreach (string file in files)
{
string ext = Path.GetExtension(file);
if (fileTypes.Contains(ext.ToLower()))
{
imageViewer = new FrmImageViewer(openFileDialogImg.FileName);
if (!imageViewer.ShowDialog().Equals(DialogResult.Cancel))
{
openFileDialogImg.Tag = true;
this.txtImagePath.Text = openFileDialogImg.FileName;
return;
}
}
}
MessageBox.Show(ResourceCulture.GetString("FileError", "文件格式错误 "));
}
}
}
......@@ -550,10 +600,51 @@ namespace TSA_V
return true;
}
private void linkLabel2_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
private bool GerberFileProcess(string[] files)
{
string defPath = Path.GetPathRoot(Application.StartupPath) + @"image\";
//List<string> newFiles = FileUtil.FileProcess(openFileDialog.FileNames);
GerberVS.BoundingBox boxBound = GerberVS.AGerberController.OpenLayers(files, defPath, out string filename);
if (boxBound != null && File.Exists(filename))
{
double x = boxBound.Right - boxBound.Left;
double y = boxBound.Top - boxBound.Bottom;
string msg = $"位置左下角({Math.Round(boxBound.Left, 2)}，{Math.Round(boxBound.Bottom, 2)})，" +
$"右上角（{Math.Round(boxBound.Right, 2)},{Math.Round(boxBound.Top, 2)}）：尺寸：{Math.Round(x, 2)}X{Math.Round(y, 2)}";
LogUtil.info($"gerber文件【{string.Join(",", files)}】成功导入到文件：{filename}，{msg}");
FrmImageViewer imageViewer = new FrmImageViewer(filename);
DialogResult sureresult = imageViewer.ShowDialog();
if (!sureresult.Equals(DialogResult.Cancel))
{
int l = (int)Math.Round(x);
int w = (int)Math.Round(y);
if (x <= 10 || w <= 10)
{
l = (int)(x * 25.4);
w = (int)(y * 25.4);
}
this.txtImagePath.Text = filename;
int currl = FormUtil.GetIntValue(txtBoardL);
int currw = FormUtil.GetIntValue(txtBoardW);
if (currl <= 0)
{
txtBoardL.Text = l.ToString();
}
if (currw <= 0)
{
txtBoardW.Text = w.ToString();
}
}
return true;
}
else
{
MessageBox.Show(ResourceCulture.GetString("FileError", "文件格式错误 "));
}
return false;
}
private void linkLabel2_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
using (OpenFileDialog openFileDialog = new OpenFileDialog())
{
openFileDialog.Title = "Open Gerber File(s)";
......@@ -561,44 +652,45 @@ namespace TSA_V
openFileDialog.Multiselect = true;
if (openFileDialog.ShowDialog() == DialogResult.OK)
{
string defPath = Path.GetPathRoot(Application.StartupPath) + @"image\";
//List<string> newFiles = FileUtil.FileProcess(openFileDialog.FileNames);
GerberVS.BoundingBox boxBound = GerberVS.AGerberController.OpenLayers(openFileDialog.FileNames,defPath, out string filename);
if (boxBound!=null && File.Exists(filename))
{
double x = boxBound.Right - boxBound.Left;
double y = boxBound.Top - boxBound.Bottom;
string msg = $"位置左下角({Math.Round(boxBound.Left, 2)}，{Math.Round(boxBound.Bottom, 2)})，" +
$"右上角（{Math.Round(boxBound.Right, 2)},{Math.Round(boxBound.Top, 2)}）：尺寸：{Math.Round(x, 2)}X{Math.Round(y, 2)}";
LogUtil.info($"gerber文件【{string.Join(",", openFileDialog.FileNames) }】成功导入到文件：{filename}，{msg}");
FrmImageViewer imageViewer = new FrmImageViewer(filename);
DialogResult sureresult = imageViewer.ShowDialog();
if (!sureresult.Equals(DialogResult.Cancel))
{
int l =(int) Math.Round(x);
int w = (int)Math.Round(y);
if (x <= 10 || w <= 10)
{
l = (int)(x * 25.4);
w = (int)(y * 25.4);
}
this.txtImagePath.Text = filename;
int currl = FormUtil.GetIntValue(txtBoardL);
int currw = FormUtil.GetIntValue(txtBoardW);
if (currl <= 0)
{
txtBoardL.Text = l.ToString();
}
if (currw <= 0)
{
txtBoardW.Text = w.ToString();
}
}
}
else
{
MessageBox.Show(ResourceCulture.GetString("FileError", "文件格式错误 "));
}
GerberFileProcess(openFileDialog.FileNames);
//string defPath = Path.GetPathRoot(Application.StartupPath) + @"image\";
////List<string> newFiles = FileUtil.FileProcess(openFileDialog.FileNames);
//GerberVS.BoundingBox boxBound = GerberVS.AGerberController.OpenLayers(openFileDialog.FileNames,defPath, out string filename);
//if (boxBound!=null && File.Exists(filename))
//{
// double x = boxBound.Right - boxBound.Left;
// double y = boxBound.Top - boxBound.Bottom;
// string msg = $"位置左下角({Math.Round(boxBound.Left, 2)}，{Math.Round(boxBound.Bottom, 2)})，" +
// $"右上角（{Math.Round(boxBound.Right, 2)},{Math.Round(boxBound.Top, 2)}）：尺寸：{Math.Round(x, 2)}X{Math.Round(y, 2)}";
// LogUtil.info($"gerber文件【{string.Join(",", openFileDialog.FileNames) }】成功导入到文件：{filename}，{msg}");
// FrmImageViewer imageViewer = new FrmImageViewer(filename);
// DialogResult sureresult = imageViewer.ShowDialog();
// if (!sureresult.Equals(DialogResult.Cancel))
// {
// int l =(int) Math.Round(x);
// int w = (int)Math.Round(y);
// if (x <= 10 || w <= 10)
// {
// l = (int)(x * 25.4);
// w = (int)(y * 25.4);
// }
// this.txtImagePath.Text = filename;
// int currl = FormUtil.GetIntValue(txtBoardL);
// int currw = FormUtil.GetIntValue(txtBoardW);
// if (currl <= 0)
// {
// txtBoardL.Text = l.ToString();
// }
// if (currw <= 0)
// {
// txtBoardW.Text = w.ToString();
// }
// }
//}
//else
//{
// MessageBox.Show(ResourceCulture.GetString("FileError", "文件格式错误 "));
//}
}
}
}
......
TSA-V/frmBoard/FrmBoardInfo.Designer.cs
......@@ -51,6 +51,7 @@
this.backgroundWorker1 = new System.ComponentModel.BackgroundWorker();
this.dataGridViewImageColumn1 = new System.Windows.Forms.DataGridViewImageColumn();
this.dataGridViewImageColumn2 = new System.Windows.Forms.DataGridViewImageColumn();
this.colorDialog1 = new System.Windows.Forms.ColorDialog();
this.panel1 = new System.Windows.Forms.Panel();
this.linkDis = new System.Windows.Forms.LinkLabel();
this.linkEnable = new System.Windows.Forms.LinkLabel();
......@@ -123,7 +124,6 @@
this.button1 = new System.Windows.Forms.Button();
this.btnSave = new System.Windows.Forms.Button();
this.panel2 = new System.Windows.Forms.Panel();
this.colorDialog1 = new System.Windows.Forms.ColorDialog();
this.contextMenuStrip1.SuspendLayout();
this.contextMenuStrip2.SuspendLayout();
this.panel1.SuspendLayout();
......@@ -334,7 +334,7 @@
this.btnCalibrate.Name = "btnCalibrate";
this.btnCalibrate.Size = new System.Drawing.Size(120, 45);
this.btnCalibrate.TabIndex = 294;
this.btnCalibrate.Text = "投影标定";
this.btnCalibrate.Text = "校准";
this.btnCalibrate.UseVisualStyleBackColor = true;
this.btnCalibrate.Click += new System.EventHandler(this.btnCalibrate_Click);
//
......
TSA-V/frmBoard/FrmBoardInfo.resx
......@@ -156,6 +156,9 @@
AeLDoohrNFdzAAAAAElFTkSuQmCC
</value>
</data>
<metadata name="colorDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1043, 17</value>
</metadata>
<metadata name="Column_pointNum.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
......@@ -237,9 +240,6 @@
<metadata name="Column_Down.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="colorDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1043, 17</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>82</value>
</metadata>
......
TSA-V/frmBoard/FrmBomUpload.Designer.cs
......@@ -34,8 +34,6 @@
this.txtXyFile = new System.Windows.Forms.TextBox();
this.txtBomFile = new System.Windows.Forms.TextBox();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.label2 = new System.Windows.Forms.Label();
this.txtSpilt = new System.Windows.Forms.TextBox();
this.label5 = new System.Windows.Forms.Label();
this.cmbTagNumber = new System.Windows.Forms.ComboBox();
this.label8 = new System.Windows.Forms.Label();
......@@ -48,6 +46,8 @@
this.cmbPn = new System.Windows.Forms.ComboBox();
this.label4 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.txtSpilt = new System.Windows.Forms.TextBox();
this.btnCancel = new System.Windows.Forms.Button();
this.btnUpload = new System.Windows.Forms.Button();
this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
......@@ -141,26 +141,7 @@
this.groupBox2.Size = new System.Drawing.Size(553, 279);
this.groupBox2.TabIndex = 1;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "请选择对应关系";
//
// label2
//
this.label2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.Location = new System.Drawing.Point(6, 76);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(242, 20);
this.label2.TabIndex = 321;
this.label2.Text = "BOM文件位号分隔符：";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// txtSpilt
//
this.txtSpilt.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtSpilt.Location = new System.Drawing.Point(254, 73);
this.txtSpilt.Name = "txtSpilt";
this.txtSpilt.Size = new System.Drawing.Size(133, 26);
this.txtSpilt.TabIndex = 320;
this.txtSpilt.Text = ",";
this.groupBox2.Text = "请选择映射关系";
//
// label5
//
......@@ -282,6 +263,25 @@
this.label1.Text = "物料编码：";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// label2
//
this.label2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.Location = new System.Drawing.Point(6, 76);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(242, 20);
this.label2.TabIndex = 321;
this.label2.Text = "BOM文件位号分隔符：";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// txtSpilt
//
this.txtSpilt.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtSpilt.Location = new System.Drawing.Point(254, 73);
this.txtSpilt.Name = "txtSpilt";
this.txtSpilt.Size = new System.Drawing.Size(133, 26);
this.txtSpilt.TabIndex = 320;
this.txtSpilt.Text = ",";
//
// btnCancel
//
this.btnCancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
......
TSA-V/workForm/FrmTSAV.Designer.cs
......@@ -124,7 +124,7 @@
this.btnIo.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
this.btnIo.FlatAppearance.BorderSize = 0;
this.btnIo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnIo.Location = new System.Drawing.Point(1170, 548);
this.btnIo.Location = new System.Drawing.Point(1426, 766);
this.btnIo.Name = "btnIo";
this.btnIo.Size = new System.Drawing.Size(51, 30);
this.btnIo.TabIndex = 280;
......@@ -137,7 +137,7 @@
this.btnCodeTest.BackColor = System.Drawing.SystemColors.Control;
this.btnCodeTest.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCodeTest.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCodeTest.Location = new System.Drawing.Point(233, 487);
this.btnCodeTest.Location = new System.Drawing.Point(489, 705);
this.btnCodeTest.Name = "btnCodeTest";
this.btnCodeTest.Size = new System.Drawing.Size(120, 60);
this.btnCodeTest.TabIndex = 279;
......@@ -152,7 +152,7 @@
this.btnWorkInfo.BackColor = System.Drawing.SystemColors.Control;
this.btnWorkInfo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnWorkInfo.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnWorkInfo.Location = new System.Drawing.Point(477, 487);
this.btnWorkInfo.Location = new System.Drawing.Point(733, 705);
this.btnWorkInfo.Name = "btnWorkInfo";
this.btnWorkInfo.Size = new System.Drawing.Size(120, 60);
this.btnWorkInfo.TabIndex = 278;
......@@ -171,9 +171,9 @@
this.groupBox3.Controls.Add(this.radioButton2);
this.groupBox3.Controls.Add(this.radioButton1);
this.groupBox3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox3.Location = new System.Drawing.Point(12, 3);
this.groupBox3.Location = new System.Drawing.Point(12, 2);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(641, 96);
this.groupBox3.Size = new System.Drawing.Size(641, 89);
this.groupBox3.TabIndex = 277;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "工作方式";
......@@ -184,9 +184,9 @@
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.lblGuoBan.Font = new System.Drawing.Font("微软雅黑", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblGuoBan.Location = new System.Drawing.Point(11, 17);
this.lblGuoBan.Location = new System.Drawing.Point(13, 17);
this.lblGuoBan.Name = "lblGuoBan";
this.lblGuoBan.Size = new System.Drawing.Size(618, 71);
this.lblGuoBan.Size = new System.Drawing.Size(616, 64);
this.lblGuoBan.TabIndex = 285;
this.lblGuoBan.Text = "过板模式";
this.lblGuoBan.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
......@@ -194,10 +194,10 @@
// lblPause
//
this.lblPause.AutoSize = true;
this.lblPause.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblPause.Location = new System.Drawing.Point(179, 61);
this.lblPause.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblPause.Location = new System.Drawing.Point(311, 54);
this.lblPause.Name = "lblPause";
this.lblPause.Size = new System.Drawing.Size(74, 21);
this.lblPause.Size = new System.Drawing.Size(65, 20);
this.lblPause.TabIndex = 284;
this.lblPause.Text = "暂停工作";
this.lblPause.Visible = false;
......@@ -206,7 +206,7 @@
//
this.label8.AutoSize = true;
this.label8.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label8.Location = new System.Drawing.Point(584, 21);
this.label8.Location = new System.Drawing.Point(197, 54);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(23, 20);
this.label8.TabIndex = 283;
......@@ -215,18 +215,19 @@
// label7
//
this.label7.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label7.Location = new System.Drawing.Point(302, 21);
this.label7.Location = new System.Drawing.Point(142, 19);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(222, 21);
this.label7.TabIndex = 282;
this.label7.Text = "间隔时间:";
this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label7.Visible = false;
//
// btnUpdateAutoTime
//
this.btnUpdateAutoTime.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpdateAutoTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdateAutoTime.Location = new System.Drawing.Point(497, 52);
this.btnUpdateAutoTime.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdateAutoTime.Location = new System.Drawing.Point(226, 48);
this.btnUpdateAutoTime.Name = "btnUpdateAutoTime";
this.btnUpdateAutoTime.Size = new System.Drawing.Size(71, 32);
this.btnUpdateAutoTime.TabIndex = 281;
......@@ -237,20 +238,20 @@
//
// txtAuToTime
//
this.txtAuToTime.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtAuToTime.Location = new System.Drawing.Point(529, 17);
this.txtAuToTime.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtAuToTime.Location = new System.Drawing.Point(142, 51);
this.txtAuToTime.MaxLength = 5;
this.txtAuToTime.Name = "txtAuToTime";
this.txtAuToTime.Size = new System.Drawing.Size(47, 29);
this.txtAuToTime.Size = new System.Drawing.Size(47, 26);
this.txtAuToTime.TabIndex = 2;
//
// radioButton2
//
this.radioButton2.AutoSize = true;
this.radioButton2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.radioButton2.Location = new System.Drawing.Point(44, 59);
this.radioButton2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.radioButton2.Location = new System.Drawing.Point(44, 52);
this.radioButton2.Name = "radioButton2";
this.radioButton2.Size = new System.Drawing.Size(92, 25);
this.radioButton2.Size = new System.Drawing.Size(83, 24);
this.radioButton2.TabIndex = 1;
this.radioButton2.TabStop = true;
this.radioButton2.Text = "自动工作";
......@@ -260,10 +261,10 @@
// radioButton1
//
this.radioButton1.AutoSize = true;
this.radioButton1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.radioButton1.Location = new System.Drawing.Point(44, 21);
this.radioButton1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.radioButton1.Location = new System.Drawing.Point(44, 19);
this.radioButton1.Name = "radioButton1";
this.radioButton1.Size = new System.Drawing.Size(92, 25);
this.radioButton1.Size = new System.Drawing.Size(83, 24);
this.radioButton1.TabIndex = 0;
this.radioButton1.TabStop = true;
this.radioButton1.Text = "脚踏工作";
......@@ -276,7 +277,7 @@
this.btnTest.BackColor = System.Drawing.SystemColors.Control;
this.btnTest.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnTest.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnTest.Location = new System.Drawing.Point(477, 487);
this.btnTest.Location = new System.Drawing.Point(733, 705);
this.btnTest.Name = "btnTest";
this.btnTest.Size = new System.Drawing.Size(120, 60);
this.btnTest.TabIndex = 272;
......@@ -291,7 +292,7 @@
this.btnStart.BackColor = System.Drawing.SystemColors.Control;
this.btnStart.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStart.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStart.Location = new System.Drawing.Point(599, 487);
this.btnStart.Location = new System.Drawing.Point(855, 705);
this.btnStart.Name = "btnStart";
this.btnStart.Size = new System.Drawing.Size(120, 60);
this.btnStart.TabIndex = 266;
......@@ -321,7 +322,7 @@
this.groupBox1.Controls.Add(this.lblComName);
this.groupBox1.Controls.Add(this.lblPointName);
this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox1.Location = new System.Drawing.Point(12, 103);
this.groupBox1.Location = new System.Drawing.Point(12, 94);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(641, 237);
this.groupBox1.TabIndex = 2;
......@@ -333,7 +334,7 @@
this.lblStart.AutoSize = true;
this.lblStart.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblStart.ForeColor = System.Drawing.Color.Olive;
this.lblStart.Location = new System.Drawing.Point(71, 213);
this.lblStart.Location = new System.Drawing.Point(15, 207);
this.lblStart.Name = "lblStart";
this.lblStart.Size = new System.Drawing.Size(314, 22);
this.lblStart.TabIndex = 283;
......@@ -345,7 +346,7 @@
this.lblLast.AutoSize = true;
this.lblLast.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblLast.ForeColor = System.Drawing.Color.Olive;
this.lblLast.Location = new System.Drawing.Point(71, 213);
this.lblLast.Location = new System.Drawing.Point(15, 208);
this.lblLast.Name = "lblLast";
this.lblLast.Size = new System.Drawing.Size(282, 22);
this.lblLast.TabIndex = 282;
......@@ -355,8 +356,8 @@
// btnCancel
//
this.btnCancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCancel.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCancel.Location = new System.Drawing.Point(453, 74);
this.btnCancel.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCancel.Location = new System.Drawing.Point(333, 67);
this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(68, 43);
this.btnCancel.TabIndex = 281;
......@@ -368,8 +369,8 @@
// btnSave
//
this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSave.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSave.Location = new System.Drawing.Point(379, 74);
this.btnSave.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSave.Location = new System.Drawing.Point(259, 67);
this.btnSave.Name = "btnSave";
this.btnSave.Size = new System.Drawing.Size(68, 43);
this.btnSave.TabIndex = 280;
......@@ -381,27 +382,27 @@
// lblComNotices
//
this.lblComNotices.AutoSize = true;
this.lblComNotices.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblComNotices.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblComNotices.ForeColor = System.Drawing.Color.Red;
this.lblComNotices.Location = new System.Drawing.Point(167, 165);
this.lblComNotices.Name = "lblComNotices";
this.lblComNotices.Size = new System.Drawing.Size(37, 19);
this.lblComNotices.Size = new System.Drawing.Size(37, 20);
this.lblComNotices.TabIndex = 279;
this.lblComNotices.Text = "暂无";
//
// txtCount
//
this.txtCount.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtCount.Location = new System.Drawing.Point(404, 30);
this.txtCount.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtCount.Location = new System.Drawing.Point(165, 74);
this.txtCount.MaxLength = 6;
this.txtCount.Name = "txtCount";
this.txtCount.Size = new System.Drawing.Size(88, 29);
this.txtCount.Size = new System.Drawing.Size(88, 26);
this.txtCount.TabIndex = 278;
this.txtCount.Visible = false;
//
// label6
//
this.label6.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label6.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label6.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.label6.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label6.Location = new System.Drawing.Point(9, 20);
......@@ -414,29 +415,30 @@
// lblPartNum
//
this.lblPartNum.AutoSize = true;
this.lblPartNum.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblPartNum.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblPartNum.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.lblPartNum.Location = new System.Drawing.Point(167, 20);
this.lblPartNum.Name = "lblPartNum";
this.lblPartNum.Size = new System.Drawing.Size(37, 19);
this.lblPartNum.Size = new System.Drawing.Size(37, 20);
this.lblPartNum.TabIndex = 276;
this.lblPartNum.Text = "暂无";
//
// btnUpateCount
//
this.btnUpateCount.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpateCount.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpateCount.Location = new System.Drawing.Point(393, 74);
this.btnUpateCount.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpateCount.Location = new System.Drawing.Point(226, 153);
this.btnUpateCount.Name = "btnUpateCount";
this.btnUpateCount.Size = new System.Drawing.Size(117, 43);
this.btnUpateCount.TabIndex = 275;
this.btnUpateCount.Text = "编辑数量";
this.btnUpateCount.UseVisualStyleBackColor = false;
this.btnUpateCount.Visible = false;
this.btnUpateCount.Click += new System.EventHandler(this.btnUpateCount_Click);
//
// label5
//
this.label5.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.label5.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label5.Location = new System.Drawing.Point(9, 78);
......@@ -449,28 +451,29 @@
// lblCount
//
this.lblCount.AutoSize = true;
this.lblCount.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblCount.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblCount.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.lblCount.Location = new System.Drawing.Point(167, 78);
this.lblCount.Name = "lblCount";
this.lblCount.Size = new System.Drawing.Size(37, 19);
this.lblCount.Size = new System.Drawing.Size(37, 20);
this.lblCount.TabIndex = 273;
this.lblCount.Text = "暂无";
this.lblCount.DoubleClick += new System.EventHandler(this.lblCount_DoubleClick);
//
// lblPositionNum
//
this.lblPositionNum.AutoSize = true;
this.lblPositionNum.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblPositionNum.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblPositionNum.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.lblPositionNum.Location = new System.Drawing.Point(167, 107);
this.lblPositionNum.Name = "lblPositionNum";
this.lblPositionNum.Size = new System.Drawing.Size(42, 22);
this.lblPositionNum.Size = new System.Drawing.Size(37, 20);
this.lblPositionNum.TabIndex = 8;
this.lblPositionNum.Text = "暂无";
//
// label4
//
this.label4.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.label4.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label4.Location = new System.Drawing.Point(9, 107);
......@@ -482,7 +485,7 @@
//
// label1
//
this.label1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.label1.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label1.Location = new System.Drawing.Point(9, 136);
......@@ -495,17 +498,17 @@
// lblComDes
//
this.lblComDes.AutoSize = true;
this.lblComDes.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblComDes.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblComDes.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.lblComDes.Location = new System.Drawing.Point(167, 136);
this.lblComDes.Name = "lblComDes";
this.lblComDes.Size = new System.Drawing.Size(37, 19);
this.lblComDes.Size = new System.Drawing.Size(37, 20);
this.lblComDes.TabIndex = 3;
this.lblComDes.Text = "暂无";
//
// label2
//
this.label2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.ForeColor = System.Drawing.Color.Red;
this.label2.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label2.Location = new System.Drawing.Point(9, 165);
......@@ -517,7 +520,7 @@
//
// label3
//
this.label3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.label3.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label3.Location = new System.Drawing.Point(9, 49);
......@@ -530,11 +533,11 @@
// lblComName
//
this.lblComName.AutoSize = true;
this.lblComName.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblComName.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblComName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.lblComName.Location = new System.Drawing.Point(410, 165);
this.lblComName.Name = "lblComName";
this.lblComName.Size = new System.Drawing.Size(37, 19);
this.lblComName.Size = new System.Drawing.Size(37, 20);
this.lblComName.TabIndex = 2;
this.lblComName.Text = "暂无";
this.lblComName.Visible = false;
......@@ -542,11 +545,11 @@
// lblPointName
//
this.lblPointName.AutoSize = true;
this.lblPointName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblPointName.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblPointName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.lblPointName.Location = new System.Drawing.Point(167, 49);
this.lblPointName.Name = "lblPointName";
this.lblPointName.Size = new System.Drawing.Size(42, 22);
this.lblPointName.Size = new System.Drawing.Size(37, 20);
this.lblPointName.TabIndex = 1;
this.lblPointName.Text = "暂无";
//
......@@ -556,9 +559,9 @@
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.groupBox2.Controls.Add(this.panPoint);
this.groupBox2.Location = new System.Drawing.Point(659, 3);
this.groupBox2.Location = new System.Drawing.Point(659, 2);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(552, 479);
this.groupBox2.Size = new System.Drawing.Size(808, 697);
this.groupBox2.TabIndex = 3;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "局部图";
......@@ -571,7 +574,7 @@
this.panPoint.Controls.Add(this.picPoint);
this.panPoint.Location = new System.Drawing.Point(6, 17);
this.panPoint.Name = "panPoint";
this.panPoint.Size = new System.Drawing.Size(541, 455);
this.panPoint.Size = new System.Drawing.Size(797, 673);
this.panPoint.TabIndex = 3;
//
// picPoint
......@@ -581,7 +584,7 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.picPoint.Location = new System.Drawing.Point(0, 0);
this.picPoint.Name = "picPoint";
this.picPoint.Size = new System.Drawing.Size(505, 410);
this.picPoint.Size = new System.Drawing.Size(761, 628);
this.picPoint.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.picPoint.TabIndex = 2;
this.picPoint.TabStop = false;
......@@ -594,7 +597,7 @@
this.gbBoardInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.gbBoardInfo.Location = new System.Drawing.Point(12, 346);
this.gbBoardInfo.Name = "gbBoardInfo";
this.gbBoardInfo.Size = new System.Drawing.Size(641, 136);
this.gbBoardInfo.Size = new System.Drawing.Size(641, 354);
this.gbBoardInfo.TabIndex = 0;
this.gbBoardInfo.TabStop = false;
this.gbBoardInfo.Text = "全局图(粉色表示已完成；橘色表示未开始；红色表示实时位置)";
......@@ -607,7 +610,7 @@
this.panBoard.Controls.Add(this.picBoard);
this.panBoard.Location = new System.Drawing.Point(6, 18);
this.panBoard.Name = "panBoard";
this.panBoard.Size = new System.Drawing.Size(630, 111);
this.panBoard.Size = new System.Drawing.Size(630, 329);
this.panBoard.TabIndex = 3;
//
// picBoard
......@@ -617,7 +620,7 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.picBoard.Location = new System.Drawing.Point(1, 3);
this.picBoard.Name = "picBoard";
this.picBoard.Size = new System.Drawing.Size(627, 43);
this.picBoard.Size = new System.Drawing.Size(627, 261);
this.picBoard.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.picBoard.TabIndex = 1;
this.picBoard.TabStop = false;
......@@ -628,7 +631,7 @@
this.btnCamera.BackColor = System.Drawing.SystemColors.Control;
this.btnCamera.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCamera.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCamera.Location = new System.Drawing.Point(355, 487);
this.btnCamera.Location = new System.Drawing.Point(611, 705);
this.btnCamera.Name = "btnCamera";
this.btnCamera.Size = new System.Drawing.Size(120, 60);
this.btnCamera.TabIndex = 274;
......@@ -642,7 +645,7 @@
this.btnStartWorking.BackColor = System.Drawing.SystemColors.Control;
this.btnStartWorking.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStartWorking.Font = new System.Drawing.Font("微软雅黑", 10.5F);
this.btnStartWorking.Location = new System.Drawing.Point(721, 487);
this.btnStartWorking.Location = new System.Drawing.Point(977, 705);
this.btnStartWorking.Name = "btnStartWorking";
this.btnStartWorking.Size = new System.Drawing.Size(120, 60);
this.btnStartWorking.TabIndex = 263;
......@@ -656,7 +659,7 @@
this.btnGoHome.BackColor = System.Drawing.SystemColors.Control;
this.btnGoHome.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnGoHome.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnGoHome.Location = new System.Drawing.Point(599, 487);
this.btnGoHome.Location = new System.Drawing.Point(855, 705);
this.btnGoHome.Name = "btnGoHome";
this.btnGoHome.Size = new System.Drawing.Size(120, 60);
this.btnGoHome.TabIndex = 273;
......@@ -670,7 +673,7 @@
this.btnPrePoint.BackColor = System.Drawing.SystemColors.Control;
this.btnPrePoint.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnPrePoint.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnPrePoint.Location = new System.Drawing.Point(843, 487);
this.btnPrePoint.Location = new System.Drawing.Point(1099, 705);
this.btnPrePoint.Name = "btnPrePoint";
this.btnPrePoint.Size = new System.Drawing.Size(120, 60);
this.btnPrePoint.TabIndex = 272;
......@@ -684,7 +687,7 @@
this.btnNextPoint.BackColor = System.Drawing.SystemColors.Control;
this.btnNextPoint.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnNextPoint.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnNextPoint.Location = new System.Drawing.Point(965, 487);
this.btnNextPoint.Location = new System.Drawing.Point(1221, 705);
this.btnNextPoint.Name = "btnNextPoint";
this.btnNextPoint.Size = new System.Drawing.Size(120, 60);
this.btnNextPoint.TabIndex = 271;
......@@ -698,7 +701,7 @@
this.btnStop.BackColor = System.Drawing.SystemColors.Control;
this.btnStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStop.Location = new System.Drawing.Point(1087, 487);
this.btnStop.Location = new System.Drawing.Point(1343, 705);
this.btnStop.Name = "btnStop";
this.btnStop.Size = new System.Drawing.Size(120, 60);
this.btnStop.TabIndex = 270;
......@@ -812,7 +815,7 @@
this.lblNotices.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.lblNotices.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblNotices.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.lblNotices.Location = new System.Drawing.Point(15, 547);
this.lblNotices.Location = new System.Drawing.Point(15, 765);
this.lblNotices.Name = "lblNotices";
this.lblNotices.Size = new System.Drawing.Size(568, 23);
this.lblNotices.TabIndex = 276;
......@@ -822,7 +825,7 @@
this.lblBoardPoint.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.lblBoardPoint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblBoardPoint.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.lblBoardPoint.Location = new System.Drawing.Point(15, 520);
this.lblBoardPoint.Location = new System.Drawing.Point(15, 738);
this.lblBoardPoint.Name = "lblBoardPoint";
this.lblBoardPoint.Size = new System.Drawing.Size(568, 23);
this.lblBoardPoint.TabIndex = 272;
......@@ -831,7 +834,7 @@
//
this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.panel1.Controls.Add(this.lblMsg);
this.panel1.Location = new System.Drawing.Point(12, 484);
this.panel1.Location = new System.Drawing.Point(12, 702);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(568, 63);
this.panel1.TabIndex = 269;
......@@ -851,7 +854,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1223, 579);
this.ClientSize = new System.Drawing.Size(1479, 797);
this.Controls.Add(this.btnIo);
this.Controls.Add(this.btnCodeTest);
this.Controls.Add(this.btnWorkInfo);
......
TSA-V/workForm/FrmTSAV.cs
......@@ -178,7 +178,7 @@ namespace TSA_V
{
txtAuToTime.Visible = isShow;
btnUpdateAutoTime.Visible = isShow;
label7.Visible = isShow;
//label7.Visible = isShow;
label8.Visible = isShow;
}
private void LoadPoint()
......@@ -372,11 +372,11 @@ namespace TSA_V
{
//bool isCy = ConfigAppSettings.GetBoolValue(Setting_Init.IsCycleDebug);
LogUtil.info(Name + "点击：" + btnStartWorking.Text + "，自动启动循环测试模式=" + Setting_NInit.Device_IsCycleDebug);
btnStartWorking.Enabled = false;
btnStartWorking.Visible = false;
//开始工作
TSAVBean.StartWork(BoardManager.CurrBoard);
WorkInfo.IsCycleDebug = Setting_NInit.Device_IsCycleDebug;
btnStartWorking.Enabled = true;
btnStartWorking.Visible = true;
}
private void FrmWelding_FormClosing(object sender, FormClosingEventArgs e)
......@@ -395,8 +395,8 @@ namespace TSA_V
}
private void FormStatus()
{
btnSave.Enabled = true;
btnGoHome.Enabled = true;
btnSave.Visible = true;
btnGoHome.Visible = true;
if (TSAVBean.Status <= (TSAVStatus.Wait))
{
btnStart.Visible = true;
......@@ -413,17 +413,17 @@ namespace TSA_V
if (TSAVBean.Status.Equals(TSAVStatus.Runing) && (!TSAVBean.IsInSuddenDown))
{
btnStartWorking.Enabled = !(TSAVBean.Work.IsWorking);
btnNextPoint.Enabled = true;
btnPrePoint.Enabled = true;
btnStartWorking.Visible = !(TSAVBean.Work.IsWorking);
btnNextPoint.Visible = true;
btnPrePoint.Visible = true;
}
else
{
btnStartWorking.Enabled = false;
btnStartWorking.Visible = false;
if (Setting_NInit.App_IsDebug.Equals(false))
{
btnNextPoint.Enabled = false;
btnPrePoint.Enabled = false;
btnNextPoint.Visible = false;
btnPrePoint.Visible = false;
}
}
}
......@@ -935,10 +935,11 @@ namespace TSA_V
}
private void ShowUpdateCount(bool isShow)
{
lblCount.Visible = !isShow;
txtCount.Visible = isShow;
btnSave.Visible = isShow;
btnCancel.Visible = isShow;
btnUpateCount.Visible = !isShow;
//btnUpateCount.Visible = !isShow;
}
private void btnSave_Click(object sender, EventArgs e)
{
......@@ -1098,6 +1099,14 @@ namespace TSA_V
{
FrmIoManager frmWorkIo = new FrmIoManager(true);
frmWorkIo.ShowDialog();
}
}
private void lblCount_DoubleClick(object sender, EventArgs e)
{
if (lblCount.Visible)
{
ShowUpdateCount(true);
}
}
}
}
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!