Merge branch 'Features/DB_WaterJet' into Features/Alz_And_Front

2022-01-17 18:39:35 +01:00
parent 08cd099947 57cf143306
commit 51bbaf0bfe
22 changed files with 1021 additions and 111 deletions
@@ -116,7 +116,7 @@ Public Class SideEntityControlVM
         If m_Mode = ModeOpt.SIDEANGLE Then
            Return DoubleToString(m_Parameter1, 2)
         Else
-            Return LenToString(m_Parameter1, -2)
+            Return LenToString(m_Parameter1, 2)
         End If
      End Get
      Set(value As String)
@@ -178,7 +178,7 @@ Public Class SideEntityControlVM
         If m_Mode = ModeOpt.SIDEANGLE Then
            Return LenToString(m_Parameter2, 2)
         Else
-            Return LenToString(m_Parameter2, -2)
+            Return LenToString(m_Parameter2, 2)
         End If
      End Get
      Set(value As String)
@@ -307,7 +307,7 @@ Public Class SideEntityControlVM
   Private m_Parameter3 As Double
   Public Property Parameter3 As String
      Get
-         Return LenToString(m_Parameter3, -2)
+         Return LenToString(m_Parameter3, 2)
      End Get
      Set(value As String)
         If m_Mode <> ModeOpt.SIDEANGLE Then
@@ -344,7 +344,7 @@ Public Class SideEntityControlVM
   Private m_Parameter4 As Double
   Public Property Parameter4 As String
      Get
-         Return LenToString(m_Parameter4, -2)
+         Return LenToString(m_Parameter4, 2)
      End Get
      Set(value As String)
         If m_Mode <> ModeOpt.SIDEANGLE Then
@@ -1027,6 +1027,8 @@ Public Class SideEntityControlVM
         End If
      Next

+      If vJoint.Count < 1 Then Return
+
      If vJoint(0) And vJoint(vJoint.Count - 1) Then
         bJointStart = True
      End If