Optimizer 2.7.11.3

-Piccola correzione su parametri generali su combobox

EgtBEAMWALL.Optimizer/BTLDataWnd/BTLDataWndVM.vb

@@ -575,6 +575,7 @@ Public Class BTLDataWndVM
 #Region "CONSTRUCTOR"
 
    Sub New(nProjId As Integer)
+      m_GeneralParametersList.Clear()
       ' leggo cartella dei setup delle strategie
       Dim AISetupDirPath As String = Map.refMainWindowVM.MainWindowM.GetAISetupDirPath(ProjectManagerVM.CurrProd.nType, True)
       Dim AISetupPaths As String() = Directory.GetFiles(AISetupDirPath)
@@ -626,7 +627,6 @@ Public Class BTLDataWndVM
                   End If
             End Select
          Next
-         NotifyPropertyChanged(NameOf(GeneralParametersList))
       End If
 
       ' Leggo info se presenti
@@ -657,11 +657,15 @@ Public Class BTLDataWndVM
                SetbSaveGeneralParameters(True)
                SetGeneralParametersIsEnable(True)
                Dim sTmpComboValue As String = DirectCast(GeneralParameter, ComboGenericParameter).SelValue.sValue
-               If Not EgtGetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge, DirectCast(GeneralParameter, ComboGenericParameter).SelValue.sValue) Then
+               Dim sTmpValueInfo As String = String.Empty
+               EgtGetInfo(m_nBTLInfoLayerId, GeneralParameter.sNameNge, sTmpValueInfo)
+               If sTmpValueInfo = String.Empty Then
                   DirectCast(GeneralParameter, ComboGenericParameter).SelValue.sValue = sTmpComboValue
                   SetbSaveGeneralParameters(False)
                   SetGeneralParametersIsEnable(False)
                   Return
+               Else
+                  DirectCast(GeneralParameter, ComboGenericParameter).SelValue = DirectCast(GeneralParameter, ComboGenericParameter).ComboList.FirstOrDefault(Function(x) x.sValue = sTmpValueInfo)
                End If
             Case GetType(StringGenericParameter)
                SetbSaveGeneralParameters(True)
@@ -690,6 +694,7 @@ Public Class BTLDataWndVM
                Next
          End Select
       Next
+      NotifyPropertyChanged(NameOf(GeneralParametersList))
    End Sub
 
 #End Region    ' CONSTRUCTOR

EgtBEAMWALL.Optimizer/BTLPartManager/BTLPartManagerVM.vb

@@ -238,11 +238,15 @@ Public Class BTLPartManagerVM
                Map.refProjectVM.SetbSaveGeneralParameters(True)
                Map.refProjectVM.SetGeneralParametersIsEnable(True)
                Dim sTmpComboValue As String = DirectCast(GeneralParameter, ComboGenericParameter).SelValue.sValue
-               If Not EgtGetInfo(Map.refProjectVM.BTLStructureVM.SelBTLPart.BTLPartM.nPartId, GeneralParameter.sNameNge, DirectCast(GeneralParameter, ComboGenericParameter).SelValue.sValue) Then
+               Dim sTmpValueInfo As String = String.Empty
+               EgtGetInfo(Map.refProjectVM.BTLStructureVM.SelBTLPart.BTLPartM.nPartId, GeneralParameter.sNameNge, sTmpValueInfo)
+               If sTmpValueInfo = String.Empty Then
                   DirectCast(GeneralParameter, ComboGenericParameter).SelValue.sValue = sTmpComboValue
                   Map.refProjectVM.SetbSaveGeneralParameters(False)
                   Map.refProjectVM.SetGeneralParametersIsEnable(False)
                   Return
+               Else
+                  DirectCast(GeneralParameter, ComboGenericParameter).SelValue = DirectCast(GeneralParameter, ComboGenericParameter).ComboList.FirstOrDefault(Function(x) x.sValue = sTmpValueInfo)
                End If
             Case GetType(StringGenericParameter)
                Map.refProjectVM.SetbSaveGeneralParameters(True)

EgtBEAMWALL.Optimizer/GeneralParametersStrategy/GeneralParametersStrategyVM.vb

@@ -713,7 +713,7 @@ Public Class ComboGenericParameter
       MyBase.New(JsonProjectParameters)
       If IsNothing(JsonProjectParameters) Then Return
       ComboList = JsonProjectParameters.Choices.Select(Function(jsonChoice) New ComboParameter(jsonChoice)).ToList()
-      'm_SelValue = m_ComboList.FirstOrDefault(Function(x) x.sValue = JsonProjectParameters.sValue)
+      SelValue = ComboList.FirstOrDefault(Function(x) x.sValue = JsonProjectParameters.sValue)
    End Sub
 
 #End Region    ' Constructor

EgtBEAMWALL.Optimizer/GeneralParametersStrategy/ProjectParametersV.xaml

@@ -92,8 +92,8 @@
                              HorizontalAlignment="Left"
                              TextWrapping="WrapWithOverflow"
                              Style="{StaticResource DialogWindow_TextBlock}"/>
