Merge branch 'master' of http://www.scserverddns.top:13000/sc/DyeingComputer

View/TechnologicalProcessView.xaml

@@ -16,14 +16,14 @@
     </UserControl.Resources>
     <Grid>
         <DataGrid x:Name="GridSTEP" AlternationCount="2" IsReadOnly="True" SelectionChanged="Grid_SelectionChanged"     
-                  Margin="630,40,0,0" d:ItemsSource="{d:SampleData ItemCount=90}" AutoGenerateColumns="False" MinColumnWidth="30"   
+                  Margin="630,40,0,0" d:ItemsSource="{d:SampleData ItemCount=90}" AutoGenerateColumns="False" 
                   ItemsSource="{Binding Path=TechnologicalProcess_View,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"    
-                  HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" BorderBrush="{x:Null}"              
-                  BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" Grid.ColumnSpan="2" AllowDrop="False"        
-                  CanUserReorderColumns="False" CanUserSortColumns="False" CanUserResizeRows="False" CanUserResizeColumns="False"  
+                  HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All"         
+                  BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" Grid.ColumnSpan="2"
+                  AllowDrop="False" BorderBrush="{x:Null}" MinColumnWidth="30" CanUserResizeColumns="False"  
+                  CanUserReorderColumns="False" CanUserSortColumns="False" CanUserResizeRows="False"  
                   CanUserAddRows="True" CanUserDeleteRows="False" HeadersVisibility ="Column" 
                   Background="White" SelectionMode="Single" FontSize="15" MinHeight="632" TabIndex="1" Focusable="True" >
-
             <DataGrid.RowStyle >
                 <Style TargetType="{x:Type DataGridRow}">
                     <Setter Property="IsHitTestVisible" Value="{Binding DataContext.IsInteractive,    
@@ -67,7 +67,8 @@
                 <!--列信息绑定-->
                 <DataGridTextColumn Binding="{Binding ProgramID}" Width="0" MinWidth="0" MaxWidth="0"/>
                 <DataGridTextColumn Binding="{Binding Program}" Width="0" MinWidth="0" MaxWidth="0"/>
-                <DataGridTextColumn Header="{x:Static lang:Resources.Step}" Binding="{Binding Step}" Width="60" IsReadOnly="True">
+                <DataGridTextColumn Header="{x:Static lang:Resources.Step}" Binding="{Binding Step}" 
+                                    Width="60" IsReadOnly="True">
                     <DataGridTextColumn.ElementStyle>
                         <Style TargetType="TextBlock">
                             <Setter Property="VerticalAlignment" Value="Center"/>
@@ -75,9 +76,12 @@
                         </Style>
                     </DataGridTextColumn.ElementStyle>
                 </DataGridTextColumn>
-                <DataGridTextColumn Header="{x:Static lang:Resources.Code}" Width="0" MinWidth="0" MaxWidth="0" Binding="{Binding StepID}" IsReadOnly="True"/>
-                <DataGridTextColumn Header="{x:Static lang:Resources.Directives}"  Width="0" MinWidth="0" MaxWidth="0" Binding="{Binding StepName}" IsReadOnly="True"/>
-                <DataGridTextColumn Header="{x:Static lang:Resources.ParameterSet}"  Width="0" MinWidth="0" MaxWidth="0" Binding="{Binding ParameterName}" IsReadOnly="True"/>
+                <DataGridTextColumn Header="{x:Static lang:Resources.Code}" Width="0" MinWidth="0" 
+                                    MaxWidth="0" Binding="{Binding StepID}" IsReadOnly="True"/>
+                <DataGridTextColumn Header="{x:Static lang:Resources.Directives}"  Width="0" MinWidth="0"
+                                    MaxWidth="0" Binding="{Binding StepName}" IsReadOnly="True"/>
+                <DataGridTextColumn Header="{x:Static lang:Resources.ParameterSet}"  Width="0" MinWidth="0" 
+                                    MaxWidth="0" Binding="{Binding ParameterName}" IsReadOnly="True"/>
                 <DataGridTextColumn Binding="{Binding Parameter1}" Width="0" MinWidth="0" MaxWidth="0"/>
                 <DataGridTextColumn Binding="{Binding Parameter2}" Width="0" MinWidth="0" MaxWidth="0"/>
                 <DataGridTextColumn Binding="{Binding Parameter3}" Width="0" MinWidth="0" MaxWidth="0"/>
@@ -133,7 +137,8 @@
                         </DataTemplate>
                     </DataGridTemplateColumn.CellTemplate>
                 </DataGridTemplateColumn>
-                <DataGridTextColumn Header="{x:Static lang:Resources.Remark}" Binding="{Binding Remark}" Width="*" IsReadOnly="True">
+                <DataGridTextColumn Header="{x:Static lang:Resources.Remark}" Binding="{Binding Remark}" 
+                                    Width="*" IsReadOnly="True">
                     <DataGridTextColumn.ElementStyle>
                         <Style TargetType="TextBlock">
                             <Setter Property="VerticalAlignment" Value="Center"/>
@@ -241,29 +246,43 @@
                 </DataGrid.Columns>
             </DataGrid>
         </Grid>
