From e19032f3cbffa227374fe8ae673c55a0fa19be48 Mon Sep 17 00:00:00 2001 From: RenzoL Date: Mon, 24 Jan 2022 16:50:16 +0100 Subject: [PATCH] =?UTF-8?q?Correzione=20alla=20visibilit=C3=A0=20delle=20c?= =?UTF-8?q?olonne=20delle=20EgtDataGrid=20che=20non=20veniva=20pi=C3=B9=20?= =?UTF-8?q?settata=20correttamente?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OpenProjectFileDialogVM.vb | 4 +++ .../ItemParamList/PartInRawPartListVM.vb | 4 +++ .../ItemParamList/RawPartListVM.vb | 4 +++ EgtBEAMWALL.Supervisor/MainMenu/MainMenuVM.vb | 4 +++ .../AddSectionXMaterialWndVM.vb | 4 +++ .../MyBeamMachiningsWindowVM.vb | 3 ++ .../ItemParamList/PartInRawPartListVM.vb | 4 +++ .../ItemParamList/RawPartListVM.vb | 4 +++ .../MainMenu/MainMenuVM.vb | 32 +++++++++++++++++++ .../WarehouseWnd/WarehouseWndVM.vb | 4 +++ 10 files changed, 67 insertions(+) diff --git a/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogVM.vb b/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogVM.vb index dc1109ed..7c87dd58 100644 --- a/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogVM.vb +++ b/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogVM.vb @@ -267,6 +267,10 @@ Public MustInherit Class OpenProjectFileDialogVM New IdNameStruct(OpenProjFileColumn.BTLFILENAME, BTLFileName_Msg), New IdNameStruct(OpenProjFileColumn.CREATEDATE, CreateDate_Msg)}) End If + ' setto la visibilità delle colonne delle EgtDataGrid + For Each col In ProjectColumns + col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed) + Next End Sub Friend Function VerifySelected() As Boolean diff --git a/EgtBEAMWALL.Supervisor/ItemParamList/PartInRawPartListVM.vb b/EgtBEAMWALL.Supervisor/ItemParamList/PartInRawPartListVM.vb index b7fcf0bc..a7db2123 100644 --- a/EgtBEAMWALL.Supervisor/ItemParamList/PartInRawPartListVM.vb +++ b/EgtBEAMWALL.Supervisor/ItemParamList/PartInRawPartListVM.vb @@ -176,6 +176,10 @@ Public Class PartInRawPartListVM ' PartInRawPartColumns.Clear() 'GetPrivateProfileColumns(S_PARTINRAWPARTLIST_WALL, PartInRawPartColumns) End If + ' setto la visibilità delle colonne delle EgtDataGrid + For Each col In PartInRawPartColumns + col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed) + Next End Sub End Class diff --git a/EgtBEAMWALL.Supervisor/ItemParamList/RawPartListVM.vb b/EgtBEAMWALL.Supervisor/ItemParamList/RawPartListVM.vb index a23ca2fd..79c39d5c 100644 --- a/EgtBEAMWALL.Supervisor/ItemParamList/RawPartListVM.vb +++ b/EgtBEAMWALL.Supervisor/ItemParamList/RawPartListVM.vb @@ -104,6 +104,10 @@ Public Class RawPartListVM 'RawPartColumns.Clear() 'GetPrivateProfileColumns(S_RAWPARTLIST_WALL, RawPartColumns) End If + ' setto la visibilità delle colonne delle EgtDataGrid + For Each col In RawPartColumns + col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed) + Next End Sub End Class diff --git a/EgtBEAMWALL.Supervisor/MainMenu/MainMenuVM.vb b/EgtBEAMWALL.Supervisor/MainMenu/MainMenuVM.vb index 4313b855..1de53c3b 100644 --- a/EgtBEAMWALL.Supervisor/MainMenu/MainMenuVM.vb +++ b/EgtBEAMWALL.Supervisor/MainMenu/MainMenuVM.vb @@ -175,6 +175,10 @@ Public Class MainMenuVM Map.refRawPartListVM.UpdateColumns(BWType.BEAM) Map.refPartInRawPartListVM.UpdateColumns(BWType.BEAM) End If + ' setto la visibilità delle colonne delle EgtDataGrid + For Each col In Map.refFeatureInPartInRawPartListVM.FeatureInPartInRawPartColumns + col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed) + Next '' apro progetto proj 'If Not IsNothing(Map.refProjManagerVM.CurrProj) Then ' If Map.refProjManagerVM.CurrProj.bReloadProject Then diff --git a/EgtBEAMWALL.ViewerOptimizer/AddSectionXMaterialWnd/AddSectionXMaterialWndVM.vb b/EgtBEAMWALL.ViewerOptimizer/AddSectionXMaterialWnd/AddSectionXMaterialWndVM.vb index 427a774d..707ccde3 100644 --- a/EgtBEAMWALL.ViewerOptimizer/AddSectionXMaterialWnd/AddSectionXMaterialWndVM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/AddSectionXMaterialWnd/AddSectionXMaterialWndVM.vb @@ -247,6 +247,10 @@ Public Class AddSectionXMaterialWndVM ' carico le colonne della datagrid GetPrivateProfileColumns(S_SECTXMATLIST_WALL, SectXMatColumns) End If + ' setto la visibilità delle colonne delle EgtDataGrid + For Each col In SectXMatColumns + col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed) + Next End Sub #End Region ' LoadColumns diff --git a/EgtBEAMWALL.ViewerOptimizer/BeamMachiningsWindow/MyBeamMachiningsWindowVM.vb b/EgtBEAMWALL.ViewerOptimizer/BeamMachiningsWindow/MyBeamMachiningsWindowVM.vb index bf8ba267..30c5eeca 100644 --- a/EgtBEAMWALL.ViewerOptimizer/BeamMachiningsWindow/MyBeamMachiningsWindowVM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/BeamMachiningsWindow/MyBeamMachiningsWindowVM.vb @@ -25,6 +25,9 @@ Public Class MyBeamMachiningsWindowVM MyBase.New(sTitle, sBaseDir, sMachTypePath, sTabTemplPath, bIsBeam) ' carico le colonne della datagrid GetPrivateProfileColumns(S_BEAMMACHININGS, BeamMachiningsColumns) + For Each col In BeamMachiningsColumns + col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed) + Next End Sub #End Region ' CONSTRUCTOR diff --git a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/PartInRawPartListVM.vb b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/PartInRawPartListVM.vb index 2688e8ad..9a8a550d 100644 --- a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/PartInRawPartListVM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/PartInRawPartListVM.vb @@ -129,6 +129,10 @@ Public Class PartInRawPartListVM m_colPartInRawPart_Flip = m_PartInRawPartColumns.FirstOrDefault(Function(x) x.Name = COL_FLIP) m_colPartInRawPart_PosX = m_PartInRawPartColumns.FirstOrDefault(Function(x) x.Name = COL_POSX) m_colPartInRawPart_PosY = m_PartInRawPartColumns.FirstOrDefault(Function(x) x.Name = COL_POSY) + ' setto la visibilità delle colonne delle EgtDataGrid + For Each col In PartInRawPartColumns + col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed) + Next End Sub End Class diff --git a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/RawPartListVM.vb b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/RawPartListVM.vb index e4eb6a51..43a11610 100644 --- a/EgtBEAMWALL.ViewerOptimizer/ItemParamList/RawPartListVM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/ItemParamList/RawPartListVM.vb @@ -98,6 +98,10 @@ Public Class RawPartListVM End If ' recupero riferimento a colonna StartCut m_colRawPart_StartCut = RawPartColumns.FirstOrDefault(Function(x) x.Name = COL_STARTCUT) + ' setto la visibilità delle colonne delle EgtDataGrid + For Each col In RawPartColumns + col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed) + Next End Sub End Class diff --git a/EgtBEAMWALL.ViewerOptimizer/MainMenu/MainMenuVM.vb b/EgtBEAMWALL.ViewerOptimizer/MainMenu/MainMenuVM.vb index 8e1a438a..834e982b 100644 --- a/EgtBEAMWALL.ViewerOptimizer/MainMenu/MainMenuVM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/MainMenu/MainMenuVM.vb @@ -186,9 +186,25 @@ Public Class MainMenuVM Map.refProjectVM.SetOptimizePanel_Visibility(Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.WALL AndAlso Map.refMainWindowVM.MainWindowM.GetKeyOption(KEY_OPT.NESTING_AUTO)) Map.refProjectVM.NotifyAllPanelVisibility() Map.refCALCPanelVM.SetChooseMachineBtn_Visibility(True) + ' setto la visibilità delle colonne delle EgtDataGrid If Not IsNothing(Map.refFeatureListVM.colFeature_Do) Then Map.refFeatureListVM.colFeature_Do.ColumnVisibility = Visibility.Visible End If + For Each col In Map.refFeatureListVM.FeatureColumns + col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed) + Next + For Each col In Map.refPartListVM.PartColumns + col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed) + Next + For Each col In Map.refStatisticsVM.StatisticsColumns + col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed) + Next + For Each col In Map.refPParameterListVM.PParameterListColumns + col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed) + Next + For Each col In Map.refQParameterListVM.QParameterListColumns + col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed) + Next ' imposto dimensioni colonne/righe della Grid DimensionsIniFile.ReadGridDimensions(ConstDims.PROJECT_VIEW, Map.refProjectVM.GridDims) DimensionsIniFile.ReadGridDimensions(ConstDims.LEFTPANEL_VIEW, Map.refLeftPanelVM.GridDims) @@ -268,6 +284,22 @@ Public Class MainMenuVM Map.refProjectVM.SetOptimizePanel_Visibility(True) Map.refProjectVM.NotifyAllPanelVisibility() Map.refCALCPanelVM.SetChooseMachineBtn_Visibility(False) + ' setto la visibilità delle colonne delle EgtDataGrid + For Each col In Map.refFeatureListVM.FeatureColumns + col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed) + Next + For Each col In Map.refRawPartListVM.RawPartColumns + col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed) + Next + For Each col In Map.refFeatureInPartInRawPartListVM.FeatureInPartInRawPartColumns + col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed) + Next + For Each col In Map.refPartInRawPartListVM.PartInRawPartColumns + col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed) + Next + For Each col In Map.refStatisticsVM.OptimizerStatisticsColumns + col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed) + Next ' imposto dimensioni colonne/righe della Grid DimensionsIniFile.ReadGridDimensions(ConstDims.PROJECT_OPTIMIZER, Map.refProjectVM.GridDims) DimensionsIniFile.ReadGridDimensions(ConstDims.LEFTPANEL_OPTIMIZER, Map.refLeftPanelVM.GridDims) diff --git a/EgtBEAMWALL.ViewerOptimizer/WarehouseWnd/WarehouseWndVM.vb b/EgtBEAMWALL.ViewerOptimizer/WarehouseWnd/WarehouseWndVM.vb index 9d8e8f2f..09450276 100644 --- a/EgtBEAMWALL.ViewerOptimizer/WarehouseWnd/WarehouseWndVM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/WarehouseWnd/WarehouseWndVM.vb @@ -903,6 +903,10 @@ Public Class WarehouseWndVM ' carico le colonne della datagrid GetPrivateProfileColumns(S_SPARAMLIST_WALL, SParamColumns) End If + ' setto la visibilità delle colonne delle EgtDataGrid + For Each col In SParamColumns + col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed) + Next End Sub Public Shared Sub CheckExistingSectionXMaterial()