Merge commit '377a6cef07e9db542071beccda2d89d6fd52b335' into feature/DevExpress

EgtBEAMWALL.Optimizer/ExecProcessManager/MyExecProcessManager.vb

@@ -1,5 +1,4 @@
 Imports System.IO
-Imports EgtBEAMWALL.Core.ConstBeam
 Imports EgtBEAMWALL.Core.ConstIni
 Imports EgtUILib
 Imports EgtWPFLib5
@@ -77,19 +76,35 @@ Module MyExecProcessManager
       EgtOutLog("Risultato progetto " & nBarId)
       CALCPanelVM.ProcessResults(sBarPath, nProgramPage, nBarId)
       If Answer.Args.Count > 4 Then
+         Dim PartItem As BTLPartVM = Map.refProjectVM.BTLStructureVM.BTLPartVMList.FirstOrDefault(Function(x) x.nPartId = nBarId)
          Dim nPreInvert As Integer = -1
          Dim bPreInvert As Boolean = False
-         Integer.TryParse(Answer.Args("PREINVERT"), nPreInvert)
-         If nPreInvert = 1 Then bPreInvert = True
-         Dim nPreRotate As Integer = -1
-         Integer.TryParse(Answer.Args("PREROTATE90"), nPreRotate)
-         Dim dAng As Integer = nPreRotate * 90
-         Dim BTLPartItem As BTLPartVM = Map.refProjectVM.BTLStructureVM.BTLPartVMList.FirstOrDefault(Function(x) x.nPartId = nBarId)
-         If nPreInvert > 0 Then
-            If BTLPartItem.IsInverted Then bPreInvert = False
-            BTLPartItem.SetInverted(bPreInvert)
+         If Answer.Args.ContainsKey("PREINVERT") Then
+            Integer.TryParse(Answer.Args("PREINVERT"), nPreInvert)
          End If
-         If nPreRotate > 0 Then BTLPartItem.ForwardRotation(True, True, dAng, False)
+         Dim nPreRotate As Integer = -1
+         If Answer.Args.ContainsKey("PREROTATE90") Then
+            Integer.TryParse(Answer.Args("PREROTATE90"), nPreRotate)
+         End If
+         If nPreInvert > 0 Then
+            If nPreInvert = 1 Then bPreInvert = True
+            If PartItem.IsInverted Then bPreInvert = False
+            PartItem.SetInverted(bPreInvert)
+         End If
+         If nPreRotate > 0 Then
+            Dim dAng As Integer = nPreRotate * 90
+            PartItem.ForwardRotation(True, True, dAng, False)
+         End If
+
+         Dim prefix As String = "INFONGEPART_"
+
+         Dim sInfoNgePartList As List(Of String) = Answer.Args.Where(Function(k) k.Key.StartsWith(prefix, StringComparison.OrdinalIgnoreCase)).Select(Function(k) k.Value).ToList()
+
+         For Each InfoNgePartItem As String In sInfoNgePartList
+            Dim sKeyVal() As String = InfoNgePartItem.Trim().Split("="c)
+            EgtSetInfo(PartItem.nPartId, sKeyVal(0), sKeyVal(1))
+         Next
+
       End If
       ' Gestione progressbar per verificare l'inizio e la fine della verifica
       Dim BeamManager As ExecProcessManager = m_ExecProcessManagerList(EXECENVIRONMENTS.BEAM)

EgtBEAMWALL.Optimizer/GeneralParametersStrategy/ProjectParametersV.xaml

@@ -76,8 +76,8 @@
                             Style="{StaticResource ProjectParameters_UniformGrid}">
                   <TextBlock Text="{Binding sDescriptionShort}" 
                              Style="{StaticResource ProjectParameters_TextBlock}"/>
-                  <ComboBox ItemsSource="{Binding ComboList, UpdateSourceTrigger=PropertyChanged}"
-                            SelectedItem="{Binding SelValue, UpdateSourceTrigger=PropertyChanged}"
+                  <ComboBox ItemsSource="{Binding ComboList}"
+                            SelectedItem="{Binding SelValue}"
                             DisplayMemberPath="sValue"
                             Style="{StaticResource ProjectParameters_ComboBox}">
                   </ComboBox>

EgtBEAMWALL.Optimizer/Project/ProjectVM.vb

@@ -634,7 +634,7 @@ Public Class ProjectVM
                   EgtGetInfo(m_BTLStructureVM.SelBTLPart.BTLPartM.nPartId, GeneralParameter.sNameNge, sTmpValueInfo)
                   DirectCast(GeneralParameter, ComboGenericParameter).SelValue = DirectCast(GeneralParameter, ComboGenericParameter).ComboList.FirstOrDefault(Function(x) x.sValue = sTmpValueInfo)
                Else
-                  DirectCast(GeneralParameter, ComboGenericParameter).SelValue.sValue = sTmpComboValue
+                  DirectCast(GeneralParameter, ComboGenericParameter).SelValue = DirectCast(GeneralParameter, ComboGenericParameter).ComboList.FirstOrDefault(Function(x) x.sValue = sTmpComboValue)
                   SetGeneralParameters(False)
                End If
             Case GetType(StringGenericParameter)
@@ -761,7 +761,12 @@ Public Class ProjectVM
       Dim sTmpStrategySetup As String = String.Empty
       Dim nBTLInfoLayerId As Integer = 0
       If bValuePart Then
-         EgtGetInfo(m_BTLStructureVM.SelBTLPart.BTLPartM.nPartId, AI_SETUP, m_SelStrategySetup)
+         If m_SelStrategySetup Is String.Empty Then
+            nBTLInfoLayerId = EgtGetFirstNameInGroup(GDB_ID.ROOT, BTLINFO)
+            EgtGetInfo(nBTLInfoLayerId, AI_SETUP, m_SelStrategySetup)
+         Else
+            EgtGetInfo(m_BTLStructureVM.SelBTLPart.BTLPartM.nPartId, AI_SETUP, m_SelStrategySetup)
+         End If
       Else
          nBTLInfoLayerId = EgtGetFirstNameInGroup(GDB_ID.ROOT, BTLINFO)
          EgtGetInfo(nBTLInfoLayerId, AI_SETUP, sStrategyBTLSetup)
@@ -968,7 +973,14 @@ Public Class ProjectVM
 
    Public Sub Ok()
       NotifyPropertyChanged(NameOf(GeneralParametersList))
-      EgtSetInfo(m_BTLStructureVM.SelBTLPart.BTLPartM.nPartId, AI_SETUP, m_SelStrategySetup)
+      If m_SelStrategySetup Is String.Empty Then
+         Dim nBTLInfoLayerId As Integer = 0
+         nBTLInfoLayerId = EgtGetFirstNameInGroup(GDB_ID.ROOT, BTLINFO)
+         EgtGetInfo(nBTLInfoLayerId, AI_SETUP, m_SelStrategySetup)
+         EgtSetInfo(m_BTLStructureVM.SelBTLPart.BTLPartM.nPartId, AI_SETUP, m_SelStrategySetup)
+      Else
+         EgtSetInfo(m_BTLStructureVM.SelBTLPart.BTLPartM.nPartId, AI_SETUP, m_SelStrategySetup)
+      End If
       Dim sInfo As String = String.Empty
       If m_bSaveGeneralParameters Then
          For Each GeneralParameter In m_GeneralParametersList