diff --git a/CamAuto.vb b/CamAuto.vb index 2a8e1c9..a2536c6 100644 --- a/CamAuto.vb +++ b/CamAuto.vb @@ -129,7 +129,7 @@ Public Module CamAuto EgtGetInfo(nOperId, "Lay", sLay) ' verifica interferenza nFlag = FMI_TYPE.NONE - If sLay = "OutLoop" Then + If sLay = NAME_OUTLOOP Then Dim nRes As Integer = FMI_TYPE.LI Or FMI_TYPE.RM Or FMI_TYPE.LO If Not EgtVerifyMachining(nOperId, nRes) Then Return False nFlag = nFlag Or nRes diff --git a/MoveRawPartPage.xaml b/MoveRawPartPage.xaml index f7fe55e..a090fb8 100644 --- a/MoveRawPartPage.xaml +++ b/MoveRawPartPage.xaml @@ -27,7 +27,27 @@ - + + + + + + + + + + + @@ -114,18 +134,6 @@ - - diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index 80b7799..4c571d5 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -60,5 +60,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/SplitPageUC.xaml b/SplitPageUC.xaml index 089d9c7..1f86903 100644 --- a/SplitPageUC.xaml +++ b/SplitPageUC.xaml @@ -31,7 +31,27 @@ - + + + + + + + + + + + @@ -108,21 +128,16 @@ - + + + + - - + +