Migliorata gestione uscita dalla pagina DirecCUT

- migliorati controlli per chiave di rete.

CadCuts/MoveRawPartPage.xaml

@@ -159,9 +159,11 @@
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="10*"/>
          </Grid.ColumnDefinitions>
-
-
-      </Grid>
+            <!-- Inserimento della pausa durante il movimento sulla tavola di scarico-->
+            <Button Name="PauseBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
+                <Image Source="{DynamicResource Pausa-ON_OFFImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+            </Button>
+        </Grid>
 
    </Grid>
 

CadCuts/MoveRawPartPage.xaml.vb

@@ -11,8 +11,12 @@ Public Class MoveRawPartPage
    Private m_nAuxTabId As Integer = GDB_ID.NULL
    ' Fase corrente
    Private m_nCurrPhase As Integer = 0
+   ' Disposizione corrente
+   Private m_nCurrDisposition As Integer = GDB_ID.NULL
    ' Premuto Prev
    Private m_bPrev As Boolean = False
+   ' Pemuto Next
+   Private m_bToNext As Boolean = False
    ' Dati movimento
    Private m_dStep As Double = 0
    Private m_dRotation As Double = 0
@@ -27,7 +31,8 @@ Public Class MoveRawPartPage
    Private m_bRemovedRaw As Boolean = False                 ' flag per rimozione manuale pezzi
    Private m_RawMoveDataList As New List(Of RawMoveData)    ' dati di movimento
    Private m_bRawWithCups As Boolean = False                ' flag per pezzo corrente con ventose
-
+   ' Visibilità comando Scrap
+   Private m_ScrapsVisibility As Visibility = Visibility.Visible
    Private m_CurrRawOnVacuum As Integer = GDB_ID.NULL
 
    Private Sub MoveRawPartPage_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
@@ -42,6 +47,8 @@ Public Class MoveRawPartPage
       m_CurrProjPage = m_MainWindow.m_CurrentProjectPageUC
       m_SplitPage = m_MainWindow.m_CadCutPageUC.m_SplitPage
       m_bActive = True
+      ' resetto l'inidice del pezzo da mnovimentare
+      m_CurrRawOnVacuum = GDB_ID.NULL
       ' Leggo tipo movimento grezzi
       m_bByHand = (GetVacuumType() = 0 Or
                    Not m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.AUTO_MANIP) Or
@@ -86,34 +93,19 @@ Public Class MoveRawPartPage
          ScrapsVisibility = Visibility.Collapsed
       End If
       ' aggiorno la grafica
-      ScrapsBtn.Visibility = ScrapsVisibility
+      m_ScrapsVisibility = ScrapsVisibility
+      If m_ScrapsVisibility <> Visibility.Visible Then
+         Grid.SetColumnSpan(RemovePartBtn, 3)
+      Else
+         Grid.SetColumnSpan(RemovePartBtn, 2)
+      End If
       '---------------------------- SCRAPS ----------------------------
 
       ' Se movimento pezzi finale, sistemazioni per tavolo ausiliario
       If m_SplitPage.m_bOnAuxTab Then
-         m_nAuxTabId = EgtGetTableId(AUX_TAB)
-         ' Visualizzo tavolo ausiliario
-         Dim bOldEnMod As Boolean = EgtGetEnableModified()
-         If bOldEnMod Then EgtDisableModified()
-         EgtSetStatus(m_nAuxTabId, GDB_ST.ON_)
-         If bOldEnMod Then EgtEnableModified()
-         ' Se definizione movimenti
-         If Not m_SplitPage.m_bShow Then
-            ' Area tavolo ausiliario
-            Dim b3AuxTab As New BBox3d
-            EgtGetBBoxGlob(EgtGetFirstNameInGroup(m_nAuxTabId, "A1"), GDB_BB.STANDARD, b3AuxTab)
-            ' Area tavolo principale
-            Dim b3Tab As New BBox3d
-            EgtGetTableArea(1, b3Tab)
-            ' Imposto offset su tavolo principale per includere anche il secondario
-            Dim dOffsXP As Double = Math.Max(b3AuxTab.Max().x - b3Tab.Max().x, 0)
-            Dim dOffsYP As Double = Math.Max(b3AuxTab.Max().y - b3Tab.Max().y, 0)
-            Dim dOffsXM As Double = Math.Max(b3Tab.Min().x - b3AuxTab.Min().x, 0)
-            Dim dOffsYM As Double = Math.Max(b3Tab.Min().y - b3AuxTab.Min().y, 0)
-            EgtSetTableAreaOffset(dOffsXP, dOffsYP, dOffsXM, dOffsYM)
-         End If
-         EgtZoom(ZM.ALL)
-      ' altrimenti, aggiorno visualizzazione
+         ' assegnazione delle info tavola ausiliaria alla dispozione corrente
+         SetAuxTabInCurrDisposition()
+         ' altrimenti, aggiorno visualizzazione
       Else
          EgtDraw()
       End If
@@ -190,8 +182,9 @@ Public Class MoveRawPartPage
          TopRBtn.Visibility = Windows.Visibility.Hidden
          BottomLBtn.Visibility = Windows.Visibility.Hidden
          BottomRBtn.Visibility = Windows.Visibility.Hidden
+         PauseBtn.Visibility = Windows.Visibility.Hidden
          ResetBtn.Visibility = Windows.Visibility.Hidden
-         ScrapsBtn.Visibility = Windows.Visibility.Visible
+         ScrapsBtn.Visibility = m_ScrapsVisibility
          ' altrimenti per movimento con ventose
       ElseIf Not m_SplitPage.m_bOnAuxTab Then
          UpBtn.Visibility = Windows.Visibility.Visible
@@ -207,8 +200,9 @@ Public Class MoveRawPartPage
          TopRBtn.Visibility = Windows.Visibility.Hidden
          BottomLBtn.Visibility = Windows.Visibility.Hidden
          BottomRBtn.Visibility = Windows.Visibility.Hidden
+         PauseBtn.Visibility = Windows.Visibility.Hidden
          ResetBtn.Visibility = Windows.Visibility.Hidden
-         ScrapsBtn.Visibility = Windows.Visibility.Visible
+         ScrapsBtn.Visibility = m_ScrapsVisibility
          ' altrimenti per movimento finale dei pezzi
       Else
          UpBtn.Visibility = Windows.Visibility.Hidden
@@ -224,15 +218,45 @@ Public Class MoveRawPartPage
          TopRBtn.Visibility = Windows.Visibility.Visible
          BottomLBtn.Visibility = Windows.Visibility.Visible
          BottomRBtn.Visibility = Windows.Visibility.Visible
+         PauseBtn.Visibility = Windows.Visibility.Visible
          ResetBtn.Visibility = Windows.Visibility.Visible
          ScrapsBtn.Visibility = Windows.Visibility.Hidden
       End If
+      ' salvo l'idice della fase corrente
+      m_nCurrDisposition = EgtGetPhaseDisposition(m_nCurrPhase)
       ' Abilitazione bottone modifica
       ModifyBtn.IsEnabled = m_SplitPage.m_bShow
       ' gestione abilitazione altri bottoni
       EnableButtons()
    End Sub
 
+   Private Sub SetAuxTabInCurrDisposition()
+      ' Se movimento pezzi finale, sistemazioni per tavolo ausiliario
+      m_nAuxTabId = EgtGetTableId(AUX_TAB)
+      ' Visualizzo tavolo ausiliario
+      Dim bOldEnMod As Boolean = EgtGetEnableModified()
+      If bOldEnMod Then EgtDisableModified()
+      EgtSetStatus(m_nAuxTabId, GDB_ST.ON_)
+      If bOldEnMod Then EgtEnableModified()
+      ' Se definizione movimenti
+      If Not m_SplitPage.m_bShow Then
+         ' Area tavolo ausiliario
+         Dim b3AuxTab As New BBox3d
+         EgtGetBBoxGlob(EgtGetFirstNameInGroup(m_nAuxTabId, "A1"), GDB_BB.STANDARD, b3AuxTab)
+         ' Area tavolo principale
+         Dim b3Tab As New BBox3d
+         EgtGetTableArea(1, b3Tab)
+         ' Imposto offset su tavolo principale per includere anche il secondario
+         Dim dOffsXP As Double = Math.Max(b3AuxTab.Max().x - b3Tab.Max().x, 0)
+         Dim dOffsYP As Double = Math.Max(b3AuxTab.Max().y - b3Tab.Max().y, 0)
+         Dim dOffsXM As Double = Math.Max(b3Tab.Min().x - b3AuxTab.Min().x, 0)
+         Dim dOffsYM As Double = Math.Max(b3Tab.Min().y - b3AuxTab.Min().y, 0)
+         EgtSetTableAreaOffset(dOffsXP, dOffsYP, dOffsXM, dOffsYM)
+      End If
+      EgtZoom(ZM.ALL)
+
+   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
@@ -266,14 +290,14 @@ Public Class MoveRawPartPage
             ' Se il pezzo corrente è selezionato allora lo disattivo -> deposito del pezzo
             If nStat = GDB_ST.SEL Then
                EgtSetStatus(nId, GDB_ST.ON_)
-               ' prima di rilasciare il pezzo verifico che non vada in collisione con altri pezzi sulla tavola
+               ' prima di rilasciare il pezzo verifico che non vada in collisione con altri pezzi sulla tavola (evito il controllo se ultima fase)
                If VerifyCollisionWithOtherRawPart(nId) Then
-                  ' mantengo la selezione del pezzo
-                  EgtSetStatus(nId, GDB_ST.SEL)
-                  m_CurrProjPage.SetErrorMessage("Collisione pezzi")
-               Else
-                  ' Se con ventose, le nascondo
-                  If Not m_bByHand Then EgtSetStatus(GetVacuumId(), GDB_ST.OFF)
+                     ' mantengo la selezione del pezzo
+                     EgtSetStatus(nId, GDB_ST.SEL)
+                     m_CurrProjPage.SetErrorMessage("Collisione pezzi")
+                  Else
+                     ' Se con ventose, le nascondo
+                     If Not m_bByHand Then EgtSetStatus(GetVacuumId(), GDB_ST.OFF)
                End If
             Else
 
@@ -302,9 +326,9 @@ Public Class MoveRawPartPage
                   MaxDoublePlugger = GetPrivateProfileDouble(S_MACH_RAWMOVE, K_MACH_WEIGHT_DOUBLEPLUGGER, MaxDoublePlugger, m_MainWindow.GetMachIniFile())
                   Dim AverageDensity As Double = 2700
                   AverageDensity = GetPrivateProfileDouble(S_MATERIALS, K_AVERAGEDENSITY, AverageDensity, m_MainWindow.GetMachIniFile())
-                  VacuumCups.GetWeightInformation(AverageDensity, MaxSinglePlugger, MaxDoublePlugger)
-                  VacuumCups.GetRotationForExtraStrokeY(GetPrivateProfileInt(S_MACH_RAWMOVE, K_MACH_ROTATEVACUUMFOREXTRASTROKEY, 0, m_MainWindow.GetMachIniFile()) <> 0)
-                  VacuumCups.GetRotationForExtraStrokeX(GetPrivateProfileInt(S_MACH_RAWMOVE, K_MACH_ROTATEVACUUMFOREXTRASTROKEX, 0, m_MainWindow.GetMachIniFile()) <> 0)
+                  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
                      ' Visualizzo le ventose
                      EgtSetStatus(GetVacuumId(), GDB_ST.ON_)
@@ -347,6 +371,8 @@ Public Class MoveRawPartPage
 
    ' Veririfica che il grezzo non entri in colliosione con altri pezzi 
    Private Function VerifyCollisionWithOtherRawPart(nIdOnVacumm As Integer) As Boolean
+      ' se movimento su tavola di scarico non eseguo il controllo (evito di segnalre errori per pezzi ricavati interni al grezzo...)
+      If m_SplitPage.m_bOnAuxTab Then Return False
       If nIdOnVacumm = GDB_ID.NULL Then Return False
       ' Creo gruppo temporaneo in cui generare le superfici per la veririfica di collisione
       Dim m_nTempId As Integer = EgtCreateGroup(GDB_ID.ROOT)
@@ -816,9 +842,12 @@ Public Class MoveRawPartPage
 
       ' ricavo l'angolo di posizionamento del grezzo/pezzo sulla tavola
       If Not DispositionRawOnTable(nRawId, dAngRaw, AngRotList) Then Return
+      Dim bb3dRaw As New BBox3d
+      EgtGetRawPartBBox(nRawId, bb3dRaw)
+      Dim ForceToRotate As Boolean = bb3dRaw.DimX < bb3dRaw.DimY
 
       ' provo a verificare di poter depositare il pezzo (senza applicare delle rotazioni)
-      If Not EgtMoveToCornerRawPart(nRawId, ptRef, nCorn) Then
+      If Not EgtMoveToCornerRawPart(nRawId, ptRef, nCorn) Or ForceToRotate Then
          ' se sono impostati degli step di rotazione
          If AngRotList.Count > 0 Then
             Dim bOkRotate As Boolean = False
@@ -838,6 +867,16 @@ Public Class MoveRawPartPage
             Next
             If Not bOkRotate Then Return
          Else
+            ' sposto il pezzo in centro tavola → perchè tutti i movimenti sono fatti ruotando il pezzo in centro tavola!
+            Dim b3Area As New BBox3d
+            EgtGetTableArea(1, b3Area)
+            Dim b3RawTemp As New BBox3d
+            EgtGetRawPartBBox(nRawId, b3RawTemp)
+            ' ricavo il riferimento dell'angolo in basso a sinstra del grezzo rispetto alla tavola
+            Dim ptCorner As Point3d = New Point3d(b3Area.DimX / 2, b3Area.DimY / 2, 0) - New Vector3d(b3RawTemp.DimX / 2, b3RawTemp.DimY / 2, 0)
+            ' sposto il pezzo in questa posizione
+            EgtMoveToCornerRawPart(nRawId, ptCorner, MCH_CR.BL)
+            ' riprovo il movimento
             If EgtRotateRawPart(nRawId, Vector3d.Z_AX(), -dAngRaw) Then
                If Not EgtMoveToCornerRawPart(nRawId, ptRef, nCorn) Then
                   ' riposiziono il pezzo come era prima
@@ -952,6 +991,64 @@ Public Class MoveRawPartPage
       Return True
    End Function
 
+   Private Sub PauseBtn_Click(sender As Object, e As RoutedEventArgs) Handles PauseBtn.Click
+      ' verifico che ci sia almeno un elemto selezionato (dati di aggancio pezzo)
+      If m_RawMoveDataList.Count = 0 Then Return
+      ' verifico che sia stato inseito almeno uno spostamento, altrimenti lo rimuovo
+      Dim Index As Integer = 0
+      For Index = m_RawMoveDataList.Count - 1 To 0 Step -1
+         If Math.Abs(m_RawMoveDataList(Index).m_vtRawMove.x) < EPS_SMALL AndAlso Math.Abs(m_RawMoveDataList(Index).m_vtRawMove.y) < EPS_SMALL Then
+            m_RawMoveDataList.RemoveAt(Index)
+         End If
+      Next
+      ' verifico che la lista non sia vuota
+      If m_RawMoveDataList.Count = 0 Then Return
+
+      ' recupero disposizione fase corrente
+      Dim nDispId As Integer = EgtGetPhaseDisposition(m_nCurrPhase)
+      ' imposto la pausa nella disposizione corrente
+      SetPause(nDispId)
+      ' aggiungo al gruppo disposizione dei sottogruppi con i dati di movimento dei grezzi spostati
+      SaveMoveInfoInDisposition(nDispId, m_RawMoveDataList)
+      ' imposto eventuale movimento pezzi su tavola ausiliaria
+      SaveMovePartsOnAuxTable(nDispId, m_SplitPage.m_bOnAuxTab)
+      '' Eseguo calcolo speciale dei movimenti: per tavola multicut
+      'SpecialApplyDisposition(nDispId, True, Not m_SplitPage.m_bOnAuxTab)
+
+      ' Creo nuova fase
+      Dim nNewPhase As Integer = EgtAddPhase()
+
+      ' Eseguo eventuali spezzature dei grezzi e vi sposto i pezzi (i grezzi devono essere sempre copiati per Registrazione con rotazione)
+      Dim nRawId As Integer = EgtGetFirstRawPart()
+      While nRawId <> GDB_ID.NULL
+         ' se il grezzo è presente nella fase precedente e non è quello selezionato allora procedo a creare una copia nella nuova fase
+         If EgtVerifyRawPartPhase(nRawId, nNewPhase - 1) Then
+            Dim bKeepRawPart As Boolean = True
+            For Each RawOnAuxTabData As RawMoveData In m_RawMoveDataList
+               If nRawId = RawOnAuxTabData.m_nId Then
+                  bKeepRawPart = False
+                  Exit For
+               End If
+            Next
+            If bKeepRawPart Then EgtKeepRawPart(nRawId, nNewPhase - 1)
+         End If
+         ' passo al successivo grezzo
+         nRawId = EgtGetNextRawPart(nRawId)
+      End While
+
+      Dim nCurrDisposition As Integer = EgtGetPhaseDisposition(nNewPhase)
+      'SetPause(nCurrDisposition)
+      m_nCurrDisposition = nCurrDisposition
+      ' EgtSetStatus(nRawIdSlected, GDB_ST.OFF)
+      EgtSetStatus(GetVacuumId(), GDB_ST.OFF)
+      EgtSetCurrPhase(nNewPhase)
+      SetAuxTabInCurrDisposition()
+      ' ripulisco la lista degli spostamenti
+      m_RawMoveDataList.Clear()
+      ' aggiorno la fase corrente
+      m_nCurrPhase = EgtGetCurrPhase()
+   End Sub
+
    Private Sub ResetBtn_Click(sender As Object, e As RoutedEventArgs) Handles ResetBtn.Click
       ' Recupero il primo grezzo selezionato
       Dim nRawId As Integer = EgtGetFirstSelectedObj()
@@ -987,7 +1084,30 @@ Public Class MoveRawPartPage
       EgtDeselectAll()
       ' Torno alla fase precedente
       m_bPrev = True
-      ' Passo alla pagina delle spezzature
+      ' Passo alla pagina delle spezzature solo se non esiste prima una fased di deposito sulla tavola di scarico
+
+      Dim nPrevDispId As Integer = EgtGetPrevOperation(m_nCurrDisposition)
+      ' verifico se la fasa precedente è di tipo scarico
+      If IsDispUnloadOnAuxTab(nPrevDispId) <> 0 Then
+         EgtSetCurrPhase(m_nCurrPhase - 1)
+         m_nCurrDisposition = nPrevDispId
+         m_nCurrPhase -= 1
+         m_bPrev = False
+         m_SplitPage.m_bShow = True
+         EgtDraw()
+         Return
+      End If
+
+      'If EgtGetOperationType(EgtGetPrevOperation(m_nCurrDisposition)) = MCH_OY.DISP AndAlso m_SplitPage.m_bOnAuxTab Then
+      '   EgtSetCurrPhase(m_nCurrPhase - 1)
+      '   m_nCurrDisposition = EgtGetPrevOperation(m_nCurrDisposition)
+      '   m_nCurrPhase -= 1
+      '   m_bPrev = False
+      '   m_SplitPage.m_bShow = True
+      '   EgtDraw()
+      '   Return
+      'End If
+
       m_MainWindow.m_CadCutPageUC.CadCutPageGrid.Children.Remove(Me)
       m_MainWindow.m_CadCutPageUC.CadCutPageGrid.Children.Add(m_SplitPage)
       m_MainWindow.m_CadCutPageUC.m_CadCutMode = CadCutPageUC.CadCutModes.Split
@@ -1003,6 +1123,19 @@ Public Class MoveRawPartPage
          ' non cambio pagina
          Return
       End If
+
+      ' se la disposizione corrente è sulla tavola ausiliaria allora lo sarà anche quella successiva
+      If IsDispUnloadOnAuxTab(m_nCurrDisposition) <> 0 Then
+         EgtSetCurrPhase(m_nCurrPhase + 1)
+         m_nCurrDisposition = EgtGetNextOperation(m_nCurrDisposition)
+         m_nCurrPhase += 1
+         m_bToNext = False
+         m_SplitPage.m_bShow = True
+         EgtDraw()
+         EnableButtons()
+         Return
+      End If
+
       ' resetto l'inidice del pezzo da mnovimentare
       m_CurrRawOnVacuum = GDB_ID.NULL
       ' Deseleziono tutto
@@ -1048,6 +1181,26 @@ Public Class MoveRawPartPage
       EnableButtons()
    End Sub
 
