Correzione zona di lettura FlattSawTick

CadCuts/ChooseTestToolWD.xaml.vb

@@ -74,6 +74,12 @@ Public Class ChooseTestToolWD
       End If
 
       Select Case m_MainWindow.m_CurrentMachine.MountedToolConfig
+         Case CurrentMachine.MountedToolConfigs.SAW
+            sNameTool = m_MainWindow.m_CurrentMachine.sCurrSaw
+            If Not String.IsNullOrEmpty(sNameTool) Then
+               ' Imposto la lama
+               m_SetUpToolList.Add(New TestTool(sNameTool, sNameTool))
+            End If
          Case CurrentMachine.MountedToolConfigs.SAWANDAUXTOOL
             sNameTool = m_MainWindow.m_CurrentMachine.sCurrSaw
             If Not String.IsNullOrEmpty(sNameTool) Then

CadCuts/MoveRawPartPage.xaml.vb

@@ -133,9 +133,17 @@ Public Class MoveRawPartPage
       EgtDraw()
       ' Carico i parametri di movimento
       m_dStep = GetPrivateProfileDouble(S_RAWMOVE, K_RAWSTEP, 50, m_MainWindow.GetIniFile())
+      ' Carico il valore ci 
+      Dim ExtraStep As Double = GetPrivateProfileDouble(S_RAWMOVE, K_EXTRASTEP, 1, m_MainWindow.GetIniFile())
       ' Ricavo la lunghezza del baffo di taglio 
       m_dStep = SplitAuto.MaxCuttingMustache(m_dStep)
-      StepMoveTxBx.Text = LenToString(m_dStep, 1) & "+1"
+      If ExtraStep < EPS_SMALL Then
+         StepMoveTxBx.Text = LenToString(m_dStep, 1)
+      Else
+         StepMoveTxBx.Text = LenToString(m_dStep, 1) & "+" & LenToString(ExtraStep, 1)
+         ' Aggiorno il valore sommando l'extra
+         m_dStep = m_dStep + ExtraStep
+      End If
       m_dRotation = GetPrivateProfileDouble(S_RAWMOVE, K_RAWROTATION, 30, m_MainWindow.GetIniFile())
       RotationAngleTxBx.Text = DoubleToString(m_dRotation, 3)
       ' Se movimento manuale perpendicolare

CadCuts/NestPageUC.xaml.vb

@@ -2854,20 +2854,22 @@ Math.Abs(e.Location.Y - m_locPrev.Y) < m_nRestRadius Then
       Return False
    End Function
 
-   Friend Function StoreOnePartDXF(nId As Integer, X As Double, Y As Double) As Boolean
-      Const STORE_LARGH As Double = 6000
+   Friend Function StoreOnePartDXF(nId As Integer, DimX As Double, DimY As Double, MaxPt As Point3d) As Boolean
+      'Const STORE_LARGH As Double = 6000
       Const STORE_DIST As Double = 200
-      Const STORE_OFFS As Double = 20 + 40 + 20
-      Dim dStoreLarg As Double = GetPrivateProfileDouble("Store", "StoreLargh", STORE_LARGH, m_MainWindow.GetMachIniFile())
+      'Const STORE_OFFS As Double = 20 + 40 + 20
+      'Dim dStoreLarg As Double = GetPrivateProfileDouble("Store", "StoreLargh", STORE_LARGH, m_MainWindow.GetMachIniFile())
       Dim dStoreDist As Double = GetPrivateProfileDouble("Store", "StoreDist", STORE_DIST, m_MainWindow.GetMachIniFile())
-      Dim dStoreOffs As Double = GetPrivateProfileDouble("Store", "StoreOffs", STORE_OFFS, m_MainWindow.GetMachIniFile())
+      'Dim dStoreOffs As Double = GetPrivateProfileDouble("Store", "StoreOffs", STORE_OFFS, m_MainWindow.GetMachIniFile())
       ' Recupero box tavola
       Dim b3Tab As New BBox3d
       If Not EgtGetTableArea(1, b3Tab) Then
          b3Tab.Add(New Point3d(0, 0, 0))
          b3Tab.Add(New Point3d(-3600, -2600, 0))
       End If
-      Dim vt As New Vector3d(b3Tab.Min.x, b3Tab.Min.y - Y - STORE_DIST, b3Tab.Min.z)
+      Dim Offs_y As Double = b3Tab.Min.y - MaxPt.y - STORE_DIST
+      Dim Offs_x As Double = b3Tab.Min.x - (MaxPt.x - DimX) + (b3Tab.DimX - DimX) / 2
+      Dim vt As New Vector3d(Offs_x, Offs_y, b3Tab.Min.z)
       EgtMove(nId, vt, GDB_RT.GLOB)
       ' Recupero il centro del pezzo in parcheggio e lo salvo
       Dim ptCenter As Point3d

CadCuts/SelParkIndWD.xaml.vb

@@ -273,7 +273,7 @@ Public Class SelParkIndWD
       Next
    End Sub
 
-   ' Restituisce il primo parcheggio attivo (
+   ' Restituisce il primo parcheggio attivo
    Public Shared Function GetCurrentParkIndSelected() As ParkInd
       Dim ListParkInd As New List(Of ParkInd)
       SelParkIndWD.LoadParkInd(ListParkInd)
