- Aggiornata versione a 2.4f1

- Allungato tempo attesa risposta modifica stato macchina su num flexium
- Aggiunta verifica diametro utensile su tastatura tagli inclinati

DrawImport/AlzFrontUC.xaml.vb

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

Machine/CurrentMachine.vb

@@ -752,7 +752,6 @@ Public Class CurrentMachine
          End Select
       End Get
       Set(value As Double)
-         Dim dValue As Double = 0
          Select Case GetCurrentTable()
             Case 3
                If Math.Abs(value - m_dTab3AdditionalTable) > EPS_SMALL And
@@ -761,24 +760,14 @@ Public Class CurrentMachine
                   m_dTab3AdditionalTable = value
                   ' Aggiorno il progetto corrente
                   m_MainWindow.m_CurrentProjectPageUC.AdjustAdditionalTable()
-                  ' salvo il valore della sovratavola nel progetto
-                  EgtGetInfo(EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_PROJMARK), K_TAB3_ADDITIONALTABLE, dValue)
-                  If Math.Abs(dValue - value) > EPS_SMALL Then
-                     EgtSetInfo(EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_PROJMARK), K_TAB3_ADDITIONALTABLE, value)
-                  End If
                End If
-                  Case 2
+            Case 2
                If Math.Abs(value - m_dTab2AdditionalTable) > EPS_SMALL And
                WritePrivateProfileString(S_TABLE, K_TAB2_ADDITIONALTABLE, DoubleToString(value, 3), sMachIniFile) Then
                   ' Aggiorno il valore corrente
                   m_dTab2AdditionalTable = value
                   ' Aggiorno il progetto corrente
                   m_MainWindow.m_CurrentProjectPageUC.AdjustAdditionalTable()
-                  ' salvo il valore della sovratavola nel progetto
-                  EgtGetInfo(EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_PROJMARK), K_TAB2_ADDITIONALTABLE, dValue)
-                  If Math.Abs(dValue - value) > EPS_SMALL Then
-                     EgtSetInfo(EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_PROJMARK), K_TAB2_ADDITIONALTABLE, value)
-                  End If
                End If
             Case Else
                If Math.Abs(value - m_dAdditionalTable) > EPS_SMALL And
@@ -787,11 +776,6 @@ Public Class CurrentMachine
                   m_dAdditionalTable = value
                   ' Aggiorno il progetto corrente
                   m_MainWindow.m_CurrentProjectPageUC.AdjustAdditionalTable()
-                  ' salvo il valore della sovratavola nel progetto
-                  EgtGetInfo(EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_PROJMARK), K_ADDITIONALTABLE, dValue)
-                  If Math.Abs(dValue - value) > EPS_SMALL Then
-                     EgtSetInfo(EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_PROJMARK), K_ADDITIONALTABLE, value)
-                  End If
                End If
          End Select
       End Set

Machine/StatisticsPageUC.xaml.vb

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

MainWindow.xaml.vb

@@ -323,8 +323,8 @@ Class MainWindow
       ' Verifico abilitazione nesting automatico
       m_bAutoNest = Not String.IsNullOrWhiteSpace(sNestKey)
       ' Recupero opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2405, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(9423, 2405, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2406, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(9423, 2406, 1, m_nKeyOptions)
       ' Verifico abilitazione prodotto
       Dim bProd As Boolean = GetKeyOption(KEY_OPT.CUT_BASE)
       ' Inizializzazione generale di EgtInterface
@@ -1825,7 +1825,9 @@ Class MainWindow
          m_CurrentProjectPageUC.SetInfoMessage(EgtMsg(90327))        'Inseriti Nuovi Pezzi Rovinati
          Dim nPartId As Integer = EgtGetLastPart()
          For nI As Integer = 1 To nRuPartsCnt
-            EgtRemoveInfo( nPartId, INFO_PARTOK)
+            EgtRemoveInfo(nPartId, INFO_PARTOK)
+            ' ricreo la lista delle famiglie di pezzi presenti in parcheggio
+            m_CadCutPageUC.m_NestPage.GetFamilyGroupInPark()
             m_CadCutPageUC.m_NestPage.StoreOnePart(nPartId, True)
             nPartId = EgtGetPrevPart(nPartId)
          Next

My Project/AssemblyInfo.vb

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

NcComm/M_Num.vb

@@ -92,7 +92,7 @@ Namespace Num
       Private Const TIMEOUT As Short = 99
       Private Const SHORTSLEEPTIME As Short = 10
       Private Const LONGSLEEPTIME As Short = 40
-      Private Const SHORTSLEEPCOUNT As Short = 20
+      Private Const SHORTSLEEPCOUNT As Short = 100
       Private Const LONGSLEEPCOUNT As Short = 200
 
 #End Region

Project/CurrentProjectPageUC.xaml.vb

@@ -508,20 +508,6 @@ Public Class CurrentProjectPageUC
       UpdateHeightTxBx()
       ' aggiorno materiale
       m_MainWindow.m_CurrentMachine.SetCurrMatByName(GetProjectMaterial())
-      ' aggiorno altezza sovaratavola
-      If GetPrivateProfileInt(S_GENERAL, "AdditionalTableByProj", 0, m_sIniFile) = 1 Then
-         ' leggo il valore OrigiAdditionalTable
-         Dim dValue As Double = m_MainWindow.m_CurrentMachine.dAdditionalTable
-         Select Case GetCurrentTable()
-            Case 3
-               EgtGetInfo(EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_PROJMARK), K_TAB3_ADDITIONALTABLE, dValue)
-            Case 2
-               EgtGetInfo(EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_PROJMARK), K_TAB2_ADDITIONALTABLE, dValue)
-            Case Else
-               EgtGetInfo(EgtGetFirstNameInGroup(GDB_ID.ROOT, NAME_PROJMARK), K_ADDITIONALTABLE, dValue)
-         End Select
-         m_MainWindow.m_CurrentMachine.dAdditionalTable = dValue
-      End If
       ' forzo visualizzazione eventuali dati su aree
       SetAreasStatus( True)
       ' Dichiaro progetto non modificato
@@ -870,7 +856,7 @@ Public Class CurrentProjectPageUC
 
    Friend Function UpdateSideAngCutProbeFlag() As Boolean
       Dim bCurrSacProbe As Boolean =
-             (GetPrivateProfileInt(S_MACH_NEST, K_MACH_SACPROBE, 0, m_MainWindow.GetMachIniFile()) <> 0)
+             (GetPrivateProfileInt(S_MACH_NEST, K_MACH_SACPROBE, 0, m_MainWindow.GetMachIniFile()) <> 0) AndAlso m_MainWindow.m_CurrentMachine.IsRawProbingPossible()
       Dim bProjSacProbe As Boolean = GetSideAngCutProbeFlag()
       If bCurrSacProbe <> bProjSacProbe Then Return SetSideAngCutProbeFlag(bCurrSacProbe)
       Return True

Project/ProjectMgrUC.xaml.vb

@@ -753,7 +753,7 @@ Public Class ProjectMgrUC
       Else
          m_MainWindow.m_CadCutPageUC.m_NestPage.m_bSelectCurv = False
          EgtDeselectObj(m_MainWindow.m_CadCutPageUC.m_NestPage.m_CurrSelectedCurv)
-         EgtDeselectObj(m_MainWindow.m_CadCutPageUC.m_NestPage.m_CurrSelectedSawCurv)
+         EgtResetMark(m_MainWindow.m_CadCutPageUC.m_NestPage.m_CurrSelectedSawCurv)
       End If
       ' aggiorno il disegno
       EgtDraw()