From 24b9809353a168149a0017524c0eb5ca077cbb46 Mon Sep 17 00:00:00 2001
From: Demetrio Cassarino <demetrio.cassarino@egalware.com>
Date: Mon, 10 Nov 2025 16:03:09 +0100
Subject: [PATCH] Optimizer 2.7.11.5 -modifica su importazione btl aggiunto
 aisetup

---
 .../BTLPartManager/BTLPartManagerVM.vb                | 11 ++++++++---
 EgtBEAMWALL.Optimizer/EgtBEAMWALL.Optimizer.vbproj    |  2 +-
 .../GeneralParametersWndVM.vb                         | 10 +++++++++-
 EgtBEAMWALL.Optimizer/ItemParamList/RawPartListVM.vb  |  2 ++
 EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb      |  4 ++--
 EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml         |  2 ++
 6 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/EgtBEAMWALL.Optimizer/BTLPartManager/BTLPartManagerVM.vb b/EgtBEAMWALL.Optimizer/BTLPartManager/BTLPartManagerVM.vb
index a58939f8..198cc101 100644
--- a/EgtBEAMWALL.Optimizer/BTLPartManager/BTLPartManagerVM.vb
+++ b/EgtBEAMWALL.Optimizer/BTLPartManager/BTLPartManagerVM.vb
@@ -207,10 +207,15 @@ Public Class BTLPartManagerVM
 
       ' Leggo info se presenti
       Dim sInfo As String = String.Empty
+      Dim sDefaultConfigFile As String = String.Empty
+      Dim sTrimDefaultConfig As String = String.Empty
       EgtGetInfo(Map.refProjectVM.BTLStructureVM.SelBTLPart.BTLPartM.nPartId, "AISETUP", Map.refProjectVM.SelStrategySetup)
-      If IsNothing(Map.refProjectVM.SelStrategySetup) Then
-         Dim nBTLInfoLayerId As Integer = EgtGetFirstNameInGroup(GDB_ID.ROOT, BTLINFO)
-         EgtGetInfo(nBTLInfoLayerId, "AISETUP", Map.refProjectVM.SelStrategySetup)
+      If Map.refProjectVM.SelStrategySetup Is String.Empty Then
+         If GetMainPrivateProfileString(S_STRATEGY, K_DEFAULTCONFIG, "", sDefaultConfigFile) <> 0 Then
+            sTrimDefaultConfig = System.IO.Path.GetFileNameWithoutExtension(sDefaultConfigFile)
+            Map.refProjectVM.SelStrategySetup = sTrimDefaultConfig
+            EgtSetInfo(Map.refProjectVM.BTLStructureVM.SelBTLPart.BTLPartM.nPartId, "AISETUP", Map.refProjectVM.SelStrategySetup)
+         End If
       End If
       For Each GeneralParameter In Map.refProjectVM.GeneralParametersList
          Select Case GeneralParameter.GetType()
diff --git a/EgtBEAMWALL.Optimizer/EgtBEAMWALL.Optimizer.vbproj b/EgtBEAMWALL.Optimizer/EgtBEAMWALL.Optimizer.vbproj
index 5291a726..5be1d1b1 100644
--- a/EgtBEAMWALL.Optimizer/EgtBEAMWALL.Optimizer.vbproj
+++ b/EgtBEAMWALL.Optimizer/EgtBEAMWALL.Optimizer.vbproj
@@ -960,7 +960,7 @@
       <Version>2.7.10.1</Version>
     </PackageReference>
     <PackageReference Include="EgwWPFBaseLib">
-      <Version>2.7.11-beta.1</Version>
+      <Version>2.7.11-beta.4</Version>
     </PackageReference>
     <PackageReference Include="EntityFramework">
       <Version>6.4.4</Version>
diff --git a/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersWndVM.vb b/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersWndVM.vb
index b1916dda..174ab624 100644
--- a/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersWndVM.vb
+++ b/EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersWndVM.vb
@@ -130,7 +130,6 @@ Public Class GeneralParametersWndVM
             m_SelStrategySetup = sTrimDefaultConfig
             EgtGetInfo(nBTLInfoLayerId, "AISETUP", m_SelStrategySetup)
          End If
-
       End If
       For Each GeneralParameter In m_GeneralParametersList
          Select Case GeneralParameter.GetType()
@@ -199,9 +198,18 @@ Public Class GeneralParametersWndVM
 
    Friend Sub SaveProjectParameters()
       Dim sInfo As String = String.Empty
+      Dim sDefaultConfigFile As String = String.Empty
+      Dim sTrimDefaultConfig As String = String.Empty
       Dim nBTLInfoLayerId As Integer = EgtGetFirstNameInGroup(GDB_ID.ROOT, PROJECTINFO)
       If m_bSaveGeneralParameters Then
          EgtSetInfo(nBTLInfoLayerId, "AISETUP", m_SelStrategySetup)
+         If m_SelStrategySetup Is String.Empty Then
+            If GetMainPrivateProfileString(S_STRATEGY, K_DEFAULTCONFIG, "", sDefaultConfigFile) <> 0 Then
+               sTrimDefaultConfig = System.IO.Path.GetFileNameWithoutExtension(sDefaultConfigFile)
+               m_SelStrategySetup = sTrimDefaultConfig
+               EgtSetInfo(nBTLInfoLayerId, "AISETUP", m_SelStrategySetup)
+            End If
+         End If
          For Each GeneralParameter In m_GeneralParametersList
             Select Case GeneralParameter.GetType()
                Case GetType(BooleanGenericParameter)
diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListVM.vb b/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListVM.vb
index 179a2b9b..cc6b086e 100644
--- a/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListVM.vb
+++ b/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListVM.vb
@@ -214,6 +214,8 @@ Public Class RawPartListVM
    Sub New()
       ' Aggiungo riferimento a Map
       Map.SetRefRawPartListVM(Me)
+      NotifyPropertyChanged(NameOf(RawPartColumns))
+      NotifyPropertyChanged(NameOf(PartInRawPartColumns))
    End Sub
 
 #End Region    ' CONSTRUCTOR
diff --git a/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb
index fdfed442..2e5a83b5 100644
--- a/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb	
+++ b/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb	
@@ -67,5 +67,5 @@ Imports System.Windows
 '      Revision
 '
 
-<Assembly: AssemblyVersion("2.7.11.4")>
-<Assembly: AssemblyFileVersion("2.7.11.4")>
+<Assembly: AssemblyVersion("2.7.11.5")>
+<Assembly: AssemblyFileVersion("2.7.11.5")>
diff --git a/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml b/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml
index 32943671..96e52c02 100644
--- a/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml
+++ b/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml
@@ -2636,11 +2636,13 @@
    <Style x:Key="Dimension_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
       <Setter Property="Width" Value="55"/>
       <Setter Property="TextWrapping" Value="Wrap"/>
+      <Setter Property="VerticalAlignment" Value="Center"/>
    </Style>
 
    <Style x:Key="Qty_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
       <Setter Property="Width" Value="40"/>
       <Setter Property="TextWrapping" Value="Wrap"/>
+      <Setter Property="VerticalAlignment" Value="Center"/>
    </Style>
 
    <Style x:Key="FreeContour_TextBox" TargetType="{x:Type TextBox}" BasedOn="{StaticResource {x:Type TextBox}}">