This commit is contained in:
atvstdla
2025-09-30 17:35:11 +09:00
parent 5a2eeed3c4
commit 1273ca8236
37 changed files with 1333 additions and 1033 deletions

View File

@@ -863,7 +863,7 @@ namespace Project
if (UTIL.MsgQ(msg) != System.Windows.Forms.DialogResult.Yes) return;
if (!MOT.Move(axis, value, speed, acc, relative, !chkJogMoveForce.Checked, !chkJogMoveForce.Checked))
if (!MOT.Move(axis, value, speed, acc, relative, true,true))
PUB.log.AddE("MOT:MOVE_:" + axis.ToString() + ",Msg=" + PUB.mot.ErrorMessage);

View File

@@ -29,17 +29,13 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Model_Operation));
this.dv = new arCtl.arDatagridView();
this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dvc_title = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Code = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dvc_bsave = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.bs = new System.Windows.Forms.BindingSource(this.components);
this.ds1 = new Project.DataSet1();
this.tmDisplay = new System.Windows.Forms.Timer(this.components);
@@ -159,6 +155,12 @@
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.arLabel2 = new arCtl.arLabel();
this.arLabel18 = new arCtl.arLabel();
this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dvc_title = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Code = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dvc_bsave = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.btReName = new System.Windows.Forms.ToolStripButton();
this.label24 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.dv)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.ds1)).BeginInit();
@@ -201,15 +203,15 @@
this.Code,
this.dvc_bsave});
this.dv.DataSource = this.bs;
dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle20.BackColor = System.Drawing.SystemColors.Window;
dataGridViewCellStyle20.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
dataGridViewCellStyle20.ForeColor = System.Drawing.SystemColors.ControlText;
dataGridViewCellStyle20.Padding = new System.Windows.Forms.Padding(5);
dataGridViewCellStyle20.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle20.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dv.DefaultCellStyle = dataGridViewCellStyle20;
dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window;
dataGridViewCellStyle5.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText;
dataGridViewCellStyle5.Padding = new System.Windows.Forms.Padding(5);
dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dv.DefaultCellStyle = dataGridViewCellStyle5;
this.dv.Dock = System.Windows.Forms.DockStyle.Fill;
this.dv.Location = new System.Drawing.Point(0, 136);
this.dv.MultiSelect = false;
@@ -220,43 +222,6 @@
this.dv.TabIndex = 1;
this.dv.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.dv_DataError);
//
// Column1
//
this.Column1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
this.Column1.DataPropertyName = "idx";
dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.Column1.DefaultCellStyle = dataGridViewCellStyle16;
this.Column1.HeaderText = "*";
this.Column1.Name = "Column1";
this.Column1.Width = 50;
//
// dvc_title
//
this.dvc_title.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
this.dvc_title.DataPropertyName = "Title";
dataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
this.dvc_title.DefaultCellStyle = dataGridViewCellStyle17;
this.dvc_title.HeaderText = "Description";
this.dvc_title.Name = "dvc_title";
//
// Code
//
this.Code.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
this.Code.DataPropertyName = "Code";
dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.Code.DefaultCellStyle = dataGridViewCellStyle18;
this.Code.HeaderText = "Customer Code";
this.Code.Name = "Code";
//
// dvc_bsave
//
this.dvc_bsave.DataPropertyName = "BSave";
dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.dvc_bsave.DefaultCellStyle = dataGridViewCellStyle19;
this.dvc_bsave.HeaderText = "BLoad";
this.dvc_bsave.Name = "dvc_bsave";
this.dvc_bsave.Width = 86;
//
// bs
//
this.bs.DataMember = "OPModel";
@@ -312,6 +277,7 @@
//
// panel4
//
this.panel4.Controls.Add(this.label24);
this.panel4.Controls.Add(this.dv);
this.panel4.Controls.Add(this.panel1);
this.panel4.Controls.Add(this.tableLayoutPanel1);
@@ -707,7 +673,7 @@
this.chkSave2.AutoSize = true;
this.chkSave2.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Bold);
this.chkSave2.ForeColor = System.Drawing.Color.Tomato;
this.chkSave2.Location = new System.Drawing.Point(431, 51);
this.chkSave2.Location = new System.Drawing.Point(407, 51);
this.chkSave2.Name = "chkSave2";
this.chkSave2.Size = new System.Drawing.Size(216, 23);
this.chkSave2.TabIndex = 39;
@@ -719,19 +685,19 @@
//
this.checkBox34.AutoSize = true;
this.checkBox34.ForeColor = System.Drawing.Color.Green;
this.checkBox34.Location = new System.Drawing.Point(617, 25);
this.checkBox34.Location = new System.Drawing.Point(582, 25);
this.checkBox34.Name = "checkBox34";
this.checkBox34.Size = new System.Drawing.Size(86, 23);
this.checkBox34.Size = new System.Drawing.Size(72, 23);
this.checkBox34.TabIndex = 38;
this.checkBox34.Tag = "10";
this.checkBox34.Text = "Qty(Max)";
this.checkBox34.Text = "Qty(M)";
this.checkBox34.UseVisualStyleBackColor = true;
//
// checkBox35
//
this.checkBox35.AutoSize = true;
this.checkBox35.ForeColor = System.Drawing.Color.Green;
this.checkBox35.Location = new System.Drawing.Point(548, 25);
this.checkBox35.Location = new System.Drawing.Point(517, 25);
this.checkBox35.Name = "checkBox35";
this.checkBox35.Size = new System.Drawing.Size(63, 23);
this.checkBox35.TabIndex = 37;
@@ -743,7 +709,7 @@
//
this.checkBox30.AutoSize = true;
this.checkBox30.ForeColor = System.Drawing.Color.Blue;
this.checkBox30.Location = new System.Drawing.Point(311, 50);
this.checkBox30.Location = new System.Drawing.Point(291, 50);
this.checkBox30.Name = "checkBox30";
this.checkBox30.Size = new System.Drawing.Size(62, 23);
this.checkBox30.TabIndex = 32;
@@ -754,7 +720,7 @@
// checkBox2
//
this.checkBox2.AutoSize = true;
this.checkBox2.Location = new System.Drawing.Point(431, 25);
this.checkBox2.Location = new System.Drawing.Point(407, 25);
this.checkBox2.Name = "checkBox2";
this.checkBox2.Size = new System.Drawing.Size(111, 23);
this.checkBox2.TabIndex = 31;
@@ -787,7 +753,7 @@
// checkBox3
//
this.checkBox3.AutoSize = true;
this.checkBox3.Location = new System.Drawing.Point(311, 24);
this.checkBox3.Location = new System.Drawing.Point(291, 24);
this.checkBox3.Name = "checkBox3";
this.checkBox3.Size = new System.Drawing.Size(114, 23);
this.checkBox3.TabIndex = 28;
@@ -799,7 +765,7 @@
//
this.checkBox20.AutoSize = true;
this.checkBox20.ForeColor = System.Drawing.Color.Blue;
this.checkBox20.Location = new System.Drawing.Point(255, 50);
this.checkBox20.Location = new System.Drawing.Point(236, 50);
this.checkBox20.Name = "checkBox20";
this.checkBox20.Size = new System.Drawing.Size(50, 23);
this.checkBox20.TabIndex = 27;
@@ -811,7 +777,7 @@
//
this.checkBox21.AutoSize = true;
this.checkBox21.ForeColor = System.Drawing.Color.Blue;
this.checkBox21.Location = new System.Drawing.Point(156, 50);
this.checkBox21.Location = new System.Drawing.Point(141, 50);
this.checkBox21.Name = "checkBox21";
this.checkBox21.Size = new System.Drawing.Size(93, 23);
this.checkBox21.TabIndex = 25;
@@ -823,7 +789,7 @@
//
this.checkBox22.AutoSize = true;
this.checkBox22.ForeColor = System.Drawing.Color.Blue;
this.checkBox22.Location = new System.Drawing.Point(73, 50);
this.checkBox22.Location = new System.Drawing.Point(59, 50);
this.checkBox22.Name = "checkBox22";
this.checkBox22.Size = new System.Drawing.Size(77, 23);
this.checkBox22.TabIndex = 25;
@@ -834,7 +800,7 @@
// checkBox23
//
this.checkBox23.AutoSize = true;
this.checkBox23.Location = new System.Drawing.Point(255, 24);
this.checkBox23.Location = new System.Drawing.Point(236, 24);
this.checkBox23.Name = "checkBox23";
this.checkBox23.Size = new System.Drawing.Size(50, 23);
this.checkBox23.TabIndex = 26;
@@ -845,7 +811,7 @@
// checkBox24
//
this.checkBox24.AutoSize = true;
this.checkBox24.Location = new System.Drawing.Point(156, 24);
this.checkBox24.Location = new System.Drawing.Point(141, 24);
this.checkBox24.Name = "checkBox24";
this.checkBox24.Size = new System.Drawing.Size(93, 23);
this.checkBox24.TabIndex = 25;
@@ -856,7 +822,7 @@
// checkBox25
//
this.checkBox25.AutoSize = true;
this.checkBox25.Location = new System.Drawing.Point(73, 24);
this.checkBox25.Location = new System.Drawing.Point(59, 24);
this.checkBox25.Name = "checkBox25";
this.checkBox25.Size = new System.Drawing.Size(77, 23);
this.checkBox25.TabIndex = 25;
@@ -891,7 +857,7 @@
//
this.checkBox29.AutoSize = true;
this.checkBox29.ForeColor = System.Drawing.Color.Blue;
this.checkBox29.Location = new System.Drawing.Point(311, 51);
this.checkBox29.Location = new System.Drawing.Point(291, 51);
this.checkBox29.Name = "checkBox29";
this.checkBox29.Size = new System.Drawing.Size(62, 23);
this.checkBox29.TabIndex = 31;
@@ -902,7 +868,7 @@
// checkBox18
//
this.checkBox18.AutoSize = true;
this.checkBox18.Location = new System.Drawing.Point(431, 24);
this.checkBox18.Location = new System.Drawing.Point(407, 24);
this.checkBox18.Name = "checkBox18";
this.checkBox18.Size = new System.Drawing.Size(111, 23);
this.checkBox18.TabIndex = 30;
@@ -935,7 +901,7 @@
// checkBox10
//
this.checkBox10.AutoSize = true;
this.checkBox10.Location = new System.Drawing.Point(311, 24);
this.checkBox10.Location = new System.Drawing.Point(291, 24);
this.checkBox10.Name = "checkBox10";
this.checkBox10.Size = new System.Drawing.Size(114, 23);
this.checkBox10.TabIndex = 28;
@@ -947,7 +913,7 @@
//
this.checkBox9.AutoSize = true;
this.checkBox9.ForeColor = System.Drawing.Color.Blue;
this.checkBox9.Location = new System.Drawing.Point(255, 50);
this.checkBox9.Location = new System.Drawing.Point(236, 50);
this.checkBox9.Name = "checkBox9";
this.checkBox9.Size = new System.Drawing.Size(50, 23);
this.checkBox9.TabIndex = 27;
@@ -959,7 +925,7 @@
//
this.checkBox6.AutoSize = true;
this.checkBox6.ForeColor = System.Drawing.Color.Blue;
this.checkBox6.Location = new System.Drawing.Point(156, 50);
this.checkBox6.Location = new System.Drawing.Point(141, 50);
this.checkBox6.Name = "checkBox6";
this.checkBox6.Size = new System.Drawing.Size(93, 23);
this.checkBox6.TabIndex = 25;
@@ -971,7 +937,7 @@
//
this.checkBox7.AutoSize = true;
this.checkBox7.ForeColor = System.Drawing.Color.Blue;
this.checkBox7.Location = new System.Drawing.Point(73, 50);
this.checkBox7.Location = new System.Drawing.Point(59, 50);
this.checkBox7.Name = "checkBox7";
this.checkBox7.Size = new System.Drawing.Size(77, 23);
this.checkBox7.TabIndex = 25;
@@ -982,7 +948,7 @@
// checkBox8
//
this.checkBox8.AutoSize = true;
this.checkBox8.Location = new System.Drawing.Point(255, 24);
this.checkBox8.Location = new System.Drawing.Point(236, 24);
this.checkBox8.Name = "checkBox8";
this.checkBox8.Size = new System.Drawing.Size(50, 23);
this.checkBox8.TabIndex = 26;
@@ -993,7 +959,7 @@
// checkBox5
//
this.checkBox5.AutoSize = true;
this.checkBox5.Location = new System.Drawing.Point(156, 24);
this.checkBox5.Location = new System.Drawing.Point(141, 24);
this.checkBox5.Name = "checkBox5";
this.checkBox5.Size = new System.Drawing.Size(93, 23);
this.checkBox5.TabIndex = 25;
@@ -1004,7 +970,7 @@
// checkBox4
//
this.checkBox4.AutoSize = true;
this.checkBox4.Location = new System.Drawing.Point(73, 24);
this.checkBox4.Location = new System.Drawing.Point(59, 24);
this.checkBox4.Name = "checkBox4";
this.checkBox4.Size = new System.Drawing.Size(77, 23);
this.checkBox4.TabIndex = 25;
@@ -1042,7 +1008,7 @@
//
this.checkBox28.AutoSize = true;
this.checkBox28.ForeColor = System.Drawing.Color.Blue;
this.checkBox28.Location = new System.Drawing.Point(311, 51);
this.checkBox28.Location = new System.Drawing.Point(291, 51);
this.checkBox28.Name = "checkBox28";
this.checkBox28.Size = new System.Drawing.Size(62, 23);
this.checkBox28.TabIndex = 37;
@@ -1054,19 +1020,19 @@
//
this.checkBox26.AutoSize = true;
this.checkBox26.ForeColor = System.Drawing.Color.Green;
this.checkBox26.Location = new System.Drawing.Point(617, 24);
this.checkBox26.Location = new System.Drawing.Point(582, 24);
this.checkBox26.Name = "checkBox26";
this.checkBox26.Size = new System.Drawing.Size(86, 23);
this.checkBox26.Size = new System.Drawing.Size(72, 23);
this.checkBox26.TabIndex = 36;
this.checkBox26.Tag = "10";
this.checkBox26.Text = "Qty(Max)";
this.checkBox26.Text = "Qty(M)";
this.checkBox26.UseVisualStyleBackColor = true;
//
// checkBox27
//
this.checkBox27.AutoSize = true;
this.checkBox27.ForeColor = System.Drawing.Color.Green;
this.checkBox27.Location = new System.Drawing.Point(548, 24);
this.checkBox27.Location = new System.Drawing.Point(517, 24);
this.checkBox27.Name = "checkBox27";
this.checkBox27.Size = new System.Drawing.Size(63, 23);
this.checkBox27.TabIndex = 35;
@@ -1079,7 +1045,7 @@
this.chkSave1.AutoSize = true;
this.chkSave1.Font = new System.Drawing.Font("맑은 고딕", 10F, System.Drawing.FontStyle.Bold);
this.chkSave1.ForeColor = System.Drawing.Color.Tomato;
this.chkSave1.Location = new System.Drawing.Point(431, 50);
this.chkSave1.Location = new System.Drawing.Point(407, 50);
this.chkSave1.Name = "chkSave1";
this.chkSave1.Size = new System.Drawing.Size(216, 23);
this.chkSave1.TabIndex = 33;
@@ -1090,7 +1056,7 @@
// checkBox19
//
this.checkBox19.AutoSize = true;
this.checkBox19.Location = new System.Drawing.Point(431, 25);
this.checkBox19.Location = new System.Drawing.Point(407, 25);
this.checkBox19.Name = "checkBox19";
this.checkBox19.Size = new System.Drawing.Size(111, 23);
this.checkBox19.TabIndex = 31;
@@ -1123,7 +1089,7 @@
// checkBox11
//
this.checkBox11.AutoSize = true;
this.checkBox11.Location = new System.Drawing.Point(311, 24);
this.checkBox11.Location = new System.Drawing.Point(291, 24);
this.checkBox11.Name = "checkBox11";
this.checkBox11.Size = new System.Drawing.Size(114, 23);
this.checkBox11.TabIndex = 28;
@@ -1135,7 +1101,7 @@
//
this.checkBox12.AutoSize = true;
this.checkBox12.ForeColor = System.Drawing.Color.Blue;
this.checkBox12.Location = new System.Drawing.Point(255, 50);
this.checkBox12.Location = new System.Drawing.Point(236, 50);
this.checkBox12.Name = "checkBox12";
this.checkBox12.Size = new System.Drawing.Size(50, 23);
this.checkBox12.TabIndex = 27;
@@ -1147,7 +1113,7 @@
//
this.checkBox13.AutoSize = true;
this.checkBox13.ForeColor = System.Drawing.Color.Blue;
this.checkBox13.Location = new System.Drawing.Point(156, 50);
this.checkBox13.Location = new System.Drawing.Point(141, 50);
this.checkBox13.Name = "checkBox13";
this.checkBox13.Size = new System.Drawing.Size(93, 23);
this.checkBox13.TabIndex = 25;
@@ -1159,7 +1125,7 @@
//
this.checkBox14.AutoSize = true;
this.checkBox14.ForeColor = System.Drawing.Color.Blue;
this.checkBox14.Location = new System.Drawing.Point(73, 50);
this.checkBox14.Location = new System.Drawing.Point(59, 50);
this.checkBox14.Name = "checkBox14";
this.checkBox14.Size = new System.Drawing.Size(77, 23);
this.checkBox14.TabIndex = 25;
@@ -1170,7 +1136,7 @@
// checkBox15
//
this.checkBox15.AutoSize = true;
this.checkBox15.Location = new System.Drawing.Point(255, 24);
this.checkBox15.Location = new System.Drawing.Point(236, 24);
this.checkBox15.Name = "checkBox15";
this.checkBox15.Size = new System.Drawing.Size(50, 23);
this.checkBox15.TabIndex = 26;
@@ -1181,7 +1147,7 @@
// checkBox16
//
this.checkBox16.AutoSize = true;
this.checkBox16.Location = new System.Drawing.Point(156, 24);
this.checkBox16.Location = new System.Drawing.Point(141, 24);
this.checkBox16.Name = "checkBox16";
this.checkBox16.Size = new System.Drawing.Size(93, 23);
this.checkBox16.TabIndex = 25;
@@ -1192,7 +1158,7 @@
// checkBox17
//
this.checkBox17.AutoSize = true;
this.checkBox17.Location = new System.Drawing.Point(73, 24);
this.checkBox17.Location = new System.Drawing.Point(59, 24);
this.checkBox17.Name = "checkBox17";
this.checkBox17.Size = new System.Drawing.Size(77, 23);
this.checkBox17.TabIndex = 25;
@@ -1227,7 +1193,7 @@
//
this.checkBox36.AutoSize = true;
this.checkBox36.ForeColor = System.Drawing.Color.Blue;
this.checkBox36.Location = new System.Drawing.Point(311, 51);
this.checkBox36.Location = new System.Drawing.Point(291, 51);
this.checkBox36.Name = "checkBox36";
this.checkBox36.Size = new System.Drawing.Size(62, 23);
this.checkBox36.TabIndex = 37;
@@ -1239,7 +1205,7 @@
//
this.checkBox38.AutoSize = true;
this.checkBox38.ForeColor = System.Drawing.Color.Green;
this.checkBox38.Location = new System.Drawing.Point(431, 24);
this.checkBox38.Location = new System.Drawing.Point(407, 24);
this.checkBox38.Name = "checkBox38";
this.checkBox38.Size = new System.Drawing.Size(63, 23);
this.checkBox38.TabIndex = 35;
@@ -1272,7 +1238,7 @@
// checkBox41
//
this.checkBox41.AutoSize = true;
this.checkBox41.Location = new System.Drawing.Point(311, 24);
this.checkBox41.Location = new System.Drawing.Point(291, 24);
this.checkBox41.Name = "checkBox41";
this.checkBox41.Size = new System.Drawing.Size(114, 23);
this.checkBox41.TabIndex = 28;
@@ -1284,7 +1250,7 @@
//
this.checkBox42.AutoSize = true;
this.checkBox42.ForeColor = System.Drawing.Color.Blue;
this.checkBox42.Location = new System.Drawing.Point(255, 50);
this.checkBox42.Location = new System.Drawing.Point(236, 50);
this.checkBox42.Name = "checkBox42";
this.checkBox42.Size = new System.Drawing.Size(50, 23);
this.checkBox42.TabIndex = 27;
@@ -1296,7 +1262,7 @@
//
this.checkBox43.AutoSize = true;
this.checkBox43.ForeColor = System.Drawing.Color.Blue;
this.checkBox43.Location = new System.Drawing.Point(156, 50);
this.checkBox43.Location = new System.Drawing.Point(141, 50);
this.checkBox43.Name = "checkBox43";
this.checkBox43.Size = new System.Drawing.Size(93, 23);
this.checkBox43.TabIndex = 25;
@@ -1308,7 +1274,7 @@
//
this.checkBox44.AutoSize = true;
this.checkBox44.ForeColor = System.Drawing.Color.Blue;
this.checkBox44.Location = new System.Drawing.Point(73, 50);
this.checkBox44.Location = new System.Drawing.Point(59, 50);
this.checkBox44.Name = "checkBox44";
this.checkBox44.Size = new System.Drawing.Size(77, 23);
this.checkBox44.TabIndex = 25;
@@ -1319,7 +1285,7 @@
// checkBox45
//
this.checkBox45.AutoSize = true;
this.checkBox45.Location = new System.Drawing.Point(255, 24);
this.checkBox45.Location = new System.Drawing.Point(236, 24);
this.checkBox45.Name = "checkBox45";
this.checkBox45.Size = new System.Drawing.Size(50, 23);
this.checkBox45.TabIndex = 26;
@@ -1330,7 +1296,7 @@
// checkBox46
//
this.checkBox46.AutoSize = true;
this.checkBox46.Location = new System.Drawing.Point(156, 24);
this.checkBox46.Location = new System.Drawing.Point(141, 24);
this.checkBox46.Name = "checkBox46";
this.checkBox46.Size = new System.Drawing.Size(93, 23);
this.checkBox46.TabIndex = 25;
@@ -1341,7 +1307,7 @@
// checkBox47
//
this.checkBox47.AutoSize = true;
this.checkBox47.Location = new System.Drawing.Point(73, 24);
this.checkBox47.Location = new System.Drawing.Point(59, 24);
this.checkBox47.Name = "checkBox47";
this.checkBox47.Size = new System.Drawing.Size(77, 23);
this.checkBox47.TabIndex = 25;
@@ -1546,7 +1512,7 @@
//
this.label15.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "vSIDConv", true));
this.label15.Dock = System.Windows.Forms.DockStyle.Left;
this.label15.Font = new System.Drawing.Font("Consolas", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label15.Font = new System.Drawing.Font("Consolas", 9.75F);
this.label15.Location = new System.Drawing.Point(400, 0);
this.label15.Name = "label15";
this.label15.Size = new System.Drawing.Size(50, 20);
@@ -1557,6 +1523,7 @@
// label14
//
this.label14.Dock = System.Windows.Forms.DockStyle.Left;
this.label14.Font = new System.Drawing.Font("Consolas", 9.75F);
this.label14.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.label14.Location = new System.Drawing.Point(300, 0);
this.label14.Name = "label14";
@@ -1569,7 +1536,7 @@
//
this.label13.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "vJobInfo", true));
this.label13.Dock = System.Windows.Forms.DockStyle.Left;
this.label13.Font = new System.Drawing.Font("Consolas", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label13.Font = new System.Drawing.Font("Consolas", 9.75F);
this.label13.Location = new System.Drawing.Point(250, 0);
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(50, 20);
@@ -1580,6 +1547,7 @@
// label12
//
this.label12.Dock = System.Windows.Forms.DockStyle.Left;
this.label12.Font = new System.Drawing.Font("Consolas", 9.75F);
this.label12.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.label12.Location = new System.Drawing.Point(200, 0);
this.label12.Name = "label12";
@@ -1592,7 +1560,7 @@
//
this.label11.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "vSIDInfo", true));
this.label11.Dock = System.Windows.Forms.DockStyle.Left;
this.label11.Font = new System.Drawing.Font("Consolas", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label11.Font = new System.Drawing.Font("Consolas", 9.75F);
this.label11.Location = new System.Drawing.Point(150, 0);
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(50, 20);
@@ -1603,6 +1571,7 @@
// label10
//
this.label10.Dock = System.Windows.Forms.DockStyle.Left;
this.label10.Font = new System.Drawing.Font("Consolas", 9.75F);
this.label10.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.label10.Location = new System.Drawing.Point(100, 0);
this.label10.Name = "label10";
@@ -1615,7 +1584,7 @@
//
this.label9.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "vOption", true));
this.label9.Dock = System.Windows.Forms.DockStyle.Left;
this.label9.Font = new System.Drawing.Font("Consolas", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label9.Font = new System.Drawing.Font("Consolas", 9.75F);
this.label9.Location = new System.Drawing.Point(50, 0);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(50, 20);
@@ -1626,6 +1595,7 @@
// label8
//
this.label8.Dock = System.Windows.Forms.DockStyle.Left;
this.label8.Font = new System.Drawing.Font("Consolas", 9.75F);
this.label8.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.label8.Location = new System.Drawing.Point(0, 0);
this.label8.Name = "label8";
@@ -1642,6 +1612,7 @@
this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.btAdd,
this.btDel,
this.btReName,
this.btSave,
this.btCopy,
this.toolStripButton10,
@@ -1795,6 +1766,65 @@
this.arLabel18.TextShadow = true;
this.arLabel18.TextVisible = true;
//
// Column1
//
this.Column1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
this.Column1.DataPropertyName = "idx";
dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.Column1.DefaultCellStyle = dataGridViewCellStyle1;
this.Column1.HeaderText = "*";
this.Column1.Name = "Column1";
this.Column1.Width = 50;
//
// dvc_title
//
this.dvc_title.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
this.dvc_title.DataPropertyName = "Title";
dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
this.dvc_title.DefaultCellStyle = dataGridViewCellStyle2;
this.dvc_title.HeaderText = "Description(Vendor-Customer)";
this.dvc_title.Name = "dvc_title";
this.dvc_title.ReadOnly = true;
//
// Code
//
this.Code.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
this.Code.DataPropertyName = "Code";
dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.Code.DefaultCellStyle = dataGridViewCellStyle3;
this.Code.HeaderText = "Customer Code";
this.Code.Name = "Code";
//
// dvc_bsave
//
this.dvc_bsave.DataPropertyName = "BSave";
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.dvc_bsave.DefaultCellStyle = dataGridViewCellStyle4;
this.dvc_bsave.HeaderText = "BLoad";
this.dvc_bsave.Name = "dvc_bsave";
this.dvc_bsave.Width = 86;
//
// btReName
//
this.btReName.Image = ((System.Drawing.Image)(resources.GetObject("btReName.Image")));
this.btReName.ImageTransparentColor = System.Drawing.Color.Magenta;
this.btReName.Name = "btReName";
this.btReName.Size = new System.Drawing.Size(104, 52);
this.btReName.Text = "ReName";
this.btReName.Click += new System.EventHandler(this.btReName_Click);
//
// label24
//
this.label24.Dock = System.Windows.Forms.DockStyle.Bottom;
this.label24.Font = new System.Drawing.Font("Consolas", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label24.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.label24.Location = new System.Drawing.Point(0, 671);
this.label24.Name = "label24";
this.label24.Size = new System.Drawing.Size(639, 20);
this.label24.TabIndex = 33;
this.label24.Text = "BLoad Descriptoin , 1=QR+DM+PDF417, 2=1D, 3=QR, 4=DM, 5=PDF417";
this.label24.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// Model_Operation
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -1945,10 +1975,6 @@
private System.Windows.Forms.CheckBox chkSave2;
private System.Windows.Forms.CheckBox chkOwnZPL;
private System.Windows.Forms.Button button1;
private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
private System.Windows.Forms.DataGridViewTextBoxColumn dvc_title;
private System.Windows.Forms.DataGridViewTextBoxColumn Code;
private System.Windows.Forms.DataGridViewTextBoxColumn dvc_bsave;
private System.Windows.Forms.Panel panel8;
private System.Windows.Forms.CheckBox chkDisablePartNoValue;
private System.Windows.Forms.CheckBox chkDisableBatchValue;
@@ -1969,5 +1995,11 @@
private System.Windows.Forms.CheckBox checkBox45;
private System.Windows.Forms.CheckBox checkBox46;
private System.Windows.Forms.CheckBox checkBox47;
private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
private System.Windows.Forms.DataGridViewTextBoxColumn dvc_title;
private System.Windows.Forms.DataGridViewTextBoxColumn Code;
private System.Windows.Forms.DataGridViewTextBoxColumn dvc_bsave;
private System.Windows.Forms.ToolStripButton btReName;
private System.Windows.Forms.Label label24;
}
}

