diff --git a/Database/Meshes.csv b/Database/Meshes.csv index 023ed8f..1d14751 100644 --- a/Database/Meshes.csv +++ b/Database/Meshes.csv @@ -9,44 +9,6 @@ B9,12,100,25,3,6.5,,,Pressure Welded,Untreated,0,B 12 B9,12,100,30,3,6.5,,,Pressure Welded,Untreated,0,B 12 B9,12,100,35,3,6.5,,,Pressure Welded,Untreated,0,B 12 B9,12,100,40,3,6.5,,,Pressure Welded,Untreated,0,B 12 -F4-T,25,50,25,3,6.5,,,Pressure Welded,Hot dip galvanized steel,1,F 25 -F4-T,25,50,30,3,6.5,,,Pressure Welded,Hot dip galvanized steel,1,F 25 -F4-T,25,50,35,3,6.5,,,Pressure Welded,Hot dip galvanized steel,1,F 25 -F4-T,25,50,40,3,6.5,,,Pressure Welded,Hot dip galvanized steel,1,F 25 -F4-T,25,50,45,3,6.5,,,Pressure Welded,Hot dip galvanized steel,1,F 25 -F4-T,25,50,50,3,6.5,,,Pressure Welded,Hot dip galvanized steel,1,F 25 -F4-T,25,50,30,4,6.5,,,Pressure Welded,Hot dip galvanized steel,1,F 25 -F4-T,25,50,35,4,6.5,,,Pressure Welded,Hot dip galvanized steel,1,F 25 -F4-T,25,50,40,4,6.5,,,Pressure Welded,Hot dip galvanized steel,1,F 25 -F4-T,25,50,45,4,6.5,,,Pressure Welded,Hot dip galvanized steel,1,F 25 -F4-T,25,50,50,4,6.5,,,Pressure Welded,Hot dip galvanized steel,1,F 25 -F4-T,25,50,60,4,6.5,,,Pressure Welded,Hot dip galvanized steel,1,F 25 -F4-T,25,50,25,5,6.5,,,Pressure Welded,Hot dip galvanized steel,1,F 25 -F4-T,25,50,30,5,6.5,,,Pressure Welded,Hot dip galvanized steel,1,F 25 -F4-T,25,50,35,5,6.5,,,Pressure Welded,Hot dip galvanized steel,1,F 25 -F4-T,25,50,40,5,6.5,,,Pressure Welded,Hot dip galvanized steel,1,F 25 -F4-T,25,50,45,5,6.5,,,Pressure Welded,Hot dip galvanized steel,1,F 25 -F4-T,25,50,50,5,6.5,,,Pressure Welded,Hot dip galvanized steel,1,F 25 -F4-T,25,50,60,5,6.5,,,Pressure Welded,Hot dip galvanized steel,1,F 25 -F4-T,25,50,25,3,6.5,,,Pressure Welded,Untreated,1,F 25 -F4-T,25,50,30,3,6.5,,,Pressure Welded,Untreated,1,F 25 -F4-T,25,50,35,3,6.5,,,Pressure Welded,Untreated,1,F 25 -F4-T,25,50,40,3,6.5,,,Pressure Welded,Untreated,1,F 25 -F4-T,25,50,45,3,6.5,,,Pressure Welded,Untreated,1,F 25 -F4-T,25,50,50,3,6.5,,,Pressure Welded,Untreated,1,F 25 -F4-T,25,50,30,4,6.5,,,Pressure Welded,Untreated,1,F 25 -F4-T,25,50,35,4,6.5,,,Pressure Welded,Untreated,1,F 25 -F4-T,25,50,40,4,6.5,,,Pressure Welded,Untreated,1,F 25 -F4-T,25,50,45,4,6.5,,,Pressure Welded,Untreated,1,F 25 -F4-T,25,50,50,4,6.5,,,Pressure Welded,Untreated,1,F 25 -F4-T,25,50,60,4,6.5,,,Pressure Welded,Untreated,1,F 25 -F4-T,25,50,25,5,6.5,,,Pressure Welded,Untreated,1,F 25 -F4-T,25,50,30,5,6.5,,,Pressure Welded,Untreated,1,F 25 -F4-T,25,50,35,5,6.5,,,Pressure Welded,Untreated,1,F 25 -F4-T,25,50,40,5,6.5,,,Pressure Welded,Untreated,1,F 25 -F4-T,25,50,45,5,6.5,,,Pressure Welded,Untreated,1,F 25 -F4-T,25,50,50,5,6.5,,,Pressure Welded,Untreated,1,F 25 -F4-T,25,50,60,5,6.5,,,Pressure Welded,Untreated,1,F 25 H3,34,37,25,2,5,,,Pressure Welded,Hot dip galvanized steel,0,H 34 H3,34,37,30,2,5,,,Pressure Welded,Hot dip galvanized steel,0,H 34 H3,34,37,25,3,5,,,Pressure Welded,Hot dip galvanized steel,0,H 34 @@ -55,8 +17,6 @@ H3,33,37,35,3,5,,,Pressure Welded,Hot dip galvanized steel,0,H 33 H3,33,37,40,3,5,,,Pressure Welded,Hot dip galvanized steel,0,H 33 H3,33,37,45,3,5,,,Pressure Welded,Hot dip galvanized steel,0,H 33 H3,33,37,50,3,5,,,Pressure Welded,Hot dip galvanized steel,0,H 33 -H3,34,37,25,4,6.5,,,Pressure Welded,Hot dip galvanized steel,0,H 34 -H3,34,37,30,4,6.5,,,Pressure Welded,Hot dip galvanized steel,0,H 34 H3,33,37,50,4,6.5,,,Pressure Welded,Hot dip galvanized steel,0,H 33 H3,33,37,60,4,6.5,,,Pressure Welded,Hot dip galvanized steel,0,H 33 H3,33,37,70,4,6.5,,,Pressure Welded,Hot dip galvanized steel,0,H 33 @@ -69,8 +29,6 @@ H3,33,37,35,3,5,,,Pressure Welded,Untreated,0,H 33 H3,33,37,40,3,5,,,Pressure Welded,Untreated,0,H 33 H3,33,37,45,3,5,,,Pressure Welded,Untreated,0,H 33 H3,33,37,50,3,5,,,Pressure Welded,Untreated,0,H 33 -H3,34,37,25,4,6.5,,,Pressure Welded,Untreated,0,H 34 -H3,34,37,30,4,6.5,,,Pressure Welded,Untreated,0,H 34 H3,33,37,50,4,6.5,,,Pressure Welded,Untreated,0,H 33 H3,33,37,60,4,6.5,,,Pressure Welded,Untreated,0,H 33 H3,33,37,70,4,6.5,,,Pressure Welded,Untreated,0,H 33 @@ -88,20 +46,6 @@ H4-T,33,50,35,3,5,,,Pressure Welded,Hot dip galvanized steel,1,H 33 H4-T,33,50,40,3,5,,,Pressure Welded,Hot dip galvanized steel,1,H 33 H4-T,33,50,45,3,5,,,Pressure Welded,Hot dip galvanized steel,1,H 33 H4-T,33,50,50,3,5,,,Pressure Welded,Hot dip galvanized steel,1,H 33 -H4-T,33,50,30,4,6.5,,,Pressure Welded,Hot dip galvanized steel,1,H 33 -H4-T,33,50,35,4,6.5,,,Pressure Welded,Hot dip galvanized steel,1,H 33 -H4-T,33,50,40,4,6.5,,,Pressure Welded,Hot dip galvanized steel,1,H 33 -H4-T,33,50,45,4,6.5,,,Pressure Welded,Hot dip galvanized steel,1,H 33 -H4-T,33,50,50,4,6.5,,,Pressure Welded,Hot dip galvanized steel,1,H 33 -H4-T,33,50,60,4,6.5,,,Pressure Welded,Hot dip galvanized steel,1,H 33 -H4-T,33,50,80,4,6.5,,,Pressure Welded,Hot dip galvanized steel,1,H 33 -H4-T,33,50,25,5,6.5,,,Pressure Welded,Hot dip galvanized steel,1,H 33 -H4-T,33,50,30,5,6.5,,,Pressure Welded,Hot dip galvanized steel,1,H 33 -H4-T,33,50,35,5,6.5,,,Pressure Welded,Hot dip galvanized steel,1,H 33 -H4-T,33,50,40,5,6.5,,,Pressure Welded,Hot dip galvanized steel,1,H 33 -H4-T,33,50,45,5,6.5,,,Pressure Welded,Hot dip galvanized steel,1,H 33 -H4-T,33,50,50,5,6.5,,,Pressure Welded,Hot dip galvanized steel,1,H 33 -H4-T,33,50,60,5,6.5,,,Pressure Welded,Hot dip galvanized steel,1,H 33 H4-T,33,50,25,2,5,,,Pressure Welded,Untreated,1,H 33 H4-T,33,50,25,3,5,,,Pressure Welded,Untreated,1,H 33 H4-T,33,50,30,3,5,,,Pressure Welded,Untreated,1,H 33 @@ -109,20 +53,6 @@ H4-T,33,50,35,3,5,,,Pressure Welded,Untreated,1,H 33 H4-T,33,50,40,3,5,,,Pressure Welded,Untreated,1,H 33 H4-T,33,50,45,3,5,,,Pressure Welded,Untreated,1,H 33 H4-T,33,50,50,3,5,,,Pressure Welded,Untreated,1,H 33 -H4-T,33,50,30,4,6.5,,,Pressure Welded,Untreated,1,H 33 -H4-T,33,50,35,4,6.5,,,Pressure Welded,Untreated,1,H 33 -H4-T,33,50,40,4,6.5,,,Pressure Welded,Untreated,1,H 33 -H4-T,33,50,45,4,6.5,,,Pressure Welded,Untreated,1,H 33 -H4-T,33,50,50,4,6.5,,,Pressure Welded,Untreated,1,H 33 -H4-T,33,50,60,4,6.5,,,Pressure Welded,Untreated,1,H 33 -H4-T,33,50,80,4,6.5,,,Pressure Welded,Untreated,1,H 33 -H4-T,33,50,25,5,6.5,,,Pressure Welded,Untreated,1,H 33 -H4-T,33,50,30,5,6.5,,,Pressure Welded,Untreated,1,H 33 -H4-T,33,50,35,5,6.5,,,Pressure Welded,Untreated,1,H 33 -H4-T,33,50,40,5,6.5,,,Pressure Welded,Untreated,1,H 33 -H4-T,33,50,45,5,6.5,,,Pressure Welded,Untreated,1,H 33 -H4-T,33,50,50,5,6.5,,,Pressure Welded,Untreated,1,H 33 -H4-T,33,50,60,5,6.5,,,Pressure Welded,Untreated,1,H 33 H6,34,75,25,2,5,,,Pressure Welded,Hot dip galvanized steel,0,H 34 H6,34,75,30,2,5,,,Pressure Welded,Hot dip galvanized steel,0,H 34 H6,34,75,40,2,5,,,Pressure Welded,Hot dip galvanized steel,0,H 34 @@ -149,76 +79,12 @@ H9-T,33,100,35,3,6.5,,,Pressure Welded,Hot dip galvanized steel,1,H 33 H9-T,33,100,40,3,6.5,,,Pressure Welded,Hot dip galvanized steel,1,H 33 H9-T,33,100,45,3,6.5,,,Pressure Welded,Hot dip galvanized steel,1,H 33 H9-T,33,100,50,3,6.5,,,Pressure Welded,Hot dip galvanized steel,1,H 33 -H9-T,33,100,30,4,6.5,,,Pressure Welded,Hot dip galvanized steel,1,H 33 -H9-T,33,100,35,4,6.5,,,Pressure Welded,Hot dip galvanized steel,1,H 33 -H9-T,33,100,40,4,6.5,,,Pressure Welded,Hot dip galvanized steel,1,H 33 -H9-T,33,100,45,4,6.5,,,Pressure Welded,Hot dip galvanized steel,1,H 33 -H9-T,33,100,50,4,6.5,,,Pressure Welded,Hot dip galvanized steel,1,H 33 -H9-T,33,100,25,5,6.5,,,Pressure Welded,Hot dip galvanized steel,1,H 33 -H9-T,33,100,30,5,6.5,,,Pressure Welded,Hot dip galvanized steel,1,H 33 -H9-T,33,100,35,5,6.5,,,Pressure Welded,Hot dip galvanized steel,1,H 33 -H9-T,33,100,40,5,6.5,,,Pressure Welded,Hot dip galvanized steel,1,H 33 -H9-T,33,100,45,5,6.5,,,Pressure Welded,Hot dip galvanized steel,1,H 33 -H9-T,33,100,50,5,6.5,,,Pressure Welded,Hot dip galvanized steel,1,H 33 -H9-T,33,100,60,5,6.5,,,Pressure Welded,Hot dip galvanized steel,1,H 33 H9-T,33,100,25,3,6.5,,,Pressure Welded,Untreated,1,H 33 H9-T,33,100,30,3,6.5,,,Pressure Welded,Untreated,1,H 33 H9-T,33,100,35,3,6.5,,,Pressure Welded,Untreated,1,H 33 H9-T,33,100,40,3,6.5,,,Pressure Welded,Untreated,1,H 33 H9-T,33,100,45,3,6.5,,,Pressure Welded,Untreated,1,H 33 H9-T,33,100,50,3,6.5,,,Pressure Welded,Untreated,1,H 33 -H9-T,33,100,30,4,6.5,,,Pressure Welded,Untreated,1,H 33 -H9-T,33,100,35,4,6.5,,,Pressure Welded,Untreated,1,H 33 -H9-T,33,100,40,4,6.5,,,Pressure Welded,Untreated,1,H 33 -H9-T,33,100,45,4,6.5,,,Pressure Welded,Untreated,1,H 33 -H9-T,33,100,50,4,6.5,,,Pressure Welded,Untreated,1,H 33 -H9-T,33,100,25,5,6.5,,,Pressure Welded,Untreated,1,H 33 -H9-T,33,100,30,5,6.5,,,Pressure Welded,Untreated,1,H 33 -H9-T,33,100,35,5,6.5,,,Pressure Welded,Untreated,1,H 33 -H9-T,33,100,40,5,6.5,,,Pressure Welded,Untreated,1,H 33 -H9-T,33,100,45,5,6.5,,,Pressure Welded,Untreated,1,H 33 -H9-T,33,100,50,5,6.5,,,Pressure Welded,Untreated,1,H 33 -H9-T,33,100,60,5,6.5,,,Pressure Welded,Untreated,1,H 33 -J9-T,41,100,25,3,5,,,Pressure Welded,Hot dip galvanized steel,1,J 41 -J9-T,41,100,30,3,5,,,Pressure Welded,Hot dip galvanized steel,1,J 41 -J9-T,41,100,35,3,5,,,Pressure Welded,Hot dip galvanized steel,1,J 41 -J9-T,41,100,40,3,5,,,Pressure Welded,Hot dip galvanized steel,1,J 41 -J9-T,41,100,45,3,5,,,Pressure Welded,Hot dip galvanized steel,1,J 41 -J9-T,41,100,50,3,5,,,Pressure Welded,Hot dip galvanized steel,1,J 41 -J9-T,41,100,30,4,6.5,,,Pressure Welded,Hot dip galvanized steel,1,J 41 -J9-T,41,100,35,4,6.5,,,Pressure Welded,Hot dip galvanized steel,1,J 41 -J9-T,41,100,40,4,6.5,,,Pressure Welded,Hot dip galvanized steel,1,J 41 -J9-T,41,100,45,4,6.5,,,Pressure Welded,Hot dip galvanized steel,1,J 41 -J9-T,41,100,50,4,6.5,,,Pressure Welded,Hot dip galvanized steel,1,J 41 -J9-T,41,100,60,4,6.5,,,Pressure Welded,Hot dip galvanized steel,1,J 41 -J9-T,41,100,20,5,6.5,,,Pressure Welded,Hot dip galvanized steel,1,J 41 -J9-T,41,100,25,5,6.5,,,Pressure Welded,Hot dip galvanized steel,1,J 41 -J9-T,41,100,30,5,6.5,,,Pressure Welded,Hot dip galvanized steel,1,J 41 -J9-T,41,100,35,5,6.5,,,Pressure Welded,Hot dip galvanized steel,1,J 41 -J9-T,41,100,40,5,6.5,,,Pressure Welded,Hot dip galvanized steel,1,J 41 -J9-T,41,100,45,5,6.5,,,Pressure Welded,Hot dip galvanized steel,1,J 41 -J9-T,41,100,50,5,6.5,,,Pressure Welded,Hot dip galvanized steel,1,J 41 -J9-T,41,100,60,5,6.5,,,Pressure Welded,Hot dip galvanized steel,1,J 41 -J9-T,41,100,25,3,5,,,Pressure Welded,Untreated,1,J 41 -J9-T,41,100,30,3,5,,,Pressure Welded,Untreated,1,J 41 -J9-T,41,100,35,3,5,,,Pressure Welded,Untreated,1,J 41 -J9-T,41,100,40,3,5,,,Pressure Welded,Untreated,1,J 41 -J9-T,41,100,45,3,5,,,Pressure Welded,Untreated,1,J 41 -J9-T,41,100,50,3,5,,,Pressure Welded,Untreated,1,J 41 -J9-T,41,100,30,4,6.5,,,Pressure Welded,Untreated,1,J 41 -J9-T,41,100,35,4,6.5,,,Pressure Welded,Untreated,1,J 41 -J9-T,41,100,40,4,6.5,,,Pressure Welded,Untreated,1,J 41 -J9-T,41,100,45,4,6.5,,,Pressure Welded,Untreated,1,J 41 -J9-T,41,100,50,4,6.5,,,Pressure Welded,Untreated,1,J 41 -J9-T,41,100,60,4,6.5,,,Pressure Welded,Untreated,1,J 41 -J9-T,41,100,20,5,6.5,,,Pressure Welded,Untreated,1,J 41 -J9-T,41,100,25,5,6.5,,,Pressure Welded,Untreated,1,J 41 -J9-T,41,100,30,5,6.5,,,Pressure Welded,Untreated,1,J 41 -J9-T,41,100,35,5,6.5,,,Pressure Welded,Untreated,1,J 41 -J9-T,41,100,40,5,6.5,,,Pressure Welded,Untreated,1,J 41 -J9-T,41,100,45,5,6.5,,,Pressure Welded,Untreated,1,J 41 -J9-T,41,100,50,5,6.5,,,Pressure Welded,Untreated,1,J 41 -J9-T,41,100,60,5,6.5,,,Pressure Welded,Untreated,1,J 41 N6,17,75,25,2,5,,,Pressure Welded,Hot dip galvanized steel,0,N 17 N6,17,75,30,2,5,,,Pressure Welded,Hot dip galvanized steel,0,N 17 N6,17,75,25,2,5,,,Pressure Welded,Untreated,0,N 17 @@ -255,16 +121,8 @@ A,22,22,25,2,,20,2,Type A,Stainless Steel (Pickled),0,A 22 A,22,22,30,2,,20,2,Type A,Stainless Steel (Pickled),0,A 22 A,33,11,25,2,,20,2,Type A,Stainless Steel (Pickled),0,A 33 A,33,11,30,2,,20,2,Type A,Stainless Steel (Pickled),0,A 33 -A,22,22,25,3,,20,2,Type A,Stainless Steel (Pickled),0,A 22 -A,22,22,30,3,,20,2,Type A,Stainless Steel (Pickled),0,A 22 A,22,22,25,2,,20,2,Type A,Stainless Steel (Untreated),0,A 22 A,22,22,30,2,,20,2,Type A,Stainless Steel (Untreated),0,A 22 A,33,11,25,2,,20,2,Type A,Stainless Steel (Untreated),0,A 33 A,33,11,30,2,,20,2,Type A,Stainless Steel (Untreated),0,A 33 -A,22,22,25,3,,20,2,Type A,Stainless Steel (Untreated),0,A 22 -A,22,22,30,3,,20,2,Type A,Stainless Steel (Untreated),0,A 22 -A,22,22,25,3,,20,2,Type A,Aluminum,0,A 22 -A,22,22,30,3,,20,2,Type A,Aluminum,0,A 22 -A,33,11,25,3,,20,2,Type A,Aluminum,0,A 33 -A,33,11,30,3,,20,2,Type A,Aluminum,0,A 33 A,33,11,25,2,,20,2,Type A,Hot dip galvanized steel,1,A 33 diff --git a/Wardrobe/GUI/AppForm.vb b/Wardrobe/GUI/AppForm.vb index f7b407d..94b6db3 100644 --- a/Wardrobe/GUI/AppForm.vb +++ b/Wardrobe/GUI/AppForm.vb @@ -19,9 +19,11 @@ Public Class AppForm If savedData(i) = "Export Folder Path" Then Settings.exportFolder = savedData(i + 1) Main_Menu.Button_Order.Enabled = True - Main_Menu.Label_FilePathError.Visible = False + Main_Menu.Label_SettingsError.Visible = False End If Next + 'FIXA: Add for sales reps. + 'FIXA: Kolla så all settings data är ok Dim appDir As String = Application.StartupPath diff --git a/Wardrobe/GUI/Main_Menu.Designer.vb b/Wardrobe/GUI/Main_Menu.Designer.vb index 4d0fe9d..99e2424 100644 --- a/Wardrobe/GUI/Main_Menu.Designer.vb +++ b/Wardrobe/GUI/Main_Menu.Designer.vb @@ -25,17 +25,16 @@ Partial Class Main_Menu Me.Button_Settings = New System.Windows.Forms.Button() Me.Button_Multiple = New System.Windows.Forms.Button() Me.Button_Individual = New System.Windows.Forms.Button() - Me.Button_FilePath = New System.Windows.Forms.Button() Me.Button_Order = New System.Windows.Forms.Button() - Me.Label_FilePathError = New System.Windows.Forms.Label() + Me.Label_SettingsError = New System.Windows.Forms.Label() Me.SuspendLayout() ' 'Button_Settings ' - Me.Button_Settings.Location = New System.Drawing.Point(91, 73) - Me.Button_Settings.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) + Me.Button_Settings.Location = New System.Drawing.Point(68, 59) + Me.Button_Settings.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.Button_Settings.Name = "Button_Settings" - Me.Button_Settings.Size = New System.Drawing.Size(169, 50) + Me.Button_Settings.Size = New System.Drawing.Size(127, 41) Me.Button_Settings.TabIndex = 5 Me.Button_Settings.Text = "Settings" Me.Button_Settings.UseVisualStyleBackColor = True @@ -43,10 +42,9 @@ Partial Class Main_Menu 'Button_Multiple ' Me.Button_Multiple.Enabled = False - Me.Button_Multiple.Location = New System.Drawing.Point(979, 540) - Me.Button_Multiple.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button_Multiple.Location = New System.Drawing.Point(734, 439) Me.Button_Multiple.Name = "Button_Multiple" - Me.Button_Multiple.Size = New System.Drawing.Size(156, 114) + Me.Button_Multiple.Size = New System.Drawing.Size(117, 93) Me.Button_Multiple.TabIndex = 4 Me.Button_Multiple.Text = "Multiple" Me.Button_Multiple.UseVisualStyleBackColor = True @@ -54,59 +52,47 @@ Partial Class Main_Menu 'Button_Individual ' Me.Button_Individual.Enabled = False - Me.Button_Individual.Location = New System.Drawing.Point(979, 372) - Me.Button_Individual.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button_Individual.Location = New System.Drawing.Point(734, 302) Me.Button_Individual.Name = "Button_Individual" - Me.Button_Individual.Size = New System.Drawing.Size(156, 114) + Me.Button_Individual.Size = New System.Drawing.Size(117, 93) Me.Button_Individual.TabIndex = 3 Me.Button_Individual.Text = "Individual" Me.Button_Individual.UseVisualStyleBackColor = True ' - 'Button_FilePath - ' - Me.Button_FilePath.Location = New System.Drawing.Point(320, 73) - Me.Button_FilePath.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) - Me.Button_FilePath.Name = "Button_FilePath" - Me.Button_FilePath.Size = New System.Drawing.Size(164, 50) - Me.Button_FilePath.TabIndex = 6 - Me.Button_FilePath.Text = "File path" - Me.Button_FilePath.UseVisualStyleBackColor = True - ' 'Button_Order ' Me.Button_Order.Enabled = False - Me.Button_Order.Location = New System.Drawing.Point(259, 434) - Me.Button_Order.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Button_Order.Location = New System.Drawing.Point(194, 353) Me.Button_Order.Name = "Button_Order" - Me.Button_Order.Size = New System.Drawing.Size(156, 80) + Me.Button_Order.Size = New System.Drawing.Size(117, 65) Me.Button_Order.TabIndex = 7 Me.Button_Order.Text = "Create Order" Me.Button_Order.UseVisualStyleBackColor = True ' - 'Label_FilePathError + 'Label_SettingsError ' - Me.Label_FilePathError.AutoSize = True - Me.Label_FilePathError.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label_FilePathError.ForeColor = System.Drawing.Color.Red - Me.Label_FilePathError.Location = New System.Drawing.Point(504, 87) - Me.Label_FilePathError.Name = "Label_FilePathError" - Me.Label_FilePathError.Size = New System.Drawing.Size(184, 20) - Me.Label_FilePathError.TabIndex = 8 - Me.Label_FilePathError.Text = "Please update file path!" + Me.Label_SettingsError.AutoSize = True + Me.Label_SettingsError.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label_SettingsError.ForeColor = System.Drawing.Color.Red + Me.Label_SettingsError.Location = New System.Drawing.Point(215, 71) + Me.Label_SettingsError.Margin = New System.Windows.Forms.Padding(2, 0, 2, 0) + Me.Label_SettingsError.Name = "Label_SettingsError" + Me.Label_SettingsError.Size = New System.Drawing.Size(112, 17) + Me.Label_SettingsError.TabIndex = 8 + Me.Label_SettingsError.Text = "Update Settings!" ' 'Main_Menu ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(8.0!, 16.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(1395, 772) - Me.Controls.Add(Me.Label_FilePathError) + Me.ClientSize = New System.Drawing.Size(1046, 627) + Me.Controls.Add(Me.Label_SettingsError) Me.Controls.Add(Me.Button_Order) - Me.Controls.Add(Me.Button_FilePath) Me.Controls.Add(Me.Button_Settings) Me.Controls.Add(Me.Button_Multiple) Me.Controls.Add(Me.Button_Individual) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None - Me.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) + Me.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.Name = "Main_Menu" Me.Text = "Main_Menu" Me.ResumeLayout(False) @@ -117,7 +103,6 @@ Partial Class Main_Menu Friend WithEvents Button_Settings As Button Friend WithEvents Button_Multiple As Button Friend WithEvents Button_Individual As Button - Friend WithEvents Button_FilePath As Button Friend WithEvents Button_Order As Button - Friend WithEvents Label_FilePathError As Label + Friend WithEvents Label_SettingsError As Label End Class diff --git a/Wardrobe/GUI/Main_Menu.vb b/Wardrobe/GUI/Main_Menu.vb index 7a48030..dceeb21 100644 --- a/Wardrobe/GUI/Main_Menu.vb +++ b/Wardrobe/GUI/Main_Menu.vb @@ -91,40 +91,12 @@ Public Class Main_Menu ' ---------------------------------- Settings ---------------------------------- ' --- Settings button clicked --- Private Sub Button_Settings_Click(sender As Object, e As EventArgs) Handles Button_Settings.Click - Settings.ButtonClicked(sender, e) - End Sub - - Private Sub Button_FilePath_Click(sender As Object, e As EventArgs) Handles Button_FilePath.Click - Dim ofd As FolderBrowserDialog = New FolderBrowserDialog - If ofd.ShowDialog() <> DialogResult.Cancel Then - Settings.exportFolder = ofd.SelectedPath - - Dim appData As String() = System.IO.File.ReadAllLines(AppForm.appDataPath & "\SavedData.txt") - Dim appDataList As New List(Of String) - For i = 0 To appData.Length - 1 - appDataList.Add(appData(i)) - Next - - Dim pathUpdated As Boolean = False - For i = 0 To appDataList.Count - 1 - If appDataList(i) = "Export Folder Path" Then - appDataList(i + 1) = ofd.SelectedPath - pathUpdated = True - Exit For - End If - Next - - If pathUpdated = False Then - appDataList.Add("") - appDataList.Add("Export Folder Path") - appDataList.Add(ofd.SelectedPath) - End If - - System.IO.File.WriteAllLines(AppForm.appDataPath & "\SavedData.txt", appDataList.ToArray()) - - Button_Order.Enabled = True - Label_FilePathError.Visible = False - End If + AppForm.fillMode = True + AppForm.Panel_Start.Controls.Clear() + Settings.TopLevel = False + AppForm.Panel_Start.Controls.Add(Settings) + Settings.Init_Settings() + Settings.Show() End Sub Private Sub Button_Order_Click(sender As Object, e As EventArgs) Handles Button_Order.Click diff --git a/Wardrobe/GUI/Settings.Designer.vb b/Wardrobe/GUI/Settings.Designer.vb new file mode 100644 index 0000000..d317190 --- /dev/null +++ b/Wardrobe/GUI/Settings.Designer.vb @@ -0,0 +1,158 @@ + _ +Partial Class Settings + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.Button_KB = New System.Windows.Forms.Button() + Me.Button_FilePath = New System.Windows.Forms.Button() + Me.Label_Name = New System.Windows.Forms.Label() + Me.TextBox_Name = New System.Windows.Forms.TextBox() + Me.Label_UserData = New System.Windows.Forms.Label() + Me.TextBox_Phone = New System.Windows.Forms.TextBox() + Me.Label_Tel = New System.Windows.Forms.Label() + Me.TextBox_Mail = New System.Windows.Forms.TextBox() + Me.Label_Mail = New System.Windows.Forms.Label() + Me.Button_Save = New System.Windows.Forms.Button() + Me.SuspendLayout() + ' + 'Button_KB + ' + Me.Button_KB.Location = New System.Drawing.Point(639, 133) + Me.Button_KB.Name = "Button_KB" + Me.Button_KB.Size = New System.Drawing.Size(160, 68) + Me.Button_KB.TabIndex = 0 + Me.Button_KB.Text = "Update Knowledge Base" + Me.Button_KB.UseVisualStyleBackColor = True + ' + 'Button_FilePath + ' + Me.Button_FilePath.Location = New System.Drawing.Point(639, 283) + Me.Button_FilePath.Name = "Button_FilePath" + Me.Button_FilePath.Size = New System.Drawing.Size(160, 68) + Me.Button_FilePath.TabIndex = 1 + Me.Button_FilePath.Text = "Update File Path" + Me.Button_FilePath.UseVisualStyleBackColor = True + ' + 'Label_Name + ' + Me.Label_Name.AutoSize = True + Me.Label_Name.Location = New System.Drawing.Point(113, 203) + Me.Label_Name.Name = "Label_Name" + Me.Label_Name.Size = New System.Drawing.Size(38, 13) + Me.Label_Name.TabIndex = 2 + Me.Label_Name.Text = "Name:" + ' + 'TextBox_Name + ' + Me.TextBox_Name.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.TextBox_Name.Location = New System.Drawing.Point(200, 200) + Me.TextBox_Name.Name = "TextBox_Name" + Me.TextBox_Name.Size = New System.Drawing.Size(171, 21) + Me.TextBox_Name.TabIndex = 3 + ' + 'Label_UserData + ' + Me.Label_UserData.AutoSize = True + Me.Label_UserData.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label_UserData.Location = New System.Drawing.Point(112, 156) + Me.Label_UserData.Name = "Label_UserData" + Me.Label_UserData.Size = New System.Drawing.Size(181, 20) + Me.Label_UserData.TabIndex = 4 + Me.Label_UserData.Text = "Sales Representative" + ' + 'TextBox_Phone + ' + Me.TextBox_Phone.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.TextBox_Phone.Location = New System.Drawing.Point(200, 241) + Me.TextBox_Phone.Name = "TextBox_Phone" + Me.TextBox_Phone.Size = New System.Drawing.Size(171, 21) + Me.TextBox_Phone.TabIndex = 6 + ' + 'Label_Tel + ' + Me.Label_Tel.AutoSize = True + Me.Label_Tel.Location = New System.Drawing.Point(113, 244) + Me.Label_Tel.Name = "Label_Tel" + Me.Label_Tel.Size = New System.Drawing.Size(81, 13) + Me.Label_Tel.TabIndex = 5 + Me.Label_Tel.Text = "Phone Number:" + ' + 'TextBox_Mail + ' + Me.TextBox_Mail.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.TextBox_Mail.Location = New System.Drawing.Point(200, 283) + Me.TextBox_Mail.Name = "TextBox_Mail" + Me.TextBox_Mail.Size = New System.Drawing.Size(171, 21) + Me.TextBox_Mail.TabIndex = 8 + ' + 'Label_Mail + ' + Me.Label_Mail.AutoSize = True + Me.Label_Mail.Location = New System.Drawing.Point(113, 286) + Me.Label_Mail.Name = "Label_Mail" + Me.Label_Mail.Size = New System.Drawing.Size(29, 13) + Me.Label_Mail.TabIndex = 7 + Me.Label_Mail.Text = "Mail:" + ' + 'Button_Save + ' + Me.Button_Save.Location = New System.Drawing.Point(858, 533) + Me.Button_Save.Name = "Button_Save" + Me.Button_Save.Size = New System.Drawing.Size(99, 54) + Me.Button_Save.TabIndex = 9 + Me.Button_Save.Text = "Save" + Me.Button_Save.UseVisualStyleBackColor = True + ' + 'Settings + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(1046, 627) + Me.Controls.Add(Me.Button_Save) + Me.Controls.Add(Me.TextBox_Mail) + Me.Controls.Add(Me.Label_Mail) + Me.Controls.Add(Me.TextBox_Phone) + Me.Controls.Add(Me.Label_Tel) + Me.Controls.Add(Me.Label_UserData) + Me.Controls.Add(Me.TextBox_Name) + Me.Controls.Add(Me.Label_Name) + Me.Controls.Add(Me.Button_FilePath) + Me.Controls.Add(Me.Button_KB) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None + Me.Name = "Settings" + Me.Text = "Settings" + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents Button_KB As Button + Friend WithEvents Button_FilePath As Button + Friend WithEvents Label_Name As Label + Friend WithEvents TextBox_Name As TextBox + Friend WithEvents Label_UserData As Label + Friend WithEvents TextBox_Phone As TextBox + Friend WithEvents Label_Tel As Label + Friend WithEvents TextBox_Mail As TextBox + Friend WithEvents Label_Mail As Label + Friend WithEvents Button_Save As Button +End Class diff --git a/Wardrobe/GUI/Settings.resx b/Wardrobe/GUI/Settings.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/Wardrobe/GUI/Settings.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Wardrobe/GUI/Settings.vb b/Wardrobe/GUI/Settings.vb index 00ae70c..9da4102 100644 --- a/Wardrobe/GUI/Settings.vb +++ b/Wardrobe/GUI/Settings.vb @@ -5,8 +5,80 @@ Public Class Settings Public Shared exportFolder As String Public Shared folderPaths As New Dictionary(Of String, String) - ' --- Settings button clicked --- - Public Shared Sub ButtonClicked(sender As Object, e As EventArgs) - adminClass.updateDatabase() 'Update KB - should be its own button inside of a settings form + Public Shared SRName, SRPhone, SRMail As String + Private Shared appDataList As New List(Of String) + + Public Shared Sub Init_Settings() + Dim appData As String() = System.IO.File.ReadAllLines(AppForm.appDataPath & "\SavedData.txt") + For i = 0 To appData.Length - 1 + appDataList.Add(appData(i)) + Next End Sub -End Class + + Private Sub TextBox_Name_TextChanged(sender As Object, e As EventArgs) Handles TextBox_Name.TextChanged + SRName = sender.Text + + Update_AppData("Sales Representative: Name", SRName) + End Sub + + Private Sub TextBox_Phone_TextChanged(sender As Object, e As EventArgs) Handles TextBox_Phone.TextChanged + SRPhone = sender.Text + + Update_AppData("Sales Representative: Phone number", SRPhone) + End Sub + + Private Sub TextBox_Mail_TextChanged(sender As Object, e As EventArgs) Handles TextBox_Mail.TextChanged + SRMail = sender.Text + + Update_AppData("Sales Representative: Mail", SRMail) + End Sub + + + Private Sub Button_KB_Click(sender As Object, e As EventArgs) Handles Button_KB.Click + adminClass.updateDatabase() 'Update KB + End Sub + + Private Sub Button_FilePath_Click(sender As Object, e As EventArgs) Handles Button_FilePath.Click + Dim ofd As FolderBrowserDialog = New FolderBrowserDialog + If ofd.ShowDialog() <> DialogResult.Cancel Then + Settings.exportFolder = ofd.SelectedPath + + Update_AppData("Export Folder Path", ofd.SelectedPath) + End If + End Sub + + Private Sub Button_Save_Click(sender As Object, e As EventArgs) Handles Button_Save.Click + System.IO.File.WriteAllLines(AppForm.appDataPath & "\SavedData.txt", appDataList.ToArray()) + + If SRName <> "" AndAlso SRPhone <> "" AndAlso SRMail <> "" AndAlso Settings.exportFolder <> "" Then + Main_Menu.Button_Order.Enabled = True + Main_Menu.Label_SettingsError.Visible = False + Else + Main_Menu.Button_Order.Enabled = False + Main_Menu.Label_SettingsError.Visible = True + End If + + AppForm.fillMode = True + AppForm.Panel_Start.Controls.Clear() + Main_Menu.TopLevel = False + AppForm.Panel_Start.Controls.Add(Main_Menu) + Main_Menu.Show() + End Sub + + Private Shared Sub Update_AppData(dataName As String, data As String) + Dim pathUpdated As Boolean = False + For i = 0 To appDataList.Count - 1 + If appDataList(i) = dataName Then + appDataList(i + 1) = data + pathUpdated = True + Exit For + End If + Next + + If pathUpdated = False Then + appDataList.Add("") + appDataList.Add(dataName) + appDataList.Add(data) + End If + End Sub +End Class \ No newline at end of file diff --git a/Wardrobe/Gratings Data/Database.vb b/Wardrobe/Gratings Data/Database.vb index 67b8fc7..162f251 100644 --- a/Wardrobe/Gratings Data/Database.vb +++ b/Wardrobe/Gratings Data/Database.vb @@ -11,13 +11,13 @@ Public Class Database ' Make .csv files of each sheet in Excel excelApp.DisplayAlerts = False Dim wSNames As New List(Of String) - excelWB = excelApp.Workbooks.Open(Settings.HLCtFolder & "\Database\Databas.xlsx") + excelWB = excelApp.Workbooks.Open(Settings2ABC.HLCtFolder & "\Database\Databas.xlsx") For i = 1 To 5 Dim activeSheet As Excel.Worksheet activeSheet = excelWB.Sheets(i) wSNames.Add(activeSheet.Name) - activeSheet.SaveAs(Settings.HLCtFolder & "\Database\" & wSNames(i - 1), Excel.XlFileFormat.xlCSV) + activeSheet.SaveAs(Settings2ABC.HLCtFolder & "\Database\" & wSNames(i - 1), Excel.XlFileFormat.xlCSV) System.Runtime.InteropServices.Marshal.ReleaseComObject(activeSheet) Next @@ -32,7 +32,7 @@ Public Class Database .TableName = wSNames(i) } - Dim lines = IO.File.ReadAllLines(Settings.HLCtFolder & "\Database\" & wSNames(i) & ".csv") + Dim lines = IO.File.ReadAllLines(Settings2ABC.HLCtFolder & "\Database\" & wSNames(i) & ".csv") ' Create DataTable columns Dim words As String() = lines(0).Split(New Char() {","c}) diff --git a/Wardrobe/SolidWorks/Frame_3D.vb b/Wardrobe/SolidWorks/Frame_3D.vb index 6dfd3e3..c6f5e03 100644 --- a/Wardrobe/SolidWorks/Frame_3D.vb +++ b/Wardrobe/SolidWorks/Frame_3D.vb @@ -469,9 +469,9 @@ Public Class Frame_3D If endPieceLength > 0 Then - Dim Part = swApp.OpenDoc6(Settings.HLCtFolder & "\HLCt\frame_l_straight.SLDPRT", 1, 0, "", longstatus, longwarnings) + Dim Part = swApp.OpenDoc6(Settings2ABC.HLCtFolder & "\HLCt\frame_l_straight.SLDPRT", 1, 0, "", longstatus, longwarnings) - longstatus = Part.SaveAs3(Settings.folderPaths("object_" & Data.objectNum & "_models3D_frames_sw_support") & "\FRAME_L_END_PIECE" & j + 1 & ".SLDPRT", 0, 0) + longstatus = Part.SaveAs3(Settings2ABC.folderPaths("object_" & Data.objectNum & "_models3D_frames_sw_support") & "\FRAME_L_END_PIECE" & j + 1 & ".SLDPRT", 0, 0) Dim swEquationMgr As EquationMgr swEquationMgr = Part.GetEquationMgr() @@ -511,7 +511,7 @@ Public Class Frame_3D Dim swWarnings As Integer boolstatus = Part.Save3(4, swErrors, swWarnings) - swApp.CloseDoc(Settings.folderPaths("object_" & Data.objectNum & "_models3D_frames_sw_support") & "\FRAME_L_END_PIECE" & j + 1 & ".SLDPRT") + swApp.CloseDoc(Settings2ABC.folderPaths("object_" & Data.objectNum & "_models3D_frames_sw_support") & "\FRAME_L_END_PIECE" & j + 1 & ".SLDPRT") End If Next End Sub diff --git a/Wardrobe/SolidWorks/Frame_Drawing.vb b/Wardrobe/SolidWorks/Frame_Drawing.vb index 3c01793..b9c95e8 100644 --- a/Wardrobe/SolidWorks/Frame_Drawing.vb +++ b/Wardrobe/SolidWorks/Frame_Drawing.vb @@ -30,12 +30,12 @@ Public Class Frame_Drawing Dim transMatrix As Object = Nothing For j = 0 To compNames.Count - 2 + endPieceExist Dim frameID = Frame_3D.cuttingList.ElementAt(i).Value(j) - compNames(j) = Settings.folderPaths("object_" & Data.objectNum & "_models3D_frames_sw") & "\" & "FRAME_L_STRAIGHT_" & frameID & ".SLDPRT" + compNames(j) = Settings2ABC.folderPaths("object_" & Data.objectNum & "_models3D_frames_sw") & "\" & "FRAME_L_STRAIGHT_" & frameID & ".SLDPRT" coordNames(j) = "" Next If endPieceLength > 0 Then - compNames(compNames.Count - 1) = Settings.folderPaths("object_" & Data.objectNum & "_models3D_frames_sw_support") & "\FRAME_L_END_PIECE" & i + 1 & ".SLDPRT" + compNames(compNames.Count - 1) = Settings2ABC.folderPaths("object_" & Data.objectNum & "_models3D_frames_sw_support") & "\FRAME_L_END_PIECE" & i + 1 & ".SLDPRT" coordNames(coordNames.Count - 1) = "" End If @@ -60,9 +60,9 @@ Public Class Frame_Drawing longstatus = swCustPropMgr.Add3("Revision", 30, "", 1) - longstatus = model.SaveAs3(Settings.folderPaths("object_" & Data.objectNum & "_models3D_frames_sw") & "\FRAME_ASSEMBLY" & i + 1 & ".SLDASM", 0, 0) + longstatus = model.SaveAs3(Settings2ABC.folderPaths("object_" & Data.objectNum & "_models3D_frames_sw") & "\FRAME_ASSEMBLY" & i + 1 & ".SLDASM", 0, 0) - swApp.CloseDoc(Settings.folderPaths("object_" & Data.objectNum & "_models3D_frames_sw") & "\FRAME_ASSEMBLY" & i + 1 & ".SLDASM") + swApp.CloseDoc(Settings2ABC.folderPaths("object_" & Data.objectNum & "_models3D_frames_sw") & "\FRAME_ASSEMBLY" & i + 1 & ".SLDASM") Next End Sub @@ -82,7 +82,7 @@ Public Class Frame_Drawing Dim swSheet As Sheet swSheet = iDrawing.GetCurrentSheet() swSheet.SetProperties2(12, 12, 1, 1, False, swSheetWidth, swSheetHeight, True) - swSheet.SetTemplateName(Settings.HLCtFolder & "\Files Needed\A3 Part.slddrt") + swSheet.SetTemplateName(Settings2ABC.HLCtFolder & "\Files Needed\A3 Part.slddrt") swSheet.ReloadTemplate(True) swSheet.SetScale(1, 10, False, False) swSheet.SetName("Frame 1") @@ -92,14 +92,14 @@ Public Class Frame_Drawing For i = 0 To Frame_3D.cuttingList.Count - 1 If i > 0 Then - status = iDrawing.NewSheet3("Frame" & i + 1, 12, 12, 1, 10, False, Settings.HLCtFolder & "\Files Needed\A3 Part.slddrt", + status = iDrawing.NewSheet3("Frame" & i + 1, 12, 12, 1, 10, False, Settings2ABC.HLCtFolder & "\Files Needed\A3 Part.slddrt", swSheetWidth, swSheetHeight, "Same as sheet specified in Document Properties") End If status = layMgr.SetCurrentLayer("Svenska") Dim myView As View - myView = iDrawing.CreateDrawViewFromModelView3(Settings.folderPaths("object_" & Data.objectNum & "_models3D_frames_sw") & "\FRAME_ASSEMBLY" & i + 1 & ".SLDASM", + myView = iDrawing.CreateDrawViewFromModelView3(Settings2ABC.folderPaths("object_" & Data.objectNum & "_models3D_frames_sw") & "\FRAME_ASSEMBLY" & i + 1 & ".SLDASM", "*Front", swSheetWidth / 2, swSheetHeight / 2, 0) myView.UseSheetScale() = True myView.SetDisplayTangentEdges2(2) @@ -192,10 +192,10 @@ Public Class Frame_Drawing Next Dim newName As String - newName = Settings.folderPaths("object_" & Data.objectNum & "_drawings_frames_sw") & "\frame_drawing.SLDDRW" + newName = Settings2ABC.folderPaths("object_" & Data.objectNum & "_drawings_frames_sw") & "\frame_drawing.SLDDRW" status = iDrawing.SaveAs3(newName, 0, 0) - status = iDrawing.SaveAs3(Settings.folderPaths("object_" & Data.objectNum & "_drawings_frames_pdf") & "\frame_drawing.pdf", 0, 2) + status = iDrawing.SaveAs3(Settings2ABC.folderPaths("object_" & Data.objectNum & "_drawings_frames_pdf") & "\frame_drawing.pdf", 0, 2) End Sub diff --git a/Wardrobe/SolidWorks/Individual_3D.vb b/Wardrobe/SolidWorks/Individual_3D.vb index c1c00f5..8ccec4f 100644 --- a/Wardrobe/SolidWorks/Individual_3D.vb +++ b/Wardrobe/SolidWorks/Individual_3D.vb @@ -81,15 +81,15 @@ Public Class Individual_3D Dim childrenSourcePaths As New List(Of String) Dim childrenDestPaths As New List(Of String) - sourcePath = Settings.filesFolder & "\Files\CADStart\" & designName & ".SLDASM" - destPath = Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw") & "\GRATING_ASSEMBLY.SLDASM" + sourcePath = Settings2ABC.filesFolder & "\Files\CADStart\" & designName & ".SLDASM" + destPath = Settings2ABC.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw") & "\GRATING_ASSEMBLY.SLDASM" - childrenSourcePaths.Add(Settings.HLCtFolder & "\HLCt\Parts\START.SLDPRT") - childrenDestPaths.Add(Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\MASTER.SLDPRT") + childrenSourcePaths.Add(Settings2ABC.HLCtFolder & "\HLCt\Parts\START.SLDPRT") + childrenDestPaths.Add(Settings2ABC.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\MASTER.SLDPRT") Dim instanceCounter As New Dictionary(Of String, Integer) For i = 0 To partDT.Rows.Count - 1 - childrenSourcePaths.Add(Settings.filesFolder & "\Files\CADStart\" & partDT.Rows(i)("partName") & ".SLDPRT") + childrenSourcePaths.Add(Settings2ABC.filesFolder & "\Files\CADStart\" & partDT.Rows(i)("partName") & ".SLDPRT") Dim partName As String = partDT.Rows(i)("partName") Dim partNameArray As String() = partName.Split("_") @@ -106,10 +106,10 @@ Public Class Individual_3D End Try If partNameArray(0) = "FRAME" Then - childrenDestPaths.Add(Settings.folderPaths("object_" & Data.objectNum & "_models3D_frames_sw") & "\" & newName & + childrenDestPaths.Add(Settings2ABC.folderPaths("object_" & Data.objectNum & "_models3D_frames_sw") & "\" & newName & instanceCounter(newName.Substring(0, newName.Length - 1)) & ".SLDPRT") Else - childrenDestPaths.Add(Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw") & "\" & newName & + childrenDestPaths.Add(Settings2ABC.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw") & "\" & newName & instanceCounter(newName.Substring(0, newName.Length - 1)) & ".SLDPRT") End If Next diff --git a/Wardrobe/SolidWorks/Individual_3D_Simplified.vb b/Wardrobe/SolidWorks/Individual_3D_Simplified.vb index d165bad..ceb42f5 100644 --- a/Wardrobe/SolidWorks/Individual_3D_Simplified.vb +++ b/Wardrobe/SolidWorks/Individual_3D_Simplified.vb @@ -116,20 +116,20 @@ Public Class Individual_3D_Simplified Dim childrenSourcePaths As New List(Of String) Dim childrenDestPaths As New List(Of String) - sourcePath = Settings.filesFolder & "\Files\CADStart\" & designName & ".SLDASM" + sourcePath = Settings2ABC.filesFolder & "\Files\CADStart\" & designName & ".SLDASM" - childrenSourcePaths.Add(Settings.HLCtFolder & "\HLCt\Parts\START.SLDPRT") + childrenSourcePaths.Add(Settings2ABC.HLCtFolder & "\HLCt\Parts\START.SLDPRT") If withFrame = True Then - destPath = Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\GRATING_ASSEMBLY_SIMPLIFIED_WITH_FRAME.SLDASM" - childrenDestPaths.Add(Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\MASTER_SIMPLIFIED_WITH_FRAME.SLDPRT") + destPath = Settings2ABC.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\GRATING_ASSEMBLY_SIMPLIFIED_WITH_FRAME.SLDASM" + childrenDestPaths.Add(Settings2ABC.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\MASTER_SIMPLIFIED_WITH_FRAME.SLDPRT") Else - destPath = Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\GRATING_ASSEMBLY_SIMPLIFIED.SLDASM" - childrenDestPaths.Add(Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\MASTER_SIMPLIFIED.SLDPRT") + destPath = Settings2ABC.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\GRATING_ASSEMBLY_SIMPLIFIED.SLDASM" + childrenDestPaths.Add(Settings2ABC.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\MASTER_SIMPLIFIED.SLDPRT") End If Dim instanceCounter As New Dictionary(Of String, Integer) For i = 0 To partDT.Rows.Count - 1 - childrenSourcePaths.Add(Settings.filesFolder & "\Files\CADStart\" & partDT.Rows(i)("partName") & ".SLDPRT") + childrenSourcePaths.Add(Settings2ABC.filesFolder & "\Files\CADStart\" & partDT.Rows(i)("partName") & ".SLDPRT") Dim partName As String = partDT.Rows(i)("partName") Dim partNameArray As String() = partName.Split("_") @@ -146,10 +146,10 @@ Public Class Individual_3D_Simplified End Try If partNameArray(0) = "FRAME" Then - childrenDestPaths.Add(Settings.folderPaths("object_" & Data.objectNum & "_models3D_frames_sw") & "\" & newName & + childrenDestPaths.Add(Settings2ABC.folderPaths("object_" & Data.objectNum & "_models3D_frames_sw") & "\" & newName & instanceCounter(newName.Substring(0, newName.Length - 1)) & ".SLDPRT") Else - childrenDestPaths.Add(Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\" & newName & + childrenDestPaths.Add(Settings2ABC.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\" & newName & instanceCounter(newName.Substring(0, newName.Length - 1)) & ".SLDPRT") End If Next diff --git a/Wardrobe/SolidWorks/Individual_Drawing.vb b/Wardrobe/SolidWorks/Individual_Drawing.vb index 0d18881..453565e 100644 --- a/Wardrobe/SolidWorks/Individual_Drawing.vb +++ b/Wardrobe/SolidWorks/Individual_Drawing.vb @@ -112,7 +112,7 @@ Public Class Individual_Drawing Dim iPart As PartDoc iPart = swApp.ActiveDoc Dim newName As String - newName = Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\simplified_grating.SLDPRT" + newName = Settings2ABC.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\simplified_grating.SLDPRT" Dim config As Configuration config = iPart.GetActiveConfiguration @@ -167,7 +167,7 @@ Public Class Individual_Drawing Dim swSheet As Sheet swSheet = iDrawing.GetCurrentSheet() swSheet.SetProperties2(12, 12, 1, 1, False, swSheetWidth, swSheetHeight, True) - swSheet.SetTemplateName(Settings.HLCtFolder & "\Files Needed\A3 Part.slddrt") + swSheet.SetTemplateName(Settings2ABC.HLCtFolder & "\Files Needed\A3 Part.slddrt") swSheet.ReloadTemplate(True) Dim layMgr As LayerMgr @@ -176,7 +176,7 @@ Public Class Individual_Drawing status = layMgr.SetCurrentLayer("Svenska") Dim myView As View - myView = iDrawing.CreateDrawViewFromModelView3(Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\simplified_grating.SLDPRT", + myView = iDrawing.CreateDrawViewFromModelView3(Settings2ABC.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\simplified_grating.SLDPRT", "*Front", swSheetWidth / 2, swSheetHeight / 2, 0) myView.UseSheetScale() = True Dim viewScale1, viewScale2 As Double @@ -293,7 +293,7 @@ Public Class Individual_Drawing Add_Dimensions(sortedMeasurments("Lmes"), CompName, myView, iDrawing, swExtensions, OutLine, scaleDecimal, X_Mid, Y_Mid, "Lmes") Add_Dimensions(sortedMeasurments("Wmes"), CompName, myView, iDrawing, swExtensions, OutLine, scaleDecimal, X_Mid, Y_Mid, "Wmes") Dim myView2 As View - myView2 = iDrawing.CreateDrawViewFromModelView3(Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\simplified_grating.SLDPRT", + myView2 = iDrawing.CreateDrawViewFromModelView3(Settings2ABC.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\simplified_grating.SLDPRT", "*Bottom", swSheetWidth / 2, OutLine(3) + sideCounter(0) * 0.01 + 0.03, 0) myView2.UseSheetScale() = True @@ -315,7 +315,7 @@ Public Class Individual_Drawing Dim longstatus As Integer Dim newName As String - newName = Settings.folderPaths("object_" & Data.objectNum & "_drawings_gratings_sw") & "\grating_drawing.SLDDRW" + newName = Settings2ABC.folderPaths("object_" & Data.objectNum & "_drawings_gratings_sw") & "\grating_drawing.SLDDRW" status = layMgr.AddLayer("Symbol", "", 0, 0, 2) status = layMgr.SetCurrentLayer("Symbol") @@ -339,7 +339,7 @@ Public Class Individual_Drawing swSkMgr.AddToDB = False longstatus = iDrawing.SaveAs3(newName, 0, 0) - longstatus = iDrawing.SaveAs3(Settings.folderPaths("object_" & Data.objectNum & "_drawings_gratings_pdf") & "\grating_drawing.pdf", 0, 2) + longstatus = iDrawing.SaveAs3(Settings2ABC.folderPaths("object_" & Data.objectNum & "_drawings_gratings_pdf") & "\grating_drawing.pdf", 0, 2) End Sub Private Shared Sub Add_Dimensions(points() As Integer, CompName As String, myView As View, iDrawing As DrawingDoc, swExtensions As SldWorks.ModelDocExtension _ diff --git a/Wardrobe/SolidWorks/Instructions.vb b/Wardrobe/SolidWorks/Instructions.vb index fbb8be1..95cddb4 100644 --- a/Wardrobe/SolidWorks/Instructions.vb +++ b/Wardrobe/SolidWorks/Instructions.vb @@ -16,7 +16,7 @@ Public Class Instructions Dim swSheet As Sheet swSheet = iDrawing.GetCurrentSheet() swSheet.SetProperties2(12, 12, 1, 1, False, swSheetWidth, swSheetHeight, True) - swSheet.SetTemplateName(Settings.HLCtFolder & "\Files Needed\A3 Part.slddrt") + swSheet.SetTemplateName(Settings2ABC.HLCtFolder & "\Files Needed\A3 Part.slddrt") swSheet.ReloadTemplate(True) swSheet.SetScale(1, 10, False, False) swSheet.SetName("Instructions") @@ -28,15 +28,15 @@ Public Class Instructions Dim drawName As String If AppForm.fillMode = True Then If withFrame = True Then - drawName = Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\GRATINGS_ASSEMBLY_SIMPLIFIED_WITH_FRAME.SLDASM" + drawName = Settings2ABC.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\GRATINGS_ASSEMBLY_SIMPLIFIED_WITH_FRAME.SLDASM" Else - drawName = Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\GRATINGS_ASSEMBLY_SIMPLIFIED.SLDASM" + drawName = Settings2ABC.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\GRATINGS_ASSEMBLY_SIMPLIFIED.SLDASM" End If Else If withFrame = True Then - drawName = Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\GRATING_ASSEMBLY_SIMPLIFIED_WITH_FRAME.SLDASM" + drawName = Settings2ABC.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\GRATING_ASSEMBLY_SIMPLIFIED_WITH_FRAME.SLDASM" Else - drawName = Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\GRATING_ASSEMBLY_SIMPLIFIED.SLDASM" + drawName = Settings2ABC.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\GRATING_ASSEMBLY_SIMPLIFIED.SLDASM" End If End If @@ -271,11 +271,11 @@ Public Class Instructions ' --- instruction for support beams --- If Calculate_Fill_Grid.withSupportBeam = True Then - status = iDrawing.NewSheet3("Support Beams", 12, 12, 1, 10, False, Settings.HLCtFolder & "\Files Needed\A3 Part.slddrt", + status = iDrawing.NewSheet3("Support Beams", 12, 12, 1, 10, False, Settings2ABC.HLCtFolder & "\Files Needed\A3 Part.slddrt", swSheetWidth, swSheetHeight, "Same as sheet specified in Document Properties") status = layMgr.SetCurrentLayer("Svenska") - drawName = Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\GRATINGS_ASSEMBLY_SIMPLIFIED.SLDASM" + drawName = Settings2ABC.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\GRATINGS_ASSEMBLY_SIMPLIFIED.SLDASM" myView = iDrawing.CreateDrawViewFromModelView3(drawName, "*Front", swSheetWidth / 2, adjustedHeightPosInSheet, 0) myView.UseSheetScale() = True @@ -413,7 +413,7 @@ Public Class Instructions End If Dim newName As String - newName = Settings.folderPaths("object_" & Data.objectNum & "_guide") & "\assembly_instructions.SLDDRW" + newName = Settings2ABC.folderPaths("object_" & Data.objectNum & "_guide") & "\assembly_instructions.SLDDRW" status = iDrawing.SaveAs3(newName, 0, 0) status = iDrawing.SaveAs3(newName, 0, 2) diff --git a/Wardrobe/SolidWorks/Multiple_3D.vb b/Wardrobe/SolidWorks/Multiple_3D.vb index 3317eb7..1786b04 100644 --- a/Wardrobe/SolidWorks/Multiple_3D.vb +++ b/Wardrobe/SolidWorks/Multiple_3D.vb @@ -121,15 +121,15 @@ Public Class Multiple_3D Dim childrenSourcePaths As New List(Of String) Dim childrenDestPaths As New List(Of String) - sourcePath = Settings.filesFolder & "\Files\CADStart\" & designName & ".SLDASM" - destPath = Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw") & "\GRATINGS_ASSEMBLY.SLDASM" + sourcePath = Settings2ABC.filesFolder & "\Files\CADStart\" & designName & ".SLDASM" + destPath = Settings2ABC.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw") & "\GRATINGS_ASSEMBLY.SLDASM" - childrenSourcePaths.Add(Settings.HLCtFolder & "\HLCt\Parts\START.SLDPRT") - childrenDestPaths.Add(Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\MASTER.SLDPRT") + childrenSourcePaths.Add(Settings2ABC.HLCtFolder & "\HLCt\Parts\START.SLDPRT") + childrenDestPaths.Add(Settings2ABC.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\MASTER.SLDPRT") Dim instanceCounter As New Dictionary(Of String, Integer) For i = 0 To partDT.Rows.Count - 1 - childrenSourcePaths.Add(Settings.filesFolder & "\Files\CADStart\" & partDT.Rows(i)("partName") & ".SLDPRT") + childrenSourcePaths.Add(Settings2ABC.filesFolder & "\Files\CADStart\" & partDT.Rows(i)("partName") & ".SLDPRT") Dim partName As String = partDT.Rows(i)("partName") Dim partNameArray As String() = partName.Split("_") @@ -146,10 +146,10 @@ Public Class Multiple_3D End Try If partNameArray(0) = "FRAME" Then - childrenDestPaths.Add(Settings.folderPaths("object_" & Data.objectNum & "_models3D_frames_sw") & "\" & newName & + childrenDestPaths.Add(Settings2ABC.folderPaths("object_" & Data.objectNum & "_models3D_frames_sw") & "\" & newName & instanceCounter(newName.Substring(0, newName.Length - 1)) & ".SLDPRT") Else - childrenDestPaths.Add(Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw") & "\" & newName & + childrenDestPaths.Add(Settings2ABC.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw") & "\" & newName & instanceCounter(newName.Substring(0, newName.Length - 1)) & ".SLDPRT") End If Next diff --git a/Wardrobe/SolidWorks/Multiple_3D_Simplified.vb b/Wardrobe/SolidWorks/Multiple_3D_Simplified.vb index 8b55fa3..fdc276c 100644 --- a/Wardrobe/SolidWorks/Multiple_3D_Simplified.vb +++ b/Wardrobe/SolidWorks/Multiple_3D_Simplified.vb @@ -181,21 +181,21 @@ Public Class Multiple_3D_Simplified Dim childrenSourcePaths As New List(Of String) Dim childrenDestPaths As New List(Of String) - sourcePath = Settings.filesFolder & "\Files\CADStart\" & designName & ".SLDASM" + sourcePath = Settings2ABC.filesFolder & "\Files\CADStart\" & designName & ".SLDASM" - childrenSourcePaths.Add(Settings.HLCtFolder & "\HLCt\Parts\START.SLDPRT") + childrenSourcePaths.Add(Settings2ABC.HLCtFolder & "\HLCt\Parts\START.SLDPRT") Dim frameStr As String = "" If withFrame = True Then frameStr = "_WITH_FRAME" End If - destPath = Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\GRATINGS_ASSEMBLY_SIMPLIFIED" & frameStr & ".SLDASM" - childrenDestPaths.Add(Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\MASTER_SIMPLIFIED" & frameStr & ".SLDPRT") + destPath = Settings2ABC.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\GRATINGS_ASSEMBLY_SIMPLIFIED" & frameStr & ".SLDASM" + childrenDestPaths.Add(Settings2ABC.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\MASTER_SIMPLIFIED" & frameStr & ".SLDPRT") Dim instanceCounter As New Dictionary(Of String, Integer) For i = 0 To partDT.Rows.Count - 1 - childrenSourcePaths.Add(Settings.filesFolder & "\Files\CADStart\" & partDT.Rows(i)("partName") & ".SLDPRT") + childrenSourcePaths.Add(Settings2ABC.filesFolder & "\Files\CADStart\" & partDT.Rows(i)("partName") & ".SLDPRT") Dim partName As String = partDT.Rows(i)("partName") Dim partNameArray As String() = partName.Split("_") @@ -212,10 +212,10 @@ Public Class Multiple_3D_Simplified End Try If partNameArray(0) = "FRAME" Then - childrenDestPaths.Add(Settings.folderPaths("object_" & Data.objectNum & "_models3D_frames_sw") & "\" & newName & frameStr & + childrenDestPaths.Add(Settings2ABC.folderPaths("object_" & Data.objectNum & "_models3D_frames_sw") & "\" & newName & frameStr & instanceCounter(newName.Substring(0, newName.Length - 1)) & ".SLDPRT") Else - childrenDestPaths.Add(Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\" & newName & frameStr & + childrenDestPaths.Add(Settings2ABC.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\" & newName & frameStr & instanceCounter(newName.Substring(0, newName.Length - 1)) & ".SLDPRT") End If Next diff --git a/Wardrobe/SolidWorks/Multiple_Drawing.vb b/Wardrobe/SolidWorks/Multiple_Drawing.vb index f3b1e07..5bf430f 100644 --- a/Wardrobe/SolidWorks/Multiple_Drawing.vb +++ b/Wardrobe/SolidWorks/Multiple_Drawing.vb @@ -16,7 +16,7 @@ Public Class Multiple_Drawing Dim swSheet As Sheet swSheet = iDrawing.GetCurrentSheet() swSheet.SetProperties2(12, 12, 1, 1, False, swSheetWidth, swSheetHeight, True) - swSheet.SetTemplateName(Settings.HLCtFolder & "\Files Needed\A3 Part.slddrt") + swSheet.SetTemplateName(Settings2ABC.HLCtFolder & "\Files Needed\A3 Part.slddrt") swSheet.ReloadTemplate(True) swSheet.SetScale(1, 10, False, False) swSheet.SetName("Assembly") @@ -28,7 +28,7 @@ Public Class Multiple_Drawing Dim adjustedHeightPosInSheet As Double = swSheetHeight / 2 + 0.02 Dim myView As View - myView = iDrawing.CreateDrawViewFromModelView3(Settings.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\GRATINGS_ASSEMBLY_SIMPLIFIED.SLDASM", + myView = iDrawing.CreateDrawViewFromModelView3(Settings2ABC.folderPaths("object_" & Data.objectNum & "_models3D_gratings_sw_support") & "\GRATINGS_ASSEMBLY_SIMPLIFIED.SLDASM", "*Front", swSheetWidth / 2, adjustedHeightPosInSheet, 0) myView.UseSheetScale() = True myView.SetDisplayTangentEdges2(2) @@ -431,10 +431,10 @@ Public Class Multiple_Drawing Next Dim newName As String - newName = Settings.folderPaths("object_" & Data.objectNum & "_drawings_gratings_sw") & "\grating_drawing.SLDDRW" + newName = Settings2ABC.folderPaths("object_" & Data.objectNum & "_drawings_gratings_sw") & "\grating_drawing.SLDDRW" status = iDrawing.SaveAs3(newName, 0, 0) - status = iDrawing.SaveAs3(Settings.folderPaths("object_" & Data.objectNum & "_drawings_gratings_pdf") & "\grating_drawing.pdf", 0, 2) + status = iDrawing.SaveAs3(Settings2ABC.folderPaths("object_" & Data.objectNum & "_drawings_gratings_pdf") & "\grating_drawing.pdf", 0, 2) End Sub diff --git a/Wardrobe/Wardrobe.vbproj b/Wardrobe/Wardrobe.vbproj index 5346e35..f027285 100644 --- a/Wardrobe/Wardrobe.vbproj +++ b/Wardrobe/Wardrobe.vbproj @@ -97,7 +97,12 @@ Form - + + Settings.vb + + + Form + True @@ -140,6 +145,9 @@ Main_Menu.vb + + Settings.vb + VbMyResourcesResXFileCodeGenerator Resources.Designer.vb