-        <TextBlock x:Name="name" HorizontalAlignment="Left" Margin="600,0,0,0" TextWrapping="Wrap" FontSize="24" Background="#FFD0D0D0" Text="{Binding Program_Name}" Height="30" Block.TextAlignment="Center">
+        <TextBlock x:Name="name" HorizontalAlignment="Left" Margin="600,0,0,0" TextWrapping="Wrap" 
+                   FontSize="24" Background="#FFD0D0D0" Text="{Binding Program_Name}" Height="30" 
+                   Block.TextAlignment="Center">
             <TextBlock.LayoutTransform>
                 <!--文字同样旋转90度-->
                 <RotateTransform Angle="270"/>
             </TextBlock.LayoutTransform>
         </TextBlock>
         <WrapPanel Orientation="Horizontal" Background="#FFCCCCCC" VerticalAlignment="Top">
-            <Button Content="{x:Static lang:Resources.DyeingMachine}" FontSize="20" HorizontalAlignment="Left" Height="40" VerticalAlignment="Top" Width="200" Background="White" Click="DyeingMachine_Click"/>
-            <Button Content="{x:Static lang:Resources.Receipt}" FontSize="20" HorizontalAlignment="Left" Height="40" VerticalAlignment="Top" Width="200" Background="White" Click="Receipt_Click"/>
-            <Button Content="{x:Static lang:Resources.ParameterSet}" FontSize="20" HorizontalAlignment="Left" Height="40" VerticalAlignment="Top" Width="200" Background="White" Click="ParameterSet_Click"/>
+            <Button Content="{x:Static lang:Resources.DyeingMachine}" FontSize="20"
+                    HorizontalAlignment="Left" Height="40" VerticalAlignment="Top" 
+                    Width="200" Background="White" Click="DyeingMachine_Click"/>
+            <Button Content="{x:Static lang:Resources.Receipt}" FontSize="20"
+                    HorizontalAlignment="Left" Height="40" VerticalAlignment="Top"
+                    Width="200" Background="White" Click="Receipt_Click"/>
+            <Button Content="{x:Static lang:Resources.ParameterSet}" FontSize="20" 
+                    HorizontalAlignment="Left" Height="40" VerticalAlignment="Top" 
+                    Width="200" Background="White" Click="ParameterSet_Click"/>
         </WrapPanel>
         <WrapPanel Orientation="Horizontal" Background="#FFCCCCCC" VerticalAlignment="Top" Margin="630,0,0,0">
-            <Button Content="{x:Static lang:Resources.edit}" x:Name="ProgramgroupView_edit" FontSize="20" HorizontalAlignment="Left" Height="40" VerticalAlignment="Top" Width="200" Background="White" 
+            <Button Content="{x:Static lang:Resources.edit}" x:Name="ProgramgroupView_edit" FontSize="20"
+                    HorizontalAlignment="Left" Height="40" VerticalAlignment="Top" Width="200" Background="White" 
                     Click="ProgramgroupView_edit_Click" IsEnabled="{Binding UserButton}"/>
-            <Button Content="{x:Static lang:Resources.Delete}" x:Name="ProgramgroupView_del" FontSize="20" HorizontalAlignment="Left" Height="40" VerticalAlignment="Top" Width="200" Background="White" 
+            <Button Content="{x:Static lang:Resources.Delete}" x:Name="ProgramgroupView_del" FontSize="20" 
+                    HorizontalAlignment="Left" Height="40" VerticalAlignment="Top" Width="200" Background="White" 
                     Click="ProgramgroupView_del_Click" IsEnabled="{Binding UserButton}"/>
-            <Button Content="{x:Static lang:Resources.Insert}" x:Name="ProgramgroupView_Insert" FontSize="20" HorizontalAlignment="Left" Height="40" VerticalAlignment="Top" Width="200" Background="White" 
+            <Button Content="{x:Static lang:Resources.Insert}" x:Name="ProgramgroupView_Insert" FontSize="20"
+                    HorizontalAlignment="Left" Height="40" VerticalAlignment="Top" Width="200" Background="White" 
                     Click="ProgramgroupView_Insert_Click" IsEnabled="{Binding UserButton}"/>
-            <Button Content="{x:Static lang:Resources.Jump}" x:Name="ProgramgroupView_Jump" FontSize="20" HorizontalAlignment="Left" Height="40" VerticalAlignment="Top" Width="200" Background="White" 
+            <Button Content="{x:Static lang:Resources.Jump}" x:Name="ProgramgroupView_Jump" FontSize="20" 
+                    HorizontalAlignment="Left" Height="40" VerticalAlignment="Top" Width="200" Background="White" 
                     Click="ProgramgroupView_Jump_Click"  IsEnabled="{Binding UserButton}"/>
-            <Button Content="{x:Static lang:Resources.R_P}" x:Name="ProgramgroupView_run" FontSize="20" HorizontalAlignment="Left" Height="40" VerticalAlignment="Top" Width="200" Background="White" 
+            <Button Content="{x:Static lang:Resources.R_P}" x:Name="ProgramgroupView_run" FontSize="20" 
+                    HorizontalAlignment="Left" Height="40" VerticalAlignment="Top" Width="200" Background="White" 
                     Command="{Binding ProgramgroupView_run}"/>
-            <Button Content="{x:Static lang:Resources.StopProcess}" x:Name="ProgramgroupView_stop" FontSize="20" HorizontalAlignment="Left" Height="40" VerticalAlignment="Top" Width="200" Background="White" 
+            <Button Content="{x:Static lang:Resources.StopProcess}" x:Name="ProgramgroupView_stop" FontSize="20" 
+                    HorizontalAlignment="Left" Height="40" VerticalAlignment="Top" Width="200" Background="White" 
                     IsEnabled="{Binding UserButton}" Command="{Binding ProgramgroupView_stop}"/>
         </WrapPanel>
     </Grid>