Aggiunto commento nuova libreria

- ricompilazione per nuova versione (nelle dll corretto problema rallentamenti iniziali e finali non più eseguiti).

CAM/CamAuto.vb

@@ -101,6 +101,74 @@ Friend Module CamAuto
       Return True
    End Function
 
+   Friend Function ResetAllSplitCurv() As Boolean
+      Dim bOk As Boolean = True
+      Dim nIdPart As Integer = EgtGetFirstPart()
+      While nIdPart <> GDB_ID.NULL
+         ' elimino il layer dei flag di separazione "AUX_SPLIT_WJ"
+         Dim IdAuxLayer As Integer = EgtGetFirstNameInGroup(nIdPart, INFO_AUX_SPLIT_WJ)
+         EgtErase(IdAuxLayer)
+         ' accedo al Layer OutLoop
+         Dim nIdLayerOutLoop As Integer = EgtGetFirstNameInGroup(nIdPart, NAME_OUTLOOP)
+         Dim nIdMy As Integer = EgtGetFirstInGroup(nIdLayerOutLoop)
+         While nIdMy <> GDB_ID.NULL
+            EgtRemoveInfo(nIdMy, INFO_JOINENTITY)
+            nIdMy = EgtGetNext(nIdMy)
+         End While
+         nIdPart = EgtGetNextPart(nIdPart)
+      End While
+      Dim nRawId As Integer = CamAuto.GetCurrentRaw()
+      nIdPart = EgtGetFirstPartInRawPart(nRawId)
+      While nIdPart <> GDB_ID.NULL
+         ' elimino il layer dei flag di separazione "AUX_SPLIT_WJ"
+         Dim IdAuxLayer As Integer = EgtGetFirstNameInGroup(nIdPart, INFO_AUX_SPLIT_WJ)
+         EgtErase(IdAuxLayer)
+         ' accedo al Layer OutLoop
+         Dim nIdLayerOutLoop As Integer = EgtGetFirstNameInGroup(nIdPart, NAME_OUTLOOP)
+         Dim nIdMy As Integer = EgtGetFirstInGroup(nIdLayerOutLoop)
+         While nIdMy <> GDB_ID.NULL
+            EgtRemoveInfo(nIdMy, INFO_JOINENTITY)
+            nIdMy = EgtGetNext(nIdMy)
+         End While
+         nIdPart = EgtGetNextPartInRawPart(nIdPart)
+      End While
+      Return bOk
+   End Function
+
+   Friend Function ResetAllStartCurv() As Boolean
+      Dim bOk As Boolean = True
+      Dim nIdPart As Integer = EgtGetFirstPart()
+      While nIdPart <> GDB_ID.NULL
+         ' accedo al Layer OutLoop
+         Dim nIdLayerOutLoop As Integer = EgtGetFirstNameInGroup(nIdPart, NAME_OUTLOOP)
+         EgtRemoveInfo(nIdLayerOutLoop, INFO_START)
+         nIdPart = EgtGetNextPart(nIdPart)
+      End While
+      Dim nRawId As Integer = CamAuto.GetCurrentRaw()
+      nIdPart = EgtGetFirstPartInRawPart(nRawId)
+      While nIdPart <> GDB_ID.NULL
+         ' accedo al Layer OutLoop
+         Dim nIdLayerOutLoop As Integer = EgtGetFirstNameInGroup(nIdPart, NAME_OUTLOOP)
+         EgtRemoveInfo(nIdLayerOutLoop, INFO_START)
+         nIdPart = EgtGetNextPartInRawPart(nIdPart)
+      End While
+      Return bOk
+   End Function
+
+   ' verifico che il contorno passato non sia stato separato
+   Friend Function VerifyOutLoopIsClosed(nIdLayerOutLoop As Integer)
+      Dim nIdMy As Integer = EgtGetFirstInGroup(nIdLayerOutLoop)
+      While nIdMy <> GDB_ID.NULL
+         Dim nValInfo As Integer = 1
+         If EgtGetInfo(nIdMy, INFO_JOINENTITY, nValInfo) Then
+            If nValInfo = 0 Then Return False
+         End If
+         EgtRemoveInfo(nIdMy, INFO_JOINENTITY)
+         nIdMy = EgtGetNext(nIdMy)
+      End While
+      Return True
+   End Function
+
    Friend Function RemoveFinalEmptyPhases() As Boolean
       Dim nOpeId As Integer = EgtGetLastOperation()
       While nOpeId <> GDB_ID.NULL

CadCuts/CSVPage.xaml.vb

@@ -189,6 +189,7 @@ Public Class CSVPage
       Dim Index2 As Integer = 0
       For Index1 = 0 To m_CsvPartList.Count - 1
          Dim sFileName As String = m_CsvPartList(Index1).m_sPath
+         sFileName = Path.GetFileNameWithoutExtension(sFileName).ToUpper.Trim()
          Dim bNewFile As Boolean = True
          For Index2 = 0 To LocalList.Count - 1
             If sFileName = LocalList(Index2) Then
@@ -308,7 +309,7 @@ Public Class CSVPage
       Dim LocalPartList As New List(Of CsvPart)
 
       ' Lettura del file
-      If ReadCsvPartList(sFile, m_sCsvPath, m_CsvPartList) Then
+      If ReadCsvPartList(sFile, m_sCsvPath, LocalPartList) Then
          ' Creo un nuovo file che ospitarà il merge de
          Dim sNewMergeFile As String = Path.GetDirectoryName(m_sCsvPath) & "\Merge.csv"
          m_sCsvPath = sNewMergeFile
@@ -322,7 +323,6 @@ Public Class CSVPage
       Next
    End Sub
 
-
    Private Sub ShowTreeView()
       ' Path del file Csv
       Dim TempPath As New Text.StringBuilder(260)
@@ -345,6 +345,7 @@ Public Class CSVPage
             dCurrTh = CurrPart.m_dTh
             sCurrPath = CurrPart.m_sPath
          ElseIf String.Compare(sCurrMat, CurrPart.m_sMaterial, True) <> 0 Or
+                String.Compare(sCurrPath, CurrPart.m_sPath, True) <> 0 Or
                 Math.Abs(dCurrTh - CurrPart.m_dTh) > 10 * EPS_SMALL Then
             If m_bFull Then
                PartCathegory.Name = If(String.IsNullOrWhiteSpace(sCurrMat), "***", sCurrMat) &
@@ -492,6 +493,7 @@ Public Class CSVPage
    End Function
 
    Private Sub InsertBtn_Click(sender As Object, e As RoutedEventArgs) Handles InsertBtn.Click
+      'm_CurrProjPage.ClearMessage()
       ' Recupero lo spessore della lastra corrente
       Dim dRawHeight As Double = GetRawHeight()
       If dRawHeight < EPS_SMALL Then Return
@@ -502,20 +504,17 @@ Public Class CSVPage
       End If
       ' Recupero la tolleranza sullo spessore
       Dim dToler As Double = GetPrivateProfileDouble(S_CSV, K_THICKTOLERANCE, 100 * EPS_SMALL, m_MainWindow.GetIniFile())
-      dToler = Math.Max( dToler, 100 * EPS_SMALL)
+      dToler = Math.Max(dToler, 100 * EPS_SMALL)
       ' Creo la lista dei pezzi inseribili nella lastra corrente
       Dim InsPartList As New List(Of CsvPart)
       For i As Integer = 1 To m_CsvPartList.Count()
          Dim CurrPart As CsvPart = m_CsvPartList(i - 1)
          If CurrPart.m_bActive And
-            (Math.Abs(CurrPart.m_dTh - dRawHeight) < dToler Or
-              CurrPart.m_dTh < EPS_SMALL) And
-            (String.IsNullOrWhiteSpace(CurrPart.m_sMaterial) Or
-             String.IsNullOrWhiteSpace(sCurrMat) Or
-             CurrPart.m_sMaterial = "***" Or
-             sCurrMat = "***" Or
-             String.Compare(CurrPart.m_sMaterial, sCurrMat, True) = 0) Then
+            (Math.Abs(CurrPart.m_dTh - dRawHeight) < dToler Or CurrPart.m_dTh < EPS_SMALL) And
+            (String.IsNullOrWhiteSpace(CurrPart.m_sMaterial) Or String.IsNullOrWhiteSpace(sCurrMat) Or CurrPart.m_sMaterial = "***" Or sCurrMat = "***" Or String.Compare(CurrPart.m_sMaterial, sCurrMat, True) = 0) Then
             InsPartList.Add(CurrPart)
+            'ElseIf CurrPart.m_bActive Then
+            '   m_CurrProjPage.SetWarningMessage("Grezzo non compatibile")
          End If
       Next
       ' Lancio l'inserimento dei pezzi
@@ -627,7 +626,7 @@ Public Class CSVPage
          EgtAdjustFlatPart(nId)
          ' Se Csv completo, aggiungo info su CSV di origine
          If m_bFull Then
-            EgtSetInfo(nId, INFO_CSV_PATH, m_sCsvPath)
+            EgtSetInfo(nId, INFO_CSV_PATH, CurrPart.m_sPath)
             EgtSetInfo(nId, INFO_CSV_PART, CurrPart.m_sName)
             EgtSetInfo(nId, INFO_CSV_ORD, CurrPart.m_sOrd)
             EgtSetInfo(nId, INFO_CSV_DIST, CurrPart.m_sDist)
@@ -641,6 +640,11 @@ Public Class CSVPage
 
          ' assegno l'identificatico del pezzo, se esiste
          If Not String.IsNullOrEmpty(CurrPart.m_sRefGuid) Then
+            ' GuidCode dovrebbe contenere 36 caratteri, il precode 5: tot = 41
+            If CurrPart.m_sRefGuid.Count <= 36 Then
+               Dim sPreGuid As String = CreatePreGuidCode(CurrPart.m_nId)
+               CurrPart.m_sRefGuid = sPreGuid & CurrPart.m_sRefGuid
+            End If
             EgtSetInfo(CurrPart.m_nId, INFO_REFGROUP, CurrPart.m_sRefGuid)
          End If
          Dim nRegLayId As Integer = EgtGetFirstNameInGroup(CurrPart.m_nId, NAME_REGION)
@@ -760,11 +764,11 @@ Public Class CSVPage
       Dim sName As String = String.Empty
       EgtGetInfo(nId, INFO_CSV_PART, sName)
       ' Verifico che il pezzo appartenga a questo Csv
-      If String.Compare(sCsvPath, m_sCsvPath, True) = 0 Then
+      If SearchCurrCSV(sCsvPath) Then
          ' Cerco il pezzo nella lista dei pezzi
          For i As Integer = 1 To m_CsvPartList.Count()
             Dim CurrPart As CsvPart = m_CsvPartList(i - 1)
-            If String.Compare(sName, CurrPart.m_sName, True) = 0 Then
+            If String.Compare(sName, CurrPart.m_sName, True) = 0 And String.Compare(sCsvPath, CurrPart.m_sPath, True) = 0 Then
                ' Se nel grezzo
                If EgtGetParent(nId) = m_nRawId Then
                   ' Rimuovo le lavorazioni
@@ -772,10 +776,13 @@ Public Class CSVPage
                   ' Rimuovo dal grezzo
                   EgtRemovePartFromRawPart(nId)
                End If
+               ' recupero il Guid del pezzo corrente (potrebbe essere stato modificato a causa di rotazioni quando il pezzo è passato in parcheggio)
+               Dim sCurrRefGuid As String = String.Empty
+               EgtGetInfo(nId, INFO_REFGROUP, sCurrRefGuid)
                ' Cancello il pezzo
                EgtErase(nId)
                ' aggiorno il layer che indica il numero di pezzi in parcheggio (se sRefGroup<>"")
-               m_MainWindow.m_CadCutPageUC.m_NestPage.CountPartInFamily(CurrPart.m_sRefGuid)
+               m_MainWindow.m_CadCutPageUC.m_NestPage.CountPartInFamily(sCurrRefGuid)
                ' Aggiorno il contatore
                CurrPart.m_nToNest += 1
                ' ricreo la lista delle famiglie di pezzi presenti in parcheggio
@@ -791,6 +798,16 @@ Public Class CSVPage
       Return False
    End Function
 
+   Private Function SearchCurrCSV(ByVal sCSVFile As String) As Boolean
+      For i As Integer = 1 To m_CsvPartList.Count()
+         Dim CurrPart As CsvPart = m_CsvPartList(i - 1)
+         If String.Compare(sCSVFile, CurrPart.m_sPath, True) = 0 Then
+            Return True
+         End If
+      Next
+      Return False
+   End Function
+
    Friend Sub SaveCsvPartList()
       ' Se Csv semplificato non va salvata
       If Not m_bFull Then Return

CadCuts/CadCutPageUC.xaml.vb

@@ -107,6 +107,9 @@ Public Class CadCutPageUC
 
    Private Sub PhotoBtn_Click(sender As Object, e As RoutedEventArgs) Handles PhotoBtn.Click
       m_MainWindow.TestOff()
+      m_MainWindow.DragRettangleOff()
+      m_MainWindow.SplitCurvWJOff()
+      m_MainWindow.StartCurvWJOff()
       m_CurrProjPage.m_SceneButtons.MeasureBtn.IsChecked = False
       EgtSetCurrentContext(m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene.GetCtx())
       ' Se macchina fotografica collegata, faccio una foto
@@ -140,6 +143,9 @@ Public Class CadCutPageUC
 
    Private Sub RawPartBtn_Click(sender As Object, e As RoutedEventArgs) Handles RawPartBtn.Click
       m_MainWindow.TestOff()
+      m_MainWindow.DragRettangleOff()
+      m_MainWindow.SplitCurvWJOff()
+      m_MainWindow.StartCurvWJOff()
       m_CurrProjPage.CurrProjGrid.Visibility = Windows.Visibility.Hidden
       m_CurrProjPage.CurrentProjectPageGrid.Children.Remove(Me)
       m_CurrProjPage.CurrentProjectPageGrid.Children.Add(m_MainWindow.m_RawPartPage)
@@ -165,6 +171,9 @@ Public Class CadCutPageUC
 
    Private Sub DrawBtn_Click(sender As Object, e As RoutedEventArgs) Handles DrawBtn.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
@@ -172,6 +181,9 @@ Public Class CadCutPageUC
 
    Private Sub ImportBtn_Click(sender As Object, e As RoutedEventArgs) Handles ImportBtn.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_ImportPageUC)
       m_MainWindow.m_ActivePage = MainWindow.Pages.Import
@@ -193,6 +205,9 @@ Public Class CadCutPageUC
    End Sub
 
    Private Sub SplitBtn_Click(sender As Object, e As RoutedEventArgs) Handles SplitBtn.Click
+      m_MainWindow.DragRettangleOff()
+      m_MainWindow.SplitCurvWJOff()
+      m_MainWindow.StartCurvWJOff()
       m_CurrProjPage.m_SceneButtons.MeasureBtn.IsChecked = False
       EgtDeselectObj(m_NestPage.m_CurrSelectedCurv)
       m_ProjectMgr.TestBtn.IsChecked = False
@@ -206,9 +221,9 @@ Public Class CadCutPageUC
                SplitImage.Source = New System.Windows.Media.Imaging.BitmapImage(New Uri("/Resources/NewIcons/Nest.png", UriKind.Relative))
             End If
             If m_CadCutMode = CadCutModes.Nest Then
-                  CadCutPageGrid.Children.Remove(m_NestPage)
-               Else
-                  CadCutPageGrid.Children.Remove(m_FastGridSlabManager)
+               CadCutPageGrid.Children.Remove(m_NestPage)
+            Else
+               CadCutPageGrid.Children.Remove(m_FastGridSlabManager)
             End If
             CadCutPageGrid.Children.Add(m_SplitPage)
             m_CadCutMode = CadCutModes.Split

CadCuts/MoveRawPartPage.xaml.vb

@@ -28,6 +28,8 @@ Public Class MoveRawPartPage
    Private m_RawMoveDataList As New List(Of RawMoveData)    ' dati di movimento
    Private m_bRawWithCups As Boolean = False                ' flag per pezzo corrente con ventose
 
+   Private m_CurrRawOnVacuum As Integer = GDB_ID.NULL
+
    Private Sub MoveRawPartPage_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
       ' Assegno testi
       RemovePartBtn.Content = EgtMsg(MSG_MOVERAWPAGEUC + 1)  'Rimuovi
@@ -230,16 +232,48 @@ Public Class MoveRawPartPage
          If nParentId = nRawGroupId Then
             Dim nStat As Integer = GDB_ST.ON_
             EgtGetStatus(nId, nStat)
+            ' Se il pezzo corrente è selezionato allora lo disattivo -> deposito del pezzo
             If nStat = GDB_ST.SEL Then
                EgtSetStatus(nId, GDB_ST.ON_)
-               ' Se con ventose, le nascondo
-               If Not m_bByHand Then EgtSetStatus(GetVacuumId(), GDB_ST.OFF)
+               ' prima di rilasciare il pezzo verifico che non vada in collisione con altri pezzi sulla tavola
+               If VerifyCollisionWithOtherRawPart(nId) Then
+                  ' mantengo la selezione del pezzo
+                  EgtSetStatus(nId, GDB_ST.SEL)
+                  m_CurrProjPage.SetErrorMessage("Collisione pezzi")
+               Else
+                  ' Se con ventose, le nascondo
+                  If Not m_bByHand Then EgtSetStatus(GetVacuumId(), GDB_ST.OFF)
+               End If
             Else
+
+               ' verifico che il pezzo precedente possa essere depositato correttamente
+               If VerifyCollisionWithOtherRawPart(m_CurrRawOnVacuum) Then
+                  ' mantengo la selezione del pezzo
+                  EgtSetStatus(m_CurrRawOnVacuum, GDB_ST.SEL)
+                  m_CurrProjPage.SetErrorMessage("Collisione pezzi")
+                  EgtDraw()
+                  ' esco dal ciclo, prima devo depositare correttamente il pezzo
+                  Exit While
+               End If
+               ' salvo l'indice del pezzo correntemente attaccato alle ventose
+               m_CurrRawOnVacuum = nId
+
+               ' Deseleziono tutto e abilito la selezione del pezzo corrente
                EgtDeselectAll()
                EgtSetStatus(nId, GDB_ST.SEL)
                ' Se con ventose, le posiziono sul grezzo
                If Not m_bByHand Then
                   Dim rmData As New RawMoveData
+                  ' inizializzo i dati del grezzo per il cacolo del peso
+                  Dim MaxSinglePlugger As Double = 250
+                  MaxSinglePlugger = GetPrivateProfileDouble(S_MACH_RAWMOVE, K_MACH_WEIGHT_SINGLEPLUGGER, MaxSinglePlugger, m_MainWindow.GetMachIniFile())
+                  Dim MaxDoublePlugger As Double = 750
+                  MaxDoublePlugger = GetPrivateProfileDouble(S_MACH_RAWMOVE, K_MACH_WEIGHT_DOUBLEPLUGGER, MaxDoublePlugger, m_MainWindow.GetMachIniFile())
+                  Dim AverageDensity As Double = 2700
+                  AverageDensity = GetPrivateProfileDouble(S_MATERIALS, K_AVERAGEDENSITY, AverageDensity, m_MainWindow.GetMachIniFile())
+                  VacuumCups.GetWeightInformation(AverageDensity, MaxSinglePlugger, MaxDoublePlugger)
+                  VacuumCups.GetRotationForExtraStrokeY(GetPrivateProfileInt(S_MACH_RAWMOVE, K_MACH_ROTATEVACUUMFOREXTRASTROKEY, 0, m_MainWindow.GetMachIniFile()) <> 0)
+                  VacuumCups.GetRotationForExtraStrokeX(GetPrivateProfileInt(S_MACH_RAWMOVE, K_MACH_ROTATEVACUUMFOREXTRASTROKEX, 0, m_MainWindow.GetMachIniFile()) <> 0)
                   If PutVacuumCupsOnRaw(nId, rmData) Then
                      ' Visualizzo le ventose
                      EgtSetStatus(GetVacuumId(), GDB_ST.ON_)
@@ -249,10 +283,18 @@ Public Class MoveRawPartPage
                      ' Reset eventuale messaggio
                      m_CurrProjPage.ClearMessage()
                   Else
+                     ' nascondo la visualizzazione delle ventose
+                     EgtSetStatus(GetVacuumId(), GDB_ST.OFF)
                      ' Aggiorno i dati
                      m_bRawWithCups = False
-                     ' Messaggio di avvertimento
-                     m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_MOVERAWPAGEUC + 2)) 'Pezzo troppo piccolo : non si può muovere
+                     If VacuumCups.bOverWeight Then
+                        m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_MOVERAWPAGEUC + 4)) 'Pezzo troppo pesante : non si può muovere
+                     ElseIf VacuumCups.bExtraStroke Then
+                        m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_MOVERAWPAGEUC + 5)) 'Pezzo oltre le corse : non si può muovere
+                     Else
+                        ' Messaggio di avvertimento
+                        m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_MOVERAWPAGEUC + 2)) 'Pezzo troppo piccolo : non si può muovere
+                     End If
                   End If
                End If
             End If
@@ -261,8 +303,52 @@ Public Class MoveRawPartPage
          End If
          nId = EgtGetNextObjInSelWin()
       End While
+
+      ' clicco su un oggetto che non è un grezzo -> verifico che il pezzo precedente possa essere depositato correttamente
+      If VerifyCollisionWithOtherRawPart(m_CurrRawOnVacuum) Then
+         ' mantengo la selezione del pezzo
+         EgtSetStatus(m_CurrRawOnVacuum, GDB_ST.SEL)
+         m_CurrProjPage.SetErrorMessage("Collisione pezzi")
+         EgtDraw()
+      End If
+
    End Sub
 
+   ' Veririfica che il grezzo non entri in colliosione con altri pezzi 
+   Private Function VerifyCollisionWithOtherRawPart(nIdOnVacumm As Integer) As Boolean
+      If nIdOnVacumm = GDB_ID.NULL Then Return False
+      ' Creo gruppo temporaneo in cui generare le superfici per la veririfica di collisione
+      Dim m_nTempId As Integer = EgtCreateGroup(GDB_ID.ROOT)
+      If m_nTempId = GDB_ID.NULL Then Return False
+      EgtSetName(m_nTempId, "RawTemp")
+      Dim nIdActualRawOutLine As Integer = EgtGetFirstNameInGroup(nIdOnVacumm, "RawOutline")
+      Dim ActualRawFlatRegion As Integer = EgtCreateSurfFlatRegion(m_nTempId, nIdActualRawOutLine)
+      Dim nCurrPhase As Integer = EgtGetCurrPhase()
+      Dim nRawGroupId = EgtGetParent(EgtGetFirstRawPart())
+      Dim nIdRaw As Integer = EgtGetFirstRawPart()
+      ' ciclo su tutti i grezzi per veririficare eventuali collisioni
+      While nIdRaw <> GDB_ID.NULL
+         ' verifico la fase del grezzo
+         If EgtVerifyRawPartCurrPhase(nIdRaw) And nIdOnVacumm <> nIdRaw Then
+            ' recupero il contorno del pezzo
+            Dim nIdRawOutLine As Integer = EgtGetFirstNameInGroup(nIdRaw, "RawOutline")
+            Dim nIdRawFlatRegion As Integer = EgtCreateSurfFlatRegion(m_nTempId, nIdRawOutLine)
+            If EgtSurfFrIntersect(nIdRawFlatRegion, ActualRawFlatRegion) Then
+               If EgtExistsObj(nIdRawFlatRegion) Then
+                  EgtErase(m_nTempId)
+                  ' esiste una intersezione delle superfici
+                  Return True
+               End If
+            End If
+         End If
+         nIdRaw = EgtGetNextRawPart(nIdRaw)
+      End While
+      EgtErase(m_nTempId)
+      Return False
+   End Function
+
+#Region "Move Up/Down/Left/Right"
+
    Private Sub UpBtn_Click(sender As Object, e As RoutedEventArgs) Handles UpBtn.Click
       Dim nRawId As Integer = EgtGetFirstSelectedObj()
       While nRawId <> GDB_ID.NULL
@@ -285,9 +371,15 @@ Public Class MoveRawPartPage
          Else
             If m_bRawWithCups Then
                Dim vtMove As New Vector3d(0, m_dStep, 0)
+               ' ----------- INIZIO verifica di essere entro i limiti macchina -----------
+               m_CurrProjPage.ClearMessage()
+               VerifyReleasdPositionIsValid(vtMove)
+               ' ----------- FINE verifica di essere entro i limiti macchina -----------
                If EgtMoveRawPart(nRawId, vtMove) Then
                   EgtMove(GetVacuumId(), vtMove, GDB_RT.GLOB)
                   AddRawMoveData(nRawId, vtMove, m_RawMoveDataList)
+               Else
+                  VacuumCups.ptStartPointLift.y -= vtMove.y
                End If
             Else
                m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_MOVERAWPAGEUC + 2)) 'Pezzo troppo piccolo : non si può muovere
@@ -322,9 +414,15 @@ Public Class MoveRawPartPage
          Else
             If m_bRawWithCups Then
                Dim vtMove As New Vector3d(0, -m_dStep, 0)
+               ' ----------- INIZIO verifica di essere entro i limiti macchina -----------
+               m_CurrProjPage.ClearMessage()
+               VerifyReleasdPositionIsValid(vtMove)
+               ' ----------- FINE verifica di essere entro i limiti macchina -----------
                If EgtMoveRawPart(nRawId, vtMove) Then
                   EgtMove(GetVacuumId(), vtMove, GDB_RT.GLOB)
                   AddRawMoveData(nRawId, vtMove, m_RawMoveDataList)
+               Else
+                  VacuumCups.ptStartPointLift.y -= vtMove.y
                End If
             Else
                m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_MOVERAWPAGEUC + 2)) 'Pezzo troppo piccolo : non si può muovere
@@ -342,9 +440,15 @@ Public Class MoveRawPartPage
       While nRawId <> GDB_ID.NULL
          If m_bRawWithCups Then
             Dim vtMove As New Vector3d(m_dStep, 0, 0)
+            ' ----------- INIZIO verifica di essere entro i limiti macchina -----------
+            m_CurrProjPage.ClearMessage()
+            VerifyReleasdPositionIsValid(vtMove)
+            ' ----------- FINE verifica di essere entro i limiti macchina -----------
             If EgtMoveRawPart(nRawId, vtMove) Then
                EgtMove(GetVacuumId(), vtMove, GDB_RT.GLOB)
                AddRawMoveData(nRawId, vtMove, m_RawMoveDataList)
+            Else
+               VacuumCups.ptStartPointLift.x -= vtMove.x
             End If
          Else
             m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_MOVERAWPAGEUC + 2)) 'Pezzo troppo piccolo : non si può muovere
@@ -361,9 +465,15 @@ Public Class MoveRawPartPage
       While nRawId <> GDB_ID.NULL
          If m_bRawWithCups Then
             Dim vtMove As New Vector3d(-m_dStep, 0, 0)
+            ' ----------- INIZIO verifica di essere entro i limiti macchina -----------
+            m_CurrProjPage.ClearMessage()
+            VerifyReleasdPositionIsValid(vtMove)
+            ' ----------- FINE verifica di essere entro i limiti macchina -----------
             If EgtMoveRawPart(nRawId, vtMove) Then
                EgtMove(GetVacuumId(), vtMove, GDB_RT.GLOB)
                AddRawMoveData(nRawId, vtMove, m_RawMoveDataList)
+            Else
+               VacuumCups.ptStartPointLift.x -= vtMove.x
             End If
          Else
             m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_MOVERAWPAGEUC + 2)) 'Pezzo troppo piccolo : non si può muovere
@@ -373,6 +483,77 @@ Public Class MoveRawPartPage
       EgtDraw()
    End Sub
 
+#End Region   'Move Up/Down/Left/Right
+
+   ' verifica che la poszione da raggiungere sia nei limiti delle corse
+   Private Function VerifyReleasdPositionIsValid(ByRef vtMove As Vector3d) As Boolean
+      Dim bOk As Boolean = True
+      ' determino il punto finale dello spostamento
+      Dim ptEndPointLift As Point3d = VacuumCups.ptStartPointLift
+      ptEndPointLift.x += vtMove.x
+      ptEndPointLift.y += vtMove.y
+      Dim sInfo As String = String.Empty
+      Select Case VacuumCups.VerifyOutOfStrokes(ptEndPointLift, VacuumCups.dDegRotStartAng)
+         Case 1
+            ' extra corsa sulla x-: devo ridurre del valore di extra corsa
+            EgtGetOutstrokeInfo(sInfo)
+            m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_SIMULATIONPAGEUC + 2) & " " & sInfo)        'Extracorsa ...
+            ptEndPointLift.x -= vtMove.x
+            Dim dMaxMove As Double = VacuumCups.GetExtraStrokeValue(sInfo)
+            If Math.Abs(dMaxMove - vtMove.x) <= EPS_SMALL * 100 Then
+               vtMove.x = 0
+            Else
+               vtMove.x -= dMaxMove - EPS_SMALL * 100
+            End If
+            ptEndPointLift.x += vtMove.x
+            bOk = False
+         Case 2
+            ' extra corsa sulla x+: devo ridurre del valore di extra corsa
+            EgtGetOutstrokeInfo(sInfo)
+            m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_SIMULATIONPAGEUC + 2) & " " & sInfo)        'Extracorsa ...
+            ptEndPointLift.x -= vtMove.x
+            Dim dMaxMove As Double = VacuumCups.GetExtraStrokeValue(sInfo)
+            If Math.Abs(dMaxMove - vtMove.x) <= EPS_SMALL * 100 Then
+               vtMove.x = 0
+            Else
+               vtMove.x -= dMaxMove + EPS_SMALL * 100
+            End If
+            ptEndPointLift.x += vtMove.x
+            bOk = False
+         Case 4
+            ' extra corsa sulla y-
+            EgtGetOutstrokeInfo(sInfo)
+            m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_SIMULATIONPAGEUC + 2) & " " & sInfo)        'Extracorsa ...
+            ptEndPointLift.y -= vtMove.y
+            Dim dMaxMove As Double = VacuumCups.GetExtraStrokeValue(sInfo)
+            If Math.Abs(dMaxMove - vtMove.y) <= EPS_SMALL * 100 Then
+               vtMove.y = 0
+            Else
+               vtMove.y -= dMaxMove - EPS_SMALL * 100
+            End If
+            ptEndPointLift.y += vtMove.y
+            bOk = False
+         Case 8
+            ' extra corsa sulla y+
+            EgtGetOutstrokeInfo(sInfo)
+            m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_SIMULATIONPAGEUC + 2) & " " & sInfo)        'Extracorsa ...
+            ptEndPointLift.y -= vtMove.y
+            Dim dMaxMove As Double = VacuumCups.GetExtraStrokeValue(sInfo)
+            If Math.Abs(dMaxMove - vtMove.y) <= EPS_SMALL * 100 Then
+               vtMove.y = 0
+            Else
+               vtMove.y -= dMaxMove + EPS_SMALL * 100
+            End If
+            ptEndPointLift.y += vtMove.y
+            bOk = False
+      End Select
+      ' il movimento del pezzo è accettabile, aggiorno le posizione per la verifica dello step successivo
+      VacuumCups.ptStartPointLift = ptEndPointLift
+      Return bOk
+   End Function
+
+#Region "Rotate CounterClockWise/ClockWise"
+
    Private Sub RotateCounterClockwiseBtn_Click(sender As Object, e As RoutedEventArgs) Handles RotateCounterClockwiseBtn.Click
       ' Solo movimento con ventose
       If m_bByHand Then Return
@@ -380,14 +561,24 @@ Public Class MoveRawPartPage
       While nRawId <> GDB_ID.NULL
          If m_bRawWithCups Then
             Dim dAng As Double = m_dRotation
+            ' ----------- INIZIO verifica di essere entro i limiti macchina -----------
+            ' Recupero il centro del grezzo
+            Dim ptRawCen As Point3d
+            EgtGetRawPartCenter(nRawId, ptRawCen)
+            m_CurrProjPage.ClearMessage()
+            VerifyReleasdAngleIsValid(dAng, ptRawCen)
+            ' ----------- FINE verifica di essere entro i limiti macchina -----------
             If EgtRotateRawPart(nRawId, Vector3d.Z_AX(), dAng) Then
-               ' Recupero il centro del grezzo
-               Dim ptRawCen As Point3d
-               EgtGetRawPartCenter(nRawId, ptRawCen)
+               '' Recupero il centro del grezzo
+               'Dim ptRawCen As Point3d
+               'EgtGetRawPartCenter(nRawId, ptRawCen)
                ' Eseguo la rotazione della ventosa
                EgtRotate(GetVacuumId(), ptRawCen, Vector3d.Z_AX(), dAng, GDB_RT.GLOB)
                ' Memorizzo
                AddRawMoveData(nRawId, dAng, m_RawMoveDataList)
+            Else
+               VacuumCups.ptStartPointLift.Rotate(ptRawCen, Vector3d.Z_AX(), dAng)
+               VacuumCups.dDegRotStartAng -= dAng
             End If
          Else
             m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_MOVERAWPAGEUC + 2)) 'Pezzo troppo piccolo : non si può muovere
@@ -404,14 +595,24 @@ Public Class MoveRawPartPage
       While nRawId <> GDB_ID.NULL
          If m_bRawWithCups Then
             Dim dAng As Double = -m_dRotation
+            ' ----------- INIZIO verifica di essere entro i limiti macchina -----------
+            ' Recupero il centro del grezzo
+            Dim ptRawCen As Point3d
+            EgtGetRawPartCenter(nRawId, ptRawCen)
+            m_CurrProjPage.ClearMessage()
+            VerifyReleasdAngleIsValid(dAng, ptRawCen)
+            ' ----------- FINE verifica di essere entro i limiti macchina -----------
             If EgtRotateRawPart(nRawId, Vector3d.Z_AX(), dAng) Then
-               ' Recupero il centro del grezzo
-               Dim ptRawCen As Point3d
-               EgtGetRawPartCenter(nRawId, ptRawCen)
+               '' Recupero il centro del grezzo
+               'Dim ptRawCen As Point3d
+               'EgtGetRawPartCenter(nRawId, ptRawCen)
                ' Eseguo la rotazione della ventosa
                EgtRotate(GetVacuumId(), ptRawCen, Vector3d.Z_AX(), dAng, GDB_RT.GLOB)
                ' Memorizzo
                AddRawMoveData(nRawId, dAng, m_RawMoveDataList)
+            Else
+               VacuumCups.ptStartPointLift.Rotate(ptRawCen, Vector3d.Z_AX(), dAng)
+               VacuumCups.dDegRotStartAng -= dAng
             End If
          Else
             m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_MOVERAWPAGEUC + 2)) 'Pezzo troppo piccolo : non si può muovere
@@ -421,6 +622,44 @@ Public Class MoveRawPartPage
       EgtDraw()
    End Sub
 
+#End Region  ' Rotate CounterClockWise/ClockWise
+
+   ' verifica che la rotazione da raggiungere sia nei limiti delle corse
+   Private Function VerifyReleasdAngleIsValid(ByRef dAngDeg As Double, ByVal ptCenter As Point3d) As Boolean
+      Dim bOk As Boolean = True
+      ' determino il punto finale dello spostamento
+      Dim ptEndPointLift As Point3d = VacuumCups.ptStartPointLift
+      Dim dDegRotEndAng As Double = VacuumCups.dDegRotStartAng + dAngDeg
+      ptEndPointLift.Rotate(ptCenter, Vector3d.Z_AX(), dAngDeg)
+      Dim sInfo As String = String.Empty
+      Select Case VacuumCups.VerifyOutOfStrokes(ptEndPointLift, dDegRotEndAng)
+         Case 16
+            ' extra corsa sulla c-
+            EgtGetOutstrokeInfo(sInfo)
+            m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_SIMULATIONPAGEUC + 2) & " " & sInfo)        'Extracorsa ...
+            ptEndPointLift.Rotate(ptCenter, Vector3d.Z_AX(), -dAngDeg)
+            dDegRotEndAng -= dAngDeg
+            dAngDeg += VacuumCups.GetExtraStrokeValue(sInfo) + EPS_SMALL
+            dDegRotEndAng += dAngDeg
+            ptEndPointLift.Rotate(ptCenter, Vector3d.Z_AX(), dAngDeg)
+            bOk = False
+         Case 34
+            ' extra corsa sulla c+
+            EgtGetOutstrokeInfo(sInfo)
+            m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_SIMULATIONPAGEUC + 2) & " " & sInfo)        'Extracorsa ...
+            ptEndPointLift.Rotate(ptCenter, Vector3d.Z_AX(), -dAngDeg)
+            dDegRotEndAng -= dAngDeg
+            dAngDeg -= VacuumCups.GetExtraStrokeValue(sInfo) + EPS_SMALL
+            dDegRotEndAng += dAngDeg
+            ptEndPointLift.Rotate(ptCenter, Vector3d.Z_AX(), dAngDeg)
+            bOk = False
+      End Select
+      ' il movimento del pezzo è accettabile, aggiorno le posizione per la verifica dello step successivo
+      VacuumCups.ptStartPointLift = ptEndPointLift
+      VacuumCups.dDegRotStartAng = dDegRotEndAng
+      Return bOk
+   End Function
+
    Private Sub RemovePartBtn_Click(sender As Object, e As RoutedEventArgs) Handles RemovePartBtn.Click
       Dim nRawId As Integer = EgtGetFirstSelectedObj()
       While nRawId <> GDB_ID.NULL
@@ -658,6 +897,17 @@ Public Class MoveRawPartPage
    End Sub
 
    Private Sub PrevBtn_Click(sender As Object, e As RoutedEventArgs) Handles PrevBtn.Click
+      ' verifico che il pezzo sia depositabile
+      If VerifyCollisionWithOtherRawPart(m_CurrRawOnVacuum) Then
+         ' mantengo la selezione del pezzo
+         EgtSetStatus(m_CurrRawOnVacuum, GDB_ST.SEL)
+         m_CurrProjPage.SetErrorMessage("Collisione pezzi")
+         EgtDraw()
+         ' non cambio pagina
+         Return
+      End If
+      ' resetto l'inidice del pezzo da mnovimentare
+      m_CurrRawOnVacuum = GDB_ID.NULL
       ' Deseleziono tutto
       EgtDeselectAll()
       ' Torno alla fase precedente
@@ -669,6 +919,17 @@ Public Class MoveRawPartPage
    End Sub
 
    Private Sub NextBtn_Click(sender As Object, e As RoutedEventArgs) Handles NextBtn.Click
+      ' verifico che il pezzo sia depositabile
+      If VerifyCollisionWithOtherRawPart(m_CurrRawOnVacuum) Then
+         ' mantengo la selezione del pezzo
+         EgtSetStatus(m_CurrRawOnVacuum, GDB_ST.SEL)
+         m_CurrProjPage.SetErrorMessage("Collisione pezzi")
+         EgtDraw()
+         ' non cambio pagina
+         Return
+      End If
+      ' resetto l'inidice del pezzo da mnovimentare
+      m_CurrRawOnVacuum = GDB_ID.NULL
       ' Deseleziono tutto
       EgtDeselectAll()
       ' Passo alla pagina delle spezzature

CadCuts/NestPageUC.xaml

@@ -99,19 +99,30 @@
             <Image Source="{DynamicResource ClockwiseRotateImg}" Width="65" Height="65" HorizontalAlignment="Center"
                VerticalAlignment="Center" />
          </Button>
-         
-         <UniformGrid Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="3" Columns="2" >
+
+            <UniformGrid Name ="UG0" Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="3" Columns="3" >
                 <Button Name="InsertPartBtn" Style="{DynamicResource OmagCut_YellowIconButton}">
                     <Image Source="{DynamicResource Inserisci-pezzoImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
                 </Button>
                 <Button Name="StorePartBtn" Style="{DynamicResource OmagCut_YellowIconButton}">
                     <Image Source="{DynamicResource Parcheggia-pezzoImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
                 </Button>
+                <ToggleButton Name="StartCurveWJBtn" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+                    <Image Source="{DynamicResource StartWJImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+                </ToggleButton>
+            </UniformGrid>
+          
+            <UniformGrid Name ="UG1"  Grid.Column="0" Grid.Row="6" Grid.ColumnSpan="3" Columns="3" >
+                <Button Name="RemovePartBtn" Style="{DynamicResource OmagCut_YellowIconButton}">
+                    <Image Source="{DynamicResource Elimina-pezzoImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+                </Button>
+                <ToggleButton Name="DragRettanleBtn" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+                    <Image Source="{DynamicResource Drag_RettangleImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+                </ToggleButton>
+                <ToggleButton Name="SplitCurveWJBtn" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+                    <Image Source="{DynamicResource SplitWJImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+                </ToggleButton>
             </UniformGrid>
-
-            <Button Name="RemovePartBtn" Grid.ColumnSpan="3" Grid.Row="6" Style="{DynamicResource OmagCut_YellowIconButton}">
-                <Image Source="{DynamicResource Elimina-pezzoImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
-            </Button>
 
             <UniformGrid Grid.Column="0" Grid.Row="7" Grid.ColumnSpan="3" Columns="2" >
                 <Button Name="SelectAllBtn" Style="{DynamicResource OmagCut_YellowIconButton}">

CadCuts/NestPageUC.xaml.vb

@@ -1,5 +1,4 @@
-Imports System.Windows.Input
-Imports EgtUILib
+Imports EgtUILib
 Imports EgtWPFLib
 
 Public Class NestPageUC
@@ -14,10 +13,36 @@ Public Class NestPageUC
    Private m_nPartPos As Integer = PART_POS.NONE_TABLE
    ' Flag per impostata per selezionare di una curva
    Friend m_bSelectCurv As Boolean = False
+   ' dati per DragRettangoli (estensio/accorciamento dei rettangoli trascinando un lato)
+   Private m_bIsVisibleDragRettangle As Boolean = False
+   Friend m_bIsCheckedDragRettangle As Boolean = False
+   ' dati per attivare disattivare le lavorazioni WaterJet
+   Private m_bIsVisibleSliptCurveWJ As Boolean = False
+   Friend m_bIsCheckedSplitCurveWJ As Boolean = False
+   ' dati per attivare disattivare la selezione del pubnto di inizio
+   Private m_bIsVisibleStarCurvetWJ As Boolean = False
+   Friend m_bIsCheckedStartCurveWJ As Boolean = False
 
+   ' Id della curva e del taglio selezionati per eseguire il test
    Friend m_CurrSelectedCurv As Integer = GDB_ID.NULL
    Friend m_CurrSelectedSawCurv As Integer = GDB_ID.NULL
 
+   ' Id del rettangolo, del taglio e della curva da modificare tramite Drag
+   Private m_nIdSelectedOutLoopRettangle As Integer = GDB_ID.NULL
+   Private m_nIdSelectedRegionRettangle As Integer = GDB_ID.NULL
+   Private m_nIdSelectedSawRettangle As Integer = GDB_ID.NULL
+   Private m_nIdSelectedCurvRettangle As Integer = GDB_ID.NULL
+   Private m_nIdSelectedTextRettangle As Integer = GDB_ID.NULL
+   Private m_nIdSelectedTextTopRettangle As Integer = GDB_ID.NULL
+   Private m_nIdSelectedFlatSurfRettangle As Integer = GDB_ID.NULL
+   Private m_SideListRettangle(4) As Integer
+   Private m_sTextContent As String = String.Empty
+   Private m_dRettangleIsModified As Boolean = False
+
+   ' Id dei lato WJ da separare tramite comando ON_OFF
+   Private m_nIdSelectedSideWJ As Integer = GDB_ID.NULL
+   Private m_nIdSelectedWaterJet As Integer = GDB_ID.NULL
+
    Enum PART_POS As Integer
       IN_TABLE = -1
       NONE_TABLE = 0
@@ -59,8 +84,8 @@ Public Class NestPageUC
    ' lista delle famiglie di pezzi in parcheggio
    Private m_ListOfGroupInPark As New List(Of FamilyPart)
    ' se seleniozato il layer CounterPz
-   Dim m_bIsCounterLy As Boolean = False
-   Dim m_nCurrNubrOfParts As Integer = 0
+   Private m_bIsCounterLy As Boolean = False
+   Private m_nCurrNubrOfParts As Integer = 0
 
    Private Sub NestPage_Initialized(sender As Object, e As EventArgs)
       ' Imposto i messaggi letti dal file dei messaggi
@@ -69,6 +94,37 @@ Public Class NestPageUC
       RemovePartBtn.ToolTip = EgtMsg(MSG_NESTPAGEUC + 3)            'Remove part - Elimina pezzo
       SelectAllBtn.ToolTip = EgtMsg(MSG_NESTPAGEUC + 4)             'Select All - Seleziona Tutto
       DeselectAllBtn.ToolTip = EgtMsg(MSG_NESTPAGEUC + 5)           'Deselect All - Deseleziona Tutto
+
+      Dim nColumsIn_UG1 As Integer = 2
+      ' gestisco la visualizzazione del comando PAN (per il drag dei rettangoli)
+      m_bIsVisibleDragRettangle = (GetPrivateProfileInt(S_NEST, K_DRAG_RETTANGLE, 0, m_MainWindow.GetIniFile()) <> 0)
+      If Not m_bIsVisibleDragRettangle Then
+         nColumsIn_UG1 = 1
+         DragRettanleBtn.Visibility = Visibility.Collapsed
+      End If
+
+      ' gestisco la visualizzazione del comando Splt (per i tagli waterjet)
+      If m_MainWindow.m_CurrentMachine.WaterJettingActive Then
+         nColumsIn_UG1 += 1
+         SplitCurveWJBtn.Visibility = Visibility.Visible
+         '91133=Separa
+         SplitCurveWJBtn.ToolTip = EgtMsg(91133)
+      Else
+         SplitCurveWJBtn.Visibility = Visibility.Collapsed
+      End If
+      UG1.Columns = nColumsIn_UG1
+
+      Dim nColumnIn_UG0 As Integer = 2
+      ' gestisco la visualizzazione del comando Punto_Inizio (per i tagli waterjet)
+      If m_MainWindow.m_CurrentMachine.WaterJettingActive Then
+         nColumnIn_UG0 += 1
+         StartCurveWJBtn.Visibility = Visibility.Visible
+         ' 91132=Start
+         StartCurveWJBtn.ToolTip = EgtMsg(91132)
+      Else
+         StartCurveWJBtn.Visibility = Visibility.Collapsed
+      End If
+      UG0.Columns = nColumnIn_UG0
    End Sub
 
    Private Sub NestPage_Loaded(sender As Object, e As RoutedEventArgs)
@@ -116,6 +172,7 @@ Public Class NestPageUC
       m_dRegStep = GetPrivateProfileDouble(S_REG, K_REGSTEP, 10, m_MainWindow.GetIniFile())
       m_dRegAngStep = GetPrivateProfileDouble(S_REG, K_REGANGSTEP, 1, m_MainWindow.GetIniFile())
       m_dMaxRegAng = GetPrivateProfileDouble(S_MACH_REG, K_MACH_MAX_ROT_ANG, 10, m_MainWindow.GetMachIniFile())
+
       ' Garantisco visibilità pezzi parcheggiati
       ShowParkedParts()
       ' Garantisco visibilità eventuale contorno da foto
@@ -132,6 +189,7 @@ Public Class NestPageUC
       End If
    End Sub
 
+   ' funzione utilizzata per la selezione dei tagli quando il comando TEST è attivo
    Private Sub OnMyMouseDownSceneSelCurv(sender As Object, e As System.Windows.Forms.MouseEventArgs)
       ' Verifico di essere il gestore attivo e non in modalità registrazione
       If Not m_bActive Or m_bRegister Then Return
@@ -162,18 +220,15 @@ Public Class NestPageUC
                Dim ptE As Point3d
                EgtEndPoint(nIdMy, ptE)
                If m_CurrSelectedCurv <> GDB_ID.NULL Or m_CurrSelectedCurv = nIdMy Then
-                  EgtDeselectObj(m_CurrSelectedSawCurv)
                   EgtDeselectObj(m_CurrSelectedCurv)
                End If
                ' recupero il gruppo della lavorazione associata
                Dim nIdParentPart As Integer = EgtGetParent(nIdParent)
-               Dim nIdPV As Integer = EgtGetFirstNameInGroup(nIdParentPart, "PV")
+               Dim nIdPV As Integer = EgtGetFirstNameInGroup(nIdParentPart, NAME_PREVIEW)
                Dim nIdSaw As Integer = EgtGetFirstNameInGroup(nIdPV, "Saw" & nIdMy.ToString)
                If Not EgtGetGroupObjs(nIdSaw) Then
-                  EgtSelectObj(nIdSaw)
                   m_CurrSelectedSawCurv = nIdSaw
                   m_CurrSelectedCurv = nIdMy
-                  EgtSelectObj(nIdSaw)
                   EgtSetMark(nIdSaw)
                   EgtSelectObj(nIdMy)
                   EgtDraw()
@@ -187,6 +242,643 @@ Public Class NestPageUC
       Return
    End Sub
 
+   ' funzione per la selezione dei lati su cui operare la separazione del tagli waterjet
+   Private Sub OnMyMouseDownSceneSplitCurv(sender As Object, e As System.Windows.Forms.MouseEventArgs)
+      ' Verifico di essere il gestore attivo e non in modalità registrazione
+      If Not m_bActive Or m_bRegister Then Return
+      ' Si può selezionare solo con il tasto sinistro e se il bottone TEST Attivo
+      If e.Button <> Windows.Forms.MouseButtons.Left Or
+         Not m_bIsCheckedSplitCurveWJ Then
+         Return
+      End If
+      ' Se esiste un elemento selezionato
+      EgtResetMark(m_nIdSelectedWaterJet)
+      ' Verifico se selezionato indicativo di pezzo
+      EgtSetObjFilterForSelWin(False, True, False, False, False)
+      Dim nSelMy As Integer
+      EgtSelect(e.Location, Scene.DIM_SEL, Scene.DIM_SEL, nSelMy)
+      Dim nIdMy As Integer = EgtGetFirstObjInSelWin()
+      While nIdMy <> GDB_ID.NULL
+         Dim sLayer As String = String.Empty
+         ' layer di origine
+         Dim nIdParent As Integer = EgtGetParent(nIdMy)
+         ' recupero il nome del Layer
+         EgtGetName(nIdParent, sLayer)
+         ' solo se il nome del layer è quello associato ad un lato esterno allora procedo con l'evidenziazione
+         If sLayer = NAME_OUTLOOP Then
+            If EgtGetType(nIdMy) = GDB_TY.CRV_ARC OrElse EgtGetType(nIdMy) = GDB_TY.CRV_COMPO OrElse EgtGetType(nIdMy) = GDB_TY.CRV_LINE Then
+               If m_nIdSelectedSideWJ <> GDB_ID.NULL Or m_nIdSelectedSideWJ = nIdMy Then
+                  EgtDeselectObj(m_nIdSelectedSideWJ)
+               End If
+               ' recupero il gruppo della lavorazione associata
+               Dim nIdParentPart As Integer = EgtGetParent(nIdParent)
+               Dim nIdPV As Integer = EgtGetFirstNameInGroup(nIdParentPart, NAME_PREVIEW)
+               ' VERIFICA: recupero l'elenco delle Preview di Tipo WaterJet associate a questo Part
+               Dim ListGroup As List(Of Integer) = ResearchGropuWJ(nIdParent, nIdPV)
+               ' VERIFICA: se esistono delle lavorazioni associate al percorso OutLoop di tipo Saw allora non procedo
+               Dim ListGroupSaw As List(Of Integer) = ResearchGropuSaw(nIdParent, nIdPV)
+               ' se non esiste almeno 1 Preview di tipo WaterJet
+               If ListGroup.Count > 0 Then
+                  m_nIdSelectedSideWJ = nIdMy
+                  Dim nValInfo As String = 1
+                  Dim nNewValInfo As Integer = nValInfo
+                  If EgtGetInfo(nIdMy, INFO_JOINENTITY, nValInfo) Then
+                     If nValInfo = 1 Then
+                        nNewValInfo = 0
+                     Else
+                        nNewValInfo = 1
+                     End If
+                  Else
+                     ' se manca l'info allora il taglio sValInfo = "1" quindi separo il taglio
+                     nNewValInfo = 0
+                  End If
+                  EgtSetInfo(nIdMy, INFO_JOINENTITY, nNewValInfo)
+                  ' Ricalcolo tutte le lavorazioni
+                  Dim nWarn As Integer = 0
+                  ResetAllMachinings(nWarn)
+                  ' recupero l'indice del PreView che deve essere acceso per indicare la selezione
+                  ListGroup = ResearchGropuWJ(nIdParent, nIdPV)
+                  Dim nIdWJ As Integer = GetPVIdFromIdSide(ListGroup, nIdMy)
+                  GetCurrentPVFromIdSide(ListGroup, nIdMy, nIdWJ, nIdParent)
+                  ' assegno un identificativo grafico per inidcare che è un taglio separato
+                  If nNewValInfo = 0 Then
+                     AssignFlagOnGraphic(nIdMy, nIdParentPart)
+                  Else
+                     EraseFlagOnGraphic(nIdMy, nIdParentPart)
+                  End If
+                  m_nIdSelectedWaterJet = nIdWJ
+                  ' salvo il valore del PreView evidenziato
+                  EgtSetMark(nIdWJ)
+                  EgtSelectObj(nIdMy)
+                  EgtDraw()
+                  Exit While
+               End If
+
+            End If
+         End If
+         nIdMy = EgtGetNextObjInSelWin()
+      End While
+      Return
+   End Sub
+
+   ' funzione per la selezione del punto di inizio tagli waterjet (percorso chiuso)
+   Private Sub OnMyMouseDownSceneStartCurv(sender As Object, e As System.Windows.Forms.MouseEventArgs)
+      ' Verifico di essere il gestore attivo e non in modalità registrazione
+      If Not m_bActive Or m_bRegister Then Return
+      ' Si può selezionare solo con il tasto sinistro e se il bottone TEST Attivo
+      If e.Button <> Windows.Forms.MouseButtons.Left Or
+         Not m_bIsCheckedStartCurveWJ Then
+         Return
+      End If
+
+      ' Acquisisco punto da disegno
+      Dim ptStartCurv As New Point3d
+      EgtUnProjectPoint(e.Location, ptStartCurv)
+      ' Aggiusto Z punto acquisito (è in globale)
+      Dim ptRawMax As New Point3d
+      Dim ptRawMin As New Point3d
+      If GetRawBox(ptRawMin, ptRawMax) Then
+         ptStartCurv.z = ptRawMax.z
+      End If
+
+      ' Se esiste un elemento selezionato
+      EgtResetMark(m_nIdSelectedWaterJet)
+      ' Verifico se selezionato indicativo di pezzo
+      EgtSetObjFilterForSelWin(False, True, False, False, False)
+      Dim nSelMy As Integer
+      EgtSelect(e.Location, Scene.DIM_SEL, Scene.DIM_SEL, nSelMy)
+      Dim nIdMy As Integer = EgtGetFirstObjInSelWin()
+      While nIdMy <> GDB_ID.NULL
+         Dim sLayer As String = String.Empty
+         ' layer di origine
+         Dim nIdParent As Integer = EgtGetParent(nIdMy)
+         ' recupero il nome del Layer
+         EgtGetName(nIdParent, sLayer)
+         ' solo se il nome del layer è quello associato ad un lato esterno allora procedo con l'evidenziazione
+         If sLayer = NAME_OUTLOOP Or sLayer = NAME_INLOOP Then
+            If EgtGetType(nIdMy) = GDB_TY.CRV_ARC OrElse EgtGetType(nIdMy) = GDB_TY.CRV_COMPO OrElse EgtGetType(nIdMy) = GDB_TY.CRV_LINE Then
+               ' verifico che il contorno sia chiuso, altrimenti esco
+               If Not VerifyOutLoopIsClosed(nIdParent) Then
+                  ' 91131=Il contorno non è chiuso
+                  m_CurrProjPage.SetWarningMessage(EgtMsg(91131))
+                  Exit While
+               End If
+               ' recupero il gruppo della lavorazione associata
+               Dim nIdParentPart As Integer = EgtGetParent(nIdParent)
+               Dim nIdPV As Integer = EgtGetFirstNameInGroup(nIdParentPart, NAME_PREVIEW)
+               ' VERIFICA: recupero l'elenco delle Preview di Tipo WaterJet_n_S associate a questo Part
+               Dim ListGroup As List(Of Integer) = ResearchGropuWJ(nIdParent, nIdPV)
+               ' VERIFICA: se esistono delle lavorazioni associate al percorso OutLoop di tipo Saw allora non procedo
+               Dim ListGroupSaw As List(Of Integer) = ResearchGropuSaw(nIdParent, nIdPV)
+               ' se non esiste almeno 1 Preview di tipo WaterJet
+               If ListGroup.Count = 1 And ListGroupSaw.Count = 0 Then
+                  EgtSetInfo(nIdParent, INFO_START, ptStartCurv)
+                  ' Ricalcolo tutte le lavorazioni
+                  Dim nWarn As Integer = 0
+                  ResetAllMachinings(nWarn)
+                  ' recupero l'indice del PreView che deve essere acceso per indicare la selezione
+                  ListGroup = ResearchGropuWJ(nIdParent, nIdPV)
+                  Dim nIdWJ As Integer = GetPVIdFromIdSide(ListGroup, nIdMy)
+                  GetCurrentPVFromIdSide(ListGroup, nIdMy, nIdWJ, nIdParent)
+                  m_nIdSelectedWaterJet = nIdWJ
+                  EgtSetMark(nIdWJ)
+                  EgtDraw()
+                  Exit While
+               Else
+                  ' 91131=Il contorno non è chiuso
+                  m_CurrProjPage.SetWarningMessage(EgtMsg(91131))
+                  Exit While
+               End If
+
+            End If
+         End If
+         nIdMy = EgtGetNextObjInSelWin()
+      End While
+      Return
+   End Sub
+
+#Region "DRAG RETTANGLE"
+
+   ' funzione chiamata da OnMyMouseMoveScene: verifica che la selezione sia corretta (deve essere il lato di una figura rettangolare)
+   Private Sub OnMyMouseDownSceneSelSideRettangle(sender As Object, e As System.Windows.Forms.MouseEventArgs)
+      ' Verifico di essere il gestore attivo e non in modalità registrazione
+      If Not m_bActive Or m_bRegister Then Return
+      ' Si può selezionare solo con il tasto sinistro e se il bottone TEST Attivo
+      If e.Button <> Windows.Forms.MouseButtons.Left Then
+         Return
+      End If
+      ' Verifico se selezionato indicativo di pezzo
+      EgtSetObjFilterForSelWin(False, True, False, False, False)
+      Dim nSelMy As Integer
+      EgtSelect(e.Location, Scene.DIM_SEL, Scene.DIM_SEL, nSelMy)
+      Dim nIdMy As Integer = EgtGetFirstObjInSelWin()
+      While nIdMy <> GDB_ID.NULL
+         Dim sLayer As String = String.Empty
+         ' layer di origine
+         Dim nIdParent As Integer = EgtGetParent(nIdMy)
+         ' recupero il nome del Layer
+         EgtGetName(nIdParent, sLayer)
+         ' solo se il nome del layer è quello associato ad un lato esterno allora procedo con l'evidenziazione
+         If sLayer = NAME_OUTLOOP Then
+            If EgtGetType(nIdMy) = GDB_TY.CRV_LINE Then
+               ' -------------------------------- INIZIO VERIFICHE --------------------------------
+               m_nIdSelectedOutLoopRettangle = nIdParent
+               If Not IsRettangle(m_SideListRettangle) Then
+                  m_CurrProjPage.ClearMessage()
+                  m_CurrProjPage.SetWarningMessage("Non è un rettangolo (0)")
+                  Return
+               End If
+               ' recupero il gruppo della lavorazione associata
+               Dim nIdParentPart As Integer = EgtGetParent(nIdParent)
+               Dim nIdPV As Integer = EgtGetFirstNameInGroup(nIdParentPart, "PV")
+               ' se non esiste un gruppo di lavorazione associato allora esco
+               If nIdPV = GDB_ID.NULL Then
+                  m_CurrProjPage.ClearMessage()
+                  m_CurrProjPage.SetWarningMessage("Pezzo in parcheggio (1)")
+                  Return
+               End If
+               ' se esiste ma è vuoto (pezzo scaricato da tavola)
+               If EgtGetFirstInGroup(nIdPV) = GDB_ID.NULL Then
+                  m_CurrProjPage.ClearMessage()
+                  m_CurrProjPage.SetWarningMessage("Pezzo in parcheggio (2)")
+                  Return
+               End If
+               ' Devo verificare che sia una lavorazione solo di lama?
+               Dim nIdSaw As Integer = EgtGetFirstNameInGroup(nIdPV, "Saw" & nIdMy.ToString)
+               ' -------------------------------- FINE VERIFICHE --------------------------------
+
+               If Not EgtGetGroupObjs(nIdSaw) Then
+                  m_nIdSelectedSawRettangle = nIdSaw
+                  m_nIdSelectedCurvRettangle = nIdMy
+
+                  m_nIdSelectedRegionRettangle = EgtGetFirstNameInGroup(nIdParentPart, NAME_REGION)
+                  ' recupero i testi cintenuti nel layer Region
+                  If m_nIdSelectedRegionRettangle <> GDB_ID.NULL Then
+                     Dim nCurrId As Integer = EgtGetFirstInGroup(m_nIdSelectedRegionRettangle)
+                     While nCurrId <> GDB_ID.NULL
+                        If EgtGetType(nCurrId) = GDB_TY.EXT_TEXT Then
+                           Dim sVal As String = String.Empty
+                           EgtTextGetContent(nCurrId, sVal)
+                           If sVal = "*TOP*" Then
+                              m_nIdSelectedTextTopRettangle = nCurrId
+                           Else
+                              m_nIdSelectedTextRettangle = nCurrId
+                              m_sTextContent = GetMyRettangleText(sVal)
+                           End If
+                        ElseIf EgtGetType(nCurrId) = GDB_TY.SRF_FRGN Then
+                           m_nIdSelectedFlatSurfRettangle = nCurrId
+                        End If
+                        nCurrId = EgtGetNext(nCurrId)
+                     End While
+                  End If
+                  ' seleziono ed evidenzio il lato selezionato
+                  EgtSelectObj(nIdSaw)
+                  EgtSetMark(nIdSaw)
+                  EgtSelectObj(nIdMy)
+                  EgtDraw()
+                  Exit While
+               End If
+            End If
+            ' se le'elemto corrente non è una linea
+         End If
+         ' se le'elemto corrente non appartiene al layer OutLoop passo al prossimo elemento dell'elenco
+         nIdMy = EgtGetNextObjInSelWin()
+      End While
+   End Sub
+
+   ' restituisce il valore del Text ripulito dalle dimensioni
+   Private Function GetMyRettangleText(sTextPz As String) As String
+      ' da DrawPageUC.xaml.vb/MultipleInsert
+      Dim sText As String = String.Empty
+      If sTextPz.Contains("<br/>") Then
+         Dim nLastIndex As Integer = sTextPz.LastIndexOf(">")
+         sText = sTextPz.Remove(nLastIndex + 1)
+         Return sText
+      End If
+      If sTextPz.Contains("  ") Then
+         Dim sInfo() As String = sTextPz.Split(" ")
+         If sInfo.Count > 3 Then
+            Return sText = sInfo(0) & "  " & sInfo(1) & "  "
+         End If
+      End If
+      Return sText
+   End Function
+
+   ' verifico che la figura selezionata sia realmente un rettangolo
+   Private Function IsRettangle(ByRef IdSideList() As Integer) As Boolean
+      ' creo una lista con i lati del rettangolo
+      Dim nCounter As Integer = 0
+      ' recupero i lati dal leyer "OutLoop"
+      Dim IdSideRettangle As Integer = EgtGetFirstInGroup(m_nIdSelectedOutLoopRettangle)
+      While IdSideRettangle <> GDB_ID.NULL And nCounter < 4
+         Dim sVal As String = String.Empty
+         Dim dPrevAng As Double = 0
+         EgtGetInfo(IdSideRettangle, "PrevAng", sVal)
+         StringToDouble(sVal, dPrevAng)
+         Dim dNextAng As Double = 0
+         EgtGetInfo(IdSideRettangle, "NextAng", sVal)
+         StringToDouble(sVal, dNextAng)
+         ' se gli angoli non sono retti allora esco senza caricare il lato corrente
+         If Math.Abs(dPrevAng - 90) > EPS_ANG_SMALL OrElse Math.Abs(dNextAng - 90) > EPS_ANG_SMALL Then
+            Exit While
+         End If
+         IdSideList(nCounter) = IdSideRettangle
+         nCounter += 1
+         IdSideRettangle = EgtGetNext(IdSideRettangle)
+      End While
+      ' verifico che siano solo quattro lati
+      If IdSideRettangle = GDB_ID.NULL And nCounter = 4 Then
+         ' solo se la figura ha 4 lati ortogonali
+         Return True
+      End If
+
+      m_nIdSelectedOutLoopRettangle = GDB_ID.NULL
+      ' la figura presenta più/meno di 4 lati    
+      Return False
+   End Function
+
+   ' recupero le informazioni correnti per sapere se la figura è mdificabile
+   Private Function GetRettangleInfoScale(ByRef frFixed As Frame3d, ByRef MaxLen As Double, ByRef MinLen As Double) As Vector3d
+      ' determino la direzione del lato selezionato
+      Dim vtDirSelectedCurv As New Vector3d
+      EgtStartVector(m_nIdSelectedCurvRettangle, GDB_ID.ROOT, vtDirSelectedCurv)
+
+      ' recupero il lato successivo a quello selezionato 
+      Dim Index As Integer = 0
+      Dim Len As Double = 0
+      For Ind As Integer = 0 To 3
+         If m_SideListRettangle(Ind) = m_nIdSelectedCurvRettangle Then
+            ' verifico se esiste un lato Precedente altrimenti recupero l'ultimo della lista
+            If Ind = 0 Then
+               Index = 3
+            Else
+               Index = Ind - 1
+            End If
+         End If
+      Next
+      ' recupero la dimensione del lato
+      EgtCurveLength(m_SideListRettangle(Index), MaxLen)
+      EgtCurveLength(m_nIdSelectedCurvRettangle, MinLen)
+
+      ' verifico che il lato selezionato sia il maggiore
+      If MinLen > MaxLen Then Return Nothing
+
+      ' determimo il versore dal lato appena calcolato
+      Dim vtDir As New Vector3d
+
+      EgtStartVector(m_SideListRettangle(Index), GDB_ID.ROOT, vtDir)
+      vtDir.Normalize()
+      Dim dProjectionBaseX As Double = vtDir * Vector3d.X_AX
+      Dim ptFixed As New Point3d
+      EgtStartPoint(m_SideListRettangle(Index), GDB_ID.ROOT, ptFixed)
+
+      Dim vtPerp As New Vector3d(vtDir.x, vtDir.y, vtDir.z)
+      vtPerp.Rotate(Vector3d.Z_AX, 90)
+
+      ' determino il Frame corrente
+      frFixed = New Frame3d(ptFixed, vtDir, vtPerp, Vector3d.Z_AX)
+
+      Return vtDir
+
+   End Function
+
+   ' funzione chiamata da OnMyMouseMoveScene: gestisce la modifica lungo una dimensione del rettangolo selezionato
+   Private Sub OnMyMouseMoveSawRettangle(sender As Object, e As System.Windows.Forms.MouseEventArgs)
+      ' Verifico di essere il gestore attivo
+      If Not m_bActive Then Return
+      ' Se drag non abilitato o già in esecuzione, esco
+      If Not m_bDrag Or m_bDragging Then Return
+      ' Se primo movimento di drag, verifico di aver superato la soglia di movimento in pixel
+      If m_bDragToStart Then
+         If Math.Abs(e.Location.X - m_locPrev.X) < m_nRestRadius And
+            Math.Abs(e.Location.Y - m_locPrev.Y) < m_nRestRadius Then
+            Return
+         End If
+         m_bDragToStart = False
+      End If
+
+      ' riferiemento che deve rimanere fisso del rettangolo 
+      Dim frFixed As Frame3d = Nothing
+      ' lunghezza del lato da modificare
+      Dim MaxLen As Double = 0
+      Dim MinLen As Double = 0
+      ' recupero info sul rettangolo selezionato
+      Dim vtDir As Vector3d = GetRettangleInfoScale(frFixed, MaxLen, MinLen)
+      If vtDir.Equals(Vector3d.NULL) Then
+         Return
+      End If
+
+      ' Inizio esecuzione di drag
+      m_bDragging = True
+
+      ' Ricavo il punto corrente in coordinate mondo
+      Dim ptCurr As Point3d
+      EgtUnProjectPoint(e.Location, ptCurr)
+      ' Ricavo il vettore di movimento
+      Dim vtMove As Vector3d = ptCurr - m_ptPrev
+      ' ricavo il valore efficace di allungamento (la proiezione)
+      Dim dProjection As Double = vtMove * vtDir
+      vtMove = vtDir * dProjection
+      ' recupero il valore di scalatura
+      Dim dScalefactor = dProjection / MaxLen + 1
+
+      ' Modifico dimensione figura
+      If Math.Abs(dScalefactor) > EPS_SMALL * EPS_SMALL Then
+         EgtScale(m_nIdSelectedOutLoopRettangle, frFixed, dScalefactor, 1, 1, GDB_ID.ROOT)
+         EgtScale(m_nIdSelectedFlatSurfRettangle, frFixed, dScalefactor, 1, 1, GDB_ID.ROOT)
+         Dim ptCen As Point3d
+         EgtCenterPoint(m_nIdSelectedTextRettangle, ptCen)
+         EgtModifyText(m_nIdSelectedTextRettangle, m_sTextContent & LenToString(MaxLen + dProjection, 2) & " x " & LenToString(MinLen, 2))
+         EgtMove(m_nIdSelectedTextRettangle, vtMove * 0.5, GDB_ID.ROOT)
+         If m_nIdSelectedTextTopRettangle <> GDB_ID.NULL Then
+            EgtMove(m_nIdSelectedTextTopRettangle, vtMove * 0.5, GDB_ID.ROOT)
+         End If
+         ' il rettangolo è stato modifica almeno una volta
+         m_dRettangleIsModified = True
+      End If
+
+      ' verifico che il il lato  maggiore rimanga semore il lato maggiore
+      Dim bRettangleCorrect As Boolean = False
+      If (MaxLen + dProjection - MinLen) > EPS_SMALL Then bRettangleCorrect = True
+
+      Dim nWarn As Integer = 0
+      ResetAllMachinings(nWarn)
+      EnableReferenceRegion(False)
+      ' se la modifica genera un errore allora ripristino la figura prima della defomrazione
+      If Not EgtVerifyPart(EgtGetParent(m_nIdSelectedOutLoopRettangle), True) Or Not bRettangleCorrect Then
+         EgtScale(m_nIdSelectedOutLoopRettangle, frFixed, 1 / dScalefactor, 1, 1, GDB_ID.ROOT)
+         EgtScale(m_nIdSelectedFlatSurfRettangle, frFixed, 1 / dScalefactor, 1, 1, GDB_ID.ROOT)
+         Dim ptCen As Point3d
+         EgtCenterPoint(m_nIdSelectedTextRettangle, ptCen)
+         EgtModifyText(m_nIdSelectedTextRettangle, m_sTextContent & LenToString(MaxLen, 2) & " x " & LenToString(MinLen, 2))
+         EgtMove(m_nIdSelectedTextRettangle, -vtMove * 0.5, GDB_ID.ROOT)
+         If m_nIdSelectedTextTopRettangle <> GDB_ID.NULL Then
+            EgtMove(m_nIdSelectedTextTopRettangle, -vtMove * 0.5, GDB_ID.ROOT)
+         End If
+      End If
+
+      EgtDraw()
+      ' Aggiorno il punto precedente
+      m_ptPrev = ptCurr
+      ' Terminata esecuzione di drag
+      m_bDragging = False
+   End Sub
+
+   ' funzione chiamata da OnMyMouseUp: gestisce il reset di tutti gli indici in uso 
+   Public Sub ResetDragRettangleParam()
+      ' deseleziono l'elemento corrente
+      EgtDeselectObj(m_nIdSelectedSawRettangle)
+      EgtDeselectObj(m_nIdSelectedCurvRettangle)
+      EgtResetMark(m_nIdSelectedSawRettangle)
+      If m_dRettangleIsModified Then
+         ' elimino eventuali riferienti con la famiglia di appartenenza
+         Dim nCurrPart As Integer = EgtGetParent(m_nIdSelectedRegionRettangle)
+         EgtRemoveInfo(nCurrPart, INFO_REFGROUP)
+         ' elimino il Layer che contiene l'informazione del numero di pezzi
+         Dim nCounterLayer As Integer = EgtGetFirstNameInGroup(nCurrPart, INFO_COUNTERLY)
+         EgtErase(nCounterLayer)
+      End If
+      m_dRettangleIsModified = False
+      ' resetto gli indici
+      m_nIdSelectedOutLoopRettangle = GDB_ID.NULL
+      m_nIdSelectedRegionRettangle = GDB_ID.NULL
+      m_nIdSelectedSawRettangle = GDB_ID.NULL
+      m_nIdSelectedCurvRettangle = GDB_ID.NULL
+      m_nIdSelectedTextRettangle = GDB_ID.NULL
+      m_nIdSelectedTextTopRettangle = GDB_ID.NULL
+      m_nIdSelectedFlatSurfRettangle = GDB_ID.NULL
+      m_SideListRettangle = {GDB_ID.NULL, GDB_ID.NULL, GDB_ID.NULL, GDB_ID.NULL}
+      m_sTextContent = String.Empty
+      ' disattivo il drag
+      m_bDrag = False
+      ' aggiorno le lavorazioni
+      Dim nWarn As Integer = 0
+      ResetAllMachinings(nWarn)
+      EgtDraw()
+   End Sub
+
+#End Region    ' Drag Rettangolo
+
+#Region "SPLIT/START CURVE"
+
+   ' restituisce l'elenco dei Gruppi Waterjet associati al contorno indicato
+   Public Function ResearchGropuWJ(nIdOutLoop As Integer, nIdPV As Integer) As List(Of Integer)
+      Dim ListOfGroupPV As New List(Of Integer)
+      Dim nIdGroup As Integer = GDB_ID.NULL
+      Dim nIdMy As Integer = GDB_ID.NULL
+      ' recupero il primo lato dall'elenco dei lati della figura
+      nIdMy = EgtGetFirstInGroup(nIdOutLoop)
+      ' altrimenti cerco all'interno del layer OutLoop per ogni lato la lavorazione associata
+      While nIdMy <> GDB_ID.NULL
+         ' verifico se esiste una Preview associata al lato
+         nIdGroup = EgtGetFirstNameInGroup(nIdPV, "Waterjet" & nIdMy.ToString & "S")
+         If nIdGroup <> GDB_ID.NULL Then
+            ListOfGroupPV.Add(nIdGroup)
+         End If
+         nIdMy = EgtGetNext(nIdMy)
+      End While
+      Return ListOfGroupPV
+   End Function
+
+   ' restituisce l'elenco dei Gruppi Saw associati al contorno indicato
+   Public Function ResearchGropuSaw(nIdOutLoop As Integer, nIdPV As Integer) As List(Of Integer)
+      Dim ListOfGroupPV As New List(Of Integer)
+      Dim nIdGroup As Integer = GDB_ID.NULL
+      Dim nIdMy As Integer = GDB_ID.NULL
+      ' recupero il primo lato dall'elenco dei lati della figura
+      nIdMy = EgtGetFirstInGroup(nIdOutLoop)
+      ' altrimenti cerco all'interno del layer OutLoop per ogni lato la lavorazione associata
+      While nIdMy <> GDB_ID.NULL
+         ' verifico se esiste una Preview associata al lato
+         nIdGroup = EgtGetFirstNameInGroup(nIdPV, "Saw" & nIdMy.ToString)
+         If nIdGroup <> GDB_ID.NULL Then
+            ListOfGroupPV.Add(nIdGroup)
+         End If
+         nIdMy = EgtGetNext(nIdMy)
+      End While
+      Return ListOfGroupPV
+   End Function
+
+   Public Function GetPVIdFromIdSide(ListGroup As List(Of Integer), nIdMy As Integer) As Integer
+      Dim IdWaterjetPV As Integer = GDB_ID.NULL
+      For Each nIdItem As Integer In ListGroup
+         Dim sName As String = String.Empty
+         If EgtGetName(nIdItem, sName) Then
+            If sName.Contains(nIdMy.ToString) Then
+               IdWaterjetPV = nIdItem
+               Exit For
+            End If
+         End If
+      Next
+      Return IdWaterjetPV
+   End Function
+
+   Public Sub GetCurrentPVFromIdSide(ListGroup As List(Of Integer), nIdMy As Integer, ByRef nIdWj As Integer, nIdParent As Integer)
+      Dim nObjInGroup As Integer = EgtGetGroupObjs(nIdParent)
+      Dim nCount As Integer = 0
+      GetNextSideJoint(ListGroup, nIdMy, nIdWj, nCount, nObjInGroup)
+      If nIdWj <> GDB_ID.NULL Then Return
+      GetPrevSideJoint(ListGroup, nIdMy, nIdWj, nCount, nObjInGroup)
+   End Sub
+
+   ' funzione ricorsiva per la ricerca del lato al quale è associata la PreView
+   Private Sub GetNextSideJoint(ListGroup As List(Of Integer), nIdMy As Integer, ByRef nIdWj As Integer, ByRef nCount As Integer, nObjInGroup As Integer)
+      Dim nValInfo As Integer = 1
+      ' espressione di controllo per evitare di generare Loop infinito
+      If nCount > nObjInGroup Then Return
+      If nIdWj = GDB_ID.NULL Then
+         Dim nIdWJNext As Integer = EgtGetNext(nIdMy)
+         If nIdWJNext = GDB_ID.NULL Then nIdWJNext = EgtGetFirstInGroup(EgtGetParent(nIdMy))
+         nCount += 1
+         EgtGetInfo(nIdWJNext, INFO_JOINENTITY, nValInfo)
+         If nValInfo = 1 Then
+            nIdWj = GetPVIdFromIdSide(ListGroup, nIdWJNext)
+            If nIdWj <> GDB_ID.NULL Then Return
+         Else
+            Return
+         End If
+         'nIdWJNext = EgtGetNext(nIdWJNext)
+         GetNextSideJoint(ListGroup, nIdWJNext, nIdWj, nCount, nObjInGroup)
+         If nIdWj <> GDB_ID.NULL Then Return
+      End If
+   End Sub
+
+   ' funzione ricorsiva per la ricerca del lato al quale è associata la PreView
+   Private Sub GetPrevSideJoint(ListGroup As List(Of Integer), nIdMy As Integer, ByRef nIdWj As Integer, ByRef nCount As Integer, nObjInGroup As Integer)
+      Dim nValInfo As Integer = 1
+      ' espressione di controllo per evitare di generare Loop infinito
+      If nCount > nObjInGroup Then Return
+      If nIdWj = GDB_ID.NULL Then
+         Dim nIdWJPrev As Integer = EgtGetPrev(nIdMy)
+         ' se arrivato al primo valore allora continuo la ricerca dall'ultimo
+         If nIdWJPrev = GDB_ID.NULL Then nIdWJPrev = EgtGetLastInGroup(EgtGetParent(nIdMy))
+         nCount += 1
+         EgtGetInfo(nIdWJPrev, INFO_JOINENTITY, nValInfo)
+         If nValInfo = 1 Then
+            nIdWj = GetPVIdFromIdSide(ListGroup, nIdWJPrev)
+            If nIdWj <> GDB_ID.NULL Then Return
+         Else
+            Return
+         End If
+         'nIdWJPrev = EgtGetPrev(nIdWJPrev)
+         GetPrevSideJoint(ListGroup, nIdWJPrev, nIdWj, nCount, nObjInGroup)
+         If nIdWj <> GDB_ID.NULL Then Return
+
+      End If
+   End Sub
+
+   Public Sub ResetSplitCurvWJParam()
+      EgtDeselectObj(m_nIdSelectedSideWJ)
+      EgtResetMark(m_nIdSelectedWaterJet)
+      m_nIdSelectedSideWJ = GDB_ID.NULL
+      m_nIdSelectedWaterJet = GDB_ID.NULL
+      EgtDraw()
+   End Sub
+
+   ' ricevo l'ID del percorso di lavorazione WJ al quale associo una etichetta grafica con scritto "S"
+   Private Sub AssignFlagOnGraphic(nIdMy As Integer, IdParentPart As Integer)
+      ' cerco se esiste già un layer nominato "AUX_SPLIT_WJ", altrimenti lo creo
+      Dim IdAuxLayer As Integer = EgtGetFirstNameInGroup(IdParentPart, INFO_AUX_SPLIT_WJ)
+      If IdAuxLayer = GDB_ID.NULL Then
+         IdAuxLayer = EgtCreateGroup(IdParentPart)
+         EgtSetName(IdAuxLayer, INFO_AUX_SPLIT_WJ)
+      End If
+      ' recupero il punto medio del segmento selezionato
+      Dim MidPoint As Point3d
+      EgtMidPoint(nIdMy, GDB_RT.GLOB, MidPoint)
+      'Dim nIdTextFlag As Integer = EgtCreateText(IdAuxLayer, MidPoint, "*", 20, GDB_RT.GLOB)
+      Dim nIdTextFlag As Integer = GetCreateFlagText(nIdMy, IdAuxLayer)
+      EgtSetColor(nIdTextFlag, New Color3d(255, 0, 0))
+      EgtSetName(nIdTextFlag, "RefSide_" & nIdMy.ToString)
+   End Sub
+
+   Private Function GetCreateFlagText(nId As Integer, nIdLayer As Integer, Optional sText As String = "*") As Integer
+      ' recupero il punto medio
+      Dim MidPoint As Point3d
+      EgtMidPoint(nId, GDB_RT.GLOB, MidPoint)
+      ' recupero la direzione del vettore nel punto medio
+      Dim vVers As Vector3d
+      EgtMidVector(nId, GDB_RT.GLOB, vVers)
+      vVers.Normalize()
+      vVers.Rotate(Vector3d.Z_AX, 90)
+      ' Ingombro complessivo della lavorazione
+      Dim ptMin, ptMax As Point3d
+      EgtStartPoint(nId, GDB_RT.GLOB, ptMin)
+      EgtEndPoint(nId, GDB_RT.GLOB, ptMax)
+      ' Metto il numero nel centro
+      Dim dRadXY = Point3d.DistXY(ptMin, ptMax)
+      Dim dHtxt As Double = 50
+      Dim dRat As Double = 0.75
+      If dRadXY < 200 Then
+         dHtxt = 40
+         dRat = 0.6
+      ElseIf dRadXY < 25 Then
+         dHtxt = 25
+         dRat = 0.5
+      End If
+      ' determino la posizione del flag
+      MidPoint.x += vVers.x * dHtxt / 2
+      MidPoint.y += vVers.y * dHtxt / 2
+
+      Return EgtCreateTextAdv(nIdLayer, MidPoint, 0, sText, "", 300, False, dHtxt, dRat, 0, INS_POS.MC, GDB_RT.GLOB)
+   End Function
+
+   Private Sub EraseFlagOnGraphic(nIdMy As Integer, IdParentPart As Integer)
+      ' cerco se esiste già un layer nominato "AUX_SPLIT_WJ", altrimenti lo creo
+      Dim IdAuxLayer As Integer = EgtGetFirstNameInGroup(IdParentPart, INFO_AUX_SPLIT_WJ)
+      If IdAuxLayer = GDB_ID.NULL Then Return
+      Dim nIdTextFlag As Integer = EgtGetFirstNameInGroup(IdAuxLayer, "RefSide_" & nIdMy.ToString)
+      EgtErase(nIdTextFlag)
+   End Sub
+
+   Public Sub ResetStartCurvWJParam()
+      EgtResetMark(m_nIdSelectedWaterJet)
+      m_nIdSelectedWaterJet = GDB_ID.NULL
+      EgtDraw()
+   End Sub
+
+#End Region    ' Split/Start Curve
+
    Private Sub OnMyMouseDownScene(sender As Object, e As System.Windows.Forms.MouseEventArgs) Handles m_CurrProjPage.OnMouseDownScene
       ' Verifico di essere il gestore attivo e non in modalità registrazione
       If Not m_bActive Or m_bRegister Then Return
@@ -195,6 +887,7 @@ Public Class NestPageUC
          Not m_CurrProjPage.CurrentProjectScene.IsStatusNull() Then
          Return
       End If
+
       ' se in modalità slezione tagli
       If m_bSelectCurv Then
          OnMyMouseDownSceneSelCurv(sender, e)
@@ -202,6 +895,30 @@ Public Class NestPageUC
       End If
 
       m_bIsCounterLy = False
+      ' se in modalità DragRettangle (deformazione delle componenti rettangolari)
+      If m_bIsCheckedDragRettangle Then
+         OnMyMouseDownSceneSelSideRettangle(sender, e)
+         ' Dati per drag (abilito il Drag)
+         m_locPrev = e.Location
+         m_bDrag = EgtUnProjectPoint(e.Location, m_ptPrev) And m_nIdSelectedCurvRettangle <> GDB_ID.NULL
+         m_bDragToStart = m_bDrag
+         m_bVerify = m_bDrag AndAlso (Keyboard.Modifiers And ModifierKeys.Shift) > 0
+         m_vtTotMove = Vector3d.NULL()
+         Return
+      End If
+
+      ' se in modalità SplitCurveWJ (separazione dei tagli WaterJet)
+      If m_bIsCheckedSplitCurveWJ Then
+         OnMyMouseDownSceneSplitCurv(sender, e)
+         Return
+      End If
+
+      ' se in modalità StartCurveWJ (punto di inzio taglio waterjet)
+      If m_bIsCheckedStartCurveWJ Then
+         OnMyMouseDownSceneStartCurv(sender, e)
+         Return
+      End If
+
       ' Per default no drag
       m_bDrag = False
       ' Verifico se selezionato indicativo di pezzo
@@ -251,10 +968,10 @@ Public Class NestPageUC
 
             ' Drag possibile
             m_bDrag = True
-               Exit While
-            Else
-               ' verifico se l'elemento selezionato è il nome della tavola
-               If EgtGetType(nId) = GDB_TY.EXT_TEXT AndAlso (sNamePartId = MAIN_TAB Or sNamePartId = SECOND_TAB) Then
+            Exit While
+         Else
+            ' verifico se l'elemento selezionato è il nome della tavola
+            If EgtGetType(nId) = GDB_TY.EXT_TEXT AndAlso (sNamePartId = MAIN_TAB Or sNamePartId = SECOND_TAB) Then
                Dim nRes As Integer = m_MainWindow.m_CadCutPageUC.m_ProjectMgr.ChangeTable()
                ' se non è stata eseguita nessuna scelta esco dal ciclo 
                If nRes = 0 Then Exit While
@@ -353,6 +1070,13 @@ Public Class NestPageUC
          End If
          m_bDragToStart = False
       End If
+
+      ' se devo muovere un lato del rettangolo
+      If m_bIsCheckedDragRettangle Then
+         OnMyMouseMoveSawRettangle(sender, e)
+         Return
+      End If
+
       ' Determino cosa muovere
       Dim nMoveId = If(m_nIdToSel <> GDB_ID.NULL, m_nIdToSel, GDB_ID.SEL)
       ' Verifico se in tavola o in parcheggio
@@ -458,6 +1182,20 @@ Public Class NestPageUC
       If Not m_bActive Then Return
       ' verifico che non sia attivo il comando Test
       If m_bSelectCurv Then Return
+      ' verifico che sia attivo il comando di Drag dei rettangoli
+      If m_bIsCheckedDragRettangle Then
+         ' deseleziono gli oggeti, resetto le variabili usate, aggiorno il disegno
+         ResetDragRettangleParam()
+         Return
+      End If
+      ' verifico che sia attivo il comando di modifica tagli waterjet
+      If m_bIsCheckedSplitCurveWJ Then
+         Return
+      End If
+      If m_bIsCheckedStartCurveWJ Then
+         Return
+      End If
+
       ' Se eseguito drag
       If Not m_bDragToStart Then
          ' Se movimento con sola verifica finale
@@ -545,7 +1283,6 @@ Public Class NestPageUC
          VeinMatching.OnSelectPart(m_nIdToSel)
          ' Set flag posizione selezionati
          m_nPartPos = If(bPartInTable, PART_POS.IN_TABLE, PART_POS.OUT_TABLE)
-
          ' Se deselezione da eseguire
       ElseIf m_nIdToDesel <> GDB_ID.NULL Then
          EgtDeselectObj(m_nIdToDesel)
@@ -843,8 +1580,28 @@ Public Class NestPageUC
                If Not EgtGetPartPartClusterCenterGlob(nId, ptCen) Then Return False
                ' Rotazione del pezzo attorno al suo centro
                EgtRotate(nId, ptCen, Vector3d.Z_AX(), dAngRotDeg, GDB_RT.GLOB)
+
+               '---------------------- COUNTER PART ----------------------
+               ' Aggiorno il Guid assegnando la nuova rotazione
+               Dim sRefGroup As String = String.Empty
+               If EgtGetInfo(nId, INFO_REFGROUP, sRefGroup) Then
+                  Dim sCurrRefGroup As String = sRefGroup
+                  If UppDateGuidCode(sRefGroup, CreatePreGuidCode(nId)) Then
+                     EgtSetInfo(nId, INFO_REFGROUP, sRefGroup)
+                  End If
+                  ' aggiorno il layer che indica il numero di pezzi in parcheggio
+                  CountPartInFamily(sCurrRefGroup)
+               End If
+               ' se esiste almento un pezzo del gruppo in parcheggio esco
+               If Not ParkInGroupFamily(nId) Then
+                  PackPartInStore(nId)
+               End If
+               ' ricarico l'lelenco dei pezzi in parcheggio
+               GetFamilyGroupInPark()
+               '---------------------- COUNTER PART ----------------------
+
                ' Sistemazione nel parcheggio
-               PackPartInStore(nId)
+               'PackPartInStore(nId)
             End If
             ' Passo al successivo selezionato
             nId = EgtGetNextSelectedObj()
@@ -1477,6 +2234,59 @@ Public Class NestPageUC
    End Function
 
 #End Region    ' Manager Counter Part
+   Private Sub DragRettangle_Click() Handles DragRettanleBtn.Click
+      If DragRettanleBtn.IsChecked Then
+         m_bIsCheckedDragRettangle = True
+         SplitCurveWJBtn.IsChecked = False
+         ResetSplitCurvWJParam()
+         m_bIsCheckedSplitCurveWJ = False
+         StartCurveWJBtn.IsChecked = False
+         ResetStartCurvWJParam()
+         m_bIsCheckedStartCurveWJ = False
+      Else
+         m_bIsCheckedDragRettangle = False
+         ResetDragRettangleParam()
+         m_CurrProjPage.ClearMessage()
+         ShowParkedParts()
+      End If
+      EgtDraw()
+   End Sub
+
+   Private Sub SplitCurveWJBtn_Click() Handles SplitCurveWJBtn.Click
+      If SplitCurveWJBtn.IsChecked Then
+         m_bIsCheckedSplitCurveWJ = True
+         DragRettanleBtn.IsChecked = False
+         m_bIsCheckedDragRettangle = False
+         StartCurveWJBtn.IsChecked = False
+         ResetStartCurvWJParam()
+         m_bIsCheckedStartCurveWJ = False
+      Else
+         m_bIsCheckedSplitCurveWJ = False
+         ' resetto i parametri di selezione dei lati
+         ResetSplitCurvWJParam()
+         m_CurrProjPage.ClearMessage()
+         ShowParkedParts()
+      End If
+      EgtDraw()
+   End Sub
+
+   Private Sub StartCurveWJBtn_Click() Handles StartCurveWJBtn.Click
+      If StartCurveWJBtn.IsChecked Then
+         m_bIsCheckedStartCurveWJ = True
+         DragRettanleBtn.IsChecked = False
+         m_bIsCheckedDragRettangle = False
+         ResetSplitCurvWJParam()
+         SplitCurveWJBtn.IsChecked = False
+         m_bIsCheckedSplitCurveWJ = False
+      Else
+         m_bIsCheckedStartCurveWJ = False
+         ' resetto i parametri di selezione dei lati
+         ResetStartCurvWJParam()
+         m_CurrProjPage.ClearMessage()
+         ShowParkedParts()
+      End If
+      EgtDraw()
+   End Sub
 
    Private Sub StorePartBtn_Click(sender As Object, e As RoutedEventArgs) Handles StorePartBtn.Click
       ' creo la lista delle famiglie di pezzi presenti in parcheggio
@@ -1534,7 +2344,7 @@ Public Class NestPageUC
       ' Parcheggio
       Const STORE_LARGH As Double = 6000
       Const STORE_DIST As Double = 200
-      Const STORE_OFFS As Double = 20
+      Const STORE_OFFS As Double = 20 + 40 + 20
       Dim dStXmin As Double = b3Tab.Min().x - 0.5 * (STORE_LARGH - b3Tab.DimX())
       Return EgtPackBox(nId, dStXmin, -INFINITO, dStXmin + STORE_LARGH, b3Tab.Min().y - STORE_DIST, STORE_OFFS, False)
    End Function
@@ -1869,7 +2679,7 @@ Class FamilyPart
    Private PtMaxStoraged As Point3d
 
    Private m_nHText As Integer = 40
-   Public ReadOnly Property nHText As String
+   Public ReadOnly Property nHText As Double
       Get
          Return m_nHText
       End Get

CadCuts/SplitPageUC.xaml.vb

@@ -410,25 +410,38 @@ Public Class SplitPageUC
       VerifyHomogenousMachining(ItemList)
 
       ItemList.Sort(Function(x, y) Comparer(Of Integer).Default.Compare(m_ItemList.IndexOf(x), m_ItemList.IndexOf(y)))
-      ' verifico che siano contigui
-      Dim bContigus As Boolean = False
-      Dim OrdIndex = 0
-      OrdIndex = MachiningLsBx.SelectedItems(MachiningLsBx.SelectedItems.Count - 1).Ind
-      Dim LastSel As NameIdLsBxItem = MachiningLsBx.SelectedItems(MachiningLsBx.SelectedItems.Count - 1)
-      If MachiningLsBx.SelectedItems.Count = 1 Then
-         bContigus = True
+
+      If VerifyContinuity(ItemList) Then
+         MoveUpBtn.IsEnabled = True
+         MoveDownBtn.IsEnabled = True
       Else
-         For Each Item As NameIdLsBxItem In ItemList
-            If Item.Ind = LastSel.Ind + 1 Or Item.Ind = LastSel.Ind - 1 Then
-               bContigus = True
-            End If
-         Next
-      End If
-      ' se non contiguo, elimino dai selezionati il primo(che è l'ultimo ad essere stato selezionato)
-      If Not bContigus Then
-         ItemList.Remove(LastSel)
-         MachiningLsBx.SelectedItems.RemoveAt(MachiningLsBx.SelectedItems.Count - 1)
+         MoveUpBtn.IsEnabled = False
+         MoveDownBtn.IsEnabled = False
       End If