@@ -286,7 +286,7 @@ Public Class SelParkIndWD
       Return Nothing
    End Function
 
-   ' Restitusice il nome del file immagine del parcheggio (manance solo dell'Indice di parcheggio e dell'esetensione png)
+   ' Restitusice il nome del file immagine del parcheggio (manca solo dell'Indice di parcheggio e dell'esetensione png)
    Public Shared Function GetPathCurrProj() As String
       Dim nProj As Integer = m_MainWindow.m_CurrentProjectPageUC.GetCurrentProject()
       Dim sParkPath As String = m_MainWindow.GetSaveDir() & "\" & Math.Abs(nProj).ToString("D4") & "_ParkInd_"
@@ -298,15 +298,20 @@ Public Class SelParkIndWD
       Return sParkPath
    End Function
 
-   Public Shared Sub CopyImgSvg(sNewFileName As String, Optional nCtx As Integer = -1)
+   ' Dato il nome del progetto crea le immagini dei parcheggi
+   Public Shared Sub CopyImgSvg(sNewFileName As String, refListParkInd As List(Of ParkInd), Optional nCtx As Integer = -1)
       If sNewFileName.EndsWith(".nge") Then
          sNewFileName = sNewFileName.Remove(sNewFileName.Length - 4, 4) & "_ParkInd_"
       End If
       Dim Extension As String = ".svg"
       If Not MainWindow.m_bShowSVGParkInd Then Extension = ".png"
       Dim ListParkInd As New List(Of ParkInd)
-      ' ricarico la lista
-      SelParkIndWD.LoadParkInd(ListParkInd, nCtx)
+      If Not IsNothing(refListParkInd) Then
+         ListParkInd = refListParkInd
+      Else
+         ' ricarico la lista
+         SelParkIndWD.LoadParkInd(ListParkInd, nCtx)
+      End If
       'SelParkIndWD.sActualProj = Path.GetFileNameWithoutExtension(sPath)
       For Each ItemParkInd As ParkInd In ListParkInd
          If ItemParkInd.Ind <> 0 And ItemParkInd.Ind <> 999 And ItemParkInd.nPartInPark > 0 Then
@@ -816,8 +821,12 @@ Public Module XMLReader
       Canv.ViewBoxDim = ViewBoxDim
       ' Elaboro i dati per avere la scalatura del disegno
       Dim DimViewBox As String() = ViewBoxDim.ToString.Split(" ")
-      Dim DimX As Integer = Math.Abs(CInt(DimViewBox(2))) + Math.Abs(CInt(DimViewBox(0)))
-      Dim DimY As Integer = Math.Abs(CInt(DimViewBox(3))) + Math.Abs(CInt(DimViewBox(1)))
+      Dim DimX As Integer = 10
+      Dim DimY As Integer = 10
+      If DimViewBox.Count = 4 Then
+         DimX = Math.Abs(CInt(DimViewBox(2))) + Math.Abs(CInt(DimViewBox(0)))
+         DimY = Math.Abs(CInt(DimViewBox(3))) + Math.Abs(CInt(DimViewBox(1)))
+      End If
 
       ' Leggo in loop i tag: 'path'
       While Not m_xmlr.EOF

Constants/ConstIni.vb

@@ -237,10 +237,13 @@ Module ConstIni
    Public Const K_OTHERREFTABX As String = "OtherRefTabX"
    Public Const K_OTHERREFTABY As String = "OtherRefTabY"
    Public Const K_OTHERREFTABPOS As String = "OtherRefTabPos"
+   Public Const K_REFTAB As String = "RefTab"
+   Public Const K_CURRENTREFTAB As String = "CurrRefTab"
 
 
    Public Const S_RAWMOVE As String = "RawMove"
    Public Const K_RAWSTEP As String = "Step"
+   Public Const K_EXTRASTEP As String = "ExtraStep"
    Public Const K_RAWROTATION As String = "Rotation"
    Public Const K_PERPENDICULAR As String = "Perpendicular"
 
@@ -340,6 +343,7 @@ Module ConstIni
    Public Const K_DC_FLATT_HEADSIDE As String = "FlattHeadSide"
    Public Const K_DC_FLATT_MACHTYPE As String = "FlattMachType"
    Public Const K_DC_FLATT_ROTLOCK As String = "FlattRotLock"
+   Public Const K_DC_FLATT_SAWTH As String = "FlattSawThick"
    Public Const K_DC_FLAT_CHAINEDPATH As String = "ChainedPath"
    Public Const K_DC_FLATT_POSX As String = "FlattPosX"
    Public Const K_DC_FLATT_POSY As String = "FlattPosY"

DirectCuts/ControlsDirectCutUC.xaml.vb

@@ -53,7 +53,6 @@ Public Class ControlsDirectCutUC
       FlatteningCut
       Polishing
       CopyTemplate
-      SawTest
       SingleCutAuto
       SingleDrill
       Squaring

DirectCuts/FlatteningCut.xaml.vb

@@ -407,6 +407,7 @@ Public Class FlatteningCut
             If Not EgtSetCalcTool(sSaw, "H1", 1) Then Return
             ' Trasformo in posizione punta utensile in basso
             If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, vAng, True, m_ptTipP2) Then Return
