diff --git a/Constants/ConstIni.vb b/Constants/ConstIni.vb index 376ee80..f432b43 100644 --- a/Constants/ConstIni.vb +++ b/Constants/ConstIni.vb @@ -37,6 +37,7 @@ Module ConstIni Public Const K_DELETEPROJECT As String = "DeleteProject" Public Const K_DOORDIMENSION As String = "DoorDimensions" Public Const K_HARDWAREDIMENSION As String = "HardwareDimensions" + Public Const K_INVERTBEVEL As String = "DisableInvertBevel" Public Const S_LANGUAGES As String = "Languages" Public Const K_LANGUAGE As String = "Language" diff --git a/DoorParameters/Compo.vb b/DoorParameters/Compo.vb index 7b3e8e2..1cec3de 100644 --- a/DoorParameters/Compo.vb +++ b/DoorParameters/Compo.vb @@ -40,6 +40,16 @@ Public Class Compo End Get End Property + Private m_CompoType As CompoType + Public ReadOnly Property CompoType As CompoType + Get + Return m_CompoType + End Get + End Property + +#Region "Colori GroupBox" + + ' Colore della linea che circonda l'elenco dei parametri Private m_BorderColor As SolidColorBrush = DirectCast(New BrushConverter().ConvertFrom("#DCDCDC"), SolidColorBrush) Public Property BorderColor As SolidColorBrush Get @@ -51,6 +61,7 @@ Public Class Compo End Set End Property + ' Colore di sfondo nell'intestazione Private m_BackGroundColor As SolidColorBrush = DirectCast(New BrushConverter().ConvertFrom("#FFFFFF"), SolidColorBrush) Public Property BackGroundColor As SolidColorBrush Get @@ -62,7 +73,8 @@ Public Class Compo End Set End Property - Private m_Foreground As SolidColorBrush = DirectCast(New BrushConverter().ConvertFrom("#000000"), SolidColorBrush) + ' Colore utilizzato nell'intestazione + Private m_Foreground As SolidColorBrush = DirectCast(New BrushConverter().ConvertFrom("#000000"), SolidColorBrush) Public Property Foreground As SolidColorBrush Get Return m_Foreground @@ -73,6 +85,7 @@ Public Class Compo End Set End Property + ' Spessorre della linea che circonda l'elenco dei parametri Private m_BorderThickness As Integer = 1 Public Property BorderThickness As Integer Get @@ -84,6 +97,7 @@ Public Class Compo End Set End Property + ' Carettere grassetto utilizzato nell'intestazione Private m_FontBold As FontWeight = FontWeights.Bold Public Property FontBold As FontWeight Get @@ -95,13 +109,11 @@ Public Class Compo End Set End Property - Private m_CompoType As CompoType - Public ReadOnly Property CompoType As CompoType - Get - Return m_CompoType - End Get - End Property +#End Region ' Colori GroupBox +#Region "CompoRef" + + ' componente RIFERITA generata sul telaio Private m_refCompoJamb As Compo Public Property refJambCompo As Compo Get @@ -112,6 +124,7 @@ Public Class Compo End Set End Property + ' componente di RIFERIMENTO generata sull'anta Private m_refCompoDoor As Compo Public Property refCompoDoor As Compo Get @@ -132,6 +145,7 @@ Public Class Compo End Set End Property + ' identifica il codice della componente Private m_IdCode As String Public Property IdCode As String Get @@ -142,6 +156,9 @@ Public Class Compo End Set End Property + ' questo parametro è utilizzato per le componenti Anta-Anta + ' in fase di salvateggio viene stampato "##IdCodeComponent : 20 , matched" + ' indica che la componente che è stata creata è riferita Private m_MatchedDoor As Boolean = False Public Property MatchedDoor As Boolean Get @@ -151,6 +168,7 @@ Public Class Compo m_MatchedDoor = value End Set End Property + ' deve essere settato a 1 (solo in presenza di due ante): ' - inserisco un componente sul frame Top & sulla seconda anta (dx) ' - inserisco un componente sul frema Bottom & sulla prima anta (sx) @@ -180,10 +198,13 @@ Public Class Compo End Set End Property +#End Region ' CompoRef + #Region "Gestione Errori DOORCreator" Public m_ParameterDDfList As New List(Of String) + ' In caso di direttorio componente mancante Private m_MissingDirectory As Boolean = False Public Property MissingDirectory As Boolean Get @@ -195,6 +216,7 @@ Public Class Compo End Set End Property + ' In caso di file componente mancante Private m_MissingFile As Boolean = False Public Property MissingFile As Boolean Get @@ -206,6 +228,7 @@ Public Class Compo End Set End Property + ' In caso di caricamento di default della componente Private m_LoadByDefault As Boolean = False Public Property LoadByDefault As Boolean Get @@ -219,6 +242,7 @@ Public Class Compo End Set End Property + ' In caso di mancanza di un paremtro da ddf Private m_MissingParameter As Boolean = False Public Property MissingParameter As Boolean Get @@ -230,6 +254,7 @@ Public Class Compo End Set End Property + ' In caso di valore caricato sbagliato Private m_ErrorValue As Boolean = False Public Property ErrorValue As Boolean Get @@ -248,6 +273,7 @@ Public Class Compo End Set End Property + ' definisce il colore dell'errore attraverso il parametro "IsError" Private m_ErrorColor As SolidColorBrush = DirectCast(New BrushConverter().ConvertFrom(OptionModule.ColorLoadByDefault), SolidColorBrush) Public Property ErrorColor As SolidColorBrush Get @@ -259,6 +285,20 @@ Public Class Compo End Set End Property + ' definsce il tipo di carettere che deve essere visualizzato + ' è assegnato assieme al colore dell'errore + Private m_FontStyleCompoBrandFile As String = "Normal" + Public Property FontStyleCompoBrandFile As String + Get + Return m_FontStyleCompoBrandFile + End Get + Set(value As String) + m_FontStyleCompoBrandFile = value + NotifyPropertyChanged("FontStyleCompoBrandFile") + End Set + + End Property + Public ReadOnly Property ShowParamList As Visibility Get If m_LoadByDefault Then @@ -269,6 +309,7 @@ Public Class Compo End Get End Property + ' Sets l'immagine per l'eliminazione della componente Public Sub SetImage() If m_LoadByDefault Then 'm_ImageButton = "/Resources/Refresh/Error.png" @@ -286,25 +327,40 @@ Public Class Compo End Get End Property + ' Ha il compito di assegnare il colore in funzione della cmbinaione di errori + ' e comunicare che è stato trivato un errore Public ReadOnly Property IsError As Boolean Get ' è suffuciente che ci sia un errore perchè venga evidenziato nella grafica If m_ErrorValue And Not m_MissingParameter And Not m_LoadByDefault Then ErrorColor = DirectCast(New BrushConverter().ConvertFrom(OptionModule.ColorErrorValue), SolidColorBrush) + FontStyleCompoBrandFile = "Italic" Return True ElseIf m_MissingParameter And Not m_ErrorValue And Not m_LoadByDefault Then ErrorColor = DirectCast(New BrushConverter().ConvertFrom(OptionModule.ColorMissingParameter), SolidColorBrush) + FontStyleCompoBrandFile = "Italic" Return True ElseIf m_LoadByDefault And Not m_MissingParameter And Not m_ErrorValue Then ErrorColor = DirectCast(New BrushConverter().ConvertFrom(OptionModule.ColorLoadByDefault), SolidColorBrush) + FontStyleCompoBrandFile = "Italic" Return True ElseIf m_LoadByDefault And (m_MissingParameter OrElse m_ErrorValue) Then ErrorColor = DirectCast(New BrushConverter().ConvertFrom(OptionModule.ColorLoadByDefault), SolidColorBrush) + FontStyleCompoBrandFile = "Italic" Return True ElseIf m_MissingParameter And m_ErrorValue Then ErrorColor = DirectCast(New BrushConverter().ConvertFrom(OptionModule.ColorErrorAndMissing), SolidColorBrush) + FontStyleCompoBrandFile = "Italic" Return True + ElseIf OptionModule.m_ConfigurationSoftware = ConfigType.Assembly AndAlso Not IsNothing(refCompoDoor) Then + MissingDirectory = True + MissingFile = True + ErrorColor = DirectCast(New BrushConverter().ConvertFrom(OptionModule.ColorRefCompo), SolidColorBrush) + FontStyleCompoBrandFile = "Italic" + Return False Else + ErrorColor = DirectCast(New BrushConverter().ConvertFrom("Black"), SolidColorBrush) + FontStyleCompoBrandFile = "Normal" Return False End If End Get @@ -312,6 +368,9 @@ Public Class Compo #End Region ' Gestione Errori +#Region "Group Chapter" + + ' definsce se il capitolo NON deve essere di tipo Expand Private m_IsFixed As Boolean Friend ReadOnly Property IsFixed As Boolean Get @@ -389,7 +448,9 @@ Public Class Compo NotifyPropertyChanged("ErrorColor") End Sub -#Region "Template ComboBox" +#End Region ' Group Chapter + +#Region "Selezione Template" #Region "Brand" @@ -502,16 +563,15 @@ Public Class Compo End Property Public Sub SetSelBrand(sSelBrand As String) m_SelBrandPart = sSelBrand - For IndexModelList As Integer = 0 To m_BrandListPart.Count - 1 - If m_BrandListPart(IndexModelList) = m_SelBrandPart Then - If sSelBrand.ToLower.Contains(FRAME_FOLDER) Then - m_FileList = CompoType.FrameFolderList(IndexModelList).ModelFileList - Else - m_FileList = CompoType.FolderList(IndexModelList).ModelFileList - End If - Exit For - End If - Next + Dim IndexModelList As Integer = m_BrandListPart.IndexOf(Trim(sSelBrand)) + If IndexModelList < 0 Then Return + If sSelBrand.ToLower.Contains(FRAME_FOLDER) Then + If IndexModelList > CompoType.FrameFolderList.Count - 1 Then Return + m_FileList = CompoType.FrameFolderList(IndexModelList).ModelFileList + Else + If IndexModelList > CompoType.FolderList.Count - 1 Then Return + m_FileList = CompoType.FolderList(IndexModelList).ModelFileList + End If NotifyPropertyChanged("FileList") NotifyPropertyChanged("SelBrandPart") End Sub @@ -702,8 +762,7 @@ Public Class Compo If Not String.IsNullOrWhiteSpace(ErrorList) Then EgtOutLog(ErrorList) End Sub - ' setto la lista dei parametri da caricare - 'Private Sub ReadParamConfig(ByRef NewCompoParam As CompoParam, ByRef ErrorList As String, ParamIndex As Integer, DefaultConfig As String) + ' setto la lista dei parametri da caricare Private Sub ReadParamConfig(ByRef ErrorList As String, DefaultConfig As String) Dim NewCompoParam As CompoParam = Nothing Dim ParamIndex As Integer = 1 @@ -1875,7 +1934,7 @@ Public Class Compo Return False End Function -#End Region ' Template ComboBox +#End Region ' Selezione Template Private m_TidyParam As String Public Property TidyParam As String @@ -2030,6 +2089,7 @@ Public Class CompoParam Public ReadOnly Property ColorParam As String Get + ' se sono nell'HardwareManager non gestisco gli errori If Not IsNothing(Map.refHardwarePageVM) AndAlso Map.refMainWindowVM.SelectedPage = MainWindowVM.ListPageEnum.nHardwarePage Then If CurrCompo.EnableChapter Then @@ -2043,6 +2103,8 @@ Public Class CompoParam End If If m_IsModifingRefCompoParam Then Return OptionModule.ColorModifyingParamRef + 'ElseIf m_MissingParameterInReading Then + ' Return OptionModule.ColorMissingParameter Else Return OptionModule.ColorErrorValue End If diff --git a/DoorParameters/Part.vb b/DoorParameters/Part.vb index aa68bd1..41f42ad 100644 --- a/DoorParameters/Part.vb +++ b/DoorParameters/Part.vb @@ -511,6 +511,12 @@ Public Class Part #Region "SWING" + Public ReadOnly Property VisibilityInvertBevel As Visibility + Get + Return OptionModule.m_DisableInvertBevel + End Get + End Property + ' lista degli Swing Private m_SwingTypeList As New List(Of String) Public Property SwingTypeList As List(Of String) @@ -1205,14 +1211,6 @@ Public Class Part 'Gestione ComboBox e TextBox di ogni compo della pulsantiera letta da Compo.ini (Door) Friend Function AddNewCompo(CurrCompoType As CompoType, Optional IsFrame As Boolean = False, Optional IndecRefCompo As Integer = -1) As Compo Dim FileNameComplete As String = String.Empty - ' converto tutti gli sfondi in bianco dei nomi delle componenti (solo se sono su un'anta) - 'For Each Compo In Map.refPartPageVM.CurrPart.CompoList - ' Compo.BorderColor = DirectCast(New BrushConverter().ConvertFrom("#DCDCDC"), SolidColorBrush) - ' Compo.BackGroundColor = DirectCast(New BrushConverter().ConvertFrom("#FFFFFF"), SolidColorBrush) - ' Compo.Foreground = DirectCast(New BrushConverter().ConvertFrom("#000000"), SolidColorBrush) - ' Compo.BorderThickness = 1 - ' Compo.FontBold = FontWeights.Normal - 'Next ' riconosco il part su cui sto aggiungendo la componente Dim CurrPartDoor As PartDoor = Map.refAssemblyManagerVM.ReserchPartDoor(Me.TypePart) If Not IsNothing(CurrPartDoor) Then diff --git a/DoorParameters/PartPageV.xaml b/DoorParameters/PartPageV.xaml index 8c0eef6..8178bf8 100644 --- a/DoorParameters/PartPageV.xaml +++ b/DoorParameters/PartPageV.xaml @@ -223,11 +223,13 @@ IsEnabled="{Binding IsRaedOnly, Converter={StaticResource TrueToFalse}}"/> - @@ -573,7 +575,7 @@