Merge commit '9b89b68684e2d64b043ac6572b75b1cfc0d1515c'

- milgiorata gestione errore in ManageProfileType
- AboutBox dà indicazioni su Uso Librerie Debug, OS, CPU, Grafica
- modificato manifest.app per riconoscere iOS fino a Windows 11
- cambio versione e sistemazione controllo codice mensile.

AboutBoxWindow/AboutBoxV.xaml.vb

@@ -15,11 +15,24 @@ Public Class AboutBoxV
       Dim sOpts As String = IniFile.m_nKeyOptions.ToString()
       KeyLbl.Text = sKey & " - " & sKlev & " - " & sOpts
       CopyrightLbl.Text = My.Application.Info.Copyright.ToString()
-      Dim sInfo As String = "DataRoot " & IniFile.m_sDataRoot & vbCrLf
+      Dim sInfo As String = If( EgtIsDebug(), "*** Debug Libraries ***" & vbCrLf, "")
+      sInfo &= "DataRoot " & IniFile.m_sDataRoot & vbCrLf
       sInfo &= "Doors " & IniFile.m_sDoorsDirPath & vbCrLf
       If OptionModule.m_MaterialList.Count = 1 Then
          sInfo &= "Material " & OptionModule.m_MaterialList(0).Name
       End If
+      Dim sOpSys As String = String.Empty
+      EgtGetOsInfo( sOpSys)
+      sInfo &= sOpSys & Environment.NewLine
+      Dim sCPU As String = String.Empty
+      EgtGetCpuInfo( sCPU)
+      sInfo &= sCPU & Environment.NewLine
+      Dim sMem As String = String.Empty
+      EgtGetMemoryInfo( sMem)
+      sInfo &= sMem & Environment.NewLine
+      Dim sScene As String = String.Empty
+      EgtGetSceneInfo(sScene)
+      sInfo &= sScene
       InfoLbl.Text = sInfo
       ExitBtn.Content = EgtMsg(MSG_MISSINGKEYWD + 4)          'Ok
    End Sub

AssemblyManager/AssemblyManagerVM.vb

@@ -752,6 +752,30 @@ Public Class AssemblyManagerVM
                NewList(IndexParam).ErrorInReading = True
             End If
 
+         ElseIf TypeOf OldList(IndexParam) Is ComboBoxOnOffParam Then
+            Dim OldParam As ComboBoxOnOffParam = DirectCast(OldList(IndexParam), ComboBoxOnOffParam)
+            Dim NewParam As ComboBoxOnOffParam = DirectCast(NewList(IndexParam), ComboBoxOnOffParam)
+
+            If OldParam.ItemList.Count > OldParam.ItemListDDF.Count Then
+               NewParam.ItemList.Add(OldParam.ItemList.Last)
+               NewParam.SetSelItem(NewParam.ItemList.Last)
+               NewList(IndexParam).ErrorInReading = True
+            End If
+            Dim IndexItem As Integer = -1
+            For IndexItem = 0 To OldParam.ItemListDDF.Count - 1
+               If OldParam.SelItem = OldParam.ItemList(IndexItem) Then
+                  NewList(IndexParam).ErrorInReading = False
+                  NewParam.MissingParameterInReading = OldParam.MissingParameterInReading
+                  NewParam.SetSelItem(NewParam.ItemList(IndexItem))
+                  If OldParam.ItemList.Count > OldParam.ItemListDDF.Count Then
+                     OldParam.ItemList.RemoveAt(OldParam.ItemList.Count - 1)
+                     NewParam.ItemList.RemoveAt(NewParam.ItemList.Count - 1)
+                  End If
+                  Exit For
+               End If
+            Next
+            NewParam.SetIsActive(OldParam.IsActive)
+
          ElseIf TypeOf OldList(IndexParam) Is ComboBoxParam Then
             Dim OldParam As ComboBoxParam = DirectCast(OldList(IndexParam), ComboBoxParam)
             Dim NewParam As ComboBoxParam = DirectCast(NewList(IndexParam), ComboBoxParam)
@@ -774,17 +798,7 @@ Public Class AssemblyManagerVM
                   Exit For
                End If
             Next
