diff --git a/MachinePanel/MachinePanelVM.vb b/MachinePanel/MachinePanelVM.vb index 48bb6a9..899e44c 100644 --- a/MachinePanel/MachinePanelVM.vb +++ b/MachinePanel/MachinePanelVM.vb @@ -143,10 +143,16 @@ Public Class MachinePanelVM MessageBox.Show(EgtMsg(MSG_TOOLDBERRORS + 30), EgtMsg(MSG_MESSAGEBOX + 1), MessageBoxButton.OK, MessageBoxImage.Error) Return End If - Dim ToolDbWindow As New ToolDbWindowV(Application.Current.MainWindow, New ToolDbWindowVM(CurrentMachine.sMachDir, CurrentMachine.sMachIniFile, OmagOFFICEMap.refSceneHostVM.MainScene.GetCtx())) - ToolDbWindow.Height = 640 - ToolDbWindow.Width = 1024 - ToolDbWindow.ShowDialog() + + Dim ToolDbWindowVM As New ToolDbWindowVM(CurrentMachine.sMachDir, CurrentMachine.sMachIniFile, OmagOFFICEMap.refSceneHostVM.MainScene.GetCtx(), "Stone") + Dim ToolDbWindowV As New ToolDbWindowV(Application.Current.MainWindow, ToolDbWindowVM) + If ToolDbWindowVM.MatType <> 0 Then + ToolDbWindowV.Height = 640 + ToolDbWindowV.Width = 1024 + ToolDbWindowV.ShowDialog() + Else + Exit Sub + End If If Not SetUpUtility.IsValidToolHeadExitInSetUp() Then SetUp_Background = Brushes.Red diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index f2ed344..c9bbf9c 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -69,5 +69,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/OmagOFFICE.vbproj b/OmagOFFICE.vbproj index 0e15f54..b7ffcb8 100644 --- a/OmagOFFICE.vbproj +++ b/OmagOFFICE.vbproj @@ -209,10 +209,6 @@ - - MyToolDbWindowV.xaml - - MachiningTabV.xaml @@ -373,10 +369,6 @@ MainWindowV.xaml Code - - Designer - MSBuild:Compile - Designer MSBuild:Compile