+
          End If
          ' Calcolo direzione asse lama
          If Not EgtGetCalcToolDirFromAngles(dR1, dR2, m_vtToolP2) Then Return
@@ -725,6 +726,21 @@ Public Class FlatteningCut
       Dim ptStart As Point3d = m_ptTipP1
       ptStart.z = 0
       Dim nCutId = EgtCreateLinePDL(nLayerId, ptStart, m_dAngO, m_dLen)
+
+      ' -- APPLICO OFFSET AI TAGLI -- And PointModeCmBx.SelectedIndex = PT_MODE.SAW
+      If m_nTool = TOOL.SAW And PointModeCmBx.SelectedIndex = PT_MODE.SAW Then
+         ' Applico un offset al taglio:
+         Dim vtOffs As New Vector3d
+         EgtStartVector(nCutId, GDB_RT.GLOB, vtOffs)
+         vtOffs.Rotate(Vector3d.Z_AX, 90)
+         Dim SawThick As Double = GetFootPrintTool()
+         Dim DirOffs As Double = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_FLATT_SAWTH, 0, m_MainWindow.GetIniFile)
+         Dim vtNormTool As Vector3d = m_vtToolP1
+         vtNormTool.Normalize()
+         EgtOutLog("Offset flattening: " & DirOffs.ToString & "*" & SawThick.ToString)
+         If DirOffs <> 0 Then EgtMove(nCutId, vtOffs * DirOffs * SawThick, GDB_RT.GLOB)
+      End If
+
       EgtSetInfo(nCutId, INFO_DIRECTCUT, 1)
       ' Imposto affondamento e angolo di fianco sul taglio
       EgtSetInfo(nCutId, INFO_DEPTH, m_dDepth)

DrawImport/ImportPageUC.xaml.vb

@@ -1074,8 +1074,9 @@ Public Class ImportPageUC
          ' Passo al pezzo successivo
          nId = EgtGetNextPart(nId)
       End While
-      Dim x As Double = GlobBBox.DimX
-      Dim Y As Double = GlobBBox.DimY
+      Dim DimX As Double = GlobBBox.DimX
+      Dim DimY As Double = GlobBBox.DimY
+      Dim BBoxMaxPt As Point3d = GlobBBox.Max
 
       ' Ciclo sui pezzi inseriti
       nId = nFirstId
@@ -1114,7 +1115,7 @@ Public Class ImportPageUC
          ' Inserisco in parcheggio
          If GetPrivateProfileInt(S_GENERAL, K_ENABLEDXFPARK, 0, m_MainWindow.GetIniFile) <> 0 Then
             ' Mantengo la posizione relativa tra i pezzi
-            m_MainWindow.m_CadCutPageUC.m_NestPage.StoreOnePartDXF(nId, x, Y)
+            m_MainWindow.m_CadCutPageUC.m_NestPage.StoreOnePartDXF(nId, DimX, DimY, BBoxMaxPt)
          Else
             m_MainWindow.m_CadCutPageUC.m_NestPage.StoreOnePart(nId, True)
          End If

Machine/MachineStatusUC.xaml.vb

@@ -279,12 +279,16 @@ 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
+      '' modifica richiesta 26/05/2023 da Rosario per cliente Lanzetta (lettura feed per CN Fanuc)
+      '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
+
+      ' modifica richiesta 24/03/2025 da Fabio per cliente Frigerio
+      dRealFeed = m_CN.d_DInterpo_Prog_Feed * m_CN.d_DInterpo_Feed_override / 100
+
       'Feed = DoubleToString(dRealFeed, 0)
       FeedTxBx.Text = LenToString(dRealFeed, 0, True)
       'FeedOverride = DoubleToString(m_CN.d_DInterpo_Feed_override, 0) & "%"

MainWindow.xaml.vb

@@ -26,7 +26,7 @@ Class MainWindow
    ' Variabile che definisce l'avvio forzato in modalità FRAME
    Friend m_OnlyFrame As Boolean = False
 
-   Public Shared m_bShowSVGParkInd As Boolean = False
+   Public Shared m_bShowSVGParkInd As Boolean = True
 
    ' Dichiarazione delle Page UserControl
    Friend m_WorkInProgressPageUC As WorkInProgressPageUC
@@ -345,8 +345,8 @@ Class MainWindow
       ' Verifico abilitazione nesting automatico
       m_bAutoNest = Not String.IsNullOrWhiteSpace(sNestKey)
       ' Recupero opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2703, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(9423, 2703, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2704, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(9423, 2704, 1, m_nKeyOptions)
       ' Verifico abilitazione prodotto
       Dim bProd As Boolean = GetKeyOption(KEY_OPT.CUT_BASE)
       ' Impostazione per programma OnlyFrame: solo se CUT_BASE non attivo
@@ -1218,13 +1218,17 @@ Class MainWindow
             m_DirectCutPageUC.m_ControlsDirectCutUC.m_GridCut.GridCut_Unloaded(sender, e)
          Case ControlsDirectCutUC.DirectCutPages.FlatteningCut
             m_DirectCutPageUC.m_ControlsDirectCutUC.m_FlatteningCut.FlatteningCut_Unloaded(sender, e)