+
+      GetCurrSelection()
+
+      '' verifico che siano contigui
+      'Dim bContigus As Boolean = False
+      'Dim OrdIndex = 0
+      'OrdIndex = MachiningLsBx.SelectedItems(MachiningLsBx.SelectedItems.Count - 1).Ind
+      '' recupero l'indice dell'ultimo elemento selezionato
+      'Dim LastSel As NameIdLsBxItem = MachiningLsBx.SelectedItems(MachiningLsBx.SelectedItems.Count - 1)
+      'If MachiningLsBx.SelectedItems.Count = 1 Then
+      '   bContigus = True
+      'Else
+      '   For Each Item As NameIdLsBxItem In ItemList
+      '      If Item.Ind = LastSel.Ind + 1 Or Item.Ind = LastSel.Ind - 1 Then
+      '         bContigus = True
+      '      End If
+      '   Next
+      'End If
+      '' se non contiguo, elimino dai selezionati il primo(che è l'ultimo ad essere stato selezionato)
+      'If Not bContigus Then
+      '   ItemList.Remove(LastSel)
+      '   MachiningLsBx.SelectedItems.RemoveAt(MachiningLsBx.SelectedItems.Count - 1)
+      'End If
+
       ' resetto marcatura lavorazioni
       If m_CurrFirstInd > -1 Then
          For Index As Integer = m_CurrFirstInd To m_CurrLastInd
@@ -497,6 +510,9 @@ Public Class SplitPageUC
    Private Sub OnOffBtn_Click(sender As Object, e As RoutedEventArgs) Handles OnOffBtn.Click
       If m_CurrFirstInd = -1 Then Return
       For Index As Integer = m_CurrFirstInd To m_CurrLastInd
+         If Not m_ItemList(Index).IsSelected Then
+            Continue For
+         End If
          Dim nI As Integer = m_ItemList(Index).Ind
          If m_MachiningList(nI).m_bEnabled Then
             m_MachiningList(nI).m_bEnabled = False
@@ -557,6 +573,9 @@ Public Class SplitPageUC
       If m_CurrFirstInd = -1 Then Return
       Dim bGenModif As Boolean = False
       For Index As Integer = m_CurrFirstInd To m_CurrLastInd
+         If Not m_ItemList(Index).IsSelected Then
+            Continue For
+         End If
          Dim nI As Integer = m_ItemList(Index).Ind
          ' Provo ad entrambi gli estremi
          Dim bModif As Boolean = AdjustBothCuts(nI)
@@ -582,6 +601,9 @@ Public Class SplitPageUC
       If m_CurrFirstInd = -1 Then Return
       Dim bGenModif As Boolean = False
       For Index As Integer = m_CurrFirstInd To m_CurrLastInd
+         If Not m_ItemList(Index).IsSelected Then
+            Continue For
+         End If
          Dim nI As Integer = m_ItemList(Index).Ind
          ' Eseguo
          If AdjustEndCut(nI) Then
@@ -601,6 +623,9 @@ Public Class SplitPageUC
       If m_CurrFirstInd = -1 Then Return
       Dim bGenModif As Boolean = False
       For Index As Integer = m_CurrFirstInd To m_CurrLastInd
+         If Not m_ItemList(Index).IsSelected Then
+            Continue For
+         End If
          Dim nI As Integer = m_ItemList(Index).Ind
          ' Eseguo
          If AdjustStartCut(nI) Then
@@ -729,6 +754,9 @@ Public Class SplitPageUC
       If m_CurrFirstInd = -1 Then Return
       Dim bGenModif As Boolean = False
       For Index As Integer = m_CurrFirstInd To m_CurrLastInd
+         If Not m_ItemList(Index).IsSelected Then
+            Continue For
+         End If
          Dim nI As Integer = m_ItemList(Index).Ind
          If m_MachiningList(nI).m_sLay = NAME_OUTLOOP Then
             EgtSetCurrMachining(m_MachiningList(nI).m_nId)
@@ -827,6 +855,9 @@ Public Class SplitPageUC
       If m_CurrFirstInd = -1 Then Return
       Dim bGenModif As Boolean = False
       For Index As Integer = m_CurrFirstInd To m_CurrLastInd
+         If Not m_ItemList(Index).IsSelected Then
+            Continue For
+         End If
          Dim nI As Integer = m_ItemList(Index).Ind
          If m_MachiningList(nI).m_sLay = NAME_OUTLOOP Then
             EgtSetCurrMachining(m_MachiningList(nI).m_nId)
@@ -966,6 +997,8 @@ Public Class SplitPageUC
    Private Sub ModifStartBtn_Click(sender As Object, e As RoutedEventArgs) Handles ModifStartBtn.Click
       ' abilito la finestra per inserire i valori solo per il primo elemento della lista (di default tutti gli altri oggetti assumono lo stesso valore)
       Dim bFirstInd As Boolean = True
+      Dim bFirstMill As Boolean = True
+      Dim bFirstWJ As Boolean = True
       ' elenco delle variabili : MCH_MY.SAWING/MCH_MY.MILLING
       Dim dUsal As Double = 0
 
@@ -980,6 +1013,9 @@ Public Class SplitPageUC
       If m_CurrFirstInd = -1 Then Return
       Dim bGenModif As Boolean = False
       For Index As Integer = m_CurrFirstInd To m_CurrLastInd
+         If Not m_ItemList(Index).IsSelected Then
+            Continue For
+         End If
          Dim nI As Integer = m_ItemList(Index).Ind
          Dim nOperId As Integer = m_MachiningList(nI).m_nId
          Dim nMachiningType As Integer = EgtGetOperationType(nOperId)
@@ -993,7 +1029,7 @@ Public Class SplitPageUC
             ' ------------------ INIZIO PREPARAZIONE TASTIERINO VIRTUALE ------------------
             If bFirstInd Then
                ' Dialogo richiesta valore
-               Dim ValWnd As New EditValueWD(m_MainWindow, EgtMsg(MSG_SPLITPAGEUC + 35))      ' Allungamento
+               Dim ValWnd As New EditValueWD(m_MainWindow, "SAW: " & EgtMsg(MSG_SPLITPAGEUC + 35))      ' Allungamento
                ValWnd.SetVal(dOrigUsal)
                If Not ValWnd.ShowDialog() Then Return
                ' carico il valore letto dal testierino virtuale
@@ -1045,16 +1081,16 @@ Public Class SplitPageUC
             ' leggo il valore salvato nella geometria
             Dim dOrigUsal As Double = 0
             EgtGetInfo(nOperId, INFO_MCH_USER_SAL, dOrigUsal)
-            If bFirstInd Then
+            If bFirstMill Then
                ' ------------------ INIZIO PREPARAZIONE TASTIERINO VIRTUALE ------------------
                ' Dialogo richiesta valore
-               Dim ValWnd As New EditValueWD(m_MainWindow, EgtMsg(MSG_SPLITPAGEUC + 35))      ' Allungamento
+               Dim ValWnd As New EditValueWD(m_MainWindow, "MILL: " & EgtMsg(MSG_SPLITPAGEUC + 35))      ' Allungamento
                ValWnd.SetVal(dOrigUsal)
                If Not ValWnd.ShowDialog() Then Return
                ' carico il valore letto dal testierino virtuale
                dUsal = ValWnd.GetVal()
                ' comunico che ho letto il primo dato
-               bFirstInd = False
+               bFirstMill = False
             End If
             ' ------------------ FINE PREPARAZIONE TASTIERINO VIRTUALE ------------------
 
@@ -1071,7 +1107,7 @@ Public Class SplitPageUC
          ElseIf nMachiningType = MCH_MY.WATERJETTING Then
 
             ' ------------------ INIZIO PREPARAZIONE TASTIERINO VIRTUALE ------------------
-            If bFirstInd Then
+            If bFirstWJ Then
                ' Recupero i valori attuali della lavorazione
                Dim bOriginalIsLeadIn As Boolean = True
                Dim dOriginalAddLen As Double = 0
@@ -1086,7 +1122,7 @@ Public Class SplitPageUC
                EgtGetMachiningParam(MCH_MP.LIPERP, nOriginalPerpDist)
                EgtGetMachiningParam(MCH_MP.LEADINTYPE, nOriginalLeadInType)
                ' Dialogo richiesta valori
-               Dim ModifStartWnd As New ModifStartEndWD(m_MainWindow, EgtMsg(MSG_SPLITPAGEUC + 33), bOriginalIsLeadIn, nOperId)      ' Inizio Modif.
+               Dim ModifStartWnd As New ModifStartEndWD(m_MainWindow, "WJ: " & EgtMsg(MSG_SPLITPAGEUC + 33), bOriginalIsLeadIn, nOperId)      ' Inizio Modif.
                ModifStartWnd.SetElongation(dOriginalAddLen)
                ModifStartWnd.SetHole(bOriginalLiHole)
                ModifStartWnd.SetLiTangDist(nOriginalTangDist)
@@ -1101,7 +1137,7 @@ Public Class SplitPageUC
                nWJPerpDist = ModifStartWnd.GetLiPerpDist()
                nWJLeadInType = ModifStartWnd.GetLeadInType().Id
                ' comunico che ho letto il primo dato
-               bFirstInd = False
+               bFirstWJ = False
             End If
             ' ------------------ INIZIO PREPARAZIONE TASTIERINO VIRTUALE ------------------
 
@@ -1132,6 +1168,8 @@ Public Class SplitPageUC
    Private Sub ModifEndBtn_Click(sender As Object, e As RoutedEventArgs) Handles ModifEndBtn.Click
       ' abilito la finestra per inserire i valori solo per il primo elemento della lista (di default tutti gli altri oggetti assumono lo stesso valore)
       Dim bFirstInd As Boolean = True
+      Dim bFirstMill As Boolean = True
+      Dim bFirstWJ As Boolean = True
       ' elenco delle variabili : MCH_MY.SAWING/MCH_MY.MILLING
       Dim dUeal As Double = 0
 
@@ -1145,6 +1183,9 @@ Public Class SplitPageUC
       If m_CurrFirstInd = -1 Then Return
       Dim bGenModif As Boolean = False
       For Index As Integer = m_CurrFirstInd To m_CurrLastInd
+         If Not m_ItemList(Index).IsSelected Then
+            Continue For
+         End If
          Dim nI As Integer = m_ItemList(Index).Ind
          Dim nOperId As Integer = m_MachiningList(nI).m_nId
          Dim nMachiningType As Integer = EgtGetOperationType(nOperId)
@@ -1158,7 +1199,7 @@ Public Class SplitPageUC
             ' ------------------ INIZIO PREPARAZIONE TASTIERINO VIRTUALE ------------------
             If bFirstInd Then
                ' Dialogo richiesta valore
-               Dim ValWnd As New EditValueWD(m_MainWindow, EgtMsg(MSG_SPLITPAGEUC + 35))      ' Allungamento
+               Dim ValWnd As New EditValueWD(m_MainWindow, "SAW: " & EgtMsg(MSG_SPLITPAGEUC + 35))      ' Allungamento
                ValWnd.SetVal(dOrigUeal)
                If Not ValWnd.ShowDialog() Then Return
                dUeal = ValWnd.GetVal()
@@ -1208,13 +1249,13 @@ Public Class SplitPageUC
             Dim dOrigUeal As Double = 0
             EgtGetInfo(nOperId, INFO_MCH_USER_EAL, dOrigUeal)
             ' ------------------ INIZIO PREPARAZIONE TASTIERINO VIRTUALE ------------------
-            If bFirstInd Then
+            If bFirstMill Then
                ' Dialogo richiesta valore
-               Dim ValWnd As New EditValueWD(m_MainWindow, EgtMsg(MSG_SPLITPAGEUC + 35))      ' Allungamento
+               Dim ValWnd As New EditValueWD(m_MainWindow, "MILL: " & EgtMsg(MSG_SPLITPAGEUC + 35))      ' Allungamento
                ValWnd.SetVal(dOrigUeal)
                If Not ValWnd.ShowDialog() Then Return
                dUeal = ValWnd.GetVal()
-               bFirstInd = False
+               bFirstMill = False
             End If
             ' ------------------ FINE PREPARAZIONE TASTIERINO VIRTUALE ------------------
             ' Modifica della lavorazione
@@ -1228,7 +1269,7 @@ Public Class SplitPageUC
             ' se altrimenti getto d'acqua
          ElseIf nMachiningType = MCH_MY.WATERJETTING Then
 
-            If bFirstInd Then
+            If bFirstWJ Then
                ' Recupero i valori attuali della lavorazione
                Dim dAddLen As Double = 0
                Dim LeadOutType As Integer = 0
@@ -1240,7 +1281,7 @@ Public Class SplitPageUC
                EgtGetMachiningParam(MCH_MP.LOTANG, nTangDist)
                EgtGetMachiningParam(MCH_MP.LOPERP, nPerpDist)
                ' Dialogo richiesta valore
-               Dim ModifStartWnd As New ModifStartEndWD(m_MainWindow, EgtMsg(MSG_SPLITPAGEUC + 34), False, nOperId)      ' Fine Modif.
+               Dim ModifStartWnd As New ModifStartEndWD(m_MainWindow, "WJ: " & EgtMsg(MSG_SPLITPAGEUC + 34), False, nOperId)      ' Fine Modif.
                ModifStartWnd.SetElongation(dAddLen)
                ModifStartWnd.SetLeadOutType(LeadOutType)
                ModifStartWnd.SetLoTangDist(nTangDist)
@@ -1250,7 +1291,7 @@ Public Class SplitPageUC
                WJLeadOutType = ModifStartWnd.GetLeadOutType().Id
                nWJTangDist = ModifStartWnd.GetLoTangDist()
                nWJPerpDist = ModifStartWnd.GetLoPerpDist()
-               bFirstInd = False
+               bFirstWJ = False
             End If
 
             ' Modifica della lavorazione
@@ -1278,6 +1319,9 @@ Public Class SplitPageUC
    Private Sub InvertBtn_Click(sender As Object, e As RoutedEventArgs) Handles InvertBtn.Click
       If m_CurrFirstInd = -1 Then Return
       For Index As Integer = m_CurrFirstInd To m_CurrLastInd
+         If Not m_ItemList(Index).IsSelected Then
+            Continue For
+         End If
          Dim nI As Integer = m_ItemList(Index).Ind
          ' Si possono invertire solo i tagli di lama
          If m_MachiningList(nI).m_nType <> MCH_OY.SAWING Then Continue For
@@ -1323,6 +1367,9 @@ Public Class SplitPageUC
       If m_CurrFirstInd = -1 Then Return
       Dim bGenModif As Boolean = False
       For Index As Integer = m_CurrFirstInd To m_CurrLastInd
+         If Not m_ItemList(Index).IsSelected Then
+            Continue For
+         End If
          Dim nI As Integer = m_ItemList(Index).Ind
          Dim nOperId As Integer = m_MachiningList(nI).m_nId
          If GetPause(nOperId) Then
@@ -1420,8 +1467,37 @@ Public Class SplitPageUC
          ' assegno numerazione
          NumberDirectionMachining(nI)
       Next
+
+      ' -------------------- Recupero le lavorazioni indicate come attive --------------------
+      Dim ActiveMachLst As New List(Of Integer)
+      For Each ItemSplitMach As NameIdLsBxItem In m_ItemList
+         ActiveMachLst.Add(ItemSplitMach.Ind)
+      Next
+      ' -------------------- Recupero le lavorazioni indicate come attive --------------------
+
       ' Preparo la lista degli Item
       ShowMachiningList()
+
+      ' -------------------- Riattivo le lavorazioni precedenti --------------------
+
+      For Each Item As SplitMach In m_MachiningList
+         EgtSetInfo(Item.m_nId, INFO_MCH_USER_OFF, True)
+      Next
+
+      For nIndex As Integer = 0 To ActiveMachLst.Count - 1
+         For Each ItemSplitMach As NameIdLsBxItem In m_ItemList
+            If ItemSplitMach.Ind = ActiveMachLst(nIndex) Then
+               EgtRemoveInfo(m_MachiningList(ItemSplitMach.Ind).m_nId, INFO_MCH_USER_OFF)
+               m_MachiningList(ItemSplitMach.Ind).m_bEnabled = True
+               ItemSplitMach.bIsActive = True
+               ' sistemo colore
+               ColorMachining(m_MachiningList(ItemSplitMach.Ind))
+               Exit For
+            End If
+         Next
+      Next
+      ' -------------------- Riattivo le lavorazioni precedenti --------------------
+
       ' Aggiorno visualizzazione
       EgtDraw()
       ' Aggiono abilitazione bottoni
@@ -1645,6 +1721,37 @@ Public Class SplitPageUC
       End If
    End Sub
 
+   Private Function VerifyContinuity(ItemList As List(Of NameIdLsBxItem)) As Boolean
+      If ItemList.Count < 2 Then Return True
+      Dim bContigus As Boolean = False
+      For Index As Integer = 0 To ItemList.Count - 2
+         If ItemList(Index).Ind = ItemList(Index + 1).Ind + 1 Or ItemList(Index).Ind = ItemList(Index + 1).Ind - 1 Then
+            bContigus = True
+         Else
+            bContigus = False
+            Exit For
+         End If
+      Next
+      Return bContigus
+   End Function
+
+   Private Sub GetCurrSelection()
+      For Each Item As NameIdLsBxItem In m_ItemList
+         Item.IsSelected = False
+      Next
+      ' recupero il numero di elementi selezionati
+      Dim nCount As Integer = MachiningLsBx.SelectedItems.Count
+      For Index As Integer = 0 To nCount - 1
+         Dim Local_ItemTemplate As NameIdLsBxItem = MachiningLsBx.SelectedItems(Index)
+         For Each Item As NameIdLsBxItem In m_ItemList
+            If Item.Ind = Local_ItemTemplate.Ind Then
+               Item.IsSelected = True
+               Exit For
+            End If
+         Next
+      Next
+   End Sub
+
    Private Sub VisibilityButtonFromMachinig(ByVal Type As Integer)
       If Type <> MCH_OY.SAWING Then
          CutBtn.Visibility = Visibility.Hidden
@@ -1721,6 +1828,15 @@ Public Class SplitPageUC
       vtXY.Normalize()
       Dim ptCen As Point3d = Point3d.Media(ptMin, ptMax) + vtXY * If(Not b2ndLav, -0.8, 0.8) * dHtxt
       ptCen.z = ptMax.z + 1
+
+      ' ricavo la posizione del punto (se waterjet separata)
+      If m_MachiningList(nI).m_nType = MCH_OY.WATERJETTING Or m_MachiningList(nI).m_nType = MCH_OY.MILLING Then
+         Dim ptMid As Point3d
+         Dim vVers As Vector3d
+         MidPointOfCurve(m_MachiningList(nI).m_nId, ptMid, vVers)
+         ptCen = ptMid ' + vVers * If(Not b2ndLav, -0.8, 0.8) * dHtxt
+      End If
+
       If bNumber Then
          Dim nNbrId As Integer = EgtCreateTextAdv( m_nNbrGrpId, ptCen, 0, (nI + 1).ToString(), "",
                                                    300, False, dHtxt, dRat, 0, INS_POS.MC)
@@ -1775,6 +1891,36 @@ Public Class SplitPageUC
       Return EgtGetBBoxGlob(nPvId, GDB_BB.STANDARD, ptMin, ptMax)
    End Function
 
+   Private Function MidPointOfCurve(nOperId As Integer, ByRef ptMid As Point3d, ByRef vVers As Vector3d) As Boolean
+      Dim nPvId As Integer = GDB_ID.NULL
+      EgtGetInfo(EgtGetFirstNameInGroup(nOperId, NAME_PREVIEW), INFO_PV_ONPART_ID, nPvId)
+      ' creo un layer ausiliario per creare la curva composita
+      Dim AuxLayer As Integer = EgtCreateGroup(nPvId)
+      ' imposto la lavorazione corrente
+      EgtSetCurrMachining(nOperId)
+      ' recupero tutte le entità della lavorazione corrente
+      Dim nInd As Integer = 0
+      Dim nIdCurr As Integer
+      Dim nSub As Integer
+      Dim CurveCompoList As New List(Of Integer)
+      While EgtGetMachiningGeometry(nInd, nIdCurr, nSub)
+         CurveCompoList.Add(nIdCurr)
+         nInd += 1
+      End While
+      Dim PtNearStart As Point3d
+      Dim nIdCutPath As Integer = EgtCreateCurveCompoByChain(AuxLayer, CurveCompoList.ToArray, PtNearStart, False)
+      Dim dLength As Double = 0
+      EgtCurveLength(nIdCutPath, dLength)
+      Dim dParam As Double = 0
+      EgtCurveParamAtLength(nIdCutPath, dLength / 2, dParam)
+      EgtAtParamPoint(nIdCutPath, dParam, GDB_RT.GLOB, ptMid)
+      EgtAtParamVector(nIdCutPath, dParam, -1, vVers)
+      vVers.Normalize()
+      vVers.Rotate(Vector3d.Z_AX, 90)
+      EgtErase(AuxLayer)
+      Return True
+   End Function
+
    Private Function AddMachiningDirection( ptStart As Point3d, vtDir As Vector3d, dLen As Double, bTwin As Boolean) As Integer
       Dim dArrX As Double = dLen * Math.Cos( 30 * Math.PI / 180)
       Dim dArrY As Double = dLen * Math.Sin( 30 * Math.PI / 180)
@@ -1854,7 +2000,10 @@ Public Class SplitPageUC
       EgtDisableModified()
       ' cancello evidenziazione
       If m_CurrFirstInd >= 0 Then
-         For Index As integer = m_CurrFirstInd To m_CurrLastInd
+         For Index As Integer = m_CurrFirstInd To m_CurrLastInd
+            If Not m_ItemList(Index).IsSelected Then
+               Continue For
+            End If
             MarkMachining(m_ItemList(Index).Ind, False)
          Next
          m_CurrFirstInd = -1
@@ -1913,6 +2062,8 @@ Public Class SplitPageUC
       Private m_bIsActive As Boolean
       Private m_nType As Integer
 
+      Private m_IsSelected As Boolean
+
       Public Property Ind As Integer
          Get
             Return m_nInd
@@ -1955,6 +2106,15 @@ Public Class SplitPageUC
          End Set
       End Property
 
+      Public Property IsSelected As Boolean
+         Get
+            Return m_IsSelected
+         End Get
+         Set(value As Boolean)
+            m_IsSelected = value
+         End Set
+      End Property
+
       Sub New(Name As String, Ind As Integer, bIsActive As Boolean, nType As Integer)
          Me.m_sName = Name
          Me.m_nInd = Ind

CadCuts/VacuumCups.vb

@@ -1,4 +1,5 @@
 Imports EgtUILib
+Imports System.Text.RegularExpressions
 
 Module VacuumCups
    ' Tipo manipolatore con ventosa (0=assente, 1=dietro, 2=laterale)
@@ -10,7 +11,22 @@ Module VacuumCups
    Private m_dPreferredRot As Double = 0
    Private m_dPrefVertRotXMinus As Double = 0
    Private m_dPrefVertRotXPlus As Double = 0
+   Private m_dPrefVertRotYMinus As Double = 0
+   Private m_dPrefVertRotYPlus As Double = 0
    Private m_dDripRefAng As Double = 0
+   ' dati carico massimo manipolatore
+   Private m_RawDensity As Double = 2500
+   Private m_RawWeight As Double = 0
+   Private m_MaxWeightSinglePlugger As Double = 250
+   Private m_MaxWeightDoublePlugger As Double = 750
+   Public bOverWeight As Boolean = False
+   ' dati per rotazione ventose vicono al fine corsa Y e X
+   Private bRotateVacuumNearExtraStrokeY As Boolean = False
+   Private bRotateVacuumNearExtraStrokeX As Boolean = False
+   ' dati stroke
+   Public bExtraStroke As Boolean = False
+   Public ptStartPointLift As Point3d
+   Public dDegRotStartAng As Double
 
    ' Nome del gruppo temporaneo per le ventose
    Private Const VACTMP_GRP As String = "VacTmp"
@@ -50,6 +66,20 @@ Module VacuumCups
       Return m_nVacType
    End Function
 
+   ' carico i dati macchina relativi al peso massimo movimentabile
+   Friend Sub GetWeightInformation(Density As Double, MaxSingle As Double, MaxDouble As Double)
+      m_RawDensity = Density
+      m_MaxWeightSinglePlugger = MaxSingle
+      m_MaxWeightDoublePlugger = MaxDouble
+   End Sub
+
+   Friend Sub GetRotationForExtraStrokeY(Rotate As Boolean)
+      bRotateVacuumNearExtraStrokeY = Rotate
+   End Sub
+
+   Friend Sub GetRotationForExtraStrokeX(Rotate As Boolean)
+      bRotateVacuumNearExtraStrokeX = Rotate
+   End Sub
    Friend Function GetVacuumId() As Integer
       Return m_nVacId
    End Function
@@ -66,6 +96,8 @@ Module VacuumCups
       ' Identificativo riferimento della testa nella macchina
       Dim nT1Id As Integer = EgtGetFirstNameInGroup(EgtGetHeadId(VACUUM_HEAD), HEAD_FIRST_EXIT)
       If nT1Id = GDB_ID.NULL Then Return False
+      ' imposto la l'uscita della ventosa come fosse l'uscita di un utensile
+      EgtSetCalcTool("", "H4", 1)
       ' Creo gruppo temporaneo in cui copiarli
       m_nTempId = EgtCreateGroup(GDB_ID.ROOT)
       If m_nTempId = GDB_ID.NULL Then Return False
@@ -78,7 +110,9 @@ Module VacuumCups
       EgtGetInfo( m_nVacId, KEY_VACLAY_PREFROT, m_dPreferredRot)
       ' Angoli di rotazione preferiti per ventosa in verticale (lungo Y) a sinistra e a destra del centro tavola
       EgtGetInfo( m_nVacId, KEY_VACLAY_PREFVROTXMINUS, m_dPrefVertRotXMinus)
-      EgtGetInfo( m_nVacId, KEY_VACLAY_PREFVROTXPLUS, m_dPrefVertRotXPlus)
+      EgtGetInfo(m_nVacId, KEY_VACLAY_PREFVROTXPLUS, m_dPrefVertRotXPlus)
+      EgtGetInfo(m_nVacId, KEY_VACLAY_PREFVROTYMINUS, m_dPrefVertRotYMinus)
+      EgtGetInfo(m_nVacId, KEY_VACLAY_PREFVROTYPLUS, m_dPrefVertRotYPlus)
       ' Direzione di riferimento per tagli Drip
       EgtGetInfo( m_nVacId, KEY_VACLAY_DRIPREFDIR, m_dDripRefAng)
       ' Nascondo il gruppo ma rendo visibili le curve di contorno delle ventose
@@ -165,6 +199,18 @@ Module VacuumCups
       EgtGetBBoxGlob(nRKerfId, GDB_BB.STANDARD, b3Kerf)
       Dim ptKerfCen As Point3d
       EgtCentroid(nRKerfId, GDB_ID.ROOT, ptKerfCen)
+
+      '-------------------- INIZIO CALCOLO PESO --------------------
+      ' recupero l'area del grezzo da muovere
+      Dim RawArea As Double = 0
+      ' superficie del grezzo senza considerare eventuali fori
+      EgtSurfFrGrossArea(nRKerfId, RawArea)
+      ' volume calcolato in mmc
+      Dim RawVolume As Double = RawArea * b3Raw.DimZ()
+      ' peso calolato in kg
+      m_RawWeight = RawVolume * m_RawDensity / Math.Pow(10, 9)
+      '-------------------- FINE CALCOLO PESO --------------------
+
       ' Eseguo ricerca
       If FindVacuumCupsOnRaw(nRawId, ptRawCen, b3Kerf, ptKerfCen, nKerfId, nRKerfId, rmData) Then
          Return True
@@ -187,6 +233,7 @@ Module VacuumCups
       Return False
    End Function
 
+   ' utilizzata per gestire la movimentazione dei pezzi per eseguire i drip
    Friend Function PutVacuumCupsOnPart(nPartId As Integer,
                                        ByRef rmData As RawMoveData, ByRef b3Part As BBox3d) As Boolean
       ' Ripristino posizione originale ventose
@@ -266,6 +313,7 @@ Module VacuumCups
          Dim sCups() As String = Nothing
          Dim sCups2() As String = Nothing
          If Not GetVacuumCupSelection(nI, sCups, sCups2) Then Return False
+         bExtraStroke = False
          ' Determino validità soluzioni della configurazione
          Dim vtMove As New Vector3d
          Dim ptRotCen As New Point3d
@@ -294,6 +342,7 @@ Module VacuumCups
          Dim frCurrRef As New Frame3d
          EgtFrame(m_nRefId, GDB_ID.ROOT, frCurrRef)
          Dim vtDelta As Vector3d = frCurrRef.Orig() - ptRawCen
+
          ' Assegno dati noti al movimento del grezzo
          rmData.m_nId = nRawId
          rmData.m_vtRawMove = Vector3d.NULL()
@@ -368,6 +417,23 @@ Module VacuumCups
       If b3Vac.IsEmpty() Then Return INFINITO
       ' Se box maggiore di quello del pezzo, scarto soluzione
       If b3Vac.Radius() > b3Raw.Radius() Then Return INFINITO
+      '-------------------- INIZIO VERIFICA PESO --------------------
+      bOverWeight = False
+      Select Case GetPluggerFromCameras(sCups)
+         Case 2
+            ' se peso del grezzo oltre il limite consentito allora scarto la soluzione
+            If m_RawWeight > m_MaxWeightDoublePlugger Then
+               bOverWeight = True
+               Return INFINITO
+            End If
+         Case 1
+            ' se peso del grezzo oltre il limite consentito allora scarto la soluzione
+            If m_RawWeight > m_MaxWeightSinglePlugger Then
+               bOverWeight = True
+               Return INFINITO
+            End If
+      End Select
+      '-------------------- FINE VERIFICA PESO --------------------
       ' Recupero l'area della tavola
       Dim b3Tab As New BBox3d
       EgtGetTableArea(1, b3Tab)
@@ -383,13 +449,24 @@ Module VacuumCups
          dRotAngDeg = dAngOrizzDeg
          If b3Vac.DimY() > b3Vac.DimX() + EPS_SMALL Then dRotAngDeg -= 90
          Dim dPreferredRot As Double = m_dPreferredRot
-         If Math.Abs( dRotAngDeg - 90) < 45  Or  Math.Abs( dRotAngDeg - 270) < 45 Then
+         ' -------------------- INIZIO GESTIONE ROTAZIONE ASSE C PER NON ANDARE IN EXTRA-CORSA --------------------
+         ' verifico l'orientamento del pezzo
+         If bRotateVacuumNearExtraStrokeX And (Math.Abs(dRotAngDeg - 90) < 45 Or Math.Abs(dRotAngDeg - 270) < 45) Then
+            ' se l'orientamento è verticale
             If frMinRect.Orig().x < b3Tab.Center().x Then
                dPreferredRot = m_dPrefVertRotXMinus
-            else
+            Else
                dPreferredRot = m_dPrefVertRotXPlus
             End If
-         End If 
+         ElseIf bRotateVacuumNearExtraStrokeY And (Math.Abs(dRotAngDeg - 90) > 45 Or Math.Abs(dRotAngDeg - 270) > 45) Then
+            ' se l'orientemanto è orizzontale e la macchina è stata abilitata
+            If frMinRect.Orig().y < b3Tab.Center().y Then
+               dPreferredRot = m_dPrefVertRotYPlus
+            Else
+               dPreferredRot = m_dPrefVertRotYMinus
+            End If
+         End If
+         ' -------------------- FINE GESTIONE ROTAZIONE ASSE C PER NON ANDARE IN EXTRA-CORSA --------------------
          Dim dAngDelta As Double = If( Math.Abs( b3Vac.DimY() - b3Vac.DimX()) < 10 * EPS_SMALL, 90, 180)
          While dRotAngDeg - dPreferredRot >= dAngDelta / 2 
             dRotAngDeg -= dAngDelta
@@ -446,11 +523,55 @@ Module VacuumCups
       ' Applico movimento e rotazione al punto
       ptRef.Move(vtMove)
       ptRef.Rotate(ptRotCen, Vector3d.Z_AX(), dRotAngDeg)
+
+      ' -------------- INIZIO verifica di essere nel limite delle corse macchina --------------
+      If VerifyOutOfStrokes(ptRef, dRotAngDeg) <> 0 Then
+         bExtraStroke = True
+         Return INFINITO
+      End If
+      ' se la posizione è accettbaile allora salvo i dati
+      ptStartPointLift = ptRef
+      dDegRotStartAng = dRotAngDeg
+      ' -------------- FINE verifica di essere nel limite delle corse macchina --------------
+
       ' Ne calcolo la distanza dal centro della tavola
       Dim dDist As Double = Point3d.DistXY(ptRef, b3Tab.Center())
       Return dDist
    End Function
 
+   ' assegante le posizioni del centro delle ventose e l'angolo di posizionamento orizzontale verifica che la posizione sia raggiungibile
+   Public Function VerifyOutOfStrokes(ptRef As Point3d, dRotAngDeg As Double) As Integer
+      Dim dX, dY, dZ As Double
+      Dim nStat As Integer
+      Dim dCHome As Double
+      EgtGetAxisHomePos("C", dCHome)
+      ' imposto la l'uscita della ventosa come fosse l'uscita di un utensile
+      EgtSetCalcTool("", "H4", 1)
+      EgtGetCalcPositions(ptRef, dRotAngDeg + dCHome, 0, nStat, dX, dY, dZ)
+      EgtVerifyOutstroke(dX, dY, dZ, dRotAngDeg + dCHome, 0, nStat)
+      Return nStat
+   End Function
+
+   ' dall'informazione di extra corsa recupera il valore indicato
+   Public Function GetExtraStrokeValue(sInfo As String) As Double
+      Dim dExtraStroke As Double = 0
+      Dim sItems As String() = sInfo.Split("="c)
+      If sItems.Count = 2 Then
+         Dim nStartIndex As Integer = 0
+         For Each ItemChar As Char In sItems(1)
+            If ItemChar = "("c Then
+               Exit For
+            End If
+            nStartIndex += 1
+         Next
+         If nStartIndex > 0 Then
+            Dim sValue As String = sItems(1).Remove(nStartIndex, sItems(1).Count - nStartIndex)
+            StringToLen(sValue, dExtraStroke)
+         End If
+      End If
+      Return dExtraStroke
+   End Function
+
    Private Function TestVacuumCups(nCups() As Integer, nRawRegId As Integer,
                                    vtMove As Vector3d, ptRotCen As Point3d, dRotAngDeg As Double) As Boolean
       ' Eseguo verifica delle ventose rispetto al grezzo
@@ -471,6 +592,28 @@ Module VacuumCups
       Return bVacOk
    End Function
 
+   ' dato il vettore delle camere restituisco il quali attuatori sono coinvolti
+   Private Function GetPluggerFromCameras(sCups() As String) As Integer
+      Dim nCountPlunger As Integer = 1
+      Dim bPlugger1 As Boolean = False
+      Dim bPlugger2 As Boolean = False
+      For Each Camera As String In sCups
+         If (Camera.Contains("1") Or Camera.Contains("2") Or Camera.Contains("3")) Then
+            bPlugger1 = True
+         Else
+            bPlugger2 = True
+         End If
+      Next
+      ' verifico quali sono le camere attive
+      If bPlugger1 And bPlugger2 Then
+         nCountPlunger = 2
+      ElseIf Not bPlugger1 And Not bPlugger2 Then
+         nCountPlunger = 0
+      End If
+      ' restituisco il numero di Plugger in uso
+      Return nCountPlunger
+   End Function
+
    Friend Function SaveOneMoveInfo(nId As Integer, rmData As RawMoveData) As Boolean
       ' Assegno le informazioni
       EgtSetInfo(nId, "Id", rmData.m_nId)

Constants/ConstGen.vb

@@ -94,6 +94,8 @@ Module ConstGen
    Public Const KEY_VACLAY_PREFROT As String = "PreferredRot"
    Public Const KEY_VACLAY_PREFVROTXMINUS As String = "PrefVertRotXMinus"
    Public Const KEY_VACLAY_PREFVROTXPLUS As String = "PrefVertRotXPlus"
+   Public Const KEY_VACLAY_PREFVROTYMINUS As String = "PrefVertRotYMinus"
+   Public Const KEY_VACLAY_PREFVROTYPLUS As String = "PrefVertRotYPlus"
    ' Info in gruppo layout per direzione di riferimento ventose per tagli da sotto
    Public Const KEY_VACLAY_DRIPREFDIR As String = "DripRefDir"
    ' Info in asse rotante ventosa per step discreti
@@ -185,6 +187,8 @@ Module ConstGen
    Public Const INFO_TOTAREA As String = "TotArea"
    ' Info per area da produrre dei pezzi del progetto
    Public Const INFO_TOPRODAREA As String = "ToProdArea"
+   ' Info per nome progetti
+   Public Const INFO_PROJNAME As String = "ProjName"
 
    ' Nome layer delle regioni
    Public Const NAME_REGION As String = "Region"
@@ -210,7 +214,8 @@ Module ConstGen
    Public Const INFO_DEPTH As String = "Depth"
    Public Const INFO_WIDTH As String = "Width"
    Public Const INFO_DEPTH2 As String = "Depth2"
-   Public CONST INFO_AGG2 As String = "Agg2"
+   Public Const INFO_AGG2 As String = "Agg2"
+   Public Const INFO_ROUNDOFF As String = "RoundOff"
    ' Info in entità da tagliare per taglio ristretto
    Public Const INFO_STRICT As String = "Strict"
    ' Info in entità da tagliare per angolo di lato e tallone
@@ -300,6 +305,12 @@ Module ConstGen
    Public Const INFO_PARTOK As String = "POK"
    ' Info in pezzo per stato rotazione
    Public Const INFO_PARTROT As String = "ROT"
+   ' Info in entità in OutLoop per indicare se è separata WaterJet
+   Public Const INFO_JOINENTITY As String = "JoinEntity"
+   ' Nome layer per "*" inidcanti un lato separato nel taglio WaterJet
+   Public Const INFO_AUX_SPLIT_WJ As String = "AUX_SPLIT_WJ"
+   ' Info in OutLoop per punto inzio lavorazione WaterJet
+   Public Const INFO_START As String = "Start"
 
    ' Nome di pezzo che è una cornice
    Public Const NAME_FRAME As String = "Frame"

Constants/ConstIni.vb

@@ -46,6 +46,10 @@ Module ConstIni
    Public Const K_THEME As String = "Theme"
    Public Const K_MANUAL_CUT As String = "ManualCut"
    Public Const K_TEST As String = "Test"
+   Public Const K_SMARTMACHININGPAGE As String = "SmartMachiningPage"
+   Public Const K_STARTPROGRAM As String = "StartProgram"
+   Public Const K_GENERATECN As String = "GenerateCN"
+
 
    Public Const S_LANGUAGES As String = "Languages"
    Public Const K_LANGUAGE As String = "Language"
@@ -129,6 +133,7 @@ Module ConstIni
    Public Const K_ENGRAVENUMBER2 As String = "EngraveNumber2"
    Public Const K_ENGRAVEOFFSET2 As String = "EngraveOffset2"
    Public Const K_ENGRAVEDEPTH As String = "EngraveDepth"
+   Public Const K_ENGRAVEDEPTH2 As String = "EngraveDepth2"
    Public Const K_ENGRAVESHORT As String = "EngraveShort"
    Public Const K_DRIPOFFSET As String = "DripOffset"
    Public Const K_DRIPOFFSET2 As String = "DripOffset2"
@@ -137,6 +142,7 @@ Module ConstIni
    Public Const K_UNDERDRILLDEPTH As String = "UnderDrillDepth"
    Public Const K_FILOTOPOFFSET As String = "FiloTopOffset"
    Public Const K_FILOTOPDEPTH As String = "FiloTopDepth"
+   Public Const K_ROUNDOFF As String = "RoundOff"
 
    Public Const S_NEST As String = "Nest"
    Public Const K_DIRECT As String = "Direct"
@@ -148,6 +154,7 @@ Module ConstIni
    Public Const K_TEXTCOLOR As String = "TextColor"
    Public Const K_AUTOMATICOPTIMIZE As String = "AutomaticOptimize"
    Public Const K_AUTOMATICMAXTIME As String = "AutomaticMaxTime"
+   Public Const K_DRAG_RETTANGLE As String = "DragRectangle"
 
    Public Const S_SPLIT As String = "Split"
    Public Const K_MOVE_LEV As String = "MoveLevel"

Constants/ConstMachIni.vb

@@ -228,6 +228,10 @@
    Public Const S_MACH_RAWMOVE As String = "RawMove"
    Public Const K_MACH_RM_ROTATE As String = "Rotate"
    Public Const K_MACH_RM_FINALMOVE As String = "FinalMove"
+   Public Const K_MACH_WEIGHT_SINGLEPLUGGER As String = "MaxWeightSinglePlugger"
+   Public Const K_MACH_WEIGHT_DOUBLEPLUGGER As String = "MaxWeightDoublePlugger"
+   Public Const K_MACH_ROTATEVACUUMFOREXTRASTROKEY As String = "RotateVacuumForExtraStrokeY"
+   Public Const K_MACH_ROTATEVACUUMFOREXTRASTROKEX As String = "RotateVacuumForExtraStrokeX"
 
    Public Const S_MACH_REG As String = "Reg"
    Public Const K_MACH_MAX_ROT_ANG As String = "MaxRotAng"
@@ -290,5 +294,6 @@
    Public Const K_CURRMATERIAL As String = "CurrMaterial"
    Public Const K_MATERIAL As String = "Material"
    Public Const K_FROMDBWATERJET As String = "FromDBWaterJet"
+   Public Const K_AVERAGEDENSITY As String = "AverageDensity"
 
 End Module

DirectCuts/FlatteningCut.xaml.vb

@@ -66,6 +66,7 @@ Public Class FlatteningCut
       Right
    End Enum
 
+   ' Per abilitare la spianatura con la FRESA deve essere imposatato a TRUE il flag "Usa Fresa" nella pagina MACCHINA (campo INCISIONI)
    Private Sub FlatteningCut_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
       ' Creo lista modalità di acquisizione punto 
       m_PointsModeArray(PT_MODE.SAW) = EgtMsg(MSG_DIRECTCUTPAGEUC + 24)
@@ -614,9 +615,11 @@ Public Class FlatteningCut
 
    ' ricavo l'ingombro di lavorazione in funzione dell'utensile selezionato
    Private Function GetFootPrintTool() As Double
+      ' vedere nella pagina Allarm il capito "Incisioni"
+      Dim bForceUseMill As Boolean = (GetPrivateProfileInt(S_MACH_NEST, K_MACH_ENGRAVING_WITHMILL, 1, m_MainWindow.GetMachIniFile()) <> 0)
       Dim dFootPrint As Double = 0
       ' verifico quale lavorazione è attiva
-      If Not String.IsNullOrEmpty(m_MainWindow.m_CurrentMachine.sCurrSawing) Then
+      If Not String.IsNullOrEmpty(m_MainWindow.m_CurrentMachine.sCurrSawing) AndAlso Not bForceUseMill Then
          EgtTdbGetCurrToolParam(MCH_TP.THICK, dFootPrint)
       ElseIf Not String.IsNullOrEmpty(m_MainWindow.m_CurrentMachine.sCurrMilling) Then
          Dim sCurrMill = m_MainWindow.m_CurrentMachine.sCurrMill
@@ -644,13 +647,17 @@ Public Class FlatteningCut
       Dim nPartId = EgtCreateGroup(GDB_ID.ROOT)
       EgtSetName(nPartId, NAME_DIRECTCUT)
       Dim nLayerId = EgtCreateGroup(nPartId)
-      EgtSetName(nLayerId, NAME_OUTLOOP)
+      ' EgtSetName(nLayerId, NAME_OUTLOOP)
+      EgtSetName(nLayerId, NAME_ONPATH)
       ' Creo il taglio
       Dim ptStart As Point3d = m_ptTipP1
       ptStart.z = 0
       Dim nCutId = EgtCreateLinePDL(nLayerId, ptStart, m_dAngO, m_dLen)
       ' Imposto affondamento e angolo di fianco sul taglio
       EgtSetInfo(nCutId, INFO_DEPTH, m_dDepth)
+      If (GetPrivateProfileInt(S_MACH_NEST, K_MACH_ENGRAVING_WITHMILL, 1, m_MainWindow.GetMachIniFile()) <> 0) Then
+         EgtSetInfo(nCutId, INFO_WIDTH, GetFootPrintTool)
+      End If
       EgtSetInfo(nCutId, INFO_SIDE_ANGLE, 0)
       ' Imposto prima direzione
       EgtSetInfo(nCutId, INFO_DIR, 1)

DrawImport/AlzFrontUC.xaml.vb

@@ -76,9 +76,9 @@ Public Class AlzFrontUC
       m_MainWindow.m_DrawPageUC.DripCutBtn.IsEnabled = False
 
       ' nome dei parametri condivisi
-      Parameter1TxBl.Text = "Altezza"
-      Parameter2TxBl.Text = "Delta angolo"
-      Parameter5TxBl.Text = "Spessore"
+      Parameter1TxBl.Text = EgtMsg(91134)
+      Parameter2TxBl.Text = EgtMsg(91135)
+      Parameter5TxBl.Text = EgtMsg(91136)
 
       EgtZoom(ZM.ALL)
    End Sub

DrawImport/CompoDimensionUC.xaml.vb

@@ -336,6 +336,7 @@ Public Class CompoDimensionUC
             Dim nCmpInfo As Integer = 0
             If EgtGetInfo(nId, "ID", nCmpInfo) AndAlso nCmp = nCmpInfo Then
                EgtSetStatus(nId, GDB_ST.OFF)
+               UpdateInLoopReference(nCmp)
                Exit While
             End If
             nId = EgtGetNextName(nId, "HoleLabels")
@@ -379,5 +380,42 @@ Public Class CompoDimensionUC
       EgtDraw()
    End Sub
 
+   Private Sub UpdateInLoopReference(nCmp As Integer)
+      ' aggiorno il layer "FiloTop"
+      Dim nIdInLoop As Integer = EgtGetFirstNameInGroup(EgtGetFirstGroupInGroup(GDB_ID.ROOT), "InLoop")
+      While nIdInLoop <> GDB_ID.NULL
+         Dim nCmpInfoIL As Integer = 0
+         If EgtGetInfo(nIdInLoop, "ID", nCmpInfoIL) AndAlso nCmp = nCmpInfoIL Then
+            Dim nLayFiloTop As Integer = GDB_ID.NULL
+            EgtGetInfo(nIdInLoop, "FiloTopRef", nLayFiloTop)
+            If nLayFiloTop <> GDB_ID.NULL Then
+               Dim LocalList As New List(Of Integer) From {nIdInLoop}
+               m_DrawPage.m_FiloTopUC.CreateFiloTopPreView(LocalList)
+               EgtSetStatus(nLayFiloTop, GDB_ST.ON_)
+               Exit While
+            End If
+         End If
+         nIdInLoop = EgtGetNextName(nIdInLoop, "InLoop")
+      End While
+   End Sub
+
+   ' riceve la info "ID" della componente
+   Public Sub SetStatusVisibilityInLoopReference(nCmp As Integer, Status As GDB_ST)
+      ' aggiorno il layer "FiloTop"
+      Dim nIdInLoop As Integer = EgtGetFirstNameInGroup(EgtGetFirstGroupInGroup(GDB_ID.ROOT), "InLoop")
+      While nIdInLoop <> GDB_ID.NULL
+         Dim nCmpInfoIL As Integer = 0
+         If EgtGetInfo(nIdInLoop, "ID", nCmpInfoIL) AndAlso nCmp = nCmpInfoIL Then
+            Dim nLayFiloTop As Integer = GDB_ID.NULL
+            EgtGetInfo(nIdInLoop, "FiloTopRef", nLayFiloTop)
+            If nLayFiloTop <> GDB_ID.NULL Then
+               EgtSetStatus(nLayFiloTop, Status)
+               Exit While
+            End If
+         End If
+         nIdInLoop = EgtGetNextName(nIdInLoop, "InLoop")
+      End While
+   End Sub
+
 #End Region    ' METHODS for InternalCompo
 End Class

DrawImport/DrawPageUC.xaml.vb

@@ -41,6 +41,9 @@ Public Class DrawPageUC
    Friend m_bDrawOk As Boolean = False
    Private m_bFirst As Boolean = True
 
+   Private m_SelListHole As New List(Of Integer)
+   Private m_DeselectListHole As New List(Of Integer)
+
    ' questa variabile serve per risalire al nome della componente che ospita i componenti interni att
    Friend m_sMainCompo As String = String.Empty
 
@@ -360,6 +363,8 @@ Public Class DrawPageUC
          Dim nCmpInfo As Integer = 0
          If EgtGetInfo(nHLId, "ID", nCmpInfo) AndAlso nCmp = nCmpInfo Then
             EgtSetStatus(nHLId, GDB_ST.ON_)
+            ' nascondo eventuali FiloTop
+            m_CompoDimension.SetStatusVisibilityInLoopReference(nCmp, GDB_ST.OFF)
             Exit While
          End If
          nHLId = EgtGetNextName(nHLId, "HoleLabels")
@@ -462,21 +467,25 @@ Public Class DrawPageUC
                   EgtDeselectObj(nId)
                   EgtDeselectObj(nLayId)
                   Dim sLayName As String = ""
-                  If EgtGetName(nLayId, sLayName) AndAlso sLayName = NAME_INLOOP AndAlso EgtExistsInfo( nLayId, INFO_FILOTOP) Then
-                     EgtRemoveInfo( nLayId, INFO_FILOTOP)
-                     EgtRemoveInfo( nLayId, INFO_OFFSET)
-                     EgtRemoveInfo( nLayId, INFO_DEPTH)
-                     EgtResetColor( nLayId)
+                  If EgtGetName(nLayId, sLayName) AndAlso sLayName = NAME_INLOOP AndAlso EgtExistsInfo(nLayId, INFO_FILOTOP) Then
+                     EgtRemoveInfo(nLayId, INFO_FILOTOP)
+                     EgtRemoveInfo(nLayId, INFO_OFFSET)
+                     EgtRemoveInfo(nLayId, INFO_DEPTH)
+                     EgtResetColor(nLayId)
                   End If
+                  m_DeselectListHole.Add(nLayId)
+                  m_SelListHole.Remove(nLayId)
                Else
                   Dim sLayName As String = ""
-                  If EgtGetName( nLayId, sLayName) AndAlso sLayName = NAME_INLOOP Then
-                     EgtSelectObj( nId)
-                     EgtSelectObj( nLayId)
-                     EgtSetInfo( nLayId, INFO_FILOTOP, 1)
-                     EgtSetInfo( nLayId, INFO_OFFSET, m_FiloTopUC.FiloTopOffset)
-                     EgtSetInfo( nLayId, INFO_DEPTH, m_FiloTopUC.FiloTopDepth)
-                     EgtSetColor( nLayId, New Color3d(255, 255, 255))
+                  If EgtGetName(nLayId, sLayName) AndAlso sLayName = NAME_INLOOP Then
+                     EgtSelectObj(nId)
+                     EgtSelectObj(nLayId)
+                     EgtSetInfo(nLayId, INFO_FILOTOP, 1)
+                     EgtSetInfo(nLayId, INFO_OFFSET, m_FiloTopUC.FiloTopOffset)
+                     EgtSetInfo(nLayId, INFO_DEPTH, m_FiloTopUC.FiloTopDepth)
+                     EgtSetColor(nLayId, New Color3d(255, 255, 255))
+                     m_SelListHole.Add(nLayId)
+                     m_DeselectListHole.Remove(nLayId)
                   End If
                End If
                EgtDraw()
@@ -484,6 +493,8 @@ Public Class DrawPageUC
          End If
          nId = EgtGetNextObjInSelWin()
       End While
+      m_FiloTopUC.CreateFiloTopPreView(m_SelListHole)
+      m_FiloTopUC.EraseFiloTopPreview(m_DeselectListHole)
    End Sub
 
    Private Sub OnShowDistanceVector(sender As Object, vtDist As Vector3d) Handles DrawScene.OnShowDistanceVector
@@ -882,7 +893,7 @@ Public Class DrawPageUC
 
    ' permette di inserire più di un part
    Private Function MakeMultipleInsert(ByVal nNbr As Integer, sName As String) As Boolean
-      
+
       Dim InsertColor As Color3d = CompoColor(m_MainWindow.GetIniFile())
 
       ' Imposto il contesto corrente
@@ -1047,8 +1058,7 @@ Public Class DrawPageUC
          If nNbr > 1 Then
             sGUICode = System.Guid.NewGuid.ToString
          End If
-         ' dimensione caratteri per numero di pezzi
-         Dim nHText As Integer = 40
+
          ' Se esiste il file del pezzo
          If My.Computer.FileSystem.FileExists(sTmpFile) Then
             ' eseguo inserimento
@@ -1066,7 +1076,8 @@ Public Class DrawPageUC
 
                ' assegno l'identificatico del pezzo, se esiste
                If Not String.IsNullOrEmpty(sGUICode) Then
-                  EgtSetInfo(nId2, INFO_REFGROUP, sGUICode)
+                  Dim sPreGuid As String = CreatePreGuidCode(nId2)
+                  EgtSetInfo(nId2, INFO_REFGROUP, sPreGuid & sGUICode)
                End If
                ' muovo il pezzo nella prima posizione di parcheggio libera
                m_MainWindow.m_CadCutPageUC.m_NestPage.StoreOnePart(nId2, True)
@@ -1362,6 +1373,8 @@ Public Class DrawPageUC
    End Sub
 
    Private Sub FiloTopBtn_Click(sender As Object, e As RoutedEventArgs) Handles FiloTopBtn.Click
+      m_SelListHole.Clear()
+      m_DeselectListHole.Clear()
       m_SceneButtons.MeasureBtn.IsChecked = False
       If FiloTopBtn.IsChecked Then
          ' Imposto modalità
@@ -1375,25 +1388,25 @@ Public Class DrawPageUC
             m_PrevSideAnglePage = Pages.AlzFront
             LeftButtonGrd.Children.Remove(m_CompoDimension.m_AlzFrontPage)
          End If
-         VariablesGrd.Children.Add( m_FiloTopUC)
+         VariablesGrd.Children.Add(m_FiloTopUC)
          SideAngleBtn.IsEnabled = False
          EngraveBtn.IsEnabled = False
          DripCutBtn.IsEnabled = False
          MessageGrid.Visibility = Windows.Visibility.Hidden
          BackBtn.Visibility = Windows.Visibility.Hidden
-         MessageTxBx.Text = EgtMsg( MSG_DRAWPAGEUC + 6)   ' Selezionare un contorno
+         MessageTxBx.Text = EgtMsg(MSG_DRAWPAGEUC + 6)   ' Selezionare un contorno
          MessageBrd.Background = Application.Current.FindResource("OmagCut_Green")
          ' In ogni caso, nascondo layer delle misure
-         Dim PartId As Integer = EgtGetFirstInGroup( GDB_ID.ROOT)
-         EgtSetStatus(EgtGetFirstNameInGroup( PartId, COMPO_LAYER_AUX), GDB_ST.OFF)
-         EgtSetStatus(EgtGetFirstNameInGroup( PartId, COMPO_LAYER_QUOTATURE), GDB_ST.OFF)
-         EgtSetStatus(EgtGetFirstNameInGroup( PartId, COMPO_LAYER_ETICHETTE), GDB_ST.OFF)
+         Dim PartId As Integer = EgtGetFirstInGroup(GDB_ID.ROOT)
+         EgtSetStatus(EgtGetFirstNameInGroup(PartId, COMPO_LAYER_AUX), GDB_ST.OFF)
+         EgtSetStatus(EgtGetFirstNameInGroup(PartId, COMPO_LAYER_QUOTATURE), GDB_ST.OFF)
+         EgtSetStatus(EgtGetFirstNameInGroup(PartId, COMPO_LAYER_ETICHETTE), GDB_ST.OFF)
       Else
-         VariablesGrd.Children.Remove( m_FiloTopUC)
+         VariablesGrd.Children.Remove(m_FiloTopUC)
          If m_PrevSideAnglePage = Pages.CompoDimension Then
-            VariablesGrd.Children.Add( m_CompoDimension)
+            VariablesGrd.Children.Add(m_CompoDimension)
          ElseIf m_PrevSideAnglePage = Pages.InternalComponent Then
-            LeftButtonGrd.Children.Add( m_CompoDimension.m_InternalCompoPage)
+            LeftButtonGrd.Children.Add(m_CompoDimension.m_InternalCompoPage)
          End If
          SideAngleBtn.IsEnabled = m_bEnableSideAngle
          EngraveBtn.IsEnabled = True

DrawImport/FiloTopUC.xaml

@@ -41,7 +41,11 @@
                FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
       <EgtWPFLib:EgtTextBox Name="Parameter2TxBx" Grid.Column="1" Grid.Row="11" Width="90"
                Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-
-   </Grid>
+      <TextBlock Name="Parameter3TxBl" Grid.Row="12" Text="Arrotonda"
+               Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
+               FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
+      <CheckBox Name="Parameter3ChBx" Grid.Row="12" Grid.Column="1" Style="{StaticResource OmagCut_CheckBox_Single}"
+             HorizontalAlignment="Center" Margin="0,0,6,0"/>
+    </Grid>
 
 </UserControl>

DrawImport/FiloTopUC.xaml.vb

@@ -7,6 +7,8 @@ Public Class FiloTopUC
    ' Riferimento alla pagina che ha aperto SideAngleUC
    Private m_CallingPage As MainWindow.Pages
 
+   Private m_SelList As New List(Of Integer)
+
    ' Offset della sfilettatura
    Private m_dFiloTopOffset As Double = 0
    Friend ReadOnly Property FiloTopOffset As Double
@@ -23,6 +25,13 @@ Public Class FiloTopUC
       End Get
    End Property
 
+   ' esegue l'arrotindamento sugli angoli del percorso utensile
+   Private m_bCornerradius As Boolean = False
+   Friend ReadOnly Property bCornerRadius As Boolean
+      Get
+         Return m_bCornerradius
+      End Get
+   End Property
 
    Private Sub FiloTopUC_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
       ' Imposto riferimenti ad altre pagine
@@ -43,14 +52,18 @@ Public Class FiloTopUC
       End If
 
       ' Gestisco visualizzazione dei parametri
-      Parameter2TxBl.Visibility = Windows.Visibility.Visible
+      ParameterTxBl.Visibility = Windows.Visibility.Visible
       Parameter2TxBx.Visibility = Windows.Visibility.Visible
+      Parameter3TxBl.Visibility = Windows.Visibility.Visible
 
       ' Aggiorno valori
       m_dFiloTopOffset = GetPrivateProfileDouble( S_SIDES, K_FILOTOPOFFSET, 5, m_MainWindow.GetIniFile())
       ParameterTxBx.Text = LenToString( m_dFiloTopOffset, 3)
       m_dFiloTopDepth = GetPrivateProfileDouble( S_SIDES, K_FILOTOPDEPTH, 5, m_MainWindow.GetIniFile())
-      Parameter2TxBx.Text = LenToString( m_dFiloTopDepth, 3)
+      Parameter2TxBx.Text = LenToString(m_dFiloTopDepth, 3)
+      m_bCornerradius = GetPrivateProfileInt(S_SIDES, K_ROUNDOFF, 0, m_MainWindow.GetIniFile()) <> 0
+      Parameter3ChBx.IsChecked = m_bCornerradius
+      m_SelList.Clear()
    End Sub
 
    Private Sub FiloTopUC_Unloaded(sender As Object, e As RoutedEventArgs) Handles Me.Unloaded
@@ -74,6 +87,8 @@ Public Class FiloTopUC
          End While
          nPartId = EgtGetNextPart(nPartId)
       End While
+      ' aggiorno la preview
+      CreateFiloTopPreView(m_SelList, False)
    End Sub
 
    Private Sub Parameter2TxBx_EgtClosed(sender As Object, e As EventArgs) Handles Parameter2TxBx.EgtClosed
@@ -95,4 +110,161 @@ Public Class FiloTopUC
       End While
    End Sub
 
+   Private Sub Parameter3ChBx_Checked() Handles Parameter3ChBx.Click
+      ' Assegno il valore
+      m_bCornerradius = Parameter3ChBx.IsChecked
+      WritePrivateProfileString(S_SIDES, K_ROUNDOFF, If(m_bCornerradius, "1", "0"), m_MainWindow.GetIniFile())
+      ' Aggiorno le info del profilo
+      Dim nPartId As Integer = EgtGetFirstPart()
+      While nPartId <> GDB_ID.NULL
+         Dim nLayId As Integer = EgtGetFirstLayer(nPartId)
+         While nLayId <> GDB_ID.NULL
+            Dim sLayName As String = ""
+            If EgtGetName(nLayId, sLayName) AndAlso sLayName = NAME_INLOOP AndAlso EgtExistsInfo(nLayId, INFO_FILOTOP) Then
+               EgtSetInfo(nLayId, INFO_ROUNDOFF, If(m_bCornerradius, 1, 0))
+            End If
+            nLayId = EgtGetNextLayer(nLayId)
+         End While
+         nPartId = EgtGetNextPart(nPartId)
+      End While
+      ' aggiorno la preview (False = blocco la lettura dei dati della componente)
+      CreateFiloTopPreView(m_SelList, False)
+   End Sub
+
+   Public Sub CreateFiloTopPreView(SelList As List(Of Integer), Optional bReadInfo As Boolean = True)
+      m_SelList = SelList
+      If m_SelList.Count < 1 Then Return
+      Dim nPartId As Integer = EgtGetFirstPart()
+      While nPartId <> GDB_ID.NULL
+         Dim nLayId As Integer = EgtGetFirstLayer(nPartId)
+         While nLayId <> GDB_ID.NULL
+            Dim sLayName As String = ""
+            ' verifico che lemento corrente appartenga all'elenco degli elementi selezionati
+            Dim bIsSelected As Boolean = m_SelList.Find(Function(value As Integer)
+                                                           Return value = nLayId
+                                                        End Function) <> 0
+            If EgtGetName(nLayId, sLayName) AndAlso sLayName = NAME_INLOOP AndAlso EgtExistsInfo(nLayId, INFO_FILOTOP) AndAlso bIsSelected Then
+               ' ---------------------- Inizio GESTIONE PREVIEW percorso -------------------------------
+               Dim nLayFiloTop As Integer = GDB_ID.NULL
+               Dim nInLoopRef As Integer = GDB_ID.NULL
+               nLayFiloTop = EgtGetFirstNameInGroup(nPartId, "FiloTop")
+               EgtGetInfo(nLayFiloTop, "InLoopRef", nInLoopRef)
+               ' verifico il Layer "FiloTop" sia associato all'InLoop corrente
+               While (nLayFiloTop <> GDB_ID.NULL AndAlso nInLoopRef <> nLayId)
+                  nLayFiloTop = EgtGetNextName(nLayFiloTop, "FiloTop")
+                  EgtGetInfo(nLayFiloTop, "InLoopRef", nInLoopRef)
+               End While
+
+               ' se non esiste il Layer "FiloTop"
+               If nLayFiloTop = GDB_ID.NULL Then
+                  ' lo creo
+                  nLayFiloTop = EgtCreateGroup(nPartId)
+                  EgtSetName(nLayFiloTop, "FiloTop")
+                  EgtSetInfo(nLayFiloTop, "InLoopRef", nLayId)
+                  EgtSetInfo(nLayId, "FiloTopRef", nLayFiloTop)
+               End If
+
+               ' carico i dati del filo top selezionato
+               If bReadInfo Then
+                  EgtGetInfo(nLayFiloTop, INFO_OFFSET, m_dFiloTopOffset)
+                  ParameterTxBx.Text = LenToString(m_dFiloTopOffset, 3)
+                  EgtGetInfo(nLayFiloTop, INFO_DEPTH, m_dFiloTopDepth)
+                  Parameter2TxBx.Text = LenToString(m_dFiloTopDepth, 3)
+                  Dim nVal As Integer = If(m_bCornerradius, 1, 0)
+                  EgtGetInfo(nLayFiloTop, INFO_ROUNDOFF, nVal)
+                  Parameter3ChBx.IsChecked = If(nVal = 1, True, False)
+                  m_bCornerradius = Parameter3ChBx.IsChecked
+               End If
+
+               ' procedo alla creazione della curva
+               Dim nIdCompoCurve As Integer = GDB_ID.NULL
+               ' cancello un eventuale curva composita creata in precedenza
+               nIdCompoCurve = EgtGetFirstNameInGroup(nLayFiloTop, "OffsetPreView")
+               If nIdCompoCurve <> GDB_ID.NULL Then
+                  EgtErase(nIdCompoCurve)
+               End If
+               Dim nCompoCurve As New List(Of Integer)
+               ' costruisco il percorso chiuso dati i lati di contorno 
+               Dim nLine As Integer = EgtGetFirstInGroup(nLayId)
+               While nLine <> GDB_ID.NULL
+                  nCompoCurve.Add(nLine)
+                  nLine = EgtGetNext(nLine)
+               End While
+               Dim PtNearStart As Point3d
+               Dim nInfoRoundOff As Integer = If(m_bCornerradius, 1, 0)
+
+               nIdCompoCurve = EgtCreateCurveCompoByChain(nLayFiloTop, nCompoCurve.ToArray, PtNearStart, False)
+               EgtSetName(nIdCompoCurve, "OffsetPreView")
+
+               ' salvo i dati nel layer FiloTop
+               EgtSetInfo(nLayFiloTop, INFO_OFFSET, m_dFiloTopOffset)
+               EgtSetInfo(nLayFiloTop, INFO_DEPTH, m_dFiloTopDepth)
+               EgtSetInfo(nLayFiloTop, INFO_ROUNDOFF, nInfoRoundOff)
+
+               Dim bOk As Boolean = False
+               ' leggo che tipo di offset applicare (Round, Extend)
+               If nInfoRoundOff <> 1 Then
+                  bOk = EgtOffsetCurve(nIdCompoCurve, -m_dFiloTopOffset, OFF_TYPE.EXTEND)
+               Else
+                  bOk = EgtOffsetCurve(nIdCompoCurve, -m_dFiloTopOffset, OFF_TYPE.FILLET)
+               End If
+
+               ' se la generazione della curva non va a buon fine
+               If Not bOk Then
+                  EgtErase(nLayFiloTop)
+                  EgtRemoveInfo(nLayId, "FiloTopRef")
+                  EgtOutLog("Error in generation OffsetPreView in TopEgde ")
+               End If
+               ' ---------------------- Fine GESTIONE PREVIEW percorso -------------------------------
+            End If
+               nLayId = EgtGetNextLayer(nLayId)
+         End While
+         nPartId = EgtGetNextPart(nPartId)
+      End While
+      EgtDraw()
+   End Sub
+
+   ' riceve la lista dei LayerFiloTop che devono essere eliminati
+   Public Sub EraseFiloTopPreview(EraseList As List(Of Integer))
+      Dim m_EraseList As List(Of Integer) = EraseList
+      If m_EraseList.Count < 1 Then Return
+      Dim nPartId As Integer = EgtGetFirstPart()
+      While nPartId <> GDB_ID.NULL
+         Dim nLayId As Integer = EgtGetFirstLayer(nPartId)
+         While nLayId <> GDB_ID.NULL
+            Dim sLayName As String = ""
+            Dim bIsSelected As Boolean = m_EraseList.Find(Function(value As Integer)
+                                                             Return value = nLayId
+                                                          End Function) <> 0
+            If EgtGetName(nLayId, sLayName) AndAlso sLayName = NAME_INLOOP AndAlso bIsSelected Then
+               ' ---------------------- Inizio GESTIONE PREVIEW percorso -------------------------------
+               Dim nLayFiloTop As Integer = GDB_ID.NULL
+               Dim nInLoopRef As Integer = GDB_ID.NULL
+               nLayFiloTop = EgtGetFirstNameInGroup(nPartId, "FiloTop")
+               EgtGetInfo(nLayFiloTop, "InLoopRef", nInLoopRef)
+               ' cerco il Layer associato all'InLoop corrente
+               While (nLayFiloTop <> GDB_ID.NULL AndAlso nInLoopRef <> nLayId)
+                  nLayFiloTop = EgtGetNextName(nLayFiloTop, "FiloTop")
+                  EgtGetInfo(nLayFiloTop, "InLoopRef", nInLoopRef)
+               End While
+
+               ' se non esiste il Layer
+               If nLayFiloTop = GDB_ID.NULL Then
+                  ' esco 
+                  Return
+               Else
+                  ' lo elimino
+                  EgtErase(nLayFiloTop)
+                  EraseList.Remove(nLayId)
+               End If
+               ' ---------------------- Fine GESTIONE PREVIEW percorso -------------------------------
+            End If
+            nLayId = EgtGetNextLayer(nLayId)
+         End While
+         nPartId = EgtGetNextPart(nPartId)
+      End While
+      EgtDraw()
+   End Sub
+
+
 End Class

DrawImport/ImportPageUC.xaml.vb

@@ -810,7 +810,7 @@ Public Class ImportPageUC
       End While
 
       ' identificativo univoico del gruppo di pezzi, se più di un pezzo
-      Dim sGUICode As String = String.Empty
+      Dim sGUICode As New List(Of String)
 
       ' Scrivo testi per nesting
       SideAngle.WriteSideAngleForNest(ImportScene.GetCtx())
@@ -821,30 +821,53 @@ Public Class ImportPageUC
       ' Salvo tutti i pezzi in un file temporaneo
       Dim sTmpFile As String = m_MainWindow.GetTempDir() & "\FlatPart" & ".Nge"
       If Not EgtSaveFile(sTmpFile, NGE.BIN) Then Return
-      ' Passo al contesto principale
-      EgtSetCurrentContext(m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene.GetCtx())
-      ' Recupero flag per inserimento diretto in grezzo (altrimenti in parcheggio)
-      Dim bDirect As Boolean = (GetPrivateProfileInt(S_NEST, K_DIRECT, 0, m_MainWindow.GetIniFile()) <> 0)
-      ' Elimino eventuali precedenti pezzi vuoti
-      EgtEraseEmptyParts()
+
       ' Determino numero ripetizioni
       Dim nRepeat = 1
       StringToInt(PartNumTxBx.Text, nRepeat)
       nRepeat = Math.Min(Math.Max(1, nRepeat), 50)
       ' creo il riferimento
       If nRepeat > 1 Then
-         sGUICode = System.Guid.NewGuid.ToString
+         ' per ogni pezze del file DXF creo un gruppo
+         Dim nIdTemp As Integer = EgtGetFirstPart()
+         While nIdTemp <> GDB_ID.NULL
+            Dim sPreGuid As String = CreatePreGuidCode(nIdTemp)
+            sGUICode.Add(sPreGuid & System.Guid.NewGuid.ToString)
+            nIdTemp = EgtGetNextPart(nIdTemp)
+         End While
       End If
+
+      ' Passo al contesto principale
+      EgtSetCurrentContext(m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene.GetCtx())
+      ' Recupero flag per inserimento diretto in grezzo (altrimenti in parcheggio)
+      Dim bDirect As Boolean = (GetPrivateProfileInt(S_NEST, K_DIRECT, 0, m_MainWindow.GetIniFile()) <> 0)
+      ' Elimino eventuali precedenti pezzi vuoti
+      EgtEraseEmptyParts()
+
       ' Inserisco i pezzi nell'ambiente principale e recupero Id primo pezzo inserito
       Dim nFirstId As Integer = EgtGetLastPart()
       For nInd As Integer = 1 To nRepeat
          Dim nFirst2Id As Integer = EgtGetLastPart()
          EgtInsertFile(sTmpFile)
+
+         Dim FirstOfImport As Integer = EgtGetNextPart(nFirst2Id)
+         Dim Index As Integer = 1
+         While FirstOfImport <> GDB_ID.NULL And Index <= sGUICode.Count
+            If Not String.IsNullOrEmpty(sGUICode(Index - 1)) Then
+               EgtSetInfo(FirstOfImport, INFO_REFGROUP, sGUICode(Index - 1))
+               Index += 1
+            Else
+               Exit While
+            End If
+            FirstOfImport = EgtGetNextPart(FirstOfImport)
+         End While
+
          nFirst2Id = If(nFirst2Id <> GDB_ID.NULL, EgtGetNextPart(nFirst2Id), EgtGetFirstPart())
          ' Eventuale inserimento pezzi in VeinMatching
          VeinMatching.AddParts(sTmpFile, nFirst2Id)
       Next
       nFirstId = If(nFirstId <> GDB_ID.NULL, EgtGetNextPart(nFirstId), EgtGetFirstPart())
+
       ' Cancello il file
       If My.Computer.FileSystem.FileExists(sTmpFile) Then
          My.Computer.FileSystem.DeleteFile(sTmpFile)
@@ -853,7 +876,7 @@ Public Class ImportPageUC
       Dim dNewArea As Double = 0
       Dim nId As Integer = nFirstId
       While nId <> GDB_ID.NULL
-         dNewArea += GeomCalc.GetPartArea( nId)
+         dNewArea += GeomCalc.GetPartArea(nId)
          ' Passo al pezzo successivo
          nId = EgtGetNextPart(nId)
       End While
@@ -876,32 +899,28 @@ Public Class ImportPageUC
          If m_nFileType = FT.DXF Or m_nFileType = FT.NGE Then
             ' Eventuale testo per indicare il sopra
             If TopBtn.IsChecked() Then
-               Utility.AddTopToPartRegion( nRegId)
+               Utility.AddTopToPartRegion(nRegId)
             End If
             ' Se richiesti, inserisco dati Ordine, Distinta, Nome, Origine
             If m_bEnableOrderList Then
                ' Cerco il nome del pezzo
                Dim sName As String = ""
-               EgtGetName( nId, sName)
+               EgtGetName(nId, sName)
                ' Recupero il box del pezzo
-               Dim b3Reg As New BBox3d : EgtGetBBox( nRegId, GDB_BB.IGNORE_TEXT + GDB_BB.IGNORE_DIM, b3Reg)
+               Dim b3Reg As New BBox3d : EgtGetBBox(nRegId, GDB_BB.IGNORE_TEXT + GDB_BB.IGNORE_DIM, b3Reg)
                ' Aggiungo info equivalenti a CSV
                EgtSetInfo(nId, INFO_CSV_PART, sName)
                EgtSetInfo(nId, INFO_CSV_ORD, m_sOrder)
                EgtSetInfo(nId, INFO_CSV_DIST, m_sList)
                EgtSetInfo(nId, INFO_CSV_MAT, m_MainWindow.m_CurrentMachine.CurrMat.sName)
-               EgtSetInfo(nId, INFO_CSV_V1, DoubleToString( b3Reg.DimX(), 1))
-               EgtSetInfo(nId, INFO_CSV_V2, DoubleToString( b3Reg.DimY(), 1))
+               EgtSetInfo(nId, INFO_CSV_V1, DoubleToString(b3Reg.DimX(), 1))
+               EgtSetInfo(nId, INFO_CSV_V2, DoubleToString(b3Reg.DimY(), 1))
             End If
          End If
          ' Imposto colore testi
-         Utility.SetTextColor( nRegId)
+         Utility.SetTextColor(nRegId)
          ' Imposto path di provenienza
          EgtSetInfo(nId, INFO_SOU_PATH, IO.Path.Combine(m_sCurrDir, m_sCurrFile))
-         ' assegno l'identificatico del pezzo, se esiste
-         If Not String.IsNullOrEmpty(sGUICode) Then
-            EgtSetInfo(nId, INFO_REFGROUP, sGUICode)
-         End If
          ' Inserisco in parcheggio
          m_MainWindow.m_CadCutPageUC.m_NestPage.StoreOnePart(nId, True)
          ' Recupero Id di pezzo successivo
@@ -919,7 +938,7 @@ Public Class ImportPageUC
       ' Eventuale aggiornamento VeinMatching
       VeinMatching.ZoomAll()
       ' Aggiorno Aree totale e da lavorare dei pezzi
-      m_MainWindow.m_CurrentProjectPageUC.UpdateTotalArea( dNewArea)
+      m_MainWindow.m_CurrentProjectPageUC.UpdateTotalArea(dNewArea)
       m_MainWindow.m_CurrentProjectPageUC.UpdateToProduceArea()
       m_MainWindow.m_CurrentProjectPageUC.ShowAreas()
       ' Aggiorno ambiente principale

DrawImport/InternalComponentPageUC.xaml.vb

@@ -1,4 +1,5 @@
-Imports EgtUILib
+Imports System.IO
+Imports EgtUILib
 
 Public Class InternalComponentPageUC
 
@@ -286,12 +287,22 @@ Public Class InternalComponentPageUC
          If sCompoImage.Length <> 0 Then
             Try
                Dim sPath As String = m_MainWindow.GetResourcesDir() & "\" & sCompoImage
-               sCompoImageSource = ImageConverter.ConvertFromString(sPath)
-               GetImage(index).Height = 65
-               GetImage(index).Width = 65
-               GetImage(index).Source = sCompoImageSource
-               GetLabel(index).SetValue(Grid.ColumnProperty, 1)
-               GetLabel(index).SetValue(Grid.ColumnSpanProperty, 1)
+               If File.Exists(sPath) Then
+                  sCompoImageSource = ImageConverter.ConvertFromString(sPath)
+                  GetImage(index).Height = 65
+                  GetImage(index).Width = 65
+                  GetImage(index).Source = sCompoImageSource
+                  GetLabel(index).SetValue(Grid.ColumnProperty, 1)
+                  GetLabel(index).SetValue(Grid.ColumnSpanProperty, 1)
+               Else
+                  sCompoImage = String.Empty
+                  GetImage(index).Height = 0
+                  GetImage(index).Width = 0
+                  CustomThickness.Right = 0
+                  GetImage(index).Margin = CustomThickness
+                  GetLabel(index).SetValue(Grid.ColumnProperty, 0)
+                  GetLabel(index).SetValue(Grid.ColumnSpanProperty, 2)
+               End If
             Catch ex As Exception
                EgtOutLog("Error loading image " & sCompoImage)
                sCompoImage = String.Empty

DrawImport/SideAngleUc.xaml.vb

@@ -34,6 +34,7 @@ Public Class SideAngleUC
    Friend m_dDripOffset2 As Double = 0
    Friend m_nEngrNbr2 As Integer = 1
    Friend m_dDripDepth As Double = 10
+   Friend m_dEngraveDepth2 As Double = 15
    Friend m_dDripShort As Double = 0
 
    Private CurrEntityDrip As DripEntity
@@ -133,9 +134,18 @@ Public Class SideAngleUC
          ' Affondamento
          Parameter3TxBl.Visibility = Windows.Visibility.Visible
          Parameter3TxBx.Visibility = Windows.Visibility.Visible
+
          ' Accorciamento
-         Parameter4TxBl.Visibility = Windows.Visibility.Hidden
-         Parameter4TxBx.Visibility = Windows.Visibility.Hidden
+         If m_Mode = ModeOpt.ENGRAVE Then
+            ' modifico il nome del messaggio 
+            Parameter4TxBl.Text = EgtMsg(MSG_IMPORTPAGEUC + 11) & "2"     ' Affondamento2
+            Parameter4TxBl.Visibility = Windows.Visibility.Visible
+            Parameter4TxBx.Visibility = Windows.Visibility.Visible
+         Else
+            Parameter4TxBl.Visibility = Windows.Visibility.Hidden
+            Parameter4TxBx.Visibility = Windows.Visibility.Hidden
+         End If
+
       End If
 
       ' Gestisco Checkbox e nomi in base al numero di lati inclinabili
@@ -156,12 +166,12 @@ Public Class SideAngleUC
          m_nEngrNbr2 = GetPrivateProfileInt( S_SIDES, K_ENGRAVENUMBER2, 1, m_MainWindow.GetIniFile())
          m_dDripOffset2 = GetPrivateProfileDouble( S_SIDES, K_ENGRAVEOFFSET2, 0, m_MainWindow.GetIniFile())
          m_dDripDepth = GetPrivateProfileDouble( S_SIDES, K_ENGRAVEDEPTH, 10, m_MainWindow.GetIniFile())
-         m_dDripShort = GetPrivateProfileDouble( S_SIDES, K_ENGRAVESHORT, 0, m_MainWindow.GetIniFile())
+         m_dEngraveDepth2 = GetPrivateProfileDouble(S_SIDES, K_ENGRAVEDEPTH2, 0, m_MainWindow.GetIniFile())
          Parameter1TxBx.Text = LenToString( m_dDripOffset, 3)
          Parameter2aTxBx.Text = m_nEngrNbr2.ToString()
          Parameter2bTxBx.Text = LenToString( m_dDripOffset2, 3)
          Parameter3TxBx.Text = LenToString( m_dDripDepth, 3)
-         Parameter4TxBx.Text = LenToString( m_dDripShort, 3)
+         Parameter4TxBx.Text = LenToString(m_dEngraveDepth2, 3)
       End If
 
       ' Aggiorno visualizzazione
@@ -489,6 +499,7 @@ Public Class SideAngleUC
          WritePrivateProfileString( S_SIDES, K_ENGRAVENUMBER2, m_nEngrNbr2.ToString(), m_MainWindow.GetIniFile())
          WritePrivateProfileString(S_SIDES, K_ENGRAVEOFFSET2, LenToString(m_dDripOffset2, 3), m_MainWindow.GetIniFile())
          WritePrivateProfileString(S_SIDES, K_ENGRAVEDEPTH, LenToString(m_dDripDepth, 3), m_MainWindow.GetIniFile())
+         WritePrivateProfileString(S_SIDES, K_ENGRAVEDEPTH2, LenToString(m_dEngraveDepth2, 3), m_MainWindow.GetIniFile())
          'WritePrivateProfileString( S_SIDES, K_ENGRAVESHORT, DoubleToString( m_dDripShort, 3), m_MainWindow.GetIniFile())
       End If
 
@@ -635,7 +646,7 @@ Public Class SideAngleUC
       SideAngle.AddTextToLine(sEntityName, TextLayer, CurrLine, 20, dBBoxRad, True)
    End Sub
 
-   ' Funzione che crea le geometrie dei gocciolatoi
+   ' Funzione che crea le geometrie dei gocciolatoi (NON UTILIZZATA)
    Friend Sub CreateDripGeomOLD(nPartId As Integer)
       ' Recupero Id layer di contorno esterno
       Dim nOutLoopId = EgtGetFirstNameInGroup(nPartId, NAME_OUTLOOP)
@@ -830,6 +841,9 @@ Public Class SideAngleUC
       Dim nCrvId = EgtGetFirstInGroup(DripLayer)
       While nCrvId <> GDB_ID.NULL
          EgtOffsetCurve(nCrvId, -m_dDripOffset, OFF_TYPE.EXTEND)
+         If m_Mode = ModeOpt.ENGRAVE Then
+            EgtSetInfo(nCrvId, INFO_DEPTH, m_dDripDepth)
+         End If
          nCrvId = EgtGetNext(nCrvId)
       End While
       ' Eventuali curve aggiuntive con offset2
@@ -840,10 +854,14 @@ Public Class SideAngleUC
             For i As Integer = 1 To m_nEngrNbr2
                Dim nNewId As Integer = EgtCopy(nCrvId, nCrvId, GDB_POS.AFTER)
                EgtOffsetCurve(nNewId, -i * m_dDripOffset2, OFF_TYPE.EXTEND)
+               If m_Mode = ModeOpt.ENGRAVE Then
+                  EgtSetInfo(nNewId, INFO_DEPTH, m_dEngraveDepth2)
+               End If
             Next
             nCrvId = nNextCrvId
          End While
       End If
+
       If m_Mode = ModeOpt.DRIP Then
          ' Esplodo nelle curve componenti
          nCrvId = EgtGetFirstInGroup(DripLayer)
@@ -866,11 +884,12 @@ Public Class SideAngleUC
          nCrvId = EgtGetFirstInGroup(DripLayer)
          While nCrvId <> GDB_ID.NULL
             EgtSetColor(nCrvId, COL_MCH_DRIPCUT())
-            EgtSetInfo(nCrvId, INFO_DEPTH, m_dDripDepth)
+            'EgtSetInfo(nCrvId, INFO_DEPTH, m_dDripDepth)
             EgtSetInfo(nCrvId, INFO_STRICT, If(m_dDripShort > EPS_SMALL, "3", "0"))
             nCrvId = EgtGetNext(nCrvId)
          End While
       End If
+
    End Sub
 
    Private Sub PrevBtn_Click(sender As Object, e As RoutedEventArgs) Handles PrevBtn.Click
@@ -1304,11 +1323,16 @@ Public Class SideAngleUC
    End Sub
 
    Private Sub Parameter4TxBx_EgtClosed(sender As Object, e As EventArgs) Handles Parameter4TxBx.EgtClosed
-      If m_Mode = ModeOpt.DRIP Or m_Mode = ModeOpt.ENGRAVE Then
+      If m_Mode = ModeOpt.DRIP Then
          ' Recupero il valore
          StringToLen(Parameter4TxBx.Text, m_dDripShort)
          ' Creo le geometrie dei gocciolatoi
          RefreshSideAngleText()
+      ElseIf m_Mode = ModeOpt.ENGRAVE Then
+         ' Recupero il valore
+         StringToLen(Parameter4TxBx.Text, m_dEngraveDepth2)
+         ' Creo le geometrie dei gocciolatoi
+         RefreshSideAngleText()
       End If
    End Sub
 

Machine/CurrentMachine.vb

@@ -752,6 +752,7 @@ Public Class CurrentMachine
          End Select
       End Get
       Set(value As Double)
+         Dim dValue As Double = 0
          Select Case GetCurrentTable()
             Case 3
                If Math.Abs(value - m_dTab3AdditionalTable) > EPS_SMALL And
@@ -760,14 +761,24 @@ Public Class CurrentMachine
                   m_dTab3AdditionalTable = value
                   ' Aggiorno il progetto corrente
                   m_MainWindow.m_CurrentProjectPageUC.AdjustAdditionalTable()
+                  ' salvo il valore della sovratavola nel progetto
+                  EgtGetInfo(EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_PROJMARK), K_TAB3_ADDITIONALTABLE, dValue)
+                  If Math.Abs(dValue - value) > EPS_SMALL Then
+                     EgtSetInfo(EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_PROJMARK), K_TAB3_ADDITIONALTABLE, value)
+                  End If
                End If