-                  <ComboBox ItemsSource="{Binding ComboList}"
-                            SelectedItem="{Binding SelValue}"
+                  <ComboBox ItemsSource="{Binding ComboList, UpdateSourceTrigger=PropertyChanged}"
+                            SelectedItem="{Binding SelValue, UpdateSourceTrigger=PropertyChanged}"
                             DisplayMemberPath="sValue"
                             Margin="0"
                             Foreground="Black"

EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb

@@ -67,5 +67,5 @@ Imports System.Windows
 '      Revision
 '
 
-<Assembly: AssemblyVersion("2.7.11.2")>
-<Assembly: AssemblyFileVersion("2.7.11.2")>
+<Assembly: AssemblyVersion("2.7.11.3")>
+<Assembly: AssemblyFileVersion("2.7.11.3")>

EgtBEAMWALL.Optimizer/ProdManager/ProdManagerVM.vb

@@ -714,6 +714,11 @@ Public Class ProdManagerVM
       Dim nAsseBaseLayer As Integer = EgtGetFirstNameInGroup(GDB_ID.ROOT, ASSEBASE)
       EgtSetInfo(nAsseBaseLayer, BTL_PRT_PROJ, nProjId)
 
+      ' Apro finestra parametri generali
+      Dim GeneralParametersWndVM As New GeneralParametersWndVM()
+      GeneralParametersWndVM.SetbSaveGeneralParameters(True)
+      GeneralParametersWndVM.SaveProjectParameters()
+
       ' Controllo se effettuare import + verifica
       If Map.refConfigurationPageVM.bVerifyImportBTL_IsChecked Then
          ' Eseguo procedura
@@ -966,6 +971,15 @@ Public Class ProdManagerVM
          EgtOutLog("Errore! Impossibile creare nuovo progetto!")
          Return False
       End If
+
+      ' creo PROJECTINFO
+      Dim nProjectInfoLayer As Integer = EgtCreateGroup(GDB_ID.ROOT)
+      EgtSetName(nProjectInfoLayer, PROJECTINFO)
+      EgtSetLevel(nProjectInfoLayer, GDB_LV.SYSTEM)
+      ' scrivo info proj e tipo su layer BtlInfo
+      EgtSetInfo(nProjectInfoLayer, BTL_PRT_PROJ, nProjId)
+      EgtSetInfo(nProjectInfoLayer, BTL_GEN_PROJTYPE, nType)
+
       ' imposto CurrentMachine
       InitCurrentMachine(Machine)
       ' imposto flag secondo tipo di progetto (travi o pareti)
@@ -1002,6 +1016,11 @@ Public Class ProdManagerVM
       EgtSetInfo(nAsseBaseLayer, BTL_PRT_PROJ, nProjId)
       SectionXMaterial.SetType(nType)
 
+      ' Apro finestra parametri generali
+      Dim GeneralParametersWndVM As New GeneralParametersWndVM()
+      GeneralParametersWndVM.SetbSaveGeneralParameters(True)
+      GeneralParametersWndVM.SaveProjectParameters()
+
       ' leggo struttura BTL per liste
       Map.refProjectVM.BTLStructureVM = New BTLStructureVM(BTLStructureM.CreateBTLStructure(0))
       CopyBuilding()

EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml

@@ -2657,7 +2657,25 @@
       <Setter Property="Margin" Value="5,0,5,0"/>
       <Setter Property="TextWrapping" Value="Wrap"/>
    </Style>
+   
+   <Style TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
+      <Setter Property="Height" Value="22"/>
+      <Setter Property="VerticalContentAlignment" Value="Center"/>
+      <Setter Property="HorizontalContentAlignment" Value="Right"/>
+      <Setter Property="ExplicitUpdateSource" Value="EnterKeyPress"/>
+   </Style>
 
+   <Style x:Key="PartParam_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
+      <Setter Property="Width" Value="150"/>
+      <Setter Property="Margin" Value="5"/>
+   </Style>
+
+   <Style x:Key="Warehouse_TextBox" TargetType="{x:Type EgtWPFLib5:EgtTextBox}" BasedOn="{StaticResource {x:Type EgtWPFLib5:EgtTextBox}}">
+      <Setter Property="Width" Value="100"/>
+      <Setter Property="Margin" Value="5"/>
+      <Setter Property="TextWrapping" Value="Wrap"/>
+   </Style>
+   
    <!--#endregion TextBox-->
 
    <!--#region Border-->
@@ -2819,6 +2837,22 @@
       <Setter Property="MinWidth" Value="55"/>
       <Setter Property="Margin" Value="5,-2,0,5"/>
    </Style>
+
+   <Style x:Key="Optimize_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">
+      <Setter Property="Height" Value="22"/>
+      <Setter Property="Width" Value="85"/>
+      <Setter Property="Margin" Value="5,0,2.5,0"/>
+   </Style>
+
+   <Style x:Key="PartParam_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">
+      <Setter Property="Height" Value="22"/>
+      <Setter Property="Width" Value="150"/>
+   </Style>
+
+   <Style x:Key="Warehouse_ComboBox" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">
+      <Setter Property="Height" Value="22"/>
+      <Setter Property="Width" Value="100"/>
+   </Style>
    
    <!--#endregion ComboBox-->