sidesquare measurement
This commit is contained in:
Mans
parent
3923247b8e
commit
4ade30f8ef
|
|
@ -2,8 +2,8 @@
|
||||||
Imports Excel = Microsoft.Office.Interop.Excel
|
Imports Excel = Microsoft.Office.Interop.Excel
|
||||||
|
|
||||||
Public Class GUI
|
Public Class GUI
|
||||||
Public Shared filepath As String = "C:\Users\Anton\Documents\Exjobb"
|
'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\xperd\Documents"
|
||||||
|
|
||||||
Dim excelApp As Excel.Application = New Excel.Application
|
Dim excelApp As Excel.Application = New Excel.Application
|
||||||
Dim excelWB As Excel.Workbook
|
Dim excelWB As Excel.Workbook
|
||||||
|
|
@ -190,7 +190,7 @@ Public Class GUI
|
||||||
' ---------------------------------- Export to SW ----------------------------------
|
' ---------------------------------- Export to SW ----------------------------------
|
||||||
' --- When export to SW button is pressed ---
|
' --- When export to SW button is pressed ---
|
||||||
Private Sub ExportSWButton_Click(sender As Object, e As EventArgs) Handles ExportSWButton.Click
|
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()
|
SW_Drawing_Gratings.CreateDrawing()
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -22,6 +22,8 @@
|
||||||
Public Shared anglePoints As New Dictionary(Of String, Integer())
|
Public Shared anglePoints As New Dictionary(Of String, Integer())
|
||||||
Public Shared anglePointsComp As New Dictionary(Of String, String())
|
Public Shared anglePointsComp As New Dictionary(Of String, String())
|
||||||
|
|
||||||
|
Public Shared sideSquareMesLine As New Dictionary(Of String, Integer())
|
||||||
|
|
||||||
|
|
||||||
Public Shared Sub Load_DrawingPanel()
|
Public Shared Sub Load_DrawingPanel()
|
||||||
Get_DrawboxParameters()
|
Get_DrawboxParameters()
|
||||||
|
|
@ -185,6 +187,19 @@
|
||||||
New Point(measureLabels(mesName)(1), measureLabels(mesName)(2)))
|
New Point(measureLabels(mesName)(1), measureLabels(mesName)(2)))
|
||||||
Next
|
Next
|
||||||
|
|
||||||
|
'Stöd measuremnet linje för sidesquare
|
||||||
|
Dim penMes As Pen = New Pen(Color.Gray, 1)
|
||||||
|
For i = 0 To sideSquareMesLine.Count - 1
|
||||||
|
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)
|
||||||
|
Next
|
||||||
|
|
||||||
|
|
||||||
Dim Pendot As Pen = New Pen(Color.Gray, 1)
|
Dim Pendot As Pen = New Pen(Color.Gray, 1)
|
||||||
Pendot.DashPattern = {2, 4}
|
Pendot.DashPattern = {2, 4}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -323,98 +323,149 @@
|
||||||
End If
|
End If
|
||||||
End If
|
End If
|
||||||
|
|
||||||
|
For i = 2 To pointsMeasurements.Count - 1
|
||||||
|
Dim mesName As String = pointsMeasurements.Keys(i)
|
||||||
|
If index + 1 < pointsMeasurements(mesName)(0) Then
|
||||||
|
pointsMeasurements(mesName)(0) = pointsMeasurements(mesName)(0) + 4
|
||||||
|
pointsMeasurements(mesName)(1) = pointsMeasurements(mesName)(1) + 4
|
||||||
|
End If
|
||||||
|
Next
|
||||||
|
Dim mesNum As Integer = pointsMeasurements.Count - 1
|
||||||
If sidePressed = 1 Then
|
If sidePressed = 1 Then
|
||||||
GUI_Drawing_Panel.points.Add("pSS" & pointCounter * 4 - 3,
|
GUI_Drawing_Panel.points.Add("pSS" & pointCounter * 4 - 3,
|
||||||
{GUI_Drawing_Panel.pCon1(0) + sideSquareValues(2) / (GUI_Drawing_Panel.scaleDiff),
|
{GUI_Drawing_Panel.pCon1(0) + sideSquareValues(2) / (GUI_Drawing_Panel.scaleDiff),
|
||||||
GUI_Drawing_Panel.pCon1(1),
|
GUI_Drawing_Panel.pCon1(1),
|
||||||
GUI_Drawing_Panel.pCon1(2) + sideSquareValues(2),
|
GUI_Drawing_Panel.pCon1(2) + sideSquareValues(2) / 1000,
|
||||||
GUI_Drawing_Panel.pCon1(3)})
|
GUI_Drawing_Panel.pCon1(3)})
|
||||||
GUI_Drawing_Panel.points.Add("pSS" & pointCounter * 4 - 2,
|
GUI_Drawing_Panel.points.Add("pSS" & pointCounter * 4 - 2,
|
||||||
{GUI_Drawing_Panel.pCon1(0) + sideSquareValues(2) / (GUI_Drawing_Panel.scaleDiff),
|
{GUI_Drawing_Panel.pCon1(0) + sideSquareValues(2) / (GUI_Drawing_Panel.scaleDiff),
|
||||||
GUI_Drawing_Panel.pCon1(1) + sideSquareValues(1) / (GUI_Drawing_Panel.scaleDiff),
|
GUI_Drawing_Panel.pCon1(1) + sideSquareValues(1) / (GUI_Drawing_Panel.scaleDiff),
|
||||||
GUI_Drawing_Panel.pCon1(2) + sideSquareValues(2),
|
GUI_Drawing_Panel.pCon1(2) + sideSquareValues(2) / 1000,
|
||||||
GUI_Drawing_Panel.pCon1(3) + sideSquareValues(1)})
|
GUI_Drawing_Panel.pCon1(3) - sideSquareValues(1) / 1000})
|
||||||
GUI_Drawing_Panel.points.Add("pSS" & pointCounter * 4 - 1,
|
GUI_Drawing_Panel.points.Add("pSS" & pointCounter * 4 - 1,
|
||||||
{GUI_Drawing_Panel.pCon1(0) + (sideSquareValues(2) + sideSquareValues(0)) / (GUI_Drawing_Panel.scaleDiff),
|
{GUI_Drawing_Panel.pCon1(0) + (sideSquareValues(2) + sideSquareValues(0)) / (GUI_Drawing_Panel.scaleDiff),
|
||||||
GUI_Drawing_Panel.pCon1(1) + sideSquareValues(1) / (GUI_Drawing_Panel.scaleDiff),
|
GUI_Drawing_Panel.pCon1(1) + sideSquareValues(1) / (GUI_Drawing_Panel.scaleDiff),
|
||||||
GUI_Drawing_Panel.pCon1(2) + sideSquareValues(2) + sideSquareValues(0),
|
GUI_Drawing_Panel.pCon1(2) + (sideSquareValues(2) + sideSquareValues(0)) / 1000,
|
||||||
GUI_Drawing_Panel.pCon1(3) + sideSquareValues(1)})
|
GUI_Drawing_Panel.pCon1(3) - sideSquareValues(1) / 1000})
|
||||||
GUI_Drawing_Panel.points.Add("pSS" & pointCounter * 4,
|
GUI_Drawing_Panel.points.Add("pSS" & pointCounter * 4,
|
||||||
{GUI_Drawing_Panel.pCon1(0) + (sideSquareValues(2) + sideSquareValues(0)) / (GUI_Drawing_Panel.scaleDiff),
|
{GUI_Drawing_Panel.pCon1(0) + (sideSquareValues(2) + sideSquareValues(0)) / (GUI_Drawing_Panel.scaleDiff),
|
||||||
GUI_Drawing_Panel.pCon1(1),
|
GUI_Drawing_Panel.pCon1(1),
|
||||||
GUI_Drawing_Panel.pCon1(2) + sideSquareValues(2) + sideSquareValues(0),
|
GUI_Drawing_Panel.pCon1(2) + (sideSquareValues(2) + sideSquareValues(0)) / 1000,
|
||||||
GUI_Drawing_Panel.pCon1(3)})
|
GUI_Drawing_Panel.pCon1(3)})
|
||||||
|
'Outer measuements
|
||||||
|
pointsMeasurements("Lmes")(1) = pointsMeasurements("Lmes")(1) + 4
|
||||||
|
pointsMeasurements("Wmes")(0) = pointsMeasurements("Wmes")(0) + 4
|
||||||
|
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("SS_" & mesNum + 1, {index + 2, index + 5, 1})
|
||||||
|
pointsMeasurements.Add("SS_" & mesNum + 2, {index + 2, index + 3, 4})
|
||||||
|
|
||||||
|
GUI_Drawing_Panel.sideSquareMesLine.Add("SS_" & mesNum, {GUI_Drawing_Panel.pCon1(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.pCon1(0) + CInt(GUI.Controls("Off_TextBox").Text) / (2 * GUI_Drawing_Panel.scaleDiff) - 8,
|
||||||
|
GUI_Drawing_Panel.pCon1(1) - 15 - 12 - 3,
|
||||||
|
1}) '15 är linjen, 12 är textens höjd, 3 är lite extra
|
||||||
|
GUI_Drawing_Panel.measureLabels.Add("SS_" & mesNum + 1, {CInt(GUI.Controls("X_TextBox").Text),
|
||||||
|
GUI_Drawing_Panel.pCon1(0) + sideSquareValues(2) / (GUI_Drawing_Panel.scaleDiff) + CInt(GUI.Controls("X_TextBox").Text) / (2 * GUI_Drawing_Panel.scaleDiff) - 8,
|
||||||
|
GUI_Drawing_Panel.pCon1(1) + sideSquareValues(1) / (GUI_Drawing_Panel.scaleDiff) + 3,
|
||||||
|
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),
|
||||||
|
1})
|
||||||
|
|
||||||
ElseIf sidePressed = 2 Then
|
ElseIf sidePressed = 2 Then
|
||||||
GUI_Drawing_Panel.points.Add("pSS" & pointCounter * 4 - 3,
|
GUI_Drawing_Panel.points.Add("pSS" & pointCounter * 4 - 3,
|
||||||
{GUI_Drawing_Panel.pCon2(0),
|
{GUI_Drawing_Panel.pCon2(0),
|
||||||
GUI_Drawing_Panel.pCon2(1) + sideSquareValues(2) / (GUI_Drawing_Panel.scaleDiff),
|
GUI_Drawing_Panel.pCon2(1) + sideSquareValues(2) / (GUI_Drawing_Panel.scaleDiff),
|
||||||
GUI_Drawing_Panel.pCon2(2),
|
GUI_Drawing_Panel.pCon2(2),
|
||||||
GUI_Drawing_Panel.pCon2(3) + sideSquareValues(2)})
|
GUI_Drawing_Panel.pCon2(3) - sideSquareValues(2) / 1000})
|
||||||
GUI_Drawing_Panel.points.Add("pSS" & pointCounter * 4 - 2,
|
GUI_Drawing_Panel.points.Add("pSS" & pointCounter * 4 - 2,
|
||||||
{GUI_Drawing_Panel.pCon2(0) - sideSquareValues(0) / (GUI_Drawing_Panel.scaleDiff),
|
{GUI_Drawing_Panel.pCon2(0) - sideSquareValues(0) / (GUI_Drawing_Panel.scaleDiff),
|
||||||
GUI_Drawing_Panel.pCon2(1) + sideSquareValues(2) / (GUI_Drawing_Panel.scaleDiff),
|
GUI_Drawing_Panel.pCon2(1) + sideSquareValues(2) / (GUI_Drawing_Panel.scaleDiff),
|
||||||
GUI_Drawing_Panel.pCon2(2) - sideSquareValues(0),
|
GUI_Drawing_Panel.pCon2(2) - sideSquareValues(0) / 1000,
|
||||||
GUI_Drawing_Panel.pCon2(3) + sideSquareValues(2)})
|
GUI_Drawing_Panel.pCon2(3) - sideSquareValues(2) / 1000})
|
||||||
GUI_Drawing_Panel.points.Add("pSS" & pointCounter * 4 - 1,
|
GUI_Drawing_Panel.points.Add("pSS" & pointCounter * 4 - 1,
|
||||||
{GUI_Drawing_Panel.pCon2(0) - sideSquareValues(0) / (GUI_Drawing_Panel.scaleDiff),
|
{GUI_Drawing_Panel.pCon2(0) - sideSquareValues(0) / (GUI_Drawing_Panel.scaleDiff),
|
||||||
GUI_Drawing_Panel.pCon2(1) + (sideSquareValues(2) + sideSquareValues(1)) / (GUI_Drawing_Panel.scaleDiff),
|
GUI_Drawing_Panel.pCon2(1) + (sideSquareValues(2) + sideSquareValues(1)) / (GUI_Drawing_Panel.scaleDiff),
|
||||||
GUI_Drawing_Panel.pCon2(2) - sideSquareValues(0),
|
GUI_Drawing_Panel.pCon2(2) - sideSquareValues(0) / 1000,
|
||||||
GUI_Drawing_Panel.pCon2(3) + sideSquareValues(2) + sideSquareValues(1)})
|
GUI_Drawing_Panel.pCon2(3) - (sideSquareValues(2) + sideSquareValues(1)) / 1000})
|
||||||
GUI_Drawing_Panel.points.Add("pSS" & pointCounter * 4,
|
GUI_Drawing_Panel.points.Add("pSS" & pointCounter * 4,
|
||||||
{GUI_Drawing_Panel.pCon2(0),
|
{GUI_Drawing_Panel.pCon2(0),
|
||||||
GUI_Drawing_Panel.pCon2(1) + (sideSquareValues(2) + sideSquareValues(1)) / (GUI_Drawing_Panel.scaleDiff),
|
GUI_Drawing_Panel.pCon2(1) + (sideSquareValues(2) + sideSquareValues(1)) / (GUI_Drawing_Panel.scaleDiff),
|
||||||
GUI_Drawing_Panel.pCon2(2),
|
GUI_Drawing_Panel.pCon2(2),
|
||||||
GUI_Drawing_Panel.pCon2(3) + sideSquareValues(2) + sideSquareValues(1)})
|
GUI_Drawing_Panel.pCon2(3) - (sideSquareValues(2) + sideSquareValues(1)) / 1000})
|
||||||
|
'Outer measuements
|
||||||
|
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("SS_" & mesNum + 1, {index + 2, index + 5, 2})
|
||||||
|
pointsMeasurements.Add("SS_" & mesNum + 2, {index + 2, index + 3, 3})
|
||||||
|
|
||||||
ElseIf sidePressed = 3 Then
|
ElseIf sidePressed = 3 Then
|
||||||
GUI_Drawing_Panel.points.Add("pSS" & pointCounter * 4 - 3,
|
GUI_Drawing_Panel.points.Add("pSS" & pointCounter * 4 - 3,
|
||||||
{GUI_Drawing_Panel.pCon1(0) + (sideSquareValues(2) + sideSquareValues(0)) / (GUI_Drawing_Panel.scaleDiff),
|
{GUI_Drawing_Panel.pCon1(0) + (sideSquareValues(2) + sideSquareValues(0)) / (GUI_Drawing_Panel.scaleDiff),
|
||||||
GUI_Drawing_Panel.pCon3(1),
|
GUI_Drawing_Panel.pCon3(1),
|
||||||
GUI_Drawing_Panel.pCon1(2) + sideSquareValues(2) + sideSquareValues(0),
|
GUI_Drawing_Panel.pCon1(2) + (sideSquareValues(2) + sideSquareValues(0)) / 1000,
|
||||||
GUI_Drawing_Panel.pCon3(3)})
|
GUI_Drawing_Panel.pCon3(3)})
|
||||||
GUI_Drawing_Panel.points.Add("pSS" & pointCounter * 4 - 2,
|
GUI_Drawing_Panel.points.Add("pSS" & pointCounter * 4 - 2,
|
||||||
{GUI_Drawing_Panel.pCon1(0) + (sideSquareValues(2) + sideSquareValues(0)) / (GUI_Drawing_Panel.scaleDiff),
|
{GUI_Drawing_Panel.pCon1(0) + (sideSquareValues(2) + sideSquareValues(0)) / (GUI_Drawing_Panel.scaleDiff),
|
||||||
GUI_Drawing_Panel.pCon3(1) - sideSquareValues(1) / (GUI_Drawing_Panel.scaleDiff),
|
GUI_Drawing_Panel.pCon3(1) - sideSquareValues(1) / (GUI_Drawing_Panel.scaleDiff),
|
||||||
GUI_Drawing_Panel.pCon1(2) + sideSquareValues(2) + sideSquareValues(0),
|
GUI_Drawing_Panel.pCon1(2) + (sideSquareValues(2) + sideSquareValues(0)) / 1000,
|
||||||
GUI_Drawing_Panel.pCon3(3) - sideSquareValues(1)})
|
GUI_Drawing_Panel.pCon3(3) + sideSquareValues(1) / 1000})
|
||||||
GUI_Drawing_Panel.points.Add("pSS" & pointCounter * 4 - 1,
|
GUI_Drawing_Panel.points.Add("pSS" & pointCounter * 4 - 1,
|
||||||
{GUI_Drawing_Panel.pCon1(0) + sideSquareValues(2) / (GUI_Drawing_Panel.scaleDiff),
|
{GUI_Drawing_Panel.pCon1(0) + sideSquareValues(2) / (GUI_Drawing_Panel.scaleDiff),
|
||||||
GUI_Drawing_Panel.pCon3(1) - sideSquareValues(1) / (GUI_Drawing_Panel.scaleDiff),
|
GUI_Drawing_Panel.pCon3(1) - sideSquareValues(1) / (GUI_Drawing_Panel.scaleDiff),
|
||||||
GUI_Drawing_Panel.pCon1(2) + sideSquareValues(2),
|
GUI_Drawing_Panel.pCon1(2) + sideSquareValues(2) / 1000,
|
||||||
GUI_Drawing_Panel.pCon3(3) - sideSquareValues(1)})
|
GUI_Drawing_Panel.pCon3(3) + sideSquareValues(1) / 1000})
|
||||||
GUI_Drawing_Panel.points.Add("pSS" & pointCounter * 4,
|
GUI_Drawing_Panel.points.Add("pSS" & pointCounter * 4,
|
||||||
{GUI_Drawing_Panel.pCon1(0) + sideSquareValues(2) / (GUI_Drawing_Panel.scaleDiff),
|
{GUI_Drawing_Panel.pCon1(0) + sideSquareValues(2) / (GUI_Drawing_Panel.scaleDiff),
|
||||||
GUI_Drawing_Panel.pCon3(1),
|
GUI_Drawing_Panel.pCon3(1),
|
||||||
GUI_Drawing_Panel.pCon1(2) + sideSquareValues(2),
|
GUI_Drawing_Panel.pCon1(2) + sideSquareValues(2) / 1000,
|
||||||
GUI_Drawing_Panel.pCon3(3)})
|
GUI_Drawing_Panel.pCon3(3)})
|
||||||
|
|
||||||
|
pointsMeasurements.Add("SS_" & 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
|
Else
|
||||||
GUI_Drawing_Panel.points.Add("pSS" & pointCounter * 4 - 3,
|
GUI_Drawing_Panel.points.Add("pSS" & pointCounter * 4 - 3,
|
||||||
{GUI_Drawing_Panel.pCon1(0),
|
{GUI_Drawing_Panel.pCon1(0),
|
||||||
GUI_Drawing_Panel.pCon2(1) + (sideSquareValues(2) + sideSquareValues(1)) / (GUI_Drawing_Panel.scaleDiff),
|
GUI_Drawing_Panel.pCon2(1) + (sideSquareValues(2) + sideSquareValues(1)) / (GUI_Drawing_Panel.scaleDiff),
|
||||||
GUI_Drawing_Panel.pCon1(2),
|
GUI_Drawing_Panel.pCon1(2),
|
||||||
GUI_Drawing_Panel.pCon2(3) + sideSquareValues(2) + sideSquareValues(1)})
|
GUI_Drawing_Panel.pCon2(3) - (sideSquareValues(2) + sideSquareValues(1)) / 1000})
|
||||||
GUI_Drawing_Panel.points.Add("pSS" & pointCounter * 4 - 2,
|
GUI_Drawing_Panel.points.Add("pSS" & pointCounter * 4 - 2,
|
||||||
{GUI_Drawing_Panel.pCon1(0) + sideSquareValues(0) / (GUI_Drawing_Panel.scaleDiff),
|
{GUI_Drawing_Panel.pCon1(0) + sideSquareValues(0) / (GUI_Drawing_Panel.scaleDiff),
|
||||||
GUI_Drawing_Panel.pCon2(1) + (sideSquareValues(2) + sideSquareValues(1)) / (GUI_Drawing_Panel.scaleDiff),
|
GUI_Drawing_Panel.pCon2(1) + (sideSquareValues(2) + sideSquareValues(1)) / (GUI_Drawing_Panel.scaleDiff),
|
||||||
GUI_Drawing_Panel.pCon1(2) + sideSquareValues(0),
|
GUI_Drawing_Panel.pCon1(2) + sideSquareValues(0) / 1000,
|
||||||
GUI_Drawing_Panel.pCon2(3) + sideSquareValues(2) + sideSquareValues(1)})
|
GUI_Drawing_Panel.pCon2(3) - (sideSquareValues(2) + sideSquareValues(1)) / 1000})
|
||||||
GUI_Drawing_Panel.points.Add("pSS" & pointCounter * 4 - 1,
|
GUI_Drawing_Panel.points.Add("pSS" & pointCounter * 4 - 1,
|
||||||
{GUI_Drawing_Panel.pCon1(0) + sideSquareValues(0) / (GUI_Drawing_Panel.scaleDiff),
|
{GUI_Drawing_Panel.pCon1(0) + sideSquareValues(0) / (GUI_Drawing_Panel.scaleDiff),
|
||||||
GUI_Drawing_Panel.pCon2(1) + sideSquareValues(2) / (GUI_Drawing_Panel.scaleDiff),
|
GUI_Drawing_Panel.pCon2(1) + sideSquareValues(2) / (GUI_Drawing_Panel.scaleDiff),
|
||||||
GUI_Drawing_Panel.pCon1(2) + sideSquareValues(0),
|
GUI_Drawing_Panel.pCon1(2) + sideSquareValues(0) / 1000,
|
||||||
GUI_Drawing_Panel.pCon2(3) + sideSquareValues(2)})
|
GUI_Drawing_Panel.pCon2(3) - sideSquareValues(2) / 1000})
|
||||||
GUI_Drawing_Panel.points.Add("pSS" & pointCounter * 4,
|
GUI_Drawing_Panel.points.Add("pSS" & pointCounter * 4,
|
||||||
{GUI_Drawing_Panel.pCon1(0),
|
{GUI_Drawing_Panel.pCon1(0),
|
||||||
GUI_Drawing_Panel.pCon2(1) + sideSquareValues(2) / (GUI_Drawing_Panel.scaleDiff),
|
GUI_Drawing_Panel.pCon2(1) + sideSquareValues(2) / (GUI_Drawing_Panel.scaleDiff),
|
||||||
GUI_Drawing_Panel.pCon1(2),
|
GUI_Drawing_Panel.pCon1(2),
|
||||||
GUI_Drawing_Panel.pCon2(3) + sideSquareValues(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("SS_" & mesNum + 1, {index + 2, index + 5, 4})
|
||||||
|
pointsMeasurements.Add("SS_" & mesNum + 2, {index + 2, index + 3, 3})
|
||||||
End If
|
End If
|
||||||
|
|
||||||
pointsFunc.Add("pSS" & pointCounter * 4 - 3, True)
|
pointsFunc.Add("pSS" & pointCounter * 4 - 3, False)
|
||||||
pointsFunc.Add("pSS" & pointCounter * 4 - 2, False)
|
pointsFunc.Add("pSS" & pointCounter * 4 - 2, False)
|
||||||
pointsFunc.Add("pSS" & pointCounter * 4 - 1, False)
|
pointsFunc.Add("pSS" & pointCounter * 4 - 1, False)
|
||||||
pointsFunc.Add("pSS" & pointCounter * 4, True)
|
pointsFunc.Add("pSS" & pointCounter * 4, False)
|
||||||
|
|
||||||
'Insert four new points
|
'Insert four new points
|
||||||
GUI_Drawing_Panel.pointsOrder.Insert(index + 1, "pSS" & pointCounter * 4 - 3)
|
GUI_Drawing_Panel.pointsOrder.Insert(index + 1, "pSS" & pointCounter * 4 - 3)
|
||||||
|
|
@ -447,148 +498,8 @@
|
||||||
GUI.Controls("Button_Square").Enabled = True
|
GUI.Controls("Button_Square").Enabled = True
|
||||||
GUI.Controls("Button_SquareSide").Enabled = True
|
GUI.Controls("Button_SquareSide").Enabled = True
|
||||||
|
|
||||||
'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
|
|
||||||
' 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
|
|
||||||
'Next
|
|
||||||
|
|
||||||
|
|
||||||
'Dim mesNum As Integer = pointsMeasurements.Count - 1
|
|
||||||
'For i = 2 To pointsMeasurements.Count - 1
|
|
||||||
' Dim mesName As String = pointsMeasurements.Keys(i)
|
|
||||||
' If Index + 1 < pointsMeasurements(mesName)(0) Then
|
|
||||||
' pointsMeasurements(mesName)(0) = pointsMeasurements(mesName)(0) + 1
|
|
||||||
' pointsMeasurements(mesName)(1) = pointsMeasurements(mesName)(1) + 1
|
|
||||||
' ElseIf Index + 1 = pointsMeasurements(mesName)(0) OrElse Index + 1 = pointsMeasurements(mesName)(1) Then
|
|
||||||
' pointsMeasurements(mesName)(1) = pointsMeasurements(mesName)(1) + 1
|
|
||||||
' End If
|
|
||||||
' Next
|
|
||||||
|
|
||||||
'If pXP < GUI_Drawing_Panel.containerMidX Then
|
|
||||||
' If pYP > GUI_Drawing_Panel.containerMidY Then
|
|
||||||
' 'Kvadrant 4
|
|
||||||
' GUI_Drawing_Panel.points.Add("pA" & pointCounter * 2 - 1, {pXP + d1P, pYP, pXSW + d1SW, pYSW})
|
|
||||||
' GUI_Drawing_Panel.points.Add("pA" & pointCounter * 2, {pXP, pYP - d2P, pXSW, pYSW + d2SW})
|
|
||||||
|
|
||||||
' 'Recess measuements
|
|
||||||
' pointsMeasurements.Add("A_" & mesNum, {Index + 1, Index + 2, 3})
|
|
||||||
' pointsMeasurements.Add("A_" & mesNum + 1, {Index + 1, Index + 2, 4})
|
|
||||||
|
|
||||||
' 'Panel recess measurements
|
|
||||||
' GUI_Drawing_Panel.anglePoints.Add("A" & pointCounter * 2 - 1, {pXP + d1P, pYP - d2P})
|
|
||||||
' GUI_Drawing_Panel.anglePointsComp.Add("A" & pointCounter * 2 - 1, {"pA" & pointCounter * 2 - 1, "pA" & pointCounter * 2})
|
|
||||||
|
|
||||||
' 'Label
|
|
||||||
' GUI_Drawing_Panel.measureLabels.Add("A_" & mesNum, {CInt(GUI.Controls("Y_TextBox").Text), pXP + d1P + 3,
|
|
||||||
' pYP - d2P / 2 - 4, 4})
|
|
||||||
' GUI_Drawing_Panel.measureLabels.Add("A_" & mesNum + 1, {CInt(GUI.Controls("X_TextBox").Text), pXP + d1P / 2 - 8,
|
|
||||||
' pYP - d2P - 12 - 3, 4})
|
|
||||||
' Else
|
|
||||||
' 'Kvadrant 1
|
|
||||||
' GUI_Drawing_Panel.points.Add("pA" & pointCounter * 2 - 1, {pXP, pYP + d2P, pXSW, pYSW - d2SW})
|
|
||||||
' GUI_Drawing_Panel.points.Add("pA" & pointCounter * 2, {pXP + d1P, pYP, pXSW + d1SW, pYSW})
|
|
||||||
|
|
||||||
' 'Outer measuements
|
|
||||||
' pointsMeasurements("Lmes")(1) = pointsMeasurements("Lmes")(1) + 1
|
|
||||||
' pointsMeasurements("Wmes")(0) = pointsMeasurements("Wmes")(0) + 1
|
|
||||||
' pointsMeasurements("Wmes")(1) = pointsMeasurements("Wmes")(1) + 1
|
|
||||||
|
|
||||||
' 'SW Recess measuements
|
|
||||||
' pointsMeasurements.Add("A_" & mesNum, {Index + 1, Index + 2, 1})
|
|
||||||
' pointsMeasurements.Add("A_" & mesNum + 1, {Index + 1, Index + 2, 4})
|
|
||||||
|
|
||||||
' 'Panel recess measurements
|
|
||||||
' GUI_Drawing_Panel.anglePoints.Add("A" & pointCounter * 2 - 1, {pXP + d1P, pYP + d2P})
|
|
||||||
' GUI_Drawing_Panel.anglePointsComp.Add("A" & pointCounter * 2 - 1, {"pA" & pointCounter * 2 - 1, "pA" & pointCounter * 2})
|
|
||||||
|
|
||||||
' 'Label
|
|
||||||
' GUI_Drawing_Panel.measureLabels.Add("A_" & mesNum, {CInt(GUI.Controls("X_TextBox").Text), pXP + d1P / 2 - 8,
|
|
||||||
' pYP + d2P + 3, 1})
|
|
||||||
' GUI_Drawing_Panel.measureLabels.Add("A_" & mesNum + 1, {CInt(GUI.Controls("Y_TextBox").Text), pXP + d1P + 3,
|
|
||||||
' pYP + d2P / 2 - 4, 1})
|
|
||||||
' End If
|
|
||||||
' Else
|
|
||||||
' If pYP > GUI_Drawing_Panel.containerMidY Then
|
|
||||||
' 'Kvadrant 3
|
|
||||||
' GUI_Drawing_Panel.points.Add("pA" & pointCounter * 2 - 1, {pXP, pYP - d2P, pXSW, pYSW + d2SW})
|
|
||||||
' GUI_Drawing_Panel.points.Add("pA" & pointCounter * 2, {pXP - d1P, pYP, pXSW - d1SW, pYSW})
|
|
||||||
|
|
||||||
' pointsMeasurements("Wmes")(1) = pointsMeasurements("Wmes")(1) + 1
|
|
||||||
|
|
||||||
' 'Recess measuements
|
|
||||||
' pointsMeasurements.Add("A_" & mesNum, {Index + 1, Index + 2, 2})
|
|
||||||
' pointsMeasurements.Add("A_" & mesNum + 1, {Index + 1, Index + 2, 3})
|
|
||||||
|
|
||||||
' 'Panel recess measurements
|
|
||||||
' GUI_Drawing_Panel.anglePoints.Add("A" & pointCounter * 2 - 1, {pXP - d1P, pYP - d2P})
|
|
||||||
' GUI_Drawing_Panel.anglePointsComp.Add("A" & pointCounter * 2 - 1, {"pA" & pointCounter * 2 - 1, "pA" & pointCounter * 2})
|
|
||||||
|
|
||||||
' 'Label
|
|
||||||
' GUI_Drawing_Panel.measureLabels.Add("A_" & mesNum, {CInt(GUI.Controls("X_TextBox").Text), pXP - d1P / 2 - 8,
|
|
||||||
' pYP - d2P - 12 - 3, 3})
|
|
||||||
' GUI_Drawing_Panel.measureLabels.Add("A_" & mesNum + 1, {CInt(GUI.Controls("Y_TextBox").Text), pXP - d1P - 18 - 3,
|
|
||||||
' pYP - d2P / 2 - 4, 3})
|
|
||||||
' Else
|
|
||||||
' 'Kvadrant 2
|
|
||||||
' GUI_Drawing_Panel.points.Add("pA" & pointCounter * 2 - 1, {pXP - d1P, pYP, pXSW - d1SW, pYSW})
|
|
||||||
' GUI_Drawing_Panel.points.Add("pA" & pointCounter * 2, {pXP, pYP + d2P, pXSW, pYSW - d2SW})
|
|
||||||
|
|
||||||
' pointsMeasurements("Lmes")(1) = pointsMeasurements("Lmes")(1) + 1
|
|
||||||
' pointsMeasurements("Wmes")(1) = pointsMeasurements("Wmes")(1) + 1
|
|
||||||
|
|
||||||
' 'Recess measuements
|
|
||||||
' pointsMeasurements.Add("A_" & mesNum, {Index + 1, Index + 2, 1})
|
|
||||||
' pointsMeasurements.Add("A_" & mesNum + 1, {Index + 1, Index + 2, 2})
|
|
||||||
|
|
||||||
' 'Panel recess measurements
|
|
||||||
' GUI_Drawing_Panel.anglePoints.Add("A" & pointCounter * 2 - 1, {pXP - d1P, pYP + d2P})
|
|
||||||
' GUI_Drawing_Panel.anglePointsComp.Add("A" & pointCounter * 2 - 1, {"pA" & pointCounter * 2 - 1, "pA" & pointCounter * 2})
|
|
||||||
|
|
||||||
' 'Label
|
|
||||||
' GUI_Drawing_Panel.measureLabels.Add("A_" & mesNum, {CInt(GUI.Controls("Y_TextBox").Text), pXP - d1P - 18 - 3,
|
|
||||||
' pYP + d2P / 2 - 4, 2})
|
|
||||||
' GUI_Drawing_Panel.measureLabels.Add("A_" & mesNum + 1, {CInt(GUI.Controls("X_TextBox").Text), pXP - d1P / 2 - 8,
|
|
||||||
' pYP + d2P + 3, 2})
|
|
||||||
' End If
|
|
||||||
' End If
|
|
||||||
' pointsFunc.Add("pA" & pointCounter * 2 - 1, False)
|
|
||||||
' pointsFunc.Add("pA" & pointCounter * 2, False)
|
|
||||||
|
|
||||||
' 'Insert two new points
|
|
||||||
' GUI_Drawing_Panel.pointsOrder.Insert(Index + 1, "pA" & pointCounter * 2 - 1)
|
|
||||||
' GUI_Drawing_Panel.pointsOrder.Insert(Index + 2, "pA" & pointCounter * 2)
|
|
||||||
|
|
||||||
' numOfNewPoints = 2
|
|
||||||
' angleFunctionActive = False
|
|
||||||
|
|
||||||
|
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue