diff --git a/Icarus/Constants/Const3dPrint.vb b/Icarus/Constants/Const3dPrint.vb index c83aa93..9b85311 100644 --- a/Icarus/Constants/Const3dPrint.vb +++ b/Icarus/Constants/Const3dPrint.vb @@ -107,6 +107,7 @@ Public Const MAC_RIBSLINK = "RibsLink" Public Const MAC_RIBSINVERTORDER = "RibsInvertOrder" Public Const MAC_RIBSINVERTDIRECTION = "RibsInvertDirection" + Public Const MAC_RIBSINVERTSTRANDORDER = "RibsInvertStrandOrder" Public Const MAC_RIBSLEADININVERT = "RibsLeadInInvert" Public Const MAC_RIBSLEADINLEN = "RibsLeadInLen" Public Const MAC_RIBSLEADOUTINVERT = "RibsLeadOutInvert" diff --git a/Icarus/CurrMachiningPanel/CurrMachining.vb b/Icarus/CurrMachiningPanel/CurrMachining.vb index d2cfeac..658dbf2 100644 --- a/Icarus/CurrMachiningPanel/CurrMachining.vb +++ b/Icarus/CurrMachiningPanel/CurrMachining.vb @@ -241,6 +241,7 @@ Public Class CurrMachiningCathegory New CurrCheckMachiningParam(MachiningParam.Params.RIBSLINK, nPartId, nIndex, bForceFromDb), New CurrCheckMachiningParam(MachiningParam.Params.RIBSINVERTORDER, nPartId, nIndex, bForceFromDb), New CurrCheckMachiningParam(MachiningParam.Params.RIBSINVERTDIRECTION, nPartId, nIndex, bForceFromDb), + New CurrCheckMachiningParam(MachiningParam.Params.RIBSINVERTSTRANDORDER, nPartId, nIndex, bForceFromDb), New CurrCheckMachiningParam(MachiningParam.Params.RIBSLEADININVERT, nPartId, nIndex, bForceFromDb), New CurrNumericMachiningParam(MachiningParam.Params.RIBSLEADINLEN, nPartId, nIndex, bForceFromDb), New CurrCheckMachiningParam(MachiningParam.Params.RIBSLEADOUTINVERT, nPartId, nIndex, bForceFromDb), @@ -915,6 +916,8 @@ Public Class CurrCheckMachiningParam bReadFromPart = EgtGetInfo(nPartId, MAC_RIBSINVERTORDER, m_bValue) Case Params.RIBSINVERTDIRECTION bReadFromPart = EgtGetInfo(nPartId, MAC_RIBSINVERTDIRECTION, m_bValue) + Case Params.RIBSINVERTSTRANDORDER + bReadFromPart = EgtGetInfo(nPartId, MAC_RIBSINVERTSTRANDORDER, m_bValue) Case Params.RIBSLEADININVERT bReadFromPart = EgtGetInfo(nPartId, MAC_RIBSLEADININVERT, m_bValue) Case Params.RIBSLEADOUTINVERT @@ -926,7 +929,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.RIBSLEADININVERT, Params.RIBSLEADOUTINVERT + Case Params.RIBSLINK, Params.RIBSINVERTORDER, Params.RIBSINVERTDIRECTION, Params.RIBSINVERTSTRANDORDER, Params.RIBSLEADININVERT, Params.RIBSLEADOUTINVERT m_DbParam = DbMachining.CathegoryList.FirstOrDefault(Function(y) y.Type = MachiningCathegory.Cathegories.RIBS).MachiningParamList.FirstOrDefault(Function(z) z.Type = m_Type) End Select If bForceFromDb OrElse Not bReadFromPart Then @@ -946,6 +949,8 @@ Public Class CurrCheckMachiningParam EgtSetInfo(nPartId, MAC_RIBSINVERTORDER, If(m_bValue, 1, 0)) Case Params.RIBSINVERTDIRECTION EgtSetInfo(nPartId, MAC_RIBSINVERTDIRECTION, If(m_bValue, 1, 0)) + Case Params.RIBSINVERTSTRANDORDER + EgtSetInfo(nPartId, MAC_RIBSINVERTSTRANDORDER, If(m_bValue, 1, 0)) Case Params.RIBSLEADININVERT EgtSetInfo(nPartId, MAC_RIBSLEADININVERT, If(m_bValue, 1, 0)) Case Params.RIBSLEADOUTINVERT diff --git a/Icarus/MachiningDb/Machining.vb b/Icarus/MachiningDb/Machining.vb index 88ed44b..f3a135c 100644 --- a/Icarus/MachiningDb/Machining.vb +++ b/Icarus/MachiningDb/Machining.vb @@ -353,6 +353,7 @@ Public Class MachiningCathegory New CheckMachiningParam(MachiningParam.Params.RIBSLINK, nIndex), New CheckMachiningParam(MachiningParam.Params.RIBSINVERTORDER, nIndex), New CheckMachiningParam(MachiningParam.Params.RIBSINVERTDIRECTION, nIndex), + New CheckMachiningParam(MachiningParam.Params.RIBSINVERTSTRANDORDER, nIndex), New CheckMachiningParam(MachiningParam.Params.RIBSLEADININVERT, nIndex), New NumericMachiningParam(MachiningParam.Params.RIBSLEADINLEN, nIndex), New CheckMachiningParam(MachiningParam.Params.RIBSLEADOUTINVERT, nIndex), @@ -475,6 +476,7 @@ Public MustInherit Class MachiningParam FLOWRATE_PC = 58 DYNAMIC_MODE = 59 PRINT_ORDER = 60 + RIBSINVERTSTRANDORDER = 61 MATERIALS = 100 End Enum @@ -561,6 +563,8 @@ Public MustInherit Class MachiningParam m_sName = "Invert Order" Case Params.RIBSINVERTDIRECTION m_sName = "Invert Direction" + Case Params.RIBSINVERTSTRANDORDER + m_sName = "Invert Strand Order" Case Params.RIBSLEADININVERT m_sName = "Lead In Invert" Case Params.RIBSLEADINLEN @@ -1155,6 +1159,8 @@ Public Class CheckMachiningParam m_bValue = ReadMachiningParamDouble(nIndex, MAC_RIBSINVERTORDER, 0) Case Params.RIBSINVERTDIRECTION m_bValue = ReadMachiningParamDouble(nIndex, MAC_RIBSINVERTDIRECTION, 0) + Case Params.RIBSINVERTSTRANDORDER + m_bValue = ReadMachiningParamDouble(nIndex, MAC_RIBSINVERTSTRANDORDER, 0) Case Params.RIBSLEADININVERT m_bValue = ReadMachiningParamDouble(nIndex, MAC_RIBSLEADININVERT, 0) Case Params.RIBSLEADOUTINVERT @@ -1174,6 +1180,8 @@ Public Class CheckMachiningParam WriteMachiningParam(nIndex, MAC_RIBSINVERTORDER, If(m_bValue, 1, 0), sFilePath) Case Params.RIBSINVERTDIRECTION WriteMachiningParam(nIndex, MAC_RIBSINVERTDIRECTION, If(m_bValue, 1, 0), sFilePath) + Case Params.RIBSINVERTSTRANDORDER + WriteMachiningParam(nIndex, MAC_RIBSINVERTSTRANDORDER, If(m_bValue, 1, 0), sFilePath) Case Params.RIBSLEADININVERT WriteMachiningParam(nIndex, MAC_RIBSLEADININVERT, If(m_bValue, 1, 0), sFilePath) Case Params.RIBSLEADOUTINVERT diff --git a/Icarus/RibParamPanel/CopyFromWndVM.vb b/Icarus/RibParamPanel/CopyFromWndVM.vb index bd8a119..307789c 100644 --- a/Icarus/RibParamPanel/CopyFromWndVM.vb +++ b/Icarus/RibParamPanel/CopyFromWndVM.vb @@ -60,6 +60,7 @@ Public Class CopyFromWndVM MachiningParam.Params.RIBSSTRANDCOUNT, MachiningParam.Params.RIBSLINK, MachiningParam.Params.RIBSINVERTDIRECTION, + MachiningParam.Params.RIBSINVERTSTRANDORDER, MachiningParam.Params.RIBSLEADININVERT, MachiningParam.Params.RIBSLEADINLEN, MachiningParam.Params.RIBSLEADOUTINVERT, @@ -129,7 +130,7 @@ Public Class CopyFromWndVM Else RibTypeParam.SetValue(RibTypeParam.dPartValue) End If - Case MachiningParam.Params.RIBSLINK, MachiningParam.Params.RIBSINVERTDIRECTION, MachiningParam.Params.RIBSLEADININVERT, MachiningParam.Params.RIBSLEADOUTINVERT + Case MachiningParam.Params.RIBSLINK, 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 @@ -139,6 +140,9 @@ Public Class CopyFromWndVM Case MachiningParam.Params.RIBSINVERTDIRECTION RibTypeParam = Map.refRibParamPanelVM.MachiningParamList.FirstOrDefault(Function(x) x.Type = MachiningParam.Params.RIBSINVERTDIRECTION) bRead = EgtGetInfo(nFromId, MAC_RIBSINVERTDIRECTION, bRibParam) + Case MachiningParam.Params.RIBSINVERTSTRANDORDER + RibTypeParam = Map.refRibParamPanelVM.MachiningParamList.FirstOrDefault(Function(x) x.Type = MachiningParam.Params.RIBSINVERTSTRANDORDER) + bRead = EgtGetInfo(nFromId, MAC_RIBSINVERTSTRANDORDER, bRibParam) Case MachiningParam.Params.RIBSLEADININVERT RibTypeParam = Map.refRibParamPanelVM.MachiningParamList.FirstOrDefault(Function(x) x.Type = MachiningParam.Params.RIBSLEADININVERT) bRead = EgtGetInfo(nFromId, MAC_RIBSLEADININVERT, bRibParam) diff --git a/Icarus/RibParamPanel/RibParamPanelVM.vb b/Icarus/RibParamPanel/RibParamPanelVM.vb index 8abc573..84ac670 100644 --- a/Icarus/RibParamPanel/RibParamPanelVM.vb +++ b/Icarus/RibParamPanel/RibParamPanelVM.vb @@ -47,6 +47,7 @@ Public Class RibParamPanelVM New RibNumericMachiningParam(MachiningParam.Params.RIBSSTRANDCOUNT, nRibId, nPartId), New RibCheckMachiningParam(MachiningParam.Params.RIBSLINK, nRibId, nPartId), New RibCheckMachiningParam(MachiningParam.Params.RIBSINVERTDIRECTION, nRibId, nPartId), + New RibCheckMachiningParam(MachiningParam.Params.RIBSINVERTSTRANDORDER, nRibId, nPartId), New RibCheckMachiningParam(MachiningParam.Params.RIBSLEADININVERT, nRibId, nPartId), New RibNumericMachiningParam(MachiningParam.Params.RIBSLEADINLEN, nRibId, nPartId), New RibCheckMachiningParam(MachiningParam.Params.RIBSLEADOUTINVERT, nRibId, nPartId), @@ -238,6 +239,10 @@ Public Class RibNumericMachiningParam bReadFromPart = EgtGetInfo(nRibId, MAC_RIBSINVERTDIRECTION, m_dValue) EgtGetInfo(nPartId, MAC_RIBSINVERTDIRECTION, m_dPartValue) m_bIsLen = True + Case Params.RIBSINVERTSTRANDORDER + bReadFromPart = EgtGetInfo(nRibId, MAC_RIBSINVERTSTRANDORDER, m_dValue) + EgtGetInfo(nPartId, MAC_RIBSINVERTSTRANDORDER, m_dPartValue) + m_bIsLen = True Case Params.RIBSLEADININVERT bReadFromPart = EgtGetInfo(nRibId, MAC_RIBSLEADININVERT, m_dValue) EgtGetInfo(nPartId, MAC_RIBSLEADININVERT, m_dPartValue) @@ -300,6 +305,12 @@ Public Class RibNumericMachiningParam Else EgtRemoveInfo(nRibId, MAC_RIBSINVERTDIRECTION) End If + Case Params.RIBSINVERTSTRANDORDER + If bIsModifiedFromPart Then + EgtSetInfo(nRibId, MAC_RIBSINVERTSTRANDORDER, sWriteValue) + Else + EgtRemoveInfo(nRibId, MAC_RIBSINVERTSTRANDORDER) + End If Case Params.RIBSLEADININVERT If bIsModifiedFromPart Then EgtSetInfo(nRibId, MAC_RIBSLEADININVERT, sWriteValue) @@ -523,6 +534,9 @@ Public Class RibCheckMachiningParam Case Params.RIBSINVERTDIRECTION bReadFromPart = EgtGetInfo(nRibId, MAC_RIBSINVERTDIRECTION, m_bValue) EgtGetInfo(nPartId, MAC_RIBSINVERTDIRECTION, m_bPartValue) + Case Params.RIBSINVERTSTRANDORDER + bReadFromPart = EgtGetInfo(nRibId, MAC_RIBSINVERTSTRANDORDER, m_bValue) + EgtGetInfo(nPartId, MAC_RIBSINVERTSTRANDORDER, m_bPartValue) Case Params.RIBSLEADININVERT bReadFromPart = EgtGetInfo(nRibId, MAC_RIBSLEADININVERT, m_bValue) EgtGetInfo(nPartId, MAC_RIBSLEADININVERT, m_bPartValue) @@ -551,6 +565,12 @@ Public Class RibCheckMachiningParam Else EgtRemoveInfo(nRibId, MAC_RIBSINVERTDIRECTION) End If + Case Params.RIBSINVERTSTRANDORDER + If bIsModifiedFromPart Then + EgtSetInfo(nRibId, MAC_RIBSINVERTSTRANDORDER, If(m_bValue, 1, 0)) + Else + EgtRemoveInfo(nRibId, MAC_RIBSINVERTSTRANDORDER) + End If Case Params.RIBSLEADININVERT If bIsModifiedFromPart Then EgtSetInfo(nRibId, MAC_RIBSLEADININVERT, If(m_bValue, 1, 0))