Correzione gestione Inch decimali e cambio versione

This commit is contained in:
Nicola Pievani
2023-10-10 18:54:46 +02:00
parent 25f5365241
commit 0e4609ba9e
2 changed files with 4 additions and 4 deletions
+2 -2
View File
@@ -223,7 +223,7 @@ Public Class EgtCalculator
' La calcolatrice in pollici deve essere abilitata solo se programma NON in MM e IsLength = True
m_IsLength = m_IsLength And Not EgtUiUnitsAreMM()
If m_IsLength Then
If m_IsLength AndAlso nCurrFractionPattern <> FractionPattern.None Then
DotBtn.Visibility = Visibility.Collapsed
BackspaceBtn.Visibility = Visibility.Collapsed
FeetBtn.Visibility = Visibility.Visible
@@ -362,7 +362,7 @@ Public Class EgtCalculator
Dim bOk As Boolean = False
' se impostato per dati in frazioni
Dim sDecimal As String = String.Empty
If StringFractionToStringDecimal(ValueTxBx.Text, sDecimal) Then
If nCurrFractionPattern <> FractionPattern.None AndAlso StringFractionToStringDecimal(ValueTxBx.Text, sDecimal) Then
bOk = EgtUILib.EgtLuaEvalNumExpr(sDecimal, m_DoubleResult)
Else
bOk = EgtUILib.EgtLuaEvalNumExpr(ValueTxBx.Text, m_DoubleResult)
+2 -2
View File
@@ -61,5 +61,5 @@ Imports System.Windows
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.5.2.2")>
<Assembly: AssemblyFileVersion("2.5.2.2")>
<Assembly: AssemblyVersion("2.5.10.1")>
<Assembly: AssemblyFileVersion("2.5.10.1")>