Correzione gestione Inch decimali e cambio versione
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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")>
|
||||
|
||||
Reference in New Issue
Block a user