Skip to content

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

删除没用的转换器

parent ea85577c
Show 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 @@
<ResourceDictionary Source="pack://application:,,,/ThickTcpUiInWindow;component/Converter/Dictionary_MyConv.xaml"/>
<!--<ResourceDictionary Source="pack://application:,,,/ThickTcpUiInWindow;component/Culture/StringResource.zh-CN.xaml"/>-->
</ResourceDictionary.MergedDictionaries>
<local:DataValidSrcConverter x:Key="datavalidsrc2boolconv" />
<local:FilmVSRCConverter x:Key="filmvsrc2boolconv" />
</ResourceDictionary>
</Page.Resources>
<Grid >
......@@ -30,43 +28,43 @@
<RowDefinition Height="496*" />
<RowDefinition Height="auto" />
</Grid.RowDefinitions>
<StackPanel Orientation="Horizontal" Background="{StaticResource Background_Title}">
<StackPanel Orientation="Horizontal" Background="{StaticResource Brush_theme_bar}">
<Button Style="{StaticResource ButtonStyle_back2}" Command="BrowseBack"/>
<TextBlock Style="{StaticResource TextBlockStyle_Title}" Text="{DynamicResource strSystemParam}"/>
</StackPanel>
<ScrollViewer CanContentScroll="True" PanningMode="Both" Grid.Row="1" >
<StackPanel >
<ScrollViewer PanningMode="Both" Grid.Row="1" >
<StackPanel Orientation="Vertical" >
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"/>
<ColumnDefinition />
</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}" />
</Border>
<StackPanel Grid.Column="1" >
<StackPanel Grid.Column="1" Orientation="Vertical">
<StackPanel Orientation="Horizontal">
<StackPanel Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strDBSize}" />
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strDBSize}" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding DBKeepMonth}" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="{DynamicResource strMonth}" />
<TextBox Style="{StaticResource ResourceKey=TextBoxStyle_FieldContent}" Text="{Binding DBKeepMonth}" />
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}" Text="{DynamicResource strMonth}" />
</StackPanel>
</StackPanel>
<StackPanel Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strOrgInterval}" />
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strOrgInterval}" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding AutoOrgInterval}" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="{DynamicResource strTimes}" />
<TextBox Style="{StaticResource ResourceKey=TextBoxStyle_FieldContent}" Text="{Binding AutoOrgInterval}" />
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}" Text="min" />
</StackPanel>
</StackPanel>
<StackPanel Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strGageLength}" />
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strGageLength}" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding PosLength}" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm_interval}" Text="|"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" >
<TextBox Style="{StaticResource ResourceKey=TextBoxStyle_FieldContent}" Text="{Binding PosLength}" />
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm_interval}" Text="|"/>
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}" >
<Run>
<MultiBinding Converter="{StaticResource p2mmconv}" Mode="OneWay" StringFormat="{}{0:F0}">
<Binding Path="PosLength" />
......@@ -78,12 +76,13 @@
</StackPanel>
</StackPanel>
<StackPanel Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strEncoder1Scale}" />
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strEncoder1Scale}" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding Encoder1_mmpp}" HorizontalAlignment="Left"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" Text="{DynamicResource strMmOfPulse}"/>
<TextBox Style="{StaticResource ResourceKey=TextBoxStyle_FieldContent}" Text="{Binding Encoder1_mmpp}" HorizontalAlignment="Left"/>
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}" Text="{DynamicResource strMmOfPulse}"/>
</StackPanel>
</StackPanel>
<StackPanel Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strTimeGridAdv}" />
......@@ -98,40 +97,40 @@
</StackPanel>
</StackPanel>
<StackPanel Orientation="Horizontal">
<StackPanel Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strFilmVSrc}" />
<ComboBox Width="191" MinHeight="40" HorizontalAlignment="Left" >
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strFilmVSrc}" />
<ComboBox Width="191" MinHeight="40" HorizontalAlignment="Left">
<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 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>
</ComboBox>
</StackPanel>
<StackPanel Orientation="Horizontal" Visibility="{Binding IsSelected,Converter={StaticResource visbilityconv},ConverterParameter=Collapsed, ElementName=comboBoxotem_EN2}">
<StackPanel Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strEncoder2Scale}" />
<StackPanel Orientation="Horizontal" Visibility="{Binding IsSelected,Converter={StaticResource ResourceKey=visbilityconv},ConverterParameter=Collapsed, ElementName=comboBoxotem_EN2}">
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strEncoder2Scale}" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding Encoder2_mmpp}" HorizontalAlignment="Left"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" >
<TextBox Style="{StaticResource ResourceKey=TextBoxStyle_FieldContent}" Text="{Binding Encoder2_mmpp}" HorizontalAlignment="Left"/>
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}" >
<Run Text="mm/脉冲"/>
</TextBlock>
</StackPanel>
</StackPanel>
<StackPanel Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strEncoder2Scaling}" />
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strEncoder2Scaling}" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding Encoder2_comp}" HorizontalAlignment="Left"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" >
<TextBox Style="{StaticResource ResourceKey=TextBoxStyle_FieldContent}" Text="{Binding Encoder2_comp}" HorizontalAlignment="Left"/>
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}" >
<Run Text="倍"/>
</TextBlock>
</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}" />
<StackPanel Orientation="Horizontal">
<TextBox HorizontalAlignment="Left" MaxWidth="150" Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding MmOfR,StringFormat={}{0:F1}}" />
......@@ -139,11 +138,11 @@
</StackPanel>
</StackPanel>
</StackPanel>
<StackPanel Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strFilmVThreshold}" />
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strFilmVThreshold}" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding FilmVThreshold}" HorizontalAlignment="Left"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" >
<TextBox Style="{StaticResource ResourceKey=TextBoxStyle_FieldContent}" Text="{Binding FilmVThreshold}" HorizontalAlignment="Left"/>
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}" >
<Run Text="m/min"/>
</TextBlock>
</StackPanel>
......@@ -151,25 +150,42 @@
</StackPanel>
<StackPanel Orientation="Horizontal">
<StackPanel Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strDataValidSrc}" />
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strDataValidSrc}" />
<ComboBox Width="191" MinHeight="40" HorizontalAlignment="Left">
<ComboBoxItem x:Name="comboBoxotem_byen2" IsSelected="{Binding DataValidSrc, Converter={StaticResource datavalidsrc2boolconv}, ConverterParameter=BYEN2}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent}" FontSize="32" Text="{DynamicResource strFilmVelocity}"/>
<ComboBoxItem x:Name="comboBoxotem_byen2" IsSelected="{Binding DataValidSrc, Converter={StaticResource e2bconv}, ConverterParameter={x:Static common:DATAVALIDSRC.BYEN2}}">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent}" FontSize="32" Text="{DynamicResource strFilmVelocity}"/>
</ComboBoxItem>
<ComboBoxItem x:Name="comboBoxotem_byinput" IsSelected="{Binding DataValidSrc, Converter={StaticResource datavalidsrc2boolconv}, ConverterParameter=BYINPUT}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent}" FontSize="32" Text="{DynamicResource strLocalInput}"/>
<ComboBoxItem x:Name="comboBoxotem_byinput" IsSelected="{Binding DataValidSrc, Converter={StaticResource e2bconv}, ConverterParameter={x:Static common:DATAVALIDSRC.BYINPUT}}">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent}" FontSize="32" Text="{DynamicResource strLocalInput}"/>
</ComboBoxItem>
<ComboBoxItem x:Name="comboBoxotem_valid" IsSelected="{Binding DataValidSrc, Converter={StaticResource datavalidsrc2boolconv}, ConverterParameter=VALID}" >
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent}" FontSize="32" Text="{DynamicResource strLongEffective}"/>
<ComboBoxItem x:Name="comboBoxotem_valid" IsSelected="{Binding DataValidSrc, Converter={StaticResource e2bconv}, ConverterParameter={x:Static common:DATAVALIDSRC.VALID}}" >
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent}" FontSize="32" Text="{DynamicResource strLongEffective}"/>
</ComboBoxItem>
<ComboBoxItem x:Name="comboBoxotem_invalid" IsSelected="{Binding DataValidSrc, Converter={StaticResource datavalidsrc2boolconv}, ConverterParameter=INVALID}">
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent}" FontSize="32" Text="{DynamicResource strLongFailed}"/>
<ComboBoxItem x:Name="comboBoxotem_invalid" IsSelected="{Binding DataValidSrc, Converter={StaticResource e2bconv}, ConverterParameter={x:Static common:DATAVALIDSRC.INVALID}}">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent}" FontSize="32" Text="{DynamicResource strLongFailed}"/>
</ComboBoxItem>
</ComboBox>
</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>
</Grid>
......@@ -179,17 +195,17 @@
<ColumnDefinition Width="auto"/>
<ColumnDefinition />
</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}"/>
</Border>
<WrapPanel Grid.Column="1" Orientation="Horizontal">
<StackPanel Orientation="Horizontal">
<StackPanel Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strVScan}" />
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strVScan}" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding VScan}" HorizontalAlignment="Left"/>
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm_interval}" Text="|" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" >
<TextBox Style="{StaticResource ResourceKey=TextBoxStyle_FieldContent}" Text="{Binding VScan}" HorizontalAlignment="Left"/>
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm_interval}" Text="|" />
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}" >
<Run>
<MultiBinding Converter="{StaticResource outsp2mpminconv}" Mode="OneWay" StringFormat="{}{0:F1}">
<Binding Path="VScan" />
......@@ -202,12 +218,12 @@
</TextBlock>
</StackPanel>
</StackPanel>
<StackPanel Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strVAccuracy}" />
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strVAccuracy}" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding VAccuracy}" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm_interval}" Text="|" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" >
<TextBox Style="{StaticResource ResourceKey=TextBoxStyle_FieldContent}" Text="{Binding VAccuracy}" />
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm_interval}" Text="|" />
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}" >
<Run>
<MultiBinding Converter="{StaticResource outsp2mpminconv}" Mode="OneWay" StringFormat="{}{0:F1}">
<Binding Path="VAccuracy" />
......@@ -219,12 +235,12 @@
</TextBlock>
</StackPanel>
</StackPanel>
<StackPanel Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strVTest}" />
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strVTest}" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding VJOG}" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm_interval}" Text="|" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" >
<TextBox Style="{StaticResource ResourceKey=TextBoxStyle_FieldContent}" Text="{Binding VJOG}" />
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm_interval}" Text="|" />
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}" >
<Run>
<MultiBinding Converter="{StaticResource outsp2mpminconv}" Mode="OneWay" StringFormat="{}{0:F1}">
<Binding Path="VJOG" />
......@@ -239,12 +255,12 @@
</StackPanel>
<StackPanel Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strSVelocity}" />
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strSVelocity}" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding SVelocity}" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm_interval}" Text="|" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" >
<TextBox Style="{StaticResource ResourceKey=TextBoxStyle_FieldContent}" Text="{Binding SVelocity}" />
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm_interval}" Text="|" />
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}" >
<Run >
<MultiBinding Converter="{StaticResource outsp2mpminconv}" Mode="OneWay" StringFormat="{}{0:F1}">
<Binding Path="SVelocity" />
......@@ -257,12 +273,12 @@
</StackPanel>
</StackPanel>
<StackPanel Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strHVelocity1}" />
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strHVelocity1}" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding HVelocity1}" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm_interval}" Text="|" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" >
<TextBox Style="{StaticResource ResourceKey=TextBoxStyle_FieldContent}" Text="{Binding HVelocity1}" />
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm_interval}" Text="|" />
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}" >
<Run >
<MultiBinding Converter="{StaticResource outsp2mpminconv}" Mode="OneWay" StringFormat="{}{0:F1}">
<Binding Path="HVelocity1" />
......@@ -274,12 +290,12 @@
</TextBlock>
</StackPanel>
</StackPanel>
<StackPanel Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strHVelocity2}" />
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strHVelocity2}" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding HVelocity2}" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm_interval}" Text="|" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" >
<TextBox Style="{StaticResource ResourceKey=TextBoxStyle_FieldContent}" Text="{Binding HVelocity2}" />
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm_interval}" Text="|" />
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}" >
<Run >
<MultiBinding Converter="{StaticResource outsp2mpminconv}" Mode="OneWay" StringFormat="{}{0:F1}">
<Binding Path="HVelocity2" />
......@@ -292,20 +308,20 @@
</StackPanel>
</StackPanel>
<StackPanel Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strATime}" />
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strATime}" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding ATime}" />
<TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" >
<TextBox Style="{StaticResource ResourceKey=TextBoxStyle_FieldContent}" Text="{Binding ATime}" />
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}" >
<Run Text="ms" />
</TextBlock>
</StackPanel>
</StackPanel>
<StackPanel Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strDTime}" />
<StackPanel Orientation="Vertical" Margin="5">
<TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strDTime}" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding DTime}" />
<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" />
</TextBlock>
</StackPanel>
......
Project.FLY.Thick.Base/FLY.Thick.Base.UI/Page_Initparam.xaml.cs
View file @ cbf505fe
......@@ -60,12 +60,4 @@ namespace ThickTcpUiInWindow
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