diff --git a/Angle/AngleVM.vb b/Angle/AngleVM.vb index 920de82..f2acdce 100644 --- a/Angle/AngleVM.vb +++ b/Angle/AngleVM.vb @@ -27,6 +27,7 @@ Public Class AngleVM End Sub Public Overrides Sub Conferma() + LoadEditParametric() Close() End Sub diff --git a/Extremity/ExtremityVM.vb b/Extremity/ExtremityVM.vb index a0732b3..d4c94a8 100644 --- a/Extremity/ExtremityVM.vb +++ b/Extremity/ExtremityVM.vb @@ -29,6 +29,7 @@ Public Class ExtremityVM End Sub Public Overrides Sub Conferma() + LoadEditParametric() Close() End Sub diff --git a/Length/LengthVM.vb b/Length/LengthVM.vb index d457bd3..8b66d27 100644 --- a/Length/LengthVM.vb +++ b/Length/LengthVM.vb @@ -27,6 +27,7 @@ Public Class LengthVM End Sub Public Overrides Sub Conferma() + LoadEditParametric() Close() End Sub diff --git a/Move/MoveVM.vb b/Move/MoveVM.vb index d07adc3..b6a54d8 100644 --- a/Move/MoveVM.vb +++ b/Move/MoveVM.vb @@ -49,6 +49,8 @@ Public Class MoveVM Title = EGT_MOVE.ToUpper() LoadParamList() Stage = If(Map.refSceneHostVM.m_nIdPart = GDB_ID.NULL, MoveStage.SelectPart, MoveStage.InsertMovement) + ActivateButton() + RemoveAllUC() End Sub #End Region ' Contructor @@ -212,6 +214,27 @@ Public Class MoveVM SolidManagerM.ManageUndoRedo() End Sub + Private Sub ActivateButton() + ' Disattivo pulsante Rotate + DirectCast(Map.refSceneButtonVM.GetButton(EGT_ROTATE), _ToggleButton).IsChecked = False + ' Disattivo pulsante Pair + DirectCast(Map.refSceneButtonVM.GetButton(EGT_PAIR), _ToggleButton).IsChecked = False + ' Attivo pulsante Move + DirectCast(Map.refSceneButtonVM.GetButton(EGT_MOVE), _ToggleButton).IsChecked = True + End Sub + + Private Sub RemoveAllUC() + Map.refSceneButtonVM.RemoveUC(Map.refSceneButtonVM.m_AngleUC) + Map.refSceneButtonVM.RemoveUC(Map.refSceneButtonVM.m_EditPanelUC) + Map.refSceneButtonVM.RemoveUC(Map.refSceneButtonVM.m_EditParametricUC) + Map.refSceneButtonVM.RemoveUC(Map.refSceneButtonVM.m_ExtremityUC) + Map.refSceneButtonVM.RemoveUC(Map.refSceneButtonVM.m_LengthUC) + Map.refSceneButtonVM.RemoveUC(Map.refSceneButtonVM.m_NewPanelUC) + Map.refSceneButtonVM.RemoveUC(Map.refSceneButtonVM.m_PairUC) + Map.refSceneButtonVM.RemoveUC(Map.refSceneButtonVM.m_ParametricCompoUC) + Map.refSceneButtonVM.RemoveUC(Map.refSceneButtonVM.m_RotateUC) + End Sub + #End Region ' Methods End Class diff --git a/Pair/PairVM.vb b/Pair/PairVM.vb index b61bb4f..d291fed 100644 --- a/Pair/PairVM.vb +++ b/Pair/PairVM.vb @@ -75,6 +75,9 @@ Public Class PairVM If EgtLuaSetGlobBoolVar("ASS.bSaveTemp", bSaveTemp) Then AssLog("ASS.bSaveTemp = " & bSaveTemp.ToString) LoadParamList() + + ActivateButton() + RemoveAllUC() End Sub #End Region ' Constructor @@ -185,6 +188,27 @@ NoSecondLine: Map.refSceneHostVM.m_nTransfNum += nTransf End Sub + Private Sub ActivateButton() + ' Disattivo pulsante Rotate + DirectCast(Map.refSceneButtonVM.GetButton(EGT_ROTATE), _ToggleButton).IsChecked = False + ' Attivo pulsante Pair + DirectCast(Map.refSceneButtonVM.GetButton(EGT_PAIR), _ToggleButton).IsChecked = True + ' Disattivo pulsante Move + DirectCast(Map.refSceneButtonVM.GetButton(EGT_MOVE), _ToggleButton).IsChecked = False + End Sub + + Private Sub RemoveAllUC() + Map.refSceneButtonVM.RemoveUC(Map.refSceneButtonVM.m_AngleUC) + Map.refSceneButtonVM.RemoveUC(Map.refSceneButtonVM.m_EditPanelUC) + Map.refSceneButtonVM.RemoveUC(Map.refSceneButtonVM.m_EditParametricUC) + Map.refSceneButtonVM.RemoveUC(Map.refSceneButtonVM.m_ExtremityUC) + Map.refSceneButtonVM.RemoveUC(Map.refSceneButtonVM.m_LengthUC) + Map.refSceneButtonVM.RemoveUC(Map.refSceneButtonVM.m_MoveUC) + Map.refSceneButtonVM.RemoveUC(Map.refSceneButtonVM.m_NewPanelUC) + Map.refSceneButtonVM.RemoveUC(Map.refSceneButtonVM.m_ParametricCompoUC) + Map.refSceneButtonVM.RemoveUC(Map.refSceneButtonVM.m_RotateUC) + End Sub + #End Region ' Methods #Region "EVENTS" diff --git a/Rotate/RotateVM.vb b/Rotate/RotateVM.vb index 0d4cdce..a8bbf50 100644 --- a/Rotate/RotateVM.vb +++ b/Rotate/RotateVM.vb @@ -83,6 +83,9 @@ Public Class RotateVM LoadParamList() Stage = If(Map.refSceneHostVM.m_nIdPart = GDB_ID.NULL, RotateStage.SelectPart, RotateStage.SelectAxis) + + ActivateButton() + RemoveAllUC() End Sub #End Region ' Constructor @@ -178,6 +181,27 @@ Public Class RotateVM EgtDraw() End Sub + Private Sub ActivateButton() + ' Attivo pulsante Rotate + DirectCast(Map.refSceneButtonVM.GetButton(EGT_ROTATE), _ToggleButton).IsChecked = True + ' Disattivo pulsante Pair + DirectCast(Map.refSceneButtonVM.GetButton(EGT_PAIR), _ToggleButton).IsChecked = False + ' Disattivo pulsante Move + DirectCast(Map.refSceneButtonVM.GetButton(EGT_MOVE), _ToggleButton).IsChecked = False + End Sub + + Private Sub RemoveAllUC() + Map.refSceneButtonVM.RemoveUC(Map.refSceneButtonVM.m_AngleUC) + Map.refSceneButtonVM.RemoveUC(Map.refSceneButtonVM.m_EditPanelUC) + Map.refSceneButtonVM.RemoveUC(Map.refSceneButtonVM.m_EditParametricUC) + Map.refSceneButtonVM.RemoveUC(Map.refSceneButtonVM.m_ExtremityUC) + Map.refSceneButtonVM.RemoveUC(Map.refSceneButtonVM.m_LengthUC) + Map.refSceneButtonVM.RemoveUC(Map.refSceneButtonVM.m_MoveUC) + Map.refSceneButtonVM.RemoveUC(Map.refSceneButtonVM.m_NewPanelUC) + Map.refSceneButtonVM.RemoveUC(Map.refSceneButtonVM.m_ParametricCompoUC) + Map.refSceneButtonVM.RemoveUC(Map.refSceneButtonVM.m_PairUC) + End Sub + #End Region ' Methods End Class diff --git a/SceneUserControl/SceneUserControlVM.vb b/SceneUserControl/SceneUserControlVM.vb index 3d9689e..abdaa15 100644 --- a/SceneUserControl/SceneUserControlVM.vb +++ b/SceneUserControl/SceneUserControlVM.vb @@ -104,6 +104,12 @@ Public Class SceneUserControlVM m_Color_Timer.Start() End Sub + Public Sub LoadEditParametric() + If IsNothing(Map.refSceneButtonVM.m_EditParametricUC) Then Map.refSceneButtonVM.m_EditParametricUC = New SceneUserControlV + Map.refSceneButtonVM.m_EditParametricUC.DataContext = New EditParametricVM() + Map.refSceneButtonVM.LoadUC(Map.refSceneButtonVM.m_EditParametricUC) + End Sub + #End Region ' Methods #Region "EVENTS"