diff --git a/WorkflowConfigurator/Forms/PartDlg.Designer.cs b/WorkflowConfigurator/Forms/PartDlg.Designer.cs index de3670efb..8751d2f94 100644 --- a/WorkflowConfigurator/Forms/PartDlg.Designer.cs +++ b/WorkflowConfigurator/Forms/PartDlg.Designer.cs @@ -49,19 +49,18 @@ this.locationRadioButton1 = new System.Windows.Forms.RadioButton(); this.label3 = new System.Windows.Forms.Label(); this.lifetimeManagementComboBox = new System.Windows.Forms.ComboBox(); - this.oraDBTypeTextBox = new System.Windows.Forms.TextBox(); - this.label4 = new System.Windows.Forms.Label(); - this.label5 = new System.Windows.Forms.Label(); this.formRadioButton1 = new System.Windows.Forms.RadioButton(); this.formRadioButton2 = new System.Windows.Forms.RadioButton(); this.formRadioButton3 = new System.Windows.Forms.RadioButton(); this.formRadioButton4 = new System.Windows.Forms.RadioButton(); this.formRadioButton5 = new System.Windows.Forms.RadioButton(); this.codeFormGroupBox = new System.Windows.Forms.GroupBox(); + this.formRadioButton9 = new System.Windows.Forms.RadioButton(); this.formRadioButton8 = new System.Windows.Forms.RadioButton(); this.formRadioButton7 = new System.Windows.Forms.RadioButton(); this.formRadioButton6 = new System.Windows.Forms.RadioButton(); - this.formRadioButton9 = new System.Windows.Forms.RadioButton(); + this.formRadioButton10 = new System.Windows.Forms.RadioButton(); + this.formRadioButton11 = new System.Windows.Forms.RadioButton(); this.codeTypeGroupBox.SuspendLayout(); this.codeLocationGroupBox.SuspendLayout(); this.codeFormGroupBox.SuspendLayout(); @@ -70,7 +69,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(21, 26); + this.label1.Location = new System.Drawing.Point(16, 18); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(102, 13); this.label1.TabIndex = 0; @@ -79,7 +78,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(21, 78); + this.label2.Location = new System.Drawing.Point(16, 44); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(63, 13); this.label2.TabIndex = 4; @@ -87,16 +86,16 @@ // // nameTextBox // - this.nameTextBox.Location = new System.Drawing.Point(137, 23); + this.nameTextBox.Location = new System.Drawing.Point(132, 15); this.nameTextBox.Name = "nameTextBox"; this.nameTextBox.Size = new System.Drawing.Size(191, 20); this.nameTextBox.TabIndex = 1; // // descriptionTextBox // - this.descriptionTextBox.Location = new System.Drawing.Point(137, 75); + this.descriptionTextBox.Location = new System.Drawing.Point(132, 41); this.descriptionTextBox.Name = "descriptionTextBox"; - this.descriptionTextBox.Size = new System.Drawing.Size(675, 20); + this.descriptionTextBox.Size = new System.Drawing.Size(714, 20); this.descriptionTextBox.TabIndex = 5; // // codeTypeGroupBox @@ -110,12 +109,12 @@ this.codeTypeGroupBox.Controls.Add(this.typeRadioButton3); this.codeTypeGroupBox.Controls.Add(this.typeRadioButton2); this.codeTypeGroupBox.Controls.Add(this.typeRadioButton1); - this.codeTypeGroupBox.Location = new System.Drawing.Point(24, 136); + this.codeTypeGroupBox.Location = new System.Drawing.Point(227, 102); this.codeTypeGroupBox.Name = "codeTypeGroupBox"; - this.codeTypeGroupBox.Size = new System.Drawing.Size(444, 212); + this.codeTypeGroupBox.Size = new System.Drawing.Size(430, 252); this.codeTypeGroupBox.TabIndex = 8; this.codeTypeGroupBox.TabStop = false; - this.codeTypeGroupBox.Text = "Code type"; + this.codeTypeGroupBox.Text = "Way to check a value"; // // typeRadioButton9 // @@ -219,7 +218,7 @@ // okButton // this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.okButton.Location = new System.Drawing.Point(650, 311); + this.okButton.Location = new System.Drawing.Point(771, 318); this.okButton.Name = "okButton"; this.okButton.Size = new System.Drawing.Size(75, 36); this.okButton.TabIndex = 11; @@ -230,7 +229,7 @@ // cancelButton // this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.cancelButton.Location = new System.Drawing.Point(737, 311); + this.cancelButton.Location = new System.Drawing.Point(681, 318); this.cancelButton.Name = "cancelButton"; this.cancelButton.Size = new System.Drawing.Size(75, 36); this.cancelButton.TabIndex = 12; @@ -242,9 +241,9 @@ // this.codeLocationGroupBox.Controls.Add(this.locationRadioButton2); this.codeLocationGroupBox.Controls.Add(this.locationRadioButton1); - this.codeLocationGroupBox.Location = new System.Drawing.Point(638, 136); + this.codeLocationGroupBox.Location = new System.Drawing.Point(663, 102); this.codeLocationGroupBox.Name = "codeLocationGroupBox"; - this.codeLocationGroupBox.Size = new System.Drawing.Size(174, 160); + this.codeLocationGroupBox.Size = new System.Drawing.Size(183, 80); this.codeLocationGroupBox.TabIndex = 10; this.codeLocationGroupBox.TabStop = false; this.codeLocationGroupBox.Text = "Code location"; @@ -274,7 +273,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(21, 104); + this.label3.Location = new System.Drawing.Point(16, 70); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(110, 13); this.label3.TabIndex = 6; @@ -283,45 +282,20 @@ // lifetimeManagementComboBox // this.lifetimeManagementComboBox.FormattingEnabled = true; - this.lifetimeManagementComboBox.Location = new System.Drawing.Point(137, 101); + this.lifetimeManagementComboBox.Location = new System.Drawing.Point(132, 67); this.lifetimeManagementComboBox.Name = "lifetimeManagementComboBox"; this.lifetimeManagementComboBox.Size = new System.Drawing.Size(191, 21); this.lifetimeManagementComboBox.TabIndex = 7; // - // oraDBTypeTextBox - // - this.oraDBTypeTextBox.Location = new System.Drawing.Point(137, 49); - this.oraDBTypeTextBox.Name = "oraDBTypeTextBox"; - this.oraDBTypeTextBox.Size = new System.Drawing.Size(191, 20); - this.oraDBTypeTextBox.TabIndex = 3; - // - // label4 - // - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(21, 52); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(82, 13); - this.label4.TabIndex = 2; - this.label4.Text = "Oracle DB type:"; - // - // label5 - // - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(334, 53); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(147, 13); - this.label5.TabIndex = 13; - this.label5.Text = "PCBA, Flowtube, Battery, atp."; - // // formRadioButton1 // this.formRadioButton1.AutoSize = true; this.formRadioButton1.Location = new System.Drawing.Point(18, 23); this.formRadioButton1.Name = "formRadioButton1"; - this.formRadioButton1.Size = new System.Drawing.Size(65, 17); + this.formRadioButton1.Size = new System.Drawing.Size(106, 17); this.formRadioButton1.TabIndex = 0; this.formRadioButton1.TabStop = true; - this.formRadioButton1.Text = "Barcode"; + this.formRadioButton1.Text = "Barcode scanner"; this.formRadioButton1.UseVisualStyleBackColor = true; // // formRadioButton2 @@ -329,10 +303,10 @@ this.formRadioButton2.AutoSize = true; this.formRadioButton2.Location = new System.Drawing.Point(18, 43); this.formRadioButton2.Name = "formRadioButton2"; - this.formRadioButton2.Size = new System.Drawing.Size(68, 17); + this.formRadioButton2.Size = new System.Drawing.Size(109, 17); this.formRadioButton2.TabIndex = 1; this.formRadioButton2.TabStop = true; - this.formRadioButton2.Text = "QR code"; + this.formRadioButton2.Text = "QR code scanner"; this.formRadioButton2.UseVisualStyleBackColor = true; // // formRadioButton3 @@ -362,14 +336,16 @@ this.formRadioButton5.AutoSize = true; this.formRadioButton5.Location = new System.Drawing.Point(18, 103); this.formRadioButton5.Name = "formRadioButton5"; - this.formRadioButton5.Size = new System.Drawing.Size(92, 17); + this.formRadioButton5.Size = new System.Drawing.Size(142, 17); this.formRadioButton5.TabIndex = 4; this.formRadioButton5.TabStop = true; - this.formRadioButton5.Text = "Complete S/N"; + this.formRadioButton5.Text = "Complete S/N from a DB"; this.formRadioButton5.UseVisualStyleBackColor = true; // // codeFormGroupBox // + this.codeFormGroupBox.Controls.Add(this.formRadioButton11); + this.codeFormGroupBox.Controls.Add(this.formRadioButton10); this.codeFormGroupBox.Controls.Add(this.formRadioButton9); this.codeFormGroupBox.Controls.Add(this.formRadioButton8); this.codeFormGroupBox.Controls.Add(this.formRadioButton7); @@ -379,22 +355,33 @@ this.codeFormGroupBox.Controls.Add(this.formRadioButton3); this.codeFormGroupBox.Controls.Add(this.formRadioButton2); this.codeFormGroupBox.Controls.Add(this.formRadioButton1); - this.codeFormGroupBox.Location = new System.Drawing.Point(474, 136); + this.codeFormGroupBox.Location = new System.Drawing.Point(19, 102); this.codeFormGroupBox.Name = "codeFormGroupBox"; - this.codeFormGroupBox.Size = new System.Drawing.Size(158, 212); + this.codeFormGroupBox.Size = new System.Drawing.Size(202, 252); this.codeFormGroupBox.TabIndex = 9; this.codeFormGroupBox.TabStop = false; - this.codeFormGroupBox.Text = "Code form"; + this.codeFormGroupBox.Text = "Way to obtain a value"; + // + // formRadioButton9 + // + this.formRadioButton9.AutoSize = true; + this.formRadioButton9.Location = new System.Drawing.Point(18, 183); + this.formRadioButton9.Name = "formRadioButton9"; + this.formRadioButton9.Size = new System.Drawing.Size(105, 17); + this.formRadioButton9.TabIndex = 8; + this.formRadioButton9.TabStop = true; + this.formRadioButton9.Text = "S640 datastream"; + this.formRadioButton9.UseVisualStyleBackColor = true; // // formRadioButton8 // this.formRadioButton8.AutoSize = true; this.formRadioButton8.Location = new System.Drawing.Point(18, 163); this.formRadioButton8.Name = "formRadioButton8"; - this.formRadioButton8.Size = new System.Drawing.Size(133, 17); + this.formRadioButton8.Size = new System.Drawing.Size(127, 17); this.formRadioButton8.TabIndex = 7; this.formRadioButton8.TabStop = true; - this.formRadioButton8.Text = "S/N generator / printer"; + this.formRadioButton8.Text = "S/N generator/printer"; this.formRadioButton8.UseVisualStyleBackColor = true; // // formRadioButton7 @@ -402,10 +389,10 @@ this.formRadioButton7.AutoSize = true; this.formRadioButton7.Location = new System.Drawing.Point(18, 143); this.formRadioButton7.Name = "formRadioButton7"; - this.formRadioButton7.Size = new System.Drawing.Size(52, 17); + this.formRadioButton7.Size = new System.Drawing.Size(85, 17); this.formRadioButton7.TabIndex = 6; this.formRadioButton7.TabStop = true; - this.formRadioButton7.Text = "Scale"; + this.formRadioButton7.Text = "Scale (mass)"; this.formRadioButton7.UseVisualStyleBackColor = true; // // formRadioButton6 @@ -419,25 +406,33 @@ this.formRadioButton6.Text = "Camera"; this.formRadioButton6.UseVisualStyleBackColor = true; // - // formRadioButton9 + // formRadioButton10 // - this.formRadioButton9.AutoSize = true; - this.formRadioButton9.Location = new System.Drawing.Point(18, 183); - this.formRadioButton9.Name = "formRadioButton9"; - this.formRadioButton9.Size = new System.Drawing.Size(98, 17); - this.formRadioButton9.TabIndex = 8; - this.formRadioButton9.TabStop = true; - this.formRadioButton9.Text = "640 datastream"; - this.formRadioButton9.UseVisualStyleBackColor = true; + this.formRadioButton10.AutoSize = true; + this.formRadioButton10.Location = new System.Drawing.Point(18, 203); + this.formRadioButton10.Name = "formRadioButton10"; + this.formRadioButton10.Size = new System.Drawing.Size(66, 17); + this.formRadioButton10.TabIndex = 9; + this.formRadioButton10.TabStop = true; + this.formRadioButton10.Text = "(spare 2)"; + this.formRadioButton10.UseVisualStyleBackColor = true; + // + // formRadioButton11 + // + this.formRadioButton11.AutoSize = true; + this.formRadioButton11.Location = new System.Drawing.Point(18, 223); + this.formRadioButton11.Name = "formRadioButton11"; + this.formRadioButton11.Size = new System.Drawing.Size(66, 17); + this.formRadioButton11.TabIndex = 10; + this.formRadioButton11.TabStop = true; + this.formRadioButton11.Text = "(spare 3)"; + this.formRadioButton11.UseVisualStyleBackColor = true; // // PartDlg // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(833, 359); - this.Controls.Add(this.label5); - this.Controls.Add(this.oraDBTypeTextBox); - this.Controls.Add(this.label4); + this.ClientSize = new System.Drawing.Size(863, 365); this.Controls.Add(this.lifetimeManagementComboBox); this.Controls.Add(this.label3); this.Controls.Add(this.codeLocationGroupBox); @@ -483,11 +478,8 @@ private System.Windows.Forms.RadioButton typeRadioButton3; private System.Windows.Forms.RadioButton typeRadioButton4; private System.Windows.Forms.RadioButton typeRadioButton5; - private System.Windows.Forms.TextBox oraDBTypeTextBox; - private System.Windows.Forms.Label label4; private System.Windows.Forms.RadioButton typeRadioButton6; private System.Windows.Forms.RadioButton typeRadioButton7; - private System.Windows.Forms.Label label5; private System.Windows.Forms.RadioButton typeRadioButton8; private System.Windows.Forms.RadioButton typeRadioButton9; private System.Windows.Forms.RadioButton formRadioButton1; @@ -500,5 +492,7 @@ private System.Windows.Forms.RadioButton formRadioButton7; private System.Windows.Forms.RadioButton formRadioButton8; private System.Windows.Forms.RadioButton formRadioButton9; + private System.Windows.Forms.RadioButton formRadioButton11; + private System.Windows.Forms.RadioButton formRadioButton10; } } \ No newline at end of file diff --git a/WorkflowConfigurator/Forms/PartDlg.cs b/WorkflowConfigurator/Forms/PartDlg.cs index b50052e71..17ca50a35 100644 --- a/WorkflowConfigurator/Forms/PartDlg.cs +++ b/WorkflowConfigurator/Forms/PartDlg.cs @@ -40,7 +40,6 @@ namespace WorkflowConfigurator.Forms { nameTextBox.Enabled = true; descriptionTextBox.Enabled = true; - oraDBTypeTextBox.Enabled = true; lifetimeManagementComboBox.Enabled = true; typeRadioButton1.Enabled = true; @@ -62,6 +61,8 @@ namespace WorkflowConfigurator.Forms formRadioButton7.Enabled = true; formRadioButton8.Enabled = true; formRadioButton9.Enabled = true; + formRadioButton10.Enabled = true; + formRadioButton11.Enabled = true; locationRadioButton1.Enabled = true; locationRadioButton2.Enabled = true; @@ -70,7 +71,6 @@ namespace WorkflowConfigurator.Forms { nameTextBox.Enabled = true; descriptionTextBox.Enabled = true; - oraDBTypeTextBox.Enabled = true; lifetimeManagementComboBox.Enabled = true; typeRadioButton1.Enabled = true; @@ -83,15 +83,17 @@ namespace WorkflowConfigurator.Forms typeRadioButton8.Enabled = true; typeRadioButton9.Enabled = true; - formRadioButton1.Enabled = false; - formRadioButton2.Enabled = false; - formRadioButton3.Enabled = false; - formRadioButton4.Enabled = false; - formRadioButton5.Enabled = false; - formRadioButton6.Enabled = false; - formRadioButton7.Enabled = false; - formRadioButton8.Enabled = false; - formRadioButton9.Enabled = false; + formRadioButton1.Enabled = true; + formRadioButton2.Enabled = true; + formRadioButton3.Enabled = true; + formRadioButton4.Enabled = true; + formRadioButton5.Enabled = true; + formRadioButton6.Enabled = true; + formRadioButton7.Enabled = true; + formRadioButton8.Enabled = true; + formRadioButton9.Enabled = true; + formRadioButton10.Enabled = true; + formRadioButton11.Enabled = true; locationRadioButton1.Enabled = false; locationRadioButton2.Enabled = false; @@ -100,7 +102,6 @@ namespace WorkflowConfigurator.Forms { nameTextBox.Enabled = false; descriptionTextBox.Enabled = false; - oraDBTypeTextBox.Enabled = false; lifetimeManagementComboBox.Enabled = false; typeRadioButton1.Enabled = false; @@ -122,6 +123,8 @@ namespace WorkflowConfigurator.Forms formRadioButton7.Enabled = false; formRadioButton8.Enabled = false; formRadioButton9.Enabled = false; + formRadioButton10.Enabled = false; + formRadioButton11.Enabled = false; locationRadioButton1.Enabled = false; locationRadioButton2.Enabled = false; @@ -145,7 +148,6 @@ namespace WorkflowConfigurator.Forms void Redraw() { nameTextBox.Text = Part.Name; - oraDBTypeTextBox.Text = Part.OraDBType; descriptionTextBox.Text = Part.Description; lifetimeManagementComboBox.Text = Part.LifetimeManagement.ToString(); @@ -168,6 +170,8 @@ namespace WorkflowConfigurator.Forms formRadioButton7.Checked = (Part.CodeForm == (sbyte)CodeForm.Scale); formRadioButton8.Checked = (Part.CodeForm == (sbyte)CodeForm.SNGenerator); formRadioButton9.Checked = (Part.CodeForm == (sbyte)CodeForm.DataStream); + formRadioButton10.Checked = (Part.CodeForm == (sbyte)CodeForm.Spare2); + formRadioButton11.Checked = (Part.CodeForm == (sbyte)CodeForm.Spare3); locationRadioButton1.Checked = (Part.CodeLocation == CodeLocation.OnPart); locationRadioButton2.Checked = (Part.CodeLocation == CodeLocation.OnPallet); @@ -176,7 +180,6 @@ namespace WorkflowConfigurator.Forms void UpdateFromForm() { if (Part.Name != nameTextBox.Text) { AnyChange = true; Part.Name = nameTextBox.Text; } - if (Part.OraDBType != oraDBTypeTextBox.Text) { AnyChange = true; Part.OraDBType = oraDBTypeTextBox.Text; } if (Part.Description != descriptionTextBox.Text) { AnyChange = true; Part.Description = descriptionTextBox.Text; } for (LifetimeManagement lm = 0; lm < LifetimeManagement.Count; lm++) @@ -217,7 +220,9 @@ namespace WorkflowConfigurator.Forms (formRadioButton6.Checked ? CodeForm.Camera : (formRadioButton7.Checked ? CodeForm.Scale : (formRadioButton8.Checked ? CodeForm.SNGenerator : - CodeForm.DataStream))))))); + (formRadioButton8.Checked ? CodeForm.DataStream : + (formRadioButton8.Checked ? CodeForm.Spare2 : + CodeForm.Spare3))))))))); if (Part.CodeForm != (sbyte)codeForm) { AnyChange = true; diff --git a/WorkflowConfigurator/Properties/AssemblyInfo.cs b/WorkflowConfigurator/Properties/AssemblyInfo.cs index 1a995219e..ddeb07f65 100644 --- a/WorkflowConfigurator/Properties/AssemblyInfo.cs +++ b/WorkflowConfigurator/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.0.4.0")] -[assembly: AssemblyFileVersion("3.0.4.0")] +[assembly: AssemblyVersion("3.0.5.0")] +[assembly: AssemblyFileVersion("3.0.5.0")] diff --git a/WorkflowConfigurator/Resources/Strings.Designer.cs b/WorkflowConfigurator/Resources/Strings.Designer.cs index 85646eb05..e67eb3f5a 100644 --- a/WorkflowConfigurator/Resources/Strings.Designer.cs +++ b/WorkflowConfigurator/Resources/Strings.Designer.cs @@ -222,6 +222,15 @@ namespace WorkflowConfigurator.Resources { } } + /// + /// Looks up a localized string similar to How to obtain. + /// + internal static string Chdr_HowToObtain { + get { + return ResourceManager.GetString("Chdr_HowToObtain", resourceCulture); + } + } + /// /// Looks up a localized string similar to Name. /// @@ -240,24 +249,6 @@ namespace WorkflowConfigurator.Resources { } } - /// - /// Looks up a localized string similar to Oracle descr.. - /// - internal static string Chdr_OraDBDescr { - get { - return ResourceManager.GetString("Chdr_OraDBDescr", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Oracle. - /// - internal static string Chdr_OraDBType { - get { - return ResourceManager.GetString("Chdr_OraDBType", resourceCulture); - } - } - /// /// Looks up a localized string similar to Check part no.. /// diff --git a/WorkflowConfigurator/Resources/Strings.resx b/WorkflowConfigurator/Resources/Strings.resx index 2b69295c8..d6f95a0cd 100644 --- a/WorkflowConfigurator/Resources/Strings.resx +++ b/WorkflowConfigurator/Resources/Strings.resx @@ -303,12 +303,6 @@ Workflow step - - Oracle - - - Oracle descr. - Remove @@ -408,4 +402,7 @@ Max. part name length is {0} characters. + + How to obtain + \ No newline at end of file diff --git a/WorkflowConfigurator/UserControls/PartsCtrl.cs b/WorkflowConfigurator/UserControls/PartsCtrl.cs index 7f1574d87..820d5c267 100644 --- a/WorkflowConfigurator/UserControls/PartsCtrl.cs +++ b/WorkflowConfigurator/UserControls/PartsCtrl.cs @@ -127,9 +127,9 @@ namespace WorkflowConfigurator.UserControls { partsListView.Columns[0].Width = (ls.ColWid1 > 0) ? ls.ColWid1 : 28; partsListView.Columns[1].Width = (ls.ColWid2 > 0) ? ls.ColWid2 : 28; - partsListView.Columns[2].Width = (ls.ColWid3 > 0) ? ls.ColWid3 : 70; - partsListView.Columns[3].Width = (ls.ColWid4 > 0) ? ls.ColWid4 : 50; - partsListView.Columns[4].Width = (ls.ColWid5 > 0) ? ls.ColWid5 : 50; + partsListView.Columns[2].Width = (ls.ColWid3 > 0) ? ls.ColWid3 : 73; + partsListView.Columns[3].Width = (ls.ColWid4 > 0) ? ls.ColWid4 : 111; + partsListView.Columns[4].Width = (ls.ColWid5 > 0) ? ls.ColWid5 : 100; partsListView.Columns[5].Width = (ls.ColWid6 > 0) ? ls.ColWid6 : 50; partsListView.Columns[6].Width = (ls.ColWid7 > 0) ? ls.ColWid7 : 200; } @@ -167,18 +167,16 @@ namespace WorkflowConfigurator.UserControls Control[] partsEditors; + ComboBox howToObtainComboBox; ComboBox checkComboBox; - ComboBox oraTypeComboBox; - ComboBox oraDescrComboBox; /// public enum PartsColumn { HasSN, Nr, Name, + HowToObtain, Check, - OraDBType, - OraDBDescr, DefaultCode, Description, CoulumnsCount @@ -187,49 +185,29 @@ namespace WorkflowConfigurator.UserControls void InitPartsListViewColumns() { LocalSettings ls = Program.LocalSettings; - partsListView.Columns.Add(Strings.Chdr_HasSN, ((ls != null) && (ls.ColWid1 > 0)) ? ls.ColWid1 : 28); - partsListView.Columns.Add(Strings.Chdr_Nr, ((ls != null) && (ls.ColWid2 > 0)) ? ls.ColWid2 : 28); - partsListView.Columns.Add(Strings.Chdr_Name, ((ls != null) && (ls.ColWid3 > 0)) ? ls.ColWid3 : 70); - partsListView.Columns.Add(Strings.Chdr_Check, ((ls != null) && (ls.ColWid4 > 0)) ? ls.ColWid4 : 50); - partsListView.Columns.Add(Strings.Chdr_OraDBType, ((ls != null) && (ls.ColWid5 > 0)) ? ls.ColWid5 : 50); - partsListView.Columns.Add(Strings.Chdr_OraDBDescr, ((ls != null) && (ls.ColWid6 > 0)) ? ls.ColWid6 : 50); - partsListView.Columns.Add("Dflt. code", ((ls != null) && (ls.ColWid7 > 0)) ? ls.ColWid7 : 70); - partsListView.Columns.Add(Strings.Description, ((ls != null) && (ls.ColWid8 > 0)) ? ls.ColWid8 : 200); + partsListView.Columns.Add(Strings.Chdr_HasSN, ((ls != null) && (ls.ColWid1 > 0)) ? ls.ColWid1 : 28); + partsListView.Columns.Add(Strings.Chdr_Nr, ((ls != null) && (ls.ColWid2 > 0)) ? ls.ColWid2 : 28); + partsListView.Columns.Add(Strings.Chdr_Name, ((ls != null) && (ls.ColWid3 > 0)) ? ls.ColWid3 : 73); + partsListView.Columns.Add(Strings.Chdr_HowToObtain, ((ls != null) && (ls.ColWid4 > 0)) ? ls.ColWid4 : 111); + partsListView.Columns.Add(Strings.Chdr_Check, ((ls != null) && (ls.ColWid5 > 0)) ? ls.ColWid5 : 100); + partsListView.Columns.Add("Dflt. code", ((ls != null) && (ls.ColWid6 > 0)) ? ls.ColWid6 : 50); + partsListView.Columns.Add(Strings.Description, ((ls != null) && (ls.ColWid7 > 0)) ? ls.ColWid7 : 200); + + howToObtainComboBox = new ComboBox(); + for (CodeForm cf = 0; cf < CodeForm.Count; cf++) howToObtainComboBox.Items.Add(cf.ToDescription()); checkComboBox = new ComboBox(); for (CodeType ct = 0; ct < CodeType.Count; ct++) checkComboBox.Items.Add(ct.ToDescription()); - oraTypeComboBox = new ComboBox(); - oraTypeComboBox.Items.Add(""); - oraTypeComboBox.Items.Add("Flowtube"); - oraTypeComboBox.Items.Add("Batt"); - oraTypeComboBox.Items.Add("Batt1"); - oraTypeComboBox.Items.Add("Batt2"); - oraTypeComboBox.Items.Add("Antena"); - oraTypeComboBox.Items.Add("Puzdro_620"); - - oraDescrComboBox = new ComboBox(); - oraDescrComboBox.Items.Add(""); - oraDescrComboBox.Items.Add("Tadiran"); - oraDescrComboBox.Items.Add("Vitzrocell"); - oraDescrComboBox.Items.Add("DN15"); - oraDescrComboBox.Items.Add("DN20"); - oraDescrComboBox.Items.Add("DN25"); - oraDescrComboBox.Items.Add("DN32"); - oraDescrComboBox.Items.Add("DN40"); - oraDescrComboBox.Items.Add("internal"); - oraDescrComboBox.Items.Add("external"); - partsEditors = new Control[] { - null, /// HasSN - null, /// Nr. - new TextBox(), /// Name - checkComboBox, /// Check - oraTypeComboBox, /// OraDBType - oraDescrComboBox, /// OraDBDescr - new TextBox(), /// DefaultCode - new TextBox(), /// Description + null, /// HasSN + null, /// Nr. + new TextBox(), /// Name + howToObtainComboBox, /// How to obtain + checkComboBox, /// Check + new TextBox(), /// DefaultCode + new TextBox(), /// Description }; foreach (var ctrl in partsEditors) @@ -240,22 +218,12 @@ namespace WorkflowConfigurator.UserControls /// ListViewItem Part2Lvi(Part part) { - string oraType = null; - string oraDescr = null; - if (!string.IsNullOrEmpty(part.OraDBType)) - { - string[] oraItems = part.OraDBType.Split(new char[] { ' ' }); - oraType = oraItems[0]; - oraDescr = (oraItems.Length > 1) ? oraItems[1] : string.Empty; - } - ListViewItem lvi = new ListViewItem(); lvi.Checked = (part.CodeLocation == CodeLocation.OnPart); lvi.SubItems.Add(part.StepNumber.ToString()); lvi.SubItems.Add(part.Name); + lvi.SubItems.Add(((CodeForm)part.CodeForm).ToDescription()); lvi.SubItems.Add(((CodeType)part.CodeType).ToDescription()); - lvi.SubItems.Add(oraType); - lvi.SubItems.Add(oraDescr); lvi.SubItems.Add((part.DefaultCode != null) ? part.DefaultCode : string.Empty); lvi.SubItems.Add(part.Description); lvi.Tag = part; @@ -267,6 +235,16 @@ namespace WorkflowConfigurator.UserControls part.CodeLocation = lvi.Checked ? CodeLocation.OnPart : CodeLocation.OnPallet; part.Name = lvi.SubItems[(int)PartsColumn.Name].Text; + part.CodeForm = (sbyte)CodeForm.Barcode; + for (CodeForm cf = 0; cf < CodeForm.Count; cf++) + { + if (lvi.SubItems[(int)PartsColumn.HowToObtain].Text == cf.ToDescription()) + { + part.CodeForm = (sbyte)cf; + break; + } + } + part.CodeType = (sbyte)CodeType.UniqueNr; for (CodeType ct = 0; ct < CodeType.Count; ct++) { @@ -277,9 +255,6 @@ namespace WorkflowConfigurator.UserControls } } - string oraDescr = lvi.SubItems[(int)PartsColumn.OraDBDescr].Text; - part.OraDBType = string.Format(string.IsNullOrEmpty(oraDescr) ? "{0}" : "{0} {1}", lvi.SubItems[(int)PartsColumn.OraDBType].Text, oraDescr); - part.DefaultCode = lvi.SubItems[(int)PartsColumn.DefaultCode].Text; part.Description = lvi.SubItems[(int)PartsColumn.Description].Text; return true; @@ -323,6 +298,19 @@ namespace WorkflowConfigurator.UserControls SetUnsavedFlag(); return; } + else if ((e.SubItem == (int)PartsColumn.HowToObtain) && checkComboBox.Items.Contains(e.DisplayText)) + { + (e.Item.Tag as Part).CodeForm = (sbyte)CodeForm.Barcode; + for (CodeForm cf = 0; cf < CodeForm.Count; cf++) + { + if (e.DisplayText == cf.ToDescription()) + { + (e.Item.Tag as Part).CodeForm = (sbyte)cf; + SetUnsavedFlag(); + return; + } + } + } else if ((e.SubItem == (int)PartsColumn.Check) && checkComboBox.Items.Contains(e.DisplayText)) { (e.Item.Tag as Part).CodeType = (sbyte)CodeType.UniqueNr; @@ -336,20 +324,6 @@ namespace WorkflowConfigurator.UserControls } } } - else if (e.SubItem == (int)PartsColumn.OraDBType) - { - string oraDescr = e.Item.SubItems[(int)PartsColumn.OraDBDescr].Text; - (e.Item.Tag as Part).OraDBType = string.Format(string.IsNullOrEmpty(oraDescr) ? "{0}" : "{0} {1}", e.DisplayText, oraDescr); - SetUnsavedFlag(); - return; - } - else if (e.SubItem == (int)PartsColumn.OraDBDescr) - { - string oraDescr = e.DisplayText; - (e.Item.Tag as Part).OraDBType = string.Format(string.IsNullOrEmpty(oraDescr) ? "{0}" : "{0} {1}", e.Item.SubItems[(int)PartsColumn.OraDBType].Text, oraDescr); - SetUnsavedFlag(); - return; - } else if (e.SubItem == (int)PartsColumn.DefaultCode) { if (e.DisplayText != e.Item.SubItems[e.SubItem].Text)