diff --git a/EgtBEAMWALL.Core/Constants/ConstDataGridColumnsIni.vb b/EgtBEAMWALL.Core/Constants/ConstDataGridColumnsIni.vb index 99a7c2c4..d2dd0134 100644 --- a/EgtBEAMWALL.Core/Constants/ConstDataGridColumnsIni.vb +++ b/EgtBEAMWALL.Core/Constants/ConstDataGridColumnsIni.vb @@ -2,8 +2,6 @@ Public Const OPTIMIZERDATAGRIDCOLUMNS_FILE_NAME As String = "OPTIMIZERDataGridColumns.ini" - Public Const S_FEATURELIST As String = "DG_FeatureList" - Public Const S_OPENPROJFILEDLG_PROJ As String = "DG_OpenProjectFileDialog_PROJ" Public Const S_OPENPROJFILEDLG_PROD As String = "DG_OpenProjectFileDialog_PROD" Public Const S_NEWOPENPROJFILEDLG_PROD As String = "DG_NewOpenProjectFileDialog_PROD" Public Const S_RAWPARTLIST_BEAM As String = "DG_RawPartList_BEAM" diff --git a/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb index 06decb4a..c8eb50f4 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/NewOpenProjectFileDialogV.xaml b/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml index 011b2df0..3261a3c3 100644 --- a/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml +++ b/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml @@ -3,9 +3,10 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5" xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core" + xmlns:EgwWPFBaseLib="clr-namespace:EgwWPFBaseLib;assembly=EgwWPFBaseLib" Title="{Binding Title}" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="True" - WindowStartupLocation="CenterScreen" ShowInTaskbar="False" + WindowStartupLocation="CenterScreen" ShowInTaskbar="False" MinHeight="500" MinWidth="500" DataContext="{Binding RelativeSource={RelativeSource Self}}" Style="{StaticResource OptimizerWindow.Dialog.NoClose}"> @@ -90,20 +91,20 @@ - + @@ -216,7 +217,7 @@ - + 0 Then - If String.IsNullOrWhiteSpace(SelProject.ProjFileList(0).sProjDirPath) OrElse Not Directory.Exists(SelProject.ProjFileList(0).sProjDirPath) Then Return False - AllFilesInDir = Directory.EnumerateFiles(SelProject.ProjFileList(0).sProjDirPath) - Else Return False - End If - ElseIf m_ProjectType = Core.ConstBeam.ProjectType.PROD Then + If m_ProjectType = Core.ConstBeam.ProjectType.PROD Then If String.IsNullOrWhiteSpace(SelProject.ProdFileVM.sProdDirPath) OrElse Not Directory.Exists(SelProject.ProdFileVM.sProdDirPath) Then Return False AllFilesInDir = Directory.EnumerateFiles(SelProject.ProdFileVM.sProdDirPath) Else @@ -744,6 +719,8 @@ Public MustInherit Class NewOpenProjectFileDialogVM ''' Execute the New. This method is invoked by the NewCommand. ''' Public Overridable Sub Cancel() + ' Salvo modifiche a colonne + EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_NEWOPENPROJFILEDLG_PROD, ProdColumns) End Sub #End Region ' Cancel diff --git a/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogV.xaml b/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogV.xaml index d50d368d..7dff4745 100644 --- a/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogV.xaml +++ b/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogV.xaml @@ -3,6 +3,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5" xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core" + xmlns:EgwWPFBaseLib="clr-namespace:EgwWPFBaseLib;assembly=EgwWPFBaseLib" Title="{Binding Title}" ResizeMode="NoResize" TitleBarHeight="30" WindowStartupLocation="CenterScreen" ShowInTaskbar="False" @@ -85,17 +86,17 @@ - + - + @@ -119,14 +120,14 @@ - + @@ -135,22 +136,22 @@ - + + --> + @@ -163,14 +164,14 @@ - + - + FilterTypes.NULL AndAlso ( - (m_SelFilterType.Id = BTLDateTypes.EXPORTDATE AndAlso Not SearchDate.Contains(CurrProj.dtExportDate.Date)) OrElse - (m_SelFilterType.Id = BTLDateTypes.CREATEDATE AndAlso Not SearchDate.Contains(CurrProj.dtCreateDate.Date))) Then bProjectOk = False - If m_SelFilterType.Id <> FilterTypes.NULL AndAlso m_SearchText <> String.Empty AndAlso ( - (m_SelFilterType.Id = FilterTypes.ID AndAlso CurrProj.sProjId.ToString.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse - (m_SelFilterType.Id = FilterTypes.BTLFILENAME AndAlso CurrProj.sBTLFileName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse - (m_SelFilterType.Id = FilterTypes.LISTNAME AndAlso CurrProj.sListName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse - (m_SelFilterType.Id = FilterTypes.MACHINE AndAlso CurrProj.sMachine.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) Then bProjectOk = False - ElseIf m_ProjectType = ProjectType.PROD Then - Dim CurrProj As ProdFileVM = DirectCast(Proj, ProdFileVM) - If m_SelFilterType.Id <> FilterTypes.NULL AndAlso ( - (m_SelFilterType.Id = BTLDateTypes.CREATEDATE AndAlso Not SearchDate.Contains(CurrProj.dtCreateDate.Date))) Then bProjectOk = False - If m_SelFilterType.Id <> FilterTypes.NULL AndAlso m_SearchText <> String.Empty AndAlso ( - (m_SelFilterType.Id = FilterTypes.ID AndAlso CurrProj.sProdId.ToString.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse - (m_SelFilterType.Id = FilterTypes.BTLFILENAME AndAlso CurrProj.sBTLFileName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse - (m_SelFilterType.Id = FilterTypes.MACHINE AndAlso CurrProj.sMachine.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) Then bProjectOk = False - End If + Dim CurrProj As ProdFileVM = DirectCast(Proj, ProdFileVM) + If m_SelFilterType.Id <> FilterTypes.NULL AndAlso ( + (m_SelFilterType.Id = BTLDateTypes.CREATEDATE AndAlso Not SearchDate.Contains(CurrProj.dtCreateDate.Date))) Then bProjectOk = False + If m_SelFilterType.Id <> FilterTypes.NULL AndAlso m_SearchText <> String.Empty AndAlso ( + (m_SelFilterType.Id = FilterTypes.ID AndAlso CurrProj.sProdId.ToString.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse + (m_SelFilterType.Id = FilterTypes.BTLFILENAME AndAlso CurrProj.sBTLFileName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse + (m_SelFilterType.Id = FilterTypes.MACHINE AndAlso CurrProj.sMachine.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) Then bProjectOk = False Return bProjectOk End Function diff --git a/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs b/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs index 5148a4b1..51b5c64b 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.3")] -[assembly: AssemblyFileVersion("3.1.1.3")] +[assembly: AssemblyVersion("3.1.1.4")] +[assembly: AssemblyFileVersion("3.1.1.4")] diff --git a/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Optimizer/My Project/AssemblyInfo.vb index 77aea063..c68b0fcd 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/OpenProjectFileDialog/OpenProjectFileDialogVM.vb b/EgtBEAMWALL.Optimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb index 567d6ec6..04a820a4 100644 --- a/EgtBEAMWALL.Optimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb +++ b/EgtBEAMWALL.Optimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb @@ -12,8 +12,6 @@ Public Class OpenProjectFileDialogVM Public Overrides Function Init(ProjectType As ProjectType, Optional CurrProjectList As List(Of ProjectFileVM) = Nothing, Optional GoToProd As Boolean = False) As Boolean? m_ProjectType = ProjectType m_GoToProd = GoToProd - ' carico colonne - LoadColumns(ProjectType) NotifyPropertyChanged(NameOf(FilterTypeList)) m_SelFilterType = m_FilterTypeList(0) ' carico lista progetti diff --git a/EgtBEAMWALL.Optimizer/ProdManager/ProdManagerVM.vb b/EgtBEAMWALL.Optimizer/ProdManager/ProdManagerVM.vb index 7d9bd228..305d2b7d 100644 --- a/EgtBEAMWALL.Optimizer/ProdManager/ProdManagerVM.vb +++ b/EgtBEAMWALL.Optimizer/ProdManager/ProdManagerVM.vb @@ -447,6 +447,10 @@ Public Class ProdManagerVM Part.CalcBTLPartVolume() Next Core.ViewPanelVM.UpdateBWType(nType) + ' imposto macchina del progetto + Map.refMachinePanelVM.SelectedMachine = Map.refMachinePanelVM.MachineList.FirstOrDefault(Function(x) String.Equals(x.Name, ProjectManagerVM.CurrProd.sMachine, StringComparison.OrdinalIgnoreCase)) + Map.refMachinePanelVM.SetSelMachineName(Map.refMachinePanelVM.SelectedMachine.Name) + Map.refMachinePanelVM.SetStrategyManagerIsChecked(True) ' aggiorno le colonne in base al tipo progetto Map.refRawPartListVM.UpdateColumns(nType) Map.refFeatureInPartInRawPartListVM.UpdateColumns(nType) diff --git a/EgtBEAMWALL.Supervisor/ConfigurationPage/ConfigurationPageVM.vb b/EgtBEAMWALL.Supervisor/ConfigurationPage/ConfigurationPageVM.vb index f0368fc7..c1931f0b 100644 --- a/EgtBEAMWALL.Supervisor/ConfigurationPage/ConfigurationPageVM.vb +++ b/EgtBEAMWALL.Supervisor/ConfigurationPage/ConfigurationPageVM.vb @@ -2,6 +2,7 @@ Imports EgtUILib Imports EgtWPFLib5 Imports EgtBEAMWALL.Core +Imports System.IO Public Class ConfigurationPageVM Inherits VMBase @@ -77,12 +78,12 @@ Public Class ConfigurationPageVM End Set End Property - Protected m_VariablesColumns As New ObservableCollection(Of EgtDataGridColumn) - Public Property VariablesColumns As ObservableCollection(Of EgtDataGridColumn) + Protected m_VariablesColumns As New ObservableCollection(Of EgwWPFBaseLib.ColumnLayout) + Public Property VariablesColumns As ObservableCollection(Of EgwWPFBaseLib.ColumnLayout) Get Return m_VariablesColumns End Get - Set(value As ObservableCollection(Of EgtDataGridColumn)) + Set(value As ObservableCollection(Of EgwWPFBaseLib.ColumnLayout)) m_VariablesColumns = value End Set End Property @@ -390,7 +391,8 @@ Public Class ConfigurationPageVM End If Next ' carico la lista delle colonne delle variabili della macchina in ConfigurationPage - GetPrivateProfileColumns(S_VARIABLESLIST, VariablesColumns) + 'GetPrivateProfileColumns(S_VARIABLESLIST, VariablesColumns) + EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_VARIABLESLIST, VariablesColumns) ' carico le Variables della macchina LoadVariables() ' leggo SectionTime e PartTime diff --git a/EgtBEAMWALL.Supervisor/MDIPage/MDIPageV.xaml b/EgtBEAMWALL.Supervisor/MDIPage/MDIPageV.xaml index e8e289ed..d44c17a8 100644 --- a/EgtBEAMWALL.Supervisor/MDIPage/MDIPageV.xaml +++ b/EgtBEAMWALL.Supervisor/MDIPage/MDIPageV.xaml @@ -2,7 +2,8 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:EgtBEAMWALLSUPERVISOR="clr-namespace:EgtBEAMWALL.Supervisor" - xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"> + xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core" + xmlns:EgwWPFBaseLib="clr-namespace:EgwWPFBaseLib;assembly=EgwWPFBaseLib"> @@ -10,23 +11,23 @@ - + @@ -48,7 +49,7 @@ - + diff --git a/EgtBEAMWALL.Supervisor/MDIPage/MDIPageVM.vb b/EgtBEAMWALL.Supervisor/MDIPage/MDIPageVM.vb index ff27b773..67081257 100644 --- a/EgtBEAMWALL.Supervisor/MDIPage/MDIPageVM.vb +++ b/EgtBEAMWALL.Supervisor/MDIPage/MDIPageVM.vb @@ -3,18 +3,19 @@ Imports EgtWPFLib5 Imports EgtUILib Imports EgtBEAMWALL.Core Imports System.Windows.Threading +Imports System.IO Public Class MDIPageVM Inherits VMBase Private m_MDIResultTimer As New DispatcherTimer - Private m_MDICommandColumns As New ObservableCollection(Of EgtDataGridColumn) - Public Property MDICommandColumns As ObservableCollection(Of EgtDataGridColumn) + Private m_MDICommandColumns As New ObservableCollection(Of EgwWPFBaseLib.ColumnLayout) + Public Property MDICommandColumns As ObservableCollection(Of EgwWPFBaseLib.ColumnLayout) Get Return m_MDICommandColumns End Get - Set(value As ObservableCollection(Of EgtDataGridColumn)) + Set(value As ObservableCollection(Of EgwWPFBaseLib.ColumnLayout)) m_MDICommandColumns = value End Set End Property @@ -96,7 +97,7 @@ Public Class MDIPageVM ' imposto riferimento in Map Map.SetRefMDIPageVM(Me) ' carico le colonne della datagrid - GetPrivateProfileColumns(S_MDICOMMANDS, MDICommandColumns) + EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_MDICOMMANDS, MDICommandColumns) ' leggo stringhe MDI GetPrivateProfileMDICommands(S_MDI, MDICommandList) m_MDIResultTimer.Interval = TimeSpan.FromMilliseconds(2000) diff --git a/EgtBEAMWALL.Supervisor/MachineLogPage/MachineLogPageV.xaml b/EgtBEAMWALL.Supervisor/MachineLogPage/MachineLogPageV.xaml index e47e5610..d0261cab 100644 --- a/EgtBEAMWALL.Supervisor/MachineLogPage/MachineLogPageV.xaml +++ b/EgtBEAMWALL.Supervisor/MachineLogPage/MachineLogPageV.xaml @@ -2,7 +2,8 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:EgtBEAMWALLSUPERVISOR="clr-namespace:EgtBEAMWALL.Supervisor" - xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core"> + xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core" + xmlns:EgwWPFBaseLib="clr-namespace:EgwWPFBaseLib;assembly=EgwWPFBaseLib"> @@ -58,23 +59,23 @@ - + - + diff --git a/EgtBEAMWALL.Supervisor/MachineLogPage/MachineLogPageVM.vb b/EgtBEAMWALL.Supervisor/MachineLogPage/MachineLogPageVM.vb index 1be8fe82..b591565a 100644 --- a/EgtBEAMWALL.Supervisor/MachineLogPage/MachineLogPageVM.vb +++ b/EgtBEAMWALL.Supervisor/MachineLogPage/MachineLogPageVM.vb @@ -4,6 +4,7 @@ Imports EgtUILib Imports EgtBEAMWALL.Core Imports System.Windows.Threading Imports EgtBEAMWALL.Core.MachLog +Imports System.IO Public Class MachineLogPageVM Inherits VMBase @@ -18,31 +19,31 @@ Public Class MachineLogPageVM PERIOD = 2 End Enum - Private m_colMachineLog_Type As EgtDataGridColumn - Public ReadOnly Property colMachineLog_Type As EgtDataGridColumn + Private m_colMachineLog_Type As EgwWPFBaseLib.ColumnLayout + Public ReadOnly Property colMachineLog_Type As EgwWPFBaseLib.ColumnLayout Get Return m_colMachineLog_Type End Get End Property - Private m_colMachineLog_Description As EgtDataGridColumn - Public ReadOnly Property colMachineLog_Description As EgtDataGridColumn + Private m_colMachineLog_Description As EgwWPFBaseLib.ColumnLayout + Public ReadOnly Property colMachineLog_Description As EgwWPFBaseLib.ColumnLayout Get Return m_colMachineLog_Description End Get End Property - Private m_colMachineLog_SupervisorId As EgtDataGridColumn - Public ReadOnly Property colMachineLog_SupervisorId As EgtDataGridColumn + Private m_colMachineLog_SupervisorId As EgwWPFBaseLib.ColumnLayout + Public ReadOnly Property colMachineLog_SupervisorId As EgwWPFBaseLib.ColumnLayout Get Return m_colMachineLog_SupervisorId End Get End Property - Private m_MachineLogColumns As New ObservableCollection(Of EgtDataGridColumn) - Public Property MachineLogColumns As ObservableCollection(Of EgtDataGridColumn) + Private m_MachineLogColumns As New ObservableCollection(Of EgwWPFBaseLib.ColumnLayout) + Public Property MachineLogColumns As ObservableCollection(Of EgwWPFBaseLib.ColumnLayout) Get Return m_MachineLogColumns End Get - Set(value As ObservableCollection(Of EgtDataGridColumn)) + Set(value As ObservableCollection(Of EgwWPFBaseLib.ColumnLayout)) m_MachineLogColumns = value End Set End Property @@ -264,13 +265,14 @@ Public Class MachineLogPageVM ' imposto riferimento in Map Map.SetRefMachineLogPageVM(Me) ' carico le colonne della datagrid - GetPrivateProfileColumns(S_MACHINELOG, MachineLogColumns) + 'GetPrivateProfileColumns(S_MACHINELOG, MachineLogColumns) + EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_MACHINELOG, MachineLogColumns) m_MachineLogList_View = CollectionViewSource.GetDefaultView(m_MachineLogList) m_MachineLogList_View.Filter = AddressOf MachineLogFilter ' recupero riferimento a colonna StartCut - m_colMachineLog_Type = m_MachineLogColumns.FirstOrDefault(Function(x) x.Name = COL_TYPE) - m_colMachineLog_Description = m_MachineLogColumns.FirstOrDefault(Function(x) x.Name = COL_DESCRIPTION) - m_colMachineLog_SupervisorId = m_MachineLogColumns.FirstOrDefault(Function(x) x.Name = COL_SUPERVISORID) + m_colMachineLog_Type = m_MachineLogColumns.FirstOrDefault(Function(x) x.Key = COL_TYPE) + m_colMachineLog_Description = m_MachineLogColumns.FirstOrDefault(Function(x) x.Key = COL_DESCRIPTION) + m_colMachineLog_SupervisorId = m_MachineLogColumns.FirstOrDefault(Function(x) x.Key = COL_SUPERVISORID) ' imposto valori filtri da ini m_SelPartEventType = GetMainPrivateProfileInt(S_MACHINELOGFILTER, K_PARTEVENTTYPE, 2) m_SelEntityType = GetMainPrivateProfileInt(S_MACHINELOGFILTER, K_ENTITYTYPE, 1) @@ -336,9 +338,9 @@ Public Class MachineLogPageVM Friend Sub LoadMachineLogList() If Map.refMainWindowVM.MainWindowM.nUserLevel < 5 Then - m_colMachineLog_Type.ColumnVisibility = Visibility.Collapsed - m_colMachineLog_Description.ColumnVisibility = Visibility.Collapsed - m_colMachineLog_SupervisorId.ColumnVisibility = Visibility.Collapsed + m_colMachineLog_Type.IsVisible = False + m_colMachineLog_Description.IsVisible = False + m_colMachineLog_SupervisorId.IsVisible = False End If UpdateMachineLogList(True) m_MachineLogList_View = CollectionViewSource.GetDefaultView(m_MachineLogList) diff --git a/EgtBEAMWALL.Supervisor/MainWindow/MainWindowVM.vb b/EgtBEAMWALL.Supervisor/MainWindow/MainWindowVM.vb index fe5bef57..b2bf8305 100644 --- a/EgtBEAMWALL.Supervisor/MainWindow/MainWindowVM.vb +++ b/EgtBEAMWALL.Supervisor/MainWindow/MainWindowVM.vb @@ -211,7 +211,10 @@ Public Class MainWindowVM ' salvo tabelle Dim DataGridColumnDictionary As New Dictionary(Of String, ObservableCollection(Of EgwWPFBaseLib.ColumnLayout)) From {{S_RAWPARTLIST_SUPERVISOR, Map.refRawPartListVM.RawPartColumns}, {S_PARTINRAWPARTLIST_SUPERVISOR, Map.refPartInRawPartListVM.PartInRawPartColumns}, - {S_FEATUREINPARTINRAWPARTLIST_SUPERVISOR, Map.refFeatureInPartInRawPartListVM.FeatureInPartInRawPartColumns}} + {S_FEATUREINPARTINRAWPARTLIST_SUPERVISOR, Map.refFeatureInPartInRawPartListVM.FeatureInPartInRawPartColumns}, + {S_VARIABLESLIST, Map.refConfigurationPageVM.VariablesColumns}, + {S_MACHINELOG, Map.refMachineLogPageVM.MachineLogColumns}, + {S_MDICOMMANDS, Map.refMDIPageVM.MDICommandColumns}} EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), DataGridColumnDictionary) ' Termino il Model MainWindowM.Close() diff --git a/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb index b138a21b..6d41760e 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: ' - - + + diff --git a/EgtBEAMWALL.Supervisor/OpenProjectFileDialog/OpenProjectFileDialogVM.vb b/EgtBEAMWALL.Supervisor/OpenProjectFileDialog/OpenProjectFileDialogVM.vb index 488417ae..f6965c08 100644 --- a/EgtBEAMWALL.Supervisor/OpenProjectFileDialog/OpenProjectFileDialogVM.vb +++ b/EgtBEAMWALL.Supervisor/OpenProjectFileDialog/OpenProjectFileDialogVM.vb @@ -11,7 +11,7 @@ Public Class OpenProjectFileDialogVM m_ProjectType = ProjectType m_GoToProd = GoToProd ' carico colonne - LoadColumns(m_ProjectType) + LoadColumns() NotifyPropertyChanged(NameOf(FilterTypeList)) m_SelFilterType = m_FilterTypeList(0) ' carico lista progetti