Merge commit '01ced18fad0b4863f565dae8c01f195aebae3968' into Features/Manage_Msg

CAM/CamAuto.vb

@@ -1056,20 +1056,24 @@ Friend Module CamAuto
       If EgtGetTableId(MAIN_TAB) = GDB_ID.NULL Then Return 0
       If EgtGetTableId(SECOND_TAB) = GDB_ID.NULL Then Return 1
       If EgtGetTableId(THIRD_TAB) = GDB_ID.NULL Then Return 2
-      Return 3
+      If EgtGetTableId(FORTH_TAB) = GDB_ID.NULL Then Return 3
+      Return 4
    End Function
 
    Friend Function GetTableName(nInd As Integer) As String
       If nInd = 1 Then Return MAIN_TAB
       If nInd = 2 Then Return SECOND_TAB
       If nInd = 3 Then Return THIRD_TAB
+      If nInd = 4 Then Return FORTH_TAB
       Return ""
    End Function
 
    Friend Function GetCurrentTable() As Integer
       Dim sTabName As String = MAIN_TAB
       EgtGetTableName(sTabName)
-      If sTabName = THIRD_TAB Then
+      If sTabName = FORTH_TAB Then
+         Return 4
+      ElseIf sTabName = THIRD_TAB Then
          Return 3
       ElseIf sTabName = SECOND_TAB Then
          Return 2

CadCuts/ChangeToolWD.xaml

@@ -37,7 +37,7 @@
             </Grid.ColumnDefinitions>
             <TextBlock Grid.Column="0" Text="MACHINING" Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" />
             <TextBlock Grid.Column="1" Text="TOOL" Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" />
-            <TextBlock Grid.Column="2" Text="TC" Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+            <TextBlock Grid.Column="2" Text="TC" Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}" Margin="10,0,0,0"/>
          </Grid>
 
          <ListBox Name="SetUpToolListBox" Grid.Column="1" Grid.Row="2"
@@ -46,15 +46,15 @@
                <DataTemplate>
                   <Grid Width="{Binding ActualWidth, ElementName=SetUpToolListBox}" Margin="0,0,-40,0">
                      <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="0.6*"/>
+                        <ColumnDefinition Width="0.8*"/>
                         <ColumnDefinition Width="0.7*"/>
-                        <ColumnDefinition Width="0.3*"/>
-                        <ColumnDefinition Width="0.005*"/>
+                        <ColumnDefinition Width="0.4*"/>
+                        <ColumnDefinition Width="0.0*"/>
                      </Grid.ColumnDefinitions>
                      <TextBlock Grid.Column="0" Text="{Binding Machining}" Style="{StaticResource OmagCut_ListBoxTextBlock}"/>
-                     <TextBlock Grid.Column="1" Text="{Binding ToolName}" Style="{StaticResource OmagCut_ListBoxTextBlock}" />
+                            <TextBlock Grid.Column="1" Text="{Binding ToolName}" Style="{StaticResource OmagCut_ListBoxTextBlock}"/>
                      <TextBlock Grid.Column="2" Text="{Binding ToolPos}" Style="{StaticResource OmagCut_ListBoxTextBlock}"/>
-                     <Rectangle Grid.Column="2" Style="{DynamicResource Rect_SplitPage}"/>
+                     <Rectangle Grid.Column="2" Style="{DynamicResource Rect_SplitPage}" Margin="15,0,0,0"/>
                      <Grid.ToolTip>
                         <StackPanel>
                            <TextBlock Text="{Binding Machining}" Style="{StaticResource OmagCut_ListBoxTextBlock}"/>

CadCuts/MoveRawPartPage.xaml.vb

@@ -44,8 +44,8 @@ Public Class MoveRawPartPage
       RemovePartBtn.Content = EgtMsg(MSG_MOVERAWPAGEUC + 1)  'Rimuovi
       ModifyBtn.Content = EgtMsg(MSG_SPLITPAGEUC + 17)       'Modifica
       ResetBtn.Content = EgtMsg(MSG_NESTPAGEUC + 6)          'Reset
-      ScrapsBtn.Content = "Add Scraps"
-      UnloadPartsBtn.Content = "Move part"
+      ScrapsBtn.Content = EgtMsg(90366)                      'Add Scraps
+      UnloadPartsBtn.Content = EgtMsg(90367)                 'Move part
    End Sub
 
    Private Sub MoveRawPartPage_Loaded(sender As Object, e As EventArgs) Handles Me.Loaded
@@ -124,10 +124,10 @@ Public Class MoveRawPartPage
       If m_SplitPage.m_bOnAuxTab And m_SplitPage.m_bEnableOnAuxTab Then
          ' assegnazione delle info tavola ausiliaria alla dispozione corrente (Spostato nella funzione Refresh)
          SetAuxTabInCurrDisposition()
-         UnloadPartsBtn.Content = "Go to MOVE part"
+         UnloadPartsBtn.Content = EgtMsg(90368)    ' Go to MOVE part
          ' altrimenti, aggiorno visualizzazione
       ElseIf Not m_SplitPage.m_bOnAuxTab And m_SplitPage.m_bEnableOnAuxTab Then
-         UnloadPartsBtn.Content = "Go to UNLOAD part"
+         UnloadPartsBtn.Content = EgtMsg(90369)    ' Go to UNLOAD part
       End If
       '---------------------------- AUX TABLE ---------------------------- 
       EgtDraw()
@@ -215,10 +215,10 @@ Public Class MoveRawPartPage
       Else
          UnloadPartsBtn.Visibility = Visibility.Visible
          If m_SplitPage.m_bOnAuxTab Then
-            UnloadPartsBtn.Content = "Go to MOVE part"
+            UnloadPartsBtn.Content = EgtMsg(90368)    ' Go to MOVE part
             ' altrimenti, aggiorno visualizzazione
          Else
-            UnloadPartsBtn.Content = "Go to UNLOAD part"
+            UnloadPartsBtn.Content = EgtMsg(90369)    ' Go to UNLOAD part
          End If
       End If
       ' Aggiorno interfaccia per taglio perpendicolare
@@ -342,7 +342,7 @@ Public Class MoveRawPartPage
                If VerifyCollisionWithOtherRawPart(nId) Then
                   ' mantengo la selezione del pezzo
                   EgtSetStatus(nId, GDB_ST.SEL)
-                  m_CurrProjPage.SetErrorMessage("Collisione pezzi")
+                  m_CurrProjPage.SetErrorMessage(EgtMsg(91231))      ' Collisione pezzi
                Else
                   ' Se con ventose, le nascondo
                   If Not m_bByHand Then EgtSetStatus(GetVacuumId(), GDB_ST.OFF)
@@ -352,7 +352,7 @@ Public Class MoveRawPartPage
                If VerifyCollisionWithOtherRawPart(m_CurrRawOnVacuum) Then
                   ' mantengo la selezione del pezzo
                   EgtSetStatus(m_CurrRawOnVacuum, GDB_ST.SEL)
-                  m_CurrProjPage.SetErrorMessage("Collisione pezzi")
+                  m_CurrProjPage.SetErrorMessage(EgtMsg(91231))      ' Collisione pezzi
                   EgtDraw()
                   ' esco dal ciclo, prima devo depositare correttamente il pezzo
                   Exit While
@@ -361,7 +361,7 @@ Public Class MoveRawPartPage
                If VerifyCollisionWithOtherRawPart(nId, True) Then
                   ' mantengo la selezione del pezzo
                   EgtSetStatus(m_CurrRawOnVacuum, GDB_ST.SEL)
-                  m_CurrProjPage.SetErrorMessage("Collisione pezzi")
+                  m_CurrProjPage.SetErrorMessage(EgtMsg(91231))       ' Collisione pezzi
                   EgtDraw()
                   ' esco dal ciclo, prima devo depositare correttamente il pezzo
                   Exit While
@@ -538,18 +538,18 @@ Public Class MoveRawPartPage
       If EgtGetInfo(nMyId, K_ISNEWSCRAPS, nVal) Then
          If nVal = 1 Or nVal = 2 Then
             ' 1 → è stato definito come nuovo grezzo oppure, 2 → è stato definito come nuovo grezzo ed è stato inserito nel DB delle lastre
-            ScrapsBtn.Content = "Remove Scrap"
+            ScrapsBtn.Content = EgtMsg(91228)      ' Remove Scrap
             ScrapsBtn.IsEnabled = True And Not m_SplitPage.m_bShow
             Return True
          ElseIf nVal = 3 Then
             ' non è possibile rimuovere il grezzo in questa fase
-            ScrapsBtn.Content = "Defined as Scrap"
+            ScrapsBtn.Content = EgtMsg(91229)      ' Defined as Scrap
             ScrapsBtn.IsEnabled = False
             Return True
          End If
       End If
       ' non è un nuovo grezzo
-      ScrapsBtn.Content = "Add Scrap"
+      ScrapsBtn.Content = EgtMsg(91230)            ' Add Scrap
       ScrapsBtn.IsEnabled = True And Not m_SplitPage.m_bShow
       Return False
    End Function

CadCuts/NestPageUC.xaml.vb

@@ -110,7 +110,7 @@ Public Class NestPageUC
       RemovePartBtn.ToolTip = EgtMsg(MSG_NESTPAGEUC + 3)            'Remove part - Elimina pezzo
       SelectAllBtn.ToolTip = EgtMsg(MSG_NESTPAGEUC + 4)             'Select All - Seleziona Tutto
       DeselectAllBtn.ToolTip = EgtMsg(MSG_NESTPAGEUC + 5)           'Deselect All - Deseleziona Tutto
-      DragRettanleBtn.ToolTip = "Strech"
+      DragRettanleBtn.ToolTip = EgtMsg(91207)                       'Strech
 
       ' Nascondo i pulsanti in uso quando attivo la modalità REG
       UG0_Reg.Visibility = Visibility.Hidden
@@ -356,7 +356,7 @@ Public Class NestPageUC
       End While
       If nIdMy = GDB_ID.NULL Then
          m_MainWindow.m_CurrentProjectPageUC.ClearMessage()
-         m_MainWindow.m_CurrentProjectPageUC.SetErrorMessage("Select OUTLOOP")
+         m_MainWindow.m_CurrentProjectPageUC.SetErrorMessage(EgtMsg(91208))      ' Select OUTLOOP
       End If
       Return
    End Sub
@@ -544,7 +544,7 @@ Public Class NestPageUC
                m_nIdSelectedOutLoopRettangle = nIdParent
                If Not IsRettangle(m_SideListRettangle) Then
                   m_CurrProjPage.ClearMessage()
-                  m_CurrProjPage.SetWarningMessage("Non è un rettangolo (0)")
+                  m_CurrProjPage.SetWarningMessage(EgtMsg(91209))     ' Non è un rettangolo (0)
                   Return
                End If
                ' recupero il gruppo della lavorazione associata
@@ -553,13 +553,13 @@ Public Class NestPageUC
                ' se non esiste un gruppo di lavorazione associato allora esco
                If nIdPV = GDB_ID.NULL Then
                   m_CurrProjPage.ClearMessage()
-                  m_CurrProjPage.SetWarningMessage("Pezzo in parcheggio (1)")
+                  m_CurrProjPage.SetWarningMessage(EgtMsg(91210))      ' Pezzo in parcheggio (1)
                   Return
                End If
                ' se esiste ma è vuoto (pezzo scaricato da tavola)
                If EgtGetFirstInGroup(nIdPV) = GDB_ID.NULL Then
                   m_CurrProjPage.ClearMessage()
-                  m_CurrProjPage.SetWarningMessage("Pezzo in parcheggio (2)")
+                  m_CurrProjPage.SetWarningMessage(EgtMsg(91211))    ' Pezzo in parcheggio (2)
                   Return
                End If
                ' Devo verificare che sia una lavorazione solo di lama?
