Skip to content

T
Thick-Common
Commit 2270e8fb authored by 潘栩锋's avatar 潘栩锋 🚴
Browse files
Options

GetSample 添加 更多报警

parent 9671ddff
Show whitespace changes
Inline Side-by-side
Showing with 403 additions and 377 deletions
Project.FLY.Thick.Base/FLY.Thick.Base.UI/PgGetSample.xaml
View file @ 2270e8fb
...@@ -14,33 +14,33 @@ ...@@ -14,33 +14,33 @@
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Dictionary_MyStyle.xaml"/> <ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Dictionary_MyStyle.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.Thick.Base.UI;component/Converter/Dictionary_MyConv.xaml"/> <ResourceDictionary Source="pack://application:,,,/FLY.Thick.Base.UI;component/Converter/Dictionary_MyConv.xaml"/>
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
<local:GetSampleVmUt x:Key="unittest"/> <local:PgGetSampleVmUt x:Key="viewModel"/>
<local:Item2IndexConverter x:Key="i2iConv"/>
<local:Item2DirectionConverter x:Key="i2dConv"/>
</ResourceDictionary> </ResourceDictionary>
</Page.Resources> </Page.Resources>
<Grid d:DataContext="{StaticResource unittest}" > <Grid d:DataContext="{StaticResource viewModel}" Background="{StaticResource Brushes.Card.Background}">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="auto" /> <RowDefinition Height="auto" />
<RowDefinition /> <RowDefinition />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid Name="grid_initparam"/> <Grid Name="grid_initparam"/>
<StackPanel Orientation="Horizontal" Background="{StaticResource Background_Title}"> <StackPanel Orientation="Horizontal" Background="{StaticResource Brushes.TitleBar.Background}">
<Button Style="{StaticResource ButtonStyle_back2}" Command="BrowseBack"/> <Button Style="{StaticResource Styles.TitleBar.BackButton2}" Command="BrowseBack"/>
<TextBlock Style="{StaticResource TextBlockStyle_Title}" Text="样品标定"/> <TextBlock Style="{StaticResource Styles.TitleBar.Text}" >
<Run Text="{Binding InfoName}"/>样品标定
</TextBlock>
</StackPanel> </StackPanel>
<ScrollViewer PanningMode="Both" Grid.Row="1" > <ScrollViewer PanningMode="Both" Grid.Row="1" >
<StackPanel > <StackPanel >
<StackPanel Orientation="Horizontal" > <Border Style="{StaticResource Styles.Card.Border}">
<Border Style="{StaticResource BorderStyle_paramSection}">
<TextBlock Text="基本" />
</Border>
<StackPanel> <StackPanel>
<TextBlock Style="{StaticResource Styles.Card.Title}"
Text="基本"/>
<StackPanel Margin="{StaticResource ControlMargin}"> <StackPanel Margin="{StaticResource ControlMargin}">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<StackPanel Margin="{StaticResource ControlMargin}"> <StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="使能" /> <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="使能" />
<ToggleButton Style="{StaticResource ToggleButtonStyle1}" IsChecked="{Binding Enable}"/> <ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" IsChecked="{Binding Enable}"/>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
...@@ -48,118 +48,96 @@ ...@@ -48,118 +48,96 @@
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<StackPanel Margin="{StaticResource ControlMargin}"> <StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeader}" Text="速度" /> <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="样品半径" />
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent}" Text="{Binding Velocity}" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm_interval}" Text="|" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" >
<Run >
<MultiBinding Converter="{StaticResource outsp2mpminconv}" Mode="OneWay" StringFormat="{}{0:F1}">
<Binding Path="Velocity" />
<Binding Path="DataContext.Encoder1_mmpp" ElementName="grid_initparam"/>
<Binding Path="DataContext.Speed1Scale" ElementName="grid_initparam"/>
</MultiBinding>
</Run>
<Run Text="m/min"/>
</TextBlock>
</StackPanel>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="样品半径" />
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding Range}" /> <TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding SampleRange}" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm_interval}" Text="|" /> <TextBlock Style="{StaticResource Styles.Text.FieldContent.Separator}" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" > <TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" >
<Run> <Run>
<MultiBinding Converter="{StaticResource p2mmconv}" Mode="OneWay" StringFormat="{}{0:F0}"> <MultiBinding Converter="{StaticResource p2mmconv}" Mode="OneWay" StringFormat="{}{0:F0}">
<Binding Path="Range" /> <Binding Path="SampleRange" />
<Binding Path="DataContext.Encoder1_mmpp" ElementName="grid_initparam"/> <Binding Path="DataContext.Encoder1_mmpp" ElementName="grid_initparam"/>
</MultiBinding> </MultiBinding>
</Run> </Run>mm
<Run Text="mm"/>
</TextBlock> </TextBlock>
</StackPanel> </StackPanel>
</StackPanel>
</StackPanel>
<StackPanel Orientation="Horizontal">
<!--<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="{StaticResource strSampleInterval}" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding Interval}" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="min"/>
</StackPanel> </StackPanel>
</StackPanel>-->
<StackPanel Margin="{StaticResource ControlMargin}"> <StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="移动滤波" /> <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="移动滤波窗口" />
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding Window}" /> <TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding Window}" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="min"/> <TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" Text="min"/>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}"> <StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="按%判断异常" /> <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="按%判断异常" />
<ToggleButton Style="{StaticResource ToggleButtonStyle1}" IsChecked="{Binding IsCheckByPercent}" HorizontalAlignment="Left"/> <ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" IsChecked="{Binding IsCheckByPercent}" HorizontalAlignment="Left"/>
</StackPanel> </StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}" Visibility="{Binding IsCheckByPercent,Converter={StaticResource visbilityconv}, ConverterParameter=Collapsed}"> <StackPanel Margin="{StaticResource ControlMargin}" Visibility="{Binding IsCheckByPercent,Converter={StaticResource visbilityconv}, ConverterParameter=Collapsed}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="异常比例" /> <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="异常比例" />
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding ErrPercent,StringFormat={}{0:F1}}" /> <TextBox Style="{StaticResource Styles.Text.FieldContent.Input}" Text="{Binding ErrPercent,Converter={StaticResource percentconv}}" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="%"/> <TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" Text="%"/>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}" Visibility="{Binding IsCheckByPercent,Converter={StaticResource visbilityconv}, ConverterParameter=CollapsedWhenTrue}"> <StackPanel Margin="{StaticResource ControlMargin}" Visibility="{Binding IsCheckByPercent,Converter={StaticResource visbilityconv}, ConverterParameter=CollapsedWhenTrue}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="异常值" /> <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="异常AD值" />
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding ErrValue}" /> <TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding ErrValue}" />
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<Button Style="{StaticResource ButtonStyle2}" FontSize="27" Command="{Binding GetOrgAdCmd}">
<StackPanel>
<TextBlock Text="计算"/>
<TextBlock Text="原始AD值"/>
</StackPanel> </StackPanel>
</Button> <StackPanel Orientation="Horizontal">
<Button Style="{StaticResource ButtonStyle2}" FontSize="27" Click="btnGageInfoClick">
<StackPanel>
<TextBlock Text="机架信息"/> <StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="差异比例" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding CrossErrPercent,Converter={StaticResource percentconv}}" />
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" Text="%"/>
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Comment}" Text="样品1AD/样品0AD&#13;与上一次比较" />
</StackPanel>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="差异时间范围" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding ErrIntervalMin}" />
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" Text="min"/>
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Comment}" Text="两次时间点比较,&#13;时间点的间隔最大时长。 大于它无效，不能比较" />
</StackPanel> </StackPanel>
</Button>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</Border>
<Border Style="{StaticResource Styles.Card.Border}">
<StackPanel>
<TextBlock Style="{StaticResource Styles.Card.Title}"
Text="样品"/>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<StackPanel>
<StackPanel.Resources> <StackPanel.Resources>
<CollectionViewSource Source="{Binding Samples}" x:Key="samplesViewSource" />
<sys:Double x:Key="column0_width">50</sys:Double> <sys:Double x:Key="column0_width">50</sys:Double>
<sys:Double x:Key="column_width">150</sys:Double> <sys:Double x:Key="column_width">150</sys:Double>
<Style x:Key="TextBlockStyle_header_no" TargetType="TextBlock" BasedOn="{StaticResource TextBlockStyle_FieldHeader}"> <Style x:Key="TextBlockStyle_header_no" TargetType="TextBlock" BasedOn="{StaticResource Styles.Text.FieldHeader}">
<Setter Property="Margin" Value="0"/> <Setter Property="Margin" Value="0"/>
<Setter Property="Width" Value="{StaticResource column0_width}"/> <Setter Property="Width" Value="{StaticResource column0_width}"/>
<Setter Property="TextAlignment" Value="Center"/>
</Style> </Style>
<Style x:Key="TextBlockStyle_header" TargetType="TextBlock" BasedOn="{StaticResource TextBlockStyle_FieldHeaderEditable}"> <Style x:Key="TextBlockStyle_header" TargetType="TextBlock" BasedOn="{StaticResource Styles.Text.FieldHeader.Editable}">
<Setter Property="Margin" Value="0"/> <Setter Property="Margin" Value="0"/>
<Setter Property="Width" Value="{StaticResource column_width}"/> <Setter Property="Width" Value="{StaticResource column_width}"/>
<Setter Property="TextAlignment" Value="Center"/> <Setter Property="TextAlignment" Value="Center"/>
</Style> </Style>
</StackPanel.Resources> </StackPanel.Resources>
<Border Style="{StaticResource BorderStyle_paramSection}">
<TextBlock Text="样品"/>
</Border>
<StackPanel>
<StackPanel.Resources>
<CollectionViewSource Source="{Binding Samples}" x:Key="samplesViewSource" />
</StackPanel.Resources>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource TextBlockStyle_header_no}" Text="序号" /> <TextBlock Style="{StaticResource TextBlockStyle_header_no}" Text="序号" />
<TextBlock Style="{StaticResource TextBlockStyle_header}" Text="使能" /> <TextBlock Style="{StaticResource TextBlockStyle_header}" Text="使能" />
<TextBlock Style="{StaticResource TextBlockStyle_header}" Text="不标定" /> <TextBlock Style="{StaticResource TextBlockStyle_header}" Text="不标定" />
<TextBlock Style="{StaticResource TextBlockStyle_header}" Text="原始AD值" /> <TextBlock Style="{StaticResource TextBlockStyle_header}" Text="原始AD值" />
<TextBlock Style="{StaticResource TextBlockStyle_header}" Text="位置" /> <TextBlock Style="{StaticResource TextBlockStyle_header}" Text="位置" />
</StackPanel> </StackPanel>
<ItemsControl ItemsSource="{Binding Source={StaticResource samplesViewSource}}"> <ItemsControl ItemsSource="{Binding Samples}">
<ItemsControl.ItemsPanel> <ItemsControl.ItemsPanel>
<ItemsPanelTemplate> <ItemsPanelTemplate>
<StackPanel/> <StackPanel/>
...@@ -167,85 +145,89 @@ ...@@ -167,85 +145,89 @@
</ItemsControl.ItemsPanel> </ItemsControl.ItemsPanel>
<ItemsControl.ItemTemplate> <ItemsControl.ItemTemplate>
<DataTemplate> <DataTemplate>
<StackPanel> <StackPanel Visibility="{Binding IsVisible,Converter={StaticResource visbilityconv},ConverterParameter=Collapsed}">
<Rectangle Height="2" Fill="Gray"/> <Rectangle Height="2" Fill="Gray"/>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent}" Width="{StaticResource column0_width}" Margin="0"> <TextBlock Style="{StaticResource Styles.Text.FieldContent}" Width="{StaticResource column0_width}"
<Run Text="{Binding Path=., Mode=OneWay, Converter={StaticResource i2iConv}, ConverterParameter={StaticResource samplesViewSource}}"/> Text="{Binding Name}"/>
</TextBlock> <ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" Width="{StaticResource column_width}"
<ToggleButton Style="{StaticResource ToggleButtonStyle1}" IsChecked="{Binding Enable}" Width="{StaticResource column_width}" Margin="0"/> IsChecked="{Binding Enable}" />
<ToggleButton Style="{StaticResource ToggleButtonStyle1}" IsChecked="{Binding JustForCheck}" Width="{StaticResource column_width}" Margin="0"/> <StackPanel Orientation="Horizontal" Visibility="{Binding Enable,Converter={StaticResource visbilityconv}}">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" TextAlignment="Center" Text="{Binding OrgAD}" Width="{StaticResource column_width}" Margin="0"/> <ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" Width="{StaticResource column_width}"
<StackPanel Orientation="Horizontal" > IsChecked="{Binding JustForCheck}" />
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding Position}" /> <TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Width="{StaticResource column_width}" TextAlignment="Center"
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm_interval}" Text="|" /> Text="{Binding OrgAD}" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" > <Grid Width="{StaticResource column_width}" >
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding Position}" />
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Separator}" />
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" >
<Run> <Run>
<MultiBinding Converter="{StaticResource p2mmconv}" Mode="OneWay" StringFormat="{}{0:F0}"> <MultiBinding Converter="{StaticResource p2mmconv}" Mode="OneWay" StringFormat="{}{0:F0}">
<Binding Path="Position" /> <Binding Path="Position" />
<Binding Path="DataContext.Encoder1_mmpp" ElementName="grid_initparam"/> <Binding Path="DataContext.Encoder1_mmpp" ElementName="grid_initparam"/>
</MultiBinding> </MultiBinding>
</Run> </Run>mm
<Run Text="mm" />
</TextBlock> </TextBlock>
</StackPanel> </StackPanel>
</Grid>
</StackPanel>
</StackPanel> </StackPanel>
</StackPanel>
</StackPanel>
</DataTemplate> </DataTemplate>
</ItemsControl.ItemTemplate> </ItemsControl.ItemTemplate>
</ItemsControl> </ItemsControl>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</StackPanel>
<StackPanel Orientation="Horizontal">
<Border Style="{StaticResource BorderStyle_paramSection}">
<TextBlock Text="位置修正" />
</Border> </Border>
<Border Style="{StaticResource Styles.Card.Border}">
<StackPanel>
<TextBlock Style="{StaticResource Styles.Card.Title}"
Text="位置修正"/>
<StackPanel> <StackPanel>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<StackPanel Margin="{StaticResource ControlMargin}" Orientation="Vertical"> <StackPanel Margin="{StaticResource ControlMargin}" Orientation="Vertical">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="查找范围" /> <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="查找范围" />
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding Search}" /> <TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding SearchRange}" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm_interval}" Text="|" /> <TextBlock Style="{StaticResource Styles.Text.FieldContent.Separator}" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}"> <TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}">
<Run> <Run>
<MultiBinding Converter="{StaticResource p2mmconv}" Mode="OneWay" StringFormat="{}{0:F0}"> <MultiBinding Converter="{StaticResource p2mmconv}" Mode="OneWay" StringFormat="{}{0:F0}">
<Binding Path="Search" /> <Binding Path="Search" />
<Binding Path="DataContext.Encoder1_mmpp" ElementName="grid_initparam"/> <Binding Path="DataContext.Encoder1_mmpp" ElementName="grid_initparam"/>
</MultiBinding> </MultiBinding>
</Run> </Run>mm
<Run Text="mm" /></TextBlock> </TextBlock>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal">
<StackPanel> <StackPanel>
<StackPanel.Resources> <StackPanel.Resources>
<sys:Double x:Key="column0_width">50</sys:Double> <sys:Double x:Key="column0_width">100</sys:Double>
<sys:Double x:Key="column_width">150</sys:Double> <sys:Double x:Key="column_width">150</sys:Double>
<Style x:Key="TextBlockStyle_header_no" TargetType="TextBlock" BasedOn="{StaticResource TextBlockStyle_FieldHeader}"> <Style x:Key="TextBlockStyle_header_no" TargetType="TextBlock" BasedOn="{StaticResource Styles.Text.FieldHeader}">
<Setter Property="Margin" Value="0"/> <Setter Property="Margin" Value="0"/>
<Setter Property="Width" Value="{StaticResource column0_width}"/> <Setter Property="Width" Value="{StaticResource column0_width}"/>
<Setter Property="TextAlignment" Value="Center"/>
</Style> </Style>
<Style x:Key="TextBlockStyle_header" TargetType="TextBlock" BasedOn="{StaticResource TextBlockStyle_FieldHeaderEditable}"> <Style x:Key="TextBlockStyle_header" TargetType="TextBlock" BasedOn="{StaticResource Styles.Text.FieldHeader.Editable}">
<Setter Property="Margin" Value="0"/> <Setter Property="Margin" Value="0"/>
<Setter Property="Width" Value="{StaticResource column_width}"/> <Setter Property="Width" Value="{StaticResource column_width}"/>
<Setter Property="TextAlignment" Value="Center"/> <Setter Property="TextAlignment" Value="Center"/>
</Style> </Style>
<CollectionViewSource Source="{Binding Features}" x:Key="featuresViewSource" />
</StackPanel.Resources> </StackPanel.Resources>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource TextBlockStyle_header_no}" Text="特征" /> <TextBlock Style="{StaticResource TextBlockStyle_header_no}" Text="特征" />
<TextBlock Style="{StaticResource TextBlockStyle_header}" Text="使能" /> <TextBlock Style="{StaticResource TextBlockStyle_header}" Text="使能" />
<TextBlock Style="{StaticResource TextBlockStyle_header}" Text="位置" /> <TextBlock Style="{StaticResource TextBlockStyle_header}" Text="位置" />
</StackPanel> </StackPanel>
<ItemsControl ItemsSource="{Binding Source={StaticResource featuresViewSource}}"> <ItemsControl ItemsSource="{Binding Features}">
<ItemsControl.ItemsPanel> <ItemsControl.ItemsPanel>
<ItemsPanelTemplate> <ItemsPanelTemplate>
<StackPanel/> <StackPanel/>
...@@ -256,32 +238,28 @@ ...@@ -256,32 +238,28 @@
<StackPanel> <StackPanel>
<Rectangle Height="2" Fill="Gray"/> <Rectangle Height="2" Fill="Gray"/>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent}" FontSize="20" Width="{StaticResource column0_width}" Margin="0" VerticalAlignment="Center"> <TextBlock Style="{StaticResource Styles.Text.FieldContent}" Width="{StaticResource column0_width}"
<Run Text="{Binding Path=., Mode=OneWay, Converter={StaticResource i2dConv},ConverterParameter={StaticResource featuresViewSource}}"/> Text="{Binding Name}"/>
</TextBlock> <ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" Width="{StaticResource column_width}"
<ToggleButton Style="{StaticResource ToggleButtonStyle1}" IsChecked="{Binding Enable}" Width="{StaticResource column_width}" Margin="0"/> IsChecked="{Binding Enable}" />
<StackPanel Orientation="Horizontal" Visibility="{Binding Enable,Converter={StaticResource visbilityconv}}">
<StackPanel Orientation="Horizontal"> <TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding StartPos}" />
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding StartPos}" /> <TextBlock Style="{StaticResource Styles.Text.FieldContent}" Text="-" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent}" Text="-" /> <TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding EndPos}" />
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding EndPos}" /> <TextBlock Style="{StaticResource Styles.Text.FieldContent.Separator}"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm_interval}" Text="|" /> <TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}">
<Run> <Run>
<MultiBinding Converter="{StaticResource p2mmconv}" Mode="OneWay" StringFormat="{}{0:F0}"> <MultiBinding Converter="{StaticResource p2mmconv}" Mode="OneWay" StringFormat="{}{0:F0}">
<Binding Path="StartPos" /> <Binding Path="StartPos" />
<Binding Path="DataContext.Encoder1_mmpp" ElementName="grid_initparam"/> <Binding Path="DataContext.Encoder1_mmpp" ElementName="grid_initparam"/>
</MultiBinding> </MultiBinding>
</Run> </Run>mm-
<Run Text="mm" />
<Run Text="-" />
<Run> <Run>
<MultiBinding Converter="{StaticResource p2mmconv}" Mode="OneWay" StringFormat="{}{0:F0}"> <MultiBinding Converter="{StaticResource p2mmconv}" Mode="OneWay" StringFormat="{}{0:F0}">
<Binding Path="EndPos" /> <Binding Path="EndPos" />
<Binding Path="DataContext.Encoder1_mmpp" ElementName="grid_initparam"/> <Binding Path="DataContext.Encoder1_mmpp" ElementName="grid_initparam"/>
</MultiBinding> </MultiBinding>
</Run> </Run>mm
<Run Text="mm" />
</TextBlock> </TextBlock>
</StackPanel> </StackPanel>
...@@ -295,12 +273,46 @@ ...@@ -295,12 +273,46 @@
</ItemsControl> </ItemsControl>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</StackPanel>
</Border>
<Border Style="{StaticResource Styles.Card.Border}">
<StackPanel>
<TextBlock Style="{StaticResource Styles.Card.Title}"
Text="采集记录"/>
<StackPanel Orientation="Horizontal">
<Button Style="{StaticResource Styles.Button.Square2}" Content="获取" Command="{Binding GetTempDataCmd}"/>
</StackPanel>
<StackPanel Orientation="Horizontal">
<ItemsControl ItemsSource="{Binding TempData}" >
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<StackPanel Orientation="Horizontal"/>
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
<ItemsControl.ItemTemplate>
<DataTemplate>
<DataGrid ItemsSource="{Binding .}" IsReadOnly="True" Margin="{StaticResource ControlMargin}" AutoGenerateColumns="False" Width="400" TextBlock.FontSize="12" TextBlock.FontWeight="Normal"
>
<DataGrid.Columns>
<DataGridTextColumn Header="复位" Binding="{Binding IsReset}" Width="100"/>
<DataGridTextColumn Header="时间" Binding="{Binding Time,StringFormat={}{0:HH:mm:ss}}" FontSize="10" Width="100"/>
<DataGridTextColumn Header="AD" Binding="{Binding Ad}" Width="100"/>
<DataGridTextColumn Header="滤波AD" Binding="{Binding FilterAd}" Width="100"/>
</DataGrid.Columns>
</DataGrid>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
</StackPanel>
</StackPanel>
</Border>
</StackPanel> </StackPanel>
</ScrollViewer> </ScrollViewer>
<Button Style="{StaticResource Styles.Button.Apply}" VerticalAlignment="Bottom" Margin="0,0,20,-45" <Button Style="{StaticResource Styles.Button.Apply}" VerticalAlignment="Bottom" Margin="0,0,20,20"
Command="{Binding ApplyCmd}"/> Command="{Binding ApplyCmd}"/>
</Grid> </Grid>
</Page> </Page>
Project.FLY.Thick.Base/FLY.Thick.Base.UI/PgGetSample.xaml.cs
View file @ 2270e8fb
...@@ -19,10 +19,8 @@ namespace FLY.Thick.Base.UI ...@@ -19,10 +19,8 @@ namespace FLY.Thick.Base.UI
{ {
IGetSampleService getSampleService; IGetSampleService getSampleService;
IInitParamService initParamService; IInitParamService initParamService;
IGageInfoService gageInfoService;
IUnityContainer container;
GetSampleVm viewModel; PgGetSampleVm viewModel;
public PgGetSample() public PgGetSample()
{ {
...@@ -30,32 +28,22 @@ namespace FLY.Thick.Base.UI ...@@ -30,32 +28,22 @@ namespace FLY.Thick.Base.UI
} }
[InjectionMethod] [InjectionMethod]
public void Init( public void Init(
IUnityContainer container,
IGetSampleService getSampleService, IGetSampleService getSampleService,
IInitParamService initParamService, IInitParamService initParamService,
IGageInfoService gageInfoService) string infoName = null)
{ {
this.getSampleService = getSampleService; this.getSampleService = getSampleService;
this.initParamService = initParamService; this.initParamService = initParamService;
this.gageInfoService = gageInfoService;
this.container = container;
viewModel = new GetSampleVm(); viewModel = new PgGetSampleVm();
viewModel.Init(getSampleService, gageInfoService); viewModel.Init(getSampleService, infoName);
this.DataContext = viewModel; this.DataContext = viewModel;
this.grid_initparam.DataContext = this.initParamService; this.grid_initparam.DataContext = this.initParamService;
} }
private void btnGageInfoClick(object sender, RoutedEventArgs e)
{
Page p = (container.IsRegistered<Page>("pgGageInfo")) ? container.Resolve<Page>("pgGageInfo") : container.Resolve<PgGageInfo>(); ;
//container.BuildUp(p);
NavigationService.Navigate(p);
}
} }
public class GetSampleVm : INotifyPropertyChanged public class PgGetSampleVm : INotifyPropertyChanged
{ {
#region 参数 #region 参数
...@@ -101,7 +89,7 @@ namespace FLY.Thick.Base.UI ...@@ -101,7 +89,7 @@ namespace FLY.Thick.Base.UI
/// <summary> /// <summary>
/// 参数：样品点参数 /// 参数：样品点参数
/// </summary> /// </summary>
public SampleCell[] Samples { get; private set; } public SampleCellView[] Samples { get; set; }
/// <summary> /// <summary>
/// 参数：特征查找范围 /// 参数：特征查找范围
/// </summary> /// </summary>
...@@ -109,67 +97,121 @@ namespace FLY.Thick.Base.UI ...@@ -109,67 +97,121 @@ namespace FLY.Thick.Base.UI
/// <summary> /// <summary>
/// 参数：特征参数 /// 参数：特征参数
/// </summary> /// </summary>
public SampleFeature[] Features { get; private set; } public SampleFeatureView[] Features { get; set; }
#endregion #endregion
#region Command #region Command
public RelayCommand ApplyCmd { get; } public RelayCommand ApplyCmd { get; private set; }
public RelayCommand GetOrgAdCmd { get; } public RelayCommand GetTempDataCmd { get; private set; }
#endregion #endregion
public event PropertyChangedEventHandler PropertyChanged; public event PropertyChangedEventHandler PropertyChanged;
public List<List<TempFilterData>> TempData { get; private set; }
public string InfoName { get; set; }
IGetSampleService getSampleService; IGetSampleService getSampleService;
IGageInfoService gageInfoService;
ItemsControl tempdatas; public PgGetSampleVm()
public GetSampleVm()
{ {
ApplyCmd = new RelayCommand(Apply); ApplyCmd = new RelayCommand(Apply);
GetTempDataCmd = new RelayCommand(GetTempData);
} }
[InjectionMethod]
public void Init( public void Init(
IGetSampleService getSampleService, IGetSampleService getSampleService,
IGageInfoService gageInfoService) string infoName)
{ {
InfoName = infoName;
this.getSampleService = getSampleService; this.getSampleService = getSampleService;
this.gageInfoService = gageInfoService;
Misc.BindingOperations.SetBinding(this.getSampleService, nameof(this.getSampleService.Enable), this, nameof(Enable)); Misc.BindingOperations.SetBinding(this.getSampleService, nameof(this.getSampleService.Enable), this, nameof(Enable));
Misc.BindingOperations.SetBinding(this.getSampleService, nameof(this.getSampleService.SampleRange), this, nameof(SampleRange)); Misc.BindingOperations.SetBinding(this.getSampleService, nameof(this.getSampleService.SampleRange), this, nameof(SampleRange));
Misc.BindingOperations.SetBinding(this.getSampleService, nameof(this.getSampleService.Window), this, nameof(Window)); Misc.BindingOperations.SetBinding(this.getSampleService, nameof(this.getSampleService.Window), this, nameof(Window));
Misc.BindingOperations.SetBinding(this.getSampleService, nameof(this.getSampleService.IsCheckByPercent), this, nameof(IsCheckByPercent)); Misc.BindingOperations.SetBinding(this.getSampleService, nameof(this.getSampleService.IsCheckByPercent), this, nameof(IsCheckByPercent));
Misc.BindingOperations.SetBinding(this.getSampleService, nameof(this.getSampleService.ErrPercent), this, nameof(ErrPercent)); Misc.BindingOperations.SetBinding(this.getSampleService, nameof(this.getSampleService.ErrPercent), this, nameof(ErrPercent));
Misc.BindingOperations.SetBinding(this.getSampleService, nameof(this.getSampleService.ErrValue), this, nameof(ErrValue)); Misc.BindingOperations.SetBinding(this.getSampleService, nameof(this.getSampleService.ErrValue), this, nameof(ErrValue));
Misc.BindingOperations.SetBinding(this.getSampleService, nameof(this.getSampleService.CrossErrPercent), this, nameof(CrossErrPercent));
Misc.BindingOperations.SetBinding(this.getSampleService, nameof(this.getSampleService.ErrIntervalMin), this, nameof(ErrIntervalMin));
Misc.BindingOperations.SetBinding(this.getSampleService, nameof(this.getSampleService.SearchRange), this, nameof(SearchRange)); Misc.BindingOperations.SetBinding(this.getSampleService, nameof(this.getSampleService.SearchRange), this, nameof(SearchRange));
Samples = new SampleCell[this.getSampleService.Samples.Count()]; Misc.BindingOperations.SetBinding(this.getSampleService, nameof(this.getSampleService.Samples), ()=> {
Features = new SampleFeature[this.getSampleService.Features.Count()]; var samples = this.getSampleService.Samples;
if (samples == null)
{
Samples = null;
}
else
{
Samples = new SampleCellView[samples.Count()];
for (int i = 0; i < Samples.Count(); i++) for (int i = 0; i < Samples.Count(); i++)
{ {
Samples[i] = new SampleCell(); Samples[i] = new SampleCellView() { Name = i.ToString() };
Misc.BindingOperations.SetBinding(this.getSampleService.Samples[i], nameof(SampleCell.Enable), Samples[i], nameof(SampleCell.Enable)); var sampleView = Samples[i];
Misc.BindingOperations.SetBinding(this.getSampleService.Samples[i], nameof(SampleCell.JustForCheck), Samples[i], nameof(SampleCell.JustForCheck)); Misc.BindingOperations.SetBinding(samples[i], nameof(SampleCell.Enable), sampleView, nameof(SampleCellView.Enable));
Misc.BindingOperations.SetBinding(this.getSampleService.Samples[i], nameof(SampleCell.OrgAD), Samples[i], nameof(SampleCell.OrgAD)); Misc.BindingOperations.SetBinding(samples[i], nameof(SampleCell.JustForCheck), sampleView, nameof(SampleCellView.JustForCheck));
Misc.BindingOperations.SetBinding(this.getSampleService.Samples[i], nameof(SampleCell.Position), Samples[i], nameof(SampleCell.Position)); Misc.BindingOperations.SetBinding(samples[i], nameof(SampleCell.OrgAD), sampleView, nameof(SampleCellView.OrgAD));
Misc.BindingOperations.SetBinding(samples[i], nameof(SampleCell.Position), sampleView, nameof(SampleCellView.Position));
} }
for (int i = 0; i < Features.Count(); i++) updateSampleCellViewVisible();
for (int i = 0; i < Samples.Count(); i++) {
var sampleView = Samples[i];
sampleView.PropertyChanged += (s, e) =>
{
if (e.PropertyName == nameof(SampleCellView.Enable))
{ {
Features[i] = new SampleFeature(); updateSampleCellViewVisible();
Misc.BindingOperations.SetBinding(this.getSampleService.Features[i], nameof(SampleFeature.Enable), Features[i], nameof(SampleFeature.Enable));
Misc.BindingOperations.SetBinding(this.getSampleService.Features[i], nameof(SampleFeature.StartPos), Features[i], nameof(SampleFeature.StartPos));
Misc.BindingOperations.SetBinding(this.getSampleService.Features[i], nameof(SampleFeature.EndPos), Features[i], nameof(SampleFeature.EndPos));
} }
};
} }
}
});
Misc.BindingOperations.SetBinding(this.getSampleService, nameof(this.getSampleService.Features), () => {
var features = this.getSampleService.Features;
if (features == null)
{
Features = null;
}
else
{
int cnt = Math.Min(features.Count(), 2);
Features = new SampleFeatureView[cnt];
for (int i = 0; i < Features.Count(); i++)
{
Features[i] = new SampleFeatureView();
var featureView = Features[i];
if (i == 0)
featureView.Name = "正向";
else
featureView.Name = "反向";
Misc.BindingOperations.SetBinding(features[i], nameof(SampleFeature.Enable), featureView, nameof(SampleFeatureView.Enable));
Misc.BindingOperations.SetBinding(features[i], nameof(SampleFeature.StartPos), featureView, nameof(SampleFeatureView.StartPos));
Misc.BindingOperations.SetBinding(features[i], nameof(SampleFeature.EndPos), featureView, nameof(SampleFeatureView.EndPos));
}
}
});
}
protected void updateSampleCellViewVisible()
{
if (Samples == null)
return;
for (int i = 0; i < Samples.Count(); i++) {
if (i == 0)
Samples[i].IsVisible = true;
else
{
Samples[i].IsVisible = Samples[i-1].Enable;
}
}
}
private void Apply() private void Apply()
{ {
if (!WdPassword.Authorize("GetSample")) if (!WdPassword.Authorize("GetSample"))
...@@ -179,11 +221,12 @@ namespace FLY.Thick.Base.UI ...@@ -179,11 +221,12 @@ namespace FLY.Thick.Base.UI
this.getSampleService.Enable = this.Enable; this.getSampleService.Enable = this.Enable;
this.getSampleService.SampleRange = this.SampleRange; this.getSampleService.SampleRange = this.SampleRange;
this.getSampleService.Velocity = this.Velocity;
this.getSampleService.Window = this.Window; this.getSampleService.Window = this.Window;
this.getSampleService.IsCheckByPercent = this.IsCheckByPercent; this.getSampleService.IsCheckByPercent = this.IsCheckByPercent;
this.getSampleService.ErrPercent = this.ErrPercent; this.getSampleService.ErrPercent = this.ErrPercent;
this.getSampleService.ErrValue = this.ErrValue; this.getSampleService.ErrValue = this.ErrValue;
this.getSampleService.CrossErrPercent = this.CrossErrPercent;
this.getSampleService.ErrIntervalMin = this.ErrIntervalMin;
for (int i = 0; i < Samples.Count(); i++) for (int i = 0; i < Samples.Count(); i++)
{ {
...@@ -213,20 +256,32 @@ namespace FLY.Thick.Base.UI ...@@ -213,20 +256,32 @@ namespace FLY.Thick.Base.UI
TimeSpan.FromSeconds(2)); TimeSpan.FromSeconds(2));
} }
private void GetTempData()
{
getSampleService.GetTempFilterDatas((asyncContext, retData) =>
{
var ll = retData as List<List<TempFilterData>>;
TempData = ll;
FLY.ControlLibrary.Window_Tip.Show("加载完成",
$"共加载{ll.Count()}列数据",
TimeSpan.FromSeconds(2));
}, null);
} }
public class GetSampleVmUt : INotifyPropertyChanged }
public class PgGetSampleVmUt : PgGetSampleVm
{ {
public GetSampleVmUt() public PgGetSampleVmUt()
{ {
Samples = new SampleCell[3]; Samples = new SampleCellView[3];
for (int i = 0; i < Samples.Count(); i++) for (int i = 0; i < Samples.Count(); i++)
{ {
SampleCell sampleCell = new SampleCell(); SampleCellView sampleCell = new SampleCellView() { Name = i.ToString() };
Samples[i] = sampleCell; Samples[i] = sampleCell;
} }
Features = new SampleFeature[2];
Features[0] = new SampleFeature(); Features = new SampleFeatureView[2];
Features[1] = new SampleFeature(); Features[0] = new SampleFeatureView() { Name = "正向" };
Features[1] = new SampleFeatureView() { Name = "反向" };
Enable = true; Enable = true;
...@@ -234,138 +289,87 @@ namespace FLY.Thick.Base.UI ...@@ -234,138 +289,87 @@ namespace FLY.Thick.Base.UI
Features[0].Enable = true; Features[0].Enable = true;
updateSampleCellViewVisible();
}
} }
#region IGetSampleService 成员
/// <summary> /// <summary>
/// 参数：使能 /// 样品点
/// </summary> /// </summary>
public bool Enable { get; set; } public class SampleCellView : INotifyPropertyChanged
{
/// <summary> /// <summary>
/// 参数：速度 /// 序号
/// </summary> /// </summary>
public UInt32 Velocity { get; set; } public string Name { get; set; }
/// <summary> /// <summary>
/// 参数：样品点范围 /// 显示出来
/// </summary> /// </summary>
public int Range { get; set; } public bool IsVisible { get; set; }
/// <summary> /// <summary>
/// 参数：移动滤波 ，窗口值 /// 参数：使能
/// </summary> /// </summary>
public int Window { get; set; } public bool Enable { get; set; }
/// <summary> /// <summary>
/// 使用%方式检查异常 /// 参数：只检查不标定
/// </summary>
public bool IsCheckByPercent { get; set; }
/// <summary>
/// 异常%
/// </summary> /// </summary>
public double ErrPercent { get; set; } public bool JustForCheck { get; set; }
/// <summary>
/// 异常值
/// </summary>
public int ErrValue { get; set; }
/// <summary>
/// 参数：样品点参数
/// </summary>
public SampleCell[] Samples { get; }
/// <summary> /// <summary>
/// 参数：特征查找范围 /// 参数：原始AD值
/// </summary> /// </summary>
public int Search { get; set; } public int OrgAD { get; set; }
/// <summary>
/// 参数：特征参数
/// </summary>
public SampleFeature[] Features { get; }
/// <summary> /// <summary>
/// 状态：从flyad7 得到的。 用于绘制图 /// 参数：位置
/// </summary> /// </summary>
public int PosOfGrid { get; set; } = 10; public int Position { get; set; }
public event PropertyChangedEventHandler PropertyChanged;
#region INotifyPropertyChanged 成员
public event PropertyChangedEventHandler PropertyChanged;
#endregion #endregion
} }
/// <summary> /// <summary>
/// 列表转序号 /// 样品正向校正特征
/// </summary> /// </summary>
[ValueConversion(typeof(object), typeof(int))] public class SampleFeatureView : INotifyPropertyChanged
public class Item2IndexConverter : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
{ {
/// <summary>
/// 序号
/// </summary>
public string Name { get; set; }
int result = -1; /// <summary>
if (value != null) /// 参数：使能
{ /// </summary>
public bool Enable { get; set; }
var collectionViewSource = parameter as CollectionViewSource;
if (collectionViewSource != null)
{
var cv = (CollectionView)collectionViewSource.View;
//在 设计模式中， View为null, 所以下面必须判断
if (cv != null)
{
result = cv.IndexOf(value);
}
}
}
return result >= 0 ? result : System.Windows.DependencyProperty.UnsetValue;
}
public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) /// <summary>
{ /// 参数：开始位置
throw new NotImplementedException(); /// </summary>
} public int StartPos { get; set; }
}
/// <summary> /// <summary>
/// 列表转序号 /// 参数：结束位置
/// </summary> /// </summary>
[ValueConversion(typeof(object), typeof(string))] public int EndPos { get; set; }
public class Item2DirectionConverter : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
{
if (value != null)
{
var collectionViewSource = parameter as CollectionViewSource;
if (collectionViewSource != null)
{
var cv = (CollectionView)collectionViewSource.View;
//在 设计模式中， View为null, 所以下面必须判断
if (cv != null)
{
switch (cv.IndexOf(value))
{
case 0:
return "正向";
case 1:
return "反向";
} #region INotifyPropertyChanged 成员
}
}
}
return "";
}
public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) public event PropertyChangedEventHandler PropertyChanged;
{
throw new NotImplementedException();
} #endregion
} }
} }
Project.FLY.Thick.Base/FLY.Thick.Base/Client/GetSampleServiceClient.cs
View file @ 2270e8fb
using FLY.Thick.Base.IService; using FLY.Thick.Base.IService;
using FObjBase;
using FObjBase.Reflect;
using System; using System;
using System.Collections.Generic;
using System.Linq; using System.Linq;
namespace FLY.Thick.Base.Client namespace FLY.Thick.Base.Client
...@@ -90,6 +93,12 @@ namespace FLY.Thick.Base.Client ...@@ -90,6 +93,12 @@ namespace FLY.Thick.Base.Client
{ {
Call(nameof(Apply)); Call(nameof(Apply));
} }
[Call(typeof(List<List<TempFilterData>>))]
public void GetTempFilterDatas(AsyncCBHandler asyncDelegate, object asyncContext)
{
Call(nameof(GetTempFilterDatas),null, asyncDelegate,asyncContext);
}
#endregion #endregion
} }
......
Project.FLY.Thick.Base/FLY.Thick.Base/IService/IGetSampleService.cs
View file @ 2270e8fb
...@@ -90,6 +90,9 @@ namespace FLY.Thick.Base.IService ...@@ -90,6 +90,9 @@ namespace FLY.Thick.Base.IService
/// 应用 /// 应用
/// </summary> /// </summary>
void Apply(); void Apply();
[Call(typeof(List<List<TempFilterData>>))]
void GetTempFilterDatas(AsyncCBHandler asyncDelegate, object asyncContext);
} }
......
Project.FLY.Thick.Base/FLY.Thick.Base/Server/GetSample.cs
View file @ 2270e8fb
...@@ -707,17 +707,15 @@ _end: ...@@ -707,17 +707,15 @@ _end:
/// </summary> /// </summary>
/// <param name="asyncCB"></param> /// <param name="asyncCB"></param>
/// <param name="asyncContext"></param> /// <param name="asyncContext"></param>
public void GetTempFilterDatas(AsyncCBHandler asyncCB, object asyncContext) public void GetTempFilterDatas(AsyncCBHandler asyncDelegate, object asyncContext)
{ {
List<List<TempFilterData>> ret = new List<List<TempFilterData>>(); List<List<TempFilterData>> ret = new List<List<TempFilterData>>();
for (int i = 0; i < Samples.Count(); i++) { for (int i = 0; i < Samples.Count(); i++) {
SampleCell sample = Samples[i]; SampleCell sample = Samples[i];
if (sample.Enable) if (sample.Enable)
ret.Add(tempFilters[i].GetDatas()); ret.Add(tempFilters[i].GetDatas());
else
ret.Add(null);
} }
asyncCB(asyncContext, ret); asyncDelegate(asyncContext, ret);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment