diff --git a/EgtBEAMWALL.Core/BTLViewModel/BTLFeatureVM.vb b/EgtBEAMWALL.Core/BTLViewModel/BTLFeatureVM.vb index cffe203e..a2217508 100644 --- a/EgtBEAMWALL.Core/BTLViewModel/BTLFeatureVM.vb +++ b/EgtBEAMWALL.Core/BTLViewModel/BTLFeatureVM.vb @@ -163,7 +163,7 @@ Public Class BTLFeatureVM Public ReadOnly Property CALC_ROT_Visibility As Visibility Get - Return If(m_BTLFeatureM.nCALC_ROT <> 0, Visibility.Visible, Visibility.Collapsed) + Return If(m_BTLFeatureM.nCALC_ROT <> 0, Visibility.Visible, Visibility.Hidden) End Get End Property diff --git a/EgtBEAMWALL.Core/MachGroupPanel/MyMachGroupVM.vb b/EgtBEAMWALL.Core/MachGroupPanel/MyMachGroupVM.vb index 1a53d32e..bcae9b54 100644 --- a/EgtBEAMWALL.Core/MachGroupPanel/MyMachGroupVM.vb +++ b/EgtBEAMWALL.Core/MachGroupPanel/MyMachGroupVM.vb @@ -267,13 +267,13 @@ Public MustInherit Class MyMachGroupVM Public ReadOnly Property CALC_ROT_Visibility As Visibility Get - Return If(MyMachGroupM.nCALC_ROT <> 0, Visibility.Visible, Visibility.Collapsed) + Return If(MyMachGroupM.nCALC_ROT <> 0, Visibility.Visible, Visibility.Hidden) End Get End Property Public ReadOnly Property CALC_FALL_Visibility As Visibility Get - Return If(MyMachGroupM.nCALC_FALL <> 0, Visibility.Visible, Visibility.Collapsed) + Return If(MyMachGroupM.nCALC_FALL <> 0, Visibility.Visible, Visibility.Hidden) End Get End Property diff --git a/EgtBEAMWALL.Core/MachGroupPanel/PartVM.vb b/EgtBEAMWALL.Core/MachGroupPanel/PartVM.vb index 755bacb7..13592860 100644 --- a/EgtBEAMWALL.Core/MachGroupPanel/PartVM.vb +++ b/EgtBEAMWALL.Core/MachGroupPanel/PartVM.vb @@ -319,13 +319,13 @@ Public MustInherit Class PartVM Public ReadOnly Property CALC_ROT_Visibility As Visibility Get - Return If(m_PartM.nCALC_ROT <> 0, Visibility.Visible, Visibility.Collapsed) + Return If(m_PartM.nCALC_ROT <> 0, Visibility.Visible, Visibility.Hidden) End Get End Property Public ReadOnly Property CALC_FALL_Visibility As Visibility Get - Return If(m_PartM.nCALC_FALL <> 0, Visibility.Visible, Visibility.Collapsed) + Return If(m_PartM.nCALC_FALL <> 0, Visibility.Visible, Visibility.Hidden) End Get End Property diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml.vb b/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml.vb index ff8c7932..61751e23 100644 --- a/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml.vb +++ b/EgtBEAMWALL.Optimizer/ItemParamList/BTLPartListV.xaml.vb @@ -258,22 +258,20 @@ Public Class BTLPartListV End Sub Private Sub BTLPart_GridControl_PreviewKeyDown(sender As Object, e As KeyEventArgs) - Dim BTLStructureVM As BTLStructureVM = TryCast(Me.Tag, BTLStructureVM) - If IsNothing(BTLStructureVM) Then Return + If e.Key = Key.Delete Then + Dim BTLStructureVM As BTLStructureVM = TryCast(Me.Tag, BTLStructureVM) + If IsNothing(BTLStructureVM) Then Return - Dim SelBTLPart As BTLPartVM = BTLStructureVM.SelBTLPart - Dim SelBTLFeatureVM As BTLFeatureVM = SelBTLPart?.SelBTLFeatureVM + Dim SelBTLPart As BTLPartVM = BTLStructureVM.SelBTLPart + Dim SelBTLFeatureVM As BTLFeatureVM = SelBTLPart?.SelBTLFeatureVM - If bSelOnFeature AndAlso Not IsNothing(SelBTLFeatureVM) Then - If SelBTLFeatureVM.DeleteFeature_Command.CanExecute(Nothing) Then - SelBTLFeatureVM.DeleteFeature_Command.Execute(Nothing) + If bSelOnFeature AndAlso Not IsNothing(SelBTLFeatureVM) Then + SelBTLFeatureVM.DeleteFeature() e.Handled = True + Return End If - Return - End If - If BTLStructureVM.DeletePart_Command.CanExecute(Nothing) Then - BTLStructureVM.DeletePart_Command.Execute(Nothing) + BTLStructureVM.DeletePart() e.Handled = True End If End Sub diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/FeatureInPartInRawPartListV.xaml b/EgtBEAMWALL.Optimizer/ItemParamList/FeatureInPartInRawPartListV.xaml index 41ff5584..ca78c0d3 100644 --- a/EgtBEAMWALL.Optimizer/ItemParamList/FeatureInPartInRawPartListV.xaml +++ b/EgtBEAMWALL.Optimizer/ItemParamList/FeatureInPartInRawPartListV.xaml @@ -23,7 +23,7 @@ @@ -56,40 +56,42 @@ AllowColumnFiltering="False"> - + - + - + - + Style="{StaticResource CALC_ERR_TextBlock}"/> diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/FeatureInPartInRawPartListV.xaml.vb b/EgtBEAMWALL.Optimizer/ItemParamList/FeatureInPartInRawPartListV.xaml.vb index 5aedaff0..c41bfd6a 100644 --- a/EgtBEAMWALL.Optimizer/ItemParamList/FeatureInPartInRawPartListV.xaml.vb +++ b/EgtBEAMWALL.Optimizer/ItemParamList/FeatureInPartInRawPartListV.xaml.vb @@ -48,7 +48,7 @@ Public Class FeatureInPartInRawPartListV End Sub ' salvataggio del layout colonne - Public Sub SaveStatisticGridControlLayout() + Public Sub SaveFeatureInPartInRawPartGridControlLayout() FeatureVMList_GridControl.SaveLayoutToJson(m_sDataGridLayoutPath) End Sub @@ -56,7 +56,7 @@ Public Class FeatureInPartInRawPartListV ' imposto DataContext m_FeatureInPartInRawPartListVM = Me.DataContext ' imposto riferimento ad action per salvataggio layout tabella - m_FeatureInPartInRawPartListVM.refFeatureInPartInRawPartListGridControlLayout = AddressOf SaveStatisticGridControlLayout + m_FeatureInPartInRawPartListVM.refSaveFeatureInPartInRawPartGridControlLayout = AddressOf SaveFeatureInPartInRawPartGridControlLayout ' rispristino layout tabella If Not IsNothing(m_sDataGridLayoutPath) AndAlso File.Exists(m_sDataGridLayoutPath) Then FeatureVMList_GridControl.RestoreLayoutFromJson(m_sDataGridLayoutPath) diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/FeatureInPartInRawPartListVM.vb b/EgtBEAMWALL.Optimizer/ItemParamList/FeatureInPartInRawPartListVM.vb index bc7a1730..f7ffb8d9 100644 --- a/EgtBEAMWALL.Optimizer/ItemParamList/FeatureInPartInRawPartListVM.vb +++ b/EgtBEAMWALL.Optimizer/ItemParamList/FeatureInPartInRawPartListVM.vb @@ -8,7 +8,7 @@ Public Class FeatureInPartInRawPartListVM #Region "FIELDS & PROPERTIES" - Public refFeatureInPartInRawPartListGridControlLayout As Action + Public refSaveFeatureInPartInRawPartGridControlLayout As Action Private m_colFeatureInPartInRawPart_Do As EgwWPFBaseLib.ColumnLayout Public ReadOnly Property colFeatureInPartInRawPart_Do As EgwWPFBaseLib.ColumnLayout @@ -80,6 +80,12 @@ Public Class FeatureInPartInRawPartListVM End If End Sub + Friend Sub Close() + If Not IsNothing(refSaveFeatureInPartInRawPartGridControlLayout) Then + refSaveFeatureInPartInRawPartGridControlLayout() + End If + End Sub + #End Region ' Methods End Class diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListV.xaml b/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListV.xaml index 78ec457b..a73fe750 100644 --- a/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListV.xaml +++ b/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListV.xaml @@ -25,6 +25,7 @@ - + Style="{StaticResource CALC_ROT_TextBlock}"/> + Style="{StaticResource CALC_ERR_TextBlock}"/> @@ -109,7 +112,7 @@ AllowEditing="False" Style="{StaticResource ColumnInfoStyle}"/> @@ -185,6 +188,7 @@ @@ -286,11 +290,11 @@ + Style="{StaticResource CALC_ROT_TextBlock}"/> + Style="{StaticResource CALC_ERR_TextBlock}"/> diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListV.xaml.vb b/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListV.xaml.vb index 9b28bf8e..e68fa739 100644 --- a/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListV.xaml.vb +++ b/EgtBEAMWALL.Optimizer/ItemParamList/RawPartListV.xaml.vb @@ -272,22 +272,20 @@ Public Class RawPartListV End Sub Private Sub RawPart_TableView_PreviewKeyDown(sender As Object, e As KeyEventArgs) - Dim MyMachGroupPanelVM As MyMachGroupPanelVM = TryCast(Me.Tag, MyMachGroupPanelVM) - If IsNothing(MyMachGroupPanelVM) Then Return + If e.Key = Key.Delete Then + Dim MyMachGroupPanelVM As MyMachGroupPanelVM = TryCast(Me.Tag, MyMachGroupPanelVM) + If IsNothing(MyMachGroupPanelVM) Then Return - Dim SelectedMachGroup As MyMachGroupVM = MyMachGroupPanelVM.SelectedMachGroup - Dim SelPart As PartVM = SelectedMachGroup?.SelPart + Dim SelectedMachGroup As MyMachGroupVM = MyMachGroupPanelVM.SelectedMachGroup + Dim SelPart As PartVM = SelectedMachGroup?.SelPart - If Map.refMachGroupPanelVM.bSelOnPart AndAlso Not IsNothing(SelPart) Then - If SelPart.RemovePart_Command.CanExecute(Nothing) Then - SelPart.RemovePart_Command.Execute(Nothing) + If MyMachGroupPanelVM.bSelOnPart AndAlso Not IsNothing(SelPart) Then + SelPart.RemovePart() e.Handled = True + Return End If - Return - End If - If SelectedMachGroup.RemoveRawPart_Command.CanExecute(Nothing) Then - SelectedMachGroup.RemoveRawPart_Command.Execute(Nothing) + SelectedMachGroup.RemoveRawPart() e.Handled = True End If End Sub diff --git a/EgtBEAMWALL.Optimizer/MainWindow/MainWindowVM.vb b/EgtBEAMWALL.Optimizer/MainWindow/MainWindowVM.vb index 7ea4f24c..ded21171 100644 --- a/EgtBEAMWALL.Optimizer/MainWindow/MainWindowVM.vb +++ b/EgtBEAMWALL.Optimizer/MainWindow/MainWindowVM.vb @@ -432,7 +432,7 @@ Public Class MainWindowVM EgwWPFBaseLib.EgwDataGrid.WriteColumnLayout(DataGridColumnsIniFile.m_sDataGridColumnsIniFile, DataGridColumnDictionary) Map.refPartListVM.Close() Map.refRawPartListVM.Close() - + Map.refFeatureInPartInRawPartListVM.Close() End If ' Termino il Model m_MainWindowM.Close() diff --git a/EgtBEAMWALL.Optimizer/Project/ProjectVM.vb b/EgtBEAMWALL.Optimizer/Project/ProjectVM.vb index 8b322b75..49833d67 100644 --- a/EgtBEAMWALL.Optimizer/Project/ProjectVM.vb +++ b/EgtBEAMWALL.Optimizer/Project/ProjectVM.vb @@ -204,7 +204,6 @@ Public Class ProjectVM End Property Friend Sub SetFeatureListVisibility(bVisible As Boolean) m_FeatureList_Visibility = If(bVisible, Visibility.Visible, Visibility.Collapsed) - If Not m_FeatureList_Visibility Then Map.refFeatureInPartInRawPartListVM.refFeatureInPartInRawPartListGridControlLayout() NotifyPropertyChanged(NameOf(FeatureList_Visibility)) End Sub diff --git a/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml b/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml index bfc98f54..1989da43 100644 --- a/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml +++ b/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml @@ -2842,7 +2842,7 @@ - +