@@ -1017,7 +1017,7 @@ Public Class NestPageUC
                AddPointRegBtn.IsChecked = False
             Else
                m_MainWindow.m_CurrentProjectPageUC.ClearMessage()
-               m_MainWindow.m_CurrentProjectPageUC.SetWarningMessage("Max spot for reg: " & m_nCountSpot.ToString)
+               m_MainWindow.m_CurrentProjectPageUC.SetWarningMessage(EgtMsg(91212) & m_nCountSpot.ToString)    ' Max spot for reg: 
             End If
          ElseIf RemovePointRegBtn.IsChecked Then
             ' Verifico se selezionato indicativo di pezzo
@@ -1179,12 +1179,18 @@ Public Class NestPageUC
             Exit While
          Else
             ' verifico se l'elemento selezionato è il nome della tavola
-            If EgtGetType(nId) = GDB_TY.EXT_TEXT AndAlso (sNamePartId = MAIN_TAB Or sNamePartId = SECOND_TAB) Then
+            If EgtGetType(nId) = GDB_TY.EXT_TEXT AndAlso (sNamePartId = MAIN_TAB Or
+                                                          sNamePartId = SECOND_TAB Or
+                                                          sNamePartId = THIRD_TAB Or
+                                                          sNamePartId = FORTH_TAB) Then
+               ' Apro la finestra per la selezione della tavola da usare
                Dim nRes As Integer = m_MainWindow.m_CadCutPageUC.m_ProjectMgr.ChangeTable()
                ' se non è stata eseguita nessuna scelta esco dal ciclo 
                If nRes = 0 Then Exit While
-               ' imposto l'altra tavola
-               Dim sOtherTab = If(sNamePartId = MAIN_TAB, SECOND_TAB, MAIN_TAB)
+
+               ' recupero il nome della tavola corrente
+               Dim sOtherTab As String = GetTableName(nRes)
+
                EgtChangeTable(sOtherTab, True)
                m_CurrProjPage.AdjustAdditionalTable(True)
                EgtSetMachineLook(MCH_LOOK.TAB)
@@ -2997,11 +3003,12 @@ Math.Abs(e.Location.Y - m_locPrev.Y) < m_nRestRadius Then
       If ParkIndBtn.IsChecked Then
          m_SelParkInd.UpdateList()
       End If
-      UpdateImageParkInd()
+      ' abilito la notofica di modifica
+      UpdateImageParkInd(False)
    End Sub
 
    ' Aggiorna immagine e restituisce il numero di parcheggi (+1) disponibili (+1 perchè conto anche il comando All_Off)
-   Private Function UpdateImageParkInd() As Integer
+   Private Function UpdateImageParkInd(Optional bDisableModified As Boolean = True) As Integer
       ' Carcico la lista dei parcheggi
       Dim ListparkInd As New List(Of ParkInd)
       SelParkIndWD.LoadParkInd(ListparkInd)
@@ -3016,6 +3023,11 @@ Math.Abs(e.Location.Y - m_locPrev.Y) < m_nRestRadius Then
          End If
          ParkIndImg.Source = ImageConverter.ConvertFromString(s)
       Else
+         Dim bOldEnMod As Boolean = False
+         If bDisableModified Then
+            bOldEnMod = EgtGetEnableModified()
+            If bOldEnMod Then EgtDisableModified()
+         End If
          ' Se il comando non è abilitato allora provvedo a selezionare il primo parcheggio
          Dim CurrparkInd As ParkInd = SelParkIndWD.GetCurrentParkIndSelected()
          If Not IsNothing(CurrparkInd) Then
@@ -3026,6 +3038,8 @@ Math.Abs(e.Location.Y - m_locPrev.Y) < m_nRestRadius Then
                SelParkIndWD.SetStatusPartInParkInd(ListparkInd(1), True)
             End If
          End If
+         ' Se necessario, ripristino precedente impostazione modificato
+         If bOldEnMod Then EgtEnableModified()
       End If
       Return nCount
    End Function
@@ -3174,7 +3188,8 @@ Math.Abs(e.Location.Y - m_locPrev.Y) < m_nRestRadius Then
       If Not IsNothing(m_SelParkInd) Then
          m_SelParkInd.UpdateList()
       End If
-      UpdateImageParkInd()
+      ' abilito la notofica di modifica
+      UpdateImageParkInd(False)
    End Sub
 
 
@@ -3701,7 +3716,7 @@ Math.Abs(e.Location.Y - m_locPrev.Y) < m_nRestRadius Then
       ' Verifico che almeno un punto sia stato inserito
       If m_nCountSpotCUT < 1 Then
          m_MainWindow.m_CurrentProjectPageUC.ClearMessage()
-         m_MainWindow.m_CurrentProjectPageUC.SetWarningMessage("Insert one spot reg to start.")
+         m_MainWindow.m_CurrentProjectPageUC.SetWarningMessage(EgtMsg(91213))      ' Insert one spot reg to start.
       End If
 
       ' recupero l'elenco non ordinato degli Id dei punti SpotReg (da Office)

CadCuts/SelectPartFromFamilyWD.xaml.vb

@@ -33,8 +33,8 @@
       Me.Top = Owner.Top + Owner.Height / 2 - Me.Height / 2
       Me.Left = Owner.Left + Owner.Width / 2 - Me.Width / 2
 
-      TitleWDTxbl.Text = "Selection parts"
-      NbrOfPartsMsg.Text = "Number of parts"
+      TitleWDTxbl.Text = EgtUILib.EgtMsg(91232)      ' Selection parts
+      NbrOfPartsMsg.Text = EgtUILib.EgtMsg(91233)    ' Number of parts
       NbrOfParts.Text = m_NumberOfParts.ToString
    End Sub
 

CadCuts/SelectTableWD.xaml

@@ -0,0 +1,82 @@
+<Window x:Class="SelectTableWD"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:EgtWPFLib="clr-namespace:EgtWPFLib;assembly=EgtWPFLib"
+        FontFamily="{DynamicResource OmagCut_Font}"
+        Title="ChooseTool" Height="282.6" Width="326.6" WindowStyle="None" 
+        ResizeMode="NoResize" ShowInTaskbar="False" AllowsTransparency="True" 
+        Background="Transparent">
+
+    <Border Style="{DynamicResource OmagCut_Border}">
+
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="0.5*"/>
+                <ColumnDefinition Width="4*"/>
+                <ColumnDefinition Width="0.5*"/>
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="0.5*"/>
+                <RowDefinition Height="0.5*"/>
+                <RowDefinition Height="1.5*"/>
+                <RowDefinition Height="0.1*"/>
+                <RowDefinition Height="1.0*"/>
+                <RowDefinition Height="0.5*"/>
+            </Grid.RowDefinitions>
+
+            <TextBlock Name="Title" Grid.Row="1" Grid.Column="1" 
+                       Style="{DynamicResource OmagCut_CenteredLowerCaseCharacterTextBlock}"/>
+
+            <ItemsControl Name="TableList"
+                          Grid.Row="2" Grid.Column="1">
+                <ItemsControl.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <StackPanel Orientation="Horizontal" 
+                                    HorizontalAlignment="Center"/>
+                    </ItemsPanelTemplate>
+                </ItemsControl.ItemsPanel>
+                <ItemsControl.ItemTemplate>
+                    <DataTemplate>
+                        <RadioButton GroupName="TabGrp" 
+                                     IsChecked="{Binding IsActive}"
+                                     Width="60" Height="60">
+                            
+                            <RadioButton.Style>
+                                <Style TargetType="ToggleButton" BasedOn="{StaticResource OmagCut_ToggleButton}">
+                                    <Style.Triggers>
+                                        <Trigger Property="IsChecked" Value="True">
+                                            <Setter Property="Foreground" Value="white"/>
+                                            <Setter Property="Background" Value="{StaticResource OmagCut_Blue}"/>
+                                        </Trigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </RadioButton.Style>
+                            <Grid>
+                                <TextBlock Text="{Binding sName}" Background="Transparent"/>
+                                <Image Source="{Binding ImgTab}" Margin="0,10,0,0"
+                                       Style="{StaticResource OmagCut_ButtonIcon}"/>
+                            </Grid>
+                            
+                        </RadioButton>
+                    </DataTemplate>
+                </ItemsControl.ItemTemplate>
+            </ItemsControl>
+            
+            <Grid Grid.Column="1" Grid.Row="4">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="0.5*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="1*"/>
+                    <ColumnDefinition Width="0.5*"/>
+                </Grid.ColumnDefinitions>
+                <Button Name="OkBtn" Grid.Column="1" Style="{DynamicResource OmagCut_GradientBlueIconButton}" >
+                    <Image Source="{DynamicResource VImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+                </Button>
+                <Button Name="ExitBtn" Grid.Column="3" Style="{DynamicResource OmagCut_GradientBlueIconButton}" IsCancel="True">
+                    <Image Source="{DynamicResource XImg}" Style="{StaticResource OmagCut_ButtonIcon}"/>
+                </Button>
+            </Grid>
+        </Grid>
+    </Border>
+</Window>

CadCuts/SelectTableWD.xaml.vb

@@ -0,0 +1,96 @@
+Imports System.ComponentModel
+
+Public Class SelectTableWD
+   Private m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
+
+   Private m_nSelectedTable As Integer = 0
+   Public ReadOnly Property nSelectedTable As Integer
+      Get
+         Return m_nSelectedTable
+      End Get
+   End Property
+
+   Sub New(Owner As Window)
+      Me.Owner = Owner
+      Me.WindowStartupLocation = WindowStartupLocation.CenterOwner
+      InitializeComponent()
+   End Sub
+
+   Public CurrTableList As New List(Of TableToChange)
+
+   Private Sub ChangeTable_Initialized() Handles Me.Initialized
+
+      Title.Text = EgtUILib.EgtMsg(91234)      ' Seleziona la tavola da usare
+      ' recuepero l'inidce della tavola corrente
+      Dim nIndeXCurrTab As Integer = GetCurrentTable()
+      ' creo la lista delle tavole disponibili (attivo il bottone della tavola attualmente in uso)
+      For nInd As Integer = 0 To GetTableCount() - 1
+         CurrTableList.Add(New TableToChange("Tab", (nInd + 1).ToString, ((nInd + 1) = nIndeXCurrTab)))
+      Next
+   End Sub
+
+   Private Sub ChangeTable_Loaded() Handles Me.Loaded
+      TableList.ItemsSource = CurrTableList
+   End Sub
+
+   Private Sub OkBtn_Click(sender As Object, e As RoutedEventArgs) Handles OkBtn.Click
+      ' recupero l'indice della tavola impostata
+      For Each ItemTab As TableToChange In CurrTableList
+         If ItemTab.IsActive Then
+            m_nSelectedTable = ItemTab.nIndex
+            Exit For
+         End If
+      Next
+      DialogResult = True
+   End Sub
+
+End Class
+
+Public Class TableToChange
+   Implements INotifyPropertyChanged
+
+   Private Property m_sName As String = "Tab"
+   Public ReadOnly Property sName As String
+      Get
+         Return m_sName
+      End Get
+   End Property
+
+   Public ReadOnly Property ImgTab As String
+      Get
+         Return DirectCast(Application.Current.MainWindow, MainWindow).GetResourcesDir() & "\MachineButtonsImage\table.png"
+      End Get
+   End Property
+
+   Private Property m_nIndex As Integer = 3
+   Public ReadOnly Property nIndex As Integer
+      Get
+         Return m_nIndex
+      End Get
+   End Property
+
+   Private m_bIsActive As Boolean = False
+   Public Property IsActive As Boolean
+      Get
+         Return m_bIsActive
+      End Get
+      Set(value As Boolean)
+         m_bIsActive = value
+         NotifyPropertyChanged("IsActive")
+      End Set
+   End Property
+
+   Public Sub New(Name As String, Ind As Integer, IsCurrent As Boolean)
+      m_sName = Name & " " & Ind.ToString
+      m_nIndex = Ind
+      m_bIsActive = IsCurrent
+      NotifyPropertyChanged("IsActive")
+   End Sub
+
+   Public Event PropertyChanged(sender As Object, e As PropertyChangedEventArgs) Implements INotifyPropertyChanged.PropertyChanged
+
+   Public Sub NotifyPropertyChanged(propName As String)
+      RaiseEvent PropertyChanged(Me, New PropertyChangedEventArgs(propName))
+   End Sub
+
+End Class

