Gestione punti SpotReg

- inibita la generazione CN in simulazione se versione ufficio.

CadCuts/CadCutPageUC.xaml

@@ -30,7 +30,7 @@
          </Grid.ColumnDefinitions>
 
          <Button Name="PhotoBtn" Grid.Column="0" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
-                <Image Source="{DynamicResource PhotoImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+                <Image Name="PhotoIMG" Source="{DynamicResource PhotoImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
          </Button>
             <Button Name="RawPartBtn" Grid.Column="1" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
             <Image Source="{DynamicResource RawPartImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>

CadCuts/MoveRawPartPage.xaml.vb

@@ -370,7 +370,15 @@ Public Class MoveRawPartPage
                   VacuumCups.SetWeightInformation(AverageDensity, MaxSinglePlugger, MaxDoublePlugger)
                   VacuumCups.SetRotationForExtraStrokeY(GetPrivateProfileInt(S_MACH_RAWMOVE, K_MACH_ROTATEVACUUMFOREXTRASTROKEY, 0, m_MainWindow.GetMachIniFile()) <> 0)
                   VacuumCups.SetRotationForExtraStrokeX(GetPrivateProfileInt(S_MACH_RAWMOVE, K_MACH_ROTATEVACUUMFOREXTRASTROKEX, 0, m_MainWindow.GetMachIniFile()) <> 0)
-                  If PutVacuumCupsOnRaw(nId, rmData) Then
+
+                  VacuumCups.ResetHeadName()
+                  Dim bPutVacuum As Boolean = PutVacuumCupsOnRaw(nId, rmData)
+                  If Not bPutVacuum Then
+                     Dim bTwoHeadVac As Boolean = ( EgtGetHeadId( VACUUM_HEAD_2) <> GDB_ID.NULL)
+                     If bTwoHeadVac Then bPutVacuum = PutVacuumCupsOnRaw(nId, rmData)
+                  End If
+
+                  If bPutVacuum Then
                      ' Visualizzo le ventose
                      EgtSetStatus(GetVacuumId(), GDB_ST.ON_)
                      ' Aggiorno i dati
@@ -392,6 +400,8 @@ Public Class MoveRawPartPage
                         m_CurrProjPage.SetWarningMessage(EgtMsg(MSG_MOVERAWPAGEUC + 2)) 'Pezzo troppo piccolo : non si può muovere
                      End If
                   End If
+
+
                End If
             End If
             EgtDraw()
@@ -1292,6 +1302,7 @@ Public Class MoveRawPartPage
             m_bRemovedRaw = GetRemoveByHandInDisposition(m_nCurrDisposition)
             GetMoveInfoInDisposition(m_nCurrDisposition, m_RawMoveDataList)
             EgtDraw()
+            EnableButtons()
             Return
          ElseIf IsDispUnloadOnAuxTab(m_nCurrDisposition) <> 0 AndAlso Not NextOperationIsUnloading(m_nCurrDisposition) Then
             ' imposto la nuova fase, al termine della Sub verrà caricata la pagina Split nella fase indicata ora

CadCuts/NestPageUC.xaml

@@ -100,7 +100,32 @@
                VerticalAlignment="Center" />
          </Button>
 
-            <UniformGrid Name ="UG0" Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="3" Columns="3" >
+          <!--Comandi attivi solo in madalità REG-->
+            <UniformGrid Name ="UG0_Reg" Grid.Column="0" Grid.Row="6" Grid.ColumnSpan="3" Columns="3" Visibility="Hidden">
+                <ToggleButton Name="AddPointRegBtn" Visibility="Hidden"
+                              Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+                    <Image Source="{DynamicResource RefTabImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+                </ToggleButton>
+                <ToggleButton Name="ModPointRegBtn" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+                    <Image Source="{DynamicResource RefTabImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+                </ToggleButton>
+                <ToggleButton Name="RemovePointRegBtn" Visibility="Hidden"
+                              Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+                    <Image Source="{DynamicResource RefTabImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+                </ToggleButton>
+            </UniformGrid>
+
+            <!--Comandi attivi solo in madalità REG-->
+            <UniformGrid Name ="UG1_Reg" Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="3" Columns="2" Visibility="Hidden">
+                <Button Name="AdjustPointRegBtn" Style="{DynamicResource OmagCut_YellowIconButton}">
+                    <Image Source="{DynamicResource Parcheggia-pezzoImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+                </Button>
+                <ToggleButton Name="ActivatePointRegBtn" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+                    <Image Source="{DynamicResource ON_OFF-singolo-taglioImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+                </ToggleButton>
+            </UniformGrid>
+
+            <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>

CadCuts/NestPageUC.xaml.vb

@@ -1,4 +1,8 @@
-Imports EgtUILib
+Imports System.ComponentModel
+Imports System.Reflection
+Imports System.Windows.Forms
+Imports System.Windows.Forms.Integration
+Imports EgtUILib
 Imports EgtWPFLib
 
 Public Class NestPageUC
@@ -104,12 +108,17 @@ Public Class NestPageUC
       DeselectAllBtn.ToolTip = EgtMsg(MSG_NESTPAGEUC + 5)           'Deselect All - Deseleziona Tutto
       DragRettanleBtn.ToolTip = "Strech"
 
+      ' Nascondo i pulsanti in uso quando attivo la modalità REG
+      UG0_Reg.Visibility = Visibility.Hidden
+
       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
+      Else
+         DragRettanleBtn.Visibility = Visibility.Visible
       End If
 
       ' gestisco la visualizzazione del comando Splt (per i tagli waterjet)
@@ -186,6 +195,33 @@ Public Class NestPageUC
       ShowParkedParts()
       ' Garantisco visibilità eventuale contorno da foto
       m_CurrProjPage.ShowContour(True)
+
+      ' Veroifico se esiste il gruppo "REG"
+      Dim nIdRaws As Integer = EgtGetParent(m_CurrProjPage.m_nRawId)
+      Dim nIdReg As Integer = EgtGetFirstNameInGroup(EgtGetParent(nIdRaws), "Reg")
+      If nIdReg <> GDB_ID.NULL Then
+         m_nRegGroupId = nIdReg
+         EgtGetInfo(m_nRegGroupId, COUNTSPOT, m_nCountSpot)
+         EgtGetInfo(m_nRegGroupId, COUNTSPOTCUT, m_nCountSpotCUT)
+         ' Lo nascondo
+         EgtSetStatus(m_nRegGroupId, GDB_ST.OFF)
+      Else
+         ' Creo layer per definire i punti di REG
+         m_nRegGroupId = EgtCreateGroup(EgtGetParent(nIdRaws))
+         EgtSetName(m_nRegGroupId, REG)
+         m_nCountSpot = 0
+         m_nCountSpotCUT = 0
+      End If
+      ' Se nel progetto non sono inseriti punti SpotReg disabilito i comandi
+      If m_nCountSpot < 1 Then
+         UG0_Reg.IsEnabled = False
+         UG1_Reg.IsEnabled = False
+      End If
+      ' Se nel progetto non sono inseriti punti SpotRegCUT provvedo ad aggiungerli
+      If m_nCountSpotCUT < 1 Then
+         InsertSportRegistration()
+      End If
+
    End Sub
 
    Public Sub UpdateStepsOnUI()
@@ -890,10 +926,103 @@ Public Class NestPageUC
 
    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
+      If Not m_bActive Or m_bRegister Then
+         ' procedo solo sel il click è avvenuto con il tasto sinistro del mouse
+         If e.Button <> MouseButtons.Left Then Return
+         ' se aggiungo SpotReg e numero di Spot inferiore a quelli inseriti in Office
+         If AddPointRegBtn.IsChecked Then
+            If m_nCountSpotCUT < m_nCountSpot Then
+               ' Acquisisco punto da disegno
+               EgtUnProjectPoint(e.Location, m_ptPrev)
+               Dim ptRawMax As Point3d = m_b3Raw.Max()
+               m_ptPrev.z = ptRawMax.z
+               ' Inserisco un nuovo punto registrazione
+               CreateSpotRegistration(m_nRegGroupId, m_ptPrev, m_nCountSpotCUT + 1)
+               EgtDraw()
+               ' disattivo il comando di inserimento
+               AddPointRegBtn.IsChecked = False
+            Else
+               m_MainWindow.m_CurrentProjectPageUC.ClearMessage()
+               m_MainWindow.m_CurrentProjectPageUC.SetWarningMessage("Max spot for reg: " & m_nCountSpot.ToString)
+            End If
+         ElseIf RemovePointRegBtn.IsChecked Then
+            ' Verifico se selezionato indicativo di pezzo
+            EgtSetObjFilterForSelWin(True, True, True, True, True)
+            Dim nSelect As Integer
+            EgtSelect(e.Location, Scene.DIM_SEL, Scene.DIM_SEL, nSelect)
+            Dim nSelId As Integer = EgtGetFirstObjInSelWin()
+            Dim sName As String = String.Empty
+            While nSelId <> GDB_ID.NULL
+               sName = String.Empty
+               EgtGetName(nSelId, sName)
+               If sName.StartsWith(SPOTREGCUT_) Then
+                  ' recupero recupero il centro della prima curva
+                  Dim nIdParent As Integer = EgtGetParent(nSelId)
+                  RemoveSpotRegistration(nIdParent)
+                  EgtDraw()
+                  EgtErase(nIdParent)
+                  RemovePointRegBtn.IsChecked = False
+                  ' Esco dal ciclo
+                  Exit While
+               End If
+               nSelId = EgtGetNextObjInSelWin()
+            End While
+         ElseIf ModPointRegBtn.IsChecked Then
+            ' Verifico se selezionato indicativo di pezzo
+            EgtSetObjFilterForSelWin(True, True, True, True, True)
+            Dim nSelect As Integer
+            EgtSelect(e.Location, Scene.DIM_SEL, Scene.DIM_SEL, nSelect)
+            Dim nSelId As Integer = EgtGetFirstObjInSelWin()
+            Dim sName As String = String.Empty
+            While nSelId <> GDB_ID.NULL
+               sName = String.Empty
+               EgtGetName(nSelId, sName)
+               If sName.StartsWith(SPOTREGCUT_) Then
+                  EgtDeselectAll()
+                  EgtResetMark(m_nCurrSpotRegId)
+                  ' recupero l'Id del gruppo di appartenenza
+                  Dim nIdParent As Integer = EgtGetParent(nSelId)
+                  EgtSelectGroupObjs(nIdParent)
+                  EgtSetMark(nIdParent)
+                  EgtDraw()
+                  ' Acquisisco punto da disegno
+                  EgtUnProjectPoint(e.Location, m_ptPrev)
+                  m_bDrag = True
+                  ' Salvo l'Id del punto SpotReg da spostare
+                  m_nCurrSpotRegId = nIdParent
+                  ' Esco dal ciclo
+                  Exit While
+               End If
+               nSelId = EgtGetNextObjInSelWin()
+            End While
+         ElseIf ActivatePointRegBtn.IsChecked Then
+            ' Verifico se selezionato indicativo di pezzo
+            EgtSetObjFilterForSelWin(True, True, True, True, True)
+            Dim nSelect As Integer
+            EgtSelect(e.Location, Scene.DIM_SEL, Scene.DIM_SEL, nSelect)
+            Dim nSelId As Integer = EgtGetFirstObjInSelWin()
+            Dim sName As String = String.Empty
+            While nSelId <> GDB_ID.NULL
+               sName = String.Empty
+               EgtGetName(nSelId, sName)
+               ' accetto qualsiasi punto di tipo SpotReg (sia da OFFICE che da CUT)
+               If sName.StartsWith(SPOTREG_) Or sName.StartsWith(SPOTREGCUT_) Then
+                  Dim nIdParent As Integer = EgtGetParent(nSelId)
+                  ActivateSpotRegistration(nIdParent)
+                  EgtDraw()
+                  ' Esco dal ciclo
+                  Exit While
+               End If
+               nSelId = EgtGetNextObjInSelWin()
+            End While
+         End If
+         ' Devo sempre uscire da questa condizione
+         Return
+      End If
+
       ' Si può selezionare solo con il tasto sinistro e se stato NULL
       If e.Button <> Windows.Forms.MouseButtons.Left Or
-         Not m_CurrProjPage.CurrentProjectScene.IsStatusNull() Then
+Not m_CurrProjPage.CurrentProjectScene.IsStatusNull() Then
          Return
       End If
 
@@ -902,7 +1031,6 @@ Public Class NestPageUC
          OnMyMouseDownSceneSelCurv(sender, e)
          Return
       End If
-
       m_bIsCounterLy = False
       ' se in modalità DragRettangle (deformazione delle componenti rettangolari)
       If m_bIsCheckedDragRettangle Then
@@ -963,7 +1091,6 @@ Public Class NestPageUC
                   End If
                End If
             End If
-
             If Not m_bIsCounterLy Then
                ' Se già selezionato o posizione oggetto incompatibile con flag posizione selezionati
                If nStat = GDB_ST.SEL Then
@@ -1022,6 +1149,10 @@ Public Class NestPageUC
                      EgtSetCurrPhase(nI)
                      EgtSetTableAreaOffset(TAB_OFFS, TAB_OFFS, TAB_OFFS, TAB_OFFS)
                   Next
+                  ' aggiorno posizionamento ventose per lavorazioni da sotto
+                  UpdateVacuumsForDrip()
+                  ' dichiaro tutto aggiornato
+                  m_CurrProjPage.SetOrderMachiningFlag()
                   EgtSetCurrPhase(1)
                   ' Rotazione
                   Dim dAngRot As Double = If(sOtherTab = SECOND_TAB, 180, -180)
@@ -1067,7 +1198,6 @@ Public Class NestPageUC
       m_bKeyLeftShiftPressed = m_bVerify
       m_vtTotMove = Vector3d.NULL()
    End Sub
-
    Private Sub OnMyMouseMoveScene(sender As Object, e As System.Windows.Forms.MouseEventArgs) Handles m_CurrProjPage.OnMouseMoveScene
       ' Verifico di essere il gestore attivo
       If Not m_bActive Then Return
@@ -1076,7 +1206,7 @@ Public Class NestPageUC
       ' 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
+Math.Abs(e.Location.Y - m_locPrev.Y) < m_nRestRadius Then
             Return
          End If
          m_bDragToStart = False
@@ -1087,6 +1217,19 @@ Public Class NestPageUC
          OnMyMouseMoveSawRettangle(sender, e)
          Return
       End If
+      If ModPointRegBtn.IsChecked Then
+         ' 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
+         MoveSpotRegistration(m_nCurrSpotRegId, vtMove)
+         ' Aggiorno il punto precedente
+         m_ptPrev = ptCurr_
+         ' Terminata esecuzione di drag
+         m_bDragging = False
+         Return
+      End If
 
       ' Determino cosa muovere
       Dim nMoveId = If(m_nIdToSel <> GDB_ID.NULL, m_nIdToSel, GDB_ID.SEL)
@@ -1650,6 +1793,10 @@ Public Class NestPageUC
             nRevPhase += 1
          End While
       End If
+      ' Muovo i punti SpotReg generati nel programma OFFICE
+      If bMoveOk Then
+         MoveAllSpotRegistration(vtMove)
+      End If
       ' Ripristino lo stato iniziale
       EgtSetCurrPhase(1)
       HideAllMachinings()
@@ -1909,12 +2056,160 @@ Public Class NestPageUC
          ' Dichiaro grezzo per punti
          EgtSetInfo(GetCurrentRaw(), KEY_RAWBYPOINTS, 1)
       End If
+      ' Ruoto i punti SpotReg disegnati in Office
+      If bMoveOk Then
+         RotateAllSpotRegistration(dAngDeg, ptCen)
+      End If
       ' Ripristino lo stato iniziale
       EgtSetCurrPhase(1)
       HideAllMachinings()
       Return bMoveOk
    End Function
 
+   Friend Function RotateAllRawParts(dAngDeg As Double, ptCen As Point3d, Optional bIsReg As Boolean = True) As Boolean
+      ' Recupero rotazione totale
+      Dim dRegRot As Double = GetRegistrationRotation()
+      ' Recupero il centro del grezzo iniziale per usarlo come centro della rotazione
+      'Dim ptCen As New Point3d
+      'GetRawCenter(ptCen)
+      ' Provo la rotazione
+      Dim bMoveOk As Boolean = True
+      Dim nPhase As Integer = 1
+      Dim nRawId As Integer = GDB_ID.NULL
+      While nPhase <= EgtGetPhaseCount()
+         EgtSetCurrPhase(nPhase)
+         nRawId = EgtGetFirstRawPart()
+         While nRawId <> GDB_ID.NULL
+            If EgtVerifyRawPartPhase(nRawId, nPhase) Then
+               ' Rotazione del centro come spostamento grezzo più rotazione grezzo attorno al suo centro
+               Dim ptRawCen As New Point3d
+               EgtGetRawPartCenter(nRawId, ptRawCen)
+               Dim ptMovCen As New Point3d(ptRawCen)
+               ptMovCen.Rotate(ptCen, Vector3d.Z_AX(), dAngDeg)
+               If Not EgtMoveRawPart(nRawId, ptMovCen - ptRawCen) Then
+                  bMoveOk = False
+                  Exit While
+               End If
+               If Not EgtRotateRawPart(nRawId, Vector3d.Z_AX(), dAngDeg) Then
+                  EgtMoveRawPart(nRawId, -(ptMovCen - ptRawCen))
+                  bMoveOk = False
+                  Exit While
+               End If
+            End If
+            nRawId = EgtGetNextRawPart(nRawId)
+         End While
+         If Not bMoveOk Then Exit While
+         nPhase += 1
+      End While
+      ' Se rotazione impossibile, ripristino posizione dei grezzi già spostati
+      If Not bMoveOk Then
+         Dim nRevPhase As Integer = 1
+         Dim nRevRawId As Integer = GDB_ID.NULL
+         While nRevPhase <= nPhase
+            EgtSetCurrPhase(nRevPhase)
+            nRevRawId = EgtGetFirstRawPart()
+            While nRevRawId <> GDB_ID.NULL And (nRevPhase < nPhase Or nRevRawId <> nRawId)
+               If EgtVerifyRawPartPhase(nRevRawId, nRevPhase) Then
+                  ' Eseguo al contrario
+                  EgtRotateRawPart(nRevRawId, Vector3d.Z_AX(), -dAngDeg)
+                  Dim ptRawCen As New Point3d
+                  EgtGetRawPartCenter(nRevRawId, ptRawCen)
+                  Dim ptMovCen As New Point3d(ptRawCen)
+                  ptMovCen.Rotate(ptCen, Vector3d.Z_AX(), -dAngDeg)
+                  EgtMoveRawPart(nRevRawId, (ptMovCen - ptRawCen))
+               End If
+               nRevRawId = EgtGetNextRawPart(nRevRawId)
+            End While
+            nRevPhase += 1
+         End While
+         ' Altrimenti eseguo sistemazioni
+      Else
+         ' Origine della tavola
+         Dim ptOri As Point3d
+         EgtGetTableRef(1, ptOri)
+         ' Annullo rotazioni dei grezzi e le rifaccio sulle parti componenti
+         Dim nRevPhase As Integer = 1
+         Dim nRevRawId As Integer = GDB_ID.NULL
+         While nRevPhase <= EgtGetPhaseCount()
+            EgtSetCurrPhase(nRevPhase)
+            nRevRawId = EgtGetFirstRawPart()
+            While nRevRawId <> GDB_ID.NULL
+               If EgtVerifyRawPartPhase(nRevRawId, nRevPhase) Then
+                  ' Eseguo al contrario
+                  EgtRotateRawPart(nRevRawId, Vector3d.Z_AX(), -dAngDeg)
+                  Dim ptRawCen As New Point3d
+                  EgtGetRawPartCenter(nRevRawId, ptRawCen)
+                  Dim ptMovCen As New Point3d(ptRawCen)
+                  ptMovCen.Rotate(ptCen, Vector3d.Z_AX(), -dAngDeg)
+                  EgtMoveRawPart(nRevRawId, (ptMovCen - ptRawCen))
+                  ' Rifaccio sugli oggetti contenuti nel grezzo
+                  Dim nId As Integer = EgtGetFirstInGroup(nRevRawId)
+                  While nId <> GDB_ID.NULL
+                     EgtRotate(nId, ptCen, Vector3d.Z_AX(), dAngDeg, GDB_RT.GLOB)
+                     nId = EgtGetNext(nId)
+                  End While
+                  ' Imposto posizione esatta del grezzo dopo rotazione
+                  Dim b3Raw As New BBox3d
+                  EgtGetRawPartBBox(nRevRawId, b3Raw)
+                  EgtMoveToCornerRawPart(nRevRawId, (b3Raw.Min() - ptOri) + Point3d.ORIG(), MCH_CR.BL)
+               End If
+               nRevRawId = EgtGetNextRawPart(nRevRawId)
+            End While
+            nRevPhase += 1
+         End While
+         ' Ruoto opportunamente anche i dati di movimento
+         Dim nOpeId As Integer = EgtGetFirstActiveOperation()
+         While nOpeId <> GDB_ID.NULL
+            If EgtGetOperationType(nOpeId) = MCH_OY.DISP Then
+               ' Recupero i gruppi con i dati
+               Dim nRpmId As Integer = EgtGetFirstNameInGroup(nOpeId, "Rpm*")
+               While nRpmId <> GDB_ID.NULL
+                  ' Recupero le informazioni
+                  Dim vtRawMove As New Vector3d
+                  If EgtGetInfo(nRpmId, "Mv", vtRawMove) Then
+                     vtRawMove.Rotate(Vector3d.Z_AX(), dAngDeg)
+                     EgtSetInfo(nRpmId, "Mv", vtRawMove)
+                  End If
+                  Dim vtDelta As New Vector3d
+                  If EgtGetInfo(nRpmId, "Dt", vtDelta) Then
+                     vtDelta.Rotate(Vector3d.Z_AX(), dAngDeg)
+                     EgtSetInfo(nRpmId, "Dt", vtDelta)
+                  End If
+                  Dim dAngRotDeg As Double = 0
+                  If EgtGetInfo(nRpmId, "Ad", dAngRotDeg) Then
+                     EgtSetInfo(nRpmId, "Ad", dAngRotDeg + dAngDeg)
+                  End If
+                  ' Cerco un altro gruppo
+                  nRpmId = EgtGetNextName(nRpmId, "Rpm*")
+               End While
+            End If
+            nOpeId = EgtGetNextActiveOperation(nOpeId)
+         End While
+         ' Se non è registrazione, ruoto anche l'eventuale foto della lastra
+         'If Not bIsReg Then
+         '   Dim nPhotoId = m_CurrProjPage.GetPhoto()
+         '   If nPhotoId <> GDB_ID.NULL then EgtRotatePhoto(nPhotoId, ptCen, Vector3d.Z_AX(), dAngDeg)
+         'End If
+         ' Aggiorno rotazione totale
+         If bIsReg Then
+            SetRegistrationRotation(dRegRot + dAngDeg)
+         Else
+            SetRegistrationRotation(0)
+         End If
+         ' Dichiaro grezzo per punti
+         EgtSetInfo(GetCurrentRaw(), KEY_RAWBYPOINTS, 1)
+      End If
+      ' Ruoto i punti SpotReg disegnati in Office
+      If bMoveOk Then
+         RotateAllSpotRegistration(dAngDeg, ptCen)
+      End If
+      ' Ripristino lo stato iniziale
+      EgtSetCurrPhase(1)
+      HideAllMachinings()
+      Return bMoveOk
+   End Function
+
+
    Private Sub InsertPartBtn_Click(sender As Object, e As RoutedEventArgs) Handles InsertPartBtn.Click
       ' Se inserimento automatico
       If GetPrivateProfileInt(S_NEST, K_AUTOMATICOPTIMIZE, 0, m_MainWindow.GetIniFile()) <> 0 And
@@ -2482,8 +2777,11 @@ Public Class NestPageUC
       Const STORE_LARGH As Double = 6000
       Const STORE_DIST As Double = 200
       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)
+      Dim dStoreLarg As Double = GetPrivateProfileDouble("Store", "StoreLargh", STORE_LARGH, m_MainWindow.GetMachIniFile())
+      Dim dStoreDist As Double = GetPrivateProfileDouble("Store", "StoreDist", STORE_DIST, m_MainWindow.GetMachIniFile())
+      Dim dStoreOffs As Double = GetPrivateProfileDouble("Store", "StoreOffs", STORE_OFFS, m_MainWindow.GetMachIniFile())
+      Dim dStXmin As Double = b3Tab.Min().x - 0.5 * (dStoreLarg - b3Tab.DimX())
+      Return EgtPackBox(nId, dStXmin, -INFINITO, dStXmin + dStoreLarg, b3Tab.Min().y - dStoreDist, dStoreOffs, False)
    End Function
 
    Private Sub RemovePartBtn_Click(sender As Object, e As RoutedEventArgs) Handles RemovePartBtn.Click
@@ -2852,6 +3150,422 @@ Public Class NestPageUC
       Return True
    End Function
 
