EgtDOORCreator 2.2e1:

-> correzione annullamento nuovo assemblato,
-> gestione automatico del ricalcolo della ferramenta in caso di inversione delle ante (cambio Swing)
-> evidenziazione dei parametri modificati (sui telai) e segnalazione in caso di ricalcolo (si: ricalcolo, no: ognora il ricalcolo, annulla: ripristina l'ultimo valore inserito)
-> aggiunta dei bottoni per il ricalcolo su ogni componente della porta (solo se la componente ha un riferimento valido)
This commit is contained in:
Nicola Pievani
2020-05-19 15:28:49 +00:00
parent 47d3e9fe5d
commit 93bc8aaf9c
10 changed files with 620 additions and 54 deletions
+18 -9
View File
@@ -149,6 +149,7 @@ Friend Module OptionModule
Friend ColorMissingParameter As String = "Yellow"
Friend ColorLoadByDefault As String = "Red"
Friend ColorErrorAndMissing As String = "Red"
Friend ColorModifyingParamRef As String = "Yellow"
Friend m_CompoPaneOrder As List(Of String) = New List(Of String)
@@ -338,17 +339,17 @@ Friend Module OptionModule
m_MaterialIsVisible = Visibility.Collapsed
End If
Dim PropertyList As New ObservableCollection(Of String)
' se non trovo l'elenco dei materiali allora eseguo le vecchie istruzioni
If Not DefaultGetPrivateProfileMaterialProperties(ConstIni.S_PROPERTIES_INI, "Property", m_MaterialList) then
DefaultGetPrivateProfileObservableCollection(ConstIni.S_PROPERTIES_INI, ConstIni.K_PROPRTIESLIST_INI, PropertyList)
' se non trovo l'elenco dei materiali allora eseguo le vecchie istruzioni
If Not DefaultGetPrivateProfileMaterialProperties(ConstIni.S_PROPERTIES_INI, "Property", m_MaterialList) Then
DefaultGetPrivateProfileObservableCollection(ConstIni.S_PROPERTIES_INI, ConstIni.K_PROPRTIESLIST_INI, PropertyList)
m_MaterialIsVisible = Visibility.Collapsed
' carico la vecchia lista di proprietà
LoadPropertiesList(PropertyList, m_PropertList)
' genero una lista fittizia di materiali
MaterialList.Add(GENERICMATERIAL)
LoadMaterialList (MaterialList)
LoadMaterialList(MaterialList)
m_MaterialList(0).PropertiesList = m_PropertList
If PropertyList.Count < 1 then
If PropertyList.Count < 1 Then
OptionModule.m_DisableProperties = Visibility.Collapsed
End If
PropertyList.Clear()
@@ -479,7 +480,7 @@ Friend Module OptionModule
'carico i colori da associare agli errori
Dim sColor As String = String.Empty
Dim ColorConvert As SolidColorBrush
DefaultGetPrivateProfileString("Error", "Value", "Red", sColor)
DefaultGetPrivateProfileString("Error", "ErrorValue", "Red", sColor)
If Not String.IsNullOrEmpty(sColor) Then
Try
ColorConvert = DirectCast(New BrushConverter().ConvertFrom(sColor), SolidColorBrush)
@@ -503,7 +504,7 @@ Friend Module OptionModule
Catch ex As Exception
End Try
End If
DefaultGetPrivateProfileString("Error", "ValueAndMissing", "Red", sColor)
DefaultGetPrivateProfileString("Error", "ErrorValueAndMissing", "Red", sColor)
If Not String.IsNullOrEmpty(sColor) Then
Try
ColorConvert = DirectCast(New BrushConverter().ConvertFrom(sColor), SolidColorBrush)
@@ -511,6 +512,14 @@ Friend Module OptionModule
Catch ex As Exception
End Try
End If
DefaultGetPrivateProfileString("Error", "ModifyingParamRef", "Yellow", sColor)
If Not String.IsNullOrEmpty(sColor) Then
Try
ColorConvert = DirectCast(New BrushConverter().ConvertFrom(sColor), SolidColorBrush)
ColorModifyingParamRef = sColor
Catch ex As Exception
End Try
End If
'-----------------------------------------------------------------------------------------------------------------
' SIZE JAMB
Dim ThicknessHead As String = String.Empty
@@ -762,7 +771,7 @@ Friend Module OptionModule
Friend Sub CreateNewPropertiesList(ByRef LocalPart As Part)
If OptionModule.m_DisableProperties <> Visibility.Visible Then Return
If OptionModule.m_MaterialList.Count > 1 Then
If OptionModule.m_MaterialList.Count > 0 Then
LocalPart.SetMaterial(OptionModule.m_MaterialList(0))
LocalPart.SetPropertiesList(OptionModule.m_MaterialList(0).PropertiesList)
Return
@@ -776,7 +785,7 @@ Friend Module OptionModule
Friend Sub CreateNewPropertiesListJamb(ByRef LocalPart As Part)
If OptionModule.m_DisableProperties <> Visibility.Visible Then Return
If OptionModule.m_MaterialList.Count > 1 Then
If OptionModule.m_MaterialList.Count > 0 Then
LocalPart.SetMaterial(OptionModule.m_MaterialList(0))
LocalPart.SetPropertiesList(OptionModule.m_MaterialList(0).PropertiesList)
Return