Inserita nuova versione Alzatine e frontalini

Gestione parametro Anima nel ToolDB
Cambio colore sfondo per i parametri di lavorazione
2021-10-08 19:48:11 +02:00 · 2021-10-08 18:59:59 +02:00 · 2021-10-08 18:11:15 +02:00 · 2021-10-08 16:41:10 +02:00 · 2021-10-08 16:40:37 +02:00 · 2021-10-07 17:32:48 +02:00
98 changed files with 1966 additions and 954 deletions
@@ -101,16 +101,25 @@
         </Button>
         
         <UniformGrid Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="3" Columns="2" >
-            <Button Name="InsertPartBtn" Style="{DynamicResource OmagCut_YellowTextButton}" Padding="1"/>
-            <Button Name="StorePartBtn" Style="{DynamicResource OmagCut_YellowTextButton}" Padding="1"/>
-         </UniformGrid>
+                <Button Name="InsertPartBtn" Style="{DynamicResource OmagCut_YellowIconButton}">
+                    <Image Source="{DynamicResource Inserisci-pezzoImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+                </Button>
+                <Button Name="StorePartBtn" Style="{DynamicResource OmagCut_YellowIconButton}">
+                    <Image Source="{DynamicResource Parcheggia-pezzoImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+                </Button>
+            </UniformGrid>

-         <Button Name="RemovePartBtn" Grid.ColumnSpan="3" Grid.Row="6"
-            Style="{DynamicResource OmagCut_YellowTextButton}" Padding="1"/>
+            <Button Name="RemovePartBtn" Grid.ColumnSpan="3" Grid.Row="6" Style="{DynamicResource OmagCut_YellowIconButton}">
+                <Image Source="{DynamicResource Elimina-pezzoImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+            </Button>

-         <UniformGrid Grid.Column="0" Grid.Row="7" Grid.ColumnSpan="3" Columns="2" >
-            <Button Name="SelectAllBtn" Style="{DynamicResource OmagCut_YellowTextButton}" Padding="1"/>
-            <Button Name="DeselectAllBtn" Style="{DynamicResource OmagCut_YellowTextButton}" Padding="1"/>
+            <UniformGrid Grid.Column="0" Grid.Row="7" Grid.ColumnSpan="3" Columns="2" >
+                <Button Name="SelectAllBtn" Style="{DynamicResource OmagCut_YellowIconButton}">
+                    <Image Source="{DynamicResource Seleziona-tuttoImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+                </Button>
+                <Button Name="DeselectAllBtn" Style="{DynamicResource OmagCut_YellowIconButton}">
+                    <Image Source="{DynamicResource Deseleziona-tuttoImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+                </Button>
         </UniformGrid>

      </Grid>
@@ -56,11 +56,11 @@ Public Class NestPageUC

   Private Sub NestPage_Initialized(sender As Object, e As EventArgs)
      ' Imposto i messaggi letti dal file dei messaggi
-      InsertPartBtn.Content = EgtMsg(MSG_NESTPAGEUC + 1)            'Insert part - Inserisci pezzo
-      StorePartBtn.Content = EgtMsg(MSG_NESTPAGEUC + 2)             'Store part - Parcheggia pezzo
-      RemovePartBtn.Content = EgtMsg(MSG_NESTPAGEUC + 3)            'Remove part - Elimina pezzo
-      SelectAllBtn.Content = EgtMsg(MSG_NESTPAGEUC + 4)             'Select All - Seleziona Tutto
-      DeselectAllBtn.Content = EgtMsg(MSG_NESTPAGEUC + 5)           'Deselect All - Deseleziona Tutto
+      InsertPartBtn.ToolTip = EgtMsg(MSG_NESTPAGEUC + 1)            'Insert part - Inserisci pezzo
+      StorePartBtn.ToolTip = EgtMsg(MSG_NESTPAGEUC + 2)             'Store part - Parcheggia pezzo
+      RemovePartBtn.ToolTip = EgtMsg(MSG_NESTPAGEUC + 3)            'Remove part - Elimina pezzo
+      SelectAllBtn.ToolTip = EgtMsg(MSG_NESTPAGEUC + 4)             'Select All - Seleziona Tutto
+      DeselectAllBtn.ToolTip = EgtMsg(MSG_NESTPAGEUC + 5)           'Deselect All - Deseleziona Tutto
   End Sub

   Private Sub NestPage_Loaded(sender As Object, e As RoutedEventArgs)
@@ -132,9 +132,6 @@ Public Class NestPageUC
         Not m_CurrProjPage.m_bSelectCurv Then
         Return
      End If
-
-      '------------------- NUOVA DEFINIZIONE -------------------------
-
      ' provo a riconoscere il valore medio del segmento 
      ' Verifico se selezionato indicativo di pezzo
      EgtSetObjFilterForSelWin(False, True, False, False, False)
@@ -176,13 +173,9 @@ Public Class NestPageUC
         End If
         nIdMy = EgtGetNextObjInSelWin()
      End While
-
      Return
-
-      '------------------- NUOVA DEFINIZIONE -------------------------
   End Sub

-
   Private Sub OnMyMouseDownScene(sender As Object, e As System.Windows.Forms.MouseEventArgs) Handles m_CurrProjPage.OnMouseDownScene
      ' Verifico di essere il gestore attivo e non in modalità registrazione
      If Not m_bActive Or m_bRegister Then Return
@@ -219,16 +212,37 @@ Public Class NestPageUC
            m_bDrag = True
            Exit While
         Else
-            ' verifico che tra gli elemnti selezionati ci sia un testo
+            ' verifico se l'elemento selezionato è il nome della tavola
            If EgtGetType(nId) = GDB_TY.EXT_TEXT AndAlso (sNamePartId = MAIN_TAB Or sNamePartId = SECOND_TAB) Then
               Dim nTab As Integer = m_MainWindow.m_CadCutPageUC.m_ProjectMgr.ChangeTable()
-               ' se non è stata eseguita nessuna selezione esco dal ciclo 
+               ' se non è stata eseguita nessuna scelta esco dal ciclo 
               If nTab = 0 Then Exit While
-               '' Creo nuovo progetto
-               'm_CurrProjPage.NewProject(nTabInd, bRetainParkedParts)
-               '' Gestione stato FastGrid
-               'm_MainWindow.m_CadCutPageUC.m_FastGridSlabManager.OnPostNewProject()
-               'EgtZoom(ZM.ALL)
+               ' imposto l'altra tavola
+               Dim sOtherTab = If( sNamePartId = MAIN_TAB, SECOND_TAB, MAIN_TAB)
+               EgtChangeTable( sOtherTab, True)
+               m_CurrProjPage.AdjustAdditionalTable( True)
+               EgtSetMachineLook(MCH_LOOK.TAB)
+               ' aggiorno le lavorazioni
+               UpdateAllMachiningsToolpaths()
+               ' aggiorno i movimenti pezzi tra disposizioni
+               For nI As Integer = 1  To EgtGetPhaseCount()
+                  EgtSetCurrPhase( nI)
+                  Dim nDispId As Integer = EgtGetPhaseDisposition(nI)
+                  SpecialApplyDisposition(nDispId, True)
+               Next
+               ' aggiorno posizionamento ventose per lavorazioni da sotto
+               UpdateVacuumsForDrip()
+               ' dichiaro tutto aggiornato
+               m_CurrProjPage.SetOrderMachiningFlag()
+               EgtSetCurrPhase(1)
+               ' aggiorno posizione pezzi in parcheggio
+               Dim nPPId As Integer = EgtGetFirstPart()
+               While nPPId <> GDB_ID.NULL
+                  PackPartInStore(nPPId)
+                  nPPId = EgtGetNextPart( nPPId)
+               End While
+               ' visualizzazione
+               EgtZoom(ZM.ALL)
               Exit While
            End If
         End If
@@ -100,9 +100,15 @@
               <ColumnDefinition Width="1*"/>
            </Grid.ColumnDefinitions>

-            <Button Name="OnOffBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowTextButton}" FontSize="{DynamicResource SplitPageBtn_FontSize}"/>
-            <Button Name="AllOnBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowTextButton}" FontSize="{DynamicResource SplitPageBtn_FontSize}"/>
-            <Button Name="AllOffBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowTextButton}" FontSize="{DynamicResource SplitPageBtn_FontSize}"/>
+            <Button Name="OnOffBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconButton}">
+                <Image Source="{DynamicResource ON_OFF-singolo-taglioImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+            </Button>
+            <Button Name="AllOnBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
+                <Image Source="{DynamicResource Tutti-ONImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+            </Button>
+            <Button Name="AllOffBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
+                <Image Source="{DynamicResource Tutti-OFFImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+            </Button>

         </Grid>

@@ -113,11 +119,17 @@
               <ColumnDefinition Width="1*"/>
            </Grid.ColumnDefinitions>

-            <Button Name="CutBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowTextButton}" FontSize="{DynamicResource SplitPageBtn_FontSize}"/>
-            <Button Name="CutStartBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowTextButton}" FontSize="{DynamicResource SplitPageBtn_FontSize}"/>
-            <Button Name="CutEndBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowTextButton}" FontSize="{DynamicResource SplitPageBtn_FontSize}"/>
+                <Button Name="CutBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconButton}">
+                    <Image Source="{DynamicResource Allunga-AccorciaImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+                </Button>
+                <Button Name="CutStartBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
+                    <Image Source="{DynamicResource Inizio-Allunga-AccorciaImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+                </Button>
+                <Button Name="CutEndBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
+                    <Image Source="{DynamicResource Fine-Allunga-AccorciaImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+                </Button>

-         </Grid>
+            </Grid>

      </Grid>

@@ -139,18 +151,42 @@
         </Grid.ColumnDefinitions>


-         <Button Name="OutCenStartBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowTextButton}" FontSize="{DynamicResource SplitPageBtn_FontSize}"/>
-         <Button Name="OutCenEndBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowTextButton}" FontSize="{DynamicResource SplitPageBtn_FontSize}"/>
-         <Button Name="ModifStartBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowTextButton}" FontSize="{DynamicResource SplitPageBtn_FontSize}"/>
-         <Button Name="ModifEndBtn" Grid.Column="3" Style="{DynamicResource OmagCut_YellowTextButton}" FontSize="{DynamicResource SplitPageBtn_FontSize}"/>
-         <Button Name="InvertBtn" Grid.Column="4" Style="{DynamicResource OmagCut_YellowTextButton}" FontSize="{DynamicResource SplitPageBtn_FontSize}"/>
-         <Button Name="PauseBtn" Grid.Column="5" Style="{DynamicResource OmagCut_YellowTextButton}" FontSize="{DynamicResource SplitPageBtn_FontSize}"/>
-         <Button Name="AllOutStartBtn" Grid.Column="6" Style="{DynamicResource OmagCut_YellowTextButton}" FontSize="{DynamicResource SplitPageBtn_FontSize}"/>
-         <Button Name="AllCenStartBtn" Grid.Column="7" Style="{DynamicResource OmagCut_YellowTextButton}" FontSize="{DynamicResource SplitPageBtn_FontSize}"/>
-         <Button Name="AllOutEndBtn" Grid.Column="8" Style="{DynamicResource OmagCut_YellowTextButton}" FontSize="{DynamicResource SplitPageBtn_FontSize}"/>
-         <Button Name="AllCenEndBtn" Grid.Column="9" Style="{DynamicResource OmagCut_YellowTextButton}" FontSize="{DynamicResource SplitPageBtn_FontSize}"/>
-         <Button Name="AllExtendBtn" Grid.Column="10" Style="{DynamicResource OmagCut_YellowTextButton}" FontSize="{DynamicResource SplitPageBtn_FontSize}"/>
-         <Button Name="AllReduceBtn" Grid.Column="11" Style="{DynamicResource OmagCut_YellowTextButton}" FontSize="{DynamicResource SplitPageBtn_FontSize}"/>
+         <Button Name="OutCenStartBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconButton}">
+                <Image Source="{DynamicResource Inizio-Centro-FuoriImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+         </Button>
+            <Button Name="OutCenEndBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconButton}">
+                <Image Source="{DynamicResource Fine-Centro-FuoriImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+            </Button>
+            <Button Name="ModifStartBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
+                <Image Source="{DynamicResource Modifica-InizioImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+            </Button>
+            <Button Name="ModifEndBtn" Grid.Column="3"  Style="{DynamicResource OmagCut_YellowIconButton}">
+                <Image Source="{DynamicResource Modifica-FineImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+            </Button>
+            <Button Name="InvertBtn" Grid.Column="4" Style="{DynamicResource OmagCut_YellowIconButton}">
+                <Image Source="{DynamicResource InvertiImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+            </Button>
+            <Button Name="PauseBtn" Grid.Column="5" Style="{DynamicResource OmagCut_YellowIconButton}">
+                <Image Source="{DynamicResource Pausa-ON_OFFImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+            </Button>
+            <Button Name="AllOutStartBtn" Grid.Column="6" Style="{DynamicResource OmagCut_YellowIconButton}">
+                <Image Source="{DynamicResource Inizio-tutti-fuoriImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+            </Button>
+            <Button Name="AllCenStartBtn" Grid.Column="7" Style="{DynamicResource OmagCut_YellowIconButton}">
+                <Image Source="{DynamicResource Inizio-tutti-centroImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+            </Button>
+            <Button Name="AllOutEndBtn" Grid.Column="8" Style="{DynamicResource OmagCut_YellowIconButton}">
+                <Image Source="{DynamicResource Fine-tutti-fuoriImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+            </Button>
+            <Button Name="AllCenEndBtn" Grid.Column="9" Style="{DynamicResource OmagCut_YellowIconButton}">
+                <Image Source="{DynamicResource Fine-tutti-centroImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+            </Button>
+            <Button Name="AllExtendBtn" Grid.Column="10" Style="{DynamicResource OmagCut_YellowIconButton}">
+                <Image Source="{DynamicResource Tutti-allungaImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+            </Button>
+            <Button Name="AllReduceBtn" Grid.Column="11" Style="{DynamicResource OmagCut_YellowIconButton}">
+                <Image Source="{DynamicResource Tutti-accorciaImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+            </Button>

      </Grid>

@@ -29,24 +29,24 @@ Public Class SplitPageUC
      ' Collego lista di oggetti a ListBox
      MachiningLsBx.ItemsSource = m_ItemList
      ' Assegno testi
-      OnOffBtn.Content = EgtMsg(MSG_SPLITPAGEUC + 1)         ' On/Off
-      AllOnBtn.Content = EgtMsg(MSG_SPLITPAGEUC + 2)         ' Tutti On
-      AllOffBtn.Content = EgtMsg(MSG_SPLITPAGEUC + 3)        ' Tutti Off
-      CutBtn.Content = EgtMsg(MSG_SPLITPAGEUC + 4)           ' Allunga/Accorcia
-      CutStartBtn.Content = EgtMsg(MSG_SPLITPAGEUC + 5)      ' Inizio Allunga/Accorcia
-      CutEndBtn.Content = EgtMsg(MSG_SPLITPAGEUC + 6)        ' Fine Allunga/Accorcia
-      OutCenStartBtn.Content = EgtMsg(MSG_SPLITPAGEUC + 7)   ' Inizio Centro/Fuori
-      OutCenEndBtn.Content = EgtMsg(MSG_SPLITPAGEUC + 12)    ' Fine Centro/Fuori
-      ModifStartBtn.Content = EgtMsg(MSG_SPLITPAGEUC + 33)   ' Inizio Modif.
-      ModifEndBtn.Content = EgtMsg(MSG_SPLITPAGEUC + 34)     ' Fine Modif.
-      InvertBtn.Content = EgtMsg(MSG_SPLITPAGEUC + 36)       ' Inverti
-      PauseBtn.Content = EgtMsg(MSG_SPLITPAGEUC + 31)        ' Pausa On/Off
-      AllOutStartBtn.Content = EgtMsg(MSG_SPLITPAGEUC + 8)   ' Inizi Tutti Fuori
-      AllCenStartBtn.Content = EgtMsg(MSG_SPLITPAGEUC + 9)   ' Inizi Tutti Centro
-      AllOutEndBtn.Content = EgtMsg(MSG_SPLITPAGEUC + 13)    ' Fine Tutti Fuori
-      AllCenEndBtn.Content = EgtMsg(MSG_SPLITPAGEUC + 14)    ' Fine Tutti Centro
-      AllExtendBtn.Content = EgtMsg(MSG_SPLITPAGEUC + 15)    ' Allunga Tutti
-      AllReduceBtn.Content = EgtMsg(MSG_SPLITPAGEUC + 16)    ' Accorc. Tutti
+      OnOffBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 1)         ' On/Off
+      AllOnBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 2)         ' Tutti On
+      AllOffBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 3)        ' Tutti Off
+      CutBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 4)           ' Allunga/Accorcia
+      CutStartBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 5)      ' Inizio Allunga/Accorcia
+      CutEndBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 6)        ' Fine Allunga/Accorcia
+      OutCenStartBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 7)   ' Inizio Centro/Fuori
+      OutCenEndBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 12)    ' Fine Centro/Fuori
+      ModifStartBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 33)   ' Inizio Modif.
+      ModifEndBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 34)     ' Fine Modif.
+      InvertBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 36)       ' Inverti
+      PauseBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 31)        ' Pausa On/Off
+      AllOutStartBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 8)   ' Inizi Tutti Fuori
+      AllCenStartBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 9)   ' Inizi Tutti Centro
+      AllOutEndBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 13)    ' Fine Tutti Fuori
+      AllCenEndBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 14)    ' Fine Tutti Centro
+      AllExtendBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 15)    ' Allunga Tutti
+      AllReduceBtn.ToolTip = EgtMsg(MSG_SPLITPAGEUC + 16)    ' Accorc. Tutti
      ModifyBtn.Content = EgtMsg(MSG_SPLITPAGEUC + 17)       ' Modifica
      AutoBtn.Content = EgtMsg(MSG_SPLITPAGEUC + 18)         ' Auto
      RestartBtn.Content = EgtMsg(MSG_SPLITPAGEUC + 19)      ' Restart
@@ -107,6 +107,7 @@
   Public Const K_ZBJOG As String = "ZBJog"
   Public Const K_POWERON As String = "PowerON"
   Public Const K_POWEROFF As String = "PowerOFF"
+   Public Const K_REMOTE As String = "Remote"

   Public Const S_PRODUCTIONLINE As String = "ProductionLine"
   Public Const K_ACTIVE As String = "Active"
@@ -35,10 +35,11 @@
               <ColumnDefinition Width="1*"/>
            </Grid.ColumnDefinitions>

-            <Button Name="Point1Btn" Grid.Column="0"
-               Style="{DynamicResource OmagCut_YellowTextButton}"/>
+                <Button Name="Point1Btn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconButton}">
+                    <Image Source="{DynamicResource Acquisisci-PImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+                </Button>

-         </Grid>
+            </Grid>

         <ComboBox Name="PointModeCmBx" Grid.Row="1" Grid.ColumnSpan="2" Style="{StaticResource OmagCut_ComboBox}"
            Margin="6,0,6,0">
@@ -55,10 +56,12 @@
               <ColumnDefinition Width="1*"/>
            </Grid.ColumnDefinitions>

-            <ToggleButton Name="LineBtn" Grid.Column="0"
-               Style="{DynamicResource OmagCut_YellowToggleButton}"/>
-            <ToggleButton Name="ArcBtn" Grid.Column="1"
-               Style="{DynamicResource OmagCut_YellowToggleButton}"/>
+                <ToggleButton Name="LineBtn" Grid.Column="0" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+                    <Image Source="{DynamicResource LineaImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+                </ToggleButton>
+                <ToggleButton Name="ArcBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+                    <Image Source="{DynamicResource ArcoImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+                </ToggleButton>

         </Grid>

@@ -69,14 +72,18 @@
               <ColumnDefinition Width="1*"/>
            </Grid.ColumnDefinitions>

-            <Button Name="RemoveBtn" Grid.Column="0" Grid.Row="3" Grid.RowSpan="2"
-            Style="{DynamicResource OmagCut_GradientBlueTextButton}"/>
-            <Button Name="CloseBtn" Grid.Column="1" Grid.Row="3" Grid.RowSpan="2"
-            Style="{DynamicResource OmagCut_GradientBlueTextButton}"/>
+                <Button Name="RemoveBtn" Grid.Column="0" Grid.Row="3" Grid.RowSpan="2" Style="{DynamicResource OmagCut_GradientBlueIconButton}">
+                    <Image Source="{DynamicResource Rimuovi-segmentoImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+                </Button>
+                <Button Name="CloseBtn" Grid.Column="1" Grid.Row="3" Grid.RowSpan="2" Style="{DynamicResource OmagCut_GradientBlueIconButton}">
+                    <Image Source="{DynamicResource ChiudiImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+                </Button>

-         </Grid>
+            </Grid>

-            <Button Name="SaveBtn" Grid.Column="0" Grid.Row="10" Style="{DynamicResource OmagCut_GradientBlueTextButton}"/>
+            <Button Name="SaveBtn" Grid.Column="0" Grid.Row="10"  Style="{DynamicResource OmagCut_GradientBlueIconButton}">
+                <Image Source="{DynamicResource Salva-taglioImg}" Style="{StaticResource OmagCut_ArrowButtonIcon}"/>
+            </Button>

            <Button Name="ExitBtn" Grid.Column="2" Grid.Row="10" Style="{DynamicResource OmagCut_YellowIconButton}">
                <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
@@ -49,12 +49,12 @@ Public Class CopyTemplateUC
      ' la associo alla combobox
      PointModeCmBx.ItemsSource = m_PointsModeArray

-      Point1Btn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 10)
-      LineBtn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 50)
-      ArcBtn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 51)
-      RemoveBtn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 52)
-      CloseBtn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 53)
-      SaveBtn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 54)
+      Point1Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 10)
+      LineBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 50)
+      ArcBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 51)
+      RemoveBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 52)
+      CloseBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 53)
+      SaveBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 54)
   End Sub

   Private Sub CopyTemplate_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
@@ -141,10 +141,20 @@
                    </Grid>
                </Button>
             
-            <Button Name="PolishingBtn" Grid.Row="6"
-               Style="{DynamicResource OmagCut_YellowTextButton}"/>
+                <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"
+                <Button Name="CopyTemplateBtn" Grid.Row="7"
                    Style="{DynamicResource OmagCut_YellowIconButton}">
                <Grid>
                    <Grid.ColumnDefinitions>
@@ -158,9 +168,19 @@
            </Button>
             
            <Button Name="SawTestBtn" Grid.Row="8"
-               Style="{DynamicResource OmagCut_YellowTextButton}"/>
-
+                    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>
      
@@ -180,7 +200,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>
@@ -198,22 +219,27 @@
          <!--Comando asse X-Y-->
          <ToggleButton Name="XYBtn" Grid.Column="2"
               Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}">
-            <!--<Image Source="{DynamicResource VacuumImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>-->
+                <Image Source="{DynamicResource XYJogImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
         </ToggleButton>
          
          <!--Comando asse Z-C-->
          <ToggleButton Name="ZCBtn" Grid.Column="3"   
               Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}">
-              <!--<Image Source="{DynamicResource VacuumImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>-->
+              <Image Source="{DynamicResource ZCJogImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
          </ToggleButton>

-          <!--Comando asse Z-B-->
-          <ToggleButton Name="ZBBtn" Grid.Column="4"
+         <!--Comando asse Z-B-->
+         <ToggleButton Name="ZBBtn" Grid.Column="4"
               Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}">
-              <!--<Image Source="{DynamicResource VacuumImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>-->
-          </ToggleButton>
+                <Image Source="{DynamicResource ZBJogImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
+         </ToggleButton>

-            <Button Name="ManualModeBtn" Grid.Column="7"
+         <!--Comando Remote-->
+         <ToggleButton Name="RemoteBtn" Grid.Column="5"
+               Style="{DynamicResource OmagCut_GradientYellowIconToggleButton}">
+            <!--<Image Source="{DynamicResource VacuumImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>-->
+         </ToggleButton>
+         <Button Name="ManualModeBtn" Grid.Column="8"
               Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
            <Image Source="{DynamicResource ManualImg}" Style="{StaticResource OmagCut_ScaleButtonIcon}"/>
         </Button>
@@ -77,7 +77,7 @@ Public Class DirectCutPageUC

      'Posizionemento nella griglia delle Page UserControl
      m_MachineButtons.SetValue(Grid.RowProperty, 2)
-      m_MachineButtons.SetValue(Grid.ColumnSpanProperty, 6)
+      m_MachineButtons.SetValue(Grid.ColumnSpanProperty, 7)
      m_ManualAxesMove.SetValue(Grid.RowProperty, 1)
      If m_bManulaCut Then
         m_SingleCutAuto.SetValue(Grid.RowProperty, 1)
@@ -94,15 +94,14 @@ Public Class DirectCutPageUC
      m_ControlsMachineButton.SetValue(Grid.RowProperty, 1)
      m_VacuumMachineButton.SetValue(Grid.RowProperty, 1)

-      Dim bCollapsedNewBottonsConsole As Boolean = False
+      ' verifico che sia presente almeno uno dei bottoni della nuova console (SOLO PER MACCHINA CON paragrafo [ControlMachButtons])
+      Dim bCollapsedNewBottonsConsole As Boolean = Not m_ControlsMachineButton.GetPrivateProfileMachineButtons("JogButtons", "Button1", Nothing, Nothing, Nothing, Nothing, Nothing, Nothing, m_MainWindow.GetMachIniFile())
      m_NewMachineButtonsType = m_ControlsMachineButton.GetPrivateProfileMachineButtons(S_CONTROLMACHBUTTONS, "Button1", Nothing, Nothing, Nothing, Nothing, Nothing, Nothing, m_MainWindow.GetMachIniFile())
      If Not m_NewMachineButtonsType Then
         'Assegno MachineButtons alla pagina
         LowerButtonGrid.Children.Add(m_MachineButtons)
         ControlsMachineBtn.Visibility = Windows.Visibility.Collapsed
         VacuumMachineBtn.Visibility = Windows.Visibility.Collapsed
-         ' per le configurazioni diverse dalla Digitale5
-         bCollapsedNewBottonsConsole = True
      End If

      If GetPrivateProfileInt(S_NUMERICALCONTROL, K_TYPE, 0, m_MainWindow.GetMachIniFile()) = 0 Then
@@ -122,27 +121,36 @@ Public Class DirectCutPageUC
      GridCutTxt.Text = EgtMsg(90204)
      'FlatteningCutBtn.Content = EgtMsg(90206)
      FlatteningCutTxt.Text = EgtMsg(90206)
-      PolishingBtn.Content = EgtMsg(90231)
+      'PolishingBtn.Content = EgtMsg(90231)
+      PolishingTxt.Text = EgtMsg(90231)
      'CopyTemplateBtn.Content = EgtMsg(90209)
      CopyTemplateTxt.Text = EgtMsg(90209)
