临时提交

SCADA_DAQ/Customer/UctFrmMain.xaml

@@ -7,8 +7,16 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:SCADA_DAQ.Customer"
              mc:Ignorable="d" 
-             xmlns:annHelper="clr-namespace:SCADA.CommonCtrl.AnimationHelper;assembly=SCADA.CommonCtrl"
-             d:DesignHeight="450" d:DesignWidth="800">
+             xmlns:annHelper="clr-namespace:SCADA.CommonCtrl.AnimationHelper;assembly=SCADA.CommonCtrl" xmlns:uct="clr-namespace:SCADA_DAQ.Customer.Views.Uct"
+    d:DesignHeight="450" d:DesignWidth="800">
     <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*"/>
+        </Grid.ColumnDefinitions>
+        <Grid Grid.Column="1">
+            <uct:UctSetSpeed/>
+        </Grid>
+        <uct:UctMotionControl/>
     </Grid>
 </wpfcontrol:BaseUctFrm>

SCADA_DAQ/Customer/UctFrmPalletizingManual.xaml

@@ -56,7 +56,6 @@
             </Grid>
 
             <Grid Grid.ColumnSpan="1" Grid.RowSpan="1" Grid.Row="1">
-                <GroupBox Header="码垛方案信息">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock FontSize="20" VerticalAlignment="Center" Foreground="Black" x:Name="Stacksln"/>
                         <wpfcontrol:AutoFilteredComboBox Margin="5" x:Name="ChooseStackSln"  VerticalAlignment="Center"  Width="150" Height="40" Grid.Column="1" FontSize="30"/>
@@ -69,16 +68,13 @@
                         <uct:UctShowInfo x:Name="BoxLength1" VerticalAlignment="Center" Margin="5"/>
                         <uct:UctShowInfo x:Name="BoxHeight1" VerticalAlignment="Center" Margin="5"/>
                     </StackPanel>
-                </GroupBox>
             </Grid>
             <Grid Grid.ColumnSpan="1" Grid.RowSpan="1" Grid.Row="2">
-                <GroupBox Header="当前运行码垛信息">
                     <StackPanel Orientation="Horizontal">
                         <uct:UctShowInfo x:Name="CaptureIndex"  VerticalAlignment="Center" Margin="5"/>
                         <uct:UctShowInfo x:Name="LayerNo" VerticalAlignment="Center" Margin="5"/>
                         <uct:UctShowInfo x:Name="LayerIndex" VerticalAlignment="Center" Margin="5"/>
                     </StackPanel>
-                </GroupBox>
             </Grid>
         </Grid>
     </Grid>