Egalware/egtbeamwall
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EgtBEAMWALL 3.1.1.7:

Browse Source 
-aggiornato grafica datagrid
This commit is contained in:
Demetrio Cassarino
2026-02-05 16:33:23 +01:00
parent 78cb995cec
commit 935eae5608
9 changed files with 37 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EgtBEAMWALL.Core/My Project/AssemblyInfo.vb
+2 -2
View File
@@ -38,5 +38,5 @@ Imports System.Windows
' 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")>
EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb
+1 -1
View File
@@ -720,7 +720,7 @@ Public MustInherit Class NewOpenProjectFileDialogVM
''' </summary>
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
EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogV.xaml.vb
+1 -1
View File
@@ -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
EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -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")]
EgtBEAMWALL.Optimizer/ItemParamList/RawPartListV.xaml
+16
View File
@@ -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"
EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb
+2 -2
View File
@@ -67,5 +67,5 @@ Imports System.Windows
' Revision
'
<Assembly: AssemblyVersion("3.1.1.6")>
<Assembly: AssemblyFileVersion("3.1.1.6")>
<Assembly: AssemblyVersion("3.1.1.7")>
<Assembly: AssemblyFileVersion("3.1.1.7")>
EgtBEAMWALL.Optimizer/UpdateBTLWnd/UpdateBTLWndV.xaml.vb
+1 -1
View File
@@ -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
EgtBEAMWALL.Optimizer/WarehouseWnd/WarehouseWndVM.vb
+10 -9
View File
@@ -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
EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb
+2 -2
View File
@@ -70,5 +70,5 @@ Imports System.Windows
' 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")>