-      SawTestBtn.Content = EgtMsg(90207)
+      '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())
-      Dim x As Integer = GetPrivateProfileInt(S_NCDATA, K_NEWCONSOLE, 0, m_MainWindow.GetMachIniFile())
-      If GetPrivateProfileInt(S_NCDATA, K_NEWCONSOLE, 0, m_MainWindow.GetMachIniFile()) = 1 And Not bCollapsedNewBottonsConsole Then
-         XYBtn.Content = "X - Y"
-         ZCBtn.Content = "Z - C"
-         If AxesNumber < 5 Then
-            ZBBtn.Visibility = Windows.Visibility.Collapsed
-         End If
-         ZBBtn.Content = "Z - B"
-      Else
-         XYBtn.Visibility = Windows.Visibility.Collapsed
-         ZCBtn.Visibility = Windows.Visibility.Collapsed
-         ZBBtn.Visibility = Windows.Visibility.Collapsed
-      End If
+
+      '' leggo se è stata configurata la nuova conole
+      'If GetPrivateProfileInt(S_NCDATA, K_NEWCONSOLE, 0, m_MainWindow.GetMachIniFile()) = 1 And Not bCollapsedNewBottonsConsole Then
+      '   XYBtn.Content = "X - Y"
+      '   XYBtn.Foreground = Brushes.White
+      '   ZCBtn.Content = "Z - C"
+      '   ZCBtn.Foreground = Brushes.White
+      '   If AxesNumber < 5 Then
+      '      ZBBtn.Visibility = Windows.Visibility.Collapsed
+      '   End If
+      '   ZBBtn.Content = "Z - B"
+      '   ZBBtn.Foreground = Brushes.White
+      '   RemoteBtn.Content = "Remote"
+      '   RemoteBtn.Foreground = Brushes.White
+      'Else
+      '   XYBtn.Visibility = Windows.Visibility.Collapsed
+      '   ZCBtn.Visibility = Windows.Visibility.Collapsed
+      '   ZBBtn.Visibility = Windows.Visibility.Collapsed
+      'End If

   End Sub

@@ -182,6 +190,8 @@ Public Class DirectCutPageUC
            End If
         End If
      End While
+      ' attivo la visualizzazione dei comandi
+      SetVisibilityJogButtuns()
      ' lo stato di questi comandi vieni carico dalla lettura del PLC (refresh)
      '----------- FINE NUOVI BOTTONI------------

@@ -228,6 +238,7 @@ Public Class DirectCutPageUC
      End If
      MultipleCutBtn.IsEnabled = bRawOk
      GridCutBtn.IsEnabled = bRawOk
+      SingleDrillBtn.IsEnabled = bRawOk
      FlatteningCutBtn.IsEnabled = bRawOk
      PolishingBtn.IsEnabled = (bRawOk And m_MainWindow.m_CurrentMachine.bPolishing)
      SawTestBtn.IsEnabled = bRawOk
@@ -238,6 +249,35 @@ Public Class DirectCutPageUC

   End Sub

+   Private Sub SetVisibilityJogButtuns()
+      XYBtn.Visibility = Visibility.Collapsed
+      ZCBtn.Visibility = Visibility.Collapsed
+      ZBBtn.Visibility = Visibility.Collapsed
+      RemoteBtn.Visibility = Visibility.Collapsed
+
+      Dim Item As MachineButton = Nothing
+      For Each Item In m_ButtonJogList
+         Select Case Item.StateFlag.Trim
+            Case K_XYJOG
+               XYBtn.Visibility = Visibility.Visible
+               XYBtn.Foreground = Brushes.White
+               XYBtn.ToolTip = "X - Y"
+            Case K_ZCJOG
+               ZCBtn.Visibility = Visibility.Visible
+               ZCBtn.Foreground = Brushes.White
+               ZCBtn.ToolTip = "Z - C"
+            Case K_ZBJOG
+               ZBBtn.Visibility = Visibility.Visible
+               ZBBtn.Foreground = Brushes.White
+               ZBBtn.ToolTip = "Z - B"
+            Case K_REMOTE
+               RemoteBtn.Visibility = Visibility.Visible
+               RemoteBtn.Foreground = Brushes.White
+               RemoteBtn.Content = "Remote"
+         End Select
+      Next
+   End Sub
+
   Private Sub PhotoBtn_Click(sender As Object, e As RoutedEventArgs) Handles PhotoBtn.Click
      EgtSetCurrentContext(m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene.GetCtx())
      ' Se macchina fotografica collegata, faccio una foto
@@ -342,7 +382,16 @@ Public Class DirectCutPageUC

   '------------------NUOVI BOTTONI PER GESTIONE JOYSTICK-------------------------------------------------
   Private Sub XYBtn_Click(sender As Object, e As RoutedEventArgs) Handles XYBtn.Click
-      Dim XYJogButton As MachineButton = m_ButtonJogList(0)
+      ' riverco in elenco il bottone XYJog
+      Dim XYJogButton As MachineButton = Nothing
+      Dim ItemButton As MachineButton = Nothing
+      For Each ItemButton In m_ButtonJogList
+         If ItemButton.StateFlag = K_XYJOG Then
+            XYJogButton = ItemButton
+            Exit For
+         End If
+      Next
+      If IsNothing(XYJogButton) Then Return
      ' eseguo lo script lua associato
      XYJogButton.ExecuteMDICommand(XYJogButton.TLuaScriptName)
      ' che comunica al PLC di cambiare lo stato, la modifica dello stato è intercettata dalla funzione Refresh che avvia il metodo Changed
@@ -365,7 +414,16 @@ Public Class DirectCutPageUC
   End Sub

   Private Sub ZCBtn_Click(sender As Object, e As RoutedEventArgs) Handles ZCBtn.Click
-      Dim ZJogButton As MachineButton = m_ButtonJogList(1)
+      ' riverco in elenco il bottone ZCYJog
+      Dim ZJogButton As MachineButton = Nothing
+      Dim ItemButton As MachineButton = Nothing
+      For Each ItemButton In m_ButtonJogList
+         If ItemButton.StateFlag = K_ZCJOG Then
+            ZJogButton = ItemButton
+            Exit For
+         End If
+      Next
+      If IsNothing(ZJogButton) Then Return
      ' eseguo lo script lua associato
      ZJogButton.ExecuteMDICommand(ZJogButton.TLuaScriptName)
   End Sub
@@ -386,9 +444,18 @@ Public Class DirectCutPageUC
   End Sub

   Private Sub ZBBtn_Click(sender As Object, e As RoutedEventArgs) Handles ZBBtn.Click
-      Dim BCJogButton As MachineButton = m_ButtonJogList(2)
+      ' riverco in elenco il bottone ZCYJog
+      Dim ZBJogButton As MachineButton = Nothing
+      Dim ItemButton As MachineButton = Nothing
+      For Each ItemButton In m_ButtonJogList
+         If ItemButton.StateFlag = K_ZBJOG Then
+            ZBJogButton = ItemButton
+            Exit For
+         End If
+      Next
+      If IsNothing(ZBJogButton) Then Return
      ' eseguo lo script lua associato
-      BCJogButton.ExecuteMDICommand(BCJogButton.TLuaScriptName)
+      ZBJogButton.ExecuteMDICommand(ZBJogButton.TLuaScriptName)
   End Sub

   Friend Sub ZBJogChanged(bBCAxes As Boolean)
@@ -405,6 +472,44 @@ Public Class DirectCutPageUC
         ZBBtn.IsChecked = bBCAxes
      End If
   End Sub
+
+   Private Sub RemoteBtn_Click(sender As Object, e As RoutedEventArgs) Handles RemoteBtn.Click
+      Dim RemoteButton As MachineButton = Nothing
+      Dim ItemButton As MachineButton = Nothing
+      For Each ItemButton In m_ButtonJogList
+         If ItemButton.StateFlag = K_REMOTE Then
+            RemoteButton = ItemButton
+            Exit For
+         End If
+      Next
+      If IsNothing(RemoteButton) 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 = RemoteButton.TLuaScriptName
+      Else
+         sLuaFileName = RemoteButton.FLuaScriptName
+      End If
+      RemoteButton.ExecuteMDICommand(sLuaFileName)
+   End Sub
+
+   Friend Sub RemoteChanged(bRemote As Boolean)
+      ' devo decodificare il tipo di pulsante, quindi eseguire la conversione...
+      Dim RemoteButton As TwoStateButton = Nothing
+      For Each MachineButton As MachineButton In m_ButtonJogList
+         If MachineButton.StateFlag.Trim = K_REMOTE Then
+            RemoteButton = MachineButton
+            Exit For
+         End If
+      Next
+      If Not IsNothing(RemoteButton) Then
+         RemoteButton.SetIsChecked(bRemote)
+         RemoteBtn.IsChecked = bRemote
+      End If
+   End Sub
+
   '------------------NUOVI BOTTONI PER GESTIONE JOYSTICK-------------------------------------------------
   Private Sub MachViewModeBtn_Click(sender As Object, e As RoutedEventArgs) Handles MachViewModeBtn.Click
      If m_bShowMachine Then
@@ -38,12 +38,17 @@
               <ColumnDefinition Width="1*"/>
            </Grid.ColumnDefinitions>

-            <ToggleButton Name="Point1Btn" Grid.Column="0"
-            Style="{DynamicResource OmagCut_YellowToggleButton}"/>
-            <ToggleButton Name="Point2Btn" Grid.Column="1"
-            Style="{DynamicResource OmagCut_YellowToggleButton}"/>
+                <ToggleButton Name="Point1Btn" Grid.Column="0"
+               Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+                    <Image Source="{DynamicResource Acquisisci-P1Img}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+                </ToggleButton>

-         </Grid>
+                <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>
@@ -125,12 +130,16 @@
               <ColumnDefinition Width="1*"/>
            </Grid.ColumnDefinitions>

-            <Button Name="SimulBtn" Grid.Column="0" Style="{DynamicResource OmagCut_GradientBlueTextButton}"/>
-            <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_GradientBlueTextButton}"/>
-            <Button Name="ExitBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
-               <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-            </Button>
-         </Grid>
+                <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>

@@ -79,8 +79,8 @@ Public Class FlatteningCut
      ' la associo alla combobox
      TypeCmBx.ItemsSource = m_TypeArray
      ' assegno messaggi
-      Point1Btn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 10)
-      Point2Btn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 11)
+      Point1Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 10)
+      Point2Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 11)
      DepthTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 13)
      LenghtTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 14)
      DirectionTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 15)
@@ -89,8 +89,8 @@ Public Class FlatteningCut
      ZReleasedTxBl.Text = "Z Svincolo"
      SideTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 23)
      RotLockTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 29)
-      SimulBtn.Content = EgtMsg(MSG_CADCUTPAGEUC + 1)
-      OkBtn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
+      SimulBtn.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 1)
+      OkBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
      ' Carico i dati dell'ultimo taglio
      m_dDepth = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_FLATT_DEPTH, m_dDepth, m_MainWindow.GetIniFile())
      m_dAngO = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_FLATT_ANGH, m_dAngO, m_MainWindow.GetIniFile())
@@ -34,12 +34,16 @@
               <ColumnDefinition Width="1*"/>
            </Grid.ColumnDefinitions>

-            <ToggleButton Name="Point1Btn" Grid.Column="0"
-            Style="{DynamicResource OmagCut_YellowToggleButton}"/>
-            <ToggleButton Name="Point2Btn" Grid.Column="1"
-            Style="{DynamicResource OmagCut_YellowToggleButton}"/>
+                <ToggleButton Name="Point1Btn" Grid.Column="0"
+               Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+                    <Image Source="{DynamicResource Acquisisci-P1Img}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+                </ToggleButton>

-         </Grid>
+                <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">
@@ -131,12 +135,16 @@
               <ColumnDefinition Width="1*"/>
            </Grid.ColumnDefinitions>

-            <Button Name="SimulBtn" Grid.Column="0" Style="{DynamicResource OmagCut_GradientBlueTextButton}"/>
-            <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_GradientBlueTextButton}"/>
-            <Button Name="ExitBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
-               <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-            </Button>
-         </Grid>
+                <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>

@@ -63,8 +63,8 @@ Public Class GridCut
      ' la associo alla combobox
      PointModeCmBx.ItemsSource = m_PointsModeArray
      ' assegno messaggi
-      Point1Btn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 10)
-      Point2Btn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 11)
+      Point1Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 10)
+      Point2Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 11)
      DepthTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 13)
      DirectionTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 15)
      SideAngleTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 16)
@@ -73,8 +73,8 @@ Public Class GridCut
      NumPzYTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 21)
      DimPzYTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 22)
      SideTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 23)
-      SimulBtn.Content = EgtMsg(MSG_CADCUTPAGEUC + 1)
-      OkBtn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
+      SimulBtn.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 1)
+      OkBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
      ' Carico i dati dell'ultimo taglio
      m_dDepth = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_GRID_DEPTH, m_dDepth, m_MainWindow.GetIniFile())
      m_dAngO = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_GRID_ANGH, m_dAngO, m_MainWindow.GetIniFile())
@@ -121,6 +121,8 @@ Public Class MachineButtonsUC
                     CurrToggleBtn.Content = "Z - C"
                  ElseIf StateFlagArray(nIndex) = K_ZBJOG Then
                     CurrToggleBtn.Content = "Z - B"
+                  ElseIf StateFlagArray(nIndex) = K_REMOTE Then
+                     CurrToggleBtn.Content = "Remote"
                  End If
               Catch ex As Exception
                  EgtOutLog("Error loading content " & StateFlagArray(nIndex))
@@ -602,6 +604,15 @@ Public Class MachineButtonsUC
      ' selezoiono lo stato del bottone
      GetToggleButton(nIndex + 1).IsChecked = bBCAxes
   End Sub
+
+   Friend Sub RemoteChanged(ByVal bRemote As Boolean)
+      ' recupero le asscociazioni con i bottoni
+      Dim nIndex As Integer = Array.IndexOf(StateFlagArray, K_REMOTE)
+      If nIndex = -1 Then Return
+      ' selezoiono lo stato del bottone
+      GetToggleButton(nIndex + 1).IsChecked = bRemote
+   End Sub
+
   '-----------------------------------------------------------------------------------------------------------------

   Private Function GetToggleButton(ByVal nIndex As Integer) As Primitives.ToggleButton
@@ -201,11 +201,12 @@ Public Class ManualAxesMoveUC
      EgtOutLog("CmdString=" & CmdString)
      ' Eseguo in MDI
      m_CN.DGeneralFunctions_WriteCncMode(2)     ' Modalità MDI
