From 935eae56082fc63d5d65a7d9adebade8ddbd2134 Mon Sep 17 00:00:00 2001 From: Demetrio Cassarino Date: Thu, 5 Feb 2026 16:33:23 +0100 Subject: [PATCH] EgtBEAMWALL 3.1.1.7: -aggiornato grafica datagrid --- EgtBEAMWALL.Core/My Project/AssemblyInfo.vb | 4 ++-- .../NewOpenProjectFileDialogVM.vb | 2 +- .../OpenProjectFileDialogV.xaml.vb | 2 +- .../Properties/AssemblyInfo.cs | 4 ++-- .../ItemParamList/RawPartListV.xaml | 16 ++++++++++++++++ .../My Project/AssemblyInfo.vb | 4 ++-- .../UpdateBTLWnd/UpdateBTLWndV.xaml.vb | 2 +- .../WarehouseWnd/WarehouseWndVM.vb | 19 ++++++++++--------- .../My Project/AssemblyInfo.vb | 4 ++-- 9 files changed, 37 insertions(+), 20 deletions(-) diff --git a/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb index b5b388b1..4416f252 100644 --- a/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb +++ b/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb @@ -38,5 +38,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb b/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb index 47768e4e..8dca509b 100644 --- a/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb +++ b/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb @@ -720,7 +720,7 @@ Public MustInherit Class NewOpenProjectFileDialogVM ''' Public Overridable Sub Cancel() ' Salvo modifiche a colonne - EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_NEWOPENPROJFILEDLG_PROD, ProdColumns) + EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_NEWOPENPROJFILEDLG_PROD, ProdColumns) End Sub #End Region ' Cancel diff --git a/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogV.xaml.vb b/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogV.xaml.vb index c0952b2d..0c1cad1f 100644 --- a/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogV.xaml.vb +++ b/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogV.xaml.vb @@ -70,7 +70,7 @@ Public Class OpenProjectFileDialogV Private Sub CloseWindow(bDialogResult As Boolean) Handles m_OpenProjFileDialogVM.m_CloseWindow ' Salvo modifiche a colonne - EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(System.IO.Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_OPENPROJFILEDLG_PROD, m_OpenProjFileDialogVM.ProjectColumns) + EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_OPENPROJFILEDLG_PROD, m_OpenProjFileDialogVM.ProjectColumns) Me.DialogResult = bDialogResult End Sub diff --git a/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs b/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs index 52c2ddec..cf1d555f 100644 --- a/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs +++ b/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.1.1.6")] -[assembly: AssemblyFileVersion("3.1.1.6")] +[assembly: AssemblyVersion("3.1.1.7")] +[assembly: AssemblyFileVersion("3.1.1.7")] diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListV.xaml b/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListV.xaml index bc91a1f2..36cb50be 100644 --- a/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListV.xaml +++ b/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListV.xaml @@ -11,6 +11,14 @@ CanUserDeleteRows="False" SelectionMode="Single" Margin="2.5,0,0,5" + EnableRowVirtualization="True" + EnableColumnVirtualization="True" + VirtualizingStackPanel.IsVirtualizing="True" + VirtualizingPanel.IsVirtualizingWhenGrouping="True" + VirtualizingPanel.ScrollUnit="Pixel" + RenderOptions.CachingHint="Cache" + VirtualizingPanel.CacheLength="10" + VirtualizingPanel.CacheLengthUnit="Pixel" ColumnLayouts="{Binding RawPartColumns}" BeginningEdit="RawPartList_BeginningEdit" AlternatingRowBackground="{StaticResource BeamWall_LinkWater}" @@ -319,6 +327,14 @@ SelectionMode="Single" Margin="15,0,0,5" BeginningEdit="PartInRawPartList_BeginningEdit" + EnableRowVirtualization="True" + EnableColumnVirtualization="True" + VirtualizingStackPanel.IsVirtualizing="True" + VirtualizingPanel.IsVirtualizingWhenGrouping="True" + VirtualizingPanel.ScrollUnit="Pixel" + RenderOptions.CachingHint="Cache" + VirtualizingPanel.CacheLength="10" + VirtualizingPanel.CacheLengthUnit="Pixel" ColumnLayouts="{Binding DataContext.PartInRawPartColumns, RelativeSource={RelativeSource AncestorType={x:Type OPTIMIZER:RawPartListV}}}" ColumnHeaderStyle="{StaticResource RawPart_DataGridColumnHeader}" GridLinesVisibility="None" diff --git a/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb index 5302b466..67d4a928 100644 --- a/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb +++ b/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb @@ -67,5 +67,5 @@ Imports System.Windows ' Revision ' - - + + diff --git a/EgtBEAMWALL.Optimizer/UpdateBTLWnd/UpdateBTLWndV.xaml.vb b/EgtBEAMWALL.Optimizer/UpdateBTLWnd/UpdateBTLWndV.xaml.vb index 2530cdff..61dcd517 100644 --- a/EgtBEAMWALL.Optimizer/UpdateBTLWnd/UpdateBTLWndV.xaml.vb +++ b/EgtBEAMWALL.Optimizer/UpdateBTLWnd/UpdateBTLWndV.xaml.vb @@ -14,7 +14,7 @@ Public Class UpdateBTLWndV End Sub Private Sub CloseWindow(bDialogResult As Boolean) Handles m_UpdateBTLWndVM.m_CloseWindow - EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_UPDATEBTLPARTLIST, m_UpdateBTLWndVM.UpdateBTLColumns) + EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_UPDATEBTLPARTLIST, m_UpdateBTLWndVM.UpdateBTLColumns) Me.DialogResult = bDialogResult End Sub diff --git a/EgtBEAMWALL.Optimizer/WarehouseWnd/WarehouseWndVM.vb b/EgtBEAMWALL.Optimizer/WarehouseWnd/WarehouseWndVM.vb index ccc8bb6d..fd26c525 100644 --- a/EgtBEAMWALL.Optimizer/WarehouseWnd/WarehouseWndVM.vb +++ b/EgtBEAMWALL.Optimizer/WarehouseWnd/WarehouseWndVM.vb @@ -1,8 +1,8 @@ -Imports EgtWPFLib5 -Imports EgtUILib -Imports System.Collections.ObjectModel -Imports EgtBEAMWALL.Core +Imports System.Collections.ObjectModel Imports System.IO +Imports EgtBEAMWALL.Core +Imports EgtUILib +Imports EgtWPFLib5 Public Class WarehouseWndVM Inherits VMBase @@ -664,13 +664,13 @@ Public Class WarehouseWndVM Case WarehouseType.MEDIUM Dim sWarehousePath As String = Map.refMainWindowVM.MainWindowM.sWarehouseDir & "\" & WH_MEDIUM_INI_FILE_NAME - If Map.refProjectVM.BTLStructureVM.nPROJTYPE = MachineType.BEAM Then ' Verifico che i valori siano tutti > 0 If dStartOffset < 0 OrElse dOffset < 0 Then MessageBox.Show(IncorrectValues_Msg, Error_Msg) Return End If + For Each SPItem In SParamList If IsNothing(SParamList(ParamIndex - 1).SectXMat) OrElse SParamList(ParamIndex - 1).dL <= 0 Then MessageBox.Show(IncorrectValues_Msg, Error_Msg) @@ -682,6 +682,7 @@ Public Class WarehouseWndVM WritePrivateProfileString(S_BEAM, K_STARTOFFSET, LenToString(dStartOffset, 3), sWarehousePath) WritePrivateProfileString(S_BEAM, K_OFFSET, LenToString(dOffset, 3), sWarehousePath) ParamIndex = 1 + For Each SPItem In SParamList Dim sL As String = String.Empty sL = LenToString(SParamList(ParamIndex - 1).dL, 3) @@ -757,9 +758,9 @@ Public Class WarehouseWndVM End Select If Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.BEAM Then - EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_SPARAMLIST_BEAM, SParamColumns) + EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_SPARAMLIST_BEAM, SParamColumns) Else - EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_SPARAMLIST_WALL, SParamColumns) + EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_SPARAMLIST_WALL, SParamColumns) End If RaiseEvent m_CloseWindow(True) End Sub @@ -779,9 +780,9 @@ Public Class WarehouseWndVM Public Sub Cancel() If Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.BEAM Then - EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_SPARAMLIST_BEAM, SParamColumns) + EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_SPARAMLIST_BEAM, SParamColumns) Else - EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_SPARAMLIST_WALL, SParamColumns) + EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_SPARAMLIST_WALL, SParamColumns) End If RaiseEvent m_CloseWindow(True) End Sub diff --git a/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb index ba3ee12b..64d702ad 100644 --- a/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb +++ b/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb @@ -70,5 +70,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + +