Inserita gestione Flag per Rettificata tagli inclinati

Modifica gestione FEED per controllo FANUC
Correzione disabilitazione NuovoRiferimento
2023-05-30 19:27:14 +02:00 · 2023-05-26 17:35:18 +02:00 · 2023-05-25 12:48:26 +02:00 · 2023-05-24 12:01:26 +02:00 · 2023-05-24 12:00:11 +02:00 · 2023-05-23 18:40:38 +02:00
30 changed files with 1081 additions and 295 deletions
@@ -1292,6 +1292,7 @@ Public Class MoveRawPartPage
            m_bRemovedRaw = GetRemoveByHandInDisposition(m_nCurrDisposition)
            GetMoveInfoInDisposition(m_nCurrDisposition, m_RawMoveDataList)
            EgtDraw()
+            EnableButtons()
            Return
         ElseIf IsDispUnloadOnAuxTab(m_nCurrDisposition) <> 0 AndAlso Not NextOperationIsUnloading(m_nCurrDisposition) Then
            ' imposto la nuova fase, al termine della Sub verrà caricata la pagina Split nella fase indicata ora
@@ -116,6 +116,8 @@ Module ConstIni
   Public Const K_LASTCOLOR As String = "LastColor"
   Public Const K_COLOR As String = "Color"

+   Public Const S_FRAMECOMPO As String = "FrameCompo"
+
   Public Const S_EXTCOMPO As String = "Compo"

   Public Const S_INTCOMPO As String = "InternalCompo"
@@ -223,6 +225,12 @@ Module ConstIni
   Public Const K_RAWOFFSX As String = "OffsX"
   Public Const K_RAWOFFSY As String = "OffsY"
   Public Const K_RAWKERF As String = "Kerf"
+   Public Const K_ENABLEOTHERREFTAB As String = "EnableOtherRefTab"
+   Public Const K_OTHERREFTAB As String = "OtherRefTab"
+   Public Const K_OTHERREFTABX As String = "OtherRefTabX"
+   Public Const K_OTHERREFTABY As String = "OtherRefTabY"
+   Public Const K_OTHERREFTABPOS As String = "OtherRefTabPos"
+

   Public Const S_RAWMOVE As String = "RawMove"
   Public Const K_RAWSTEP As String = "Step"
@@ -232,6 +232,7 @@
   Public Const K_HOLES_OFFSETWJ As String = "HolesOffsetWJ"
   Public Const K_MIN_RADIUSWJ As String = "MinRadiusWJ"
   Public Const K_MACH_DRILLINGWJ_ON_CORNERS As String = "DrillingWJOnCorners"
+   Public Const K_MACH_RECTIFICATION_ON_SUBSQUARE As String = "RectificationSubSqWJ"
   ' DrillMillC90
   ' CutLongDxSx
   ' AngRotMultiCut
@@ -683,6 +683,17 @@ Public MustInherit Class MachineButton
      End If
      EgtLuaSetGlobNumVar("CMD.S", dSpeed)

+      ' versione 2.5e1
+      EgtTdbSetCurrTool(m_MainWindow.m_CurrentProjectPageUC.ToolTxBx.Text)
+      Dim sToolPos As String = String.Empty
+      If EgtTdbGetCurrToolParam(MCH_TP.TCPOS, sToolPos) Then
+         EgtLuaGetGlobStringVar("CMD.TCPOS", sToolPos)
+      End If
+      Dim dToolDiam As Double = 0
+      If EgtTdbGetCurrToolParam(MCH_TP.DIAM, dToolDiam) Then
+         EgtLuaSetGlobNumVar("CMD.DIAM", dToolDiam * 1000)
+      End If
+
      Dim dL1, dL2, dL3, dR1, dR2 As Double
      m_MainWindow.m_CNCommunication.GetAxesPositions(dL1, dL2, dL3, dR1, dR2)
      EgtLuaSetGlobNumVar("CMD.L1", dL1)
@@ -186,7 +186,10 @@ Public Class FlatteningCut
      WritePrivateProfileString( S_DIRECTCUTS, K_DC_FLATT_MACHTYPE, m_nMachType.ToString(), m_MainWindow.GetIniFile())
      WritePrivateProfileString( S_DIRECTCUTS, K_DC_FLATT_ROTLOCK, If( m_bRotLock, "1", "0"), m_MainWindow.GetIniFile())
      WritePrivateProfileString( S_DIRECTCUTS, K_DC_FLATT_POSX, DoubleToString( m_ptTipP1.x, 2), m_MainWindow.GetIniFile())
-      WritePrivateProfileString( S_DIRECTCUTS, K_DC_FLATT_POSY, DoubleToString( m_ptTipP1.y, 2), m_MainWindow.GetIniFile())
+      WritePrivateProfileString(S_DIRECTCUTS, K_DC_FLATT_POSY, DoubleToString(m_ptTipP1.y, 2), m_MainWindow.GetIniFile())
+      ' imposto la Z di sicurezza corretta
+      EgtMdbSetGeneralParam(MCH_GP.SAFEZ, DirectCutPageUC.m_dZSafe)
+      EgtMdbSave()
      ' Se non vado in simulazione
      If Not m_bSimul Then
         ' Dichiaro sottopagina da non riattivare
@@ -35,6 +35,7 @@ Public Class MachineButtonsUC
   Private Const BTN_STATE_DOOR_OPENED As String = "DoorOpened"
   Private Const BTN_STATE_DOOR_CLOSED As String = "DoorClosed"
   Private Const BTN_STATE_PARKING As String = "Parking"
+   Private Const BTN_STATE_HOME As String = "Home"
   Private Const BTN_ENABLE_ZONE_1 As String = "EnableZone1"
   Private Const BTN_ENABLE_ZONE_2 As String = "EnableZone2"
   Private Const BTN_ENABLE_PC As String = "EnablePC"
@@ -380,6 +381,17 @@ Public Class MachineButtonsUC
         EgtTdbGetCurrToolParam(MCH_TP.SPEED, dSpeed)
      End If
      EgtLuaSetGlobNumVar("CMD.S", dSpeed)
+      ' versione 2.5e1
+      EgtTdbSetCurrTool(m_MainWindow.m_CurrentProjectPageUC.ToolTxBx.Text)
+      Dim sToolPos As String = String.Empty
+      If EgtTdbGetCurrToolParam(MCH_TP.TCPOS, sToolPos) Then
+         EgtLuaGetGlobStringVar("CMD.TCPOS", sToolPos)
+      End If
+      Dim dToolDiam As Double = 0
+      If EgtTdbGetCurrToolParam(MCH_TP.DIAM, dToolDiam) Then
+         EgtLuaSetGlobNumVar("CMD.DIAM", dToolDiam * 1000)
+      End If
+
      Dim dL1, dL2, dL3, dR1, dR2 As Double
      m_MainWindow.m_CNCommunication.GetAxesPositions(dL1, dL2, dL3, dR1, dR2)
      EgtLuaSetGlobNumVar("CMD.L1", dL1)
@@ -700,6 +712,40 @@ Public Class MachineButtonsUC
      End If
   End Sub

+   Friend Sub HomeStateChanged(HomeState As Boolean)
+      Dim nIndex As Integer = Array.IndexOf(StateFlagArray, BTN_STATE_HOME)
+      If nIndex = -1 Then Return
+      If HomeState Then
+         GetToggleButton(nIndex + 1).IsChecked = True
+         Try
+            Dim s As String
+            If (m_MainWindow.m_OptionsPageUC.ThemesCmBx.SelectedIndex = 0) Then
+               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayY(nIndex)
+            Else
+               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\NewIcons\" & ImageArrayY(nIndex)
+            End If
+            Dim sButtonImageSource As ImageSource = ImageConverter.ConvertFromString(s)
+            GetImage(nIndex + 1).Source = sButtonImageSource
+         Catch ex As Exception
+            EgtOutLog("Error loading image " & ImageArrayY(nIndex + 1))
+         End Try
+      Else
+         GetToggleButton(nIndex + 1).IsChecked = False
+         Try
+            Dim s As String
+            If (m_MainWindow.m_OptionsPageUC.ThemesCmBx.SelectedIndex = 0) Then
+               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayY(nIndex)
+            Else
+               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\NewIcons\" & ImageArrayY(nIndex)
+            End If
+            Dim sButtonImageSource As ImageSource = ImageConverter.ConvertFromString(s)
+            GetImage(nIndex + 1).Source = sButtonImageSource
+         Catch ex As Exception
+            EgtOutLog("Error loading image " & ImageArrayN(nIndex + 1))
+         End Try
+      End If
+   End Sub
+
   Friend Sub EnableZoneStateChanged(ZoneState As Integer)
      Dim sFlag As String = String.Empty
      If ZoneState = 1 Then
@@ -37,7 +37,7 @@ Public Class CompoDimensionUC
      InternComponentBtn.Content = EgtMsg(MSG_COMPONENTPAGEUC + 47)     ' Componenti interni
      If Not String.IsNullOrEmpty(sCompoDir) Then
         bEnableAlzFront = True
-         AlzFrontBtn.Content = "Alzatine & Frontalini"
+         AlzFrontBtn.Content = EgtMsg(91137)
      Else
         AlzFrontBtn.Visibility = Visibility.Collapsed
      End If
@@ -107,8 +107,10 @@ Public Class CompoDimensionUC
   Friend Sub ShowAlzFrontBtn(ByVal value As Boolean)
      If value Then
         AlzFrontBtn.Visibility = Visibility.Visible
+         m_MainWindow.m_DrawPageUC.MessageGrid.Visibility = Visibility.Hidden
      Else
         AlzFrontBtn.Visibility = Visibility.Hidden
+         m_MainWindow.m_DrawPageUC.MessageGrid.Visibility = Visibility.Visible
      End If
   End Sub

@@ -283,6 +283,19 @@ Public Class DrawPageUC
      m_sCsvOrder = ""
      m_sCsvList = ""
      m_sCsvName = ""
+
+      ' Visuliazzazione dei bottoni per modifica dei componenti
+      If m_MainWindow.FrameCutBtn.IsChecked Then
+         SideAngleBtn.Visibility = Visibility.Hidden
+         FiloTopBtn.Visibility = Visibility.Hidden
+         EngraveBtn.Visibility = Visibility.Hidden
+         DripCutBtn.Visibility = Visibility.Hidden
+      Else
+         SideAngleBtn.Visibility = Visibility.Visible
+         FiloTopBtn.Visibility = Visibility.Visible
+         EngraveBtn.Visibility = Visibility.Visible
+         DripCutBtn.Visibility = Visibility.Visible
+      End If
   End Sub

   ' recupero il click sulla scena ed assegno il metodo a secondo della pagina aperta
@@ -553,6 +566,7 @@ Public Class DrawPageUC
      OkBtn.IsEnabled = True
   End Sub

+   ' Navigazione nelle due pagine per la selezione dei componenti da disegnare
   Friend Sub BackBtn_Click(sender As Object, e As RoutedEventArgs) Handles BackBtn.Click
      m_SceneButtons.MeasureBtn.IsChecked = False
      DrawPage_Unloaded(sender, e)
@@ -1124,6 +1138,30 @@ Public Class DrawPageUC
      Return True
   End Function

+   Private Function MakeSectionFrameInsert() As Boolean
+      ' m_MainWindow.m_ImportPageUC.LoadFrame()
+      ' recupero il primo layer del primo pezzo
+      Dim nLayerId As Integer = EgtGetFirstLayer(EgtGetFirstPart())
+      If nLayerId = GDB_ID.NULL Then Return False
+      ' percorso in cui salvare tempora
+      Dim sTmpFile As String = m_MainWindow.GetTempDir() & "\Frame.Nge"
+      If Not EgtSaveObjToFile(nLayerId, sTmpFile, NGE.BIN) Then Return False
+      ' Passo al contesto principale
+      EgtSetCurrentContext(m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene.GetCtx())
+      ' Inserisco il pezzo
+      If Not My.Computer.FileSystem.FileExists(sTmpFile) Then Return False
+      EgtInsertFile(sTmpFile)
+      ' Ne recupero l'Id
+      Dim nPartId As Integer = EgtGetLastPart()
+      ' Creo la cornice
+      m_MainWindow.m_FrameCutPageUC.CreateFrame(nPartId)
+      ' Ricalcolo lavorazioni
+      AddFrameMachinings(m_MainWindow.m_FrameCutPageUC.m_FrameMachiningUC.m_dStartTrim, m_MainWindow.m_FrameCutPageUC.m_FrameMachiningUC.m_dEndTrim)
+      ' Cancello il file
+      My.Computer.FileSystem.DeleteFile(sTmpFile)
+      Return True
+   End Function
+
   Private Sub OkBtn_Click(sender As Object, e As RoutedEventArgs) Handles OkBtn.Click
      m_bBackFromInternalCompo = False
      m_bInternalCompo = False
@@ -1139,7 +1177,12 @@ Public Class DrawPageUC
      Dim InsNbr As Integer = Int32.Parse(PartNumTxBx.Text)
      ' Passo al contesto principale
      'MakeInsert(InsNbr, sPartName)
-      MakeMultipleInsert(InsNbr, sPartName)
+      If m_MainWindow.FrameCutBtn.IsChecked Then
+         MakeSectionFrameInsert()
+      Else
+         MakeMultipleInsert(InsNbr, sPartName)
+      End If
+
      ' Aggiorno ambiente principale
      EgtZoom(ZM.ALL)
      ' Elimino nome del componente precedente
@@ -1153,7 +1196,7 @@ Public Class DrawPageUC
      ' Istruzioni per chiudere ImportPageUC e aprire CadCutPageUC
      m_MainWindow.MainWindowGrid.Children.Remove(m_MainWindow.m_DrawPageUC)
      m_MainWindow.MainWindowGrid.Children.Add(m_MainWindow.m_CurrentProjectPageUC)
-      m_MainWindow.m_ActivePage = MainWindow.Pages.CadCut
+      m_MainWindow.m_ActivePage = If(m_MainWindow.FrameCutBtn.IsChecked, MainWindow.Pages.FrameCut, MainWindow.Pages.CadCut)

   End Sub

@@ -1174,7 +1217,7 @@ Public Class DrawPageUC
      ' Istruzioni per chiudere ImportPageUC e aprire CadCutPageUC
      m_MainWindow.MainWindowGrid.Children.Remove(m_MainWindow.m_DrawPageUC)
      m_MainWindow.MainWindowGrid.Children.Add(m_MainWindow.m_CurrentProjectPageUC)
-      m_MainWindow.m_ActivePage = MainWindow.Pages.CadCut
+      m_MainWindow.m_ActivePage = If(m_MainWindow.FrameCutBtn.IsChecked, MainWindow.Pages.FrameCut, MainWindow.Pages.CadCut)
   End Sub

   Private Sub TrfDataBtn_Click(sender As Object, e As RoutedEventArgs) Handles TrfDataBtn.Click
@@ -39,7 +39,8 @@ Public Class FiloTopUC

      ' Imposto messaggi
      ParameterTxBl.Text = EgtMsg( MSG_IMPORTPAGEUC + 10)       ' Offset
-      Parameter2TxBl.Text = EgtMsg( MSG_IMPORTPAGEUC + 11)      ' Affondamento
+      Parameter2TxBl.Text = EgtMsg(MSG_IMPORTPAGEUC + 11)      ' Affondamento
+      Parameter3TxBl.Text = EgtMsg(91138)

      If m_CallingPage = MainWindow.Pages.Draw Then
         ' Imposto questa come pagina correntemente visualizzata nella drawpage
@@ -41,6 +41,7 @@ Public Class MainComponentPageUC
      m_MainWindow.m_DrawPageUC.FiloTopBtn.IsEnabled = False
      m_MainWindow.m_DrawPageUC.EngraveBtn.IsEnabled = False
      m_MainWindow.m_DrawPageUC.DripCutBtn.IsEnabled = False
+      m_MainWindow.m_DrawPageUC.m_bBackFromInternalCompo = False
   End Sub

   Private Function GetButton(ByVal nInd As Integer) As Button
@@ -167,7 +168,7 @@ Public Class MainComponentPageUC

   Private Sub Compo_Click(sender As Object, e As RoutedEventArgs) Handles Compo1.Click, Compo2.Click, Compo3.Click, Compo4.Click, Compo5.Click, Compo6.Click, Compo7.Click, Compo8.Click
      CurrentBtn = DirectCast(e.Source, Button)
-      Dim CompoName As String = S_COMPO & GetIndexFromButton(CurrentBtn).ToString
+      Dim CompoName As String = If(m_MainWindow.FrameCutBtn.IsChecked, S_FRAMECOMPO, S_COMPO) & GetIndexFromButton(CurrentBtn).ToString
      m_sCurrCompoFam = CompoName
      m_SecondaryComponentPage.m_sCurrCompo = String.Empty
      Dim nCount As Integer = GetPrivateProfileInt(CompoName, K_CMP_COUNT, 0, m_MainWindow.GetIniFile())
@@ -251,13 +252,18 @@ Public Class MainComponentPageUC
   End Sub

   Private Sub LoadPage()
+      If m_MainWindow.FrameCutBtn.IsChecked Then
+         LoadFramePage()
+         Return
+      End If
+
      Dim nDeltaSecondPage As Integer = 8
      ' Leggo numero di componenti presenti
      Dim nCompoNumber As Integer = GetPrivateProfileInt(S_COMPO, K_CMP_COUNT, 0, m_MainWindow.GetIniFile())
      ' Calcolo indici a seconda della pagina in cui sono
      If m_bIsFirstPage Then
         ClearButton(nCompoNumber)
-      nDeltaSecondPage = 0
+         nDeltaSecondPage = 0
      Else
         ClearButton(nCompoNumber)
         nDeltaSecondPage = 8
@@ -325,16 +331,86 @@ Public Class MainComponentPageUC

   End Sub

+   Private Sub LoadFramePage()
+      Dim nDeltaSecondPage As Integer = 8
+      ' Leggo numero di componenti presenti
+      Dim nCompoNumber As Integer = GetPrivateProfileInt(S_FRAMECOMPO, K_CMP_COUNT, 0, m_MainWindow.GetIniFile())
+      ' Calcolo indici a seconda della pagina in cui sono
+      If m_bIsFirstPage Then
+         ClearButton(nCompoNumber)
+         nDeltaSecondPage = 0
+      Else
+         ClearButton(nCompoNumber)
+         nDeltaSecondPage = 8
+      End If
+
+      ' Creazione converter da String a ImageSource
+      Dim ImageConverter As New ImageSourceConverter
+      Dim ThicknessConverter As New ThicknessConverter
+
+      'Assegnazione immagine e testo ai Button
+      For index As Integer = 1 To 8
+         Dim CustomThickness As New Thickness(0)
+         Dim nCompoName As Integer = GetPrivateProfileInt(S_FRAMECOMPO & index + nDeltaSecondPage, "Name", 0, m_MainWindow.GetIniFile())
+         Dim sCompoImage As String = ""
+         Dim sCompoImageSource As ImageSource
+
+         'verifico presenza immagine e la aggiungo
+         If GetPrivateProfileString(S_FRAMECOMPO & index + nDeltaSecondPage, "Image", "", sCompoImage, m_MainWindow.GetIniFile()) <> 0 Then
+            Try
+               sCompoImageSource = ImageConverter.ConvertFromString(m_MainWindow.GetResourcesDir() & "\" & sCompoImage)
+               GetImage(index).Height = 65
+               GetImage(index).Width = 65
+               GetImage(index).Source = sCompoImageSource
+            Catch ex As Exception
+               EgtOutLog("Error loading image " & sCompoImage)
+               sCompoImage = String.Empty
+               GetImage(index).Height = 0
+               GetImage(index).Width = 0
+               CustomThickness.Right = 0
+               GetImage(index).Margin = CustomThickness
+            End Try
+         Else
+            'Se non c'è l'immagine azzero la distanza tra testo e immagine
+            CustomThickness.Right = 0
+            GetImage(index).Margin = CustomThickness
+         End If
+
+         'verifico presenza testo
+         If nCompoName > 0 Then
+            Dim sCompoName As String = EgtMsg(MSG_COMPONENTPAGEUC + nCompoName)
+            'verifico presenza immagine
+            If sCompoImage.Length > 0 Then
+               'se la lunghezza del testo è maggiore di 15 lo taglio
+               If sCompoName.Length > 15 Then
+                  sCompoName = sCompoName.Substring(0, 15)
+               End If
+               GetLabel(index).Text = sCompoName
+               'Se ci sono sia testo che immagine imposto un margine di 10
+               CustomThickness.Right = 10
+               GetImage(index).Margin = CustomThickness
+            Else
+               'se l'immagine non c'è e il testo è maggiore di 20 lo taglio
+               If sCompoName.Length > 20 Then
+                  sCompoName = sCompoName.Substring(0, 20)
+               End If
+               GetLabel(index).Text = sCompoName
+            End If
+         Else
+            'Se non c'è testo azzero la distanza tra testo e immagine
+            CustomThickness.Right = 0
+            GetImage(index).Margin = CustomThickness
+         End If
+
+      Next
+
+   End Sub
+
   ' Gestione bottone altri componenti
   Private Sub Compo9_Click(sender As Object, e As RoutedEventArgs) Handles Compo9.Click
      If m_bIsFirstPage Then
         m_bIsFirstPage = False
         LoadPage()
-         'Compo9.SetValue(Grid.ColumnProperty, 1)
-         'Compo9.SetValue(Grid.ColumnSpanProperty, 1)
-         'ImageCompo9.Source = New System.Windows.Media.Imaging.BitmapImage(New Uri("/Resources/NumericKeyboardArrow.png", UriKind.Relative))
-         'ImageCompo9.Visibility = Windows.Visibility.Visible
-         'LabelCompo9.Visibility = Windows.Visibility.Hidden
         Compo9.SetValue(Grid.ColumnProperty, 0)
         Compo9.SetValue(Grid.ColumnSpanProperty, 2)
         ImageCompo9.Visibility = Windows.Visibility.Hidden
@@ -7,124 +7,132 @@
   mc:Ignorable="d" 
   d:DesignHeight="853.3" d:DesignWidth="1280">

-   <!-- Definizione della FrameCutPage -->
-   <Grid Name="FrameCutPageGrid" >
-      <Grid.ColumnDefinitions>
-         <ColumnDefinition Width="3*"/>
-         <ColumnDefinition Width="12*"/>
-      </Grid.ColumnDefinitions>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="1*"/>
-         <RowDefinition Height="8*"/>
-         <RowDefinition Height="1*"/>
-      </Grid.RowDefinitions>
-      
-      <!-- Definizione della Grid superiore -->
-      <Grid Grid.Column="1" Grid.Row="0" >
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="4*"/>
-         </Grid.ColumnDefinitions>
-         
-         <Button Name="PhotoBtn" Grid.Column="0" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
-            <Image Source="{DynamicResource PhotoImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-         </Button>
-         <Button Name="RawPartBtn" Grid.Column="1" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
-            <Image Source="{DynamicResource RawPartImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-         </Button>
-         <ToggleButton Name="MachiningBtn" Grid.Column="4" Style="{DynamicResource OmagCut_RightGrayYellowIconToggleButton}">
-            <Image Source="{DynamicResource FrameMachiningImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-         </ToggleButton>
-
-      </Grid>
-
-      <Grid Name="LeftGrid" Grid.Row="1">
-         <Grid.RowDefinitions>
+    <!-- Definizione della FrameCutPage -->
+    <Grid Name="FrameCutPageGrid" >
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="3*"/>
+            <ColumnDefinition Width="12*"/>
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
            <RowDefinition Height="1*"/>
-            <RowDefinition Height="7*"/>
-         </Grid.RowDefinitions>
-      
-      <Grid Grid.Row="1">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-         </Grid.ColumnDefinitions>
-         <Grid.RowDefinitions>
-            <RowDefinition Height="0.6*"/>
-            <RowDefinition Height="0.8*"/>
-            <RowDefinition Height="0.5*"/>
-            <RowDefinition Height="0.5*"/>
-            <RowDefinition Height="0.5*"/>
-            <RowDefinition Height="0.8*"/>
-            <RowDefinition Height="2.5*"/>
-         </Grid.RowDefinitions>
+            <RowDefinition Height="8*"/>
+            <RowDefinition Height="1*"/>
+        </Grid.RowDefinitions>

-         <ComboBox Name="AlongAxCmBx" Grid.Row="0" Grid.ColumnSpan="3" Style="{StaticResource OmagCut_ComboBox}" 
-               Width="200" MaxDropDownHeight="300">
-            <ComboBox.ItemTemplate>
-               <DataTemplate>
-                  <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-               </DataTemplate>
-            </ComboBox.ItemTemplate>
-         </ComboBox>
+        <!-- Definizione della Grid superiore -->
+        <Grid Grid.Column="1" Grid.Row="0" >
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="4*"/>
+            </Grid.ColumnDefinitions>

-         <UniformGrid Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3" Columns="2" >
-            <Button Name="SelSectionBtn" 
-                    Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
-                <Image Source="{DynamicResource Sezione-corniceImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+            <Button Name="PhotoBtn" Grid.Column="0" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
+                <Image Source="{DynamicResource PhotoImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
            </Button>
-             
-            <Grid>
-               <Button Name="SelGuideBtn" 
+            <Button Name="RawPartBtn" Grid.Column="1" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
+                <Image Source="{DynamicResource RawPartImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+            </Button>
+            <ToggleButton Name="MachiningBtn" Grid.Column="4" Style="{DynamicResource OmagCut_RightGrayYellowIconToggleButton}">
+                <Image Source="{DynamicResource FrameMachiningImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+            </ToggleButton>
+
+        </Grid>
+
+        <Grid Name="LeftGrid" Grid.Row="1">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="7*"/>
+            </Grid.RowDefinitions>
+
+            <Grid Grid.Row="1">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="0.6*"/>
+                    <RowDefinition Height="0.8*"/>
+                    <RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="0.8*"/>
+                    <RowDefinition Height="0.8*"/>
+                    <RowDefinition Height="1.7*"/>
+                </Grid.RowDefinitions>
+
+                <ComboBox Name="AlongAxCmBx" Grid.Row="0" Grid.ColumnSpan="3" Style="{StaticResource OmagCut_ComboBox}" 
+               Width="200" MaxDropDownHeight="300">
+                    <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                            <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                        </DataTemplate>
+                    </ComboBox.ItemTemplate>
+                </ComboBox>
+
+                <UniformGrid Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3" Columns="2" >
+                    <Button Name="SelSectionBtn" 
+                    Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
+                        <Image Source="{DynamicResource Sezione-corniceImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+                    </Button>
+
+                    <Grid>
+                        <Button Name="SelGuideBtn" 
                       Style="{DynamicResource OmagCut_YellowTextButton}"/>
-               <UniformGrid Name="ArcGrid" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3" Columns="2" >
-                  <TextBlock Name="ArcRadTxBl"  Grid.Row="2" Grid.ColumnSpan="2"
+                        <UniformGrid Name="ArcGrid" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3" Columns="2" >
+                            <TextBlock Name="ArcRadTxBl"  Grid.Row="2" Grid.ColumnSpan="2"
                             Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                  <EgtWPFLib:EgtTextBox Name="ArcRadTxBx" Grid.Column="2" Grid.Row="2" Width="50"
+                            <EgtWPFLib:EgtTextBox Name="ArcRadTxBx" Grid.Column="2" Grid.Row="2" Width="50"
                             Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
-                  <TextBlock Name="ArcAngTxBl"  Grid.Row="3" Grid.ColumnSpan="2"
+                            <TextBlock Name="ArcAngTxBl"  Grid.Row="3" Grid.ColumnSpan="2"
                             Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                  <EgtWPFLib:EgtTextBox Name="ArcAngTxBx" Grid.Column="2" Grid.Row="3" Width="50"
+                            <EgtWPFLib:EgtTextBox Name="ArcAngTxBx" Grid.Column="2" Grid.Row="3" Width="50"
                             Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
-               </UniformGrid>
-            </Grid>  
-         </UniformGrid>
+                        </UniformGrid>
+                    </Grid>
+                </UniformGrid>

-         <TextBlock Name="OffsZTxBl"  Grid.Row="2" Grid.ColumnSpan="2"
+                <TextBlock Name="OffsZTxBl"  Grid.Row="2" Grid.ColumnSpan="2"
               Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-         <EgtWPFLib:EgtTextBox Name="OffsZTxBx" Grid.Column="2" Grid.Row="2" Width="50"
+                <EgtWPFLib:EgtTextBox Name="OffsZTxBx" Grid.Column="2" Grid.Row="2" Width="50"
               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>

-         <TextBlock Name="OffsXyTxBl"  Grid.Row="3" Grid.ColumnSpan="2"
+                <TextBlock Name="OffsXyTxBl"  Grid.Row="3" Grid.ColumnSpan="2"
               Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-         <EgtWPFLib:EgtTextBox Name="OffsXyTxBx" Grid.Column="2" Grid.Row="3" Width="50"
+                <EgtWPFLib:EgtTextBox Name="OffsXyTxBx" Grid.Column="2" Grid.Row="3" Width="50"
               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>

-         <TextBlock Name="OffsYyTxBl"  Grid.Row="4" Grid.ColumnSpan="2"
+                <TextBlock Name="OffsYyTxBl"  Grid.Row="4" Grid.ColumnSpan="2"
            Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-         <EgtWPFLib:EgtTextBox Name="OffsYyTxBx" Grid.Column="2" Grid.Row="4" Width="50"
+                <EgtWPFLib:EgtTextBox Name="OffsYyTxBx" Grid.Column="2" Grid.Row="4" Width="50"
            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>

-         <UniformGrid Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="3" Columns="2" >
-            <Button Name="MirrorPartBtn" 
+                <UniformGrid Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="3" Columns="2" >
+                    <Button Name="MirrorPartBtn" 
                    Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
                        <Image Source="{DynamicResource SpecchiaImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
-            </Button>
-            <Button Name="RemovePartBtn" 
+                    </Button>
+                    <Button Name="RemovePartBtn" 
                    Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
                        <Image Source="{DynamicResource Rimuovi_eliminaImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
-            </Button>
-         </UniformGrid>
+                    </Button>
+                </UniformGrid>

-         <!--<TextBlock Name="SawRoughingTxBl" Grid.Row="4" Grid.ColumnSpan="3"
+                <UniformGrid Grid.Column="0" Grid.Row="6" Grid.ColumnSpan="3" Columns="2" >
+                    <Button Name="CompoBtn" 
+                    Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
+                        <Image Source="{DynamicResource DrawImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+                    </Button>
+                </UniformGrid>
+
+                <!--<TextBlock Name="SawRoughingTxBl" Grid.Row="4" Grid.ColumnSpan="3"
            Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>

         <ComboBox Name="SawRoughingCmBx" Grid.Row="5" Grid.ColumnSpan="3" Style="{StaticResource OmagCut_ComboBox}"
@@ -182,10 +190,10 @@
            </ComboBox.ItemTemplate>
         </ComboBox>-->

-      </Grid>
-         
-      </Grid>
+            </Grid>

-   </Grid>
+        </Grid>
+
+    </Grid>

 </UserControl>
@@ -81,6 +81,8 @@ Public Class FrameCutPageUC
      m_ProjectMgr.CSVBtn.Visibility = Windows.Visibility.Hidden
      m_ProjectMgr.VeinMatchingBtn.Visibility = Windows.Visibility.Hidden
      m_ProjectMgr.RegisterBtn.Visibility = Windows.Visibility.Hidden
+      ' Visualizzo il bottone per l'importazione dei compo frame
+      CompoBtn.Visibility = If(GetPrivateProfileInt(S_FRAMECOMPO, K_CMP_COUNT, 0, m_MainWindow.GetIniFile()) > 0, Visibility.Visible, Visibility.Hidden)
      ' Recupero dimensioni e kerf del grezzo
      m_nRawId = EgtGetFirstRawPart()
      GetRawBox(m_RawBox)
@@ -436,6 +438,16 @@ Public Class FrameCutPageUC
      End If
   End Sub

+   Private Sub CompoBtn_Click(sender As Object, e As RoutedEventArgs) Handles CompoBtn.Click
+      m_MainWindow.TestOff()
+      m_MainWindow.DragRettangleOff()
+      m_MainWindow.SplitCurvWJOff()
+      m_MainWindow.StartCurvWJOff()
+      m_MainWindow.MainWindowGrid.Children.Remove(m_MainWindow.m_CurrentProjectPageUC)
+      m_MainWindow.MainWindowGrid.Children.Add(m_MainWindow.m_DrawPageUC)
+      m_MainWindow.m_ActivePage = MainWindow.Pages.Draw
+   End Sub
+
   Friend Function CreateFrame(nPartId As Integer) As Boolean
      If Not MyCreateFrame( nPartId) Then
         EgtErase( nPartId)
@@ -184,6 +184,31 @@

               </GroupBox>

+               <!--Parametri rettifica tagli sottosquadra: 1 Parametro -->
+               <GroupBox Name="RectificationWJParamGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="0" Grid.Row="4" Grid.ColumnSpan="2" >
+                   <Grid Grid.Column="3" Grid.Row="2">
+                       <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="2*"/>
+                           <ColumnDefinition Width="2*"/>
+                       </Grid.ColumnDefinitions>
+                       <Grid.RowDefinitions>
+                           <RowDefinition Height="*"/>
+                       </Grid.RowDefinitions>
+
+                       <TextBlock Name="EnableRectificationTxBl" Grid.Row="0" Grid.ColumnSpan="2"
+                                  Style="{DynamicResource OmagCut_ToolsDBTextBlock}" />
+                       <CheckBox Name="EnableRectificationChBx" Grid.Row="0" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_CheckBox_Single}"
+                                 HorizontalAlignment="Right" Margin="0,0,10,0"/>
+
+                       <!--<TextBlock Name="OffsetRectificationTxBl" Grid.Row="1" Grid.Column="0" 
+                                  Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
+                       <EgtWPFLib:EgtTextBox Name="OffsetRectificationTxBx" Grid.Row="1" Grid.Column="1" Margin="10,0,10,0"
+                                  Style="{DynamicResource OmagCut_CalculatorTextBox}"/>-->
+
+                   </Grid>
+
+               </GroupBox>
+
               <!--Parametri WaterJet: 5 Parametro (se questo GroupBox attivo allora nascondo Fori/Fresatura)-->
               <GroupBox Name="WjsParamGpBx" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2" Grid.RowSpan="4" 
                              Style="{DynamicResource OmagCut_GroupBox}">
@@ -97,7 +97,10 @@ Public Class AlarmsPageUC
      HolesOffsetWJTxBl.Text = "Offset"
      MinRadiusWJTxBl.Text = "Min Radius"
      OneHoleInCornerWJTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 26)
-      '--  FINE  -- nuovi parametri per preforo lavello
+      '-- INIZIO -- nuovi parametro Rettifica tagli sottosquadra WJ
+      REctificationWJParamGpBx.Header = "Rectification"
+      EnableRectificationTxBl.Text = "Enable (on subsquare angle)"
+      '--  FINE  -- nuovi parametro Rettifica tagli sottosquadra WJ
      NestingParamGpBx.Header = EgtMsg(MSG_ALARMSPAGEUC + 31)            ' Nesting
      AlignTxBl.Text = EgtMsg(90932)                                     ' Allineato
      GhigliottinaTxBl.Text = EgtMsg(91066)                              ' Ghigliottina
@@ -175,6 +178,7 @@ Public Class AlarmsPageUC
         ' Se non previsti tagli waterjet, disabilito relativo box
         If Not m_CurrentMachine.bWaterJetting Then
            WjsParamGpBx.Visibility = Visibility.Hidden
+            RectificationWJParamGpBx.Visibility = Visibility.Hidden
         End If

         ' Abilitazione box per contorni grezzo da foto
@@ -354,7 +358,9 @@ Public Class AlarmsPageUC
      MinRadiusWJTxBx.Text = LenToString(dVal, 2)
      OneHoleInCornerWJChBx.IsChecked =
         (GetPrivateProfileInt(S_MACH_NEST, K_MACH_DRILLINGWJ_ON_CORNERS, 1, m_MainWindow.GetMachIniFile()) <> 0)
-
+      ' leggo se attiva la rettifica degli angoli per WaterJet
+      EnableRectificationChBx.IsChecked =
+         (GetPrivateProfileInt(S_MACH_NEST, K_MACH_RECTIFICATION_ON_SUBSQUARE, 0, m_MainWindow.GetMachIniFile()) <> 0)
      ' Leggo accorciamento angoli con fresa
      dVal = GetPrivateProfileDouble(S_MACH_NEST, K_MACH_MILLING_SHORTENING, 0, m_MainWindow.GetMachIniFile())
      ShortTxBx.Text = LenToString(dVal, 2)
@@ -970,9 +976,18 @@ Public Class AlarmsPageUC
         WritePrivateProfileString(S_MACH_NEST, K_MACH_DRILLINGWJ_ON_CORNERS, "0", m_MainWindow.GetMachIniFile())
      End If
   End Sub
-
   ' --   FINE   -- nuovi parametri per prefori WaterJet

+   ' -- INIZIO -- nuovi parametri per Rettifica angoli in sottosquadra WaterJet
+   Private Sub EnableRectificationChBx_Click(sender As Object, e As EventArgs) Handles EnableRectificationChBx.Click
+      If EnableRectificationChBx.IsChecked() Then
+         WritePrivateProfileString(S_MACH_NEST, K_MACH_RECTIFICATION_ON_SUBSQUARE, "1", m_MainWindow.GetMachIniFile)
+      Else
+         WritePrivateProfileString(S_MACH_NEST, K_MACH_RECTIFICATION_ON_SUBSQUARE, "0", m_MainWindow.GetMachIniFile)
+      End If
+   End Sub
+   ' --   FINE   -- nuovi parametri per Rettifica angoli in sottosquadra WaterJet
+
   Private Sub TmEnableChBx_Click(sender As Object, e As RoutedEventArgs) Handles TmEnableChBx.Click
      If TmEnableChBx.IsChecked() Then
         WritePrivateProfileString(S_MACH_NEST, K_MACH_ENGRAVING_WITHMILL, "1", m_MainWindow.GetMachIniFile())
@@ -1189,6 +1204,12 @@ Public Class AlarmsPageUC
      EgtLuaSetGlobNumVar("CMD.THICK", dToolThick * 1000)
      EgtTdbGetCurrToolParam(MCH_TP.LEN, dToolLen)
      EgtLuaSetGlobNumVar("CMD.LENGTH", dToolLen * 1000)
+      ' Nuova varibile per gestione tastatura utensili Frankfurt (Polishing)
+      Dim nType As Integer
+      EgtTdbGetCurrToolParam(MCH_TP.TYPE, nType)
+      If m_CurrentMachine.bPolishingWheel AndAlso nType = MCH_TY.MILL_POLISHING Then
+         EgtLuaSetGlobStringVar("CMD.POLISHING", "1")
+      End If
      EgtLuaSetGlobBoolVar("CMD.INCHES", m_MainWindow.m_CNCommunication.GetMachineInInches())
      EgtLuaCallFunction("CMD.CmdString")
      ' Leggo variabili
@@ -279,6 +279,12 @@ Public Class MachineStatusUC

   Sub DisplayFeed()
      Dim dRealFeed As Double = m_CN.d_DInterpo_Prog_Feed * m_CN.d_DInterpo_Feed_override / 100
+      ' modifica richiesta 26/05/2023 da Rosario per cliente Lanzetta
+      If m_MainWindow.m_CNCommunication.m_nNCType = 4 Then
+         dRealFeed = m_CN.d_DInterpo_Prog_Feed
+      Else
+         dRealFeed = m_CN.d_DInterpo_Prog_Feed * m_CN.d_DInterpo_Feed_override / 100
+      End If
      'Feed = DoubleToString(dRealFeed, 0)
      FeedTxBx.Text = LenToString(dRealFeed, 0, True)
      'FeedOverride = DoubleToString(m_CN.d_DInterpo_Feed_override, 0) & "%"
@@ -61,8 +61,8 @@ Public Class PolishingsPageUC
      RepeatTxBl.Text = EgtMsg(91093)             ' Ripetizioni
      StepTxBl.Text = EgtMsg(90787)               ' Passo
      OffSetTxBl.Text = EgtMsg(91089)             ' Offset
-      RadiusTxBl.Text = "Raggio"
-      DistanceTxBl.Text = "Distanza"
+      RadiusTxBl.Text = EgtMsg(91139)             ' Raggio
+      DistanceTxBl.Text = EgtMsg(91140)           ' Distanza
      LiLoGpBx.Header = EgtMsg(91094)             ' Attacco/Uscita
      LiLenTxBl.Text = EgtMsg(91097)              ' Lunghezza
      LiHeightTxBl.Text = EgtMsg(91095)           ' Altezza
@@ -328,8 +328,8 @@ Class MainWindow
      ' Verifico abilitazione nesting automatico
      m_bAutoNest = Not String.IsNullOrWhiteSpace(sNestKey)
      ' Recupero opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2504, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(9423, 2504, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2505, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(9423, 2505, 1, m_nKeyOptions)
      ' Verifico abilitazione prodotto
      Dim bProd As Boolean = GetKeyOption(KEY_OPT.CUT_BASE)
      ' Inizializzazione generale di EgtInterface
@@ -1226,7 +1226,8 @@ Class MainWindow
         m_ProdLineTimer.Interval = TimeSpan.FromMilliseconds(2000)
         m_ProdLineTimer.Start()
      End If
-
+      ' di default attivo la pagina CadCut
+      m_ActivePage = MainWindow.Pages.CadCut
      ' seleziono il tipo di avvio
      m_CurrentProjectPageUC.StartProgram()
      ' aggiorno la grafica
@@ -62,5 +62,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 

-<Assembly: AssemblyVersion("2.5.4.3")>
-<Assembly: AssemblyFileVersion("2.5.4.3")>
+<Assembly: AssemblyVersion("2.5.5.2")>
+<Assembly: AssemblyFileVersion("2.5.5.2")>
@@ -654,6 +654,7 @@ Public Class CNCommunication
            End If
            m_MainWindow.m_DirectCutPageUC.m_MachineButtons.DoorStateChanged(m_CN.nDoorClosedState)
            m_MainWindow.m_DirectCutPageUC.m_MachineButtons.ParkingStateChanged(m_CN.bParkingState)
+            m_MainWindow.m_DirectCutPageUC.m_MachineButtons.HomeStateChanged(m_CN.bHomeState)
            m_MainWindow.m_DirectCutPageUC.m_MachineButtons.EnableZoneStateChanged(m_CN.nEnableZone)
            m_MainWindow.m_DirectCutPageUC.m_MachineButtons.EnablePcStateChanged(m_CN.nEnablePc)
            m_MainWindow.m_DirectCutPageUC.m_MachineButtons.TableUpChanged(m_CN.bTableUpState)
@@ -650,9 +650,7 @@ Namespace Fanuc
 					  ' ...

 					Case CnData.Feed       ' (2)
-
-						Dim qq As Short = n_temp
-					  'd_DInterpo_Prog_Feed = CDbl(CLng(values(n))) ' d_DInterpo_Prog_Feed
+						d_DInterpo_Prog_Feed = CDbl(n_temp) ' d_DInterpo_Prog_Feed

 					Case CnData.FeedOvr    ' (3) Potenziom. Feed  = * 0.47059
 						d_DInterpo_Feed_override = CDbl(n_temp)
@@ -245,6 +245,9 @@
    <Compile Include="Project\CicloStartWD.xaml.vb">
      <DependentUpon>CicloStartWD.xaml</DependentUpon>
    </Compile>
+    <Compile Include="RawPhoto\OtherRefTabWD.xaml.vb">
+      <DependentUpon>OtherRefTabWD.xaml</DependentUpon>
+    </Compile>
    <Compile Include="RawPhoto\SlabIdWD.xaml.vb">
      <DependentUpon>SlabIdWD.xaml</DependentUpon>
    </Compile>
@@ -519,6 +522,10 @@
      <SubType>Designer</SubType>
      <Generator>MSBuild:Compile</Generator>
    </Page>
+    <Page Include="RawPhoto\OtherRefTabWD.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
    <Page Include="RawPhoto\SlabIdWD.xaml">
      <Generator>MSBuild:Compile</Generator>
      <SubType>Designer</SubType>
@@ -1330,6 +1337,9 @@
  <ItemGroup>
    <Resource Include="Resources\ToolChangerPos.png" />
  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\RefTab.png" />
+  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
  <PropertyGroup>
    <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\OmagCUT\OmagCUTR32.exe
@@ -32,6 +32,7 @@
    <BitmapImage x:Key="AlignPiecesImg" UriSource="Resources/NewIcons/ruota-oggetto-inclinato.png"></BitmapImage>
    <BitmapImage x:Key="BarCodeImg" UriSource="Resources/NewIcons/BarCode.png"></BitmapImage>
    <BitmapImage x:Key="SlabIdImg" UriSource="Resources/NewIcons/SlabId.png"></BitmapImage>
+    <BitmapImage x:Key="RefTabImg" UriSource="Resources/NewIcons/RefTab.png"></BitmapImage>
    <BitmapImage x:Key="BottomLeftImg" UriSource="Resources/NewIcons/1-BottomLeft.png"></BitmapImage>
    <BitmapImage x:Key="BottomRightImg" UriSource="Resources/NewIcons/2-BottomRight.png"></BitmapImage>
    <BitmapImage x:Key="PartRotOnImg" UriSource="Resources/NewIcons/PartRotOn.png"></BitmapImage>
@@ -102,6 +102,7 @@
    <BitmapImage x:Key="AlignPiecesImg" UriSource="Resources/AlignPieces.png"></BitmapImage>
    <BitmapImage x:Key="BarCodeImg" UriSource="Resources/BarCode.png"></BitmapImage>
    <BitmapImage x:Key="SlabIdImg" UriSource="Resources/SlabId.png"></BitmapImage>
+    <BitmapImage x:Key="RefTabImg" UriSource="Resources/NewIcons/RefTab.png"></BitmapImage>
    <BitmapImage x:Key="BottomLeftImg" UriSource="Resources/BottomLeft.png"></BitmapImage>
    <BitmapImage x:Key="BottomRightImg" UriSource="Resources/BottomRight.png"></BitmapImage>
    <BitmapImage x:Key="PartRotOnImg" UriSource="Resources/PartRotOn.png"></BitmapImage>
@@ -491,7 +491,19 @@ Public Class OpenPageUC
      m_SceneButtons.MeasureBtn.IsChecked = False
      ' Istruzioni per chiudere OpenPageUC e aprire currentproject e cadcut page
      m_MainWindow.MainWindowGrid.Children.Remove(m_MainWindow.m_OpenPage)
-      m_MainWindow.MainWindowGrid.Children.Add(m_MainWindow.m_CurrentProjectPageUC)
+      If m_MainWindow.m_PrevActivePage = MainWindow.Pages.CadCut Then
+         m_MainWindow.MainWindowGrid.Children.Add(m_MainWindow.m_CurrentProjectPageUC)
+         If Not m_MainWindow.CadCutBtn.IsChecked Then
+            m_MainWindow.m_CurrentProjectPageUC.CurrentProjectPageGrid.Children.Add(m_MainWindow.m_CadCutPageUC)
+            m_MainWindow.CadCutBtn.IsChecked = True
+         End If
+      ElseIf m_MainWindow.m_PrevActivePage = MainWindow.Pages.FrameCut Then
+         m_MainWindow.MainWindowGrid.Children.Add(m_MainWindow.m_CurrentProjectPageUC)
+         If Not m_MainWindow.FrameCutBtn.IsChecked Then
+            m_MainWindow.m_CurrentProjectPageUC.CurrentProjectPageGrid.Children.Add(m_MainWindow.m_FrameCutPageUC)
+            m_MainWindow.FrameCutBtn.IsChecked = True
+         End If
+      End If
      ' Non modifico progetto corrente
      m_MainWindow.m_ActivePage = m_MainWindow.m_PrevActivePage
   End Sub
@@ -0,0 +1,82 @@
+<Window x:Class="OtherRefTabWD"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+   xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
+   FontFamily="{DynamicResource OmagCut_Font}"
+   ResizeMode="NoResize" WindowStyle="None" AllowsTransparency="True" Background="Transparent"
+   Title="ModifStartEndWD" Height="250" Width="320" ShowInTaskbar="False">
+
+    <!--Definizione della pagina di scelta del nome con cui salvare il progetto-->
+    <Border Style="{DynamicResource OmagCut_Border}">
+        <Grid x:Name="SaveNameGrid">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="0.2*"/>
+                <ColumnDefinition Width="2*"/>
+                <ColumnDefinition Width="2*"/>
+                <ColumnDefinition Width="0.2*"/>
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <!--<RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="1*"/>
+                    <RowDefinition Height="0.5*"/>-->
+                <RowDefinition Height="0.2*"/>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="0.2*"/>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="0.2*"/>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="0.2*"/>
+                <RowDefinition Height="1.5*"/>
+                <RowDefinition Height="0.2*"/>
+            </Grid.RowDefinitions>
+
+            <TextBlock Name="RefRawTxbl" Grid.Column="1" Grid.Row="1"
+            Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+            
+            <ComboBox Name="RefTabModeCmBx" Grid.Column="2" Grid.Row="1" Style="{StaticResource OmagCut_ComboBox}" 
+               MaxDropDownHeight="300" Margin="0,0,0,0">
+                <ComboBox.ItemTemplate>
+                    <DataTemplate>
+                        <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                    </DataTemplate>
+                </ComboBox.ItemTemplate>
+            </ComboBox>
+
+            <TextBlock Name="RefTabXTxbl" Grid.Column="1" Grid.Row="3"
+            Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+            <EgtWPFLib:EgtTextBox Name="RefTabXTxBx" Grid.Column="2" Grid.Row="3"
+            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+
+            <TextBlock Name="RefTabYTxbl" Grid.Column="1" Grid.Row="5"
+            Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+            <EgtWPFLib:EgtTextBox Name="RefTabYTxBx" Grid.Column="2" Grid.Row="5"
+            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+
+            <Grid Name="ButtonsGrid" Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="7" Grid.RowSpan="1">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="0.5*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="0.5*"/>
+                </Grid.ColumnDefinitions>
+
+                <Button Name="OkBtn" Grid.Column="1"
+                    Style="{DynamicResource OmagCut_GradientBlueIconButton}">
+                    <Image Source="{DynamicResource VImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+                </Button>
+                <Button Name="ExitBtn" Grid.Column="3"
+                    IsCancel="True"
+                    Style="{DynamicResource OmagCut_GradientBlueIconButton}">
+                    <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+                </Button>
+
+            </Grid>
+
+        </Grid>
+
+    </Border>
+
+</Window>
@@ -0,0 +1,108 @@
+Imports System.IO
+Imports EgtUILib
+Imports EgtWPFLib
+
+Public Class OtherRefTabWD
+   Dim m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
+   Dim m_RawPartPage As RawPartPageUC
+
+   Private m_sPosX As String = "0"
+   Private m_sPosY As String = "0"
+
+   Private m_dPrevOffsetX As Double = 0
+   Private m_dPrevOffsetY As Double = 0
+
+   Private m_SelIndex As Integer = 0
+
+   Sub New(Owner As Window, PosX As String, PosY As String, OffsetX As Double, OffsetY As Double, OtherRefMode As Integer)
+      Me.Owner = Owner
+      ' La chiamata è richiesta dalla finestra di progettazione.
+      InitializeComponent()
+
+      ' Aggiungere le eventuali istruzioni di inizializzazione dopo la chiamata a InitializeComponent().
+      m_sPosX = PosX
+      m_sPosY = PosY
+      m_dPrevOffsetX = OffsetX
+      m_dPrevOffsetY = OffsetY
+      m_SelIndex = OtherRefMode
+   End Sub
+
+   Private Sub OtherRrefTabWD_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
+      ' costruisco il riferimento alla pagina Raw
+      m_RawPartPage = m_MainWindow.m_RawPartPage
+      ' posiziono la finestra
+      Me.Top = Owner.Top + Owner.Height / 4 - Me.Height / 2
+      Me.Left = Owner.Left + Owner.Width / 6 - Me.Width / 2
+      RefRawTxbl.Text = "Raw reference"
+      RefTabXTxbl.Text = "Position X"
+      RefTabYTxbl.Text = "Position Y"
+      RefTabModeCmBx.ItemsSource = m_RawPartPage.m_OtherRefTabList
+      RefTabModeCmBx.SelectedIndex = m_RawPartPage.m_OtherRefTabPos
+   End Sub
+
+   Private Sub OtherRrefTabWD_Load(sender As Object, e As EventArgs) Handles Me.Loaded
+      RefTabXTxBx.Text = m_sPosX
+      RefTabYTxBx.Text = m_sPosY
+   End Sub
+
+   Private Sub RefTabModeCmBx_SelectionChanged(sender As Object, e As SelectionChangedEventArgs) Handles RefTabModeCmBx.SelectionChanged
+      m_RawPartPage.m_OtherRefTabPos = RefTabModeCmBx.SelectedIndex
+      WritePrivateProfileString(S_RAWPART, K_OTHERREFTABPOS, m_RawPartPage.m_OtherRefTabPos.ToString, m_MainWindow.GetIniFile())
+      m_RawPartPage.RefTabModeChange()
+   End Sub
+
+   Private Sub RefTabXTxBx_EgtClosed(sender As Object, e As EventArgs) Handles RefTabXTxBx.EgtClosed
+      Dim ptMin, ptMax As Point3d
+      If EgtGetTableArea(1, ptMin, ptMax) Then
+         Dim dX As Double = 0
+         StringToLen(RefTabXTxBx.Text, dX)
+         If Not (dX > 0 And dX < ptMax.x - ptMin.x) Then
+            If dX > 0 Then
+               dX = ptMax.x - ptMin.x
+            Else
+               dX = 0
+            End If
+            RefTabXTxBx.Text = LenToString(dX, 2)
+            ' errore, posizione fuori dalla tavola
+         End If
+         m_RawPartPage.m_OtherRefTabX = dX
+         m_RawPartPage.RefTabModeChange()
+      End If
+   End Sub
+
+   Private Sub RefTabYTxBx_EgtClosed(sender As Object, e As EventArgs) Handles RefTabYTxBx.EgtClosed
+      Dim ptMin, ptMax As Point3d
+      If EgtGetTableArea(1, ptMin, ptMax) Then
+         Dim dY As Double = 0
+         StringToLen(RefTabYTxBx.Text, dY)
+         If Not (dY > 0 And dY < ptMax.y - ptMin.y) Then
+            If dY > 0 Then
+               dY = ptMax.y - ptMin.y
+            Else
+               dY = 0
+            End If
+            RefTabYTxBx.Text = LenToString(dY, 2)
+            ' errore, posizione fuori dalla tavola
+         End If
+         m_RawPartPage.m_OtherRefTabY = dY
+         m_RawPartPage.RefTabModeChange()
+      End If
+   End Sub
+
+   Private Sub OkBtn_Click() Handles OkBtn.Click
+      WritePrivateProfileString(S_RAWPART, K_OTHERREFTABX, DoubleToString(RefTabXTxBx.Text, 2), m_MainWindow.GetIniFile())
+      WritePrivateProfileString(S_RAWPART, K_OTHERREFTABY, DoubleToString(RefTabYTxBx.Text, 2), m_MainWindow.GetIniFile())
+      WritePrivateProfileString(S_RAWPART, K_OTHERREFTABPOS, m_RawPartPage.m_OtherRefTabPos.ToString, m_MainWindow.GetIniFile())
+      Me.Close()
+   End Sub
+
+   Private Sub ExitBtn_Click() Handles ExitBtn.Click
+      ' riposiziono l'origine
+      m_RawPartPage.m_OtherRefTabX = m_sPosX
+      m_RawPartPage.m_OtherRefTabY = m_sPosY
+      ' ripristino il valore della combobox
+      m_RawPartPage.m_OtherRefTabPos = m_SelIndex
+      m_RawPartPage.RefTabModeChange()
+   End Sub
+
+End Class
@@ -6,76 +6,76 @@
   xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
   mc:Ignorable="d" 
   d:DesignHeight="853.3" d:DesignWidth="1280" Loaded="RawPartPage_Loaded" Initialized="RawPartPage_Initialized" Unloaded="RawPartPage_Unloaded">