+#Region "SPOT REG"
+
+   ' Layer per crocette dei punti REG (creato in Office)
+   Public m_nRegGroupId As Integer = GDB_ID.NULL
+   ' Numero di spot inseriti nel grezzo corrente (da Office)
+   Private m_nCountSpot As Integer = 0
+   ' Gruppo Spot attualmente selezionato
+   Private m_nCurrSpotRegId As Integer = GDB_ID.NULL
+   ' Nome info nuomero Spot (da Office)
+   Private Const COUNTSPOT As String = "CountSpot"
+   ' Nome gruppo
+   Private Const REG As String = "Reg"
+   ' Nome del gruppo di ogno Spot (da Office)
+   Private Const SPOTREG_ As String = "SpotReg_"
+   Private Const RADSPOT As Double = 20
+
+   ' numero di Spot inseriti (da Cut)
+   Private m_nCountSpotCUT As Integer = 0
+   ' Nome del gruppo di ogno Spot (da Cut)
+   Private Const SPOTREGCUT_ As String = "SpotRegCUT_"
+   ' Nome info nuomero Spot (da Office)
+   Private Const COUNTSPOTCUT As String = "CountSpotCUT"
+   ' Nome della Info per indicare se il punto è da usare
+   Private Const ACTIVATESPOTCUT As String = "ActivateSpotCut"
+
+   Private Sub AddPointReg_Click() Handles AddPointRegBtn.Click
+      DeselectCurSpotReg()
+      ModPointRegBtn.IsChecked = False
+      RemovePointRegBtn.IsChecked = False
+      ActivatePointRegBtn.IsChecked = False
+   End Sub
+
+   Private Sub ModPointReg_Click() Handles ModPointRegBtn.Click
+      ' Deseleziono lo Spotreg selezionato
+      DeselectCurSpotReg()
+      AddPointRegBtn.IsChecked = False
+      RemovePointRegBtn.IsChecked = False
+      ActivatePointRegBtn.IsChecked = False
+   End Sub
+
+   Private Sub RemovePointReg_Click() Handles RemovePointRegBtn.Click
+      DeselectCurSpotReg()
+      ModPointRegBtn.IsChecked = False
+      AddPointRegBtn.IsChecked = False
+      ActivatePointRegBtn.IsChecked = False
+   End Sub
+
+   Private Sub AdjustPointReg_Click() Handles AdjustPointRegBtn.Click
+      PointRegCheckedOff()
+      AdjustRawWithSpotReg()
+   End Sub
+
+   Private Sub ActivatePointRegBtn_Click() Handles ActivatePointRegBtn.Click
+      DeselectCurSpotReg()
+      AddPointRegBtn.IsChecked = False
+      ModPointRegBtn.IsChecked = False
+      RemovePointRegBtn.IsChecked = False
+   End Sub
+
+   Private Sub DeselectCurSpotReg()
+      EgtDeselectAll()
+      If m_nCurrSpotRegId <> GDB_ID.NULL Then
+         EgtResetMark(m_nCurrSpotRegId)
+         m_nCurrSpotRegId = GDB_ID.NULL
+         EgtDraw()
+      End If
+   End Sub
+
+   ' disabilito contemporaneamente tutti i comandi per la gestione punti SpotReg
+   Public Sub PointRegCheckedOff()
+      DeselectCurSpotReg()
+      AddPointRegBtn.IsChecked = False
+      ModPointRegBtn.IsChecked = False
+      RemovePointRegBtn.IsChecked = False
+      ActivatePointRegBtn.IsChecked = False
+   End Sub
+
+   ' riceve l'ID del gruppo da muovere
+   Private Function MoveSpotRegistration(nIdGroup As Integer, vtMove As Vector3d) As Boolean
+      If nIdGroup = GDB_ID.NULL Then Return False
+      ' Non ci deve essere movimento in Z
+      vtMove.z = 0
+      ' Recupero il cercio di riferimento
+      Dim nArcId As Integer = EgtGetFirstInGroup(nIdGroup)
+      Dim b3Crv As New BBox3d
+      EgtGetBBoxGlob(nArcId, GDB_BB.STANDARD, b3Crv)
+      Dim ptMin, ptMax As Point3d
+      If EgtGetTableArea(1, ptMin, ptMax) Then
+         Dim m_ptTableMin As Point3d = ptMin
+         Dim m_dTableLength As Double = ptMax.x - ptMin.x
+         Dim m_dTableWidth As Double = ptMax.y - ptMin.y
+         b3Crv.Move(vtMove)
+         If b3Crv.Min().x < m_ptTableMin.x + 10 * EPS_SMALL Then
+            vtMove.x += m_ptTableMin.x + 10 * EPS_SMALL - b3Crv.Min().x
+         ElseIf b3Crv.Max().x > m_ptTableMin.x + m_dTableLength + 10 * EPS_SMALL Then
+            vtMove.x += m_ptTableMin.x + m_dTableLength - 10 * EPS_SMALL - b3Crv.Max().x
+         End If
+         If b3Crv.Min().y < m_ptTableMin.y + 10 * EPS_SMALL Then
+            vtMove.y += m_ptTableMin.y + 10 * EPS_SMALL - b3Crv.Min().y
+         ElseIf b3Crv.Max().y > m_ptTableMin.y + m_dTableWidth + 10 * EPS_SMALL Then
+            vtMove.y += m_ptTableMin.y + m_dTableWidth - 10 * EPS_SMALL - b3Crv.Max().y
+         End If
+         ' muovo il gruppo
+         EgtMove(nIdGroup, vtMove)
+         EgtDraw()
+         Return True
+      End If
+      Return False
+   End Function
+
+   ' Muovo solo gli elementi SpotReg creati nel programma OFFICE
+   Private Sub MoveAllSpotRegistration(vtMove As Vector3d, Optional bOnlyOfficeSpot As Boolean = True)
+      Dim nId As Integer = EgtGetFirstInGroup(m_nRegGroupId)
+      While nId <> GDB_ID.NULL
+         Dim sName As String = String.Empty
+         EgtGetName(nId, sName)
+         If Not sName.Contains("CUT") Or Not bOnlyOfficeSpot Then
+            EgtMove(nId, vtMove)
+         End If
+         nId = EgtGetNext(nId)
+      End While
+      EgtDraw()
+   End Sub
+
+   ' Riposiziono i punti SpotReg (tutti) in funzione dell'altezza del grezzo
+   Public Sub UpdateSpotRegistration()
+      Dim ptCentArc As Point3d
+      Dim nId As Integer = EgtGetFirstInGroup(m_nRegGroupId)
+      Dim sNameEnt As String = String.Empty
+      Dim sName As String = String.Empty
+      EgtGetName(nId, sName)
+      If sName.Contains("CUT") Then
+         sNameEnt = SPOTREGCUT_ & "Arc"
+      Else
+         sNameEnt = SPOTREG_ & "Arc"
+      End If
+      Dim nIdArc As Integer = EgtGetFirstNameInGroup(nId, sNameEnt)
+      If Not EgtCenterPoint(nIdArc, GDB_ID.ROOT, ptCentArc) Then
+         Return
+      End If
+      Dim dOffsetZ As Double = m_b3Raw.Max().z - ptCentArc.z
+      If Math.Abs(dOffsetZ) > 0.1 Then
+         MoveAllSpotRegistration(New Vector3d(0, 0, dOffsetZ + 0.1), False)
+      Else
+         ' se già in posizione allora mi occupo solo di visualizzarli
+         EgtDraw()
+      End If
+   End Sub
+
+   ' Ruoto solo gli elementi SpotReg creati nel programma OFFICE
+   Private Sub RotateAllSpotRegistration(dAngRot As Double, ptCen As Point3d)
+      Dim nId As Integer = EgtGetFirstInGroup(m_nRegGroupId)
+      While nId <> GDB_ID.NULL
+         Dim sName As String = String.Empty
+         EgtGetName(nId, sName)
+         If Not sName.Contains("CUT") Then
+            EgtRotate(nId, ptCen, Vector3d.Z_AX, dAngRot)
+         End If
+         nId = EgtGetNext(nId)
+      End While
+      EgtDraw()
+   End Sub
+
+   ' Per ogni SpotReg di OFFICE viene generato (nella stessa posizione) uno SpotRegCUT
+   Private Function InsertSportRegistration() As Boolean
+      ' recupero l'elenco non ordinato degli Id dei punti SpotReg (da Office)
+      Dim SpotRegList As New List(Of Integer)
+      Dim nId As Integer = GDB_ID.NULL
+      ' Creo la lista ordinata dei punti SpotReg (da OFFICE)
+      For nIndexSpot As Integer = 1 To m_nCountSpot
+         nId = EgtGetFirstNameInGroup(m_nRegGroupId, SPOTREG_ & nIndexSpot.ToString)
+         SpotRegList.Add(nId)
+      Next
+      ' Creo i punti SpotRegCUT sovrapposti a quelli inseriti in OFFICE
+      Dim bOk As Boolean = True
+      For nIndex As Integer = 0 To SpotRegList.Count - 1
+         Dim ptCent As Point3d
+         GetCenterSpotReg(SpotRegList, SPOTREG_ & "Arc", nIndex + 1, ptCent)
+         bOk = bOk And CreateSpotRegistration(m_nRegGroupId, ptCent, nIndex + 1)
+      Next
+      Return bOk
+   End Function
+
+   ' Creo il punto nel gruppo "Reg/SpotRegCUT_"
+   Private Function CreateSpotRegistration(nLayerIdReg As Integer, ptP As Point3d, nIndexSpot As Integer) As Boolean
+      ' creo uno specifico layer per ogni spot (definito da una croce inscritta in un cerchio)
+      Dim nIdSpotLay As Integer = EgtCreateGroup(nLayerIdReg)
+      ' Aggiungo cerchio
+      Dim nCircId As Integer = EgtCreateCircle(nIdSpotLay, ptP, RADSPOT)
+      ' Inserisco una croce all'interno del 
+      Dim nLineVId As Integer = EgtCreateLinePVL(nIdSpotLay, ptP, Vector3d.Y_AX, RADSPOT)
+      EgtExtendCurveStartByLen(nLineVId, RADSPOT)
+      Dim nLineHId As Integer = EgtCreateLinePVL(nIdSpotLay, ptP, Vector3d.X_AX, RADSPOT)
+      EgtExtendCurveStartByLen(nLineHId, RADSPOT)
+      Dim nTextId As Integer = EgtCreateText(nIdSpotLay, ptP + New Vector3d(1, 1, 0), nIndexSpot.ToString, 10)
+      ' coloro gli oggetti appena creati ed assegno il nome
+      Dim bOk As Boolean = EgtSetColor(nCircId, New Color3d(0, 255, 0))
+      bOk = bOk And EgtSetName(nCircId, SPOTREGCUT_ & "Arc")
+      bOk = bOk And EgtSetColor(nLineVId, New Color3d(0, 255, 0))
+      bOk = bOk And EgtSetName(nLineVId, SPOTREGCUT_ & "LineV")
+      bOk = bOk And EgtSetColor(nLineHId, New Color3d(0, 255, 0))
+      bOk = bOk And EgtSetName(nLineHId, SPOTREGCUT_ & "LineH")
+      bOk = bOk And EgtSetColor(nTextId, New Color3d(255, 0, 0))
+      bOk = bOk And EgtSetName(nTextId, SPOTREGCUT_ & "Text")
+      ' assegno il nome del gruppo corrente
+      bOk = bOk And EgtSetName(nIdSpotLay, SPOTREGCUT_ & nIndexSpot.ToString)
+      If bOk Then
+         ' Aggiorno il contatore degli Spot
+         EgtSetInfo(nLayerIdReg, COUNTSPOTCUT, nIndexSpot)
+         m_nCountSpotCUT = nIndexSpot
+      End If
+      Return bOk
+   End Function
+
+   ' Elimino il punto nel gruppo "Reg/SpotRegCUT_"
+   Private Function RemoveSpotRegistration(nSpotRegId As Integer) As Boolean
+      Dim nIndSpotReg As Integer = GetIndexGroupSpotReg(nSpotRegId)
+      If Not EgtErase(nSpotRegId) Then Return False
+      ' faccio scorrere tutti i gruppi ed eventualmente li rinomino
+      Dim n_IdSR As Integer = EgtGetFirstInGroup(m_nRegGroupId)
+      m_nCountSpotCUT -= 1
+      EgtSetInfo(m_nRegGroupId, COUNTSPOTCUT, m_nCountSpotCUT)
+      While n_IdSR <> GDB_ID.NULL
+         Dim sName As String = String.Empty
+         EgtGetName(n_IdSR, sName)
+         If sName.Contains("CUT") Then
+            Dim nCurrIndSpotReg As Integer = GetIndexGroupSpotReg(n_IdSR)
+            If nCurrIndSpotReg > nIndSpotReg Then
+               ' Recupero il testo
+               Dim nIdtext As Integer = EgtGetFirstNameInGroup(n_IdSR, SPOTREGCUT_ & "Text")
+               nCurrIndSpotReg -= 1
+               EgtModifyText(nIdtext, nCurrIndSpotReg.ToString)
+               EgtSetName(n_IdSR, SPOTREGCUT_ & nCurrIndSpotReg.ToString)
+            End If
+         End If
+         n_IdSR = EgtGetNext(n_IdSR)
+
+      End While
+      EgtDraw()
+      Return True
+   End Function
+
+   ' Cambio lo stato dello SpotReg (sia di OFFICE che di CUT)
+   Private Function ActivateSpotRegistration(nSpotRegId As Integer) As Boolean
+      Dim nIndexSpot As Integer = GetIndexGroupSpotReg(nSpotRegId)
+      Dim nParentId As Integer = EgtGetParent(nSpotRegId)
+      Dim nInfo As Integer = 0
+      Dim bOk As Boolean = True
+      If Not EgtGetInfo(nSpotRegId, ACTIVATESPOTCUT, nInfo) Then
+         nInfo = 1
+      End If
+      If nInfo = 1 Then
+         ' inserisco una Info sullo SpotRegCUT che indica che è disattivo
+         nSpotRegId = EgtGetFirstNameInGroup(nParentId, SPOTREGCUT_ & nIndexSpot.ToString)
+         bOk = EgtSetInfo(nSpotRegId, ACTIVATESPOTCUT, 0)
+         Dim nEntId As Integer = EgtGetFirstNameInGroup(nSpotRegId, SPOTREGCUT_ & "Arc")
+         bOk = bOk And EgtSetColor(nEntId, New Color3d(255, 0, 0))
+         nEntId = EgtGetFirstNameInGroup(nSpotRegId, SPOTREGCUT_ & "LineV")
+         bOk = bOk And EgtSetColor(nEntId, New Color3d(255, 0, 0))
+         nEntId = EgtGetFirstNameInGroup(nSpotRegId, SPOTREGCUT_ & "LineH")
+         bOk = bOk And EgtSetColor(nEntId, New Color3d(255, 0, 0))
+         nEntId = EgtGetFirstNameInGroup(nSpotRegId, SPOTREGCUT_ & "Text")
+         bOk = bOk And EgtSetColor(nEntId, New Color3d(255, 255, 0))
+         ' inserisco una Info sullo SpotReg (OFFICE) che indica che è disattivo
+         nSpotRegId = EgtGetFirstNameInGroup(nParentId, SPOTREG_ & nIndexSpot.ToString)
+         bOk = EgtSetInfo(nSpotRegId, ACTIVATESPOTCUT, 0)
+         nEntId = EgtGetFirstNameInGroup(nSpotRegId, SPOTREG_ & "Arc")
+         bOk = bOk And EgtSetColor(nEntId, New Color3d(0, 0, 255))
+         nEntId = EgtGetFirstNameInGroup(nSpotRegId, SPOTREG_ & "LineV")
+         bOk = bOk And EgtSetColor(nEntId, New Color3d(0, 0, 255))
+         nEntId = EgtGetFirstNameInGroup(nSpotRegId, SPOTREG_ & "LineH")
+         bOk = bOk And EgtSetColor(nEntId, New Color3d(0, 0, 255))
+         nEntId = EgtGetFirstNameInGroup(nSpotRegId, SPOTREG_ & "Text")
+         bOk = bOk And EgtSetColor(nEntId, New Color3d(0, 0, 0))
+      Else
+         ' inserisco una Info sul pezzo che indica che è attivo
+         nSpotRegId = EgtGetFirstNameInGroup(nParentId, SPOTREGCUT_ & nIndexSpot.ToString)
+         bOk = EgtSetInfo(nSpotRegId, ACTIVATESPOTCUT, 1)
+         Dim nEntId As Integer = EgtGetFirstNameInGroup(nSpotRegId, SPOTREGCUT_ & "Arc")
+         bOk = bOk And EgtSetColor(nEntId, New Color3d(0, 255, 0))
+         nEntId = EgtGetFirstNameInGroup(nSpotRegId, SPOTREGCUT_ & "LineV")
+         bOk = bOk And EgtSetColor(nEntId, New Color3d(0, 255, 0))
+         nEntId = EgtGetFirstNameInGroup(nSpotRegId, SPOTREGCUT_ & "LineH")
+         bOk = bOk And EgtSetColor(nEntId, New Color3d(0, 255, 0))
+         nEntId = EgtGetFirstNameInGroup(nSpotRegId, SPOTREGCUT_ & "Text")
+         bOk = bOk And EgtSetColor(nEntId, New Color3d(255, 0, 0))
+         ' inserisco una Info sullo SpotReg (OFFICE) che indica che è disattivo
+         nSpotRegId = EgtGetFirstNameInGroup(nParentId, SPOTREG_ & nIndexSpot.ToString)
+         bOk = EgtSetInfo(nSpotRegId, ACTIVATESPOTCUT, 0)
+         nEntId = EgtGetFirstNameInGroup(nSpotRegId, SPOTREG_ & "Arc")
+         bOk = bOk And EgtSetColor(nEntId, New Color3d(0, 0, 0))
+         nEntId = EgtGetFirstNameInGroup(nSpotRegId, SPOTREG_ & "LineV")
+         bOk = bOk And EgtSetColor(nEntId, New Color3d(0, 0, 0))
+         nEntId = EgtGetFirstNameInGroup(nSpotRegId, SPOTREG_ & "LineH")
+         bOk = bOk And EgtSetColor(nEntId, New Color3d(0, 0, 0))
+         nEntId = EgtGetFirstNameInGroup(nSpotRegId, SPOTREG_ & "Text")
+         bOk = bOk And EgtSetColor(nEntId, New Color3d(255, 0, 0))
+      End If
+      Return bOk
+   End Function
+
+   ' Restituisce l'indice dello "SpotReg_" oppure "SpotRegCUT_"
+   Private Function GetIndexGroupSpotReg(nSpotRegId As Integer) As Integer
+      Dim sNameParent As String = String.Empty
+      EgtGetName(nSpotRegId, sNameParent)
+      ' Ricavo l'indice dal nome
+      Dim sItems As String() = sNameParent.Split("_"c)
+      Dim nCurrIndex As Integer = 0
+      If sItems.Count = 2 Then
+         If Not Integer.TryParse(sItems(1), nCurrIndex) Then
+            nCurrIndex = -1
+         End If
+      End If
+      Return nCurrIndex
+   End Function
+
+   ' Calcola gli spostamenti del grezzo per posizionare i punti di SpotReg
+   Private Function AdjustRawWithSpotReg() As Boolean
+      ' Verifico che almeno un punto sia stato inserito
+      If m_nCountSpotCUT < 1 Then
+         m_MainWindow.m_CurrentProjectPageUC.ClearMessage()
+         m_MainWindow.m_CurrentProjectPageUC.SetWarningMessage("Insert one spot reg to start.")
+      End If
+
+      ' recupero l'elenco non ordinato degli Id dei punti SpotReg (da Office)
+      Dim SpotRegList As New List(Of Integer)
+      Dim SpotRegCUTList As New List(Of Integer)
+      Dim nId As Integer = EgtGetFirstInGroup(m_nRegGroupId)
+      ' Creo la lista ordinata dei punti
+      For nIndexSpot As Integer = 1 To m_nCountSpotCUT
+         nId = EgtGetFirstNameInGroup(m_nRegGroupId, SPOTREGCUT_ & nIndexSpot.ToString)
+         Dim nActivate As Integer = 0
+         If Not EgtGetInfo(nId, ACTIVATESPOTCUT, nActivate) Then
+            nActivate = 1
+         End If
+         If nId <> GDB_ID.NULL And nActivate = 1 Then
+            SpotRegCUTList.Add(nId)
+            nId = EgtGetFirstNameInGroup(m_nRegGroupId, SPOTREG_ & nIndexSpot.ToString)
+            SpotRegList.Add(nId)
+         End If
+      Next
+
+      ' Carico la lista dei centri
+      Dim ptCentCUTList As New List(Of Point3d)
+      Dim ptCentLIst As New List(Of Point3d)
+      If Not GetAllCenterSpotReg(SpotRegCUTList, SpotRegList, ptCentCUTList, ptCentLIst) Then Return False
+
+      ' Eseguo il primo posizionamento di massima
+      Dim vtMoveStart As Vector3d = ptCentCUTList(0) - ptCentLIst(0)
+      Dim dAngRotSum As Double = 0.0
+      Dim dScaleSum As Double = 0.0
+      For nIndex As Integer = 1 To ptCentCUTList.Count - 1
+         Dim vtDirCUT As Vector3d = ptCentCUTList(nIndex) - ptCentCUTList(0)
+         Dim vtDir As Vector3d = ptCentLIst(nIndex) - ptCentLIst(0)
+         Dim dLenCUT, dLen, dAngVCUT, dAngV, dAngHCUT, dAngH As Double
+         vtDirCUT.ToSpherical(dLenCUT, dAngVCUT, dAngHCUT)
+         vtDir.ToSpherical(dLen, dAngV, dAngH)
+         dScaleSum += Math.Abs(dLenCUT - dLen) / dLenCUT
+         dAngRotSum += dAngHCUT - dAngH
+      Next
+      vtMoveStart.z = 0
+      ' Determino la deformazione media
+      dScaleSum = 1 - dScaleSum / (ptCentCUTList.Count - 1)
+      MoveAllRawParts(vtMoveStart)
+      ' Ruoto del valor medio delle differenze angolari
+      RotateAllRawParts(dAngRotSum / (ptCentCUTList.Count - 1), ptCentCUTList(0))
+
+      ' Correggo lo spostamento in funzione della deformazione misurata
+      Dim vtMoveSum As Vector3d = New Vector3d(0, 0, 0)
+      GetAllCenterSpotReg(SpotRegCUTList, SpotRegList, ptCentCUTList, ptCentLIst)
+      For nIndex As Integer = 1 To ptCentCUTList.Count - 1
+         vtMoveSum += ptCentCUTList(nIndex) - ptCentLIst(nIndex)
+      Next
+      vtMoveSum.z = 0
+      vtMoveSum = vtMoveSum / (ptCentCUTList.Count - 1)
+      MoveAllRawParts(vtMoveSum * dScaleSum / 2)
+      EgtDraw()
+
+      Return True
+   End Function
+
+   Private Function GetAllCenterSpotReg(SpotRegCUTList As List(Of Integer), SpotRegList As List(Of Integer),
+                                 ByRef ptCentCUTList As List(Of Point3d), ByRef ptCentLIst As List(Of Point3d)) As Boolean
+      ptCentCUTList.Clear()
+      ptCentLIst.Clear()
+      For nIndex As Integer = 0 To m_nCountSpotCUT
+         Dim ptCenCUT As Point3d
+         Dim ptCent As Point3d
+         If GetCenterSpotReg(SpotRegCUTList, SPOTREGCUT_ & "Arc", nIndex + 1, ptCenCUT) Then
+            ptCentCUTList.Add(ptCenCUT)
+            GetCenterSpotReg(SpotRegList, SPOTREG_ & "Arc", nIndex + 1, ptCent)
+            ptCentLIst.Add(ptCent)
+         End If
+      Next
+      If ptCentCUTList.Count > 0 AndAlso ptCentCUTList.Count = ptCentLIst.Count Then
+         Return True
+      Else
+         Return False
+      End If
+   End Function
+
+   ' Data la lista di punti Spot e l'indice dello spot da ricercare restituisce il centro del punto indicato
+   Private Function GetCenterSpotReg(ListSR As List(Of Integer), sName As String, nIndex As Integer, ByRef ptCentArc As Point3d) As Boolean
+      For Each ItemSR As Integer In ListSR
+         If GetIndexGroupSpotReg(ItemSR) = nIndex Then
+            Dim nIdArc As Integer = EgtGetFirstNameInGroup(ItemSR, sName)
+            If EgtCenterPoint(nIdArc, GDB_ID.ROOT, ptCentArc) Then
+               Return True
+            End If
+         End If
+      Next
+      Return False
+   End Function
+
+#End Region
+
 End Class
 
 

CadCuts/SplitAuto.vb

@@ -1,4 +1,5 @@
-Imports System.Windows.Forms.Integration
+Imports System.Net
+Imports System.Windows.Forms.Integration
 Imports EgtUILib
 
 Public Module SplitAuto
@@ -119,6 +120,9 @@ Public Module SplitAuto
                                            Mach.m_dStartFreeLen > FREELEN_INF And Mach.m_bIsLine
                      Mach.m_bCanEndAll = (dEndAddLen > -EPS_SMALL And (nRes And CAR_RES.LO_OK) <> 0) And
                                          Mach.m_dEndFreeLen > FREELEN_INF And Mach.m_bIsLine
+                     If nRes = 0 Then
+                        EgtOutLog("Operation ID " & nOperId.ToString & " isn't split cut! verify depth machining.")
+                     End If
                   End If
                   ' se trasformabile in taglio di separazione, verifico se lo è
                   If Mach.m_bCanStartAll Or Mach.m_bCanEndAll Then
@@ -795,21 +799,29 @@ Public Module SplitAuto
 
    Private Function ExecMove(nDispId As Integer, vNewRaws As List(Of Integer),
                              vtMove As Vector3d, dMinMove As Double) As Boolean
-      Dim vtMove2 As Vector3d = -vtMove
+      Dim bTwoHeadVac As Boolean = ( EgtGetHeadId( VACUUM_HEAD_2) <> GDB_ID.NULL)
       Dim rmData As New RawMoveData
-      If PutVacuumCupsOnRaw(vNewRaws(1), rmData) AndAlso
-                        SafeMoveRawPart(vNewRaws(1), vtMove, dMinMove) Then
+      Dim vtMove2 As Vector3d = -vtMove
+
+      VacuumCups.ResetHeadName()
+      Dim bPutVacuum As Boolean = PutVacuumCupsOnRaw(vNewRaws(1), rmData)
+      If Not bPutVacuum And bTwoHeadVac Then bPutVacuum= PutVacuumCupsOnRaw(vNewRaws(1), rmData)
+      If bPutVacuum AndAlso SafeMoveRawPart(vNewRaws(1), vtMove, dMinMove) Then
          rmData.m_vtRawMove = vtMove
          SaveOneMoveInfoInDisposition(nDispId, rmData)
          Return True
-      ElseIf PutVacuumCupsOnRaw(vNewRaws(0), rmData) AndAlso
-                        SafeMoveRawPart(vNewRaws(0), vtMove2, dMinMove) Then
+      End If
+
+      VacuumCups.ResetHeadName()
+      Dim bPut2Vacuum As Boolean = PutVacuumCupsOnRaw(vNewRaws(0), rmData)
+      If Not bPut2Vacuum And bTwoHeadVac Then bPutVacuum = PutVacuumCupsOnRaw(vNewRaws(0), rmData)
+      If bPut2Vacuum AndAlso SafeMoveRawPart(vNewRaws(0), vtMove2, dMinMove) Then
          rmData.m_vtRawMove = vtMove2
          SaveOneMoveInfoInDisposition(nDispId, rmData)
          Return True
-      Else
-         Return False
       End If
+
+      Return False
    End Function
 
    Private Function SafeMoveRawPart(nRawId As Integer, ByRef vtMove As Vector3d, dMindist As Double) As Boolean

CadCuts/SplitPageUC.xaml.vb

@@ -1700,7 +1700,7 @@ Public Class SplitPageUC
          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
+         If m_MachiningList(nI).m_nType <> MCH_OY.SAWING And m_MachiningList(nI).m_nType <> MCH_OY.WATERJETTING Then Continue For
          ' Non si possono invertire i tagli di lama inclinati
          If Math.Abs(m_MachiningList(nI).m_dSideAng) > 0.1 Then Continue For
          ' Se abilitata inversione automatica e quindi non invertito
@@ -1714,6 +1714,7 @@ Public Class SplitPageUC
                ResetEnableInvert(m_MachiningList(nI).m_nEntId)
                EgtErase(m_MachiningList(nI).m_nArrId)
                NumberDirectionMachining(nI, False)
+               UpdateMachiningPreview(m_MachiningList(nI).m_nId, True)
                EgtDraw()
             End If
             ' se altrimenti disabilitata inversione automatica e invertito
@@ -1725,6 +1726,7 @@ Public Class SplitPageUC
                SwapStartEndData(nI)
                EgtErase(m_MachiningList(nI).m_nArrId)
                NumberDirectionMachining(nI, False)
+               UpdateMachiningPreview(m_MachiningList(nI).m_nId, True)
                EgtDraw()
             End If
             ' altrimenti disabilitata inversione automatica e non invertito
@@ -2196,6 +2198,7 @@ Public Class SplitPageUC
 
       ' gestione bottone per generazione ponticelli
       If Type = MCH_OY.WATERJETTING Then
+         InvertBtn.Visibility = Visibility.Visible
          ' siccome la stessa posizione è occupata da due comandi sovrapposti
          If CutStartBtn.Visibility = Visibility.Hidden Then
             BridgesWJBtn.Visibility = Visibility.Visible

CadCuts/VacuumCups.vb

@@ -1,5 +1,6 @@
 Imports EgtUILib
 Imports System.Text.RegularExpressions
+Imports System.Threading
 
 Module VacuumCups
    ' Tipo manipolatore con ventosa (0=assente, 1=dietro, 2=laterale)
@@ -31,6 +32,19 @@ Module VacuumCups
    ' Nome del gruppo temporaneo per le ventose
    Private Const VACTMP_GRP As String = "VacTmp"
 
+   Private m_sHeadName As String = VACUUM_HEAD
+   Public Sub ResetHeadName()
+      Dim bReload As Boolean = (m_sHeadName <> VACUUM_HEAD)
+      m_sHeadName = VACUUM_HEAD
+      If bReload Then LoadVacuumCups()
+   End Sub
+   Public Function ChangeHeadName() As Boolean
+      If EgtGetHeadId( VACUUM_HEAD_2) = GDB_ID.NULL Then Return False
+      m_sHeadName = If( m_sHeadName = VACUUM_HEAD, VACUUM_HEAD_2, VACUUM_HEAD) 
+      LoadVacuumCups()
+      Return True
+   End Function
+
    '-----------------------------------------------------------------------------------------------
    Friend Class RawMoveData
 
@@ -87,17 +101,17 @@ Module VacuumCups
    Friend Function LoadVacuumCups() As Boolean
       ' Leggo tipo manipolatore con ventosa
       m_nVacType = 0
-      EgtGetInfo(EgtGetHeadId(VACUUM_HEAD), KEY_VAC_TYPE, m_nVacType)
+      EgtGetInfo(EgtGetHeadId(m_sHeadName), KEY_VAC_TYPE, m_nVacType)
       ' Cancello eventuali vecchie ventose
       RemoveVacuumCups()
       ' Identificativo ventose nella macchina
-      Dim nLayId As Integer = EgtGetFirstNameInGroup(EgtGetHeadId(VACUUM_HEAD), VACUUM_HEAD_LAYOUT)
+      Dim nLayId As Integer = EgtGetFirstNameInGroup(EgtGetHeadId(m_sHeadName), VACUUM_HEAD_LAYOUT)
       If nLayId = GDB_ID.NULL Then Return False
       ' Identificativo riferimento della testa nella macchina
-      Dim nT1Id As Integer = EgtGetFirstNameInGroup(EgtGetHeadId(VACUUM_HEAD), HEAD_FIRST_EXIT)
+      Dim nT1Id As Integer = EgtGetFirstNameInGroup(EgtGetHeadId(m_sHeadName), 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)
+      EgtSetCalcTool("", m_sHeadName, 1)
       ' Creo gruppo temporaneo in cui copiarli
       m_nTempId = EgtCreateGroup(GDB_ID.ROOT)
       If m_nTempId = GDB_ID.NULL Then Return False
@@ -107,23 +121,23 @@ Module VacuumCups
       m_nVacId = EgtCopyGlob(nLayId, m_nTempId)
       If m_nVacId = GDB_ID.NULL Then Return False
       ' Angolo di rotazione preferito
-      EgtGetInfo( m_nVacId, KEY_VACLAY_PREFROT, m_dPreferredRot)
+      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_PREFVROTXMINUS, m_dPrefVertRotXMinus)
       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)
+      EgtGetInfo(m_nVacId, KEY_VACLAY_DRIPREFDIR, m_dDripRefAng)
       ' Nascondo il gruppo ma rendo visibili le curve di contorno delle ventose
       EgtSetStatus(m_nVacId, GDB_ST.OFF)
       Dim nId As Integer = EgtGetFirstInGroup(m_nVacId)
       While nId <> GDB_ID.NULL
          Select Case EgtGetType(nId)
-         Case GDB_TY.CRV_LINE, GDB_TY.CRV_ARC, GDB_TY.CRV_BEZ, GDB_TY.CRV_COMPO
-            EgtSetStatus(nId, GDB_ST.ON_)
-         Case Else
-            EgtSetStatus(nId, GDB_ST.OFF)
+            Case GDB_TY.CRV_LINE, GDB_TY.CRV_ARC, GDB_TY.CRV_BEZ, GDB_TY.CRV_COMPO
+               EgtSetStatus(nId, GDB_ST.ON_)
+            Case Else
+               EgtSetStatus(nId, GDB_ST.OFF)
          End Select
          nId = EgtGetNext(nId)
       End While
@@ -152,7 +166,7 @@ Module VacuumCups
    Friend Function ResetVacuumCups() As Boolean
       ' Ripristino posizione e rotazione originali
       Dim frOriRef As New Frame3d
-      EgtFrame(EgtGetFirstNameInGroup(EgtGetHeadId(VACUUM_HEAD), HEAD_FIRST_EXIT), GDB_ID.ROOT, frOriRef)
+      EgtFrame(EgtGetFirstNameInGroup(EgtGetHeadId(m_sHeadName), HEAD_FIRST_EXIT), GDB_ID.ROOT, frOriRef)
       Dim frCurrRef As New Frame3d
       EgtFrame(m_nRefId, GDB_ID.ROOT, frCurrRef)
       EgtMove(m_nVacId, frOriRef.Orig() - frCurrRef.Orig(), GDB_RT.GLOB)
@@ -164,10 +178,10 @@ Module VacuumCups
       Dim nId As Integer = EgtGetFirstInGroup(m_nVacId)
       While nId <> GDB_ID.NULL
          Select Case EgtGetType(nId)
-         Case GDB_TY.CRV_LINE, GDB_TY.CRV_ARC, GDB_TY.CRV_BEZ, GDB_TY.CRV_COMPO
-            EgtSetStatus(nId, GDB_ST.ON_)
-         Case Else
-            EgtSetStatus(nId, GDB_ST.OFF)
+            Case GDB_TY.CRV_LINE, GDB_TY.CRV_ARC, GDB_TY.CRV_BEZ, GDB_TY.CRV_COMPO
+               EgtSetStatus(nId, GDB_ST.ON_)
+            Case Else
+               EgtSetStatus(nId, GDB_ST.OFF)
          End Select
          nId = EgtGetNext(nId)
       End While
@@ -207,14 +221,17 @@ Module VacuumCups
       EgtSurfFrGrossArea(nRKerfId, RawArea)
       ' volume calcolato in mmc
       Dim RawVolume As Double = RawArea * b3Raw.DimZ()
-      ' peso calolato in kg
+      ' peso calcolato 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
+      Else
+         If ChangeHeadName() Then Return False
       End If
+
       ' In caso di fallimento, provo riducendo con offset la regione di kerf
       ' (così si simula la proiezione del centro sul MAT - medial axis transform)
       Dim bOkFind As Boolean = False
@@ -241,20 +258,20 @@ Module VacuumCups
       ' Verifico sia veramente un pezzo
       If EgtGetRawPartFromPart(nPartId) = GDB_ID.NULL Then Return False
       ' Cerco la direzione del primo taglio attivo da sotto
-      Dim nDripLayId As Integer = EgtGetFirstNameInGroup( nPartId, NAME_DRIPCUT)
-      Dim nDripLineId As Integer = EgtGetFirstInGroup( nDripLayId)
+      Dim nDripLayId As Integer = EgtGetFirstNameInGroup(nPartId, NAME_DRIPCUT)
+      Dim nDripLineId As Integer = EgtGetFirstInGroup(nDripLayId)
       While nDripLineId <> GDB_ID.NULL
-         Dim nMchId As Integer = EgtGetOperationId( "DripSaw" & nDripLineId.ToString())
+         Dim nMchId As Integer = EgtGetOperationId("DripSaw" & nDripLineId.ToString())
          Dim nMode As Integer
-         If EgtGetMode( nMchId, nMode) AndAlso nMode = GDB_MD.STD Then Exit While
-         nDripLineId = EgtGetNext( nDripLineId)
+         If EgtGetMode(nMchId, nMode) AndAlso nMode = GDB_MD.STD Then Exit While
+         nDripLineId = EgtGetNext(nDripLineId)
       End While
       Dim vtDir As New Vector3d
-      if EgtStartVector( nDripLineId, GDB_ID.ROOT, vtDir) Then
+      If EgtStartVector(nDripLineId, GDB_ID.ROOT, vtDir) Then
          Dim dLen, dAngV, dAngH As Double
-         vtDir.ToSpherical( dLen, dAngV, dAngH)
+         vtDir.ToSpherical(dLen, dAngV, dAngH)
          Dim dOffsAng = dAngH - m_dDripRefAng
-         While dOffsAng - m_dPreferredRot >= 90 
+         While dOffsAng - m_dPreferredRot >= 90
             dOffsAng -= 180
          End While
          While dOffsAng - m_dPreferredRot <= -90