-      System.Threading.Thread.Sleep(m_MainWindow.m_CurrentMachine.nThreadSleep)
+      System.Threading.Thread.Sleep(150)
      m_CN.sz_ManualDataInput = CmdString
      m_CN.MDI_command()
-      System.Threading.Thread.Sleep(m_MainWindow.m_CurrentMachine.nThreadSleep)
+      System.Threading.Thread.Sleep(150)
      m_CN.DGeneralFunctions_CycleStart()
+      System.Threading.Thread.Sleep(m_MainWindow.m_CurrentMachine.nThreadSleep)
      m_CN.DGeneralFunctions_WriteCncMode(7)     ' Modalità manuale
      m_MoveClicked = False
   End Sub
@@ -35,12 +35,17 @@
               <ColumnDefinition Width="1*"/>
            </Grid.ColumnDefinitions>

-            <ToggleButton Name="Point1Btn" Grid.Column="0"
-            Style="{DynamicResource OmagCut_YellowToggleButton}"/>
-            <ToggleButton Name="Point2Btn" Grid.Column="1"
-            Style="{DynamicResource OmagCut_YellowToggleButton}"/>
+                <ToggleButton Name="Point1Btn" Grid.Column="0"
+               Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+                    <Image Source="{DynamicResource Acquisisci-P1Img}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+                </ToggleButton>

-         </Grid>
+                <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">
@@ -256,12 +261,16 @@
               <ColumnDefinition Width="1*"/>
            </Grid.ColumnDefinitions>

-            <Button Name="SimulBtn" Grid.Column="0" Style="{DynamicResource OmagCut_GradientBlueTextButton}"/>
-            <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_GradientBlueTextButton}"/>
-            <Button Name="ExitBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
-               <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-            </Button>
-         </Grid>
+                <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>

@@ -63,8 +63,8 @@ Public Class MultipleCut
      ' la associo alla combobox
      PointModeCmBx.ItemsSource = m_PointsModeArray
      ' assegno messaggi
-      Point1Btn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 10)
-      Point2Btn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 11)
+      Point1Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 10)
+      Point2Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 11)
      DepthTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 13)
      LenghtTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 14)
      DirectionTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 15)
@@ -72,8 +72,8 @@ Public Class MultipleCut
      NumPzTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 17)
      DimPzTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 18)
      SideTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 23)
-      SimulBtn.Content = EgtMsg(MSG_CADCUTPAGEUC + 1)
-      OkBtn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
+      SimulBtn.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 1)
+      OkBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
      Num1TxBl.Text = "1"
      Num2TxBl.Text = "2"
      Num3TxBl.Text = "3"
@@ -63,12 +63,16 @@
               <ColumnDefinition Width="1*"/>
            </Grid.ColumnDefinitions>

-            <Button Name="SimulBtn" Grid.Column="0" Style="{DynamicResource OmagCut_GradientBlueTextButton}"/>
-            <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_GradientBlueTextButton}"/>
-            <Button Name="ExitBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
-               <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-            </Button>
-         </Grid>
+                <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>

@@ -23,8 +23,8 @@ Public Class Polishing

   Private Sub Polishing_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
      ' assegno messaggi
-      SimulBtn.Content = EgtMsg(MSG_CADCUTPAGEUC + 1)
-      OkBtn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
+      SimulBtn.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 1)
+      OkBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
   End Sub

   Private Sub Polishing_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
@@ -37,12 +37,17 @@
               <ColumnDefinition Width="1*"/>
            </Grid.ColumnDefinitions>

-            <ToggleButton Name="Point1Btn" Grid.Column="0"
-               Style="{DynamicResource OmagCut_YellowToggleButton}"/>
-            <ToggleButton Name="Point2Btn" Grid.Column="1"
-               Style="{DynamicResource OmagCut_YellowToggleButton}"/>
+                <ToggleButton Name="Point1Btn" Grid.Column="0"
+               Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+                    <Image Source="{DynamicResource Acquisisci-P1Img}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+                </ToggleButton>

-         </Grid>
+                <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">
@@ -80,12 +85,16 @@
               <ColumnDefinition Width="1*"/>
            </Grid.ColumnDefinitions>

-            <Button Name="SimulBtn" Grid.Column="0" Style="{DynamicResource OmagCut_GradientBlueTextButton}"/>
-            <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_GradientBlueTextButton}"/>
-            <Button Name="ExitBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconButton}">
-               <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
-            </Button>
-         </Grid>
+                <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>

@@ -58,14 +58,14 @@ Public Class SawTestUC
      ' la associo alla combobox
      PointModeCmBx.ItemsSource = m_PointsModeArray
      ' assegno messaggi
-      Point1Btn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 10)
-      Point2Btn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 11)
+      Point1Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 10)
+      Point2Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 11)
      DepthTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 13)
      LenghtTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 14)
      DirectionTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 15)
      OffsetTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 28)
-      SimulBtn.Content = EgtMsg(MSG_CADCUTPAGEUC + 1)
-      OkBtn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
+      SimulBtn.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 1)
+      OkBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
      ' Carico i dati dell'ultimo test
      m_dDepth = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_TEST_DEPTH, m_dDepth, m_MainWindow.GetIniFile())
      m_dLen = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_TEST_LENGTH, m_dLen, m_MainWindow.GetIniFile())
@@ -38,11 +38,16 @@
            </Grid.ColumnDefinitions>

            <ToggleButton Name="Point1Btn" Grid.Column="0"
-               Style="{DynamicResource OmagCut_YellowToggleButton}"/>
-            <ToggleButton Name="Point2Btn" Grid.Column="1"
-               Style="{DynamicResource OmagCut_YellowToggleButton}"/>
+               Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+                    <Image Source="{DynamicResource Acquisisci-P1Img}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+            </ToggleButton>

-         </Grid>
+            <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>
@@ -106,10 +111,14 @@
               <ColumnDefinition Width="1*"/>
            </Grid.ColumnDefinitions>

-            <Button Name="SimulBtn" Grid.Column="0" Style="{DynamicResource OmagCut_GradientBlueTextButton}"/>
-            <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_GradientBlueTextButton}"/>
+            <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}"/>
+                    <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
            </Button>
         </Grid>

@@ -57,16 +57,16 @@ Public Class SingleCutUC
      ' la associo alla combobox
      PointModeCmBx.ItemsSource = m_PointsModeArray
      ' Assegno messaggi
-      Point1Btn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 10)
-      Point2Btn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 11)
+      Point1Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 10)
+      Point2Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 11)
      DepthTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 13)
      LenghtTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 14)
      DirectionTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 15)
      SideAngleTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 16)
      OffsetTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 28)
      SawThChBl.Text = EgtMsg(90232)   ' Spessore lama
-      SimulBtn.Content = EgtMsg(MSG_CADCUTPAGEUC + 1)
-      OkBtn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
+      SimulBtn.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 1)
+      OkBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
      ' Carico i dati dell'ultimo taglio
      m_dDepth = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_SING_DEPTH, m_dDepth, m_MainWindow.GetIniFile())
      m_dLen = GetPrivateProfileDouble( S_DIRECTCUTS, K_DC_SING_LENGTH, m_dLen, m_MainWindow.GetIniFile())
@@ -38,8 +38,10 @@
                </Grid.ColumnDefinitions>

                <ToggleButton Name="Point1Btn" Grid.Column="0"
-               Style="{DynamicResource OmagCut_YellowToggleButton}"/>
-      
+               Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+                    <Image Source="{DynamicResource Acquisisci-PImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+                </ToggleButton>
+

            </Grid>

@@ -77,8 +79,12 @@
                    <ColumnDefinition Width="1*"/>
                </Grid.ColumnDefinitions>

-                <Button Name="SimulBtn" Grid.Column="0" Style="{DynamicResource OmagCut_GradientBlueTextButton}"/>
-                <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_GradientBlueTextButton}"/>
+                <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>
@@ -61,9 +61,9 @@ Public Class SingleDrillUC
      PointModeCmBx.ItemsSource = m_PointsModeArray

      ' Assegno messaggi
-      Point1Btn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 10)
-      SimulBtn.Content = EgtMsg(MSG_CADCUTPAGEUC + 1)
-      OkBtn.Content = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
+      Point1Btn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 10)
+      SimulBtn.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 1)
+      OkBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
   End Sub

   Private Sub SingleDrill_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
@@ -165,12 +165,13 @@
                <ColumnDefinition Width="1*"/>
            </Grid.ColumnDefinitions>
            <Grid.RowDefinitions>
+                <RowDefinition Height="0.55*"/>
+                <RowDefinition Height="0.55*"/>
+                <RowDefinition Height="0.55*"/>
                <RowDefinition Height="1*"/>
-                <RowDefinition Height="1*"/>
-                <RowDefinition Height="1*"/>
-                <!--<RowDefinition Height="1*"/>-->
            </Grid.RowDefinitions>

+            <!-- Altezza delle alette --> 
            <TextBlock Name="Parameter1TxBl" Grid.Row="0" Grid.ColumnSpan="2"
                           Text="Offset"
                           Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
@@ -187,12 +188,15 @@
                                  Width="60" Height="30" Margin="0,0,0,0"
                                  Style="{StaticResource OmagCut_CalculatorTextBox}"/>
            
-
+            <!-- Delta angolo (abilitato solo per i frontalini) -->
            <TextBlock Name="Parameter2TxBl" Grid.Row="1" Grid.ColumnSpan="2"
                       Text="Offset2"
                       Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
                       FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
+            <!-- temporaneamente disabilito la definizione delta angolo per alzatine  -->
            <EgtWPFLib:EgtTextBox Name="Parameter2ATxBx" 
+                                  IsEnabled="False"
+                                  Visibility="Collapsed"
                                  Grid.Column="2" Grid.Row="1"
                                  HorizontalAlignment="Right"
                                  Width="60" Height="30" Margin="0,0,0,0"
@@ -202,7 +206,18 @@
                                  HorizontalAlignment="Right"
                                  Width="60" Height="30" Margin="0,0,0,0"
                                  Style="{StaticResource OmagCut_CalculatorTextBox}"/>
-            
+
+            <!-- Spessore aletta -->
+            <TextBlock Name="Parameter5TxBl" Grid.Row="2" Grid.ColumnSpan="2"
+                       Text="Offset2"
+                       Style="{StaticResource OmagCut_CenteredLowerCaseCharacterTextBlock}"
+                       FontSize="{DynamicResource FontSize_LowerCaseCharacter}"/>
+            <EgtWPFLib:EgtTextBox Name="Parameter5TxBx" 
+                                  Grid.Column="2" Grid.Row="2" 
+                                  HorizontalAlignment="Right"
+                                  Width="60" Height="30" Margin="0,0,0,0"
+                                  Style="{StaticResource OmagCut_CalculatorTextBox}"/>
+
            <!--Gestisco nello spazio di una TextBox due TextBoxs--><!--
            <UniformGrid Rows="1" Grid.Column="2" Grid.Row="1" Grid.ColumnSpan="2" Width="90" >
                <EgtWPFLib:EgtTextBox Name="Parameter2aTxBx" 
@@ -236,7 +251,7 @@
                                  Width="85" Height="30"
                                  Style="{StaticResource OmagCut_CalculatorTextBox}"/>-->
            
-            <UniformGrid Columns="2" Grid.ColumnSpan="4" Grid.Row="2">
+            <UniformGrid Columns="2" Grid.ColumnSpan="4" Grid.Row="3">
                <!--questo bottone è stato creato solo per garantire il corretto allinaemento-->
                <Button Name="Vuoto" Visibility="Hidden"/>
                <!--Bottone per tornare indietro alla selezione di CompoInterni e Alz&Front-->
@@ -77,6 +77,7 @@ Public Class AlzFrontUC
      ' nome dei parametri condivisi
      Parameter1TxBl.Text = "Altezza"
      Parameter2TxBl.Text = "Delta angolo"
+      Parameter5TxBl.Text = "Spessore"

      EgtZoom(ZM.ALL)
   End Sub
@@ -98,6 +99,7 @@ Public Class AlzFrontUC
      GetPrivateProfileString(S_ALZFRONT, K_FRONT_HEIGHT, "0", Parameter1FTxBx.Text, m_MainWindow.GetIniFile)
      GetPrivateProfileString(S_ALZFRONT, K_ALZ_DELTA_ANG, "0", Parameter2ATxBx.Text, m_MainWindow.GetIniFile)
      GetPrivateProfileString(S_ALZFRONT, K_FRONT_DELTA_ANG, "0", Parameter2FTxBx.Text, m_MainWindow.GetIniFile)
+      Parameter5TxBx.Text = Utility.LenToString(m_MainWindow.m_CurrentProjectPageUC.m_dRawHeight, 2)

      ' Imposto contesto corrente
      EgtSetCurrentContext(m_MainWindow.m_DrawPageUC.DrawScene.GetCtx())
@@ -157,6 +159,13 @@ Public Class AlzFrontUC
            Else
               AlzFrontEntityList.Add(New AlzFrontEntity(sNameCurrLine, CurrLine))
            End If
+            ' inserisco riferimento univoco al lato (solo se non esiste)
+            Dim sInfoRef As String = String.Empty
+            EgtGetInfo(CurrLine, "RefAF", sInfoRef)
+            If String.IsNullOrEmpty(sInfoRef) Then
+               Dim sRefGUID As String = System.Guid.NewGuid().ToString()
+               EgtSetInfo(CurrLine, "RefAF", sRefGUID)
+            End If
            nEntityIndex += 1
         Else
            EgtSetName(CurrLine, "B" & nOtherIndex.ToString)
@@ -614,6 +623,13 @@ Public Class AlzFrontUC
      LoadCurrentCompo()
   End Sub

+   Private Sub Parameter5TxBx_EgtClosed(sender As Object, e As EventArgs) Handles Parameter5TxBx.EgtClosed
+      Dim dValue As Double
+      StringToDouble(Parameter5TxBx.Text, dValue)
+      ' aggiorno il disegno
+      LoadCurrentCompo()
+   End Sub
+
 #End Region    ' Altezza, delta angolo di spoglia

 #Region "METHODS"
