From ad6e5b609afba1f9dcbbd85f7cdea1b27daed2b4 Mon Sep 17 00:00:00 2001
From: Emmanuele Sassi <emmanuele.sassi@egaltech.com>
Date: Fri, 18 Sep 2015 08:07:34 +0000
Subject: [PATCH] OmagCUT : - Aggiunte variabili in RawPart.

---
 ConstMsg.vb                                   |   4 +-
 MachineStatusUC.xaml                          | 248 ++++++++++--------
 MainWindow.xaml.vb                            |   4 +-
 NestPageUC.xaml                               |  11 +-
 NestPageUC.xaml.vb                            |  11 +-
 OmagCUT.vbproj                                |   6 +-
 RowPartPageUC.xaml => RawPartPageUC.xaml      |  59 +++--
 ...artPageUC.xaml.vb => RawPartPageUC.xaml.vb |  27 +-
 8 files changed, 222 insertions(+), 148 deletions(-)
 rename RowPartPageUC.xaml => RawPartPageUC.xaml (77%)
 rename RowPartPageUC.xaml.vb => RawPartPageUC.xaml.vb (67%)

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 @@
     <!-- ** Definizione della MachineStatusBar ** -->
     <Grid Name="MachineStatusGrid">
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1.75*"/>
-            <ColumnDefinition Width="2"/>
-            <ColumnDefinition Width="1.75*"/>
-            <ColumnDefinition Width="2"/>
-            <ColumnDefinition Width="1.75*"/>
-            <ColumnDefinition Width="2"/>
-            <ColumnDefinition Width="1.75*"/>
-            <ColumnDefinition Width="2"/>
-            <ColumnDefinition Width="1.75*"/>
-            <ColumnDefinition Width="2"/>
-            <ColumnDefinition Width="1.75*"/>
-            <ColumnDefinition Width="2"/>
-            <ColumnDefinition Width="1.75*"/>
-            <ColumnDefinition Width="2"/>
-            <ColumnDefinition Width="1.75*"/>
-            <ColumnDefinition Width="2"/>
             <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="2"/>
+            <ColumnDefinition Width="1.75*"/>
+            <ColumnDefinition Width="2"/>
+            <ColumnDefinition Width="1.75*"/>
+            <ColumnDefinition Width="2"/>
+            <ColumnDefinition Width="1.75*"/>
+            <ColumnDefinition Width="2"/>
+            <ColumnDefinition Width="1.75*"/>
+            <ColumnDefinition Width="2"/>
+            <ColumnDefinition Width="1.75*"/>
+            <ColumnDefinition Width="2"/>
+            <ColumnDefinition Width="1.75*"/>
+            <ColumnDefinition Width="2"/>
+            <ColumnDefinition Width="1.75*"/>
+            <ColumnDefinition Width="2"/>
+            <ColumnDefinition Width="1.75*"/>
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
             <RowDefinition Height="1*"/>
             <RowDefinition Height="1*"/>
         </Grid.RowDefinitions>
+        
 
-        <Grid Grid.Row="0" >
+        <Border Grid.Column="1" Grid.RowSpan="2" Background="Gold" />
+
+        <Grid Grid.Column="2" Grid.Row="0" >
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto" />
                 <ColumnDefinition Width="1*" />
             </Grid.ColumnDefinitions>
 
             <Label Grid.Column="0" Content="F" FontSize="35" VerticalAlignment="Bottom" Margin="0,-8,0,0" />
-            <Label Grid.Column="1" Name="FeedLbl"  Content="1000.72" FontSize="27" HorizontalAlignment="Right"
+            <Label Grid.Column="1" Name="FeedLbl"  Content="1000" FontSize="27" HorizontalAlignment="Right"
                 Margin="-10,0,0,-4.5" VerticalAlignment="Bottom" />
 
         </Grid>
 
-        <Grid Grid.Row="1" >
+        <Grid Grid.Column="2" Grid.Row="1" >
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto" />
                 <ColumnDefinition Width="1*" />