+      End Select
+
+      Select Case m_DirectCutPageUC.m_ControlsDirectCutUC1.m_ActiveDirectCutPage
          Case ControlsDirectCutUC.DirectCutPages.CopyTemplate
             m_DirectCutPageUC.m_ControlsDirectCutUC1.m_CopyTemplate.CopyTemplate_Unloaded(sender, e)
          Case ControlsDirectCutUC.DirectCutPages.Polishing
             m_DirectCutPageUC.m_ControlsDirectCutUC1.m_Polishing.Polishing_Unloaded(sender, e)
-         Case ControlsDirectCutUC.DirectCutPages.SawTest
+         Case ControlsDirectCutUC1.DirectCutPages.SawTest
             m_DirectCutPageUC.m_ControlsDirectCutUC1.m_SawTest.SawTest_Unloaded(sender, e)
       End Select
+
       Return True
    End Function
 

My Project/AssemblyInfo.vb

@@ -62,5 +62,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.7.3.2")>
-<Assembly: AssemblyFileVersion("2.7.3.2")>
+<Assembly: AssemblyVersion("2.7.4.1")>
+<Assembly: AssemblyFileVersion("2.7.4.1")>

Project/CurrentProjectPageUC.xaml.vb

@@ -782,9 +782,9 @@ Public Class CurrentProjectPageUC
       If GetPrivateProfileInt(S_GENERAL, K_ENABLEDXFPARK, 0, m_MainWindow.GetIniFile) <> 0 Then
          ' Gestione visulizzazione lista pezzi in parcheggio
          Dim sNewFileName As String = SelParkIndWD.GetPathCurrProj()
-         SelParkIndWD.CopyImgSvg(sPath)
+         SelParkIndWD.CopyImgSvg(sPath, Nothing)
          SelParkIndWD.sActualProj = String.Empty
-         SelParkIndWD.CopyImgSvg(sNewFileName)
+         SelParkIndWD.CopyImgSvg(sNewFileName, Nothing)
       End If
       '--------------------------------------------------------------------------------
 
@@ -798,6 +798,8 @@ Public Class CurrentProjectPageUC
       m_MruFiles.Add(sPath)
       ' Dichiaro progetto non modificato
       EgtResetModified()
+
+      EgtOutLog("PROJECT " & CurrProjName & " SAVED")
       Return True
    End Function
 

Project/OpenPageUC.xaml.vb

@@ -514,7 +514,7 @@ Public Class OpenPageUC
       ' Gestione visulizzazione lista pezzi in parcheggio
       Dim nProj As Integer = m_MainWindow.m_CurrentProjectPageUC.GetCurrentProject()
       Dim sNewFileName As String = m_MainWindow.GetSaveDir() & "\" & Math.Abs(nProj).ToString("D4") & "_ParkInd_"
-      SelParkIndWD.CopyImgSvg(sNewFileName, OpenScene.GetCtx)
+      SelParkIndWD.CopyImgSvg(sNewFileName, Nothing, OpenScene.GetCtx)
       SelParkIndWD.sActualProj = String.Empty
       '--------------------------------------------------------------------------------
 

Project/ProjectMgrUC.xaml.vb

@@ -100,38 +100,18 @@ Public Class ProjectMgrUC
       ' Scelta tavola della macchina
       Dim nTabInd As Integer = ChooseTable()
 
-      ' Creo una copia di tutte le immagini usata nella lista dei parcheggi
+      ' Ricarico la lista dei parcheggi del progetto precedente a quello nuovo
       Dim ListParkInd As New List(Of ParkInd)
       SelParkIndWD.LoadParkInd(ListParkInd)
+
       ' Creo nuovo progetto
       m_CurrProjPage.NewProject(nTabInd, bRetainParkedParts)
 
-
       ' Gestione visulizzazione lista pezzi in parcheggio
-      m_MainWindow.m_CadCutPageUC.m_NestPage.ReloadListParkInd()
       Dim sNewFileName As String = SelParkIndWD.GetPathCurrProj()
-      SelParkIndWD.CopyImgSvg(sNewFileName)
-      'Dim Extension As String = ".svg"
-      'If Not MainWindow.m_bShowSVGParkInd Then Extension = ".png"
-      'For Each ItemParkInd As ParkInd In ListParkInd
-      '   If ItemParkInd.Ind <> 0 And ItemParkInd.Ind <> 999 And ItemParkInd.nPartInPark > 0 Then
-      '      Try
-      '         Dim sNewFile As String = sNewFileName & ItemParkInd.Ind.ToString & Extension
-      '         If MainWindow.m_bShowSVGParkInd Then
-      '            WriteMyXML(sNewFile, ItemParkInd.LocalMyCanvas)
-      '         Else
-      '            If File.Exists(sNewFile) Then
-      '               File.Delete(sNewFile)
-      '            End If
-      '            File.Copy(If(Extension = ".svg", ItemParkInd.Svg, ItemParkInd.Img), sNewFile)
-      '         End If
-      '      Catch ex As Exception
-      '         EgtOutLog("Copia immagine " & If(Extension = ".svg", ItemParkInd.Svg, ItemParkInd.Img) & " di ParkInd non roiscita")
-      '      End Try
-      '   End If
-      'Next
-      m_MainWindow.m_CadCutPageUC.m_NestPage.ReloadListParkInd()
+      SelParkIndWD.CopyImgSvg(sNewFileName, ListParkInd)
 