-            'ElseIf TypeOf ErrCompo.CompoParamList(IndexParam) Is ComboBoxOnOffParam Then
-            '   Dim Param As ComboBoxOnOffParam = DirectCast(ErrCompo.CompoParamList(IndexParam), ComboBoxOnOffParam)
-            '   For Each Item In Param.ItemListDDF
-            '      If Param.SelItem = Item Then
-            '         If Param.ItemList.Count > Param.ItemListDDF.Count Then
-            '            Param.ItemList.RemoveAt(Param.ItemList.Count - 1)
-            '         End If
-            '         Param.ErrorInReading = False
-            '         Exit For
-            '      End If
-            '   Next
+
          End If
 
       Next

CompoPanel/CompoPanelVM.vb

@@ -128,7 +128,7 @@ Public Class CompoPanelVM
                If CompoPanelList(IndexCompoOrder) = CompoNameDDF Then
                   Dim Local_NewCompoType As CompoType
                   If Not String.IsNullOrEmpty(Image) Then
-                     Local_NewCompoType = New CompoType(CompoName, CompoNameDDF, CompoArray(Index), Image, Side, FolderName)
+                     Local_NewCompoType = New CompoType(CompoName, CompoNameDDF, CompoArray(Index), Image, Side, FolderName, "wood")
                   Else
                      Local_NewCompoType = New CompoType(CompoName, CompoNameDDF, CompoArray(Index), Side, FolderName)
                   End If

Constants/ConstCompo.vb

@@ -62,6 +62,7 @@ Module ConstCompo
    Public Const K_DEPTH_BOTTOM As String = "depth bottom"
    Public Const K_DELTA_BOTTOM As String = "delta bottom"
    Public Const K_HARDWARE As String = "hardware"
+   Public Const K_OPTIONS As String = "options"
 
    ' Nome, sezioni e chiavi del file Config.ini
    Public Const CONFIGINI_FILE_NAME As String = "Config.ini"

DdfFile.vb

@@ -526,6 +526,12 @@ Friend Module DdfFile
       If Not Directory.Exists(Path.GetDirectoryName(sPath)) Then
          Directory.CreateDirectory(Path.GetDirectoryName(sPath))
       End If
+
+      If OptionModule.m_sVersionDDF = "2" Then
+         DdfFileContent.Add(ConstCompo.K_OPTIONS & ": ")
+         DdfFileContent.Add(Part.sOptions)
+      End If
+
       DdfFileContent.Add(" ")
       DdfFileContent.Add("# End Part")
       ' se sono arrivato fin qui significa che tutto è andato a buon fine (posso quindisalvare il file corrente)
@@ -564,6 +570,7 @@ Friend Module DdfFile
       End If
       ' dal 20/04/2023 inserita gestione della versione (da configurare nel programma)
       If OptionModule.m_sVersionDDF <> "1" Then
+         DdfFileContent.Add("")
          DdfFileContent.Add("version: " & OptionModule.m_sVersionDDF)
       End If
       DdfFileContent.Add("")
@@ -698,7 +705,12 @@ Friend Module DdfFile
       End If
       '----------------------------------------------------------------------------------------------------------------------------------------------------
       DdfFileContent.Add("" & ConstCompo.S_PROFILES & ":")
-      DdfFileContent.Add(m_sSpace1Tab & ConstCompo.K_LOCKEDGE & ": " & SetBevel(Part.TypePart, Part.LockEdgeType.Name, Part.DispositionItem.Name, Part.SwingAlias.Name, Part.InvertBevel))
+      If OptionModule.m_sVersionDDF = "2" Then ' K_TYPE
+         DdfFileContent.Add(m_sSpace1Tab & ConstCompo.K_LOCKEDGE & ": ")
+         DdfFileContent.Add(m_sSpace2Tab & ConstCompo.K_TYPEEDGE & ": " & SetBevel(Part.TypePart, Part.LockEdgeType.Name, Part.DispositionItem.Name, Part.SwingAlias.Name, Part.InvertBevel))
+      Else
+         DdfFileContent.Add(m_sSpace1Tab & ConstCompo.K_LOCKEDGE & ": " & SetBevel(Part.TypePart, Part.LockEdgeType.Name, Part.DispositionItem.Name, Part.SwingAlias.Name, Part.InvertBevel))
+      End If
       DdfFileContent.Add(m_sSpace2Tab & ConstCompo.K_MACHINING & ": " & ConvertBooleanToOnOff(Part.LockEdgeMachining))
       If Not StringToDouble(Part.LockEdgeOverMaterial, dVal) Then
          MessageBox.Show(String.Format(EgtMsg(50141), K_LOCKEDGEOVERMATERIAL_INI), EgtMsg(50101), MessageBoxButton.OK, MessageBoxImage.Error)