@@ -388,7 +405,7 @@ Module VacuumCups
 
    Private Function GetVacRotAxisSteps(ByRef vAngRot As List(Of Double)) As Boolean
       ' Recupero l'asse rotante della testa ventosa
-      Dim nRotAxId As Integer = EgtGetParent(EgtGetHeadId(VACUUM_HEAD))
+      Dim nRotAxId As Integer = EgtGetParent(EgtGetHeadId(m_sHeadName))
       ' Verifico se contiene info con STEPS
       Dim sSteps As String = ""
       If Not EgtGetInfo(nRotAxId, KEY_ROTVAC_STEPS, sSteps) Then Return False
@@ -493,15 +510,15 @@ Module VacuumCups
          ' Ordino secondo distanza angolare crescente da direzione di allineamento (modulo 180 deg)
          Dim dRotRefDeg As Double = dRotAngDeg
          vAngRot.Sort(Function(P, Q)
-                         Dim dDiffP = Math.Abs( P - dRotRefDeg)
-                         If Math.Abs( dDiffP - 180) < 10 * EPS_ANG_SMALL Then dDiffP = 1
-                         Dim dDiffQ = Math.Abs( Q - dRotRefDeg)
-                         If Math.Abs( dDiffQ - 180) < 10 * EPS_ANG_SMALL Then dDiffQ = 1
-                         Return ( dDiffP - dDiffQ)
+                         Dim dDiffP = Math.Abs(P - dRotRefDeg)
+                         If Math.Abs(dDiffP - 180) < 10 * EPS_ANG_SMALL Then dDiffP = 1
+                         Dim dDiffQ = Math.Abs(Q - dRotRefDeg)
+                         If Math.Abs(dDiffQ - 180) < 10 * EPS_ANG_SMALL Then dDiffQ = 1
+                         Return (dDiffP - dDiffQ)
                       End Function)
          ' Annullo la rotazione di allineamento
          dRotAngDeg = 0
-      ' altrimenti in continuo
+         ' altrimenti in continuo
       Else
          ' Assegno più valori di ricerca e conservo angolo di allineamento
          vAngRot.AddRange({0, +5, -5, +12.5, -12.5, +25, -25, +45, -45})
@@ -548,25 +565,43 @@ Module VacuumCups
 
    ' assegnate 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 sAxisName As String = "C"
+      ' verifico che il nome dell'asse impostato sia corretto
+      If EgtGetAxisId(sAxisName) = GDB_ID.NULL Then
+         If m_sHeadName = VACUUM_HEAD Then
+            sAxisName = "C1"
+         Else
+            sAxisName = "C2"
+         End If
+      End If
       ' Posizione Home dell'asse rotante
       Dim dCHome As Double
-      EgtGetAxisHomePos("C", dCHome)
+      EgtGetAxisHomePos(sAxisName, dCHome)
       ' Corse dell'asse
       Dim dCMin As Double
-      EgtGetAxisMin("C", dCMin)
+      EgtGetAxisMin(sAxisName, dCMin)
       Dim dCMax As Double
-      EgtGetAxisMax("C", dCMax)
+      EgtGetAxisMax(sAxisName, dCMax)
       ' Porto l'angolo nel range
       Dim dRotAngMachDeg As Double = dRotAngDeg + dCHome
       AdjustAngleInRange(dRotAngMachDeg, dCMin, dCMax)
       ' Imposto la ventosa come fosse un utensile
-      EgtSetCalcTool("", "H4", 1)
+      EgtSetCalcTool("", m_sHeadName, 1)
       ' Calcolo gli assi macchina
       Dim dX, dY, dZ As Double
       Dim nStat As Integer
-      EgtGetCalcPositions(ptRef, dRotAngMachDeg, 0, nStat, dX, dY, dZ)
-      ' Verifico le corse
-      EgtVerifyOutstroke(dX, dY, dZ, dRotAngMachDeg, 0, nStat)
+      If EgtGetAxisId("A") <> GDB_ID.NULL Then
+         ' Asse tavola rotante (movimenti solo con A0)
+         EgtGetCalcPositions(ptRef, 0, dRotAngMachDeg, nStat, dX, dY, dZ)
+         ' Verifico le corse
+         EgtVerifyOutstroke(dX, dY, dZ, 0, dRotAngMachDeg, nStat)
+      Else
+         EgtGetCalcPositions(ptRef, dRotAngMachDeg, 0, nStat, dX, dY, dZ)
+         ' Verifico le corse
+         EgtVerifyOutstroke(dX, dY, dZ, dRotAngMachDeg, 0, nStat)
+      End If
+
+
       Return nStat
    End Function
 
@@ -732,7 +767,7 @@ Module VacuumCups
             rmList.RemoveAt(nInd)
             nInd = rmList.Count() - 1
          End If
-      ' Se non trovato, lo accodo
+         ' Se non trovato, lo accodo
       Else
          rmList.Add(New RawMoveData(nRawId))
          nInd = rmList.Count() - 1

Constants/ConstGen.vb

@@ -84,6 +84,11 @@ Module ConstGen
 
    ' Nome testa con ventose per spostamento pezzi
    Public Const VACUUM_HEAD As String = "H4"
+   Public Const VACUUM_HEAD_2 As String = "H104"
+   ' Nome teste laser
+   Public Const LASER_HEAD As String = "H3"
+   Public Const LASER_HEAD_2 As String = "H103"
+
    ' Info tipo ventosa
    Public Const KEY_VAC_TYPE As String = "VacType"
    ' Nome gruppo layout in testa con ventose

Constants/ConstIni.vb

@@ -116,6 +116,8 @@ Module ConstIni
    Public Const K_LASTCOLOR As String = "LastColor"
    Public Const K_COLOR As String = "Color"
 
+   Public Const S_FRAMECOMPO As String = "FrameCompo"
+
    Public Const S_EXTCOMPO As String = "Compo"
 
    Public Const S_INTCOMPO As String = "InternalCompo"
@@ -204,6 +206,7 @@ Module ConstIni
    Public Const K_OFFSZ As String = "OffsZ"
    Public Const K_OFFSXY As String = "OffsXY"
    Public Const K_OFFSYY As String = "OffsYY"
+   Public Const K_OFFSXINTERY As String = "OffsYInterY"
    Public Const K_STARTTRIM As String = "StartTrim"
    Public Const K_ENDTRIM As String = "EndTrim"
    Public Const K_OTHERSIDE As String = "OtherSide"
@@ -223,6 +226,12 @@ Module ConstIni
    Public Const K_RAWOFFSX As String = "OffsX"
    Public Const K_RAWOFFSY As String = "OffsY"
    Public Const K_RAWKERF As String = "Kerf"
+   Public Const K_ENABLEOTHERREFTAB As String = "EnableOtherRefTab"
+   Public Const K_OTHERREFTAB As String = "OtherRefTab"
+   Public Const K_OTHERREFTABX As String = "OtherRefTabX"
+   Public Const K_OTHERREFTABY As String = "OtherRefTabY"
+   Public Const K_OTHERREFTABPOS As String = "OtherRefTabPos"
+
 
    Public Const S_RAWMOVE As String = "RawMove"
    Public Const K_RAWSTEP As String = "Step"

Constants/ConstMachIni.vb

@@ -5,6 +5,7 @@
 
    Public Const S_PARTPROGRAM As String = "PartProgram"
    Public Const K_EXTENSION As String = "Extension"
+   Public Const K_EXTFILECN As String = "ExtFileCN"
 
    Public Const S_AXES As String = "Axes"
    Public Const K_AXESNUM As String = "AxesNum"
@@ -56,6 +57,10 @@
    Public Const S_EXECLUA As String = "ExecLua"
    Public Const K_FILESCRIPT_LUA As String = "FileScript"
 
+   Public Const S_CAMERAHQ As String = "CameraHQ"
+   Public Const K_CAMERAHQ_ENABLE As String = "EnableHQ"
+   Public Const K_CAMERAHQ_ACTIVATE As String = "ActivateHQ"
+
    Public Const S_NCDATA As String = "NcData"
    Public Const K_NEWVARIABLE As String = "NewVariable"
    Public Const K_NEWCONSOLE As String = "NewConsole"
@@ -151,6 +156,10 @@
    Public Const K_PRODLIPROBINGTCPOS2VAR As String = "ProbingTcPos2Var"
    Public Const K_PRODLISAWDIAMETER2VAR As String = "SawDiameter2Var"
 
+   Public Const S_POLISHLINE As String = "PolishLine"
+   Public Const K_CLICKSTATE As String = "ClickState"
+   Public Const k_CLICKDIR As String = "ClickDir"
+
    Public Const S_STATISTICS As String = "Stats"
    Public Const K_DATADIR As String = "DataDir"
    Public Const K_SHOWAREAS As String = "ShowAreas"
@@ -232,6 +241,7 @@
    Public Const K_HOLES_OFFSETWJ As String = "HolesOffsetWJ"
    Public Const K_MIN_RADIUSWJ As String = "MinRadiusWJ"
    Public Const K_MACH_DRILLINGWJ_ON_CORNERS As String = "DrillingWJOnCorners"
+   Public Const K_MACH_RECTIFICATION_ON_SUBSQUARE As String = "RectificationSubSqWJ"
    ' DrillMillC90
    ' CutLongDxSx
    ' AngRotMultiCut

DirectCuts/ControlsMachineButtonUC.xaml.vb

@@ -683,6 +683,17 @@ Public MustInherit Class MachineButton
       End If
       EgtLuaSetGlobNumVar("CMD.S", dSpeed)
 
+      ' versione 2.5e1
+      EgtTdbSetCurrTool(m_MainWindow.m_CurrentProjectPageUC.ToolTxBx.Text)
+      Dim sToolPos As String = String.Empty
+      If EgtTdbGetCurrToolParam(MCH_TP.TCPOS, sToolPos) Then
+         EgtLuaGetGlobStringVar("CMD.TCPOS", sToolPos)
+      End If
+      Dim dToolDiam As Double = 0
+      If EgtTdbGetCurrToolParam(MCH_TP.DIAM, dToolDiam) Then
+         EgtLuaSetGlobNumVar("CMD.DIAM", dToolDiam * 1000)
+      End If
+
       Dim dL1, dL2, dL3, dR1, dR2 As Double
       m_MainWindow.m_CNCommunication.GetAxesPositions(dL1, dL2, dL3, dR1, dR2)
       EgtLuaSetGlobNumVar("CMD.L1", dL1)

DirectCuts/FlatteningCut.xaml.vb

@@ -186,7 +186,10 @@ Public Class FlatteningCut
       WritePrivateProfileString( S_DIRECTCUTS, K_DC_FLATT_MACHTYPE, m_nMachType.ToString(), m_MainWindow.GetIniFile())
       WritePrivateProfileString( S_DIRECTCUTS, K_DC_FLATT_ROTLOCK, If( m_bRotLock, "1", "0"), m_MainWindow.GetIniFile())
       WritePrivateProfileString( S_DIRECTCUTS, K_DC_FLATT_POSX, DoubleToString( m_ptTipP1.x, 2), m_MainWindow.GetIniFile())
-      WritePrivateProfileString( S_DIRECTCUTS, K_DC_FLATT_POSY, DoubleToString( m_ptTipP1.y, 2), m_MainWindow.GetIniFile())
+      WritePrivateProfileString(S_DIRECTCUTS, K_DC_FLATT_POSY, DoubleToString(m_ptTipP1.y, 2), m_MainWindow.GetIniFile())
+      ' imposto la Z di sicurezza corretta
+      EgtMdbSetGeneralParam(MCH_GP.SAFEZ, DirectCutPageUC.m_dZSafe)
+      EgtMdbSave()
       ' Se non vado in simulazione
       If Not m_bSimul Then
          ' Dichiaro sottopagina da non riattivare
@@ -406,7 +409,7 @@ Public Class FlatteningCut
 
    Private Sub DepthTxBx_EgtClosed(sender As Object, e As EventArgs) Handles DepthTxBx.EgtClosed
       ' Verifico che l'affondamento impostato non sia superiore a quello massimo
-      Dim dMaxDepth = m_ptRawMax.z - m_ptRawMin.z + MAX_TAB_DEPTH
+      Dim dMaxDepth = m_ptRawMax.z - m_ptRawMin.z + m_MainWindow.m_CurrentMachine.MaxTabDepth
       Dim dDepth As Double = 0
       StringToLen(DepthTxBx.Text, dDepth)
       If dDepth < 0 Then

DirectCuts/GridCut.xaml.vb

@@ -405,7 +405,7 @@ Public Class GridCut
 
    Private Sub DepthTxBx_EgtClosed(sender As Object, e As EventArgs) Handles DepthTxBx.EgtClosed
       ' Verifico che l'affondamento impostato non sia superiore a quello massimo
-      Dim dMaxDepth = m_ptRawMax.z - m_ptRawMin.z + MAX_TAB_DEPTH
+      Dim dMaxDepth = m_ptRawMax.z - m_ptRawMin.z + m_MainWindow.m_CurrentMachine.MaxTabDepth
       Dim dDepth As Double = 0
       StringToLen(DepthTxBx.Text, dDepth)
       If dDepth < 0 Then

DirectCuts/MachineButtonsUC.xaml.vb

@@ -35,6 +35,7 @@ Public Class MachineButtonsUC
    Private Const BTN_STATE_DOOR_OPENED As String = "DoorOpened"
    Private Const BTN_STATE_DOOR_CLOSED As String = "DoorClosed"
    Private Const BTN_STATE_PARKING As String = "Parking"
+   Private Const BTN_STATE_HOME As String = "Home"
    Private Const BTN_ENABLE_ZONE_1 As String = "EnableZone1"
    Private Const BTN_ENABLE_ZONE_2 As String = "EnableZone2"
    Private Const BTN_ENABLE_PC As String = "EnablePC"
@@ -380,6 +381,17 @@ Public Class MachineButtonsUC
          EgtTdbGetCurrToolParam(MCH_TP.SPEED, dSpeed)
       End If
       EgtLuaSetGlobNumVar("CMD.S", dSpeed)
+      ' versione 2.5e1
+      EgtTdbSetCurrTool(m_MainWindow.m_CurrentProjectPageUC.ToolTxBx.Text)
+      Dim sToolPos As String = String.Empty
+      If EgtTdbGetCurrToolParam(MCH_TP.TCPOS, sToolPos) Then
+         EgtLuaGetGlobStringVar("CMD.TCPOS", sToolPos)
+      End If
+      Dim dToolDiam As Double = 0
+      If EgtTdbGetCurrToolParam(MCH_TP.DIAM, dToolDiam) Then
+         EgtLuaSetGlobNumVar("CMD.DIAM", dToolDiam * 1000)
+      End If
+
       Dim dL1, dL2, dL3, dR1, dR2 As Double
       m_MainWindow.m_CNCommunication.GetAxesPositions(dL1, dL2, dL3, dR1, dR2)
       EgtLuaSetGlobNumVar("CMD.L1", dL1)
@@ -700,6 +712,40 @@ Public Class MachineButtonsUC
       End If
    End Sub
 
+   Friend Sub HomeStateChanged(HomeState As Boolean)
+      Dim nIndex As Integer = Array.IndexOf(StateFlagArray, BTN_STATE_HOME)
+      If nIndex = -1 Then Return
+      If HomeState Then
+         GetToggleButton(nIndex + 1).IsChecked = True
+         Try
+            Dim s As String
+            If (m_MainWindow.m_OptionsPageUC.ThemesCmBx.SelectedIndex = 0) Then
+               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayY(nIndex)
+            Else
+               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\NewIcons\" & ImageArrayY(nIndex)
+            End If
+            Dim sButtonImageSource As ImageSource = ImageConverter.ConvertFromString(s)
+            GetImage(nIndex + 1).Source = sButtonImageSource
+         Catch ex As Exception
+            EgtOutLog("Error loading image " & ImageArrayY(nIndex + 1))
+         End Try
+      Else
+         GetToggleButton(nIndex + 1).IsChecked = False
+         Try
+            Dim s As String
+            If (m_MainWindow.m_OptionsPageUC.ThemesCmBx.SelectedIndex = 0) Then
+               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\" & ImageArrayY(nIndex)
+            Else
+               s = m_MainWindow.GetResourcesDir() & "\MachineButtonsImage\NewIcons\" & ImageArrayY(nIndex)
+            End If
+            Dim sButtonImageSource As ImageSource = ImageConverter.ConvertFromString(s)
+            GetImage(nIndex + 1).Source = sButtonImageSource
+         Catch ex As Exception
+            EgtOutLog("Error loading image " & ImageArrayN(nIndex + 1))
+         End Try
+      End If
+   End Sub
+
    Friend Sub EnableZoneStateChanged(ZoneState As Integer)
       Dim sFlag As String = String.Empty
       If ZoneState = 1 Then

DirectCuts/MultipleCut.xaml.vb

@@ -435,7 +435,7 @@ Public Class MultipleCut
 
    Private Sub DepthTxBx_EgtClosed(sender As Object, e As EventArgs) Handles DepthTxBx.EgtClosed
       ' Verifico che l'affondamento impostato non sia superiore a quello massimo
-      Dim dMaxDepth = m_ptRawMax.z - m_ptRawMin.z + MAX_TAB_DEPTH
+      Dim dMaxDepth = m_ptRawMax.z - m_ptRawMin.z + m_MainWindow.m_CurrentMachine.MaxTabDepth
       Dim dDepth As Double = 0
       StringToLen(DepthTxBx.Text, dDepth)
       If dDepth < 0 Then

DirectCuts/SawTestUC.xaml.vb

@@ -351,7 +351,7 @@ Public Class SawTestUC
 
    Private Sub DepthTxBx_EgtClosed(sender As Object, e As EventArgs) Handles DepthTxBx.EgtClosed
       ' Verifico che l'affondamento impostato non sia superiore a quello massimo
-      Dim dMaxDepth = m_ptRawMax.z - m_ptRawMin.z + MAX_TAB_DEPTH
+      Dim dMaxDepth = m_ptRawMax.z - m_ptRawMin.z + m_MainWindow.m_CurrentMachine.MaxTabDepth
       Dim dDepth As Double = 0
       StringToLen(DepthTxBx.Text, dDepth)
       If dDepth < 0 Then

DirectCuts/SingleCutUC.xaml.vb

@@ -40,7 +40,7 @@ Public Class SingleCutUC
    Private m_nTempLay As Integer = GDB_ID.NULL
 
    ' Costanti
-   Private Const MAX_TAB_DEPTH As Double = 10.0
+   Private Const MAX_TAB_DEPTH As Double = 10.0  ' sostituita da un m_MaxTabDepth letto da file ini macchina
    Private Const MIN_CUT_LEN As Double = 10.0
    Private Const MAX_SIDE_ANG As Double = 60.0
    ' Costanti che indicano la modalità di acquisizione dei punti
@@ -429,7 +429,7 @@ Public Class SingleCutUC
 
    Private Sub DepthTxBx_EgtClosed(sender As Object, e As EventArgs) Handles DepthTxBx.EgtClosed
       ' Verifico che l'affondamento impostato non sia superiore a quello massimo
-      Dim dMaxDepth = m_ptRawMax.z - m_ptRawMin.z + MAX_TAB_DEPTH
+      Dim dMaxDepth = m_ptRawMax.z - m_ptRawMin.z + m_MainWindow.m_CurrentMachine.MaxTabDepth
       Dim dDepth As Double = 0
       StringToLen(DepthTxBx.Text, dDepth)
       If dDepth < 0 Then

DrawImport/CompoDimensionUC.xaml.vb

@@ -37,7 +37,7 @@ Public Class CompoDimensionUC
       InternComponentBtn.Content = EgtMsg(MSG_COMPONENTPAGEUC + 47)     ' Componenti interni
       If Not String.IsNullOrEmpty(sCompoDir) Then
          bEnableAlzFront = True
-         AlzFrontBtn.Content = "Alzatine & Frontalini"
+         AlzFrontBtn.Content = EgtMsg(91137)
       Else
          AlzFrontBtn.Visibility = Visibility.Collapsed
       End If
@@ -107,8 +107,10 @@ Public Class CompoDimensionUC
    Friend Sub ShowAlzFrontBtn(ByVal value As Boolean)
       If value Then
          AlzFrontBtn.Visibility = Visibility.Visible
+         m_MainWindow.m_DrawPageUC.MessageGrid.Visibility = Visibility.Hidden
       Else
          AlzFrontBtn.Visibility = Visibility.Hidden
+         m_MainWindow.m_DrawPageUC.MessageGrid.Visibility = Visibility.Visible
       End If
    End Sub
 

DrawImport/DrawPageUC.xaml.vb

@@ -283,6 +283,19 @@ Public Class DrawPageUC
       m_sCsvOrder = ""
       m_sCsvList = ""
       m_sCsvName = ""
+
+      ' Visuliazzazione dei bottoni per modifica dei componenti
+      If m_MainWindow.FrameCutBtn.IsChecked Then
+         SideAngleBtn.Visibility = Visibility.Hidden
+         FiloTopBtn.Visibility = Visibility.Hidden
+         EngraveBtn.Visibility = Visibility.Hidden
+         DripCutBtn.Visibility = Visibility.Hidden
+      Else
+         SideAngleBtn.Visibility = Visibility.Visible
+         FiloTopBtn.Visibility = Visibility.Visible
+         EngraveBtn.Visibility = Visibility.Visible
+         DripCutBtn.Visibility = Visibility.Visible
+      End If
    End Sub
 
    ' recupero il click sulla scena ed assegno il metodo a secondo della pagina aperta
@@ -553,6 +566,7 @@ Public Class DrawPageUC
       OkBtn.IsEnabled = True
    End Sub
 
+   ' Navigazione nelle due pagine per la selezione dei componenti da disegnare
    Friend Sub BackBtn_Click(sender As Object, e As RoutedEventArgs) Handles BackBtn.Click
       m_SceneButtons.MeasureBtn.IsChecked = False
       DrawPage_Unloaded(sender, e)
@@ -1124,6 +1138,33 @@ Public Class DrawPageUC
       Return True
    End Function
 
+   Private Function MakeSectionFrameInsert(ByVal nNbr As Integer) As Boolean
+      ' m_MainWindow.m_ImportPageUC.LoadFrame()
+      ' recupero il primo layer del primo pezzo
+      Dim nLayerId As Integer = EgtGetFirstLayer(EgtGetFirstPart())
+      If nLayerId = GDB_ID.NULL Then Return False
+      ' percorso in cui salvare tempora
+      Dim sTmpFile As String = m_MainWindow.GetTempDir() & "\Frame.Nge"
+      If Not EgtSaveObjToFile(nLayerId, sTmpFile, NGE.BIN) Then Return False
+      ' Passo al contesto principale
+      EgtSetCurrentContext(m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene.GetCtx())
+      ' Inserisco il pezzo
+      If Not My.Computer.FileSystem.FileExists(sTmpFile) Then Return False
+      ' eseguo inserimento
+      For i As Integer = 1 To nNbr
+         EgtInsertFile(sTmpFile)
+         ' Ne recupero l'Id
+         Dim nPartId As Integer = EgtGetLastPart()
+         ' Creo la cornice
+         m_MainWindow.m_FrameCutPageUC.CreateFrame(nPartId)
+         ' Ricalcolo lavorazioni
+         AddFrameMachinings(m_MainWindow.m_FrameCutPageUC.m_FrameMachiningUC.m_dStartTrim, m_MainWindow.m_FrameCutPageUC.m_FrameMachiningUC.m_dEndTrim)
+      Next
+      ' Cancello il file
+      My.Computer.FileSystem.DeleteFile(sTmpFile)
+      Return True
+   End Function
+
    Private Sub OkBtn_Click(sender As Object, e As RoutedEventArgs) Handles OkBtn.Click
       m_bBackFromInternalCompo = False
       m_bInternalCompo = False
@@ -1139,7 +1180,12 @@ Public Class DrawPageUC
       Dim InsNbr As Integer = Int32.Parse(PartNumTxBx.Text)
       ' Passo al contesto principale
       'MakeInsert(InsNbr, sPartName)
-      MakeMultipleInsert(InsNbr, sPartName)
+      If m_MainWindow.FrameCutBtn.IsChecked Then
+         MakeSectionFrameInsert(InsNbr)
+      Else
+         MakeMultipleInsert(InsNbr, sPartName)
+      End If
+
       ' Aggiorno ambiente principale
       EgtZoom(ZM.ALL)
       ' Elimino nome del componente precedente
@@ -1153,7 +1199,7 @@ Public Class DrawPageUC
       ' Istruzioni per chiudere ImportPageUC e aprire CadCutPageUC
       m_MainWindow.MainWindowGrid.Children.Remove(m_MainWindow.m_DrawPageUC)
       m_MainWindow.MainWindowGrid.Children.Add(m_MainWindow.m_CurrentProjectPageUC)
-      m_MainWindow.m_ActivePage = MainWindow.Pages.CadCut
+      m_MainWindow.m_ActivePage = If(m_MainWindow.FrameCutBtn.IsChecked, MainWindow.Pages.FrameCut, MainWindow.Pages.CadCut)
 
    End Sub
 
@@ -1174,7 +1220,7 @@ Public Class DrawPageUC
       ' Istruzioni per chiudere ImportPageUC e aprire CadCutPageUC
       m_MainWindow.MainWindowGrid.Children.Remove(m_MainWindow.m_DrawPageUC)
       m_MainWindow.MainWindowGrid.Children.Add(m_MainWindow.m_CurrentProjectPageUC)
-      m_MainWindow.m_ActivePage = MainWindow.Pages.CadCut
+      m_MainWindow.m_ActivePage = If(m_MainWindow.FrameCutBtn.IsChecked, MainWindow.Pages.FrameCut, MainWindow.Pages.CadCut)
    End Sub
 
    Private Sub TrfDataBtn_Click(sender As Object, e As RoutedEventArgs) Handles TrfDataBtn.Click

DrawImport/FiloTopUC.xaml.vb

@@ -39,7 +39,8 @@ Public Class FiloTopUC
 
       ' Imposto messaggi
       ParameterTxBl.Text = EgtMsg( MSG_IMPORTPAGEUC + 10)       ' Offset
-      Parameter2TxBl.Text = EgtMsg( MSG_IMPORTPAGEUC + 11)      ' Affondamento
+      Parameter2TxBl.Text = EgtMsg(MSG_IMPORTPAGEUC + 11)      ' Affondamento
+      Parameter3TxBl.Text = EgtMsg(91138)
 
       If m_CallingPage = MainWindow.Pages.Draw Then
          ' Imposto questa come pagina correntemente visualizzata nella drawpage

DrawImport/ImportPageUC.xaml

@@ -58,7 +58,7 @@
             <ListBox Name="FileListBox" Grid.Row="1" Grid.RowSpan="2" ItemTemplate="{DynamicResource DataTemplateItem}"
                      ItemsSource="{Binding ItemList}"/>
 
-                <Grid Grid.Row="3" Margin="0,0,8,0">
+                <Grid Name="FinderGrd"  Grid.Row="3" Margin="0,0,8,0">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="4*"/>
                         <ColumnDefinition Width="1*"/>

DrawImport/ImportPageUC.xaml.vb

@@ -19,6 +19,9 @@ Public Class ImportPageUC
    Friend WithEvents ImportScene As New Scene
    Private ImportSceneHost As New System.Windows.Forms.Integration.WindowsFormsHost
 
+   Private m_SelListHole As New List(Of Integer)
+   Private m_DeselectListHole As New List(Of Integer)
+
    ' Properties
    Private m_sCurrDir As String = String.Empty
    Private m_sCurrFile As String = String.Empty
@@ -101,6 +104,8 @@ Public Class ImportPageUC
       ' abilitazione Ordine e Distinta per importazione DXF
       m_bEnableOrderList = (m_MainWindow.m_PrevActivePage = MainWindow.Pages.CadCut And
                             GetPrivateProfileInt(S_COMPO, K_CSVDATA, 0, m_MainWindow.GetIniFile()) <> 0)
+      ' rendo visibilie il pulsante di ricerca file
+      FinderGrd.Visibility = Visibility.Visible
 
       If m_bFirst Then
          ' imposto colore di default
@@ -196,7 +201,6 @@ Public Class ImportPageUC
       PartNumTxBx.Text = "1"
       ' disabilito ok
       OkBtn.IsEnabled = False
-
    End Sub
 
    Private Sub LoadGridData()
@@ -345,7 +349,7 @@ Public Class ImportPageUC
    End Function
 
    Private Function LoadCurrFile() As Boolean
-      ' Pulisco il DB geometrico locale
+      ' Pulisco il DB geometrico locale      
       Dim bOk As Boolean = EgtNewFile()
       ' Costruisco path completa del file
       Dim sPath = IO.Path.Combine(m_sCurrDir, m_sCurrFile)
@@ -415,7 +419,7 @@ Public Class ImportPageUC
             DripCutBtn.IsEnabled = False
             DripDrillBtn.IsEnabled = False
          End If
-      ' altrimenti import per cornici
+         ' altrimenti import per cornici
       Else
          mmBtn.IsEnabled = (m_nFileType = FT.DXF)
          inchBtn.IsEnabled = (m_nFileType = FT.DXF)
@@ -569,6 +573,8 @@ Public Class ImportPageUC
                         EgtSetColor(nEntId, New Color3d(127, 63, 0))
                         nEntId = EgtGetNext( nEntId)
                      End While
+                     m_DeselectListHole.Add(nLayId)
+                     m_SelListHole.Remove(nLayId)
                   End If
                Else
                   Dim nLayId As Integer = GDB_ID.NULL
@@ -585,6 +591,8 @@ Public Class ImportPageUC
                         EgtSetColor(nEntId, New Color3d(255, 255, 255))
                         nEntId = EgtGetNext( nEntId)
                      End While
+                     m_SelListHole.Add(nLayId)
+                     m_DeselectListHole.Remove(nLayId)
                   End If
                End If
                EgtDraw()
@@ -592,6 +600,12 @@ Public Class ImportPageUC
          End If
          nId = EgtGetNextObjInSelWin()
       End While
+      m_FiloTopUC.CreateFiloTopPreView(m_SelListHole)
+      m_FiloTopUC.EraseFiloTopPreview(m_DeselectListHole)
+      If m_SelListHole.Count > 0 Then
+         MessageTxBx.Text = ""
+         MessageBrd.Background = Brushes.Transparent
+      End If
    End Sub
 
    Private Sub OnShowDistanceVector(sender As Object, vtDist As Vector3d) Handles ImportScene.OnShowDistanceVector
@@ -1040,6 +1054,7 @@ Public Class ImportPageUC
 
    Private Sub SideAngleBtn_Click(sender As Object, e As RoutedEventArgs) Handles SideAngleBtn.Click
       If SideAngleBtn.IsChecked() Then
+         FinderGrd.Visibility = Visibility.Hidden
          ' Aggiungo regioni per percorsi interni
          AdjustSelectRegions()
          ' Dichiaro nessuna selezione
@@ -1062,6 +1077,7 @@ Public Class ImportPageUC
          MessageTxBx.Text = EgtMsg(MSG_DRAWPAGEUC + 6)   ' Selezionare un contorno
          MessageBrd.Background = Application.Current.FindResource("OmagCut_Green")
       Else
+         FinderGrd.Visibility = Visibility.Visible
          ' Rimuovo regioni per percorsi interni
          RemoveSelectRegions()
          FilePathTxBl.Visibility = Windows.Visibility.Visible
@@ -1092,6 +1108,7 @@ Public Class ImportPageUC
 
    Private Sub DripCutBtn_Click(sender As Object, e As RoutedEventArgs) Handles DripCutBtn.Click
       If DripCutBtn.IsChecked() Then
