EgtCAM5 :
- Migliorati Db utensili e lavorazioni. - Corretto errore che non permetteva di scrivere le s nell'inputbox. - Introdotta chiusura automatica degli expander nell'OptionPanel in modalità lavora.
This commit is contained in:
+52
-3
@@ -42,6 +42,14 @@ Namespace EgtCAM5
|
||||
' Ultima lavorazione evidenziata
|
||||
Private m_LastMarkedOperationId As Integer = GDB_ID.NULL
|
||||
|
||||
'Expander aperto tra quelli presenti nel MachiningOptionPanel
|
||||
Private m_CurrExpandedExpander As MachiningOptionPanelExpander = MachiningOptionPanelExpander.OPERATIONLIST
|
||||
Friend Enum MachiningOptionPanelExpander
|
||||
OPERATIONLIST
|
||||
OPERATIONPARAMETERS
|
||||
SIMULATION
|
||||
End Enum
|
||||
|
||||
Private m_ListIsExpanded As Boolean
|
||||
Public Property ListIsExpanded As Boolean
|
||||
Get
|
||||
@@ -51,7 +59,12 @@ Namespace EgtCAM5
|
||||
If value <> m_ListIsExpanded Then
|
||||
m_ListIsExpanded = value
|
||||
If value Then
|
||||
Application.Msn.NotifyColleagues(Application.SIMULATIONEXPANDER_SET_ISEXPANDED, False)
|
||||
If m_CurrExpandedExpander = MachiningOptionPanelExpander.OPERATIONPARAMETERS Then
|
||||
ParametersIsExpanded = False
|
||||
ElseIf m_CurrExpandedExpander = MachiningOptionPanelExpander.SIMULATION Then
|
||||
Application.Msn.NotifyColleagues(Application.SIMULATIONEXPANDER_SET_ISEXPANDED, False)
|
||||
End If
|
||||
m_CurrExpandedExpander = MachiningOptionPanelExpander.OPERATIONLIST
|
||||
End If
|
||||
OnPropertyChanged("ListIsExpanded")
|
||||
End If
|
||||
@@ -66,11 +79,43 @@ Namespace EgtCAM5
|
||||
Set(value As Boolean)
|
||||
If value <> m_ParametersIsExpanded Then
|
||||
m_ParametersIsExpanded = value
|
||||
OnPropertyChanged("ParametersIsExpanded")
|
||||
If value Then
|
||||
If m_CurrExpandedExpander = MachiningOptionPanelExpander.OPERATIONLIST Then
|
||||
ListIsExpanded = False
|
||||
ElseIf m_CurrExpandedExpander = MachiningOptionPanelExpander.SIMULATION Then
|
||||
m_CurrExpandedExpander = MachiningOptionPanelExpander.OPERATIONPARAMETERS
|
||||
Application.Msn.NotifyColleagues(Application.SIMULATIONEXPANDER_SET_ISEXPANDED, False)
|
||||
End If
|
||||
ParametersExpanderName = m_SelectedOperation.Name
|
||||
m_CurrExpandedExpander = MachiningOptionPanelExpander.OPERATIONPARAMETERS
|
||||
Else
|
||||
If m_CurrExpandedExpander = MachiningOptionPanelExpander.OPERATIONLIST Then
|
||||
ListIsExpanded = True
|
||||
End If
|
||||
ParametersExpanderName = String.Empty
|
||||
End If
|
||||
OnPropertyChanged("ParametersIsExpanded")
|
||||
End If
|
||||
End Set
|
||||
End Property
|
||||
|
||||
Private m_ParametersExpanderName As String
|
||||
Public Property ParametersExpanderName As String
|
||||
Get
|
||||
If String.IsNullOrEmpty(m_ParametersExpanderName) Then
|
||||
Return EgtMsg(MSG_OPERATION + 2)
|
||||
Else
|
||||
Return m_ParametersExpanderName
|
||||
End If
|
||||
End Get
|
||||
Set(value As String)
|
||||
If value <> m_ParametersExpanderName Then
|
||||
m_ParametersExpanderName = value
|
||||
End If
|
||||
OnPropertyChanged("ParametersExpanderName")
|
||||
End Set
|
||||
End Property
|
||||
|
||||
Private m_IsEnabledOperationList As Boolean = True
|
||||
Public Property IsEnabledOperationList As Boolean
|
||||
Get
|
||||
@@ -377,9 +422,13 @@ Namespace EgtCAM5
|
||||
NewMachining = bValue
|
||||
End Sub)
|
||||
Application.Msn.Register(Application.SIMULATIONEXPANDER_GET_ISEXPANDED, Sub(bValue As Boolean)
|
||||
ListIsExpanded = Not bValue
|
||||
If m_CurrExpandedExpander = MachiningOptionPanelExpander.SIMULATION Then
|
||||
ListIsExpanded = True
|
||||
End If
|
||||
If bValue Then
|
||||
ListIsExpanded = False
|
||||
ParametersIsExpanded = False
|
||||
m_CurrExpandedExpander = MachiningOptionPanelExpander.SIMULATION
|
||||
End If
|
||||
End Sub)
|
||||
End Sub
|
||||
|
||||
Reference in New Issue
Block a user