Merge branch 'main' into NewInterface

Icarus/CurrMachiningPanel/CurrMachining.vb

@@ -315,13 +315,13 @@ Public Class CurrNumericMachiningParam
             m_bIsLen = True
          Case Params.STRANDCOUNT
             bReadFromPart = EgtGetInfo(nPartId, MAC_STRANDCOUNT, m_dValue)
-            m_bIsLen = True
+            m_bIsLen = False
          Case Params.OFFSET
             bReadFromPart = EgtGetInfo(nPartId, MAC_OFFSET, m_dValue)
             m_bIsLen = True
          Case Params.STRANDOVERLAP
             bReadFromPart = EgtGetInfo(nPartId, MAC_STRANDOVERLAP, m_dValue)
-            m_bIsLen = True
+            m_bIsLen = False
          Case Params.STARTPOINTOFFSETONSLICE
             bReadFromPart = EgtGetInfo(nPartId, MAC_STARTPOINTOFFSETONSLICE, m_dValue)
             m_bIsLen = True
@@ -363,7 +363,7 @@ Public Class CurrNumericMachiningParam
          '   m_bIsLen = True
          Case Params.FLOORCOUNT
             bReadFromPart = EgtGetInfo(nPartId, MAC_FLOORCOUNT, m_dValue)
-            m_bIsLen = True
+            m_bIsLen = False
          Case Params.G0FEED
             bReadFromPart = EgtGetInfo(nPartId, MAC_G0FEED, m_dValue)
             m_bIsLen = True
@@ -375,10 +375,10 @@ Public Class CurrNumericMachiningParam
             m_bIsLen = True
          Case Params.RIBSOVERLAP
             bReadFromPart = EgtGetInfo(nPartId, MAC_RIBSOVERLAP, m_dValue)
-            m_bIsLen = True
+            m_bIsLen = False
          Case Params.RIBSSTRANDCOUNT
             bReadFromPart = EgtGetInfo(nPartId, MAC_RIBSSTRANDCOUNT, m_dValue)
-            m_bIsLen = True
+            m_bIsLen = False
          Case Params.RIBSLEADINLEN
             bReadFromPart = EgtGetInfo(nPartId, MAC_RIBSLEADINLEN, m_dValue)
             m_bIsLen = True
@@ -393,10 +393,10 @@ Public Class CurrNumericMachiningParam
             m_bIsLen = True
          Case Params.RIBSLEADOUTWIPEDIR
             bReadFromPart = EgtGetInfo(nPartId, MAC_RIBSLEADOUTWIPEDIR, m_dValue)
-            m_bIsLen = True
+            m_bIsLen = False
          Case Params.SHELLNBRDIFFERENCE
             bReadFromPart = EgtGetInfo(nPartId, MAC_SHELLNBRDIFFERENCE, m_dValue)
-            m_bIsLen = True
+            m_bIsLen = False
          Case Params.SHELLNBRCOASTING
             bReadFromPart = EgtGetInfo(nPartId, MAC_SHELLNBRCOASTING, m_dValue)
             m_bIsLen = True
@@ -405,10 +405,10 @@ Public Class CurrNumericMachiningParam
             m_bIsLen = True
          Case Params.SHELLNBRWIPEDIR
             bReadFromPart = EgtGetInfo(nPartId, MAC_SHELLNBRWIPEDIR, m_dValue)
-            m_bIsLen = True
+            m_bIsLen = False
          Case Params.AUXSOLIDSOVERLAP
             bReadFromPart = EgtGetInfo(nPartId, MAC_AUXSOLIDSOVERLAP, m_dValue)
-            m_bIsLen = True
+            m_bIsLen = False
          Case Params.AUXSOLIDSLINKPARAM
             bReadFromPart = EgtGetInfo(nPartId, MAC_AUXSOLIDSLINKPARAM, m_dValue)
             m_bIsLen = True
@@ -423,7 +423,7 @@ Public Class CurrNumericMachiningParam
             m_bIsLen = True
          Case Params.AUXSOLIDSWIPEDIR
             bReadFromPart = EgtGetInfo(nPartId, MAC_AUXSOLIDSWIPEDIR, m_dValue)
-            m_bIsLen = True
+            m_bIsLen = False
          Case Params.FLOWRATE_PC
             bReadFromPart = EgtGetInfo(nPartId, MAC_CONSTANT, m_dValue)
             m_bIsLen = False
@@ -453,6 +453,9 @@ Public Class CurrNumericMachiningParam
             m_dValue = m_DbParam.dOrigValue
             m_dOrigValue = m_DbParam.dOrigValue
          End If
+      ElseIf Type = Params.G0FEEDZ AndAlso Not bReadFromPart Then
+         m_dValue = 1000
+         m_dOrigValue = 1000
       ElseIf Type = Params.FLOWRATE_PC AndAlso Not bReadFromPart Then
          m_dValue = 100
          m_dOrigValue = 100

Icarus/MachiningDb/Machining.vb

@@ -663,13 +663,13 @@ Public Class NumericMachiningParam
                m_bIsLen = True
             Case Params.STRANDCOUNT
                m_dValue = ReadMachiningParamDouble(nIndex, MAC_STRANDCOUNT, 0)