+   ' verifica se la disposizione indicata è uno scarico sulla tavola ausiliaria
+   Public Function IsDispUnloadOnAuxTab(nCurrDispId As Integer) As Integer
+      ' verifico se la fase precedente è uno scarico su tavola ausiliaria
+      Dim bVal As Integer = 0
+      EgtGetInfo(nCurrDispId, "Pat", bVal)
+      Return bVal
+   End Function
+
+   ' recupero la prima disposizione disponibile tra l'elenco delle operazioni presenti
+   Public Function GetNextDisposition(nCurrDisposId As Integer) As Integer
+      Dim nDispId As Integer = nCurrDisposId
+      While nDispId <> GDB_ID.NULL
+         If EgtGetOperationType(nDispId) = MCH_OY.DISP Then
+            Return nDispId
+         End If
+         nDispId = EgtGetNextOperation(nDispId)
+      End While
+      Return GDB_ID.NULL
+   End Function
+
    Private Sub EnableButtons()
       UpBtn.IsEnabled = Not m_SplitPage.m_bShow
       LeftBtn.IsEnabled = Not m_SplitPage.m_bShow
@@ -1062,12 +1215,22 @@ Public Class MoveRawPartPage
       TopRBtn.IsEnabled = Not m_SplitPage.m_bShow
       BottomLBtn.IsEnabled = Not m_SplitPage.m_bShow
       BottomRBtn.IsEnabled = Not m_SplitPage.m_bShow
+      PauseBtn.IsEnabled = Not m_SplitPage.m_bShow
       ResetBtn.IsEnabled = Not m_SplitPage.m_bShow
-      NextBtn.IsEnabled = Not m_SplitPage.m_bOnAuxTab
-      ScrapsBtn.IsEnabled = Not m_SplitPage.m_bShow
+      If m_SplitPage.m_bShow Then
+         NextBtn.IsEnabled = (m_nCurrPhase < EgtGetPhaseCount())
+      Else
+         NextBtn.IsEnabled = Not m_SplitPage.m_bOnAuxTab
+      End If
    End Sub
 
    Private Sub MoveRawPartPage_Unloaded(sender As Object, e As EventArgs) Handles Me.Unloaded
+      ' verifico che la fase corrente non sia vuota
+      Dim nLastDispId As Integer = EgtGetPhaseDisposition(m_nCurrPhase)
+      If EgtIsOperationEmpty(nLastDispId) And m_SplitPage.m_bOnAuxTab And m_RawMoveDataList.Count = 0 Then
+         EgtErase(nLastDispId)
+      End If
+
       ' Se movimento con ventose
       If Not m_bByHand Then
          ' nascondo le ventose
@@ -1083,11 +1246,11 @@ Public Class MoveRawPartPage
             ' imposto eventuale presenza rimozioni manuali
             SaveRemoveByHandInDisposition(nDispId, m_bRemovedRaw)
             ' imposto eventuale movimento pezzi su tavola ausiliaria
-            SaveMovePartsOnAuxTable( nDispId, m_SplitPage.m_bOnAuxTab)
+            SaveMovePartsOnAuxTable(nDispId, m_SplitPage.m_bOnAuxTab)
             ' Eseguo calcolo speciale dei movimenti
             SpecialApplyDisposition(nDispId, True, Not m_SplitPage.m_bOnAuxTab)
          End If
-      ' se altrimenti movimento senza ventose perchè lama troppo grande
+         ' se altrimenti movimento senza ventose perchè lama troppo grande
       ElseIf GetVacuumType() > 0 Then
          ' se non solo visualizzazione
          If Not m_SplitPage.m_bShow Then

CadCuts/NestPageUC.xaml.vb

@@ -2314,6 +2314,11 @@ Public Class NestPageUC
       EgtZoom(ZM.ALL)
    End Sub
 
+   ' ripulisco la lista dei pezzi in parcheggio
+   Friend Sub ResetListOfGruopInPark()
+      m_ListOfGroupInPark.Clear()
+   End Sub
+
    Friend Function StoreOnePart(nId As Integer, Optional ByVal bForced As Boolean = False) As Boolean
       ' Se pezzo in grezzo, metto in parcheggio (sempre possibile)
       If bForced OrElse

CadCuts/SplitPageUC.xaml.vb

@@ -7,6 +7,7 @@ Public Class SplitPageUC
    ' Riferimento alla MainWindow
    Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
    Private WithEvents m_CurrProjPage As CurrentProjectPageUC
+
    ' Flag di pagina attiva
    Private m_bActive As Boolean = False
    ' Tipo movimento dei grezzi (manuale o con testa ventosa)
@@ -1738,6 +1739,16 @@ Public Class SplitPageUC
    End Sub
 
    Private Sub NextBtn_Click(sender As Object, e As RoutedEventArgs) Handles NextBtn.Click
+      If m_bShow Then
+         Dim CurrDisposition As Integer = EgtGetPhaseDisposition(m_nCurrPhase)
+         ' recupero l'operazione successiva
+         Dim NextDisposition As Integer = EgtGetNextOperation(CurrDisposition)
+         If Not IsNothing(m_MainWindow.m_CadCutPageUC.m_MoveRawPartPage) Then
+            ' verifico che l'operazione sia una disposizione, altrimenti cerco
+            NextDisposition = m_MainWindow.m_CadCutPageUC.m_MoveRawPartPage.GetNextDisposition(NextDisposition)
+            m_bOnAuxTab = m_MainWindow.m_CadCutPageUC.m_MoveRawPartPage.IsDispUnloadOnAuxTab(NextDisposition)
+         End If
+      End If
       m_bToNext = True
       m_MainWindow.m_CadCutPageUC.CadCutPageGrid.Children.Remove(m_MainWindow.m_CadCutPageUC.m_SplitPage)
       m_MainWindow.m_CadCutPageUC.CadCutPageGrid.Children.Add(m_MainWindow.m_CadCutPageUC.m_MoveRawPartPage)
@@ -1969,7 +1980,7 @@ Public Class SplitPageUC
                m_bOnAuxTab = False
                ' Ci deve essere almeno 1 taglio disabilitato e 1 e 1 solo passante
                NextBtn.IsEnabled = (GetDisabledCutsCount() > 0 And GetSplitCutsCount() = 1)
-            ' Altrimenti
+               ' Altrimenti
             Else
                ' movimento standard sulla tavola (almeno un taglio disabilitato)
                Dim bStdTab As Boolean = (GetDisabledCutsCount() > 0)
@@ -1980,7 +1991,7 @@ Public Class SplitPageUC
                ' Deve essere permesso almeno un tipo di movimento
                NextBtn.IsEnabled = bStdTab Or m_bOnAuxTab Or bFinalMoveTab
             End If
-         ' altrimenti sto solo visualizzando
+            ' altrimenti sto solo visualizzando
          Else
             ' movimento su tavola di scarico
             m_bOnAuxTab = (m_nCurrPhase = EgtGetPhaseCount() - 1 And m_bEnableOnAuxTab And EgtGetOperationType(EgtGetLastOperation()) = MCH_OY.DISP)

CadCuts/VacuumCups.vb

@@ -67,17 +67,17 @@ Module VacuumCups
    End Function
 
    ' carico i dati macchina relativi al peso massimo movimentabile
-   Friend Sub GetWeightInformation(Density As Double, MaxSingle As Double, MaxDouble As Double)
+   Friend Sub SetWeightInformation(Density As Double, MaxSingle As Double, MaxDouble As Double)
       m_RawDensity = Density
       m_MaxWeightSinglePlugger = MaxSingle
       m_MaxWeightDoublePlugger = MaxDouble
    End Sub
 
-   Friend Sub GetRotationForExtraStrokeY(Rotate As Boolean)
+   Friend Sub SetRotationForExtraStrokeY(Rotate As Boolean)
       bRotateVacuumNearExtraStrokeY = Rotate
    End Sub
 
-   Friend Sub GetRotationForExtraStrokeX(Rotate As Boolean)
+   Friend Sub SetRotationForExtraStrokeX(Rotate As Boolean)
       bRotateVacuumNearExtraStrokeX = Rotate
    End Sub
    Friend Function GetVacuumId() As Integer

Constants/ConstGen.vb

@@ -391,6 +391,9 @@ Module ConstGen
    Public Function COL_MCH_DRIPCUT() As Color3d
       Return New Color3d(255, 0, 165)
    End Function
+   Public Function COL_MCH_ONENGRAVE_ANG() As Color3d
+      Return New Color3d(255, 255, 100)
+   End Function
    Public Function COL_MCH_DRIPFREE() As Color3d
       Return New Color3d(192, 0, 128)
    End Function

Constants/ConstIni.vb

@@ -18,6 +18,7 @@ Module ConstIni
    Public Const S_GENERAL As String = "General"
    Public Const K_DEBUG As String = "Debug"
    Public Const K_LICENCE As String = "Licence"
+   Public Const K_NETKEY As String = "NetKey"
    Public Const K_MESSAGESDIR As String = "MessagesDir"
    Public Const K_MESSAGES As String = "Messages"
    Public Const K_SUPPORT As String = "Support"
@@ -135,6 +136,7 @@ Module ConstIni
    Public Const K_ENGRAVEDEPTH As String = "EngraveDepth"
    Public Const K_ENGRAVEDEPTH2 As String = "EngraveDepth2"
    Public Const K_ENGRAVESHORT As String = "EngraveShort"
+   Public Const K_ENGRAVEANGLE As String = "EngraveAngle"
    Public Const K_DRIPOFFSET As String = "DripOffset"
    Public Const K_DRIPOFFSET2 As String = "DripOffset2"
    Public Const K_DRIPDEPTH As String = "DripDepth"

Constants/ConstMachIni.vb

@@ -46,6 +46,11 @@
    Public Const K_THREADSLEEP As String = "ThreadSleep"
    Public Const K_PHOTODELEY As String = "PhotoDeley"
 
+   Public Const S_EXECLUA As String = "ExecLua"
+   Public Const K_DIRSCRIPT_LUA As String = "DirScript"
+   Public Const K_FILESCRIPT_LUA As String = "FileScript"
+   Public Const K_CALLFUNCTION As String = "CallFunction"
+
    Public Const S_NCDATA As String = "NcData"
    Public Const K_NEWVARIABLE As String = "NewVariable"
    Public Const K_NEWCONSOLE As String = "NewConsole"

DirectCuts/ControlsDirectCutUC.xaml

@@ -0,0 +1,177 @@
+<UserControl x:Class="ControlsDirectCutUC"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             DataContext="Self"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:OmagCUT="clr-namespace:OmagCUT"
+             xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib" 
+             mc:Ignorable="d" 
+             d:DesignHeight="597.3" d:DesignWidth="256">
+
+   <Grid Name="LeftButtonGrid" Grid.Row="1" >
+      <Grid.RowDefinitions>
+         <!--<RowDefinition Height="1*"/>
+            <RowDefinition Height="7*"/>-->
+         <RowDefinition Height="9*"/>
+      </Grid.RowDefinitions>
+      <!-- Definizione della Grid laterale -->
+      <Grid Name="CutTypeGrid" Grid.Row="1" >
+         <Grid.RowDefinitions>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+            <!--<RowDefinition Height="1*"/>-->
+         </Grid.RowDefinitions>
+         <Button Name="ManualBtn" Grid.Column="2" Grid.Row="0"                    
+                        Style="{DynamicResource OmagCut_YellowIconButton}">
+            <Grid>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="80"/>
+                  <ColumnDefinition Width="140"/>
+               </Grid.ColumnDefinitions>
+               <Image Source="{DynamicResource Movimento-manualeImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
+               <TextBlock Name="ManualTxt" Grid.Column="1"
+                                   Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+            </Grid>
+         </Button>
+
+         <Button Name="SingleCutBtn" Grid.Row="1"
+                        Style="{DynamicResource OmagCut_YellowIconButton}">
+            <Grid>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="80"/>
+                  <ColumnDefinition Width="140"/>
+               </Grid.ColumnDefinitions>
+               <Image Source="{DynamicResource Taglio-singoloImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
+               <TextBlock Name="SingleCutTxt" Grid.Column="1"
+                                   Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+            </Grid>
+         </Button>
+
+         <Button Name="MultipleCutBtn" Grid.Row="2"
+                        Style="{DynamicResource OmagCut_YellowIconButton}">
+            <Grid>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="80"/>
+                  <ColumnDefinition Width="140"/>
+               </Grid.ColumnDefinitions>
+               <Image Source="{DynamicResource Taglio-multiploImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
+               <TextBlock Name="MultipleCutTxt" Grid.Column="1"
+                                   Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+            </Grid>
+         </Button>
+
+         <Button Name="GridCutBtn" Grid.Row="3"
+                        Style="{DynamicResource OmagCut_YellowIconButton}">
+            <Grid>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="80"/>
+                  <ColumnDefinition Width="140"/>
+               </Grid.ColumnDefinitions>
+               <Image Source="{DynamicResource Taglio-grigliaImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
+               <TextBlock Name="GridCutTxt" Grid.Column="1"
+                                   Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+            </Grid>
+         </Button>
+
+
+         <Button Name="SingleDrillBtn" Grid.Row="4"
+                        Style="{DynamicResource OmagCut_YellowIconButton}">
+            <Grid>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="80"/>
+                  <ColumnDefinition Width="140"/>
+               </Grid.ColumnDefinitions>
+               <Image Source="{DynamicResource Foro-singoloImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
+               <TextBlock Name="SingleDrillTxt" Grid.Column="1"
+                                   Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+            </Grid>
+         </Button>
+
+         <Button Name="FlatteningCutBtn" Grid.Row="5"
+                        Style="{DynamicResource OmagCut_YellowIconButton}">
+            <Grid>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="80"/>
+                  <ColumnDefinition Width="140"/>
+               </Grid.ColumnDefinitions>
+               <Image Source="{DynamicResource SpianaturaImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
+               <TextBlock Name="FlatteningCutTxt" Grid.Column="1"
+                                   Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+            </Grid>
+         </Button>
+
+         <!--<Button Name="PolishingBtn" Grid.Row="6"
+                        Style="{DynamicResource OmagCut_YellowIconButton}">
+            <Grid>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="80"/>
+                  <ColumnDefinition Width="140"/>
+               </Grid.ColumnDefinitions>
+               <Image Source="{DynamicResource LucidaturaImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
+               <TextBlock Name="PolishingTxt" Grid.Column="1"
+                               Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+            </Grid>
+         </Button>-->
+
+         <!--<Button Name="CopyTemplateBtn" Grid.Row="7"
+                        Style="{DynamicResource OmagCut_YellowIconButton}">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="80"/>
+                            <ColumnDefinition Width="140"/>
+                        </Grid.ColumnDefinitions>
+                        <Image Source="{DynamicResource Copia-dimaImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
+                        <TextBlock Name="CopyTemplateTxt" Grid.Column="1"
+                                   Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                    </Grid>
+                </Button>-->
+
+         <Button Name="SquaringBtn" Grid.Row="6"
+                        Style="{DynamicResource OmagCut_YellowIconButton}">
+            <Grid>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="80"/>
+                  <ColumnDefinition Width="140"/>
+               </Grid.ColumnDefinitions>
+               <Image Source="{DynamicResource Copia-dimaImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
+               <TextBlock Name="SquaringTxt" Grid.Column="1"
+                                   Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+            </Grid>
+         </Button>
+
+         <!--<Button Name="SawTestBtn" Grid.Row="6"
+                    Style="{DynamicResource OmagCut_YellowIconButton}">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="80"/>
+                        <ColumnDefinition Width="140"/>
+                    </Grid.ColumnDefinitions>
+                    <Image Source="{DynamicResource Test-lamaImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
+                    <TextBlock Name="SawTestTxt" Grid.Column="1"
+                           Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                </Grid>
+            </Button>-->
+
+         <Grid Name="ChangeUCGrid" Grid.Row="7">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
+            <Button Name="ChangeUCBtn" Grid.ColumnSpan="2" Style="{DynamicResource OmagCut_YellowIconButton}">
+               <Grid>
+                  <!--<Image Name="ImageCompo9" Source="{DynamicResource NumericKeyboardArrowImg}" />-->
+                  <TextBlock Name="ChangeUCTxBl" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+               </Grid>
+            </Button>
+         </Grid>
+
+      </Grid>
+   </Grid>
+</UserControl>

DirectCuts/ControlsDirectCutUC.xaml.vb

