Cambio versione 2.4l1

CompoPanel/CompoType.vb

@@ -99,6 +99,17 @@ Public Class CompoType
       m_FolderName = FolderName
    End Sub
 
+   Private m_DDFMaterial As String
+   Public ReadOnly Property DDFMaterial As String
+      Get
+         Return m_DDFMaterial
+      End Get
+   End Property
+
+   Public Sub SetDDFMaterial(DDFMaterial As String)
+      m_DDFMaterial = DDFMaterial
+   End Sub
+
    Public Function LoadListTemplate() As Boolean
       FolderList.Clear()
       m_HardwareFolderList.Clear()
@@ -114,12 +125,13 @@ Public Class CompoType
       Return other
    End Function
 
-   Sub New(sName As String, sDDFName As String, sPath As String, sJambSide As String, sFolderName As String)
+   Sub New(sName As String, sDDFName As String, sPath As String, sJambSide As String, sFolderName As String, Optional ByVal sDDFMaterial As String = "wood")
       m_Name = sName
       m_DDFName = sDDFName
       m_Path = sPath
       m_JambSide = sJambSide
       m_FolderName = sFolderName
+      m_DDFMaterial = sDDFMaterial
       LoadListTemplate()
    End Sub
 

HardwareManager/Hardware.vb

@@ -747,6 +747,7 @@ Public Class Hardware
                Exit For
             End If
          Next
+
          If Not bIsCurrentMaterial And nIsActive <> 4 Then
             nIsActive = nIsActiveMaterial
          End If
@@ -988,6 +989,10 @@ Public Class Hardware
    ' caricamento dei dati del file lua
    Private Function FindParamTemplateInConfigList(sParam As String, sValue As String) As Boolean
       For IndexGroupChapters As Integer = 0 To m_GroupChapters.Count - 1
+         ' verifico che sia attivo il gruppo
+         If Not m_GroupChapters(IndexGroupChapters).EnableChapter Then
+            Continue For
+         End If
          For IndexChapter As Integer = 0 To m_GroupChapters(IndexGroupChapters).CompoParamList.Count - 1
             If m_GroupChapters(IndexGroupChapters).CompoParamList(IndexChapter).DDFName = sParam Then
                ' ho trovato una corrispondenza tra il valore de file ini e quello lua in lettura
@@ -1953,10 +1958,16 @@ Public Class Hardware
       End If
 
       For IndexGroupChapters As Integer = 0 To m_GroupChapters.Count - 1
+         ' se il presente gruppo non è attivo passo al successivo (di default assegno "nil", in caso di uscita senza gruppo il valore 
+         If Not m_GroupChapters(IndexGroupChapters).EnableChapter Then
+            sValue = " nil"
+            Continue For
+         End If
          For IndexChapter As Integer = 0 To m_GroupChapters(IndexGroupChapters).CompoParamList.Count - 1
             If m_GroupChapters(IndexGroupChapters).CompoParamList(IndexChapter).DDFName = NameParam Then
                ' verifico che il parametro da stampare sia abilitato alla stampa (altriementi NON scrivere nel file)  
                If Not m_GroupChapters(IndexGroupChapters).IsActiveChapter Then sValue = " nil" : Return True
+
                If TypeOf m_GroupChapters(IndexGroupChapters).CompoParamList(IndexChapter) Is TextBoxDGCParam Then
                   Dim Text As TextBoxDGCParam = DirectCast(m_GroupChapters(IndexGroupChapters).CompoParamList(IndexChapter), TextBoxDGCParam)
                   sValue = String.Empty

MainWindow/MainWindowModel.vb

@@ -57,8 +57,8 @@ Friend Class MainWindowModel
       EgtUILib.GetPrivateProfileString(S_LICENCE, K_KEY, "", sKey, sLicFile)
       EgtSetKey(sKey)
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(3279, 2407, 1, IniFile.m_nKeyLevel) And
-                            EgtGetKeyOptions(3279, 2407, 1, IniFile.m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(3279, 2412, 1, IniFile.m_nKeyLevel) And
+                            EgtGetKeyOptions(3279, 2412, 1, IniFile.m_nKeyOptions)
       'Inizializzazione generale di EgtInterface
       m_nDebug = GetMainPrivateProfileInt(S_GENERAL, K_DEBUG, 0)
       Dim sLogFile As String = IniFile.m_sTempDir & "\" & GENLOG_FILE_NAME.Replace("#", m_nInstance.ToString())

My Project/AssemblyInfo.vb

@@ -32,7 +32,7 @@ Imports System.Windows
 
 <Assembly: AssemblyCompany("EgalTech s.r.l.")> 
 <Assembly: AssemblyProduct("EgtDOORCreator")>
-<Assembly: AssemblyCopyright("Copyright ©  2016-2021 by EgalTech s.r.l.")>
+<Assembly: AssemblyCopyright("Copyright ©  2016-2022 by EgalTech 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.4.11.1")>
-<Assembly: AssemblyFileVersion("2.4.11.1")>
+<Assembly: AssemblyVersion("2.4.12.1")>
+<Assembly: AssemblyFileVersion("2.4.12.1")>