- impostata ultima griglia per selezione
- migliorata selezione
This commit is contained in:
@@ -1548,12 +1548,14 @@ Public Class BTLPartVM
|
||||
End If
|
||||
If Not IsNothing(Map.refFeatureListManagerVM) Then Map.refFeatureListManagerVM.FeatureSelectionChanged()
|
||||
'End If
|
||||
If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
|
||||
EgtResetCurrMachGroup()
|
||||
ResetSearchFound()
|
||||
Map.refStatisticsTimePanelVM.SetViewPage_Visibility(Visibility.Visible)
|
||||
Map.refStatisticsTimePanelVM.SetMachiningPage_Visibility(Visibility.Collapsed)
|
||||
End If
|
||||
'If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then
|
||||
' If Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.MACHGROUP Then
|
||||
' EgtResetCurrMachGroup()
|
||||
' ResetSearchFound()
|
||||
' Map.refStatisticsTimePanelVM.SetViewPage_Visibility(Visibility.Visible)
|
||||
' Map.refStatisticsTimePanelVM.SetMachiningPage_Visibility(Visibility.Collapsed)
|
||||
' End If
|
||||
'End If
|
||||
EgtDraw()
|
||||
NotifyPropertyChanged(NameOf(SelBTLFeatureVM))
|
||||
' se modalità building, la tolgo
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
DataContext="{StaticResource FeatureListManagerVM}"
|
||||
HorizontalAlignment="Left"
|
||||
Orientation="Vertical"
|
||||
Style="{StaticResource OnlyProdFeatureListManager_StackPanel}">
|
||||
|
||||
<Button Command="{Binding CopyFeature_Command}"
|
||||
|
||||
@@ -373,73 +373,94 @@
|
||||
</DataGrid.Resources>
|
||||
<DataGrid.RowDetailsTemplate>
|
||||
<DataTemplate>
|
||||
<ListBox ItemsSource="{Binding BTLFeatureVMList}"
|
||||
SelectedItem="{Binding SelBTLFeatureVM, UpdateSourceTrigger=PropertyChanged}"
|
||||
PreviewMouseWheel="ListBox_PreviewMouseWheel"
|
||||
Width="860" Margin="20,0,0,0"
|
||||
Style="{StaticResource BTL_ListBox}">
|
||||
<ListBox.ItemTemplate>
|
||||
<DataTemplate>
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="50"/>
|
||||
<ColumnDefinition Width="40"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<TextBlock Text="{Binding nPRID}"
|
||||
Style="{StaticResource OnlyProd_TextBlock}"/>
|
||||
<Grid Grid.Column="1">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<!--<EgtBEAMWALL:OnlyProdFeatureListManagerV Grid.Row="1" Grid.ColumnSpan="2"/>-->
|
||||
<StackPanel Orientation="Vertical">
|
||||
<Button Height="30" Width="30"/>
|
||||
<Button Height="30" Width="30"/>
|
||||
<Button Height="30" Width="30"/>
|
||||
</StackPanel>
|
||||
<ListBox Grid.Column="1"
|
||||
ItemsSource="{Binding BTLFeatureVMList}"
|
||||
SelectedItem="{Binding SelBTLFeatureVM, UpdateSourceTrigger=PropertyChanged}"
|
||||
PreviewMouseWheel="ListBox_PreviewMouseWheel"
|
||||
Width="860" Margin="20,0,0,0"
|
||||
Grid.IsSharedSizeScope="True"
|
||||
Style="{StaticResource BTL_ListBox}">
|
||||
<ListBox.ItemsPanel>
|
||||
<ItemsPanelTemplate>
|
||||
<WrapPanel Orientation="Vertical" MaxHeight="150"/>
|
||||
</ItemsPanelTemplate>
|
||||
</ListBox.ItemsPanel>
|
||||
<ListBox.ItemTemplate>
|
||||
<DataTemplate>
|
||||
<Grid Margin="0,0,50,0">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
<ColumnDefinition Width="10"/>
|
||||
<ColumnDefinition Width="50"/>
|
||||
<ColumnDefinition Width="40"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto" SharedSizeGroup="Feature_Grp"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto" SharedSizeGroup="Feature_Prc"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="Auto" SharedSizeGroup="Feature_Name"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<Border Width="{Binding ActualHeight, RelativeSource={RelativeSource self}}"
|
||||
Background="{Binding Calc_Background}"/>
|
||||
<TextBlock Text="{Binding nPRID}"
|
||||
Style="{StaticResource OnlyProd_TextBlock}"/>
|
||||
<Grid Grid.Column="1">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="1*"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
</Grid.RowDefinitions>
|
||||
<Ellipse Visibility="{Binding CALC_ROT_Visibility}"
|
||||
Style="{StaticResource OnlyProdFeatureInPartInRawPartList_Ellipse}"/>
|
||||
<TextBlock Grid.Row="1"
|
||||
Text="{Binding CALC_ERR_Letter}"
|
||||
Style="{StaticResource OnlyProdFeatureInPartInRawPartList_TextBlock}"/>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
<ColumnDefinition Width="10"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<Border Width="{Binding ActualHeight, RelativeSource={RelativeSource self}}"
|
||||
Background="{Binding Calc_Background}"/>
|
||||
<Grid Grid.Column="1">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="1*"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
</Grid.RowDefinitions>
|
||||
<Ellipse Visibility="{Binding CALC_ROT_Visibility}"
|
||||
Style="{StaticResource OnlyProdFeatureInPartInRawPartList_Ellipse}"/>
|
||||
<TextBlock Grid.Row="1"
|
||||
Text="{Binding CALC_ERR_Letter}"
|
||||
Style="{StaticResource OnlyProdFeatureInPartInRawPartList_TextBlock}"/>
|
||||
</Grid>
|
||||
</Grid>
|
||||
<CheckBox Grid.Column="2"
|
||||
IsChecked="{Binding bDO, UpdateSourceTrigger=PropertyChanged}"
|
||||
VerticalAlignment="Center"
|
||||
HorizontalAlignment="Center"
|
||||
Margin="0,0,5,0"/>
|
||||
<TextBlock Grid.Column="3"
|
||||
Text="["
|
||||
Style="{StaticResource OnlyProd_TextBlock}"/>
|
||||
<TextBlock Grid.Column="4"
|
||||
Text="{Binding nSelGRP}"
|
||||
Style="{StaticResource OnlyProd_TextBlock}"/>
|
||||
<TextBlock Grid.Column="5"
|
||||
Text="-"
|
||||
Style="{StaticResource OnlyProd_TextBlock}"/>
|
||||
<TextBlock Grid.Column="6"
|
||||
Text="{Binding nPRC, StringFormat={}{0:000}}"
|
||||
Style="{StaticResource OnlyProd_TextBlock}"/>
|
||||
<TextBlock Grid.Column="7"
|
||||
Text="] "
|
||||
Style="{StaticResource OnlyProd_TextBlock}"/>
|
||||
<TextBlock Grid.Column="8"
|
||||
Text="{Binding sName}" FontSize="11" HorizontalAlignment="Center" VerticalAlignment="Center"
|
||||
Style="{StaticResource OnlyProd_TextBlock}"/>
|
||||
<Button Grid.Column="9" Height="15" Width="15" Margin="20,0,0,0"/>
|
||||
</Grid>
|
||||
<CheckBox Grid.Column="2"
|
||||
IsChecked="{Binding bDO, UpdateSourceTrigger=PropertyChanged}"
|
||||
VerticalAlignment="Center"
|
||||
HorizontalAlignment="Center"
|
||||
Margin="0,0,5,0"/>
|
||||
<TextBlock Grid.Column="3"
|
||||
Text="["
|
||||
Style="{StaticResource OnlyProd_TextBlock}"/>
|
||||
<TextBlock Grid.Column="4"
|
||||
Text="{Binding nSelGRP}"
|
||||
Style="{StaticResource OnlyProd_TextBlock}"/>
|
||||
<TextBlock Grid.Column="5"
|
||||
Text="-"
|
||||
Style="{StaticResource OnlyProd_TextBlock}"/>
|
||||
<TextBlock Grid.Column="6"
|
||||
Text="{Binding nPRC, StringFormat={}{0:000}}"
|
||||
Style="{StaticResource OnlyProd_TextBlock}"/>
|
||||
<TextBlock Grid.Column="7"
|
||||
Text="] "
|
||||
Style="{StaticResource OnlyProd_TextBlock}"/>
|
||||
<TextBlock Grid.Column="8"
|
||||
Text="{Binding sName}" FontSize="11" HorizontalAlignment="Center" VerticalAlignment="Center"
|
||||
Style="{StaticResource OnlyProd_TextBlock}"/>
|
||||
</Grid>
|
||||
</DataTemplate>
|
||||
</ListBox.ItemTemplate>
|
||||
</ListBox>
|
||||
</DataTemplate>
|
||||
</ListBox.ItemTemplate>
|
||||
</ListBox>
|
||||
</Grid>
|
||||
</DataTemplate>
|
||||
</DataGrid.RowDetailsTemplate>
|
||||
|
||||
|
||||
@@ -33,6 +33,8 @@ Public Class MyMachGroupPanelVM
|
||||
OnPreSetCurrMachGroup()
|
||||
EgtSetCurrMachGroup(value.Id)
|
||||
OnPostSetCurrMachGroup()
|
||||
' imposto tipo di grid selezionata
|
||||
Map.refProjectVM.SetLastSelGridType(ProjectVM.GridSelTypes.MACHGROUP)
|
||||
Map.refStatisticsTimePanelVM.SetMachiningPage_Visibility(Visibility.Visible)
|
||||
Map.refStatisticsTimePanelVM.SetViewPage_Visibility(Visibility.Collapsed)
|
||||
End If
|
||||
|
||||
Reference in New Issue
Block a user