@@ -749,6 +765,9 @@ Public Class AlzFrontUC
      If StringToLen(Parameter2FTxBx.Text, dVal) Then
         EgtLuaSetGlobNumVar("CMP.F_DeltaAng", dVal)
      End If
+      If StringToLen(Parameter5TxBx.Text, dVal) Then
+         EgtLuaSetGlobNumVar("CMP.ThicknessRaw", dVal)
+      End If
      ' parametri per la scrittura dei caratteri
      EgtLuaSetGlobNumVar("CMP.BBoxRad", m_dBBoxRad)
      EgtLuaSetGlobNumVar("CMP.HeightText", m_dH)
@@ -879,6 +879,9 @@ Public Class DrawPageUC

   ' permette di inserire più di un part
   Private Function MakeMultipleInsert(ByVal nNbr As Integer, sName As String) As Boolean
+      Dim InsertColor As Color3d = New Color3d(89, 210, 210)
+      CompoColor(InsertColor, m_MainWindow.GetIniFile())
+
      ' Imposto il contesto corrente
      EgtSetCurrentContext(DrawScene.GetCtx())
      Dim Pz As Integer = -1
@@ -1014,11 +1017,16 @@ Public Class DrawPageUC
         SideAngle.WriteSideAngleForNest(DrawScene.GetCtx())
         ' Imposto colore testi
         Utility.SetTextColor(nRegLayId)
+         ' Imposto il colore del pezzo inserito nel progetto
+         Dim nPartInRegion As Integer = EgtGetFirstInGroup(nRegLayId)
+         EgtSetColor(nPartInRegion, InsertColor)
+
         ' Esporto il pezzo in un file temporaneo
         Dim sTmpFile As String = m_MainWindow.GetTempDir() & "\FlatPartCompo.Nge"
         If Not EgtSaveObjToFile(Pz, sTmpFile, NGE.BIN) Then
            Return False
         End If
+
         ' Passo al contesto principale
         EgtSetCurrentContext(m_MainWindow.m_CurrentProjectPageUC.CurrentProjectScene.GetCtx())
         ' Recupero flag per inserimento diretto in grezzo (altrimenti in parcheggio)
@@ -1043,13 +1051,25 @@ Public Class DrawPageUC
               dNewArea += GeomCalc.GetPartArea(nId2)
               ' Inserisco in parcheggio
               m_MainWindow.m_CadCutPageUC.m_NestPage.StoreOnePart(nId2, True)
-               ' Se richiesto posizionamento diretto, lo eseguo
-               If bDirect Then
-                  If m_MainWindow.m_CadCutPageUC.m_NestPage.InsertOnePart(nId2) Then
-                     ' Eventuale notifica al VeinMatching
-                     VeinMatching.OnInsertPartInRaw(nId2)
+
+               ' ------------------------ AGGIUNGO PEZZO NEL VEINMATCH ----------------------------------
+               ' verifico che il pezzo sia un Piano Cucina o un Piano Bagno o un'Aletta
+               Dim sCMP As String = String.Empty
+               EgtGetInfo(nId2, "CMP", sCMP)
+               If sCMP.StartsWith("PCucina") Or sCMP.StartsWith("PBagno") Or sCMP.StartsWith("AlzFront") Then
+                  ' Aggiungo riferimento e lo inserisco in VeinMatching
+                  VeinMatching.SetRefOnPart(nId2)
+                  VeinMatching.AddPartFromDraw(nId2, True)
+                  ' Se richiesto posizionamento diretto, lo eseguo
+                  If bDirect Then
+                     If m_MainWindow.m_CadCutPageUC.m_NestPage.InsertOnePart(nId2) Then
+                        ' Eventuale notifica al VeinMatching
+                        VeinMatching.OnInsertPartInRaw(nId2)
+                     End If
                  End If
               End If
+               ' ------------------------ AGGIUNGO PEZZO NEL VEINMATCH ----------------------------------
+
            Next
            ' Cancello il file
            My.Computer.FileSystem.DeleteFile(sTmpFile)
@@ -576,6 +576,36 @@ Public Class ImportPageUC
      End If
   End Sub

+   ' metodo utilizzato per definire il colore dei pezzi DXF importati
+   Private Sub ColorRegion(nCtx As Integer)
+      ' Leggo dati corrispondenza colore
+      Dim InsertColor As Color3d = New Color3d(89, 210, 210)
+      CompoColor(InsertColor, m_MainWindow.GetIniFile())
+
+      ' Imposto contesto corrente
+      EgtSetCurrentContext(nCtx)
+      ' Ciclo sui pezzi
+      Dim PartId As Integer = EgtGetFirstPart()
+      While PartId <> GDB_ID.NULL
+         ' Ciclo sui layer di contorno
+         Dim bOutLoop As Boolean = True
+         Dim RegionId As Integer = EgtGetFirstNameInGroup(PartId, NAME_REGION)
+         While RegionId <> GDB_ID.NULL
+            ' Ciclo sulle regioni
+            Dim EntId As Integer = EgtGetFirstInGroup(RegionId)
+            While EntId <> GDB_ID.NULL
+               EgtSetColor(EntId, InsertColor)
+               EntId = EgtGetNext(EntId)
+            End While
+            RegionId = EgtGetNextName(PartId, NAME_REGION)
+         End While
+         ' passo al pezzo successico
+         PartId = EgtGetNextPart(PartId)
+      End While
+      ' Aggiorno scritte per angoli sui lati
+      WriteSideAngleForNest(nCtx)
+   End Sub
+
   Private Sub UseLayerBtn_Click(sender As Object, e As RoutedEventArgs) Handles UseLayerBtn.Click
      ' Creo i pezzi
      Dim nType As Integer = If(m_nFileType = FT.NGE, FPC_TYPE.NGE, FPC_TYPE.LAYER)
@@ -589,6 +619,8 @@ Public Class ImportPageUC
      If GetPrivateProfileInt(S_COLORTOENGRAVE, K_CTE_ENABLE, 0, m_MainWindow.GetIniFile()) <> 0 Then
         Engrave.ColorToEngrave(ImportScene.GetCtx())
      End If
+      ' gestico il colore degli elementi da importare (devono avere una regione definita!
+      ColorRegion(ImportScene.GetCtx())
      ' Eseguo zoom
      ImportScene.ZoomAll()
      ' disabilito bottoni UseLayer e UseRegion, abilito bottoni Reset e Insert
@@ -619,6 +651,8 @@ Public Class ImportPageUC
      If GetPrivateProfileInt(S_COLORTOENGRAVE, K_CTE_ENABLE, 0, m_MainWindow.GetIniFile()) <> 0 Then
         Engrave.ColorToEngrave(ImportScene.GetCtx())
      End If
+      ' gestico il colore degli elementi da importare (devono avere una regione definita!
+      ColorRegion(ImportScene.GetCtx())
      ' Eseguo zoom
      ImportScene.ZoomAll()
      ' disabilito bottoni UseLayer e UseRegion, abilito bottoni Reset e Insert
@@ -649,6 +683,8 @@ Public Class ImportPageUC
      If GetPrivateProfileInt(S_COLORTOENGRAVE, K_CTE_ENABLE, 0, m_MainWindow.GetIniFile()) <> 0 Then
         Engrave.ColorToEngrave(ImportScene.GetCtx())
      End If
+      ' gestico il colore degli elementi da importare (devono avere una regione definita!
+      ColorRegion(ImportScene.GetCtx())
      ' Eseguo zoom
      ImportScene.ZoomAll()
      ' disabilito bottoni UseLayer e UseRegion, abilito bottoni Reset e Insert
@@ -201,7 +201,7 @@ Module SideAngle
   Friend Sub ColorToSideAngle(nCtx As Integer)
      ' Leggo dati corrispondenza colore-angolo
      Dim CurrCSA As New ColorSideAngs
-      CurrCSA.Read( m_MainWindow.GetIniFile)
+      CurrCSA.Read(m_MainWindow.GetIniFile)
      ' Imposto contesto corrente
      EgtSetCurrentContext(nCtx)
      ' Ciclo sui pezzi
@@ -212,27 +212,27 @@ Module SideAngle
         Dim LoopId As Integer = EgtGetFirstNameInGroup(PartId, NAME_OUTLOOP)
         While LoopId <> GDB_ID.NULL
            ' Ciclo sulle curve
-            Dim PrevId As Integer = EgtGetLastInGroup( LoopId)
-            Dim EntId As Integer = EgtGetFirstInGroup( LoopId)
+            Dim PrevId As Integer = EgtGetLastInGroup(LoopId)
+            Dim EntId As Integer = EgtGetFirstInGroup(LoopId)
            While EntId <> GDB_ID.NULL
-               Dim NextId As Integer = EgtGetNext( EntId)
-               If  NextId = GDB_ID.NULL Then NextId = EgtGetFirstInGroup( LoopId)
-               If VerifySideAnglePossible( PrevId, EntId, NextId, bOutLoop) Then
+               Dim NextId As Integer = EgtGetNext(EntId)
+               If NextId = GDB_ID.NULL Then NextId = EgtGetFirstInGroup(LoopId)
+               If VerifySideAnglePossible(PrevId, EntId, NextId, bOutLoop) Then
                  Dim colEnt As Color3d
-                  If EgtGetColor( EntId, colEnt) Then
+                  If EgtGetColor(EntId, colEnt) Then
                     Dim dAng As Double
                     Dim dHeel As Double
-                     If CurrCSA.GetSideAngHeel( colEnt, dAng, dHeel) Then
-                        EgtSetInfo( EntId, INFO_SIDE_ANGLE, dAng)
-                        EgtSetInfo( EntId, INFO_ORIG_SIDE_ANGLE, dAng)
-                        EgtSetInfo( EntId, INFO_HEEL, dHeel)
+                     If CurrCSA.GetSideAngHeel(colEnt, dAng, dHeel) Then
+                        EgtSetInfo(EntId, INFO_SIDE_ANGLE, dAng)
+                        EgtSetInfo(EntId, INFO_ORIG_SIDE_ANGLE, dAng)
+                        EgtSetInfo(EntId, INFO_HEEL, dHeel)
                     End If
                  End If
               End If
               PrevId = EntId
-               EntId = EgtGetNext( EntId)
+               EntId = EgtGetNext(EntId)
            End While
-            If bOutLoop then
+            If bOutLoop Then
               bOutLoop = False
               LoopId = EgtGetFirstNameInGroup(PartId, NAME_INLOOP)
            Else
@@ -115,9 +115,13 @@

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

         <!--<TextBlock Name="SawRoughingTxBl" Grid.Row="4" Grid.ColumnSpan="3"
@@ -65,8 +65,8 @@ Public Class FrameCutPageUC
      SelGuideBtn.Content = EgtMsg(MSG_FRAMECUTPAGEUC + 16)     'Guida
      ArcRadTxBl.Text = EgtMsg(MSG_FRAMECUTPAGEUC + 17)         'Rad
      ArcAngTxBl.Text = EgtMsg(MSG_FRAMECUTPAGEUC + 18)         'Ang
-      MirrorPartBtn.Content = EgtMsg(MSG_FRAMECUTPAGEUC + 7)    'Mirror cornice
-      RemovePartBtn.Content = EgtMsg(MSG_FRAMECUTPAGEUC + 3)    'Rimuovi cornice
+      MirrorPartBtn.ToolTip = EgtMsg(MSG_FRAMECUTPAGEUC + 7)    'Mirror cornice
+      RemovePartBtn.ToolTip = EgtMsg(MSG_FRAMECUTPAGEUC + 3)    'Rimuovi cornice
      OffsZTxBl.Text = EgtMsg(MSG_FRAMECUTPAGEUC + 8)           'Distanza sopra
      OffsXyTxBl.Text = EgtMsg(MSG_FRAMECUTPAGEUC + 9)          'Distanza inizio
      OffsYyTxBl.Text = EgtMsg(MSG_FRAMECUTPAGEUC + 22)         'Distanza Y
@@ -28,6 +28,9 @@ Public Class CurrentMachine
   Private m_nThreadSleep As Integer = 150

   ' Dati su linea di produzione
+   Private m_bDemo As Boolean = False
+   Public nLastProjSentToViewDEMO As Integer = 0
+
   Private m_bProdLine As Boolean = False
   Private m_sVarProg1 As String = "E80021"
   Private m_nProg1 As Integer = 901
@@ -225,6 +228,12 @@ Public Class CurrentMachine
      End Get
   End Property

+   Friend ReadOnly Property bDemo As Boolean
+      Get
+         Return m_bDemo
+      End Get
+   End Property
+
   Friend ReadOnly Property bProdLine As Boolean
      Get
         Return m_bProdLine
@@ -1034,6 +1043,7 @@ Public Class CurrentMachine
         m_bProdLine = False
         EgtOutLog("Error - Production line requested but not key enabled")
      End If
+      m_bDemo = (GetPrivateProfileInt(S_PRODUCTIONLINE, "Demo", 0, sMachIniFile) <> 0)
      GetPrivateProfileString(S_PRODUCTIONLINE, K_VARPROG1, "", m_sVarProg1, sMachIniFile)
      m_nProg1 = GetPrivateProfileInt(S_PRODUCTIONLINE, K_NAMEPROG1, 0, m_MainWindow.GetMachIniFile())
      GetPrivateProfileString(S_PRODUCTIONLINE, K_VARPROG2, "", m_sVarProg2, sMachIniFile)
@@ -38,7 +38,9 @@
                <ToggleButton Name="MachiningDBBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
                    <Image Source="{DynamicResource DB-utensiliImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
                </ToggleButton>
-                <ToggleButton Name="PolishingsBtn" Grid.Column="3" Style="{DynamicResource OmagCut_YellowToggleButton}"></ToggleButton>
+                <ToggleButton Name="PolishingsBtn" Grid.Column="3" Style="{DynamicResource  OmagCut_BlueIconToggleButton}">
+                    <!--<Image Source="{DynamicResource LucidaturaImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>-->
+                </ToggleButton>
                <ToggleButton Name="TestingPageBtn" Grid.Column="4" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
                    <Image Source="{DynamicResource MacchinaImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
                </ToggleButton>
