|
|
@@ -1110,7 +1110,7 @@
|
|
|
|
|
|
<StackPanel Grid.Row="6"
|
|
|
Grid.ColumnSpan="7"
|
|
|
- Margin="10,10,0,10"
|
|
|
+ Margin="10,0"
|
|
|
Grid.Column="0"
|
|
|
VerticalAlignment="Center"
|
|
|
Orientation="Horizontal">
|
|
|
@@ -1128,7 +1128,7 @@
|
|
|
|
|
|
<TextBlock Grid.Row="7"
|
|
|
Grid.ColumnSpan="7"
|
|
|
- Margin="10,10,0,10"
|
|
|
+ Margin="10,0"
|
|
|
Grid.Column="0"
|
|
|
VerticalAlignment="Center"
|
|
|
HorizontalAlignment="Center">
|
|
|
@@ -1159,14 +1159,14 @@
|
|
|
<TextBlock Grid.Row="1"
|
|
|
Grid.Column="0"
|
|
|
Text="{lex:Loc 点编号,Converter={StaticResource StringFormatConverter},ConverterParameter='{}{0}: '}"
|
|
|
- Margin="10"
|
|
|
+ Margin="10,0"
|
|
|
VerticalAlignment="Center" />
|
|
|
<ComboBox x:Name="cmbSelectPoint"
|
|
|
Grid.Row="2"
|
|
|
Grid.Column="0"
|
|
|
MinWidth="80"
|
|
|
materialDesign:HintAssist.Hint="{lex:Loc 选择点}"
|
|
|
- Margin="10,5"
|
|
|
+ Margin="10,0"
|
|
|
ItemsSource="{Binding Points}"
|
|
|
SelectedItem="{Binding SelectedPointInComboBox,Mode=TwoWay}">
|
|
|
<ComboBox.ItemTemplate>
|
|
|
@@ -1183,13 +1183,13 @@
|
|
|
<TextBlock Grid.Row="1"
|
|
|
Grid.Column="1"
|
|
|
Text="{lex:Loc 动作指令,Converter={StaticResource StringFormatConverter},ConverterParameter='{}{0}: '}"
|
|
|
- Margin="10"
|
|
|
+ Margin="10,0"
|
|
|
VerticalAlignment="Center" />
|
|
|
<ComboBox x:Name="cmbSelectMotioncmd"
|
|
|
Grid.Row="2"
|
|
|
Grid.Column="1"
|
|
|
MinWidth="80"
|
|
|
- Margin="10,5"
|
|
|
+ Margin="10,0"
|
|
|
materialDesign:HintAssist.Hint="{lex:Loc 动作指令}"
|
|
|
ItemsSource="{ext:EnumBindingSource EnumType=enums:MotionCommand}"
|
|
|
SelectedItem="{Binding DataContext.SelectMotionCommand,RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}" />
|
|
|
@@ -1197,7 +1197,7 @@
|
|
|
<Button Grid.Row="2"
|
|
|
Grid.Column="2"
|
|
|
Content="{lex:Loc 执行动作}"
|
|
|
- Margin="2"
|
|
|
+ Margin="2.0"
|
|
|
Command="{Binding DataContext.ExecuteMotion,RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}">
|
|
|
<Button.CommandParameter>
|
|
|
<MultiBinding Converter="{StaticResource MultiParameterConverter}">
|
|
|
@@ -1212,7 +1212,7 @@
|
|
|
<Button Grid.Row="3"
|
|
|
Grid.Column="0"
|
|
|
Content="{lex:Loc 示教}"
|
|
|
- Margin="2"
|
|
|
+ Margin="2,0"
|
|
|
HorizontalAlignment="Right"
|
|
|
Command="{Binding DataContext.TechPointCommand,RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}" />
|
|
|
</Grid>
|