@@ -56,23 +59,6 @@
             
         </Grid>
         
-        <Border Grid.Column="1" Grid.RowSpan="2" Background="Gold" />
-
-        <Grid Grid.Column="2" >
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="1*" />
-            </Grid.ColumnDefinitions>
-
-            <Label Name="Axis1NameLbl" Grid.Column="0" Content="X" FontSize="35" VerticalAlignment="Bottom" Margin="0,-8,0,0" />
-            <Label Name="Axis1Lbl" Grid.Column="1" Content="-1874.765" FontSize="27" HorizontalAlignment="Right"
-                Margin="-10,0,0,-4.5" VerticalAlignment="Bottom"/>
-
-        </Grid>        
-        
-        <Label Name="DeltaAxis1Lbl" Grid.Column="2" Grid.Row="1" Grid.ColumnSpan="1" Grid.RowSpan="1"
-            Content="-1126.235" FontSize="18" VerticalAlignment="Top" HorizontalAlignment="Right"/>
-
         <Border Grid.Column="3" Grid.RowSpan="2" Background="Gold" />
 
         <Grid Grid.Column="4" >
@@ -81,86 +67,138 @@
                 <ColumnDefinition Width="1*" />
             </Grid.ColumnDefinitions>
 
-            <Label Name="Axis2NameLbl" Grid.Column="0" Content="Y" FontSize="35" VerticalAlignment="Bottom" Margin="0,-8,0,0" />
-            <Label Name="Axis2Lbl" Grid.Column="1" Content="539.427" FontSize="27" HorizontalAlignment="Right"
-                Margin="-10,0,0,-4.5" VerticalAlignment="Bottom"/>
-
-        </Grid>
-
-        <Label Name="DeltaAxis2Lbl" Grid.Column="4" Grid.Row="1" Grid.ColumnSpan="1" Grid.RowSpan="1"
-            Content="460.573" FontSize="18" VerticalAlignment="Top" HorizontalAlignment="Right"/>
-
-        <Border Grid.Column="5" Grid.RowSpan="2" Background="Gold" />
-
-        <Grid Grid.Column="6" >
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="1*" />
-            </Grid.ColumnDefinitions>
-
-            <Label Name="Axis3NameLbl" Grid.Column="0" Content="Z" FontSize="35" VerticalAlignment="Bottom" Margin="0,-8,0,0" />
-            <Label Name="Axis3Lbl" Grid.Column="1" Content="539.427" FontSize="27" HorizontalAlignment="Right"
-                Margin="-10,0,0,-4.5" VerticalAlignment="Bottom"/>
-
-        </Grid>
-
-        <Label Name="DeltaAxis3Lbl" Grid.Column="6" Grid.Row="1" Grid.ColumnSpan="1" Grid.RowSpan="1"
-            Content="460.573" FontSize="18" VerticalAlignment="Top" HorizontalAlignment="Right"/>
-
-        <Border Grid.Column="7" Grid.RowSpan="2" Background="Gold" />
-
-        <Grid Grid.Column="8" >
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="1*" />
-            </Grid.ColumnDefinitions>
-
-            <Label Name="Axis4NameLbl" Grid.Column="0" Content="C" FontSize="35" VerticalAlignment="Bottom" Margin="0,-8,0,0" />
-            <Label Name="Axis4Lbl" Grid.Column="1" Content="539.427" FontSize="27" HorizontalAlignment="Right"
-                Margin="-10,0,0,-4.5" VerticalAlignment="Bottom"/>
-
-        </Grid>
-
-        <Label Name="DeltaAxis4Lbl" Grid.Column="8" Grid.Row="1" Grid.ColumnSpan="1" Grid.RowSpan="1"
-            Content="460.573" FontSize="18" VerticalAlignment="Top" HorizontalAlignment="Right"/>
-
-        <Border Grid.Column="9" Grid.RowSpan="2" Background="Gold" />
-        
-        <Grid Grid.Column="10" >
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="1*" />
-            </Grid.ColumnDefinitions>
-
-            <Label Name="Axis5NameLbl" Grid.Column="0" Content="B" FontSize="35" VerticalAlignment="Bottom" Margin="0,-8,0,0" />
-            <Label Name="Axis5Lbl" Grid.Column="1" Content="539.427" FontSize="27" HorizontalAlignment="Right"
-                Margin="-10,0,0,-4.5" VerticalAlignment="Bottom"/>
-
-        </Grid>
-
-        <Label Name="DeltaAxis5Lbl" Grid.Column="10" Grid.Row="1" Grid.ColumnSpan="1" Grid.RowSpan="1"
-            Content="460.573" FontSize="18" VerticalAlignment="Top" HorizontalAlignment="Right"/>
-
-        <Border Grid.Column="11" Grid.RowSpan="2" Background="Gold" />
-
-        <Grid Grid.Column="12" >
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="1*" />
-            </Grid.ColumnDefinitions>
-
             <Label Name="SpeedNameLbl" Grid.Column="0" Content="S" FontSize="35" VerticalAlignment="Bottom" Margin="0,-8,0,0" />
             <Label Name="SpeedLbl" Grid.Column="1" Content="539.427" FontSize="27" HorizontalAlignment="Right"
                 Margin="-10,0,0,-4.5" VerticalAlignment="Bottom"/>
 
         </Grid>
 
-        <Label Name="SpeedOverrideLbl" Grid.Column="12" Grid.Row="1" Grid.ColumnSpan="1" Grid.RowSpan="1"
+        <Label Name="SpeedOverrideLbl" Grid.Column="4" Grid.Row="1" Grid.ColumnSpan="1" Grid.RowSpan="1"
+            Content="460.573" FontSize="18" VerticalAlignment="Top" HorizontalAlignment="Right"/>
+        
+        <Border Grid.Column="5" Grid.RowSpan="2" Background="Gold" />
+
+        <Grid Grid.Column="6" Grid.Row="0" >
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="1*" />
+            </Grid.ColumnDefinitions>
+
+            <Label Grid.Column="0" Content="A" FontSize="35" VerticalAlignment="Bottom" Margin="0,-8,0,0" />
+            <Label Grid.Column="1" Name="ConsumptionLbl"  Content="25" FontSize="27" HorizontalAlignment="Right"
+                Margin="-10,0,0,-4.5" VerticalAlignment="Bottom" />
+
+        </Grid>
+
+        <Grid Grid.Column="6" Grid.Row="1" >
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="1*" />
+            </Grid.ColumnDefinitions>
+
+            <Label Grid.Column="0" Content="VVV" FontSize="35" VerticalAlignment="Bottom" Margin="0,-8,0,0" />
+            <Label Grid.Column="1" Name="FedOverrideLbl"  Content="15%" FontSize="27" HorizontalAlignment="Right"
+                Margin="-10,0,0,-4.5" VerticalAlignment="Bottom" />
+
+        </Grid>
+
+        <Border Grid.Column="7" Grid.RowSpan="2" Background="Gold" />
+
+        <Grid Grid.Column="8" >
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="1*" />
+            </Grid.ColumnDefinitions>
+
+            <Label Name="Axis1NameLbl" Grid.Column="0" Content="X" FontSize="35" VerticalAlignment="Bottom" Margin="0,-8,0,0" />
+            <Label Name="Axis1Lbl" Grid.Column="1" Content="-1874.765" FontSize="27" HorizontalAlignment="Right"
+                Margin="-10,0,0,-4.5" VerticalAlignment="Bottom"/>
+
+        </Grid>        
+        
+        <Label Name="DeltaAxis1Lbl" Grid.Column="8" Grid.Row="1" Grid.ColumnSpan="1" Grid.RowSpan="1"
+            Content="-1126.235" FontSize="18" VerticalAlignment="Top" HorizontalAlignment="Right"/>
+
+        <Border Grid.Column="9" Grid.RowSpan="2" Background="Gold" />
+
+        <Grid Grid.Column="10" >
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="1*" />
+            </Grid.ColumnDefinitions>
+
+            <Label Name="Axis2NameLbl" Grid.Column="0" Content="Y" FontSize="35" VerticalAlignment="Bottom" Margin="0,-8,0,0" />
+            <Label Name="Axis2Lbl" Grid.Column="1" Content="539.427" FontSize="27" HorizontalAlignment="Right"
+                Margin="-10,0,0,-4.5" VerticalAlignment="Bottom"/>
+
+        </Grid>
+
+        <Label Name="DeltaAxis2Lbl" Grid.Column="10" Grid.Row="1" Grid.ColumnSpan="1" Grid.RowSpan="1"
+            Content="460.573" FontSize="18" VerticalAlignment="Top" HorizontalAlignment="Right"/>
+
+        <Border Grid.Column="11" Grid.RowSpan="2" Background="Gold" />
+
+        <Grid Grid.Column="12" >
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="1*" />
+            </Grid.ColumnDefinitions>
+
+            <Label Name="Axis3NameLbl" Grid.Column="0" Content="Z" FontSize="35" VerticalAlignment="Bottom" Margin="0,-8,0,0" />
+            <Label Name="Axis3Lbl" Grid.Column="1" Content="539.427" FontSize="27" HorizontalAlignment="Right"
+                Margin="-10,0,0,-4.5" VerticalAlignment="Bottom"/>
+
+        </Grid>
+
+        <Label Name="DeltaAxis3Lbl" Grid.Column="12" Grid.Row="1" Grid.ColumnSpan="1" Grid.RowSpan="1"
             Content="460.573" FontSize="18" VerticalAlignment="Top" HorizontalAlignment="Right"/>
 
         <Border Grid.Column="13" Grid.RowSpan="2" Background="Gold" />
 
