diff --git a/Panel/PanelVM.vb b/Panel/PanelVM.vb index f63b934..9644a20 100644 --- a/Panel/PanelVM.vb +++ b/Panel/PanelVM.vb @@ -39,7 +39,7 @@ Public Class PanelVM Public Sub New() MyBase.New() - Title = EGT_PANEL.ToUpper() + Title = "Aggiungi Paretina".ToUpper() DirectCast(Map.refSceneButtonV.m_PanelUC, SceneUserControlV).Annulla.Visibility = Visibility.Hidden DirectCast(Map.refSceneButtonV.m_PanelUC, SceneUserControlV).Preview.Visibility = Visibility.Hidden LoadParamList() @@ -51,10 +51,12 @@ Public Class PanelVM Public Overrides Sub LoadParamList() AddGenericParam(New _TextBlockParam("Messaggio", MsgList(0), Visibility.Visible)) - Dim PanelType As New List(Of ParamCmBx)({New ParamCmBx("Alzatina"), New ParamCmBx("Frontalino")}) + Dim PanelType As New List(Of ParamCmBx)({New ParamCmBx("Alzatina"), New ParamCmBx("Frontalino"), New ParamCmBx("SplitBottom")}) AddGenericParam(New _ComboBoxParam("TipoParetina", PanelType, 0, Visibility.Visible)) AddGenericParam(New _TextBoxParam("Altezza", 100, Visibility.Visible)) AddGenericParam(New _TextBoxParam("Spessore", 10, Visibility.Visible)) + AddGenericParam(New _TextBoxParam("Inclinazione", 0.1, Visibility.Collapsed)) + AddGenericParam(New _TextBoxParam("Diametro foro", 30, Visibility.Collapsed)) End Sub Public Sub AdvanceStage() @@ -65,6 +67,19 @@ Public Class PanelVM Return Stage End Function + Public Overrides Sub OnComboboxSelectionChanged(sender As Object, Selection As ParamCmBx) + ' quando viene selezionato lo split bottom devo mostrare le opzioni per il fondello + If DirectCast(sender, _ComboBoxParam).Name = "TipoParetina" Then + If DirectCast(Selection, ParamCmBx).Name = "SplitBottom" Then + ParamList(4).nVisibility = Visibility.Visible + ParamList(5).nVisibility = Visibility.Visible + Else + ParamList(4).nVisibility = Visibility.Collapsed + ParamList(5).nVisibility = Visibility.Collapsed + End If + End If + End Sub + Public Overrides Sub Conferma() ' gestisco le attivazioni di undo/redo SolidManagerM.ManageUndoRedo() @@ -95,6 +110,10 @@ Public Class PanelVM End If End Sub + Public Function abba() + Return 0 + End Function + Private Function GetValue(textBox As _TextBoxParam) Dim sValue As String = textBox.sValue If String.IsNullOrEmpty(sValue) Then Return 0 diff --git a/SceneUserControl/SceneUserControlV.xaml b/SceneUserControl/SceneUserControlV.xaml index 5102298..9827aec 100644 --- a/SceneUserControl/SceneUserControlV.xaml +++ b/SceneUserControl/SceneUserControlV.xaml @@ -7,12 +7,12 @@ - + - @@ -22,7 +22,7 @@ - + @@ -73,7 +73,7 @@ - diff --git a/Utility/EgtStone3DDefaultStyle.xaml b/Utility/EgtStone3DDefaultStyle.xaml index 9f8aca3..cccc6bb 100644 --- a/Utility/EgtStone3DDefaultStyle.xaml +++ b/Utility/EgtStone3DDefaultStyle.xaml @@ -1673,6 +1673,7 @@