diff --git a/EgtCAM5.vbproj b/EgtCAM5.vbproj index 90337b1..2da8add 100644 --- a/EgtCAM5.vbproj +++ b/EgtCAM5.vbproj @@ -425,7 +425,6 @@ GunStockWndV.xaml - diff --git a/MachinePanel/MyMachinePanelVM.vb b/MachinePanel/MyMachinePanelVM.vb index b3d47d8..be7d48a 100644 --- a/MachinePanel/MyMachinePanelVM.vb +++ b/MachinePanel/MyMachinePanelVM.vb @@ -269,7 +269,7 @@ Public Class MyMachinePanelVM Dim MachDbWindowVM As New EgtWPFLib5.MachiningDbWindowVM(IniFile.m_sCurrMachIniFilePath, IniFile.m_ProjectSceneContext, "Wood", IniFile.m_nUserLevel > 9, True) Dim MachDbWindowV As New EgtWPFLib5.MachiningDbWindowV(Application.Current.MainWindow, MachDbWindowVM) If EgtWPFLib5.MachiningTreeViewItem.m_MatType <> 0 Then - MachDbWindowV.Height = 830 '674 + MachDbWindowV.Height = 800 '674 MachDbWindowV.Width = 1150 '1024 MachDbWindowV.Owner = Application.Current.MainWindow MachDbWindowV.ShowDialog() @@ -290,7 +290,7 @@ Public Class MyMachinePanelVM Dim MachDbWindowVM As New EgtWPFLib5.MachiningDbWindowVM(IniFile.m_sCurrMachIniFilePath, IniFile.m_ProjectSceneContext, "Wood", IniFile.m_nUserLevel > 9, True) Dim MachDbWindowV As New EgtWPFLib5.MachiningDbWindowV(Application.Current.MainWindow, MachDbWindowVM) If EgtWPFLib5.MachiningTreeViewItem.m_MatType <> 0 Then - MachDbWindowV.Height = 830 '674 + MachDbWindowV.Height = 800 '674 MachDbWindowV.Width = 1150 '1024 MachDbWindowV.Owner = Application.Current.MainWindow MachDbWindowV.ShowDialog() diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb index 6d82b8a..09bcc10 100644 --- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb +++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb @@ -446,54 +446,54 @@ Public Class MachiningParameterExpanderVM End Class -''' -''' Class that represent a Converter that use machining type and param type, to set the visibility state of the param type. -''' -Public Class OperationParamVisibilityConverter - Implements IValueConverter +'''' +'''' Class that represent a Converter that use machining type and param type, to set the visibility state of the param type. +'''' +'Public Class OperationParamVisibilityConverter +' Implements IValueConverter - Public Function Convert(value As Object, targetType As Type, parameter As Object, culture As System.Globalization.CultureInfo) As Object Implements IValueConverter.Convert - Select Case CInt(value) - Case MCH_OY.NONE - Return Visibility.Hidden - Case MCH_OY.DISP - Return TMDbParamVisibility.OperationDisposition(CInt(parameter)) - Case MCH_OY.DRILLING - Return TMDbParamVisibility.Drilling(CInt(parameter)) - Case MCH_OY.SAWING - Return TMDbParamVisibility.Sawing(CInt(parameter)) - Case MCH_OY.MILLING - Return TMDbParamVisibility.Milling(CInt(parameter)) - Case MCH_OY.POCKETING - Return TMDbParamVisibility.Pocketing(CInt(parameter)) - Case MCH_OY.MORTISING - Return TMDbParamVisibility.Mortising(CInt(parameter)) - Case MCH_OY.SAWROUGHING - Return TMDbParamVisibility.Sawroughing(CInt(parameter)) - Case MCH_OY.SAWFINISHING - Return TMDbParamVisibility.Sawfinishing(CInt(parameter)) - Case MCH_OY.GENMACHINING - Return TMDbParamVisibility.GenMachining(CInt(parameter)) - Case MCH_OY.CHISELING - Return TMDbParamVisibility.Chiseling(CInt(parameter)) - Case MCH_OY.SURFFINISHING - Return TMDbParamVisibility.SurfFinishing(CInt(parameter)) - Case MCH_OY.SURFROUGHING - Return TMDbParamVisibility.SurfRoughing(CInt(parameter)) - Case MCH_OY.WATERJETTING - Return TMDbParamVisibility.WaterJetting(CInt(parameter)) - Case MCH_OY.FIVEAXISMILLING - Return TMDbParamVisibility.FiveAxMachining(CInt(parameter)) - Case Else - Return Visibility.Hidden - End Select - End Function +' Public Function Convert(value As Object, targetType As Type, parameter As Object, culture As System.Globalization.CultureInfo) As Object Implements IValueConverter.Convert +' Select Case CInt(value) +' Case MCH_OY.NONE +' Return Visibility.Hidden +' Case MCH_OY.DISP +' Return TMDbParamVisibility.OperationDisposition(CInt(parameter)) +' Case MCH_OY.DRILLING +' Return TMDbParamVisibility.Drilling(CInt(parameter)) +' Case MCH_OY.SAWING +' Return TMDbParamVisibility.Sawing(CInt(parameter)) +' Case MCH_OY.MILLING +' Return TMDbParamVisibility.Milling(CInt(parameter)) +' Case MCH_OY.POCKETING +' Return TMDbParamVisibility.Pocketing(CInt(parameter)) +' Case MCH_OY.MORTISING +' Return TMDbParamVisibility.Mortising(CInt(parameter)) +' Case MCH_OY.SAWROUGHING +' Return TMDbParamVisibility.Sawroughing(CInt(parameter)) +' Case MCH_OY.SAWFINISHING +' Return TMDbParamVisibility.Sawfinishing(CInt(parameter)) +' Case MCH_OY.GENMACHINING +' Return TMDbParamVisibility.GenMachining(CInt(parameter)) +' Case MCH_OY.CHISELING +' Return TMDbParamVisibility.Chiseling(CInt(parameter)) +' Case MCH_OY.SURFFINISHING +' Return TMDbParamVisibility.SurfFinishing(CInt(parameter)) +' Case MCH_OY.SURFROUGHING +' Return TMDbParamVisibility.SurfRoughing(CInt(parameter)) +' Case MCH_OY.WATERJETTING +' Return TMDbParamVisibility.WaterJetting(CInt(parameter)) +' Case MCH_OY.FIVEAXISMILLING +' Return TMDbParamVisibility.FiveAxMachining(CInt(parameter)) +' Case Else +' Return Visibility.Hidden +' End Select +' End Function - Public Function ConvertBack(value As Object, targetType As Type, parameter As Object, culture As System.Globalization.CultureInfo) As Object Implements IValueConverter.ConvertBack - Throw New NotImplementedException - End Function +' Public Function ConvertBack(value As Object, targetType As Type, parameter As Object, culture As System.Globalization.CultureInfo) As Object Implements IValueConverter.ConvertBack +' Throw New NotImplementedException +' End Function -End Class +'End Class ''' ''' Class that represent a Converter that convert mm in inch if necessary for the param depth.