+        <Grid Grid.Column="14" >
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="1*" />
+            </Grid.ColumnDefinitions>
+
+            <Label Name="Axis4NameLbl" Grid.Column="0" Content="C" FontSize="35" VerticalAlignment="Bottom" Margin="0,-8,0,0" />
+            <Label Name="Axis4Lbl" Grid.Column="1" Content="539.427" FontSize="27" HorizontalAlignment="Right"
+                Margin="-10,0,0,-4.5" VerticalAlignment="Bottom"/>
+
+        </Grid>
+
+        <Label Name="DeltaAxis4Lbl" Grid.Column="14" Grid.Row="1" Grid.ColumnSpan="1" Grid.RowSpan="1"
+            Content="460.573" FontSize="18" VerticalAlignment="Top" HorizontalAlignment="Right"/>
+
         <Border Grid.Column="15" Grid.RowSpan="2" Background="Gold" />
+        
+        <Grid Grid.Column="16" >
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="1*" />
+            </Grid.ColumnDefinitions>
+
+            <Label Name="Axis5NameLbl" Grid.Column="0" Content="B" FontSize="35" VerticalAlignment="Bottom" Margin="0,-8,0,0" />
+            <Label Name="Axis5Lbl" Grid.Column="1" Content="539.427" FontSize="27" HorizontalAlignment="Right"
+                Margin="-10,0,0,-4.5" VerticalAlignment="Bottom"/>
+
+        </Grid>
+
+        <Label Name="DeltaAxis5Lbl" Grid.Column="16" Grid.Row="1" Grid.ColumnSpan="1" Grid.RowSpan="1"
+            Content="460.573" FontSize="18" VerticalAlignment="Top" HorizontalAlignment="Right"/>
+        
+        
+        
+        
+        
+        
+        
+        
+        
+
+        
+
+        
 
     </Grid>
 
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">
 
     <!-- Chiamata al Dictionary -->
     <UserControl.Resources>
@@ -66,14 +66,7 @@
                 VerticalAlignment="Center" />
         </Button>
 