-            Case 2
+                  Case 2
                If Math.Abs(value - m_dTab2AdditionalTable) > EPS_SMALL And
                WritePrivateProfileString(S_TABLE, K_TAB2_ADDITIONALTABLE, DoubleToString(value, 3), sMachIniFile) Then
                   ' Aggiorno il valore corrente
                   m_dTab2AdditionalTable = value
                   ' Aggiorno il progetto corrente
                   m_MainWindow.m_CurrentProjectPageUC.AdjustAdditionalTable()
+                  ' salvo il valore della sovratavola nel progetto
+                  EgtGetInfo(EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_PROJMARK), K_TAB2_ADDITIONALTABLE, dValue)
+                  If Math.Abs(dValue - value) > EPS_SMALL Then
+                     EgtSetInfo(EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_PROJMARK), K_TAB2_ADDITIONALTABLE, value)
+                  End If
                End If
             Case Else
                If Math.Abs(value - m_dAdditionalTable) > EPS_SMALL And
@@ -776,6 +787,11 @@ Public Class CurrentMachine
                   m_dAdditionalTable = value
                   ' Aggiorno il progetto corrente
                   m_MainWindow.m_CurrentProjectPageUC.AdjustAdditionalTable()
+                  ' salvo il valore della sovratavola nel progetto
+                  EgtGetInfo(EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_PROJMARK), K_ADDITIONALTABLE, dValue)
+                  If Math.Abs(dValue - value) > EPS_SMALL Then
+                     EgtSetInfo(EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_PROJMARK), K_ADDITIONALTABLE, value)
+                  End If
                End If
          End Select
       End Set
