EgtCAM5 1.8e3 :
- sistemate lavorazioni per nuovi parametri di categoria avanzata - nascosti parametri fresatura per tab (non ancora implementata la funzionalità) - migliorato report errori in lavorazioni - migliorato controllo attrezzaggio.
This commit is contained in:
Dario Sassi
@@ -575,6 +575,48 @@ Public Class MachiningTreeViewItem
|
||||
End Set
|
||||
End Property
|
||||
|
||||
'ObservableCollection che contiene le variabili per il combobox SolChoiceType
|
||||
Private m_SolChoiceTypeList As New ObservableCollection(Of IdNameStruct)(
|
||||
{New IdNameStruct(MCH_SCC.NONE, EgtMsg(MSG_MACHININGSDBPAGE + 105)),
|
||||
New IdNameStruct(MCH_SCC.STD, EgtMsg(MSG_MACHININGSDBPAGE + 106)),
|
||||
New IdNameStruct(MCH_SCC.OPPOSITE, EgtMsg(MSG_MACHININGSDBPAGE + 107)),
|
||||
New IdNameStruct(MCH_SCC.ADIR_XP, EgtMsg(MSG_MACHININGSDBPAGE + 108)),
|
||||
New IdNameStruct(MCH_SCC.ADIR_XM, EgtMsg(MSG_MACHININGSDBPAGE + 109)),
|
||||
New IdNameStruct(MCH_SCC.ADIR_YP, EgtMsg(MSG_MACHININGSDBPAGE + 110)),
|
||||
New IdNameStruct(MCH_SCC.ADIR_YM, EgtMsg(MSG_MACHININGSDBPAGE + 111)),
|
||||
New IdNameStruct(MCH_SCC.ADIR_ZP, EgtMsg(MSG_MACHININGSDBPAGE + 112)),
|
||||
New IdNameStruct(MCH_SCC.ADIR_ZM, EgtMsg(MSG_MACHININGSDBPAGE + 113)),
|
||||
New IdNameStruct(MCH_SCC.ADIR_NEAR, EgtMsg(MSG_MACHININGSDBPAGE + 114)),
|
||||
New IdNameStruct(MCH_SCC.ADIR_FAR, EgtMsg(MSG_MACHININGSDBPAGE + 115))})
|
||||
Public ReadOnly Property SolChoiceTypeList As ObservableCollection(Of IdNameStruct)
|
||||
Get
|
||||
Return m_SolChoiceTypeList
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Private m_IsModifiedSelectedSolChoiceType As Boolean = False
|
||||
Private m_SelectedSolChoiceType As Integer
|
||||
' Proprietà che indica il SolChoiceType (MCH_SAW_EL)
|
||||
Public Property SelectedSolChoiceType As Integer
|
||||
Get
|
||||
If IsNothing(SolChoiceTypeList) Then Return Nothing
|
||||
Return m_SelectedSolChoiceType
|
||||
End Get
|
||||
Set(value As Integer)
|
||||
If value <> m_SelectedSolChoiceType Then
|
||||
If Not IsNothing(SolChoiceTypeList) Then
|
||||
m_SelectedSolChoiceType = value
|
||||
Dim DbSolChoiceType As Integer = 0
|
||||
EgtMdbGetCurrMachiningParam(MCH_MP.SOLCHOICETYPE, DbSolChoiceType)
|
||||
DbSolChoiceType = IdNameStruct.IndFromId(DbSolChoiceType, SolChoiceTypeList)
|
||||
m_IsModifiedSelectedSolChoiceType = If(value <> DbSolChoiceType, True, False)
|
||||
m_delIsEnabledBtns(IsValid And Not IsModified, IsValid And (IsModified Or NewMachining), True)
|
||||
NotifyPropertyChanged("SelectedSolChoiceType")
|
||||
End If
|
||||
End If
|
||||
End Set
|
||||
End Property
|
||||
|
||||
Private m_IsModifiedSpeed As Boolean = False
|
||||
Private m_Speed As String
|
||||
''' <summary>
|
||||
@@ -1596,6 +1638,8 @@ Public Class MachiningTreeViewItem
|
||||
SelectedSubType = If(IsNothing(SubTypeList), nValue, IdNameStruct.IndFromId(nValue, SubTypeList))
|
||||
EgtMdbGetCurrMachiningParam(MCH_MP.LEADLINKTYPE, nValue)
|
||||
SelectedLeadLinkType = nValue
|
||||
EgtMdbGetCurrMachiningParam(MCH_MP.SOLCHOICETYPE, nValue)
|
||||
SelectedSolChoiceType = If(IsNothing(SolChoiceTypeList), nValue, IdNameStruct.IndFromId(nValue, SolChoiceTypeList))
|
||||
EgtMdbGetCurrMachiningParam(MCH_MP.SPEED, dValue)
|
||||
Speed = DoubleToString(dValue, 4)
|
||||
EgtMdbGetCurrMachiningParam(MCH_MP.FEED, dValue)
|
||||
@@ -1720,6 +1764,8 @@ Public Class MachiningTreeViewItem
|
||||
nValue = If(IsNothing(SubTypeList), m_SelectedSubType, IdNameStruct.IdFromInd(m_SelectedSubType, SubTypeList))
|
||||
EgtMdbSetCurrMachiningParam(MCH_MP.SUBTYPE, nValue)
|
||||
EgtMdbSetCurrMachiningParam(MCH_MP.LEADLINKTYPE, SelectedLeadLinkType)
|
||||
nValue = If(IsNothing(SolChoiceTypeList), m_SelectedSolChoiceType, IdNameStruct.IdFromInd(m_SelectedSolChoiceType, SolChoiceTypeList))
|
||||
EgtMdbSetCurrMachiningParam(MCH_MP.SOLCHOICETYPE, nValue)
|
||||
StringToDouble(Speed, dValue)
|
||||
EgtMdbSetCurrMachiningParam(MCH_MP.SPEED, dValue)
|
||||
StringToLen(Feed, dValue)
|
||||
@@ -1856,16 +1902,17 @@ Public Class MachiningTreeViewItem
|
||||
|
||||
Public ReadOnly Property IsModified() As Boolean
|
||||
Get
|
||||
Return m_IsModifiedInvert OrElse m_IsModifiedLeaveTab OrElse m_IsModifiedSelectedWorkSide OrElse m_IsModifiedSelectedHeadSide OrElse m_IsModifiedSelectedLeadInType _
|
||||
OrElse m_IsModifiedSelectedExtLinkType OrElse m_IsModifiedSelectedLeadOutType OrElse m_IsModifiedSelectedCurveUse OrElse m_IsModifiedSelectedStepType _
|
||||
OrElse m_IsModifiedSelectedSubType OrElse m_IsModifiedSelectedLeadLinkType OrElse m_IsModifiedSpeed OrElse m_IsModifiedFeed OrElse m_IsModifiedStartFeed _
|
||||
OrElse m_IsModifiedEndFeed OrElse m_IsModifiedTipFeed OrElse m_IsModifiedOffSr OrElse m_IsModifiedOffSl OrElse m_IsModifiedSideAngle OrElse m_IsModifiedApprox _
|
||||
OrElse m_IsModifiedStartPos OrElse m_IsModifiedStartSlowLen OrElse m_IsModifiedEndSlowLen OrElse m_IsModifiedThrouAddLen OrElse m_IsModifiedStepPar _
|
||||
OrElse m_IsModifiedReturnPos OrElse m_IsModifiedTabLen OrElse m_IsModifiedTabDist OrElse m_IsModifiedTabHeight OrElse m_IsModifiedTabAngle _
|
||||
OrElse m_IsModifiedLiTang OrElse m_IsModifiedLiPerp OrElse m_IsModifiedLiElev OrElse m_IsModifiedLiCompLen OrElse m_IsModifiedLoTang OrElse m_IsModifiedLoPerp _
|
||||
OrElse m_IsModifiedLoElev OrElse m_IsModifiedLoCompLen OrElse m_IsModifiedStartAddLen OrElse m_IsModifiedEndAddLen OrElse m_IsModifiedStepExtArc _
|
||||
OrElse m_IsModifiedStepIntArc OrElse m_IsModifiedSideStep OrElse m_IsModifiedVertFeed OrElse m_IsModifiedName OrElse m_IsModifiedSelectedTool _
|
||||
OrElse m_IsModifiedDepthStr OrElse m_IsModifiedUserNotes OrElse m_IsModifiedOverLap
|
||||
Return m_IsModifiedInvert OrElse m_IsModifiedLeaveTab OrElse m_IsModifiedSelectedWorkSide OrElse m_IsModifiedSelectedHeadSide OrElse m_IsModifiedSelectedLeadInType OrElse
|
||||
m_IsModifiedSelectedExtLinkType OrElse m_IsModifiedSelectedLeadOutType OrElse m_IsModifiedSelectedCurveUse OrElse m_IsModifiedSelectedStepType OrElse
|
||||
m_IsModifiedSelectedSubType OrElse m_IsModifiedSelectedLeadLinkType OrElse m_IsModifiedSelectedSolChoiceType OrElse
|
||||
m_IsModifiedSpeed OrElse m_IsModifiedFeed OrElse m_IsModifiedStartFeed OrElse
|
||||
m_IsModifiedEndFeed OrElse m_IsModifiedTipFeed OrElse m_IsModifiedOffSr OrElse m_IsModifiedOffSl OrElse m_IsModifiedSideAngle OrElse m_IsModifiedApprox OrElse
|
||||
m_IsModifiedStartPos OrElse m_IsModifiedStartSlowLen OrElse m_IsModifiedEndSlowLen OrElse m_IsModifiedThrouAddLen OrElse m_IsModifiedStepPar OrElse
|
||||
m_IsModifiedReturnPos OrElse m_IsModifiedTabLen OrElse m_IsModifiedTabDist OrElse m_IsModifiedTabHeight OrElse m_IsModifiedTabAngle OrElse
|
||||
m_IsModifiedLiTang OrElse m_IsModifiedLiPerp OrElse m_IsModifiedLiElev OrElse m_IsModifiedLiCompLen OrElse m_IsModifiedLoTang OrElse m_IsModifiedLoPerp OrElse
|
||||
m_IsModifiedLoElev OrElse m_IsModifiedLoCompLen OrElse m_IsModifiedStartAddLen OrElse m_IsModifiedEndAddLen OrElse m_IsModifiedStepExtArc OrElse
|
||||
m_IsModifiedStepIntArc OrElse m_IsModifiedSideStep OrElse m_IsModifiedVertFeed OrElse m_IsModifiedName OrElse m_IsModifiedSelectedTool OrElse
|
||||
m_IsModifiedDepthStr OrElse m_IsModifiedUserNotes OrElse m_IsModifiedOverLap
|
||||
End Get
|
||||
End Property
|
||||
|
||||
|
||||
Reference in New Issue
Block a user