@@ -0,0 +1,260 @@
+Imports EgtUILib
+Public Class ControlsDirectCutUC
+
+   ' Dichiarazione delle Page UserControl
+   Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
+   ' ---- MAI USATA ---- nuova finestra per i comandi per il taglio manuale nuovo
+   Friend m_SingleCutAuto As SingleCutAuto
+   ' ---- MAI USATA ----
+   Friend m_MachineButtons As MachineButtonsUC
+   Friend m_ManualAxesMove As ManualAxesMoveUC
+   Friend m_SingleCut As SingleCutUC
+   Friend m_SingleDrill As SingleDrillUC
+   Friend m_MultipleCut As MultipleCut
+   Friend m_GridCut As GridCut
+   Friend m_FlatteningCut As FlatteningCut
+   Friend m_Squaring As SquaringUC
+   Friend m_ControlsMachineButton As ControlsMachineButtonUC
+   Friend m_VacuumMachineButton As VacuumMachineButtonUC
+
+   Friend m_ControlDirectCutPage1 As ControlsDirectCutUC1
+
+   ' Stato di visualizzazione della macchina
+   Friend m_bShowMachine As Boolean = False
+   Friend m_nMachLook As Integer = MCH_LOOK.ALL
+   ' Dati generali CN
+   Friend m_CN As CN_generico
+   Private m_bFirst As Boolean = True
+   ' Riferimento alla pagina correntemente attiva
+   Friend m_ActiveDirectCutPage As DirectCutPages = DirectCutPages.DirectCut
+   ' Variabili che indicano attivazione paginette con bottoni macchina
+   Private m_ControlsBtn_IsActive As Boolean
+
+   Public Shared m_dZSafe As Double = 52
+
+   ' Variabile che indica se sono attivi i bottoni macchina nuovi o vecchi
+   Friend m_NewMachineButtonsType As Boolean
+   ' Indica che la finestra del talio Singolo deve essere di tipo manuale
+   Friend m_bManulaCut As Boolean = False
+
+   ' elenco dei nuovi bottoni
+   Private m_ButtonJogList As New List(Of MachineButton)
+
+   Enum DirectCutPages
+      ' pagina principale di tagli diretti
+      DirectCut
+      ' nuova pagina di tagli diretti
+      DirectCut1
+      ' elenco dei comandi associati
+      ManualAxesMove
+      SingleCut
+      MultipleCut
+      GridCut
+      FlatteningCut
+      Polishing
+      CopyTemplate
+      SawTest
+      SingleCutAuto
+      SingleDrill
+      Squaring
+   End Enum
+
+   Private Sub ControlsDirectCutUC_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
+      ' leggo la configurazione del programma per i nuovi tagli manuali
+      m_bManulaCut = GetPrivateProfileInt(S_GENERAL, K_MANUAL_CUT, 0, m_MainWindow.GetIniFile()) <> 0
+
+      'Creazione delle Page UserControl
+      m_MachineButtons = New MachineButtonsUC
+      m_ManualAxesMove = New ManualAxesMoveUC
+      m_SingleCut = New SingleCutUC
+      m_SingleDrill = New SingleDrillUC
+      m_MultipleCut = New MultipleCut
+      m_GridCut = New GridCut
+      m_FlatteningCut = New FlatteningCut
+      m_Squaring = New SquaringUC
+      m_ControlsMachineButton = New ControlsMachineButtonUC
+      m_VacuumMachineButton = New VacuumMachineButtonUC
+      ' reiferimento alla pagina succesiva
+      m_ControlDirectCutPage1 = New ControlsDirectCutUC1
+      ' Costruisco la finestra per il nuovo tipo di taglio manuale
+      m_SingleCutAuto = New SingleCutAuto
+
+      'Posizionemento nella griglia delle Page UserControl DirectCutPageUC
+      m_MachineButtons.SetValue(Grid.RowProperty, 2)
+      m_MachineButtons.SetValue(Grid.ColumnSpanProperty, 7)
+      m_ManualAxesMove.SetValue(Grid.RowProperty, 1)
+      If m_bManulaCut Then
+         m_SingleCutAuto.SetValue(Grid.RowProperty, 1)
+      Else
+         m_SingleCut.SetValue(Grid.RowProperty, 1)
+      End If
+      m_SingleDrill.SetValue(Grid.RowProperty, 1)
+      m_MultipleCut.SetValue(Grid.RowProperty, 1)
+      m_GridCut.SetValue(Grid.RowProperty, 1)
+      m_FlatteningCut.SetValue(Grid.RowProperty, 1)
+      m_Squaring.SetValue(Grid.RowProperty, 1)
+      m_ControlsMachineButton.SetValue(Grid.RowProperty, 1)
+      m_VacuumMachineButton.SetValue(Grid.RowProperty, 1)
+
+      ' ManualBtn.Content = EgtMsg(90201)
+      ManualTxt.Text = EgtMsg(90201)
+      'SingleCutBtn.Content = EgtMsg(90202)
+      SingleCutTxt.Text = EgtMsg(90202)
+      'SingleDrillBtn.Content = "Foro singolo"
+      SingleDrillTxt.Text = EgtMsg(90258)
+      'MultipleCutBtn.Content = EgtMsg(90203)
+      MultipleCutTxt.Text = EgtMsg(90203)
+      'GridCutBtn.Content = EgtMsg(90204)
+      GridCutTxt.Text = EgtMsg(90204)
+      'FlatteningCutBtn.Content = EgtMsg(90206)
+      FlatteningCutTxt.Text = EgtMsg(90206)
+      SquaringTxt.Text = "Squaring"
+      ChangeUCTxBl.Text = "Others"
+
+   End Sub
+
+   Private Sub ControlsDirectCutUC_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
+      ' Se rientro da simulazione
+      If m_ActiveDirectCutPage = DirectCutPages.SingleCut Then
+         LeftButtonGrid.Children.Add(m_SingleCut)
+         Return
+      ElseIf m_ActiveDirectCutPage = DirectCutPages.SingleCutAuto Then
+         LeftButtonGrid.Children.Add(m_SingleCutAuto)
+         Return
+      ElseIf m_ActiveDirectCutPage = DirectCutPages.MultipleCut Then
+         LeftButtonGrid.Children.Add(m_MultipleCut)
+         Return
+      ElseIf m_ActiveDirectCutPage = DirectCutPages.GridCut Then
+         LeftButtonGrid.Children.Add(m_GridCut)
+         Return
+      ElseIf m_ActiveDirectCutPage = DirectCutPages.FlatteningCut Then
+         LeftButtonGrid.Children.Add(m_FlatteningCut)
+         Return
+      ElseIf m_ActiveDirectCutPage = DirectCutPages.SingleDrill Then
+         LeftButtonGrid.Children.Add(m_SingleDrill)
+         Return
+      ElseIf m_ActiveDirectCutPage = DirectCutPages.Squaring Then
+         LeftButtonGrid.Children.Add(m_Squaring)
+         Return
+      End If
+
+      ' Caso standard
+      m_ActiveDirectCutPage = DirectCutPages.DirectCut
+
+      ' Attivo le lavorazioni solo se esiste il grezzo e se presente testa H1
+      Dim bRawOk As Boolean = (GetRawHeight() > EPS_SMALL)
+      Dim bH1Exists As Boolean = (EgtGetHeadId("H1") <> GDB_ID.NULL)
+
+      ManualBtn.IsEnabled = bH1Exists
+      ' sviluppo rimasto in sospeso
+      If m_bManulaCut Then
+         ' anche se non è presente un grezzo mantengo abilitato il bottone
+         SingleCutBtn.IsEnabled = True
+      Else
+         SingleCutBtn.IsEnabled = bRawOk
+      End If
+      MultipleCutBtn.IsEnabled = bRawOk
+      GridCutBtn.IsEnabled = bRawOk
+      SingleDrillBtn.IsEnabled = (bRawOk And bH1Exists)
+      FlatteningCutBtn.IsEnabled = (bRawOk And bH1Exists)
+      SquaringBtn.IsEnabled = bRawOk
+
+      ' aggiorno la visualizzazione dei parametri
+      ReloadParam()
+
+      ' Nascondo i pezzi in parcheggio
+      HideParkedParts()
+      EgtZoom(ZM.ALL)
+
+   End Sub
+
+   ' ricarico i parametri utensili per definizione 
+   Public Sub ReloadParam()
+      Dim sCurrSawing As String = m_MainWindow.m_CurrentMachine.sCurrSawing
+      Dim sCurrSaw As String = m_MainWindow.m_CurrentMachine.sCurrSaw
+      Dim bSaw As Boolean = False
+
+      ' se esiste una lavorazione di lama corrente vuol dire che deve essere preferita
+      If Not String.IsNullOrEmpty(sCurrSaw) And Not String.IsNullOrEmpty(sCurrSawing) Then
+         bSaw = EgtSetCalcTool(sCurrSaw, "H1", 1)
+      End If
+      m_SingleCut.SetEnableParam(bSaw)
+      m_MultipleCut.SetEnableParam(bSaw)
+      m_GridCut.SetEnableParam(bSaw)
+   End Sub
+
+#Region "COMMAND CLICK BTN"
+
+   Private Sub ManualBtn_Click(sender As Object, e As RoutedEventArgs) Handles ManualBtn.Click
+      LeftButtonGrid.Children.Add(m_ManualAxesMove)
+      m_ActiveDirectCutPage = DirectCutPages.ManualAxesMove
+   End Sub
+
+   Private Sub SingleCutBtn_Click(sender As Object, e As RoutedEventArgs) Handles SingleCutBtn.Click
+      If m_bManulaCut Then
+         LeftButtonGrid.Children.Add(m_SingleCutAuto)
+         m_ActiveDirectCutPage = DirectCutPages.SingleCutAuto
+      Else
+         LeftButtonGrid.Children.Add(m_SingleCut)
+         m_ActiveDirectCutPage = DirectCutPages.SingleCut
+      End If
+
+   End Sub
+
+   Private Sub MultipleCutBtn_Click(sender As Object, e As RoutedEventArgs) Handles MultipleCutBtn.Click
+      LeftButtonGrid.Children.Add(m_MultipleCut)
+      m_ActiveDirectCutPage = DirectCutPages.MultipleCut
+   End Sub
+
+   Private Sub GridCutBtn_Click(sender As Object, e As RoutedEventArgs) Handles GridCutBtn.Click
+      LeftButtonGrid.Children.Add(m_GridCut)
+      m_ActiveDirectCutPage = DirectCutPages.GridCut
+   End Sub
+
+   Private Sub FlatteningCutBtn_Click(sender As Object, e As RoutedEventArgs) Handles FlatteningCutBtn.Click
+      LeftButtonGrid.Children.Add(m_FlatteningCut)
+      m_ActiveDirectCutPage = DirectCutPages.FlatteningCut
+   End Sub
+
+   Private Sub SquaringBtn_Click(sender As Object, e As RoutedEventArgs) Handles SquaringBtn.Click
+      LeftButtonGrid.Children.Add(m_Squaring)
+      m_ActiveDirectCutPage = DirectCutPages.Squaring
+   End Sub
+
+   Private Sub SingleDrillBtn_Click(sender As Object, e As RoutedEventArgs) Handles SingleDrillBtn.Click
+      LeftButtonGrid.Children.Add(m_SingleDrill)
+      m_ActiveDirectCutPage = DirectCutPages.SingleDrill
+   End Sub
+
+   ' cambio pagina
+   Private Sub ChangeUCBtn_Click(sender As Object, e As RoutedEventArgs) Handles ChangeUCBtn.Click
+      DirectCutPage_Unloaded(Nothing, Nothing)
+      m_ActiveDirectCutPage = DirectCutPages.DirectCut
+      m_MainWindow.m_DirectCutPageUC.LoadDirectCutUC1()
+   End Sub
+
+#End Region    ' Command Click Btn
+
+
+   Friend Sub DirectCutPage_Unloaded(sender As Object, e As RoutedEventArgs) Handles Me.Unloaded
+      Select Case m_ActiveDirectCutPage
+         Case DirectCutPages.DirectCut Or DirectCutPages.ManualAxesMove
+            ' Non è necessario fare alcunché
+         Case DirectCutPages.SingleCut
+            LeftButtonGrid.Children.Remove(m_SingleCut)
+         Case DirectCutPages.SingleCutAuto
+            LeftButtonGrid.Children.Remove(m_SingleCutAuto)
+         Case DirectCutPages.MultipleCut
+            LeftButtonGrid.Children.Remove(m_MultipleCut)
+         Case DirectCutPages.GridCut
+            LeftButtonGrid.Children.Remove(m_GridCut)
+         Case DirectCutPages.FlatteningCut
+            LeftButtonGrid.Children.Remove(m_FlatteningCut)
+         Case DirectCutPages.SingleDrill
+            LeftButtonGrid.Children.Remove(m_SingleDrill)
+         Case DirectCutPages.Squaring
+            LeftButtonGrid.Children.Remove(m_Squaring)
+      End Select
+   End Sub
+
+End Class

DirectCuts/ControlsDirectCutUC1.xaml

@@ -0,0 +1,86 @@
+<UserControl x:Class="ControlsDirectCutUC1"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             DataContext="Self"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:OmagCUT="clr-namespace:OmagCUT"
+             xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib" 
+             mc:Ignorable="d" 
+             d:DesignHeight="597.3" d:DesignWidth="256">
+
+   <Grid Name="LeftButtonGrid" Grid.Row="1" >
+      <Grid.RowDefinitions>
+         <!--<RowDefinition Height="1*"/>
+            <RowDefinition Height="7*"/>-->
+         <RowDefinition Height="9*"/>
+      </Grid.RowDefinitions>
+      <!-- Definizione della Grid laterale -->
+      <Grid Name="CutTypeGrid" Grid.Row="1" >
+         <Grid.RowDefinitions>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+            <!--<RowDefinition Height="1*"/>-->
+         </Grid.RowDefinitions>
+
+         <Button Name="SawTestBtn" Grid.Row="0"
+                    Style="{DynamicResource OmagCut_YellowIconButton}">
+            <Grid>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="80"/>
+                  <ColumnDefinition Width="140"/>
+               </Grid.ColumnDefinitions>
+               <Image Source="{DynamicResource Test-lamaImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
+               <TextBlock Name="SawTestTxt" Grid.Column="1"
+                           Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+            </Grid>
+         </Button>
+
+         <Button Name="PolishingBtn" Grid.Row="1"
+                        Style="{DynamicResource OmagCut_YellowIconButton}">
+            <Grid>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="80"/>
+                  <ColumnDefinition Width="140"/>
+               </Grid.ColumnDefinitions>
+               <Image Source="{DynamicResource LucidaturaImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
+               <TextBlock Name="PolishingTxt" Grid.Column="1"
+                               Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+            </Grid>
+         </Button>
+
+         <Button Name="CopyTemplateBtn" Grid.Row="2"
+                        Style="{DynamicResource OmagCut_YellowIconButton}">
+            <Grid>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="80"/>
+                  <ColumnDefinition Width="140"/>
+               </Grid.ColumnDefinitions>
+               <Image Source="{DynamicResource Copia-dimaImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
+               <TextBlock Name="CopyTemplateTxt" Grid.Column="1"
+                                   Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+            </Grid>
+         </Button>
+
+         <Grid Name="ChangeUC1Grid" Grid.Row="7">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
+            <Button Name="ChangeUC1Btn" Grid.ColumnSpan="2" Style="{DynamicResource OmagCut_YellowIconButton}">
+               <Grid>
+                  <Image Name="ImageCompo9" Source="{DynamicResource NumericKeyboardArrowImg}" />
+                  <!--<TextBlock Name="LabelCompo9" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>-->
+               </Grid>
+            </Button>
+         </Grid>
+
+      </Grid>
+   </Grid>
+</UserControl>

DirectCuts/ControlsDirectCutUC1.xaml.vb

@@ -0,0 +1,142 @@
+Imports EgtUILib
+Public Class ControlsDirectCutUC1
+
+   ' Dichiarazione delle Page UserControl
+   Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
+   Friend m_Polishing As Polishing
+   Friend m_CopyTemplate As CopyTemplateUC
+   Friend m_SawTest As SawTestUC
+
+   ' Stato di visualizzazione della macchina
+   Friend m_bShowMachine As Boolean = False
+   Friend m_nMachLook As Integer = MCH_LOOK.ALL
+   ' Dati generali CN
+   Friend m_CN As CN_generico
+   Private m_bFirst As Boolean = True
+   ' Riferimento alla pagina correntemente attiva
+   Friend m_ActiveDirectCutPage As DirectCutPages = DirectCutPages.DirectCut
+   ' Variabili che indicano attivazione paginette con bottoni macchina
+   Private m_ControlsBtn_IsActive As Boolean
+
+   Public Shared m_dZSafe As Double = 52
+
+   ' Variabile che indica se sono attivi i bottoni macchina nuovi o vecchi
+   Friend m_NewMachineButtonsType As Boolean
+   ' Indica che la finestra del talio Singolo deve essere di tipo manuale
+   Friend m_bManulaCut As Boolean = False
+
+   Enum DirectCutPages
+      DirectCut
+      DirectCut1
+      Polishing
+      CopyTemplate
+      SawTest
+   End Enum
+
+   Private Sub ControlsDirectCutUC_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
+      ' leggo la configurazione del programma per i nuovi tagli manuali
+      m_bManulaCut = GetPrivateProfileInt(S_GENERAL, K_MANUAL_CUT, 0, m_MainWindow.GetIniFile()) <> 0
+
+      'Creazione delle Page UserControl
+      m_SawTest = New SawTestUC
+      m_Polishing = New Polishing
+      m_CopyTemplate = New CopyTemplateUC
+
+      'Posizionemento nella griglia delle Page UserControl
+      m_SawTest.SetValue(Grid.RowProperty, 1)
+      m_Polishing.SetValue(Grid.RowProperty, 1)
+      m_CopyTemplate.SetValue(Grid.RowProperty, 1)
+
+      ' assegno i nomi ai pulsanti
+      SawTestTxt.Text = EgtMsg(90207)
+      PolishingTxt.Text = EgtMsg(90231)
+      'CopyTemplateBtn.Content = EgtMsg(90209)
+      CopyTemplateTxt.Text = EgtMsg(90209)
+      'SquaringTxt.Text = "Squaring"
+
+   End Sub
+
+   Private Sub ControlsDirectCutUC1_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
+      ' Se rientro da simulazione
+      If m_ActiveDirectCutPage = DirectCutPages.SawTest Then
+         LeftButtonGrid.Children.Add(m_SawTest)
+         Return
+      ElseIf m_ActiveDirectCutPage = DirectCutPages.CopyTemplate Then
+         Me.LeftButtonGrid.Children.Add(m_CopyTemplate)
+         Return
+      ElseIf m_ActiveDirectCutPage = DirectCutPages.Polishing Then
+         Me.LeftButtonGrid.Children.Add(m_Polishing)
+         Return
+      End If
+
+      ' Caso standard
+      m_ActiveDirectCutPage = DirectCutPages.DirectCut1
+
+      ' Attivo le lavorazioni solo se esiste il grezzo e se presente testa H1
+      Dim bRawOk As Boolean = (GetRawHeight() > EPS_SMALL)
+      Dim bH1Exists As Boolean = (EgtGetHeadId("H1") <> GDB_ID.NULL)
+
+      PolishingBtn.IsEnabled = (bRawOk And m_MainWindow.m_CurrentMachine.bPolishing)
+      SawTestBtn.IsEnabled = (bRawOk And bH1Exists)
+      CopyTemplateBtn.IsEnabled = bH1Exists
+
+      ' aggiorno la visualizzazione dei parametri
+      ReloadParam()
+
+      ' Nascondo i pezzi in parcheggio
+      HideParkedParts()
+      EgtZoom(ZM.ALL)
+
+   End Sub
+
+   ' ricarica i dati utensili
+   Public Sub ReloadParam()
+      Dim sCurrSawing As String = m_MainWindow.m_CurrentMachine.sCurrSawing
+      Dim sCurrSaw As String = m_MainWindow.m_CurrentMachine.sCurrSaw
+      Dim bSaw As Boolean = False
+
+      ' se esiste una lavorazione di lama corrente vuol dire che deve essere preferita
+      If Not String.IsNullOrEmpty(sCurrSaw) And Not String.IsNullOrEmpty(sCurrSawing) Then
+         bSaw = EgtSetCalcTool(sCurrSaw, "H1", 1)
+      End If
+      'm_SingleCut.SetEnableParam(bSaw)
+      'm_MultipleCut.SetEnableParam(bSaw)
+      'm_GridCut.SetEnableParam(bSaw)
+   End Sub
+
+#Region "COMMAND CLICK BTN"
+   Private Sub SawTestBtn_Click(sender As Object, e As RoutedEventArgs) Handles SawTestBtn.Click
+      LeftButtonGrid.Children.Add(m_SawTest)
+      m_ActiveDirectCutPage = DirectCutPages.SawTest
+   End Sub
+
+   Private Sub PolishingBtn_Click(sender As Object, e As RoutedEventArgs) Handles PolishingBtn.Click
+      LeftButtonGrid.Children.Add(m_Polishing)
+      m_ActiveDirectCutPage = DirectCutPages.Polishing
+   End Sub
+
+   Private Sub CopyTemplateBtn_Click(sender As Object, e As RoutedEventArgs) Handles CopyTemplateBtn.Click
+      LeftButtonGrid.Children.Add(m_CopyTemplate)
+      m_ActiveDirectCutPage = DirectCutPages.CopyTemplate
+   End Sub
+
+   Private Sub ChangeUC1Btn_Click(sender As Object, e As RoutedEventArgs) Handles ChangeUC1Btn.Click
+      DirectCutPage_Unloaded(Nothing, Nothing)
+      m_ActiveDirectCutPage = DirectCutPages.DirectCut1
+      m_MainWindow.m_DirectCutPageUC.LoadDirectCutUC()
+   End Sub
+
+#End Region    ' Command Click Btn
+
+   Friend Sub DirectCutPage_Unloaded(sender As Object, e As RoutedEventArgs) Handles Me.Unloaded
+      Select Case m_ActiveDirectCutPage
+         Case DirectCutPages.SawTest
+            LeftButtonGrid.Children.Remove(m_SawTest)
+         Case DirectCutPages.Polishing
+            LeftButtonGrid.Children.Remove(m_Polishing)
+         Case DirectCutPages.CopyTemplate
+            LeftButtonGrid.Children.Remove(m_CopyTemplate)
+      End Select
+   End Sub
+
+End Class

DirectCuts/CopyTemplateUC.xaml.vb

@@ -5,6 +5,8 @@ Public Class CopyTemplateUC
    ' Riferimenti a pagine
    Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
    Private WithEvents m_CurrProjPage As CurrentProjectPageUC
+   Private m_refControlDirectCutUC As ControlsDirectCutUC1
+
    ' Flag di pagina attiva
    Private m_bActive As Boolean = False
    ' Array stringhe modalità di acquisizione dei punti
@@ -59,6 +61,7 @@ Public Class CopyTemplateUC
 
    Private Sub CopyTemplate_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
       m_CurrProjPage = m_MainWindow.m_CurrentProjectPageUC
+      m_refControlDirectCutUC = m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC1
       m_bActive = True
       SaveBtn.IsEnabled = False
       LineBtn.IsChecked = True
@@ -254,8 +257,7 @@ Public Class CopyTemplateUC
    End Sub
 
    Private Sub ExitBtn_Click(sender As Object, e As RoutedEventArgs) Handles ExitBtn.Click
-      m_MainWindow.m_DirectCutPageUC.LeftButtonGrid.Children.Remove(Me)
-      m_MainWindow.m_DirectCutPageUC.m_ActiveDirectCutPage = DirectCutPageUC.DirectCutPages.DirectCut
+      m_refControlDirectCutUC.LeftButtonGrid.Children.Remove(Me)
    End Sub
 
    Private Function EraseCopyTemplatePart() As Boolean

DirectCuts/DirectCutPageUC.xaml

@@ -28,10 +28,10 @@
             <ColumnDefinition Width="7*"/>
          </Grid.ColumnDefinitions>
 
-          <Button Name="PhotoBtn" Grid.Column="0" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
+         <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}">
+         <Button Name="RawPartBtn" Grid.Column="1" Style="{DynamicResource OmagCut_RightGrayGradientYellowButton}">
             <Image Source="{DynamicResource RawPartImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
          </Button>
 
@@ -42,25 +42,27 @@
 
       </Grid>
 
-         <!-- Definizione della Grid laterale -->
-      <Grid Name="LeftButtonGrid" Grid.Row="1" >
-         <Grid.RowDefinitions>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="7*"/>
-         </Grid.RowDefinitions>
-
-         <!-- Definizione della Grid laterale -->
-         <Grid Name="CutTypeGrid" Grid.Row="1" >
+      <!-- Definizione della Grid laterale -->
+      <!--
+        <Grid Name="LeftButtonGrid" Grid.Row="1" >
             <Grid.RowDefinitions>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
-               <RowDefinition Height="1*"/>
+                <RowDefinition Height="1*"/>
+                <RowDefinition Height="7*"/>
+            </Grid.RowDefinitions>
+
+            -->
+      <!-- Definizione della Grid laterale -->
+      <!--<Grid Name="CutTypeGrid" Grid.Row="1" >
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="1*"/>
+                    <RowDefinition Height="1*"/>
+                    <RowDefinition Height="1*"/>
+                    <RowDefinition Height="1*"/>
+                    <RowDefinition Height="1*"/>
+                    <RowDefinition Height="1*"/>
+                    <RowDefinition Height="1*"/>
+                    <RowDefinition Height="1*"/>
+                    <RowDefinition Height="1*"/>
                 </Grid.RowDefinitions>
                 <Button Name="ManualBtn" Grid.Column="2" Grid.Row="0"                    
                         Style="{DynamicResource OmagCut_YellowIconButton}">
@@ -140,7 +142,7 @@
                                    Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
                     </Grid>
                 </Button>
-             
+
                 <Button Name="PolishingBtn" Grid.Row="6"
                         Style="{DynamicResource OmagCut_YellowIconButton}">
                     <Grid>
@@ -154,36 +156,51 @@
                     </Grid>
                 </Button>
 