-      
-   <!-- Definizione della RowPartPage -->
-   <Grid Name="RowPartPageGrid" >
-      <Grid.ColumnDefinitions>
-         <ColumnDefinition Width="3*"/>
-         <ColumnDefinition Width="12*"/>
-      </Grid.ColumnDefinitions>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="1*"/>
-         <RowDefinition Height="8*"/>
-         <RowDefinition Height="1*"/>
-      </Grid.RowDefinitions>
-      
-      <!-- Definizione della Grid superiore -->
-      <Grid Name="UpperButtonGrid" Grid.Column="1" Grid.Row="0" >
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="5*"/>
-            <ColumnDefinition Width="7*"/>
-         </Grid.ColumnDefinitions>
-         
-      </Grid>
-      
-      <!-- Definizione della Grid Laterale -->
-      <Grid Name="LeftButtonGrid" Grid.RowSpan="3">
-      
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1.5*"/>
-            <ColumnDefinition Width="1.5*"/>
-         </Grid.ColumnDefinitions>
-         <Grid.RowDefinitions>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="4*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1.5*"/>
-            <RowDefinition Height="1.*"/>
-            <RowDefinition Height="0.5*"/>
-            <RowDefinition Height="1*"/>
-         </Grid.RowDefinitions>

-         <RadioButton Name="OutlineBtn" Style="{DynamicResource OmagCut_YellowToggleButton}"
-               GroupName="DefinitionMethod_GrezzoUC"/>
-         <RadioButton Name="DamagedBtn" Style="{DynamicResource OmagCut_YellowToggleButton}"
-               Grid.Column="1" GroupName="DefinitionMethod_GrezzoUC"/>
+    <!-- Definizione della RowPartPage -->
+    <Grid Name="RowPartPageGrid" >
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="3*"/>
+            <ColumnDefinition Width="12*"/>
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="8*"/>
+            <RowDefinition Height="1*"/>
+        </Grid.RowDefinitions>

-         <!-- Definizione della Grid per definizione grezzo -->
-         <Grid Name="RawMeasureGrd" Grid.Row="1" Grid.ColumnSpan="2">
+        <!-- Definizione della Grid superiore -->
+        <Grid Name="UpperButtonGrid" Grid.Column="1" Grid.Row="0" >
            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="5*"/>
+                <ColumnDefinition Width="7*"/>
+            </Grid.ColumnDefinitions>
+
+        </Grid>
+
+        <!-- Definizione della Grid Laterale -->
+        <Grid Name="LeftButtonGrid" Grid.RowSpan="3">
+
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="1.5*"/>
+                <ColumnDefinition Width="1.5*"/>
            </Grid.ColumnDefinitions>
            <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="0.5*"/>
-               <RowDefinition Height="0.5*"/>
-               <RowDefinition Height="0.5*"/>
-               <RowDefinition Height="0.5*"/>
-               <RowDefinition Height="0.5*"/>
-               <RowDefinition Height="0.5*"/>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="4*"/>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="1.5*"/>
+                <RowDefinition Height="1.*"/>
+                <RowDefinition Height="0.5*"/>
+                <RowDefinition Height="1*"/>
            </Grid.RowDefinitions>

-            <ComboBox Name="RawModeCmBx" Grid.Row="0" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_ComboBox}" 
-               MaxDropDownHeight="300" Margin="6,0,6,0">
-               <ComboBox.ItemTemplate>
-                  <DataTemplate>
-                     <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-                  </DataTemplate>
-               </ComboBox.ItemTemplate>
-            </ComboBox>
+            <RadioButton Name="OutlineBtn" Style="{DynamicResource OmagCut_YellowToggleButton}"
+               GroupName="DefinitionMethod_GrezzoUC"/>
+            <RadioButton Name="DamagedBtn" Style="{DynamicResource OmagCut_YellowToggleButton}"
+               Grid.Column="1" GroupName="DefinitionMethod_GrezzoUC"/>

-            <ComboBox Name="RawModeDamagedCmBx" Grid.Row="0" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_ComboBox}" 
+            <!-- Definizione della Grid per definizione grezzo -->
+            <Grid Name="RawMeasureGrd" Grid.Row="1" Grid.ColumnSpan="2">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="1*"/>
+                    <RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="0.5*"/>
+                </Grid.RowDefinitions>
+
+                <ComboBox Name="RawModeCmBx" Grid.Row="0" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_ComboBox}" 
+               MaxDropDownHeight="300" Margin="6,0,6,0">
+                    <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                            <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                        </DataTemplate>
+                    </ComboBox.ItemTemplate>
+                </ComboBox>
+
+                <ComboBox Name="RawModeDamagedCmBx" Grid.Row="0" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_ComboBox}" 
               MaxDropDownHeight="300" Margin="6,0,6,0">
                    <ComboBox.ItemTemplate>
                        <DataTemplate>
@@ -85,114 +85,123 @@
                </ComboBox>

                <TextBlock Name="LengthTxBl" Grid.Row="1" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
-            <EgtWPFLib:EgtTextBox Name="LengthTxBx" Grid.Column="1" Grid.Row="1" Margin="13,0,6,0"
+                <EgtWPFLib:EgtTextBox Name="LengthTxBx" Grid.Column="1" Grid.Row="1" Margin="13,0,6,0"
               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
-            <TextBlock Name="WidthTxBl" Grid.Row="2" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
-            <EgtWPFLib:EgtTextBox Name="WidthTxBx" Grid.Column="1" Grid.Row="2" Margin="13,0,6,0"
+                <TextBlock Name="WidthTxBl" Grid.Row="2" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
+                <EgtWPFLib:EgtTextBox Name="WidthTxBx" Grid.Column="1" Grid.Row="2" Margin="13,0,6,0"
               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
-            <TextBlock Name="HeightTxBl" Grid.Row="3" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
-            <EgtWPFLib:EgtTextBox Name="HeightTxBx" Grid.Column="1" Grid.Row="3" Margin="13,0,6,0"
+                <TextBlock Name="HeightTxBl" Grid.Row="3" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
+                <EgtWPFLib:EgtTextBox Name="HeightTxBx" Grid.Column="1" Grid.Row="3" Margin="13,0,6,0"
               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
-            <TextBlock Name="OffsetXTxBl" Grid.Row="4" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
-            <EgtWPFLib:EgtTextBox Name="OffsetXTxBx" Grid.Column="1" Grid.Row="4" Margin="13,0,6,0"
+                <TextBlock Name="OffsetXTxBl" Grid.Row="4" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
+                <EgtWPFLib:EgtTextBox Name="OffsetXTxBx" Grid.Column="1" Grid.Row="4" Margin="13,0,6,0"
               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
-            <TextBlock Name="OffsetYTxBl" Grid.Row="5" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
-            <EgtWPFLib:EgtTextBox Name="OffsetYTxBx" Grid.Column="1" Grid.Row="5" Margin="13,0,6,0"
+                <TextBlock Name="OffsetYTxBl" Grid.Row="5" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
+                <EgtWPFLib:EgtTextBox Name="OffsetYTxBx" Grid.Column="1" Grid.Row="5" Margin="13,0,6,0"
               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
-            <TextBlock Name="KerfTxBl" Grid.Row="6" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
-            <EgtWPFLib:EgtTextBox Name="KerfTxBx" Grid.Column="1" Grid.Row="6" Margin="13,0,6,0"
+                <TextBlock Name="KerfTxBl" Grid.Row="6" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
+                <EgtWPFLib:EgtTextBox Name="KerfTxBx" Grid.Column="1" Grid.Row="6" Margin="13,0,6,0"
               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>

-         </Grid>
-                  
-         <!-- Definizione della Grid per il materiale -->
-         <GroupBox Name="MaterialGpBx" Grid.Row="2" Grid.ColumnSpan="2" Style="{DynamicResource OmagCut_GroupBox}">
+            </Grid>

-            <ComboBox Name="MaterialsCmbx" Style="{StaticResource OmagCut_ComboBox}"
+            <!-- Definizione della Grid per il materiale -->
+            <GroupBox Name="MaterialGpBx" Grid.Row="2" Grid.ColumnSpan="2" Style="{DynamicResource OmagCut_GroupBox}">
+
+                <ComboBox Name="MaterialsCmbx" Style="{StaticResource OmagCut_ComboBox}"
               MaxDropDownHeight="600">
-               <ComboBox.ItemTemplate>
-                  <DataTemplate>
-                     <TextBlock Text="{Binding sName}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-                  </DataTemplate>
-               </ComboBox.ItemTemplate>
-            </ComboBox>
+                    <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                            <TextBlock Text="{Binding sName}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                        </DataTemplate>
+                    </ComboBox.ItemTemplate>
+                </ComboBox>

-         </GroupBox>
+            </GroupBox>

-         <!-- Definizione della Grid per Punti -->
-         <GroupBox Name="PointsGpBx" Grid.Row="3" Grid.ColumnSpan="2" Style="{DynamicResource OmagCut_GroupBox}" >
+            <!-- Definizione della Grid per Punti -->
+            <GroupBox Name="PointsGpBx" Grid.Row="3" Grid.ColumnSpan="2" Style="{DynamicResource OmagCut_GroupBox}" >

-            <Grid >
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="1.5*"/>
-                  <ColumnDefinition Width="1.5*"/>
-               </Grid.ColumnDefinitions>
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="1*"/>
-                  <RowDefinition Height="1*"/>
-               </Grid.RowDefinitions>
+                <Grid >
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1.5*"/>
+                        <ColumnDefinition Width="1.5*"/>
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="1*"/>
+                        <RowDefinition Height="1*"/>
+                    </Grid.RowDefinitions>

-               <ToggleButton Name="AddBtn"
+                    <ToggleButton Name="AddBtn"
                  Style="{DynamicResource OmagCut_YellowToggleButton}"/>
-               <ToggleButton Name="RemoveBtn" Grid.Column="1"
+                    <ToggleButton Name="RemoveBtn" Grid.Column="1"
                  Style="{DynamicResource OmagCut_YellowToggleButton}"/>
-               <Button Name="CloseBtn" Grid.Row="1" Grid.ColumnSpan="2" 
+                    <Button Name="CloseBtn" Grid.Row="1" Grid.ColumnSpan="2" 
                  Style="{DynamicResource OmagCut_YellowTextButton}"/>
-            </Grid>
-            
-         </GroupBox>
+                </Grid>

-         <!-- Definizione della Grid per Zona rovinata -->
-         <GroupBox Name="DamagedAreaGpBx" Grid.Row="4" Grid.ColumnSpan="2" Grid.RowSpan="2" Style="{DynamicResource OmagCut_GroupBox}">
+            </GroupBox>

-            <Grid>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="1*"/>
-                  <ColumnDefinition Width="1*"/>
-               </Grid.ColumnDefinitions>
+            <!-- Definizione della Grid per Zona rovinata -->
+            <GroupBox Name="DamagedAreaGpBx" Grid.Row="4" Grid.ColumnSpan="2" Grid.RowSpan="2" Style="{DynamicResource OmagCut_GroupBox}">