@@ -913,6 +913,10 @@ Public Class ToolsDbPageUC
            nMsg = MSG_TOOLSDBPAGEUC + 23       ' Spessore
         Case MCH_TP.MAXMAT
            nMsg = MSG_TOOLSDBPAGEUC + 24       ' Tagliente
+         Case MCH_TP.CORE
+            nMsg = 90720                        ' Anima
+            'Case MCH_TP.STEM
+            'nMsg = "Portautensile"       ' Portautensile
      End Select
      ' Predispongo calcolatrice (converto sempre in UIUnits perchè tutte lunghezze)
      Dim EgtCalculator As New EgtCalculatorWD(m_MainWindow, EgtToUiUnits(dVal), 300, WidthType.PIXEL, 0, 0, EgtMsg(nMsg))
@@ -957,6 +961,8 @@ Public Class ToolsDbPageUC
               EgtTdbSetCurrToolParam(MCH_TP.TOTLEN, dVal + 1)
            Case MCH_TP.DIAM
               EgtTdbSetCurrToolParam(MCH_TP.TOTDIAM, dVal)
+            Case MCH_TP.CORE
+               EgtTdbSetCurrToolParam(MCH_TP.CORE, dVal)
         End Select
      ElseIf m_nToolType = MCH_TY.DRILL_STD Then
         Select Case nType
@@ -995,6 +1001,10 @@ Public Class ToolsDbPageUC
         nType = MCH_TP.THICK
      ElseIf m_sCurrVar = "MAXMAT" Then
         nType = MCH_TP.MAXMAT
+      ElseIf m_sCurrVar = "CORE" Then
+         nType = MCH_TP.CORE
+      ElseIf m_sCurrVar = "STEM" Then
+         'nType = MCH_TP.STEM
      End If
      Return nType
   End Function
@@ -1094,6 +1094,9 @@ Class MainWindow
      If m_bNCLink And m_CurrentMachine.bProdLine Then
         m_ProdLineTimer.Interval = TimeSpan.FromMilliseconds(2000)
         m_ProdLineTimer.Start()
+      ElseIf m_CurrentMachine.bDemo Then
+         m_ProdLineTimer.Interval = TimeSpan.FromMilliseconds(2000)
+         m_ProdLineTimer.Start()
      End If

      ' seleziono il tipo di avvio
@@ -1194,7 +1197,7 @@ Class MainWindow
               nProjInd = If(nLastProj = 1, nMaxProj, nLastProj - 1)
               nMove = 1
            End If
-         ' altrimenti forzo trasmissione ultimo inviato
+            ' altrimenti forzo trasmissione ultimo inviato
         Else
            nProjInd = If(nLastProj = 1, nMaxProj, nLastProj - 1)
            nMove = 1
@@ -1223,6 +1226,10 @@ Class MainWindow
            Exit For
         End If
      Next
+
+      ' forzo la variabile CN - aggiornando il valore dell'indice del progetto in elaborazione
+      If m_CurrentMachine.bDemo Then nVarCopy = GetPrivateProfileInt(S_GENERAL, K_LASTPROJ, 0, GetIniFile())
+
      ' Leggo variabile con ultimo progetto mandato a OmagView
      Dim nLastCopy As Integer = GetPrivateProfileInt(S_GENERAL, K_LASTPROJTOVIEW, 0, GetIniFile())
      ' Se non nulla e diversa da ultimo copiato, verifico se eseguire la copia
@@ -62,5 +62,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 

-<Assembly: AssemblyVersion("2.3.9.1")>
-<Assembly: AssemblyFileVersion("2.3.9.1")>
+<Assembly: AssemblyVersion("2.3.9.5")>
+<Assembly: AssemblyFileVersion("2.3.9.5")>
@@ -326,20 +326,23 @@ Public Class CNCommunication
         m_CN.SetCnDataVar(CN_generico.CnData.BypassState, sVal)

         ' nuove variabili: stato dei nuovi pulsanti
-         m_IsNewConsole = GetPrivateProfileString(S_NCDATA, K_NEWCONSOLE, "", sVal, m_MainWindow.GetMachIniFile())
+         GetPrivateProfileString(S_NCDATA, K_NEWCONSOLE, "", sVal, m_MainWindow.GetMachIniFile())
+         m_IsNewConsole = (sVal = 1)
         If m_IsNewConsole Then
            GetPrivateProfileString(S_NCDATA, K_XYJOG, "", sVal, m_MainWindow.GetMachIniFile())
-            m_CN.SetCnDataVar(CN_generico.CnData.XYJog, sVal)
+            If Not String.IsNullOrEmpty(sVal) Then m_CN.SetCnDataVar(CN_generico.CnData.XYJog, sVal)
            GetPrivateProfileString(S_NCDATA, K_ZCJOG, "", sVal, m_MainWindow.GetMachIniFile())
-            m_CN.SetCnDataVar(CN_generico.CnData.ZCJog, sVal)
+            If Not String.IsNullOrEmpty(sVal) Then m_CN.SetCnDataVar(CN_generico.CnData.ZCJog, sVal)
            GetPrivateProfileString(S_NCDATA, K_ZBJOG, "", sVal, m_MainWindow.GetMachIniFile())
-            m_CN.SetCnDataVar(CN_generico.CnData.ZBJog, sVal)
+            If Not String.IsNullOrEmpty(sVal) Then m_CN.SetCnDataVar(CN_generico.CnData.ZBJog, sVal)
            GetPrivateProfileString(S_NCDATA, K_POWERON, "", sVal, m_MainWindow.GetMachIniFile())
-            m_CN.SetCnDataVar(CN_generico.CnData.PowerON, sVal)
+            If Not String.IsNullOrEmpty(sVal) Then m_CN.SetCnDataVar(CN_generico.CnData.PowerON, sVal)
+            GetPrivateProfileString(S_NCDATA, K_REMOTE, "", sVal, m_MainWindow.GetMachIniFile())
+            If Not String.IsNullOrEmpty(sVal) Then m_CN.SetCnDataVar(CN_generico.CnData.Remote, sVal)
         End If

-         ' Inizializzo la comunicazione
-         m_CN.Init()
+            ' Inizializzo la comunicazione
+            m_CN.Init()

      Catch ex As Exception
         ' set status to statusbar
@@ -558,6 +561,7 @@ Public Class CNCommunication
               m_MainWindow.m_DirectCutPageUC.XYJogChanged(m_CN.bXYJog)
               m_MainWindow.m_DirectCutPageUC.ZCJogChanged(m_CN.bZCJog)
               m_MainWindow.m_DirectCutPageUC.ZBJogChanged(m_CN.bZBCJog)
+               m_MainWindow.m_DirectCutPageUC.RemoteChanged(m_CN.bRemote)
            End If
         Else
            m_MainWindow.m_DirectCutPageUC.m_MachineButtons.SpindleStateChanged(m_CN.bSpindleState)
@@ -578,6 +582,7 @@ Public Class CNCommunication
               m_MainWindow.m_DirectCutPageUC.m_MachineButtons.XYJogChanged(m_CN.bXYJog)
               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)
            End If

         End If
@@ -8,7 +8,7 @@ Public MustInherit Class CN_generico
   Public Const MAX_VAR As Short = 100
   Public Const MAX_VALUES As Short = 9           ' Max. index to read the data from the FXServer array
   Public Const MAX_TOOLS As Short = 100
-   Public Const NUM_DATA = 51                     ' Numero di dati del CN (Speed,Feed,...)
+   Public Const NUM_DATA = 52                     ' Numero di dati del CN (Speed,Feed,...)

   Public m_NewVariable As Boolean = False        ' per scrittura delle vairbaili Apllication del PLC

@@ -65,6 +65,7 @@ Public MustInherit Class CN_generico
      ZCJog = 48
      ZBJog = 49
      PowerON = 50
+      Remote = 51
   End Enum

 #End Region
@@ -205,6 +206,7 @@ Public MustInherit Class CN_generico
   Public bZBCJog As Boolean

   Public bPowerON As Boolean
+   Public bRemote As Boolean
   ' Nuovi di bottoni -------------------------------------------

   Public nMachineMode As Integer
@@ -236,7 +236,7 @@ Namespace Num
         ' Detect and identify the Flexium CNC type
         sz_CncFxIdentifier = objDMainCncData.GetCncIdentifier()
         '           _txtGetCncIdentification.Invoke(DirectCast(Sub() _txtGetCncIdentification.Text = CncFxIdentifier, MethodInvoker))
-
+         EgtOutLog("Modello Flexium: " & sz_CncFxIdentifier)
         If sz_CncFxIdentifier = "Flexium 6" OrElse sz_CncFxIdentifier = "Flexium 8" OrElse sz_CncFxIdentifier = "Flexium 68" Then
            IsFlexiumPlus = False
         Else
@@ -1085,6 +1085,8 @@ Namespace Num
                  bZBCJog = CBool(values(n))
               Case CnData.PowerON     ' (49)
                  bPowerON = CBool(values(n))
+               Case CnData.Remote     ' (50)
+                  bRemote = CBool(values(n))

            End Select
         Next
@@ -748,7 +748,6 @@
  <ItemGroup>
    <Resource Include="Resources\AvantiVeloce.png" />
    <Resource Include="Resources\IndietroVeloce.png" />
-    <Resource Include="Resources\NewIcons\ZCJog.png" />
    <Resource Include="Resources\Pause.png" />
    <Resource Include="Resources\Play.png" />
  </ItemGroup>
@@ -1047,10 +1046,6 @@
  <ItemGroup>
    <Resource Include="Resources\NewIcons\SlabId.png" />
  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\NewIcons\XYJog.png" />
-    <Resource Include="Resources\NewIcons\ZBJog.png" />
-  </ItemGroup>
  <ItemGroup>
    <Resource Include="Resources\NewIcons\Nuovo.png" />
  </ItemGroup>
@@ -1105,6 +1100,129 @@
  <ItemGroup>
    <Resource Include="Resources\NewIcons\Foro-singolo.png" />
  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\Acquisisci-P1_P2.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\Esegui.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\Simula.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\Test-lama.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\File-CSV.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\Allunga-o-accorcia.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\Inizio-allunga-o-accorcia.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\Fine-allunga-o-accorcia.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\ON_OFF-singolo-taglio.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\Tutti-ON.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\Tutti-OFF.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\Inizio-centro-fuori.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\Fine-centro-fuori.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\Modifica-inizio.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\Modifica-fine.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\Inverti.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\Pausa-ON_OFF.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\Inizio-tutti-fuori.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\Inizio-tutti-centro.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\Fine-tutti-centro.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\Fine-tutti-fuori.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\Tutti-allunga.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\Tutti-accorcia.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\Parcheggia-pezzo.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\Inserisci-pezzo.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\Elimina-pezzo.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\Seleziona-tutto.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\Deseleziona-tutto.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\Arco.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\Linea.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\Rimuovi-segmento.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\Chiudi.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\Salva-taglio.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\Take-point.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\Specchia.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\Rimuovi_elimina.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\XYJog.png" />
+    <Resource Include="Resources\NewIcons\ZBJog.png" />
+    <Resource Include="Resources\NewIcons\ZCJog.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\Lucidatura.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\Acquisisci-P1.png" />
+    <Resource Include="Resources\NewIcons\Acquisisci-P2.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\NewIcons\Acquisisci-P.png" />
+  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
  <PropertyGroup>
    <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\OmagCUT\OmagCUTR32.exe
@@ -88,18 +88,32 @@
    <BitmapImage x:Key="StopImg" UriSource="Resources/NewIcons/Stop.png"></BitmapImage>
    <BitmapImage x:Key="VacuumImg" UriSource="Resources/NewIcons/Vacuum.png"></BitmapImage>

+    <!--General-->
+    <BitmapImage x:Key="EseguiImg" UriSource="Resources/NewIcons/Esegui.png"></BitmapImage>
+    <BitmapImage x:Key="SimulaImg" UriSource="Resources/NewIcons/Simula.png"></BitmapImage>
+    
    <!--ProjectManager-->
    <BitmapImage x:Key="NuovoImg" UriSource="Resources/NewIcons/Nuovo.png"></BitmapImage>
    <BitmapImage x:Key="CaricaImg" UriSource="Resources/NewIcons/Carica.png"></BitmapImage>
    <BitmapImage x:Key="SalvaImg" UriSource="Resources/NewIcons/Salva.png"></BitmapImage>
    <BitmapImage x:Key="Salva-con-nomeImg" UriSource="Resources/NewIcons/Salva-con-nome.png"></BitmapImage>
-    <BitmapImage x:Key="CSVImg" UriSource="Resources/NewIcons/CSV.png"></BitmapImage>
+    <BitmapImage x:Key="CSVImg" UriSource="Resources/NewIcons/File-CSV.png"></BitmapImage>
    <BitmapImage x:Key="Vein-matchImg" UriSource="Resources/NewIcons/Vein-match.png"></BitmapImage>
+    <BitmapImage x:Key="Test-lamaImg" UriSource="Resources/NewIcons/Test-lama.png"></BitmapImage>
+    <BitmapImage x:Key="Parcheggia-pezzoImg" UriSource="Resources/NewIcons/Parcheggia-pezzo.png"></BitmapImage>
+    <BitmapImage x:Key="Inserisci-pezzoImg" UriSource="Resources/NewIcons/Inserisci-pezzo.png"></BitmapImage>
+    <BitmapImage x:Key="Elimina-pezzoImg" UriSource="Resources/NewIcons/Elimina-pezzo.png"></BitmapImage>
+    <BitmapImage x:Key="Seleziona-tuttoImg" UriSource="Resources/NewIcons/Seleziona-tutto.png"></BitmapImage>
+    <BitmapImage x:Key="Deseleziona-tuttoImg" UriSource="Resources/NewIcons/Deseleziona-tutto.png"></BitmapImage>
+    
    <!--Machine-->
    <BitmapImage x:Key="DatiMacchinaImg" UriSource="Resources/NewIcons/DatiMacchina.png"></BitmapImage>
    <BitmapImage x:Key="DB-lavorazioniImg" UriSource="Resources/NewIcons/DB-lavorazioni.png"></BitmapImage>
    <BitmapImage x:Key="DB-utensiliImg" UriSource="Resources/NewIcons/DB-utensili.png"></BitmapImage>
    <BitmapImage x:Key="MacchinaImg" UriSource="Resources/NewIcons/Macchina.png"></BitmapImage>