-                <Button Name="CopyTemplateBtn" Grid.Row="7"
-                    Style="{DynamicResource OmagCut_YellowIconButton}">
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="80"/>
-                        <ColumnDefinition Width="140"/>
-                    </Grid.ColumnDefinitions>
-                    <Image Source="{DynamicResource Copia-dimaImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
-                    <TextBlock Name="CopyTemplateTxt" Grid.Column="1"
-                               Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-                </Grid>
-            </Button>
-             
-            <Button Name="SawTestBtn" Grid.Row="8"
-                    Style="{DynamicResource OmagCut_YellowIconButton}">
-               <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="80"/>
-                        <ColumnDefinition Width="140"/>
-                    </Grid.ColumnDefinitions>
-                    <Image Source="{DynamicResource Test-lamaImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
-                        <TextBlock Name="SawTestTxt" Grid.Column="1"
-                               Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-            </Grid>
-            </Button>
+                -->
+      <!--<Button Name="CopyTemplateBtn" Grid.Row="7"
+                        Style="{DynamicResource OmagCut_YellowIconButton}">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="80"/>
+                            <ColumnDefinition Width="140"/>
+                        </Grid.ColumnDefinitions>
+                        <Image Source="{DynamicResource Copia-dimaImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
+                        <TextBlock Name="CopyTemplateTxt" Grid.Column="1"
+                                   Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                    </Grid>
+                </Button>-->
+      <!--
+                <Button Name="SquaringBtn" Grid.Row="7"
+                        Style="{DynamicResource OmagCut_YellowIconButton}">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="80"/>
+                            <ColumnDefinition Width="140"/>
+                        </Grid.ColumnDefinitions>
+                        <Image Source="{DynamicResource Copia-dimaImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
+                        <TextBlock Name="SquaringTxt" Grid.Column="1"
+                                   Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                    </Grid>
+                </Button>
+
+                <Button Name="SawTestBtn" Grid.Row="8"
+                    Style="{DynamicResource OmagCut_YellowIconButton}">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="80"/>
+                            <ColumnDefinition Width="140"/>
+                        </Grid.ColumnDefinitions>
+                        <Image Source="{DynamicResource Test-lamaImg}" Style="{DynamicResource OmagCut_ButtonIcon}" Grid.Column="0" />
+                        <TextBlock Name="SawTestTxt" Grid.Column="1"
+                           Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                    </Grid>
+                </Button>
+
+            </Grid>-->
+      <!--
+
+        </Grid>-->
 
-        </Grid>
-      
-      </Grid>
-      
       <!-- Definizione della Grid laterale per bottoni macchina -->
       <Grid Name="MachineButtonGrid" Grid.Row="1">
          <Grid.RowDefinitions>
@@ -201,7 +218,8 @@
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="5*"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="4*"/>
             <!--<ColumnDefinition Width="1*"/>-->
             <ColumnDefinition Width="1*"/>
          </Grid.ColumnDefinitions>
@@ -215,23 +233,23 @@
                Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}">
             <Image Source="{DynamicResource VacuumImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
          </ToggleButton>
-          
-          <!--Comando asse X-Y-->
-          <ToggleButton Name="XYBtn" Grid.Column="2"
+
+         <!--Comando asse X-Y-->
+         <ToggleButton Name="XYBtn" Grid.Column="2"
                Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}">
-                <Image Source="{DynamicResource XYJogImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
+            <Image Source="{DynamicResource XYJogImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
          </ToggleButton>
-          
-          <!--Comando asse Z-C-->
-          <ToggleButton Name="ZCBtn" Grid.Column="3"   
+
+         <!--Comando asse Z-C-->
+         <ToggleButton Name="ZCBtn" Grid.Column="3"   
                Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}">
-              <Image Source="{DynamicResource ZCJogImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
-          </ToggleButton>
+            <Image Source="{DynamicResource ZCJogImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
+         </ToggleButton>
 
          <!--Comando asse Z-B-->
          <ToggleButton Name="ZBBtn" Grid.Column="4"
                Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}">
-                <Image Source="{DynamicResource ZBJogImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
+            <Image Source="{DynamicResource ZBJogImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
          </ToggleButton>
 
          <!--Comando Remote-->
@@ -240,10 +258,16 @@
             <!--<Image Source="{DynamicResource VacuumImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>-->
          </ToggleButton>
 
+         <!--Parking-->
+         <ToggleButton Name="ParkingBtn" Grid.Column="6"
+              Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}">
+            <Image Source="{DynamicResource ParkingImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
+         </ToggleButton>
+
          <!--Comando Manula/MDI-->
-         <Button Name="ManualModeBtn" Grid.Column="7"
+         <Button Name="ManualModeBtn" Grid.Column="8"
                 Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
-             <Image Source="{DynamicResource ManualImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
+            <Image Source="{DynamicResource ManualImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
          </Button>
 
       </Grid>

DirectCuts/DirectCutPageUC.xaml.vb

@@ -7,18 +7,20 @@ Public Class DirectCutPageUC
    Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
    Friend m_MachineButtons As MachineButtonsUC
    Friend m_ManualAxesMove As ManualAxesMoveUC
-   Friend m_SingleCut As SingleCutUC
-   Friend m_SingleDrill As SingleDrillUC
-   ' nuova finestra per i comandi per il taglio manuale nuovo
-   Friend m_SingleCutAuto As SingleCutAuto
-   Friend m_MultipleCut As MultipleCut
-   Friend m_GridCut As GridCut
-   Friend m_FlatteningCut As FlatteningCut
-   Friend m_Polishing As Polishing
-   Friend m_CopyTemplate As CopyTemplateUC
-   Friend m_SawTest As SawTestUC
+
    Friend m_ControlsMachineButton As ControlsMachineButtonUC
    Friend m_VacuumMachineButton As VacuumMachineButtonUC
+   Friend m_ControlsDirectCutUC As ControlsDirectCutUC
+   Friend m_ControlsDirectCutUC1 As ControlsDirectCutUC1
+
+   Friend m_ActiveControl As Controls
+   Enum Controls
+      DirectCutUC
+      DirectCutUC1
+      MachineButtonUC
+      VacuumButtonUC
+   End Enum
+
 
    ' Stato di visualizzazione della macchina
    Friend m_bShowMachine As Boolean = False
@@ -26,8 +28,6 @@ Public Class DirectCutPageUC
    ' Dati generali CN
    Friend m_CN As CN_generico
    Private m_bFirst As Boolean = True
-   ' Riferimento alla pagina correntemente attiva
-   Friend m_ActiveDirectCutPage As DirectCutPages = DirectCutPages.DirectCut
    ' Variabili che indicano attivazione paginette con bottoni macchina
    Private m_ControlsBtn_IsActive As Boolean
 
@@ -41,56 +41,23 @@ Public Class DirectCutPageUC
    ' elenco dei nuovi bottoni
    Private m_ButtonJogList As New List(Of MachineButton)
 
-   Enum DirectCutPages
-      DirectCut
-      ManualAxesMove
-      SingleCut
-      MultipleCut
-      GridCut
-      FlatteningCut
-      Polishing
-      CopyTemplate
-      SawTest
-      SingleCutAuto
-      SingleDrill
-   End Enum
 
    Private Sub DirectCutPage_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
-      ' leggo la configurazione del programma per i nuovi tagli manuali
-      m_bManulaCut = GetPrivateProfileInt(S_GENERAL, K_MANUAL_CUT, 0, m_MainWindow.GetIniFile()) <> 0
-
       'Creazione delle Page UserControl
       m_MachineButtons = New MachineButtonsUC
       m_ManualAxesMove = New ManualAxesMoveUC
-      m_SingleCut = New SingleCutUC
-      m_SingleDrill = New SingleDrillUC
-      m_MultipleCut = New MultipleCut
-      m_GridCut = New GridCut
-      m_FlatteningCut = New FlatteningCut
-      m_Polishing = New Polishing
-      m_CopyTemplate = New CopyTemplateUC
-      m_SawTest = New SawTestUC
       m_ControlsMachineButton = New ControlsMachineButtonUC
       m_VacuumMachineButton = New VacuumMachineButtonUC
-      ' Costruisco la finestra per il nuovo tipo di taglio manuale
-      m_SingleCutAuto = New SingleCutAuto
+      m_ControlsDirectCutUC = New ControlsDirectCutUC
+      m_ControlsDirectCutUC1 = New ControlsDirectCutUC1
 
       'Posizionemento nella griglia delle Page UserControl
       m_MachineButtons.SetValue(Grid.RowProperty, 2)
       m_MachineButtons.SetValue(Grid.ColumnSpanProperty, 7)
       m_ManualAxesMove.SetValue(Grid.RowProperty, 1)
-      If m_bManulaCut Then
-         m_SingleCutAuto.SetValue(Grid.RowProperty, 1)
-      Else
-         m_SingleCut.SetValue(Grid.RowProperty, 1)
-      End If
-      m_SingleDrill.SetValue(Grid.RowProperty, 1)
-      m_MultipleCut.SetValue(Grid.RowProperty, 1)
-      m_GridCut.SetValue(Grid.RowProperty, 1)
-      m_FlatteningCut.SetValue(Grid.RowProperty, 1)
-      m_Polishing.SetValue(Grid.RowProperty, 1)
-      m_CopyTemplate.SetValue(Grid.RowProperty, 1)
-      m_SawTest.SetValue(Grid.RowProperty, 1)
+
+      m_ControlsDirectCutUC.SetValue(Grid.RowProperty, 1)
+      m_ControlsDirectCutUC1.SetValue(Grid.RowProperty, 1)
       m_ControlsMachineButton.SetValue(Grid.RowProperty, 1)
       m_VacuumMachineButton.SetValue(Grid.RowProperty, 1)
 
@@ -104,31 +71,6 @@ Public Class DirectCutPageUC
          VacuumMachineBtn.Visibility = Windows.Visibility.Collapsed
       End If
 
-      If GetPrivateProfileInt(S_NUMERICALCONTROL, K_TYPE, 0, m_MainWindow.GetMachIniFile()) = 0 Then
-         ManualBtn.IsEnabled = False
-         ManualModeBtn.Visibility = Windows.Visibility.Hidden
-      End If
-
-      ' ManualBtn.Content = EgtMsg(90201)
-      ManualTxt.Text = EgtMsg(90201)
-      'SingleCutBtn.Content = EgtMsg(90202)
-      SingleCutTxt.Text = EgtMsg(90202)
-      'SingleDrillBtn.Content = "Foro singolo"
-      SingleDrillTxt.Text = EgtMsg(90258)
-      'MultipleCutBtn.Content = EgtMsg(90203)
-      MultipleCutTxt.Text = EgtMsg(90203)
-      'GridCutBtn.Content = EgtMsg(90204)
-      GridCutTxt.Text = EgtMsg(90204)
-      'FlatteningCutBtn.Content = EgtMsg(90206)
-      FlatteningCutTxt.Text = EgtMsg(90206)
-      'PolishingBtn.Content = EgtMsg(90231)
-      PolishingTxt.Text = EgtMsg(90231)
-      'CopyTemplateBtn.Content = EgtMsg(90209)
-      CopyTemplateTxt.Text = EgtMsg(90209)
-      'SawTestBtn.Content = EgtMsg(90207)
-      SawTestTxt.text = EgtMsg(90207)
-
-
       ' nuovi bottoni 20/05/2021 - modifica specifiche 04/08/2021
       ' leggo il numero di assi attivi nella macchina
       Dim AxesNumber = GetPrivateProfileInt(S_AXES, K_AXESNUM, 5, m_MainWindow.GetMachIniFile())
@@ -176,59 +118,10 @@ Public Class DirectCutPageUC
       ' lo stato di questi comandi vieni carico dalla lettura del PLC (refresh)
       '----------- FINE NUOVI BOTTONI------------
 
-      ' Se rientro da simulazione
-      If m_ActiveDirectCutPage = DirectCutPages.SingleCut Then
-         LeftButtonGrid.Children.Add(m_SingleCut)
-         Return
-      ElseIf m_ActiveDirectCutPage = DirectCutPages.SingleCutAuto Then
-         LeftButtonGrid.Children.Add(m_SingleCutAuto)
-         Return
-      ElseIf m_ActiveDirectCutPage = DirectCutPages.MultipleCut Then
-         LeftButtonGrid.Children.Add(m_MultipleCut)
-         Return
-      ElseIf m_ActiveDirectCutPage = DirectCutPages.GridCut Then
-         LeftButtonGrid.Children.Add(m_GridCut)
-         Return
-      ElseIf m_ActiveDirectCutPage = DirectCutPages.FlatteningCut Then
-         LeftButtonGrid.Children.Add(m_FlatteningCut)
-         Return
-      ElseIf m_ActiveDirectCutPage = DirectCutPages.Polishing Then
-         LeftButtonGrid.Children.Add(m_Polishing)
-         Return
-      ElseIf m_ActiveDirectCutPage = DirectCutPages.SawTest Then
-         LeftButtonGrid.Children.Add(m_SawTest)
-         Return
-      ElseIf m_ActiveDirectCutPage = DirectCutPages.SingleDrill Then
-         LeftButtonGrid.Children.Add(m_SingleDrill)
-         Return
-      End If
-
-      ' Caso standard
-      m_ActiveDirectCutPage = DirectCutPages.DirectCut
+      LoadLastDirectCutControls()
 
       ' Se macchina fotografica abilitata
       PhotoBtn.IsEnabled = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.MAN_PHOTO)
-
-      ' Attivo le lavorazioni solo se esiste il grezzo e se presente testa H1
-      Dim bRawOk As Boolean = (GetRawHeight() > EPS_SMALL)
-      Dim bH1Exists As Boolean = (EgtGetHeadId("H1") <> GDB_ID.NULL)
-
-      ManualBtn.IsEnabled = bH1Exists
-      ' sviluppo rimasto in sospeso
-      If m_bManulaCut Then
-         ' anche se non è presente un grezzo mantengo abilitato il bottone
-         SingleCutBtn.IsEnabled = True
-      Else
-         SingleCutBtn.IsEnabled = bRawOk
-      End If
-      MultipleCutBtn.IsEnabled = bRawOk
-      GridCutBtn.IsEnabled = bRawOk
-      SingleDrillBtn.IsEnabled = (bRawOk And bH1Exists)
-      FlatteningCutBtn.IsEnabled = (bRawOk And bH1Exists)
-      PolishingBtn.IsEnabled = (bRawOk And m_MainWindow.m_CurrentMachine.bPolishing)
-      SawTestBtn.IsEnabled = (bRawOk And bH1Exists)
-      CopyTemplateBtn.IsEnabled = bH1Exists
-
       ' aggiorno la visualizzazione dei parametri
       ReloadParam()
 
@@ -247,9 +140,9 @@ Public Class DirectCutPageUC
       If Not String.IsNullOrEmpty(sCurrSaw) And Not String.IsNullOrEmpty(sCurrSawing) Then
          bSaw = EgtSetCalcTool(sCurrSaw, "H1", 1)
       End If
-      m_SingleCut.SetEnableParam(bSaw)
-      m_MultipleCut.SetEnableParam(bSaw)
-      m_GridCut.SetEnableParam(bSaw)
+      m_ControlsDirectCutUC.m_SingleCut.SetEnableParam(bSaw)
+      m_ControlsDirectCutUC.m_MultipleCut.SetEnableParam(bSaw)
+      m_ControlsDirectCutUC.m_GridCut.SetEnableParam(bSaw)
    End Sub
 
    Private Sub SetVisibilityJogButtuns()
@@ -257,6 +150,7 @@ Public Class DirectCutPageUC
       ZCBtn.Visibility = Visibility.Collapsed
       ZBBtn.Visibility = Visibility.Collapsed
       RemoteBtn.Visibility = Visibility.Collapsed
+      ParkingBtn.Visibility = Visibility.Collapsed
 
       Dim Item As MachineButton = Nothing
       For Each Item In m_ButtonJogList
@@ -277,6 +171,10 @@ Public Class DirectCutPageUC
                RemoteBtn.Visibility = Visibility.Visible
                RemoteBtn.Foreground = Brushes.White
                RemoteBtn.Content = "Remote"
+            Case K_PARKING
+               ParkingBtn.Visibility = Visibility.Visible
+               ParkingBtn.Foreground = Brushes.White
+               ParkingBtn.ToolTip = "Parking"
          End Select
       Next
    End Sub
@@ -305,57 +203,6 @@ Public Class DirectCutPageUC
       m_MainWindow.m_PrevActivePage = MainWindow.Pages.DirectCut
    End Sub
 
-   Private Sub ManualBtn_Click(sender As Object, e As RoutedEventArgs) Handles ManualBtn.Click
-      LeftButtonGrid.Children.Add(m_ManualAxesMove)
-      m_ActiveDirectCutPage = DirectCutPages.ManualAxesMove
-   End Sub
-
-   Private Sub SingleCutBtn_Click(sender As Object, e As RoutedEventArgs) Handles SingleCutBtn.Click
-      If m_bManulaCut Then
-         LeftButtonGrid.Children.Add(m_SingleCutAuto)
-         m_ActiveDirectCutPage = DirectCutPages.SingleCutAuto
-      Else
-         LeftButtonGrid.Children.Add(m_SingleCut)
-         m_ActiveDirectCutPage = DirectCutPages.SingleCut
-      End If
-
-   End Sub
-
-   Private Sub MultipleCutBtn_Click(sender As Object, e As RoutedEventArgs) Handles MultipleCutBtn.Click
-      LeftButtonGrid.Children.Add(m_MultipleCut)
-      m_ActiveDirectCutPage = DirectCutPages.MultipleCut
-   End Sub
-
-   Private Sub GridCutBtn_Click(sender As Object, e As RoutedEventArgs) Handles GridCutBtn.Click
-      LeftButtonGrid.Children.Add(m_GridCut)
-      m_ActiveDirectCutPage = DirectCutPages.GridCut
-   End Sub
-
-   Private Sub FlatteningCutBtn_Click(sender As Object, e As RoutedEventArgs) Handles FlatteningCutBtn.Click
-      LeftButtonGrid.Children.Add(m_FlatteningCut)
-      m_ActiveDirectCutPage = DirectCutPages.FlatteningCut
-   End Sub
-
-   Private Sub PolishingBtn_Click(sender As Object, e As RoutedEventArgs) Handles PolishingBtn.Click
-      LeftButtonGrid.Children.Add(m_Polishing)
-      m_ActiveDirectCutPage = DirectCutPages.Polishing
-   End Sub
-
-   Private Sub CopyTemplateBtn_Click(sender As Object, e As RoutedEventArgs) Handles CopyTemplateBtn.Click
-      LeftButtonGrid.Children.Add(m_CopyTemplate)
-      m_ActiveDirectCutPage = DirectCutPages.CopyTemplate
-   End Sub
-
-   Private Sub SawTestBtn_Click(sender As Object, e As RoutedEventArgs) Handles SawTestBtn.Click
-      LeftButtonGrid.Children.Add(m_SawTest)
-      m_ActiveDirectCutPage = DirectCutPages.SawTest
-   End Sub
-
-   Private Sub SingleDrillBtn_Click(sender As Object, e As RoutedEventArgs) Handles SingleDrillBtn.Click
-      LeftButtonGrid.Children.Add(m_SingleDrill)
-      m_ActiveDirectCutPage = DirectCutPages.SingleDrill
-   End Sub
-
    Private Sub ControlsMachineBtn_Click(sender As Object, e As RoutedEventArgs) Handles ControlsMachineBtn.Click
       If ControlsMachineBtn.IsChecked Then
          m_ControlsMachineButton = New ControlsMachineButtonUC
@@ -383,7 +230,21 @@ Public Class DirectCutPageUC
       End If
    End Sub
 
-   '------------------NUOVI BOTTONI PER GESTIONE JOYSTICK-------------------------------------------------
+   Friend Sub LoadDirectCutUC()
+      ManageControls()
+      m_ActiveControl = Controls.DirectCutUC
+      MachineButtonGrid.Children.Add(m_ControlsDirectCutUC)
+   End Sub
+
+   Friend Sub LoadDirectCutUC1()
+      ManageControls()
+      m_ActiveControl = Controls.DirectCutUC1
+      MachineButtonGrid.Children.Add(m_ControlsDirectCutUC1)
+   End Sub
+
+
+#Region "[JogButtons]"
+
    Private Sub XYBtn_Click(sender As Object, e As RoutedEventArgs) Handles XYBtn.Click
       ' riverco in elenco il bottone XYJog
       Dim XYJogButton As MachineButton = Nothing
@@ -513,7 +374,45 @@ Public Class DirectCutPageUC
       End If
    End Sub
 