@@ -714,7 +726,12 @@ Friend Module DdfFile
             DdfFileContent.Add(m_sSpace2Tab & ConstCompo.K_OVERMATERIAL & ": " & sVal)
          End If
       End If
-      DdfFileContent.Add(m_sSpace1Tab & ConstCompo.K_HINGEEDGE & ": " & SetBevel(Part.TypePart, Part.HingeEdgeType.Name, Part.DispositionItem.Name, Part.SwingAlias.Name))
+      If OptionModule.m_sVersionDDF = "2" Then ' K_TYPE
+         DdfFileContent.Add(m_sSpace1Tab & ConstCompo.K_HINGEEDGE & ": ")
+         DdfFileContent.Add(m_sSpace2Tab & ConstCompo.K_TYPEEDGE & ": " & SetBevel(Part.TypePart, Part.HingeEdgeType.Name, Part.DispositionItem.Name, Part.SwingAlias.Name))
+      Else
+         DdfFileContent.Add(m_sSpace1Tab & ConstCompo.K_HINGEEDGE & ": " & SetBevel(Part.TypePart, Part.HingeEdgeType.Name, Part.DispositionItem.Name, Part.SwingAlias.Name))
+      End If
       DdfFileContent.Add(m_sSpace2Tab & ConstCompo.K_MACHINING & ": " & ConvertBooleanToOnOff(Part.HingeEdgeMachining))
       If Not StringToDouble(Part.HingeEdgeOverMaterial, dVal) Then
          MessageBox.Show(String.Format(EgtMsg(50141), K_HINGEDGEOVERMATERIAL_INI), EgtMsg(50101), MessageBoxButton.OK, MessageBoxImage.Error)
@@ -730,7 +747,12 @@ Friend Module DdfFile
             DdfFileContent.Add(m_sSpace2Tab & ConstCompo.K_OVERMATERIAL & ": " & sVal)
          End If
       End If
-      DdfFileContent.Add(m_sSpace1Tab & ConstCompo.K_TOP & ": " & SetBevel(Part.TypePart, Part.TopType.Name, Part.DispositionItem.Name, Part.SwingAlias.Name))
+      If OptionModule.m_sVersionDDF = "2" Then ' K_TYPE
+         DdfFileContent.Add(m_sSpace1Tab & ConstCompo.K_TOP & ": ")
+         DdfFileContent.Add(m_sSpace2Tab & ConstCompo.K_TYPEEDGE & ": " & SetBevel(Part.TypePart, Part.TopType.Name, Part.DispositionItem.Name, Part.SwingAlias.Name))
+      Else
+         DdfFileContent.Add(m_sSpace1Tab & ConstCompo.K_TOP & ": " & SetBevel(Part.TypePart, Part.TopType.Name, Part.DispositionItem.Name, Part.SwingAlias.Name))
+      End If
       DdfFileContent.Add(m_sSpace2Tab & ConstCompo.K_MACHINING & ": " & ConvertBooleanToOnOff(Part.TopMachining))
       If Not StringToDouble(Part.TopOverMaterial, dVal) Then
          MessageBox.Show(String.Format(EgtMsg(50141), K_TOPOVERMATERIAL_INI), EgtMsg(50101), MessageBoxButton.OK, MessageBoxImage.Error)
@@ -746,7 +768,12 @@ Friend Module DdfFile
             DdfFileContent.Add(m_sSpace2Tab & ConstCompo.K_OVERMATERIAL & ": " & sVal)
          End If
       End If
