From f2da51ffa759e9dcac91ce22e83a455c36cc0bbc Mon Sep 17 00:00:00 2001 From: Daniele Bariletti Date: Thu, 20 Feb 2025 17:52:05 +0100 Subject: [PATCH] - correzioni alla gestione dell'apertura dell'UC per la modifica delle paretine. --- Panel/EditPanelVM.vb | 8 ++++++-- SceneHost/MySceneHostVM.vb | 12 +++--------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Panel/EditPanelVM.vb b/Panel/EditPanelVM.vb index 10da32a..d241367 100644 --- a/Panel/EditPanelVM.vb +++ b/Panel/EditPanelVM.vb @@ -40,7 +40,7 @@ Public Class EditPanelVM Return m_nIdPart End Get Set(value As Integer) - If m_nIdPart <> GDB_ID.NULL Then SceneCmd.DeselectAll() + SceneCmd.DeselectAll() m_nIdPart = value Stage = EditPanelStage.InsertNewParam ' devo capire che tipo di pezzo sto modificando @@ -65,6 +65,7 @@ Public Class EditPanelVM End Select End If UpdateParameterListShown() + SelectPartOrPartsToEdit() End Set End Property @@ -105,12 +106,14 @@ Public Class EditPanelVM Public Sub New() MyBase.New() Title = "Modifica Paretina".ToUpper() + LoadParamList() + If Map.refSceneHostVM.m_nIdPart <> GDB_ID.NULL Then nIdPart = Map.refSceneHostVM.m_nIdPart Stage = EditPanelStage.InsertNewParam End If - LoadParamList() + UpdatePanelInfoFromPart(m_nIdPart) End Sub @@ -419,6 +422,7 @@ Public Class EditPanelVM Dim PartSolidSel As PartSolidM = GetPartSolid(nIdPart) PartSolidSel.SelectSinglePart() End If + EgtDraw() End Sub #End Region ' Methods diff --git a/SceneHost/MySceneHostVM.vb b/SceneHost/MySceneHostVM.vb index 8ab9ecb..d2980aa 100644 --- a/SceneHost/MySceneHostVM.vb +++ b/SceneHost/MySceneHostVM.vb @@ -1007,9 +1007,8 @@ Line1: End If If Map.refSceneButtonVM.IsTgBtnChecked(EGT_EDIT_PANEL) Then - Dim PartSolidId As Integer = nPartId - If sName = "SOLID" Then EgtGetInfo(nPartId, "Parent", PartSolidId) - DirectCast(Map.refSceneButtonVM.m_EditPanelUC.DataContext, EditPanelVM).nIdPart = PartSolidId + Dim PartSolidSel As PartSolidM = SolidManagerM.GetPartSolid(nPartId) + DirectCast(Map.refSceneButtonVM.m_EditPanelUC.DataContext, EditPanelVM).nIdPart = PartSolidSel.PartId End If ' selezione semplice @@ -1119,12 +1118,7 @@ Line1: ' WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING ' WARNING WARNING WARNING WARNING WARNING WARNING ' questo controllo รจ stato tolto per poter selezionare gli oggetti importati nel vme e quindi non presenti nel nesting 'If bSelected Then - If Map.refSceneButtonVM.IsTgBtnChecked(EGT_EDIT_PANEL) Then - DirectCast(Map.refSceneButtonVM.m_EditPanelUC.DataContext, EditPanelVM).SelectPartOrPartsToEdit() - Else - PartSolidIdToSel.SelectPart() - End If - + PartSolidIdToSel.SelectPart() 'End If ' Se deselezione da eseguire ElseIf m_nIdToDesel <> GDB_ID.NULL Then