-               m_bIsLen = True
+               m_bIsLen = False
             Case Params.OFFSET
                m_dValue = ReadMachiningParamDouble(nIndex, MAC_OFFSET, 0)
                m_bIsLen = True
             Case Params.STRANDOVERLAP
                m_dValue = ReadMachiningParamDouble(nIndex, MAC_STRANDOVERLAP, 0)
-               m_bIsLen = True
+               m_bIsLen = False
             Case Params.STARTPOINTOFFSETONSLICE
                m_dValue = ReadMachiningParamDouble(nIndex, MAC_STARTPOINTOFFSETONSLICE, 0)
                m_bIsLen = True
@@ -713,20 +713,20 @@ Public Class NumericMachiningParam
                m_dValue = ReadMachiningParamDouble(nIndex, MAC_FLOORCOUNT, 0)
                m_bIsLen = False
             Case Params.G0FEED
-               m_dValue = ReadMachiningParamDouble(nIndex, MAC_G0FEED, 0)
+               m_dValue = ReadMachiningParamDouble(nIndex, MAC_G0FEED, 10000)
                m_bIsLen = True
             Case Params.G0FEEDZ
-               m_dValue = ReadMachiningParamDouble(nIndex, MAC_G0FEEDZ, 0)
+               m_dValue = ReadMachiningParamDouble(nIndex, MAC_G0FEEDZ, 1000)
                m_bIsLen = True
             Case Params.TOOLDIAM
                m_dValue = ReadMachiningParamDouble(nIndex, MAC_TOOLDIAM, 0)
                m_bIsLen = True
             Case Params.RIBSOVERLAP
                m_dValue = ReadMachiningParamDouble(nIndex, MAC_RIBSOVERLAP, 0)
-               m_bIsLen = True
+               m_bIsLen = False
             Case Params.RIBSSTRANDCOUNT
                m_dValue = ReadMachiningParamDouble(nIndex, MAC_RIBSSTRANDCOUNT, 0)
-               m_bIsLen = True
+               m_bIsLen = False
             Case Params.RIBSLEADINLEN
                m_dValue = ReadMachiningParamDouble(nIndex, MAC_RIBSLEADINLEN, 0)
                m_bIsLen = True
@@ -741,10 +741,10 @@ Public Class NumericMachiningParam
                m_bIsLen = True
             Case Params.RIBSLEADOUTWIPEDIR
                m_dValue = ReadMachiningParamDouble(nIndex, MAC_RIBSLEADOUTWIPEDIR, 0)
-               m_bIsLen = True
+               m_bIsLen = False
             Case Params.SHELLNBRDIFFERENCE
                m_dValue = ReadMachiningParamDouble(nIndex, MAC_SHELLNBRDIFFERENCE, 0)
-               m_bIsLen = True
+               m_bIsLen = False
             Case Params.SHELLNBRCOASTING
                m_dValue = ReadMachiningParamDouble(nIndex, MAC_SHELLNBRCOASTING, 0)
                m_bIsLen = True
@@ -753,10 +753,10 @@ Public Class NumericMachiningParam
                m_bIsLen = True
             Case Params.SHELLNBRWIPEDIR
                m_dValue = ReadMachiningParamDouble(nIndex, MAC_SHELLNBRWIPEDIR, 0)
-               m_bIsLen = True
+               m_bIsLen = False
             Case Params.AUXSOLIDSOVERLAP
                m_dValue = ReadMachiningParamDouble(nIndex, MAC_AUXSOLIDSOVERLAP, 0)
-               m_bIsLen = True
+               m_bIsLen = False
             Case Params.AUXSOLIDSLINKPARAM
                m_dValue = ReadMachiningParamDouble(nIndex, MAC_AUXSOLIDSLINKPARAM, 0)
                m_bIsLen = True
@@ -771,7 +771,7 @@ Public Class NumericMachiningParam
                m_bIsLen = True
             Case Params.AUXSOLIDSWIPEDIR
                m_dValue = ReadMachiningParamDouble(nIndex, MAC_AUXSOLIDSWIPEDIR, 0)
-               m_bIsLen = True
+               m_bIsLen = False
             Case Params.FLOWRATE_PC
                m_dValue = ReadMachiningParamDouble(nIndex, MAC_CONSTANT, 100)
                m_bIsLen = False

Icarus/OptionsWindow/OptionWindowVM.vb

@@ -1229,6 +1229,8 @@ Public Class LayerColor
                Return "Layer Start"
             Case LayerType.OTHERS
                Return "Others"
+            Case Else
+               Return ""
          End Select
       End Get
    End Property

Icarus/Utility/GeomEntityColors.vb

@@ -97,7 +97,7 @@ Module GeomEntityColors
 
    Friend Sub SetColor(Type As LayerType, c3Color As Color3d)
       Dim c3Temp As Color3d
-      Dim sIniKey As String
+      Dim sIniKey As String = ""
       Select Case Type
          Case LayerType.PRINTPART
             c3Temp = c3Print
@@ -126,7 +126,7 @@ Module GeomEntityColors
    End Sub
    Friend Sub SetAlpha(Type As LayerType, dAlpha As Double)
       Dim c3Temp As Color3d = c3Print
-      Dim sIniKey As String
+      Dim sIniKey As String = ""
       Select Case Type
          Case LayerType.PRINTPART
             c3Temp = c3Print