CadCuts/SplitPageUC.xaml.vb

@@ -93,8 +93,8 @@ Public Class SplitPageUC
       ModifyBtn.Content = EgtMsg(MSG_SPLITPAGEUC + 17)       ' Modifica
       AutoBtn.Content = EgtMsg(MSG_SPLITPAGEUC + 18)         ' Auto
       RestartBtn.Content = EgtMsg(MSG_SPLITPAGEUC + 19)      ' Restart
-      BridgesWJBtn.ToolTip = "Bridges"
-      BridgesDeleteWJBtn.ToolTip = "Remove bridges"
+      BridgesWJBtn.ToolTip = EgtMsg(91214)                   ' Bridges
+      BridgesDeleteWJBtn.ToolTip = EgtMsg(91215)             ' Remove bridges
    End Sub
 
    Private Sub SplitPageUC_Loaded(sender As Object, e As EventArgs) Handles Me.Loaded
@@ -277,7 +277,7 @@ Public Class SplitPageUC
          ' recupero il nome del Layer
          EgtGetName(nIdParent, sLayer)
          ' solo se il nome del layer è quello associato ad un lato esterno allora procedo con l'evidenziazione
-         If sLayer = NAME_OUTLOOP Then
+         If sLayer = NAME_OUTLOOP Or sLayer = "WjRectification" Then
             If (EgtGetType(nIdMy) = GDB_TY.CRV_ARC OrElse EgtGetType(nIdMy) = GDB_TY.CRV_COMPO OrElse EgtGetType(nIdMy) = GDB_TY.CRV_LINE) AndAlso VerifySideIsAcceptable(nIdMy) Then
                If m_nIdSelectedSideWJ <> GDB_ID.NULL Or m_nIdSelectedSideWJ = nIdMy Then
                   EgtDeselectObj(m_nIdSelectedSideWJ)
@@ -310,7 +310,7 @@ Public Class SplitPageUC
                         m_nIdSelectedSideWJ = GDB_ID.NULL
                         nIdParentPart = GDB_ID.NULL
                         m_CurrProjPage.ClearMessage()
-                        m_CurrProjPage.SetWarningMessage("Bridge intersects part")
+                        m_CurrProjPage.SetWarningMessage(EgtMsg(91216))      ' Bridge intersects part
                         Return
                      End If
                   End If
@@ -401,21 +401,22 @@ Public Class SplitPageUC
    Private Function VerifySideIsAcceptable(nMyId As Integer) As Boolean
       Dim dVal As Double = 0
       ' verifico che l'entità selezionata non contenga questi parametri
-      If EgtGetInfo(nMyId, INFO_SIDE_ANGLE2, dVal) Then
-         If dVal <> 0 Then
-            Return False
-         End If
-      End If
+      ' If EgtGetInfo(nMyId, INFO_SIDE_ANGLE2, dVal) Then
+      '    If dVal <> 0 Then
+      '       Return False
+      '    End If
+      ' End If
       If EgtGetInfo(nMyId, INFO_SIDE_ANGLE, dVal) Then
          If dVal <> 0 Then
             Return False
          End If
       End If
-      If EgtGetInfo(nMyId, INFO_ORIG_SIDE_ANGLE, dVal) Then
-         If dVal <> 0 Then
-            Return False
-         End If
-      End If
+      ' ' Non bastano i controlli sopra...?
+      ' If EgtGetInfo(nMyId, INFO_ORIG_SIDE_ANGLE, dVal) Then
+      '    If dVal <> 0 Then
+      '       Return False
+      '    End If
+      ' End If
       ' altrimenti l'entità è accettabile
       Return True
    End Function
@@ -845,7 +846,7 @@ Public Class SplitPageUC
    End Sub
 
    Private Sub AddTopText(ByRef sName As String)
-      sName &= "  Top"
+      sName &= EgtMsg(91217)    '   Top
    End Sub
 
    Private Sub RemovePauseText(ByRef sName As String)
@@ -931,12 +932,12 @@ Public Class SplitPageUC
    Private Sub SetLayNbArrTgBtn_Click()
       If LayNbArrTgBtn.IsChecked Then
          StatusOffNumbArrow(GDB_ST.ON_)
-         LayNbArrTgBtn.ToolTip = "Hide"
+         LayNbArrTgBtn.ToolTip = EgtMsg(91218)    ' Hide
          Dim Img As ImageSource = ImageConverter.ConvertFromString("pack://application:,,,/Resources/NewIcons/LightArrowOn.png")
          LayNbArrImg.Source = Img
       Else
          StatusOffNumbArrow(GDB_ST.OFF)
-         LayNbArrTgBtn.ToolTip = "Show"
+         LayNbArrTgBtn.ToolTip = EgtMsg(91219)    ' Show
          Dim Img As ImageSource = ImageConverter.ConvertFromString("pack://application:,,,/Resources/NewIcons/LightArrowOff.png")
          LayNbArrImg.Source = Img
       End If
@@ -2420,7 +2421,7 @@ Public Class SplitPageUC
       ' eventualmente stampo messaggio
       If Not m_bAreHomogeneous Then
          m_MainWindow.m_CurrentProjectPageUC.ClearMessage()
-         m_MainWindow.m_CurrentProjectPageUC.SetWarningMessage("Lavorazioni non omogenee")
+         m_MainWindow.m_CurrentProjectPageUC.SetWarningMessage(EgtMsg(91220))      ' Lavorazioni non omogenee
       Else
          m_MainWindow.m_CurrentProjectPageUC.ClearMessage()
       End If

Constants/ConstGen.vb

@@ -112,6 +112,7 @@ Module ConstGen
    Public Const MAIN_TAB As String = "MainTab"
    Public Const SECOND_TAB As String = "2ndTab"
    Public Const THIRD_TAB As String = "3rdTab"
+   Public Const FORTH_TAB As String = "4thTab"
    ' Nome tavola ausiliaria per spostamento finale pezzi
    Public Const AUX_TAB As String = "AuxTab"
 

Constants/ConstMachIni.vb

@@ -173,6 +173,7 @@
    Public Const K_ADDITIONALTABLE As String = "AdditionalTable"
    Public Const K_TAB2_ADDITIONALTABLE As String = "Tab2AdditionalTable"
    Public Const K_TAB3_ADDITIONALTABLE As String = "Tab3AdditionalTable"
+   Public Const K_TAB4_ADDITIONALTABLE As String = "Tab4AdditionalTable"
    Public Const K_CENTER_RAW_ONX As String = "CenterRawOnX"
    Public Const K_CHANGETABWD As String = "ChangeTabWD"
 

DirectCuts/DirectCutPageUC.xaml.vb

@@ -179,11 +179,11 @@ Public Class DirectCutPageUC
             Case K_REMOTE
                RemoteBtn.Visibility = Visibility.Visible
                RemoteBtn.Foreground = Brushes.White
-               RemoteBtn.Content = "Remote"
+               RemoteBtn.Content = EgtMsg(90262)      'Remote
             Case K_PARKING
                ParkingBtn.Visibility = Visibility.Visible
                ParkingBtn.Foreground = Brushes.White
-               ParkingBtn.ToolTip = "Parking"
+               ParkingBtn.ToolTip = EgtMsg(90263)     'Parking
          End Select
       Next
    End Sub

DirectCuts/FlatteningCut.xaml.vb

@@ -100,15 +100,15 @@ Public Class FlatteningCut
       DirectionTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 15)
       WidthTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 26)
       OverlapTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 27)
-      ZReleasedTxBl.Text = "Z Svincolo"
+      ZReleasedTxBl.Text = EgtMsg(91235)        'Z Svincolo
       SideTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 23)
       RotLockTxBl.Text = EgtMsg(MSG_DIRECTCUTPAGEUC + 29)
-      ChainedPathTxBl.Text = "Chained path"
+      ChainedPathTxBl.Text = EgtMsg(91236)      'Chained path
       SimulBtn.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 1)
       OkBtn.ToolTip = EgtMsg(MSG_DIRECTCUTPAGEUC + 30)
       ' tipo di utensile in uso per la lavorazione
       m_ToolsArray(TOOL.SAW) = EgtMsg(MSG_DIRECTCUTPAGEUC + 24)
-      m_ToolsArray(TOOL.MILL) = "Mill"
+      m_ToolsArray(TOOL.MILL) = EgtMsg(91237)   'Mill
       SelToolCmBx.ItemsSource = m_ToolsArray
       ' Carico i dati dell'ultimo taglio
       m_dDepth = GetPrivateProfileDouble(S_DIRECTCUTS, K_DC_FLATT_DEPTH, m_dDepth, m_MainWindow.GetIniFile())

DirectCuts/MachineButtonsUC.xaml.vb

@@ -136,7 +136,7 @@ Public Class MachineButtonsUC
                   ElseIf StateFlagArray(nIndex) = K_ZBJOG Then
                      CurrToggleBtn.Content = "Z - B"
                   ElseIf StateFlagArray(nIndex) = K_REMOTE Then
-                     CurrToggleBtn.Content = "Remote"
+                     CurrToggleBtn.Content = EgtMsg(90262)     'Remote
                   End If
                Catch ex As Exception
                   EgtOutLog("Error loading content " & StateFlagArray(nIndex))

DirectCuts/SingleCutUC.xaml.vb

@@ -147,6 +147,8 @@ Public Class SingleCutUC
       ' Deseleziono bottone primo punto
       Point1Btn.IsChecked = False
 
+      ' forzo la verifica dell'affondamento in relazione allo spessore del pezzo
+      DepthTxBx_EgtClosed(Nothing, Nothing)
       ' la visualizzazione dei comandi è gestita dalla DirectCutPageUC richiamando la funzione ReloadParam
 
       ' forzo la macchina ad essere visibile fin da subito
@@ -159,7 +161,7 @@ Public Class SingleCutUC
       ' Aggiorno visualizzazione
       EgtDraw()
 
-      ' Avvi il timer
+      ' Avvio il timer
       m_RefreshTimer.Start()
    End Sub
 

DrawImport/ImportPageUC.xaml.vb

@@ -84,13 +84,13 @@ Public Class ImportPageUC
       ResetBtn.Content = EgtMsg(MSG_IMPORTPAGEUC + 3)                 'Reset
       mmBtn.Content = EgtMsg(MSG_IMPORTPAGEUC + 4)                    'mm
       inchBtn.Content = EgtMsg(MSG_IMPORTPAGEUC + 5)                  'inch
-      OrderListBtn.Content = EgtMsg(90398)                           'Dati Csv
-      TopBtn.Content = EgtMsg(90384)                                 'Indica Lato Sopra
+      OrderListBtn.Content = EgtMsg(90398)                            'Dati Csv
+      TopBtn.Content = EgtMsg(90384)                                  'Indica Lato Sopra
       PartNumTxBl.Text = EgtMsg(MSG_IMPORTPAGEUC + 15)                'Numero
       SideAngleBtn.Content = EgtMsg(MSG_IMPORTPAGEUC + 7)             'Inclina lati