+      m_MainWindow.m_CadCutPageUC.m_NestPage.ReloadListParkInd()
 
       ' Gestione stato FastGrid
       m_MainWindow.m_CadCutPageUC.m_FastGridSlabManager.OnPostNewProject()

RawPhoto/OtherRefTabWD.xaml

@@ -4,7 +4,7 @@
    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">
+   Title="ModifStartEndWD" Height="350" Width="320" ShowInTaskbar="False">
 
     <!--Definizione della pagina di scelta del nome con cui salvare il progetto-->
     <Border Style="{DynamicResource OmagCut_Border}">
@@ -28,14 +28,30 @@
                 <RowDefinition Height="0.2*"/>
                 <RowDefinition Height="1*"/>
                 <RowDefinition Height="0.2*"/>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="0.2*"/>
+                <RowDefinition Height="0.2*"/>
                 <RowDefinition Height="1.5*"/>
                 <RowDefinition Height="0.2*"/>
             </Grid.RowDefinitions>
 
-            <TextBlock Name="RefRawTxbl" Grid.Column="1" Grid.Row="1"
+            <TextBlock Name="SelRefTxbl" Grid.Column="1" Grid.Row="1"
             Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
-            
-            <ComboBox Name="RefTabModeCmBx" Grid.Column="2" Grid.Row="1" Style="{StaticResource OmagCut_ComboBox}" 
+
+            <ComboBox Name="RefTabCmBx" Grid.Column="2" Grid.Row="1" Style="{StaticResource OmagCut_ComboBox}" 
+                MaxDropDownHeight="300" Margin="0,0,0,0">
+                <ComboBox.ItemTemplate>
+                    <DataTemplate>
+                        <TextBlock Text="{Binding Name}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                    </DataTemplate>
+                </ComboBox.ItemTemplate>
+            </ComboBox>
+
+
+            <TextBlock Name="RefRawTxbl" Grid.Column="1" Grid.Row="3"
+            Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+
+            <ComboBox Name="RefTabOrientationCmBx" Grid.Column="2" Grid.Row="3" Style="{StaticResource OmagCut_ComboBox}" 
                MaxDropDownHeight="300" Margin="0,0,0,0">
                 <ComboBox.ItemTemplate>
                     <DataTemplate>
@@ -44,17 +60,17 @@
                 </ComboBox.ItemTemplate>
             </ComboBox>
 
-            <TextBlock Name="RefTabXTxbl" Grid.Column="1" Grid.Row="3"
+            <TextBlock Name="RefTabXTxbl" Grid.Column="1" Grid.Row="5"
             Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
-            <EgtWPFLib:EgtTextBox Name="RefTabXTxBx" Grid.Column="2" Grid.Row="3"
+            <EgtWPFLib:EgtTextBox Name="RefTabXTxBx" Grid.Column="2" Grid.Row="5"
             Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-            <TextBlock Name="RefTabYTxbl" Grid.Column="1" Grid.Row="5"
+            <TextBlock Name="RefTabYTxbl" Grid.Column="1" Grid.Row="7"
             Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
-            <EgtWPFLib:EgtTextBox Name="RefTabYTxBx" Grid.Column="2" Grid.Row="5"
+            <EgtWPFLib:EgtTextBox Name="RefTabYTxBx" Grid.Column="2" Grid.Row="7"
             Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-            <Grid Name="ButtonsGrid" Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="7" Grid.RowSpan="1">
+            <Grid Name="ButtonsGrid" Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="10" Grid.RowSpan="1">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="0.5*"/>
                     <ColumnDefinition Width="1*"/>

RawPhoto/OtherRefTabWD.xaml.vb

@@ -1,4 +1,5 @@
 Imports System.IO
+Imports System.Reflection
 Imports EgtUILib
 Imports EgtWPFLib
 
@@ -12,9 +13,14 @@ Public Class OtherRefTabWD
    Private m_dPrevOffsetX As Double = 0
    Private m_dPrevOffsetY As Double = 0
 
+   Private m_bModifX As Boolean = False
+   Private m_bModifY As Boolean = False
+
    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)
+   Private m_SelRef As Integer = 0
+
+   Sub New(Owner As Window, PosX As String, PosY As String, OffsetX As Double, OffsetY As Double, OtherRefMode As Integer, SelRef As Integer)
       Me.Owner = Owner
       ' La chiamata è richiesta dalla finestra di progettazione.
       InitializeComponent()
@@ -25,6 +31,7 @@ Public Class OtherRefTabWD
       m_dPrevOffsetX = OffsetX
       m_dPrevOffsetY = OffsetY
       m_SelIndex = OtherRefMode
+      m_SelRef = SelRef
    End Sub
 
    Private Sub OtherRrefTabWD_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
@@ -36,8 +43,11 @@ Public Class OtherRefTabWD
       RefRawTxbl.Text = "Raw reference"
       RefTabXTxbl.Text = "Position X"
       RefTabYTxbl.Text = "Position Y"
