Optimizer 2.7.10.5

-Test nuova datagrid in PParamters da testare

EgtBEAMWALL.Optimizer/EgtBEAMWALL.Optimizer.vbproj

@@ -1027,6 +1027,9 @@
     <PackageReference Include="EgwMultiEngineManager.Data">
       <Version>2.7.10.1</Version>
     </PackageReference>
+    <PackageReference Include="EgwWPFBaseLib">
+      <Version>2.7.10-beta.8</Version>
+    </PackageReference>
     <PackageReference Include="EntityFramework">
       <Version>6.4.4</Version>
     </PackageReference>

EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdPParameterListV.xaml

@@ -2,7 +2,7 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.Optimizer" 
-             xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core">
+             xmlns:EgwWPFBaseLib="clr-namespace:EgwWPFBaseLib;assembly=EgwWPFBaseLib">
 
    <Grid Margin="5">
       <Grid.RowDefinitions>
@@ -13,18 +13,18 @@
          <ColumnDefinition Width="1*"/>
          <ColumnDefinition Width="Auto"/>
       </Grid.ColumnDefinitions>
-      <EgtBEAMWALLCORE:EgtDataGrid CanUserDeleteRows="False"
-                                   SelectionMode="Single"
-                                   Margin="0,0,0,5"
-                                   ItemsSource="{Binding Tag.PBTLParamVMList, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPParameterListV}}}"
-                                   SelectedItem="{Binding Tag.SelPBTLParam, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPParameterListV}}}"
-                                   IsEnabled="{Binding PParameterList_IsEnabled}"    
-                                   BindingColumns="{Binding PParameterListColumns}"
-                                   AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
-                                   AlternationCount="2"
-                                   ColumnHeaderStyle="{StaticResource PParam_DataGridColumnHeader}"
-                                   CellStyle="{StaticResource CellDataGrid_CustomHighLight}"
-                                   Style="{StaticResource DataGrid_OnlyProd}">
+      <EgwWPFBaseLib:EgwDataGrid CanUserDeleteRows="False"
+                                 SelectionMode="Single"
+                                 Margin="0,0,0,5"
+                                 ItemsSource="{Binding Tag.PBTLParamVMList, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPParameterListV}}}"
+                                 SelectedItem="{Binding Tag.SelPBTLParam, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdPParameterListV}}}"
+                                 IsEnabled="{Binding PParameterList_IsEnabled}"    
+                                 ColumnLayouts="{Binding PParameterListColumns}"
+                                 AlternatingRowBackground="{StaticResource BeamWall_LinkWater}"
+                                 AlternationCount="2"
+                                 ColumnHeaderStyle="{StaticResource PParam_DataGridColumnHeader}"
+                                 CellStyle="{StaticResource CellDataGrid_CustomHighLight}"
+                                 Style="{StaticResource DataGrid_OnlyProd}">
          <DataGrid.RowStyle>
             <Style TargetType="DataGridRow" BasedOn="{StaticResource RowDataGrid_CustomHighLight}">
                <EventSetter Event="PreviewMouseDown" Handler="PParameterList_PreviewMouseDown"/>
@@ -43,8 +43,8 @@
                <DataGridTemplateColumn.CellTemplate>
                   <DataTemplate>
                      <CheckBox IsChecked="{Binding bCustom, UpdateSourceTrigger=PropertyChanged}"
-                            Visibility="{Binding Tag, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"
-                            VerticalAlignment="Center"/>
+                               Visibility="{Binding Tag, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"
+                               VerticalAlignment="Center"/>
                   </DataTemplate>
                </DataGridTemplateColumn.CellTemplate>
             </DataGridTemplateColumn>
@@ -130,7 +130,7 @@
                </DataGridTextColumn.HeaderTemplate>
             </DataGridTextColumn>
          </DataGrid.Resources>
-      </EgtBEAMWALLCORE:EgtDataGrid>
+      </EgwWPFBaseLib:EgwDataGrid>
 
       <Image Grid.Column="1" Width="250"
              Source="{Binding sCurrDraw}" 

EgtBEAMWALL.Optimizer/ItemParamList/PParameterListVM.vb

@@ -8,19 +8,19 @@ Public Class PParameterListVM
 
 #Region "FIELDS & PROPERTIES"
 