View File

@@ -28,6 +28,7 @@ namespace Project
//if (COMM.SETTING.Data.FullScreen) this.WindowState = FormWindowState.Maximized;
//this.WindowState = FormWindowState.Normal;
dvc_bsave.HeaderText = $"BLoad\n(1~8)";
this.panel3.Visible = PUB.UserAdmin;
}
private void FModelV_FormClosing(object sender, FormClosingEventArgs e)
@@ -378,31 +379,57 @@ namespace Project
{
var drv = this.bs.Current as DataRowView;
if (drv == null) return;
//button - save
this.Validate();
this.bs.EndEdit();
if (hasChanged() == true)
{
UTIL.MsgE("Need save");
return;
}
if (PUB.PasswordCheck() == false)
{
UTIL.MsgE("Password incorrect");
return;
}
var dr = drv.Row as DataSet1.OPModelRow;
var dlg = UTIL.MsgQ(string.Format("Do you want to copy the following model information?\n\nModel Name : {0}", dr.Title));
var oldname = dr.Title;
var newname = UTIL.InputBox("input new name", dr.Title);
if (newname.Item1 == false) return;
if(dr.Title.Equals(newname.Item2))
{
UTIL.MsgE("Same Data");
return;
}
var dlg = UTIL.MsgQ(string.Format("Do you want to copy the following model information?\n\nNew Model Name : {0}", newname.Item2));
if (dlg != System.Windows.Forms.DialogResult.Yes) return;
var newdr = this.ds1.OPModel.NewOPModelRow();
UTIL.CopyData(dr, newdr);
newdr.Title += "-copy-";
newdr.Title = newname.Item2;
newdr.idx = this.ds1.OPModel.OrderByDescending(t => t.idx).FirstOrDefault().idx + 1;
newdr.EndEdit();
this.ds1.OPModel.AddOPModelRow(newdr);
if (this.bs.Count > 0) this.bs.Position = this.bs.Count - 1;
PUB.mdm.dataSet.OPModel.Clear();
PUB.mdm.dataSet.OPModel.Merge(this.ds1.OPModel);
PUB.mdm.dataSet.AcceptChanges();
PUB.mdm.SaveModelV();
////detailcopy
//var childs = ds1.OPModel.Where(t => t.pidx == dr.idx).ToArray();
//foreach (var dr2 in childs)
//{
// var newdr2 = this.ds1.OPModel.NewOPModelRow();
// Util.CopyData(dr2, newdr2);
// newdr2.pidx = newdr.idx;
// newdr2.EndEdit();
// newdr2.idx = this.ds1.OPModel.OrderByDescending(t => t.idx).FirstOrDefault().idx + 1;
// this.ds1.OPModel.AddOPModelRow(newdr2);
//}
//if (this.bs.Count > 0) this.bs.Position = this.bs.Count - 1;
//copy regex
var cnt = DB.CopyRegEx(oldname,newname.Item2);
PUB.log.AddAT($"model copy(regex : {cnt})");
}
@@ -603,6 +630,51 @@ namespace Project
f.ShowDialog();
}
}
private void btReName_Click(object sender, EventArgs e)
{
//button - save
this.Validate();
this.bs.EndEdit();
if (hasChanged() == true)
{
UTIL.MsgE("Need save");
return;
}
if (PUB.PasswordCheck() == false)
{
UTIL.MsgE("Password incorrect");
return;
}
var drv = this.bs.Current as DataRowView;
if (drv == null) return;
var dr = drv.Row as DataSet1.OPModelRow;
var beforename = dr.Title;
var dlg = UTIL.InputBox("Change Model ?Name", dr.Title);
if (dlg.Item1 == false) return;
if(beforename.Equals(dlg.Item2))
{
UTIL.MsgE("Same data");
return;
}
if (UTIL.MsgQ($"Change model name\nBefore:{beforename},After:{dlg.Item2}") != DialogResult.Yes)
return;
dr.Title = dlg.Item2;
dr.EndEdit();
//update regexname
DB.ChangeRegExName(beforename, dlg.Item2);
PUB.mdm.dataSet.OPModel.Clear();
PUB.mdm.dataSet.OPModel.Merge(this.ds1.OPModel);
PUB.mdm.dataSet.AcceptChanges();
PUB.mdm.SaveModelV();
}
}
}