-      RefTabModeCmBx.ItemsSource = m_RawPartPage.m_OtherRefTabList
-      RefTabModeCmBx.SelectedIndex = m_RawPartPage.m_OtherRefTabPos
+      SelRefTxbl.Text = "Sel reference"
+      RefTabOrientationCmBx.ItemsSource = m_RawPartPage.m_OtherRefTabOrientationList
+      RefTabOrientationCmBx.SelectedIndex = m_RawPartPage.m_OtherRefTabPos
+      RefTabCmBx.ItemsSource = m_RawPartPage.m_OtherRefTabList
+      RefTabCmBx.SelectedIndex = m_RawPartPage.m_CurrRefTab
    End Sub
 
    Private Sub OtherRrefTabWD_Load(sender As Object, e As EventArgs) Handles Me.Loaded
@@ -45,9 +55,44 @@ Public Class OtherRefTabWD
       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())
+   Private Sub RefTabCmBx_SelectionChanged(sender As Object, e As SelectionChangedEventArgs) Handles RefTabCmBx.SelectionChanged
+      If m_bModifX Or m_bModifY Then
+         Dim SaveCurrToolWnd = New EgtMsgBox(m_MainWindow, "", EgtMsg(MSG_EGTMSGBOX + 2), EgtMsgBox.Buttons.YES_NO_CANCEL, EgtMsgBox.Icons.NULL)
+         Select Case SaveCurrToolWnd.m_nPressedBtn
+            Case 0    ' Annulla
+               ' annullo l'operazione di cambio indice
+               RefTabCmBx.SelectedIndex = m_RawPartPage.m_CurrRefTab
+               Return
+            Case 1    ' Si
+               ' salvo i valori modificati
+               UpdateCurrOffset()
+               ' recupero l'oggetto precedentemente selezionato e lo aggiorno (per evitare di rileggere il file ini)
+               Dim temp_RefTab As ReferenceTable = m_RawPartPage.m_OtherRefTabList(m_RawPartPage.m_CurrRefTab)
+               temp_RefTab.dOffsetX = m_RawPartPage.m_OtherRefTabX
+               temp_RefTab.dOffsetY = m_RawPartPage.m_OtherRefTabY
+               temp_RefTab.nPos = m_RawPartPage.m_OtherRefTabPos
+            Case 2    ' No
+               ' Non salvo e vado oltre
+               m_bModifX = False
+               m_bModifY = False
+         End Select
+      End If
+      ' recupero l'oggetto selezionato
+      Dim local_RefTab As ReferenceTable = m_RawPartPage.m_OtherRefTabList(RefTabCmBx.SelectedIndex)
+      m_RawPartPage.m_CurrRefTab = RefTabCmBx.SelectedIndex
+      ' Imposto gli Offset del riferimento selezionato
+      RefTabXTxBx.Text = LenToString(local_RefTab.dOffsetX, 2)
+      m_RawPartPage.m_OtherRefTabX = local_RefTab.dOffsetX
+      RefTabYTxBx.Text = LenToString(local_RefTab.dOffsetY, 2)
+      m_RawPartPage.m_OtherRefTabY = local_RefTab.dOffsetY
+      ' Aggiorno la posizine del grezzo
+      m_RawPartPage.RefTabModeChange()
+      m_bModifX = False
+      m_bModifY = False
+   End Sub
+
+   Private Sub RefTabOrientationCmBx_SelectionChanged(sender As Object, e As SelectionChangedEventArgs) Handles RefTabOrientationCmBx.SelectionChanged
+      m_RawPartPage.m_OtherRefTabPos = RefTabOrientationCmBx.SelectedIndex
       m_RawPartPage.RefTabModeChange()
    End Sub
 
@@ -66,6 +111,7 @@ Public Class OtherRefTabWD
             ' errore, posizione fuori dalla tavola
          End If
          m_RawPartPage.m_OtherRefTabX = dX
+         m_bModifX = True
          m_RawPartPage.RefTabModeChange()
       End If
    End Sub
@@ -85,24 +131,99 @@ Public Class OtherRefTabWD
             ' errore, posizione fuori dalla tavola
          End If
          m_RawPartPage.m_OtherRefTabY = dY
+         m_bModifY = True
          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())
+      WritePrivateProfileString(S_RAWPART, K_CURRENTREFTAB, m_RawPartPage.m_CurrRefTab.ToString, m_MainWindow.GetIniFile())
+      ' Aggiorno il valore del riferimento correntemente modificato
+      UpdateCurrOffset()
+      m_RawPartPage.RefTabModeChange()
       Me.Close()
    End Sub
 
+   Private Sub UpdateCurrOffset()
+      Dim sKeyMsg As String = K_REFTAB & m_RawPartPage.m_CurrRefTab.ToString
+      Dim sValMsg As String = DoubleToString(m_RawPartPage.m_OtherRefTabX, 2) & "," & DoubleToString(m_RawPartPage.m_OtherRefTabY, 2) & "," & m_RawPartPage.m_OtherRefTabPos.ToString
+      WritePrivateProfileString(S_RAWPART, sKeyMsg, sValMsg, m_MainWindow.GetIniFile())
+   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
+      ' Recupero la prima selezione eseguita
+      m_RawPartPage.m_CurrRefTab = m_SelRef
+      Dim temp_RefTab As ReferenceTable = m_RawPartPage.m_OtherRefTabList(m_RawPartPage.m_CurrRefTab)
+      ' aggiorno i valori
+      m_RawPartPage.m_OtherRefTabX = temp_RefTab.dOffsetX
+      m_RawPartPage.m_OtherRefTabY = temp_RefTab.dOffsetY
+      m_RawPartPage.m_OtherRefTabPos = temp_RefTab.nPos
       m_RawPartPage.RefTabModeChange()
    End Sub
 
 End Class