-        <UniformGrid Grid.Column="0" Grid.Row="8" Grid.ColumnSpan="3" Columns="2">
-            <TextBlock Name="LayerThicknessLbl" Grid.ColumnSpan="3" VerticalAlignment="Center"
-                    HorizontalAlignment="Center" FontSize="15" TextWrapping="WrapWithOverflow" Width="75"
-                    TextAlignment="Center" />
-            <TextBox Name="LayerThicknessTxBx" Grid.Column="1" Grid.Row="5" Style="{StaticResource NumericKeyboard}"
-                    FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center" Width="60"
-                    TextAlignment="Right"/>
-        </UniformGrid>
+        <Button Name="RemovePartBtn" Grid.ColumnSpan="3" Grid.Row="7" FontSize="22" />
 
     </Grid>
 
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 @@
     <Compile Include="NestPageUC.xaml.vb">
       <DependentUpon>NestPageUC.xaml</DependentUpon>
     </Compile>
-    <Compile Include="RowPartPageUC.xaml.vb">
-      <DependentUpon>RowPartPageUC.xaml</DependentUpon>
+    <Compile Include="RawPartPageUC.xaml.vb">
+      <DependentUpon>RawPartPageUC.xaml</DependentUpon>
     </Compile>
     <Compile Include="ImportPageUC.xaml.vb">
       <DependentUpon>ImportPageUC.xaml</DependentUpon>
@@ -219,7 +219,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="RowPartPageUC.xaml">
+    <Page Include="RawPartPageUC.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
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 @@
-<UserControl x:Class="RowPartPageUC"
+<UserControl x:Class="RawPartPageUC"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -42,10 +42,12 @@
                 <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
             <Grid.RowDefinitions>
-                <RowDefinition Height="3*"/>
+                <RowDefinition Height="3.5*"/>
+                <RowDefinition Height="0.5*"/>
+                <RowDefinition Height="1*"/>
                 <RowDefinition Height="0.5*"/>
                 <RowDefinition Height="1.5*"/>
-                <RowDefinition Height="2.5*"/>
+                <RowDefinition Height="0.5*"/>
                 <RowDefinition Height="1.5*"/>
                 <RowDefinition Height="1*"/>
             </Grid.RowDefinitions>
@@ -62,36 +64,42 @@
                     <RowDefinition Height="0.5*"/>
                     <RowDefinition Height="0.5*"/>
                     <RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="0.5*"/>
                 </Grid.RowDefinitions>
                 <RadioButton Name="RectangleBtn" Style="{StaticResource {x:Type ToggleButton}}"
                 FontSize="20" FontWeight="Bold" GroupName="DefinitionMethod_GrezzoUC"/>
                 <RadioButton Name="ByPointsBtn" Style="{StaticResource {x:Type ToggleButton}}"
                 Grid.Column="1" FontSize="20" FontWeight="Bold" GroupName="DefinitionMethod_GrezzoUC"/>
-                <Label Name="WidthLbl" Grid.Row="1" FontSize="20" HorizontalAlignment="Center"
+                <Label Name="LengthLbl" Grid.Row="1" FontSize="20" HorizontalAlignment="Center"
                 VerticalAlignment="Center" />
-                <TextBox Name="WidthTxBx" Grid.Column="1" Grid.Row="1" Text="200" FontSize="20"
+                <TextBox Name="LengthTxBx" Grid.Column="1" Grid.Row="1" Text="200" FontSize="20"
                 HorizontalAlignment="Center" VerticalAlignment="Center" Width="60" TextAlignment="Right"
                 Style="{StaticResource NumericKeyboard}"  />
-                <Label Name="HeightLbl" Grid.Row="2" FontSize="20" HorizontalAlignment="Center"
+                <Label Name="WidthLbl" Grid.Row="2" FontSize="20" HorizontalAlignment="Center"
                 VerticalAlignment="Center"/>
