Merge branch 'develop'

Machine/MachineStatusUC.xaml.vb

@@ -248,16 +248,16 @@ Public Class MachineStatusUC
          dL3 = ptTip.z
       End If
       ' Visualizzazione
-      Axis1TxBx.Text = LenToString(dL1, -3)
-      Axis2TxBx.Text = LenToString(dL2, -3)
-      Axis3TxBx.Text = LenToString(dL3, -3)
+      Axis1TxBx.Text = LenToString(dL1, -3, True)
+      Axis2TxBx.Text = LenToString(dL2, -3, True)
+      Axis3TxBx.Text = LenToString(dL3, -3, True)
       Axis4TxBx.Text = DoubleToString(dR1, -3)
       Axis5TxBx.Text = DoubleToString(dR2, -3)
       If m_AxesNumber >= 6 Then Axis6TxBx.Text = DoubleToString(dA6, -3)
-      If m_AxesNumber >= 7 Then Axis7TxBx.Text = LenToString(dA7, -3)
-      If m_AxesNumber >= 8 Then Axis8TxBx.Text = LenToString(dA8, -3)
-      If m_AxesNumber >= 9 Then Axis9TxBx.Text = LenToString(dA9, -3)
-      If m_AxesNumber >= 10 Then Axis10TxBx.Text = LenToString(dA10, -3)
+      If m_AxesNumber >= 7 Then Axis7TxBx.Text = LenToString(dA7, -3, True)
+      If m_AxesNumber >= 8 Then Axis8TxBx.Text = LenToString(dA8, -3, True)
+      If m_AxesNumber >= 9 Then Axis9TxBx.Text = LenToString(dA9, -3, True)
+      If m_AxesNumber >= 10 Then Axis10TxBx.Text = LenToString(dA10, -3, True)
    End Sub
 
    Sub DisplayPositionDelta()
@@ -265,22 +265,22 @@ Public Class MachineStatusUC
       Dim dL1, dL2, dL3, dR1, dR2, dA6, dA7, dA8, dA9, dA10 As Double
       m_MainWindow.m_CNCommunication.GetAxesDeltas(dL1, dL2, dL3, dR1, dR2, dA6, dA7, dA8, dA9, dA10)
       ' Visualizzazione
-      DeltaAxis1TxBx.Text = LenToString(dL1, -3)
-      DeltaAxis2TxBx.Text = LenToString(dL2, -3)
-      DeltaAxis3TxBx.Text = LenToString(dL3, -3)
+      DeltaAxis1TxBx.Text = LenToString(dL1, -3, True)
+      DeltaAxis2TxBx.Text = LenToString(dL2, -3, True)
+      DeltaAxis3TxBx.Text = LenToString(dL3, -3, True)
       DeltaAxis4TxBx.Text = DoubleToString(dR1, -3)
       DeltaAxis5TxBx.Text = DoubleToString(dR2, -3)
       If m_AxesNumber >= 6 Then DeltaAxis6TxBx.Text = DoubleToString(dA6, -3)
-      If m_AxesNumber >= 7 Then DeltaAxis7TxBx.Text = LenToString(dA7, -3)
-      If m_AxesNumber >= 8 Then DeltaAxis8TxBx.Text = LenToString(dA8, -3)
-      If m_AxesNumber >= 9 Then DeltaAxis9TxBx.Text = LenToString(dA9, -3)
-      If m_AxesNumber >= 10 Then DeltaAxis10TxBx.Text = LenToString(dA10, -3)
+      If m_AxesNumber >= 7 Then DeltaAxis7TxBx.Text = LenToString(dA7, -3, True)
+      If m_AxesNumber >= 8 Then DeltaAxis8TxBx.Text = LenToString(dA8, -3, True)
+      If m_AxesNumber >= 9 Then DeltaAxis9TxBx.Text = LenToString(dA9, -3, True)
+      If m_AxesNumber >= 10 Then DeltaAxis10TxBx.Text = LenToString(dA10, -3, True)
    End Sub
 
    Sub DisplayFeed()
       Dim dRealFeed As Double = m_CN.d_DInterpo_Prog_Feed * m_CN.d_DInterpo_Feed_override / 100
       'Feed = DoubleToString(dRealFeed, 0)
-      FeedTxBx.Text = LenToString(dRealFeed, 0)
+      FeedTxBx.Text = LenToString(dRealFeed, 0, True)
       'FeedOverride = DoubleToString(m_CN.d_DInterpo_Feed_override, 0) & "%"
       Dim dFeedOverride As Double = m_CN.d_DInterpo_Feed_override
       FeedOverrideTxBx.Text = DoubleToString(dFeedOverride, 0) & "%"

MainWindow.xaml.vb

@@ -328,8 +328,8 @@ Class MainWindow
       ' Verifico abilitazione nesting automatico
       m_bAutoNest = Not String.IsNullOrWhiteSpace(sNestKey)
       ' Recupero opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2502, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(9423, 2502, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(9423, 2503, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(9423, 2503, 1, m_nKeyOptions)
       ' Verifico abilitazione prodotto
       Dim bProd As Boolean = GetKeyOption(KEY_OPT.CUT_BASE)
       ' Inizializzazione generale di EgtInterface

My Project/AssemblyInfo.vb

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

Utility/Utility.vb

@@ -205,10 +205,10 @@ Module Utility
    End Function
 
    ' conerte il dato (in mm) in stringa nell'unità corrente
-   Friend Function LenToString(dVal As Double, nNumDec As Integer) As String
+   Friend Function LenToString(dVal As Double, nNumDec As Integer, Optional ByVal bForceToDecimal As Boolean = False) As String
       Dim sVal As String = DoubleToString(EgtToUiUnits(dVal), nNumDec)
       ' se richiesta scrittura in frazione (solo se unità corrente INCHES)
-      If nCurrFractionPattern <> FractionPattern.None And Not EgtUiUnitsAreMM() Then
+      If (nCurrFractionPattern <> FractionPattern.None And Not EgtUiUnitsAreMM()) And Not bForceToDecimal Then
          ' conevrto il dato corrente in decimale
          Dim dCurrVal As Double = dVal
          StringToDouble(sVal, dCurrVal)
@@ -217,10 +217,10 @@ Module Utility
       Return sVal
    End Function
 
-   Friend Function StringToLen(sVal As String, ByRef dVal As Double) As Boolean
+   Friend Function StringToLen(sVal As String, ByRef dVal As Double, Optional ByVal bForceToDecimal As Boolean = False) As Boolean
       If String.IsNullOrEmpty(sVal) Then Return False
 
-      If nCurrFractionPattern <> FractionPattern.None And Not EgtUiUnitsAreMM() Then
+      If (nCurrFractionPattern <> FractionPattern.None And Not EgtUiUnitsAreMM()) And Not bForceToDecimal Then
          Dim sValSource As String = sVal
          ' conevrto la stringa in formato decimale (sempre in stringa)
          StringFractionToStringDecimal(sValSource, sVal)