-      FiloTopBtn.Content = EgtMsg(90400)                             'Filo Top
+      FiloTopBtn.Content = EgtMsg(90400)                              'Filo Top
       DripCutBtn.Content = EgtMsg(MSG_IMPORTPAGEUC + 8)               'Incidi da sotto
-      EngraveBtn.Content = "Engrave"
+      EngraveBtn.Content = EgtMsg(91238)                              'Engrave
       DripDrillBtn.Content = EgtMsg(MSG_IMPORTPAGEUC + 14)            'Foro da sotto
       Cad2dBtn.Content = "Cad 2d"
 

Machine/AlarmsPageUC.xaml.vb

@@ -94,13 +94,13 @@ Public Class AlarmsPageUC
       WJsParamGpBx.Header = EgtMsg( 91058)                               ' Parametri waterjet
       WjIntCutsTxBl.Text = EgtMsg(90930)                                 ' Sempre sugli interni
       '-- INIZIO -- nuovi parametri per preforo lavello
-      HolesDiameterWJTxBl.Text = "Diameter"
-      HolesOffsetWJTxBl.Text = "Offset"
-      MinRadiusWJTxBl.Text = "Min Radius"
+      HolesDiameterWJTxBl.Text = EgtMsg(91044)                           ' Diametro
+      HolesOffsetWJTxBl.Text = EgtMsg(91045)                             ' Offset
+      MinRadiusWJTxBl.Text = EgtMsg(91046)                               ' Raggio Minimo
       OneHoleInCornerWJTxBl.Text = EgtMsg(MSG_ALARMSPAGEUC + 26)
       '-- INIZIO -- nuovi parametro Rettifica tagli sottosquadra WJ
-      REctificationWJParamGpBx.Header = "Rectification"
-      EnableRectificationTxBl.Text = "Enable (on subsquare angle)"
+      RectificationWJParamGpBx.Header = EgtMsg(91047)                    ' Rettifica
+      EnableRectificationTxBl.Text = EgtMsg(91048)                       ' Abilita (sottosquadra)
       '--  FINE  -- nuovi parametro Rettifica tagli sottosquadra WJ
       NestingParamGpBx.Header = EgtMsg(MSG_ALARMSPAGEUC + 31)            ' Nesting
       AlignTxBl.Text = EgtMsg(90932)                                     ' Allineato

Machine/CurrentMachine.vb

@@ -135,6 +135,7 @@ Public Class CurrentMachine
    Private m_dAdditionalTable As Double = 0
    Private m_dTab2AdditionalTable As Double = 0
    Private m_dTab3AdditionalTable As Double = 0
+   Private m_dTab4AdditionalTable As Double = 0
    Private m_bCenterRawOnX As Boolean = False
 
    ' Offset aggiuntivi per fotografia
@@ -833,10 +834,12 @@ Public Class CurrentMachine
    Friend Property dAdditionalTable As Double
       Get
          Select Case GetCurrentTable()
-            Case 3
-               Return m_dTab3AdditionalTable
             Case 2
                Return m_dTab2AdditionalTable
+            Case 3
+               Return m_dTab3AdditionalTable
+            Case 4
+               Return m_dTab4AdditionalTable
             Case Else
                Return m_dAdditionalTable
          End Select
@@ -844,6 +847,19 @@ Public Class CurrentMachine
       Set(value As Double)
          Dim dValue As Double = 0
          Select Case GetCurrentTable()
+            Case 4
+               If Math.Abs(value - m_dTab4AdditionalTable) > EPS_SMALL And
+               WritePrivateProfileString(S_TABLE, K_TAB4_ADDITIONALTABLE, DoubleToString(value, 3), sMachIniFile) Then
+                  ' Aggiorno il valore corrente
+                  m_dTab4AdditionalTable = value
+                  ' Aggiorno il progetto corrente
+                  m_MainWindow.m_CurrentProjectPageUC.AdjustAdditionalTable()
+                  ' salvo il valore della sovratavola nel progetto
+                  EgtGetInfo(EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_PROJMARK), K_TAB3_ADDITIONALTABLE, dValue)
+                  If Math.Abs(dValue - value) > EPS_SMALL Then
+                     EgtSetInfo(EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_PROJMARK), K_TAB3_ADDITIONALTABLE, value)
+                  End If
+               End If
             Case 3
                If Math.Abs(value - m_dTab3AdditionalTable) > EPS_SMALL And
                WritePrivateProfileString(S_TABLE, K_TAB3_ADDITIONALTABLE, DoubleToString(value, 3), sMachIniFile) Then
@@ -1304,7 +1320,7 @@ Public Class CurrentMachine
       ' lama
       GetPrivateProfileString(S_MACH_MACH, K_CURRSAW, Nothing, m_sCurrSaw, sMachIniFile)
       ' lama inclinata
-      If m_nShowToolChanger = 4 Then
+      If m_MountedToolConfig = 4 Then
          GetPrivateProfileString(S_MACH_MACH, K_CURRSAWTILTED, Nothing, m_sCurrSawTilted, sMachIniFile)
       Else
          ' se non è configurato il cambio utensile e allora imposto l'unica lama disponibile per i tagli inclinati
@@ -1384,6 +1400,7 @@ Public Class CurrentMachine
       m_dAdditionalTable = GetPrivateProfileDouble(S_TABLE, K_ADDITIONALTABLE, 0, sMachIniFile)
       m_dTab2AdditionalTable = GetPrivateProfileDouble(S_TABLE, K_TAB2_ADDITIONALTABLE, 0, sMachIniFile)
       m_dTab3AdditionalTable = GetPrivateProfileDouble(S_TABLE, K_TAB3_ADDITIONALTABLE, 0, sMachIniFile)
+      m_dTab4AdditionalTable = GetPrivateProfileDouble(S_TABLE, K_TAB4_ADDITIONALTABLE, 0, sMachIniFile)
 
       ' Leggo centratura del pezzo in X sulla tavola (per macchine con nastro)
       m_bCenterRawOnX = (GetPrivateProfileInt(S_TABLE, K_CENTER_RAW_ONX, 0, sMachIniFile) <> 0)

Machine/MachineCNPageUC.xaml.vb

@@ -41,7 +41,7 @@ Public Class MachineCNPageUC
       If GetPrivateProfileInt(S_NCDATA, K_NEWCONSOLE, 0, m_MainWindow.GetMachIniFile()) = 1 Then
          PowerONBtn.Content = "ON"
          PowerOFFBtn.Content = "OFF"
-         PowerGpBx.Header = "Power"
+         PowerGpBx.Header = EgtMsg(90974)    'Power
       Else
          PowerGpBx.Visibility = Visibility.Collapsed
       End If
@@ -49,7 +49,7 @@ Public Class MachineCNPageUC
       ' verifico che sia attiva la modalità per l'uso di due fotocamere
       If GetPrivateProfileInt(S_CAMERAHQ, K_CAMERAHQ_ENABLE, 0, m_MainWindow.GetMachIniFile()) = 1 Then
          CameraHQ.Visibility = Visibility.Visible
-         CameraHQ.Header = "Photo on table"
+         CameraHQ.Header = EgtMsg(90975)     'Photo on table
          CameraHQBtn.Content = "HQ"
          ' verifico quale camera è impostata
          If GetPrivateProfileInt(S_CAMERAHQ, K_CAMERAHQ_ACTIVATE, 0, m_MainWindow.GetMachIniFile()) = 1 Then
@@ -177,7 +177,7 @@ Public Class MachineCNPageUC
       If m_MainWindow.m_CNCommunication.m_nNCType = 3 AndAlso m_MainWindow.m_CNCommunication.m_CN.m_IsSiemensOne Then
          Dim sDBVarPath As String = ""
          GetPrivateProfileString(S_NCSIEMENS, K_DBVARPATH, "", sDBVarPath, m_MainWindow.GetMachIniFile)
-         sDBVarPath &= "Start_Cycle"
+         sDBVarPath &= EgtMsg(90976)                                     ' Start_Cycle
          m_CN.DVariables_WriteVariables3(sDBVarPath, 1, 1, 0, 0, "")     ' Modalità manuale
       Else
          m_CN.DGeneralFunctions_CycleStart()
@@ -188,7 +188,7 @@ Public Class MachineCNPageUC
       If m_MainWindow.m_CNCommunication.m_nNCType = 3 AndAlso m_MainWindow.m_CNCommunication.m_CN.m_IsSiemensOne Then
          Dim sDBVarPath As String = ""
          GetPrivateProfileString(S_NCSIEMENS, K_DBVARPATH, "", sDBVarPath, m_MainWindow.GetMachIniFile)
-         sDBVarPath &= "Stop_Cycle"
+         sDBVarPath &= EgtMsg(90977)                                     ' Stop_Cycle
          m_CN.DVariables_WriteVariables3(sDBVarPath, 1, 0, 0, 0, "")     ' Modalità manuale
       Else
          m_CN.DGeneralFunctions_FeedHold()
@@ -199,7 +199,7 @@ Public Class MachineCNPageUC
       If m_MainWindow.m_CNCommunication.m_nNCType = 3 AndAlso m_MainWindow.m_CNCommunication.m_CN.m_IsSiemensOne Then
          Dim sDBVarPath As String = ""
          GetPrivateProfileString(S_NCSIEMENS, K_DBVARPATH, "", sDBVarPath, m_MainWindow.GetMachIniFile)
-         sDBVarPath &= "Reset_Cycle"
+         sDBVarPath &= EgtMsg(90978)                                     ' Reset_Cycle
          m_CN.DVariables_WriteVariables3(sDBVarPath, 1, 1, 0, 0, "")     ' Modalità manuale
       Else
          Call m_CN.DGeneralFunctions_Reset()

Machine/MachiningDbPageUC.xaml.vb

@@ -79,8 +79,8 @@ Public Class MachiningDbPageUC
       NewBtn.Content = EgtMsg(MSG_MACHINEPAGEUC + 16)
       SaveBtn.Content = EgtMsg(MSG_MACHINEPAGEUC + 17)
       RemoveBtn.Content = EgtMsg(MSG_MACHINEPAGEUC + 18)
-      ExportBtn.Content = "Export"
-      ImportBtn.Content = "Import"
+      ExportBtn.Content = EgtMsg(91126)    ' Export
+      ImportBtn.Content = EgtMsg(91127)    ' Import
 
       NameTxBl.Text = EgtMsg(MSG_MACHININGSDBPAGEUC + 1)
       DepthTxBl.Text = EgtMsg(MSG_MACHININGSDBPAGEUC + 2)

Machine/SetUpPage.xaml.vb

@@ -1105,8 +1105,8 @@ Public Class SetUpPage
    ' Funzione che genera il file di setup corrente (per Cam5 e Office)
    Private Sub SaveSetUpFile()
       If m_CurrMachine.MountedToolConfig <> CurrentMachine.MountedToolConfigs.TOOLCHANGERWITHSAW Then Return
-      Dim sContentFile As String = "; this file has been created by program OmagCUT by current setup" & vbCrLf
-      sContentFile &= "[General]" & vbCrLf
+      Dim sContentFile As String = EgtMsg(91239) & vbCrLf     ' ; this file has been created by program OmagCUT by current setup
+      sContentFile &= EgtMsg(91240) & vbCrLf                  ' [General]
       For Each ToolPosition As ToolChangerPos In m_CurrMachine.ToolChanger
          Dim sToolName As String = ToolPosition.sTool
          Dim sPositionName As String = ToolPosition.sName

Machine/WaterJetPageUC.xaml

@@ -8,266 +8,292 @@
    mc:Ignorable="d" 
    d:DesignHeight="768" d:DesignWidth="1280" Initialized="WaterJetPage_Initialized">
 
-   <!-- Definizione della PolishingsPage -->
-   <Border Style="{DynamicResource OmagCut_PageBorder}">
+    <!-- Definizione della PolishingsPage -->
+    <Border Style="{DynamicResource OmagCut_PageBorder}">
 