+         FinderGrd.Visibility = Visibility.Hidden
          ' Dichiaro nessuna selezione
          m_nSelectedPart = GDB_ID.NULL
          m_nSelectedLayer = GDB_ID.NULL
@@ -1112,6 +1129,7 @@ Public Class ImportPageUC
          MessageTxBx.Text = EgtMsg(MSG_DRAWPAGEUC + 6)   ' Selezionare un contorno
          MessageBrd.Background = Application.Current.FindResource("OmagCut_Green")
       Else
+         FinderGrd.Visibility = Visibility.Visible
          FilePathTxBl.Visibility = Windows.Visibility.Visible
          FileListBox.Visibility = Windows.Visibility.Visible
          LeftGrid.Children.Remove(m_SideAngleUC)
@@ -1142,6 +1160,7 @@ Public Class ImportPageUC
 
    Private Sub DripDrillBtn_Click(sender As Object, e As RoutedEventArgs) Handles DripDrillBtn.Click
       If DripDrillBtn.IsChecked() Then
+         FinderGrd.Visibility = Visibility.Hidden
          ' Aggiungo regioni di selezione per percorsi interni
          AdjustSelectRegions()
          ' Imposto modalità fori da sotto
@@ -1160,6 +1179,7 @@ Public Class ImportPageUC
          MessageTxBx.Text = EgtMsg(MSG_DRAWPAGEUC + 15)   ' Selezionare uno o più fori
          MessageBrd.Background = Application.Current.FindResource("OmagCut_Green")
       Else
+         FinderGrd.Visibility = Visibility.Visible
          ' Rimuovo regioni per percorsi interni
          RemoveSelectRegions()
          FilePathTxBl.Visibility = Windows.Visibility.Visible
@@ -1187,6 +1207,7 @@ Public Class ImportPageUC
 
    Private Sub FiloTopBtn_Click(sender As Object, e As RoutedEventArgs) Handles FiloTopBtn.Click
       If FiloTopBtn.IsChecked() Then
+         FinderGrd.Visibility = Visibility.Hidden
          ' Aggiungo regioni per percorsi interni
          AdjustSelectRegions()
          ' Dichiaro nessuna selezione
@@ -1208,6 +1229,7 @@ Public Class ImportPageUC
          MessageTxBx.Text = EgtMsg(MSG_DRAWPAGEUC + 6)   ' Selezionare un contorno interno
          MessageBrd.Background = Application.Current.FindResource("OmagCut_Green")
       Else
+         FinderGrd.Visibility = Visibility.Visible
          ' Rimuovo regioni per percorsi interni
          RemoveSelectRegions()
          FilePathTxBl.Visibility = Windows.Visibility.Visible

DrawImport/MainComponentPageUC.xaml.vb

@@ -41,6 +41,7 @@ Public Class MainComponentPageUC
       m_MainWindow.m_DrawPageUC.FiloTopBtn.IsEnabled = False
       m_MainWindow.m_DrawPageUC.EngraveBtn.IsEnabled = False
       m_MainWindow.m_DrawPageUC.DripCutBtn.IsEnabled = False
+      m_MainWindow.m_DrawPageUC.m_bBackFromInternalCompo = False
    End Sub
 
    Private Function GetButton(ByVal nInd As Integer) As Button
@@ -167,7 +168,7 @@ Public Class MainComponentPageUC
 
    Private Sub Compo_Click(sender As Object, e As RoutedEventArgs) Handles Compo1.Click, Compo2.Click, Compo3.Click, Compo4.Click, Compo5.Click, Compo6.Click, Compo7.Click, Compo8.Click
       CurrentBtn = DirectCast(e.Source, Button)
-      Dim CompoName As String = S_COMPO & GetIndexFromButton(CurrentBtn).ToString
+      Dim CompoName As String = If(m_MainWindow.FrameCutBtn.IsChecked, S_FRAMECOMPO, S_COMPO) & GetIndexFromButton(CurrentBtn).ToString
       m_sCurrCompoFam = CompoName
       m_SecondaryComponentPage.m_sCurrCompo = String.Empty
       Dim nCount As Integer = GetPrivateProfileInt(CompoName, K_CMP_COUNT, 0, m_MainWindow.GetIniFile())
@@ -251,13 +252,18 @@ Public Class MainComponentPageUC
    End Sub
 
    Private Sub LoadPage()
+      If m_MainWindow.FrameCutBtn.IsChecked Then
+         LoadFramePage()
+         Return
+      End If
+
       Dim nDeltaSecondPage As Integer = 8
       ' Leggo numero di componenti presenti
       Dim nCompoNumber As Integer = GetPrivateProfileInt(S_COMPO, K_CMP_COUNT, 0, m_MainWindow.GetIniFile())
       ' Calcolo indici a seconda della pagina in cui sono
       If m_bIsFirstPage Then
          ClearButton(nCompoNumber)
-      nDeltaSecondPage = 0
+         nDeltaSecondPage = 0
       Else
          ClearButton(nCompoNumber)
          nDeltaSecondPage = 8
@@ -325,16 +331,86 @@ Public Class MainComponentPageUC
 
    End Sub
 
+   Private Sub LoadFramePage()
+      Dim nDeltaSecondPage As Integer = 8
+      ' Leggo numero di componenti presenti
+      Dim nCompoNumber As Integer = GetPrivateProfileInt(S_FRAMECOMPO, K_CMP_COUNT, 0, m_MainWindow.GetIniFile())
+      ' Calcolo indici a seconda della pagina in cui sono
+      If m_bIsFirstPage Then
+         ClearButton(nCompoNumber)
+         nDeltaSecondPage = 0
+      Else
+         ClearButton(nCompoNumber)
+         nDeltaSecondPage = 8
+      End If
+
+      ' Creazione converter da String a ImageSource
+      Dim ImageConverter As New ImageSourceConverter
+      Dim ThicknessConverter As New ThicknessConverter
+
+      'Assegnazione immagine e testo ai Button
+      For index As Integer = 1 To 8
+         Dim CustomThickness As New Thickness(0)
+         Dim nCompoName As Integer = GetPrivateProfileInt(S_FRAMECOMPO & index + nDeltaSecondPage, "Name", 0, m_MainWindow.GetIniFile())
+         Dim sCompoImage As String = ""
+         Dim sCompoImageSource As ImageSource
+
+         'verifico presenza immagine e la aggiungo
+         If GetPrivateProfileString(S_FRAMECOMPO & index + nDeltaSecondPage, "Image", "", sCompoImage, m_MainWindow.GetIniFile()) <> 0 Then
+            Try
+               sCompoImageSource = ImageConverter.ConvertFromString(m_MainWindow.GetResourcesDir() & "\" & sCompoImage)
+               GetImage(index).Height = 65
+               GetImage(index).Width = 65
+               GetImage(index).Source = sCompoImageSource
+            Catch ex As Exception
+               EgtOutLog("Error loading image " & sCompoImage)
+               sCompoImage = String.Empty
+               GetImage(index).Height = 0
+               GetImage(index).Width = 0
+               CustomThickness.Right = 0
+               GetImage(index).Margin = CustomThickness
+            End Try
+         Else
+            'Se non c'è l'immagine azzero la distanza tra testo e immagine
+            CustomThickness.Right = 0
+            GetImage(index).Margin = CustomThickness
+         End If
+
+         'verifico presenza testo
+         If nCompoName > 0 Then
+            Dim sCompoName As String = EgtMsg(MSG_COMPONENTPAGEUC + nCompoName)
+            'verifico presenza immagine
+            If sCompoImage.Length > 0 Then
+               'se la lunghezza del testo è maggiore di 15 lo taglio
+               If sCompoName.Length > 15 Then
+                  sCompoName = sCompoName.Substring(0, 15)
+               End If
+               GetLabel(index).Text = sCompoName
+               'Se ci sono sia testo che immagine imposto un margine di 10
+               CustomThickness.Right = 10
+               GetImage(index).Margin = CustomThickness
+            Else
+               'se l'immagine non c'è e il testo è maggiore di 20 lo taglio
+               If sCompoName.Length > 20 Then
+                  sCompoName = sCompoName.Substring(0, 20)
+               End If
+               GetLabel(index).Text = sCompoName
+            End If
+         Else
+            'Se non c'è testo azzero la distanza tra testo e immagine
+            CustomThickness.Right = 0
+            GetImage(index).Margin = CustomThickness
+         End If
+
+      Next
+
+   End Sub
+
    ' Gestione bottone altri componenti
    Private Sub Compo9_Click(sender As Object, e As RoutedEventArgs) Handles Compo9.Click
       If m_bIsFirstPage Then
          m_bIsFirstPage = False
          LoadPage()
-         'Compo9.SetValue(Grid.ColumnProperty, 1)
-         'Compo9.SetValue(Grid.ColumnSpanProperty, 1)
-         'ImageCompo9.Source = New System.Windows.Media.Imaging.BitmapImage(New Uri("/Resources/NumericKeyboardArrow.png", UriKind.Relative))
-         'ImageCompo9.Visibility = Windows.Visibility.Visible
-         'LabelCompo9.Visibility = Windows.Visibility.Hidden
          Compo9.SetValue(Grid.ColumnProperty, 0)
          Compo9.SetValue(Grid.ColumnSpanProperty, 2)
          ImageCompo9.Visibility = Windows.Visibility.Hidden

Frames/FrameCutPageUC.xaml

@@ -7,124 +7,146 @@
    mc:Ignorable="d" 
    d:DesignHeight="853.3" d:DesignWidth="1280">
 
-   <!-- Definizione della FrameCutPage -->
-   <Grid Name="FrameCutPageGrid" >
-      <Grid.ColumnDefinitions>
-         <ColumnDefinition Width="3*"/>
-         <ColumnDefinition Width="12*"/>
-      </Grid.ColumnDefinitions>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="1*"/>
-         <RowDefinition Height="8*"/>
-         <RowDefinition Height="1*"/>
-      </Grid.RowDefinitions>
-      
-      <!-- Definizione della Grid superiore -->
-      <Grid Grid.Column="1" Grid.Row="0" >
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="4*"/>
-         </Grid.ColumnDefinitions>
-         
-         <Button Name="PhotoBtn" Grid.Column="0" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
-            <Image Source="{DynamicResource PhotoImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-         </Button>
-         <Button Name="RawPartBtn" Grid.Column="1" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
-            <Image Source="{DynamicResource RawPartImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-         </Button>
-         <ToggleButton Name="MachiningBtn" Grid.Column="4" Style="{DynamicResource OmagCut_RightGrayYellowIconToggleButton}">
-            <Image Source="{DynamicResource FrameMachiningImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-         </ToggleButton>
-
-      </Grid>
-
-      <Grid Name="LeftGrid" Grid.Row="1">
-         <Grid.RowDefinitions>
+    <!-- Definizione della FrameCutPage -->
+    <Grid Name="FrameCutPageGrid" >
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="3*"/>
+            <ColumnDefinition Width="12*"/>
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
             <RowDefinition Height="1*"/>
-            <RowDefinition Height="7*"/>
-         </Grid.RowDefinitions>
-      
-      <Grid Grid.Row="1">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-         </Grid.ColumnDefinitions>
-         <Grid.RowDefinitions>
-            <RowDefinition Height="0.6*"/>
-            <RowDefinition Height="0.8*"/>
-            <RowDefinition Height="0.5*"/>
-            <RowDefinition Height="0.5*"/>
-            <RowDefinition Height="0.5*"/>
-            <RowDefinition Height="0.8*"/>
-            <RowDefinition Height="2.5*"/>
-         </Grid.RowDefinitions>
+            <RowDefinition Height="8*"/>
+            <RowDefinition Height="1*"/>
+        </Grid.RowDefinitions>
 
-         <ComboBox Name="AlongAxCmBx" Grid.Row="0" Grid.ColumnSpan="3" Style="{StaticResource OmagCut_ComboBox}" 
-               Width="200" MaxDropDownHeight="300">
-            <ComboBox.ItemTemplate>
-               <DataTemplate>
-                  <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-               </DataTemplate>
-            </ComboBox.ItemTemplate>
-         </ComboBox>
+        <!-- Definizione della Grid superiore -->
+        <Grid Grid.Column="1" Grid.Row="0" >
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="4*"/>
+            </Grid.ColumnDefinitions>
 
-         <UniformGrid Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3" Columns="2" >
-            <Button Name="SelSectionBtn" 
-                    Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
+            <Button Name="PhotoBtn" Grid.Column="0" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
+                <Image Source="{DynamicResource PhotoImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+            </Button>
+            <Button Name="RawPartBtn" Grid.Column="1" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
+                <Image Source="{DynamicResource RawPartImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+            </Button>
+
+            <Button Name="CompoBtn" Grid.Column="2" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
+                <Image Source="{DynamicResource DrawImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+            </Button>
+
+            <Button Name="SelSectionBtn" Grid.Column="3" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
                 <Image Source="{DynamicResource Sezione-corniceImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
             </Button>
-             
-            <Grid>
-               <Button Name="SelGuideBtn" 
-                       Style="{DynamicResource OmagCut_YellowTextButton}"/>
-               <UniformGrid Name="ArcGrid" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3" Columns="2" >
-                  <TextBlock Name="ArcRadTxBl"  Grid.Row="2" Grid.ColumnSpan="2"
-                             Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                  <EgtWPFLib:EgtTextBox Name="ArcRadTxBx" Grid.Column="2" Grid.Row="2" Width="50"
-                             Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
-                  <TextBlock Name="ArcAngTxBl"  Grid.Row="3" Grid.ColumnSpan="2"
-                             Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-                  <EgtWPFLib:EgtTextBox Name="ArcAngTxBx" Grid.Column="2" Grid.Row="3" Width="50"
-                             Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
-               </UniformGrid>
-            </Grid>  
-         </UniformGrid>
 
-         <TextBlock Name="OffsZTxBl"  Grid.Row="2" Grid.ColumnSpan="2"
+            <ToggleButton Name="MachiningBtn" Grid.Column="4" Style="{DynamicResource OmagCut_RightGrayYellowIconToggleButton}">
+                <Image Source="{DynamicResource FrameMachiningImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+            </ToggleButton>
+
+        </Grid>
+
+        <Grid Name="LeftGrid" Grid.Row="1">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="7*"/>
+            </Grid.RowDefinitions>
+
+            <Grid Grid.Row="1">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="0.6*"/>
+                    <RowDefinition Height="0.8*"/>
+                    <RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="0.8*"/>
+                    <RowDefinition Height="0.8*"/>
+                    <RowDefinition Height="1.7*"/>
+                </Grid.RowDefinitions>
+
+                <ComboBox Name="AlongAxCmBx" Grid.Row="0" Grid.ColumnSpan="3" Style="{StaticResource OmagCut_ComboBox}" 
+               Width="200" MaxDropDownHeight="300">
+                    <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                            <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                        </DataTemplate>
+                    </ComboBox.ItemTemplate>
+                </ComboBox>
+
+                <UniformGrid Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3" Columns="2" >
+                    <!--<Button Name="SelSectionBtn" 
+                    Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
+                        <Image Source="{DynamicResource Sezione-corniceImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+                    </Button>-->
+
+                    <Grid>
+                        <Button Name="SelGuideBtn" Style="{DynamicResource OmagCut_YellowTextButton}"/>
+                        <UniformGrid Name="ArcGrid" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3" Columns="2" >
+                            <TextBlock Name="ArcRadTxBl"  Grid.Row="2" Grid.ColumnSpan="2"
+                             Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
+                            <EgtWPFLib:EgtTextBox Name="ArcRadTxBx" Grid.Column="2" Grid.Row="2" Width="50"
+                             Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+                            <TextBlock Name="ArcAngTxBl"  Grid.Row="3" Grid.ColumnSpan="2"
+                             Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
+                            <EgtWPFLib:EgtTextBox Name="ArcAngTxBx" Grid.Column="2" Grid.Row="3" Width="50"
+                             Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+                        </UniformGrid>
+                    </Grid>
+                </UniformGrid>
+
+                <TextBlock Name="OffsZTxBl"  Grid.Row="2" Grid.ColumnSpan="2"
                Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-         <EgtWPFLib:EgtTextBox Name="OffsZTxBx" Grid.Column="2" Grid.Row="2" Width="50"
+                <EgtWPFLib:EgtTextBox Name="OffsZTxBx" Grid.Column="2" Grid.Row="2" Width="50"
                Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-         <TextBlock Name="OffsXyTxBl"  Grid.Row="3" Grid.ColumnSpan="2"
+                <TextBlock Name="OffsXyTxBl"  Grid.Row="3" Grid.ColumnSpan="2"
                Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-         <EgtWPFLib:EgtTextBox Name="OffsXyTxBx" Grid.Column="2" Grid.Row="3" Width="50"
+                <EgtWPFLib:EgtTextBox Name="OffsXyTxBx" Grid.Column="2" Grid.Row="3" Width="50"
                Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-         <TextBlock Name="OffsYyTxBl"  Grid.Row="4" Grid.ColumnSpan="2"
-            Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
-         <EgtWPFLib:EgtTextBox Name="OffsYyTxBx" Grid.Column="2" Grid.Row="4" Width="50"
-            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+                <TextBlock Name="OffsYyTxBl"  Grid.Row="4" Grid.ColumnSpan="2"
+               Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
+                <EgtWPFLib:EgtTextBox Name="OffsYyTxBx" Grid.Column="2" Grid.Row="4" Width="50"
+               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-         <UniformGrid Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="3" Columns="2" >
-            <Button Name="MirrorPartBtn" 
+                <TextBlock Name="OffsXInteryTxBl"  Grid.Row="5" Grid.ColumnSpan="2"
+               Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
+                <EgtWPFLib:EgtTextBox Name="OffsXInteryTxBx" Grid.Column="2" Grid.Row="5" Width="50"
+               Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+
+                <UniformGrid Grid.Column="0" Grid.Row="7" Grid.ColumnSpan="3" Columns="2" >
+                    <Button Name="MirrorPartBtn" 
                     Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
                         <Image Source="{DynamicResource SpecchiaImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
-            </Button>
-            <Button Name="RemovePartBtn" 
+                    </Button>
+                    <Button Name="RemovePartBtn" 
                     Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
                         <Image Source="{DynamicResource Rimuovi_eliminaImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
-            </Button>
-         </UniformGrid>
+                    </Button>
+                </UniformGrid>
 
-         <!--<TextBlock Name="SawRoughingTxBl" Grid.Row="4" Grid.ColumnSpan="3"
+                <!--<UniformGrid Grid.Column="0" Grid.Row="6" Grid.ColumnSpan="3" Columns="2" >
+                    <Button Name="CompoBtn" 
+                    Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
+                        <Image Source="{DynamicResource DrawImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+                    </Button>
+                </UniformGrid>-->
+
+                <!--<TextBlock Name="SawRoughingTxBl" Grid.Row="4" Grid.ColumnSpan="3"
             Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
 
          <ComboBox Name="SawRoughingCmBx" Grid.Row="5" Grid.ColumnSpan="3" Style="{StaticResource OmagCut_ComboBox}"
@@ -182,10 +204,10 @@
             </ComboBox.ItemTemplate>
          </ComboBox>-->
 
-      </Grid>
-         
-      </Grid>
+            </Grid>
 
-   </Grid>
+        </Grid>
+
+    </Grid>
 
 </UserControl>

Frames/FrameCutPageUC.xaml.vb

@@ -52,6 +52,8 @@ Public Class FrameCutPageUC
       OffsXyTxBx.Text = LenToString(dOffsXY, 3)
       Dim dOffsYY As Double = GetPrivateProfileDouble(S_FRAME, K_OFFSYY, 5, m_MainWindow.GetIniFile())
       OffsYyTxBx.Text = LenToString(dOffsYY, 3)
+      Dim dOffsXInterY As Double = GetPrivateProfileDouble(S_FRAME, K_OFFSXINTERY, 5, m_MainWindow.GetIniFile())
+      OffsXInteryTxBx.Text = LenToString(dOffsXInterY, 3)
 
       ' Imposto i messaggi letti dal file dei messaggi
       m_AlongAx.Add(EgtMsg(MSG_FRAMECUTPAGEUC + 1))            'Lungo X
@@ -70,6 +72,7 @@ Public Class FrameCutPageUC
       OffsZTxBl.Text = EgtMsg(MSG_FRAMECUTPAGEUC + 8)           'Distanza sopra
       OffsXyTxBl.Text = EgtMsg(MSG_FRAMECUTPAGEUC + 9)          'Distanza inizio
       OffsYyTxBl.Text = EgtMsg(MSG_FRAMECUTPAGEUC + 22)         'Distanza Y
+      OffsXInteryTxBl.Text = EgtMsg(90645)                      'Interasse
    End Sub
 
    Private Sub FrameCutPage_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
@@ -81,6 +84,12 @@ Public Class FrameCutPageUC
       m_ProjectMgr.CSVBtn.Visibility = Windows.Visibility.Hidden
       m_ProjectMgr.VeinMatchingBtn.Visibility = Windows.Visibility.Hidden
       m_ProjectMgr.RegisterBtn.Visibility = Windows.Visibility.Hidden
+      ' Visualizzo il bottone per l'importazione dei compo frame
+      If m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.COMPOFRAME) AndAlso GetPrivateProfileInt(S_FRAMECOMPO, K_CMP_COUNT, 0, m_MainWindow.GetIniFile()) > 0 Then
+         CompoBtn.Visibility = Visibility.Visible
+      Else
+         CompoBtn.Visibility = Visibility.Hidden
+      End If
       ' Recupero dimensioni e kerf del grezzo
       m_nRawId = EgtGetFirstRawPart()
       GetRawBox(m_RawBox)
@@ -271,7 +280,7 @@ Public Class FrameCutPageUC
       End If
    End Sub
 
-   Private Sub OffsXXTxBx_EgtClosed(sender As Object, e As EventArgs) Handles OffsZTxBx.EgtClosed, OffsXyTxBx.EgtClosed, OffsYyTxBx.EgtClosed
+   Private Sub OffsXXTxBx_EgtClosed(sender As Object, e As EventArgs) Handles OffsZTxBx.EgtClosed, OffsXyTxBx.EgtClosed, OffsYyTxBx.EgtClosed, OffsXInteryTxBx.EgtClosed
       ' Forzo aggiornamento grezzo nella pagina di Nesting
       m_MainWindow.m_CadCutPageUC.m_NestPage.CalcRawPart()
       ' Parcheggio pezzi presenti nel grezzo
@@ -296,9 +305,13 @@ Public Class FrameCutPageUC
          WritePrivateProfileString(S_FRAME, K_OFFSXY, DoubleToString(dOffsXy, 3), m_MainWindow.GetIniFile())
       End If
       Dim dOffsYy As Double = 0
-      If StringToLen(OffsYyTxBx.Text, dOffsYY) Then
+      If StringToLen(OffsYyTxBx.Text, dOffsYy) Then
          WritePrivateProfileString(S_FRAME, K_OFFSYY, DoubleToString(dOffsYy, 3), m_MainWindow.GetIniFile())
       End If
+      Dim dOffsXIntery As Double = 0
+      If StringToLen(OffsXInteryTxBx.Text, dOffsXIntery) Then
+         WritePrivateProfileString(S_FRAME, K_OFFSXINTERY, DoubleToString(dOffsXIntery, 3), m_MainWindow.GetIniFile())
+      End If
    End Sub
 
    Private Sub MirrorPartBtn_Click(sender As Object, e As RoutedEventArgs) Handles MirrorPartBtn.Click
@@ -436,6 +449,16 @@ Public Class FrameCutPageUC
       End If
    End Sub
 
+   Private Sub CompoBtn_Click(sender As Object, e As RoutedEventArgs) Handles CompoBtn.Click
+      m_MainWindow.TestOff()
+      m_MainWindow.DragRettangleOff()
+      m_MainWindow.SplitCurvWJOff()
+      m_MainWindow.StartCurvWJOff()
+      m_MainWindow.MainWindowGrid.Children.Remove(m_MainWindow.m_CurrentProjectPageUC)
+      m_MainWindow.MainWindowGrid.Children.Add(m_MainWindow.m_DrawPageUC)
+      m_MainWindow.m_ActivePage = MainWindow.Pages.Draw
+   End Sub
+
    Friend Function CreateFrame(nPartId As Integer) As Boolean
       If Not MyCreateFrame( nPartId) Then
          EgtErase( nPartId)
@@ -936,12 +959,18 @@ Public Class FrameCutPageUC
       ' Determino distanza da spessore lama
       Dim dMinDist As Double = 0
       Dim dSawThick As Double = 0
+      Dim dOffsXIntery As Double = 0
+      StringToLen(OffsXInteryTxBx.Text, dOffsXIntery)
       If EgtTdbSetCurrTool(m_MainWindow.m_CurrentMachine.sCurrSaw) AndAlso
          EgtTdbGetCurrToolParam(MCH_TP.THICK, dSawThick) Then
-         dMinDist = dSawThick + 5 * EPS_SMALL
+         If dOffsXIntery <= dSawThick Then
+            dMinDist = dSawThick + 5 * EPS_SMALL
+         Else
+            dMinDist = dOffsXIntery + 5 * EPS_SMALL
+         End If
       Else
          EgtOutLog("Not found current saw for frames mindist")
-         dMinDist = 0
+         dMinDist = dOffsXIntery
       End If
       ' Inserisco il pezzo nel grezzo
       Dim ptIns As Point3d

Machine/AlarmsPageUC.xaml

@@ -184,6 +184,31 @@
 
                </GroupBox>
 
+               <!--Parametri rettifica tagli sottosquadra: 1 Parametro -->
+               <GroupBox Name="RectificationWJParamGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="0" Grid.Row="4" Grid.ColumnSpan="2" >
+                   <Grid Grid.Column="3" Grid.Row="2">
+                       <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="2*"/>
+                           <ColumnDefinition Width="2*"/>
+                       </Grid.ColumnDefinitions>
+                       <Grid.RowDefinitions>
+                           <RowDefinition Height="*"/>
+                       </Grid.RowDefinitions>
+
+                       <TextBlock Name="EnableRectificationTxBl" Grid.Row="0" Grid.ColumnSpan="2"
+                                  Style="{DynamicResource OmagCut_ToolsDBTextBlock}" />
+                       <CheckBox Name="EnableRectificationChBx" Grid.Row="0" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_CheckBox_Single}"
+                                 HorizontalAlignment="Right" Margin="0,0,10,0"/>
+
+                       <!--<TextBlock Name="OffsetRectificationTxBl" Grid.Row="1" Grid.Column="0" 
+                                  Style="{DynamicResource OmagCut_ToolsDBTextBlock}"/>
+                       <EgtWPFLib:EgtTextBox Name="OffsetRectificationTxBx" Grid.Row="1" Grid.Column="1" Margin="10,0,10,0"
+                                  Style="{DynamicResource OmagCut_CalculatorTextBox}"/>-->
+
+                   </Grid>
+
+               </GroupBox>
+
                <!--Parametri WaterJet: 5 Parametro (se questo GroupBox attivo allora nascondo Fori/Fresatura)-->
                <GroupBox Name="WjsParamGpBx" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2" Grid.RowSpan="4" 
                               Style="{DynamicResource OmagCut_GroupBox}">

Machine/AlarmsPageUC.xaml.vb

@@ -97,7 +97,10 @@ Public Class AlarmsPageUC
       HolesOffsetWJTxBl.Text = "Offset"
       MinRadiusWJTxBl.Text = "Min Radius"
       OneHoleInCornerWJTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 26)
-      '--  FINE  -- nuovi parametri per preforo lavello
+      '-- INIZIO -- nuovi parametro Rettifica tagli sottosquadra WJ
+      REctificationWJParamGpBx.Header = "Rectification"
+      EnableRectificationTxBl.Text = "Enable (on subsquare angle)"
+      '--  FINE  -- nuovi parametro Rettifica tagli sottosquadra WJ
       NestingParamGpBx.Header = EgtMsg(MSG_ALARMSPAGEUC + 31)            ' Nesting
       AlignTxBl.Text = EgtMsg(90932)                                     ' Allineato
       GhigliottinaTxBl.Text = EgtMsg(91066)                              ' Ghigliottina
@@ -175,6 +178,7 @@ Public Class AlarmsPageUC
          ' Se non previsti tagli waterjet, disabilito relativo box
          If Not m_CurrentMachine.bWaterJetting Then
             WjsParamGpBx.Visibility = Visibility.Hidden
+            RectificationWJParamGpBx.Visibility = Visibility.Hidden
          End If
 
          ' Abilitazione box per contorni grezzo da foto
@@ -354,7 +358,9 @@ Public Class AlarmsPageUC
       MinRadiusWJTxBx.Text = LenToString(dVal, 2)
       OneHoleInCornerWJChBx.IsChecked =
          (GetPrivateProfileInt(S_MACH_NEST, K_MACH_DRILLINGWJ_ON_CORNERS, 1, m_MainWindow.GetMachIniFile()) <> 0)
-
+      ' leggo se attiva la rettifica degli angoli per WaterJet
+      EnableRectificationChBx.IsChecked =
+         (GetPrivateProfileInt(S_MACH_NEST, K_MACH_RECTIFICATION_ON_SUBSQUARE, 0, m_MainWindow.GetMachIniFile()) <> 0)
       ' Leggo accorciamento angoli con fresa
       dVal = GetPrivateProfileDouble(S_MACH_NEST, K_MACH_MILLING_SHORTENING, 0, m_MainWindow.GetMachIniFile())
       ShortTxBx.Text = LenToString(dVal, 2)
@@ -970,9 +976,18 @@ Public Class AlarmsPageUC
          WritePrivateProfileString(S_MACH_NEST, K_MACH_DRILLINGWJ_ON_CORNERS, "0", m_MainWindow.GetMachIniFile())
       End If
    End Sub
-
    ' --   FINE   -- nuovi parametri per prefori WaterJet
 
+   ' -- INIZIO -- nuovi parametri per Rettifica angoli in sottosquadra WaterJet
+   Private Sub EnableRectificationChBx_Click(sender As Object, e As EventArgs) Handles EnableRectificationChBx.Click
+      If EnableRectificationChBx.IsChecked() Then
+         WritePrivateProfileString(S_MACH_NEST, K_MACH_RECTIFICATION_ON_SUBSQUARE, "1", m_MainWindow.GetMachIniFile)
+      Else
+         WritePrivateProfileString(S_MACH_NEST, K_MACH_RECTIFICATION_ON_SUBSQUARE, "0", m_MainWindow.GetMachIniFile)
+      End If
+   End Sub
+   ' --   FINE   -- nuovi parametri per Rettifica angoli in sottosquadra WaterJet
+
    Private Sub TmEnableChBx_Click(sender As Object, e As RoutedEventArgs) Handles TmEnableChBx.Click
       If TmEnableChBx.IsChecked() Then
          WritePrivateProfileString(S_MACH_NEST, K_MACH_ENGRAVING_WITHMILL, "1", m_MainWindow.GetMachIniFile())
@@ -1189,6 +1204,12 @@ Public Class AlarmsPageUC
       EgtLuaSetGlobNumVar("CMD.THICK", dToolThick * 1000)
       EgtTdbGetCurrToolParam(MCH_TP.LEN, dToolLen)
       EgtLuaSetGlobNumVar("CMD.LENGTH", dToolLen * 1000)
+      ' Nuova varibile per gestione tastatura utensili Frankfurt (Polishing)
+      Dim nType As Integer
+      EgtTdbGetCurrToolParam(MCH_TP.TYPE, nType)
+      If m_CurrentMachine.bPolishingWheel AndAlso nType = MCH_TY.MILL_POLISHING Then
+         EgtLuaSetGlobStringVar("CMD.POLISHING", "1")
+      End If
       EgtLuaSetGlobBoolVar("CMD.INCHES", m_MainWindow.m_CNCommunication.GetMachineInInches())
       EgtLuaCallFunction("CMD.CmdString")
       ' Leggo variabili