-               <ToggleButton Name="NewBtn" Style="{DynamicResource OmagCut_YellowToggleButton}"/>
-               <ToggleButton Name="DeleteBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowToggleButton}"/>
-            </Grid>
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="1*"/>
+                    </Grid.ColumnDefinitions>

-         </GroupBox>
+                    <ToggleButton Name="NewBtn" Style="{DynamicResource OmagCut_YellowToggleButton}"/>
+                    <ToggleButton Name="DeleteBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowToggleButton}"/>
+                </Grid>

-         <Button Name="ConfirmPhotoBtn" Grid.Row="4" Grid.ColumnSpan="2" Visibility="Hidden" 
+            </GroupBox>
+
+            <TextBlock Name="OtherRefTabTxBl" Grid.Row="5" Grid.ColumnSpan="2" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
+            <CheckBox Name="OtherRefTabChBx" Grid.Row="5" Grid.Column="1" Style="{StaticResource OmagCut_CheckBox}"
+                    HorizontalAlignment="Right" Margin="0,0,6,0"/>
+
+            <Button Name="ConfirmPhotoBtn" Grid.Row="4" Grid.ColumnSpan="2" Visibility="Hidden" 
            Style="{DynamicResource OmagCut_YellowTextButton}"/>

-      </Grid>
-      
-      <!-- Definizione della Grid Inferiore per i Button V e X -->
-      <Grid Name="LowerButtonGrid" Grid.Column="1" Grid.Row="3">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="6*"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-         </Grid.ColumnDefinitions>
+        </Grid>

-         <Button Name="RawProbingBtn" Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
-            <Image Source="{DynamicResource RawProbeImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-         </Button>
+        <!-- Definizione della Grid Inferiore per i Button V e X -->
+        <Grid Name="LowerButtonGrid" Grid.Column="1" Grid.Row="3">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="5*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>

-         <Button Name="BarCodeBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
-            <Image Source="{DynamicResource BarCodeImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-         </Button>
+            <Button Name="RawProbingBtn" Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
+                <Image Source="{DynamicResource RawProbeImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+            </Button>

-         <Button Name="SlabIdBtn" Grid.Column="3" Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
-            <Image Source="{DynamicResource SlabIdImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-         </Button>
+            <Button Name="BarCodeBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
+                <Image Source="{DynamicResource BarCodeImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+            </Button>

-         <Button Name="OkBtn" Grid.Column="5" Style="{DynamicResource OmagCut_GradientBlueIconButton}">
-            <Image Source="{DynamicResource VImg}" Width="65" Height="65" HorizontalAlignment="Center"
+            <Button Name="SlabIdBtn" Grid.Column="3" Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
+                <Image Source="{DynamicResource SlabIdImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+            </Button>
+
+            <Button Name="OtherRefTabBtn" Grid.Column="4" Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
+                <Image Source="{DynamicResource RefTabImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+            </Button>
+
+            <Button Name="OkBtn" Grid.Column="6" Style="{DynamicResource OmagCut_GradientBlueIconButton}">
+                <Image Source="{DynamicResource VImg}" Width="65" Height="65" HorizontalAlignment="Center"
            VerticalAlignment="Center" />
-         </Button>
-         
-      </Grid>
-      
-   </Grid>
-   
+            </Button>
+
+        </Grid>
+
+    </Grid>
+
 </UserControl>
@@ -1,6 +1,9 @@
 Imports System.Globalization
+Imports System.IO
+Imports System.Windows.Media.Animation
 Imports EgtUILib
 Imports EgtWPFLib
+Imports Microsoft.VisualBasic.Devices

 Public Class RawPartPageUC

@@ -78,6 +81,16 @@ Public Class RawPartPageUC
   ' Costante raggio cerchietto
   Private Const RAD_CIRCLE As Double = 30

+   ' Riferimento grezzo
+   Private m_bEnableOtherRefTab As Boolean = False
+   Private m_bOtherRefTab As Boolean
+   Public m_OtherRefTabX As Double = 0
+   Public m_OtherRefTabY As Double = 0
+   Public m_OtherRefTabList(3) As String
+   Public m_OtherRefTabPos As Integer = 0
+   Private m_nOtherRefTabLay As Integer = GDB_ID.NULL
+   Private m_OtherRefTabPoint As Point3d
+
   ' mostra la pagina delle lavorazioni
   Private m_SmartMachiningPage As Boolean = False

@@ -105,6 +118,13 @@ Public Class RawPartPageUC
      FROM_SAW = 7
   End Enum

+   Private Enum OTHERREFMODE As Integer
+      BL = 0
+      BR = 1
+      TR = 2
+      TL = 3
+   End Enum
+
   Private Sub RawPartPage_Initialized(sender As Object, e As EventArgs)

      'Creazione della Page UserControl e relative impostazioni
@@ -145,6 +165,13 @@ Public Class RawPartPageUC
         ReDim Preserve m_RawModeListEx(3)
      End If
      RawModeCmBx.ItemsSource = m_RawModeList
+
+      ' Creo la lista dei riferimenti tavola 
+      m_OtherRefTabList(OTHERREFMODE.BL) = "Bottom left"
+      m_OtherRefTabList(OTHERREFMODE.BR) = "Bottom right"
+      m_OtherRefTabList(OTHERREFMODE.TR) = "Top right"
+      m_OtherRefTabList(OTHERREFMODE.TL) = "Top left"
+
      ' lista per selezione RawModeDamaged
      m_RawModeDamagedList(0) = EgtMsg(MSG_RAWPARTPAGEUC + 2)    'Per Punti
      m_RawModeDamagedList(1) = EgtMsg(MSG_RAWPARTPAGEUC + 30)   'Da Laser
@@ -184,6 +211,8 @@ Public Class RawPartPageUC
      RemoveBtn.Content = EgtMsg(MSG_RAWPARTPAGEUC + 15)        'Remove - Rimuovi
      CloseBtn.Content = EgtMsg(MSG_RAWPARTPAGEUC + 31)         'Close - Chiudi
      ConfirmPhotoBtn.Content = EgtMsg(MSG_RAWPARTPAGEUC + 24)  'Conferma
+
+      OtherRefTabTxBl.Text = "New Ref On Tab"
   End Sub

   Private Sub RawPartPage_Loaded(sender As Object, e As RoutedEventArgs)
@@ -277,6 +306,12 @@ Public Class RawPartPageUC
            Utility.SetBlockAndSlabNbr(sBlock, sSlabNbr)
         End If
      End If
+
+      ' Carico le info del riferimento alternativo della tavola
+      m_nOtherRefTabLay = EgtCreateGroup(GDB_ID.ROOT)
+      EgtSetLevel(m_nTempLay, GDB_LV.TEMP)
+      LoadOtherRefTab()
+
      ' Assegno dati grezzo rettangolare ai textbox
      LengthTxBx.Text = LenToString(m_RawLength, 2)
      WidthTxBx.Text = LenToString(m_RawWidth, 2)
@@ -320,6 +355,36 @@ Public Class RawPartPageUC
      Next
   End Sub

+   Private Sub LoadOtherRefTab()
+      m_bEnableOtherRefTab = (GetPrivateProfileInt(S_RAWPART, K_ENABLEOTHERREFTAB, 0, m_MainWindow.GetIniFile()) <> 0)
+      If Not m_bEnableOtherRefTab Then
+         OtherRefTabBtn.Visibility = Visibility.Collapsed
+         OtherRefTabChBx.Visibility = Visibility.Collapsed
+         OtherRefTabTxBl.Visibility = Visibility.Collapsed
+         Return
+      End If
+      m_bOtherRefTab = (GetPrivateProfileInt(S_RAWPART, K_OTHERREFTAB, 0, m_MainWindow.GetIniFile()) <> 0)
+      m_OtherRefTabX = GetPrivateProfileDouble(S_RAWPART, K_OTHERREFTABX, 0, m_MainWindow.GetIniFile())
+      m_OtherRefTabY = GetPrivateProfileDouble(S_RAWPART, K_OTHERREFTABY, 0, m_MainWindow.GetIniFile())
+      m_OtherRefTabPos = GetPrivateProfileInt(S_RAWPART, K_OTHERREFTABPOS, 0, m_MainWindow.GetIniFile())
+      ' RefTabPosCmbx.SelectedIndex = m_OtherRefTabPos
+      OtherRefTabChBx.IsChecked = m_bOtherRefTab
+      ' se riferimento tavola differente da quello atteso
+      If m_bOtherRefTab Then
+         ' dasibilito la modifica dei parametri di Offset
+         OffsetXTxBx.IsEnabled = False
+         OffsetYTxBx.IsEnabled = False
+         UpdateOffsetText()
+      End If
+
+      ' Rimuovo eventuali crocette create acquisendo i punti nel disegno
+      EgtEmptyGroup(m_nOtherRefTabLay)
+      ' Acquisisco punto da disegno
+      m_OtherRefTabPoint = New Point3d(m_ptTableMin.x + m_OtherRefTabX, m_ptTableMin.y + m_OtherRefTabY, m_ptTableMin.z + 0.15 + m_CurrentMachine.dAdditionalTable)
+      CreateOtherRefTab(m_nOtherRefTabLay, m_OtherRefTabPoint)
+      ' EgtDraw()
+   End Sub
+
   Private Sub OnMyMouseDownScene(sender As Object, e As System.Windows.Forms.MouseEventArgs) Handles m_CurrProjPage.OnMouseDownScene
      ' Verifico di essere il gestore attivo
      If Not m_bActive Then Return
@@ -930,6 +995,13 @@ Public Class RawPartPageUC
            ' Disattivo bottoni zone rovinate
            DamagedAreaGpBx.Visibility = Windows.Visibility.Hidden
            ConfirmPhotoBtn.Visibility = Windows.Visibility.Hidden
+            If m_bEnableOtherRefTab Then
+               OtherRefTabChBx.IsEnabled = True
+               OtherRefTabBtn.IsEnabled = True
+               ' disegno il riferimento
+               m_OtherRefTabPoint = New Point3d(m_ptTableMin.x + m_OtherRefTabX, m_ptTableMin.y + m_OtherRefTabY, m_ptTableMin.z + 0.15 + m_CurrentMachine.dAdditionalTable)
+               CreateOtherRefTab(m_nOtherRefTabLay, m_OtherRefTabPoint)
+            End If
         Case RAWMODE.BY_POINTS
            RawModeCmBx.IsEnabled = True
            RawModeDamagedCmBx.Visibility = Visibility.Collapsed
@@ -946,6 +1018,12 @@ Public Class RawPartPageUC
            ' Disattivo bottoni zone rovinate e foto
            DamagedAreaGpBx.Visibility = Windows.Visibility.Hidden
            ConfirmPhotoBtn.Visibility = Windows.Visibility.Hidden
+            ' disettivo la possibilità di modificare il riferimento 
+            If m_bEnableOtherRefTab Then
+               OtherRefTabChBx.IsEnabled = False
+               OtherRefTabBtn.IsEnabled = False
+               EgtEmptyGroup(m_nOtherRefTabLay)
+            End If
         Case RAWMODE.FROM_LASER
            RawModeCmBx.IsEnabled = True
            RawModeDamagedCmBx.Visibility = Visibility.Collapsed
@@ -962,6 +1040,11 @@ Public Class RawPartPageUC
            ' Disattivo bottoni zone rovinate e foto
            DamagedAreaGpBx.Visibility = Windows.Visibility.Hidden
            ConfirmPhotoBtn.Visibility = Windows.Visibility.Hidden
+            If m_bEnableOtherRefTab Then
+               OtherRefTabChBx.IsEnabled = False
+               OtherRefTabBtn.IsEnabled = False
+               EgtEmptyGroup(m_nOtherRefTabLay)
+            End If
         Case RAWMODE.DAMAGED
            RawModeCmBx.IsEnabled = False
            RawModeDamagedCmBx.Visibility = Visibility.Visible
@@ -980,6 +1063,11 @@ Public Class RawPartPageUC
            DamagedAreaGpBx.Visibility = Windows.Visibility.Visible
            ' Disattivo bottoni foto
            ConfirmPhotoBtn.Visibility = Windows.Visibility.Hidden
+            If m_bEnableOtherRefTab Then
+               OtherRefTabChBx.IsEnabled = False
+               OtherRefTabBtn.IsEnabled = False
+               EgtEmptyGroup(m_nOtherRefTabLay)
+            End If
         Case RAWMODE.FROM_PHOTO
            RawModeCmBx.IsEnabled = True
            RawModeDamagedCmBx.Visibility = Visibility.Collapsed
@@ -992,6 +1080,11 @@ Public Class RawPartPageUC
            DamagedAreaGpBx.Visibility = Windows.Visibility.Hidden
            ' Visualizzo bottoni foto
            ConfirmPhotoBtn.Visibility = Windows.Visibility.Visible
+            If m_bEnableOtherRefTab Then
+               OtherRefTabChBx.IsEnabled = False
+               OtherRefTabBtn.IsEnabled = False
+               EgtEmptyGroup(m_nOtherRefTabLay)
+            End If
         Case RAWMODE.DAMAGED_BY_LASER
            RawModeCmBx.IsEnabled = True
            RawModeDamagedCmBx.Visibility = Visibility.Visible
@@ -1008,6 +1101,11 @@ Public Class RawPartPageUC
            ' Disattivo bottoni zone rovinate e foto
            DamagedAreaGpBx.Visibility = Windows.Visibility.Hidden
            ConfirmPhotoBtn.Visibility = Windows.Visibility.Hidden
