EgtDoorCreator 3.1a1 :
- modifiche per convertire meta espressioni in file lua in espressioni di interfaccia utente.
This commit is contained in:
+20
-35
@@ -1917,6 +1917,22 @@ Public Class Compo
|
||||
Return True
|
||||
End Function
|
||||
|
||||
' Conversione da meta espressione in file lua ad espressione valida in interfaccia
|
||||
Private Function ConvertFromLua( sValue As String) As String
|
||||
' sistemo variabili
|
||||
sValue = sValue.Replace( "(DGD.dW)", "W")
|
||||
sValue = sValue.Replace( "(DGD.dW/25.4)", "W")
|
||||
sValue = sValue.Replace( "(DGD.dT)", "T")
|
||||
sValue = sValue.Replace( "(DGD.dT/25.4)", "T")
|
||||
sValue = sValue.Replace( "(DGD.dH)", "H")
|
||||
sValue = sValue.Replace( "(DGD.dH/25.4)", "H")
|
||||
' elimino inch(...) o mm(...)
|
||||
sValue = RegexFunction.Brackets(sValue)
|
||||
' sistemo per unità in interfaccia
|
||||
Utility.ConvertCurrentUnitMeasure(sValue)
|
||||
return sValue
|
||||
End Function
|
||||
|
||||
' carico il parametro letto
|
||||
Private Function LoadParamFromLua(sValue As String, ByRef CurrCompoParam As CompoParam) As Boolean
|
||||
If TypeOf CurrCompoParam Is TextBoxOnOffParam Then
|
||||
@@ -1926,29 +1942,11 @@ Public Class Compo
|
||||
End If
|
||||
Dim sItems() As String = sValue.Split(";"c)
|
||||
' estraggo il primo valore: -- NomeParamOnOff = inch(0.6); 0
|
||||
sValue = sItems(0)
|
||||
Dim ReadValue = RegexFunction.Brackets(sValue)
|
||||
If ReadValue.Contains("DGD.dW") Then
|
||||
ReadValue = sValue.Replace(ReadValue & ")", "W")
|
||||
ReadValue = RegexFunction.Brackets(ReadValue)
|
||||
End If
|
||||
If ReadValue.Contains("DGD.dT") Then
|
||||
ReadValue = sValue.Replace(ReadValue & ")", "T")
|
||||
ReadValue = RegexFunction.Brackets(ReadValue)
|
||||
End If
|
||||
If ReadValue.Contains("DGD.dH") Then
|
||||
ReadValue = sValue.Replace(ReadValue & ")", "H")
|
||||
ReadValue = RegexFunction.Brackets(ReadValue)
|
||||
End If
|
||||
Utility.ConvertCurrentUnitMeasure(ReadValue)
|
||||
Dim ReadValue As String = ConvertFromLua( sItems(0))
|
||||
TempParam.SetValue(ReadValue)
|
||||
' verifico se deve essere attivata
|
||||
If sItems.Count > 1 Then
|
||||
If sItems(1).Trim <> "0" Then
|
||||
TempParam.SetIsActive(True)
|
||||
Else
|
||||
TempParam.SetIsActive(False)
|
||||
End If
|
||||
If sItems.Count > 1 AndAlso sItems(1).Trim = "0" Then
|
||||
TempParam.SetIsActive(False)
|
||||
Else
|
||||
TempParam.SetIsActive(True)
|
||||
End If
|
||||
@@ -1959,20 +1957,7 @@ Public Class Compo
|
||||
If Map.refMainWindowVM.SelectedPage <> MainWindowVM.ListPageEnum.nHardwarePage Then
|
||||
If Not TempParam.EnableCopy Then Return False
|
||||
End If
|
||||
Dim ReadValue = RegexFunction.Brackets(sValue)
|
||||
If ReadValue.Contains("DGD.dW") Then
|
||||
ReadValue = sValue.Replace(ReadValue & ")", "W")
|
||||
ReadValue = RegexFunction.Brackets(ReadValue)
|
||||
End If
|
||||
If ReadValue.Contains("DGD.dT") Then
|
||||
ReadValue = sValue.Replace(ReadValue & ")", "T")
|
||||
ReadValue = RegexFunction.Brackets(ReadValue)
|
||||
End If
|
||||
If ReadValue.Contains("DGD.dH") Then
|
||||
ReadValue = sValue.Replace(ReadValue & ")", "H")
|
||||
ReadValue = RegexFunction.Brackets(ReadValue)
|
||||
End If
|
||||
Utility.ConvertCurrentUnitMeasure(ReadValue)
|
||||
Dim ReadValue As String = ConvertFromLua( sValue)
|
||||
TempParam.SetValue(ReadValue)
|
||||
Return True
|
||||
ElseIf TypeOf CurrCompoParam Is ComboBoxOnOffParam Then
|
||||
|
||||
@@ -32,7 +32,7 @@ Imports System.Windows
|
||||
|
||||
<Assembly: AssemblyCompany("Egalware s.r.l.")>
|
||||
<Assembly: AssemblyProduct("EgtDOORCreator")>
|
||||
<Assembly: AssemblyCopyright("Copyright © 2016-2025 by Egalware s.r.l.")>
|
||||
<Assembly: AssemblyCopyright("Copyright © 2016-2026 by Egalware s.r.l.")>
|
||||
<Assembly: AssemblyTrademark("")>
|
||||
<Assembly: ComVisible(false)>
|
||||
|
||||
@@ -72,5 +72,5 @@ Imports System.Windows
|
||||
' by using the '*' as shown below:
|
||||
' <Assembly: AssemblyVersion("1.0.*")>
|
||||
|
||||
<Assembly: AssemblyVersion("2.7.12.1")>
|
||||
<Assembly: AssemblyFileVersion("2.7.12.1")>
|
||||
<Assembly: AssemblyVersion("3.1.1.1")>
|
||||
<Assembly: AssemblyFileVersion("3.1.1.1")>
|
||||
|
||||
+1
-1
@@ -39,7 +39,7 @@ Module RegexFunction
|
||||
' Restituisce il valore scritto tra le parentesi tonde ()
|
||||
Friend Function Brackets(sLine As String) As String
|
||||
If Not sLine.Contains("("c) AndAlso Not sLine.Contains(")"c) Then Return sLine
|
||||
Return Regex.Match(sLine, "\s*\(\s*(.*?\b)\s*\).*").Groups(1).Value
|
||||
Return Regex.Match(sLine, "\s*\(\s*(.*\b)\s*\).*").Groups(1).Value
|
||||
End Function
|
||||
|
||||
' restituisce quello che segue l'uguale assegnata una parola chiave tra i due trattini e 'uguale
|
||||
|
||||
Reference in New Issue
Block a user