-   '------------------NUOVI BOTTONI PER GESTIONE JOYSTICK-------------------------------------------------
+   Private Sub ParkingBtn_Click(sender As Object, e As RoutedEventArgs) Handles ParkingBtn.Click
+      Dim ParkingButton As MachineButton = Nothing
+      Dim ItemButton As MachineButton = Nothing
+      For Each ItemButton In m_ButtonJogList
+         If ItemButton.StateFlag = K_PARKING Then
+            ParkingButton = ItemButton
+            Exit For
+         End If
+      Next
+      If IsNothing(ParkingButton) Then Return
+      ' eseguo lo script lua associato
+      Dim CurrentBtn As Primitives.ToggleButton = e.Source
+      Dim sLuaFileName As String = String.Empty
+      ' verifico lo stato del bottone per avviare il giusto script
+      If CurrentBtn.IsChecked() Then
+         sLuaFileName = ParkingButton.TLuaScriptName
+      Else
+         sLuaFileName = ParkingButton.FLuaScriptName
+      End If
+      ParkingButton.ExecuteMDICommand(sLuaFileName)
+   End Sub
+
+   Friend Sub ParkingStateChanged(bParkingState As Boolean)
+      ' devo decodificare il tipo di pulsante, quindi eseguire la conversione...
+      Dim ParkingButton As TwoStateButton = Nothing
+      For Each MachineButton As MachineButton In m_ButtonJogList
+         If MachineButton.StateFlag.Trim = K_PARKING Then
+            ParkingButton = MachineButton
+            Exit For
+         End If
+      Next
+      If Not IsNothing(ParkingButton) Then
+         ParkingButton.SetIsChecked(bParkingState)
+         ParkingButton.IsChecked = bParkingState
+      End If
+   End Sub
+
+#End Region    '[JogButtons]
+
    Private Sub MachViewModeBtn_Click(sender As Object, e As RoutedEventArgs) Handles MachViewModeBtn.Click
       If m_bShowMachine Then
          ' aggiorno lo stato
@@ -532,36 +431,36 @@ Public Class DirectCutPageUC
    End Sub
 
    Friend Sub DirectCutPage_Unloaded(sender As Object, e As RoutedEventArgs) Handles Me.Unloaded
-      Select Case m_ActiveDirectCutPage
-         Case DirectCutPages.DirectCut Or DirectCutPages.ManualAxesMove
-            ' Non è necessario fare alcunché
-         Case DirectCutPages.SingleCut
-            LeftButtonGrid.Children.Remove(m_SingleCut)
-         Case DirectCutPages.SingleCutAuto
-            LeftButtonGrid.Children.Remove(m_SingleCutAuto)
-         Case DirectCutPages.MultipleCut
-            LeftButtonGrid.Children.Remove(m_MultipleCut)
-         Case DirectCutPages.GridCut
-            LeftButtonGrid.Children.Remove(m_GridCut)
-         Case DirectCutPages.FlatteningCut
-            LeftButtonGrid.Children.Remove(m_FlatteningCut)
-         Case DirectCutPages.Polishing
-            LeftButtonGrid.Children.Remove(m_Polishing)
-         Case DirectCutPages.CopyTemplate
-            LeftButtonGrid.Children.Remove(m_CopyTemplate)
-         Case DirectCutPages.SawTest
-            LeftButtonGrid.Children.Remove(m_SawTest)
-         Case DirectCutPages.SingleDrill
-            LeftButtonGrid.Children.Remove(m_SingleDrill)
+      ManageControls()
+   End Sub
+
+   Friend Sub ManageControls()
+      Select Case m_ActiveControl
+         Case Controls.DirectCutUC
+            MachineButtonGrid.Children.Remove(m_ControlsDirectCutUC)
+            m_ControlsDirectCutUC.DirectCutPage_Unloaded(Nothing, Nothing)
+         Case Controls.DirectCutUC1
+            MachineButtonGrid.Children.Remove(m_ControlsDirectCutUC1)
+            m_ControlsDirectCutUC1.DirectCutPage_Unloaded(Nothing, Nothing)
+         Case Controls.MachineButtonUC
+            MachineButtonGrid.Children.Remove(m_ControlsMachineButton)
+            ControlsMachineBtn.IsChecked = False
+         Case Controls.VacuumButtonUC
+            MachineButtonGrid.Children.Remove(m_VacuumMachineButton)
+            VacuumMachineBtn.IsChecked = False
+      End Select
+   End Sub
+
+   Friend Sub LoadLastDirectCutControls()
+      Select Case m_ActiveControl
+         Case Controls.DirectCutUC
+            MachineButtonGrid.Children.Add(m_ControlsDirectCutUC)
+         Case Controls.DirectCutUC1
+            MachineButtonGrid.Children.Add(m_ControlsDirectCutUC1)
+         Case Else
+            m_ActiveControl = Controls.DirectCutUC
+            MachineButtonGrid.Children.Add(m_ControlsDirectCutUC)
       End Select
-      If ControlsMachineBtn.IsChecked Then
-         MachineButtonGrid.Children.Remove(m_ControlsMachineButton)
-         ControlsMachineBtn.IsChecked = False
-      End If
-      If VacuumMachineBtn.IsChecked Then
-         MachineButtonGrid.Children.Remove(m_VacuumMachineButton)
-         VacuumMachineBtn.IsChecked = False
-      End If
    End Sub
 
    Private Sub ManualModeBtn_Click(sender As Object, e As RoutedEventArgs) Handles ManualModeBtn.Click

DirectCuts/FlatteningCut.xaml.vb

@@ -190,7 +190,7 @@ Public Class FlatteningCut
       ' Se non vado in simulazione
       If Not m_bSimul Then
          ' Dichiaro sottopagina da non riattivare
-         m_MainWindow.m_DirectCutPageUC.m_ActiveDirectCutPage = DirectCutPageUC.DirectCutPages.DirectCut
+         m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.m_ActiveDirectCutPage = ControlsDirectCutUC.DirectCutPages.DirectCut
          ' Rimuovo layer temporaneo per crocette
          EgtErase(m_nTempLay)
          ' Rimuovo eventuale pezzo per taglio diretto
@@ -568,6 +568,7 @@ Public Class FlatteningCut
       m_bSimul = True
       m_CurrProjPage.m_SceneButtons.MeasureBtn.IsChecked = False
       m_CurrProjPage.CurrProjGrid.Visibility = Windows.Visibility.Hidden
+      m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.LeftButtonGrid.Children.Remove(Me)
       m_CurrProjPage.CurrentProjectPageGrid.Children.Remove(m_MainWindow.m_DirectCutPageUC)
       m_MainWindow.m_PrevActivePage = MainWindow.Pages.DirectCut
       m_CurrProjPage.CurrentProjectPageGrid.Children.Add(m_MainWindow.m_SimulationPage)
@@ -610,7 +611,7 @@ Public Class FlatteningCut
    Private Sub ExitBtn_Click(sender As Object, e As RoutedEventArgs) Handles ExitBtn.Click
       EgtMdbSetGeneralParam(MCH_GP.SAFEZ, DirectCutPageUC.m_dZSafe)
       EgtMdbSave()
-      m_MainWindow.m_DirectCutPageUC.LeftButtonGrid.Children.Remove(Me)
+      m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.LeftButtonGrid.Children.Remove(Me)
    End Sub
 
    ' ricavo l'ingombro di lavorazione in funzione dell'utensile selezionato

DirectCuts/GridCut.xaml.vb

@@ -168,7 +168,7 @@ Public Class GridCut
       ' Se non vado in simulazione
       If Not m_bSimul Then
          ' Dichiaro sottopagina da non riattivare
-         m_MainWindow.m_DirectCutPageUC.m_ActiveDirectCutPage = DirectCutPageUC.DirectCutPages.DirectCut
+         m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.m_ActiveDirectCutPage = ControlsDirectCutUC.DirectCutPages.DirectCut
          ' Rimuovo layer temporaneo per crocette
          EgtErase(m_nTempLay)
          ' Rimuovo eventuale pezzo per taglio diretto
@@ -494,6 +494,7 @@ Public Class GridCut
       m_bSimul = True
       m_CurrProjPage.m_SceneButtons.MeasureBtn.IsChecked = False
       m_CurrProjPage.CurrProjGrid.Visibility = Windows.Visibility.Hidden
+      m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.LeftButtonGrid.Children.Remove(Me)
       m_CurrProjPage.CurrentProjectPageGrid.Children.Remove(m_MainWindow.m_DirectCutPageUC)
       m_MainWindow.m_PrevActivePage = MainWindow.Pages.DirectCut
       m_CurrProjPage.CurrentProjectPageGrid.Children.Add(m_MainWindow.m_SimulationPage)
@@ -534,7 +535,7 @@ Public Class GridCut
    End Sub
 
    Private Sub ExitBtn_Click(sender As Object, e As RoutedEventArgs) Handles ExitBtn.Click
-      m_MainWindow.m_DirectCutPageUC.LeftButtonGrid.Children.Remove(Me)
+      m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.LeftButtonGrid.Children.Remove(Me)
    End Sub
 
    Private Function CreateGridCut() As Boolean

DirectCuts/ManualAxesMoveUC.xaml.vb

@@ -21,10 +21,12 @@ Public Class ManualAxesMoveUC
       ' Messaggi
       L1SawThChBx.Content = EgtMsg(90232)   ' Spessore lama
       L2SawThChBx.Content = EgtMsg(90232)   ' Spessore lama
+
       AddHandler m_Timer.Tick, AddressOf Timer_tick
    End Sub
 
    Private Sub ManualAxesMove_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
+      m_CN = m_MainWindow.m_DirectCutPageUC.m_CN
       ' Valori feed e speed da lama corrente
       Dim dTemp As Double = 0
       EgtTdbSetCurrTool(m_MainWindow.m_CurrentProjectPageUC.ToolTxBx.Text)
@@ -338,7 +340,7 @@ Public Class ManualAxesMoveUC
    End Function
 
    Private Sub BackBtn_Click(sender As Object, e As RoutedEventArgs) Handles BackBtn.Click
-      m_MainWindow.m_DirectCutPageUC.LeftButtonGrid.Children.Remove(Me)
+      m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.LeftButtonGrid.Children.Remove(Me)
    End Sub
 
    Private Sub G0Btn_Checked(sender As Object, e As RoutedEventArgs) Handles G0Btn.Checked

DirectCuts/MultipleCut.xaml.vb

@@ -195,7 +195,7 @@ Public Class MultipleCut
       ' Se non vado in simulazione
       If Not m_bSimul Then
          ' Dichiaro sottopagina da non riattivare
-         m_MainWindow.m_DirectCutPageUC.m_ActiveDirectCutPage = DirectCutPageUC.DirectCutPages.DirectCut
+         m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.m_ActiveDirectCutPage = ControlsDirectCutUC.DirectCutPages.DirectCut
          ' Rimuovo layer temporaneo per crocette
          EgtErase(m_nTempLay)
          ' Rimuovo eventuale pezzo per taglio diretto
@@ -540,6 +540,7 @@ Public Class MultipleCut
       m_bSimul = True
       m_CurrProjPage.m_SceneButtons.MeasureBtn.IsChecked = False
       m_CurrProjPage.CurrProjGrid.Visibility = Windows.Visibility.Hidden
+      m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.LeftButtonGrid.Children.Remove(Me)
       m_CurrProjPage.CurrentProjectPageGrid.Children.Remove(m_MainWindow.m_DirectCutPageUC)
       m_MainWindow.m_PrevActivePage = MainWindow.Pages.DirectCut
       m_CurrProjPage.CurrentProjectPageGrid.Children.Add(m_MainWindow.m_SimulationPage)
@@ -580,7 +581,7 @@ Public Class MultipleCut
    End Sub
 
    Private Sub ExitBtn_Click(sender As Object, e As RoutedEventArgs) Handles ExitBtn.Click
-      m_MainWindow.m_DirectCutPageUC.LeftButtonGrid.Children.Remove(Me)
+      m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.LeftButtonGrid.Children.Remove(Me)
    End Sub
 
    Private Function CreateMultipleCut() As Boolean

DirectCuts/Polishing.xaml.vb

@@ -6,6 +6,8 @@ Public Class Polishing
    ' Riferimenti a pagine
    Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
    Private WithEvents m_CurrProjPage As CurrentProjectPageUC
+   Private m_refControlDirectCutUC As ControlsDirectCutUC1
+
    ' Flag di pagina attiva
    Private m_bActive As Boolean = False
    ' Flag di simulazione in corso
@@ -30,6 +32,7 @@ Public Class Polishing
    Private Sub Polishing_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
       ' Attivo la pagina
       m_CurrProjPage = m_MainWindow.m_CurrentProjectPageUC
+      m_refControlDirectCutUC = m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC1
       m_bActive = True
       ' Se rientro da simulazione
       If m_bSimul Then
@@ -72,7 +75,7 @@ Public Class Polishing
       ' Se non vado in simulazione
       If Not m_bSimul Then
          ' Dichiaro sottopagina da non riattivare
-         m_MainWindow.m_DirectCutPageUC.m_ActiveDirectCutPage = DirectCutPageUC.DirectCutPages.DirectCut
+         m_refControlDirectCutUC.m_ActiveDirectCutPage = ControlsDirectCutUC1.DirectCutPages.DirectCut
          ' Cancello eventuali lucidature
          RemovePolishings()
          ' Riattivo eventuali lavorazioni presenti
@@ -148,6 +151,7 @@ Public Class Polishing
       m_bSimul = True
       m_CurrProjPage.m_SceneButtons.MeasureBtn.IsChecked = False
       m_CurrProjPage.CurrProjGrid.Visibility = Windows.Visibility.Hidden
+      m_refControlDirectCutUC.LeftButtonGrid.Children.Remove(Me)
       m_CurrProjPage.CurrentProjectPageGrid.Children.Remove(m_MainWindow.m_DirectCutPageUC)
       m_MainWindow.m_PrevActivePage = MainWindow.Pages.DirectCut
       m_CurrProjPage.CurrentProjectPageGrid.Children.Add(m_MainWindow.m_SimulationPage)
@@ -188,7 +192,7 @@ Public Class Polishing
    End Sub
 
    Private Sub ExitBtn_Click(sender As Object, e As RoutedEventArgs) Handles ExitBtn.Click
-      m_MainWindow.m_DirectCutPageUC.LeftButtonGrid.Children.Remove(Me)
+      m_refControlDirectCutUC.LeftButtonGrid.Children.Remove(Me)
    End Sub
 
    Private Function CreatePolishing( sKitName As String) As Boolean

DirectCuts/SawTestUC.xaml.vb

@@ -5,6 +5,7 @@ Public Class SawTestUC
    ' Riferimenti a pagine
    Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
    Private WithEvents m_CurrProjPage As CurrentProjectPageUC
+   Private m_refControlDirectCutUC As ControlsDirectCutUC1
    ' Flag di pagina attiva
    Private m_bActive As Boolean = False
    ' Flag di simulazione in corso
@@ -76,6 +77,7 @@ Public Class SawTestUC
    Private Sub SawTest_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
       ' Attivo la pagina
       m_CurrProjPage = m_MainWindow.m_CurrentProjectPageUC
+      m_refControlDirectCutUC = m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC1
       m_bActive = True
       ' Se rientro da simulazione
       If m_bSimul Then
@@ -139,7 +141,7 @@ Public Class SawTestUC
       WritePrivateProfileString( S_DIRECTCUTS, K_DC_TEST_OFFSET, DoubleToString( m_dOffset, 2), m_MainWindow.GetIniFile())
       If Not m_bSimul Then
          ' Dichiaro sottopagina da non riattivare
-         m_MainWindow.m_DirectCutPageUC.m_ActiveDirectCutPage = DirectCutPageUC.DirectCutPages.DirectCut
+         m_refControlDirectCutUC.m_ActiveDirectCutPage = ControlsDirectCutUC1.DirectCutPages.DirectCut1
          ' Rimuovo layer temporaneo per crocette
          EgtErase(m_nTempLay)
          ' Rimuovo eventuale pezzo per taglio diretto
@@ -419,6 +421,7 @@ Public Class SawTestUC
       m_bSimul = True
       m_CurrProjPage.m_SceneButtons.MeasureBtn.IsChecked = False
       m_CurrProjPage.CurrProjGrid.Visibility = Windows.Visibility.Hidden
+      m_refControlDirectCutUC.LeftButtonGrid.Children.Remove(Me)
       m_CurrProjPage.CurrentProjectPageGrid.Children.Remove(m_MainWindow.m_DirectCutPageUC)
       m_MainWindow.m_PrevActivePage = MainWindow.Pages.DirectCut
       m_CurrProjPage.CurrentProjectPageGrid.Children.Add(m_MainWindow.m_SimulationPage)
@@ -459,7 +462,7 @@ Public Class SawTestUC
    End Sub
 
    Private Sub ExitBtn_Click(sender As Object, e As RoutedEventArgs) Handles ExitBtn.Click
-      m_MainWindow.m_DirectCutPageUC.LeftButtonGrid.Children.Remove(Me)
+      m_refControlDirectCutUC.LeftButtonGrid.Children.Remove(Me)
    End Sub
 
    Private Function CreateSingleCut() As Boolean

DirectCuts/SingleCutAuto.xaml.vb

@@ -363,7 +363,7 @@ Public Class SingleCutAuto
       ' Se non vado in simulazione
       If Not m_bSimul Then
          ' Dichiaro sottopagina da non riattivare
-         m_MainWindow.m_DirectCutPageUC.m_ActiveDirectCutPage = DirectCutPageUC.DirectCutPages.DirectCut
+         m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.m_ActiveDirectCutPage = ControlsDirectCutUC.DirectCutPages.DirectCut
          ' Rimuovo layer temporaneo per crocette
          EgtErase(m_nTempLay)
          ' Rimuovo eventuale pezzo per taglio diretto
@@ -715,6 +715,7 @@ Public Class SingleCutAuto
       m_bSimul = True
       m_CurrProjPage.m_SceneButtons.MeasureBtn.IsChecked = False
       m_CurrProjPage.CurrProjGrid.Visibility = Windows.Visibility.Hidden
+      m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.LeftButtonGrid.Children.Remove(Me)
       m_CurrProjPage.CurrentProjectPageGrid.Children.Remove(m_MainWindow.m_DirectCutPageUC)
       m_MainWindow.m_PrevActivePage = MainWindow.Pages.DirectCut
       m_CurrProjPage.CurrentProjectPageGrid.Children.Add(m_MainWindow.m_SimulationPage)
@@ -758,7 +759,7 @@ Public Class SingleCutAuto
       ' reimposto il precedetne utensile e lavorazione
       m_MainWindow.m_CurrentMachine.sCurrSaw = m_PrecSaw
       m_MainWindow.m_CurrentMachine.sCurrSawing = m_PrecSawing
-      m_MainWindow.m_DirectCutPageUC.LeftButtonGrid.Children.Remove(Me)
+      m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.LeftButtonGrid.Children.Remove(Me)
    End Sub
 
    Private Function CreateSingleCut() As Boolean

DirectCuts/SingleCutUC.xaml.vb

@@ -157,7 +157,7 @@ Public Class SingleCutUC
       ' Se non vado in simulazione
       If Not m_bSimul Then
          ' Dichiaro sottopagina da non riattivare
-         m_MainWindow.m_DirectCutPageUC.m_ActiveDirectCutPage = DirectCutPageUC.DirectCutPages.DirectCut
+         m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.m_ActiveDirectCutPage = ControlsDirectCutUC.DirectCutPages.DirectCut
          ' Rimuovo layer temporaneo per crocette
          EgtErase(m_nTempLay)
          ' Rimuovo eventuale pezzo per taglio diretto
@@ -524,6 +524,7 @@ Public Class SingleCutUC
       m_bSimul = True
       m_CurrProjPage.m_SceneButtons.MeasureBtn.IsChecked = False
       m_CurrProjPage.CurrProjGrid.Visibility = Windows.Visibility.Hidden
+      m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.LeftButtonGrid.Children.Remove(Me)
       m_CurrProjPage.CurrentProjectPageGrid.Children.Remove(m_MainWindow.m_DirectCutPageUC)
       m_MainWindow.m_PrevActivePage = MainWindow.Pages.DirectCut
       m_CurrProjPage.CurrentProjectPageGrid.Children.Add(m_MainWindow.m_SimulationPage)
@@ -564,7 +565,7 @@ Public Class SingleCutUC
    End Sub
 
    Private Sub ExitBtn_Click(sender As Object, e As RoutedEventArgs) Handles ExitBtn.Click
-      m_MainWindow.m_DirectCutPageUC.LeftButtonGrid.Children.Remove(Me)
+      m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.LeftButtonGrid.Children.Remove(Me)
    End Sub
 
    Private Function CreateSingleCut() As Boolean

DirectCuts/SingleDrillUC.xaml.vb

@@ -136,7 +136,7 @@ Public Class SingleDrillUC
       ' Se non vado in simulazione
       If Not m_bSimul Then
          ' Dichiaro sottopagina da non riattivare
-         m_MainWindow.m_DirectCutPageUC.m_ActiveDirectCutPage = DirectCutPageUC.DirectCutPages.DirectCut
+         m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.m_ActiveDirectCutPage = ControlsDirectCutUC.DirectCutPages.DirectCut
          ' Rimuovo layer temporaneo per crocette
          EgtErase(m_nTempLay)
          ' Rimuovo eventuale pezzo per taglio diretto
