EgtDOORCreator 2.2d1:

-> correzione apertura ddf in modalità assemblato
-> conversione di porte in assembalto
-> gestione dei materiali e delle proprietà
This commit is contained in:
Nicola Pievani
2020-04-24 16:42:00 +00:00
parent 1aab4c7ec8
commit e2cdd82d63
29 changed files with 461 additions and 114 deletions
+16 -9
View File
@@ -155,6 +155,9 @@ Friend Module OptionModule
Friend m_Font As String
Friend m_TextHeight As Double
Friend m_DimensionHardware As Visibility
Friend m_DimensionDoor As Visibility
' iniziliazzo il la lettura dei messaggi
Friend Sub ReadMessages()
' Leggo elenco lingue disponibili da file ini
@@ -293,6 +296,10 @@ Friend Module OptionModule
m_EnableBrowse = If(GetMainPrivateProfileInt(S_REPORT, K_TEMPLATEBROWSER, 0) = 1, True, False)
m_DimensionDoor = If(GetMainPrivateProfileInt(S_REPORT, K_DOORDIMENSION, 0) = 1, Visibility.Visible, Visibility.Collapsed)
m_DimensionHardware = If(GetMainPrivateProfileInt(S_REPORT, K_HARDWAREDIMENSION, 0) = 1, Visibility.Visible, Visibility.Collapsed)
' leggo il tipo di Bevel selezionato
DefaultGetPrivateProfilesBevel(S_EDGE, K_BEVELU_INI, m_bBevelUp)
DefaultGetPrivateProfilesBevel(S_EDGE, K_BEVELD_INI, m_bBevelDown)
@@ -320,7 +327,7 @@ Friend Module OptionModule
' carico i nomi dei materiali (NomeDDF/NomeGrafica) e le liste di materiali associate
Dim MaterialList As New ObservableCollection(Of String)
DefaultGetPrivateProfileObservableCollection("Material", "MaterialList", MaterialList)
LoadMaterialList (MaterialList)
LoadMaterialList(MaterialList)
' se eiste un solo materiale allora non mostro a vodeo
If MaterialList.Count < 2 then
m_MaterialIsVisible = Visibility.Collapsed
@@ -344,7 +351,7 @@ Friend Module OptionModule
If PropertyList.Count > 0 Then LoadPropertiesList(PropertyList, m_PropertListJamb)
End If
Part.m_MaterilaList = m_MaterialList
m_CurrMaterial = m_MaterialList(0)
' Leggo le dimensioni della porta dal file Default.ini
Dim IsMM As Boolean = False
DefaultGetMmUnits(ConstCompo.S_GENERALINI, ConstCompo.K_MMUNITSINI, IsMM)
@@ -716,16 +723,16 @@ Friend Module OptionModule
Next
End Sub
Friend Sub CreateNewPropertiesListJamb(ByRef List As ObservableCollection(Of PropertyItem))
Friend Sub CreateNewPropertiesListJamb(ByRef List As ObservableCollection(Of PropertyItem), ByRef SelectedMaterial As MaterialType)
If OptionModule.m_DisableProperties <> Visibility.Visible Then Return
Dim LocalList As ObservableCollection(Of PropertyItem)
If OptionModule.m_PropertListJamb.Count > 0 Then
LocalList = OptionModule.m_PropertListJamb
Else
LocalList = OptionModule.m_PropertList
If OptionModule.m_MaterialList.Count > 1 Then
SelectedMaterial = OptionModule.m_MaterialList(0)
List = OptionModule.m_MaterialList(0).PropertiesList
Return
End If
' configurazione senza materiali
If List.Count > 0 Then List.Clear()
For Each Item In LocalList
For Each Item In OptionModule.m_PropertList
List.Add(New PropertyItem(Item.Name, Item.GraphicName, Item.IsChecked))
Next
End Sub