@@ -1311,7 +1327,7 @@ Public Class CurrentMachine
       ' Leggo valori da file Data e li carico nelle proprietà
       Dim sFilePath As String = sMachDir & "\" &  MACHININGS_DIR & "\" & WATERJETDB_FILE
       Dim Local_MaterialList = New ObservableCollection(Of EgtWPFLib5.WjMaterial)
-      Local_MaterialList = EgtWPFLib5.WaterjetDbWindowVM.LoadWjMaterials(sFilePath)
+      Local_MaterialList = WaterjetDbWindowVM_OmagCUT.LoadWjMaterials(sFilePath)
       ' definisco la lista delle qualità (solo se è vuota)
       If m_Qualities.Count < 1 Then
          m_Qualities.Add("Q1")
@@ -1342,7 +1358,7 @@ Public Class CurrentMachine
       ' Leggo valori da file Data e li carico nelle proprietà
       Dim sFilePath As String = sMachDir & "\" & MACHININGS_DIR & "\" & WATERJETDB_FILE
       Dim Local_MaterialList = New ObservableCollection(Of EgtWPFLib5.WjMaterial)
-      Local_MaterialList = EgtWPFLib5.WaterjetDbWindowVM.LoadWjMaterials(sFilePath)
+      Local_MaterialList = WaterjetDbWindowVM_OmagCUT.LoadWjMaterials(sFilePath)
       Dim sItems() As String = sCurMat.Split("."c)
       If sItems.Count > 1 Then
          Dim sMat As String = sItems(0)

Machine/MachinePageUC.xaml.vb

@@ -145,12 +145,12 @@ Public Class MachinePageUC
             m_ActiveMachinePage = MachinePages.Alarms
          Case MachinePages.WaterJet
             ' Verifica ed eventuale salvataggio Db Waterjet
-            Dim nPressedBtn As Integer = DirectCast(m_WaterJetPageUC.DataContext, EgtWPFLib5.WaterjetDbWindowVM).CloseWaterjetDb_OmagCut(m_MainWindow)
-            If nPressedBtn = EgtWPFLib5.WaterjetDbWindowVM.SaveWndBtnEnum.CANCEL Then
+            Dim nPressedBtn As Integer = DirectCast(m_WaterJetPageUC.DataContext, WaterjetDbWindowVM_OmagCUT).CloseWaterjetDb_OmagCut(m_MainWindow)
+            If nPressedBtn = WaterjetDbWindowVM_OmagCUT.SaveWndBtnEnum.CANCEL Then
                AlarmsBtn.IsChecked = False
                WaterJetBtn.IsChecked = True
                Return
-            ElseIf nPressedBtn = EgtWPFLib5.WaterjetDbWindowVM.SaveWndBtnEnum.NO Then
+            ElseIf nPressedBtn = WaterjetDbWindowVM_OmagCUT.SaveWndBtnEnum.NO Then
                m_WaterJetPageUC.WaterJetPage_Reinitialize()
             End If
             ' passo alla pagina Dati Macchina
@@ -215,12 +215,12 @@ Public Class MachinePageUC
             m_ActiveMachinePage = MachinePages.ToolsDb
          Case MachinePages.WaterJet
             'Verifica ed eventuale salvataggio Db Waterjet
-            Dim nPressedBtn As Integer = DirectCast(m_WaterJetPageUC.DataContext, EgtWPFLib5.WaterjetDbWindowVM).CloseWaterjetDb_OmagCut(m_MainWindow)
-            If nPressedBtn = EgtWPFLib5.WaterjetDbWindowVM.SaveWndBtnEnum.CANCEL Then
+            Dim nPressedBtn As Integer = DirectCast(m_WaterJetPageUC.DataContext, WaterjetDbWindowVM_OmagCUT).CloseWaterjetDb_OmagCut(m_MainWindow)
+            If nPressedBtn = WaterjetDbWindowVM_OmagCUT.SaveWndBtnEnum.CANCEL Then
                ToolsDBBtn.IsChecked = False
                WaterJetBtn.IsChecked = True
                Return
-            ElseIf nPressedBtn = EgtWPFLib5.WaterjetDbWindowVM.SaveWndBtnEnum.NO Then
+            ElseIf nPressedBtn = WaterjetDbWindowVM_OmagCUT.SaveWndBtnEnum.NO Then
                m_WaterJetPageUC.WaterJetPage_Reinitialize()
             End If
             ' passo alla pagina Dati Macchina
@@ -285,12 +285,12 @@ Public Class MachinePageUC
             m_ActiveMachinePage = MachinePages.MachiningDb
          Case MachinePages.WaterJet
             ' Verifica ed eventuale salvataggio Db Waterjet
-            Dim nPressedBtn As Integer = DirectCast(m_WaterJetPageUC.DataContext, EgtWPFLib5.WaterjetDbWindowVM).CloseWaterjetDb_OmagCut(m_MainWindow)
-            If nPressedBtn = EgtWPFLib5.WaterjetDbWindowVM.SaveWndBtnEnum.CANCEL Then
+            Dim nPressedBtn As Integer = DirectCast(m_WaterJetPageUC.DataContext, WaterjetDbWindowVM_OmagCUT).CloseWaterjetDb_OmagCut(m_MainWindow)
+            If nPressedBtn = WaterjetDbWindowVM_OmagCUT.SaveWndBtnEnum.CANCEL Then
                MachiningDBBtn.IsChecked = False
                WaterJetBtn.IsChecked = True
                Return
-            ElseIf nPressedBtn = EgtWPFLib5.WaterjetDbWindowVM.SaveWndBtnEnum.NO Then
+            ElseIf nPressedBtn = WaterjetDbWindowVM_OmagCUT.SaveWndBtnEnum.NO Then
                m_WaterJetPageUC.WaterJetPage_Reinitialize()
             End If
             ' passo alla pagina Dati Macchina
@@ -358,12 +358,12 @@ Public Class MachinePageUC
             PolishingsBtn.IsChecked = True
          Case MachinePages.WaterJet
             ' Verifica ed eventuale salvataggio Db Waterjet
-            Dim nPressedBtn As Integer = DirectCast(m_WaterJetPageUC.DataContext, EgtWPFLib5.WaterjetDbWindowVM).CloseWaterjetDb_OmagCut(m_MainWindow)
-            If nPressedBtn = EgtWPFLib5.WaterjetDbWindowVM.SaveWndBtnEnum.CANCEL Then
+            Dim nPressedBtn As Integer = DirectCast(m_WaterJetPageUC.DataContext, WaterjetDbWindowVM_OmagCUT).CloseWaterjetDb_OmagCut(m_MainWindow)
+            If nPressedBtn = WaterjetDbWindowVM_OmagCUT.SaveWndBtnEnum.CANCEL Then
                PolishingsBtn.IsChecked = False
                WaterJetBtn.IsChecked = True
                Return
-            ElseIf nPressedBtn = EgtWPFLib5.WaterjetDbWindowVM.SaveWndBtnEnum.NO Then
+            ElseIf nPressedBtn = WaterjetDbWindowVM_OmagCUT.SaveWndBtnEnum.NO Then
                m_WaterJetPageUC.WaterJetPage_Reinitialize()
             End If
             ' passo alla pagina Dati Macchina
@@ -513,12 +513,12 @@ Public Class MachinePageUC
             m_ActiveMachinePage = MachinePages.MachineCN
          Case MachinePages.WaterJet
             ' Verifica ed eventuale salvataggio Db Waterjet
-            Dim nPressedBtn As Integer = DirectCast(m_WaterJetPageUC.DataContext, EgtWPFLib5.WaterjetDbWindowVM).CloseWaterjetDb_OmagCut(m_MainWindow)
-            If nPressedBtn = EgtWPFLib5.WaterjetDbWindowVM.SaveWndBtnEnum.CANCEL Then
+            Dim nPressedBtn As Integer = DirectCast(m_WaterJetPageUC.DataContext, WaterjetDbWindowVM_OmagCUT).CloseWaterjetDb_OmagCut(m_MainWindow)
+            If nPressedBtn = WaterjetDbWindowVM_OmagCUT.SaveWndBtnEnum.CANCEL Then
                TestingPageBtn.IsChecked = False
                WaterJetBtn.IsChecked = True
                Return
-            ElseIf nPressedBtn = EgtWPFLib5.WaterjetDbWindowVM.SaveWndBtnEnum.NO Then
+            ElseIf nPressedBtn = WaterjetDbWindowVM_OmagCUT.SaveWndBtnEnum.NO Then
                m_WaterJetPageUC.WaterJetPage_Reinitialize()
             End If
             ' passo alla pagina Dati Macchina
@@ -593,12 +593,12 @@ Public Class MachinePageUC
             m_ActiveMachinePage = MachinePages.Statistics
          Case MachinePages.WaterJet
             ' Verifica ed eventuale salvataggio Db Waterjet
-            Dim nPressedBtn As Integer = DirectCast(m_WaterJetPageUC.DataContext, EgtWPFLib5.WaterjetDbWindowVM).CloseWaterjetDb_OmagCut(m_MainWindow)
-            If nPressedBtn = EgtWPFLib5.WaterjetDbWindowVM.SaveWndBtnEnum.CANCEL Then
+            Dim nPressedBtn As Integer = DirectCast(m_WaterJetPageUC.DataContext, WaterjetDbWindowVM_OmagCUT).CloseWaterjetDb_OmagCut(m_MainWindow)
+            If nPressedBtn = WaterjetDbWindowVM_OmagCUT.SaveWndBtnEnum.CANCEL Then
                StatisticsBtn.IsChecked = False
                WaterJetBtn.IsChecked = True
                Return
-            ElseIf nPressedBtn = EgtWPFLib5.WaterjetDbWindowVM.SaveWndBtnEnum.NO Then
+            ElseIf nPressedBtn = WaterjetDbWindowVM_OmagCUT.SaveWndBtnEnum.NO Then
                m_WaterJetPageUC.WaterJetPage_Reinitialize()
             End If
             ' passo alla pagina Dati Macchina

Machine/StatisticsPageUC.xaml.vb

@@ -36,7 +36,7 @@ Public Class StatisticsPageUC
       DayTxBl.Text = sDay
       ' Leggo il numero della settimana
       Dim nWeek As Integer = GetPrivateProfileInt(S_STATDATA, K_SD_WEEK, -1, m_MainWindow.GetIniFile())
-      WeekTxBl.Text = ( nWeek + 1).ToString()
+      WeekTxBl.Text = (nWeek).ToString()
 
       ' Leggo area pezzi del giorno
       Dim dDayParts As Double = GetPrivateProfileDouble(S_STATDATA, K_SD_DAYPARTS, 0, m_MainWindow.GetIniFile())

Machine/WaterJetPageUC.xaml.vb

@@ -8,18 +8,18 @@ Public Class WaterJetPageUC
 
    ' Riferimento alla MainWindow
    Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
-   Private m_refWaterjetDbWindowVM As EgtWPFLib5.WaterjetDbWindowVM
+   Private m_refWaterjetDbWindowVM As WaterjetDbWindowVM_OmagCUT
    Private m_sOrigNewMaterial As String = String.Empty
    Private m_sOrigNewSubMaterial As String = String.Empty
 
    Private Sub WaterJetPage_Initialized(sender As Object, e As EventArgs)
-      m_refWaterjetDbWindowVM = New EgtWPFLib5.WaterjetDbWindowVM(m_MainWindow.m_CurrentMachine.sMachDir)
+      m_refWaterjetDbWindowVM = New WaterjetDbWindowVM_OmagCUT(m_MainWindow.m_CurrentMachine.sMachDir)
       Me.DataContext = m_refWaterjetDbWindowVM
       EgtWPFLib.Utility.MainWindow = m_MainWindow
    End Sub
 
    Public Sub WaterJetPage_Reinitialize()
-      m_refWaterjetDbWindowVM = New EgtWPFLib5.WaterjetDbWindowVM(m_MainWindow.m_CurrentMachine.sMachDir)
+      m_refWaterjetDbWindowVM = New WaterjetDbWindowVM_OmagCUT(m_MainWindow.m_CurrentMachine.sMachDir)
       Me.DataContext = m_refWaterjetDbWindowVM
    End Sub
 

Machine/WaterjetDbWindowVM.vb

@@ -0,0 +1,61 @@
+Imports System.Collections.ObjectModel
+Imports System.IO
+Imports EgtUILib
+Imports EgtWPFLib5
+Imports EgtWPFLib
+
+' nuova libreria EgtWPFLib5 ver 2.4g1
+Public Class WaterjetDbWindowVM_OmagCUT
+   Inherits EgtWPFLib5.WaterjetDbWindowVM
+
+   Public Function CloseWaterjetDb_OmagCut(MainWindow As Window) As SaveWndBtnEnum
+      If bIsModified Then
+         Dim SaveWjDbWnd As New EgtMsgBox(MainWindow, "", EgtMsg(31759), EgtMsgBox.Buttons.YES_NO_CANCEL, EgtMsgBox.Icons.NULL)
+         Select Case SaveWjDbWnd.m_nPressedBtn
+            Case 1   ' Yes
+               WriteWaterjetDb()
+               bIsModified = False
+               Return SaveWndBtnEnum.YES
+            Case 2   ' No
+               Return SaveWndBtnEnum.NO
+            Case Else   ' Cancel
+               Return SaveWndBtnEnum.CANCEL
+         End Select
+      Else
+         Dim bExitFor As Boolean = False
+         For Each Material As EgtWPFLib5.WjMaterial In MaterialList
+            If Not IsNothing(Material.SubMaterialList) Then
+               For Each SubMaterial As EgtWPFLib5.WjSubMaterial In Material.SubMaterialList
+                  If Not IsNothing(SubMaterial.ParamList) Then
+                     For Each QParam As EgtWPFLib5.WjParam In SubMaterial.ParamList
+                        bExitFor = QParam.IsModified()
+                        If bExitFor Then Exit For
+                     Next
+                  End If
+                  If bExitFor Then Exit For
+               Next
+            End If
+            If bExitFor Then Exit For
+         Next
+         If bExitFor Then
+            Dim SaveWjDbWnd As New EgtMsgBox(MainWindow, "", EgtMsg(31759), EgtMsgBox.Buttons.YES_NO_CANCEL, EgtMsgBox.Icons.NULL)
+            Select Case SaveWjDbWnd.m_nPressedBtn
+               Case 1   ' Yes
+                  WriteWaterjetDb()
+                  bIsModified = False
+                  Return SaveWndBtnEnum.YES
+               Case 2   ' No
+                  Return SaveWndBtnEnum.NO
+               Case Else   ' Cancel
+                  Return SaveWndBtnEnum.CANCEL
+            End Select
+         End If
+      End If
+      Return SaveWndBtnEnum.YES
+   End Function
+
+   Sub New(sMachDir As String)
+      MyBase.New(sMachDir)
+   End Sub
+
+End Class

MainWindow.xaml.vb

@@ -323,8 +323,8 @@ Class MainWindow
       ' Verifico abilitazione nesting automatico
       m_bAutoNest = Not String.IsNullOrWhiteSpace(sNestKey)
       ' Recupero opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2402, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(9423, 2402, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2406, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(9423, 2406, 1, m_nKeyOptions)
       ' Verifico abilitazione prodotto
       Dim bProd As Boolean = GetKeyOption(KEY_OPT.CUT_BASE)
       ' Inizializzazione generale di EgtInterface
@@ -569,6 +569,12 @@ Class MainWindow
       m_CurrentProjectPageUC.m_SceneButtons.MeasureBtn.IsChecked = False
       ' disbilito Test
       TestOff()
+      ' disabilito DragRettangle
+      DragRettangleOff()
+      ' disabilito SplitCurv
+      SplitCurvWJOff()
+      ' disattivo StartCurv
+      StartCurvWJOff()
       Select Case m_ActivePage
          Case Pages.WorkInProgress
             WorkInProgressBtn.IsChecked = True
@@ -625,6 +631,9 @@ Class MainWindow
       EgtMdbGetGeneralParam(MCH_GP.SAFEZ, DirectCutPageUC.m_dZSafe)
       m_CurrentProjectPageUC.m_SceneButtons.MeasureBtn.IsChecked = False
       TestOff()
+      DragRettangleOff()
+      SplitCurvWJOff()
+      StartCurvWJOff()
       Select Case m_ActivePage
          Case Pages.WorkInProgress
             WorkInProgressBtn.IsChecked = False
@@ -678,6 +687,9 @@ Class MainWindow
    Private Sub CadCutBtn_Click(sender As Object, e As RoutedEventArgs) Handles CadCutBtn.Click
       m_CurrentProjectPageUC.m_SceneButtons.MeasureBtn.IsChecked = False
       TestOff()
+      DragRettangleOff()
+      SplitCurvWJOff()
+      StartCurvWJOff()
       Select Case m_ActivePage
          Case Pages.WorkInProgress
             WorkInProgressBtn.IsChecked = False
@@ -730,6 +742,9 @@ Class MainWindow
    Private Sub FrameCutBtn_Click(sender As Object, e As RoutedEventArgs) Handles FrameCutBtn.Click
       m_CurrentProjectPageUC.m_SceneButtons.MeasureBtn.IsChecked = False
       TestOff()
+      DragRettangleOff()
+      SplitCurvWJOff()
+      StartCurvWJOff()
       Select Case m_ActivePage
          Case Pages.WorkInProgress
             WorkInProgressBtn.IsChecked = False
