diff --git a/Databas.xlsx b/Databas.xlsx index e869fdb..f90c48b 100644 Binary files a/Databas.xlsx and b/Databas.xlsx differ diff --git a/HLCt/Parts/~$START.SLDPRT b/HLCt/Parts/~$START.SLDPRT new file mode 100644 index 0000000..214926b Binary files /dev/null and b/HLCt/Parts/~$START.SLDPRT differ diff --git a/Wardrobe/GUI.vb b/Wardrobe/GUI.vb index 8bf68b7..e8d1585 100644 --- a/Wardrobe/GUI.vb +++ b/Wardrobe/GUI.vb @@ -1,8 +1,9 @@ Imports XCCLibrary +Imports Excel = Microsoft.Office.Interop.Excel Public Class GUI - 'Public Shared filepath As String = "C:\Users\Anton\Documents\Exjobb" - Public Shared filepath As String = "C:\Users\xperd\OneDrive\Dokument\Exjobb" + Public Shared filepath As String = "C:\Users\Anton\Documents\Exjobb" + 'Public Shared filepath As String = "C:\Users\xperd\OneDrive\Dokument\Exjobb" Dim filesFolder As String = filepath ' Hämta från settings Dim HLCtFolder As String = filepath & "\X2021" ' Hämta från settings @@ -37,6 +38,10 @@ Public Class GUI Dim angleFunctionActive As Boolean = False Dim squareFunctionActive As Boolean = False + Dim excelApp As Excel.Application = New Excel.Application + Dim excelWB As Excel.Workbook + Dim excelSheet As Excel.Worksheet + ' --- Start method (main) for GUI --- Sub GUI_load() Handles MyBase.Load containerPanel = DrawingPanel @@ -675,7 +680,16 @@ Public Class GUI ' --- Settings button clicked --- Private Sub SettingsButton_Click(sender As Object, e As EventArgs) Handles SettingsButton.Click - Program.Update_KB() + 'Program.Update_KB() + + excelWB = excelApp.Workbooks.Open(HLCtFolder & "\Databas.xlsx") + + excelSheet = excelWB.Sheets("Pressure_welded") 'Call sheet by name + 'excelSheet = excelWB.Sheets(1) 'Call sheet by number + + Dim temp1 As String = excelSheet.Range("A64").Value 'Call cell by name + Dim temp2 As Excel.XlPattern = excelSheet.Cells(79, 1).style.interior.pattern 'Call cell by row and column index + End Sub ' --- When export to SW button is pressed --- diff --git a/Wardrobe/Wardrobe.vbproj b/Wardrobe/Wardrobe.vbproj index 73a1b84..77f04be 100644 --- a/Wardrobe/Wardrobe.vbproj +++ b/Wardrobe/Wardrobe.vbproj @@ -123,6 +123,24 @@ + + {2DF8D04C-5BFA-101B-BDE5-00AA0044DE52} + 2 + 8 + 0 + primary + False + True + + + {00020813-0000-0000-C000-000000000046} + 1 + 9 + 0 + primary + False + True + {83A33D31-27C5-11CE-BFD4-00400513BB57} 28 @@ -132,6 +150,15 @@ False True + + {0002E157-0000-0000-C000-000000000046} + 5 + 3 + 0 + primary + False + True +