From b1ce12e11070556c74a4c99d421ced8cca81a098 Mon Sep 17 00:00:00 2001 From: RenzoL Date: Fri, 21 May 2021 12:31:35 +0200 Subject: [PATCH] - correzione alla selezione GRP in ConfigurationPage che dava errore - sistemati i messaggi --- .../BTLParam/BTLStructureVM.vb | 2 +- .../BTLParam/FeatureInPartInRawPartListVM.vb | 8 ++++-- .../BTLParam/FeatureListVM.vb | 3 +- .../BTLParam/ParameterListVM.vb | 16 ++++++----- .../BTLParam/PartInRawPartListVM.vb | 19 +++++++------ .../BTLParam/PartListVM.vb | 28 ++++++++++--------- .../BTLParam/RawPartListVM.vb | 17 +++++------ .../ConfigurationPage/ConfigurationPageVM.vb | 14 ++++++---- .../MachinePanel/MachinePanelVM.vb | 6 ++-- .../OpenProjectFileDialogVM.vb | 14 +++++----- .../ProjectManager/ProjectFileVM.vb | 12 ++++---- .../StatusBar/MyStatusBarVM.vb | 2 +- 12 files changed, 76 insertions(+), 65 deletions(-) diff --git a/EgtBEAMWALL.ViewerOptimizer/BTLParam/BTLStructureVM.vb b/EgtBEAMWALL.ViewerOptimizer/BTLParam/BTLStructureVM.vb index aaa827bc..b51e9b40 100644 --- a/EgtBEAMWALL.ViewerOptimizer/BTLParam/BTLStructureVM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/BTLParam/BTLStructureVM.vb @@ -472,7 +472,7 @@ Public Class BTLStructureVM Public ReadOnly Property PDN_Msg As String Get - Return "PDN_Msg" + Return EgtMsg(61809) End Get End Property diff --git a/EgtBEAMWALL.ViewerOptimizer/BTLParam/FeatureInPartInRawPartListVM.vb b/EgtBEAMWALL.ViewerOptimizer/BTLParam/FeatureInPartInRawPartListVM.vb index 4bbc259f..a858aeda 100644 --- a/EgtBEAMWALL.ViewerOptimizer/BTLParam/FeatureInPartInRawPartListVM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/BTLParam/FeatureInPartInRawPartListVM.vb @@ -1,16 +1,18 @@ -Public Class FeatureInPartInRawPartListVM +Imports EgtUILib + +Public Class FeatureInPartInRawPartListVM #Region "Messages" Public ReadOnly Property Description_Msg As String Get - Return "Descrizione" + Return EgtMsg(61603) End Get End Property Public ReadOnly Property DO_Msg As String Get - Return "DO" + Return EgtMsg(61610) End Get End Property diff --git a/EgtBEAMWALL.ViewerOptimizer/BTLParam/FeatureListVM.vb b/EgtBEAMWALL.ViewerOptimizer/BTLParam/FeatureListVM.vb index 06710836..0d0a28cc 100644 --- a/EgtBEAMWALL.ViewerOptimizer/BTLParam/FeatureListVM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/BTLParam/FeatureListVM.vb @@ -1,4 +1,5 @@ Imports System.Collections.ObjectModel +Imports EgtUILib Public Class FeatureListVM @@ -16,7 +17,7 @@ Public Class FeatureListVM Public ReadOnly Property Description_Msg As String Get - Return "Descrizione" + Return EgtMsg(61603) End Get End Property diff --git a/EgtBEAMWALL.ViewerOptimizer/BTLParam/ParameterListVM.vb b/EgtBEAMWALL.ViewerOptimizer/BTLParam/ParameterListVM.vb index ffc585d6..1de538ad 100644 --- a/EgtBEAMWALL.ViewerOptimizer/BTLParam/ParameterListVM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/BTLParam/ParameterListVM.vb @@ -1,39 +1,41 @@ -Public Class ParameterListVM +Imports EgtUILib + +Public Class ParameterListVM #Region "Messages" Public ReadOnly Property Custom_Msg As String Get - Return "Custom" + Return EgtMsg(61801) End Get End Property Public ReadOnly Property NAM_Msg As String Get - Return "Nome" + Return EgtMsg(61808) End Get End Property Public ReadOnly Property Description_Msg As String Get - Return "Descrizione" + Return EgtMsg(61603) End Get End Property Public ReadOnly Property Value_Msg As String Get - Return "Valore" + Return EgtMsg(61615) End Get End Property Public ReadOnly Property Min_Msg As String Get - Return "Min" + Return EgtMsg(61616) End Get End Property Public ReadOnly Property Max_Msg As String Get - Return "Max" + Return EgtMsg(61617) End Get End Property diff --git a/EgtBEAMWALL.ViewerOptimizer/BTLParam/PartInRawPartListVM.vb b/EgtBEAMWALL.ViewerOptimizer/BTLParam/PartInRawPartListVM.vb index d7b80fef..5af24a05 100644 --- a/EgtBEAMWALL.ViewerOptimizer/BTLParam/PartInRawPartListVM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/BTLParam/PartInRawPartListVM.vb @@ -1,5 +1,6 @@ Imports System.Collections.ObjectModel Imports EgtBEAMWALL.Core +Imports EgtUILib Public Class PartInRawPartListVM @@ -17,52 +18,52 @@ Public Class PartInRawPartListVM Public ReadOnly Property PDN_Msg As String Get - Return "PDN" + Return EgtMsg(61809) End Get End Property Public ReadOnly Property W_Msg As String Get - Return "W" + Return EgtMsg(61605) End Get End Property Public ReadOnly Property H_Msg As String Get - Return "H" + Return EgtMsg(61606) End Get End Property Public ReadOnly Property L_Msg As String Get - Return "L" + Return EgtMsg(61604) End Get End Property Public ReadOnly Property NAM_Msg As String Get - Return "Descrizione" + Return EgtMsg(61603) End Get End Property Public ReadOnly Property PosX_Msg As String Get - Return "Posizione X" + Return EgtMsg(61811) End Get End Property Public ReadOnly Property PosY_Msg As String Get - Return "Posizione Y" + Return EgtMsg(61812) End Get End Property Public ReadOnly Property Offset_Msg As String Get - Return "Offset" + Return EgtMsg(61755) End Get End Property Public ReadOnly Property MAT_Msg As String Get - Return "Materiale" + Return EgtMsg(61607) End Get End Property diff --git a/EgtBEAMWALL.ViewerOptimizer/BTLParam/PartListVM.vb b/EgtBEAMWALL.ViewerOptimizer/BTLParam/PartListVM.vb index 95c3f2de..b85633e9 100644 --- a/EgtBEAMWALL.ViewerOptimizer/BTLParam/PartListVM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/BTLParam/PartListVM.vb @@ -1,74 +1,76 @@ -Public Class PartListVM +Imports EgtUILib + +Public Class PartListVM #Region "Messages" Public ReadOnly Property PDN_Msg As String Get - Return "PDN" + Return EgtMsg(61809) End Get End Property Public ReadOnly Property DO_Msg As String Get - Return "DO" + Return EgtMsg(61810) End Get End Property Public ReadOnly Property W_Msg As String Get - Return "W" + Return EgtMsg(61605) End Get End Property Public ReadOnly Property H_Msg As String Get - Return "H" + Return EgtMsg(61606) End Get End Property Public ReadOnly Property L_Msg As String Get - Return "L" + Return EgtMsg(61604) End Get End Property Public ReadOnly Property NAM_Msg As String Get - Return "Descrizione" + Return EgtMsg(61603) End Get End Property Public ReadOnly Property MAT_Msg As String Get - Return "Materiale" + Return EgtMsg(61607) End Get End Property Public ReadOnly Property CNT_Msg As String Get - Return "Richiesti" + Return EgtMsg(61608) End Get End Property Public ReadOnly Property ADDED_Msg As String Get - Return "Aggiunti" + Return EgtMsg(61813) End Get End Property Public ReadOnly Property INPROD_Msg As String Get - Return "In Produzione" + Return EgtMsg(61609) End Get End Property Public ReadOnly Property DONE_Msg As String Get - Return "Lavorati" + Return EgtMsg(61814) End Get End Property Public ReadOnly Property GRP_Msg As String Get - Return "Gruppo" + Return EgtMsg(61612) End Get End Property diff --git a/EgtBEAMWALL.ViewerOptimizer/BTLParam/RawPartListVM.vb b/EgtBEAMWALL.ViewerOptimizer/BTLParam/RawPartListVM.vb index c5df2e24..5aa52360 100644 --- a/EgtBEAMWALL.ViewerOptimizer/BTLParam/RawPartListVM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/BTLParam/RawPartListVM.vb @@ -1,5 +1,6 @@ Imports System.Collections.ObjectModel Imports EgtBEAMWALL.Core +Imports EgtUILib Public Class RawPartListVM @@ -19,49 +20,49 @@ Public Class RawPartListVM Public ReadOnly Property ID_Msg As String Get - Return "ID" + Return EgtMsg(61815) End Get End Property Public ReadOnly Property StartOffset_Msg As String Get - Return "Ritaglio iniziale" + Return EgtMsg(61816) End Get End Property Public ReadOnly Property W_Msg As String Get - Return "W" + Return EgtMsg(61605) End Get End Property Public ReadOnly Property H_Msg As String Get - Return "H" + Return EgtMsg(61606) End Get End Property Public ReadOnly Property L_Msg As String Get - Return "L" + Return EgtMsg(61604) End Get End Property Public ReadOnly Property Material_Msg As String Get - Return "Materiale" + Return EgtMsg(61607) End Get End Property Public ReadOnly Property Used_Msg As String Get - Return "% utilizzo" + Return EgtMsg(61817) End Get End Property Public ReadOnly Property Waste_Msg As String Get - Return "Scarto" + Return EgtMsg(61818) End Get End Property diff --git a/EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/ConfigurationPageVM.vb b/EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/ConfigurationPageVM.vb index a5a0596d..9c7aa289 100644 --- a/EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/ConfigurationPageVM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/ConfigurationPage/ConfigurationPageVM.vb @@ -103,13 +103,15 @@ Public Class ConfigurationPageVM Set(value As PRC) If value IsNot m_nSelPRC Then m_nSelPRC = value - ' carico la lista dei parametri Q in base al Process selezionato - If Not IsNothing(QBTLParamVMList) Then - QBTLParamVMList.Clear() + If Not IsNothing(m_nSelPRC) Then + ' carico la lista dei parametri Q in base al Process selezionato + If Not IsNothing(QBTLParamVMList) Then + QBTLParamVMList.Clear() + End If + For Each QBTLParam In nSelPRC.QBTLParamVMList + QBTLParamVMList.Add(QBTLParam) + Next End If - For Each QBTLParam In nSelPRC.QBTLParamVMList - QBTLParamVMList.Add(QBTLParam) - Next NotifyPropertyChanged(NameOf(QBTLParamVMList)) End If End Set diff --git a/EgtBEAMWALL.ViewerOptimizer/MachinePanel/MachinePanelVM.vb b/EgtBEAMWALL.ViewerOptimizer/MachinePanel/MachinePanelVM.vb index e60f3122..3b532e77 100644 --- a/EgtBEAMWALL.ViewerOptimizer/MachinePanel/MachinePanelVM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/MachinePanel/MachinePanelVM.vb @@ -102,17 +102,17 @@ Public Class MachinePanelVM Public ReadOnly Property ToolDBToolTip As String Get - Return "Tool DB" + Return EgtMsg(5003) End Get End Property Public ReadOnly Property MachiningDbToolTip As String Get - Return "Machining DB" + Return EgtMsg(5004) End Get End Property Public ReadOnly Property SetUpToolTip As String Get - Return "SetUp" + Return EgtMsg(31501) End Get End Property diff --git a/EgtBEAMWALL.ViewerOptimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb b/EgtBEAMWALL.ViewerOptimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb index c391a132..4fa3e06d 100644 --- a/EgtBEAMWALL.ViewerOptimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb @@ -94,32 +94,32 @@ Public Class OpenProjectFileDialogVM Public ReadOnly Property Id_Msg As String Get - Return "ID" + Return EgtMsg(61815) End Get End Property Public ReadOnly Property BTLFileName_Msg As String Get - Return "BTL File Name" + Return EgtMsg(61819) End Get End Property Public ReadOnly Property ListName_Msg As String Get - Return "List Name" + Return EgtMsg(61820) End Get End Property Public ReadOnly Property ExportDate_Msg As String Get - Return "Export Date" + Return EgtMsg(61821) End Get End Property Public ReadOnly Property CreateDate_Msg As String Get - Return "Creation Date" + Return EgtMsg(61822) End Get End Property Public ReadOnly Property Name_Msg As String Get - Return "Name" + Return EgtMsg(61808) End Get End Property @@ -130,7 +130,7 @@ Public Class OpenProjectFileDialogVM End Property Public ReadOnly Property Delete_Msg As String Get - Return "Delete" + Return EgtMsg(61823) End Get End Property Public ReadOnly Property Cancel_Msg As String diff --git a/EgtBEAMWALL.ViewerOptimizer/ProjectManager/ProjectFileVM.vb b/EgtBEAMWALL.ViewerOptimizer/ProjectManager/ProjectFileVM.vb index 857f544a..1a24abac 100644 --- a/EgtBEAMWALL.ViewerOptimizer/ProjectManager/ProjectFileVM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/ProjectManager/ProjectFileVM.vb @@ -87,32 +87,32 @@ Public Class ProjectFileVM Public ReadOnly Property Id_Msg As String Get - Return "ID" + Return EgtMsg(61815) End Get End Property Public ReadOnly Property BTLFileName_Msg As String Get - Return "BTL File Name" + Return EgtMsg(61819) End Get End Property Public ReadOnly Property ListName_Msg As String Get - Return "List Name" + Return EgtMsg(61820) End Get End Property Public ReadOnly Property ExportDate_Msg As String Get - Return "Export Date" + Return EgtMsg(61821) End Get End Property Public ReadOnly Property CreateDate_Msg As String Get - Return "Creation Date" + Return EgtMsg(61822) End Get End Property Public ReadOnly Property Name_Msg As String Get - Return "Name" + Return EgtMsg(61808) End Get End Property diff --git a/EgtBEAMWALL.ViewerOptimizer/StatusBar/MyStatusBarVM.vb b/EgtBEAMWALL.ViewerOptimizer/StatusBar/MyStatusBarVM.vb index 9fabe558..5bf0b586 100644 --- a/EgtBEAMWALL.ViewerOptimizer/StatusBar/MyStatusBarVM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/StatusBar/MyStatusBarVM.vb @@ -19,7 +19,7 @@ Public Class MyStatusBarVM Public ReadOnly Property CurrMachine As String Get - Return Map.refMachinePanelVM.SelectedMachine.Name + Return If(Not IsNothing(Map.refMachinePanelVM.SelectedMachine), Map.refMachinePanelVM.SelectedMachine.Name, "") End Get End Property