-      DdfFileContent.Add(m_sSpace1Tab & ConstCompo.K_BOTTOM & ": " & SetBevel(Part.TypePart, Part.BottomType.Name, Part.DispositionItem.Name, Part.SwingAlias.Name))
+      If OptionModule.m_sVersionDDF = "2" Then ' K_TYPE
+         DdfFileContent.Add(m_sSpace1Tab & ConstCompo.K_BOTTOM & ": ")
+         DdfFileContent.Add(m_sSpace2Tab & ConstCompo.K_TYPEEDGE & ": " & SetBevel(Part.TypePart, Part.BottomType.Name, Part.DispositionItem.Name, Part.SwingAlias.Name))
+      Else
+         DdfFileContent.Add(m_sSpace1Tab & ConstCompo.K_BOTTOM & ": " & SetBevel(Part.TypePart, Part.BottomType.Name, Part.DispositionItem.Name, Part.SwingAlias.Name))
+      End If
       DdfFileContent.Add(m_sSpace2Tab & ConstCompo.K_MACHINING & ": " & ConvertBooleanToOnOff(Part.BottomMachining))
       If Not StringToDouble(Part.BottomOverMaterial, dVal) Then
          MessageBox.Show(String.Format(EgtMsg(50141), K_BOTTOMOVERMATERIAL_INI), EgtMsg(50101), MessageBoxButton.OK, MessageBoxImage.Error)
@@ -763,8 +790,9 @@ Friend Module DdfFile
          End If
       End If
 
+      DdfFileContent.Add(" ")
       If OptionModule.m_sVersionDDF = "2" Then
-         DdfFileContent.Add(ConstCompo.K_HARDWARE & "hardware: ")
+         DdfFileContent.Add(ConstCompo.K_HARDWARE & ": ")
       End If
       ' Riordino e stampo le compo
       SearchCompo(DdfFileContent, Part, bIsDDF)

DoorParameters/Part.vb

@@ -1161,6 +1161,21 @@ Public Class Part
 
 #End Region    ' Top Angle
 
+#Region "OPTIONS"
+
+   Private m_sOptions As String = String.Empty
+
+   Public Property sOptions As String
+      Get
+         Return m_sOptions
+      End Get
+      Set(value As String)
+         m_sOptions = value
+      End Set
+   End Property
+
+#End Region    ' Options
+
 #End Region    ' General
 
    ' lista delle componenti
@@ -1702,6 +1717,8 @@ Public Class Part
                ReadDoorCompleted = True
             Case ConstCompo.K_HARDWARE
                LineIndex = LineIndex + 1
+            Case ConstCompo.K_OPTIONS
+               LineIndex = ReadDoor.GetOptions(ReadDoor.NextIndex(LineIndex))
             Case Else 'COMPONENTS
                ' Se sezione senza nome o altro errore              
                If String.IsNullOrWhiteSpace(sSection) Then
@@ -2205,6 +2222,28 @@ Public Class Part
       Return NextIndex(Index)
    End Function
 
+   Private Function GetOptions(Index As Integer) As Integer
+      If Index > FileContent.Count() - 1 Then Return Index
+      Dim sLine As String = RemoveComment(FileContent(Index))
+      ' se stringa vuota passo alla riga successiva
+      If String.IsNullOrEmpty(sLine) Then
+         Return Index
+      End If
+      ' procedo a leggere le options
+      Dim nCount As Integer = 0
+      m_sOptions = String.Empty
+      ' sLine.StartsWith(OptionModule.m_sSpace1Tab)
+      While Not (Search3Hyphens(sLine) OrElse Search3Dots(sLine))
+         m_sOptions &= If(nCount > 0, vbCrLf, "") & sLine
+         Index = NextIndex(Index)
+         ' se il file è terminatpo esco
+         If Index > FileContent.Count() - 1 Then Return Index
+         sLine = RemoveComment(FileContent(Index))
+         nCount = nCount + 1
+      End While
+      Return Index
+   End Function
+
    ' calcola la congruenza del posizionamento e del secure
    Private Sub CalcBevelFromSecure()
       ' se sono nella configurazione assemblato e sto leggendo un frame 
@@ -2635,7 +2674,10 @@ Public Class Part
          If SearchKey(sLine, sEdgeName) Then
             ' passo alla riga successiva
             Index = NextIndex(Index)
-            If Index > FileContent.Count() - 1 Then Return -1
+            If Index > FileContent.Count() - 1 Then
+               nError = -1
+               Return ""
+            End If
             sLine = RemoveComment(FileContent(Index))
             sVal = GetValueWithKey(sLine, K_TYPEEDGE)
          Else

EgtDOORCreator.vbproj

