From 6043e8bf16c2fc657ba7cc86ae0b74c51c2e59e0 Mon Sep 17 00:00:00 2001 From: Demetrio Cassarino Date: Tue, 25 Feb 2025 09:15:59 +0100 Subject: [PATCH] -pulizia codice --- Panel/EditPanelVM.vb | 10 +++++++--- Panel/EditParametricVM.vb | 13 +++++++------ Panel/NewPanelVM.vb | 10 ++++++---- Panel/PanelManagerM.vb | 3 +-- SceneUserControl/SceneUserControlVM.vb | 10 ++++++++++ 5 files changed, 31 insertions(+), 15 deletions(-) diff --git a/Panel/EditPanelVM.vb b/Panel/EditPanelVM.vb index bcade89..fd7816a 100644 --- a/Panel/EditPanelVM.vb +++ b/Panel/EditPanelVM.vb @@ -3,6 +3,8 @@ Public Class EditPanelVM Inherits SceneUserControlVM +#Region "FIELDS & PROPERTIES" + Private Enum ParamEnum MSG_ISTRUZ = 0 PARAG_PANEL = 1 @@ -16,8 +18,6 @@ Public Class EditPanelVM EDIT_NEIGH = 9 End Enum -#Region "FIELDS & PROPERTIES" - Private ReadOnly m_MsgList As New List(Of String)({TopBar_Msg_Stg0, TopBar_Msg_Stg1, TopBar_Msg_Stg2, Msg_Paragraph1, Msg_Paragraph2}) Public ReadOnly Property MsgList As List(Of String) Get @@ -89,21 +89,25 @@ Public Class EditPanelVM Return EgtMsg(110040) ' Seleziona il Part che vuoi modificare End Get End Property + Public ReadOnly Property TopBar_Msg_Stg1 As String Get Return EgtMsg(110041) ' Inserisci i nuovi parametri End Get End Property + Public ReadOnly Property TopBar_Msg_Stg2 As String Get Return EgtMsg(110042) ' Conferma, modifica con altri parametri o annulla End Get End Property + Public ReadOnly Property Msg_Paragraph1 As String Get Return EgtMsg(110038) ' Frontalino End Get End Property + Public ReadOnly Property Msg_Paragraph2 As String Get Return EgtMsg(110039) ' Fondo @@ -126,7 +130,6 @@ Public Class EditPanelVM Stage = EditPanelStage.InsertNewParam End If - UpdatePanelInfoFromPart(m_nIdPart) End Sub @@ -439,4 +442,5 @@ Public Class EditPanelVM End Sub #End Region ' Methods + End Class diff --git a/Panel/EditParametricVM.vb b/Panel/EditParametricVM.vb index 0e24983..644eb93 100644 --- a/Panel/EditParametricVM.vb +++ b/Panel/EditParametricVM.vb @@ -1,10 +1,11 @@ -Imports System.Security.Cryptography -Imports EgtUILib +Imports EgtUILib Imports EgtWPFLib5 Public Class EditParametricVM Inherits SceneUserControlVM +#Region "FIELDS & PROPERTIES" + Private Enum ParamEnum As Integer TOP_MSG = 0 CHK_PNT = 1 @@ -14,8 +15,6 @@ Public Class EditParametricVM Private bReadyForLinks As Boolean = False -#Region "FIELDS & PROPERTIES" - Private ReadOnly m_MsgList As New List(Of String)({TopBar_Msg_Stg0, TopBar_Msg_Stg1, TopBar_Msg_Stg2}) Public ReadOnly Property MsgList As List(Of String) Get @@ -132,11 +131,13 @@ Public Class EditParametricVM Return EgtMsg(110040) ' Seleziona l'oggetto di cui vuoi modificare il vincolo End Get End Property + Public ReadOnly Property TopBar_Msg_Stg1 As String Get Return EgtMsg(110041) ' Seleziona l'oggetto a cui vuoi vincolare il precedente End Get End Property + Public ReadOnly Property TopBar_Msg_Stg2 As String Get Return EgtMsg(110042) ' @@ -171,6 +172,7 @@ Public Class EditParametricVM #End Region ' Constructor #Region "METHODS" + Public Overrides Sub LoadParamList() AddGenericParam(New _TextBlockParam(EGT_MESSAGE, MsgList(0), ParamType.STR, Visibility.Visible)) ' checkbox @@ -273,7 +275,7 @@ Public Class EditParametricVM EgtLuaExecLine("PAR.DrawAngularDimension()") End Sub -#End Region +#End Region ' Methods #Region "EVENTS" @@ -291,7 +293,6 @@ Public Class EditParametricVM End Sub Public Overrides Sub OnComboboxSelectionChanged(sender As Object, Selection As ParamCmBx) - End Sub #End Region ' Events diff --git a/Panel/NewPanelVM.vb b/Panel/NewPanelVM.vb index 3ddab90..3e5c67d 100644 --- a/Panel/NewPanelVM.vb +++ b/Panel/NewPanelVM.vb @@ -1,9 +1,10 @@ -Imports System.Windows.Forms -Imports EgtUILib.EgtInterface +Imports EgtUILib.EgtInterface Public Class NewPanelVM Inherits SceneUserControlVM +#Region "FIELDS & PROPERTIES" + Private Enum ParamEnum MSG_ISTRUZ = 0 TY_PANEL = 1 @@ -20,8 +21,6 @@ Public Class NewPanelVM BOTTOM_BORE_Y = 12 End Enum -#Region "FIELDS & PROPERTIES" - Private ReadOnly m_MsgList As New List(Of String)({TopBar_Msg_Stg0, TopBar_Msg_Stg1, TopBar_Msg_Stg2}) Public ReadOnly Property MsgList As List(Of String) Get @@ -47,16 +46,19 @@ Public Class NewPanelVM Return EgtMsg(110030) ' Clicca sull'edge di un pezzo per aggiungere una paretina del tipo selezionato End Get End Property + Public ReadOnly Property TopBar_Msg_Stg1 As String Get Return EgtMsg(110038) ' frontalino End Get End Property + Public ReadOnly Property TopBar_Msg_Stg2 As String Get Return EgtMsg(110039) ' fondo End Get End Property + Public ReadOnly Property TopBar_Msg_Bottom As String Get Return EgtMsg(110043) ' seleziona le paretine che fanno da contorno al fondo che vuoi creare diff --git a/Panel/PanelManagerM.vb b/Panel/PanelManagerM.vb index 8b1825d..ffa8842 100644 --- a/Panel/PanelManagerM.vb +++ b/Panel/PanelManagerM.vb @@ -1,4 +1,3 @@ -Imports EgtUILib.EgtInterface -Module PanelManagerM +Module PanelManagerM End Module diff --git a/SceneUserControl/SceneUserControlVM.vb b/SceneUserControl/SceneUserControlVM.vb index abdaa15..dbf6ece 100644 --- a/SceneUserControl/SceneUserControlVM.vb +++ b/SceneUserControl/SceneUserControlVM.vb @@ -180,6 +180,8 @@ Public Class SceneUserControlVM End Class +' ------------------------------ _GENERICPARAM ------------------------------ + Public Class GenericParam Inherits VMBase @@ -251,6 +253,8 @@ Public Class GenericParam End Class +' ------------------------------ _TEXTBOX ------------------------------ + Public Class _TextBoxParam Inherits GenericParam @@ -293,6 +297,8 @@ Public Class _TextBoxParam End Class +' ------------------------------ _TEXTBLOCK ------------------------------ + Public Class _TextBlockParam Inherits GenericParam @@ -333,6 +339,8 @@ Public Class _TextBlockParam End Class +' ------------------------------ _COMBOBOX ------------------------------ + Public Class _ComboBoxParam Inherits GenericParam @@ -416,6 +424,8 @@ Public Class ParamCmBx End Class +' ------------------------------ _CHECKBOX ------------------------------ + Public Class _CheckBoxParam Inherits GenericParam