@@ -753,8 +768,8 @@ Class MainWindow
             m_ActivePage = Pages.FrameCut
          Case Pages.Photo, Pages.RawPart, Pages.Draw, Pages.Import, Pages.CSV
             ' Pages.Simulation: quando sono nella simulazione devo uscire dalla pagina
-            CadCutBtn.IsChecked = True
-            FrameCutBtn.IsChecked = False
+            CadCutBtn.IsChecked = False
+            FrameCutBtn.IsChecked = True
          Case Pages.FrameCut
             FrameCutBtn.IsChecked = True
          Case Pages.Machine
@@ -783,6 +798,9 @@ Class MainWindow
    Private Sub MachineBtn_Click(sender As Object, e As RoutedEventArgs) Handles MachineBtn.Click
       m_CurrentProjectPageUC.m_SceneButtons.MeasureBtn.IsChecked = False
       TestOff()
+      DragRettangleOff()
+      SplitCurvWJOff()
+      StartCurvWJOff()
       Select Case m_ActivePage
          Case Pages.WorkInProgress
             WorkInProgressBtn.IsChecked = False
@@ -831,6 +849,9 @@ Class MainWindow
    Private Sub OptionsBtn_Click(sender As Object, e As RoutedEventArgs) Handles OptionsBtn.Click
       m_CurrentProjectPageUC.m_SceneButtons.MeasureBtn.IsChecked = False
       TestOff()
+      DragRettangleOff()
+      SplitCurvWJOff()
+      StartCurvWJOff()
       Select Case m_ActivePage
          Case Pages.WorkInProgress
             WorkInProgressBtn.IsChecked = False
@@ -1071,10 +1092,10 @@ Class MainWindow
          Case MachinePageUC.MachinePages.WaterJet
             ' Verifica ed eventuale salvataggio Db Waterjet
             Dim m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
-            Dim nPressedBtn As Integer = DirectCast(m_MachinePageUC.m_WaterJetPageUC.DataContext, EgtWPFLib5.WaterjetDbWindowVM).CloseWaterjetDb_OmagCut(m_MainWindow)
-            If nPressedBtn = EgtWPFLib5.WaterjetDbWindowVM.SaveWndBtnEnum.CANCEL Then
+            Dim nPressedBtn As Integer = DirectCast(m_MachinePageUC.m_WaterJetPageUC.DataContext, WaterjetDbWindowVM_OmagCUT).CloseWaterjetDb_OmagCut(m_MainWindow)
+            If nPressedBtn = WaterjetDbWindowVM_OmagCUT.SaveWndBtnEnum.CANCEL Then
                Return False
-            ElseIf nPressedBtn = EgtWPFLib5.WaterjetDbWindowVM.SaveWndBtnEnum.NO Then
+            ElseIf nPressedBtn = WaterjetDbWindowVM_OmagCUT.SaveWndBtnEnum.NO Then
                m_MachinePageUC.m_WaterJetPageUC.WaterJetPage_Reinitialize()
             End If
       End Select
@@ -1137,10 +1158,15 @@ Class MainWindow
    Private Sub OnIdle()
       ' Recupero il tipo di progetto
       Dim nPrjType As Integer = m_CurrentProjectPageUC.GetCurrentProjectType()
+      ' Verifico presenza testa H1 per lama/fresa (nel contesto principale)
+      Dim nCurrCtx As Integer = EgtGetCurrentContext()
+      EgtSetCurrentContext(m_CurrentProjectPageUC.CurrentProjectScene.GetCtx())
+      Dim bHeadH1 As Boolean = (EgtGetHeadId("H1") <> GDB_ID.NULL)
+      EgtSetCurrentContext(nCurrCtx)
       ' Aggiorno interfaccia
       CadCutBtn.IsEnabled = (nPrjType <> CurrentProjectPageUC.PRJ_TYPE.FRAMES)
-      FrameCutBtn.IsEnabled = (nPrjType <> CurrentProjectPageUC.PRJ_TYPE.FLATS) AndAlso (EgtGetHeadId("H1") <> GDB_ID.NULL)
-      ' DirectCutBtn.IsEnabled = (EgtGetHeadId("H1") <> GDB_ID.NULL)
+      FrameCutBtn.IsEnabled = (nPrjType <> CurrentProjectPageUC.PRJ_TYPE.FLATS) AndAlso bHeadH1
+      ' DirectCutBtn.IsEnabled = bHeadH1
    End Sub
 
    ' Nomi dei file per OmagVIEW
@@ -1799,7 +1825,9 @@ Class MainWindow
          m_CurrentProjectPageUC.SetInfoMessage(EgtMsg(90327))        'Inseriti Nuovi Pezzi Rovinati
          Dim nPartId As Integer = EgtGetLastPart()
          For nI As Integer = 1 To nRuPartsCnt
-            EgtRemoveInfo( nPartId, INFO_PARTOK)
+            EgtRemoveInfo(nPartId, INFO_PARTOK)
+            ' ricreo la lista delle famiglie di pezzi presenti in parcheggio
+            m_CadCutPageUC.m_NestPage.GetFamilyGroupInPark()
             m_CadCutPageUC.m_NestPage.StoreOnePart(nPartId, True)
             nPartId = EgtGetPrevPart(nPartId)
          Next
@@ -1890,4 +1918,25 @@ Class MainWindow
       Me.m_CadCutPageUC.m_NestPage.m_bSelectCurv = False
    End Sub
 
+   ' spegne il comando per la mofica dei rettangoli
+   Public Sub DragRettangleOff()
+      m_CadCutPageUC.m_NestPage.DragRettanleBtn.IsChecked = False
+      Me.m_CadCutPageUC.m_NestPage.m_bIsCheckedDragRettangle = False
+      ShowParkedParts()
+
+   End Sub
+
+   Public Sub SplitCurvWJOff()
+      m_CadCutPageUC.m_NestPage.SplitCurveWJBtn.IsChecked = False
+      Me.m_CadCutPageUC.m_NestPage.m_bIsCheckedSplitCurveWJ = False
+      m_CadCutPageUC.m_NestPage.ResetSplitCurvWJParam()
+
+   End Sub
+
+   Public Sub StartCurvWJOff()
+      m_CadCutPageUC.m_NestPage.StartCurveWJBtn.IsChecked = False
+      Me.m_CadCutPageUC.m_NestPage.m_bIsCheckedStartCurveWJ = False
+      m_CadCutPageUC.m_NestPage.ResetStartCurvWJParam()
+   End Sub
+
 End Class

My Project/AssemblyInfo.vb

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

OmagCUT.vbproj

@@ -205,6 +205,7 @@
     <Compile Include="Machine\ImportExportToolWD.xaml.vb">
       <DependentUpon>ImportExportToolWD.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Machine\WaterjetDbWindowVM.vb" />
     <Compile Include="Machine\WaterJetPageVM.vb" />
     <Compile Include="Machine\WaterJetPageUC.xaml.vb">
       <DependentUpon>WaterJetPageUC.xaml</DependentUpon>
@@ -1247,6 +1248,19 @@
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\Spiral.png" />
+    <Resource Include="Resources\NewIcons\Drag_Rettangle.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\GenerateCN.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\GenerateCN.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\SPLIT-WJ.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\START-WJ.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>

OmagCUTDarkDictionary.xaml

@@ -46,6 +46,7 @@
     <BitmapImage x:Key="DownArrowImg" UriSource="Resources/NewIcons/DownArrow.png"></BitmapImage>
     <BitmapImage x:Key="DrawImg" UriSource="Resources/NewIcons/icone-tagli-3.png"></BitmapImage>
     <BitmapImage x:Key="FrameMachiningImg" UriSource="Resources/NewIcons/FrameMachining.png"></BitmapImage>
+    <BitmapImage x:Key="GenerateCNImg" UriSource="Resources/NewIcons/GenerateCN.png"></BitmapImage>
     <BitmapImage x:Key="GenericViewImg" UriSource="Resources/NewIcons/GenericView.png"></BitmapImage>
     <BitmapImage x:Key="HalfTurnRotateImg" UriSource="Resources/Negative/HalfTurnRotate.png"></BitmapImage>
     <BitmapImage x:Key="ImportImg" UriSource="Resources/NewIcons/icone-tagli-6.png"></BitmapImage>
@@ -105,6 +106,9 @@
     <BitmapImage x:Key="Elimina-pezzoImg" UriSource="Resources/NewIcons/Elimina-pezzo.png"></BitmapImage>
     <BitmapImage x:Key="Seleziona-tuttoImg" UriSource="Resources/NewIcons/Seleziona-tutto.png"></BitmapImage>
     <BitmapImage x:Key="Deseleziona-tuttoImg" UriSource="Resources/NewIcons/Deseleziona-tutto.png"></BitmapImage>
+    <BitmapImage x:Key="Drag_RettangleImg" UriSource="Resources/NewIcons/Drag_Rettangle.png"></BitmapImage>
+    <BitmapImage x:Key="StartWJImg" UriSource="Resources/NewIcons/START-WJ.png"></BitmapImage>
+    <BitmapImage x:Key="SplitWJImg" UriSource="Resources/NewIcons/SPLIT-WJ.png"></BitmapImage>
     
     <!--Machine-->
     <BitmapImage x:Key="DatiMacchinaImg" UriSource="Resources/NewIcons/DatiMacchina.png"></BitmapImage>

OmagCUTDictionary.xaml

@@ -116,6 +116,7 @@
     <BitmapImage x:Key="DownArrowImg" UriSource="Resources/DownArrow.png"></BitmapImage>
     <BitmapImage x:Key="DrawImg" UriSource="Resources/Draw.png"></BitmapImage>
     <BitmapImage x:Key="FrameMachiningImg" UriSource="Resources/FrameMachining.png"></BitmapImage>
+    <BitmapImage x:Key="GenerateCNImg" UriSource="Resources/GenerateCN.png"></BitmapImage>
     <BitmapImage x:Key="GenericViewImg" UriSource="Resources/GenericView.png"></BitmapImage>
     <BitmapImage x:Key="HalfTurnRotateImg" UriSource="Resources/HalfTurnRotate.png"></BitmapImage>
     <BitmapImage x:Key="ImportImg" UriSource="Resources/Import.png"></BitmapImage>
@@ -173,6 +174,9 @@
     <BitmapImage x:Key="Elimina-pezzoImg" UriSource="Resources/NewIcons/Elimina-pezzo.png"></BitmapImage>
     <BitmapImage x:Key="Seleziona-tuttoImg" UriSource="Resources/NewIcons/Seleziona-tutto.png"></BitmapImage>
     <BitmapImage x:Key="Deseleziona-tuttoImg" UriSource="Resources/NewIcons/Deseleziona-tutto.png"></BitmapImage>
+    <BitmapImage x:Key="Drag_RettangleImg" UriSource="Resources/NewIcons/Drag_Rettangle.png"></BitmapImage>
+    <BitmapImage x:Key="StartWJImg" UriSource="Resources/NewIcons/START-WJ.png"></BitmapImage>
+    <BitmapImage x:Key="SplitWJImg" UriSource="Resources/NewIcons/SPLIT-WJ.png"></BitmapImage>
 
     <!--Machine-->
     <BitmapImage x:Key="DatiMacchinaImg" UriSource="Resources/NewIcons/DatiMacchina.png"></BitmapImage>

Project/CurrentProjectPageUC.xaml.vb

@@ -180,42 +180,12 @@ Public Class CurrentProjectPageUC
          EgtInitMachMgr(m_MainWindow.GetMachinesRootDir(), m_MainWindow.GetToolMakersDir())
          m_bFirst = False
 
-         ' ------------------ SELEZIONE AVVIO -----------------------------
-         ' apro la finstra di selezione di avvio del programma
-         'StartProgram()
-         ' ------------------ SELEZIONE AVVIO -----------------------------
-
-         '' Se richiesto, carico ultimo progetto
-         'Dim bAutoLoadLast As Boolean = GetPrivateProfileInt(S_GENERAL, K_AUTOLOADLASTPROJ, 0, m_MainWindow.GetIniFile()) <> 0
-         'If bAutoLoadLast Then
-         '   m_nCurrProj = GetPrivateProfileInt(S_GENERAL, K_LASTPROJ, 0, m_MainWindow.GetIniFile())
-         '   Dim sPath As String = m_MainWindow.GetSaveDir() & "\" & m_nCurrProj.ToString("D4") & ".nge"
-         '   If Not LoadProject(sPath, False) Then
-         '      NewProject()
-         '   End If
-         '   EgtResetModified()
-         '   'Altrimenti ne imposto uno nuovo
-         'Else
-         '   m_nCurrProj = GetPrivateProfileInt(S_GENERAL, K_LASTPROJ, 0, m_MainWindow.GetIniFile())
-         '   NewProject()
-         'End If
-
          ' creo nuovo progetto
          m_nCurrProj = GetPrivateProfileInt(S_GENERAL, K_LASTPROJ, 0, m_MainWindow.GetIniFile())
          'NewProject()
 
          ' Nascondo progress per fotografia
          PhotoProgress.Visibility = Windows.Visibility.Hidden
-         ' Carico sottopagina opportuna
-         If GetProjectType() <> PRJ_TYPE.FRAMES Then
-            CurrentProjectPageGrid.Children.Add(m_MainWindow.m_CadCutPageUC)
-            m_MainWindow.m_ActivePage = MainWindow.Pages.CadCut
-            m_MainWindow.CadCutBtn.IsChecked = True
-         Else
-            CurrentProjectPageGrid.Children.Add(m_MainWindow.m_FrameCutPageUC)
-            m_MainWindow.m_ActivePage = MainWindow.Pages.FrameCut
-            m_MainWindow.FrameCutBtn.IsChecked = True
-         End If
 
       Else
          EgtSetCurrentContext(CurrentProjectScene.GetCtx())
@@ -274,8 +244,10 @@ Public Class CurrentProjectPageUC
          m_MainWindow.MainWindowGrid.Children.Remove(m_MainWindow.m_CurrentProjectPageUC)
          m_MainWindow.MainWindowGrid.Children.Add(m_MainWindow.m_OpenPage)
          m_MainWindow.m_ActivePage = MainWindow.Pages.Open
+         ' inizializzo gli oggetti della pagina (non passo dalla funzione Load!)
+         m_MainWindow.m_CadCutPageUC.m_ProjectMgr.SetReference()
 
-      ' seleziono il file dalla lista della finestra (= 4) 
+         ' seleziono il file dalla lista della finestra (= 4) 
       ElseIf MyStartLancherWD.CurrSelection = MODE_LAUNCHER.SelectedProject Then
          NewProject()
          Dim sCurrDir As String = Path.GetDirectoryName(MyStartLancherWD.SelPath)
@@ -304,6 +276,21 @@ Public Class CurrentProjectPageUC
          End If
       End If
 
+      ' se apro la finestra "OpenFolder" l'assegnazione dei Children è fatta direttamente nella classe ProjectMgrUC
+      If MyStartLancherWD.CurrSelection <> MODE_LAUNCHER.OpenFolder Then
+         ' Carico sottopagina opportuna
+         If GetProjectType() <> PRJ_TYPE.FRAMES Then
+            CurrentProjectPageGrid.Children.Add(m_MainWindow.m_CadCutPageUC)
+            m_MainWindow.m_ActivePage = MainWindow.Pages.CadCut
+            m_MainWindow.CadCutBtn.IsChecked = True
+         Else
+            CurrentProjectPageGrid.Children.Add(m_MainWindow.m_FrameCutPageUC)
+            m_MainWindow.m_ActivePage = MainWindow.Pages.FrameCut
+            m_MainWindow.FrameCutBtn.IsChecked = True
+         End If
+      End If
+
+
    End Sub
 
    ' questo metodo è direttamente richiamato in caso di selezione della regione sinistra della pagina
@@ -521,6 +508,20 @@ Public Class CurrentProjectPageUC
       UpdateHeightTxBx()
       ' aggiorno materiale
       m_MainWindow.m_CurrentMachine.SetCurrMatByName(GetProjectMaterial())
+      ' aggiorno altezza sovaratavola
+      If GetPrivateProfileInt(S_GENERAL, "AdditionalTableByProj", 0, m_sIniFile) = 1 Then
+         ' leggo il valore OrigiAdditionalTable
+         Dim dValue As Double = m_MainWindow.m_CurrentMachine.dAdditionalTable
+         Select Case GetCurrentTable()
+            Case 3
+               EgtGetInfo(EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_PROJMARK), K_TAB3_ADDITIONALTABLE, dValue)
+            Case 2
+               EgtGetInfo(EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_PROJMARK), K_TAB2_ADDITIONALTABLE, dValue)
+            Case Else
+               EgtGetInfo(EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_PROJMARK), K_ADDITIONALTABLE, dValue)
+         End Select
+         m_MainWindow.m_CurrentMachine.dAdditionalTable = dValue
+      End If
       ' forzo visualizzazione eventuali dati su aree
       SetAreasStatus( True)
       ' Dichiaro progetto non modificato

Project/ProjectMgrUC.xaml.vb

@@ -34,9 +34,7 @@ Public Class ProjectMgrUC
 
    Private Sub ProjectMgrUC_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
       ' Impostazioni
-      m_CurrProjPage = m_MainWindow.m_CurrentProjectPageUC
-      m_CurrMachine = m_MainWindow.m_CurrentMachine
-      m_CurrNcComm = m_MainWindow.m_CNCommunication
+      SetReference()
 
       ' Se richiesto carico finestra per VeinMatching e ultimo intarsio
       If m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.MAN_PHOTO) And
@@ -55,6 +53,12 @@ Public Class ProjectMgrUC
       End If
    End Sub
 
+   Public Sub SetReference()
+      m_CurrProjPage = m_MainWindow.m_CurrentProjectPageUC
+      m_CurrMachine = m_MainWindow.m_CurrentMachine
+      m_CurrNcComm = m_MainWindow.m_CNCommunication
+   End Sub
+
    Private Sub NewBtn_Click(sender As Object, e As RoutedEventArgs) Handles NewBtn.Click
       EgtSetCurrentContext(m_CurrProjPage.CurrentProjectScene.GetCtx())
       m_CurrProjPage.m_SceneButtons.MeasureBtn.IsChecked = False
@@ -248,6 +252,10 @@ Public Class ProjectMgrUC
       EgtSetCurrentContext(m_CurrProjPage.CurrentProjectScene.GetCtx())
       ' Cancello eventuali messaggi
       m_CurrProjPage.ClearMessage()
+      ' cancello tutti i tagli di separazione (Waterjet)
+      ResetAllSplitCurv()
+      ' cancello tutti i punti di inizio (Waterjet)
+      ResetAllStartCurv()
       ' Ricalcolo tutte le lavorazioni
       Dim nWarn As Integer = 0
       ResetAllMachinings(nWarn)
@@ -349,6 +357,14 @@ Public Class ProjectMgrUC
          Return
       End If
       ' ---------------------------- Fine modalità test --------------------------------------------
+      ' se esiste salvo il nome del progetto
+      Dim sCurrProjName As String = String.Empty
+      GetPrivateProfileString(S_GENERAL, K_LASTNAMEPROJ, "", sCurrProjName, m_MainWindow.GetIniFile())
+      If Not String.IsNullOrEmpty(sCurrProjName) Then
+         EgtSetInfo(EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_PROJMARK), INFO_PROJNAME, sCurrProjName)
+      Else
+         EgtRemoveInfo(EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_PROJMARK), INFO_PROJNAME)
+      End If
 
       Dim bOk As Boolean = True
       EgtSetCurrentContext(m_CurrProjPage.CurrentProjectScene.GetCtx())
@@ -466,20 +482,15 @@ Public Class ProjectMgrUC
             ' se abilitato e non è restart, lancio eventuale lua post-trasmissione
             If m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.SIMPLESTATISTICS) And nPhaseRestart = 0 Then
                m_MainWindow.ExecSentProgScript(False)
-               ''-------------------Avvio il Ciclo-Start-------------------------
-               'Dim MyCicloStartWD As New CicloStartWD(m_MainWindow)
-               'MyCicloStartWD.ShowDialog()
-               ''-------------------Avvio il Ciclo-Start-------------------------
             End If
          End If
 
-         '-------------------Avvio il Ciclo-Start-------------------------
-         If GetPrivateProfileInt(S_GENERAL, "StartProgram", 0, m_MainWindow.GetIniFile()) <> 0 Then
+         '------------------- INIZIO Avvio il Ciclo-Start-------------------------
+         If GetPrivateProfileInt(S_GENERAL, K_STARTPROGRAM, 0, m_MainWindow.GetIniFile()) <> 0 Then
             Dim MyCicloStartWD As New CicloStartWD(m_MainWindow)
             MyCicloStartWD.ShowDialog()
          End If
-
-         '-------------------Avvio il Ciclo-Start-------------------------
+         '------------------- FINE Avvio il Ciclo-Start-------------------------
 
          ' Altrimenti linea di produzione
       Else
@@ -742,7 +753,7 @@ Public Class ProjectMgrUC
       Else
          m_MainWindow.m_CadCutPageUC.m_NestPage.m_bSelectCurv = False
          EgtDeselectObj(m_MainWindow.m_CadCutPageUC.m_NestPage.m_CurrSelectedCurv)
-         EgtDeselectObj(m_MainWindow.m_CadCutPageUC.m_NestPage.m_CurrSelectedSawCurv)
+         EgtResetMark(m_MainWindow.m_CadCutPageUC.m_NestPage.m_CurrSelectedSawCurv)
       End If
       ' aggiorno il disegno
       EgtDraw()

RawPhoto/RawPartPageUC.xaml.vb

@@ -45,9 +45,9 @@ Public Class RawPartPageUC
    ' Layer per crocette temporanee
    Private m_nTempLay As Integer = GDB_ID.NULL
    ' Definizione lista modalità di definizione grezzo per ComboBox
-   Private m_RawModeList(2) As String
-   Private m_RawModeDamagedList(1) As String
-   Private m_RawModeListEx(3) As String
+   Private m_RawModeList(3) As String
+   Private m_RawModeDamagedList(2) As String
+   Private m_RawModeListEx(4) As String
    ' Variabile che indica la zona danneggiata selezionata
    Private m_nSelDmg As Integer
    ' Array per modalità per punti
@@ -63,6 +63,8 @@ Public Class RawPartPageUC
    Private m_CurveXDamagedAreaList As New List(Of Integer)
    ' Flag che indica se è in corso la definizione tramite laser o se il grezzo è già chiuso
    Private m_bIsRawDefiningByLaser As Boolean = False
+   ' Flag che indica se è in corso la definizione tramite lama o se il grezzo è già chiuso
+   Private m_bIsRawDefiningBySaw As Boolean = False
    ' Flag di tastatura in corso
    Private m_bProbingOn As Boolean = False
    ' Flag inserimento punti laser da disegno
@@ -99,6 +101,8 @@ Public Class RawPartPageUC
       FROM_PHOTO = 3
       DAMAGED = 4
       DAMAGED_BY_LASER = 5
+      DAMAGED_BY_SAW = 6
+      FROM_SAW = 7
    End Enum
 
    Private Sub RawPartPage_Initialized(sender As Object, e As EventArgs)
@@ -123,14 +127,32 @@ Public Class RawPartPageUC
       m_RawModeList(0) = EgtMsg(MSG_RAWPARTPAGEUC + 1)           'Rettangolo
       m_RawModeList(1) = EgtMsg(MSG_RAWPARTPAGEUC + 2)           'Per Punti
       m_RawModeList(2) = EgtMsg(MSG_RAWPARTPAGEUC + 30)          'Da Laser
+      If m_MainWindow.m_CurrentMachine.bSaw Then
+         m_RawModeList(3) = EgtMsg(MSG_DIRECTCUTPAGEUC + 24)        'Da Lama
+      Else
+         ' se non insrisco "Lama" allora ridimensiono il vettore
+         ReDim Preserve m_RawModeList(2)
+      End If
       m_RawModeListEx(0) = EgtMsg(MSG_RAWPARTPAGEUC + 1)         'Rettangolo
       m_RawModeListEx(1) = EgtMsg(MSG_RAWPARTPAGEUC + 2)         'Per Punti
       m_RawModeListEx(2) = EgtMsg(MSG_RAWPARTPAGEUC + 30)        'Da Laser
-      m_RawModeListEx(3) = EgtMsg(MSG_RAWPARTPAGEUC + 35)        'Da Fotografia
+      If m_MainWindow.m_CurrentMachine.bSaw Then
+         m_RawModeListEx(3) = EgtMsg(MSG_DIRECTCUTPAGEUC + 24)      'Da Lama
+         m_RawModeListEx(4) = EgtMsg(MSG_RAWPARTPAGEUC + 35)        'Da Fotografia
+      Else
+         ' se non insrisco "Lama" allora ridimensiono il vettore
+         m_RawModeListEx(3) = EgtMsg(MSG_RAWPARTPAGEUC + 35)        'Da Fotografia
+         ReDim Preserve m_RawModeListEx(3)
+      End If
       RawModeCmBx.ItemsSource = m_RawModeList
       ' lista per selezione RawModeDamaged
       m_RawModeDamagedList(0) = EgtMsg(MSG_RAWPARTPAGEUC + 2)    'Per Punti
       m_RawModeDamagedList(1) = EgtMsg(MSG_RAWPARTPAGEUC + 30)   'Da Laser
+      If m_MainWindow.m_CurrentMachine.bSaw Then
+         m_RawModeDamagedList(2) = EgtMsg(MSG_DIRECTCUTPAGEUC + 24) 'Da Lama
+      Else
+         ReDim Preserve m_RawModeDamagedList(1)
+      End If
       RawModeDamagedCmBx.ItemsSource = m_RawModeDamagedList
 
       ' Nascondo bottone tastatura lastra se disattivato da file .ini
@@ -142,7 +164,7 @@ Public Class RawPartPageUC
                    GetPrivateProfileInt(S_RAWPART, K_SLABID, 0, m_MainWindow.GetIniFile()) <> 0)
       SlabIdBtn.Visibility = If(m_bSlabId, Windows.Visibility.Visible, Windows.Visibility.Collapsed)
 
-      m_SmartMachiningPage = GetPrivateProfileInt(S_GENERAL, "SmartMachiningPage", 0, m_MainWindow.GetIniFile()) <> 0
+      m_SmartMachiningPage = GetPrivateProfileInt(S_GENERAL, K_SMARTMACHININGPAGE, 0, m_MainWindow.GetIniFile()) <> 0
 
       ' Imposto i messaggi letti dal file dei messaggi
       OutlineBtn.Content = EgtMsg(MSG_RAWPARTPAGEUC + 33)       'Rectangle - Rettangolo
@@ -309,9 +331,10 @@ Public Class RawPartPageUC
       ' Verifico cosa selezionato
       Dim nSolidId = EgtGetFirstNameInGroup(m_CurrProjPage.m_nRawId, NAME_RAW_SOLID)
       Dim nKerfId = EgtGetFirstNameInGroup(m_CurrProjPage.m_nRawId, NAME_KERF)
+
       '----------------------------------------- INIZIO ------------------ se decido di inserire i punti laser manualmente --------------------------------------------------
-      ' se decido di inserire i punti laser manualmente
-      If m_bFromDraw And m_ActiveRawMode = RAWMODE.FROM_LASER Or m_ActiveRawMode = RAWMODE.DAMAGED_BY_LASER Then
+      ' se decido di inserire i punti laser manualmente (in assenza di collegamento con CN)
+      If m_bFromDraw AndAlso (m_ActiveRawMode = RAWMODE.FROM_LASER Or m_ActiveRawMode = RAWMODE.DAMAGED_BY_LASER Or m_ActiveRawMode = RAWMODE.FROM_SAW Or m_ActiveRawMode = RAWMODE.DAMAGED_BY_SAW) Then
          ' Rimuovo eventuali crocette create acquisendo i punti nel disegno
          EgtEmptyGroup(m_nTempLay)
          ' Acquisisco punto da disegno
@@ -336,6 +359,7 @@ Public Class RawPartPageUC
          Return
       End If
       '-----------------------------------------  FINE  ------------------ se decido di inserire i punti laser manualmente --------------------------------------------------
+      ' recupero elemento selezionato nella scena
       EgtSetObjFilterForSelWin(True, True, True, True, True)
       Dim nSel As Integer
       EgtSelect(e.Location, 2 * Scene.DIM_SEL, 2 * Scene.DIM_SEL, nSel)
@@ -349,8 +373,7 @@ Public Class RawPartPageUC
             m_bDrag = EgtUnProjectPoint(e.Location, m_ptPrev)
             m_nDragEnt = -1
             m_dDragPar = -1
-         ElseIf sName = NAME_KERF And
-                (m_ActiveRawMode = RAWMODE.RECTANGLE Or m_ActiveRawMode = RAWMODE.BY_POINTS) Then
+         ElseIf sName = NAME_KERF And (m_ActiveRawMode = RAWMODE.RECTANGLE Or m_ActiveRawMode = RAWMODE.BY_POINTS) Then
             m_bDrag = EgtUnProjectPoint(e.Location, m_ptPrev)
             Dim dDist, dU As Double
             If Not EgtPointCurveDist(m_ptPrev.Loc(nKerfId), nKerfId, nKerfId, dDist, dU) Then
@@ -360,7 +383,7 @@ Public Class RawPartPageUC
             m_dDragPar = dU
             ' Privilegio il kerf, pertanto esco
             Exit While
-         ElseIf sName = NAME_DAMAGED And (m_ActiveRawMode = RAWMODE.DAMAGED Or m_ActiveRawMode = RAWMODE.DAMAGED_BY_LASER) Then
+         ElseIf sName = NAME_DAMAGED And (m_ActiveRawMode = RAWMODE.DAMAGED Or m_ActiveRawMode = RAWMODE.BY_POINTS) Then
             m_bDrag = EgtUnProjectPoint(e.Location, m_ptPrev)
             Dim dDist, dU As Double
             If Not EgtPointCurveDist(m_ptPrev.Loc(nSelId), nSelId, nSelId, dDist, dU) Then
@@ -377,6 +400,7 @@ Public Class RawPartPageUC
          End If
          nSelId = EgtGetNextObjInSelWin()
       End While
+
       ' se drag e modalità punti
       If m_bDrag And m_ActiveRawMode = RAWMODE.BY_POINTS Then
          ' se aggiungi punto
@@ -413,7 +437,7 @@ Public Class RawPartPageUC
             End If
          End If
          ' se drag e modalità zona danneggiata
-      ElseIf m_bDrag And (m_ActiveRawMode = RAWMODE.DAMAGED Or m_ActiveRawMode = RAWMODE.DAMAGED_BY_LASER) Then
+      ElseIf m_bDrag And (m_ActiveRawMode = RAWMODE.DAMAGED Or m_ActiveRawMode = RAWMODE.DAMAGED_BY_LASER Or m_ActiveRawMode = RAWMODE.DAMAGED_BY_SAW) Then
          ' se aggiungi zona rovinata
          If m_nPtDmgMode = DMGMODE.ADD Then
             AddNewDamagedArea()
@@ -665,6 +689,8 @@ Public Class RawPartPageUC
    Private Sub OkBtn_Click(sender As Object, e As RoutedEventArgs) Handles OkBtn.Click
       ' Non è possibile uscire con tastatura in corso
       If m_bProbingOn Then Return
+      ' reimposto il comando OutLine
+      OutlineBtn_Click(Nothing, Nothing)
       ' Se confermata uscita
       If ExitRawPart(True) Then
          m_MainWindow.m_CurrentProjectPageUC.CurrentProjectPageGrid.Children.Remove(Me)
@@ -696,6 +722,16 @@ Public Class RawPartPageUC
             CloseDamagedAreaByLaser()
          End If
       End If
+      If m_ActiveRawMode = RAWMODE.FROM_SAW Then
+         If m_bIsRawDefiningBySaw Then
+            CloseRawBySaw()
+         End If
+      End If
+      If m_ActiveRawMode = RAWMODE.DAMAGED_BY_SAW Then
+         If m_bIsRawDefiningBySaw Then
+            CloseDamagedAreaBySaw()
+         End If
+      End If
       ' Apro pagina di selezione della lavorazione prima di chiudere il grezzo
       m_ChooseMachiningPage = New ChooseMachining(m_MainWindow)
       '--------------------------- SELEZIONE LAVORAZIONI ---------------------------------
@@ -779,6 +815,8 @@ Public Class RawPartPageUC
          Case 0          ' Rettangolo
             ' Se ero in modalità da laser
             VerifyLaserDefining()
+            ' Se ero in modalità da Lama
+            VerifySawDefinig()
             ' Verificos e sto realmente cambiando modalità
             Dim bChanging As Boolean = (m_ActiveRawMode <> RAWMODE.RECTANGLE)
             ' Imposto nuova modalità
@@ -790,6 +828,8 @@ Public Class RawPartPageUC
          Case 1          ' Punti
             ' Se ero in modalità da laser
             VerifyLaserDefining()
+            ' Se ero in modalità da Lama
+            VerifySawDefinig()
             ' Imposto nuova modalità
             m_ActiveRawMode = RAWMODE.BY_POINTS
             ' Riattivo i controlli in base a quale modalità di inserimento contorni è attiva
@@ -797,6 +837,8 @@ Public Class RawPartPageUC
             UpdateCircles()
             EgtDraw()
          Case 2          ' Da laser
+            ' Se ero in modalità da Lama
+            VerifySawDefinig()
             ' Imposto nuova modalità
             m_ActiveRawMode = RAWMODE.FROM_LASER
             RemoveCircles()
@@ -811,10 +853,44 @@ Public Class RawPartPageUC
             ' Disattivo il bottone
             CloseBtn.IsEnabled = False
             OkBtn.IsEnabled = False
