diff --git a/MachiningsDbWindow/MachiningTreeView.vb b/MachiningsDbWindow/MachiningTreeView.vb index c8b5e19..9d92c5a 100644 --- a/MachiningsDbWindow/MachiningTreeView.vb +++ b/MachiningsDbWindow/MachiningTreeView.vb @@ -190,9 +190,8 @@ Public Class MachiningTreeViewItem Select Case m_Type Case MCH_MY.CHISELING m_WorkSideList = New ObservableCollection(Of IdNameStruct)( - {New IdNameStruct(MCH_SAW_WS.CENTER, EgtMsg(MSG_MACHININGSDBPAGE + 120)), - New IdNameStruct(MCH_SAW_WS.LEFT, EgtMsg(MSG_MACHININGSDBPAGE + 121)), - New IdNameStruct(MCH_SAW_WS.RIGHT, EgtMsg(MSG_MACHININGSDBPAGE + 122))}) + {New IdNameStruct(MCH_CHISEL_WS.LEFT, EgtMsg(MSG_MACHININGSDBPAGE + 121)), + New IdNameStruct(MCH_CHISEL_WS.RIGHT, EgtMsg(MSG_MACHININGSDBPAGE + 122))}) Case Else m_WorkSideList = New ObservableCollection(Of IdNameStruct)( {New IdNameStruct(MCH_SAW_WS.CENTER, EgtMsg(MSG_MACHININGSDBPAGE + 120)), @@ -209,14 +208,15 @@ Public Class MachiningTreeViewItem Public Property SelectedWorkSide As Integer Get If IsNothing(WorkSideList) Then Return Nothing - Return IdNameStruct.SearchFromId(m_SelectedWorkSide, WorkSideList) + Return m_SelectedWorkSide End Get Set(value As Integer) If value <> m_SelectedWorkSide Then If Not IsNothing(WorkSideList) Then - m_SelectedWorkSide = IdNameStruct.SearchToId(value, WorkSideList) + m_SelectedWorkSide = value Dim DbWorkSide As Integer = 0 EgtMdbGetCurrMachiningParam(MCH_MP.WORKSIDE, DbWorkSide) + DbWorkSide = IdNameStruct.SearchToId(DbWorkSide, WorkSideList) m_IsModifiedSelectedWorkSide = If(value <> DbWorkSide, True, False) m_delIsEnabledBtns(IsValid And Not IsModified, IsValid And (IsModified Or NewMachining), True) NotifyPropertyChanged("SelectedWorkSide") @@ -239,14 +239,15 @@ Public Class MachiningTreeViewItem Public Property SelectedHeadSide As Integer Get If IsNothing(HeadSideList) Then Return Nothing - Return IdNameStruct.SearchFromId(m_SelectedHeadSide, HeadSideList) + Return m_SelectedHeadSide End Get Set(value As Integer) If value <> m_SelectedHeadSide Then If Not IsNothing(HeadSideList) Then - m_SelectedHeadSide = IdNameStruct.SearchToId(value, HeadSideList) + m_SelectedHeadSide = value Dim DbHeadSide As Integer = 0 EgtMdbGetCurrMachiningParam(MCH_MP.HEADSIDE, DbHeadSide) + DbHeadSide = IdNameStruct.SearchToId(DbHeadSide, HeadSideList) m_IsModifiedSelectedHeadSide = If(value <> DbHeadSide, True, False) m_delIsEnabledBtns(IsValid And Not IsModified, IsValid And (IsModified Or NewMachining), True) NotifyPropertyChanged("SelectedHeadSide") @@ -275,6 +276,12 @@ Public Class MachiningTreeViewItem New IdNameStruct(MCH_MIL_LI.GLIDE, EgtMsg(MSG_MACHININGSDBPAGE + 132)), New IdNameStruct(MCH_MIL_LI.ZIGZAG, EgtMsg(MSG_MACHININGSDBPAGE + 142)), New IdNameStruct(MCH_MIL_LI.HELIX, EgtMsg(MSG_MACHININGSDBPAGE + 133))}) + Case MCH_MY.POCKETING + m_LeadInTypeList = New ObservableCollection(Of IdNameStruct)( + {New IdNameStruct(MCH_POCK_LI.NONE, EgtMsg(MSG_MACHININGSDBPAGE + 129)), + New IdNameStruct(MCH_POCK_LI.GLIDE, EgtMsg(MSG_MACHININGSDBPAGE + 132)), + New IdNameStruct(MCH_POCK_LI.ZIGZAG, EgtMsg(MSG_MACHININGSDBPAGE + 142)), + New IdNameStruct(MCH_POCK_LI.HELIX, EgtMsg(MSG_MACHININGSDBPAGE + 133))}) Case Else m_LeadInTypeList = Nothing End Select @@ -351,6 +358,10 @@ Public Class MachiningTreeViewItem New IdNameStruct(MCH_MIL_LO.TANGENT, EgtMsg(MSG_MACHININGSDBPAGE + 131)), New IdNameStruct(MCH_MIL_LO.GLIDE, EgtMsg(MSG_MACHININGSDBPAGE + 132)), New IdNameStruct(MCH_MIL_LO.AS_LI, EgtMsg(MSG_MACHININGSDBPAGE + 137))}) + Case MCH_MY.POCKETING + m_LeadOutTypeList = New ObservableCollection(Of IdNameStruct)( + {New IdNameStruct(MCH_POCK_LO.NONE, EgtMsg(MSG_MACHININGSDBPAGE + 129)), + New IdNameStruct(MCH_POCK_LO.GLIDE, EgtMsg(MSG_MACHININGSDBPAGE + 132))}) Case Else m_LeadOutTypeList = Nothing End Select @@ -490,6 +501,12 @@ Public Class MachiningTreeViewItem If m_SubTypeList.Count = 0 Then m_SubTypeList.Add(New IdNameStruct(0, "")) End If + Case MCH_MY.POCKETING + m_SubTypeList = New ObservableCollection(Of IdNameStruct)( + {New IdNameStruct(MCH_POCK_SUB.ZIGZAG, EgtMsg(MSG_MACHININGSDBPAGE + 142)), + New IdNameStruct(MCH_POCK_SUB.ONEWAY, EgtMsg(MSG_MACHININGSDBPAGE + 143)), + New IdNameStruct(MCH_POCK_SUB.SPIRALIN, EgtMsg(MSG_MACHININGSDBPAGE + 148)), + New IdNameStruct(MCH_POCK_SUB.SPIRALOUT, EgtMsg(MSG_MACHININGSDBPAGE + 149))}) Case Else m_SubTypeList = Nothing End Select @@ -1570,9 +1587,17 @@ Public Class MachiningTreeViewItem EgtMdbGetCurrMachiningParam(MCH_MP.INVERT, Invert) EgtMdbGetCurrMachiningParam(MCH_MP.LEAVETAB, LeaveTab) EgtMdbGetCurrMachiningParam(MCH_MP.WORKSIDE, nValue) - SelectedWorkSide = nValue + If Not IsNothing(WorkSideList) Then + SelectedWorkSide = IdNameStruct.SearchToId(nValue, WorkSideList) + Else + SelectedWorkSide = nValue + End If EgtMdbGetCurrMachiningParam(MCH_MP.HEADSIDE, nValue) - SelectedHeadSide = nValue + If Not IsNothing(HeadSideList) Then + SelectedHeadSide = IdNameStruct.SearchToId(nValue, HeadSideList) + Else + SelectedHeadSide = nValue + End If EgtMdbGetCurrMachiningParam(MCH_MP.LEADINTYPE, nValue) SelectedLeadInType = nValue EgtMdbGetCurrMachiningParam(MCH_MP.EXTLINKTYPE, nValue) @@ -1690,12 +1715,23 @@ Public Class MachiningTreeViewItem Friend Sub WriteMachiningParam() EgtSetCurrentContext(IniFile.m_ProjectSceneContext) + Dim nValue As Integer = 0 Dim dValue As Double = 0 EgtMdbSetCurrMachiningParam(MCH_MP.INVERT, Invert) EgtMdbSetCurrMachiningParam(MCH_MP.LEAVETAB, LeaveTab) EgtMdbSetCurrMachiningParam(MCH_MP.TYPE, Type) - EgtMdbSetCurrMachiningParam(MCH_MP.WORKSIDE, SelectedWorkSide) - EgtMdbSetCurrMachiningParam(MCH_MP.HEADSIDE, SelectedHeadSide) + If Not IsNothing(WorkSideList) Then + nValue = IdNameStruct.SearchFromId(m_SelectedWorkSide, WorkSideList) + Else + nValue = m_SelectedWorkSide + End If + EgtMdbSetCurrMachiningParam(MCH_MP.WORKSIDE, nValue) + If Not IsNothing(HeadSideList) Then + nValue = IdNameStruct.SearchFromId(m_SelectedHeadSide, HeadSideList) + Else + nValue = m_SelectedHeadSide + End If + EgtMdbSetCurrMachiningParam(MCH_MP.HEADSIDE, nValue) EgtMdbSetCurrMachiningParam(MCH_MP.LEADINTYPE, SelectedLeadInType) EgtMdbSetCurrMachiningParam(MCH_MP.EXTLINKTYPE, SelectedExtLinkType) EgtMdbSetCurrMachiningParam(MCH_MP.LEADOUTTYPE, SelectedLeadOutType) diff --git a/SetUpWindow/SetUpViewModel.vb b/SetUpWindow/SetUpViewModel.vb index 1525b63..ec33d51 100644 --- a/SetUpWindow/SetUpViewModel.vb +++ b/SetUpWindow/SetUpViewModel.vb @@ -349,6 +349,7 @@ Namespace EgtCAM5 For PositionIndex = 0 To m_PositionGroupList(nGroup - 1).PositionList.Count - 1 Dim TempPosition As Position = m_PositionGroupList(nGroup - 1).PositionList(PositionIndex) If TempPosition.TcPos = sTcPos Then + TempPosition.Head = sHead For ExitIndex = 0 To TempPosition.ExitToolAssociationList.Count - 1 Dim CurrExitToolAss As ExitToolAssociation = TempPosition.ExitToolAssociationList(ExitIndex) If CurrExitToolAss.ExitPar = sExitList(ToolIndex) Then diff --git a/SharedFieldsClass.vb b/SharedFieldsClass.vb index 667e9f7..9adba7c 100644 --- a/SharedFieldsClass.vb +++ b/SharedFieldsClass.vb @@ -27,14 +27,6 @@ ' Array che contiene il valore della proprietà visibility per ogni campo delle operazioni Friend OperationDisposition(49) As Visibility - 'Friend OperationDrilling(49) As Visibility - 'Friend OperationSawing(49) As Visibility - 'Friend OperationMilling(49) As Visibility - 'Friend OperationPocketing(49) As Visibility - 'Friend OperationMortising(49) As Visibility - 'Friend OperationSawroughing(49) As Visibility - 'Friend OperationSawfinishing(49) As Visibility - Sub New() ' Parametri drill standard @@ -450,9 +442,9 @@ Pocketing(1) = Visibility.Collapsed ' LeaveTab Pocketing(2) = Visibility.Collapsed ' WorkSide Pocketing(3) = Visibility.Collapsed ' HeadSide - Pocketing(4) = Visibility.Collapsed ' LeadInType + Pocketing(4) = Visibility.Visible ' LeadInType Pocketing(5) = Visibility.Collapsed ' ExtLinkType - Pocketing(6) = Visibility.Collapsed ' LeadOutType + Pocketing(6) = Visibility.Visible ' LeadOutType Pocketing(7) = Visibility.Collapsed ' CurveUse Pocketing(8) = Visibility.Collapsed ' StepType Pocketing(9) = Visibility.Collapsed ' LeadLinkType @@ -461,25 +453,25 @@ Pocketing(12) = Visibility.Visible ' StartFeed Pocketing(13) = Visibility.Visible ' EndFeed Pocketing(14) = Visibility.Visible ' TipFeed - Pocketing(15) = Visibility.Collapsed ' OffSr - Pocketing(16) = Visibility.Collapsed ' OffSl - Pocketing(17) = Visibility.Collapsed ' SideAngle + Pocketing(15) = Visibility.Visible ' OffSr + Pocketing(16) = Visibility.Visible ' OffSl + Pocketing(17) = Visibility.Visible ' SideAngle Pocketing(18) = Visibility.Collapsed ' Approx Pocketing(19) = Visibility.Visible ' StartPos Pocketing(20) = Visibility.Collapsed ' StartSlowLen Pocketing(21) = Visibility.Collapsed ' EndSlowLen Pocketing(22) = Visibility.Collapsed ' ThroughAddlen - Pocketing(23) = Visibility.Collapsed ' StepPar + Pocketing(23) = Visibility.Visible ' StepPar Pocketing(24) = Visibility.Collapsed ' ReturnPos Pocketing(25) = Visibility.Collapsed ' TabLen Pocketing(26) = Visibility.Collapsed ' TabDist Pocketing(27) = Visibility.Collapsed ' TabHeight Pocketing(28) = Visibility.Collapsed ' TabAngle - Pocketing(29) = Visibility.Collapsed ' LiTang + Pocketing(29) = Visibility.Visible ' LiTang Pocketing(30) = Visibility.Collapsed ' LiPerp Pocketing(31) = Visibility.Collapsed ' LiElev Pocketing(32) = Visibility.Collapsed ' LiCompLen - Pocketing(33) = Visibility.Collapsed ' LoTang + Pocketing(33) = Visibility.Visible ' LoTang Pocketing(34) = Visibility.Collapsed ' LoPerp Pocketing(35) = Visibility.Collapsed ' LoElev Pocketing(36) = Visibility.Collapsed ' LoCompLen @@ -487,7 +479,7 @@ Pocketing(38) = Visibility.Collapsed ' EndAddLen Pocketing(39) = Visibility.Collapsed ' StepExtArc Pocketing(40) = Visibility.Collapsed ' StepIntArc - Pocketing(41) = Visibility.Collapsed ' SideStep + Pocketing(41) = Visibility.Visible ' SideStep Pocketing(42) = Visibility.Collapsed ' VertFeed Pocketing(43) = Visibility.Visible ' NamePar Pocketing(44) = Visibility.Visible ' Tool @@ -495,7 +487,7 @@ Pocketing(46) = Visibility.Visible ' UserNotes Pocketing(47) = Visibility.Collapsed ' OverLapStr Pocketing(48) = Visibility.Collapsed ' OffsetStr - Pocketing(49) = Visibility.Collapsed ' SubType + Pocketing(49) = Visibility.Visible ' SubType ' Parametri Mortising Mortising(0) = Visibility.Visible ' Invert