-      <Grid Name="WaterJetPageGrid" >
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="3*"/>
-            <ColumnDefinition Width="8*"/>
-            <ColumnDefinition Width="4*"/>
-         </Grid.ColumnDefinitions>
-         <Grid.RowDefinitions>
-            <RowDefinition Height="8*"/>
-            <RowDefinition Height="1*"/>
-         </Grid.RowDefinitions>
+        <Grid Name="WaterJetPageGrid" >
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="3*"/>
+                <ColumnDefinition Width="8*"/>
+                <ColumnDefinition Width="4*"/>
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="8*"/>
+                <RowDefinition Height="1*"/>
+            </Grid.RowDefinitions>
 
-         <!--Lista dei materiali-->
-         <GroupBox Name="MaterialGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="0"
+            <!--Lista dei materiali-->
+            <GroupBox Name="MaterialGpBx" Style="{DynamicResource OmagCut_GroupBox}" Grid.Column="0"
                       Header="{Binding Material_Msg}"
                       Grid.Row="0" BorderThickness="0">
 
-            <Grid>
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="7*"/>
-                  <RowDefinition Height="1*"/>
-                  <RowDefinition Height="1*"/>
-               </Grid.RowDefinitions>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="7*"/>
+                        <RowDefinition Height="1*"/>
+                        <RowDefinition Height="1*"/>
+                    </Grid.RowDefinitions>
 
-               <!--Lista dei materiali-->
-               <ListBox Name="MaterialsLstBx" 
+                    <!--Lista dei materiali-->
+                    <ListBox Name="MaterialsLstBx" 
                              ItemsSource="{Binding MaterialList}" SelectedItem="{Binding SelMaterial}"
                              Grid.RowSpan="2">
-                  <ListBox.ItemTemplate>
-                     <DataTemplate>
-                        <TextBlock Text="{Binding Name}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-                     </DataTemplate>
-                  </ListBox.ItemTemplate>
-               </ListBox>
-               <!--Campo visualizzato solo per aggiungere un nuovo materiale-->
-               <EgtWPFLib:EgtTextBox Name="NewMaterialNameTxBx" Grid.Row="1" 
+                        <ListBox.ItemTemplate>
+                            <DataTemplate>
+                                <TextBlock Text="{Binding Name}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                            </DataTemplate>
+                        </ListBox.ItemTemplate>
+                    </ListBox>
+                    <!--Campo visualizzato solo per aggiungere un nuovo materiale-->
+                    <EgtWPFLib:EgtTextBox Name="NewMaterialNameTxBx" Grid.Row="1" 
                                           Width="220"
                                           Text="{Binding sNewMaterial}"
                                           Visibility="{Binding NewMaterial_Visibility}"
                                           Style="{DynamicResource OmagCut_KeyboardTextBox}" 
                                           KeyboardPosition="Top"/>
-               <!--Pulsanti per aggiungere/rimuovere/salvare la lista-->
-               <UniformGrid Grid.Row="2" Columns="3">
-                  <Button Name="NewMaterialBtn" Grid.Column="0"
+                    <!--Pulsanti per aggiungere/rimuovere/salvare la lista-->
+                    <UniformGrid Grid.Row="2" Columns="3">
+                        <Button Name="NewMaterialBtn" Grid.Column="0"
                                 Content="{Binding New_Msg}"
                                 Command="{Binding NewMaterialCommand}"
                                 Style="{DynamicResource OmagCut_WjDbRightGrayGradientYellowTextButton}"/>
-                  <Button Name="DeleteMaterialBtn" Grid.Column="1"
+                        <Button Name="DeleteMaterialBtn" Grid.Column="1"
                                 Content="{Binding Delete_Msg}"
                                 Command="{Binding DeleteMaterialCommand}"
                                 Style="{DynamicResource OmagCut_WjDbRightGrayGradientYellowTextButton}"/>
-                  <Button Name="ModifyMaterialBtn" Grid.Column="1"
+                        <Button Name="ModifyMaterialBtn" Grid.Column="1"
                                 Content="{Binding Modify_Msg}"
                                 Command="{Binding ModifyMaterialCommand}"
                                 Style="{DynamicResource OmagCut_WjDbRightGrayGradientYellowTextButton}"/>
-               </UniformGrid>
+                    </UniformGrid>
 
-            </Grid>
+                </Grid>
 
-         </GroupBox>
+            </GroupBox>
 
-         <!--Raggruppo all'interno della stessa cornice le sottocatogorie e i parametri-->
-         <Border Style="{DynamicResource OmagCut_Border}" 
+            <!--Raggruppo all'interno della stessa cornice le sottocatogorie e i parametri-->
+            <Border Style="{DynamicResource OmagCut_Border}" 
                     Grid.Column="1" Grid.Row="0" 
                     Grid.ColumnSpan="2" Grid.RowSpan="1">
 
-            <Grid Name="SubMaterialGrd" Grid.Column="1">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="2*"/>
-                  <ColumnDefinition Width="2*"/>
-                  <ColumnDefinition Width="2*"/>
-                  <ColumnDefinition Width="2*"/>
-               </Grid.ColumnDefinitions>
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="1*"/>
-                  <RowDefinition Height="1*"/>
-                  <RowDefinition Height="1*"/>
-                  <RowDefinition Height="1*"/>
-                  <RowDefinition Height="1*"/>
-                  <RowDefinition Height="1*"/>
-                  <RowDefinition Height="1*"/>
-                  <RowDefinition Height="1*"/>
-               </Grid.RowDefinitions>
+                <Grid Name="SubMaterialGrd" Grid.Column="1">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="2*"/>
+                        <ColumnDefinition Width="2*"/>
+                        <ColumnDefinition Width="2*"/>
+                        <ColumnDefinition Width="2*"/>
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="1*"/>
+                        <RowDefinition Height="1*"/>
+                        <RowDefinition Height="1*"/>
+                        <RowDefinition Height="1*"/>
+                        <RowDefinition Height="1*"/>
+                        <RowDefinition Height="1*"/>
+                        <RowDefinition Height="1*"/>
+                        <RowDefinition Height="1*"/>
+                    </Grid.RowDefinitions>
 
-               <!--Sottocategoria dei materiali associata alla lista precedente-->
-               <GroupBox Name="SubMaterialGpBx" Style="{DynamicResource OmagCut_GroupBox}" 
+                    <!--Sottocategoria dei materiali associata alla lista precedente-->
+                    <GroupBox Name="SubMaterialGpBx" Style="{DynamicResource OmagCut_GroupBox}" 
                               Header="{Binding SubMaterial_Msg}"
                               Grid.Column="0" Grid.Row="0" 
                               Grid.ColumnSpan="1" Grid.RowSpan="8" BorderThickness="0">
 
-                  <Grid Grid.Column="1">
-                     <Grid.RowDefinitions>
-                        <RowDefinition Height="7*"/>
-                        <RowDefinition Height="1*"/>
-                        <RowDefinition Height="1*"/>
-                     </Grid.RowDefinitions>
+                        <Grid Grid.Column="1">
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="7*"/>
+                                <RowDefinition Height="1*"/>
+                                <RowDefinition Height="1*"/>
+                            </Grid.RowDefinitions>
 
-                     <!--Lista dei materiali-->
-                     <ListBox Name="SubMaterialsLstBx" ItemsSource="{Binding Path=SelectedItem.SubMaterialList, ElementName=MaterialsLstBx}"
+                            <!--Lista dei materiali-->
+                            <ListBox Name="SubMaterialsLstBx" ItemsSource="{Binding Path=SelectedItem.SubMaterialList, ElementName=MaterialsLstBx}"
                                      SelectedItem="{Binding Path=SelectedItem.SelSubMaterial, ElementName=MaterialsLstBx}"
                                      Grid.RowSpan="2">
-                        <ListBox.ItemTemplate>
-                           <DataTemplate>
-                              <TextBlock Text="{Binding Name}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
-                           </DataTemplate>
-                        </ListBox.ItemTemplate>
-                     </ListBox>
+                                <ListBox.ItemTemplate>
+                                    <DataTemplate>
+                                        <TextBlock Text="{Binding Name}" Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"/>
+                                    </DataTemplate>
+                                </ListBox.ItemTemplate>
+                            </ListBox>
 
-                     <!--Campo visualizzato solo per aggiungere un nuovo materiale-->
-                     <EgtWPFLib:EgtTextBox Name="NewSubMaterialNameTxBx" Grid.Row="1" 
+                            <!--Campo visualizzato solo per aggiungere un nuovo materiale-->
+                            <EgtWPFLib:EgtTextBox Name="NewSubMaterialNameTxBx" Grid.Row="1" 
                                                   Width="220"
                                                   Text="{Binding sNewSubMaterial}"
                                                   Visibility="{Binding NewSubMaterial_Visibility}"
                                                   Style="{DynamicResource OmagCut_KeyboardTextBox}" 
                                                   KeyboardPosition="Top"/>
 
-                     <!--Pulsanti per aggiungere/rimuovere/salvare la lista-->
-                     <UniformGrid Grid.Row="2" Columns="3">
-                        <Button Name="NewSubMaterialBtn" Grid.Column="0"
+                            <!--Pulsanti per aggiungere/rimuovere/salvare la lista-->
+                            <UniformGrid Grid.Row="2" Columns="3">
+                                <Button Name="NewSubMaterialBtn" Grid.Column="0"
                                         Content="{Binding New_Msg}"
                                         Command="{Binding NewSubMaterialCommand}"
                                         Style="{DynamicResource OmagCut_WjDbRightGrayGradientYellowTextButton}"/>
-                        <Button Name="RemoveSubMaterialBtn" Grid.Column="1"
+                                <Button Name="RemoveSubMaterialBtn" Grid.Column="1"
                                         Content="{Binding Delete_Msg}"
                                         Command="{Binding DeleteSubMaterialCommand}"
                                         Style="{DynamicResource OmagCut_WjDbRightGrayGradientYellowTextButton}"/>
-                        <Button Name="ModifySubMaterialBtn" Grid.Column="1"
+                                <Button Name="ModifySubMaterialBtn" Grid.Column="1"
                                         Content="{Binding Modify_Msg}"
                                         Command="{Binding ModifySubMaterialCommand}"
                                         Style="{DynamicResource OmagCut_WjDbRightGrayGradientYellowTextButton}"/>
-                     </UniformGrid>
+                            </UniformGrid>
 
-                  </Grid>
+                        </Grid>
 
-               </GroupBox>
+                    </GroupBox>
 
-               <!--Lista dei parametri associata alla sottovcategoria dei materiali-->
-               <GroupBox Name="ParamsGpBx" 
+                    <!--Lista dei parametri associata alla sottovcategoria dei materiali-->
+                    <GroupBox Name="ParamsGpBx" 
                               Grid.Column="1" Grid.Row="0" Margin="0,0,0,3"
                               Grid.ColumnSpan="3" Grid.RowSpan="8" BorderThickness="0">
 
-                  <!--Titolazione delle colonne della tabella-->
-                  <GroupBox.Header >
-                     <Grid Width="700">
-                        <Grid.ColumnDefinitions>
-                           <ColumnDefinition Width="1*"/>
-                           <ColumnDefinition Width="1*"/>
-                           <ColumnDefinition Width="1*"/>
-                           <ColumnDefinition Width="1*"/>
-                           <ColumnDefinition Width="1*"/>
-                           <ColumnDefinition Width="1*"/>
-                           <ColumnDefinition Width="1*"/>
-                           <ColumnDefinition Width="1*"/>
-                        </Grid.ColumnDefinitions>
+                        <!--Titolazione delle colonne della tabella-->
+                        <GroupBox.Header >
+                            <Grid Width="700">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="1*"/>
+                                    <ColumnDefinition Width="1*"/>
+                                    <ColumnDefinition Width="1*"/>
+                                    <ColumnDefinition Width="1*"/>
+                                    <ColumnDefinition Width="1*"/>
+                                    <ColumnDefinition Width="1*"/>
+                                    <ColumnDefinition Width="1*"/>
+                                    <ColumnDefinition Width="1*"/>
+                                    <ColumnDefinition Width="1*"/>
+                                </Grid.ColumnDefinitions>
 