View File

@@ -132,9 +132,6 @@
<metadata name="ds1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="ds1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="tmDisplay.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>88, 17</value>
</metadata>
@@ -145,6 +142,21 @@
<value>356, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="btReName.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
TgDQASA1MVpwzwAAAABJRU5ErkJggg==
</value>
</data>
<data name="btSave.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAABGdBTUEAALGPC/xhBQAAAwFJREFUWEft

View File

@@ -123,8 +123,8 @@
this.bindingNavigatorAddNewItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorAddNewItem.Image")));
this.bindingNavigatorAddNewItem.Name = "bindingNavigatorAddNewItem";
this.bindingNavigatorAddNewItem.RightToLeftAutoMirrorImage = true;
this.bindingNavigatorAddNewItem.Size = new System.Drawing.Size(49, 22);
this.bindingNavigatorAddNewItem.Text = "Add";
this.bindingNavigatorAddNewItem.Size = new System.Drawing.Size(65, 22);
this.bindingNavigatorAddNewItem.Text = "Add(&A)";
//
// bs
//
@@ -150,8 +150,8 @@
this.bindingNavigatorDeleteItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorDeleteItem.Image")));
this.bindingNavigatorDeleteItem.Name = "bindingNavigatorDeleteItem";
this.bindingNavigatorDeleteItem.RightToLeftAutoMirrorImage = true;
this.bindingNavigatorDeleteItem.Size = new System.Drawing.Size(60, 22);
this.bindingNavigatorDeleteItem.Text = "Delete";
this.bindingNavigatorDeleteItem.Size = new System.Drawing.Size(76, 22);
this.bindingNavigatorDeleteItem.Text = "Delete(&D)";
//
// bindingNavigatorMoveFirstItem
//
@@ -217,8 +217,8 @@
//
this.component_Reel_RegExRuleBindingNavigatorSaveItem.Image = ((System.Drawing.Image)(resources.GetObject("component_Reel_RegExRuleBindingNavigatorSaveItem.Image")));
this.component_Reel_RegExRuleBindingNavigatorSaveItem.Name = "component_Reel_RegExRuleBindingNavigatorSaveItem";
this.component_Reel_RegExRuleBindingNavigatorSaveItem.Size = new System.Drawing.Size(51, 22);
this.component_Reel_RegExRuleBindingNavigatorSaveItem.Text = "Save";
this.component_Reel_RegExRuleBindingNavigatorSaveItem.Size = new System.Drawing.Size(65, 22);
this.component_Reel_RegExRuleBindingNavigatorSaveItem.Text = "Save(&S)";
this.component_Reel_RegExRuleBindingNavigatorSaveItem.Click += new System.EventHandler(this.component_Reel_RegExRuleBindingNavigatorSaveItem_Click);
//
// toolStripButton1
@@ -227,8 +227,8 @@
this.toolStripButton1.Image = global::Project.Properties.Resources.arrow_refresh_small;
this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton1.Name = "toolStripButton1";
this.toolStripButton1.Size = new System.Drawing.Size(66, 22);
this.toolStripButton1.Text = "Refresh";
this.toolStripButton1.Size = new System.Drawing.Size(81, 22);
this.toolStripButton1.Text = "Refresh(&R)";
this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click);
//
// btCopy
@@ -236,8 +236,8 @@
this.btCopy.Image = global::Project.Properties.Resources.copy;
this.btCopy.ImageTransparentColor = System.Drawing.Color.Magenta;
this.btCopy.Name = "btCopy";
this.btCopy.Size = new System.Drawing.Size(55, 22);
this.btCopy.Text = "Copy";
this.btCopy.Size = new System.Drawing.Size(71, 22);
this.btCopy.Text = "Copy(&C)";
this.btCopy.Click += new System.EventHandler(this.btCopy_Click);
//
// toolStripButton2
@@ -245,8 +245,8 @@
this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image")));
this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton2.Name = "toolStripButton2";
this.toolStripButton2.Size = new System.Drawing.Size(81, 22);
this.toolStripButton2.Text = "Export List";
this.toolStripButton2.Size = new System.Drawing.Size(98, 22);
this.toolStripButton2.Text = "Export List(&O)";
this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click);
//
// dv1

