Skip to content

张东亮 / NS200

转到一个项目
切换导航栏
切换导航栏固定状态
Commit bd93dd1c 由 张东亮
选项

1

1 个父辈 d5d36c32
全部展开
内嵌 并排
正在显示 12 个修改的文件 包含 124 行增加 和 106 行删除
AutoScanAndLabel/AxisControl.Designer.cs
...@@ -29,19 +29,12 @@ namespace AutoScanAndLabel ...@@ -29,19 +29,12 @@ namespace AutoScanAndLabel
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
this.axisMoveControl1 = new DeviceLibrary.AxisMoveControl();
this.panel1 = new System.Windows.Forms.Panel(); this.panel1 = new System.Windows.Forms.Panel();
this.axisMoveControl1 = new DeviceLibrary.AxisMoveControl();
this.configControl1 = new AutoScanAndLabel.ConfigControl(); this.configControl1 = new AutoScanAndLabel.ConfigControl();
this.panel1.SuspendLayout(); this.panel1.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
// axisMoveControl1
//
this.axisMoveControl1.Location = new System.Drawing.Point(3, 3);
this.axisMoveControl1.Name = "axisMoveControl1";
this.axisMoveControl1.Size = new System.Drawing.Size(559, 400);
this.axisMoveControl1.TabIndex = 0;
//
// panel1 // panel1
// //
this.panel1.AutoScroll = true; this.panel1.AutoScroll = true;
...@@ -53,13 +46,21 @@ namespace AutoScanAndLabel ...@@ -53,13 +46,21 @@ namespace AutoScanAndLabel
this.panel1.Size = new System.Drawing.Size(1234, 924); this.panel1.Size = new System.Drawing.Size(1234, 924);
this.panel1.TabIndex = 2; this.panel1.TabIndex = 2;
// //
// axisMoveControl1
//
this.axisMoveControl1.Location = new System.Drawing.Point(24, 19);
this.axisMoveControl1.Name = "axisMoveControl1";
this.axisMoveControl1.Size = new System.Drawing.Size(702, 400);
this.axisMoveControl1.TabIndex = 0;
this.axisMoveControl1.Tag = "not";
//
// configControl1 // configControl1
// //
this.configControl1.Config = null; this.configControl1.Config = null;
this.configControl1.Location = new System.Drawing.Point(568, 3); this.configControl1.Location = new System.Drawing.Point(24, 426);
this.configControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.configControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.configControl1.Name = "configControl1"; this.configControl1.Name = "configControl1";
this.configControl1.Size = new System.Drawing.Size(663, 656); this.configControl1.Size = new System.Drawing.Size(1134, 656);
this.configControl1.TabIndex = 1; this.configControl1.TabIndex = 1;
// //
// AxisControl // AxisControl
......
AutoScanAndLabel/Form1.cs
...@@ -25,10 +25,10 @@ namespace AutoScanAndLabel ...@@ -25,10 +25,10 @@ namespace AutoScanAndLabel
crc.OpenResourceLog = true; crc.OpenResourceLog = true;
InitializeComponent(); InitializeComponent();
this.FormClosing += Form1_FormClosing; this.FormClosing += Form1_FormClosing;
this.Text = Config.Get(Setting_Init.App_Title);
crc.GetLanguageEvent += Crc_GetLanguageEvent; crc.GetLanguageEvent += Crc_GetLanguageEvent;
crc.LanguageChangeEvent += Crc_LanguageChangeEvent; crc.LanguageChangeEvent += Crc_LanguageChangeEvent;
crc.CurrLanguage = Crc_GetLanguageEvent(); crc.CurrLanguage = Crc_GetLanguageEvent();
this.Text = crc.GetString("App_Title", "自动贴标机");//Config.Get(Setting_Init.App_Title);
t1.Interval = 1000; t1.Interval = 1000;
t1.Tick += T1_Tick; t1.Tick += T1_Tick;
t1.Start(); t1.Start();
...@@ -56,7 +56,7 @@ namespace AutoScanAndLabel ...@@ -56,7 +56,7 @@ namespace AutoScanAndLabel
{ {
crc.LanguageProcess(this, this.GetType().Name); crc.LanguageProcess(this, this.GetType().Name);
crc.ProcessListItem(menuStrip1.Items, "menuStrip1"); crc.ProcessListItem(menuStrip1.Items, "menuStrip1");
this.Text = crc.GetString("App_Title", "自动贴标机");//Config.Get(Setting_Init.App_Title);
listView1.Columns[1].Text = crc.GetString("Res0004", "时间"); listView1.Columns[1].Text = crc.GetString("Res0004", "时间");
listView1.Columns[2].Text = crc.GetString("Res0003", "信息"); listView1.Columns[2].Text = crc.GetString("Res0003", "信息");
......
AutoScanAndLabel/SettingControl.Designer.cs
...@@ -38,15 +38,15 @@ namespace AutoScanAndLabel ...@@ -38,15 +38,15 @@ namespace AutoScanAndLabel
this.chbAutoRun = new System.Windows.Forms.CheckBox(); this.chbAutoRun = new System.Windows.Forms.CheckBox();
this.btn_labelDebug = new System.Windows.Forms.Button(); this.btn_labelDebug = new System.Windows.Forms.Button();
this.groupBox2 = new System.Windows.Forms.GroupBox(); this.groupBox2 = new System.Windows.Forms.GroupBox();
this.listEdit_pn = new AutoScanAndLabel.UC.ListEditControl();
this.groupBox3 = new System.Windows.Forms.GroupBox(); this.groupBox3 = new System.Windows.Forms.GroupBox();
this.listEditControl1 = new AutoScanAndLabel.UC.ListEditControl();
this.txt_code = new System.Windows.Forms.TextBox(); this.txt_code = new System.Windows.Forms.TextBox();
this.btn_codetest = new System.Windows.Forms.Button(); this.btn_codetest = new System.Windows.Forms.Button();
this.label_matchdebugstring = new System.Windows.Forms.Label(); this.label_matchdebugstring = new System.Windows.Forms.Label();
this.groupBox4 = new System.Windows.Forms.GroupBox(); this.groupBox4 = new System.Windows.Forms.GroupBox();
this.button1 = new System.Windows.Forms.Button(); this.button1 = new System.Windows.Forms.Button();
this.uC_U11 = new AutoScanAndLabel.UC_U1(); this.uC_U11 = new AutoScanAndLabel.UC_U1();
this.listEditControl1 = new AutoScanAndLabel.UC.ListEditControl();
this.listEdit_pn = new AutoScanAndLabel.UC.ListEditControl();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout(); this.groupBox2.SuspendLayout();
this.groupBox3.SuspendLayout(); this.groupBox3.SuspendLayout();
...@@ -100,7 +100,7 @@ namespace AutoScanAndLabel ...@@ -100,7 +100,7 @@ namespace AutoScanAndLabel
this.cb_labelselect.FormattingEnabled = true; this.cb_labelselect.FormattingEnabled = true;
this.cb_labelselect.Location = new System.Drawing.Point(134, 75); this.cb_labelselect.Location = new System.Drawing.Point(134, 75);
this.cb_labelselect.Name = "cb_labelselect"; this.cb_labelselect.Name = "cb_labelselect";
this.cb_labelselect.Size = new System.Drawing.Size(198, 20); this.cb_labelselect.Size = new System.Drawing.Size(198, 23);
this.cb_labelselect.TabIndex = 0; this.cb_labelselect.TabIndex = 0;
this.cb_labelselect.SelectedIndexChanged += new System.EventHandler(this.cb_labelselect_SelectedIndexChanged); this.cb_labelselect.SelectedIndexChanged += new System.EventHandler(this.cb_labelselect_SelectedIndexChanged);
// //
...@@ -109,7 +109,7 @@ namespace AutoScanAndLabel ...@@ -109,7 +109,7 @@ namespace AutoScanAndLabel
this.cb_printerselect.FormattingEnabled = true; this.cb_printerselect.FormattingEnabled = true;
this.cb_printerselect.Location = new System.Drawing.Point(134, 37); this.cb_printerselect.Location = new System.Drawing.Point(134, 37);
this.cb_printerselect.Name = "cb_printerselect"; this.cb_printerselect.Name = "cb_printerselect";
this.cb_printerselect.Size = new System.Drawing.Size(198, 20); this.cb_printerselect.Size = new System.Drawing.Size(198, 23);
this.cb_printerselect.TabIndex = 0; this.cb_printerselect.TabIndex = 0;
this.cb_printerselect.SelectedIndexChanged += new System.EventHandler(this.cb_printerselect_SelectedIndexChanged); this.cb_printerselect.SelectedIndexChanged += new System.EventHandler(this.cb_printerselect_SelectedIndexChanged);
// //
...@@ -118,7 +118,7 @@ namespace AutoScanAndLabel ...@@ -118,7 +118,7 @@ namespace AutoScanAndLabel
this.chbAutoRun.AutoSize = true; this.chbAutoRun.AutoSize = true;
this.chbAutoRun.Location = new System.Drawing.Point(3, 185); this.chbAutoRun.Location = new System.Drawing.Point(3, 185);
this.chbAutoRun.Name = "chbAutoRun"; this.chbAutoRun.Name = "chbAutoRun";
this.chbAutoRun.Size = new System.Drawing.Size(84, 16); this.chbAutoRun.Size = new System.Drawing.Size(104, 19);
this.chbAutoRun.TabIndex = 1; this.chbAutoRun.TabIndex = 1;
this.chbAutoRun.Text = "开机自启动"; this.chbAutoRun.Text = "开机自启动";
this.chbAutoRun.UseVisualStyleBackColor = true; this.chbAutoRun.UseVisualStyleBackColor = true;
...@@ -145,18 +145,6 @@ namespace AutoScanAndLabel ...@@ -145,18 +145,6 @@ namespace AutoScanAndLabel
this.groupBox2.Text = "PN匹配规则"; this.groupBox2.Text = "PN匹配规则";
this.groupBox2.Visible = false; this.groupBox2.Visible = false;
// //
// listEdit_pn
//
this.listEdit_pn.Dock = System.Windows.Forms.DockStyle.Fill;
this.listEdit_pn.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.listEdit_pn.ListFile = "config/pn.list";
this.listEdit_pn.Location = new System.Drawing.Point(3, 17);
this.listEdit_pn.Margin = new System.Windows.Forms.Padding(5);
this.listEdit_pn.Name = "listEdit_pn";
this.listEdit_pn.Size = new System.Drawing.Size(354, 158);
this.listEdit_pn.TabIndex = 3;
this.listEdit_pn.DataRefresh += new System.EventHandler(this.listEdit_pn_DataRefresh);
//
// groupBox3 // groupBox3
// //
this.groupBox3.Controls.Add(this.listEditControl1); this.groupBox3.Controls.Add(this.listEditControl1);
...@@ -168,23 +156,11 @@ namespace AutoScanAndLabel ...@@ -168,23 +156,11 @@ namespace AutoScanAndLabel
this.groupBox3.Text = "QTY匹配规则"; this.groupBox3.Text = "QTY匹配规则";
this.groupBox3.Visible = false; this.groupBox3.Visible = false;
// //
// listEditControl1
//
this.listEditControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.listEditControl1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.listEditControl1.ListFile = "config/qty.list";
this.listEditControl1.Location = new System.Drawing.Point(3, 17);
this.listEditControl1.Margin = new System.Windows.Forms.Padding(5);
this.listEditControl1.Name = "listEditControl1";
this.listEditControl1.Size = new System.Drawing.Size(354, 208);
this.listEditControl1.TabIndex = 3;
this.listEditControl1.DataRefresh += new System.EventHandler(this.listEdit_pn_DataRefresh);
//
// txt_code // txt_code
// //
this.txt_code.Location = new System.Drawing.Point(6, 24); this.txt_code.Location = new System.Drawing.Point(6, 24);
this.txt_code.Name = "txt_code"; this.txt_code.Name = "txt_code";
this.txt_code.Size = new System.Drawing.Size(264, 21); this.txt_code.Size = new System.Drawing.Size(264, 25);
this.txt_code.TabIndex = 5; this.txt_code.TabIndex = 5;
// //
// btn_codetest // btn_codetest
...@@ -225,15 +201,41 @@ namespace AutoScanAndLabel ...@@ -225,15 +201,41 @@ namespace AutoScanAndLabel
this.button1.TabIndex = 10; this.button1.TabIndex = 10;
this.button1.Text = "button1"; this.button1.Text = "button1";
this.button1.UseVisualStyleBackColor = true; this.button1.UseVisualStyleBackColor = true;
this.button1.Visible = false;
this.button1.Click += new System.EventHandler(this.button1_Click); this.button1.Click += new System.EventHandler(this.button1_Click);
// //
// uC_U11 // uC_U11
// //
this.uC_U11.Location = new System.Drawing.Point(3, 246); this.uC_U11.Location = new System.Drawing.Point(3, 246);
this.uC_U11.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.uC_U11.Name = "uC_U11"; this.uC_U11.Name = "uC_U11";
this.uC_U11.Size = new System.Drawing.Size(383, 167); this.uC_U11.Size = new System.Drawing.Size(383, 167);
this.uC_U11.TabIndex = 9; this.uC_U11.TabIndex = 9;
// //
// listEditControl1
//
this.listEditControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.listEditControl1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.listEditControl1.ListFile = "config/qty.list";
this.listEditControl1.Location = new System.Drawing.Point(3, 21);
this.listEditControl1.Margin = new System.Windows.Forms.Padding(5);
this.listEditControl1.Name = "listEditControl1";
this.listEditControl1.Size = new System.Drawing.Size(354, 204);
this.listEditControl1.TabIndex = 3;
this.listEditControl1.DataRefresh += new System.EventHandler(this.listEdit_pn_DataRefresh);
//
// listEdit_pn
//
this.listEdit_pn.Dock = System.Windows.Forms.DockStyle.Fill;
this.listEdit_pn.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.listEdit_pn.ListFile = "config/pn.list";
this.listEdit_pn.Location = new System.Drawing.Point(3, 21);
this.listEdit_pn.Margin = new System.Windows.Forms.Padding(5);
this.listEdit_pn.Name = "listEdit_pn";
this.listEdit_pn.Size = new System.Drawing.Size(354, 154);
this.listEdit_pn.TabIndex = 3;
this.listEdit_pn.DataRefresh += new System.EventHandler(this.listEdit_pn_DataRefresh);
//
// SettingControl // SettingControl
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
......
AutoScanAndLabel/resources/en-US.lngres
...@@ -158,6 +158,10 @@ Form1_tabControl1_Res0010__SettingControl_groupBox3_listEditControl1_btn_del_Tex ...@@ -158,6 +158,10 @@ Form1_tabControl1_Res0010__SettingControl_groupBox3_listEditControl1_btn_del_Tex
Form1_tabControl1_Res0010__SettingControl_groupBox3_Text QTY匹配规则 QTY Matching Test Form1_tabControl1_Res0010__SettingControl_groupBox3_Text QTY匹配规则 QTY Matching Test
Form1_tabControl1_Res0010__SettingControl_groupBox4_btn_codetest_Text 匹配 Matching Form1_tabControl1_Res0010__SettingControl_groupBox4_btn_codetest_Text 匹配 Matching
Form1_tabControl1_Res0010__SettingControl_groupBox4_Text 条码匹配测试 Barcode Matching Test Form1_tabControl1_Res0010__SettingControl_groupBox4_Text 条码匹配测试 Barcode Matching Test
Form1_tabControl1_Res0010__SettingControl_uC_U11_gb_btn_selectdir_Text 浏览 Browse
Form1_tabControl1_Res0010__SettingControl_uC_U11_gb_cb_exportreephoto_Text 自动拍摄并保存料盘图像. 勾选后仅本次有效 Automatically capture and save reel images. If checked, it will only be valid this time
Form1_tabControl1_Res0010__SettingControl_uC_U11_gb_label_dir_Text 图像保存目录: Image saving directory:
Form1_tabControl1_Res0010__SettingControl_uC_U11_gb_Text 料盘图像导出 Tray image export
Form1_tabControl1_Res0070__AgvControl_checkBox1_Text 手动 By Manual Form1_tabControl1_Res0070__AgvControl_checkBox1_Text 手动 By Manual
Form1_tabControl1_Res0070__AgvControl_groupBox_left_button_Leftleavefull_Text 满料串取出 Take Away The Full Stacker Form1_tabControl1_Res0070__AgvControl_groupBox_left_button_Leftleavefull_Text 满料串取出 Take Away The Full Stacker
Form1_tabControl1_Res0070__AgvControl_groupBox_left_button_leftneedempty_Text 空料串送入 Put In The Empty Stacker Form1_tabControl1_Res0070__AgvControl_groupBox_left_button_leftneedempty_Text 空料串送入 Put In The Empty Stacker
...@@ -193,7 +197,6 @@ menuStrip1_关于ToolStripMenuItem_Text 关于 About ...@@ -193,7 +197,6 @@ menuStrip1_关于ToolStripMenuItem_Text 关于 About
menuStrip1_设备操作ToolStripMenuItem_Text 设备操作 Operation menuStrip1_设备操作ToolStripMenuItem_Text 设备操作 Operation
menuStrip1_语言toolStripMenuItem_Text 语言 Language menuStrip1_语言toolStripMenuItem_Text 语言 Language
设备操作ToolStripMenuItem_二维码识别调试ToolStripMenuItem_Text 二维码识别调试 QR code recognition debugging 设备操作ToolStripMenuItem_二维码识别调试ToolStripMenuItem_Text 二维码识别调试 QR code recognition debugging
设备操作ToolStripMenuItem_启用调试模式ToolStripMenuItem_Text 启用配置模式 Configuration Mode On
设备操作ToolStripMenuItem_退出ToolStripMenuItem_Text 退出 Exit 设备操作ToolStripMenuItem_退出ToolStripMenuItem_Text 退出 Exit
Airpressure_Check 气压检测 Pressure Detection Airpressure_Check 气压检测 Pressure Detection
Alarm_Buzzer 报警蜂鸣器 Buzzer Alarm_Buzzer 报警蜂鸣器 Buzzer
...@@ -202,12 +205,6 @@ AutoRun_HddLed 自动指示灯 Auto Indicator ...@@ -202,12 +205,6 @@ AutoRun_HddLed 自动指示灯 Auto Indicator
Cam_Pixel_X_Ratio 图像/X轴比值 Image/X Specific Value Cam_Pixel_X_Ratio 图像/X轴比值 Image/X Specific Value
Cam_Pixel_Y_Ratio 图像/Y轴比值 Image/Y Specific Value Cam_Pixel_Y_Ratio 图像/Y轴比值 Image/Y Specific Value
Camera_Led 相机照明 Camera Light Camera_Led 相机照明 Camera Light
crc.GetString("Res0101 设备操作ToolStripMenuItem_启用调试模式ToolStripMenuItem_Text
crc.GetString("Res0101","设备操作ToolStripMenuItem_启用调试模式ToolStripMenuItem_Text") 启用配置模式 Configuration Mode ON
crc.GetString("Res0102 Form1_tabControl1___IOControl_groupBox1_btn夹爪夹紧_Text
crc.GetString("Res0102","Form1_tabControl1___IOControl_groupBox1_btn夹爪夹紧_Text") 夹爪夹紧 Right Barrier Down
crc.GetString("Res0103 Form1_tabControl1___IOControl_groupBox1_btn夹爪放松_Text
crc.GetString("Res0103","Form1_tabControl1___IOControl_groupBox1_btn夹爪放松_Text") 夹爪放松 Right Electric Roller Exit
Device_Led 设备照明 Equipment Lighting Device_Led 设备照明 Equipment Lighting
GratingSignal_Check 光栅信号 Light Curtain Signal GratingSignal_Check 光栅信号 Light Curtain Signal
HasNgBox NG料箱检测 NG Box Detection HasNgBox NG料箱检测 NG Box Detection
...@@ -388,7 +385,7 @@ Res0097 抓料失败请手动处理,请将料盘放入: 左侧料串,按右侧 ...@@ -388,7 +385,7 @@ Res0097 抓料失败请手动处理,请将料盘放入: 左侧料串,按右侧
Res0098 等待左侧允许放料 Res0098 等待左侧允许放料
Res0099 等待料盘取走 Res0099 等待料盘取走
Res0100 ,料串已清空. Res0100 ,料串已清空.
Res0101 设备操作ToolStripMenuItem_启用调试模式ToolStripMenuItem_Text Res0101 启用配置模式 Configuration Mode On
Res0102 Form1_tabControl1___IOControl_groupBox1_btn夹爪夹紧_Text Res0102 Form1_tabControl1___IOControl_groupBox1_btn夹爪夹紧_Text
Res0103 Form1_tabControl1___IOControl_groupBox1_btn夹爪放松_Text Res0103 Form1_tabControl1___IOControl_groupBox1_btn夹爪放松_Text
Res0104 等待 Waiting Res0104 等待 Waiting
...@@ -411,3 +408,5 @@ Res0202 伺服尚未使能 Servo is disabled. ...@@ -411,3 +408,5 @@ Res0202 伺服尚未使能 Servo is disabled.
Res0203 伺服警报状态中 In servo alarm status Res0203 伺服警报状态中 In servo alarm status
Res0204 无法操作 Unable to operate. Res0204 无法操作 Unable to operate.
Res0216 打印机 Printer Res0216 打印机 Printer
Res0217 标签打印机打开失败 The label printer failed to open
App_Title 自动贴标机 Automatic labeling machine
\ No newline at end of file \ No newline at end of file
AutoScanAndLabel/resources/ja-JP.lngres
...@@ -418,3 +418,5 @@ Res0216 打印机 プリンター ...@@ -418,3 +418,5 @@ Res0216 打印机 プリンター
Res0101 启用配置模式 設定モードを開ける Res0101 启用配置模式 設定モードを開ける
Res0102 夹爪夹紧 グリッパー圧着 Res0102 夹爪夹紧 グリッパー圧着
Res0103 夹爪放松 グリッパー解除 Res0103 夹爪放松 グリッパー解除
Res0217 标签打印机打开失败 ラベルプリンターを開けませんでした
App_Title 自动贴标机 自動ラベル貼付機
\ No newline at end of file \ No newline at end of file
AutoScanAndLabel/resources/zh-CN.lngres
...@@ -86,9 +86,9 @@ Form1_tabControl1___IOControl_groupBox1_btn打开设备光源_Text 打开设备 ...@@ -86,9 +86,9 @@ Form1_tabControl1___IOControl_groupBox1_btn打开设备光源_Text 打开设备
Form1_tabControl1___IOControl_groupBox1_btn打开相机光源_Text 打开相机光源 打开相机光源 Form1_tabControl1___IOControl_groupBox1_btn打开相机光源_Text 打开相机光源 打开相机光源
Form1_tabControl1___IOControl_groupBox1_btn关闭设备光源_Text 关闭设备光源 关闭设备光源 Form1_tabControl1___IOControl_groupBox1_btn关闭设备光源_Text 关闭设备光源 关闭设备光源
Form1_tabControl1___IOControl_groupBox1_btn关闭相机光源_Text 关闭相机光源 关闭相机光源 Form1_tabControl1___IOControl_groupBox1_btn关闭相机光源_Text 关闭相机光源 关闭相机光源
Form1_tabControl1___IOControl_groupBox1_btn夹爪放松_Text 夹爪放松 夹爪放松 Form1_tabControl1___IOControl_groupBox1_btn夹爪放松_Text 夹取机构放料 夹取机构放料
Form1_tabControl1___IOControl_groupBox1_btn夹爪回原_Text 夹爪回原 夹爪回原 Form1_tabControl1___IOControl_groupBox1_btn夹爪回原_Text 夹取机构回原 夹取机构回原
Form1_tabControl1___IOControl_groupBox1_btn夹爪夹紧_Text 夹爪夹紧 夹爪夹紧 Form1_tabControl1___IOControl_groupBox1_btn夹爪夹紧_Text 夹取机构取料 夹取机构取料
Form1_tabControl1___IOControl_groupBox1_btn入口电滚筒进入_Text 入口电滚筒进入 入口电滚筒进入 Form1_tabControl1___IOControl_groupBox1_btn入口电滚筒进入_Text 入口电滚筒进入 入口电滚筒进入
Form1_tabControl1___IOControl_groupBox1_btn入口电滚筒停止_Text 入口电滚筒停止 入口电滚筒停止 Form1_tabControl1___IOControl_groupBox1_btn入口电滚筒停止_Text 入口电滚筒停止 入口电滚筒停止
Form1_tabControl1___IOControl_groupBox1_btn入口电滚筒退出_Text 入口电滚筒退出 入口电滚筒退出 Form1_tabControl1___IOControl_groupBox1_btn入口电滚筒退出_Text 入口电滚筒退出 入口电滚筒退出
...@@ -158,6 +158,10 @@ Form1_tabControl1_Res0010__SettingControl_groupBox3_listEditControl1_btn_del_Tex ...@@ -158,6 +158,10 @@ Form1_tabControl1_Res0010__SettingControl_groupBox3_listEditControl1_btn_del_Tex
Form1_tabControl1_Res0010__SettingControl_groupBox3_Text QTY匹配规则 QTY匹配规则 Form1_tabControl1_Res0010__SettingControl_groupBox3_Text QTY匹配规则 QTY匹配规则
Form1_tabControl1_Res0010__SettingControl_groupBox4_btn_codetest_Text 匹配 匹配 Form1_tabControl1_Res0010__SettingControl_groupBox4_btn_codetest_Text 匹配 匹配
Form1_tabControl1_Res0010__SettingControl_groupBox4_Text 条码匹配测试 条码匹配测试 Form1_tabControl1_Res0010__SettingControl_groupBox4_Text 条码匹配测试 条码匹配测试
Form1_tabControl1_Res0010__SettingControl_uC_U11_gb_btn_selectdir_Text 浏览 浏览
Form1_tabControl1_Res0010__SettingControl_uC_U11_gb_cb_exportreephoto_Text 自动拍摄并保存料盘图像. 勾选后仅本次有效 自动拍摄并保存料盘图像. 勾选后仅本次有效
Form1_tabControl1_Res0010__SettingControl_uC_U11_gb_label_dir_Text 图像保存目录: 图像保存目录:
Form1_tabControl1_Res0010__SettingControl_uC_U11_gb_Text 料盘图像导出 料盘图像导出
Form1_tabControl1_Res0070__AgvControl_checkBox1_Text 手动 手动 Form1_tabControl1_Res0070__AgvControl_checkBox1_Text 手动 手动
Form1_tabControl1_Res0070__AgvControl_groupBox_left_button_Leftleavefull_Text 满料串取出 满料串取出 Form1_tabControl1_Res0070__AgvControl_groupBox_left_button_Leftleavefull_Text 满料串取出 满料串取出
Form1_tabControl1_Res0070__AgvControl_groupBox_left_button_leftneedempty_Text 空料串送入 空料串送入 Form1_tabControl1_Res0070__AgvControl_groupBox_left_button_leftneedempty_Text 空料串送入 空料串送入
...@@ -380,3 +384,5 @@ Res0202 伺服尚未使能 伺服尚未使能 ...@@ -380,3 +384,5 @@ Res0202 伺服尚未使能 伺服尚未使能
Res0203 伺服警报状态中 伺服警报状态中 Res0203 伺服警报状态中 伺服警报状态中
Res0204 无法操作 无法操作 Res0204 无法操作 无法操作
Res0216 打印机 打印机 Res0216 打印机 打印机
Res0217 标签打印机打开失败 标签打印机打开失败
App_Title 自动贴标机 自动贴标机
\ No newline at end of file \ No newline at end of file
DeviceLibrary/AutoScanAndLabel/Common.cs
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
using OnlineStore.Common; using OnlineStore.Common;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Configuration;
using System.Drawing; using System.Drawing;
using System.Drawing.Imaging; using System.Drawing.Imaging;
using System.IO; using System.IO;
...@@ -235,6 +236,7 @@ namespace DeviceLibrary ...@@ -235,6 +236,7 @@ namespace DeviceLibrary
SolidBrush tmpPlace = new SolidBrush(Color.BlueViolet); SolidBrush tmpPlace = new SolidBrush(Color.BlueViolet);
//贴标位置 //贴标位置
SolidBrush yeelow = new SolidBrush(Color.Yellow); SolidBrush yeelow = new SolidBrush(Color.Yellow);
SolidBrush white = new SolidBrush(Color.White);
Font font = new Font(FontFamily.GenericSansSerif, 60); Font font = new Font(FontFamily.GenericSansSerif, 60);
Pen Greenpen = new Pen(Color.Green, 10); Pen Greenpen = new Pen(Color.Green, 10);
...@@ -268,6 +270,7 @@ namespace DeviceLibrary ...@@ -268,6 +270,7 @@ namespace DeviceLibrary
{ {
Point op = new Point(c.X, c.Y); Point op = new Point(c.X, c.Y);
g.FillEllipse(blue, new Rectangle(op, pointsize)); g.FillEllipse(blue, new Rectangle(op, pointsize));
g.DrawString($"{angles.Count + 1}", font, white, c.X+5, c.Y);
var a = (int)getAngle(Right_Batch_Point, op); var a = (int)getAngle(Right_Batch_Point, op);
a = a < 0 ? 360 + a : a; a = a < 0 ? 360 + a : a;
angles.Add(a); angles.Add(a);
...@@ -294,7 +297,13 @@ namespace DeviceLibrary ...@@ -294,7 +297,13 @@ namespace DeviceLibrary
LogUtil.info($"labelAngle{i}:{labelAngle}"); LogUtil.info($"labelAngle{i}:{labelAngle}");
} }
} }
widthOffset = widthOffsets.Min(); int tmp= angles[angles.Count - 1] - angles[0];
if (tmp/2>labelAngle)
{
labelAngle = tmp;
LogUtil.info($"use 首尾labelAngle:{labelAngle}");
}
widthOffset = (widthOffsets.Min()+widthOffsets.Max())/2;
LogUtil.info($"use widthOffset:{widthOffset},angle:{labelAngle}"); LogUtil.info($"use widthOffset:{widthOffset},angle:{labelAngle}");
labelAngle = labelAngle > 360 ? labelAngle - 360 : labelAngle; labelAngle = labelAngle > 360 ? labelAngle - 360 : labelAngle;
labelAngle = labelAngle > 360 ? labelAngle - 360 : labelAngle; labelAngle = labelAngle > 360 ? labelAngle - 360 : labelAngle;
......
DeviceLibrary/AutoScanAndLabel/MainMachine _LeftProcess.cs
...@@ -37,16 +37,9 @@ namespace DeviceLibrary ...@@ -37,16 +37,9 @@ namespace DeviceLibrary
LeftMoveInfo.log($"批量轴上升到P2位置,二次提升,LeftStartMovePosition={LeftStartMovePosition}"); LeftMoveInfo.log($"批量轴上升到P2位置,二次提升,LeftStartMovePosition={LeftStartMovePosition}");
break; break;
case MoveStep.L03: case MoveStep.L03:
//if (IOValue(IO_Type.LeftOverHead_Check).Equals(IO_VALUE.HIGH)) LeftMoveInfo.NextMoveStep(MoveStep.L04);
//{ LeftBatchAxisDown();
// LeftMoveInfo.NextMoveStep(MoveStep.L02); LeftMoveInfo.log($"批量轴下降固定值");
// Left_Batch_Axis.AbsMove(LeftMoveInfo, LeftStartMovePosition, Config.Left_Batch_P2_speed);
// LeftMoveInfo.log($"批量轴上升过头,下降到:LeftStartMovePosition={LeftStartMovePosition}");
//}
//else
{
LeftMoveInfo.NextMoveStep(MoveStep.L04);
}
break; break;
case MoveStep.L04: case MoveStep.L04:
var currpos = Left_Batch_Axis.GetAclPosition(); var currpos = Left_Batch_Axis.GetAclPosition();
...@@ -69,23 +62,20 @@ namespace DeviceLibrary ...@@ -69,23 +62,20 @@ namespace DeviceLibrary
case MoveStep.L11_ReelPutted: case MoveStep.L11_ReelPutted:
LeftCount++; LeftCount++;
LeftMoveInfo.NextMoveStep(MoveStep.L12); LeftMoveInfo.NextMoveStep(MoveStep.L12);
LeftBatchAxisToP1(); //LeftBatchAxisToP1();
LeftBatchAxisDown();
//LeftMoveInfo.log($"料盘已放入,批量轴上升,LeftStartMovePosition={LeftStartMovePosition}"); //LeftMoveInfo.log($"料盘已放入,批量轴上升,LeftStartMovePosition={LeftStartMovePosition}");
LeftMoveInfo.log($"左侧料盘已放入,批量轴下降"); LeftMoveInfo.log($"左侧料盘已放入,批量轴下降固定值");
break; break;
case MoveStep.L12: case MoveStep.L12:
//if (IOValue(IO_Type.LeftOverHead_Check).Equals(IO_VALUE.HIGH)) LeftMoveInfo.NextMoveStep(MoveStep.L13);
//{ LeftBatchAxisToP2(false);
// LeftMoveInfo.NextMoveStep(MoveStep.L11_ReelPutted); LeftMoveInfo.log($"批量轴上升到P2位置,LeftStartMovePosition={LeftStartMovePosition}");
// Left_Batch_Axis.AbsMove(LeftMoveInfo, LeftStartMovePosition, Config.Left_Batch_P2_speed); break;
// LeftMoveInfo.log($"批量轴上升过头,下降到:LeftStartMovePosition={LeftStartMovePosition}"); case MoveStep.L13:
//} LabelMoveInfo.MoveParam = LeftMoveInfo.MoveParam.clone();
//else LeftMoveInfo.NextMoveStep(MoveStep.L20_WaitLabel);
{ LeftMoveInfo.log($"批量轴完成上升,等待贴标");
LabelMoveInfo.MoveParam = LeftMoveInfo.MoveParam.clone();
LeftMoveInfo.NextMoveStep(MoveStep.L20_WaitLabel);
LeftMoveInfo.log($"批量轴完成上升,等待贴标");
}
break; break;
case MoveStep.L20_WaitLabel: case MoveStep.L20_WaitLabel:
break; break;
...@@ -100,8 +90,8 @@ namespace DeviceLibrary ...@@ -100,8 +90,8 @@ namespace DeviceLibrary
else else
{ {
LeftMoveInfo.NextMoveStep(MoveStep.L04); LeftMoveInfo.NextMoveStep(MoveStep.L04);
LeftBatchAxisToP2(false); LeftBatchAxisDown();
LeftMoveInfo.log($"贴标完成,准备下一盘料,批量轴上升到P2位置,二次提升,LeftStartMovePosition={LeftStartMovePosition}"); LeftMoveInfo.log($"贴标完成,批量轴下降固定值");
} }
break; break;
case MoveStep.L40_ShelfFull: case MoveStep.L40_ShelfFull:
...@@ -241,7 +231,7 @@ namespace DeviceLibrary ...@@ -241,7 +231,7 @@ namespace DeviceLibrary
} }
LeftMoveInfo.log("BatchAxisToP2 目标P2: " + targetP2 + "(" + currPosition + ")"); LeftMoveInfo.log("BatchAxisToP2 目标P2: " + targetP2 + "(" + currPosition + ")");
} }
targetSpeed = Config.Left_Batch_P2_speed / 10; targetSpeed = Config.Left_Batch_P2_speed;
} }
LeftMoveInfo.TimeOutSeconds = 200; LeftMoveInfo.TimeOutSeconds = 200;
LeftMoveInfo.CanWhileCount = 0; LeftMoveInfo.CanWhileCount = 0;
...@@ -259,7 +249,7 @@ namespace DeviceLibrary ...@@ -259,7 +249,7 @@ namespace DeviceLibrary
void LeftBatchAxisToP1() void LeftBatchAxisToP1()
{ {
int targetP1 = Config.Left_Batch_P1; int targetP1 = Config.Left_Batch_P1;
int targetSpeed = Config.Left_Batch_P2_speed / 10; int targetSpeed = Config.Left_Batch_P2_speed;
LeftMoveInfo.TimeOutSeconds = 200; LeftMoveInfo.TimeOutSeconds = 200;
LeftMoveInfo.CanWhileCount = 0; LeftMoveInfo.CanWhileCount = 0;
...@@ -271,5 +261,14 @@ namespace DeviceLibrary ...@@ -271,5 +261,14 @@ namespace DeviceLibrary
//开始检测信号 //开始检测信号
Left_Batch_Axis.BatchAxisStartCheck(IO_Type.LeftTop_Check, IO_VALUE.LOW); Left_Batch_Axis.BatchAxisStartCheck(IO_Type.LeftTop_Check, IO_VALUE.LOW);
} }
/// <summary>
/// 下降固定值
/// </summary>
void LeftBatchAxisDown()
{
int targetP1 = Left_Batch_Axis.GetAclPosition() - ConfigHelper.Config.Get("LeftAxisDownValue", 50) * Config.Left_Batch_ChangeValue;
int targetSpeed = Config.Left_Batch_P1_speed;
Left_Batch_Axis.AbsMove(LeftMoveInfo, targetP1, targetSpeed);
}
} }
} }
\ No newline at end of file \ No newline at end of file
DeviceLibrary/AutoScanAndLabel/RobotManage.cs
...@@ -56,7 +56,7 @@ namespace DeviceLibrary ...@@ -56,7 +56,7 @@ namespace DeviceLibrary
} }
if (!printerHelper.Connection("")) if (!printerHelper.Connection(""))
{ {
msg += "标签打印机打开失败" + "\n"; msg += crc.GetString("Res0217", "标签打印机打开失败") + "\n";
IsLoadOk = false; IsLoadOk = false;
} }
else else
......
DeviceLibrary/userControl/AxisMoveControl.cs
...@@ -63,14 +63,14 @@ namespace DeviceLibrary ...@@ -63,14 +63,14 @@ namespace DeviceLibrary
this.IsHuiChuan = isHc; this.IsHuiChuan = isHc;
if (IsHuiChuan) if (IsHuiChuan)
{ {
groupBox1.Visible = false; //groupBox1.Visible = false;
groupBox2.Visible = true; //groupBox2.Visible = true;
timer1.Start(); timer1.Start();
} }
else else
{ {
groupBox1.Visible = true; //groupBox1.Visible = true;
groupBox2.Visible = false; //groupBox2.Visible = false;
} }
} }
...@@ -183,17 +183,17 @@ namespace DeviceLibrary ...@@ -183,17 +183,17 @@ namespace DeviceLibrary
} }
} }
private void btnGetAlarm_Click(object sender, EventArgs e) //private void btnGetAlarm_Click(object sender, EventArgs e)
{ //{
this.txtAlarmStatus.Text = AxisManager.GetAlarmStatus(PortName, SlvAddr).ToString(); // this.txtAlarmStatus.Text = AxisManager.GetAlarmStatus(PortName, SlvAddr).ToString();
this.txtBusyStatus.Text = AxisManager.GetBusyStatus(PortName, SlvAddr).ToString(); // this.txtBusyStatus.Text = AxisManager.GetBusyStatus(PortName, SlvAddr).ToString();
//this.txtStb.Text = AxisManager.instance.GetSTBState(PortName, SlvAddr).ToString(); // //this.txtStb.Text = AxisManager.instance.GetSTBState(PortName, SlvAddr).ToString();
this.txtHomeStatus.Text = AxisManager.GetHomeEndStatus(PortName, SlvAddr).ToString(); // this.txtHomeStatus.Text = AxisManager.GetHomeEndStatus(PortName, SlvAddr).ToString();
this.txtHomeSingle.Text = AxisManager.GetHomeSingle(PortName, SlvAddr).ToString(); // this.txtHomeSingle.Text = AxisManager.GetHomeSingle(PortName, SlvAddr).ToString();
this.txtLimit1.Text = AxisManager.GetLimitPositiveSingle(PortName, SlvAddr).ToString(); // this.txtLimit1.Text = AxisManager.GetLimitPositiveSingle(PortName, SlvAddr).ToString();
this.txtLimit2.Text = AxisManager.GetLimitNegativeSingle(PortName, SlvAddr).ToString(); // this.txtLimit2.Text = AxisManager.GetLimitNegativeSingle(PortName, SlvAddr).ToString();
txtServoStatue.Text = AxisManager.IsServeoOn(PortName, SlvAddr) ? "✔" : "✘"; // txtServoStatue.Text = AxisManager.IsServeoOn(PortName, SlvAddr) ? "✔" : "✘";
} //}
private void btnReadPosition_Click(object sender, EventArgs e) private void btnReadPosition_Click(object sender, EventArgs e)
...@@ -248,17 +248,17 @@ namespace DeviceLibrary ...@@ -248,17 +248,17 @@ namespace DeviceLibrary
btnAxisStop.ForeColor = color; btnAxisStop.ForeColor = color;
btnComAlarmClear.ForeColor = color; btnComAlarmClear.ForeColor = color;
btnReadPosition.ForeColor = color; btnReadPosition.ForeColor = color;
btnGetAlarm.ForeColor = color; // btnGetAlarm.ForeColor = color;
btnAddMove.ForeColor = color; btnAddMove.ForeColor = color;
btnDelMove.ForeColor = color; btnDelMove.ForeColor = color;
this.txtAlarmStatus.Text = ""; //this.txtAlarmStatus.Text = "";
this.txtBusyStatus.Text = ""; //this.txtBusyStatus.Text = "";
this.txtHomeStatus.Text = ""; //this.txtHomeStatus.Text = "";
this.txtHomeSingle.Text = ""; //this.txtHomeSingle.Text = "";
this.txtLimit1.Text = ""; //this.txtLimit1.Text = "";
this.txtLimit2.Text = ""; //this.txtLimit2.Text = "";
txtServoStatue.Text = ""; //txtServoStatue.Text = "";
} }
} }
private void AxisMove(int speed) private void AxisMove(int speed)
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!