+    <BitmapImage x:Key="LucidaturaImg" UriSource="Resources/NewIcons/Lucidatura.png"></BitmapImage>
+    
+    
    <!--Direct cuts-->
    <BitmapImage x:Key="Taglio-grigliaImg" UriSource="Resources/NewIcons/Taglio-griglia.png"></BitmapImage>
    <BitmapImage x:Key="Taglio-multiploImg" UriSource="Resources/NewIcons/Taglio-multiplo.png"></BitmapImage>
@@ -107,9 +121,47 @@
    <BitmapImage x:Key="SpianaturaImg" UriSource="Resources/NewIcons/Spianatura.png"></BitmapImage>
    <BitmapImage x:Key="Movimento-manualeImg" UriSource="Resources/NewIcons/Movimento-manuale.png"></BitmapImage>
    <BitmapImage x:Key="Copia-dimaImg" UriSource="Resources/NewIcons/Copia-dima.png"></BitmapImage>
+    <BitmapImage x:Key="Acquisisci-P1_P2Img" UriSource="Resources/NewIcons/Acquisisci-P1_P2.png"></BitmapImage>
+    <BitmapImage x:Key="Acquisisci-P1Img" UriSource="Resources/NewIcons/Acquisisci-P1.png"></BitmapImage>
+    <BitmapImage x:Key="Acquisisci-P2Img" UriSource="Resources/NewIcons/Acquisisci-P2.png"></BitmapImage>
+    <BitmapImage x:Key="Acquisisci-PImg" UriSource="Resources/NewIcons/Acquisisci-P.png"></BitmapImage>
+    <BitmapImage x:Key="ArcoImg" UriSource="Resources/NewIcons/Arco.png"></BitmapImage>
+    <BitmapImage x:Key="LineaImg" UriSource="Resources/NewIcons/Linea.png"></BitmapImage>
+    <BitmapImage x:Key="Rimuovi-segmentoImg" UriSource="Resources/NewIcons/Rimuovi-segmento.png"></BitmapImage>
+    <BitmapImage x:Key="ChiudiImg" UriSource="Resources/NewIcons/Chiudi.png"></BitmapImage>
+    <BitmapImage x:Key="Salva-taglioImg" UriSource="Resources/NewIcons/Salva-taglio.png"></BitmapImage>
+    <BitmapImage x:Key="Take-pointImg" UriSource="Resources/NewIcons/Take-point.png"></BitmapImage>
+
+    <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>
+
+
    <!--Frame-->
    <BitmapImage x:Key="Sezione-corniceImg" UriSource="Resources/NewIcons/Sezione-cornice.png"></BitmapImage>
-    
+    <BitmapImage x:Key="SpecchiaImg" UriSource="Resources/NewIcons/Specchia.png"></BitmapImage>
+    <BitmapImage x:Key="Rimuovi_eliminaImg" UriSource="Resources/NewIcons/Rimuovi_elimina.png"></BitmapImage>
+
+    <!--Machinig-->
+    <BitmapImage x:Key="Allunga-AccorciaImg" UriSource="Resources/NewIcons/Allunga-o-accorcia.png"></BitmapImage>
+    <BitmapImage x:Key="Inizio-Allunga-AccorciaImg" UriSource="Resources/NewIcons/Inizio-allunga-o-accorcia.png"></BitmapImage>
+    <BitmapImage x:Key="Fine-Allunga-AccorciaImg" UriSource="Resources/NewIcons/Fine-allunga-o-accorcia.png"></BitmapImage>
+    <BitmapImage x:Key="ON_OFF-singolo-taglioImg" UriSource="Resources/NewIcons/ON_OFF-singolo-taglio.png"></BitmapImage>
+    <BitmapImage x:Key="Tutti-ONImg" UriSource="Resources/NewIcons/Tutti-ON.png"></BitmapImage>
+    <BitmapImage x:Key="Tutti-OFFImg" UriSource="Resources/NewIcons/Tutti-OFF.png"></BitmapImage>
+    <BitmapImage x:Key="Inizio-Centro-FuoriImg" UriSource="Resources/NewIcons/Inizio-centro-fuori.png"></BitmapImage>
+    <BitmapImage x:Key="Fine-Centro-FuoriImg" UriSource="Resources/NewIcons/Fine-centro-fuori.png"></BitmapImage>
+    <BitmapImage x:Key="Modifica-InizioImg" UriSource="Resources/NewIcons/Modifica-inizio.png"></BitmapImage>
+    <BitmapImage x:Key="Modifica-FineImg" UriSource="Resources/NewIcons/Modifica-fine.png"></BitmapImage>
+    <BitmapImage x:Key="InvertiImg" UriSource="Resources/NewIcons/Inverti.png"></BitmapImage>
+    <BitmapImage x:Key="Pausa-ON_OFFImg" UriSource="Resources/NewIcons/Pausa-ON_OFF.png"></BitmapImage>
+    <BitmapImage x:Key="Inizio-tutti-fuoriImg" UriSource="Resources/NewIcons/Inizio-tutti-fuori.png"></BitmapImage>
+    <BitmapImage x:Key="Inizio-tutti-centroImg" UriSource="Resources/NewIcons/Inizio-tutti-centro.png"></BitmapImage>
+    <BitmapImage x:Key="Fine-tutti-fuoriImg" UriSource="Resources/NewIcons/Fine-tutti-fuori.png"></BitmapImage>
+    <BitmapImage x:Key="Fine-tutti-centroImg" UriSource="Resources/NewIcons/Fine-tutti-centro.png"></BitmapImage>
+    <BitmapImage x:Key="Tutti-allungaImg" UriSource="Resources/NewIcons/Tutti-allunga.png"></BitmapImage>
+    <BitmapImage x:Key="Tutti-accorciaImg" UriSource="Resources/NewIcons/Tutti-accorcia.png"></BitmapImage>
+
    <FontFamily x:Key="OmagCut_Font">./Resources/Fonts/#Roboto</FontFamily>

    <SolidColorBrush x:Key="OmagCut_TreeViewBackGroundColor" Color="#636974" />
@@ -150,12 +202,19 @@
    </Style>

    <Style x:Key="OmagCut_Border" TargetType="{x:Type Border}" BasedOn="{StaticResource OmagCut_EmptyBorder}">
-        <!--<Setter Property="Background" Value="#636974"/>
-        <Setter Property="BorderBrush" Value="#636974"/>-->
+        <!--<Setter Property="Background" Value="#636974"   #3C3F48/>
+        <Setter Property="BorderBrush" Value="#636974"      #3C3F48/>-->
        <Setter Property="Background" Value="#3C3F48"/>
        <Setter Property="BorderBrush" Value="#3C3F48"/>
    </Style>

+    <Style x:Key="OmagCut_MachiningBorder" TargetType="{x:Type Border}" BasedOn="{StaticResource OmagCut_EmptyBorder}">
+        <!--<Setter Property="Background" Value="#636974"   #3C3F48/>
+        <Setter Property="BorderBrush" Value="#636974"      #3C3F48/>-->
+        <Setter Property="Background" Value="{StaticResource OmagCut_Blue}"/>
+        <Setter Property="BorderBrush" Value="#3C3F48"/>
+    </Style>
+
    <Style x:Key="OmagCut_EmptyBorder" TargetType="{x:Type Border}">
        <Setter Property="BorderThickness" Value="{StaticResource BorderThickness}"/>
        <Setter Property="CornerRadius" Value="{DynamicResource EmptyBorder_CornerRadius}"/>
@@ -273,14 +332,32 @@
    </Style>

    <Style x:Key="OmagCut_YellowIconToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource  OmagCut_ToggleButton}">
+        <Setter Property="OverridesDefaultStyle" Value="True" />
        <Setter Property="Background" Value="#636974"/>
        <Setter Property="BorderBrush" Value="#636974"/>
        <Setter Property="FontSize" Value="{StaticResource FontSize_UpperCaseCharacter}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ToggleButton}">
+                    <Grid Background="{TemplateBinding Background}">
+                        <ContentPresenter x:Name="MyContentPresenter" 
+                                          Content="{TemplateBinding Content}"
+                                          HorizontalAlignment="Center" 
+                                          VerticalAlignment="Center" />
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
        <Style.Triggers>
            <Trigger Property="IsChecked" Value="True">
                <Setter Property="ToggleButton.Background" Value="#145993" />
            </Trigger>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter Property="Button.Background" Value="{StaticResource OmagCut_LightGray}" />
+                <Setter Property="Button.Foreground" Value="{StaticResource OmagCut_Blue}"/>
+            </Trigger>
        </Style.Triggers>
+        
    </Style>

    <Style x:Key="OmagCut_CalculatorTextBox" TargetType="{x:Type EgtWPFLib:EgtTextBox}" BasedOn="{StaticResource OmagCut_TextBox}">
@@ -460,10 +537,30 @@
    </Style>

    <Style x:Key="OmagCut_YellowIconButton" TargetType="{x:Type Button}" BasedOn="{StaticResource OmagCut_Button}">
+        <Setter Property="OverridesDefaultStyle" Value="True" />
        <Setter Property="Background" Value="#1C1D22"/>
        <Setter Property="BorderBrush" Value="#1C1D22"/>
        <!--<Setter Property="BorderBrush" Value="{StaticResource OmagCut_Yellow}"/>-->
-        <Setter Property="Foreground" Value="White"/>
+        <Setter Property="Foreground" Value="LightGray"/>
+
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Button}">
+                    <Grid Background="{TemplateBinding Background}">
+                        <ContentPresenter x:Name="MyContentPresenter" 
+                                          Content="{TemplateBinding Content}"
+                                          HorizontalAlignment="Center" 
+                                          VerticalAlignment="Center" />
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter Property="Button.Background" Value="{StaticResource OmagCut_LightGray}" />
+                <Setter Property="Button.Foreground" Value="{StaticResource OmagCut_DarkGray}"/>
+            </Trigger>
+        </Style.Triggers>
    </Style>

    <Style x:Key="OmagCut_RightGrayYellowTextToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource  OmagCut_ToggleButton_Wrap}">
@@ -481,10 +578,29 @@
    </Style>

    <Style x:Key="OmagCut_GradientBlueIconButton" TargetType="{x:Type Button}" BasedOn="{StaticResource OmagCut_Button}">
+        <Setter Property="OverridesDefaultStyle" Value="True" />
        <Setter Property="Background" Value="#2D3036"/>
        <Setter Property="BorderBrush" Value="#2D3036"/>
-        <!--<Setter Property="BorderBrush" Value="{StaticResource OmagCut_Blue}"/>-->
+        <Setter Property="BorderBrush" Value="{StaticResource OmagCut_Blue}"/>
        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Button}">
+                    <Grid Background="{TemplateBinding Background}">
+                        <ContentPresenter x:Name="MyContentPresenter" 
+                                          Content="{TemplateBinding Content}"
+                                          HorizontalAlignment="Center" 
+                                          VerticalAlignment="Center" />
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter Property="Button.Background" Value="{StaticResource OmagCut_LightGray}" />
+                <Setter Property="Button.Foreground" Value="{StaticResource OmagCut_Blue}"/>
+            </Trigger>
+        </Style.Triggers>
    </Style>

    <Style x:Key="OmagCut_CenteredLowerCaseCharacterTextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource OmagCut_UpperCaseCharacterTextBlock}">
@@ -38,7 +38,7 @@
         </Grid.RowDefinitions>

         <!-- Definizione della Grid con le caratteristiche del progetto -->
-            <Border Name="CurrProjGrid" Style="{DynamicResource OmagCut_Border}" Grid.Row="0" >
+            <Border Name="CurrProjGrid" Style="{DynamicResource OmagCut_MachiningBorder}" Grid.Row="0" >
                <Grid >
               <Grid.ColumnDefinitions>
                  <ColumnDefinition Width="1*"/>
@@ -458,7 +458,7 @@ Public Class CurrentProjectPageUC
      Return True
   End Function

-   Friend Function AdjustAdditionalTable() As Boolean
+   Friend Function AdjustAdditionalTable( Optional bForced As Boolean = False) As Boolean
      ' Recupero altezza sottotavola corrente
      Dim nFixtId As Integer = EgtGetFirstNameInGroup(EgtGetFirstMachGroup(), MACH_FIXT_GROUP)
      Dim nAddTabId As Integer = EgtGetFirstNameInGroup(nFixtId, MACH_ADD_TABLE)
@@ -470,7 +470,7 @@ Public Class CurrentProjectPageUC
      End If
      ' Se valore cambiato, aggiorno...
      Dim dDeltaZ As Double = m_MainWindow.m_CurrentMachine.dAdditionalTable - dCurrAddTab
-      If Math.Abs(dDeltaZ) > EPS_SMALL Then
+      If Math.Abs(dDeltaZ) > EPS_SMALL Or bForced Then
         AddAdditionalTable()
         UpdateAllRawsZ(dDeltaZ)
         If GetPhoto() <> GDB_ID.NULL Then
@@ -643,7 +643,7 @@ Public Class CurrentProjectPageUC
         End If
         ' Notifico a foto il cambio di path
         EgtChangePhotoPath(nPhotoId, sNewPhoto)
-      ' Altrimenti cancello eventuali file di foto associabili al progetto
+         ' Altrimenti cancello eventuali file di foto associabili al progetto
      Else
         Dim sPhoto1 As String = Path.ChangeExtension(sPath, "jpg")
         Dim sPhoto2 As String = Path.ChangeExtension(sPath, "png")
