Merge commit '1ebf4a3f54f1bcd305d8b3a0e8076b7d0b76653b'

2024-01-09 18:11:16 +01:00
parent 7267b77522 1ebf4a3f54
commit a599fde07a
5 changed files with 57 additions and 15 deletions
@@ -116,6 +116,8 @@
   Public Const MAC_RIBSOVERLAP = "RibsOverlap"
   Public Const MAC_RIBSSTRANDCOUNT = "RibsStrandCount"
   Public Const MAC_RIBSLINK = "RibsLink"
+   Public Const MAC_RIBSMERGEWITHSHELL = "RibsMergeWithShell"
+   Public Const MAC_RIBSINVERTMERGEDSHELLMAINLINK = "InvertRibsMergedShellMainLink"
   Public Const MAC_RIBSINVERTORDER = "RibsInvertOrder"
   Public Const MAC_RIBSINVERTDIRECTION = "RibsInvertDirection"
   Public Const MAC_RIBSINVERTSTRANDORDER = "RibsInvertStrandOrder"
@@ -247,6 +247,8 @@ Public Class CurrMachiningCathegory
                                                                New CurrNumericMachiningParam(MachiningParam.Params.RIBSOVERLAP, nPartId, nIndex, bForceFromDb, Me),
                                                                New CurrNumericMachiningParam(MachiningParam.Params.RIBSSTRANDCOUNT, nPartId, nIndex, bForceFromDb, Me),
                                                                New CurrCheckMachiningParam(MachiningParam.Params.RIBSLINK, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrCheckMachiningParam(MachiningParam.Params.RIBSMERGEWITHSHELL, nPartId, nIndex, bForceFromDb, Me),
+                                                                New CurrCheckMachiningParam(MachiningParam.Params.RIBSINVERTMERGEDSHELLMAINLINK, nPartId, nIndex, bForceFromDb, Me),
                                                                New CurrCheckMachiningParam(MachiningParam.Params.RIBSINVERTORDER, nPartId, nIndex, bForceFromDb, Me),
                                                                New CurrCheckMachiningParam(MachiningParam.Params.RIBSINVERTDIRECTION, nPartId, nIndex, bForceFromDb, Me),
                                                                New CurrCheckMachiningParam(MachiningParam.Params.RIBSINVERTSTRANDORDER, nPartId, nIndex, bForceFromDb, Me),
@@ -620,7 +622,7 @@ Public Class CurrNumericMachiningParam
                 Params.LEADOUTTANGDIST, Params.LEADOUTORTHODIST, Params.COASTINGLEN, Params.COASTINGFEED_PC,
                 Params.WIPELEN, Params.WIPEFEED_PC  ' Params.WIPEDIR
               m_DbParam = DbMachining.CathegoryList.FirstOrDefault(Function(y) y.Type = MachiningCathegory.Cathegories.LINK).MachiningParamList.FirstOrDefault(Function(z) z.Type = m_Type)
-            Case Params.RIBSSTRANDWIDTH, Params.RIBSOVERLAP, Params.RIBSSTRANDCOUNT, Params.RIBSLINK, Params.RIBSINVERTORDER, Params.RIBSINVERTDIRECTION,
+            Case Params.RIBSSTRANDWIDTH, Params.RIBSOVERLAP, Params.RIBSSTRANDCOUNT, Params.RIBSLINK, Params.RIBSMERGEWITHSHELL, Params.RIBSINVERTMERGEDSHELLMAINLINK, Params.RIBSINVERTORDER, Params.RIBSINVERTDIRECTION,
                 Params.RIBSLEADININVERT, Params.RIBSLEADINLEN, Params.RIBSLEADOUTINVERT, Params.RIBSLEADOUTLEN, Params.RIBSLEADOUTCOASTING,
                 Params.RIBSLEADOUTWIPE, Params.RIBSLEADOUTWIPEDIR
               m_DbParam = DbMachining.CathegoryList.FirstOrDefault(Function(y) y.Type = MachiningCathegory.Cathegories.RIBS).MachiningParamList.FirstOrDefault(Function(z) z.Type = m_Type)
@@ -1177,6 +1179,10 @@ Public Class CurrCheckMachiningParam
            bReadFromPart = EgtGetInfo(nPartId, MAC_SPIRALVASE, m_bValue)
         Case Params.RIBSLINK
            bReadFromPart = EgtGetInfo(nPartId, MAC_RIBSLINK, m_bValue)
+         Case Params.RIBSMERGEWITHSHELL
+            bReadFromPart = EgtGetInfo(nPartId, MAC_RIBSMERGEWITHSHELL, m_bValue)
+         Case Params.RIBSINVERTMERGEDSHELLMAINLINK
+            bReadFromPart = EgtGetInfo(nPartId, MAC_RIBSINVERTMERGEDSHELLMAINLINK, m_bValue)
         Case Params.RIBSINVERTORDER
            bReadFromPart = EgtGetInfo(nPartId, MAC_RIBSINVERTORDER, m_bValue)
         Case Params.RIBSINVERTDIRECTION
@@ -1200,7 +1206,7 @@ Public Class CurrCheckMachiningParam
         Select Case Type
            Case Params.SPIRALVASE
               m_DbParam = DbMachining.CathegoryList.FirstOrDefault(Function(y) y.Type = MachiningCathegory.Cathegories.GENERAL).MachiningParamList.FirstOrDefault(Function(z) z.Type = m_Type)
-            Case Params.RIBSLINK, Params.RIBSINVERTORDER, Params.RIBSINVERTDIRECTION, Params.RIBSINVERTSTRANDORDER, Params.RIBSLEADININVERT, Params.RIBSLEADOUTINVERT, Params.RIBSLIMITUNBOUNDEDWITHSOLID
+            Case Params.RIBSLINK, Params.RIBSMERGEWITHSHELL, Params.RIBSINVERTMERGEDSHELLMAINLINK, Params.RIBSINVERTORDER, Params.RIBSINVERTDIRECTION, Params.RIBSINVERTSTRANDORDER, Params.RIBSLEADININVERT, Params.RIBSLEADOUTINVERT, Params.RIBSLIMITUNBOUNDEDWITHSOLID
               m_DbParam = DbMachining.CathegoryList.FirstOrDefault(Function(y) y.Type = MachiningCathegory.Cathegories.RIBS).MachiningParamList.FirstOrDefault(Function(z) z.Type = m_Type)
            Case Params.AUXSOLIDSINFILLLINK
               m_DbParam = DbMachining.CathegoryList.FirstOrDefault(Function(y) y.Type = MachiningCathegory.Cathegories.AUX_SOLID).MachiningParamList.FirstOrDefault(Function(z) z.Type = m_Type)
@@ -1220,6 +1226,10 @@ Public Class CurrCheckMachiningParam
            EgtSetInfo(nPartId, MAC_SPIRALVASE, If(m_bValue, 1, 0))
         Case Params.RIBSLINK
            EgtSetInfo(nPartId, MAC_RIBSLINK, If(m_bValue, 1, 0))
+         Case Params.RIBSMERGEWITHSHELL
+            EgtSetInfo(nPartId, MAC_RIBSMERGEWITHSHELL, If(m_bValue, 1, 0))
+         Case Params.RIBSINVERTMERGEDSHELLMAINLINK
+            EgtSetInfo(nPartId, MAC_RIBSINVERTMERGEDSHELLMAINLINK, If(m_bValue, 1, 0))
         Case Params.RIBSINVERTORDER
            EgtSetInfo(nPartId, MAC_RIBSINVERTORDER, If(m_bValue, 1, 0))
         Case Params.RIBSINVERTDIRECTION
@@ -369,6 +369,8 @@ Public Class MachiningCathegory
                                                                New NumericMachiningParam(MachiningParam.Params.RIBSOVERLAP, nIndex, Me),
                                                                New NumericMachiningParam(MachiningParam.Params.RIBSSTRANDCOUNT, nIndex, Me),
                                                                New CheckMachiningParam(MachiningParam.Params.RIBSLINK, nIndex, Me),
+                                                                New CheckMachiningParam(MachiningParam.Params.RIBSMERGEWITHSHELL, nIndex, Me),
+                                                                New CheckMachiningParam(MachiningParam.Params.RIBSINVERTMERGEDSHELLMAINLINK, nIndex, Me),
                                                                New CheckMachiningParam(MachiningParam.Params.RIBSINVERTORDER, nIndex, Me),
                                                                New CheckMachiningParam(MachiningParam.Params.RIBSINVERTDIRECTION, nIndex, Me),
                                                                New CheckMachiningParam(MachiningParam.Params.RIBSINVERTSTRANDORDER, nIndex, Me),
@@ -538,18 +540,20 @@ Public MustInherit Class MachiningParam
      RIBSOVERLAP = 102
      RIBSSTRANDCOUNT = 103
      RIBSLINK = 104
-      RIBSINVERTORDER = 105
-      RIBSINVERTDIRECTION = 106
-      RIBSINVERTSTRANDORDER = 107
-      RIBSLEADININVERT = 108
-      RIBSLEADINLEN = 109
-      RIBSLEADOUTINVERT = 110
-      RIBSLEADOUTLEN = 111
-      RIBSLEADOUTCOASTING = 112
-      RIBSLEADOUTWIPE = 113
-      RIBSLEADOUTWIPEDIR = 114
-      RIBSLIMITUNBOUNDEDWITHSOLID = 115
-      RIBSSTRANDWIDTH = 116
+      RIBSMERGEWITHSHELL = 105
+      RIBSINVERTMERGEDSHELLMAINLINK = 106
+      RIBSINVERTORDER = 107
+      RIBSINVERTDIRECTION = 108
+      RIBSINVERTSTRANDORDER = 109
+      RIBSLEADININVERT = 110
+      RIBSLEADINLEN = 111
+      RIBSLEADOUTINVERT = 112
+      RIBSLEADOUTLEN = 113
+      RIBSLEADOUTCOASTING = 114
+      RIBSLEADOUTWIPE = 115
+      RIBSLEADOUTWIPEDIR = 116
+      RIBSLIMITUNBOUNDEDWITHSOLID = 117
+      RIBSSTRANDWIDTH = 118
      SHELLNBRDIFFERENCE = 151
      SHELLNBRCOASTING = 152
      SHELLNBRWIPE = 153
@@ -707,6 +711,10 @@ Public MustInherit Class MachiningParam
            m_sName = "Strand Count"
         Case Params.RIBSLINK
            m_sName = "Link"
+         Case Params.RIBSMERGEWITHSHELL
+            m_sName = "Merge With Shell"
+         Case Params.RIBSINVERTMERGEDSHELLMAINLINK
+            m_sName = "Invert Merged Shell Main Link"
         Case Params.RIBSINVERTORDER
            m_sName = "Invert Order"
         Case Params.RIBSINVERTDIRECTION
@@ -1697,6 +1705,10 @@ Public Class CheckMachiningParam
               m_bValue = ReadMachiningParamDouble(nIndex, MAC_SPIRALVASE, 0)
            Case Params.RIBSLINK
               m_bValue = ReadMachiningParamDouble(nIndex, MAC_RIBSLINK, 0)
+            Case Params.RIBSMERGEWITHSHELL
+               m_bValue = ReadMachiningParamDouble(nIndex, MAC_RIBSMERGEWITHSHELL, 0)
+            Case Params.RIBSINVERTMERGEDSHELLMAINLINK
+               m_bValue = ReadMachiningParamDouble(nIndex, MAC_RIBSINVERTMERGEDSHELLMAINLINK, 0)
            Case Params.RIBSINVERTORDER
               m_bValue = ReadMachiningParamDouble(nIndex, MAC_RIBSINVERTORDER, 0)
            Case Params.RIBSINVERTDIRECTION
@@ -1724,6 +1736,10 @@ Public Class CheckMachiningParam
            WriteMachiningParam(nIndex, MAC_SPIRALVASE, If(m_bValue, 1, 0), sFilePath)
         Case Params.RIBSLINK
            WriteMachiningParam(nIndex, MAC_RIBSLINK, If(m_bValue, 1, 0), sFilePath)
+         Case Params.RIBSMERGEWITHSHELL
+            WriteMachiningParam(nIndex, MAC_RIBSMERGEWITHSHELL, If(m_bValue, 1, 0), sFilePath)
+         Case Params.RIBSINVERTMERGEDSHELLMAINLINK
+            WriteMachiningParam(nIndex, MAC_RIBSINVERTMERGEDSHELLMAINLINK, If(m_bValue, 1, 0), sFilePath)
         Case Params.RIBSINVERTORDER
            WriteMachiningParam(nIndex, MAC_RIBSINVERTORDER, If(m_bValue, 1, 0), sFilePath)
         Case Params.RIBSINVERTDIRECTION
@@ -60,6 +60,7 @@ Public Class CopyFromWndVM
                                                           MachiningParam.Params.RIBSOVERLAP,
                                                           MachiningParam.Params.RIBSSTRANDCOUNT,
                                                           MachiningParam.Params.RIBSLINK,
+                                                           MachiningParam.Params.RIBSMERGEWITHSHELL,
                                                           MachiningParam.Params.RIBSINVERTDIRECTION,
                                                           MachiningParam.Params.RIBSINVERTSTRANDORDER,
                                                           MachiningParam.Params.RIBSLEADININVERT,
@@ -134,13 +135,16 @@ Public Class CopyFromWndVM
            Else
               RibTypeParam.SetValue(RibTypeParam.dPartValue)
            End If
-         Case MachiningParam.Params.RIBSLINK, MachiningParam.Params.RIBSINVERTDIRECTION, MachiningParam.Params.RIBSINVERTSTRANDORDER, MachiningParam.Params.RIBSLEADININVERT, MachiningParam.Params.RIBSLEADOUTINVERT
+         Case MachiningParam.Params.RIBSLINK, MachiningParam.Params.RIBSMERGEWITHSHELL, MachiningParam.Params.RIBSINVERTDIRECTION, MachiningParam.Params.RIBSINVERTSTRANDORDER, MachiningParam.Params.RIBSLEADININVERT, MachiningParam.Params.RIBSLEADOUTINVERT
            Dim RibTypeParam As RibCheckMachiningParam = Nothing
            Dim bRibParam As Boolean = False
            Select Case Type
               Case MachiningParam.Params.RIBSLINK
                  RibTypeParam = Map.refRibParamPanelVM.MachiningParamList.FirstOrDefault(Function(x) x.Type = MachiningParam.Params.RIBSLINK)
                  bRead = EgtGetInfo(nFromId, MAC_RIBSLINK, bRibParam)
+               Case MachiningParam.Params.RIBSMERGEWITHSHELL
+                  RibTypeParam = Map.refRibParamPanelVM.MachiningParamList.FirstOrDefault(Function(x) x.Type = MachiningParam.Params.RIBSMERGEWITHSHELL)
+                  bRead = EgtGetInfo(nFromId, MAC_RIBSMERGEWITHSHELL, bRibParam)
               Case MachiningParam.Params.RIBSINVERTDIRECTION
                  RibTypeParam = Map.refRibParamPanelVM.MachiningParamList.FirstOrDefault(Function(x) x.Type = MachiningParam.Params.RIBSINVERTDIRECTION)
                  bRead = EgtGetInfo(nFromId, MAC_RIBSINVERTDIRECTION, bRibParam)
@@ -47,6 +47,7 @@ Public Class RibParamPanelVM
                                                          New RibNumericMachiningParam(MachiningParam.Params.RIBSOVERLAP, nRibId, nPartId, Me),
                                                          New RibNumericMachiningParam(MachiningParam.Params.RIBSSTRANDCOUNT, nRibId, nPartId, Me),
                                                          New RibCheckMachiningParam(MachiningParam.Params.RIBSLINK, nRibId, nPartId, Me),
+                                                          New RibCheckMachiningParam(MachiningParam.Params.RIBSMERGEWITHSHELL, nRibId, nPartId, Me),
                                                          New RibCheckMachiningParam(MachiningParam.Params.RIBSINVERTDIRECTION, nRibId, nPartId, Me),
                                                          New RibCheckMachiningParam(MachiningParam.Params.RIBSINVERTSTRANDORDER, nRibId, nPartId, Me),
                                                          New RibCheckMachiningParam(MachiningParam.Params.RIBSLEADININVERT, nRibId, nPartId, Me),
@@ -545,6 +546,9 @@ Public Class RibCheckMachiningParam
         Case Params.RIBSLINK
            bReadFromPart = EgtGetInfo(nRibId, MAC_RIBSLINK, m_bValue)
            EgtGetInfo(nPartId, MAC_RIBSLINK, m_bPartValue)
+         Case Params.RIBSMERGEWITHSHELL
+            bReadFromPart = EgtGetInfo(nRibId, MAC_RIBSMERGEWITHSHELL, m_bValue)
+            EgtGetInfo(nPartId, MAC_RIBSMERGEWITHSHELL, m_bPartValue)
         Case Params.RIBSINVERTDIRECTION
            bReadFromPart = EgtGetInfo(nRibId, MAC_RIBSINVERTDIRECTION, m_bValue)
            EgtGetInfo(nPartId, MAC_RIBSINVERTDIRECTION, m_bPartValue)
@@ -573,6 +577,12 @@ Public Class RibCheckMachiningParam
            Else
               EgtRemoveInfo(nRibId, MAC_RIBSLINK)
            End If
+         Case Params.RIBSMERGEWITHSHELL
+            If bIsModifiedFromPart Then
+               EgtSetInfo(nRibId, MAC_RIBSMERGEWITHSHELL, If(m_bValue, 1, 0))
+            Else
+               EgtRemoveInfo(nRibId, MAC_RIBSMERGEWITHSHELL)
+            End If
         Case Params.RIBSINVERTDIRECTION
            If bIsModifiedFromPart Then
               EgtSetInfo(nRibId, MAC_RIBSINVERTDIRECTION, If(m_bValue, 1, 0))