View File

@@ -26,6 +26,7 @@ namespace Project.Dialog
if (PUB.Result.isSetvModel)
e1.Row["CustCode"] = PUB.Result.vModel.Title;
};
dataGridViewTextBoxColumn1.Visible = false;
//모델목록을 업데이트한다.
cmbModelList.Items.Clear();
@@ -92,11 +93,14 @@ namespace Project.Dialog
UTIL.MsgE("No content has been saved");
}
else UTIL.MsgI($"{cnt1} records have been saved");
lock (PUB.Result.BCDPatternLock)
{
var modelName = PUB.Result.vModel.Title;
PUB.Result.BCDPattern = PUB.GetPatterns(modelName, false);
PUB.Result.BCDIgnorePattern = PUB.GetPatterns(modelName, true);
PUB.log.Add($"Model pattern loading: {PUB.Result.BCDPattern.Count}/{PUB.Result.BCDIgnorePattern.Count}");
}
var modelName = PUB.Result.vModel.Title;
PUB.Result.BCDPattern = PUB.GetPatterns(modelName, false);
PUB.Result.BCDIgnorePattern = PUB.GetPatterns(modelName, true);
PUB.log.Add($"Model pattern loading: {PUB.Result.BCDPattern.Count}/{PUB.Result.BCDIgnorePattern.Count}");
dv1.AutoResizeColumns();
}
@@ -126,7 +130,7 @@ namespace Project.Dialog
else
drow.DefaultCellStyle.BackColor = Color.WhiteSmoke;
}
}
catch (System.Exception ex)
{

View File

@@ -201,20 +201,20 @@
<data name="toolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL4SURBVDhPhZLrS1NhHMf3qv6EsF70UohSalFRLyrzMjWw
m6mUeZtTKm+4iUFmzUXmJbRQoSKSohcVkbdZzcxtTjeckWne8tamA6fTue2coztnfnvO2XAFQT/48Lx4
zvfD+X3PEfETdVObfrraqEmoMa7EqIw0ORmBWv40MQnV/UzcfcPIMYW+fk/i621C6M+Jvdurt7uYZduy
k3N41uFwB1l28TAYs7lQ1mpBas04JclTbw9E/RNfabDbV1xc/5wXpl8sTBYWxjkWhtkNaH+u48OoB+ss
0D5Oo+z9L2Q9HKH/kkTf6abXqA0MWjl8tbLkZDEgSDagm1rHp1GKCHwYtHEwLXihUlsQcaP7lRBOrj05
c1GVuClrPI+shgto+NiMine1iCgPw0mCRHUUUcpDqGuvE1ZxMywWVylElehYQZBUHfG2e7gDHZNP0WCU
C5K0R3GQv0xFfnMKpE1nkNmUifahRXSMuNH2fQ1O0lO0spcRBJJ6yfb4igLOONGDF8NKVGnzBEl6YzwJ
n0Xu4xzopzzCKp8naWhID6seL6Ir+vwCfmIrdUzRswyYpwxoMpXgXlcxkmtPIf1RIsxzFMykWL5g/bS/
EwcRRCn/EBy/Ve49XLobqfUSDE73Q9VzFUp1EVIeRKJZ24Jv8yzMpNj+WS/6CHaXFxG3A4IDihCZWLEL
+c8v4XJjLC7VxQiSInUqFO9yyJtEgr8ftHAY4D8xwUWKPCw3+AVixY55sWIneSgEYnkIzlVF4tqTDOhH
NVBpSnH1TQakjUkwE4GJ/BtGImC8PogLtMEVTsh7GZuTwdA8J6CbWEDhs1xkk6CsKQXFz69v3fFQGxzC
CzqDgoOFWsbqCAr+h4esEJ7TFhQcKfpCjVkdm/96+F843ZRvX1q7OxAnReZ2zVjWKNfY/KpvZonGjJ3G
VIAlt1eAb97NcFh2enw0TTtDr3T+CMTJCrkfr4VLP3Ttl2kc4bJWZotsP2HZLX6kLUyotHN1b2bn57AM
dZZIJBL9BohloZ6S1+tQAAAAAElFTkSuQmCC
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL2SURBVDhPhZLrS1NhHMf3Kv+EsF70UohScmFRL0pTmxrY
zVTUvM0pmprowiBTppF5CU1UqBCl6EWFqOnUpuac0w1nZNpS8zov4GVOdzlHd8789pyz4QyEfvDhefGc
74fz+54j4CboiTLhRrlGEV6h2Qou1lDkpHkquVNLh5cP06Ev1BOXparq0xEfj/GhwxPybFC1bqY3VzZM
rNG6C6PFzaaZg8bvVTMK2gyIrZi0iTLlHq6oc8JK1etrxh12eMEO7SIDrYGBZoGBen4Pyj+76NJbscsA
7ZMUCloWkfxqgvpHElzUS+3Y9jC6xOL7EkNOBiO8ZA8DM7v4qrcRgQOjqyy0K3aUyA0IeNz3gQ9HVfrP
3SuO2JfU3UFy7V3UdjehuLkSAYXe8CeISi4hSOaHqvYqfhULzWDNZEOQdIDhBZHlAZ/7xjvQMf0WtZo8
XhJfE4q893HIaoqGuP4mkuqT0D62ho4JC7783ME26SlYNkjzAlG1yCNUls1qpvrxblyGMmUmL0moCyPh
W0h7nQrVjJVfpXeagoL0YLLaEVw85BRwE1I6QOc0JEI3o0a99hGe9+QiqvIaEmoioFuwQUeK5QpWzTo7
MRJBkOyQ4MrTQvuF/FOIqxZhdHYYJf3pkMlzEP0yEE3KVvxYZqAjxQ7P2zFEWDfbEVDkEvhKPSVC6Ulk
NcYgti4EMVXXeUmOPA7S5lTyJoHg7kcNLEa4T0wwkyL9ctVOgVB6fFkoPUEe8oQwzxO3ywKR8SYRKr0C
JYp8pH9KhLguEjoi0JJ/Q0MEtN0B32yle4WruYP06jaNsWWWZ2BqBQ8b0pBCgpL6aOQ2Pji447DtsfDJ
lrsFQmJbMroF/8NKVvBJbXMLLuZ8s+kNm/tHPXwUJrPVcTa+3eKKkyLTeuYWd2xm/dKWY26Dwtw6hRkX
GxY7D9e8hWaxYbI4KIra9rrf+csVFwjOp3Vn+Ii7es5JFEYfSSt9QIoT75QWJ+IW2kvcaTqT1NnrnShP
FggEgr9Ef6FyBTeROAAAAABJRU5ErkJggg==
</value>
</data>
<metadata name="IsIgnore.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

View File

@@ -112,6 +112,7 @@
this.tmAutoConfirm = new System.Windows.Forms.Timer(this.components);
this.statusStrip1 = new System.Windows.Forms.StatusStrip();
this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel();
this.copyToClipboardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.groupBox1.SuspendLayout();
this.cmbarc.SuspendLayout();
this.panel7.SuspendLayout();
@@ -233,14 +234,15 @@
// cmbarc
//
this.cmbarc.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.ToolStripMenuItem});
this.ToolStripMenuItem,
this.copyToClipboardToolStripMenuItem});
this.cmbarc.Name = "cmbarc";
this.cmbarc.Size = new System.Drawing.Size(207, 26);
this.cmbarc.Size = new System.Drawing.Size(248, 70);
//
// 회전기준바코드로설정ToolStripMenuItem
//
this.ToolStripMenuItem.Name = "회전기준바코드로설정ToolStripMenuItem";
this.ToolStripMenuItem.Size = new System.Drawing.Size(206, 22);
this.ToolStripMenuItem.Size = new System.Drawing.Size(247, 22);
this.ToolStripMenuItem.Text = "Set as rotation reference barcode";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
@@ -371,8 +373,7 @@
this.label1.Padding = new System.Windows.Forms.Padding(5);
this.label1.Size = new System.Drawing.Size(363, 74);
this.label1.TabIndex = 0;
this.label1.Text = "Display all data read from the current barcode reader. \r\n1. First select the data field you want to input from the left side\r\n2. Input data " +
"from the list below\r\n3. Press the \"Input\" button at the bottom";
this.label1.Text = resources.GetString("label1.Text");
//
// tbRID
//
@@ -1155,9 +1156,16 @@
// toolStripStatusLabel1
//
this.toolStripStatusLabel1.Name = "toolStripStatusLabel1";
this.toolStripStatusLabel1.Size = new System.Drawing.Size(121, 17);
this.toolStripStatusLabel1.Size = new System.Drawing.Size(118, 17);
this.toolStripStatusLabel1.Text = "toolStripStatusLabel1";
//
// copyToClipboardToolStripMenuItem
//
this.copyToClipboardToolStripMenuItem.Name = "copyToClipboardToolStripMenuItem";
this.copyToClipboardToolStripMenuItem.Size = new System.Drawing.Size(247, 22);
this.copyToClipboardToolStripMenuItem.Text = "Copy To Clipboard";
this.copyToClipboardToolStripMenuItem.Click += new System.EventHandler(this.copyToClipboardToolStripMenuItem_Click);
//
// fLoaderInfo
//
this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 30F);
@@ -1284,5 +1292,6 @@
private System.Windows.Forms.TextBox tbBatch;
private System.Windows.Forms.LinkLabel linkLabel10;
private System.Windows.Forms.TextBox tbQtyMax;
private System.Windows.Forms.ToolStripMenuItem copyToClipboardToolStripMenuItem;
}
}