@@ -46,13 +46,18 @@
           <Button Name="ResetCutBtn"
                 Style="{DynamicResource OmagCut_YellowTextButton}"></Button>
           <!--Abilito la selezione delle linee da disegno-->
-                <ToggleButton Name="TestBtn" Style="{DynamicResource OmagCut_BlueToggleButton}"></ToggleButton>
-
+            <ToggleButton Name="TestBtn" Style="{DynamicResource OmagCut_YellowIconToggleButton}">
+                <Image Source="{DynamicResource Test-lamaImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+            </ToggleButton>

        </UniformGrid>

-        <Button Name="SimulateBtn" Grid.Column="1" Style="{DynamicResource OmagCut_GradientBlueTextButtonPrjMgr}"/>
-        <Button Name="WorkBtn" Grid.Column="2" Style="{DynamicResource OmagCut_GradientBlueTextButtonPrjMgr}"/>
+        <Button Name="SimulateBtn" Grid.Column="1" Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
+            <Image Source="{DynamicResource SimulaImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+        </Button>
+        <Button Name="WorkBtn" Grid.Column="2" Style="{DynamicResource OmagCut_YellowGradientYellowIconButton}">
+            <Image Source="{DynamicResource EseguiImg}" Style="{DynamicResource OmagCut_ButtonIcon}"/>
+        </Button>

    </Grid>
 </UserControl>
@@ -23,13 +23,13 @@ Public Class ProjectMgrUC

      RegisterBtn.Content = "REG"                              'Shape Registration
      ResetCutBtn.Content = EgtMsg(MSG_NESTPAGEUC + 6)         'Reset
-      SimulateBtn.Content = EgtMsg(MSG_CADCUTPAGEUC + 1)       'Simulate - Simula
+      SimulateBtn.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 1)       'Simulate - Simula
      If m_MainWindow.GetKeyOption(MainWindow.KEY_OPT.OFFICE_TYPE) Then
-         WorkBtn.Content = EgtMsg(MSG_CADCUTPAGEUC + 10)       'Export - Esporta
+         WorkBtn.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 10)       'Export - Esporta
      Else
-         WorkBtn.Content = EgtMsg(MSG_CADCUTPAGEUC + 2)        'Work - Lavora
+         WorkBtn.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 2)        'Work - Lavora
      End If
-      TestBtn.Content = EgtMsg(90255)                          'Test
+      TestBtn.ToolTip = EgtMsg(90255)                          'Test
   End Sub

   Private Sub ProjectMgrUC_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
@@ -462,7 +462,7 @@ Public Class ProjectMgrUC
      ' Costringo ad aggiornare UI
      UpdateUI()
      ' Se macchina normale
-      If Not m_CurrMachine.bProdLine Then
+      If Not m_CurrMachine.bProdLine Or Not m_CurrMachine.bDemo Then
         ' Download programma (eventuali errori sono segnalati dalla funzione)
         If m_CurrNcComm.SendProgram(sCncPath, 900) Then
            ' copio il progetto corrente come progetto in lavorazione
@@ -479,8 +479,11 @@ Public Class ProjectMgrUC
         End If

         '-------------------Avvio il Ciclo-Start-------------------------
-         Dim MyCicloStartWD As New CicloStartWD(m_MainWindow)
-         MyCicloStartWD.ShowDialog()
+         If GetPrivateProfileInt(S_GENERAL, "StartProgram", 0, m_MainWindow.GetIniFile()) <> 0 Then
+            Dim MyCicloStartWD As New CicloStartWD(m_MainWindow)
+            MyCicloStartWD.ShowDialog()
+         End If
+
         '-------------------Avvio il Ciclo-Start-------------------------

         ' Altrimenti linea di produzione
@@ -561,6 +564,7 @@ Public Class ProjectMgrUC

         ' Se non collegato alla macchina
         If Not m_MainWindow.m_bNCLink Then
+            ' salvo il progetto corrente incrementando il valore del progetto
            m_CurrProjPage.SetWarningMessage(EgtMsg(90316))        'Non connesso alla macchina
            ' copio il progetto corrente come progetto in lavorazione
            Dim sWrkPath As String = m_MainWindow.GetTempDir() & "\" & "WorkProj.nge"
@@ -571,6 +575,7 @@ Public Class ProjectMgrUC
            m_CurrProjPage.SaveProject()
            ' lancio eventuale lua post-trasmissione
            m_MainWindow.ExecSentProgScript(False, bAlreadySent)
+            ' se in versione demo (per linea di produzione) salvo il file corrente incrementando la numerazione
            Return
         End If

@@ -1562,7 +1562,7 @@ Public Class RawPartPageUC
            StringToLen(WidthTxBx.Text, m_RawWidth)
            StringToLen(OffsetXTxBx.Text, m_RawOffsX)
            StringToLen(OffsetYTxBx.Text, m_RawOffsY)
-            UpdateRawPart()
+            ' UpdateRawPart()
            UpdateRawPartKerf()
            ' Recupero id contorno kerf
            Dim nKerfId As Integer = EgtGetFirstNameInGroup(m_CurrProjPage.m_nRawId, NAME_KERF)
@@ -1587,7 +1587,7 @@ Public Class RawPartPageUC
            m_RawOffsX = m_RawOffsX - m_RawKerf
            StringToLen(OffsetYTxBx.Text, m_RawOffsY)
            m_RawOffsY = m_RawOffsY - m_RawKerf
-            UpdateRawPart()
+            ' UpdateRawPart()
            m_RawKerf = -m_RawKerf
            UpdateRawPartKerf()
            ' Recupero id contorno kerf
@@ -2,6 +2,16 @@
 Imports EgtUILib

 Module Utility
+   Friend Sub CompoColor(ByRef InsertColor As Color3d, sIniFile As String)
+      InsertColor = New Color3d(89, 210, 210)
+      Dim IndexColor As Integer = GetPrivateProfileInt(S_COMPO, "LastColor", "1", sIniFile)
+      If Not GetPrivateProfileColor(S_COMPO, "Color" & IndexColor.ToString, InsertColor, sIniFile) Then
+         IndexColor = 1
+         GetPrivateProfileColor(S_COMPO, "Color" & IndexColor.ToString, InsertColor, sIniFile)
+      End If
+      WritePrivateProfileString(S_COMPO, "LastColor", (IndexColor + 1).ToString, sIniFile)
+   End Sub
+

   '--------------------------------------------------------------------------------------------------
   Friend Sub UpdateUI()
@@ -10,15 +10,21 @@
         <ColumnDefinition Width="1*"/>
      </Grid.ColumnDefinitions>

-      <StackPanel Orientation="Vertical">
-         <Button Name="NewBtn" Height="64"
+        <StackPanel Orientation="Vertical">
+            <Button Name="NewBtn" Height="64"
            Style="{DynamicResource OmagCut_YellowTextButton}"
            Content="New"/>
-         <Button Name="ExportBtn" Height="64"
+            <Button Name="ExportBtn" Height="64"
            Style="{DynamicResource OmagCut_YellowTextButton}"
            Content="Export"/>
-      </StackPanel> 
+            <Button Name="AssemblyBtn" Height="64"
+            Style="{DynamicResource OmagCut_YellowTextButton}"
+            Content="3D"/>
+            <Button Name="ImportCurrProjBtn" Height="64"
+            Style="{DynamicResource OmagCut_YellowTextButton}"
+            Content="Import"/>
+        </StackPanel>

-   </Grid>
+    </Grid>

 </Window>
Author	SHA1	Message	Date
NicolaP	8ee25d6883	Inserita nuova versione Alzatine e frontalini	2021-10-08 19:48:11 +02:00
NicolaP	cd946a7353	Gestione parametro Anima nel ToolDB	2021-10-08 18:59:59 +02:00
NicolaP	bdefedae39	Cambio colore sfondo per i parametri di lavorazione	2021-10-08 18:11:15 +02:00
NicolaP	2a07343685	Merge commit '6507ef0a97449d014fda85ed7171c12a0eeb8f71' into Features/Demo_Fiera	2021-10-08 16:41:10 +02:00
NicolaP	b5ed38e20f	Inizio gestione dimensioni utensile STEM e CORE	2021-10-08 16:40:37 +02:00
SaraP	6507ef0a97	Nuova implementazione disegno 3D alette (faccia top fissata)	2021-10-07 17:32:48 +02:00
NicolaP	ab33dbcc46	Aggiunte icone in tutte le lavorazioni dirette	2021-10-07 12:18:08 +02:00
NicolaP	17f1bc1b20	Correzione colorazione sfondi bottoni disabilitati	2021-10-07 11:31:55 +02:00
NicolaP	97c99d3114	Inserimento nuove icone per interfaccia Dark e gestione colori pezzi	2021-10-07 09:14:09 +02:00
SaraP	cecbacd614	Gestione texture disegno 3D alette	2021-09-30 16:40:18 +02:00
NicolaP	7c8dccfa57	Correzione indentazione	2021-09-29 16:58:25 +02:00
NicolaP	fb0436d090	Gestione simulazione linea di produzione	2021-09-29 14:49:03 +02:00
SaraP	aa83984a15	Correzione comando import in VeinMatch	2021-09-28 17:06:33 +02:00
SaraP	27feb8a7cc	Correzione comando import in VeinMatch	2021-09-28 16:31:30 +02:00
NicolaP	0edda465f1	Inizio correzione comando Import in VeinMatch	2021-09-28 15:42:11 +02:00
NicolaP	8bc2076027	Merge branch 'Gestione_colori_pezzi' into Features/Demo_Fiera	2021-09-28 14:16:22 +02:00
NicolaP	174738f252	Migliorata gestione VeinMatch per alette	2021-09-28 14:08:04 +02:00
NicolaP	9112fb5691	Merge remote-tracking branch 'origin/Features/Alzatine_e_Frontalini' into Gestione_colori_pezzi	2021-09-27 19:15:49 +02:00
NicolaP	db608e6c0e	Gestione dei colori regioni per importazioni e disegni	2021-09-27 19:15:28 +02:00
SaraP	5ce753e4b7	Correzione errore disegno 3D frontalini	2021-09-27 16:38:06 +02:00
SaraP	d7445f828a	Aggiunto disegno 3D frontalini (prima implementazione)	2021-09-27 14:54:07 +02:00
NicolaP	ca4eb016a5	Disabilito la text per la gestione del DeltaAng delle alzatine	2021-09-27 14:42:43 +02:00
NicolaP	ea48c05112	Merge branch 'Features/Esporta_utensile' into Features/Demo_Fiera	2021-09-27 14:24:46 +02:00
NicolaP	3f6e8fbbeb	Configurato CycleStart da programma	2021-09-27 13:10:12 +02:00
SaraP	e52a56a683	Merge commit 'efba122f14782d61996a2671561103ad6da1cdcf' into Features/Demo_Fiera	2021-09-24 16:13:43 +02:00
SaraP	3d44bbaa5c	Disegno 3D alzatine nel VeinMatching	2021-09-24 16:08:53 +02:00
NicolaP	fc68efd4f4	Correzione Merge	2021-09-23 20:20:23 +02:00
NicolaP	191a973ee3	Merge remote-tracking branch 'origin/master' into Features/Alzatine_e_Frontalini	2021-09-23 19:46:21 +02:00
NicolaP	e3f628a07d	Controllo e verifica nuova console	2021-09-23 19:31:07 +02:00
NicolaP	8b57174267	Merge branch 'master' into Features/Esporta_utensile	2021-09-22 10:51:59 +02:00
NicolaP	2035c83062	Correzione errore in VeinMatch	2021-09-22 10:00:14 +02:00
NicolaP	3aa9129acc	Correzione spessore 3D	2021-09-22 09:31:32 +02:00
NicolaP	8ccfda96f8	Merge branch 'Features/Alzatine_e_Frontalini' of https://gitlab.steamware.net/egaltech/OmagCUT into Features/Alzatine_e_Frontalini	2021-09-22 09:24:00 +02:00
NicolaP	8a67feab0f	Aggiunto spessore per generazione 3D	2021-09-22 09:20:15 +02:00
NicolaP	f76d91fc20	Merge remote-tracking branch 'origin/HEAD'	2021-09-22 08:35:46 +02:00
Emmanuele Sassi	372b084d53	Aggiunta tasto volantino	2021-09-21 16:23:05 +02:00
SaraP	00f30c943c	Traslazioni e rotazioni per 3D VeinMatching	2021-09-21 08:43:08 +02:00
NicolaP	4418d53557	Cambio versione ver_2.3i3	2021-09-20 18:29:03 +02:00
NicolaP	0fe95e4ccc	Correzione gestione Kerf	2021-09-20 18:28:09 +02:00
NicolaP	c2d150b402	Gestione oggetti per 3D VeinMatching	2021-09-20 14:57:36 +02:00
NicolaP	80857bb4e1	Inserito comando £D per gestire l'assemblato del piano cucina	2021-09-15 15:25:37 +02:00
NicolaP	584a635ff4	Merge branch 'master' into Features/Alzatine_e_Frontalini	2021-09-15 15:02:31 +02:00
NicolaP	f1ddce36d8	Merge branch 'master' of https://gitlab.steamware.net/egaltech/OmagCUT	2021-09-15 15:00:11 +02:00
NicolaP	8aae4ff8d0	Gestione tempo attesa comando MDI in movimenti manuali	2021-09-15 14:58:24 +02:00
NicolaP	01e0fa3a9c	Inserisco nel VienMath i disegni dei pezzi	2021-09-15 12:46:38 +02:00
DarioS	27bfef3fc1	OmagCUT : - aggiunta implementazione cambio tavola su macchine a due tavole che abilitano l'operazione.	2021-09-13 15:53:05 +02:00
NicolaP	6db4dd995f	Gestione lavorazione arco approssimato	2021-09-09 19:55:00 +02:00