-                        <TextBlock Text="{Binding Thickness_Msg}" Grid.Column="0" HorizontalAlignment="Center"
+                                <TextBlock Text="{Binding Thickness_Msg}" Grid.Column="0" HorizontalAlignment="Center"
                                            Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}" 
-                                           FontSize="{DynamicResource FontSize_GroupBoxHeader}"/>
-                        <TextBlock Text="{Binding Q1_Msg}" Grid.Column="1" HorizontalAlignment="Center"
+                                           Foreground="{StaticResource Omag_White}"
+                                           FontSize="{DynamicResource FontSize_GroupBoxHeaderWJ}"/>
+
+                                <Border Grid.Column="1" Margin="1,0,-1,-1"
+                                        Background="{StaticResource Omag_Blue}">
+                                    <TextBlock Text="{Binding Flux_Msg}" Grid.Column="1" HorizontalAlignment="Center"
+                                           Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}" 
+                                           Foreground="{StaticResource Omag_White}"
+                                           FontSize="{DynamicResource FontSize_GroupBoxHeaderWJ}"/>
+                                </Border>
+
+                                <TextBlock Text="{Binding Q1_Msg}" Grid.Column="2" HorizontalAlignment="Center"
                                            Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}"
-                                           FontSize="{DynamicResource FontSize_GroupBoxHeader}"/>
-                        <TextBlock Text="{Binding Q2_Msg}" Grid.Column="2" HorizontalAlignment="Center"
+                                           Foreground="{StaticResource Omag_White}"
+                                           FontSize="{DynamicResource FontSize_GroupBoxHeaderWJ}"/>
+                                <TextBlock Text="{Binding Q2_Msg}" Grid.Column="3" HorizontalAlignment="Center"
                                            Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}" 
-                                           FontSize="{DynamicResource FontSize_GroupBoxHeader}"/>
-                        <TextBlock Text="{Binding Q3_Msg}" Grid.Column="3" HorizontalAlignment="Center"
+                                           Foreground="{StaticResource Omag_White}"
+                                           FontSize="{DynamicResource FontSize_GroupBoxHeaderWJ}"/>
+                                <TextBlock Text="{Binding Q3_Msg}" Grid.Column="4" HorizontalAlignment="Center"
                                            Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}" 
-                                           FontSize="{DynamicResource FontSize_GroupBoxHeader}"/>
-                        <TextBlock Text="{Binding Q4_Msg}" Grid.Column="4" HorizontalAlignment="Center"
+                                           Foreground="{StaticResource Omag_White}"
+                                           FontSize="{DynamicResource FontSize_GroupBoxHeaderWJ}"/>
+                                <TextBlock Text="{Binding Q4_Msg}" Grid.Column="5" HorizontalAlignment="Center"
                                            Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}" 
-                                           FontSize="{DynamicResource FontSize_GroupBoxHeader}"/>
-                        <TextBlock Text="{Binding Q5_Msg}" Grid.Column="5" HorizontalAlignment="Center"
+                                           Foreground="{StaticResource Omag_White}"
+                                           FontSize="{DynamicResource FontSize_GroupBoxHeaderWJ}"/>
+                                <TextBlock Text="{Binding Q5_Msg}" Grid.Column="6" HorizontalAlignment="Center"
                                            Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}" 
-                                           FontSize="{DynamicResource FontSize_GroupBoxHeader}"/>
-                        <TextBlock Text="{Binding QExtra_Msg}" Grid.Column="6" HorizontalAlignment="Center"
+                                           Foreground="{StaticResource Omag_White}"
+                                           FontSize="{DynamicResource FontSize_GroupBoxHeaderWJ}"/>
+                                <TextBlock Text="{Binding QExtra_Msg}" Grid.Column="7" HorizontalAlignment="Center"
                                            Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}" 
-                                           FontSize="{DynamicResource FontSize_GroupBoxHeader}"/>
-                        <TextBlock Text="{Binding AngComp_Msg}" Grid.Column="7" HorizontalAlignment="Center"
+                                           Foreground="{StaticResource Omag_White}"
+                                           FontSize="{DynamicResource FontSize_GroupBoxHeaderWJ}"/>
+                                <TextBlock Text="{Binding AngComp_Msg}" Grid.Column="8" HorizontalAlignment="Center"
                                            Style="{StaticResource OmagCut_LowerCaseCharacterTextBlock}" 
-                                           FontSize="{DynamicResource FontSize_GroupBoxHeader}"/>
-                     </Grid>
+                                           Foreground="{StaticResource Omag_White}"
+                                           FontSize="{DynamicResource FontSize_GroupBoxHeaderWJ}"/>
+                            </Grid>
 
-                  </GroupBox.Header>
+                        </GroupBox.Header>
 
-                  <!--Definizione della Grid dei parametri delle lavorazioni-->
-                  <Grid Grid.Column="2">
-                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="308*"/>
-                        <ColumnDefinition Width="73*"/>
-                     </Grid.ColumnDefinitions>
-                     <Grid.RowDefinitions>
-                        <RowDefinition Height="7*"/>
-                        <RowDefinition Height="1*"/>
-                        <RowDefinition Height="1*"/>
-                     </Grid.RowDefinitions>
+                        <!--Definizione della Grid dei parametri delle lavorazioni-->
+                        <Grid Grid.Column="2">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="308*"/>
+                                <ColumnDefinition Width="73*"/>
+                            </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="7*"/>
+                                <RowDefinition Height="1*"/>
+                                <RowDefinition Height="1*"/>
+                            </Grid.RowDefinitions>
 
-                     <ListBox Name="ParamLstBx"
+                            <ListBox Name="ParamLstBx"
                                      ItemsSource="{Binding Path=SelectedItem.ParamList , ElementName=SubMaterialsLstBx}"
                                      SelectedItem="{Binding Path=SelectedItem.SelWjParam , ElementName=SubMaterialsLstBx}"
                                      Margin="0,0,0,0"
                                      Grid.RowSpan="2" Grid.ColumnSpan="2">
-                        <ListBox.ItemTemplate>
-                           <DataTemplate>
-                              <Grid Width="700">
-                                 <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="1*"/>
-                                    <ColumnDefinition Width="1*"/>
-                                    <ColumnDefinition Width="1*"/>
-                                    <ColumnDefinition Width="1*"/>
-                                    <ColumnDefinition Width="1*"/>
-                                    <ColumnDefinition Width="1*"/>
-                                    <ColumnDefinition Width="1*"/>
-                                    <ColumnDefinition Width="1*"/>
-                                 </Grid.ColumnDefinitions>
+                                <ListBox.ItemTemplate>
+                                    <DataTemplate>
+                                        <Grid Width="700">
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="1*"/>
+                                                <ColumnDefinition Width="1*"/>
+                                                <ColumnDefinition Width="1*"/>
+                                                <ColumnDefinition Width="1*"/>
+                                                <ColumnDefinition Width="1*"/>
+                                                <ColumnDefinition Width="1*"/>
+                                                <ColumnDefinition Width="1*"/>
+                                                <ColumnDefinition Width="1*"/>
+                                                <ColumnDefinition Width="1*"/>
+                                            </Grid.ColumnDefinitions>
 
-                                 <EgtWPFLib:EgtTextBox Text="{Binding Thickness}" Grid.Column="0"
+                                            <EgtWPFLib:EgtTextBox Text="{Binding Thickness}" Grid.Column="0"
                                                        Style="{DynamicResource OmagCut_CalculatorParamWjTextBox}" />
-                                 <EgtWPFLib:EgtTextBox Text="{Binding Q1}" Grid.Column="1"
+                                            <Border Grid.Column="1" Margin="0,-5,0,-5"
+                                                    Background="Transparent"
+                                                    BorderBrush="{StaticResource Omag_Blue}" BorderThickness="3, 4, 3, 4">
+                                                <EgtWPFLib:EgtTextBox Text="{Binding Flux}" Grid.Column="1"
+                                                                      Margin="-2,0,-2,0"
                                                        Style="{DynamicResource OmagCut_CalculatorParamWjTextBox}" />
-                                 <EgtWPFLib:EgtTextBox Text="{Binding Q2}" Grid.Column="2"
+                                            </Border>
+                                            <EgtWPFLib:EgtTextBox Text="{Binding Q1}" Grid.Column="2"
                                                        Style="{DynamicResource OmagCut_CalculatorParamWjTextBox}" />
-                                 <EgtWPFLib:EgtTextBox Text="{Binding Q3}" Grid.Column="3"
+                                            <EgtWPFLib:EgtTextBox Text="{Binding Q2}" Grid.Column="3"
                                                        Style="{DynamicResource OmagCut_CalculatorParamWjTextBox}" />
-                                 <EgtWPFLib:EgtTextBox Text="{Binding Q4}" Grid.Column="4"
+                                            <EgtWPFLib:EgtTextBox Text="{Binding Q3}" Grid.Column="4"
                                                        Style="{DynamicResource OmagCut_CalculatorParamWjTextBox}" />
-                                 <EgtWPFLib:EgtTextBox Text="{Binding Q5}" Grid.Column="5"
+                                            <EgtWPFLib:EgtTextBox Text="{Binding Q4}" Grid.Column="5"
                                                        Style="{DynamicResource OmagCut_CalculatorParamWjTextBox}" />
-                                 <EgtWPFLib:EgtTextBox Text="{Binding QExtra}" Grid.Column="6"
+                                            <EgtWPFLib:EgtTextBox Text="{Binding Q5}" Grid.Column="6"
                                                        Style="{DynamicResource OmagCut_CalculatorParamWjTextBox}" />
-                                 <EgtWPFLib:EgtTextBox Text="{Binding dAngComp}" Grid.Column="7" IsLength="False"
+                                            <EgtWPFLib:EgtTextBox Text="{Binding QExtra}" Grid.Column="7"
                                                        Style="{DynamicResource OmagCut_CalculatorParamWjTextBox}" />
-                              </Grid>
-                           </DataTemplate>
-                        </ListBox.ItemTemplate>
-                     </ListBox>
+                                            <EgtWPFLib:EgtTextBox Text="{Binding dAngComp}" Grid.Column="8" IsLength="False"
+                                                       Style="{DynamicResource OmagCut_CalculatorParamWjTextBox}" />
+                                        </Grid>
+                                    </DataTemplate>
+                                </ListBox.ItemTemplate>
+                            </ListBox>
 
-                     <UniformGrid Grid.Row="2" Columns="9" Grid.ColumnSpan="2">
-                        <Button Name="NewParamBtn" Grid.Column="0"
+                            <UniformGrid Grid.Row="2" Columns="9" Grid.ColumnSpan="2">
+                                <Button Name="NewParamBtn" Grid.Column="0"
                                         Command="{Binding NewWjParamCommand}"
                                         Content="{Binding New_Msg}"
                                         Style="{DynamicResource OmagCut_WjDbRightGrayGradientYellowTextButton}"/>
-                        <Button Name="RemoveParamBtn" Grid.Column="1"
+                                <Button Name="RemoveParamBtn" Grid.Column="1"
                                         Command="{Binding DeleteWjParamCommand}"
                                         Content="{Binding Delete_Msg}"
                                         Style="{DynamicResource OmagCut_WjDbRightGrayGradientYellowTextButton}"/>
-                     </UniformGrid>
+                            </UniformGrid>
 
