Skip to content

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

删除没用的转换器

parent ea85577c
Hide whitespace changes
Inline Side-by-side
Showing with 134 additions and 126 deletions
Project.FLY.Thick.Base/FLY.Thick.Base.UI/Page_Initparam.xaml
View file @ cbf505fe
...@@ -20,8 +20,6 @@ ...@@ -20,8 +20,6 @@
<ResourceDictionary Source="pack://application:,,,/ThickTcpUiInWindow;component/Converter/Dictionary_MyConv.xaml"/> <ResourceDictionary Source="pack://application:,,,/ThickTcpUiInWindow;component/Converter/Dictionary_MyConv.xaml"/>
<!--<ResourceDictionary Source="pack://application:,,,/ThickTcpUiInWindow;component/Culture/StringResource.zh-CN.xaml"/>--> <!--<ResourceDictionary Source="pack://application:,,,/ThickTcpUiInWindow;component/Culture/StringResource.zh-CN.xaml"/>-->
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
<local:DataValidSrcConverter x:Key="datavalidsrc2boolconv" />
<local:FilmVSRCConverter x:Key="filmvsrc2boolconv" />
</ResourceDictionary> </ResourceDictionary>
</Page.Resources> </Page.Resources>
<Grid > <Grid >
...@@ -30,43 +28,43 @@ ...@@ -30,43 +28,43 @@
<RowDefinition Height="496*" /> <RowDefinition Height="496*" />
<RowDefinition Height="auto" /> <RowDefinition Height="auto" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<StackPanel Orientation="Horizontal" Background="{StaticResource Background_Title}"> <StackPanel Orientation="Horizontal" Background="{StaticResource Brush_theme_bar}">
<Button Style="{StaticResource ButtonStyle_back2}" Command="BrowseBack"/> <Button Style="{StaticResource ButtonStyle_back2}" Command="BrowseBack"/>
<TextBlock Style="{StaticResource TextBlockStyle_Title}" Text="{DynamicResource strSystemParam}"/> <TextBlock Style="{StaticResource TextBlockStyle_Title}" Text="{DynamicResource strSystemParam}"/>
</StackPanel> </StackPanel>
<ScrollViewer CanContentScroll="True" PanningMode="Both" Grid.Row="1" > <ScrollViewer PanningMode="Both" Grid.Row="1" >
<StackPanel > <StackPanel Orientation="Vertical" >
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"/> <ColumnDefinition Width="auto"/>
<ColumnDefinition /> <ColumnDefinition />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Border Width="150" Background="{StaticResource Color_theme_activity}" Margin="0,5,5,5"> <Border Width="150" Background="{StaticResource Brush_theme_bar}" Margin="0,5,5,5">
<TextBlock Style="{StaticResource TextBlockStyle_ItemHeader}" Text="{DynamicResource strBase}" /> <TextBlock Style="{StaticResource TextBlockStyle_ItemHeader}" Text="{DynamicResource strBase}" />
</Border> </Border>
<StackPanel Grid.Column="1" > <StackPanel Grid.Column="1" Orientation="Vertical">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<StackPanel Margin="5"> <StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strDBSize}" /> <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strDBSize}" />
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding DBKeepMonth}" /> <TextBox Style="{StaticResource ResourceKey=TextBoxStyle_FieldContent}" Text="{Binding DBKeepMonth}" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="{DynamicResource strMonth}" /> <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}" Text="{DynamicResource strMonth}" />
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<StackPanel Margin="5"> <StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strOrgInterval}" /> <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strOrgInterval}" />
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding AutoOrgInterval}" /> <TextBox Style="{StaticResource ResourceKey=TextBoxStyle_FieldContent}" Text="{Binding AutoOrgInterval}" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="{DynamicResource strTimes}" /> <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}" Text="min" />
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<StackPanel Margin="5"> <StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strGageLength}" /> <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strGageLength}" />
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding PosLength}" /> <TextBox Style="{StaticResource ResourceKey=TextBoxStyle_FieldContent}" Text="{Binding PosLength}" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm_interval}" Text="|"/> <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm_interval}" Text="|"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" > <TextBlock Style="{StaticResource ResourceKey=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="PosLength" /> <Binding Path="PosLength" />
...@@ -78,12 +76,13 @@ ...@@ -78,12 +76,13 @@
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<StackPanel Margin="5"> <StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strEncoder1Scale}" /> <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strEncoder1Scale}" />
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding Encoder1_mmpp}" HorizontalAlignment="Left"/> <TextBox Style="{StaticResource ResourceKey=TextBoxStyle_FieldContent}" Text="{Binding Encoder1_mmpp}" HorizontalAlignment="Left"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="{DynamicResource strMmOfPulse}"/> <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}" Text="{DynamicResource strMmOfPulse}"/>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<StackPanel Margin="5"> <StackPanel Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strTimeGridAdv}" /> <TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strTimeGridAdv}" />
...@@ -98,40 +97,40 @@ ...@@ -98,40 +97,40 @@
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<StackPanel Margin="5"> <StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strFilmVSrc}" /> <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strFilmVSrc}" />
<ComboBox Width="191" MinHeight="40" HorizontalAlignment="Left" > <ComboBox Width="191" MinHeight="40" HorizontalAlignment="Left">
<ComboBoxItem x:Name="comboBoxotem_EN2" IsSelected="{Binding FilmVSrc, Converter={StaticResource e2bconv}, ConverterParameter={x:Static common:FilmVSRC.EN2}}"> <ComboBoxItem x:Name="comboBoxotem_EN2" IsSelected="{Binding FilmVSrc, Converter={StaticResource e2bconv}, ConverterParameter={x:Static common:FilmVSRC.EN2}}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent}" FontSize="32" Text="{DynamicResource strEncoder2}"/> <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent}" FontSize="32" Text="{DynamicResource strEncoder2}"/>
</ComboBoxItem> </ComboBoxItem>
<ComboBoxItem x:Name="comboBoxotem_ROUND" IsSelected="{Binding FilmVSrc, Converter={StaticResource e2bconv}, ConverterParameter={x:Static common:FilmVSRC.ROUND}}"> <ComboBoxItem x:Name="comboBoxotem_ROUND" IsSelected="{Binding FilmVSrc, Converter={StaticResource e2bconv}, ConverterParameter={x:Static common:FilmVSRC.ROUND}}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent}" FontSize="32" Text="{DynamicResource strRollSignal}"/> <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent}" FontSize="32" Text="{DynamicResource strRollSignal}"/>
</ComboBoxItem> </ComboBoxItem>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" Visibility="{Binding IsSelected,Converter={StaticResource visbilityconv},ConverterParameter=Collapsed, ElementName=comboBoxotem_EN2}"> <StackPanel Orientation="Horizontal" Visibility="{Binding IsSelected,Converter={StaticResource ResourceKey=visbilityconv},ConverterParameter=Collapsed, ElementName=comboBoxotem_EN2}">
<StackPanel Margin="5"> <StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strEncoder2Scale}" /> <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strEncoder2Scale}" />
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding Encoder2_mmpp}" HorizontalAlignment="Left"/> <TextBox Style="{StaticResource ResourceKey=TextBoxStyle_FieldContent}" Text="{Binding Encoder2_mmpp}" HorizontalAlignment="Left"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" > <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}" >
<Run Text="mm/脉冲"/> <Run Text="mm/脉冲"/>
</TextBlock> </TextBlock>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<StackPanel Margin="5"> <StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strEncoder2Scaling}" /> <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strEncoder2Scaling}" />
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding Encoder2_comp}" HorizontalAlignment="Left"/> <TextBox Style="{StaticResource ResourceKey=TextBoxStyle_FieldContent}" Text="{Binding Encoder2_comp}" HorizontalAlignment="Left"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" > <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}" >
<Run Text="倍"/> <Run Text="倍"/>
</TextBlock> </TextBlock>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" Visibility="{Binding IsSelected,Converter={StaticResource visbilityconv},ConverterParameter=Collapsed, ElementName=comboBoxotem_ROUND}"> <StackPanel Orientation="Horizontal" Visibility="{Binding IsSelected,Converter={StaticResource ResourceKey=visbilityconv},ConverterParameter=Collapsed, ElementName=comboBoxotem_ROUND}">
<StackPanel Margin="5"> <StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strRollerPerimeter}" /> <TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strRollerPerimeter}" />
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBox HorizontalAlignment="Left" MaxWidth="150" Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding MmOfR,StringFormat={}{0:F1}}" /> <TextBox HorizontalAlignment="Left" MaxWidth="150" Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding MmOfR,StringFormat={}{0:F1}}" />
...@@ -139,11 +138,11 @@ ...@@ -139,11 +138,11 @@
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<StackPanel Margin="5"> <StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strFilmVThreshold}" /> <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strFilmVThreshold}" />
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding FilmVThreshold}" HorizontalAlignment="Left"/> <TextBox Style="{StaticResource ResourceKey=TextBoxStyle_FieldContent}" Text="{Binding FilmVThreshold}" HorizontalAlignment="Left"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" > <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}" >
<Run Text="m/min"/> <Run Text="m/min"/>
</TextBlock> </TextBlock>
</StackPanel> </StackPanel>
...@@ -151,45 +150,62 @@ ...@@ -151,45 +150,62 @@
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<StackPanel Margin="5"> <StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strDataValidSrc}" /> <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strDataValidSrc}" />
<ComboBox Width="191" MinHeight="40" HorizontalAlignment="Left"> <ComboBox Width="191" MinHeight="40" HorizontalAlignment="Left">
<ComboBoxItem x:Name="comboBoxotem_byen2" IsSelected="{Binding DataValidSrc, Converter={StaticResource datavalidsrc2boolconv}, ConverterParameter=BYEN2}"> <ComboBoxItem x:Name="comboBoxotem_byen2" IsSelected="{Binding DataValidSrc, Converter={StaticResource e2bconv}, ConverterParameter={x:Static common:DATAVALIDSRC.BYEN2}}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent}" FontSize="32" Text="{DynamicResource strFilmVelocity}"/> <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent}" FontSize="32" Text="{DynamicResource strFilmVelocity}"/>
</ComboBoxItem> </ComboBoxItem>
<ComboBoxItem x:Name="comboBoxotem_byinput" IsSelected="{Binding DataValidSrc, Converter={StaticResource datavalidsrc2boolconv}, ConverterParameter=BYINPUT}"> <ComboBoxItem x:Name="comboBoxotem_byinput" IsSelected="{Binding DataValidSrc, Converter={StaticResource e2bconv}, ConverterParameter={x:Static common:DATAVALIDSRC.BYINPUT}}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent}" FontSize="32" Text="{DynamicResource strLocalInput}"/> <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent}" FontSize="32" Text="{DynamicResource strLocalInput}"/>
</ComboBoxItem> </ComboBoxItem>
<ComboBoxItem x:Name="comboBoxotem_valid" IsSelected="{Binding DataValidSrc, Converter={StaticResource datavalidsrc2boolconv}, ConverterParameter=VALID}" > <ComboBoxItem x:Name="comboBoxotem_valid" IsSelected="{Binding DataValidSrc, Converter={StaticResource e2bconv}, ConverterParameter={x:Static common:DATAVALIDSRC.VALID}}" >
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent}" FontSize="32" Text="{DynamicResource strLongEffective}"/> <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent}" FontSize="32" Text="{DynamicResource strLongEffective}"/>
</ComboBoxItem> </ComboBoxItem>
<ComboBoxItem x:Name="comboBoxotem_invalid" IsSelected="{Binding DataValidSrc, Converter={StaticResource datavalidsrc2boolconv}, ConverterParameter=INVALID}"> <ComboBoxItem x:Name="comboBoxotem_invalid" IsSelected="{Binding DataValidSrc, Converter={StaticResource e2bconv}, ConverterParameter={x:Static common:DATAVALIDSRC.INVALID}}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent}" FontSize="32" Text="{DynamicResource strLongFailed}"/> <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent}" FontSize="32" Text="{DynamicResource strLongFailed}"/>
</ComboBoxItem> </ComboBoxItem>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal">
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strAutoScan}" />
<ToggleButton Style="{StaticResource ToggleButtonStyle1}" IsChecked="{Binding AutoF1F3}" HorizontalAlignment="Left"/>
</StackPanel>
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strAutoScanDelay}" />
<StackPanel Orientation="Horizontal">
<TextBox HorizontalAlignment="Left" MaxWidth="150" Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding ReStartDelay}" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="s" />
</StackPanel>
</StackPanel>
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strHasProfileSample}" />
<ToggleButton Style="{StaticResource ToggleButtonStyle1}" IsChecked="{Binding HasProfileSample}" HorizontalAlignment="Left"/>
</StackPanel>
</StackPanel>
</StackPanel> </StackPanel>
</Grid> </Grid>
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"/> <ColumnDefinition Width="auto"/>
<ColumnDefinition /> <ColumnDefinition />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Border Grid.Column="0" Width="150" Background="{StaticResource Color_theme_activity}" Margin="0,5,5,5"> <Border Grid.Column="0" Width="150" Background="{StaticResource Brush_theme_bar}" Margin="0,5,5,5">
<TextBlock Style="{StaticResource TextBlockStyle_ItemHeader}" Text="{DynamicResource strVelocity}"/> <TextBlock Style="{StaticResource TextBlockStyle_ItemHeader}" Text="{DynamicResource strVelocity}"/>
</Border> </Border>
<WrapPanel Grid.Column="1" Orientation="Horizontal"> <WrapPanel Grid.Column="1" Orientation="Horizontal">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<StackPanel Margin="5"> <StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strVScan}" /> <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strVScan}" />
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding VScan}" HorizontalAlignment="Left"/> <TextBox Style="{StaticResource ResourceKey=TextBoxStyle_FieldContent}" Text="{Binding VScan}" HorizontalAlignment="Left"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm_interval}" Text="|" /> <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm_interval}" Text="|" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" > <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}" >
<Run> <Run>
<MultiBinding Converter="{StaticResource outsp2mpminconv}" Mode="OneWay" StringFormat="{}{0:F1}"> <MultiBinding Converter="{StaticResource outsp2mpminconv}" Mode="OneWay" StringFormat="{}{0:F1}">
<Binding Path="VScan" /> <Binding Path="VScan" />
...@@ -202,12 +218,12 @@ ...@@ -202,12 +218,12 @@
</TextBlock> </TextBlock>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<StackPanel Margin="5"> <StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strVAccuracy}" /> <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strVAccuracy}" />
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding VAccuracy}" /> <TextBox Style="{StaticResource ResourceKey=TextBoxStyle_FieldContent}" Text="{Binding VAccuracy}" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm_interval}" Text="|" /> <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm_interval}" Text="|" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" > <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}" >
<Run> <Run>
<MultiBinding Converter="{StaticResource outsp2mpminconv}" Mode="OneWay" StringFormat="{}{0:F1}"> <MultiBinding Converter="{StaticResource outsp2mpminconv}" Mode="OneWay" StringFormat="{}{0:F1}">
<Binding Path="VAccuracy" /> <Binding Path="VAccuracy" />
...@@ -219,12 +235,12 @@ ...@@ -219,12 +235,12 @@
</TextBlock> </TextBlock>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<StackPanel Margin="5"> <StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strVTest}" /> <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strVTest}" />
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding VJOG}" /> <TextBox Style="{StaticResource ResourceKey=TextBoxStyle_FieldContent}" Text="{Binding VJOG}" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm_interval}" Text="|" /> <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm_interval}" Text="|" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" > <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}" >
<Run> <Run>
<MultiBinding Converter="{StaticResource outsp2mpminconv}" Mode="OneWay" StringFormat="{}{0:F1}"> <MultiBinding Converter="{StaticResource outsp2mpminconv}" Mode="OneWay" StringFormat="{}{0:F1}">
<Binding Path="VJOG" /> <Binding Path="VJOG" />
...@@ -239,12 +255,12 @@ ...@@ -239,12 +255,12 @@
</StackPanel> </StackPanel>
<StackPanel Margin="5"> <StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strSVelocity}" /> <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strSVelocity}" />
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding SVelocity}" /> <TextBox Style="{StaticResource ResourceKey=TextBoxStyle_FieldContent}" Text="{Binding SVelocity}" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm_interval}" Text="|" /> <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm_interval}" Text="|" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" > <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}" >
<Run > <Run >
<MultiBinding Converter="{StaticResource outsp2mpminconv}" Mode="OneWay" StringFormat="{}{0:F1}"> <MultiBinding Converter="{StaticResource outsp2mpminconv}" Mode="OneWay" StringFormat="{}{0:F1}">
<Binding Path="SVelocity" /> <Binding Path="SVelocity" />
...@@ -253,16 +269,16 @@ ...@@ -253,16 +269,16 @@
</MultiBinding> </MultiBinding>
</Run> </Run>
<Run Text="m/min" /> <Run Text="m/min" />
</TextBlock> </TextBlock>
</StackPanel>
</StackPanel> </StackPanel>
</StackPanel>
<StackPanel Margin="5"> <StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strHVelocity1}" /> <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strHVelocity1}" />
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding HVelocity1}" /> <TextBox Style="{StaticResource ResourceKey=TextBoxStyle_FieldContent}" Text="{Binding HVelocity1}" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm_interval}" Text="|" /> <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm_interval}" Text="|" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" > <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}" >
<Run > <Run >
<MultiBinding Converter="{StaticResource outsp2mpminconv}" Mode="OneWay" StringFormat="{}{0:F1}"> <MultiBinding Converter="{StaticResource outsp2mpminconv}" Mode="OneWay" StringFormat="{}{0:F1}">
<Binding Path="HVelocity1" /> <Binding Path="HVelocity1" />
...@@ -271,15 +287,15 @@ ...@@ -271,15 +287,15 @@
</MultiBinding> </MultiBinding>
</Run> </Run>
<Run Text="m/min" /> <Run Text="m/min" />
</TextBlock> </TextBlock>
</StackPanel>
</StackPanel> </StackPanel>
<StackPanel Margin="5"> </StackPanel>
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strHVelocity2}" /> <StackPanel Orientation="Vertical" Margin="5">
<StackPanel Orientation="Horizontal"> <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strHVelocity2}" />
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding HVelocity2}" /> <StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm_interval}" Text="|" /> <TextBox Style="{StaticResource ResourceKey=TextBoxStyle_FieldContent}" Text="{Binding HVelocity2}" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" > <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm_interval}" Text="|" />
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}" >
<Run > <Run >
<MultiBinding Converter="{StaticResource outsp2mpminconv}" Mode="OneWay" StringFormat="{}{0:F1}"> <MultiBinding Converter="{StaticResource outsp2mpminconv}" Mode="OneWay" StringFormat="{}{0:F1}">
<Binding Path="HVelocity2" /> <Binding Path="HVelocity2" />
...@@ -288,31 +304,31 @@ ...@@ -288,31 +304,31 @@
</MultiBinding> </MultiBinding>
</Run> </Run>
<Run Text="m/min" /> <Run Text="m/min" />
</TextBlock> </TextBlock>
</StackPanel>
</StackPanel> </StackPanel>
</StackPanel>
<StackPanel Margin="5"> <StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strATime}" /> <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strATime}" />
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding ATime}" /> <TextBox Style="{StaticResource ResourceKey=TextBoxStyle_FieldContent}" Text="{Binding ATime}" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" > <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}" >
<Run Text="ms" /> <Run Text="ms" />
</TextBlock> </TextBlock>
</StackPanel>
</StackPanel> </StackPanel>
<StackPanel Margin="5"> </StackPanel>
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strDTime}" /> <StackPanel Orientation="Vertical" Margin="5">
<StackPanel Orientation="Horizontal"> <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strDTime}" />
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding DTime}" /> <StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" > <TextBox Style="{StaticResource ResourceKey=TextBoxStyle_FieldContent}" Text="{Binding DTime}" />
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}" >
<Run Text="ms" /> <Run Text="ms" />
</TextBlock> </TextBlock>
</StackPanel>
</StackPanel> </StackPanel>
</StackPanel>
</WrapPanel> </WrapPanel>
</Grid> </Grid>
</StackPanel> </StackPanel>
</ScrollViewer> </ScrollViewer>
......
Project.FLY.Thick.Base/FLY.Thick.Base.UI/Page_Initparam.xaml.cs
View file @ cbf505fe
...@@ -60,12 +60,4 @@ namespace ThickTcpUiInWindow ...@@ -60,12 +60,4 @@ namespace ThickTcpUiInWindow
mInitParamService.Dispose(); mInitParamService.Dispose();
} }
} }
public class DataValidSrcConverter : EnumToIsCheckedConverter<DATAVALIDSRC>
{
}
public class FilmVSRCConverter : EnumToIsCheckedConverter<FilmVSRC>
{
}
} }
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