diff --git a/ConstMsg.vb b/ConstMsg.vb index faf9a43..731f1aa 100644 --- a/ConstMsg.vb +++ b/ConstMsg.vb @@ -6,6 +6,8 @@ Public Const MSG_WORKINPROGRESSPAGEUC As Integer = MSG_OMAGCUT + 100 Public Const MSG_DIRECTCUTPAGEUC As Integer = MSG_OMAGCUT + 200 Public Const MSG_CADCUTPAGEUC As Integer = MSG_OMAGCUT + 300 + Public Const MSG_NESTPAGEUC As Integer = MSG_OMAGCUT + 330 + Public Const MSG_SPLITPAGEUC As Integer = MSG_OMAGCUT + 340 Public Const MSG_DRAWPAGEUC As Integer = MSG_OMAGCUT + 350 Public Const MSG_COMPONENTPAGEUC As Integer = MSG_OMAGCUT + 400 Public Const MSG_IMPORTPAGEUC As Integer = MSG_OMAGCUT + 450 @@ -17,6 +19,6 @@ Public Const MSG_MISSINGKEYWD As Integer = 101500 - Public Const MSG_NUMERICKEYBOARDWD As Integer = 100101 + Public Const MSG_NUMERICKEYBOARDWD As Integer = 100100 End Module diff --git a/MachineStatusUC.xaml b/MachineStatusUC.xaml index 544bf22..9bc19f9 100644 --- a/MachineStatusUC.xaml +++ b/MachineStatusUC.xaml @@ -9,42 +9,45 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + + + - + @@ -56,23 +59,6 @@ - - - - - - - - - - - diff --git a/MainWindow.xaml.vb b/MainWindow.xaml.vb index 2f24e1f..48825a7 100644 --- a/MainWindow.xaml.vb +++ b/MainWindow.xaml.vb @@ -21,7 +21,7 @@ Class MainWindow Friend m_CurrentProjectPageUC As CurrentProjectPageUC Friend m_DirectCutPageUC As DirectCutPageUC Friend m_CadCutPageUC As CadCutPageUC - Friend m_RowPartPage As RowPartPageUC + Friend m_RowPartPage As RawPartPageUC Friend m_DrawPageUC As DrawPageUC Friend m_ImportPageUC As ImportPageUC Friend m_FrameCutPageUC As FrameCutPageUC @@ -145,7 +145,7 @@ Class MainWindow m_WorkInProgressPageUC = New WorkInProgressPageUC m_DirectCutPageUC = New DirectCutPageUC m_CadCutPageUC = New CadCutPageUC - m_RowPartPage = New RowPartPageUC + m_RowPartPage = New RawPartPageUC m_DrawPageUC = New DrawPageUC m_ImportPageUC = New ImportPageUC m_FrameCutPageUC = New FrameCutPageUC diff --git a/NestPageUC.xaml b/NestPageUC.xaml index 6c294c1..befdfc0 100644 --- a/NestPageUC.xaml +++ b/NestPageUC.xaml @@ -4,7 +4,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" mc:Ignorable="d" - d:DesignHeight="853.3" d:DesignWidth="256"> + d:DesignHeight="853.3" d:DesignWidth="256" Initialized="NestPage_Initialized"> @@ -66,14 +66,7 @@ VerticalAlignment="Center" /> - - - - +