-                  </Grid>
+                        </Grid>
 
-               </GroupBox>
+                    </GroupBox>
 
-            </Grid>
-         </Border>
-         <Button Name="SaveKitBtn" Grid.Row="2" Grid.Column="2"
+                </Grid>
+            </Border>
+            <Button Name="SaveKitBtn" Grid.Row="2" Grid.Column="2"
                     Command="{Binding SaveCommand}"
                     Content="{Binding Save_Msg}"
                     Style="{DynamicResource OmagCut_RightGrayGradientYellowTextButton}"/>
-      </Grid>
+        </Grid>
 
-   </Border>
+    </Border>
 
 </UserControl>

Machine/WaterJetPageVM.vb

@@ -405,7 +405,13 @@ Public Class WaterjetDbWindowVM
 
    Public ReadOnly Property Thickness_Msg As String
       Get
-         Return "Spessore"
+         Return "Spess."
+      End Get
+   End Property
+
+   Public ReadOnly Property Flux_Msg As String
+      Get
+         Return "mg/min"
       End Get
    End Property
 

My Project/AssemblyInfo.vb

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

OmagCUT.vbproj

@@ -174,6 +174,9 @@
     <Compile Include="AboutBox\AboutBoxWD.xaml.vb">
       <DependentUpon>AboutBoxWD.xaml</DependentUpon>
     </Compile>
+    <Compile Include="CadCuts\SelectTableWD.xaml.vb">
+      <DependentUpon>SelectTableWD.xaml</DependentUpon>
+    </Compile>
     <Compile Include="CadCuts\ChooseTestToolWD.xaml.vb">
       <DependentUpon>ChooseTestToolWD.xaml</DependentUpon>
     </Compile>
@@ -453,6 +456,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="CadCuts\SelectTableWD.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="CadCuts\ChooseTestToolWD.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

OmagCUTDarkDictionary.xaml

@@ -717,10 +717,10 @@
       <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
    </Style>
 
-   <Style x:Key="OmagCut_WindowBorder" TargetType="{x:Type Border}" BasedOn="{StaticResource OmagCut_EmptyBorder}">
-      <Setter Property="CornerRadius" Value="{StaticResource Page_CornerRadius}"/>
-      <Setter Property="BorderBrush" Value="{StaticResource OmagCut_DarkGray}"/>
-      <Setter Property="Background" Value="LightGray"/>
-   </Style>
+    <Style x:Key="OmagCut_WindowBorder" TargetType="{x:Type Border}" BasedOn="{StaticResource OmagCut_EmptyBorder}">
+        <Setter Property="CornerRadius" Value="{StaticResource Page_CornerRadius}"/>
+        <Setter Property="BorderBrush" Value="{StaticResource OmagCut_DarkGray}"/>
+        <Setter Property="Background" Value="LightGray"/>
+    </Style>
 
 </ResourceDictionary>

OmagCUTDictionary.xaml

@@ -81,6 +81,7 @@
    <system:Double x:Key="FontSize_LowerBarOverride">18.6</system:Double>   <!--14pt-->
    <system:Double x:Key="FontSize_UnitOfMeasure">13.3</system:Double>      <!--10pt-->
    <system:Double x:Key="FontSize_GroupBoxHeader">22</system:Double>
+   <system:Double x:Key="FontSize_GroupBoxHeaderWJ">18</system:Double>
    <system:Double x:Key="ComboBox_Height">40</system:Double>
    <system:Double x:Key="ComboBoxTextBlock_Height">40</system:Double>
    <system:Double x:Key="ArrowImage_Height">65</system:Double>
@@ -1262,7 +1263,7 @@
    </Style>
 
     <Style x:Key="OmagCut_CalculatorParamWjTextBox" TargetType="{x:Type EgtWPFLib:EgtTextBox}" BasedOn="{StaticResource OmagCut_TextBox}">
-        <Setter Property="Width" Value="80"/>
+        <Setter Property="Width" Value="70"/>
         <Setter Property="Keyboard" Value="Calculator"/>
         <Setter Property="KeyboardDimension" Value="300"/>
         <Setter Property="IsHitTestVisible" Value="False" />

Project/AddToDataBaseUC.xaml.vb

@@ -91,7 +91,7 @@ Public Class AddToDataBaseUC
          WritePrivateProfileString(S_SCRAPS, K_LASTBLOCK, EgtPHOTOLib.PhotoMap.refOptionPanelVM.SelSlab.sNameBlock, m_OmagPhotoWD.m_MainWindow.GetIniFile())
       End If
       ' aggiorno il testo del messaggio "Add" → "Save"
-      AddBtn.Content = "Save"
+      AddBtn.Content = EgtMsg(91252)      ' Save
 
       ' notifico che da ora la lastra inserita è in modalità di modifica (non salvo la lastra come nuova, ma la sovrascrivo come in modifica)
       EgtPHOTOLib.PhotoMap.refProjectVM.SetSelProjectMode(ProjectSlabVM.ProjectModeOpt.DETAIL)

Project/OmagPhotoWD.xaml.vb

@@ -145,7 +145,7 @@ Public Class OmagPhotoWD
          m_AddToDataBaseUC.ThicknessTxBx.Text = EgtPHOTOLib.PhotoMap.refOptionPanelVM.SelSlab.Thickness
          m_AddToDataBaseUC.ProjectTxBx.Text = EgtPHOTOLib.PhotoMap.refOptionPanelVM.SelSlab.ProjectAssignedTo
          ' aggiorno il testo del messaggio "Add" → "Save"
-         m_AddToDataBaseUC.AddBtn.Content = "Save"
+         m_AddToDataBaseUC.AddBtn.Content = EgtMsg(91252)      ' Save
          Return
       End If
       ' inizializzo i campi

Project/ProjectMgrUC.xaml.vb

@@ -35,7 +35,7 @@ Public Class ProjectMgrUC
          WorkBtn.ToolTip = EgtMsg(MSG_CADCUTPAGEUC + 2)        'Work - Lavora
       End If
       TestBtn.ToolTip = EgtMsg(90255)                          'Test
-      ResetCutBtn.ToolTip = "Reset Cuts" & vbCrLf & "Other Reset (Shift)"
+      ResetCutBtn.ToolTip = EgtMsg(91241) & vbCrLf & EgtMsg(91242)     ' Reset Cuts - Other Reset (Shift)
    End Sub
 
    Private Sub ProjectMgrUC_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
@@ -113,25 +113,6 @@ Public Class ProjectMgrUC
       m_MainWindow.m_CadCutPageUC.m_NestPage.ReloadListParkInd()
       Dim sNewFileName As String = SelParkIndWD.GetPathCurrProj()
       SelParkIndWD.CopyImgSvg(sNewFileName)
-      'Dim Extension As String = ".svg"
-      'If Not MainWindow.m_bShowSVGParkInd Then Extension = ".png"
-      'For Each ItemParkInd As ParkInd In ListParkInd
-      '   If ItemParkInd.Ind <> 0 And ItemParkInd.Ind <> 999 And ItemParkInd.nPartInPark > 0 Then
-      '      Try
-      '         Dim sNewFile As String = sNewFileName & ItemParkInd.Ind.ToString & Extension
-      '         If MainWindow.m_bShowSVGParkInd Then
-      '            WriteMyXML(sNewFile, ItemParkInd.LocalMyCanvas)
-      '         Else
-      '            If File.Exists(sNewFile) Then
-      '               File.Delete(sNewFile)
-      '            End If
-      '            File.Copy(If(Extension = ".svg", ItemParkInd.Svg, ItemParkInd.Img), sNewFile)
-      '         End If
-      '      Catch ex As Exception
-      '         EgtOutLog("Copia immagine " & If(Extension = ".svg", ItemParkInd.Svg, ItemParkInd.Img) & " di ParkInd non roiscita")
-      '      End Try
-      '   End If
-      'Next
       m_MainWindow.m_CadCutPageUC.m_NestPage.ReloadListParkInd()
 
 
@@ -142,26 +123,11 @@ Public Class ProjectMgrUC
    Friend Function ChooseTable() As Integer
       Dim nTabInd As Integer = 0
       Select Case GetTableCount()
-         Case 3
-            ' Tavolo da usare ?
-            Dim TableToUse As New EgtMsgBox(m_MainWindow, "", EgtMsg(91111), EgtMsgBox.Buttons.ONE_TWO_THREE, EgtMsgBox.Icons.NULL)
-            Select Case TableToUse.m_nPressedBtn
-               Case 1    ' 1
-                  nTabInd = 1
-               Case 2    ' 2
-                  nTabInd = 2
-               Case 0    ' 3
-                  nTabInd = 3
-            End Select
-         Case 2
-            ' Tavolo da usare ?
-            Dim TableToUse As New EgtMsgBox(m_MainWindow, "", EgtMsg(91111), EgtMsgBox.Buttons.ONE_TWO, EgtMsgBox.Icons.NULL)
-            Select Case TableToUse.m_nPressedBtn
-               Case 1    ' 1
-                  nTabInd = 1
-               Case 0    ' 2
-                  nTabInd = 2
-            End Select
+         Case 4, 3, 2
+            Dim SelTabWD As New SelectTableWD(m_MainWindow)
+            SelTabWD.ShowDialog()
+            nTabInd = SelTabWD.nSelectedTable
+            SelTabWD.Close()
          Case Else
             nTabInd = 1
       End Select
@@ -174,13 +140,18 @@ Public Class ProjectMgrUC
       If GetPrivateProfileInt(S_TABLE, K_CHANGETABWD, 0, m_MainWindow.GetMachIniFile()) = 0 Then
          Return nRes
       End If
-      Select Case GetTableCount()
-         Case 2
-            ' Vuoi cambiare tavola?
-            Dim TableToUse As New EgtMsgBox(m_MainWindow, "", String.Format(EgtMsg(90968)), EgtMsgBox.Buttons.OK_CANCEL, EgtMsgBox.Icons.NULL)
-            nRes = TableToUse.m_nPressedBtn
+      Dim nCountTable As Integer = GetTableCount()
+      Select Case nCountTable
+         Case 4, 2
+            ' visualizzo l'elenco dei bottoni associati alle tavole disponibili
+            Dim SelTabWD As New SelectTableWD(m_MainWindow)
+            SelTabWD.ShowDialog()
+            If SelTabWD.DialogResult Then
+               nRes = SelTabWD.nSelectedTable
+            End If
+            SelTabWD.Close()
          Case Else
-            ' negli altri casi (3 tavole o una tavola non fare nulla)
+            ' non fare nulla
       End Select
       Return nRes
    End Function
@@ -1058,7 +1029,7 @@ Public Class ProjectMgrUC
             End If
          Next
       Next
-      m_MainWindow.m_CurrentProjectPageUC.SetInfoMessage("Lavorazione aggiornate: " & nMachUpdated & "/ " & nMach)
+      m_MainWindow.m_CurrentProjectPageUC.SetInfoMessage(EgtMsg(91243) & nMachUpdated & "/ " & nMach)      ' Lavorazione aggiornate: 
    End Sub
 
    ' ------------------------------------------------ GENERA COMANDI CNC MOVIMENTO ------------------------------------------------

Project/SceneButtonsUC.xaml.vb

@@ -6,7 +6,7 @@ Public Class SceneButtonsUC
    Dim m_MainWindow As MainWindow = DirectCast(Application.Current.MainWindow, MainWindow)
 
    Private Sub Init() Handles Me.Initialized
-      TopViewBtn.ToolTip = "Top View" & vbCrLf & "Select View (Shift)"
+      TopViewBtn.ToolTip = EgtMsg(91244) & vbCrLf & EgtMsg(91245)    ' Top View - Select View (Shift)
    End Sub
 
    Private Sub MeasureBtn_Checked(sender As Object, e As RoutedEventArgs) Handles MeasureBtn.Checked

