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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -81,86 +67,138 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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" />
-
-
-
-
+
diff --git a/NestPageUC.xaml.vb b/NestPageUC.xaml.vb
index 33b9fe2..092916c 100644
--- a/NestPageUC.xaml.vb
+++ b/NestPageUC.xaml.vb
@@ -1,3 +1,12 @@
-Public Class NestPageUC
+Imports EgtUILib
+
+Public Class NestPageUC
+
+ Private Sub NestPage_Initialized(sender As Object, e As EventArgs)
+
+ 'Imposto i messaggi letti dal file dei messaggi
+ RemovePartBtn.Content = EgtMsg(MSG_NESTPAGEUC + 1)
+
+ End Sub
End Class
diff --git a/OmagCUT.vbproj b/OmagCUT.vbproj
index df53037..741ce51 100644
--- a/OmagCUT.vbproj
+++ b/OmagCUT.vbproj
@@ -142,8 +142,8 @@
NestPageUC.xaml
-
- RowPartPageUC.xaml
+
+ RawPartPageUC.xaml
ImportPageUC.xaml
@@ -219,7 +219,7 @@
Designer
MSBuild:Compile
-
+
MSBuild:Compile
Designer
diff --git a/RowPartPageUC.xaml b/RawPartPageUC.xaml
similarity index 77%
rename from RowPartPageUC.xaml
rename to RawPartPageUC.xaml
index c14993f..06efa2b 100644
--- a/RowPartPageUC.xaml
+++ b/RawPartPageUC.xaml
@@ -1,4 +1,4 @@
-
-
+
+
+
-
+
@@ -62,36 +64,42 @@
+
-
-
-
-
-
-
+
-
-
+
+
+ Grid.Column="0" Grid.Row="1" >
@@ -110,9 +118,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Grid.Column="0" Grid.Row="4" >
@@ -133,7 +162,7 @@
+ Grid.Column="0" Grid.Row="6" >
diff --git a/RowPartPageUC.xaml.vb b/RawPartPageUC.xaml.vb
similarity index 67%
rename from RowPartPageUC.xaml.vb
rename to RawPartPageUC.xaml.vb
index 6c36ca2..1411d91 100644
--- a/RowPartPageUC.xaml.vb
+++ b/RawPartPageUC.xaml.vb
@@ -1,6 +1,6 @@
Imports EgtUILib
-Public Class RowPartPageUC
+Public Class RawPartPageUC
Dim m_MainWindow As MainWindow = Application.Current.MainWindow
@@ -17,6 +17,7 @@ Public Class RowPartPageUC
UpperButtonGrid.Children.Add(m_SceneButtons)
'Associazione tag textbox e label per visualizzare nome nella calcolatrice
+ LengthTxBx.Tag = LengthLbl
WidthTxBx.Tag = WidthLbl
HeightTxBx.Tag = HeightLbl
OffsetXTxBx.Tag = OffsetXLbl
@@ -26,17 +27,19 @@ Public Class RowPartPageUC
'Imposto i messaggi letti dal file dei messaggi
RectangleBtn.Content = EgtMsg(MSG_ROWPARTPAGEUC + 1) 'Rectangle - Rettangolo
ByPointsBtn.Content = EgtMsg(MSG_ROWPARTPAGEUC + 2) 'By points - Per punti
- WidthLbl.Content = EgtMsg(MSG_ROWPARTPAGEUC + 3) 'Width - Larghezza
- HeightLbl.Content = EgtMsg(MSG_ROWPARTPAGEUC + 4) 'Height - Altezza
- OffsetXLbl.Content = EgtMsg(MSG_ROWPARTPAGEUC + 5) 'Offset X
- OffsetYLbl.Content = EgtMsg(MSG_ROWPARTPAGEUC + 6) 'Offset Y
- KerfLbl.Content = EgtMsg(MSG_ROWPARTPAGEUC + 7) 'Kerf
- DamagedAreaLbl.Content = EgtMsg(MSG_ROWPARTPAGEUC + 8) 'Damaged area - Zona rovinata
- NewBtn.Content = EgtMsg(MSG_ROWPARTPAGEUC + 9) 'New - Nuovo
- DeleteBtn.Content = EgtMsg(MSG_ROWPARTPAGEUC + 10) 'Delete - Cancella
- PointsLbl.Content = EgtMsg(MSG_ROWPARTPAGEUC + 11) 'Points - Punti
- AddBtn.Content = EgtMsg(MSG_ROWPARTPAGEUC + 12) 'Add - Aggiungi
- RemoveBtn.Content = EgtMsg(MSG_ROWPARTPAGEUC + 13) 'Remove - Rimuovi
+ LengthLbl.Content = EgtMsg(MSG_ROWPARTPAGEUC + 3) 'Length - Lunghezza
+ WidthLbl.Content = EgtMsg(MSG_ROWPARTPAGEUC + 4) 'Width - Larghezza
+ HeightLbl.Content = EgtMsg(MSG_ROWPARTPAGEUC + 5) 'Height - Spessore
+ OffsetXLbl.Content = EgtMsg(MSG_ROWPARTPAGEUC + 6) 'Offset X
+ OffsetYLbl.Content = EgtMsg(MSG_ROWPARTPAGEUC + 7) 'Offset Y
+ KerfLbl.Content = EgtMsg(MSG_ROWPARTPAGEUC + 8) 'Kerf
+ MaterialLbl.Content = EgtMsg(MSG_ROWPARTPAGEUC + 9) 'Material - Materiale
+ DamagedAreaLbl.Content = EgtMsg(MSG_ROWPARTPAGEUC + 10) 'Damaged area - Zona rovinata
+ NewBtn.Content = EgtMsg(MSG_ROWPARTPAGEUC + 11) 'New - Nuovo
+ DeleteBtn.Content = EgtMsg(MSG_ROWPARTPAGEUC + 12) 'Delete - Cancella
+ PointsLbl.Content = EgtMsg(MSG_ROWPARTPAGEUC + 13) 'Points - Punti
+ AddBtn.Content = EgtMsg(MSG_ROWPARTPAGEUC + 14) 'Add - Aggiungi
+ RemoveBtn.Content = EgtMsg(MSG_ROWPARTPAGEUC + 15) 'Remove - Rimuovi
End Sub