Machine/CurrentMachine.vb

@@ -1,6 +1,7 @@
 Imports System.Collections.ObjectModel
 Imports EgtWPFLib5
 Imports EgtUILib
+Imports System.IO
 
 Public Class CurrentMachine
 
@@ -51,6 +52,10 @@ Public Class CurrentMachine
    Private m_sProdLiProbingState2Var As String = ""
    Private m_sProdLiProbingTcPos2Var As String = ""
    Private m_sProdLiSawDiameter2Var As String = ""
+   Private m_sClickState As String = "E80028"
+   Private m_sClickDir As String = ""
+   ' Gestione speciale per canali CN
+   Private m_sExtFileCN As String = ".0"
 
    ' Numero e tipo di utensili correntemente disponibili sulla macchina
    Private m_MountedToolConfig As MountedToolConfigs = MountedToolConfigs.SAW
@@ -194,8 +199,15 @@ Public Class CurrentMachine
    ' Massimo numero di utensili su Tc manuale
    Friend MAX_TCMAN_TOOLS As Integer = 60
 
+   ' Massima profondità lavorabile nei tagli diretti
+   Private m_MaxTabDepth As Double = 10.0
 
 #Region "Proprietà che leggono e scrivono i valori anche da o su file ini"
+   Friend ReadOnly Property MaxTabDepth As Double
+      Get
+         Return m_MaxTabDepth
+      End Get
+   End Property
 
    Friend ReadOnly Property sMachineName As String
       Get
@@ -316,7 +328,7 @@ Public Class CurrentMachine
          Return m_bAskNewOnResend
       End Get
    End Property
-   
+
 
    Friend ReadOnly Property nProdLiSawProbe As Integer
       Get
@@ -324,6 +336,24 @@ Public Class CurrentMachine
       End Get
    End Property
 
+   Friend ReadOnly Property sClickState As String
+      Get
+         Return m_sClickState
+      End Get
+   End Property
+
+   Friend ReadOnly Property sClickDir As String
+      Get
+         Return m_sClickDir
+      End Get
+   End Property
+
+   Friend ReadOnly Property sExtFileCN As String
+      Get
+         Return m_sExtFileCN
+      End Get
+   End Property
+
    Friend Function sProdLiProbingStateVar(nI As Integer) As String
       If nI = 1 Then Return m_sProdLiProbingStateVar
       If nI = 2 Then Return m_sProdLiProbingState2Var
@@ -788,7 +818,7 @@ Public Class CurrentMachine
                      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
@@ -1120,6 +1150,8 @@ Public Class CurrentMachine
       m_sMachIniFile = m_MainWindow.GetMachinesRootDir & "\" & sMachineName & "\" & sMachineName & ".ini"
       ' Leggo estensione del file programma pezzo
       GetPrivateProfileString(S_PARTPROGRAM, K_EXTENSION, "xpi", m_sIsoFileExt, sMachIniFile)
+      ' per gestione canali separati (macchina NUM con più di 5 Assi) ver. 2.5g1
+      GetPrivateProfileString(S_PARTPROGRAM, K_EXTFILECN, ".0", m_sExtFileCN, sMachIniFile)
       If m_sIsoFileExt(0) <> "." Then m_sIsoFileExt = "." & m_sIsoFileExt
       ' Leggo flag incremento asse C
       m_dDeltaC = GetPrivateProfileDouble(S_AXES, K_DELTA_C, 0.0, sMachIniFile)
@@ -1153,6 +1185,13 @@ Public Class CurrentMachine
       GetPrivateProfileString(S_PRODUCTIONLINE, K_PRODLIPROBINGTCPOS2VAR, "0", m_sProdLiProbingTcPos2Var, sMachIniFile)
       GetPrivateProfileString(S_PRODUCTIONLINE, K_PRODLISAWDIAMETER2VAR, "", m_sProdLiSawDiameter2Var, sMachIniFile)
 
+      GetPrivateProfileString(S_POLISHLINE, K_CLICKSTATE, "", m_sClickState, sMachIniFile)
+      GetPrivateProfileString(S_POLISHLINE, k_CLICKDIR, "", m_sClickDir, sMachIniFile)
+      If Not Directory.Exists(m_sClickDir) Then
+         m_sClickState = ""
+         EgtOutLog("Directory " & m_sClickDir & " does not exist")
+      End If
+
       ' Leggo configurazione degli utensili in macchina
       m_MountedToolConfig = GetPrivateProfileInt(S_TOOLS, K_MOUNTEDTOOLCONFIG, 0, sMachIniFile)
       ' Leggo flag presenza tipologie utensili
@@ -1360,6 +1399,12 @@ Public Class CurrentMachine
       m_HasRawProbe = (GetPrivateProfileInt(S_MACH_PROBING, K_ENABLERAWPROBE, 1, sMachIniFile) <> 0)
       ' leggo se la macchina ha il lettore di codice a barre della lastra
       m_nEnableBarCodeReader = GetPrivateProfileInt(S_MACH_BARCODEREADER, K_ENABLEBCR, 0, sMachIniFile)
+
+      ' affonadamento massimo oltre la tavola (inidicata in positivo!)
+      m_MaxTabDepth = GetPrivateProfileDouble(S_MACH_NEST, "MaxTabDepth", 10.0, m_MainWindow.GetMachIniFile())
+      If m_MaxTabDepth < 0 Then
+         m_MaxTabDepth = 10.0
+      End If
    End Sub
 
    ' Per il controllo FANUC al momento dell'inizializzazione del CN devono essere lette alcune variabili

Machine/MachineCNPageUC.xaml

@@ -7,110 +7,123 @@
    mc:Ignorable="d" 
    d:DesignHeight="768" d:DesignWidth="1280">
 
-   <!-- Definizione della ImportPage -->
-   <Border Background="{DynamicResource OmagCut_Gray}" >
+    <!-- Definizione della ImportPage -->
+    <Border Background="{DynamicResource OmagCut_Gray}" >
 
-      <Grid Name="ImportPageGrid">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="7.5*"/>
-            <ColumnDefinition Width="1.5*"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="5*"/>
-         </Grid.ColumnDefinitions>
-         <Grid.RowDefinitions>
-            <RowDefinition Height="1.5*"/>
-            <RowDefinition Height="1.5*"/>
-            <RowDefinition Height="1.5*"/>
-            <RowDefinition Height="4.5*"/>
-         </Grid.RowDefinitions>
+        <Grid Name="ImportPageGrid">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="7.5*"/>
+                <ColumnDefinition Width="1.5*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="5*"/>
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="1.5*"/>
+                <RowDefinition Height="1.5*"/>
+                <RowDefinition Height="1.5*"/>
+                <RowDefinition Height="4.5*"/>
+            </Grid.RowDefinitions>
 
-         <GroupBox Name="CNModeGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.ColumnSpan="2" Margin="0,0,4,0">
-            <Grid>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="2*"/>
-                  <ColumnDefinition Width="2*"/>
-                  <ColumnDefinition Width="2*"/>
-                  <ColumnDefinition Width="1.5*"/>
-                  <ColumnDefinition Width="1.5*"/>
-               </Grid.ColumnDefinitions>
+            <GroupBox Name="CNModeGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.ColumnSpan="2" Margin="0,0,4,0">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="2*"/>
+                        <ColumnDefinition Width="2*"/>
+                        <ColumnDefinition Width="2*"/>
+                        <ColumnDefinition Width="1.5*"/>
+                        <ColumnDefinition Width="1.5*"/>
+                    </Grid.ColumnDefinitions>
 
-               <ToggleButton Name="AutoBtn" Grid.Column="0"
+                    <ToggleButton Name="AutoBtn" Grid.Column="0"
                   Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}"
                   Foreground="White"/>
-               <ToggleButton Name="ManualBtn" Grid.Column="1"
+                    <ToggleButton Name="ManualBtn" Grid.Column="1"
                   Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}"
                   Foreground="White"/>
-               <ToggleButton Name="MDIBtn" Grid.Column="2"
+                    <ToggleButton Name="MDIBtn" Grid.Column="2"
                   Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}"
                   Foreground="White"/>
-               <ToggleButton Name="SingleBtn" Grid.Column="3"
+                    <ToggleButton Name="SingleBtn" Grid.Column="3"
                   Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}"
                   Foreground="White"/>
-               <ToggleButton Name="HomeBtn" Grid.Column="4"
+                    <ToggleButton Name="HomeBtn" Grid.Column="4"
                   Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}"
                   Foreground="White"/>
 
-            </Grid>
+                </Grid>
 
-         </GroupBox>
+            </GroupBox>
 
-         <GroupBox Name="CommandsGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="2" Grid.ColumnSpan="2">
-            <Grid>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="2*"/>
-                  <ColumnDefinition Width="2*"/>
-                  <ColumnDefinition Width="2*"/>
-               </Grid.ColumnDefinitions>
+            <GroupBox Name="CommandsGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="2" Grid.ColumnSpan="2">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="2*"/>
+                        <ColumnDefinition Width="2*"/>
+                        <ColumnDefinition Width="2*"/>
+                    </Grid.ColumnDefinitions>
 
-               <Button Name="StartBtn" Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
-               <Button Name="StopBtn" Grid.Column="1"
+                    <Button Name="StartBtn" Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
+                    <Button Name="StopBtn" Grid.Column="1"
                   Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
-               <Button Name="ResetBtn" Grid.Column="2"
+                    <Button Name="ResetBtn" Grid.Column="2"
                   Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
 
-            </Grid>
+                </Grid>
 
-         </GroupBox>
+            </GroupBox>
 
             <GroupBox Name="MDICommandGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Row="1">
-            <Grid>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="6*"/>
-                  <ColumnDefinition Width="1.5*"/>
-               </Grid.ColumnDefinitions>
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="6*"/>
+                        <ColumnDefinition Width="1.5*"/>
+                    </Grid.ColumnDefinitions>
 
                     <EgtWPFLib:EgtTextBox Name="MDITxBx" Margin="10,0,10,0" Style="{DynamicResource OmagCut_MDIKeyboardTextBox}"/>
-               <Button Name="MDIConfirmBtn" Grid.Column="1" 
+                    <Button Name="MDIConfirmBtn" Grid.Column="1" 
                Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
 
-            </Grid>
+                </Grid>
 
-         </GroupBox>
+            </GroupBox>
 
-         <GroupBox Name="PartProgTransferGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Row="2"
+            <GroupBox Name="CameraHQ" Style="{DynamicResource OmagCut_GroupBox}" Grid.Row="1" Grid.Column="2" Grid.ColumnSpan="2">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="2*"/>
+                        <ColumnDefinition Width="2*"/>
+                        <ColumnDefinition Width="2*"/>
+                    </Grid.ColumnDefinitions>
+                    <ToggleButton Name="CameraHQBtn" Grid.Column="2"
+                                  Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}"
+                                  Foreground="White"/>
+                </Grid>
+            </GroupBox>
+
+            <GroupBox Name="PartProgTransferGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Row="2"
             Grid.ColumnSpan="3">
-            <Grid>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="2*"/>
-               <ColumnDefinition Width="2*"/>
-               <ColumnDefinition Width="2*"/>
-               <ColumnDefinition Width="2*"/>
-               <ColumnDefinition Width="2*"/>
-            </Grid.ColumnDefinitions>
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="2*"/>
+                        <ColumnDefinition Width="2*"/>
+                        <ColumnDefinition Width="2*"/>
+                        <ColumnDefinition Width="2*"/>
+                        <ColumnDefinition Width="2*"/>
+                    </Grid.ColumnDefinitions>
 
-               <Button Name="DownloadBtn" Grid.Column="0"
+                    <Button Name="DownloadBtn" Grid.Column="0"
                Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
-               <Button Name="UploadBtn" Grid.Column="1"
+                    <Button Name="UploadBtn" Grid.Column="1"
                Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
-               <Button Name="ActivateBtn" Grid.Column="2"
+                    <Button Name="ActivateBtn" Grid.Column="2"
                Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
-               <Button Name="DeleteBtn" Grid.Column="3"
+                    <Button Name="DeleteBtn" Grid.Column="3"
                Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
-               <EgtWPFLib:EgtTextBox Name="DULoadTxBx" Grid.Column="4" Width="100" Text="900.0"
+                    <EgtWPFLib:EgtTextBox Name="DULoadTxBx" Grid.Column="4" Width="100" Text="900.0"
                   Style="{DynamicResource OmagCut_KeyboardTextBox}"/>
 
-            </Grid>
-         </GroupBox>
+                </Grid>
+            </GroupBox>
 
             <GroupBox Name="PowerGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Row="2"
             Grid.Column="3" Grid.ColumnSpan="3" Margin="5,0,0,0">
@@ -131,18 +144,18 @@
             </GroupBox>
 
             <GroupBox Name="ErrorLstGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Row="3" Grid.ColumnSpan="4">
-            <ListBox Name="ErrorLstBx">
-               <ListBox.ItemTemplate>
-                  <DataTemplate>
-                     <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-                  </DataTemplate>
-               </ListBox.ItemTemplate>
-            </ListBox>
+                <ListBox Name="ErrorLstBx">
+                    <ListBox.ItemTemplate>
+                        <DataTemplate>
+                            <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                        </DataTemplate>
+                    </ListBox.ItemTemplate>
+                </ListBox>
 
-         </GroupBox>
+            </GroupBox>
 
-      </Grid>
+        </Grid>
 
-   </Border>
+    </Border>
 
 </UserControl>

Machine/MachineCNPageUC.xaml.vb

@@ -29,6 +29,7 @@ Public Class MachineCNPageUC
       MDICommandGpBx.Header = EgtMsg(MSG_MACHINECNPAGEUC + 16)
       PartProgTransferGpBx.Header = EgtMsg(MSG_MACHINECNPAGEUC + 17)
       ErrorLstGpBx.Header = EgtMsg(MSG_ALARMSPAGEUC + 12)
+
       ' Attivo gruppo PartProgTransferGpBx leggendo la variabile nel file ini
       If GetPrivateProfileInt(S_GENERAL, K_TESTINGPAGE, 0, m_MainWindow.GetIniFile()) = 1 Then
          PartProgTransferGpBx.Visibility = Windows.Visibility.Visible
@@ -44,6 +45,28 @@ Public Class MachineCNPageUC
       Else
          PowerGpBx.Visibility = Visibility.Collapsed
       End If
+
+      ' verifico che sia attiva la modalità per l'uso di due fotocamere
+      If GetPrivateProfileInt(S_CAMERAHQ, K_CAMERAHQ_ENABLE, 0, m_MainWindow.GetMachIniFile()) = 1 Then
+         CameraHQ.Visibility = Visibility.Visible
+         CameraHQ.Header = "Photo on table"
+         CameraHQBtn.Content = "HQ"
+         ' verifico quale camera è impostata
+         If GetPrivateProfileInt(S_CAMERAHQ, K_CAMERAHQ_ACTIVATE, 0, m_MainWindow.GetMachIniFile()) = 1 Then
+            CameraHQBtn.IsChecked = True
+            If Not IsNothing(m_MainWindow.m_CadCutPageUC.PhotoIMG) Then
+               m_MainWindow.m_CadCutPageUC.PhotoIMG.Source = New System.Windows.Media.Imaging.BitmapImage(New Uri("/Resources/NewIcons/icone-tagli-1HQ.png", UriKind.Relative))
+            End If
+         Else
+            CameraHQBtn.IsChecked = False
+            If Not IsNothing(m_MainWindow.m_CadCutPageUC.PhotoIMG) Then
+               m_MainWindow.m_CadCutPageUC.PhotoIMG.Source = New System.Windows.Media.Imaging.BitmapImage(New Uri("/Resources/NewIcons/icone-tagli-1.png", UriKind.Relative))
+            End If
+         End If
+      Else
+         CameraHQ.Visibility = Visibility.Collapsed
+      End If
+
    End Sub
 
    Private Sub TestingPage_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
@@ -203,6 +226,20 @@ Public Class MachineCNPageUC
       m_CN.DGeneralFunctions_WriteCncMode(8)
    End Sub
 
+   Private Sub CameraHQBtn_Click(sender As Object, e As RoutedEventArgs) Handles CameraHQBtn.Click
+      Dim sEnableHQ As String = If(CameraHQBtn.IsChecked, "1", "0")
+      WritePrivateProfileString(S_CAMERAHQ, K_CAMERAHQ_ACTIVATE, sEnableHQ, m_MainWindow.GetMachIniFile())
+      If CameraHQBtn.IsChecked Then
+         If Not IsNothing(m_MainWindow.m_CadCutPageUC.PhotoIMG) Then
+            m_MainWindow.m_CadCutPageUC.PhotoIMG.Source = New System.Windows.Media.Imaging.BitmapImage(New Uri("/Resources/NewIcons/icone-tagli-1HQ.png", UriKind.Relative))
+         End If
+      Else
+         If Not IsNothing(m_MainWindow.m_CadCutPageUC.PhotoIMG) Then
+            m_MainWindow.m_CadCutPageUC.PhotoIMG.Source = New System.Windows.Media.Imaging.BitmapImage(New Uri("/Resources/NewIcons/icone-tagli-1.png", UriKind.Relative))
+         End If
+      End If
+   End Sub
+
    Private Sub MDITxBx_KeyDown(sender As Object, e As KeyEventArgs) Handles MDITxBx.KeyDown
       If e.Key = Key.Return Then
          ' leggo se stato reset

Machine/MachineStatusUC.xaml.vb

@@ -279,6 +279,12 @@ Public Class MachineStatusUC
 
    Sub DisplayFeed()
       Dim dRealFeed As Double = m_CN.d_DInterpo_Prog_Feed * m_CN.d_DInterpo_Feed_override / 100
+      ' modifica richiesta 26/05/2023 da Rosario per cliente Lanzetta
+      If m_MainWindow.m_CNCommunication.m_nNCType = 4 Then
+         dRealFeed = m_CN.d_DInterpo_Prog_Feed
+      Else
+         dRealFeed = m_CN.d_DInterpo_Prog_Feed * m_CN.d_DInterpo_Feed_override / 100
+      End If
       'Feed = DoubleToString(dRealFeed, 0)
       FeedTxBx.Text = LenToString(dRealFeed, 0, True)
       'FeedOverride = DoubleToString(m_CN.d_DInterpo_Feed_override, 0) & "%"

Machine/PolishingsPageUC.xaml.vb

@@ -61,8 +61,8 @@ Public Class PolishingsPageUC
       RepeatTxBl.Text = EgtMsg(91093)             ' Ripetizioni
       StepTxBl.Text = EgtMsg(90787)               ' Passo
       OffSetTxBl.Text = EgtMsg(91089)             ' Offset
-      RadiusTxBl.Text = "Raggio"
-      DistanceTxBl.Text = "Distanza"
+      RadiusTxBl.Text = EgtMsg(91139)             ' Raggio
+      DistanceTxBl.Text = EgtMsg(91140)           ' Distanza
       LiLoGpBx.Header = EgtMsg(91094)             ' Attacco/Uscita
       LiLenTxBl.Text = EgtMsg(91097)              ' Lunghezza
       LiHeightTxBl.Text = EgtMsg(91095)           ' Altezza

MainWindow.xaml

@@ -53,7 +53,7 @@
             </ToggleButton>
          </Grid>
 
-         <Button Grid.Column="2" Style="{DynamicResource OmagCut_BlueIconButton}" Click="ExitBtn_Click">
+         <Button Name="ExitBtn" Grid.Column="2" Style="{DynamicResource OmagCut_BlueIconButton}" Click="ExitBtn_Click">
             <Image Source="{DynamicResource XImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
          </Button>
    

MainWindow.xaml.vb

@@ -100,6 +100,7 @@ Class MainWindow
       OFFICE_TYPE = 2 ^ 19                '  524288
       REGISTRATION = 2 ^ 20               ' 1048576
       SIMPLESTATISTICS = 2 ^ 21           ' 2097152
+      COMPOFRAME = 2 ^ 22                 ' 4194304
    End Enum
    ' Opzione nesting automatico
    Private m_bAutoNest As Boolean = False
@@ -323,13 +324,13 @@ Class MainWindow
       Dim sNestKey As String = ""
       EgtUILib.GetPrivateProfileString(S_LICENCE, K_NESTKEY, "", sNestKey, sLicFile)
       EgtSetNestKey(sNestKey)
-      Dim bNetHwKey As Boolean = ( GetPrivateProfileInt(S_GENERAL, K_NETKEY, 0, m_sIniFile) = 1)
-      EgtSetNetHwKey( bNetHwKey)
+      Dim bNetHwKey As Boolean = (GetPrivateProfileInt(S_GENERAL, K_NETKEY, 0, m_sIniFile) = 1)
+      EgtSetNetHwKey(bNetHwKey)
       ' Verifico abilitazione nesting automatico
       m_bAutoNest = Not String.IsNullOrWhiteSpace(sNestKey)
       ' Recupero opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2504, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(9423, 2504, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2507, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(9423, 2507, 1, m_nKeyOptions)
       ' Verifico abilitazione prodotto
       Dim bProd As Boolean = GetKeyOption(KEY_OPT.CUT_BASE)
       ' Inizializzazione generale di EgtInterface
@@ -439,7 +440,7 @@ Class MainWindow
 
       ' abilito il bottone per la gestione del comando di Check-Up-Start (posziona lama prelavorazione)
       If GetPrivateProfileInt(S_GENERAL, "Test", "0", m_sIniFile) = 0 OrElse
-         Not File.Exists( m_CurrentMachine.sMachDir() & "\DirectCmd\TestWork.lua") Then
+         Not File.Exists(m_CurrentMachine.sMachDir() & "\DirectCmd\TestWork.lua") Then
          m_CadCutPageUC.m_ProjectMgr.TestBtn.Visibility = Visibility.Collapsed
       Else
          m_CadCutPageUC.m_ProjectMgr.TestBtn.Visibility = Visibility.Visible
@@ -553,14 +554,14 @@ Class MainWindow
 
                ' è permessa una sola istanza alla volta del programma OmagCUT -> "(1)" : "(" & nIstance.ToString & ")"
                EgtPHOTOLib.MainData.SetUser(Environment.MachineName & "\" & Environment.UserName & " (1)")
-                  Dim sIdKey As String = String.Empty
-                  EgtGetKeyInfo(sIdKey)
-                  EgtPHOTOLib.MainData.SetKey(sIdKey)
-               End If
+               Dim sIdKey As String = String.Empty
+               EgtGetKeyInfo(sIdKey)
+               EgtPHOTOLib.MainData.SetKey(sIdKey)
             End If
+         End If
       End If
       ' --------------------------------- SLAB DB -------------------------------------------------------
-
+      ExitBtn.ToolTip = "Exit" & vbCrLf & "Minimize (Shift)"
    End Sub
 
    Private Sub ManageSingleIstance()
@@ -997,6 +998,16 @@ Class MainWindow
       ' Se già visualizzato errore, lo nascondo
       If m_CurrentProjectPageUC.OutMessageBrd.IsMouseOver Then
          m_CurrentProjectPageUC.ClearMessage()
+         ' se è premuto il pulsante Shift allora provvedo ad aprire il file di Log
+         If Keyboard.Modifiers And ModifierKeys.Shift Then
+            ' Genero file CNC (lancio anche se errore in precedenza)
+            Dim sTemoDirect As String = GetTempDir() & "\OmagCUTLog.txt"
+            Try
+               Process.Start("Notepad.exe", sTemoDirect)
+            Catch ex As Exception
+               EgtOutLog(ex.ToString)
+            End Try
+         End If
       End If
       ' Condizioni che impediscono di clickare fuori dalla calcolatrice o tastiera quando una di queste è aperta
       If EgtWPFLib.EgtCalculator.GetbIsActive Then
@@ -1087,9 +1098,9 @@ Class MainWindow
          m_CurrentProjectPageUC.SaveNamedProject()
          m_CurrentProjectPageUC.SaveProject()
       End If
-      ' Inizio la chiusura del programma (verifico di aver terminato il processo DripFeed)
+      ' Inizio la chiusura del programma (se NUM_OLD verifico di aver terminato il processo DripFeed)
       EgtOutLog("Iniziato processo di chiusura programma")
-      m_IsClosingApplication = 1
+      m_IsClosingApplication = If( m_CNCommunication.m_nNCType = 1, 1, 2)
       Dim nCount As Integer = 0
       While m_IsClosingApplication <> 2
          If nCount > 5 Then
@@ -1216,7 +1227,7 @@ Class MainWindow
    Private Sub MainWindow_ContentRendered(sender As Object, e As EventArgs) Handles Me.ContentRendered
       ' Verifico presenza del collegamento al CN
       m_bNCLink = (GetPrivateProfileInt(S_GENERAL, K_CNLINK, 0, m_sIniFile) <> 0) And
-                  Not GetKeyOption( KEY_OPT.OFFICE_TYPE)
+                  Not GetKeyOption(KEY_OPT.OFFICE_TYPE)
       m_CNCommunication.CNCommunication_Initialization()
       ' Se linea di produzione abilitata e collegata, lancio relativo timer
       If m_bNCLink And m_CurrentMachine.bProdLine Then
@@ -1226,7 +1237,8 @@ Class MainWindow
          m_ProdLineTimer.Interval = TimeSpan.FromMilliseconds(2000)
          m_ProdLineTimer.Start()
       End If
-
+      ' di default attivo la pagina CadCut
+      m_ActivePage = MainWindow.Pages.CadCut
       ' seleziono il tipo di avvio
       m_CurrentProjectPageUC.StartProgram()
       ' aggiorno la grafica
@@ -1292,7 +1304,9 @@ Class MainWindow
          m_CNCommunication.m_CN.ReadEls_Add_Parameter(m_CurrentMachine.sVarProjFinished, 1)
          Dim nVarFin As Integer = 0
          For I As Integer = 1 To 4
-            System.Threading.Thread.Sleep(50)
+            If Not m_CurrentMachine.bDemo Then
+               System.Threading.Thread.Sleep(50)
+            End If
             If m_CNCommunication.m_CN.n_DReadELS_handle = 1 Then
                nVarFin = CInt(m_CNCommunication.m_CN.d_DReadELS_value)
                Exit For
@@ -1305,11 +1319,11 @@ Class MainWindow
             ' Salvo in INI indice del progetto terminato
             WritePrivateProfileString(S_GENERAL, K_LASTPROJFINISHED, nVarFin.ToString("D4"), GetIniFile())
             ' Salvo in INI data e ora attuali di termine lavorazione del progetto (solo gli ultimi 10 tramite modulo)
-            Dim sKey As String = K_DATETIMEFINISHED & "." & ( nVarFin Mod 10).ToString() 
+            Dim sKey As String = K_DATETIMEFINISHED & "." & (nVarFin Mod 10).ToString()
             Dim sDateTime As String = My.Computer.Clock.LocalTime.ToString("dd.MM.yyyy HH\:mm\:ss")
             WritePrivateProfileString(S_GENERAL, sKey, sDateTime, GetIniFile())
             ' Eseguo script
-            ExecFinishedProgScript( nVarFin, sDateTime)
+            ExecFinishedProgScript(nVarFin, sDateTime)
          End If
       End If
       ' Se OmagVIEW blocca, esco (riproverò al prossimo giro)
@@ -1345,16 +1359,18 @@ Class MainWindow
       ' Se richieste modalità standard o speciali
       If m_CurrentMachine.nSaveProduced <> 3 Then
          StandardAndSpecialViewFileManagement()
-      ' altrimenti modalità custom
+         ' altrimenti modalità custom
       Else
-         CustomViewFileManagement( nProjInd)
+         CustomViewFileManagement(nProjInd)
       End If
       ' Leggo variabile con indice progetto da copiare per OmagVIEW (standard E80025)
       m_CNCommunication.m_CN.n_DReadELS_handle = 0
       m_CNCommunication.m_CN.ReadEls_Add_Parameter(m_CurrentMachine.sVarProjCopy, 1)
       Dim nVarCopy As Integer = 0
       For I As Integer = 1 To 10
-         System.Threading.Thread.Sleep(50)
+         If Not m_CurrentMachine.bDemo Then
+            System.Threading.Thread.Sleep(50)
+         End If
          If m_CNCommunication.m_CN.n_DReadELS_handle = 1 Then
             nVarCopy = CInt(m_CNCommunication.m_CN.d_DReadELS_value)
             Exit For
@@ -1555,7 +1571,7 @@ Class MainWindow
                nNewProjInd -= 1
             End While
          End If
-      ' se altrimenti richiesto progetto successivo
+         ' se altrimenti richiesto progetto successivo
       ElseIf nMove > 0 Then
          nNewProjInd = nProjInd + 1
          If nProjInd > nLastProj Then
@@ -1656,7 +1672,7 @@ Class MainWindow
             Catch ex As Exception
                EgtOutLog("Error erasing " & sDestEplFile)
             End Try
-         ' altrimenti, ogni commessa ha il suo file dei pezzi rovinati
+            ' altrimenti, ogni commessa ha il suo file dei pezzi rovinati
          Else
             ' Sposto nel direttorio temporaneo
             Dim sDestEplFile = m_sTempDir & "\" & CURR_PROJ_EPL
@@ -1766,7 +1782,7 @@ Class MainWindow
       Return True
    End Function
 
-   Private Function CustomViewFileManagement( nProjInd As Integer) As Boolean
+   Private Function CustomViewFileManagement(nProjInd As Integer) As Boolean
       ' Se non esiste file EPL, esco
       Dim sSouEplFile As String = m_CurrentMachine.sLineDataDir & "\" & CURR_PROJ_EPL
       If Not My.Computer.FileSystem.FileExists(sSouEplFile) Then Return True
@@ -1805,7 +1821,7 @@ Class MainWindow
       ' Verifico progetto restituito da View
       If nProjInd = 0 Then nProjInd = nLastCopy
       ' Leggo variabile con data termine lavorazione
-      Dim sKey As String = K_DATETIMEFINISHED & "." & ( nProjInd Mod 10).ToString() 
+      Dim sKey As String = K_DATETIMEFINISHED & "." & (nProjInd Mod 10).ToString()
       GetPrivateProfileString(S_GENERAL, sKey, sDateTime, sDateTime, GetIniFile())
       ' Recupero direttorio per pezzi rovinati
       Dim sRuPartsDir As String = GetRuinedPartsDir()
@@ -1832,7 +1848,7 @@ Class MainWindow
       Return True
    End Function
 
-   Friend Function ExecSentProgScript( bDirectCut As Boolean, Optional bAlreadySent As Boolean = False) As Boolean
+   Friend Function ExecSentProgScript(bDirectCut As Boolean, Optional bAlreadySent As Boolean = False) As Boolean
       ' Verifico esistenza script
       Dim sLuaPath As String = m_CurrentMachine.sMachDir() & "\Scripts\SentProg.lua"
       If Not My.Computer.FileSystem.FileExists(sLuaPath) Then Return True
@@ -1851,8 +1867,8 @@ Class MainWindow
       End If
       EgtLuaResetGlobVar("SPS")
       If nErr <> 0 Then
-          EgtOutLog("Error in SentProg : " & nErr.ToString())
-          m_CurrentProjectPageUC.SetErrorMessage(EgtMsg(90325))       'Errore nel salvataggio delle statistiche
+         EgtOutLog("Error in SentProg : " & nErr.ToString())
+         m_CurrentProjectPageUC.SetErrorMessage(EgtMsg(90325))       'Errore nel salvataggio delle statistiche
       End If
       Return (nErr = 0)
    End Function
@@ -1934,15 +1950,15 @@ Class MainWindow
       End If
       ' Dichiaro progetto passato da View
       If nProjInd = m_CurrentProjectPageUC.GetCurrentProject() Then
-         EgtSetInfo( EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_PROJMARK), INFO_UNLOADSAVED, 1)
+         EgtSetInfo(EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_PROJMARK), INFO_UNLOADSAVED, 1)
       Else
          Dim nTmpCtx As Integer = EgtInitContext()
          If nTmpCtx <> 0 Then
             Dim sNgeFile As String = GetSaveDir() & "\" & nProjInd.ToString("D4") & ".nge"