@@ -342,6 +342,7 @@ Public Class SingleDrillUC
       m_bSimul = True
       m_CurrProjPage.m_SceneButtons.MeasureBtn.IsChecked = False
       m_CurrProjPage.CurrProjGrid.Visibility = Windows.Visibility.Hidden
+      m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.LeftButtonGrid.Children.Remove(Me)
       m_CurrProjPage.CurrentProjectPageGrid.Children.Remove(m_MainWindow.m_DirectCutPageUC)
       m_MainWindow.m_PrevActivePage = MainWindow.Pages.DirectCut
       m_CurrProjPage.CurrentProjectPageGrid.Children.Add(m_MainWindow.m_SimulationPage)
@@ -382,7 +383,7 @@ Public Class SingleDrillUC
    End Sub
 
    Private Sub ExitBtn_Click(sender As Object, e As RoutedEventArgs) Handles ExitBtn.Click
-      m_MainWindow.m_DirectCutPageUC.LeftButtonGrid.Children.Remove(Me)
+      m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.LeftButtonGrid.Children.Remove(Me)
    End Sub
 
    Private Function CreateSingleDrill() As Boolean

DirectCuts/SquaringUC.xaml

@@ -0,0 +1,162 @@
+<UserControl x:Class="SquaringUC"
+   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+   xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+   xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
+   mc:Ignorable="d" 
+   d:DesignHeight="597.3" d:DesignWidth="256">
+
+   <!--<Border CornerRadius="{StaticResource Page_CornerRadius}" Background="{StaticResource OmagCut_LightGray}">-->
+   <Border Style="{DynamicResource OmagCut_DirectCutPageBorder}">
+
+      <!-- Definizione della Grid MultipleCut -->
+      <Grid Name="SingleCutGrid" >
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="2*"/>
+            <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="2*"/>
+            <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="0.5*"/>
+            <RowDefinition Height="1*"/>
+         </Grid.RowDefinitions>
+
+         <!--<Grid Grid.Row="0" Grid.ColumnSpan="2">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                </Grid.ColumnDefinitions>
+
+                <ToggleButton Name="Point1Btn" Grid.Column="0"
+               Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+                    <Image Source="{DynamicResource Acquisisci-P1Img}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+                </ToggleButton>
+
+                <ToggleButton Name="Point2Btn" Grid.Column="1"
+               Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+                    <Image Source="{DynamicResource Acquisisci-P2Img}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+                </ToggleButton>
+            </Grid>-->
+
+         <!--<ComboBox Name="PointModeCmBx" Grid.Row="1" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_ComboBox}"
+            Margin="6,0,6,0">
+                <ComboBox.ItemTemplate>
+                    <DataTemplate>
+                        <TextBlock Text="{Binding}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                    </DataTemplate>
+                </ComboBox.ItemTemplate>
+            </ComboBox>-->
+
+         <!--<TextBlock Name="DepthTxBl" Grid.Column="0" Grid.Row="2"
+            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+            <EgtWPFLib:EgtTextBox Name="DepthTxBx" Grid.Column="1" Grid.Row="2" Margin="0,0,6,0"
+            Style="{StaticResource OmagCut_CalculatorTextBox}"/>-->
+
+         <TextBlock Name="OffsetTxBl" Grid.Column="0" Grid.Row="3"
+            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+         <EgtWPFLib:EgtTextBox Name="OffsetTxBx" Grid.Column="1" Grid.Row="3" Margin="0,0,6,0"
+            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+
+         <TextBlock Name="ExtraLenTxBl" Grid.Column="0" Grid.Row="4"
+            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+         <EgtWPFLib:EgtTextBox Name="ExtraLenTxBx" Grid.Column="1" Grid.Row="4" Margin="0,0,6,0"
+            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+
+         <!--<TextBlock Name="DirectionTxBl" Grid.Column="0" Grid.Row="3"
+            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+            <EgtWPFLib:EgtTextBox Name="DirectionTxBx" Grid.Column="1" Grid.Row="3" Margin="0,0,6,0"
+            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+
+            <TextBlock Name="SideAngleTxBl" Grid.Column="0" Grid.Row="4"
+            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+            <EgtWPFLib:EgtTextBox Name="SideAngleTxBx" Grid.Column="1" Grid.Row="4" Margin="0,0,6,0"
+            Style="{StaticResource OmagCut_CalculatorTextBox}"/>-->
+
+         <!--<Grid Grid.Row="5" Grid.ColumnSpan="2">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="1.5*"/>
+                    <ColumnDefinition Width="2"/>
+                    <ColumnDefinition Width="1.5*"/>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="0.5*"/>
+                </Grid.RowDefinitions>
+
+                <Border Grid.Column="1" Grid.Row="0" Grid.RowSpan="4" Background="Black" />
+
+                <TextBlock Name="NumPzXTxBl" Grid.Column="0" Grid.Row="0"
+            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+                <TextBlock Name="DimPzXTxBl" Grid.Column="2" Grid.Row="0"
+            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+
+                <EgtWPFLib:EgtTextBox Name="NumPzXTxBx" Grid.Column="0" Grid.Row="1" Width="75"
+            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                <EgtWPFLib:EgtTextBox Name="DimPzXTxBx" Grid.Column="2" Grid.Row="1" Width="75"
+            Style="{StaticResource OmagCut_CalculatorTextBox}" />
+
+                <TextBlock Name="NumPzYTxBl" Grid.Column="0" Grid.Row="2"
+            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+                <TextBlock Name="DimPzYTxBl" Grid.Column="2" Grid.Row="2"
+            Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+
+                <EgtWPFLib:EgtTextBox Name="NumPzYTxBx" Grid.Column="0" Grid.Row="3" Width="75"
+            Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+                <EgtWPFLib:EgtTextBox Name="DimPzYTxBx" Grid.Column="2" Grid.Row="3" Width="75"
+            Style="{StaticResource OmagCut_CalculatorTextBox}" />
+
+            </Grid>
+
+            <TextBlock Name="SideTxBl" Grid.Row="6" Grid.ColumnSpan="2"
+             Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}"/>
+            <CheckBox Name="SideChBx" Grid.Row="6" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_CheckBox_Single}"
+             HorizontalAlignment="Right" Margin="0,0,6,0"/>-->
+
+         <Grid Grid.Row="7" Grid.ColumnSpan="2">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="0.5*"/>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="0.5*"/>
+               <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
+            <TextBlock Name="XcoordTxBl" Grid.Column="0" Text="X"
+               Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
+            <EgtWPFLib:EgtTextBox Name="XcoordTxBx" Grid.Column="1" Margin="0,0,6,0"
+               Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+            <TextBlock Name="YcoordTxBl" Grid.Column="2" Text="Y"
+               Style="{StaticResource OmagCut_CurrProjSummeryTextBlock}" HorizontalAlignment="Center"/>
+            <EgtWPFLib:EgtTextBox Name="YcoordTxBx" Grid.Column="3" Margin="0,0,6,0"
+               Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+         </Grid>
+
+         <Grid Grid.Row="11" Grid.ColumnSpan="2">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+               <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
+
+            <Button Name="SimulBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconButton}">
+               <Image Source="{DynamicResource SimulaImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+            </Button>
+            <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
+               <Image Source="{DynamicResource EseguiImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+            </Button>
+            <Button Name="ExitBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
+               <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+            </Button>
+         </Grid>
+
+      </Grid>
+
+   </Border>
+</UserControl>

DirectCuts/SquaringUC.xaml.vb

@@ -0,0 +1,437 @@
+Imports EgtUILib
+
+Public Class SquaringUC
+
+   ' Riferimenti a pagine
+   Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
+   Private WithEvents m_CurrProjPage As CurrentProjectPageUC
+   ' Flag di pagina attiva
+   Private m_bActive As Boolean = False
+   ' Flag di simulazione in corso
+   Private m_bSimul As Boolean = False
+
+   ' Origine tavola e dati grezzo
+   Private m_bRawOk As Boolean = False
+   Private m_ptTabOri As Point3d
+   Private m_ptRawMin As Point3d
+   Private m_ptRawMax As Point3d
+   ' Parametri P1 acquisito
+   Private m_ptTipP1 As Point3d
+   Private m_vtToolP1 As Vector3d
+   ' Parametri P2 acquisito
+   Private m_ptTipP2 As Point3d
+   Private m_vtToolP2 As Vector3d
+   ' Parametri della lavorazione
+   Private m_bCutOk As Boolean = False
+   Private m_dDepth As Double = 0
+   Private m_dOffsetSquaring As Double = 150
+   Private m_dExtraLength As Double = 0
+   Private m_dAngO As Double = 180
+   Private m_dAngV As Double = 0
+   Private m_nNumX As Integer = 0
+   Private m_dDimX As Double = 0
+   Private m_nNumY As Integer = 0
+   Private m_dDimY As Double = 0
+   Private m_bHeadSide As Boolean = False
+
+   ' Punto selezionato nel disegno
+   Private m_ptPrev As Point3d
+   ' Layer per crocette temporanee
+   Private m_nTempLay As Integer = GDB_ID.NULL
+
+   ' Costanti
+   Private Const MAX_TAB_DEPTH As Double = 10.0
+   Private Const MIN_CUT_LEN As Double = 10.0
+   Private Const MAX_SIDE_ANG As Double = 60.0
+
+   'Costante che indica il lato in cui posizionare i tagli
+   Private Enum CutSide As Integer
+      Left
+      Right
+   End Enum
+
+   Private Sub GridCut_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
+      OffsetTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 28)
+      ExtraLenTxBl.Text = "Extra length"
+      SimulBtn.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 1)
+      OkBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
+
+      ' Carico i dati dell'ultimo taglio
+      m_dDepth = 0
+      m_dAngO = 90
+      m_dAngV = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_GRID_ANGV, m_dAngV, m_MainWindow.GetIniFile())
+      m_nNumX = 1
+      m_dDimX = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_GRID_DIMX, m_dDimX, m_MainWindow.GetIniFile())
+      m_nNumY = 1
+      m_dDimY = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_GRID_DIMY, m_dDimY, m_MainWindow.GetIniFile())
+      m_bHeadSide = False
+   End Sub
+
+   Private Sub Squaring_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
+      ' Attivo la pagina
+      m_CurrProjPage = m_MainWindow.m_CurrentProjectPageUC
+      m_bActive = True
+      ' Se rientro da simulazione
+      If m_bSimul Then
+         m_bSimul = False
+         ' Disabilito registrazione progetto modificato
+         EgtDisableModified()
+         m_MainWindow.m_DirectCutPageUC.m_bShowMachine = False
+         EgtSetMachineLook(MCH_LOOK.TAB)
+         EgtDraw()
+         Return
+      End If
+      ' Disabilito registrazione progetto modificato
+      EgtDisableModified()
+      ' Creo layer temporaneo per crocette
+      m_nTempLay = EgtCreateGroup(GDB_ID.ROOT)
+      EgtSetLevel(m_nTempLay, GDB_LV.TEMP)
+      ' Origine tavola
+      m_bRawOk = True
+      If Not EgtGetTableRef(1, m_ptTabOri) Then
+         m_bRawOk = False
+         EgtOutLog("Error on TableRef1")
+      End If
+
+      ' Dati del grezzo
+      If Not GetRawBox(m_ptRawMin, m_ptRawMax) Then
+         m_bRawOk = False
+         EgtOutLog("Error on RawBox")
+      End If
+      ' calcolo lalavorazione di squadratura
+      RefreshSquaring()
+   End Sub
+
+   Private Sub RefreshSquaring()
+      If Not m_bRawOk Then Return
+
+      Dim m_ThickSaw As Double
+      EgtTdbGetCurrToolParam(MCH_TP.THICK, m_ThickSaw)
+
+      m_dDepth = CamAuto.GetRawHeight()
+      m_dDimX = Math.Abs(m_ptRawMax.x - m_ptRawMin.x) - 2 * (m_dOffsetSquaring)
+      m_dDimY = Math.Abs(m_ptRawMax.y - m_ptRawMin.y) - 2 * (m_dOffsetSquaring)
+
+      Dim ptStart As New Point3d(m_ptRawMin.x + m_dOffsetSquaring - m_ThickSaw, m_ptRawMin.y + m_dOffsetSquaring, m_ptRawMin.z)
+      Dim ptEnd As New Point3d(ptStart.x + m_dDimX, ptStart.y, m_ptRawMin.z)
+
+      SetCoordVisibility(True)
+      ShowCoord()
+
+      OffsetTxBx.Text = LenToString(m_dOffsetSquaring, 1)
+      ExtraLenTxBx.Text = LenToString(m_dExtraLength, 1)
+      m_bCutOk = False
+      UpdateSimulOkBtn()
+
+      SquaringPoint(ptStart, ptEnd)
+      m_ptPrev = ptStart
+   End Sub
+
+   Friend Sub Squaring_Unloaded(sender As Object, e As RoutedEventArgs) Handles Me.Unloaded
+      ' Salvo i dati correnti
+      'WritePrivateProfileString(S_DIRECTCUTS, K_DC_GRID_DEPTH, DoubleToString(m_dDepth, 2), m_MainWindow.GetIniFile())
+      ' Se non vado in simulazione
+      If Not m_bSimul Then
+         ' Dichiaro sottopagina da non riattivare
+         m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.m_ActiveDirectCutPage = ControlsDirectCutUC.DirectCutPages.DirectCut
+         ' Rimuovo layer temporaneo per crocette
+         EgtErase(m_nTempLay)
+         ' Rimuovo eventuale pezzo per taglio diretto
+         EraseDirectCutPart()
+         ' Riattivo eventuali lavorazioni presenti
+         ActivateAllMachinings()
+         ' Abilito registrazione progetto modificato
+         EgtEnableModified()
+         ' Nascondo la macchina
+         m_MainWindow.m_DirectCutPageUC.m_bShowMachine = False
+         EgtSetMachineLook(MCH_LOOK.TAB)
+         EgtDraw()
+      End If
+      ' Dichiaro pagina non attiva
+      m_bActive = False
+   End Sub
+
+   Private Sub UpdateSimulOkBtn()
+      If m_bCutOk Then
+         SimulBtn.IsEnabled = True
+         SimulBtn.Foreground = Brushes.Black
+         OkBtn.IsEnabled = True
+         OkBtn.Foreground = Brushes.Black
+      Else
+         SimulBtn.IsEnabled = False
+         SimulBtn.Foreground = Brushes.DarkGray
+         OkBtn.IsEnabled = False
+         OkBtn.Foreground = Brushes.DarkGray
+      End If
+   End Sub
+
+   Private Sub SquaringPoint(ptMin As Point3d, ptMax As Point3d)
+      ' Rimuovo eventuali crocette create acquisendo i punti nel disegno
+      EgtEmptyGroup(m_nTempLay)
+      ' Verifico configurazione tavola e grezzo
+      If Not m_bRawOk Then Return
+
+      ' Recupero dati utensile e testa corrente
+      Dim sTool As String = ""
+      Dim sHead As String = ""
+      Dim nExit As Integer = 0
+      EgtGetCalcTool(sTool, sHead, nExit)
+      '------------- BOTTOM LEFT -------------------
+      ' Assegno punto selezionato nel disegno a m_ptTipP1
+      m_ptTipP1 = ptMin
+      ' Porto il tip nell'origine tavola
+      m_ptTipP1.ToLoc(New Frame3d(m_ptTabOri))
+      ' Reimposto eventuale precedente utensile
+      EgtSetCalcTool(sTool, sHead, nExit)
+      '-------------  TOP RIGHT   -------------------
+      ' Assegno punto selezionato nel disegno a m_ptTipP2
+      m_ptTipP2 = ptMax
+      ' Porto il tip nell'origine tavola
+      m_ptTipP2.ToLoc(New Frame3d(m_ptTabOri))
+      ' Reimposto eventuale precedente utensile
+      EgtSetCalcTool(sTool, sHead, nExit)
+
+      ' Se il secondo punto non coincide con il primo, disegno il taglio
+      Dim vtDiff As Vector3d = m_ptTipP2 - m_ptTipP1
+      vtDiff.z = 0
+      Dim dLen As Double
+      Dim dAngVertDeg As Double
+      Dim dAngOrizzDeg As Double
+      vtDiff.ToSpherical(dLen, dAngVertDeg, dAngOrizzDeg)
+      If dLen > EPS_SMALL Then
+         m_dAngO = dAngOrizzDeg
+         CreateGridCut()
+         ' visuliazzo tavola 
+         m_MainWindow.m_DirectCutPageUC.m_bShowMachine = False
+         EgtSetMachineLook(MCH_LOOK.TAB)
+         EgtDraw()
+      End If
+   End Sub
+
+   Private Sub OffsetTxBx_EgtClosed(sender As Object, e As EventArgs) Handles OffsetTxBx.EgtClosed
+      ' Verifico che l'offset impostato non sia superiore a quello massimo
+      Dim dMaxOffset As Double = Math.Min(m_dDimX, m_dDimY) / 2 - 15
+      Dim dOffset As Double = 0
+      StringToLen(OffsetTxBx.Text, dOffset)
+      If dOffset < 0 Then
+         dOffset = 0
+      ElseIf dOffset > dMaxOffset Then
+         dOffset = dMaxOffset
+      End If
+      m_dOffsetSquaring = dOffset
+      OffsetTxBx.Text = LenToString(m_dOffsetSquaring, 2)
+      ' Disegno il taglio
+      RefreshSquaring()
+      EgtDraw()
+   End Sub
+
+   Private Sub ExtraLength_EgtClosed(sender As Object, e As EventArgs) Handles ExtraLenTxBx.EgtClosed
+      ' Verifico che il valore indicato sia almeno maggiore dell'offset indicato
+      Dim dOffset As Double = 0
+      StringToLen(OffsetTxBx.Text, dOffset)
+      Dim MadExtraLeng As Double = Math.Abs(dOffset)
+      Dim dExtraLen As Double
+      StringToLen(ExtraLenTxBx.Text, dExtraLen)
+      If dExtraLen < 0 AndAlso dExtraLen < -MadExtraLeng Then
+         dExtraLen = 0
+      End If
+      m_dExtraLength = dExtraLen
+      ExtraLenTxBx.Text = LenToString(m_dExtraLength, 2)
+      ' Disegno il taglio
+      RefreshSquaring()
+      EgtDraw()
+   End Sub
+
+   Private Sub SimulBtn_Click(sender As Object, e As RoutedEventArgs) Handles SimulBtn.Click
+      ' Verifico ci sia un taglio valido
+      If Not m_bCutOk Then Return
+      ' Salvo il progetto con le lavorazioni
+      EgtSetCurrentContext(m_CurrProjPage.CurrentProjectScene.GetCtx())
+      Dim sMchPath As String = m_MainWindow.GetTempDir() & "\" & "DirectProj.nge"
+      m_MainWindow.m_CurrentProjectPageUC.SaveFile(sMchPath, False)
+      ' Predispongo passaggio a simulazione
+      m_bSimul = True
+      m_CurrProjPage.m_SceneButtons.MeasureBtn.IsChecked = False
+      m_CurrProjPage.CurrProjGrid.Visibility = Windows.Visibility.Hidden
+      m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.LeftButtonGrid.Children.Remove(Me)
+      m_CurrProjPage.CurrentProjectPageGrid.Children.Remove(m_MainWindow.m_DirectCutPageUC)
+      m_MainWindow.m_PrevActivePage = MainWindow.Pages.DirectCut
+      m_CurrProjPage.CurrentProjectPageGrid.Children.Add(m_MainWindow.m_SimulationPage)
+      m_MainWindow.m_ActivePage = MainWindow.Pages.Simulation
+   End Sub
+
+   Private Sub OkBtn_Click(sender As Object, e As RoutedEventArgs) Handles OkBtn.Click
+#If TRIAL Then
+      m_CurrProjPage.SetWarningMessage("Trial Version")
+#Else
+      ' Verifico non sia versione Ufficio
+      If m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.OFFICE_TYPE) Then
+         m_CurrProjPage.SetWarningMessage("Office Version")
+         Return
+      End If
+      ' Verifico ci sia un taglio valido
+      If Not m_bCutOk Then Return
+      ' Salvo il progetto con le lavorazioni
+      Dim sMchPath As String = m_MainWindow.GetTempDir() & "\" & "DirectProj.nge"
+      m_MainWindow.m_CurrentProjectPageUC.SaveFile(sMchPath, False)
+      ' Genero file CNC (lancio anche se errore in precedenza)
+      Dim sCncPath As String = m_MainWindow.GetCncDir() & "\DirectCut" & m_MainWindow.m_CurrentMachine.sIsoFileExt
+      Dim bOk As Boolean = EgtGenerate(sCncPath, "OmagCut ver." & m_MainWindow.GetVersion())
+      ' Se errore in generazione, segnalo l'errore ed esco
+      If Not bOk Then
+         m_CurrProjPage.SetErrorMessage(EgtMsg(90314))       'Errore nella generazione del programma CN
+         Return
+      End If
+      ' Download programma (eventuali errori sono segnalati dalla funzione)
+      If m_MainWindow.m_CNCommunication.SendProgram(sCncPath, 900) Then
+         ' copio il progetto corrente come progetto in lavorazione
+         Dim sWrkPath As String = m_MainWindow.GetTempDir() & "\" & "WorkProj.nge"
+         My.Computer.FileSystem.CopyFile(sMchPath, sWrkPath, True)
+         ' lancio eventuale lua post-trasmissione
+         m_MainWindow.ExecSentProgScript(True)
+      End If
+#End If
+   End Sub
+
+   Private Sub ExitBtn_Click(sender As Object, e As RoutedEventArgs) Handles ExitBtn.Click
+      m_MainWindow.m_DirectCutPageUC.m_ControlsDirectCutUC.LeftButtonGrid.Children.Remove(Me)
+   End Sub
+
+   Private Function CreateGridCut() As Boolean
+      ' Verifico sia definito il punto iniziale e il grezzo
+      If Not m_bRawOk Then
+         m_bCutOk = False
+         Return False
+      End If
+      ' Spessore grezzo
+      Dim dRawHeight As Double = m_ptRawMax.z - m_ptRawMin.z
+      ' Rimuovo eventuale vecchio pezzo per taglio diretto
+      EraseDirectCutPart()
+      ' Disattivo eventuali lavorazioni presenti
+      DeactivateAllMachinings()
+      ' Creo nuovo pezzo per il taglio diretto
+      Dim nPartId = EgtCreateGroup(GDB_ID.ROOT)
+      EgtSetName(nPartId, NAME_DIRECTCUT)
+      Dim nLayerId = EgtCreateGroup(nPartId)
+      EgtSetName(nLayerId, NAME_OUTLOOP)
+      ' Creo il taglio parallelo alla lama
+      Dim ptStart As Point3d = m_ptTipP1
+      ptStart.z = 0
+      ' Funzione che crea i tagli successivi al primo
+      MultiplyCut(nLayerId)
+      ' Calcolo punto di inserimento nel grezzo
+      Dim ptMin, ptMax As Point3d
+      EgtGetBBoxGlob(nPartId, GDB_BB.STANDARD, ptMin, ptMax)
+      Dim ptIns As Point3d = ptMin + (m_ptTabOri - m_ptRawMin)
+      ptIns.z = dRawHeight
+      ' Inserisco il pezzo nel grezzo
+      EgtAddPartToRawPart(nPartId, ptIns, m_MainWindow.m_CurrentProjectPageUC.m_nRawId)
+      ' Inserisco la lavorazione
+      m_bCutOk = AddMachinings(nPartId) AndAlso UpdateAllMachiningsToolpaths()
+      EgtSetCurrPhase(1)
+      ' Eventuale eliminazione Home finale
+      If Not m_MainWindow.m_CurrentMachine.bDirectCutsFinalHome Then
+         RemoveFinalHome()
+      End If
+      UpdateSimulOkBtn()
+      Return m_bCutOk
+   End Function
+
+   Private Function MultiplyCut(nLayerId As Integer) As Boolean
+      ' Recupero lo spessore del taglio della lama o del waterjet correntemente attiva
+      Dim nType As Integer = 0
+      EgtTdbGetCurrToolParam(MCH_TP.TYPE, nType)
+      Dim dThick As Double = 0
+      EgtTdbGetCurrToolParam(If(nType = MCH_TY.SAW_STD, MCH_TP.THICK, MCH_TP.DIAM), dThick)
+      ' Ricalcolo lo spessore in base all'inclinazione
+      dThick = dThick / Math.Cos(m_dAngV * Math.PI / 180)
+      ' Imposto angolo di rotazione a seconda del lato dei tagli paralleli
+      Dim dRotAngOX As Double = 90
+      ' Recupero dati da interfaccia
+      Dim dDimPzX As Double = m_dDimX
+      Dim nNumPzX As Integer = m_nNumX
+      Dim dDimPzY As Double = m_dDimY
+      Dim nNumPzY As Integer = m_nNumY
+      ' Definisco vettore di spostamento
+      Dim vtDelta As Vector3d
+      ' Calcolo primo taglio parallelo
+      Dim ptStart As Point3d = m_ptTipP1
+      ptStart.z = 0
+      If dDimPzY <> 0 And nNumPzY > 0 And dDimPzX <> 0 And nNumPzX > 0 Then
+         Dim dLenX As Double = dThick + (dDimPzX + dThick) * nNumPzX
+         Dim nCutParaId = EgtCreateLinePDL(nLayerId, ptStart, m_dAngO, dLenX + 0.1)
+         ' Imposto affondamento e angolo di fianco sul taglio
+         EgtSetInfo(nCutParaId, INFO_DEPTH, m_dDepth)
+         EgtSetInfo(nCutParaId, INFO_SIDE_ANGLE, m_dAngV)
+         ' Allungo la geometria
+         EgtExtendCurveStartByLen(nCutParaId, m_dOffsetSquaring + m_dExtraLength)
+         EgtExtendCurveEndByLen(nCutParaId, m_dOffsetSquaring + +m_dExtraLength)
+         ' Calcolo vettore di spostamento
+         vtDelta = Vector3d.FromPolar((dDimPzY + dThick), m_dAngO)
+         ' Ruoto il vettore di traslazione 
+         vtDelta.Rotate(Vector3d.Z_AX, dRotAngOX)
+         For Index As Integer = 1 To nNumPzY
+            Dim vtPerpMove As Vector3d = Index * vtDelta
+            ' Creo copie
+            Dim nCut2Id = EgtCopyGlob(nCutParaId, nLayerId)
+            EgtMove(nCut2Id, vtPerpMove, GDB_RT.GLOB)
+         Next
+         ' Calcolo primo taglio perpendicolare
+         Dim dLenY As Double = dThick + (dDimPzY + dThick) * nNumPzY
+         ' Arretro il punto di partenza di uno spessore lama
+         Dim vtDeltaPos As Vector3d = Vector3d.FromPolar(dThick + 0.1, m_dAngO - 90)
+         Dim nCutPerpId = EgtCreateLinePDL(nLayerId, ptStart + vtDeltaPos, m_dAngO + 90, dLenY + 0.2)
+         ' Imposto affondamento e angolo di fianco sul taglio
+         EgtSetInfo(nCutPerpId, INFO_DEPTH, m_dDepth)
+         EgtSetInfo(nCutPerpId, INFO_SIDE_ANGLE, m_dAngV)
+         ' Allungo la geometria
+         EgtExtendCurveStartByLen(nCutPerpId, m_dOffsetSquaring + m_dExtraLength)
+         EgtExtendCurveEndByLen(nCutPerpId, m_dOffsetSquaring + +m_dExtraLength)
+         ' Calcolo secondo vettore di spostamento
+         vtDelta = Vector3d.FromPolar((dDimPzX + dThick), m_dAngO)
+         For Index As Integer = 1 To nNumPzX
+            Dim vtPerpMove As Vector3d = vtDelta * Index
+            ' Creo copie
+            Dim nCut3Id = EgtCopyGlob(nCutPerpId, nLayerId)
+            EgtMove(nCut3Id, vtPerpMove, GDB_RT.GLOB)
+         Next
+      End If
+      Return True
+   End Function
+
+   Private Sub SetCoordVisibility(bShow As Boolean)
+      XcoordTxBl.Visibility = If(bShow, Windows.Visibility.Visible, Windows.Visibility.Hidden)
+      XcoordTxBx.Visibility = If(bShow, Windows.Visibility.Visible, Windows.Visibility.Hidden)
+      YcoordTxBl.Visibility = If(bShow, Windows.Visibility.Visible, Windows.Visibility.Hidden)
+      YcoordTxBx.Visibility = If(bShow, Windows.Visibility.Visible, Windows.Visibility.Hidden)
+   End Sub
+
+   Private Sub ShowCoord()
+      Dim ptText As Point3d = m_ptPrev
+      ptText.ToLoc(New Frame3d(m_ptTabOri))
+      XcoordTxBx.Text = LenToString(ptText.x, 2)
+      YcoordTxBx.Text = LenToString(ptText.y, 2)
+   End Sub
+
+   Private Function SetMachineInCurrPos() As Boolean
+      ' Recupero la posizione macchina
+      Dim dL1, dL2, dL3, dR1, dR2 As Double
+      If Not m_MainWindow.m_CNCommunication.GetAxesPositions(dL1, dL2, dL3, dR1, dR2) Then Return False
+      ' Recupero il nome degli assi macchina
+      Dim sL1 As String = String.Empty
+      Dim sL2 As String = String.Empty
+      Dim sL3 As String = String.Empty
+      Dim sR1 As String = String.Empty
+      Dim sR2 As String = String.Empty
+      If Not m_MainWindow.m_CNCommunication.GetAxesNames(sL1, sL2, sL3, sR1, sR2) Then Return False
+      ' Visualizzo macchina in posizione
+      EgtSetAxisPos(sL1, dL1)
+      EgtSetAxisPos(sL2, dL2)
+      EgtSetAxisPos(sL3, dL3)
+      EgtSetAxisPos(sR1, dR1)
+      EgtSetAxisPos(sR2, dR2)
+      Return True
+   End Function
+
+End Class
+

