Egalware/omagoffice
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://gitlab.steamware.net/egalware-cadcam/interfacce/omagoffice into develop

Browse Source
This commit is contained in:
Demetrio Cassarino
2023-11-06 12:02:13 +01:00
parent 9f7b62502c 8e9a3cdb73
commit 8df9640d96
2 changed files with 47 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MachinePanel/MyMachinePanelVM.vb
+30 -14
View File
@@ -211,9 +211,15 @@ Public Class MyMachinePanelVM
MessageBox.Show(EgtMsg(MSG_MACHININGDBERRORS + 8), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error)
Return
End If
EgtOutLog("Call function: Creazione oggetto MachDbWindowVM")
TimeSpanInit()
Dim MachDbWindowVM As New EgtWPFLib5.MachiningDbWindowVM(CurrentMachine.sMachIniFile, OmagOFFICEMap.refSceneHostVM.MainScene.GetCtx(), "Stone", OmagOFFICEMap.refMainWindowVM.MainWindowM.nUserLevel > 5)
' Dim MachDbWindowV As New EgtWPFLib5.MachiningDbWindowV(Application.Current.MainWindow, MachDbWindowVM)
EgtOutLog(TimeSpanEnd())
EgtOutLog("Call function: Aggiorna oggetto MachDbWindowVM")
TimeSpanInit()
MachDbWindowVM.bPersonalInterface = True
' Collegata allo stile della GroupBox
@@ -251,30 +257,40 @@ Public Class MyMachinePanelVM
MachDbWindowVM.OpacityIsChecked = 0.25
'Definisco lo stile della DataGrid
MachDbWindowVM.HeaderVisibility = DataGridHeadersVisibility.Column
MachDbWindowVM.BackgroundDataGrid = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#484D55"), Brush)
MachDbWindowVM.BackGroundHeader = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#484D55"), Brush)
MachDbWindowVM.ForegroundHeader = Brushes.White
MachDbWindowVM.BorderBrushHeader = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
MachDbWindowVM.BorderThicknessHeader = New Thickness(0)
MachDbWindowVM.FontWeightHeader = FontWeights.Bold
MachDbWindowVM.BorderBrushDataGrid = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
MachDbWindowVM.BackgroundDataGridRow = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
MachDbWindowVM.ForegroundDataGridRow = Brushes.White
MachDbWindowVM.BorderBrushDataGridRow = Brushes.DarkGray
MachDbWindowVM.BorderThicknessDataGridRow = New Thickness(0, 0, 0, 1)
MachDbWindowVM.BorderBrushDataGridCell = Brushes.DarkGray
MachDbWindowVM.BorderThicknessDataGridCell = New Thickness(0, 0, 1, 0)
'MachDbWindowVM.HeaderVisibility = DataGridHeadersVisibility.Column
'MachDbWindowVM.BackgroundDataGrid = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#484D55"), Brush)
'MachDbWindowVM.BackGroundHeader = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#484D55"), Brush)
'MachDbWindowVM.ForegroundHeader = Brushes.White
'MachDbWindowVM.BorderBrushHeader = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
'MachDbWindowVM.BorderThicknessHeader = 0.0
'MachDbWindowVM.FontWeightHeader = FontWeights.Bold
'MachDbWindowVM.BorderBrushDataGrid = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
'MachDbWindowVM.BackgroundDataGridRow = DirectCast(New System.Windows.Media.BrushConverter().ConvertFromString("#1C1D22"), Brush)
'MachDbWindowVM.ForegroundDataGridRow = Brushes.White
'MachDbWindowVM.BorderBrushDataGridRow = Brushes.DarkGray
'MachDbWindowVM.BorderThicknessDataGridRow = "0 0 0 1"
'MachDbWindowVM.BorderBrushDataGridCell = Brushes.DarkGray
'MachDbWindowVM.BorderThicknessDataGridCell = "0 0 1 0"
EgtOutLog(TimeSpanEnd())
EgtOutLog("Call function: Creazione oggetto MachDbWindowV")
TimeSpanInit()
Dim MachDbWindowV As New MyMachiningDbWindowV(Application.Current.MainWindow, MachDbWindowVM)
If EgtWPFLib5.MachiningTreeViewItem.m_MatType <> 0 Then
EgtOutLog("Call function: Visualizzazione oggetto MachDbWindowV")
TimeSpanInit()
MachDbWindowV.Height = 768
MachDbWindowV.Width = 1024
MachDbWindowV.ShowDialog()
EgtOutLog(TimeSpanEnd())
Else
Exit Sub
End If
' Verifico che gli utensili delle lavorazioni correnti siano attrezzati (necessario perchè potrei aver cambiato gli utensili delle lavorazioni)
' e che le lavorazioni correnti siano compatibili con materiale e spessore
' Lama