-            EgtOpenFile( sNgeFile)
-            EgtSetInfo( EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_PROJMARK), INFO_UNLOADSAVED, 1)
-            EgtSaveFile( sNgeFile, NGE.CMPTEXT)
-            EgtDeleteContext( nTmpCtx)
+            EgtOpenFile(sNgeFile)
+            EgtSetInfo(EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_PROJMARK), INFO_UNLOADSAVED, 1)
+            EgtSaveFile(sNgeFile, NGE.CMPTEXT)
+            EgtDeleteContext(nTmpCtx)
             EgtSetCurrentContext(m_CurrentProjectPageUC.CurrentProjectScene.GetCtx())
          End If
       End If
@@ -1976,21 +1992,21 @@ Class MainWindow
    ' Evento che apre AboutBox quando viene clickato il logo
    Private Sub LogoBrd_MouseDown(sender As Object, e As MouseButtonEventArgs) Handles LogoBrd.MouseDown
       ' Se non premuto Shift -> AboutBox
-      If ( Keyboard.Modifiers And ModifierKeys.Shift) = 0 Then  
-         Dim AboutBox As New AboutBoxWD( Me)
-      ' Altrimenti lancio cambio macchina (solo uso interno)
+      If (Keyboard.Modifiers And ModifierKeys.Shift) = 0 Then
+         Dim AboutBox As New AboutBoxWD(Me)
+         ' Altrimenti lancio cambio macchina (solo uso interno)
       Else
          If m_ActivePage = Pages.CadCut Or m_ActivePage = Pages.FrameCut Then
             ' Cambio macchina
-            EgtLuaCreateGlobTable( "CHM")
-            EgtLuaExecFile( GetConfigDir() & "\ChangeMachine.lua")
+            EgtLuaCreateGlobTable("CHM")
+            EgtLuaExecFile(GetConfigDir() & "\ChangeMachine.lua")
             Dim nRestart As Integer = 0
-            EgtLuaGetGlobIntVar( "CHM.RESTART", nRestart)
-            EgtLuaResetGlobVar( "CHM")
+            EgtLuaGetGlobIntVar("CHM.RESTART", nRestart)
+            EgtLuaResetGlobVar("CHM")
             ' Riavvio
             If nRestart = 1 Then
                Close()
-               Process.Start( Application.ResourceAssembly.Location)
+               Process.Start(Application.ResourceAssembly.Location)
             End If
          End If
       End If

My Project/AssemblyInfo.vb

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

NcComm/CNCommunication.vb

@@ -133,6 +133,10 @@ Public Class CNCommunication
             Refresh()
          End If
 
+         If Not String.IsNullOrEmpty(m_MainWindow.m_CurrentMachine.sClickState) Then
+            ClickOnPolishLine()
+         End If
+
          m_bTimerBusy = False
          m_RefreshTimer.Start()
       Else
@@ -499,6 +503,33 @@ Public Class CNCommunication
 
    End Sub
 
+   Private Sub ClickOnPolishLine()
+      ' Se richiesto di scattare foto sulla linea di lucidatura
+      m_CN.n_DReadELS_handle = 0
+      m_CN.ReadEls_Add_Parameter(m_MainWindow.m_CurrentMachine.sClickState, 1)
+      Dim nClickState As Integer = 0
+      For I As Integer = 0 To 10
+         System.Threading.Thread.Sleep(50)
+         If m_CN.n_DReadELS_handle = 1 Then
+            nClickState = CInt(m_CN.d_DReadELS_value)
+            If nClickState = 1 Then
+               ' procedo a costruire un nuovo file nella cartella indicata in configurazione
+               Try
+                  Dim fs As FileStream = File.Create(m_MainWindow.m_CurrentMachine.sClickDir & "\NewClick.txt")
+                  ' chiudo il file creato
+                  fs.Close()
+                  ' Dichiaro di aver provveduto a comunicare di scattare la foto
+                  m_CN.DVariables_WriteVariables2(m_MainWindow.m_CurrentMachine.sClickState, "0")
+               Catch ex As Exception
+                  EgtOutLog("Error on PolishLine comunication: " & ex.ToString)
+               End Try
+            End If
+            Exit For
+         End If
+      Next
+
+   End Sub
+
    Private Sub Refresh()
 
       If m_bNewPosData Then
@@ -654,6 +685,7 @@ Public Class CNCommunication
             End If
             m_MainWindow.m_DirectCutPageUC.m_MachineButtons.DoorStateChanged(m_CN.nDoorClosedState)
             m_MainWindow.m_DirectCutPageUC.m_MachineButtons.ParkingStateChanged(m_CN.bParkingState)
+            m_MainWindow.m_DirectCutPageUC.m_MachineButtons.HomeStateChanged(m_CN.bHomeState)
             m_MainWindow.m_DirectCutPageUC.m_MachineButtons.EnableZoneStateChanged(m_CN.nEnableZone)
             m_MainWindow.m_DirectCutPageUC.m_MachineButtons.EnablePcStateChanged(m_CN.nEnablePc)
             m_MainWindow.m_DirectCutPageUC.m_MachineButtons.TableUpChanged(m_CN.bTableUpState)
@@ -1135,7 +1167,8 @@ Public Class CNCommunication
          bOk = (m_nNCType > 0)
          Dim sNumProg As String = String.Empty
          If m_nNCType = 1 Or m_nNCType = 2 Then
-            sNumProg = "%" & nNumProg.ToString() & ".0"
+            Dim sExtFileCN As String = m_MainWindow.m_CurrentMachine.sExtFileCN
+            sNumProg = "%" & nNumProg.ToString() & sExtFileCN
          Else
             sNumProg = nNumProg.ToString()
          End If

NcComm/CN_Siemens.vb

@@ -144,7 +144,7 @@ Public Class CN_Siemens
          End Select
       Else
          ' per verificare che la comunicazione funzioni correttamente
-         EgtOutLog("Modo -read_active_mode-: " & M_MMFiles.SiemensRet.n_param2.ToString)
+         ' EgtOutLog("Modo -read_active_mode-: " & M_MMFiles.SiemensRet.n_param2.ToString)
          Return M_MMFiles.read_active_mode()
          'Return CShort(M_MMFiles.SiemensRet.n_param2)
       End If

NcComm/M_Fanuc_hi.vb

@@ -650,9 +650,7 @@ Namespace Fanuc
 					  ' ...
 
 					Case CnData.Feed       ' (2)
-
-						Dim qq As Short = n_temp
-					  'd_DInterpo_Prog_Feed = CDbl(CLng(values(n))) ' d_DInterpo_Prog_Feed
+						d_DInterpo_Prog_Feed = CDbl(n_temp) ' d_DInterpo_Prog_Feed
 
 					Case CnData.FeedOvr    ' (3) Potenziom. Feed  = * 0.47059
 						d_DInterpo_Feed_override = CDbl(n_temp)

OmagCUT.vbproj

@@ -245,6 +245,9 @@
     <Compile Include="Project\CicloStartWD.xaml.vb">
       <DependentUpon>CicloStartWD.xaml</DependentUpon>
     </Compile>
+    <Compile Include="RawPhoto\OtherRefTabWD.xaml.vb">
+      <DependentUpon>OtherRefTabWD.xaml</DependentUpon>
+    </Compile>
     <Compile Include="RawPhoto\SlabIdWD.xaml.vb">
       <DependentUpon>SlabIdWD.xaml</DependentUpon>
     </Compile>
@@ -519,6 +522,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="RawPhoto\OtherRefTabWD.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="RawPhoto\SlabIdWD.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -1330,6 +1337,21 @@
   <ItemGroup>
     <Resource Include="Resources\ToolChangerPos.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\RefTab.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\PhotoHQ.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\icone-tagli-1HQ.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\ImportPageListBoxImages\4.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\ImportPageListBoxImages\5.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\OmagCUT\OmagCUTR32.exe

OmagCUTDarkDictionary.xaml

@@ -32,6 +32,7 @@
     <BitmapImage x:Key="AlignPiecesImg" UriSource="Resources/NewIcons/ruota-oggetto-inclinato.png"></BitmapImage>
     <BitmapImage x:Key="BarCodeImg" UriSource="Resources/NewIcons/BarCode.png"></BitmapImage>
     <BitmapImage x:Key="SlabIdImg" UriSource="Resources/NewIcons/SlabId.png"></BitmapImage>
+    <BitmapImage x:Key="RefTabImg" UriSource="Resources/NewIcons/RefTab.png"></BitmapImage>
     <BitmapImage x:Key="BottomLeftImg" UriSource="Resources/NewIcons/1-BottomLeft.png"></BitmapImage>
     <BitmapImage x:Key="BottomRightImg" UriSource="Resources/NewIcons/2-BottomRight.png"></BitmapImage>
     <BitmapImage x:Key="PartRotOnImg" UriSource="Resources/NewIcons/PartRotOn.png"></BitmapImage>

OmagCUTDictionary.xaml

@@ -102,6 +102,7 @@
     <BitmapImage x:Key="AlignPiecesImg" UriSource="Resources/AlignPieces.png"></BitmapImage>
     <BitmapImage x:Key="BarCodeImg" UriSource="Resources/BarCode.png"></BitmapImage>
     <BitmapImage x:Key="SlabIdImg" UriSource="Resources/SlabId.png"></BitmapImage>
+    <BitmapImage x:Key="RefTabImg" UriSource="Resources/NewIcons/RefTab.png"></BitmapImage>
     <BitmapImage x:Key="BottomLeftImg" UriSource="Resources/BottomLeft.png"></BitmapImage>
     <BitmapImage x:Key="BottomRightImg" UriSource="Resources/BottomRight.png"></BitmapImage>
     <BitmapImage x:Key="PartRotOnImg" UriSource="Resources/PartRotOn.png"></BitmapImage>

Project/CurrentProjectPageUC.xaml.vb

@@ -1400,7 +1400,8 @@ Public Class CurrentProjectPageUC
 
    Friend Sub ClearMessage()
       OutMessageBrd.Background = Brushes.Transparent
-      OutMessageBrd.Visibility = Windows.Visibility.Hidden
+      OutMessageTxBl.Text = ""
+      'OutMessageBrd.Visibility = Windows.Visibility.Hidden
    End Sub
 
 End Class

Project/OpenPageUC.xaml.vb

@@ -491,7 +491,19 @@ Public Class OpenPageUC
       m_SceneButtons.MeasureBtn.IsChecked = False
       ' Istruzioni per chiudere OpenPageUC e aprire currentproject e cadcut page
       m_MainWindow.MainWindowGrid.Children.Remove(m_MainWindow.m_OpenPage)
-      m_MainWindow.MainWindowGrid.Children.Add(m_MainWindow.m_CurrentProjectPageUC)
+      If m_MainWindow.m_PrevActivePage = MainWindow.Pages.CadCut Then
+         m_MainWindow.MainWindowGrid.Children.Add(m_MainWindow.m_CurrentProjectPageUC)
+         If Not m_MainWindow.CadCutBtn.IsChecked Then
+            m_MainWindow.m_CurrentProjectPageUC.CurrentProjectPageGrid.Children.Add(m_MainWindow.m_CadCutPageUC)
+            m_MainWindow.CadCutBtn.IsChecked = True
+         End If
+      ElseIf m_MainWindow.m_PrevActivePage = MainWindow.Pages.FrameCut Then
+         m_MainWindow.MainWindowGrid.Children.Add(m_MainWindow.m_CurrentProjectPageUC)
+         If Not m_MainWindow.FrameCutBtn.IsChecked Then
+            m_MainWindow.m_CurrentProjectPageUC.CurrentProjectPageGrid.Children.Add(m_MainWindow.m_FrameCutPageUC)
+            m_MainWindow.FrameCutBtn.IsChecked = True
+         End If
+      End If
       ' Non modifico progetto corrente
       m_MainWindow.m_ActivePage = m_MainWindow.m_PrevActivePage
    End Sub

Project/ProjectMgrUC.xaml.vb

@@ -1,6 +1,7 @@
 Imports System.ComponentModel
 Imports System.Drawing
 Imports System.IO
+Imports System.Windows.Forms.Integration
 Imports EgtUILib
 Imports EgtWPFLib
 
@@ -32,6 +33,7 @@ Public Class ProjectMgrUC
          WorkBtn.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 2)        'Work - Lavora
       End If
       TestBtn.ToolTip = EgtMsg(90255)                          'Test
+      ResetCutBtn.ToolTip = "Reset Cuts" & vbCrLf & "Reset Feed (Shift)"
    End Sub
 
    Private Sub ProjectMgrUC_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
@@ -250,6 +252,11 @@ Public Class ProjectMgrUC
    End Sub
 
    Private Sub ResetCutBtn_Click(sender As Object, e As RoutedEventArgs) Handles ResetCutBtn.Click
+      If (Keyboard.Modifiers And ModifierKeys.Shift) Then
+         ' eseguo il ricalcolo delle sole FEED di lavorazione
+         UpdateFeedAllMachining()
+         Return
+      End If
       EgtSetCurrentContext(m_CurrProjPage.CurrentProjectScene.GetCtx())
       ' Cancello eventuali messaggi
       m_CurrProjPage.ClearMessage()
@@ -510,7 +517,6 @@ Public Class ProjectMgrUC
             ' apro la finestra con l'elenco degli sfridi
             Dim MyScrapsWD As New ScrapsWD(m_MainWindow, Me, NewScrapsList)
             MyScrapsWD.ShowDialog()
-
          End If
          ' ------------------ FINE gestione SCRAPS -----------------------------
 
@@ -580,6 +586,13 @@ Public Class ProjectMgrUC
                   EgtDraw()
                   ' Dichiaro che il progetto è nuovo
                   bAlreadySent = False
+                  ' reimposto tutti gli sfridi come nuovi sfridi
+                  Dim CurrScrapsList As New List(Of Scrap)
+                  ' procedo all'aggiornamento della lista degli sfridi
+                  UpDateScrapList(CurrScrapsList)
+                  For Each ItemScrap As Scrap In CurrScrapsList
+                     ItemScrap.ResetState()
+                  Next
                End If
             End If
             If bAlreadySent Then
@@ -590,6 +603,18 @@ Public Class ProjectMgrUC
             End If
          End If
 
+         ' ------------------ INIZIO gestione SCRAPS ---------------------------
+         Dim NewScrapsList As New List(Of Scrap)
+         ' procedo all'aggiornamento della lista degli sfridi
+         UpDateScrapList(NewScrapsList)
+         ' se esiste almeno uno sfrido da inserire come nuovo grezzo
+         If NewScrapsList.Count > 0 Then
+            ' apro la finestra con l'elenco degli sfridi
+            Dim MyScrapsWD As New ScrapsWD(m_MainWindow, Me, NewScrapsList)
+            MyScrapsWD.ShowDialog()
+         End If
+         ' ------------------ FINE gestione SCRAPS -----------------------------
+
          ' Se non collegato alla macchina
          If Not m_MainWindow.m_bNCLink Then
             ' salvo il progetto corrente incrementando il valore del progetto
@@ -711,6 +736,112 @@ Public Class ProjectMgrUC
       End While
    End Sub
 
+   Public Sub UpdateFeedAllMachining()
+      ' recupero il valore di Feed della lavorazione corrente
+      Dim sMachiningName As String = String.Empty
+      If Not EgtMdbGetCurrMachiningParam(MCH_MP.NAME, sMachiningName) Then
+         ' errore: lavorazione non trovata
+         EgtOutLog(" - Prima di 'Reset Feed' accedere alla pagina MACCHINA!")
+         'm_MainWindow.m_CurrentProjectPageUC.SetErrorMessage("Salvare la lavorazione corrente")
+         Return
+      End If
+      Dim dFeed As Double = 0
+      EgtMdbGetCurrMachiningParam(MCH_MP.FEED, dFeed)
+      Dim dFeedStarted As Double = 0
+      EgtMdbGetCurrMachiningParam(MCH_MP.STARTFEED, dFeedStarted)
+      Dim dFeedEnded As Double = 0
+      EgtMdbGetCurrMachiningParam(MCH_MP.ENDFEED, dFeedEnded)
+      Dim dFeedTipped As Double = 0
+      EgtMdbGetCurrMachiningParam(MCH_MP.TIPFEED, dFeedTipped)
+      Dim dFeedBack As Double = 0
+      EgtMdbGetCurrMachiningParam(MCH_MP.BACKFEED, dFeedBack)
+      Dim dFeedSideAng As Double = 0
+      EgtMdbGetCurrMachiningParam(MCH_MP.SIDEANGFEED, dFeedSideAng)
+      Dim MachiningList As New List(Of SplitMach)
+
+      ' Recupero l'indice della fase corrente
+      Dim nCurrPhase As Integer = 1
+      ' recupero in numero di fasi presenti nel progetto
+      Dim nCountPhase As Integer = EgtGetPhaseCount()
+      ' ciclo su tutte le fasi di lavorazione
+      Dim nMach As Integer = 0
+      Dim nMachUpdated As Integer = 0
+      For IndexPhase As Integer = 1 To nCountPhase
+         ' imposto la fase corrente
+         nCurrPhase = IndexPhase
+         ' Preparo la lista delle lavorazioni
+         CalculateSplitMachList(nCurrPhase, MachiningList)
+         ' per ogni lavorazione corrente procedo ad aggiornare la feed
+         For IndexMachining As Integer = 0 To MachiningList.Count - 1
+            nMach += 1
+            Dim nOperId As Integer = MachiningList(IndexMachining).m_nId
+            ' setto la lavorazione come corrente
+            If EgtSetCurrMachining(nOperId) Then
+               Dim bUpdate As Boolean = False
+               ' STANDARD
+               Dim dOrigFeed As Double
+               EgtGetMachiningParam(MCH_MP.FEED, dOrigFeed)
+               ' imposto il valore di Feed solo se differente da quello nuovo
+               If Math.Abs(dOrigFeed - dFeed) > 0.1 Then
+                  bUpdate = bUpdate Or EgtSetMachiningParam(MCH_MP.FEED, dFeed)
+                  ' aggiorno la lavorazione (senza il ricalcolo dell'intera lavorazione)
+                  EgtApplyMachining(True)
+               End If
+               ' STARTED
+               Dim dOrigFeedStarted As Double
+               EgtGetMachiningParam(MCH_MP.STARTFEED, dOrigFeedStarted)
+               ' imposto il valore di Feed solo se differente da quello nuovo
+               If Math.Abs(dOrigFeedStarted - dFeedStarted) > 0.1 Then
+                  bUpdate = bUpdate Or EgtSetMachiningParam(MCH_MP.STARTFEED, dFeedStarted)
+                  ' aggiorno la lavorazione (senza il ricalcolo dell'intera lavorazione)
+                  EgtApplyMachining(True)
+               End If
+               ' ENDED
+               Dim dOrigFeedEnded As Double
+               EgtGetMachiningParam(MCH_MP.ENDFEED, dOrigFeedEnded)
+               ' imposto il valore di Feed solo se differente da quello nuovo
+               If Math.Abs(dOrigFeedEnded - dFeedEnded) > 0.1 Then
+                  bUpdate = bUpdate Or EgtSetMachiningParam(MCH_MP.ENDFEED, dFeedEnded)
+                  ' aggiorno la lavorazione (senza il ricalcolo dell'intera lavorazione)
+                  EgtApplyMachining(True)
+               End If
+               ' TIPPED
+               Dim dOrigFeedTipped As Double
+               EgtGetMachiningParam(MCH_MP.TIPFEED, dOrigFeedTipped)
+               ' imposto il valore di Feed solo se differente da quello nuovo
+               If Math.Abs(dOrigFeedTipped - dFeedTipped) > 0.1 Then
+                  bUpdate = bUpdate Or EgtSetMachiningParam(MCH_MP.TIPFEED, dFeedTipped)
+                  ' aggiorno la lavorazione (senza il ricalcolo dell'intera lavorazione)
+                  EgtApplyMachining(True)
+               End If
+               ' BACK
+               Dim dOrigFeedBack As Double
+               EgtGetMachiningParam(MCH_MP.BACKFEED, dOrigFeedBack)
+               ' imposto il valore di Feed solo se differente da quello nuovo
+               If Math.Abs(dOrigFeedBack - dFeedBack) > 0.1 Then
+                  bUpdate = bUpdate Or EgtSetMachiningParam(MCH_MP.BACKFEED, dFeedBack)
+                  ' aggiorno la lavorazione (senza il ricalcolo dell'intera lavorazione)
+                  EgtApplyMachining(True)
+               End If
+               ' SIDEANG
+               Dim dOrigFeedSideAng As Double
+               EgtMdbGetCurrMachiningParam(MCH_MP.SIDEANGFEED, dOrigFeedSideAng)
+               ' imposto il valore di Feed solo se differente da quello nuovo
+               If Math.Abs(dOrigFeedBack - dFeedSideAng) > 0.1 Then
+                  bUpdate = bUpdate Or EgtSetMachiningParam(MCH_MP.SIDEANGFEED, dFeedSideAng)
+                  ' aggiorno la lavorazione (senza il ricalcolo dell'intera lavorazione)
+                  EgtApplyMachining(True)
+               End If
+               ' conto il numero di lavorazioni aggiornate
+               If bUpdate Then
+                  nMachUpdated += 1
+               End If
+            End If
+         Next
+      Next
+      m_MainWindow.m_CurrentProjectPageUC.SetInfoMessage("Lavorazione aggiornate: " & nMachUpdated & "/ " & nMach)
+   End Sub
+
    ' ------------------------------------------------ GENERA COMANDI CNC MOVIMENTO ------------------------------------------------
    Private Sub ExecuteCommandCNC(ptMid As Point3d, dAngC As Double, dAngB As Double)
 
@@ -851,6 +982,7 @@ Public Class ProjectMgrUC
       ResetCutBtn.Visibility = Windows.Visibility.Hidden
       SimulateBtn.Visibility = Windows.Visibility.Hidden
       WorkBtn.Visibility = Windows.Visibility.Hidden
+      If TestBtn.Visibility = Windows.Visibility.Visible Then TestBtn.Visibility = Windows.Visibility.Hidden
       ' Nascondo bottoni CadCutPageUC
       m_MainWindow.m_CadCutPageUC.PhotoBtn.Visibility = Windows.Visibility.Hidden
       m_MainWindow.m_CadCutPageUC.RawPartBtn.Visibility = Windows.Visibility.Hidden
@@ -866,6 +998,18 @@ Public Class ProjectMgrUC
       m_MainWindow.m_CadCutPageUC.m_NestPage.RemovePartBtn.Visibility = Windows.Visibility.Hidden
       m_MainWindow.m_CadCutPageUC.m_NestPage.SelectAllBtn.Visibility = Windows.Visibility.Hidden
       m_MainWindow.m_CadCutPageUC.m_NestPage.DeselectAllBtn.Visibility = Windows.Visibility.Hidden
+      ' nuovi bottoni pagina di Nesting
+      m_MainWindow.m_CadCutPageUC.m_NestPage.DragRettanleBtn.Visibility = Windows.Visibility.Hidden
+      If m_MainWindow.m_CadCutPageUC.m_NestPage.SplitCurveWJBtn.Visibility = Windows.Visibility.Visible Then
+         m_MainWindow.m_CadCutPageUC.m_NestPage.SplitCurveWJBtn.Visibility = Windows.Visibility.Hidden
+      End If
+      ' Nascondo bottoni rawpage
+      m_MainWindow.m_RawPartPage.OtherRefTabBtn.Visibility = Windows.Visibility.Hidden
+
+      ' Rendo visibili i bottoni per la definizione degli Spotreg
+      m_MainWindow.m_CadCutPageUC.m_NestPage.UG0_Reg.Visibility = Visibility.Visible
+      m_MainWindow.m_CadCutPageUC.m_NestPage.UG1_Reg.Visibility = Visibility.Visible
+
       ' Deseleziono tutto
       EgtDeselectAll()
       ' Se c'è la foto devo sistemare
@@ -897,6 +1041,12 @@ Public Class ProjectMgrUC
       End If
       ' Visualizzo step adatti alla scelta fatta
       m_MainWindow.m_CadCutPageUC.m_NestPage.UpdateStepsOnUI()
+
+      ' visualizzo i punti di SpotReg
+      EgtSetStatus(m_MainWindow.m_CadCutPageUC.m_NestPage.m_nRegGroupId, GDB_ST.ON_)
+      ' eventualmente risistemo tutti i punti Spotreg in funzione dell'altezza del grezzo
+      m_MainWindow.m_CadCutPageUC.m_NestPage.UpdateSpotRegistration()
+
       ' Cancello eventuali messaggi di errore/avvertimento
       m_CurrProjPage.ClearMessage()
    End Sub
@@ -926,6 +1076,7 @@ Public Class ProjectMgrUC
       m_MainWindow.m_CadCutPageUC.DrawBtn.Visibility = Windows.Visibility.Visible
       m_MainWindow.m_CadCutPageUC.ImportBtn.Visibility = Windows.Visibility.Visible
       m_MainWindow.m_CadCutPageUC.SplitBtn.Visibility = Windows.Visibility.Visible
+      If TestBtn.Visibility = Windows.Visibility.Hidden Then TestBtn.Visibility = Windows.Visibility.Visible
       ' Visualizzo bottoni nesting
       m_MainWindow.m_CadCutPageUC.m_NestPage.m_bRegister = False
       m_MainWindow.m_CadCutPageUC.m_NestPage.MaximizeMoveBtn.IsEnabled = True
@@ -935,6 +1086,22 @@ Public Class ProjectMgrUC
       m_MainWindow.m_CadCutPageUC.m_NestPage.RemovePartBtn.Visibility = Windows.Visibility.Visible
       m_MainWindow.m_CadCutPageUC.m_NestPage.SelectAllBtn.Visibility = Windows.Visibility.Visible
       m_MainWindow.m_CadCutPageUC.m_NestPage.DeselectAllBtn.Visibility = Windows.Visibility.Visible
+      ' nuovi bottoni pagina di Nesting
+      m_MainWindow.m_CadCutPageUC.m_NestPage.DragRettanleBtn.Visibility = Windows.Visibility.Visible
+      If m_MainWindow.m_CadCutPageUC.m_NestPage.SplitCurveWJBtn.Visibility = Windows.Visibility.Hidden Then
+         m_MainWindow.m_CadCutPageUC.m_NestPage.SplitCurveWJBtn.Visibility = Windows.Visibility.Visible
+      End If
+      ' disabilito i comandi per gestioen SpotReg
+      m_MainWindow.m_CadCutPageUC.m_NestPage.PointRegCheckedOff()
+      m_MainWindow.m_CadCutPageUC.m_NestPage.UG0_Reg.Visibility = Visibility.Hidden
+      m_MainWindow.m_CadCutPageUC.m_NestPage.UG1_Reg.Visibility = Visibility.Hidden
+
+      ' Nascondo bottoni rawpage
+      m_MainWindow.m_RawPartPage.OtherRefTabBtn.Visibility = Windows.Visibility.Visible
+
+      ' Nascondo i bottoni per la definizione degli Spotreg
+      m_MainWindow.m_CadCutPageUC.m_NestPage.UG0_Reg.Visibility = Visibility.Hidden
+
       ' Se c'è la foto devo sistemare
       If m_CurrProjPage.GetPhoto() <> GDB_ID.NULL Then
          ' Recupero il riferimento originale del primo grezzo
@@ -979,6 +1146,11 @@ Public Class ProjectMgrUC
       End If
       ' Visualizzo step adatti alla scelta fatta
       m_MainWindow.m_CadCutPageUC.m_NestPage.UpdateStepsOnUI()
+
+      ' nascondi i punti di SpotReg
+      EgtSetStatus(m_MainWindow.m_CadCutPageUC.m_NestPage.m_nRegGroupId, GDB_ST.OFF)
+      EgtDraw()
+
       ' Cancello eventuali messaggi di errore/avvertimento
       m_CurrProjPage.ClearMessage()
    End Sub
@@ -990,6 +1162,7 @@ Public Class Scrap
    Private m_iPictureID As Integer
    Private m_sName As String
    Private m_IdRaw As Integer
+   ' nState=1 -> da inserire in DB, nState=2 -> già inserito in DB
    Private m_nState As Integer
 
    Public Property PictureID() As Integer
@@ -1022,9 +1195,16 @@ Public Class Scrap
       End Get
    End Property
 
-   Public ReadOnly Property PictureString() As String
+   Public Sub ResetState(Optional nNewState As Integer = 1)
+      m_nState = nNewState
+      EgtSetInfo(m_IdRaw, K_ISNEWSCRAPS, nNewState)
+      EgtRemoveInfo(m_IdRaw, K_DATABASEID)
+   End Sub
+
+   Public ReadOnly Property PreviewState As System.Windows.Media.Imaging.BitmapImage
       Get
-         Return "/Resources/ImportPageListBoxImages/" + PictureID.ToString() + ".png"
+         Dim sPath As String = "/Resources/ImportPageListBoxImages/" & PictureID.ToString() & ".png"
+         Return New System.Windows.Media.Imaging.BitmapImage(New Uri(sPath, UriKind.Relative))
       End Get
    End Property
 

Project/ScrapsWD.xaml

@@ -22,10 +22,26 @@
             </Grid.RowDefinitions>
 
             <Label Name="TitleTxBl" Grid.Column="1" Grid.Row="1" Foreground="White" FontSize="20" VerticalAlignment="Center"/>
-            <ListBox Name="ScrapsListBox" Grid.Column="1" Grid.Row="2" ItemTemplate="{DynamicResource DataTemplateItem}"
-               ItemsSource="{Binding ItemList, NotifyOnSourceUpdated=True}"/>
+            <ListBox Name="ScrapsListBox" Grid.Column="1" Grid.Row="2">
+                <ListBox.ItemTemplate>
+                    <DataTemplate>
+                        <Grid Margin="0,2">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="0.5*" />
+                                <ColumnDefinition Width="1*" />
+                            </Grid.ColumnDefinitions>
+                            <Image Source="{Binding PreviewState}" VerticalAlignment="Center"
+                                   MaxWidth="50" MaxHeight="50"
+                                   Stretch="Uniform" Grid.Column="0" />
+                            <TextBlock Text="{Binding Name}" VerticalAlignment="Center"
+                                       Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"
+                                        Grid.Column="1"/>
+                        </Grid>
+                    </DataTemplate>
+                </ListBox.ItemTemplate>
+            </ListBox>
 
-            <Grid Grid.Column="1" Grid.Row="4">
+                <Grid Grid.Column="1" Grid.Row="4">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="0.1*"/>
                     <ColumnDefinition Width="1*"/>

RawPhoto/Camera.vb

@@ -205,6 +205,12 @@ Public Class Camera
       Dim nInd As Integer = 1
       If m_nCameraCount = 2 Then
          nInd = GetCurrentTable()