-                <TextBox Name="HeightTxBx" Grid.Column="1" Grid.Row="2" Text="200" FontSize="20"
+                <TextBox Name="WidthTxBx" Grid.Column="1" Grid.Row="2" Text="200" FontSize="20"
                 HorizontalAlignment="Center" VerticalAlignment="Center" Width="60" TextAlignment="Right"
                 Style="{StaticResource NumericKeyboard}" />
-                <Label Name="OffsetXLbl" Grid.Row="3" FontSize="20" HorizontalAlignment="Center"
-                VerticalAlignment="Center" />
-                <TextBox Name="OffsetXTxBx" Grid.Column="1" Grid.Row="3" Text="200" FontSize="20"
+                <Label Name="HeightLbl" Grid.Row="3" FontSize="20" HorizontalAlignment="Center"
+                VerticalAlignment="Center"/>
+                <TextBox Name="HeightTxBx" Grid.Column="1" Grid.Row="3" Text="200" FontSize="20"
                 HorizontalAlignment="Center" VerticalAlignment="Center" Width="60" TextAlignment="Right"
                 Style="{StaticResource NumericKeyboard}" />
-                <Label Name="OffsetYLbl" Grid.Row="4" FontSize="20" HorizontalAlignment="Center"
+                <Label Name="OffsetXLbl" Grid.Row="4" FontSize="20" HorizontalAlignment="Center"
                 VerticalAlignment="Center" />
-                <TextBox Name="OffsetYTxBx" Grid.Column="1" Grid.Row="4" Text="200" FontSize="20"
+                <TextBox Name="OffsetXTxBx" Grid.Column="1" Grid.Row="4" Text="200" FontSize="20"
+                HorizontalAlignment="Center" VerticalAlignment="Center" Width="60" TextAlignment="Right"
+                Style="{StaticResource NumericKeyboard}" />
+                <Label Name="OffsetYLbl" Grid.Row="5" FontSize="20" HorizontalAlignment="Center"
+                VerticalAlignment="Center" />
+                <TextBox Name="OffsetYTxBx" Grid.Column="1" Grid.Row="5" Text="200" FontSize="20"
                 HorizontalAlignment="Center" VerticalAlignment="Center" Width="60" TextAlignment="Right"
                 Style="{StaticResource NumericKeyboard}" />
             </Grid>
 
             <!-- Definizione della Grid per il Kerf -->
             <Border Style="{StaticResource CustomBorder}" Grid.ColumnSpan="3"
-            Grid.Column="0" Grid.Row="1" >
+                Grid.Column="0" Grid.Row="1" >
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="1*"/>
@@ -110,9 +118,30 @@
                 </Grid>
             </Border>
 
+            <!-- Definizione della Grid per il materiale -->
+            <Border Style="{StaticResource CustomBorder}" Grid.ColumnSpan="3"
+                Grid.Column="0" Grid.Row="2" >
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1*"/>
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="0.5*"/>
+                        <RowDefinition Height="0.5*"/>
+                    </Grid.RowDefinitions>
+
+                    <Label Name="MaterialLbl" Grid.Row="0" FontSize="20" HorizontalAlignment="Left"
+                    VerticalAlignment="Center" Margin="8,0,0,0" FontWeight="Bold"/>
+                    <TextBox Name="MaterialTxBx" Grid.Row="1" Text="200" FontSize="20"
+                    HorizontalAlignment="Center" VerticalAlignment="Center" Width="60" TextAlignment="Right"
+                    Style="{StaticResource NumericKeyboard}" />
+
+                </Grid>
+            </Border>
+
             <!-- Definizione della Grid per Zona rovinata -->
             <Border Style="{StaticResource CustomBorder}" Grid.ColumnSpan="3"
-            Grid.Column="0" Grid.Row="2" >
+            Grid.Column="0" Grid.Row="4" >
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="1*"/>
@@ -133,7 +162,7 @@
 
             <!-- Definizione della Grid per Punti -->
             <Border Style="{StaticResource CustomBorder}" Grid.ColumnSpan="3"
-            Grid.Column="0" Grid.Row="4" >
+            Grid.Column="0" Grid.Row="6" >
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="1*"/>
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