Project/ScrapsWD.xaml.vb

@@ -17,7 +17,7 @@ Public Class ScrapsWD
       m_MainWindow.m_CurrentProjectPageUC.ClearMessage()
 
       ' inserisco il titolo della pagina aperta
-      TitleTxBl.Content = "Scraps List"
+      TitleTxBl.Content = EgtMsg(91246)        ' Scraps List
       ScrapsListBox.ItemsSource = m_ScrapList
       ' definzione posizione finetra
       Me.Left = 25
@@ -137,7 +137,7 @@ Public Class ScrapsWD
          MyOmagPhotoWD.ShowDialog()
       Else
          m_MainWindow.m_CurrentProjectPageUC.ClearMessage()
-         m_MainWindow.m_CurrentProjectPageUC.SetErrorMessage("Error loading contour scrap")
+         m_MainWindow.m_CurrentProjectPageUC.SetErrorMessage(EgtMsg(91247))     ' Error loading contour scrap
       End If
 
       ' ripristino il contesto corrente dell'immagine

RawPhoto/ChooseMachining.xaml.vb

@@ -505,6 +505,8 @@ Public Class ChooseMachining
       ' nascondo tutte le CmBx e TxBl
       CurrSawingTiltedTxBl.Visibility = Windows.Visibility.Hidden
       CurrSawingTiltedCmBx.Visibility = Windows.Visibility.Hidden
+      ApplySawingTiltedChBx.Visibility = Windows.Visibility.Hidden
+      CurrSawingTiltedTxBl.Visibility = Windows.Visibility.Hidden
       CurrDrillingTxBl.Visibility = Windows.Visibility.Hidden
       CurrDrillingCmBx.Visibility = Windows.Visibility.Hidden
       CurrMillingTxBl.Visibility = Windows.Visibility.Hidden
@@ -539,6 +541,8 @@ Public Class ChooseMachining
          End If
          CurrSawingTiltedTxBl.Visibility = Windows.Visibility.Visible
          CurrSawingTiltedCmBx.Visibility = Windows.Visibility.Visible
+         ApplySawingTiltedChBx.Visibility = Windows.Visibility.Visible
+         CurrSawingTiltedTxBl.Visibility = Windows.Visibility.Visible
       End If
 
       ' -- FORATURA -- se foretto presente

RawPhoto/OtherRefTabWD.xaml.vb

@@ -40,10 +40,10 @@ Public Class OtherRefTabWD
       ' posiziono la finestra
       Me.Top = Owner.Top + Owner.Height / 4 - Me.Height / 2
       Me.Left = Owner.Left + Owner.Width / 6 - Me.Width / 2
-      RefRawTxbl.Text = "Raw reference"
-      RefTabXTxbl.Text = "Position X"
-      RefTabYTxbl.Text = "Position Y"
-      SelRefTxbl.Text = "Sel reference"
+      RefRawTxbl.Text = EgtMsg(91248)     ' Raw reference
+      RefTabXTxbl.Text = EgtMsg(91249)    ' Position X
+      RefTabYTxbl.Text = EgtMsg(91250)    ' Position Y
+      SelRefTxbl.Text = EgtMsg(91251)     ' Sel reference
       RefTabOrientationCmBx.ItemsSource = m_RawPartPage.m_OtherRefTabOrientationList
       RefTabOrientationCmBx.SelectedIndex = m_RawPartPage.m_OtherRefTabPos
       RefTabCmBx.ItemsSource = m_RawPartPage.m_OtherRefTabList

RawPhoto/RawPartPageUC.xaml.vb

@@ -162,18 +162,18 @@ Public Class RawPartPageUC
       KerfTxBx.Tag = KerfTxBl
 
       ' Creo lista modalità di definizione del grezzo
-      m_RawModeList(0) = EgtMsg(MSG_RAWPARTPAGEUC + 1)           'Rettangolo
-      m_RawModeList(1) = EgtMsg(MSG_RAWPARTPAGEUC + 2)           'Per Punti
-      m_RawModeList(2) = EgtMsg(MSG_RAWPARTPAGEUC + 30)          'Da Laser
+      m_RawModeList(0) = EgtMsg(MSG_RAWPARTPAGEUC + 1)              'Rettangolo
+      m_RawModeList(1) = EgtMsg(MSG_RAWPARTPAGEUC + 2)              'Per Punti
+      m_RawModeList(2) = EgtMsg(MSG_RAWPARTPAGEUC + 30)             'Da Laser
       If m_MainWindow.m_CurrentMachine.bSaw Then
          m_RawModeList(3) = EgtMsg(MSG_DIRECTCUTPAGEUC + 24)        'Da Lama
       Else
          ' se non insrisco "Lama" allora ridimensiono il vettore
          ReDim Preserve m_RawModeList(2)
       End If
-      m_RawModeListEx(0) = EgtMsg(MSG_RAWPARTPAGEUC + 1)         'Rettangolo
-      m_RawModeListEx(1) = EgtMsg(MSG_RAWPARTPAGEUC + 2)         'Per Punti
-      m_RawModeListEx(2) = EgtMsg(MSG_RAWPARTPAGEUC + 30)        'Da Laser
+      m_RawModeListEx(0) = EgtMsg(MSG_RAWPARTPAGEUC + 1)            'Rettangolo
+      m_RawModeListEx(1) = EgtMsg(MSG_RAWPARTPAGEUC + 2)            'Per Punti
+      m_RawModeListEx(2) = EgtMsg(MSG_RAWPARTPAGEUC + 30)           'Da Laser
       If m_MainWindow.m_CurrentMachine.bSaw Then
          m_RawModeListEx(3) = EgtMsg(MSG_DIRECTCUTPAGEUC + 24)      'Da Lama
          m_RawModeListEx(4) = EgtMsg(MSG_RAWPARTPAGEUC + 35)        'Da Fotografia
@@ -185,14 +185,14 @@ Public Class RawPartPageUC
       RawModeCmBx.ItemsSource = m_RawModeList
 
       ' Creo la lista dei riferimenti tavola 
-      m_OtherRefTabOrientationList(OTHERREFMODE.BL) = "Bottom left"
-      m_OtherRefTabOrientationList(OTHERREFMODE.BR) = "Bottom right"
-      m_OtherRefTabOrientationList(OTHERREFMODE.TR) = "Top right"
-      m_OtherRefTabOrientationList(OTHERREFMODE.TL) = "Top left"
+      m_OtherRefTabOrientationList(OTHERREFMODE.BL) = EgtMsg(91221) 'Bottom left
+      m_OtherRefTabOrientationList(OTHERREFMODE.BR) = EgtMsg(91222) 'Bottom right
+      m_OtherRefTabOrientationList(OTHERREFMODE.TR) = EgtMsg(91223) 'Top right
+      m_OtherRefTabOrientationList(OTHERREFMODE.TL) = EgtMsg(91224) 'Top left
 
       ' lista per selezione RawModeDamaged
-      m_RawModeDamagedList(0) = EgtMsg(MSG_RAWPARTPAGEUC + 2)    'Per Punti
-      m_RawModeDamagedList(1) = EgtMsg(MSG_RAWPARTPAGEUC + 30)   'Da Laser
+      m_RawModeDamagedList(0) = EgtMsg(MSG_RAWPARTPAGEUC + 2)       'Per Punti
+      m_RawModeDamagedList(1) = EgtMsg(MSG_RAWPARTPAGEUC + 30)      'Da Laser
       If m_MainWindow.m_CurrentMachine.bSaw Then
          m_RawModeDamagedList(2) = EgtMsg(MSG_DIRECTCUTPAGEUC + 24) 'Da Lama
       Else
@@ -228,10 +228,10 @@ Public Class RawPartPageUC
       AddBtn.Content = EgtMsg(MSG_RAWPARTPAGEUC + 14)           'Add - Aggiungi
       RemoveBtn.Content = EgtMsg(MSG_RAWPARTPAGEUC + 15)        'Remove - Rimuovi
       CloseBtn.Content = EgtMsg(MSG_RAWPARTPAGEUC + 31)         'Close - Chiudi
-      RectangleBtn.Content = "Rectangle"
+      RectangleBtn.Content = EgtMsg(90501)                      'Rectangle
       ConfirmPhotoBtn.Content = EgtMsg(MSG_RAWPARTPAGEUC + 24)  'Conferma
 
-      OtherRefTabTxBl.Text = "New Ref On Tab"
+      OtherRefTabTxBl.Text = EgtMsg(91225)                      'New Ref On Tab
 
    End Sub
 
@@ -1982,7 +1982,7 @@ Public Class RawPartPageUC
          m_CurrProjPage.ClearMessage()
       Else
          OkBtn.IsEnabled = False
-         m_CurrProjPage.SetErrorMessage("Errore nella posizione o dimensione del grezzo")
+         m_CurrProjPage.SetErrorMessage(EgtMsg(91226))     ' Errore nella posizione o dimensione del grezzo
       End If
    End Sub
 

Simulation/SimulationPageUC.xaml.vb

@@ -90,6 +90,12 @@ Public Class SimulationPageUC
       EgtOutLog(" -- PREPARE SIMUL --")
       m_CurrProjPage = m_MainWindow.m_CurrentProjectPageUC
       Dim bOk As Boolean = True
+      ' Visualizzo opportunamente la macchina
+      m_nMachLook = MCH_LOOK.ALL
+      EgtSetMachineLook(m_nMachLook)
+      ' Imposto vista 3d isometrica di tutto
+      EgtSetView(VT.ISO_SE, False)
+      EgtZoom(ZM.ALL)
       ' Elimino eventuale attrezzaggio da OmagOFFICE
       EgtEraseCurrSetup()
       ' Verifico l'attrezzaggio degli utensili utilizzati
@@ -180,12 +186,6 @@ Public Class SimulationPageUC
       ShowAllCurrPhaseMachinings()
       ' Costringo ad aggiornare UI
       UpdateUI()
-      ' Visualizzo opportunamente la macchina
-      m_nMachLook = MCH_LOOK.ALL
-      EgtSetMachineLook(m_nMachLook)
-      ' Imposto vista 3d isometrica di tutto
-      EgtSetView(VT.ISO_SE, False)
-      EgtZoom(ZM.ALL)
       ' Registro funzione su aggiornamento interfaccia da sotto
       EgtSetProcessEvents(m_ProcEventsCallback)
       EgtSetOutText(m_OutTextCallback)
@@ -214,6 +214,7 @@ Public Class SimulationPageUC
       If m_nIdMinRedX <> GDB_ID.NULL Then EgtSetStatus(m_nIdMinRedX, GDB_ST.OFF)
       Dim m_nIdMinRedY = EgtGetFirstNameInGroup(nIdBase, "MinRedY")
       If m_nIdMinRedY <> GDB_ID.NULL Then EgtSetStatus(m_nIdMinRedY, GDB_ST.OFF)
+      EgtOutLog(" -- END PREPARE SIMUL --")
    End Sub
 
    Private Sub StepBtn_Click(sender As Object, e As RoutedEventArgs) Handles StepBtn.Click
@@ -622,7 +623,7 @@ Public Class SimulationPageUC
       ' Ripristino come fase corrente quella iniziale
       EgtSetCurrPhase(1)
       If bOk Then
-         m_CurrProjPage.SetInfoMessage("Genarato file " & sFileName & m_MainWindow.m_CurrentMachine.sIsoFileExt)
+         m_CurrProjPage.SetInfoMessage(EgtMsg(90571) & sFileName & m_MainWindow.m_CurrentMachine.sIsoFileExt)    ' Genarato file 
       Else
          m_CurrProjPage.SetErrorMessage(EgtMsg(90314))       'Errore nella generazione del programma CN
       End If