+         ' verifico se la macchina è configurata per fotocamera sulla tavola di lavoro
+         If (GetPrivateProfileInt(S_CAMERAHQ, K_CAMERAHQ_ENABLE, 0, m_MainWindow.GetMachIniFile()) <> 0) AndAlso
+            (GetPrivateProfileInt(S_CAMERAHQ, K_CAMERAHQ_ACTIVATE, 0, m_MainWindow.GetMachIniFile()) <> 0) Then
+            ' forzo l'utilizzo della seconda camera (sopra alla tavola di lavoro)
+            nInd = 2
+         End If
          If nInd <> 1 And nInd <> 2 Then Return 0
       End If
       ' Se gestore macchina non attivo, lo lancio in modo cieco
@@ -315,6 +321,16 @@ Public Class Camera
       GetPrivateProfileString(S_NCDATA, K_SPOTLIGHT2, "", sPLCVarSpotLight2, m_MainWindow.GetMachIniFile())
       Dim nPhotoDeley As Integer = GetPrivateProfileInt(S_NCNUM, K_PHOTODELEY, "100", m_MainWindow.GetMachIniFile())
 
+      ' eventualmente rimuovo inizio stringa: "PLC, ___"
+      Dim sItemString1() As String = Split(sPLCVarSpotLight1, ","c)
+      If sItemString1.Count > 1 Then
+         sPLCVarSpotLight1 = sItemString1(1).Trim
+      End If
+      Dim sItemString2() As String = Split(sPLCVarSpotLight2, ","c)
+      If sItemString2.Count > 1 Then
+         sPLCVarSpotLight2 = sItemString2(1).Trim
+      End If
+
       Select Case m_MainWindow.m_CNCommunication.m_nNCType
          Case 1, 2
             If m_MainWindow.m_CNCommunication.m_nNCType = 2 Then

RawPhoto/OtherRefTabWD.xaml

@@ -0,0 +1,82 @@
+<Window x:Class="OtherRefTabWD"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+   xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
+   FontFamily="{DynamicResource OmagCut_Font}"
+   ResizeMode="NoResize" WindowStyle="None" AllowsTransparency="True" Background="Transparent"
+   Title="ModifStartEndWD" Height="250" Width="320" ShowInTaskbar="False">
+
+    <!--Definizione della pagina di scelta del nome con cui salvare il progetto-->
+    <Border Style="{DynamicResource OmagCut_Border}">
+        <Grid x:Name="SaveNameGrid">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="0.2*"/>
+                <ColumnDefinition Width="2*"/>
+                <ColumnDefinition Width="2*"/>
+                <ColumnDefinition Width="0.2*"/>
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <!--<RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="1*"/>
+                    <RowDefinition Height="0.5*"/>-->
+                <RowDefinition Height="0.2*"/>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="0.2*"/>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="0.2*"/>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="0.2*"/>
+                <RowDefinition Height="1.5*"/>
+                <RowDefinition Height="0.2*"/>
+            </Grid.RowDefinitions>
+
+            <TextBlock Name="RefRawTxbl" Grid.Column="1" Grid.Row="1"
+            Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+            
+            <ComboBox Name="RefTabModeCmBx" Grid.Column="2" Grid.Row="1" Style="{StaticResource OmagCut_ComboBox}" 
+               MaxDropDownHeight="300" Margin="0,0,0,0">
+                <ComboBox.ItemTemplate>
+                    <DataTemplate>
+                        <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                    </DataTemplate>
+                </ComboBox.ItemTemplate>
+            </ComboBox>
+
+            <TextBlock Name="RefTabXTxbl" Grid.Column="1" Grid.Row="3"
+            Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+            <EgtWPFLib:EgtTextBox Name="RefTabXTxBx" Grid.Column="2" Grid.Row="3"
+            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+
+            <TextBlock Name="RefTabYTxbl" Grid.Column="1" Grid.Row="5"
+            Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+            <EgtWPFLib:EgtTextBox Name="RefTabYTxBx" Grid.Column="2" Grid.Row="5"
+            Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
+
+            <Grid Name="ButtonsGrid" Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="7" Grid.RowSpan="1">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="0.5*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="0.5*"/>
+                </Grid.ColumnDefinitions>
+
+                <Button Name="OkBtn" Grid.Column="1"
+                    Style="{DynamicResource OmagCut_GradientBlueIconButton}">
+                    <Image Source="{DynamicResource VImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+                </Button>
+                <Button Name="ExitBtn" Grid.Column="3"
+                    IsCancel="True"
+                    Style="{DynamicResource OmagCut_GradientBlueIconButton}">
+                    <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+                </Button>
+
+            </Grid>
+
+        </Grid>
+
+    </Border>
+
+</Window>

RawPhoto/OtherRefTabWD.xaml.vb

@@ -0,0 +1,108 @@
+Imports System.IO
+Imports EgtUILib
+Imports EgtWPFLib
+
+Public Class OtherRefTabWD
+   Dim m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
+   Dim m_RawPartPage As RawPartPageUC
+
+   Private m_sPosX As String = "0"
+   Private m_sPosY As String = "0"
+
+   Private m_dPrevOffsetX As Double = 0
+   Private m_dPrevOffsetY As Double = 0
+
+   Private m_SelIndex As Integer = 0
+
+   Sub New(Owner As Window, PosX As String, PosY As String, OffsetX As Double, OffsetY As Double, OtherRefMode As Integer)
+      Me.Owner = Owner
+      ' La chiamata è richiesta dalla finestra di progettazione.
+      InitializeComponent()
+
+      ' Aggiungere le eventuali istruzioni di inizializzazione dopo la chiamata a InitializeComponent().
+      m_sPosX = PosX
+      m_sPosY = PosY
+      m_dPrevOffsetX = OffsetX
+      m_dPrevOffsetY = OffsetY
+      m_SelIndex = OtherRefMode
+   End Sub
+
+   Private Sub OtherRrefTabWD_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
+      ' costruisco il riferimento alla pagina Raw
+      m_RawPartPage = m_MainWindow.m_RawPartPage
+      ' posiziono la finestra
+      Me.Top = Owner.Top + Owner.Height / 4 - Me.Height / 2
+      Me.Left = Owner.Left + Owner.Width / 6 - Me.Width / 2
+      RefRawTxbl.Text = "Raw reference"
+      RefTabXTxbl.Text = "Position X"
+      RefTabYTxbl.Text = "Position Y"
+      RefTabModeCmBx.ItemsSource = m_RawPartPage.m_OtherRefTabList
+      RefTabModeCmBx.SelectedIndex = m_RawPartPage.m_OtherRefTabPos
+   End Sub
+
+   Private Sub OtherRrefTabWD_Load(sender As Object, e As EventArgs) Handles Me.Loaded
+      RefTabXTxBx.Text = m_sPosX
+      RefTabYTxBx.Text = m_sPosY
+   End Sub
+
+   Private Sub RefTabModeCmBx_SelectionChanged(sender As Object, e As SelectionChangedEventArgs) Handles RefTabModeCmBx.SelectionChanged
+      m_RawPartPage.m_OtherRefTabPos = RefTabModeCmBx.SelectedIndex
+      WritePrivateProfileString(S_RAWPART, K_OTHERREFTABPOS, m_RawPartPage.m_OtherRefTabPos.ToString, m_MainWindow.GetIniFile())
+      m_RawPartPage.RefTabModeChange()
+   End Sub
+
+   Private Sub RefTabXTxBx_EgtClosed(sender As Object, e As EventArgs) Handles RefTabXTxBx.EgtClosed
+      Dim ptMin, ptMax As Point3d
+      If EgtGetTableArea(1, ptMin, ptMax) Then
+         Dim dX As Double = 0
+         StringToLen(RefTabXTxBx.Text, dX)
+         If Not (dX > 0 And dX < ptMax.x - ptMin.x) Then
+            If dX > 0 Then
+               dX = ptMax.x - ptMin.x
+            Else
+               dX = 0
+            End If
+            RefTabXTxBx.Text = LenToString(dX, 2)
+            ' errore, posizione fuori dalla tavola
+         End If
+         m_RawPartPage.m_OtherRefTabX = dX
+         m_RawPartPage.RefTabModeChange()
+      End If
+   End Sub
+
+   Private Sub RefTabYTxBx_EgtClosed(sender As Object, e As EventArgs) Handles RefTabYTxBx.EgtClosed
+      Dim ptMin, ptMax As Point3d
+      If EgtGetTableArea(1, ptMin, ptMax) Then
+         Dim dY As Double = 0
+         StringToLen(RefTabYTxBx.Text, dY)
+         If Not (dY > 0 And dY < ptMax.y - ptMin.y) Then
+            If dY > 0 Then
+               dY = ptMax.y - ptMin.y
+            Else
+               dY = 0
+            End If
+            RefTabYTxBx.Text = LenToString(dY, 2)
+            ' errore, posizione fuori dalla tavola
+         End If
+         m_RawPartPage.m_OtherRefTabY = dY
+         m_RawPartPage.RefTabModeChange()
+      End If
+   End Sub
+
+   Private Sub OkBtn_Click() Handles OkBtn.Click
+      WritePrivateProfileString(S_RAWPART, K_OTHERREFTABX, DoubleToString(RefTabXTxBx.Text, 2), m_MainWindow.GetIniFile())
+      WritePrivateProfileString(S_RAWPART, K_OTHERREFTABY, DoubleToString(RefTabYTxBx.Text, 2), m_MainWindow.GetIniFile())
+      WritePrivateProfileString(S_RAWPART, K_OTHERREFTABPOS, m_RawPartPage.m_OtherRefTabPos.ToString, m_MainWindow.GetIniFile())
+      Me.Close()
+   End Sub
+
+   Private Sub ExitBtn_Click() Handles ExitBtn.Click
+      ' riposiziono l'origine
+      m_RawPartPage.m_OtherRefTabX = m_sPosX
+      m_RawPartPage.m_OtherRefTabY = m_sPosY
+      ' ripristino il valore della combobox
+      m_RawPartPage.m_OtherRefTabPos = m_SelIndex
+      m_RawPartPage.RefTabModeChange()
+   End Sub
+
+End Class

RawPhoto/RawPartPageUC.xaml

@@ -6,76 +6,76 @@
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
    mc:Ignorable="d" 
    d:DesignHeight="853.3" d:DesignWidth="1280" Loaded="RawPartPage_Loaded" Initialized="RawPartPage_Initialized" Unloaded="RawPartPage_Unloaded">
-      
-   <!-- Definizione della RowPartPage -->
-   <Grid Name="RowPartPageGrid" >
-      <Grid.ColumnDefinitions>
-         <ColumnDefinition Width="3*"/>
-         <ColumnDefinition Width="12*"/>
-      </Grid.ColumnDefinitions>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="1*"/>
-         <RowDefinition Height="8*"/>
-         <RowDefinition Height="1*"/>
-      </Grid.RowDefinitions>
-      
-      <!-- Definizione della Grid superiore -->
-      <Grid Name="UpperButtonGrid" Grid.Column="1" Grid.Row="0" >
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="5*"/>
-            <ColumnDefinition Width="7*"/>
-         </Grid.ColumnDefinitions>
-         
-      </Grid>
-      
-      <!-- Definizione della Grid Laterale -->
-      <Grid Name="LeftButtonGrid" Grid.RowSpan="3">
-      
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1.5*"/>
-            <ColumnDefinition Width="1.5*"/>
-         </Grid.ColumnDefinitions>
-         <Grid.RowDefinitions>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="4*"/>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="1.5*"/>
-            <RowDefinition Height="1.*"/>
-            <RowDefinition Height="0.5*"/>
-            <RowDefinition Height="1*"/>
-         </Grid.RowDefinitions>
 
-         <RadioButton Name="OutlineBtn" Style="{DynamicResource OmagCut_YellowToggleButton}"
-               GroupName="DefinitionMethod_GrezzoUC"/>
-         <RadioButton Name="DamagedBtn" Style="{DynamicResource OmagCut_YellowToggleButton}"
-               Grid.Column="1" GroupName="DefinitionMethod_GrezzoUC"/>
+    <!-- Definizione della RowPartPage -->
+    <Grid Name="RowPartPageGrid" >
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="3*"/>
+            <ColumnDefinition Width="12*"/>
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="8*"/>
+            <RowDefinition Height="1*"/>
+        </Grid.RowDefinitions>
 
-         <!-- Definizione della Grid per definizione grezzo -->
-         <Grid Name="RawMeasureGrd" Grid.Row="1" Grid.ColumnSpan="2">
+        <!-- Definizione della Grid superiore -->
+        <Grid Name="UpperButtonGrid" Grid.Column="1" Grid.Row="0" >
             <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*"/>
-               <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="5*"/>
+                <ColumnDefinition Width="7*"/>
+            </Grid.ColumnDefinitions>
+
+        </Grid>
+
+        <!-- Definizione della Grid Laterale -->
+        <Grid Name="LeftButtonGrid" Grid.RowSpan="3">
+
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="1.5*"/>
+                <ColumnDefinition Width="1.5*"/>
             </Grid.ColumnDefinitions>
             <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="0.5*"/>
-               <RowDefinition Height="0.5*"/>
-               <RowDefinition Height="0.5*"/>
-               <RowDefinition Height="0.5*"/>
-               <RowDefinition Height="0.5*"/>
-               <RowDefinition Height="0.5*"/>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="4*"/>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="1.5*"/>
+                <RowDefinition Height="1.*"/>
+                <RowDefinition Height="0.5*"/>
+                <RowDefinition Height="1*"/>
             </Grid.RowDefinitions>
 
-            <ComboBox Name="RawModeCmBx" Grid.Row="0" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_ComboBox}" 
-               MaxDropDownHeight="300" Margin="6,0,6,0">
-               <ComboBox.ItemTemplate>
-                  <DataTemplate>
-                     <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-                  </DataTemplate>
-               </ComboBox.ItemTemplate>
-            </ComboBox>
+            <RadioButton Name="OutlineBtn" Style="{DynamicResource OmagCut_YellowToggleButton}"
+               GroupName="DefinitionMethod_GrezzoUC"/>
+            <RadioButton Name="DamagedBtn" Style="{DynamicResource OmagCut_YellowToggleButton}"
+               Grid.Column="1" GroupName="DefinitionMethod_GrezzoUC"/>
 
-            <ComboBox Name="RawModeDamagedCmBx" Grid.Row="0" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_ComboBox}" 
+            <!-- Definizione della Grid per definizione grezzo -->
+            <Grid Name="RawMeasureGrd" Grid.Row="1" Grid.ColumnSpan="2">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="1*"/>
+                    <RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="0.5*"/>
+                </Grid.RowDefinitions>
+
+                <ComboBox Name="RawModeCmBx" Grid.Row="0" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_ComboBox}" 
+               MaxDropDownHeight="300" Margin="6,0,6,0">
+                    <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                            <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                        </DataTemplate>
+                    </ComboBox.ItemTemplate>
+                </ComboBox>
+
+                <ComboBox Name="RawModeDamagedCmBx" Grid.Row="0" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_ComboBox}" 
                MaxDropDownHeight="300" Margin="6,0,6,0">
                     <ComboBox.ItemTemplate>
                         <DataTemplate>
@@ -85,114 +85,123 @@
                 </ComboBox>
 
                 <TextBlock Name="LengthTxBl" Grid.Row="1" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
-            <EgtWPFLib:EgtTextBox Name="LengthTxBx" Grid.Column="1" Grid.Row="1" Margin="13,0,6,0"
+                <EgtWPFLib:EgtTextBox Name="LengthTxBx" Grid.Column="1" Grid.Row="1" Margin="13,0,6,0"
                Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
-            <TextBlock Name="WidthTxBl" Grid.Row="2" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
-            <EgtWPFLib:EgtTextBox Name="WidthTxBx" Grid.Column="1" Grid.Row="2" Margin="13,0,6,0"
+                <TextBlock Name="WidthTxBl" Grid.Row="2" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
+                <EgtWPFLib:EgtTextBox Name="WidthTxBx" Grid.Column="1" Grid.Row="2" Margin="13,0,6,0"
                Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
-            <TextBlock Name="HeightTxBl" Grid.Row="3" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
-            <EgtWPFLib:EgtTextBox Name="HeightTxBx" Grid.Column="1" Grid.Row="3" Margin="13,0,6,0"
+                <TextBlock Name="HeightTxBl" Grid.Row="3" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
+                <EgtWPFLib:EgtTextBox Name="HeightTxBx" Grid.Column="1" Grid.Row="3" Margin="13,0,6,0"
                Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
-            <TextBlock Name="OffsetXTxBl" Grid.Row="4" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
-            <EgtWPFLib:EgtTextBox Name="OffsetXTxBx" Grid.Column="1" Grid.Row="4" Margin="13,0,6,0"
+                <TextBlock Name="OffsetXTxBl" Grid.Row="4" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
+                <EgtWPFLib:EgtTextBox Name="OffsetXTxBx" Grid.Column="1" Grid.Row="4" Margin="13,0,6,0"
                Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
-            <TextBlock Name="OffsetYTxBl" Grid.Row="5" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
-            <EgtWPFLib:EgtTextBox Name="OffsetYTxBx" Grid.Column="1" Grid.Row="5" Margin="13,0,6,0"
+                <TextBlock Name="OffsetYTxBl" Grid.Row="5" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
+                <EgtWPFLib:EgtTextBox Name="OffsetYTxBx" Grid.Column="1" Grid.Row="5" Margin="13,0,6,0"
                Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
-            <TextBlock Name="KerfTxBl" Grid.Row="6" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
-            <EgtWPFLib:EgtTextBox Name="KerfTxBx" Grid.Column="1" Grid.Row="6" Margin="13,0,6,0"
+                <TextBlock Name="KerfTxBl" Grid.Row="6" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
+                <EgtWPFLib:EgtTextBox Name="KerfTxBx" Grid.Column="1" Grid.Row="6" Margin="13,0,6,0"
                Style="{DynamicResource OmagCut_CalculatorTextBox}"/>
 
-         </Grid>
-                  
-         <!-- Definizione della Grid per il materiale -->
-         <GroupBox Name="MaterialGpBx" Grid.Row="2" Grid.ColumnSpan="2" Style="{DynamicResource OmagCut_GroupBox}">
+            </Grid>
 
-            <ComboBox Name="MaterialsCmbx" Style="{StaticResource OmagCut_ComboBox}"
+            <!-- Definizione della Grid per il materiale -->
+            <GroupBox Name="MaterialGpBx" Grid.Row="2" Grid.ColumnSpan="2" Style="{DynamicResource OmagCut_GroupBox}">
+
+                <ComboBox Name="MaterialsCmbx" Style="{StaticResource OmagCut_ComboBox}"
                MaxDropDownHeight="600">
-               <ComboBox.ItemTemplate>
-                  <DataTemplate>
-                     <TextBlock Text="{Binding sName}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-                  </DataTemplate>
-               </ComboBox.ItemTemplate>
-            </ComboBox>
+                    <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                            <TextBlock Text="{Binding sName}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                        </DataTemplate>
+                    </ComboBox.ItemTemplate>
+                </ComboBox>
 
-         </GroupBox>
+            </GroupBox>
 
-         <!-- Definizione della Grid per Punti -->
-         <GroupBox Name="PointsGpBx" Grid.Row="3" Grid.ColumnSpan="2" Style="{DynamicResource OmagCut_GroupBox}" >
+            <!-- Definizione della Grid per Punti -->
+            <GroupBox Name="PointsGpBx" Grid.Row="3" Grid.ColumnSpan="2" Style="{DynamicResource OmagCut_GroupBox}" >
 
-            <Grid >
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="1.5*"/>
-                  <ColumnDefinition Width="1.5*"/>
-               </Grid.ColumnDefinitions>
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="1*"/>
-                  <RowDefinition Height="1*"/>
-               </Grid.RowDefinitions>
+                <Grid >
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1.5*"/>
+                        <ColumnDefinition Width="1.5*"/>
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="1*"/>
+                        <RowDefinition Height="1*"/>
+                    </Grid.RowDefinitions>
 
-               <ToggleButton Name="AddBtn"
+                    <ToggleButton Name="AddBtn"
                   Style="{DynamicResource OmagCut_YellowToggleButton}"/>
-               <ToggleButton Name="RemoveBtn" Grid.Column="1"
+                    <ToggleButton Name="RemoveBtn" Grid.Column="1"
                   Style="{DynamicResource OmagCut_YellowToggleButton}"/>
-               <Button Name="CloseBtn" Grid.Row="1" Grid.ColumnSpan="2" 
+                    <Button Name="CloseBtn" Grid.Row="1" Grid.ColumnSpan="2" 
                   Style="{DynamicResource OmagCut_YellowTextButton}"/>
-            </Grid>
-            
-         </GroupBox>
+                </Grid>
 
-         <!-- Definizione della Grid per Zona rovinata -->
-         <GroupBox Name="DamagedAreaGpBx" Grid.Row="4" Grid.ColumnSpan="2" Grid.RowSpan="2" Style="{DynamicResource OmagCut_GroupBox}">
+            </GroupBox>
 
-            <Grid>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="1*"/>
-                  <ColumnDefinition Width="1*"/>
-               </Grid.ColumnDefinitions>
+            <!-- Definizione della Grid per Zona rovinata -->
+            <GroupBox Name="DamagedAreaGpBx" Grid.Row="4" Grid.ColumnSpan="2" Grid.RowSpan="2" Style="{DynamicResource OmagCut_GroupBox}">
 
-               <ToggleButton Name="NewBtn" Style="{DynamicResource OmagCut_YellowToggleButton}"/>
-               <ToggleButton Name="DeleteBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowToggleButton}"/>
-            </Grid>
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="1*"/>
+                    </Grid.ColumnDefinitions>
 
-         </GroupBox>
+                    <ToggleButton Name="NewBtn" Style="{DynamicResource OmagCut_YellowToggleButton}"/>
+                    <ToggleButton Name="DeleteBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowToggleButton}"/>
+                </Grid>
 
-         <Button Name="ConfirmPhotoBtn" Grid.Row="4" Grid.ColumnSpan="2" Visibility="Hidden" 
+            </GroupBox>
+
+            <TextBlock Name="OtherRefTabTxBl" Grid.Row="5" Grid.ColumnSpan="2" Style="{DynamicResource OmagCut_CurrProjSummeryTextBlock}"/>
+            <CheckBox Name="OtherRefTabChBx" Grid.Row="5" Grid.Column="1" Style="{StaticResource OmagCut_CheckBox}"
+                    HorizontalAlignment="Right" Margin="0,0,6,0"/>
+
+            <Button Name="ConfirmPhotoBtn" Grid.Row="4" Grid.ColumnSpan="2" Visibility="Hidden" 
             Style="{DynamicResource OmagCut_YellowTextButton}"/>
 
-      </Grid>
-      
-      <!-- Definizione della Grid Inferiore per i Button V e X -->
-      <Grid Name="LowerButtonGrid" Grid.Column="1" Grid.Row="3">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="6*"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
-         </Grid.ColumnDefinitions>
+        </Grid>
 
-         <Button Name="RawProbingBtn" Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
-            <Image Source="{DynamicResource RawProbeImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-         </Button>
+        <!-- Definizione della Grid Inferiore per i Button V e X -->
+        <Grid Name="LowerButtonGrid" Grid.Column="1" Grid.Row="3">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="5*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
 
-         <Button Name="BarCodeBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
-            <Image Source="{DynamicResource BarCodeImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-         </Button>
+            <Button Name="RawProbingBtn" Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
+                <Image Source="{DynamicResource RawProbeImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+            </Button>
 
-         <Button Name="SlabIdBtn" Grid.Column="3" Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
-            <Image Source="{DynamicResource SlabIdImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-         </Button>
+            <Button Name="BarCodeBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
+                <Image Source="{DynamicResource BarCodeImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+            </Button>
 
-         <Button Name="OkBtn" Grid.Column="5" Style="{DynamicResource OmagCut_GradientBlueIconButton}">
-            <Image Source="{DynamicResource VImg}" Width="65" Height="65" HorizontalAlignment="Center"
+            <Button Name="SlabIdBtn" Grid.Column="3" Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
+                <Image Source="{DynamicResource SlabIdImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+            </Button>
+
+            <Button Name="OtherRefTabBtn" Grid.Column="4" Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
+                <Image Source="{DynamicResource RefTabImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+            </Button>
+
+            <Button Name="OkBtn" Grid.Column="6" Style="{DynamicResource OmagCut_GradientBlueIconButton}">
+                <Image Source="{DynamicResource VImg}" Width="65" Height="65" HorizontalAlignment="Center"
             VerticalAlignment="Center" />
-         </Button>
-         
-      </Grid>
-      
-   </Grid>
-   
+            </Button>
+
+        </Grid>
+
+    </Grid>
+
 </UserControl>

RawPhoto/RawPartPageUC.xaml.vb

@@ -1,6 +1,9 @@
 Imports System.Globalization
+Imports System.IO
+Imports System.Windows.Media.Animation
 Imports EgtUILib
 Imports EgtWPFLib
+Imports Microsoft.VisualBasic.Devices
 
 Public Class RawPartPageUC
 
@@ -78,6 +81,16 @@ Public Class RawPartPageUC
    ' Costante raggio cerchietto
    Private Const RAD_CIRCLE As Double = 30
 
+   ' Riferimento grezzo
+   Private m_bEnableOtherRefTab As Boolean = False
+   Private m_bOtherRefTab As Boolean
+   Public m_OtherRefTabX As Double = 0
+   Public m_OtherRefTabY As Double = 0
+   Public m_OtherRefTabList(3) As String
+   Public m_OtherRefTabPos As Integer = 0
+   Private m_nOtherRefTabLay As Integer = GDB_ID.NULL
+   Private m_OtherRefTabPoint As Point3d
+
    ' mostra la pagina delle lavorazioni
    Private m_SmartMachiningPage As Boolean = False
 
@@ -105,6 +118,13 @@ Public Class RawPartPageUC
       FROM_SAW = 7
    End Enum
 
+   Private Enum OTHERREFMODE As Integer
+      BL = 0
+      BR = 1
+      TR = 2
+      TL = 3
+   End Enum
+
    Private Sub RawPartPage_Initialized(sender As Object, e As EventArgs)
 
       'Creazione della Page UserControl e relative impostazioni
@@ -145,6 +165,13 @@ Public Class RawPartPageUC
          ReDim Preserve m_RawModeListEx(3)
       End If
       RawModeCmBx.ItemsSource = m_RawModeList
+
+      ' Creo la lista dei riferimenti tavola 
+      m_OtherRefTabList(OTHERREFMODE.BL) = "Bottom left"
+      m_OtherRefTabList(OTHERREFMODE.BR) = "Bottom right"
+      m_OtherRefTabList(OTHERREFMODE.TR) = "Top right"
+      m_OtherRefTabList(OTHERREFMODE.TL) = "Top left"
+
       ' lista per selezione RawModeDamaged
       m_RawModeDamagedList(0) = EgtMsg(MSG_RAWPARTPAGEUC + 2)    'Per Punti
       m_RawModeDamagedList(1) = EgtMsg(MSG_RAWPARTPAGEUC + 30)   'Da Laser
@@ -184,6 +211,8 @@ Public Class RawPartPageUC
       RemoveBtn.Content = EgtMsg(MSG_RAWPARTPAGEUC + 15)        'Remove - Rimuovi
       CloseBtn.Content = EgtMsg(MSG_RAWPARTPAGEUC + 31)         'Close - Chiudi
       ConfirmPhotoBtn.Content = EgtMsg(MSG_RAWPARTPAGEUC + 24)  'Conferma
+
+      OtherRefTabTxBl.Text = "New Ref On Tab"
    End Sub
 
    Private Sub RawPartPage_Loaded(sender As Object, e As RoutedEventArgs)
@@ -277,6 +306,12 @@ Public Class RawPartPageUC
             Utility.SetBlockAndSlabNbr(sBlock, sSlabNbr)
          End If
       End If
+
+      ' Carico le info del riferimento alternativo della tavola
+      m_nOtherRefTabLay = EgtCreateGroup(GDB_ID.ROOT)
+      EgtSetLevel(m_nTempLay, GDB_LV.TEMP)
+      LoadOtherRefTab()
+
       ' Assegno dati grezzo rettangolare ai textbox
       LengthTxBx.Text = LenToString(m_RawLength, 2)
       WidthTxBx.Text = LenToString(m_RawWidth, 2)
@@ -320,6 +355,38 @@ Public Class RawPartPageUC
       Next
    End Sub
 
+   Private Sub LoadOtherRefTab()
+      m_bEnableOtherRefTab = (GetPrivateProfileInt(S_RAWPART, K_ENABLEOTHERREFTAB, 0, m_MainWindow.GetIniFile()) <> 0)
+      If Not m_bEnableOtherRefTab Then
+         OtherRefTabBtn.Visibility = Visibility.Collapsed
+         OtherRefTabChBx.Visibility = Visibility.Collapsed
+         OtherRefTabTxBl.Visibility = Visibility.Collapsed
+         Return
+      Else
+         OtherRefTabBtn.Visibility = Visibility.Visible
+      End If
+      m_bOtherRefTab = (GetPrivateProfileInt(S_RAWPART, K_OTHERREFTAB, 0, m_MainWindow.GetIniFile()) <> 0)
+      m_OtherRefTabX = GetPrivateProfileDouble(S_RAWPART, K_OTHERREFTABX, 0, m_MainWindow.GetIniFile())
+      m_OtherRefTabY = GetPrivateProfileDouble(S_RAWPART, K_OTHERREFTABY, 0, m_MainWindow.GetIniFile())
+      m_OtherRefTabPos = GetPrivateProfileInt(S_RAWPART, K_OTHERREFTABPOS, 0, m_MainWindow.GetIniFile())
+      ' RefTabPosCmbx.SelectedIndex = m_OtherRefTabPos
+      OtherRefTabChBx.IsChecked = m_bOtherRefTab
+      ' se riferimento tavola differente da quello atteso
+      If m_bOtherRefTab Then
+         ' dasibilito la modifica dei parametri di Offset
+         OffsetXTxBx.IsEnabled = False
+         OffsetYTxBx.IsEnabled = False
+         UpdateOffsetText()
+      End If
+
+      ' Rimuovo eventuali crocette create acquisendo i punti nel disegno
+      EgtEmptyGroup(m_nOtherRefTabLay)
+      ' Acquisisco punto da disegno
+      m_OtherRefTabPoint = New Point3d(m_ptTableMin.x + m_OtherRefTabX, m_ptTableMin.y + m_OtherRefTabY, m_ptTableMin.z + 0.15 + m_CurrentMachine.dAdditionalTable)
+      CreateOtherRefTab(m_nOtherRefTabLay, m_OtherRefTabPoint)
+      ' EgtDraw()
+   End Sub
+
    Private Sub OnMyMouseDownScene(sender As Object, e As System.Windows.Forms.MouseEventArgs) Handles m_CurrProjPage.OnMouseDownScene
       ' Verifico di essere il gestore attivo
       If Not m_bActive Then Return
@@ -930,6 +997,13 @@ Public Class RawPartPageUC
             ' Disattivo bottoni zone rovinate
             DamagedAreaGpBx.Visibility = Windows.Visibility.Hidden
             ConfirmPhotoBtn.Visibility = Windows.Visibility.Hidden
+            If m_bEnableOtherRefTab Then
+               OtherRefTabChBx.IsEnabled = True
+               OtherRefTabBtn.IsEnabled = True
+               ' disegno il riferimento
+               m_OtherRefTabPoint = New Point3d(m_ptTableMin.x + m_OtherRefTabX, m_ptTableMin.y + m_OtherRefTabY, m_ptTableMin.z + 0.15 + m_CurrentMachine.dAdditionalTable)
+               CreateOtherRefTab(m_nOtherRefTabLay, m_OtherRefTabPoint)
+            End If
          Case RAWMODE.BY_POINTS
             RawModeCmBx.IsEnabled = True
             RawModeDamagedCmBx.Visibility = Visibility.Collapsed