-   Private m_colPParam_Value As EgtDataGridColumn
-   Public ReadOnly Property colPParam_Value As EgtDataGridColumn
+   Private m_colPParam_Value As EgwWPFBaseLib.ColumnLayout
+   Public ReadOnly Property colPParam_Value As EgwWPFBaseLib.ColumnLayout
       Get
          Return m_colPParam_Value
       End Get
    End Property
 
-   Private m_PParameterListColumns As New ObservableCollection(Of EgtDataGridColumn)
-   Public Property PParameterListColumns As ObservableCollection(Of EgtDataGridColumn)
+   Private m_PParameterListColumns As New ObservableCollection(Of EgwWPFBaseLib.ColumnLayout)
+   Public Property PParameterListColumns As ObservableCollection(Of EgwWPFBaseLib.ColumnLayout)
       Get
          Return m_PParameterListColumns
       End Get
-      Set(value As ObservableCollection(Of EgtDataGridColumn))
+      Set(value As ObservableCollection(Of EgwWPFBaseLib.ColumnLayout))
          m_PParameterListColumns = value
       End Set
    End Property
@@ -108,10 +108,21 @@ Public Class PParameterListVM
    Sub New()
       ' Aggiungo riferimento a Map
       Map.SetRefPParameterListVM(Me)
+
+      'Dim NewColumnList As New ObservableCollection(Of EgwWPFBaseLib.ColumnLayout)({New EgwWPFBaseLib.ColumnLayout("colNAME", DataGridLengthUnitType.Auto, 1, True, Nothing, False, False, True, True, False, False),
+      '                                                                              New EgwWPFBaseLib.ColumnLayout("colDESC", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, True, True, True),
+      '                                                                              New EgwWPFBaseLib.ColumnLayout("colVALUE", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, False, True, True),
+      '                                                                              New EgwWPFBaseLib.ColumnLayout("colMIN", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, False, True, True),
+      '                                                                              New EgwWPFBaseLib.ColumnLayout("colMAX", DataGridLengthUnitType.Pixel, 30, True, Nothing, True, True, True, False, True, True)})
+      'EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout("C:\Temp\prova.json", S_PARAMETERLIST_P, NewColumnList)
+
       ' carico le colonne della datagrid
-      GetPrivateProfileColumns(S_PARAMETERLIST_P, PParameterListColumns)
+      EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout("C:\Temp\prova.json", S_PARAMETERLIST_P, PParameterListColumns)
+
+      '' carico le colonne della datagrid
+      'GetPrivateProfileColumns(S_PARAMETERLIST_P, PParameterListColumns)
       ' recupero riferimento a colonna Value
-      m_colPParam_Value = PParameterListColumns.FirstOrDefault(Function(x) x.Name = COL_VALUE)
+      m_colPParam_Value = PParameterListColumns.FirstOrDefault(Function(x) x.Key = COL_VALUE)
    End Sub
 
 #End Region    ' CONSTRUCTOR

EgtBEAMWALL.Optimizer/MainWindow/MainWindowVM.vb

@@ -402,6 +402,8 @@ Public Class MainWindowVM
       DbControllers.m_ProdController.LockByProdId(ProjectManagerVM.CurrProd.nProdId, False, Map.refMainWindowVM.MainWindowM.GetKeyNumber())
       ' chiudo esecutore Engine
       MyExecProcessManager.Close()
+      ' 
+      EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout("C:\Temp\prova.json", S_PARAMETERLIST_P, Map.refPParameterListVM.PParameterListColumns)
       ' Termino il Model
       m_MainWindowM.Close()
       ' Termino il programma

EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb

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

EgtBEAMWALL.Optimizer/Project/ProjectVM.vb

@@ -472,7 +472,7 @@ Public Class ProjectVM
                Map.refFeatureListVM.colFeature_Do.ResetToOrigIsReadOnly()
             End If
             If Not IsNothing(Map.refPParameterListVM.colPParam_Value) Then
-               Map.refPParameterListVM.colPParam_Value.ResetToOrigIsReadOnly()
+               Map.refPParameterListVM.colPParam_Value.ResetIsReadOnlyToOrig()
             End If
             If Not IsNothing(Map.refQParameterListVM) AndAlso Not IsNothing(Map.refQParameterListVM.colQParam_Value) Then
                Map.refQParameterListVM.colQParam_Value.ResetToOrigIsReadOnly()