+
+Public Class ReferenceTable
+
+   Private m_dOffsetX As Double
+   Private m_dOffsetY As Double
+   Private m_nPos As RawPartPageUC.OTHERREFMODE = RawPartPageUC.OTHERREFMODE.BL
+   Private m_nIndexRef As Integer = 0
+
+   Public Property dOffsetX As Double
+      Get
+         Return m_dOffsetX
+      End Get
+      Set(value As Double)
+         m_dOffsetX = value
+      End Set
+   End Property
+
+   Public Property dOffsetY As Double
+      Get
+         Return m_dOffsetY
+      End Get
+      Set(value As Double)
+         m_dOffsetY = value
+      End Set
+   End Property
+
+   Public Property nPos As Integer
+      Get
+         Return m_nPos
+      End Get
+      Set(value As Integer)
+         m_nPos = value
+      End Set
+   End Property
+
+   Public Property nIndexRef As Integer
+      Get
+         Return m_nIndexRef
+      End Get
+      Set(value As Integer)
+         m_nIndexRef = value
+      End Set
+   End Property
+
+   Public ReadOnly Property Name As String
+      Get
+         Return "REF_" & m_nIndexRef.ToString()
+      End Get
+   End Property
+
+   Public ReadOnly bOk As Boolean = True
+
+   Sub New(sStringFromIni As String, IndexRef As Integer)
+      Dim sItems() As String = sStringFromIni.Split(","c)
+      If sItems.Count = 3 Then
+         bOk = bOk And StringToLen(sItems(0), m_dOffsetX)
+         bOk = bOk And StringToLen(sItems(1), m_dOffsetY)
+         bOk = bOk And StringToInt(sItems(2), m_nPos)
+         m_nIndexRef = IndexRef
+      Else
+         bOk = False
+      End If
+   End Sub
+
+End Class

RawPhoto/RawPartPageUC.xaml.vb

@@ -1,4 +1,5 @@
 Imports System.IO
+Imports System.Reflection
 Imports EgtUILib
 Imports EgtWPFLib
 
@@ -92,10 +93,12 @@ Public Class RawPartPageUC
    ' 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
+   Public m_OtherRefTabX As Double = 0                     ' offset riferimento corrente
+   Public m_OtherRefTabY As Double = 0                     ' offset riferimento corrente
+   Public m_OtherRefTabPos As Integer = 0                  ' poisizione riferimento (Bottom-Left, ..)
+   Public m_OtherRefTabOrientationList(3) As String        ' oriemtazione riferiemnto
+   Public m_OtherRefTabList As New List(Of ReferenceTable) ' lista dei riferiemneti configurata nel programma
+   Public m_CurrRefTab As Integer = 1                      ' inidice del riferimento della lista corrente
    Private m_nOtherRefTabLay As Integer = GDB_ID.NULL
    Private m_OtherRefTabPoint As Point3d
 
@@ -126,7 +129,7 @@ Public Class RawPartPageUC
       FROM_SAW = 7
    End Enum
 
-   Private Enum OTHERREFMODE As Integer
+   Friend Enum OTHERREFMODE As Integer
       BL = 0
       BR = 1
       TR = 2
@@ -182,10 +185,10 @@ Public Class RawPartPageUC
       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"
+      m_OtherRefTabOrientationList(OTHERREFMODE.BL) = "Bottom left"
+      m_OtherRefTabOrientationList(OTHERREFMODE.BR) = "Bottom right"
+      m_OtherRefTabOrientationList(OTHERREFMODE.TR) = "Top right"
+      m_OtherRefTabOrientationList(OTHERREFMODE.TL) = "Top left"
 
       ' lista per selezione RawModeDamaged
       m_RawModeDamagedList(0) = EgtMsg(MSG_RAWPARTPAGEUC + 2)    'Per Punti
@@ -400,9 +403,36 @@ Public Class RawPartPageUC
          OtherRefTabBtn.Visibility = Visibility.Visible
       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())