View File

@@ -17,7 +17,7 @@ namespace Project.Dialog
{
string PrintPos = "";
public fLoaderInfo(List<string> errlist)
public fLoaderInfo(Dictionary<int, string> errlist)
{
InitializeComponent();
PUB.flag.set(eVarBool.FG_WAIT_LOADERINFO, true, "_LOAD");
@@ -31,7 +31,7 @@ namespace Project.Dialog
{
foreach (var item in errlist)
AddErrorMessage(item);
AddErrorMessage($"[{item.Key}] {item.Value}");
}
if (PUB.Result.vModel.IgnoreBatch) tbBatch.Enabled = false;
if (PUB.Result.vModel.IgnorePartNo) tbpartno.Enabled = false;
@@ -320,7 +320,7 @@ namespace Project.Dialog
//lv.SubItems.Add(item.CenterPX.Y.ToString());
if (item.RegExConfirm)
{
if (item.RefExApply)
if (item.RefExApply > 0)
lv.ForeColor = Color.Blue;
else
lv.ForeColor = Color.Black;
@@ -701,7 +701,7 @@ namespace Project.Dialog
var preDatas = DBHelper.Get(sql, ps);
if (preDatas.Rows.Count > 0) preData = preDatas.Rows[0] as DataSet1.K4EE_Component_Reel_ResultRow;
//기존자료가 없다면 취소
if (preData == null) return false;
@@ -2347,5 +2347,26 @@ namespace Project.Dialog
{
UTIL.TouchKeyShow(tbQtyMax, "INPUT MAX QTY(SAP)");
}
private void copyToClipboardToolStripMenuItem_Click(object sender, EventArgs e)
{
if (lvbcdList.FocusedItem == null)
{
UTIL.MsgE("No item has focus");
return;
}
try
{
var value = lvbcdList.FocusedItem.SubItems[1].Text.Trim();
Clipboard.SetText(value);
UTIL.MsgI($"Clipboard Copied\n{value}");
}
catch (Exception ex)
{
UTIL.MsgE(ex.Message+"\nClipboard");
}
}
}
}

View File

@@ -120,6 +120,12 @@
<metadata name="cmbarc.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>155, 17</value>
</metadata>
<data name="label1.Text" xml:space="preserve">
<value>Display all data read from the current barcode reader.
1. First select the data field you want to input from the left side
2. Input data from the list below
3. Press the "Input" button at the bottom</value>
</data>
<data name="ivF.MotorPosition" mimetype="application/x-microsoft.net.object.binary.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFFTeXN0ZW0uRHJhd2luZywgVmVyc2lvbj00LjAuMC4wLCBDdWx0

View File

@@ -586,7 +586,7 @@ namespace Project.Dialog
void UpdateHeight()
{
if (this.tabControl1.Visible) this.Height = 755;
else this.Height = 380;
else this.Height = 420;
}
private void btOK_Click(object sender, EventArgs e)