OmagOFFICE 2.2g2 :

- aggiornamenti vari per allineare con OmagCUT (mancano incisioni da sopra, attacco speciale lama per ceramica e selezione multipla lavorazioni in split).
This commit is contained in:
Dario Sassi
2020-07-31 17:46:18 +00:00
parent e0d3e0fd7c
commit b6116cac99
20 changed files with 352 additions and 126 deletions
+2 -1
View File
@@ -4,7 +4,8 @@
xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
IsTopDockable="True" IsBottomDockable="False" IsLeftDockable="False"
IsRightDockable="False" IsFloating="False"
Background="{StaticResource Omag_Gray}" BorderBrush="{StaticResource Omag_Gray}">
Background="{StaticResource Omag_Gray}" BorderBrush="{StaticResource Omag_Gray}"
IsEnabled="{Binding MachPanel_IsEnabled}">
<!--Combobox per selezionare la macchina corrente--><!--
<ComboBox ItemsSource="{Binding Path=MachineList}" DisplayMemberPath="Name"
+18
View File
@@ -49,6 +49,17 @@ Public Class MachinePanelVM
End Set
End Property
Private m_MachPanel_IsEnabled As Boolean = True
Public Property MachPanel_IsEnabled As Boolean
Get
Return m_MachPanel_IsEnabled
End Get
Set(value As Boolean)
m_MachPanel_IsEnabled = value
NotifyPropertyChanged("MachPanel_IsEnabled")
End Set
End Property
#Region "Messages"
Public ReadOnly Property ToolDBMsg As String
@@ -304,6 +315,13 @@ Public Class MachinePanelVM
SetUpWindow.Width = 1024
SetUpWindow.ShowDialog()
' Ripristino stato visualizzazione tavola opportuno
If OmagOFFICEMap.refOptionPanelVM.SelItem <> OptionPanelVM.Tabs.SIMUL Then
EgtSetMachineLook(MCH_LOOK.TAB)
Else
EgtSetMachineLook( OmagOFFICEMap.refSimulTabVM.MachLook)
End If
' Verifico che gli utensili delle lavorazioni correnti siano attrezzati (necessario perchè potrei aver cambiato gli utensili delle lavorazioni)
' Lama
Dim bOk As Boolean = True