diff --git a/Database/Databas.xlsx b/Database/Databas.xlsx new file mode 100644 index 0000000..8998c2e Binary files /dev/null and b/Database/Databas.xlsx differ diff --git a/Material.csv b/Database/Material.csv similarity index 100% rename from Material.csv rename to Database/Material.csv diff --git a/Meshes.csv b/Database/Meshes.csv similarity index 99% rename from Meshes.csv rename to Database/Meshes.csv index 1c6e650..61e018a 100644 --- a/Meshes.csv +++ b/Database/Meshes.csv @@ -1,4 +1,4 @@ -NAME,LB-SPACING,CB-SPACING,LB-HEIGHT,LB-THICKNESS,CB-DIAMETER,TYPE,MATERIAL,SERRATED,WHOLE MESHES +NAME [str],LB-SPACING [int],CB-SPACING [int],LB-HEIGHT [int],LB-THICKNESS [int],CB-DIAMETER [doub],TYPE [str],MATERIAL [str],SERRATED [bool],WHOLE MESHES [str] B9,12,100,20,3,6.5,Pressure Welded,Hot dip galvanized steel,0,B 12 B9,12,100,25,3,6.5,Pressure Welded,Hot dip galvanized steel,0,B 12 B9,12,100,30,3,6.5,Pressure Welded,Hot dip galvanized steel,0,B 12 diff --git a/Serrated.csv b/Database/Serrated.csv similarity index 87% rename from Serrated.csv rename to Database/Serrated.csv index 5cf1614..fcd79c3 100644 --- a/Serrated.csv +++ b/Database/Serrated.csv @@ -1,4 +1,4 @@ -TYPE,MATERIAL +TYPE [str],MATERIAL [str] Pressure Welded,Hot dip galvanized steel Pressure Welded,Stainless Steel (Pickled) Pressure Welded,Stainless Steel (Untreated) diff --git a/Whole Meshes.csv b/Database/Whole Meshes.csv similarity index 93% rename from Whole Meshes.csv rename to Database/Whole Meshes.csv index 349601e..3f3929b 100644 --- a/Whole Meshes.csv +++ b/Database/Whole Meshes.csv @@ -1,4 +1,4 @@ -H 33,H 34,F 25,D 22,N 16,N 17,B 12,I 100,J 41,JN 41,HN 35,A 22,A 33 +H 33 [int],H 34 [int],F 25 [int],D 22 [int],N 16 [int],N 17 [int],B 12 [int],I 100 [int],J 41 [int],JN 41 [int],HN 35 [int],A 22 [int],A 33 [int] 1000,1000,1000,1000,1000,1000,700,1000,1000,1000,1000,1000,1000 966,962,973,972,982,983,685,900,957,955,961,968,957 933,927,949,950,966,965,672,800,914,915,926,946,924 diff --git a/HLCt/Parts/~$START.SLDPRT b/HLCt/Parts/~$START.SLDPRT deleted file mode 100644 index b07f2ee..0000000 Binary files a/HLCt/Parts/~$START.SLDPRT and /dev/null differ diff --git a/Wardrobe/GUI.vb b/Wardrobe/GUI.vb index 29ed65d..0a4ecf4 100644 --- a/Wardrobe/GUI.vb +++ b/Wardrobe/GUI.vb @@ -2,8 +2,8 @@ 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\Documents" + Public Shared filepath As String = "C:\Users\Anton\Documents\Exjobb" + 'Public Shared filepath As String = "C:\Users\xperd\Documents" Dim excelApp As Excel.Application = New Excel.Application Dim excelWB As Excel.Workbook @@ -29,66 +29,18 @@ Public Class GUI End Sub Private Sub Get_Database() - 'excelWB = excelApp.Workbooks.Open(GUI_Settings.HLCtFolder & "\Databas.xlsx") - - 'For i = 1 To 4 'excelWB.Worksheets.Count - ' Dim activeSheet As Excel.Worksheet - ' activeSheet = excelWB.Sheets(i) - - ' Dim tempDT As New DataTable - - ' Dim numOfColumns As Integer = 0 - ' Dim columnCounter As Integer = 1 - ' Dim rowCounter As Integer - ' Dim rowValue As String - ' Dim longestRow As Integer = 0 - ' Dim columnName As String = activeSheet.Cells(1, columnCounter).Value - ' While columnName <> "" - ' tempDT.Columns.Add(columnName, GetType(String)) - - ' rowCounter = 2 - ' rowValue = activeSheet.Cells(rowCounter, numOfColumns + 1).Value - ' While rowValue <> "" - ' rowCounter = rowCounter + 1 - ' rowValue = activeSheet.Cells(rowCounter, numOfColumns + 1).Value - ' End While - ' If rowCounter > longestRow Then - ' longestRow = rowCounter - ' End If - - ' columnCounter = columnCounter + 1 - ' columnName = activeSheet.Cells(1, columnCounter).Value - ' numOfColumns = numOfColumns + 1 - ' End While - - ' For j = 2 To longestRow - 1 - ' tempDT.Rows.Add() - ' For k = 0 To numOfColumns - 1 - ' tempDT.Rows(tempDT.Rows.Count - 1)(k) = activeSheet.Cells(j, k + 1).Value - ' Next - ' Next - - ' dataBase.Add(activeSheet.Name, tempDT) - - ' System.Runtime.InteropServices.Marshal.ReleaseComObject(activeSheet) - 'Next - - 'excelWB.Close() - 'excelApp.Quit() - 'System.Runtime.InteropServices.Marshal.ReleaseComObject(excelWB) - 'System.Runtime.InteropServices.Marshal.ReleaseComObject(excelApp) - 'Make csv files of each sheet in excel Dim excelApp As Excel.Application = New Excel.Application Dim excelWB As Excel.Workbook + excelApp.DisplayAlerts = False Dim wSNames As New List(Of String) - excelWB = excelApp.Workbooks.Open(GUI_Settings.HLCtFolder & "\Databas.xlsx") + excelWB = excelApp.Workbooks.Open(GUI_Settings.HLCtFolder & "\Database\Databas.xlsx") For i = 1 To 4 Dim activeSheet As Excel.Worksheet activeSheet = excelWB.Sheets(i) wSNames.Add(activeSheet.Name) - activeSheet.SaveAs(GUI_Settings.HLCtFolder & "\" & wSNames(i - 1), Excel.XlFileFormat.xlCSV) + activeSheet.SaveAs(GUI_Settings.HLCtFolder & "\Database\" & wSNames(i - 1), Excel.XlFileFormat.xlCSV) System.Runtime.InteropServices.Marshal.ReleaseComObject(activeSheet) Next @@ -103,28 +55,43 @@ Public Class GUI 'Read all CSV files to datatables For i = 0 To wSNames.Count - 1 - Dim lines = IO.File.ReadAllLines(GUI_Settings.HLCtFolder & "\" & wSNames(i) & ".csv") + Dim lines = IO.File.ReadAllLines(GUI_Settings.HLCtFolder & "\Database\" & wSNames(i) & ".csv") Dim tempDT As New DataTable Dim words As String() = lines(0).Split(New Char() {","c}) For j = 0 To words.Count - 1 Dim colName As String = words(j).Split("[")(0) + colName = colName.Substring(0, colName.Length - 1) Dim type As String = words(j).Split("[")(1).Split("]")(0) - tempDT.Columns.Add(words(j), GetType(String)) + If type = "str" Then + tempDT.Columns.Add(colName, GetType(String)) + ElseIf type = "int" Then + tempDT.Columns.Add(colName, GetType(Integer)) + ElseIf type = "doub" Then + tempDT.Columns.Add(colName, GetType(String)) 'FIXA + Else + tempDT.Columns.Add(colName, GetType(Boolean)) + End If Next For j = 1 To lines.Count - 1 Dim values As String() = lines(j).Split(New Char() {","c}) tempDT.Rows.Add() For k = 0 To values.Count - 1 - tempDT.Rows(tempDT.Rows.Count - 1)(k) = values(k) + Try + tempDT.Rows(tempDT.Rows.Count - 1)(k) = values(k) + Catch ex As Exception + If values(k) <> "" AndAlso values(k) = 0 Then + tempDT.Rows(tempDT.Rows.Count - 1)(k) = False + ElseIf values(k) <> "" AndAlso values(k) = 1 Then + tempDT.Rows(tempDT.Rows.Count - 1)(k) = True + End If + End Try Next Next dataBase.Add(wSNames(i), tempDT) - Next - End Sub Public Sub Create_TextBox(TextBoxName As String, TextBoxText As String, TextBoxLeft As Integer, TextBoxTop As Integer, @@ -238,7 +205,7 @@ Public Class GUI ' ---------------------------------- Export to SW ---------------------------------- ' --- When export to SW button is pressed --- Private Sub ExportSWButton_Click(sender As Object, e As EventArgs) Handles ExportSWButton.Click - SW_HLCt_Gratings.BuildGrating() + 'SW_HLCt_Gratings.BuildGrating() SW_Drawing_Gratings.CreateDrawing() End Sub diff --git a/Wardrobe/GUI_Drawing_Panel.vb b/Wardrobe/GUI_Drawing_Panel.vb index 49c0575..d666961 100644 --- a/Wardrobe/GUI_Drawing_Panel.vb +++ b/Wardrobe/GUI_Drawing_Panel.vb @@ -193,10 +193,18 @@ Dim mesName As String = sideSquareMesLine.Keys(i) e.Graphics.DrawLine(penMes, sideSquareMesLine(mesName)(0), sideSquareMesLine(mesName)(1), sideSquareMesLine(mesName)(2), sideSquareMesLine(mesName)(3)) - e.Graphics.DrawLine(penMes, sideSquareMesLine(mesName)(0), sideSquareMesLine(mesName)(1) + 2, - sideSquareMesLine(mesName)(0), sideSquareMesLine(mesName)(1) - 2) - e.Graphics.DrawLine(penMes, sideSquareMesLine(mesName)(2), sideSquareMesLine(mesName)(1) + 2, - sideSquareMesLine(mesName)(2), sideSquareMesLine(mesName)(1) - 2) + + If GUI_Functions.pointsMeasurements(mesName)(2) = 1 OrElse GUI_Functions.pointsMeasurements(mesName)(2) = 3 Then + e.Graphics.DrawLine(penMes, sideSquareMesLine(mesName)(0), sideSquareMesLine(mesName)(1) + 2, + sideSquareMesLine(mesName)(0), sideSquareMesLine(mesName)(1) - 2) + e.Graphics.DrawLine(penMes, sideSquareMesLine(mesName)(2), sideSquareMesLine(mesName)(1) + 2, + sideSquareMesLine(mesName)(2), sideSquareMesLine(mesName)(1) - 2) + Else + e.Graphics.DrawLine(penMes, sideSquareMesLine(mesName)(0) + 2, sideSquareMesLine(mesName)(1), + sideSquareMesLine(mesName)(0) - 2, sideSquareMesLine(mesName)(1)) + e.Graphics.DrawLine(penMes, sideSquareMesLine(mesName)(0) + 2, sideSquareMesLine(mesName)(3), + sideSquareMesLine(mesName)(0) - 2, sideSquareMesLine(mesName)(3)) + End If Next diff --git a/Wardrobe/GUI_Functions.vb b/Wardrobe/GUI_Functions.vb index 615ebea..9d27361 100644 --- a/Wardrobe/GUI_Functions.vb +++ b/Wardrobe/GUI_Functions.vb @@ -125,7 +125,7 @@ AddHandler pointButton.Click, AddressOf PointButton_Click End If Next - pointCounter = pointCounter + 1 + pointCounter += 1 End If ElseIf GUI.DrawingPanel.Controls.Count > 2 Then @@ -137,7 +137,7 @@ End If Next - pointCounter = pointCounter - 1 + pointCounter -= 1 End If End Sub @@ -201,7 +201,7 @@ GUI.DrawingPanel.Controls.RemoveAt(2) Next - pointCounter = pointCounter - 1 + pointCounter -= 1 End If End Sub @@ -323,30 +323,48 @@ End If End If - 'pointsMeasurements.Add("SS_" & mesNum, {GUI_Drawing_Panel.pointsOrder.IndexOf(sidePoints(0)) + 1, index + 2, 1}) + For i = 2 To pointsMeasurements.Count - 1 Dim mesName As String = pointsMeasurements.Keys(i) - If mesName.Split("_")(0) = "SS" AndAlso index + 2 = pointsMeasurements(mesName)(1) Then + If mesName.Split("_")(0) = "SS1" AndAlso index + 2 = pointsMeasurements(mesName)(1) Then If GUI_Drawing_Panel.measureLabels(mesName)(3) = 1 Then - GUI_Drawing_Panel.measureLabels(mesName)(0) = GUI_Drawing_Panel.measureLabels(mesName)(0) - - CInt(GUI.Controls("Off_TextBox").Text) - - (GUI_Drawing_Panel.points(GUI_Drawing_Panel.pointsOrder(index))(2) * 1000 + GUI_Gratings_Data.gratingMaxL / 2) - - CInt(GUI.Controls("X_TextBox").Text) + GUI_Drawing_Panel.measureLabels(mesName)(0) = GUI_Drawing_Panel.points(GUI_Drawing_Panel.pointsOrder(index + 1))(2) * 1000 - + GUI_Drawing_Panel.pCon1(2) * 1000 - (sideSquareValues(2) + sideSquareValues(0)) + + GUI_Drawing_Panel.sideSquareMesLine(mesName)(0) = GUI_Drawing_Panel.pCon1(0) + (sideSquareValues(2) + sideSquareValues(0)) / (GUI_Drawing_Panel.scaleDiff) + + GUI_Drawing_Panel.measureLabels(mesName)(1) = (GUI_Drawing_Panel.sideSquareMesLine(mesName)(0) + GUI_Drawing_Panel.sideSquareMesLine(mesName)(2)) / 2 - 8 + + ElseIf GUI_Drawing_Panel.measureLabels(mesName)(3) = 2 Then + GUI_Drawing_Panel.measureLabels(mesName)(0) = GUI_Drawing_Panel.pCon2(3) * 1000 - GUI_Drawing_Panel.points(GUI_Drawing_Panel.pointsOrder(index + 1))(3) * 1000 - + (sideSquareValues(2) + sideSquareValues(1)) + + GUI_Drawing_Panel.sideSquareMesLine(mesName)(1) = GUI_Drawing_Panel.pCon2(1) + (sideSquareValues(2) + sideSquareValues(1)) / (GUI_Drawing_Panel.scaleDiff) + + GUI_Drawing_Panel.measureLabels(mesName)(2) = (GUI_Drawing_Panel.sideSquareMesLine(mesName)(1) + GUI_Drawing_Panel.sideSquareMesLine(mesName)(3)) / 2 - 6 + + ElseIf GUI_Drawing_Panel.measureLabels(mesName)(3) = 3 Then + 'FIX + Else + End If - End If + End If Next For i = 2 To pointsMeasurements.Count - 1 Dim mesName As String = pointsMeasurements.Keys(i) - If index + 1 < pointsMeasurements(mesName)(0) Then + If mesName.Split("_")(0) <> "SS1" AndAlso index + 1 < pointsMeasurements(mesName)(0) Then pointsMeasurements(mesName)(0) = pointsMeasurements(mesName)(0) + 4 pointsMeasurements(mesName)(1) = pointsMeasurements(mesName)(1) + 4 + ElseIf mesName.Split("_")(0) = "SS1" AndAlso index + 2 <= pointsMeasurements(mesName)(1) Then + pointsMeasurements(mesName)(1) = pointsMeasurements(mesName)(1) + 4 End If Next + Dim mesNum As Integer = pointsMeasurements.Count - 1 If sidePressed = 1 Then GUI_Drawing_Panel.points.Add("pSS" & pointCounter * 4 - 3, @@ -375,19 +393,19 @@ pointsMeasurements("Wmes")(1) = pointsMeasurements("Wmes")(1) + 4 'SideSquare measurements - pointsMeasurements.Add("SS_" & mesNum, {GUI_Drawing_Panel.pointsOrder.IndexOf(sidePoints(0)) + 1, index + 2, 1}) + pointsMeasurements.Add("SS1_" & mesNum, {GUI_Drawing_Panel.pointsOrder.IndexOf(sidePoints(0)) + 1, index + 2, 1}) pointsMeasurements.Add("SS_" & mesNum + 1, {index + 2, index + 5, 1}) pointsMeasurements.Add("SS_" & mesNum + 2, {index + 2, index + 3, 4}) 'Support Line for sidesquare measurement - GUI_Drawing_Panel.sideSquareMesLine.Add("SS_" & mesNum, {GUI_Drawing_Panel.points(GUI_Drawing_Panel.pointsOrder(index))(0), + GUI_Drawing_Panel.sideSquareMesLine.Add("SS1_" & mesNum, {GUI_Drawing_Panel.points(GUI_Drawing_Panel.pointsOrder(index))(0), GUI_Drawing_Panel.pCon1(1) - 15, GUI_Drawing_Panel.pCon1(0) + sideSquareValues(2) / (GUI_Drawing_Panel.scaleDiff), GUI_Drawing_Panel.pCon1(1) - 15}) 'Label - GUI_Drawing_Panel.measureLabels.Add("SS_" & mesNum, {CInt(GUI.Controls("Off_TextBox").Text) - (GUI_Drawing_Panel.points(GUI_Drawing_Panel.pointsOrder(index))(2) * 1000 + GUI_Gratings_Data.gratingMaxL / 2), + GUI_Drawing_Panel.measureLabels.Add("SS1_" & mesNum, {CInt(GUI.Controls("Off_TextBox").Text) - (GUI_Drawing_Panel.points(GUI_Drawing_Panel.pointsOrder(index))(2) * 1000 + GUI_Gratings_Data.gratingMaxL / 2), (GUI_Drawing_Panel.points(GUI_Drawing_Panel.pointsOrder(index))(0) + GUI_Drawing_Panel.pCon1(0) + sideSquareValues(2) / (GUI_Drawing_Panel.scaleDiff)) / 2 - 8, GUI_Drawing_Panel.pCon1(1) - 15 - 12 - 3, 1}) '15 är linjen, 12 är textens höjd, 3 är lite extra @@ -397,7 +415,7 @@ 1}) GUI_Drawing_Panel.measureLabels.Add("SS_" & mesNum + 2, {CInt(GUI.Controls("Y_TextBox").Text), GUI_Drawing_Panel.pCon1(0) + sideSquareValues(2) / (GUI_Drawing_Panel.scaleDiff) - 18 - 3, - GUI_Drawing_Panel.pCon1(1) + CInt(GUI.Controls("Y_TextBox").Text) / (2 * GUI_Drawing_Panel.scaleDiff), + GUI_Drawing_Panel.pCon1(1) + CInt(GUI.Controls("Y_TextBox").Text) / (2 * GUI_Drawing_Panel.scaleDiff) - 4, 1}) @@ -426,10 +444,32 @@ pointsMeasurements("Wmes")(1) = pointsMeasurements("Wmes")(1) + 4 'SideSquare measurements - pointsMeasurements.Add("SS_" & mesNum, {GUI_Drawing_Panel.pointsOrder.IndexOf(sidePoints(0)) + 1, index + 2, 2}) + pointsMeasurements.Add("SS1_" & mesNum, {GUI_Drawing_Panel.pointsOrder.IndexOf(sidePoints(0)) + 1, index + 2, 2}) pointsMeasurements.Add("SS_" & mesNum + 1, {index + 2, index + 5, 2}) pointsMeasurements.Add("SS_" & mesNum + 2, {index + 2, index + 3, 3}) + 'Support Line for sidesquare measurement + GUI_Drawing_Panel.sideSquareMesLine.Add("SS1_" & mesNum, {GUI_Drawing_Panel.pCon2(0) + 15, + GUI_Drawing_Panel.points(GUI_Drawing_Panel.pointsOrder(index))(1), + GUI_Drawing_Panel.pCon2(0) + 15, + GUI_Drawing_Panel.pCon2(1) + sideSquareValues(2) / (GUI_Drawing_Panel.scaleDiff)}) + + 'Label + GUI_Drawing_Panel.measureLabels.Add("SS1_" & mesNum, {CInt(GUI.Controls("Off_TextBox").Text) - (GUI_Gratings_Data.gratingMaxW / 2 - GUI_Drawing_Panel.points(GUI_Drawing_Panel.pointsOrder(index))(3) * 1000), + GUI_Drawing_Panel.pCon2(0) + 15 + 3, + (GUI_Drawing_Panel.points(GUI_Drawing_Panel.pointsOrder(index))(1) + GUI_Drawing_Panel.pCon2(1) + sideSquareValues(2) / (GUI_Drawing_Panel.scaleDiff)) / 2 - 4, + 2}) + + GUI_Drawing_Panel.measureLabels.Add("SS_" & mesNum + 1, {CInt(GUI.Controls("Y_TextBox").Text), + GUI_Drawing_Panel.pCon2(0) - sideSquareValues(0) / (GUI_Drawing_Panel.scaleDiff) - 18 - 3, + GUI_Drawing_Panel.pCon2(1) + (sideSquareValues(2) + sideSquareValues(1) / 2) / GUI_Drawing_Panel.scaleDiff - 4, + 2}) + + GUI_Drawing_Panel.measureLabels.Add("SS_" & mesNum + 2, {CInt(GUI.Controls("X_TextBox").Text), + GUI_Drawing_Panel.pCon2(0) - sideSquareValues(0) / (2 * GUI_Drawing_Panel.scaleDiff) - 8, + GUI_Drawing_Panel.pCon2(1) + sideSquareValues(2) / (GUI_Drawing_Panel.scaleDiff) - 15 - 3, + 2}) + ElseIf sidePressed = 3 Then GUI_Drawing_Panel.points.Add("pSS" & pointCounter * 4 - 3, {GUI_Drawing_Panel.pCon1(0) + (sideSquareValues(2) + sideSquareValues(0)) / (GUI_Drawing_Panel.scaleDiff), @@ -452,7 +492,7 @@ GUI_Drawing_Panel.pCon1(2) + sideSquareValues(2) / 1000, GUI_Drawing_Panel.pCon3(3)}) - pointsMeasurements.Add("SS_" & mesNum, {GUI_Drawing_Panel.pointsOrder.IndexOf(sidePoints(0)) + 1, index + 2, 3}) + pointsMeasurements.Add("SS1_" & mesNum, {GUI_Drawing_Panel.pointsOrder.IndexOf(sidePoints(0)) + 1, index + 2, 3}) pointsMeasurements.Add("SS_" & mesNum + 1, {index + 2, index + 5, 3}) pointsMeasurements.Add("SS_" & mesNum + 2, {index + 2, index + 3, 4}) Else @@ -477,7 +517,7 @@ GUI_Drawing_Panel.pCon1(2), GUI_Drawing_Panel.pCon2(3) - sideSquareValues(2) / 1000}) - pointsMeasurements.Add("SS_" & mesNum, {GUI_Drawing_Panel.pointsOrder.IndexOf(sidePoints(0)) + 1, index + 2, 4}) + pointsMeasurements.Add("SS1_" & mesNum, {GUI_Drawing_Panel.pointsOrder.IndexOf(sidePoints(0)) + 1, index + 2, 4}) pointsMeasurements.Add("SS_" & mesNum + 1, {index + 2, index + 5, 4}) pointsMeasurements.Add("SS_" & mesNum + 2, {index + 2, index + 3, 3}) End If @@ -554,33 +594,43 @@ For i = 2 To pointsMeasurements.Count - 1 Dim mesName As String = pointsMeasurements.Keys(i) - If index + 1 = pointsMeasurements(mesName)(0) Then - If GUI_Drawing_Panel.measureLabels(mesName)(3) = 1 Then - GUI_Drawing_Panel.measureLabels(mesName)(0) = GUI_Drawing_Panel.measureLabels(mesName)(0) - GUI.Controls("X_TextBox").Text - GUI_Drawing_Panel.measureLabels(mesName)(1) = GUI_Drawing_Panel.measureLabels(mesName)(1) + d1P / 2 - ElseIf GUI_Drawing_Panel.measureLabels(mesName)(3) = 2 Then - GUI_Drawing_Panel.measureLabels(mesName)(0) = GUI_Drawing_Panel.measureLabels(mesName)(0) - GUI.Controls("Y_TextBox").Text - GUI_Drawing_Panel.measureLabels(mesName)(2) = GUI_Drawing_Panel.measureLabels(mesName)(2) + d2P / 2 - ElseIf GUI_Drawing_Panel.measureLabels(mesName)(3) = 3 Then - GUI_Drawing_Panel.measureLabels(mesName)(0) = GUI_Drawing_Panel.measureLabels(mesName)(0) - GUI.Controls("X_TextBox").Text - GUI_Drawing_Panel.measureLabels(mesName)(1) = GUI_Drawing_Panel.measureLabels(mesName)(1) - d1P / 2 - Else - GUI_Drawing_Panel.measureLabels(mesName)(0) = GUI_Drawing_Panel.measureLabels(mesName)(0) - GUI.Controls("Y_TextBox").Text - GUI_Drawing_Panel.measureLabels(mesName)(2) = GUI_Drawing_Panel.measureLabels(mesName)(2) - d2P / 2 + If mesName.Split("_")(0) <> "SS1" AndAlso mesName.Split("_")(0) <> "SS" Then + If index + 1 = pointsMeasurements(mesName)(0) Then + If GUI_Drawing_Panel.measureLabels(mesName)(3) = 1 Then + GUI_Drawing_Panel.measureLabels(mesName)(0) = GUI_Drawing_Panel.measureLabels(mesName)(0) - GUI.Controls("X_TextBox").Text + GUI_Drawing_Panel.measureLabels(mesName)(1) = GUI_Drawing_Panel.measureLabels(mesName)(1) + d1P / 2 + ElseIf GUI_Drawing_Panel.measureLabels(mesName)(3) = 2 Then + GUI_Drawing_Panel.measureLabels(mesName)(0) = GUI_Drawing_Panel.measureLabels(mesName)(0) - GUI.Controls("Y_TextBox").Text + GUI_Drawing_Panel.measureLabels(mesName)(2) = GUI_Drawing_Panel.measureLabels(mesName)(2) + d2P / 2 + ElseIf GUI_Drawing_Panel.measureLabels(mesName)(3) = 3 Then + GUI_Drawing_Panel.measureLabels(mesName)(0) = GUI_Drawing_Panel.measureLabels(mesName)(0) - GUI.Controls("X_TextBox").Text + GUI_Drawing_Panel.measureLabels(mesName)(1) = GUI_Drawing_Panel.measureLabels(mesName)(1) - d1P / 2 + Else + GUI_Drawing_Panel.measureLabels(mesName)(0) = GUI_Drawing_Panel.measureLabels(mesName)(0) - GUI.Controls("Y_TextBox").Text + GUI_Drawing_Panel.measureLabels(mesName)(2) = GUI_Drawing_Panel.measureLabels(mesName)(2) - d2P / 2 + End If + ElseIf index + 1 = pointsMeasurements(mesName)(1) Then + If GUI_Drawing_Panel.measureLabels(mesName)(3) = 1 Then + GUI_Drawing_Panel.measureLabels(mesName)(0) = GUI_Drawing_Panel.measureLabels(mesName)(0) - GUI.Controls("Y_TextBox").Text + GUI_Drawing_Panel.measureLabels(mesName)(2) = GUI_Drawing_Panel.measureLabels(mesName)(2) + d2P / 2 + ElseIf GUI_Drawing_Panel.measureLabels(mesName)(3) = 2 Then + GUI_Drawing_Panel.measureLabels(mesName)(0) = GUI_Drawing_Panel.measureLabels(mesName)(0) - GUI.Controls("X_TextBox").Text + GUI_Drawing_Panel.measureLabels(mesName)(1) = GUI_Drawing_Panel.measureLabels(mesName)(1) - d1P / 2 + ElseIf GUI_Drawing_Panel.measureLabels(mesName)(3) = 3 Then + GUI_Drawing_Panel.measureLabels(mesName)(0) = GUI_Drawing_Panel.measureLabels(mesName)(0) - GUI.Controls("Y_TextBox").Text + GUI_Drawing_Panel.measureLabels(mesName)(2) = GUI_Drawing_Panel.measureLabels(mesName)(2) - d2P / 2 + Else + GUI_Drawing_Panel.measureLabels(mesName)(0) = GUI_Drawing_Panel.measureLabels(mesName)(0) - GUI.Controls("X_TextBox").Text + GUI_Drawing_Panel.measureLabels(mesName)(1) = GUI_Drawing_Panel.measureLabels(mesName)(1) + d1P / 2 + End If End If - ElseIf index + 1 = pointsMeasurements(mesName)(1) Then + + ElseIf mesName.Split("_")(0) = "SS1" AndAlso index + 2 = pointsMeasurements(mesName)(1) Then If GUI_Drawing_Panel.measureLabels(mesName)(3) = 1 Then - GUI_Drawing_Panel.measureLabels(mesName)(0) = GUI_Drawing_Panel.measureLabels(mesName)(0) - GUI.Controls("Y_TextBox").Text - GUI_Drawing_Panel.measureLabels(mesName)(2) = GUI_Drawing_Panel.measureLabels(mesName)(2) + d2P / 2 - ElseIf GUI_Drawing_Panel.measureLabels(mesName)(3) = 2 Then - GUI_Drawing_Panel.measureLabels(mesName)(0) = GUI_Drawing_Panel.measureLabels(mesName)(0) - GUI.Controls("X_TextBox").Text - GUI_Drawing_Panel.measureLabels(mesName)(1) = GUI_Drawing_Panel.measureLabels(mesName)(1) - d1P / 2 - ElseIf GUI_Drawing_Panel.measureLabels(mesName)(3) = 3 Then - GUI_Drawing_Panel.measureLabels(mesName)(0) = GUI_Drawing_Panel.measureLabels(mesName)(0) - GUI.Controls("Y_TextBox").Text - GUI_Drawing_Panel.measureLabels(mesName)(2) = GUI_Drawing_Panel.measureLabels(mesName)(2) - d2P / 2 - Else GUI_Drawing_Panel.measureLabels(mesName)(0) = GUI_Drawing_Panel.measureLabels(mesName)(0) - GUI.Controls("X_TextBox").Text GUI_Drawing_Panel.measureLabels(mesName)(1) = GUI_Drawing_Panel.measureLabels(mesName)(1) + d1P / 2 + + GUI_Drawing_Panel.sideSquareMesLine(mesName)(0) = GUI_Drawing_Panel.sideSquareMesLine(mesName)(0) + d1P End If End If Next