@@ -946,6 +1020,12 @@ Public Class RawPartPageUC
             ' Disattivo bottoni zone rovinate e foto
             DamagedAreaGpBx.Visibility = Windows.Visibility.Hidden
             ConfirmPhotoBtn.Visibility = Windows.Visibility.Hidden
+            ' disettivo la possibilità di modificare il riferimento 
+            If m_bEnableOtherRefTab Then
+               OtherRefTabChBx.IsEnabled = False
+               OtherRefTabBtn.IsEnabled = False
+               EgtEmptyGroup(m_nOtherRefTabLay)
+            End If
          Case RAWMODE.FROM_LASER
             RawModeCmBx.IsEnabled = True
             RawModeDamagedCmBx.Visibility = Visibility.Collapsed
@@ -962,6 +1042,11 @@ Public Class RawPartPageUC
             ' Disattivo bottoni zone rovinate e foto
             DamagedAreaGpBx.Visibility = Windows.Visibility.Hidden
             ConfirmPhotoBtn.Visibility = Windows.Visibility.Hidden
+            If m_bEnableOtherRefTab Then
+               OtherRefTabChBx.IsEnabled = False
+               OtherRefTabBtn.IsEnabled = False
+               EgtEmptyGroup(m_nOtherRefTabLay)
+            End If
          Case RAWMODE.DAMAGED
             RawModeCmBx.IsEnabled = False
             RawModeDamagedCmBx.Visibility = Visibility.Visible
@@ -980,6 +1065,11 @@ Public Class RawPartPageUC
             DamagedAreaGpBx.Visibility = Windows.Visibility.Visible
             ' Disattivo bottoni foto
             ConfirmPhotoBtn.Visibility = Windows.Visibility.Hidden
+            If m_bEnableOtherRefTab Then
+               OtherRefTabChBx.IsEnabled = False
+               OtherRefTabBtn.IsEnabled = False
+               EgtEmptyGroup(m_nOtherRefTabLay)
+            End If
          Case RAWMODE.FROM_PHOTO
             RawModeCmBx.IsEnabled = True
             RawModeDamagedCmBx.Visibility = Visibility.Collapsed
@@ -992,6 +1082,11 @@ Public Class RawPartPageUC
             DamagedAreaGpBx.Visibility = Windows.Visibility.Hidden
             ' Visualizzo bottoni foto
             ConfirmPhotoBtn.Visibility = Windows.Visibility.Visible
+            If m_bEnableOtherRefTab Then
+               OtherRefTabChBx.IsEnabled = False
+               OtherRefTabBtn.IsEnabled = False
+               EgtEmptyGroup(m_nOtherRefTabLay)
+            End If
          Case RAWMODE.DAMAGED_BY_LASER
             RawModeCmBx.IsEnabled = True
             RawModeDamagedCmBx.Visibility = Visibility.Visible
@@ -1008,6 +1103,11 @@ Public Class RawPartPageUC
             ' Disattivo bottoni zone rovinate e foto
             DamagedAreaGpBx.Visibility = Windows.Visibility.Hidden
             ConfirmPhotoBtn.Visibility = Windows.Visibility.Hidden
+            If m_bEnableOtherRefTab Then
+               OtherRefTabChBx.IsEnabled = False
+               OtherRefTabBtn.IsEnabled = False
+               EgtEmptyGroup(m_nOtherRefTabLay)
+            End If
          Case RAWMODE.DAMAGED_BY_SAW
             RawModeCmBx.IsEnabled = True
             RawModeDamagedCmBx.Visibility = Visibility.Visible
@@ -1024,6 +1124,11 @@ Public Class RawPartPageUC
             ' Disattivo bottoni zone rovinate e foto
             DamagedAreaGpBx.Visibility = Windows.Visibility.Hidden
             ConfirmPhotoBtn.Visibility = Windows.Visibility.Hidden
+            If m_bEnableOtherRefTab Then
+               OtherRefTabChBx.IsEnabled = False
+               OtherRefTabBtn.IsEnabled = False
+               EgtEmptyGroup(m_nOtherRefTabLay)
+            End If
          Case RAWMODE.FROM_SAW
             RawModeCmBx.IsEnabled = True
             RawModeDamagedCmBx.Visibility = Visibility.Collapsed
@@ -1040,11 +1145,26 @@ Public Class RawPartPageUC
             ' Disattivo bottoni zone rovinate e foto
             DamagedAreaGpBx.Visibility = Windows.Visibility.Hidden
             ConfirmPhotoBtn.Visibility = Windows.Visibility.Hidden
+            If m_bEnableOtherRefTab Then
+               OtherRefTabChBx.IsEnabled = False
+               OtherRefTabBtn.IsEnabled = False
+               EgtEmptyGroup(m_nOtherRefTabLay)
+            End If
       End Select
+      ' se abilitato nuovo riferimento del grezzo disabilito le text per offset
+      If OtherRefTabChBx.IsChecked Then
+         OffsetXTxBx.IsEnabled = False
+         OffsetYTxBx.IsEnabled = False
+      End If
    End Sub
 
    Private Sub OutlineBtn_Click(sender As Object, e As RoutedEventArgs) Handles OutlineBtn.Click
       If m_ActiveRawMode = RAWMODE.DAMAGED Or m_ActiveRawMode = RAWMODE.DAMAGED_BY_LASER Or m_ActiveRawMode = RAWMODE.DAMAGED_BY_SAW Then
+         If m_bEnableOtherRefTab Then
+            OtherRefTabTxBl.Visibility = Visibility.Visible
+            OtherRefTabBtn.Visibility = Visibility.Visible
+            OtherRefTabChBx.Visibility = Visibility.Visible
+         End If
          ' m_ActiveRawMode = RAWMODE.BY_POINTS
          m_ActiveRawMode = m_PrecActiveRawMode
          RawModeCmBx.SelectedIndex = m_ActiveRawMode
@@ -1055,6 +1175,12 @@ Public Class RawPartPageUC
    End Sub
 
    Private Sub DamagedBtn_Click(sender As Object, e As RoutedEventArgs) Handles DamagedBtn.Click
+      If m_bEnableOtherRefTab Then
+         OtherRefTabTxBl.Visibility = Visibility.Hidden
+         OtherRefTabBtn.Visibility = Visibility.Hidden
+         OtherRefTabChBx.Visibility = Visibility.Hidden
+         OtherRefTabBtn.IsEnabled = False
+      End If
       m_PrecActiveRawMode = m_ActiveRawMode
       If m_PrecActiveRawMode = RAWMODE.FROM_LASER Then
          m_ActiveRawMode = RAWMODE.DAMAGED_BY_LASER
@@ -1296,7 +1422,7 @@ Public Class RawPartPageUC
       Dim nExit As Integer = 0
       EgtGetCalcTool(sTool, sHead, nExit)
       ' Imposto come testa corrente il laser (senza utensile ovviamente)
-      If Not EgtSetCalcTool("", "H3", 1) Then
+      If Not EgtSetCalcTool("", LASER_HEAD, 1) Then
          Return False
       End If
       ' Trasformo in posizione punta utensile in basso
@@ -1308,6 +1434,10 @@ Public Class RawPartPageUC
       ' Porto il tip nell'origine tavola
       ptAcquired = ptTipP1
       ptAcquired.ToLoc(New Frame3d(m_ptTableMin))
+      EgtOutLog("Actual axis laser H3: L1=" & dL1.ToString & ", L2=" & dL2.ToString & ", L3=" & dL3.ToString &
+                   ", R1=" & dR1.ToString & ", R2=" & dR2.ToString)
+      EgtOutLog("Actual pos  laser H3: " & ptTipP1.x.ToString & "," & ptTipP1.y.ToString & "," & ptTipP1.z.ToString &
+                "; on table: " & ptAcquired.x.ToString & "," & ptAcquired.y.ToString & "," & ptAcquired.z.ToString)
       Return True
    End Function
 
@@ -1325,6 +1455,8 @@ Public Class RawPartPageUC
       EgtGetCalcTool(sTool, sHead, nExit)
       ' Trasformo in posizione punta utensile in basso
       If Not EgtGetCalcTipFromPositions(dL1, dL2, dL3, dR1, dR2, True, ptTipP1) Then
+         EgtOutLog("Actual pos " & sHead & ": L1=" & dL1.ToString & ", L2=" & dL2.ToString & ", L3=" & dL3.ToString &
+                   ", R1=" & dR1.ToString & ", R2=" & dR2.ToString)
          Return False
       End If
       ' Porto il tip nell'origine tavola
@@ -1843,6 +1975,7 @@ Public Class RawPartPageUC
          WidthTxBx.Text = LenToString(m_RawWidth, 2)
          m_CurrProjPage.SetErrorMessage(EgtMsg(MSG_RAWPARTPAGEUC + 17) & " " & LenToString(dMaxWidth, 2))   'Massima larghezza =
       End If
+      RefTabModeChange()
    End Sub
 
    Private Sub HeightTxBx_EgtClosed(sender As Object, e As EventArgs) Handles HeightTxBx.EgtClosed
@@ -1872,6 +2005,7 @@ Public Class RawPartPageUC
          HeightTxBx.Text = LenToString(m_RawHeight, 3)
          m_CurrProjPage.SetErrorMessage(EgtMsg(MSG_RAWPARTPAGEUC + 18)) 'Non sono ammessi spessori negativi
       End If
+      RefTabModeChange()
    End Sub
 
    Private Sub OffsetXTxBx_EgtClosed(sender As Object, e As EventArgs) Handles OffsetXTxBx.EgtClosed
@@ -1918,6 +2052,109 @@ Public Class RawPartPageUC
       End If
    End Sub
 
+#Region "OTHERREFTAB"
+
+   Private Sub OtherRefTabChBx_Click(sender As Object, e As EventArgs) Handles OtherRefTabChBx.Click
+      If OtherRefTabChBx.IsChecked Then
+         m_bOtherRefTab = True
+         MoveRawToOtherRefTab()
+      Else
+         m_bOtherRefTab = False
+         'MoveRawToMaiRefTab()
+      End If
+      UpdateOffsetText()
+      RawModeView()
+      WritePrivateProfileString(S_RAWPART, K_OTHERREFTAB, If(m_bOtherRefTab, "1", "0"), m_MainWindow.GetIniFile())
+   End Sub
+
+   Public Sub RefTabModeChange()
+      If Not m_bOtherRefTab Then Return
+      MoveRawToMaiRefTab()
+      MoveRawToOtherRefTab()
+      UpdateRefTabDraw()
+      UpdateOffsetText()
+   End Sub
+
+   Public Sub UpdateRefTabDraw()
+      ' Rimuovo eventuali crocette create acquisendo i punti nel disegno
+      EgtEmptyGroup(m_nOtherRefTabLay)
+      ' Acquisisco punto da disegno
+      m_OtherRefTabPoint = New Point3d(m_ptTableMin.x + m_OtherRefTabX, m_ptTableMin.y + m_OtherRefTabY, m_ptTableMin.z + 0.15)
+      CreateOtherRefTab(m_nOtherRefTabLay, m_OtherRefTabPoint)
+      EgtDraw()
+   End Sub
+
+   Private Sub UpdateOffsetText()
+      Dim ptRawMin, ptRawMax As Point3d
+      Dim dInvertKerf As Double = 1
+      If GetRawBox(ptRawMin, ptRawMax) Then
+         ' kerf
+         EgtGetInfo(EgtGetFirstRawPart(), KEY_KERF, m_RawKerf)
+         ' verifico se il kerf è negativo
+         EgtGetInfo(EgtGetFirstRawPart(), KEY_INVERT_KERF, dInvertKerf)
+         ' aggiorno dati grezzo
+         If dInvertKerf < 0 Then
+            m_RawOffsX = ptRawMin.x - m_ptTableMin.x
+            m_RawOffsY = ptRawMin.y - m_ptTableMin.y
+         Else
+            m_RawOffsX = ptRawMin.x - m_ptTableMin.x + m_RawKerf * dInvertKerf
+            m_RawOffsY = ptRawMin.y - m_ptTableMin.y + m_RawKerf * dInvertKerf
+         End If
+         OffsetXTxBx.Text = LenToString(m_RawOffsX, 2)
+         OffsetYTxBx.Text = LenToString(m_RawOffsY, 2)
+      End If
+   End Sub
+
+   Private Sub MoveRawToOtherRefTab()
+      Dim dKerf As Double = 0
+      StringToLen(KerfTxBx.Text, dKerf)
+      Select Case m_OtherRefTabPos
+         Case OTHERREFMODE.BL
+            m_RawOffsX = m_OtherRefTabX + If((dKerf < 0), -dKerf, dKerf)
+            m_RawOffsY = m_OtherRefTabY + If((dKerf < 0), -dKerf, dKerf)
+         Case OTHERREFMODE.BR
+            m_RawOffsX = m_OtherRefTabX - m_RawLength - If((dKerf < 0), -dKerf, dKerf)
+            m_RawOffsY = m_OtherRefTabY + If((dKerf < 0), -dKerf, dKerf)
+         Case OTHERREFMODE.TR
+            m_RawOffsX = m_OtherRefTabX - m_RawLength - If((dKerf < 0), -dKerf, dKerf)
+            m_RawOffsY = m_OtherRefTabY - m_RawWidth - If((dKerf < 0), -dKerf, dKerf)
+         Case OTHERREFMODE.TL
+            m_RawOffsX = m_OtherRefTabX + If((dKerf < 0), -dKerf, dKerf)
+            m_RawOffsY = m_OtherRefTabY - m_RawWidth - If((dKerf < 0), -dKerf, dKerf)
+         Case Else
+      End Select
+      UpdateRawPart()
+   End Sub
+
+   Private Sub MoveRawToMaiRefTab()
+      Dim dKerf As Double = 0
+      StringToLen(KerfTxBx.Text, dKerf)
+      Select Case m_OtherRefTabPos
+         Case OTHERREFMODE.BR
+            m_RawOffsX = If((dKerf < 0), 0, dKerf)
+            m_RawOffsY = If((dKerf < 0), 0, dKerf)
+         Case OTHERREFMODE.BL
+            m_RawOffsX = If((dKerf < 0), 0, dKerf)
+            m_RawOffsY = If((dKerf < 0), 0, dKerf)
+         Case OTHERREFMODE.TL
+            m_RawOffsX = If((dKerf < 0), 0, dKerf)
+            m_RawOffsY = If((dKerf < 0), 0, dKerf)
+         Case OTHERREFMODE.TR
+            m_RawOffsX = If((dKerf < 0), 0, dKerf)
+            m_RawOffsY = If((dKerf < 0), 0, dKerf)
+         Case Else
+      End Select
+      UpdateRawPart()
+   End Sub
+
+   Private Sub OtherRefTabBtn_Click(sender As Object, e As EventArgs) Handles OtherRefTabBtn.Click
+      ' apro la finestra per gestire il riferimento
+      Dim OthWD As New OtherRefTabWD(m_MainWindow, LenToString(m_OtherRefTabX, 2), LenToString(m_OtherRefTabY, 2), m_RawOffsX, m_RawOffsY, m_OtherRefTabPos)
+      OthWD.ShowDialog()
+   End Sub
+
+#End Region    ' OtherRefTab
+
    Private Sub KerfTxBx_EgtClosed(sender As Object, e As EventArgs) Handles KerfTxBx.EgtClosed
       Dim dKerf As Double
       If Not StringToLen(KerfTxBx.Text, dKerf) Then
@@ -1960,6 +2197,8 @@ Public Class RawPartPageUC
          Else
             CreateRawFromPhotoContour()
          End If
+         ' Forzo il riposizionamento del grezzo
+         RefTabModeChange()
          ' Ridisegno
          EgtDraw()
       ElseIf dKerf >= dMinKerf And dKerf < 0 Then
@@ -2022,6 +2261,8 @@ Public Class RawPartPageUC
          Else
             CreateRawFromPhotoContour()
          End If
+         ' Forzo il riposizionamento del grezzo
+         RefTabModeChange()
          ' Ridisegno
          EgtDraw()
       ElseIf dKerf < dMinKerf Then
@@ -2267,6 +2508,7 @@ Public Class RawPartPageUC
    Private Sub RawPartPage_Unloaded(sender As Object, e As RoutedEventArgs)
       ' Rimuovo layer temporaneo per crocette
       EgtErase(m_nTempLay)
+      EgtErase(m_nOtherRefTabLay)
       ' Dichiaro pagina non attiva
       m_bActive = False
    End Sub
@@ -2582,4 +2824,44 @@ Public Class RawPartPageUC
       Return True
    End Function
 
+   Private Function CreateOtherRefTab(nLayerId As Integer, ptP As Point3d) As Boolean
+      EgtEmptyGroup(m_nOtherRefTabLay)
+      If Not m_bOtherRefTab Or Not OtherRefTabChBx.IsEnabled Then
+         EgtDraw()
+         Return False
+      End If
+
+      If File.Exists(m_MainWindow.GetResourcesDir() & "\" & "RefTabBL.nge") Then
+         ' Aggiungo disegno staffa fermo pezzo
+         EgtInsertFile(m_MainWindow.GetResourcesDir() & "\" & "RefTabBL.nge")
+         Dim nLastPart As Integer = EgtGetLastPart()
+         Dim Lay As Integer = EgtGetFirstInGroup(nLastPart)
+         Dim Ent As Integer = EgtGetFirstInGroup(Lay)
+         While Ent <> -1
+            Dim NextEnt As Integer = EgtGetNext(Ent)
+            EgtRelocate(Ent, nLayerId)
+            EgtMove(Ent, ptP - Point3d.ORIG)
+            EgtRotate(Ent, ptP, Vector3d.Z_AX, 90 * m_OtherRefTabPos)
+            Ent = NextEnt
+         End While
+         EgtErase(nLastPart)
+      Else
+         ' Aggiungo crocette
+         ptP += New Vector3d(0, 0, 0.15)
+         Dim vtCrossX As New Vector3d(100, 0, 0)
+         Dim vtCrossY As New Vector3d(0, 100, 0)
+         Dim vtCrossZ As New Vector3d(0, 0, 100)
+         Dim nCrossId1 = EgtCreateLine(nLayerId, ptP, ptP + vtCrossX)
+         EgtSetColor(nCrossId1, New Color3d(245, 0, 0))
+         Dim nCrossId2 = EgtCreateLine(nLayerId, ptP, ptP + vtCrossY)
+         EgtSetColor(nCrossId2, New Color3d(0, 245, 0))
+         Dim nCrossId3 = EgtCreateLine(nLayerId, ptP, ptP + vtCrossZ)
+         EgtSetColor(nCrossId3, New Color3d(0, 0, 245))
+      End If
+
+      EgtDraw()
+      'EgtSaveFile("C:\EgtData\OmagCUT\Temp\MyTest.nge", NGE.BIN)
+      Return True
+   End Function
+
 End Class

Simulation/SimulationPageUC.xaml

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

Simulation/SimulationPageUC.xaml.vb

@@ -77,7 +77,7 @@ 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
+      ' abilito la visualizzazione del pulsante per la generazione del codice CN (se previsto)
       If GetPrivateProfileInt(S_GENERAL, K_GENERATECN, 0, m_MainWindow.GetIniFile()) <> 0 Then
          GenerateCN_Btn.Visibility = Visibility.Visible
       Else
@@ -535,7 +535,7 @@ Public Class SimulationPageUC
       End If
    End Sub
 
-   Private Sub ExitBtnUC_Click(sender As Object, e As RoutedEventArgs)
+   Private Sub ExitBtn_Click(sender As Object, e As RoutedEventArgs)
       ' Mi assicuro di terminare la simulazione
       ResetSimulation()
       ' Nascondo tutte le lavorazioni
@@ -566,62 +566,23 @@ Public Class SimulationPageUC
 
    End Sub
 
-   Private Sub GenerateXPIUC_Click(sender As Object, e As RoutedEventArgs)
-      ' eventualmente fermo la simulazione
+   Private Sub GenerateCN_Click(sender As Object, e As RoutedEventArgs)
+      ' Se il bottone Shift è premuto apro il file CadCut1 nel programma NotePad
+      Dim IsPressedShiftKey As Boolean = False
+      If Keyboard.Modifiers And ModifierKeys.Shift Then IsPressedShiftKey = True
+
+      ' Eventualmente fermo la simulazione
       m_nStatus = MCH_SIM_ST.UI_STOP
       m_bPlay = False
       PlayPauseBtn_Click(Nothing, Nothing)
 
-      ' se il bottone Shift è premuto apro il file CadCut1 nel programma NotePad
-      Dim IsPressedShiftKey As Boolean = False
-      If Keyboard.Modifiers And ModifierKeys.Shift Then
-         IsPressedShiftKey = True
-      End If
-      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 : ... 
+      ' Se versione ufficio non genero
+      If m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.OFFICE_TYPE) Then
+         m_CurrProjPage.SetWarningMessage("Office Version")
          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()
+
+      EgtSetCurrentContext(m_CurrProjPage.CurrentProjectScene.GetCtx())
       ' Inserisco indice di progetto
       m_CurrProjPage.SetProjectIndexFlag()
       ' Inserisco il materiale
@@ -631,45 +592,22 @@ Public Class SimulationPageUC
       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
+
+      ' Nome e path del file CN da generare
+      Dim sFileName As String = ""
+      ' Se in Tagli Diretti
+      If m_MainWindow.DirectCutBtn.IsChecked And Not m_MainWindow.CadCutBtn.IsChecked Then
+         sFileName = "DirectCut"
+      ' Altrimenti in Tagli Cad
+      Else
+         Dim nIndexTab As Integer = CamAuto.GetCurrentTable()
+         Dim sIndexTab As String = If( nIndexTab > 0, nIndexTab.ToString, "")
+         sFileName = "CadCut" & sIndexTab
       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
+
+      ' Genero file CNC
+      Dim bOk As Boolean = EgtGenerate(sCncPath, "OmagCut ver." & m_MainWindow.GetVersion())
       ' Costringo ad aggiornare UI
       UpdateUI()
       ' Ripristino come fase corrente quella iniziale
@@ -679,7 +617,7 @@ Public Class SimulationPageUC
       Else
          m_CurrProjPage.SetErrorMessage(EgtMsg(90314))       'Errore nella generazione del programma CN
       End If
-      ' procedo all'apertura del file CadCut1 apenna generato (solo se generazione corretta)
+      ' procedo all'apertura del file CadCut1 appena generato (solo se generazione corretta)
       If bOk And IsPressedShiftKey Then
          Try
             Process.Start("Notepad.exe", sCncPath)

VeinMatching/VeinMatchingWindow.xaml.vb

@@ -4,6 +4,7 @@ Imports System.Collections.ObjectModel
 Imports System.Runtime.InteropServices
 Imports EgtUILib
 Imports EgtWPFLib
+Imports OmagCUT.VeinMatchingWindow
 
 Public Class VeinMatchingWindow
 
@@ -19,6 +20,11 @@ Public Class VeinMatchingWindow
    Private m_nIdToSel As Integer = GDB_ID.NULL
    Private m_nIdToDesel As Integer = GDB_ID.NULL
 
+   Enum ALETTE
+      F = 2
+      A = 1
+   End Enum
+
    Private Sub Window_Initialized(sender As Object, e As EventArgs)
       ' Assegnazione scena all'host e posizionamento nella PlacePageGrid
       VeinMatchingSceneHost.Child = VeinMatchingScene
@@ -267,7 +273,7 @@ Friend Module VeinMatching
       Dim nRegId As Integer = EgtGetFirstInGroup(nRegLayId)
       While nRegId <> GDB_ID.NULL
          If EgtGetType(nRegId) = GDB_TY.SRF_FRGN Then
-               Exit While
+            Exit While
          End If
          nRegId = EgtGetNext(nRegId)
       End While
@@ -364,19 +370,21 @@ Friend Module VeinMatching
       ' Imposto il contesto del progetto
       EgtSetCurrentContext(m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene.GetCtx())
       ' Riattivo il gruppo di lavoro
-      EgtSetCurrMachGroup( EgtGetFirstMachGroup())
+      EgtSetCurrMachGroup(EgtGetFirstMachGroup())
       ' Verifico quali pezzi sono nel grezzo, per dichiararlo al VM
-      nId = EgtGetFirstPartInRawPart( CamAuto.GetCurrentRaw())
+      nId = EgtGetFirstPartInRawPart(CamAuto.GetCurrentRaw())
       While nId <> GDB_ID.NULL
          ' Dichiaro pezzo nel grezzo per VM
-         VeinMatching.OnInsertPartInRaw( nId)
+         VeinMatching.OnInsertPartInRaw(nId)
          ' Passo al pezzo successivo
          nId = EgtGetNextPartInRawPart(nId)
       End While
       ' Ripristino visualizzazione di eventuali pezzi in parcheggio
       ShowParkedParts()
       ' Ripristino il contesto corrente
-      EgtSetCurrentContext( nCurrCtx)
+      EgtSetCurrentContext(nCurrCtx)
+
+      ' EgtSaveFile("C:\EgtData\OmagCUT\Temp\MyVeinMatch.nge", NGE.TEXT)
       Return True
    End Function
 
@@ -422,11 +430,11 @@ Friend Module VeinMatching
       nCurrId = EgtGetFirstNameInGroup(nVeinId2, NAME_PREVIEW)
       EgtSetStatus(nCurrId, GDB_ST.OFF)
       ' Se esiste OutLoop.orig OutLoop -> OutLoop.mach e OutLoop.orig -> OutLoop
-      Dim nOutLoopOrig As Integer = EgtGetFirstNameInGroup( nVeinId2, NAME_OUTLOOP & ".orig")
+      Dim nOutLoopOrig As Integer = EgtGetFirstNameInGroup(nVeinId2, NAME_OUTLOOP & ".orig")
       If nOutLoopOrig <> GDB_ID.NULL Then
-         Dim nOutLoop As Integer = EgtGetFirstNameInGroup( nVeinId2, NAME_OUTLOOP)
-         EgtSetName( nOutLoop, NAME_OUTLOOP & ".mach")
-         EgtSetName( nOutLoopOrig, NAME_OUTLOOP)
+         Dim nOutLoop As Integer = EgtGetFirstNameInGroup(nVeinId2, NAME_OUTLOOP)
+         EgtSetName(nOutLoop, NAME_OUTLOOP & ".mach")
+         EgtSetName(nOutLoopOrig, NAME_OUTLOOP)
       End If
       ' Se necessario, ripristino il contesto originale
       If nCurrCtx > 0 Then EgtSetCurrentContext(nCurrCtx)
@@ -555,8 +563,8 @@ Friend Module VeinMatching
 
          ' Se richiesto, eseguo deselezione
          If bDeselect Then EgtDeselectObj(nId)
-         End If
-         EgtDraw()
+      End If
+      EgtDraw()
       EgtSetCurrentContext(nMainCtx)
       Return True
    End Function
@@ -1039,37 +1047,44 @@ Friend Module VeinMatching
    End Function
 
    Friend Function MoveAlettaSolid(ByRef Item As Aletta, ByRef ThicknessRaw As Double) As Boolean
-
+      ' A: alzatina, F: frontalino
       Dim nType As Integer
       If Not EgtGetInfo(Item.IdSideRef, "AF", nType) Then Return False
 
-      Dim ptSRef, ptERef, ptE As Point3d
+      Dim ptSRef, ptERef, ptS, ptE As Point3d
+      ' Piano cucina
       If Not EgtStartPoint(Item.IdSideRef, GDB_ID.ROOT, ptSRef) Then Return False
       If Not EgtEndPoint(Item.IdSideRef, GDB_ID.ROOT, ptERef) Then Return False
+      ' AlzFront
+      If Not EgtStartPoint(Item.SideId, GDB_ID.ROOT, ptS) Then Return False
       If Not EgtEndPoint(Item.SideId, GDB_ID.ROOT, ptE) Then Return False
 
+      ' vettore lato cucina
+      Dim vtRotRef As Vector3d = ptERef - ptSRef
+      ' vettore lato AlzFront
+      Dim vtRot As Vector3d = ptE - ptS
+
       ' ruoto il solido intorno al lato di riferimento
-      Dim vtRot As Vector3d = ptERef - ptSRef
-      If nType = 1 Then
-         EgtRotate(Item.PartId, ptE, vtRot, -90, GDB_RT.GLOB)
-      ElseIf nType = 2 Then
+      If nType = ALETTE.A Then
          EgtRotate(Item.PartId, ptE, vtRot, 90, GDB_RT.GLOB)
+      ElseIf nType = ALETTE.F Then
+         EgtRotate(Item.PartId, ptE, vtRot, -90, GDB_RT.GLOB)
       End If
 
       ' punto di riferimento per la traslazione sul solido
       Dim ptSolid As Point3d
-      If nType = 1 Then
+      If nType = ALETTE.A Then
          ' cerco id della curva che definisce la front face
          Dim nSolidGrp As Integer = EgtGetFirstNameInGroup(Item.PartId, NAME_VM_SOLID)
          Dim nFrontCrvId As Integer = EgtGetFirstInGroup(nSolidGrp)
-         EgtStartPoint(nFrontCrvId, ptSolid)
-      ElseIf nType = 2 Then
-         EgtStartPoint(Item.SideId, ptSolid)
+         EgtStartPoint(nFrontCrvId, GDB_ID.ROOT, ptSolid)
+      ElseIf nType = ALETTE.F Then
+         EgtStartPoint(Item.SideId, GDB_ID.ROOT, ptSolid)
       End If
 
-      Dim ItemFrame As New Frame3d
-      If Not EgtGetGroupGlobFrame(Item.PartId, ItemFrame) Then Return False
-      ptSolid.ToGlob(ItemFrame)
+      ' Dim ItemFrame As New Frame3d
+      ' If Not EgtGetGroupGlobFrame(Item.PartId, ItemFrame) Then Return False
+      ' ptSolid.ToGlob(ItemFrame)
 
       'punto di riferimento per la traslazione sul piano cucina
       Dim ptKitchen As Point3d = ptERef
@@ -1077,6 +1092,16 @@ Friend Module VeinMatching
       Dim vtMove As Vector3d = ptKitchen - ptSolid
       EgtMove(Item.PartId, vtMove, GDB_RT.GLOB)
 
+      ' eventualmente ruoto per allineare l'alzatina al piano cucina
+      Dim dLRef, dAngVRef, dAngHRef As Double
+      vtRotRef.ToSpherical(dLRef, dAngVRef, dAngHRef)
+      Dim dL, dAngV, dAngH As Double
+      vtRot.Rotate(Vector3d.Z_AX, 180)
+      vtRot.ToSpherical(dL, dAngV, dAngH)
+      Dim dDelta As Double = dAngHRef - dAngH
+      If Math.Abs(dDelta) < EPS_ANG_SMALL Then Return True
+      EgtRotate(Item.PartId, ptKitchen, Vector3d.Z_AX, dDelta, GDB_RT.GLOB)
+
       Return True
    End Function
 
@@ -1206,7 +1231,7 @@ Friend Module VeinMatching
       ' Se necessario, cambio contesto
       If m_nVeinCtx <> nCurrCtx Then
          If EgtSetCurrentContext(m_nVeinCtx) Then
-            Return If( nCurrCtx > 0, nCurrCtx, -2)
+            Return If(nCurrCtx > 0, nCurrCtx, -2)
          Else
             Return 0
          End If
@@ -1268,7 +1293,7 @@ Friend Module VeinMatching
       While nId <> GDB_ID.NULL
          Dim nOriId As Integer
          If EgtGetInfo(nId, KEY_ORI_ID, nOriId) AndAlso nOriId = nPartId Then
-               Exit While
+            Exit While
          End If
          nId = EgtGetNextPart(nId)
       End While