-         Case 3          ' Da fotografia
+         Case 3          ' Da Lama
+            If Not m_MainWindow.m_CurrentMachine.bSaw Then    ' Da fotografia
+               ' Se ero in modalità da laser
+               VerifyLaserDefining()
+               ' Se ero in modalità da Lama
+               VerifySawDefinig()
+               ' Imposto nuova modalità
+               m_ActiveRawMode = RAWMODE.FROM_PHOTO
+               ' Riattivo i controlli in base a quale modalità di inserimento contorni è attiva
+               RawModeView()
+               RemoveCircles()
+               ' Creo il grezzo dal contorno riconosciuto nella fotografia
+               CreateRawFromPhotoContour()
+               EgtDraw()
+               Exit Select
+            End If
             ' Se ero in modalità da laser
             VerifyLaserDefining()
             ' Imposto nuova modalità
+            m_ActiveRawMode = RAWMODE.FROM_SAW
+            RemoveCircles()
+            LoadFromMachine()
+            ' Azzero lista e punto di partenza
+            m_CurveXKerfList.Clear()
+            m_bptLast = False
+            ' Segno flag che indica definizione grezzo con laser in corso
+            m_bIsRawDefiningBySaw = True
+            ' Riattivo i controlli in base a quale modalità di inserimento contorni è attiva
+            RawModeView()
+            ' Disattivo il bottone
+            CloseBtn.IsEnabled = False
+            OkBtn.IsEnabled = False
+         Case 4          ' Da fotografia
+            ' Se ero in modalità da laser
+            VerifyLaserDefining()
+            ' Se ero in modalità da Lama
+            VerifySawDefinig()
+            ' Imposto nuova modalità
             m_ActiveRawMode = RAWMODE.FROM_PHOTO
             ' Riattivo i controlli in base a quale modalità di inserimento contorni è attiva
             RawModeView()
@@ -822,6 +898,7 @@ Public Class RawPartPageUC
             ' Creo il grezzo dal contorno riconosciuto nella fotografia
             CreateRawFromPhotoContour()
             EgtDraw()
+
       End Select
    End Sub
 
@@ -831,6 +908,8 @@ Public Class RawPartPageUC
             m_ActiveRawMode = RAWMODE.DAMAGED
          Case 1          ' Da laser
             m_ActiveRawMode = RAWMODE.DAMAGED_BY_LASER
+         Case 2          ' Da Lama
+            m_ActiveRawMode = RAWMODE.DAMAGED_BY_SAW
       End Select
       RawModeView()
       EgtDraw()
@@ -927,11 +1006,43 @@ Public Class RawPartPageUC
             ' Disattivo bottoni zone rovinate e foto
             DamagedAreaGpBx.Visibility = Windows.Visibility.Hidden
             ConfirmPhotoBtn.Visibility = Windows.Visibility.Hidden
+         Case RAWMODE.DAMAGED_BY_SAW
+            RawModeCmBx.IsEnabled = True
+            RawModeDamagedCmBx.Visibility = Visibility.Visible
+            LengthTxBx.IsEnabled = False
+            WidthTxBx.IsEnabled = False
+            OffsetXTxBx.IsEnabled = False
+            OffsetYTxBx.IsEnabled = False
+            ' Visualizzo bottoni per laser            
+            PointsGpBx.Visibility = Windows.Visibility.Visible
+            PointsGpBx.SetValue(Grid.RowSpanProperty, 2)
+            AddBtn.SetValue(Grid.RowSpanProperty, 1)
+            RemoveBtn.SetValue(Grid.RowSpanProperty, 1)
+            CloseBtn.Visibility = Windows.Visibility.Visible
+            ' Disattivo bottoni zone rovinate e foto
+            DamagedAreaGpBx.Visibility = Windows.Visibility.Hidden
+            ConfirmPhotoBtn.Visibility = Windows.Visibility.Hidden
+         Case RAWMODE.FROM_SAW
+            RawModeCmBx.IsEnabled = True
+            RawModeDamagedCmBx.Visibility = Visibility.Collapsed
+            LengthTxBx.IsEnabled = False
+            WidthTxBx.IsEnabled = False
+            OffsetXTxBx.IsEnabled = False
+            OffsetYTxBx.IsEnabled = False
+            ' Visualizzo bottoni per lama            
+            PointsGpBx.Visibility = Windows.Visibility.Visible
+            PointsGpBx.SetValue(Grid.RowSpanProperty, 2)
+            AddBtn.SetValue(Grid.RowSpanProperty, 1)
+            RemoveBtn.SetValue(Grid.RowSpanProperty, 1)
+            CloseBtn.Visibility = Windows.Visibility.Visible
+            ' Disattivo bottoni zone rovinate e foto
+            DamagedAreaGpBx.Visibility = Windows.Visibility.Hidden
+            ConfirmPhotoBtn.Visibility = Windows.Visibility.Hidden
       End Select
    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 Then
+      If m_ActiveRawMode = RAWMODE.DAMAGED Or m_ActiveRawMode = RAWMODE.DAMAGED_BY_LASER Or m_ActiveRawMode = RAWMODE.DAMAGED_BY_SAW Then
          ' m_ActiveRawMode = RAWMODE.BY_POINTS
          m_ActiveRawMode = m_PrecActiveRawMode
          RawModeCmBx.SelectedIndex = m_ActiveRawMode
@@ -946,6 +1057,9 @@ Public Class RawPartPageUC
       If m_PrecActiveRawMode = RAWMODE.FROM_LASER Then
          m_ActiveRawMode = RAWMODE.DAMAGED_BY_LASER
          RawModeDamagedCmBx.SelectedIndex = 1
+      ElseIf m_PrecActiveRawMode = RAWMODE.FROM_SAW Then
+         m_ActiveRawMode = RAWMODE.DAMAGED_BY_SAW
+         RawModeDamagedCmBx.SelectedIndex = 2
       Else
          m_ActiveRawMode = RAWMODE.DAMAGED
          RawModeDamagedCmBx.SelectedIndex = 0
@@ -1010,6 +1124,54 @@ Public Class RawPartPageUC
             End If
             AddBtn.IsChecked = False
             EgtDraw()
+         Case RAWMODE.FROM_SAW
+            Dim ptAcquired As Point3d
+            ' Se inserimento manuale dei punti laser
+            If m_bFromDraw Then
+               If Not IsNothing(m_ptPrev) Then
+                  ptAcquired = m_ptPrev
+                  ptAcquired.ToLoc(New Frame3d(m_ptTableMin))
+               Else
+                  m_CurrProjPage.SetErrorMessage(EgtMsg(90532))   ' Errore nell'acquisizione del punto
+                  Return
+               End If
+               ' altrimenti da macchina
+            Else
+               If Not AcquireSawPoint(ptAcquired) Then
+                  m_CurrProjPage.SetErrorMessage(EgtMsg(90532))   ' Errore nell'acquisizione del punto
+                  Return
+               End If
+            End If
+            ' Limito il punto a stare nella tavola con franco pari al kerf
+            If ptAcquired.x < m_RawKerf Then ptAcquired.x = m_RawKerf + SAFE_RAW_DIST
+            If ptAcquired.y < m_RawKerf Then ptAcquired.y = m_RawKerf + SAFE_RAW_DIST
+            If ptAcquired.x > m_dTableLength - m_RawKerf Then ptAcquired.x = m_dTableLength - m_RawKerf - SAFE_RAW_DIST
+            If ptAcquired.y > m_dTableWidth - m_RawKerf Then ptAcquired.y = m_dTableWidth - m_RawKerf - SAFE_RAW_DIST
+            ' Aggiusto Z punto movimentato (è in locale al tavolo)
+            ptAcquired.z = m_CurrentMachine.dAdditionalTable + m_RawHeight
+            'Porto il punto nel riferimento del grezzo
+            Dim frRaw As New Frame3d
+            EgtGetGroupGlobFrame(m_CurrProjPage.m_nRawId, frRaw)
+            ptAcquired.LocToLoc(New Frame3d(m_ptTableMin), frRaw)
+            m_ptPrev.LocToLoc(New Frame3d(m_ptTableMin), frRaw)
+            If m_bptLast Then
+               If Point3d.SameApprox(ptAcquired, m_ptLast) Then
+                  AddBtn.IsChecked = False
+                  Exit Sub
+               End If
+               Dim NewLine As Integer = EgtCreateLine(m_CurrProjPage.m_nRawId, m_ptLast, ptAcquired)
+               EgtSetColor(NewLine, m_KerfCol)
+               m_CurveXKerfList.Add(NewLine)
+            Else
+               m_bptLast = True
+            End If
+            m_ptLast = ptAcquired
+            If m_CurveXKerfList.Count > 1 Then
+               OkBtn.IsEnabled = True
+               CloseBtn.IsEnabled = True
+            End If
+            AddBtn.IsChecked = False
+            EgtDraw()
          Case RAWMODE.DAMAGED
             ' Verifico ci sia almeno una zona rovinata
             If EgtGetFirstNameInGroup(m_CurrProjPage.m_nRawId, NAME_DAMAGED) = GDB_ID.NULL Then
@@ -1068,6 +1230,54 @@ Public Class RawPartPageUC
             End If
             AddBtn.IsChecked = False
             EgtDraw()
+         Case RAWMODE.DAMAGED_BY_SAW
+            Dim ptAcquired As Point3d
+            ' Se inserimento manuale dei punti laser
+            If m_bFromDraw Then
+               If Not IsNothing(m_ptPrev) Then
+                  ptAcquired = m_ptPrev
+                  ptAcquired.ToLoc(New Frame3d(m_ptTableMin))
+               Else
+                  m_CurrProjPage.SetErrorMessage(EgtMsg(90532))   ' Errore nell'acquisizione del punto
+                  Return
+               End If
+               ' altrimenti da macchina
+            Else
+               If Not AcquireSawPoint(ptAcquired) Then
+                  m_CurrProjPage.SetErrorMessage(EgtMsg(90532))   ' Errore nell'acquisizione del punto
+                  Return
+               End If
+            End If
+            ' Limito il punto a stare nella tavola con franco pari al kerf
+            If ptAcquired.x < m_RawKerf Then ptAcquired.x = m_RawKerf + SAFE_RAW_DIST
+            If ptAcquired.y < m_RawKerf Then ptAcquired.y = m_RawKerf + SAFE_RAW_DIST
+            If ptAcquired.x > m_dTableLength - m_RawKerf Then ptAcquired.x = m_dTableLength - m_RawKerf - SAFE_RAW_DIST
+            If ptAcquired.y > m_dTableWidth - m_RawKerf Then ptAcquired.y = m_dTableWidth - m_RawKerf - SAFE_RAW_DIST
+            ' Aggiusto Z punto movimentato (è in locale al tavolo)
+            ptAcquired.z = m_CurrentMachine.dAdditionalTable + m_RawHeight
+            'Porto il punto nel riferimento del grezzo
+            Dim frRaw As New Frame3d
+            EgtGetGroupGlobFrame(m_CurrProjPage.m_nRawId, frRaw)
+            ptAcquired.LocToLoc(New Frame3d(m_ptTableMin), frRaw)
+            m_ptPrev.LocToLoc(New Frame3d(m_ptTableMin), frRaw)
+            If m_bptLast Then
+               If Point3d.SameApprox(ptAcquired, m_ptLast) Then
+                  AddBtn.IsChecked = False
+                  Exit Sub
+               End If
+               Dim NewLine As Integer = EgtCreateLine(m_CurrProjPage.m_nRawId, m_ptLast, ptAcquired)
+               EgtSetColor(NewLine, m_KerfCol)
+               m_CurveXDamagedAreaList.Add(NewLine)
+            Else
+               m_bptLast = True
+            End If
+            m_ptLast = ptAcquired
+            If m_CurveXDamagedAreaList.Count > 1 Then
+               OkBtn.IsEnabled = True
+               CloseBtn.IsEnabled = True
+            End If
+            AddBtn.IsChecked = False
+            EgtDraw()
       End Select
    End Sub
 
@@ -1099,6 +1309,28 @@ Public Class RawPartPageUC
       Return True
    End Function
 
+   Private Function AcquireSawPoint(ByRef ptAcquired As Point3d) As Boolean
+      Dim ptTipP1 As Point3d
+      ' Recupero la posizione macchina
+      Dim dL1, dL2, dL3, dR1, dR2 As Double
+      If Not m_MainWindow.m_CNCommunication.GetAxesPositions(dL1, dL2, dL3, dR1, dR2) Then
+         Return False
+      End If
+      ' Recupero dati utensile e testa corrente
+      Dim sTool As String = ""
+      Dim sHead As String = ""
+      Dim nExit As Integer = 0
+      EgtGetCalcTool(sTool, sHead, nExit)
+      ' Trasformo in posizione punta utensile in basso
+      If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, dR1, dR2, True, ptTipP1) Then
+         Return False
+      End If
+      ' Porto il tip nell'origine tavola
+      ptAcquired = ptTipP1
+      ptAcquired.ToLoc(New Frame3d(m_ptTableMin))
+      Return True
+   End Function
+
    Private Sub RemoveBtn_Click(sender As Object, e As RoutedEventArgs) Handles RemoveBtn.Click
       Select Case m_ActiveRawMode
          Case RAWMODE.RECTANGLE
@@ -1126,6 +1358,26 @@ Public Class RawPartPageUC
             End If
             RemoveBtn.IsChecked = False
             EgtDraw()
+         Case RAWMODE.FROM_SAW
+            If m_CurveXKerfList.Count > 0 Then
+               If m_CurveXKerfList.Count = 1 Then
+                  ' Aggiorno ptLast con primo punto
+                  EgtStartPoint(m_CurveXKerfList(m_CurveXKerfList.Count - 1), m_ptLast)
+                  ' Cancello ultima linea
+                  EgtErase(m_CurveXKerfList(m_CurveXKerfList.Count - 1))
+                  m_CurveXKerfList.RemoveAt(m_CurveXKerfList.Count - 1)
+               Else
+                  ' Cancello ultima linea
+                  EgtErase(m_CurveXKerfList(m_CurveXKerfList.Count - 1))
+                  m_CurveXKerfList.RemoveAt(m_CurveXKerfList.Count - 1)
+                  ' Aggiorno ptLast
+                  EgtEndPoint(m_CurveXKerfList(m_CurveXKerfList.Count - 1), m_ptLast)
+               End If
+            Else
+               m_bptLast = False
+            End If
+            RemoveBtn.IsChecked = False
+            EgtDraw()
          Case RAWMODE.DAMAGED
             ' Verifico ci sia almeno una zona rovinata
             If EgtGetFirstNameInGroup(m_CurrProjPage.m_nRawId, NAME_DAMAGED) = GDB_ID.NULL Then
@@ -1136,6 +1388,46 @@ Public Class RawPartPageUC
             DeleteBtn.IsChecked = False
             m_nPtMode = If(RemoveBtn.IsChecked(), PTMODE.REMOVE, PTMODE.MOVE)
             m_nPtDmgMode = DMGMODE.NONE
+         Case RAWMODE.DAMAGED_BY_LASER
+            If m_CurveXDamagedAreaList.Count > 0 Then
+               If m_CurveXDamagedAreaList.Count = 1 Then
+                  ' Aggiorno ptLast con primo punto
+                  EgtStartPoint(m_CurveXDamagedAreaList(m_CurveXDamagedAreaList.Count - 1), m_ptLast)
+                  ' Cancello ultima linea
+                  EgtErase(m_CurveXDamagedAreaList(m_CurveXDamagedAreaList.Count - 1))
+                  m_CurveXDamagedAreaList.RemoveAt(m_CurveXDamagedAreaList.Count - 1)
+               Else
+                  ' Cancello ultima linea
+                  EgtErase(m_CurveXDamagedAreaList(m_CurveXDamagedAreaList.Count - 1))
+                  m_CurveXDamagedAreaList.RemoveAt(m_CurveXDamagedAreaList.Count - 1)
+                  ' Aggiorno ptLast
+                  EgtEndPoint(m_CurveXDamagedAreaList(m_CurveXDamagedAreaList.Count - 1), m_ptLast)
+               End If
+            Else
+               m_bptLast = False
+            End If
+            RemoveBtn.IsChecked = False
+            EgtDraw()
+         Case RAWMODE.DAMAGED_BY_SAW
+            If m_CurveXDamagedAreaList.Count > 0 Then
+               If m_CurveXDamagedAreaList.Count = 1 Then
+                  ' Aggiorno ptLast con primo punto
+                  EgtStartPoint(m_CurveXDamagedAreaList(m_CurveXDamagedAreaList.Count - 1), m_ptLast)
+                  ' Cancello ultima linea
+                  EgtErase(m_CurveXDamagedAreaList(m_CurveXDamagedAreaList.Count - 1))
+                  m_CurveXDamagedAreaList.RemoveAt(m_CurveXDamagedAreaList.Count - 1)
+               Else
+                  ' Cancello ultima linea
+                  EgtErase(m_CurveXDamagedAreaList(m_CurveXDamagedAreaList.Count - 1))
+                  m_CurveXDamagedAreaList.RemoveAt(m_CurveXDamagedAreaList.Count - 1)
+                  ' Aggiorno ptLast
+                  EgtEndPoint(m_CurveXDamagedAreaList(m_CurveXDamagedAreaList.Count - 1), m_ptLast)
+               End If
+            Else
+               m_bptLast = False
+            End If
+            RemoveBtn.IsChecked = False
+            EgtDraw()
       End Select
    End Sub
 
@@ -1976,6 +2268,26 @@ Public Class RawPartPageUC
       End If
    End Sub
 
+   Private Sub VerifySawDefinig()
+      If m_bIsRawDefiningBySaw Then
+         If m_CurveXKerfList.Count > 1 Then
+            CloseRawBySaw()
+         Else
+            ' Elimino tutti i segmenti disegnati
+            For Each nEntityId As Integer In m_CurveXKerfList
+               If EgtGetType(nEntityId) = GDB_TY.CRV_LINE Then
+                  EgtErase(nEntityId)
+               End If
+            Next
+            ' Azzero lista e punto di partenza
+            m_CurveXKerfList.Clear()
+            ' Creo rettangolo
+            UpdateRawPart()
+         End If
+         m_bIsRawDefiningBySaw = False
+      End If
+   End Sub
+
    Private Sub LoadFromMachine()
       ' Elimino grezzo già presente
       EgtErase(EgtGetFirstNameInGroup(m_CurrProjPage.m_nRawId, NAME_RAW_SOLID))
@@ -1993,6 +2305,10 @@ Public Class RawPartPageUC
       Select Case m_ActiveRawMode
          Case RAWMODE.DAMAGED_BY_LASER
             CloseDamagedAreaByLaser()
+         Case RAWMODE.DAMAGED_BY_SAW
+            CloseDamagedAreaBySaw()
+         Case RAWMODE.FROM_SAW
+            CloseRawBySaw()
          Case Else
             CloseRawByLaser()
       End Select
@@ -2036,6 +2352,42 @@ Public Class RawPartPageUC
       CloseBtn.IsEnabled = False
    End Sub
 
+   Private Sub CloseRawBySaw()
+      ' Verifico ci siano punti
+      If m_CurveXKerfList.Count() = 0 Then Return
+      ' Recupero punto iniziale prima linea del grezzo
+      Dim ptStart As Point3d
+      EgtStartPoint(m_CurveXKerfList(0), ptStart)
+      m_CurveXKerfList.Add(EgtCreateLine(m_CurrProjPage.m_nRawId, m_ptLast, ptStart))
+      ' Trasformo lista di curve in un array
+      Dim CurveXKerfArray As Integer() = m_CurveXKerfList.ToArray
+      ' Creo contorno kerf
+      Dim nKerfId As Integer = EgtCreateCurveCompoByChain(m_CurrProjPage.m_nRawId, m_CurveXKerfList.Count, CurveXKerfArray, ptStart, True)
+      EgtSetName(nKerfId, NAME_KERF)
+      EgtSetColor(nKerfId, m_KerfCol)
+      ' Pulisco lista entità del grezzo
+      m_CurveXKerfList.Clear()
+      ' Aggiorno il grezzo comprese dimensioni e posizione
+      UpdateRawPartKerf()
+      ' Salvo il valore del kerf (sempre in mm)
+      Dim dKerf As Double = 0
+      StringToLen(KerfTxBx.Text, dKerf)
+      If dKerf < 0 Then
+         EgtSetInfo(m_CurrProjPage.m_nRawId, KEY_INVERT_KERF, -1)
+      Else
+         EgtSetInfo(m_CurrProjPage.m_nRawId, KEY_INVERT_KERF, 1)
+      End If
+      EgtSetInfo(m_CurrProjPage.m_nRawId, KEY_KERF, m_RawKerf)
+      ' Segno flag che indica fine della definizione
+      m_bIsRawDefiningBySaw = False
+      ' Elimino primo punto per prossimo grezzo
+      m_bptLast = False
+      ' Aggiorno visualizzazione
+      EgtDraw()
+      ' Disattivo il bottone chiudi grezzo
+      CloseBtn.IsEnabled = False
+   End Sub
+
 #Region "Damaged Area"
 
    Private Sub AddNewDamagedArea()
@@ -2092,6 +2444,32 @@ Public Class RawPartPageUC
       CloseBtn.IsEnabled = False
    End Sub
 
+   Private Sub CloseDamagedAreaBySaw()
+      ' Verifico ci siano punti
+      If m_CurveXDamagedAreaList.Count() = 0 Then Return
+      ' Recupero punto iniziale prima linea del grezzo
+      Dim ptStart As Point3d
+      EgtStartPoint(m_CurveXDamagedAreaList(0), ptStart)
+      ' creao la linea che va dal primo punto all'ultimo
+      m_CurveXDamagedAreaList.Add(EgtCreateLine(m_CurrProjPage.m_nRawId, m_ptLast, ptStart))
+      ' Trasformo lista di curve in un array
+      Dim CurveXDamagedAreaArray As Integer() = m_CurveXDamagedAreaList.ToArray
+      ' Creo contorno kerf
+      Dim nDmgId As Integer = EgtCreateCurveCompoByChain(m_CurrProjPage.m_nRawId, m_CurveXDamagedAreaList.Count, CurveXDamagedAreaArray, ptStart, True)
+      EgtSetName(nDmgId, NAME_DAMAGED)
+      EgtSetColor(nDmgId, m_KerfCol)
+      ' Pulisco lista entità del grezzo
+      m_CurveXDamagedAreaList.Clear()
+      ' Segno flag che indica fine della definizione
+      m_bIsRawDefiningBySaw = False
+      ' Elimino primo punto per prossimo grezzo
+      m_bptLast = False
+      ' Aggiorno visualizzazione
+      EgtDraw()
+      ' Disattivo il bottone chiudi grezzo
+      CloseBtn.IsEnabled = False
+   End Sub
+
    Private Sub RemoveDamagedArea()
       ' Elimino area rovinata selezionata
       EgtErase(m_nSelDmg)

Simulation/SimulationPageUC.xaml

@@ -240,6 +240,9 @@
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="1*"/>
          </Grid.ColumnDefinitions>
+         <Button Name="GenerateCN_Btn" Grid.Column="1" Style="{DynamicResource OmagCut_GradientBlueIconButton}" Click="GenerateXPIUC_Click">
+                <Image Source="{DynamicResource GenerateCNImg}" Style="{StaticResource OmagCut_ButtonIcon}" />
+         </Button>
          <Button Grid.Column="2" Style="{DynamicResource OmagCut_GradientBlueIconButton}" Click="ExitBtnUC_Click">
             <Image Source="{DynamicResource VImg}" Style="{StaticResource OmagCut_ButtonIcon}" />
          </Button>

Simulation/SimulationPageUC.xaml.vb

@@ -1,5 +1,6 @@
 Imports System.Runtime.InteropServices
 Imports EgtUILib
+Imports EgtWPFLib
 
 Public Class SimulationPageUC
    ' Riferimenti a pagine
@@ -76,6 +77,12 @@ Public Class SimulationPageUC
       End If
       ' Pulsante Play
       PlayPauseImage.Source = New System.Windows.Media.Imaging.BitmapImage(New Uri("/Resources/Play.png", UriKind.Relative))
+      ' abilito la visualizzazione del pulsante per la sola generazione del codice CN
+      If GetPrivateProfileInt(S_GENERAL, K_GENERATECN, 0, m_MainWindow.GetIniFile()) <> 0 Then
+         GenerateCN_Btn.Visibility = Visibility.Visible
+      Else
+         GenerateCN_Btn.Visibility = Visibility.Hidden
+      End If
    End Sub
 
    Private Sub SimulationPage_Loaded(sender As Object, e As RoutedEventArgs)
@@ -559,6 +566,111 @@ Public Class SimulationPageUC
 
    End Sub
 
+   Private Sub GenerateXPIUC_Click(sender As Object, e As RoutedEventArgs)
+      Dim bOk As Boolean = True
+      EgtSetCurrentContext(m_CurrProjPage.CurrentProjectScene.GetCtx())
+      ' Elimino eventuale attrezzaggio da OmagOFFICE
+      EgtEraseCurrSetup()
+      ' Verifico l'attrezzaggio degli utensili utilizzati
+      Dim sMissingTools As String = String.Empty
+      If Not VerifySetup(sMissingTools) Then
+         m_CurrProjPage.SetErrorMessage(EgtMsg(90322) & " " & sMissingTools)  'Mancano gli utensili : ... 
+         Return
+      End If
+      ' Costringo ad aggiornare UI
+      UpdateUI()
+      ' Aggiorno flag per lavaggio
+      m_CurrProjPage.UpdateWashingFlag()
+      ' Aggiorno flag per tastatura per tagli con angolo di fianco
+      m_CurrProjPage.UpdateSideAngCutProbeFlag()
+      ' Se pezzi piani e non c'è ordine delle lavorazioni, ricalcolo tutto e ne faccio uno automatico
+      Dim nPrjType As Integer = m_CurrProjPage.GetCurrentProjectType()
+      Dim bDirectCut As Boolean = (GetDirectCutPart() <> GDB_ID.NULL)
+      If nPrjType = CurrentProjectPageUC.PRJ_TYPE.FLATS And
+         Not bDirectCut And
+         Not m_CurrProjPage.GetOrderMachiningFlag() Then
+         ResetAllMachinings()
+         bOk = SortAllMachinings()
+         If bOk Then
+            m_CurrProjPage.SetOrderMachiningFlag()
+            Dim bModif As Boolean = TestAllMachiningsForStrict()
+            If bModif Then
+               m_CurrProjPage.SetWarningMessage(EgtMsg(90321))     'Ridotte alcune lavorazioni per evitare interferenze
+            Else
+               m_CurrProjPage.SetInfoMessage(EgtMsg(90399))        'Aggiornate tutte le lavorazioni
+            End If
+            EgtDraw()
+         End If
+      End If
+      ' Costringo ad aggiornare UI
+      UpdateUI()
+      ' Disabilito impostazione modificato
+      EgtDisableModified()
+      ' Aggiorno le lavorazioni
+      bOk = UpdateAllMachiningsToolpaths() And bOk
+      ' Aggiorno posizionamento ventose sui pezzi per eventuali tagli da sotto con lama
+      bOk = UpdateVacuumsForDrip() And bOk
+      ' Costringo ad aggiornare UI
+      UpdateUI()
+      ' Inserisco indice di progetto
+      m_CurrProjPage.SetProjectIndexFlag()
+      ' Inserisco il materiale
+      m_CurrProjPage.SetProjectMaterial()
+      ' Salvo il progetto con le lavorazioni
+      Dim sMchPath As String = m_MainWindow.GetTempDir() & "\MachProj.nge"
+      m_CurrProjPage.SaveFile(sMchPath)
+      ' Costringo ad aggiornare UI
+      UpdateUI()
+      ' Se modalità Ufficio, copio il progetto ed esco
+      If m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.OFFICE_TYPE) Then
+         ' Ripristino come fase corrente quella iniziale
+         EgtSetCurrPhase(1)
+         ' Chiedo il nome del file esportato
+         Dim MySaveNameWD As New SaveNameWD(m_MainWindow, SaveNameWD.SAVE_TYPE.PRJ_COPY)
+         MySaveNameWD.ShowDialog()
+         Return
+      End If
+      ' Se presente ripartenza, ne chiedo conferma
+      Dim nPhaseRestart As Integer = m_CurrProjPage.GetProjectNcRestart()
+      If nPhaseRestart <> 0 Then
+         ' Confermi ripartenza dalla fase NNN ?
+         Dim AskNcRestart As New EgtMsgBox(m_MainWindow, "", String.Format(EgtMsg(90326), nPhaseRestart),
+                                        EgtMsgBox.Buttons.YES_NO_CANCEL, EgtMsgBox.Icons.NULL, 2)
+         Select Case AskNcRestart.m_nPressedBtn
+            Case 1         ' YES
+            Case 2         ' NO
+               EgtEnableModified()
+               m_CurrProjPage.ResetProjectNcRestart()
+               nPhaseRestart = 0
+               EgtDisableModified()
+            Case Else      ' CANCEL
+               Return
+         End Select
+      End If
+      ' Se abilitate, eseguo le stime
+      If GetPrivateProfileInt(S_MACH_ESTIMATIONS, K_ENABLEEST, 0, m_MainWindow.GetMachIniFile()) <> 0 Then
+         EgtEstimate(m_MainWindow.GetTempDir() & "\MachProj.html", "OmagCut ver." & m_MainWindow.GetVersion())
+      End If
+      ' Genero file CNC (lancio anche se errore in precedenza) -> recupero la tavola corrente! CamAuto.GetCurrentTable()
+      Dim nIndexTab As Integer = CamAuto.GetCurrentTable()
+      Dim sIndexTab As String = String.Empty
+      If nIndexTab > 0 Then
+         sIndexTab = nIndexTab.ToString
+      End If
+      Dim sFileName As String = "CadCut" & sIndexTab
+      Dim sCncPath As String = m_MainWindow.GetCncDir() & "\" & sFileName & m_MainWindow.m_CurrentMachine.sIsoFileExt
+      bOk = EgtGenerate(sCncPath, "OmagCut ver." & m_MainWindow.GetVersion()) And bOk
+      ' Costringo ad aggiornare UI
+      UpdateUI()
+      ' Ripristino come fase corrente quella iniziale
+      EgtSetCurrPhase(1)
+      If bOk Then
+         m_CurrProjPage.SetInfoMessage("Genarato file " & sFileName & m_MainWindow.m_CurrentMachine.sIsoFileExt)
+      Else
+         m_CurrProjPage.SetErrorMessage(EgtMsg(90314))       'Errore nella generazione del programma CN
+      End If
+   End Sub
+
    Private Function ProcessEvents(nProg As Integer, nPause As Integer) As Integer
       ' Visualizzo assi
       ShowCncData()

Utility/Utility.vb

@@ -60,6 +60,69 @@ Module Utility
       End If
    End Function
 
+#Region "PreGuidCode"
+
+   ' recupero i primi 5 caratteri della stringa
+   Friend Function GetPreGuidCode(sGuidCode As String) As String
+      If sGuidCode.Count > 5 Then
+         Return sGuidCode(0) & sGuidCode(1) & sGuidCode(2) & sGuidCode(3) & sGuidCode(4)
+      End If
+      Return String.Empty
+   End Function
+
+   ' sostituisce i primi 5 caratteri della stringa con qualle passata
+   Friend Function UppDateGuidCode(ByRef sGuidCode As String, sPreGuidCode As String) As Boolean
+      If sPreGuidCode.Count = 5 Then
+         sGuidCode = sGuidCode.Remove(0, 5)
+         sGuidCode = sPreGuidCode & sGuidCode
+         Return True
+      End If
+      Return False
+   End Function
+
+   ' restituisce 5 caratteri 
+   Friend Function CreatePreGuidCode(nId As Integer) As String
+      ' recupero il frame dell'oggetto
+      Dim frGlobFrame As New Frame3d
+      If Not EgtGetGroupGlobFrame(nId, frGlobFrame) Then
+         Return String.Empty
+      End If
+      ' recupero il suo versore
+      Dim vtX As Vector3d = frGlobFrame.VersX
+      Dim Len As Double
+      Dim AngV As Double
+      Dim AngH As Double
+      vtX.ToSpherical(Len, AngV, AngH)
+      ' costruisco il codice (6 caratteri!) che identifica la posizione del pezzo in parcheggio
+      Dim sPreGuid As String = GetDirectionCode(AngH)
+      Return sPreGuid
+   End Function
+
+   Friend Function GetDirectionCode(dVal As Double) As String
+      Dim bIsNegative As Boolean = False
+      If dVal < 0 Then
+         dVal = dVal + (-1)
+         bIsNegative = True
+      End If
+      Dim sVal As String = DoubleToString(dVal * 1000, 0)
+      Dim nCount As Integer = sVal.Count
+      For Index As Integer = 1 To 4 - nCount
+         sVal = "0" & sVal
+      Next
+      Dim vVal As Char() = {"+", "1", "0", "0", "0"}
+      If bIsNegative Then
+         vVal = {"-"c, sVal(0), sVal(1), sVal(2), sVal(3)}
+      Else
+         vVal = {"+"c, sVal(0), sVal(1), sVal(2), sVal(3)}
+      End If
+      ' ricostruisco la stringa dotata di segno
+      sVal = vVal(0) & vVal(1) & vVal(2) & vVal(3) & vVal(4)
+      Return sVal
+   End Function
+
+#End Region    ' PreGiudCode
+
+
    Friend Function UIExprToExpr(sUIExpr As String) As String
       If String.IsNullOrWhiteSpace(sUIExpr) Then
          Return ""