EgtDOORCreator 1.9h1 :

- modifica nel caricamento della lista di properties,
- aggiunto un controllo sulla configurazione in lettura,
- gestione del cambio numero di ante nel progetto corrente,
- configurabilità della lista degli swing.
This commit is contained in:
Nicola Pievani
2018-08-03 14:46:34 +00:00
parent 3a642d86d8
commit 3f4b917f92
10 changed files with 183 additions and 77 deletions
+30 -3
View File
@@ -249,7 +249,7 @@ Friend Module OptionModule
Dim nDisableProperties As Integer = 1
nDisableProperties = GetMainPrivateProfileInt(S_GENERAL, "DisableProperties", 1)
If nDisableProperties = 0 Then
m_DDisableProperties = Visibility.Visible
m_DisableProperties = Visibility.Visible
Else
m_DisableProperties = Visibility.Collapsed
End If
@@ -288,7 +288,7 @@ Friend Module OptionModule
LoadPropertiesList(PropertyList, m_PropertList)
PropertyList.Clear()
DefaultGetPrivateProfileObservableCollection(ConstIni.S_PROPERTIES_INI, ConstIni.K_PROPRTIESLISTJAMB_INI, PropertyList)
LoadPropertiesList(PropertyList, m_PropertListJamb)
If PropertyList.Count > 0 Then LoadPropertiesList(PropertyList, m_PropertListJamb)
' Leggo le dimensioni della porta dal file Default.ini
Dim Width As String = String.Empty
@@ -569,7 +569,7 @@ Friend Module OptionModule
Friend Sub CreateNewPropertiesListJamb(ByRef List As ObservableCollection(Of PropertyItem))
If OptionModule.m_DisableProperties <> Visibility.Visible Then Return
Dim LocalList As ObservableCollection(Of PropertyItem)
If Not String.IsNullOrEmpty(OptionModule.m_PropertListJamb(0).Name) Then
If OptionModule.m_PropertListJamb.Count > 0 Then
LocalList = OptionModule.m_PropertListJamb
Else
LocalList = OptionModule.m_PropertList
@@ -592,15 +592,23 @@ Friend Module OptionModule
Private Sub LoadSwingTypeList(ByRef List As List(Of String))
If List.Count = 0 Then Return
For Each ItemSwing In List
Dim Vis As Visibility = Visibility.Visible
If ItemSwing.Contains("-"c) Then
Dim ItemSwingVisibility() As String = ItemSwing.Split("-"c)
ItemSwing = ItemSwingVisibility(0)
If ItemSwingVisibility(1) = "0" Then Vis = Visibility.Collapsed
End If
If ItemSwing.Contains("/"c) Then
Dim ItemAlias() As String = ItemSwing.Split("/"c)
Dim Swing As New SwingItemTypeList(ItemAlias(0))
Swing.VisibilityName = Vis
For IndexItem As Integer = 1 To ItemAlias.Count - 1
Swing.AliasList.Add(ItemAlias(IndexItem))
Next
m_SwingList.Add(Swing)
Else
Dim Swing As New SwingItemTypeList(ItemSwing)
Swing.VisibilityName = Vis
m_SwingList.Add(Swing)
End If
Next
@@ -609,6 +617,7 @@ Friend Module OptionModule
' carico le liste che devono essere rappresentate a video
Private Sub LoadSwingList()
For Index As Integer = 0 To 3
If Not m_SwingList(Index).VisibilityName = Visibility.Visible Then Continue For
' carico gli swing della porta singola da mostrare a video
If m_SwingList(Index).AliasList.Count = 0 Then
m_SwingTypeListSinlgeDoor.Add(m_SwingList(Index).Name)
@@ -621,6 +630,7 @@ Friend Module OptionModule
End If
Next
For Index As Integer = 4 To 7
If Not m_SwingList(Index).VisibilityName = Visibility.Visible Then Continue For
' carico gli swing della prima anta
If m_SwingList(Index).AliasList.Count = 0 Then
m_SwingTypeListLeftDoor.Add(m_SwingList(Index).Name)
@@ -633,6 +643,7 @@ Friend Module OptionModule
End If
Next
For Index As Integer = 8 To 11
If Not m_SwingList(Index).VisibilityName = Visibility.Visible Then Continue For
' carico gli swing della seconda anta
If m_SwingList(Index).AliasList.Count = 0 Then
m_SwingTypeListRightDoor.Add(m_SwingList(Index).Name)
@@ -648,6 +659,22 @@ Friend Module OptionModule
Public Sub SetCurrSwing(ByRef SwingAlias As SwingItemTypeList, ByRef SwingDDF As String)
SwingAlias = Nothing
' controllo che lo swing letto da ddf appartenga alla lista degli swing visibili ( solo su porta Singola)
If OptionModule.m_ConfigurationSoftware = ConfigType.Door Then
For Each ItemSwing In OptionModule.m_SwingList
If Trim(SwingDDF) = Trim(ItemSwing.Name) And Not ItemSwing.VisibilityName = Visibility.Visible Then
If SwingDDF.Contains("HR") Then
SwingDDF = Trim(SwingDDF)
SwingDDF = SwingDDF.Substring(0, 1) & "HR"
Else
SwingDDF = Trim(SwingDDF)
SwingDDF = SwingDDF.Substring(0, 2)
End If
Exit For
End If
Next
End If
For Each Item In OptionModule.m_SwingList
If Trim(SwingDDF) = Trim(Item.Name) Then
SwingAlias = Item