DrawImport/DrawPageUC.xaml

@@ -64,7 +64,7 @@
                <ToggleButton Name="DimensionBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowToggleButton}" Visibility="Collapsed"/>
             </Grid>
 
-            <Grid Name="VariablesGrd" Grid.Row="1" Grid.ColumnSpan="2"/>
+            <Grid Name="VariablesGrd" Grid.Row="1" Grid.RowSpan="2" Grid.ColumnSpan="2"/>
             
             <Grid Name="MessageGrid" Grid.Row="2" Grid.ColumnSpan="2">
                <TextBlock Name="MessageTxBl" Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>

DrawImport/DrawPageUC.xaml.vb

@@ -1255,6 +1255,8 @@ Public Class DrawPageUC
    Private Sub EngraveBtn_Click(sender As Object, e As RoutedEventArgs) Handles EngraveBtn.Click
       m_SceneButtons.MeasureBtn.IsChecked = False
       If EngraveBtn.IsChecked Then
+         ' Aumento lo spazio disponibile per inserirei i parametri (tolgo spazio ad eventuali messaggi)
+         Grid.SetRowSpan(VariablesGrd, 2)
          ' Imposto modalità
          m_SideAngleUC.m_Mode = SideAngleUC.ModeOpt.ENGRAVE
          If m_ActiveComponentPage = Pages.CompoDimension Then
@@ -1286,6 +1288,7 @@ Public Class DrawPageUC
          EgtSetStatus(EgtGetFirstNameInGroup(PartId, COMPO_LAYER_QUOTATURE), GDB_ST.OFF)
          EgtSetStatus(EgtGetFirstNameInGroup(PartId, COMPO_LAYER_ETICHETTE), GDB_ST.OFF)
       Else
+         Grid.SetRowSpan(VariablesGrd, 2)
          VariablesGrd.Children.Remove(m_SideAngleUC)
          If m_PrevSideAnglePage = Pages.CompoDimension Then
             VariablesGrd.Children.Add(m_CompoDimension)

DrawImport/SideAngleUc.xaml

@@ -5,7 +5,7 @@
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
    mc:Ignorable="d" 
-   d:DesignHeight="597.1" d:DesignWidth="255.9">
+   d:DesignHeight="636.9" d:DesignWidth="255.9">
 
    <!-- Definizione della Grid Laterale -->
    <Grid Name="VariablesCompoGrid"  Grid.RowSpan="2">
@@ -28,7 +28,7 @@
          <RowDefinition Height="1*"/>
          <RowDefinition Height="1*"/>
          <RowDefinition Height="0.2*"/>
-         <RowDefinition Height="4*"/>
+         <RowDefinition Height="5*"/>
          <!--<RowDefinition Height="0.5*"/>
          <RowDefinition Height="0.5*"/>
          <RowDefinition Height="0.5*"/>-->
@@ -135,7 +135,7 @@
                             Margin="0,0,0,-2"
                             Style="{StaticResource OmagCut_CalculatorTextBox}"/>
 
-      <Grid Grid.Column="0" Grid.Row="12" Grid.ColumnSpan="4">
+      <Grid Grid.Column="0" Grid.Row="12" Grid.ColumnSpan="4" >
           <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="1.5*"/>
                 <ColumnDefinition Width="0.3*"/>
@@ -143,10 +143,11 @@
                 <ColumnDefinition Width="0.6*"/>
             </Grid.ColumnDefinitions>
             <Grid.RowDefinitions>
-                <RowDefinition Height="1*"/>
-                <RowDefinition Height="1*"/>
-                <RowDefinition Height="1*"/>
-                <RowDefinition Height="1*"/>
+                <RowDefinition Height="0.9*"/>
+                <RowDefinition Height="0.9*"/>
+                <RowDefinition Height="0.9*"/>
+                <RowDefinition Height="0.9*"/>
+                <RowDefinition Height="0.9*"/>
             </Grid.RowDefinitions>
 
             <TextBlock Name="Parameter1TxBl" Grid.Row="0" Grid.ColumnSpan="2"
@@ -196,6 +197,16 @@
                                   Margin="0,0,0,-2"
                                   Width="85" Height="30"
                Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+            <TextBlock Name="Parameter5TxBl" Grid.Row="4" Grid.ColumnSpan="2"
+               Text="Angolo"
+               Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
+               FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
+            <EgtWPFLib:EgtTextBox Name="Parameter5TxBx" 
+                                  Grid.Column="2" Grid.ColumnSpan="2" Grid.Row="4" 
+                                  Margin="0,0,0,-2"
+                                  Width="85" Height="30"
+               Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+
         </Grid>
 
         <!--<TextBlock Name="Parameter1TxBl" Grid.Row="11" Text="Offset"

DrawImport/SideAngleUc.xaml.vb

@@ -36,6 +36,7 @@ Public Class SideAngleUC
    Friend m_dDripDepth As Double = 10
    Friend m_dEngraveDepth2 As Double = 15
    Friend m_dDripShort As Double = 0
+   Friend m_dEngraveAngle As Double = 0
 
    Private CurrEntityDrip As DripEntity
 
@@ -106,6 +107,9 @@ Public Class SideAngleUC
          ' Accorciamento
          Parameter4TxBl.Visibility = Windows.Visibility.Hidden
          Parameter4TxBx.Visibility = Windows.Visibility.Hidden
+         ' Angolo 
+         Parameter5TxBl.Visibility = Windows.Visibility.Hidden
+         Parameter5TxBx.Visibility = Windows.Visibility.Hidden
       Else
          ' se aggiungo gli ENGRAVE e i DRIP
 
@@ -117,10 +121,12 @@ Public Class SideAngleUC
             GetAngleTxBxFromIndex(Index).Visibility = Windows.Visibility.Visible
             GetHeelTxBxFromIndex(Index).Visibility = Windows.Visibility.Visible
          Next
+
          ' Offset
          Parameter1TxBl.Visibility = Windows.Visibility.Visible
          Parameter1TxBx.Visibility = Windows.Visibility.Visible
          Parameter2TxBl.Visibility = Windows.Visibility.Visible
+
          ' Offset2
          If m_Mode <> ModeOpt.ENGRAVE Then
             Parameter2TxBx.Visibility = Windows.Visibility.Visible
@@ -131,6 +137,7 @@ Public Class SideAngleUC
             Parameter2aTxBx.Visibility = Windows.Visibility.Visible
             Parameter2bTxBx.Visibility = Windows.Visibility.Visible
          End If
+
          ' Affondamento
          Parameter3TxBl.Visibility = Windows.Visibility.Visible
          Parameter3TxBx.Visibility = Windows.Visibility.Visible
@@ -146,6 +153,17 @@ Public Class SideAngleUC
             Parameter4TxBx.Visibility = Windows.Visibility.Hidden
          End If
 
+         ' Angolo
+         If m_Mode = ModeOpt.ENGRAVE Then
+            ' modifico il nome del messaggio 
+            Parameter5TxBl.Text = EgtMsg(MSG_IMPORTPAGEUC + 9)            ' Angolo
+            Parameter5TxBl.Visibility = Windows.Visibility.Visible
+            Parameter5TxBx.Visibility = Windows.Visibility.Visible
+         Else
+            Parameter5TxBl.Visibility = Windows.Visibility.Hidden
+            Parameter5TxBx.Visibility = Windows.Visibility.Hidden
+         End If
+
       End If
 
       ' Gestisco Checkbox e nomi in base al numero di lati inclinabili
@@ -167,11 +185,13 @@ Public Class SideAngleUC
          m_dDripOffset2 = GetPrivateProfileDouble( S_SIDES, K_ENGRAVEOFFSET2, 0, m_MainWindow.GetIniFile())
          m_dDripDepth = GetPrivateProfileDouble( S_SIDES, K_ENGRAVEDEPTH, 10, m_MainWindow.GetIniFile())
          m_dEngraveDepth2 = GetPrivateProfileDouble(S_SIDES, K_ENGRAVEDEPTH2, 0, m_MainWindow.GetIniFile())
-         Parameter1TxBx.Text = LenToString( m_dDripOffset, 3)
+         m_dEngraveAngle = GetPrivateProfileDouble(S_SIDES, K_ENGRAVEANGLE, 0, m_MainWindow.GetIniFile())
+         Parameter1TxBx.Text = LenToString(m_dDripOffset, 3)
          Parameter2aTxBx.Text = m_nEngrNbr2.ToString()
          Parameter2bTxBx.Text = LenToString( m_dDripOffset2, 3)
          Parameter3TxBx.Text = LenToString( m_dDripDepth, 3)
          Parameter4TxBx.Text = LenToString(m_dEngraveDepth2, 3)
+         Parameter5TxBx.Text = LenToString(m_dEngraveAngle, 3)
       End If
 
       ' Aggiorno visualizzazione
@@ -501,6 +521,7 @@ Public Class SideAngleUC
          WritePrivateProfileString(S_SIDES, K_ENGRAVEDEPTH, LenToString(m_dDripDepth, 3), m_MainWindow.GetIniFile())
          WritePrivateProfileString(S_SIDES, K_ENGRAVEDEPTH2, LenToString(m_dEngraveDepth2, 3), m_MainWindow.GetIniFile())
          'WritePrivateProfileString( S_SIDES, K_ENGRAVESHORT, DoubleToString( m_dDripShort, 3), m_MainWindow.GetIniFile())
+         WritePrivateProfileString(S_SIDES, K_ENGRAVEANGLE, LenToString(m_dEngraveAngle, 3), m_MainWindow.GetIniFile())
       End If
 
       EgtDraw()
@@ -862,6 +883,8 @@ Public Class SideAngleUC
          End While
       End If
 
+      Dim ListEngraveSideAng As New List(Of Integer)
+
       If m_Mode = ModeOpt.DRIP Then
          ' Esplodo nelle curve componenti
          nCrvId = EgtGetFirstInGroup(DripLayer)
@@ -881,15 +904,70 @@ Public Class SideAngleUC
          End While
       Else
          ' Assegno colore e attributi
+         Dim nInd As Integer = 0
          nCrvId = EgtGetFirstInGroup(DripLayer)
          While nCrvId <> GDB_ID.NULL
             EgtSetColor(nCrvId, COL_MCH_DRIPCUT())
             'EgtSetInfo(nCrvId, INFO_DEPTH, m_dDripDepth)
             EgtSetInfo(nCrvId, INFO_STRICT, If(m_dDripShort > EPS_SMALL, "3", "0"))
+            If nInd = 0 Then
+               ' solo se m_dEngraveAngle > 0
+               If Math.Abs(m_dEngraveAngle) > EPS_ANG_SMALL Then
+                  ' salvo l'Id della curva che deve essere manipolato separatamente
+                  ListEngraveSideAng.Add(nCrvId)
+               Else
+                  EgtRemoveInfo(nCrvId, INFO_SIDE_ANGLE)
+                  EgtModifyCurveThickness(nCrvId, -m_dEngraveDepth2)
+               End If
+            Else
+               If nInd = m_nEngrNbr2 Then
+                  nInd = -1
+               End If
+               EgtModifyCurveThickness(nCrvId, -m_dEngraveDepth2)
+            End If
+            nInd = nInd + 1
+            If nInd > m_nEngrNbr2 Then nInd = 0
             nCrvId = EgtGetNext(nCrvId)
          End While
       End If
+      SplitJointedSideEngrave(ListEngraveSideAng)
+   End Sub
 
