EgtBEAMWALL 3.1.1.6:
-rimosso cambio estensione file colonne datagrid
This commit is contained in:
Demetrio Cassarino
@@ -1,6 +1,6 @@
|
||||
Public Module ConstDataGridColumnsIni
|
||||
|
||||
Public Const OPTIMIZERDATAGRIDCOLUMNS_FILE_NAME As String = "OPTIMIZERDataGridColumns.ini"
|
||||
Public Const OPTIMIZERDATAGRIDCOLUMNS_FILE_NAME As String = "OPTIMIZERDataGridColumns.json"
|
||||
|
||||
Public Const S_OPENPROJFILEDLG_PROD As String = "DG_OpenProjectFileDialog_PROD"
|
||||
Public Const S_NEWOPENPROJFILEDLG_PROD As String = "DG_NewOpenProjectFileDialog_PROD"
|
||||
|
||||
@@ -38,5 +38,5 @@ Imports System.Windows
|
||||
' by using the '*' as shown below:
|
||||
' <Assembly: AssemblyVersion("1.0.*")>
|
||||
|
||||
<Assembly: AssemblyVersion("3.1.1.5")>
|
||||
<Assembly: AssemblyFileVersion("3.1.1.5")>
|
||||
<Assembly: AssemblyVersion("3.1.1.6")>
|
||||
<Assembly: AssemblyFileVersion("3.1.1.6")>
|
||||
|
||||
@@ -579,7 +579,7 @@ Public MustInherit Class NewOpenProjectFileDialogVM
|
||||
|
||||
Protected Sub LoadColumns()
|
||||
' carico le colonne della datagrid
|
||||
EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_NEWOPENPROJFILEDLG_PROD, ProdColumns)
|
||||
EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_NEWOPENPROJFILEDLG_PROD, ProdColumns)
|
||||
' carico campi su cui eseguire il filtro di ricerca
|
||||
m_BTLDateTypeList = New List(Of String)({CreateDate_Msg})
|
||||
m_SelBTLDateType = BTLDateTypes.CREATEDATE
|
||||
@@ -595,7 +595,7 @@ Public MustInherit Class NewOpenProjectFileDialogVM
|
||||
|
||||
Friend Function VerifySelected() As Boolean
|
||||
' 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)
|
||||
If IsNothing(SelProject) Then Return False
|
||||
Dim AllFilesInDir As IEnumerable(Of String) = Nothing
|
||||
If m_ProjectType = Core.ConstBeam.ProjectType.PROD Then
|
||||
|
||||
@@ -445,7 +445,7 @@ Public MustInherit Class OpenProjectFileDialogVM
|
||||
|
||||
Protected Sub LoadColumns()
|
||||
' carico le colonne della datagrid
|
||||
EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_OPENPROJFILEDLG_PROD, ProjectColumns)
|
||||
EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_OPENPROJFILEDLG_PROD, ProjectColumns)
|
||||
' carico campi su cui eseguire il filtro di ricerca
|
||||
m_BTLDateTypeList = New List(Of String)({CreateDate_Msg})
|
||||
m_SelBTLDateType = BTLDateTypes.CREATEDATE
|
||||
@@ -461,7 +461,7 @@ Public MustInherit Class OpenProjectFileDialogVM
|
||||
|
||||
Friend Function VerifySelected() As Boolean
|
||||
' Salvo modifiche a colonne
|
||||
EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_OPENPROJFILEDLG_PROD, ProjectColumns)
|
||||
EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_OPENPROJFILEDLG_PROD, ProjectColumns)
|
||||
If IsNothing(SelProject) Then Return False
|
||||
Dim AllFilesInDir As IEnumerable(Of String) = Nothing
|
||||
If m_ProjectType = Core.ConstBeam.ProjectType.PROD Then
|
||||
|
||||
@@ -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.5")]
|
||||
[assembly: AssemblyFileVersion("3.1.1.5")]
|
||||
[assembly: AssemblyVersion("3.1.1.6")]
|
||||
[assembly: AssemblyFileVersion("3.1.1.6")]
|
||||
|
||||
@@ -739,7 +739,7 @@ Public Class BTLDataWndVM
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Friend Sub SaveInfoBTL()
|
||||
Friend Sub SaveInfoBTL(nType As BWType)
|
||||
Dim AISetupDirPath As String = Map.refMainWindowVM.MainWindowM.GetAISetupDirPath(nType, True)
|
||||
Dim sDefaultConfigFile As String = String.Empty
|
||||
Dim sTmpStrategySetup As String = String.Empty
|
||||
@@ -813,7 +813,7 @@ Public Class BTLDataWndVM
|
||||
Return
|
||||
End If
|
||||
Else
|
||||
SaveInfoBTL()
|
||||
SaveInfoBTL(ProjectManagerVM.CurrProd.nType)
|
||||
End If
|
||||
Map.refLeftPanelVM.ResetCalc()
|
||||
Map.refSceneHostVM.SaveProject()
|
||||
|
||||
@@ -821,7 +821,7 @@ Public Class ListGenericParameter
|
||||
Return m_SelValue
|
||||
End Get
|
||||
Set(value As ToolParameter)
|
||||
If Not IsNothing(value) Then
|
||||
If Not IsNothing(value) AndAlso Not IsNothing(m_SelValue) Then
|
||||
If m_SelValue.sUUID <> value.sUUID Then
|
||||
Map.refStrategyManagerVM.SetbIsModifyStrategy(True)
|
||||
SetbIsListModify(True)
|
||||
|
||||
@@ -52,8 +52,8 @@
|
||||
Style="{StaticResource BTLPartList_Expander}">
|
||||
<Expander.Header>
|
||||
<StackPanel Style="{StaticResource PartManager_StackPanel}">
|
||||
<TextBlock Text="{Binding Path=Name}"
|
||||
Style="{StaticResource BTLPartList_TextBlock}"/>
|
||||
<!--<TextBlock Text="{Binding Path=Name}"
|
||||
Style="{StaticResource BTLPartList_TextBlock}"/>-->
|
||||
<TextBlock Text="{Binding Path=Name, Converter={StaticResource ProjIdToBtlFileName}}"
|
||||
Style="{StaticResource BTLPartList_TextBlock}"/>
|
||||
<Button Command="{Binding Tag.Data_Command, RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
|
||||
|
||||
@@ -197,7 +197,7 @@ Public Class BTLPartListVM
|
||||
Map.SetRefPartListVM(Me)
|
||||
|
||||
' carico le colonne della datagrid
|
||||
EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_PARTLIST, PartColumns)
|
||||
EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_PARTLIST, PartColumns)
|
||||
m_colPart_Do = PartColumns.FirstOrDefault(Function(x) x.Key = COL_DO)
|
||||
End Sub
|
||||
|
||||
|
||||
@@ -64,7 +64,7 @@ Public Class FeatureInPartInRawPartListVM
|
||||
Map.SetRefFeatureInPartInRawPartListVM(Me)
|
||||
|
||||
' carico le colonne della datagrid
|
||||
EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_FEATUREINPARTINRAWPARTLIST, FeatureInPartInRawPartColumns)
|
||||
EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_FEATUREINPARTINRAWPARTLIST, FeatureInPartInRawPartColumns)
|
||||
m_colFeatureInPartInRawPart_Do = FeatureInPartInRawPartColumns.FirstOrDefault(Function(x) x.Key = COL_DO)
|
||||
m_colFeatureInPartInRawPart_Priority = FeatureInPartInRawPartColumns.FirstOrDefault(Function(x) x.Key = COL_PRIORITY)
|
||||
End Sub
|
||||
|
||||
@@ -111,7 +111,7 @@ Public Class PParameterListVM
|
||||
Map.SetRefPParameterListVM(Me)
|
||||
|
||||
' carico le colonne della datagrid
|
||||
EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_PARAMETERLIST_P, PParameterListColumns)
|
||||
EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_PARAMETERLIST_P, PParameterListColumns)
|
||||
|
||||
' recupero riferimento a colonna Value
|
||||
m_colPParam_Value = PParameterListColumns.FirstOrDefault(Function(x) x.Key = COL_VALUE)
|
||||
|
||||
@@ -225,14 +225,14 @@ Public Class RawPartListVM
|
||||
Friend Sub UpdateColumns(nProjectType As BWType)
|
||||
If nProjectType = BWType.BEAM Then
|
||||
' carico le colonne della datagrid
|
||||
EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_RAWPARTLIST_BEAM, RawPartColumns)
|
||||
EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_RAWPARTLIST_BEAM, RawPartColumns)
|
||||
' carico le colonne della datagrid
|
||||
EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_PARTINRAWPARTLIST_BEAM, PartInRawPartColumns)
|
||||
EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_PARTINRAWPARTLIST_BEAM, PartInRawPartColumns)
|
||||
ElseIf nProjectType = BWType.WALL Then
|
||||
' carico le colonne della datagrid
|
||||
EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_RAWPARTLIST_WALL, RawPartColumns)
|
||||
EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_RAWPARTLIST_WALL, RawPartColumns)
|
||||
' carico le colonne della datagrid
|
||||
EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_PARTINRAWPARTLIST_WALL, PartInRawPartColumns)
|
||||
EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_PARTINRAWPARTLIST_WALL, PartInRawPartColumns)
|
||||
End If
|
||||
NotifyPropertyChanged(NameOf(RawPartColumns))
|
||||
NotifyPropertyChanged(NameOf(PartInRawPartColumns))
|
||||
|
||||
@@ -421,7 +421,7 @@ Public Class MainWindowVM
|
||||
{S_PARTINRAWPARTLIST_BEAM, Map.refRawPartListVM.PartInRawPartColumns},
|
||||
{S_FEATUREINPARTINRAWPARTLIST, Map.refFeatureInPartInRawPartListVM.FeatureInPartInRawPartColumns},
|
||||
{S_PARAMETERLIST_P, Map.refPParameterListVM.PParameterListColumns}}
|
||||
EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), DataGridColumnDictionary)
|
||||
EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, DataGridColumnDictionary)
|
||||
' Termino il Model
|
||||
m_MainWindowM.Close()
|
||||
' Termino il programma
|
||||
|
||||
@@ -67,5 +67,5 @@ Imports System.Windows
|
||||
' Revision
|
||||
'
|
||||
|
||||
<Assembly: AssemblyVersion("3.1.1.5")>
|
||||
<Assembly: AssemblyFileVersion("3.1.1.5")>
|
||||
<Assembly: AssemblyVersion("3.1.1.6")>
|
||||
<Assembly: AssemblyFileVersion("3.1.1.6")>
|
||||
|
||||
@@ -686,7 +686,7 @@ Public Class ProdManagerVM
|
||||
|
||||
m_BTLDataWnd = New BTLDataWndVM(nType)
|
||||
m_BTLDataWnd.Read(nProjId, nType)
|
||||
m_BTLDataWnd.SaveInfoBTL()
|
||||
m_BTLDataWnd.SaveInfoBTL(nType)
|
||||
|
||||
' Controllo se effettuare import + verifica
|
||||
If Map.refConfigurationPageVM.bVerifyImportBTL_IsChecked Then
|
||||
@@ -698,13 +698,13 @@ Public Class ProdManagerVM
|
||||
LoadingWndHelper.UpdateLoadingWnd(ActiveIds.IMPORTBTL, 2, EgtMsg(63005), 50, 70) ' Loading parts
|
||||
' leggo struttura BTL per liste
|
||||
Map.refProjectVM.BTLStructureVM = New BTLStructureVM(BTLStructureM.CreateBTLStructure(0))
|
||||
CopyBuilding()
|
||||
' aggiorno Db
|
||||
Dim ExportDate As DateTime
|
||||
Dim sBTLFileName As String = Path.GetFileNameWithoutExtension(sImportFilePath)
|
||||
DateTime.TryParse(Map.refProjectVM.BTLStructureVM.BTLStructureM.m_sEXPDATE & " " &
|
||||
Map.refProjectVM.BTLStructureVM.BTLStructureM.m_sEXPTIME, ExportDate)
|
||||
DbControllers.m_ProjController.UpdateInfo(nProjId, sBTLFileName, sBTLFileName, Map.refProjectVM.BTLStructureVM.sLISTNAME, ExportDate, nType, Machine.Name)
|
||||
CopyBuilding()
|
||||
' se progetto pareti e vista ruotata
|
||||
If nType = BWType.WALL AndAlso (CurrentMachine.ViewDir = VT.ISO_NW OrElse CurrentMachine.ViewDir = VT.ISO_NE) Then
|
||||
' ruoto le pareti di 180 per raddrizzarle rispetto alla vista
|
||||
@@ -837,7 +837,7 @@ Public Class ProdManagerVM
|
||||
|
||||
m_BTLDataWnd = New BTLDataWndVM(nType)
|
||||
m_BTLDataWnd.Read(nProjId, nType)
|
||||
m_BTLDataWnd.SaveInfoBTL()
|
||||
m_BTLDataWnd.SaveInfoBTL(nType)
|
||||
|
||||
' Controllo se effettuare import + verifica
|
||||
If Map.refConfigurationPageVM.bVerifyImportBTL_IsChecked Then
|
||||
@@ -988,7 +988,7 @@ Public Class ProdManagerVM
|
||||
|
||||
m_BTLDataWnd = New BTLDataWndVM(nType)
|
||||
m_BTLDataWnd.Read(nProjId, nType)
|
||||
m_BTLDataWnd.SaveInfoBTL()
|
||||
m_BTLDataWnd.SaveInfoBTL(nType)
|
||||
|
||||
' leggo struttura BTL per liste
|
||||
Map.refProjectVM.BTLStructureVM = New BTLStructureVM(BTLStructureM.CreateBTLStructure(0))
|
||||
|
||||
@@ -291,9 +291,9 @@ Public Class StatisticsVM
|
||||
Map.SetRefStatisticsVM(Me)
|
||||
|
||||
'carico le colonne della datagrid
|
||||
EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_STATISTICS, StatisticsColumns)
|
||||
EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_OPTIMIZERSTATISTICS, OptimizerStatisticsColumns)
|
||||
EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_RAWPARTSTATISTICS, RawPartStatisticsColumns)
|
||||
EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_STATISTICS, StatisticsColumns)
|
||||
EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_OPTIMIZERSTATISTICS, OptimizerStatisticsColumns)
|
||||
EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_RAWPARTSTATISTICS, RawPartStatisticsColumns)
|
||||
End Sub
|
||||
|
||||
#End Region ' CONSTRUCTOR
|
||||
@@ -395,7 +395,7 @@ Public Class StatisticsVM
|
||||
Dim DataGridColumnDictionary As New Dictionary(Of String, ObservableCollection(Of EgwWPFBaseLib.ColumnLayout)) From {{S_STATISTICS, StatisticsColumns},
|
||||
{S_OPTIMIZERSTATISTICS, OptimizerStatisticsColumns},
|
||||
{S_RAWPARTSTATISTICS, RawPartStatisticsColumns}}
|
||||
EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), DataGridColumnDictionary)
|
||||
EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, DataGridColumnDictionary)
|
||||
' Chiudo finestra senza fare niente
|
||||
RaiseEvent m_CloseWindow(False)
|
||||
End Sub
|
||||
|
||||
@@ -1688,7 +1688,7 @@ Public Class ListStrategyParameter
|
||||
Return m_SelValue
|
||||
End Get
|
||||
Set(value As ToolParameter)
|
||||
If Not IsNothing(value) Then
|
||||
If Not IsNothing(value) AndAlso Not IsNothing(m_SelValue) Then
|
||||
If m_SelValue.sUUID <> value.sUUID Then
|
||||
Map.refStrategyManagerVM.SetbIsModifyStrategy(True)
|
||||
SetbIsListModify(True)
|
||||
|
||||
@@ -96,7 +96,7 @@ Public Class UpdateBTLWndVM
|
||||
|
||||
Sub New(InputBTLPartList As List(Of BTLPartToUpdate))
|
||||
' carico le colonne della datagrid
|
||||
EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_UPDATEBTLPARTLIST, UpdateBTLColumns)
|
||||
EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_UPDATEBTLPARTLIST, UpdateBTLColumns)
|
||||
' carica la lista dei Part importati
|
||||
BTLPartList = New ObservableCollection(Of BTLPartToUpdate)(InputBTLPartList)
|
||||
End Sub
|
||||
@@ -117,7 +117,7 @@ Public Class UpdateBTLWndVM
|
||||
End Property
|
||||
|
||||
Public Sub Ok()
|
||||
EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_UPDATEBTLPARTLIST, UpdateBTLColumns)
|
||||
EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_UPDATEBTLPARTLIST, UpdateBTLColumns)
|
||||
RaiseEvent m_CloseWindow(True)
|
||||
End Sub
|
||||
|
||||
|
||||
@@ -392,7 +392,7 @@ Public Class ConfigurationPageVM
|
||||
Next
|
||||
' carico la lista delle colonne delle variabili della macchina in ConfigurationPage
|
||||
'GetPrivateProfileColumns(S_VARIABLESLIST, VariablesColumns)
|
||||
EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_VARIABLESLIST, VariablesColumns)
|
||||
EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_VARIABLESLIST, VariablesColumns)
|
||||
' carico le Variables della macchina
|
||||
LoadVariables()
|
||||
' leggo SectionTime e PartTime
|
||||
|
||||
@@ -57,7 +57,7 @@ Public Class FeatureInPartInRawPartListVM
|
||||
' creo riferimento in Map
|
||||
Map.SetRefFeatureInPartInRawPartListVM(Me)
|
||||
' carico le colonne della datagrid
|
||||
EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_FEATUREINPARTINRAWPARTLIST_SUPERVISOR, FeatureInPartInRawPartColumns)
|
||||
EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_FEATUREINPARTINRAWPARTLIST_SUPERVISOR, FeatureInPartInRawPartColumns)
|
||||
' recupero riferimento a colonna Redo
|
||||
m_colFeatureInPartInRawPart_Redo = FeatureInPartInRawPartColumns.FirstOrDefault(Function(x) x.Key = COL_REDO)
|
||||
End Sub
|
||||
|
||||
@@ -134,7 +134,7 @@ Public Class PartInRawPartListVM
|
||||
'' aggiungo riferimento a map
|
||||
Map.SetRefPartInRawPartListVM(Me)
|
||||
' carico le colonne della datagrid
|
||||
EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_PARTINRAWPARTLIST_SUPERVISOR, PartInRawPartColumns)
|
||||
EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_PARTINRAWPARTLIST_SUPERVISOR, PartInRawPartColumns)
|
||||
' recupero riferimento a colonna Redo
|
||||
m_colPartInRawPart_Redo = PartInRawPartColumns.FirstOrDefault(Function(x) x.Key = COL_REDO)
|
||||
' recupero riferimento a colonne Offset, Rot, Flip, PosX, PosY
|
||||
|
||||
@@ -110,7 +110,7 @@ Public Class RawPartListVM
|
||||
' Aggiungo riferimento a Map
|
||||
Map.SetRefRawPartListVM(Me)
|
||||
' carico le colonne della datagrid
|
||||
EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_RAWPARTLIST_SUPERVISOR, RawPartColumns)
|
||||
EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_RAWPARTLIST_SUPERVISOR, RawPartColumns)
|
||||
' recupero riferimento a colonna StartCut e PosZ
|
||||
m_colRawPart_StartCut = m_RawPartColumns.FirstOrDefault(Function(x) x.Key = COL_STARTCUT)
|
||||
m_colRawPart_PosZ = m_RawPartColumns.FirstOrDefault(Function(x) x.Key = COL_POSZ)
|
||||
|
||||
@@ -97,7 +97,7 @@ Public Class MDIPageVM
|
||||
' imposto riferimento in Map
|
||||
Map.SetRefMDIPageVM(Me)
|
||||
' carico le colonne della datagrid
|
||||
EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_MDICOMMANDS, MDICommandColumns)
|
||||
EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_MDICOMMANDS, MDICommandColumns)
|
||||
' leggo stringhe MDI
|
||||
GetPrivateProfileMDICommands(S_MDI, MDICommandList)
|
||||
m_MDIResultTimer.Interval = TimeSpan.FromMilliseconds(2000)
|
||||
|
||||
@@ -266,7 +266,7 @@ Public Class MachineLogPageVM
|
||||
Map.SetRefMachineLogPageVM(Me)
|
||||
' carico le colonne della datagrid
|
||||
'GetPrivateProfileColumns(S_MACHINELOG, MachineLogColumns)
|
||||
EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(Path.ChangeExtension(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, ".json"), S_MACHINELOG, MachineLogColumns)
|
||||
EgwWPFBaseLib.EgwDataGrid.ReadColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, S_MACHINELOG, MachineLogColumns)
|
||||
m_MachineLogList_View = CollectionViewSource.GetDefaultView(m_MachineLogList)
|
||||
m_MachineLogList_View.Filter = AddressOf MachineLogFilter
|
||||
' recupero riferimento a colonna StartCut
|
||||
|
||||
@@ -215,7 +215,7 @@ Public Class MainWindowVM
|
||||
{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)
|
||||
EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, DataGridColumnDictionary)
|
||||
' Termino il Model
|
||||
MainWindowM.Close()
|
||||
' Chiudo la finestra principale del programma
|
||||
|
||||
@@ -70,5 +70,5 @@ Imports System.Windows
|
||||
' by using the '*' as shown below:
|
||||
' <Assembly: AssemblyVersion("1.0.*")>
|
||||
|
||||
<Assembly: AssemblyVersion("3.1.1.5")>
|
||||
<Assembly: AssemblyFileVersion("3.1.1.5")>
|
||||
<Assembly: AssemblyVersion("3.1.1.6")>
|
||||
<Assembly: AssemblyFileVersion("3.1.1.6")>
|
||||
|
||||
Reference in New Issue
Block a user