diff --git a/Assembly/AssemblyPageVM.vb b/Assembly/AssemblyPageVM.vb index b8de800..6be3f89 100644 --- a/Assembly/AssemblyPageVM.vb +++ b/Assembly/AssemblyPageVM.vb @@ -244,13 +244,13 @@ Public Class AssemblyPageVM ' In questa fase manca la gestione degli swing dei Jamb Select Case SelectPart Case ConstGen.PART_FRAME_LEFT - LoadSelectedPartDoor(ConstGen.PART_FRAME_LEFT, Visibility.Hidden, True) + LoadSelectedPartDoor(ConstGen.PART_FRAME_LEFT, OptionModule.m_CompoPanelFrameVisibility, True) Case ConstGen.PART_FRAME_RIGHT - LoadSelectedPartDoor(ConstGen.PART_FRAME_RIGHT, Visibility.Hidden, True) + LoadSelectedPartDoor(ConstGen.PART_FRAME_RIGHT, OptionModule.m_CompoPanelFrameVisibility, True) Case ConstGen.PART_FRAME_TOP - LoadSelectedPartDoor(ConstGen.PART_FRAME_TOP, Visibility.Hidden, True) + LoadSelectedPartDoor(ConstGen.PART_FRAME_TOP, OptionModule.m_CompoPanelFrameVisibility, True) Case ConstGen.PART_FRAME_BOTTOM - LoadSelectedPartDoor(ConstGen.PART_FRAME_BOTTOM, Visibility.Hidden, True) + LoadSelectedPartDoor(ConstGen.PART_FRAME_BOTTOM, OptionModule.m_CompoPanelFrameVisibility, True) Case Else LoadSelectedPartDoor(SelectPart, Visibility.Visible, False) End Select diff --git a/AssemblyManager/AssemblyManagerVM.vb b/AssemblyManager/AssemblyManagerVM.vb index 9039868..ad7d740 100644 --- a/AssemblyManager/AssemblyManagerVM.vb +++ b/AssemblyManager/AssemblyManagerVM.vb @@ -957,7 +957,11 @@ Public Class AssemblyManagerVM Catch ex As Exception End Try ' se l'apertura di un assemblato genera un errore esco - If IsNothing(OpenedAssName.SelAssembly) Then Return False + If IsNothing(OpenedAssName.SelAssembly) Then + ' aggiorno la grafica per eliminare la precedente porta visualizzata + Map.refSceneManagerVM.RefreshBtn() + Return False + End If OpenedAssName.IsModified = Part.FirstReadingEdge If OptionModule.m_ConfigurationSoftware = ConfigType.Door Then DdfFile.WriteDDFPart(OpenedAssName.SelAssembly.ListPartDoor(0).Door, sTempFile, True, False) diff --git a/CompoPanel/CompoPanelVM.vb b/CompoPanel/CompoPanelVM.vb index 89b63cd..4094b64 100644 --- a/CompoPanel/CompoPanelVM.vb +++ b/CompoPanel/CompoPanelVM.vb @@ -133,7 +133,9 @@ Public Class CompoPanelVM Dim m_CurrCompoType As CompoType = DirectCast(param, CompoType) m_CurrCompoType.LoadListTemplate() If Not IsNothing(Map.refPartPageVM.CurrPart) Then - Dim NewCompo As Compo = Map.refPartPageVM.CurrPart.AddNewCompo(m_CurrCompoType) + Dim IsFrame As Boolean = False + If Map.refPartPageVM.CurrPart.TypePart.Contains("F") Then IsFrame = True + Dim NewCompo As Compo = Map.refPartPageVM.CurrPart.AddNewCompo(m_CurrCompoType, IsFrame) If IsNothing(NewCompo) Then Return ' aggiorno lista hardware di quotatura Map.refDimensioningPanelVM.LoadHardwareDimList() diff --git a/HardwareManager/Hardware.vb b/HardwareManager/Hardware.vb index 738b5d9..316c031 100644 --- a/HardwareManager/Hardware.vb +++ b/HardwareManager/Hardware.vb @@ -548,16 +548,20 @@ Public Class Hardware Private Sub FindSideJamb() If Map.refHardwarePageVM.GenericPart.CompoList.Count < 1 Then Return - If String.IsNullOrEmpty(HardwareGeneral.JambSide) Then - For Each Item In Map.refHardwarePageVM.GenericPart.CompoList(0).CompoParamList + 'If String.IsNullOrEmpty(HardwareGeneral.JambSide) Then + For Each Item In Map.refHardwarePageVM.GenericPart.CompoList(0).CompoParamList If TypeOf Item Is ComboBoxParam AndAlso Item.DDFName = "side" Then Dim CBoxPar As ComboBoxParam = DirectCast(Item, ComboBoxParam) - HardwareGeneral.SetJambSide(CBoxPar.SelItem) + Dim IndexItem As Integer = CBoxPar.ItemList.IndexOf(CBoxPar.SelItem) + If IndexItem > -1 Then + HardwareGeneral.SetJambSide(CBoxPar.ItemListDDF(IndexItem)) + End If + 'HardwareGeneral.SetJambSide(CBoxPar.SelItem) Exit For End If Next - End If + 'End If If HardwareGeneral.JambSide.ToLower.Contains("hinge") Then Map.refHardwarePageVM.GenericPart.TypePart = PART_FRAME_LEFT & HINGE If Not HardwarePartVM.bIsSettingDoor Then diff --git a/HardwareManager/HardwarePageV.xaml b/HardwareManager/HardwarePageV.xaml index cfb497b..a175956 100644 --- a/HardwareManager/HardwarePageV.xaml +++ b/HardwareManager/HardwarePageV.xaml @@ -199,7 +199,7 @@ - +