+            If m_bEnableOtherRefTab Then
+               OtherRefTabChBx.IsEnabled = False
+               OtherRefTabBtn.IsEnabled = False
+               EgtEmptyGroup(m_nOtherRefTabLay)
+            End If
         Case RAWMODE.DAMAGED_BY_SAW
            RawModeCmBx.IsEnabled = True
            RawModeDamagedCmBx.Visibility = Visibility.Visible
@@ -1024,6 +1122,11 @@ Public Class RawPartPageUC
            ' Disattivo bottoni zone rovinate e foto
            DamagedAreaGpBx.Visibility = Windows.Visibility.Hidden
            ConfirmPhotoBtn.Visibility = Windows.Visibility.Hidden
+            If m_bEnableOtherRefTab Then
+               OtherRefTabChBx.IsEnabled = False
+               OtherRefTabBtn.IsEnabled = False
+               EgtEmptyGroup(m_nOtherRefTabLay)
+            End If
         Case RAWMODE.FROM_SAW
            RawModeCmBx.IsEnabled = True
            RawModeDamagedCmBx.Visibility = Visibility.Collapsed
@@ -1040,11 +1143,26 @@ Public Class RawPartPageUC
            ' Disattivo bottoni zone rovinate e foto
            DamagedAreaGpBx.Visibility = Windows.Visibility.Hidden
            ConfirmPhotoBtn.Visibility = Windows.Visibility.Hidden
+            If m_bEnableOtherRefTab Then
+               OtherRefTabChBx.IsEnabled = False
+               OtherRefTabBtn.IsEnabled = False
+               EgtEmptyGroup(m_nOtherRefTabLay)
+            End If
      End Select
+      ' se abilitato nuovo riferimento del grezzo disabilito le text per offset
+      If OtherRefTabChBx.IsChecked Then
+         OffsetXTxBx.IsEnabled = False
+         OffsetYTxBx.IsEnabled = False
+      End If
   End Sub

   Private Sub OutlineBtn_Click(sender As Object, e As RoutedEventArgs) Handles OutlineBtn.Click
      If m_ActiveRawMode = RAWMODE.DAMAGED Or m_ActiveRawMode = RAWMODE.DAMAGED_BY_LASER Or m_ActiveRawMode = RAWMODE.DAMAGED_BY_SAW Then
+         If m_bEnableOtherRefTab Then
+            OtherRefTabTxBl.Visibility = Visibility.Visible
+            OtherRefTabBtn.Visibility = Visibility.Visible
+            OtherRefTabChBx.Visibility = Visibility.Visible
+         End If
         ' m_ActiveRawMode = RAWMODE.BY_POINTS
         m_ActiveRawMode = m_PrecActiveRawMode
         RawModeCmBx.SelectedIndex = m_ActiveRawMode
@@ -1055,6 +1173,12 @@ Public Class RawPartPageUC
   End Sub

   Private Sub DamagedBtn_Click(sender As Object, e As RoutedEventArgs) Handles DamagedBtn.Click
+      If m_bEnableOtherRefTab Then
+         OtherRefTabTxBl.Visibility = Visibility.Hidden
+         OtherRefTabBtn.Visibility = Visibility.Hidden
+         OtherRefTabChBx.Visibility = Visibility.Hidden
+         OtherRefTabBtn.IsEnabled = False
+      End If
      m_PrecActiveRawMode = m_ActiveRawMode
      If m_PrecActiveRawMode = RAWMODE.FROM_LASER Then
         m_ActiveRawMode = RAWMODE.DAMAGED_BY_LASER
@@ -1843,6 +1967,7 @@ Public Class RawPartPageUC
         WidthTxBx.Text = LenToString(m_RawWidth, 2)
         m_CurrProjPage.SetErrorMessage(EgtMsg(MSG_RAWPARTPAGEUC + 17) & " " & LenToString(dMaxWidth, 2))   'Massima larghezza =
      End If
+      RefTabModeChange()
   End Sub

   Private Sub HeightTxBx_EgtClosed(sender As Object, e As EventArgs) Handles HeightTxBx.EgtClosed
@@ -1872,6 +1997,7 @@ Public Class RawPartPageUC
         HeightTxBx.Text = LenToString(m_RawHeight, 3)
         m_CurrProjPage.SetErrorMessage(EgtMsg(MSG_RAWPARTPAGEUC + 18)) 'Non sono ammessi spessori negativi
      End If
+      RefTabModeChange()
   End Sub

   Private Sub OffsetXTxBx_EgtClosed(sender As Object, e As EventArgs) Handles OffsetXTxBx.EgtClosed
@@ -1918,6 +2044,109 @@ Public Class RawPartPageUC
      End If
   End Sub

+#Region "OTHERREFTAB"
+
+   Private Sub OtherRefTabChBx_Click(sender As Object, e As EventArgs) Handles OtherRefTabChBx.Click
+      If OtherRefTabChBx.IsChecked Then
+         m_bOtherRefTab = True
+         MoveRawToOtherRefTab()
+      Else
+         m_bOtherRefTab = False
+         'MoveRawToMaiRefTab()
+      End If
+      UpdateOffsetText()
+      RawModeView()
+      WritePrivateProfileString(S_RAWPART, K_OTHERREFTAB, If(m_bOtherRefTab, "1", "0"), m_MainWindow.GetIniFile())
+   End Sub
+
+   Public Sub RefTabModeChange()
+      If Not m_bOtherRefTab Then Return
+      MoveRawToMaiRefTab()
+      MoveRawToOtherRefTab()
+      UpdateRefTabDraw()
+      UpdateOffsetText()
+   End Sub
+
+   Public Sub UpdateRefTabDraw()
+      ' Rimuovo eventuali crocette create acquisendo i punti nel disegno
+      EgtEmptyGroup(m_nOtherRefTabLay)
+      ' Acquisisco punto da disegno
+      m_OtherRefTabPoint = New Point3d(m_ptTableMin.x + m_OtherRefTabX, m_ptTableMin.y + m_OtherRefTabY, m_ptTableMin.z + 0.15)
+      CreateOtherRefTab(m_nOtherRefTabLay, m_OtherRefTabPoint)
+      EgtDraw()
+   End Sub
+
+   Private Sub UpdateOffsetText()
+      Dim ptRawMin, ptRawMax As Point3d
+      Dim dInvertKerf As Double = 1
+      If GetRawBox(ptRawMin, ptRawMax) Then
+         ' kerf
+         EgtGetInfo(EgtGetFirstRawPart(), KEY_KERF, m_RawKerf)
+         ' verifico se il kerf è negativo
+         EgtGetInfo(EgtGetFirstRawPart(), KEY_INVERT_KERF, dInvertKerf)
+         ' aggiorno dati grezzo
+         If dInvertKerf < 0 Then
+            m_RawOffsX = ptRawMin.x - m_ptTableMin.x
+            m_RawOffsY = ptRawMin.y - m_ptTableMin.y
+         Else
+            m_RawOffsX = ptRawMin.x - m_ptTableMin.x + m_RawKerf * dInvertKerf
+            m_RawOffsY = ptRawMin.y - m_ptTableMin.y + m_RawKerf * dInvertKerf
+         End If
+         OffsetXTxBx.Text = LenToString(m_RawOffsX, 2)
+         OffsetYTxBx.Text = LenToString(m_RawOffsY, 2)
+      End If
+   End Sub
+
+   Private Sub MoveRawToOtherRefTab()
+      Dim dKerf As Double = 0
+      StringToLen(KerfTxBx.Text, dKerf)
+      Select Case m_OtherRefTabPos
+         Case OTHERREFMODE.BL
+            m_RawOffsX = m_OtherRefTabX + If((dKerf < 0), -dKerf, dKerf)
+            m_RawOffsY = m_OtherRefTabY + If((dKerf < 0), -dKerf, dKerf)
+         Case OTHERREFMODE.BR
+            m_RawOffsX = m_OtherRefTabX - m_RawLength - If((dKerf < 0), -dKerf, dKerf)
+            m_RawOffsY = m_OtherRefTabY + If((dKerf < 0), -dKerf, dKerf)
+         Case OTHERREFMODE.TR
+            m_RawOffsX = m_OtherRefTabX - m_RawLength - If((dKerf < 0), -dKerf, dKerf)
+            m_RawOffsY = m_OtherRefTabY - m_RawWidth - If((dKerf < 0), -dKerf, dKerf)
+         Case OTHERREFMODE.TL
+            m_RawOffsX = m_OtherRefTabX + If((dKerf < 0), -dKerf, dKerf)
+            m_RawOffsY = m_OtherRefTabY - m_RawWidth - If((dKerf < 0), -dKerf, dKerf)
+         Case Else
+      End Select
+      UpdateRawPart()
+   End Sub
+
+   Private Sub MoveRawToMaiRefTab()
+      Dim dKerf As Double = 0
+      StringToLen(KerfTxBx.Text, dKerf)
+      Select Case m_OtherRefTabPos
+         Case OTHERREFMODE.BR
+            m_RawOffsX = If((dKerf < 0), 0, dKerf)
+            m_RawOffsY = If((dKerf < 0), 0, dKerf)
+         Case OTHERREFMODE.BL
+            m_RawOffsX = If((dKerf < 0), 0, dKerf)
+            m_RawOffsY = If((dKerf < 0), 0, dKerf)
+         Case OTHERREFMODE.TL
+            m_RawOffsX = If((dKerf < 0), 0, dKerf)
+            m_RawOffsY = If((dKerf < 0), 0, dKerf)
+         Case OTHERREFMODE.TR
+            m_RawOffsX = If((dKerf < 0), 0, dKerf)
+            m_RawOffsY = If((dKerf < 0), 0, dKerf)
+         Case Else
+      End Select
+      UpdateRawPart()
+   End Sub
+
+   Private Sub OtherRefTabBtn_Click(sender As Object, e As EventArgs) Handles OtherRefTabBtn.Click
+      ' apro la finestra per gestire il riferimento
+      Dim OthWD As New OtherRefTabWD(m_MainWindow, LenToString(m_OtherRefTabX, 2), LenToString(m_OtherRefTabY, 2), m_RawOffsX, m_RawOffsY, m_OtherRefTabPos)
+      OthWD.ShowDialog()
+   End Sub
+
+#End Region    ' OtherRefTab
+
   Private Sub KerfTxBx_EgtClosed(sender As Object, e As EventArgs) Handles KerfTxBx.EgtClosed
      Dim dKerf As Double
      If Not StringToLen(KerfTxBx.Text, dKerf) Then
@@ -1960,6 +2189,8 @@ Public Class RawPartPageUC
         Else
            CreateRawFromPhotoContour()
         End If
+         ' Forzo il riposizionamento del grezzo
+         RefTabModeChange()
         ' Ridisegno
         EgtDraw()
      ElseIf dKerf >= dMinKerf And dKerf < 0 Then
@@ -2022,6 +2253,8 @@ Public Class RawPartPageUC
         Else
            CreateRawFromPhotoContour()
         End If
+         ' Forzo il riposizionamento del grezzo
+         RefTabModeChange()
         ' Ridisegno
         EgtDraw()
      ElseIf dKerf < dMinKerf Then
@@ -2267,6 +2500,7 @@ Public Class RawPartPageUC
   Private Sub RawPartPage_Unloaded(sender As Object, e As RoutedEventArgs)
      ' Rimuovo layer temporaneo per crocette
      EgtErase(m_nTempLay)
+      EgtErase(m_nOtherRefTabLay)
      ' Dichiaro pagina non attiva
      m_bActive = False
   End Sub
@@ -2582,4 +2816,44 @@ Public Class RawPartPageUC
      Return True
   End Function

+   Private Function CreateOtherRefTab(nLayerId As Integer, ptP As Point3d) As Boolean
+      EgtEmptyGroup(m_nOtherRefTabLay)
+      If Not m_bOtherRefTab Or Not OtherRefTabChBx.IsEnabled Then
+         EgtDraw()
+         Return False
+      End If
+
+      If File.Exists(m_MainWindow.GetResourcesDir() & "\" & "RefTabBL.nge") Then
+         ' Aggiungo disegno staffa fermo pezzo
+         EgtInsertFile(m_MainWindow.GetResourcesDir() & "\" & "RefTabBL.nge")
+         Dim nLastPart As Integer = EgtGetLastPart()
+         Dim Lay As Integer = EgtGetFirstInGroup(nLastPart)
+         Dim Ent As Integer = EgtGetFirstInGroup(Lay)
+         While Ent <> -1
+            Dim NextEnt As Integer = EgtGetNext(Ent)
+            EgtRelocate(Ent, nLayerId)
+            EgtMove(Ent, ptP - Point3d.ORIG)
+            EgtRotate(Ent, ptP, Vector3d.Z_AX, 90 * m_OtherRefTabPos)
+            Ent = NextEnt
+         End While
+         EgtErase(nLastPart)
+      Else
+         ' Aggiungo crocette
+         ptP += New Vector3d(0, 0, 0.15)
+         Dim vtCrossX As New Vector3d(100, 0, 0)
+         Dim vtCrossY As New Vector3d(0, 100, 0)
+         Dim vtCrossZ As New Vector3d(0, 0, 100)
+         Dim nCrossId1 = EgtCreateLine(nLayerId, ptP, ptP + vtCrossX)
+         EgtSetColor(nCrossId1, New Color3d(245, 0, 0))
+         Dim nCrossId2 = EgtCreateLine(nLayerId, ptP, ptP + vtCrossY)
+         EgtSetColor(nCrossId2, New Color3d(0, 245, 0))
+         Dim nCrossId3 = EgtCreateLine(nLayerId, ptP, ptP + vtCrossZ)
+         EgtSetColor(nCrossId3, New Color3d(0, 0, 245))
+      End If
+
+      EgtDraw()
+      'EgtSaveFile("C:\EgtData\OmagCUT\Temp\MyTest.nge", NGE.BIN)
+      Return True
+   End Function
+
 End Class
@@ -4,6 +4,7 @@ Imports System.Collections.ObjectModel
 Imports System.Runtime.InteropServices
 Imports EgtUILib
 Imports EgtWPFLib
+Imports OmagCUT.VeinMatchingWindow

 Public Class VeinMatchingWindow

@@ -19,6 +20,11 @@ Public Class VeinMatchingWindow
   Private m_nIdToSel As Integer = GDB_ID.NULL
   Private m_nIdToDesel As Integer = GDB_ID.NULL

+   Enum ALETTE
+      F = 2
+      A = 1
+   End Enum
+
   Private Sub Window_Initialized(sender As Object, e As EventArgs)
      ' Assegnazione scena all'host e posizionamento nella PlacePageGrid
      VeinMatchingSceneHost.Child = VeinMatchingScene
@@ -267,7 +273,7 @@ Friend Module VeinMatching
      Dim nRegId As Integer = EgtGetFirstInGroup(nRegLayId)
      While nRegId <> GDB_ID.NULL
         If EgtGetType(nRegId) = GDB_TY.SRF_FRGN Then
-               Exit While
+            Exit While
         End If
         nRegId = EgtGetNext(nRegId)
      End While
@@ -364,19 +370,21 @@ Friend Module VeinMatching
      ' Imposto il contesto del progetto
      EgtSetCurrentContext(m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene.GetCtx())
      ' Riattivo il gruppo di lavoro
-      EgtSetCurrMachGroup( EgtGetFirstMachGroup())
+      EgtSetCurrMachGroup(EgtGetFirstMachGroup())
      ' Verifico quali pezzi sono nel grezzo, per dichiararlo al VM
-      nId = EgtGetFirstPartInRawPart( CamAuto.GetCurrentRaw())
+      nId = EgtGetFirstPartInRawPart(CamAuto.GetCurrentRaw())
      While nId <> GDB_ID.NULL
         ' Dichiaro pezzo nel grezzo per VM
-         VeinMatching.OnInsertPartInRaw( nId)
+         VeinMatching.OnInsertPartInRaw(nId)
         ' Passo al pezzo successivo
         nId = EgtGetNextPartInRawPart(nId)
      End While
      ' Ripristino visualizzazione di eventuali pezzi in parcheggio
      ShowParkedParts()
      ' Ripristino il contesto corrente
-      EgtSetCurrentContext( nCurrCtx)
+      EgtSetCurrentContext(nCurrCtx)
+
+      ' EgtSaveFile("C:\EgtData\OmagCUT\Temp\MyVeinMatch.nge", NGE.TEXT)
      Return True
   End Function

@@ -422,11 +430,11 @@ Friend Module VeinMatching
      nCurrId = EgtGetFirstNameInGroup(nVeinId2, NAME_PREVIEW)
      EgtSetStatus(nCurrId, GDB_ST.OFF)
      ' Se esiste OutLoop.orig OutLoop -> OutLoop.mach e OutLoop.orig -> OutLoop
-      Dim nOutLoopOrig As Integer = EgtGetFirstNameInGroup( nVeinId2, NAME_OUTLOOP & ".orig")
+      Dim nOutLoopOrig As Integer = EgtGetFirstNameInGroup(nVeinId2, NAME_OUTLOOP & ".orig")
      If nOutLoopOrig <> GDB_ID.NULL Then
-         Dim nOutLoop As Integer = EgtGetFirstNameInGroup( nVeinId2, NAME_OUTLOOP)
-         EgtSetName( nOutLoop, NAME_OUTLOOP & ".mach")
-         EgtSetName( nOutLoopOrig, NAME_OUTLOOP)
+         Dim nOutLoop As Integer = EgtGetFirstNameInGroup(nVeinId2, NAME_OUTLOOP)
+         EgtSetName(nOutLoop, NAME_OUTLOOP & ".mach")
+         EgtSetName(nOutLoopOrig, NAME_OUTLOOP)
      End If
      ' Se necessario, ripristino il contesto originale
      If nCurrCtx > 0 Then EgtSetCurrentContext(nCurrCtx)
@@ -555,8 +563,8 @@ Friend Module VeinMatching

         ' Se richiesto, eseguo deselezione
         If bDeselect Then EgtDeselectObj(nId)
-         End If
-         EgtDraw()
+      End If
+      EgtDraw()
      EgtSetCurrentContext(nMainCtx)
      Return True
   End Function
@@ -1039,37 +1047,44 @@ Friend Module VeinMatching
   End Function

   Friend Function MoveAlettaSolid(ByRef Item As Aletta, ByRef ThicknessRaw As Double) As Boolean
-
+      ' A: alzatina, F: frontalino
      Dim nType As Integer
      If Not EgtGetInfo(Item.IdSideRef, "AF", nType) Then Return False

-      Dim ptSRef, ptERef, ptE As Point3d
+      Dim ptSRef, ptERef, ptS, ptE As Point3d
+      ' Piano cucina
      If Not EgtStartPoint(Item.IdSideRef, GDB_ID.ROOT, ptSRef) Then Return False
      If Not EgtEndPoint(Item.IdSideRef, GDB_ID.ROOT, ptERef) Then Return False
+      ' AlzFront
+      If Not EgtStartPoint(Item.SideId, GDB_ID.ROOT, ptS) Then Return False
      If Not EgtEndPoint(Item.SideId, GDB_ID.ROOT, ptE) Then Return False

+      ' vettore lato cucina
+      Dim vtRotRef As Vector3d = ptERef - ptSRef
+      ' vettore lato AlzFront
+      Dim vtRot As Vector3d = ptE - ptS
+
      ' ruoto il solido intorno al lato di riferimento
-      Dim vtRot As Vector3d = ptERef - ptSRef
-      If nType = 1 Then
-         EgtRotate(Item.PartId, ptE, vtRot, -90, GDB_RT.GLOB)
-      ElseIf nType = 2 Then
+      If nType = ALETTE.A Then
         EgtRotate(Item.PartId, ptE, vtRot, 90, GDB_RT.GLOB)
+      ElseIf nType = ALETTE.F Then
+         EgtRotate(Item.PartId, ptE, vtRot, -90, GDB_RT.GLOB)
      End If

      ' punto di riferimento per la traslazione sul solido
      Dim ptSolid As Point3d
-      If nType = 1 Then
+      If nType = ALETTE.A Then
         ' cerco id della curva che definisce la front face
         Dim nSolidGrp As Integer = EgtGetFirstNameInGroup(Item.PartId, NAME_VM_SOLID)
         Dim nFrontCrvId As Integer = EgtGetFirstInGroup(nSolidGrp)
-         EgtStartPoint(nFrontCrvId, ptSolid)
-      ElseIf nType = 2 Then
-         EgtStartPoint(Item.SideId, ptSolid)
+         EgtStartPoint(nFrontCrvId, GDB_ID.ROOT, ptSolid)
+      ElseIf nType = ALETTE.F Then
+         EgtStartPoint(Item.SideId, GDB_ID.ROOT, ptSolid)
      End If

-      Dim ItemFrame As New Frame3d
-      If Not EgtGetGroupGlobFrame(Item.PartId, ItemFrame) Then Return False
-      ptSolid.ToGlob(ItemFrame)
+      ' Dim ItemFrame As New Frame3d
+      ' If Not EgtGetGroupGlobFrame(Item.PartId, ItemFrame) Then Return False
+      ' ptSolid.ToGlob(ItemFrame)

      'punto di riferimento per la traslazione sul piano cucina
      Dim ptKitchen As Point3d = ptERef
@@ -1077,6 +1092,16 @@ Friend Module VeinMatching
      Dim vtMove As Vector3d = ptKitchen - ptSolid
      EgtMove(Item.PartId, vtMove, GDB_RT.GLOB)

+      ' eventualmente ruoto per allineare l'alzatina al piano cucina
+      Dim dLRef, dAngVRef, dAngHRef As Double
+      vtRotRef.ToSpherical(dLRef, dAngVRef, dAngHRef)
+      Dim dL, dAngV, dAngH As Double
+      vtRot.Rotate(Vector3d.Z_AX, 180)
+      vtRot.ToSpherical(dL, dAngV, dAngH)
+      Dim dDelta As Double = dAngHRef - dAngH
+      If Math.Abs(dDelta) < EPS_ANG_SMALL Then Return True
+      EgtRotate(Item.PartId, ptKitchen, Vector3d.Z_AX, dDelta, GDB_RT.GLOB)
+
      Return True
   End Function

@@ -1206,7 +1231,7 @@ Friend Module VeinMatching
      ' Se necessario, cambio contesto
      If m_nVeinCtx <> nCurrCtx Then
         If EgtSetCurrentContext(m_nVeinCtx) Then
-            Return If( nCurrCtx > 0, nCurrCtx, -2)
+            Return If(nCurrCtx > 0, nCurrCtx, -2)
         Else
            Return 0
         End If
@@ -1268,7 +1293,7 @@ Friend Module VeinMatching
      While nId <> GDB_ID.NULL
         Dim nOriId As Integer
         If EgtGetInfo(nId, KEY_ORI_ID, nOriId) AndAlso nOriId = nPartId Then
-               Exit While
+            Exit While
         End If
         nId = EgtGetNextPart(nId)
      End While
Author	SHA1	Message	Date
Nicola Pievani	391d25507e	Inserita gestione Flag per Rettificata tagli inclinati	2023-05-30 19:27:14 +02:00
Nicola Pievani	c954f364e3	Modifica gestione FEED per controllo FANUC	2023-05-26 17:35:18 +02:00
Nicola Pievani	1ab6d2746f	Correzione disabilitazione NuovoRiferimento	2023-05-25 12:48:26 +02:00
Nicola Pievani	41de0516c8	Merge branch 'Features/New_Front_Unloading' into develop	2023-05-24 12:01:26 +02:00
Nicola Pievani	dec4c0d312	Migliorata abilitazione comando Next in MoveRaw	2023-05-24 12:00:11 +02:00
Nicola Pievani	834f3afe1c	Correzione pulsante bottone HOME in MachButtons	2023-05-23 18:40:38 +02:00
Nicola Pievani	e6c95323fb	Aggiunto controllo stato pulsante bottone HOME in MachButtons	2023-05-23 18:32:22 +02:00
Nicola Pievani	fa6e5b520f	Merge branch 'master' into develop	2023-05-23 16:18:53 +02:00
Nicola Pievani	aefc037cd9	Correzione apertura programma da progetto	2023-05-23 16:18:13 +02:00
Nicola Pievani	c5f3d4fcfb	Merge branch 'develop'	2023-05-18 15:33:23 +02:00
Nicola Pievani	a04e2cbe62	Gestione avanzata posizionamento pezzi VeinMatch	2023-05-18 14:43:03 +02:00
Nicola Pievani	da980a649e	Merge branch 'Features/Compo_Frames' into develop	2023-05-18 11:18:14 +02:00
Nicola Pievani	4c282d7531	Abilito visualizzazione pulsante per inserimento FrameCompo	2023-05-18 11:13:40 +02:00
Nicola Pievani	a941f963c2	Disabilito i comandi dei compo piani	2023-05-16 10:31:58 +02:00
Nicola Pievani	eab341d7fe	Importazione FrameCompo	2023-05-15 19:37:31 +02:00
Nicola Pievani	9c7d60d307	Aggiornati i messaggi	2023-05-15 14:57:25 +02:00
Nicola Pievani	a7adcdcaca	Correzione visualizzazione Pagine componenti	2023-05-15 12:14:54 +02:00
Nicola Pievani	acb8ceed4d	Merge branch 'Features/Other_Ref_On_Table' into develop	2023-05-09 17:15:22 +02:00
Nicola Pievani	65d8f58b45	Migliorata impaginazione dati e disegno RefTab	2023-05-09 17:15:10 +02:00
Nicola Pievani	07cf7ced42	Definizione nuovp roferimento su stavola	2023-05-08 20:04:56 +02:00
Nicola Pievani	b1410ca11c	Aggiunti parametri TCPOS e DIAM per comandi diretti	2023-05-05 13:12:15 +02:00
Nicola Pievani	1975f46995	Merge branch 'Features/Probing_Polishing_Tool' into develop	2023-05-04 14:55:56 +02:00
Nicola Pievani	6863186e07	Aggiunto nuovo parametro per tastatura	2023-05-04 14:37:17 +02:00
Nicola Pievani	b434f80030	Correzione gestione Z safe, cambio versione 2.5e1	2023-05-03 18:09:58 +02:00
Nicola Pievani	ef1aef12ed	Merge branch 'develop'	2023-04-28 13:24:04 +02:00
Nicola Pievani	efafacf6ca	Merge branch 'develop'	2023-04-07 10:01:54 +02:00
Nicola Pievani	652c396933	Merge branch 'develop'	2023-03-20 15:37:52 +01:00
Nicola Pievani	7ecad4c218	Merge branch 'develop'	2023-03-13 10:45:46 +01:00
Nicola Pievani	36a1ecb509	Merge branch 'develop'	2023-03-09 12:53:18 +01:00
NicolaP	b48d4900ea	Merge branch 'develop'	2023-02-10 13:20:23 +01:00