@@ -84,15 +84,15 @@
     <Reference Include="combit.ListLabel25.Wpf">
       <HintPath>..\..\EgtProg\EgtDOORCreator\combit.ListLabel25.Wpf.dll</HintPath>
     </Reference>
+    <Reference Include="DotNetZip">
+      <HintPath>..\..\EgtProg\OmagCUT\DotNetZip.dll</HintPath>
+    </Reference>
     <Reference Include="EgtUILib">
       <HintPath>..\..\EgtProg\Dll32\EgtUILib.dll</HintPath>
     </Reference>
     <Reference Include="EgtWPFLib5">
       <HintPath>..\..\EgtProg\Dll32\EgtWPFLib5.dll</HintPath>
     </Reference>
-    <Reference Include="Ionic.Zip">
-      <HintPath>..\..\EgtProg\EgtDOORCreator\Ionic.Zip.dll</HintPath>
-    </Reference>
     <Reference Include="System.Core" />
     <Reference Include="System.Design" />
     <Reference Include="System.Drawing" />

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, 2541, 1, IniFile.m_nKeyLevel) And
-                            EgtGetKeyOptions(3279, 2541, 1, IniFile.m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(3279, 2512, 1, IniFile.m_nKeyLevel) And
+                            EgtGetKeyOptions(3279, 2512, 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

@@ -72,5 +72,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.5.4.1")>
-<Assembly: AssemblyFileVersion("2.5.4.1")>
+<Assembly: AssemblyVersion("2.5.12.2")>
+<Assembly: AssemblyFileVersion("2.5.12.2")>

My Project/app.manifest

@@ -23,24 +23,40 @@
 
   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
     <application>
-      <!-- A list of all Windows versions that this application is designed to work with. 
-      Windows will automatically select the most compatible environment.-->
+      <!-- A list of the Windows versions that this application has been tested on
+           and is designed to work with. Uncomment the appropriate elements
+           and Windows will automatically select the most compatible environment. -->
 
-      <!-- If your application is designed to work with Windows Vista, uncomment the following supportedOS node-->
-      <!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"></supportedOS>-->
+      <!-- Windows Vista -->
+      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />
 
-      <!-- If your application is designed to work with Windows 7, uncomment the following supportedOS node-->
-      <!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>-->
+      <!-- Windows 7 -->
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />
 
-      <!-- If your application is designed to work with Windows 8, uncomment the following supportedOS node-->
-      <!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"></supportedOS>-->
+      <!-- Windows 8 -->
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />
 
-      <!-- If your application is designed to work with Windows 8.1, uncomment the following supportedOS node-->
-      <!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>-->
+      <!-- Windows 8.1 -->
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />
+
+      <!-- Windows 10 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
 
     </application>
   </compatibility>
 
+  <!-- Indicates that the application is DPI-aware and will not be automatically scaled by Windows at higher
+       DPIs. Windows Presentation Foundation (WPF) applications are automatically DPI-aware and do not need 
+       to opt in. Windows Forms applications targeting .NET Framework 4.6 that opt into this setting, should 
+       also set the 'EnableWindowsFormsHighDpiAutoResizing' setting to 'true' in their app.config. -->
+  <!--
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+    </windowsSettings>
+  </application>
+  -->
+
   <!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
   <!-- <dependency>
     <dependentAssembly>

ProjectManager/ProjectManagerHardwareVM.vb

@@ -361,6 +361,8 @@ Public Class ProjectManagerHardwareVM
       End If
       Try
          Using zip As New Ionic.Zip.ZipFile(sZipToCreate, Console.Out)
+            zip.AlternateEncodingUsage = Ionic.Zip.ZipOption.Always
+            zip.AlternateEncoding = Text.Encoding.UTF8
             ' aggiungo progetto corrente .nge
             If File.Exists(sCurrProject) Then
                zip.AddItem(sCurrProject, "")

ProjectManager/ProjectManagerVM.vb

@@ -1121,6 +1121,8 @@ Public Class ProjectManagerVM
       End If
       Try
          Using zip As New Ionic.Zip.ZipFile(sZipToCreate, Console.Out)
+            zip.AlternateEncodingUsage = Ionic.Zip.ZipOption.Always
+            zip.AlternateEncoding = Text.Encoding.UTF8
             ' aggiungo progetto corrente .nge
             If File.Exists(sCurrProject) Then
                zip.AddItem(sCurrProject, "")