+   Private Sub SplitJointedSideEngrave(ListEngraveSideAngId As List(Of Integer))
+      For Each nCrvId As Integer In ListEngraveSideAngId
+         ' eventualmente separo il taglio inclinato
+         Dim dUs, dUe As Double
+         EgtCurveDomain(nCrvId, dUs, dUe)
+         Dim dU As Double = dUs
+         While dU < dUe ' + EPS_ZERO
+            Dim ptCurr As Point3d
+            EgtAtParamPoint(nCrvId, dU + 1, nCrvId, ptCurr)
+            ' separa la curva in questo punto
+            Dim nNewCurvId As Integer = GDB_ID.NULL
+            If dUe > 1 Then
+               nNewCurvId = EgtSplitCurveAtPoint(nCrvId, ptCurr, GDB_RT.LOC)
+            Else
+               nNewCurvId = nCrvId
+            End If
+            EgtSetColor(nCrvId, COL_MCH_ONENGRAVE_ANG())
+            EgtSetInfo(nCrvId, INFO_SIDE_ANGLE, m_dEngraveAngle)
+            ' recupero il vettore di estrusione della curva e la direzione della curva
+            Dim vtAux As Vector3d
+            EgtStartVector(nCrvId, vtAux)
+            Dim vtExtrusion As Vector3d
+            EgtCurveExtrusion(nCrvId, vtExtrusion)
+            ' ruoto il vetottore nella nuova direzione
+            vtExtrusion.Rotate(vtAux, -m_dEngraveAngle)
+            ' assegno il vettore di estrusione nella nuova direzione indicata (segno negativo perchè dentro il pezzo)
+            EgtModifyCurveExtrusion(nCrvId, vtExtrusion)
+            Dim ExtendFactor As Double = New Vector3d(0, 0, 1) * vtExtrusion
+            EgtModifyCurveThickness(nCrvId, -m_dDripDepth / ExtendFactor)
+            If dUe = 1 Then Exit While
+            nCrvId = nNewCurvId
+            ' aggiorno i valori del dominio della curva che rimane
+            EgtCurveDomain(nCrvId, dUs, dUe)
+         End While
+      Next
    End Sub
 
    Private Sub PrevBtn_Click(sender As Object, e As RoutedEventArgs) Handles PrevBtn.Click
@@ -1336,6 +1414,15 @@ Public Class SideAngleUC
       End If
    End Sub
 
+   Private Sub Parameter5TxBx_EgtClosed(sender As Object, e As EventArgs) Handles Parameter5TxBx.EgtClosed
+      If m_Mode = ModeOpt.ENGRAVE Then
+         ' Recupero il valore
+         StringToLen(Parameter5TxBx.Text, m_dEngraveAngle)
+         ' Creo le geometrie dei gocciolatoi
+         RefreshSideAngleText()
+      End If
+   End Sub
+
    Friend Sub ReLoadSideAnglePage()
       SideAngleUC_Loaded(Me, New RoutedEventArgs)
    End Sub

Machine/AlarmsPageUC.xaml

@@ -801,19 +801,23 @@
             <Grid Grid.Column="0" Grid.Row="8">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="2.5*"/>
-                    <ColumnDefinition Width="5*"/>
-                    <ColumnDefinition Width="2*"/>
+                    <ColumnDefinition Width="2.5*"/>
+                    <ColumnDefinition Width="4.5*"/>
+                    <ColumnDefinition Width="1.8*"/>
                 </Grid.ColumnDefinitions>
                 <Button x:Name="SawProbingBtn"
-         	   Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
+         	         Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
                     <Image Source="{DynamicResource SawProbeImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
                 </Button>
+                <Button x:Name="ExecLuaBtn" Grid.Column="1"
+         	         Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
+                    <Image Source="{DynamicResource PlayImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
+                </Button>
 
-                
-                <TextBlock Name="UseLaserOriginTxBl" Grid.Column="1"
+                <TextBlock Name="UseLaserOriginTxBl" Grid.Column="2"
                   Style="{DynamicResource OmagCut_ToolsDBTextBlock}" />
-                <CheckBox Name="UseLaserOriginChBx" Style="{DynamicResource OmagCut_CheckBox_Single}" Grid.Column="2"
-                  HorizontalAlignment="Right" Margin="10,0,10,0"/>
+                <CheckBox Name="UseLaserOriginChBx" Style="{DynamicResource OmagCut_CheckBox_Single}" Grid.Column="3"
+                  HorizontalAlignment="Right" Margin="0,0,10,0"/>
             </Grid>
             
         </Grid>

Machine/AlarmsPageUC.xaml.vb

@@ -45,6 +45,13 @@ Public Class AlarmsPageUC
          SawProbingBtn.Visibility = Windows.Visibility.Hidden
       End If
 
+      ' Se esiste un file lua valido allora mostro il pulsante per l'esecuzione dello script
+      If Not String.IsNullOrEmpty(GetExecLuaFile()) And
+         ExecLuaBtn.Visibility = Visibility.Visible Then
+      Else
+         ExecLuaBtn.Visibility = Visibility.Hidden
+      End If
+
       ' Imposto i messaggi letti dal file dei messaggi
       CurrSawTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 1)
       AuxiliaryToolTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 2)
@@ -1327,4 +1334,55 @@ Public Class AlarmsPageUC
 
    End Sub
 
+   Private Sub ExecLuaBtn_Click(sender As Object, e As RoutedEventArgs) Handles ExecLuaBtn.Click
+      Dim sExecFile As String = GetExecLuaFile()
+      Dim sCallFunction As String = GetCallFunction()
+      ' Recupero file LUA
+      Dim bExec As Boolean = EgtLuaExecFile(sExecFile)
+      ' Lancio l'esecuzione della funzione principale
+      bExec = bExec And EgtLuaCallFunction(sCallFunction)
+      ' Leggo variabili
+      Dim nErr As Integer = 0
+      EgtLuaGetGlobIntVar("CMD.ERR", nErr)
+      ' Reset lua
+      EgtLuaResetGlobVar("CMD")
+      ' Verifico condizioni di errore
+      If nErr <> 0 And bExec Then
+         ' Errore in tastatura lama
+         EgtOutLog("Error in execution file: " & sExecFile & ", calling function: " & sCallFunction & ", CMD.ERR=" & nErr.ToString)
+         ' Error in executing file FILENAME
+         Dim MsgBoxError As New EgtMsgBox(m_MainWindow, "", 90259 & " '" & sExecFile & "'.", EgtMsgBox.Buttons.OK, EgtMsgBox.Icons.NULL)
+         Return
+      End If
+   End Sub
+
+   ' Recupero il percorso del file lua da eseguire
+   Private Function GetExecLuaFile() As String
+      Dim sDir As String = String.Empty
+      Dim sFile As String = String.Empty
+      If GetPrivateProfileString(S_EXECLUA, K_DIRSCRIPT_LUA, "", sDir, m_MainWindow.GetMachIniFile()) <> 0 And
+         GetPrivateProfileString(S_EXECLUA, K_FILESCRIPT_LUA, "", sFile, m_MainWindow.GetMachIniFile()) <> 0 Then
+         ' Formatto le stringhe lette
+         sDir = sDir.Trim
+         sFile = sFile.Trim
+         If sDir.EndsWith("\"c) Then
+            sDir = sDir.Remove(sDir.LastIndexOf("\"c))
+         End If
+         If Not sFile.EndsWith(".lua") Then
+            sFile = sFile & ".lua"
+         End If
+         If File.Exists(sDir & "\" & sFile) Then
+            Return sDir & "\" & sFile
+         End If
+      End If
+      Return String.Empty
+   End Function
+
+   ' Recupera il nome della funzione che deve essere chiamata
+   Private Function GetCallFunction() As String
+      Dim sCallFunction As String = "CMD.CmdString"
+      GetPrivateProfileString(S_EXECLUA, K_CALLFUNCTION, sCallFunction, sCallFunction, m_MainWindow.GetMachIniFile())
+      Return sCallFunction
+   End Function
+
 End Class

MainWindow.xaml.vb

@@ -321,11 +321,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)
       ' Verifico abilitazione nesting automatico
       m_bAutoNest = Not String.IsNullOrWhiteSpace(sNestKey)
       ' Recupero opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2406, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(9423, 2406, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2411, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(9423, 2411, 1, m_nKeyOptions)
       ' Verifico abilitazione prodotto
       Dim bProd As Boolean = GetKeyOption(KEY_OPT.CUT_BASE)
       ' Inizializzazione generale di EgtInterface
@@ -692,6 +694,8 @@ Class MainWindow
             MainWindowGrid.Children.Remove(m_OptionsPageUC)
             MainWindowGrid.Children.Add(m_WorkInProgressPageUC)
             m_ActivePage = Pages.WorkInProgress
+         Case Else
+            WorkInProgressBtn.IsChecked = False
       End Select
    End Sub
 
@@ -750,6 +754,8 @@ Class MainWindow
             MainWindowGrid.Children.Add(m_CurrentProjectPageUC)
             m_CurrentProjectPageUC.CurrentProjectPageGrid.Children.Add(m_DirectCutPageUC)
             m_ActivePage = Pages.DirectCut
+         Case Else
+            WorkInProgressBtn.IsChecked = False
       End Select
    End Sub
 
@@ -805,6 +811,8 @@ Class MainWindow
             MainWindowGrid.Children.Add(m_CurrentProjectPageUC)
             m_CurrentProjectPageUC.CurrentProjectPageGrid.Children.Add(m_CadCutPageUC)
             m_ActivePage = Pages.CadCut
+         Case Else
+            CadCutBtn.IsChecked = False
       End Select
    End Sub
 
@@ -861,6 +869,8 @@ Class MainWindow
             MainWindowGrid.Children.Add(m_CurrentProjectPageUC)
             m_CurrentProjectPageUC.CurrentProjectPageGrid.Children.Add(m_FrameCutPageUC)
             m_ActivePage = Pages.FrameCut
+         Case Else
+            If FrameCutBtn.IsEnabled Then FrameCutBtn.IsChecked = False
       End Select
    End Sub
 
@@ -912,6 +922,8 @@ Class MainWindow
             MainWindowGrid.Children.Remove(m_OptionsPageUC)
             MainWindowGrid.Children.Add(m_MachinePageUC)
             m_ActivePage = Pages.Machine
+         Case Else
+            MachineBtn.IsChecked = False
       End Select
    End Sub
 
@@ -968,7 +980,7 @@ Class MainWindow
             MainWindowGrid.Children.Add(m_OptionsPageUC)
             m_ActivePage = Pages.Options
          Case Pages.Options
-            OptionsBtn.IsChecked = True
+            OptionsBtn.IsChecked = False
       End Select
    End Sub
 
@@ -1114,19 +1126,21 @@ Class MainWindow
       ' Se non sono in tagli diretti tutto ok
       If m_ActivePage <> Pages.DirectCut Then Return True
       ' Concludo le attività in corso
-      Select Case m_DirectCutPageUC.m_ActiveDirectCutPage
-         Case DirectCutPageUC.DirectCutPages.SingleCut
-            m_DirectCutPageUC.m_SingleCut.SingleCut_Unloaded(sender, e)
-         Case DirectCutPageUC.DirectCutPages.MultipleCut
-            m_DirectCutPageUC.m_MultipleCut.MultipleCut_Unloaded(sender, e)
-         Case DirectCutPageUC.DirectCutPages.GridCut
-            m_DirectCutPageUC.m_GridCut.GridCut_Unloaded(sender, e)
-         Case DirectCutPageUC.DirectCutPages.CopyTemplate
-            m_DirectCutPageUC.m_CopyTemplate.CopyTemplate_Unloaded(sender, e)
-         Case DirectCutPageUC.DirectCutPages.FlatteningCut
-            m_DirectCutPageUC.m_FlatteningCut.FlatteningCut_Unloaded(sender, e)
-         Case DirectCutPageUC.DirectCutPages.SawTest
-            m_DirectCutPageUC.m_SawTest.SawTest_Unloaded(sender, e)
+      Select Case m_DirectCutPageUC.m_ControlsDirectCutUC.m_ActiveDirectCutPage
+         Case ControlsDirectCutUC.DirectCutPages.SingleCut
+            m_DirectCutPageUC.m_ControlsDirectCutUC.m_SingleCut.SingleCut_Unloaded(sender, e)
+         Case ControlsDirectCutUC.DirectCutPages.MultipleCut
+            m_DirectCutPageUC.m_ControlsDirectCutUC.m_MultipleCut.MultipleCut_Unloaded(sender, e)
+         Case ControlsDirectCutUC.DirectCutPages.GridCut
+            m_DirectCutPageUC.m_ControlsDirectCutUC.m_GridCut.GridCut_Unloaded(sender, e)
+         Case ControlsDirectCutUC.DirectCutPages.FlatteningCut
+            m_DirectCutPageUC.m_ControlsDirectCutUC.m_FlatteningCut.FlatteningCut_Unloaded(sender, e)
+         Case ControlsDirectCutUC.DirectCutPages.CopyTemplate
+            m_DirectCutPageUC.m_ControlsDirectCutUC1.m_CopyTemplate.CopyTemplate_Unloaded(sender, e)
+         Case ControlsDirectCutUC.DirectCutPages.Polishing
+            m_DirectCutPageUC.m_ControlsDirectCutUC1.m_Polishing.Polishing_Unloaded(sender, e)
+         Case ControlsDirectCutUC.DirectCutPages.SawTest
+            m_DirectCutPageUC.m_ControlsDirectCutUC1.m_SawTest.SawTest_Unloaded(sender, e)
       End Select
       Return True
    End Function

My Project/AssemblyInfo.vb

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

NcComm/CNCommunication.vb

@@ -581,6 +581,7 @@ Public Class CNCommunication
                m_MainWindow.m_DirectCutPageUC.ZCJogChanged(m_CN.bZCJog)
                m_MainWindow.m_DirectCutPageUC.ZBJogChanged(m_CN.bZBCJog)
                m_MainWindow.m_DirectCutPageUC.RemoteChanged(m_CN.bRemote)
+               m_MainWindow.m_DirectCutPageUC.ParkingStateChanged(m_CN.bParkingState)
             End If
          Else
             m_MainWindow.m_DirectCutPageUC.m_MachineButtons.SpindleStateChanged(m_CN.bSpindleState)
@@ -607,6 +608,7 @@ Public Class CNCommunication
                m_MainWindow.m_DirectCutPageUC.m_MachineButtons.ZJogChanged(m_CN.bZCJog)
                m_MainWindow.m_DirectCutPageUC.m_MachineButtons.BCJogChanged(m_CN.bZBCJog)
                m_MainWindow.m_DirectCutPageUC.m_MachineButtons.RemoteChanged(m_CN.bRemote)
+               m_MainWindow.m_DirectCutPageUC.ParkingStateChanged(m_CN.bParkingState)
             End If
 
          End If

OmagCUT.vbproj

@@ -177,6 +177,12 @@
       <DependentUpon>SelectPartFromFamilyWD.xaml</DependentUpon>
     </Compile>
     <Compile Include="CAM\CamPolishing.vb" />
+    <Compile Include="DirectCuts\ControlsDirectCutUC.xaml.vb">
+      <DependentUpon>ControlsDirectCutUC.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="DirectCuts\ControlsDirectCutUC1.xaml.vb">
+      <DependentUpon>ControlsDirectCutUC1.xaml</DependentUpon>
+    </Compile>
     <Compile Include="DirectCuts\Polishing.xaml.vb">
       <DependentUpon>Polishing.xaml</DependentUpon>
     </Compile>
@@ -186,6 +192,9 @@
     <Compile Include="DirectCuts\SingleDrillUC.xaml.vb">
       <DependentUpon>SingleDrillUC.xaml</DependentUpon>
     </Compile>
+    <Compile Include="DirectCuts\SquaringUC.xaml.vb">
+      <DependentUpon>SquaringUC.xaml</DependentUpon>
+    </Compile>
     <Compile Include="DrawImport\AlzFrontUC.xaml.vb">
       <DependentUpon>AlzFrontUC.xaml</DependentUpon>
     </Compile>
@@ -429,6 +438,14 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="DirectCuts\ControlsDirectCutUC.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="DirectCuts\ControlsDirectCutUC1.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="DirectCuts\Polishing.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -441,6 +458,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="DirectCuts\SquaringUC.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="DrawImport\AlzFrontUC.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -1296,6 +1317,9 @@
   <ItemGroup>
     <Resource Include="Resources\NewIcons\Ponticelli_delete.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\Parking.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\OmagCUT\OmagCUTR32.exe

OmagCUTDictionary.xaml

@@ -208,6 +208,7 @@
     <BitmapImage x:Key="XYJogImg" UriSource="Resources/NewIcons/XYJog.png"></BitmapImage>
     <BitmapImage x:Key="ZCJogImg" UriSource="Resources/NewIcons/ZCJog.png"></BitmapImage>
     <BitmapImage x:Key="ZBJogImg" UriSource="Resources/NewIcons/ZBJog.png"></BitmapImage>
+    <BitmapImage x:Key="ParkingImg" UriSource="Resources/NewIcons/Parking.png"></BitmapImage>
 
 
     <!--Frame-->

Project/CurrentProjectPageUC.xaml.vb

@@ -107,7 +107,8 @@ Public Class CurrentProjectPageUC
          Dim nDepthBits As Integer = GetPrivateProfileInt(S_OPENGL, K_DEPTHBITS, 32, m_MainWindow.GetIniFile())
          CurrentProjectScene.SetViewAttributes(nDriver, b2Buff, nColorBits, nDepthBits)
          ' inizializzo la scena (DB geometrico + visualizzazione) e verifico presenza chiave
-         If Not CurrentProjectScene.Init() Then
+         Dim bProd As Boolean = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.CUT_BASE)
+         If Not CurrentProjectScene.Init() Or Not bProd Then
             ' Rimuovo l'host della scena perchè altrimenti rimarrebbe il buco!!
             Me.CurrentProjectPageGrid.Children.Remove(CurrentProjectSceneHost)
             ' Flag per riavvio programma
@@ -158,6 +159,7 @@ Public Class CurrentProjectPageUC
 #End If
             m_MainWindow.Close()
             If bRestart Then Process.Start(Application.ResourceAssembly.Location)
+            Return
          End If
          ' visualizzazione avanzata dei triangoli costituenti le superfici
          Dim bShowTriaAdv As Boolean = (GetPrivateProfileInt(S_SCENE, K_SHOWTRIAADV, 1, m_MainWindow.GetIniFile()) <> 0)
@@ -168,11 +170,6 @@ Public Class CurrentProjectPageUC
          ' dimensione lineare max in pixel delle textures
          Dim nTxrMaxLinPix As Integer = GetPrivateProfileInt(S_SCENE, K_TEXMAXLINPIX, 4096, m_MainWindow.GetIniFile())
          EgtSetTextureMaxLinPixels(nTxrMaxLinPix)
-         ' Verifico abilitazione prodotto
-         If Not m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.CUT_BASE) Then
-            Dim MissingKeyWnd As New EgtMsgBox(m_MainWindow, EgtMsg(MSG_MISSINGKEYWD + 1), EgtMsg(MSG_MISSINGKEYWD + 5), EgtMsgBox.Buttons.OK, EgtMsgBox.Icons.NULL, 1)
-            m_MainWindow.Close()
-         End If
          ' Recupero e imposto handle finestra principale
          Dim hMainWnd As IntPtr = New WindowInteropHelper(Application.Current.MainWindow).Handle
          EgtSetMainWindowHandle(hMainWnd)
@@ -399,6 +396,8 @@ Public Class CurrentProjectPageUC
       m_MainWindow.m_CadCutPageUC.m_NestPage.CalcRawPart()
       m_dRawHeight = 0
       UpdateHeightTxBx()
+      ' prima di parcheggiare svuoto dei pezzi in parcheggio sia vuota
+      m_MainWindow.m_CadCutPageUC.m_NestPage.ResetListOfGruopInPark()
       ' Parcheggio correttamente i pezzi precedentemente salvati
       Dim nId2 As Integer = EgtGetFirstPart()
       While nId2 <> GDB_ID.NULL
@@ -410,7 +409,7 @@ Public Class CurrentProjectPageUC
          nId2 = EgtGetNextPart(nId2)
       End While
       ' Aggiorno Aree totale e da lavorare dei pezzi
-      SetTotalArea( dTotArea)
+      SetTotalArea(dTotArea)
       UpdateToProduceArea()
       ShowAreas()
       ' Dichiaro progetto non modificato

WorkInProgress/WorkInProgressPageUC.xaml.vb

@@ -309,7 +309,8 @@ Public Class WorkInProgressPageUC
       Dim nDepthBits As Integer = GetPrivateProfileInt(S_OPENGL, K_DEPTHBITS, 32, m_MainWindow.GetIniFile())
       WorkInProgressScene.SetViewAttributes(nDriver, b2Buff, nColorBits, nDepthBits)
       ' inizializzo la scena (DB geometrico + visualizzazione) e verifico presenza chiave
-      If Not WorkInProgressScene.Init() Then
+      Dim bProd As Boolean = m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.CUT_BASE)
+      If Not WorkInProgressScene.Init() Or Not bProd Then
          ' Rimuovo l'host della scena perchè altrimenti rimarrebbe il buco!!
          Me.WorkInProgressPageGrid.Children.Remove(WorkInProgressSceneHost)
          ' Flag per riavvio programma
@@ -360,6 +361,7 @@ Public Class WorkInProgressPageUC
 #End If
          m_MainWindow.Close()
          If bRestart Then Process.Start( Application.ResourceAssembly.Location)
+         Return True
       End If
       ' dimensione lineare max in pixel delle textures
       Dim nTxrMaxLinPix As Integer = GetPrivateProfileInt(S_SCENE, K_TEXMAXLINPIX, 4096, m_MainWindow.GetIniFile())