+      ' Recupero il riferimento attivo
+      m_CurrRefTab = GetPrivateProfileInt(S_RAWPART, K_CURRENTREFTAB, 0, m_MainWindow.GetIniFile())
+      ' carico l'elenco dei riferimenti da usare
+      LoadRefTabList()
+      ' Solo se non esiste una lista allora leggo i valori
+      If m_OtherRefTabList.Count = 0 Then
+         ' Versione precedente 2.7c# DEPRECABILE
+         Dim Off_X As Double = -1000
+         Dim Off_Y As Double = -1000
+         Dim Pos_Ind As Integer = -1
+         Off_X = GetPrivateProfileDouble(S_RAWPART, K_OTHERREFTABX, -1000, m_MainWindow.GetIniFile())
+         Off_Y = GetPrivateProfileDouble(S_RAWPART, K_OTHERREFTABY, -1000, m_MainWindow.GetIniFile())
+         Pos_Ind = GetPrivateProfileInt(S_RAWPART, K_OTHERREFTABPOS, -1, m_MainWindow.GetIniFile())
+         If Off_X <> -1000 And Off_Y <> -1000 And Pos_Ind <> -1 Then
+            Dim Local_Text As String = DoubleToString(Off_X, 2) & "," & DoubleToString(Off_Y, 2) & "," & Pos_Ind.ToString
+            Dim local_NewRef As New ReferenceTable(Local_Text, 0)
+            If local_NewRef.bOk Then
+               m_OtherRefTabList.Add(local_NewRef)
+               m_CurrRefTab = 0
+               ' Carico i valori
+               m_OtherRefTabX = m_OtherRefTabList(m_CurrRefTab).dOffsetX
+               m_OtherRefTabY = m_OtherRefTabList(m_CurrRefTab).dOffsetY
+               m_OtherRefTabPos = m_OtherRefTabList(m_CurrRefTab).nPos
+               ' Creo la nuova configurazione da usare
+               Dim sKeyMsg As String = K_REFTAB & m_CurrRefTab.ToString
+               Dim sValMsg As String = DoubleToString(m_OtherRefTabX, 2) & "," & DoubleToString(m_OtherRefTabY, 2) & "," & m_OtherRefTabPos.ToString
+               WritePrivateProfileString(S_RAWPART, sKeyMsg, sValMsg, m_MainWindow.GetIniFile())
+            End If
+         End If
+      End If
       ' RefTabPosCmbx.SelectedIndex = m_OtherRefTabPos
       OtherRefTabChBx.IsChecked = m_bOtherRefTab
       ' se riferimento tavola differente da quello atteso
@@ -421,6 +451,29 @@ Public Class RawPartPageUC
       ' EgtDraw()
    End Sub
 
+   Private Sub LoadRefTabList()
+      m_OtherRefTabList.Clear()
+      Dim sRefTab As String = String.Empty
+      Dim nIndex As Integer = 0
+      While GetPrivateProfileString(S_RAWPART, K_REFTAB & nIndex.ToString, "", sRefTab, m_MainWindow.GetIniFile()) > 0
+         Dim local_NewRef As New ReferenceTable(sRefTab, nIndex)
+         If local_NewRef.bOk Then
+            m_OtherRefTabList.Add(local_NewRef)
+            nIndex += 1
+         Else
+            EgtOutLog("ERROR in reading RefTab" & nIndex.ToString & " is not correctly defined in file OmagCUT.ini, any other reference will not loaded")
+            Exit While
+         End If
+      End While
+      ' Assegno il riferimento corrente
+      If m_CurrRefTab < m_OtherRefTabList.Count Then
+         m_OtherRefTabX = m_OtherRefTabList(m_CurrRefTab).dOffsetX
+         m_OtherRefTabY = m_OtherRefTabList(m_CurrRefTab).dOffsetY
+         m_OtherRefTabPos = m_OtherRefTabList(m_CurrRefTab).nPos
+      End If
+
+   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
@@ -809,6 +862,13 @@ Public Class RawPartPageUC
       If m_bProbingOn Then Return
       ' reimposto il comando OutLine
       OutlineBtn_Click(Nothing, Nothing)
+      ' Nasocndo eventuali pareti 
+      If m_bExistsSafetyZone Then
+         ' gestisco la visualizzazione delle pareti che delimitano l'area sicura
+         EgtSetStatus(m_nIdMinRedX, GDB_ST.OFF)
+         EgtSetStatus(m_nIdMinRedY, GDB_ST.OFF)
+      End If
+
       ' Se confermata uscita
       If ExitRawPart(True) Then
          m_MainWindow.m_CurrentProjectPageUC.CurrentProjectPageGrid.Children.Remove(Me)
@@ -2362,8 +2422,10 @@ Public Class RawPartPageUC
    End Sub
 
    Private Sub OtherRefTabBtn_Click(sender As Object, e As EventArgs) Handles OtherRefTabBtn.Click
+      ' Aggiorno la lista dei riferimenti
+      LoadRefTabList()
       ' 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)
+      Dim OthWD As New OtherRefTabWD(m_MainWindow, LenToString(m_OtherRefTabX, 2), LenToString(m_OtherRefTabY, 2), m_RawOffsX, m_RawOffsY, m_OtherRefTabPos, m_CurrRefTab)
       OthWD.ShowDialog()
    End Sub
 

Simulation/SimulationPageUC.xaml.vb

@@ -206,6 +206,12 @@ Public Class SimulationPageUC
       Else
          PlayPauseImage.Source = New System.Windows.Media.Imaging.BitmapImage(New Uri("/Resources/NewIcons/Play.png", UriKind.Relative))
       End If
+
+      Dim nIdBase As Integer = EgtGetBaseId("Base")
+      Dim m_nIdMinRedX = EgtGetFirstNameInGroup(nIdBase, "MinRedX")
+      If m_nIdMinRedX <> GDB_ID.NULL Then EgtSetStatus(m_nIdMinRedX, GDB_ST.OFF)
+      Dim m_nIdMinRedY = EgtGetFirstNameInGroup(nIdBase, "MinRedY")
+      If m_nIdMinRedY <> GDB_ID.NULL Then EgtSetStatus(m_nIdMinRedY, GDB_ST.OFF)
    End Sub
 
    Private Sub StepBtn_Click(sender As Object, e As RoutedEventArgs) Handles StepBtn.Click