Browse Source

update

git-svn-id: http://10.4.3.168:50001/svn/Furnace@60 dbcde07d-dcf5-c148-8a84-ac3097b7778e
Jiangjinyuan 2 months ago
parent
commit
c4553bd0ce

+ 4 - 4
FrameworkLocal/UIClient/CenterViews/Editors/Recipe/RecipeSelectDialogView.xaml

@@ -8,13 +8,13 @@
              xmlns:editors="clr-namespace:MECF.Framework.UI.Client.CenterViews.Editors"
              xmlns:local="clr-namespace:MECF.Framework.UI.Client.CenterViews.Editors.Recipe"
              mc:Ignorable="d"
-             Width="350"
-             Height="480">
+             Width="520"
+             Height="650">
     <UserControl.Resources>
         <HierarchicalDataTemplate x:Key="FolderTemplate" ItemsSource="{Binding Files}" >
             <StackPanel Orientation="Horizontal"   Tag="{Binding RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UserControl}, Path=DataContext}">
                 <Image x:Name="ExpandImage"  Source="/MECF.Framework.UI.Client;component/Resources/Images/Folder_Close.png" Width="14" Height="12" Margin="2,0,0,0" VerticalAlignment="Center"/>
-                <TextBlock Text="{Binding Name}" Margin="5,0,0,0" VerticalAlignment="Center" HorizontalAlignment="Left"/>
+                <TextBlock  TextWrapping="WrapWithOverflow" Text="{Binding Name}" Margin="5,0,0,0" VerticalAlignment="Center" HorizontalAlignment="Left"/>
             </StackPanel>
             <HierarchicalDataTemplate.Triggers>
                 <Trigger Property="IsEnabled" Value="True">
@@ -25,7 +25,7 @@
         <HierarchicalDataTemplate x:Key="FileTemplate" ItemsSource="{Binding Files}">
             <StackPanel Orientation="Horizontal" Tag="{Binding RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=UserControl}, Path=DataContext}">
                 <Path Data="M0.5,5.125 L5.125,5.125 5.125,0.5 M5.1,0.5 L15.5,0.5 15.5,19.5 0.5,19.5 C0.5,14.7 0.5,10 0.5,5.1 2,3.6 3.6,2 5.1,0.5 z M8.1,8.5 L8.2,8.5 z M8.1,11.5 L8.2,11.5 z M8.1,14.5 L8.2,14.5 z" Fill="#FFF3F3F3" HorizontalAlignment="Left" Stretch="Fill" Stroke="#FF454545" Width="13" Height="16"/>
-                <TextBlock Text="{Binding Name}" FontSize="15" Margin="5,0,0,0" VerticalAlignment="Center" HorizontalAlignment="Left"/>
+                <TextBlock TextWrapping="WrapWithOverflow"  Text="{Binding Name}" FontSize="15" Margin="5,0,0,0" VerticalAlignment="Center" HorizontalAlignment="Left"/>
             </StackPanel>
         </HierarchicalDataTemplate>
         <editors:FolderOrFileTemplateSelector x:Key="FolderFileTemplateSelector" 

+ 3 - 0
Furnace/FurnaceUI/Views/Recipes/RecipeJobView.xaml

@@ -28,6 +28,7 @@
                     HorizontalAlignment="Left"
                     VerticalAlignment="Center"
                     FontSize="15"
+                    TextWrapping="WrapWithOverflow"
                     Text="{Binding Name}"/>
             </StackPanel>
             <HierarchicalDataTemplate.Triggers>
@@ -61,6 +62,7 @@
                     VerticalAlignment="Center"
                     FontFamily="Segoe"
                     FontSize="15"
+                    TextWrapping="WrapWithOverflow"
                     Text="{Binding Name}"
                     TextAlignment="Left"/>
                 <TextBlock
@@ -83,6 +85,7 @@
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     FontSize="15"
+                    TextWrapping="WrapWithOverflow"
                     Text="{Binding Description}"
                     TextAlignment="Center"/>
                 <TextBlock

+ 3 - 0
Furnace/FurnaceUI/Views/Recipes/RecipeLayoutView.xaml

@@ -25,9 +25,11 @@
                 <TextBlock
                     Width="250"
                     Margin="5,0,0,0"
+                    Background="Red"
                     HorizontalAlignment="Left"
                     VerticalAlignment="Center"
                     FontSize="15"
+                    TextWrapping="WrapWithOverflow"
                     Text="{Binding Name}"/>
 
             </StackPanel>
@@ -53,6 +55,7 @@
                     VerticalAlignment="Center"
                     FontFamily="Segoe"
                     FontSize="15"
+                     TextWrapping="WrapWithOverflow"
                     Text="{Binding Name}"
                     TextAlignment="Left"/>
                 <TextBlock

+ 391 - 17
Furnace/FurnaceUI/Views/Status/ControlJobStatusView.xaml

@@ -9,7 +9,7 @@
              xmlns:cal="http://www.caliburn.org"
              xmlns:local="clr-namespace:FurnaceUI.Views.Status"
              mc:Ignorable="d" 
-             Height="750" Width="1180" Background="White">
+             Height="750" Width="1180" >
     <UserControl.Resources>
         <Style TargetType="TextBlock">
             <Setter Property="FontSize" Value="14"  />
@@ -24,6 +24,11 @@
             <Setter Property="VerticalContentAlignment" Value="Center"/>
         </Style>
         <converter:StatusForegroundConverter x:Key="StatusForegroundConverter" />
+        <SolidColorBrush x:Key="N2_purge_bg" Color="#B1D2F2"/>
+        <SolidColorBrush x:Key="N2_purge_Idlebg" Color="#E4E487"/>
+        <SolidColorBrush x:Key="N2_purge_Readybg" Color="#AEE8A5"/>
+        <SolidColorBrush x:Key="N2_purge_Processbg" Color="#9FE7DA"/>
+
     </UserControl.Resources>
     <Grid>
         <Grid.ColumnDefinitions>
@@ -37,8 +42,357 @@
             <RowDefinition Height="10"/>
         </Grid.RowDefinitions>
 
-        <Canvas>
-            <Border BorderBrush="Black" BorderThickness="2" Width="525" Height="300" Canvas.Left="131" Canvas.Top="152">
+        <Border  >
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="50"/>
+                    <RowDefinition Height="*"/>
+                </Grid.RowDefinitions>
+
+                <StackPanel Orientation="Horizontal">
+
+
+                    <Button  Width="130" Height="46" Margin="0,0,10,0" IsEnabled="{Binding IsEnableCoolingSkip}">
+                        <Button.Content>
+                            <TextBlock Text="Cooling Skip" TextWrapping="Wrap" TextAlignment="Center" Foreground="Black" />
+                        </Button.Content>
+                        <i:Interaction.Triggers>
+                            <i:EventTrigger EventName="Click">
+                                <cal:ActionMessage MethodName="CoolingSkip">
+                                </cal:ActionMessage>
+                            </i:EventTrigger>
+                        </i:Interaction.Triggers>
+                    </Button>
+
+                    <Button  Width="130" Height="46" Margin="10,0,10,0"  IsEnabled="{Binding IsEnableResume}">
+                        <Button.Content>
+                            <TextBlock Text="RESUME" TextWrapping="Wrap" TextAlignment="Center" Foreground="Black" />
+                        </Button.Content>
+                        <i:Interaction.Triggers>
+                            <i:EventTrigger EventName="Click">
+                                <cal:ActionMessage MethodName="Resume">
+                                </cal:ActionMessage>
+                            </i:EventTrigger>
+                        </i:Interaction.Triggers>
+                    </Button>
+                    <Button  Width="130" Height="46"  IsEnabled="{Binding IsEnablePause}">
+                        <Button.Content>
+                            <TextBlock Text="PAUSE" TextWrapping="Wrap" TextAlignment="Center" Foreground="Black" />
+                        </Button.Content>
+                        <i:Interaction.Triggers>
+                            <i:EventTrigger EventName="Click">
+                                <cal:ActionMessage MethodName="Pause">
+                                </cal:ActionMessage>
+                            </i:EventTrigger>
+                        </i:Interaction.Triggers>
+                    </Button>
+                </StackPanel>
+
+                <Canvas Grid.Row="1">
+                    <Border BorderBrush="Black" Width="655" Height="540" BorderThickness="1" Canvas.Left="40" Canvas.Top="100" HorizontalAlignment="Center" VerticalAlignment="Top" ></Border>
+                    <Label Background="LimeGreen"  Width="130" Height="45" Canvas.Left="521" Canvas.Top="40">
+                        <Label.Content>
+                            <TextBlock Text="Power on" TextAlignment="Center" TextWrapping="Wrap"  />
+                        </Label.Content>
+                    </Label>
+                    <Button BorderBrush="Black" IsEnabled="{Binding IsEnableInitialize}" Background="Transparent"  Width="130" Height="45" Canvas.Left="523" Canvas.Top="131">
+                        <Button.Content>
+                            <TextBlock Text="INITIALL" TextAlignment="Center" TextWrapping="Wrap"  />
+                        </Button.Content>
+                        <i:Interaction.Triggers>
+                            <i:EventTrigger EventName="Click">
+                                <cal:ActionMessage MethodName="BtnClick">
+                                        <cal:Parameter Value="HomeAll"/>
+                                </cal:ActionMessage>
+                            </i:EventTrigger>
+                        </i:Interaction.Triggers>
+                    </Button>
+
+                    <Button BorderBrush="Black"  Background="Transparent"  Width="130" Height="45" Canvas.Left="312" Canvas.Top="131">
+                        <Button.Content>
+                            <TextBlock Text="RESET" TextAlignment="Center" TextWrapping="Wrap"  />
+                        </Button.Content>
+                        <i:Interaction.Triggers>
+                            <i:EventTrigger EventName="Click">
+                                <cal:ActionMessage MethodName="BtnClick">
+                                    <cal:Parameter Value="RESET"/>
+                                </cal:ActionMessage>
+                            </i:EventTrigger>
+                        </i:Interaction.Triggers>
+                    </Button>
+                    <Button BorderBrush="Black"  Background="Transparent"  Width="130" Height="45" Canvas.Left="314" Canvas.Top="221">
+                        <Button.Content>
+                            <TextBlock Text="IDLE" TextAlignment="Center" TextWrapping="Wrap"  />
+                        </Button.Content>
+                        <i:Interaction.Triggers>
+                            <i:EventTrigger EventName="Click">
+                                <cal:ActionMessage MethodName="BtnClick">
+                                    <cal:Parameter Value="IDLE"/>
+                                </cal:ActionMessage>
+                            </i:EventTrigger>
+                        </i:Interaction.Triggers>
+                    </Button>
+                    <Label Background="Transparent"  Width="130" Height="45" Canvas.Left="312" Canvas.Top="311">
+                        <Label.Content>
+                            <TextBlock Text="STANDBY" TextAlignment="Center" TextWrapping="Wrap"  />
+                        </Label.Content>
+                    </Label>
+                    <Label Background="Transparent"  Width="130" Height="45" Canvas.Left="312" Canvas.Top="401">
+                        <Label.Content>
+                            <TextBlock Text="RUN" TextAlignment="Center" TextWrapping="Wrap"  />
+                        </Label.Content>
+                    </Label>
+                    <Label Background="Transparent"  Width="130" Height="45" Canvas.Left="312" Canvas.Top="491">
+                        <Label.Content>
+                            <TextBlock Text="END" TextAlignment="Center" TextWrapping="Wrap"  />
+                        </Label.Content>
+                    </Label>
+                    <Button BorderBrush="Black" Background="Transparent"  Width="130" Height="45" Canvas.Left="100" Canvas.Top="131">
+                        <Button.Content>
+                            <TextBlock Text="ABORT" TextAlignment="Center" TextWrapping="Wrap"  />
+                        </Button.Content>
+                        <i:Interaction.Triggers>
+                            <i:EventTrigger EventName="Click">
+                                <cal:ActionMessage MethodName="BtnClick">
+                                    <cal:Parameter Value="ABORT"/>
+                                </cal:ActionMessage>
+                            </i:EventTrigger>
+                        </i:Interaction.Triggers>
+                    </Button>
+                    <Label Background="Transparent"  Width="50" Height="45" Canvas.Left="80" Canvas.Top="205">
+                        <Label.Content>
+                            <TextBlock Text="IDLE" TextAlignment="Center" TextWrapping="Wrap"  />
+                        </Label.Content>
+                    </Label>
+                    <Label Background="Transparent" BorderBrush="Transparent"  Width="50" Height="45" Canvas.Left="120" Canvas.Top="205">
+                        <Label.Content>
+                            <TextBlock Text="或" TextAlignment="Center" TextWrapping="Wrap"  />
+                        </Label.Content>
+                    </Label>
+                    <Label Background="Transparent"  Width="89" Height="45" Canvas.Left="81" Canvas.Top="251" HorizontalAlignment="Left" VerticalAlignment="Top">
+                        <Label.Content>
+                            <TextBlock Text="STANDBY" TextAlignment="Center" TextWrapping="Wrap"  />
+                        </Label.Content>
+                    </Label>
+                    <ed:LineArrow  Fill="#FFF4F4F5" Height="1" Stroke="Black"  Canvas.Left="588"  Width="48" Canvas.Top="84" HorizontalAlignment="Left" VerticalAlignment="Center">
+                        <ed:LineArrow.RenderTransform>
+                            <TransformGroup>
+                                <ScaleTransform/>
+                                <SkewTransform/>
+                                <RotateTransform Angle="90"/>
+                                <TranslateTransform/>
+                            </TransformGroup>
+                        </ed:LineArrow.RenderTransform>
+                    </ed:LineArrow>
+                    <ed:LineArrow  Fill="#FFF4F4F5" Height="1" Stroke="Black"  Canvas.Left="524"  Width="80" Canvas.Top="155" HorizontalAlignment="Center" VerticalAlignment="Center">
+                        <ed:LineArrow.RenderTransform>
+                            <TransformGroup>
+                                <ScaleTransform/>
+                                <SkewTransform/>
+                                <RotateTransform Angle="180"/>
+                                <TranslateTransform/>
+                            </TransformGroup>
+                        </ed:LineArrow.RenderTransform>
+                    </ed:LineArrow>
+                    <ed:LineArrow  Fill="#FFF4F4F5" Height="1" Stroke="Black"  Canvas.Left="230"  Width="82" Canvas.Top="155" HorizontalAlignment="Center" VerticalAlignment="Center">
+                        <ed:LineArrow.RenderTransform>
+                            <TransformGroup>
+                                <ScaleTransform/>
+                                <SkewTransform/>
+                                <RotateTransform Angle="0"/>
+                                <TranslateTransform/>
+                            </TransformGroup>
+                        </ed:LineArrow.RenderTransform>
+                    </ed:LineArrow>
+                    <ed:LineArrow  Fill="#FFF4F4F5" Height="1" Stroke="Black"  Canvas.Left="354"  Width="27" Canvas.Top="205" HorizontalAlignment="Left" VerticalAlignment="Top">
+                        <ed:LineArrow.RenderTransform>
+                            <TransformGroup>
+                                <ScaleTransform/>
+                                <SkewTransform/>
+                                <RotateTransform Angle="270"/>
+                                <TranslateTransform/>
+                            </TransformGroup>
+                        </ed:LineArrow.RenderTransform>
+                    </ed:LineArrow>
+                    <ed:LineArrow  Fill="#FFF4F4F5" Height="1" Stroke="Black"  Canvas.Left="384"  Width="47" Canvas.Top="175" HorizontalAlignment="Left" VerticalAlignment="Center">
+                        <ed:LineArrow.RenderTransform>
+                            <TransformGroup>
+                                <ScaleTransform/>
+                                <SkewTransform/>
+                                <RotateTransform Angle="90"/>
+                                <TranslateTransform/>
+                            </TransformGroup>
+                        </ed:LineArrow.RenderTransform>
+                    </ed:LineArrow>
+                    <ed:LineArrow  Fill="#FFF4F4F5" Height="1" Stroke="Black"  Canvas.Left="384"  Width="47" Canvas.Top="265" HorizontalAlignment="Center" VerticalAlignment="Top">
+                        <ed:LineArrow.RenderTransform>
+                            <TransformGroup>
+                                <ScaleTransform/>
+                                <SkewTransform/>
+                                <RotateTransform Angle="90"/>
+                                <TranslateTransform/>
+                            </TransformGroup>
+                        </ed:LineArrow.RenderTransform>
+                    </ed:LineArrow>
+                    <ed:LineArrow  Fill="#FFF4F4F5" Height="1" Stroke="Black"  Canvas.Left="384"  Width="47" Canvas.Top="355" HorizontalAlignment="Center" VerticalAlignment="Top">
+                        <ed:LineArrow.RenderTransform>
+                            <TransformGroup>
+                                <ScaleTransform/>
+                                <SkewTransform/>
+                                <RotateTransform Angle="90"/>
+                                <TranslateTransform/>
+                            </TransformGroup>
+                        </ed:LineArrow.RenderTransform>
+                    </ed:LineArrow>
+                    <ed:LineArrow  Fill="#FFF4F4F5" Height="1" Stroke="Black"  Canvas.Left="384"  Width="47" Canvas.Top="445" HorizontalAlignment="Center" VerticalAlignment="Top">
+                        <ed:LineArrow.RenderTransform>
+                            <TransformGroup>
+                                <ScaleTransform/>
+                                <SkewTransform/>
+                                <RotateTransform Angle="90"/>
+                                <TranslateTransform/>
+                            </TransformGroup>
+                        </ed:LineArrow.RenderTransform>
+                    </ed:LineArrow>
+
+                    <ed:LineArrow  Fill="#FFF4F4F5" Height="1" Stroke="Black"  Canvas.Left="184"  Width="379" Canvas.Top="557" HorizontalAlignment="Left" VerticalAlignment="Top">
+                        <ed:LineArrow.RenderTransform>
+                            <TransformGroup>
+                                <ScaleTransform/>
+                                <SkewTransform/>
+                                <RotateTransform Angle="270"/>
+                                <TranslateTransform/>
+                            </TransformGroup>
+                        </ed:LineArrow.RenderTransform>
+                    </ed:LineArrow>
+                    <ed:LineArrow  Fill="#FFF4F4F5" Height="1" Stroke="Black"  Canvas.Left="114"  Width="29" Canvas.Top="175" HorizontalAlignment="Center" VerticalAlignment="Center">
+                        <ed:LineArrow.RenderTransform>
+                            <TransformGroup>
+                                <ScaleTransform/>
+                                <SkewTransform/>
+                                <RotateTransform Angle="90"/>
+                                <TranslateTransform/>
+                            </TransformGroup>
+                        </ed:LineArrow.RenderTransform>
+                    </ed:LineArrow>
+                    <ed:LineArrow  Fill="#FFF4F4F5" Height="1" Stroke="Black"  Canvas.Left="315"  Width="129" Canvas.Top="245" HorizontalAlignment="Left" VerticalAlignment="Center">
+                        <ed:LineArrow.RenderTransform>
+                            <TransformGroup>
+                                <ScaleTransform/>
+                                <SkewTransform/>
+                                <RotateTransform Angle="180"/>
+                                <TranslateTransform/>
+                            </TransformGroup>
+                        </ed:LineArrow.RenderTransform>
+                    </ed:LineArrow>
+                    <ed:LineArrow  Fill="#FFF4F4F5" Height="1" Stroke="Black"  Canvas.Left="315"  Width="128" Canvas.Top="335" HorizontalAlignment="Center" VerticalAlignment="Center">
+                        <ed:LineArrow.RenderTransform>
+                            <TransformGroup>
+                                <ScaleTransform/>
+                                <SkewTransform/>
+                                <RotateTransform Angle="180"/>
+                                <TranslateTransform/>
+                            </TransformGroup>
+                        </ed:LineArrow.RenderTransform>
+                    </ed:LineArrow>
+                    <ed:LineArrow  Fill="#FFF4F4F5" Height="1" Stroke="Black"  Canvas.Left="315"  Width="128" Canvas.Top="425" HorizontalAlignment="Center" VerticalAlignment="Center">
+                        <ed:LineArrow.RenderTransform>
+                            <TransformGroup>
+                                <ScaleTransform/>
+                                <SkewTransform/>
+                                <RotateTransform Angle="180"/>
+                                <TranslateTransform/>
+                            </TransformGroup>
+                        </ed:LineArrow.RenderTransform>
+                    </ed:LineArrow>
+                    <ed:LineArrow  Fill="#FFF4F4F5" Height="1" Stroke="Black"  Canvas.Left="523"  Width="79" Canvas.Top="518" HorizontalAlignment="Left" VerticalAlignment="Center">
+                        <ed:LineArrow.RenderTransform>
+                            <TransformGroup>
+                                <ScaleTransform/>
+                                <SkewTransform/>
+                                <RotateTransform Angle="180"/>
+                                <TranslateTransform/>
+                            </TransformGroup>
+                        </ed:LineArrow.RenderTransform>
+                    </ed:LineArrow>
+                    <ed:LineArrow  Fill="#FFF4F4F5" Height="1" Stroke="Black"  Canvas.Left="588"  Width="144" Canvas.Top="246" HorizontalAlignment="Left" VerticalAlignment="Center">
+                        <ed:LineArrow.RenderTransform>
+                            <TransformGroup>
+                                <ScaleTransform/>
+                                <SkewTransform/>
+                                <RotateTransform Angle="180"/>
+                                <TranslateTransform/>
+                            </TransformGroup>
+                        </ed:LineArrow.RenderTransform>
+                    </ed:LineArrow>
+                    <Line X1="0" Y1="0" X2="20" Y2="0" Canvas.Left="382" Canvas.Top="536" Stroke="Black" >
+                        <Line.RenderTransform>
+                            <TransformGroup>
+                                <ScaleTransform/>
+                                <SkewTransform/>
+                                <RotateTransform Angle="90"/>
+                                <TranslateTransform/>
+                            </TransformGroup>
+                        </Line.RenderTransform>
+                    </Line>
+                    <Line X1="0" Y1="0" X2="80" Y2="0" Canvas.Left="443" Canvas.Top="334" Stroke="Black" >
+                        <Line.RenderTransform>
+                            <TransformGroup>
+                                <ScaleTransform/>
+                                <SkewTransform/>
+                                <RotateTransform Angle="0"/>
+                                <TranslateTransform/>
+                            </TransformGroup>
+                        </Line.RenderTransform>
+                    </Line>
+                    <Line X1="0" Y1="0" X2="71" Y2="0" Canvas.Left="587.5" Canvas.Top="175" Stroke="Black" HorizontalAlignment="Left" VerticalAlignment="Top" >
+                        <Line.RenderTransform>
+                            <TransformGroup>
+                                <ScaleTransform/>
+                                <SkewTransform/>
+                                <RotateTransform Angle="90"/>
+                                <TranslateTransform/>
+                            </TransformGroup>
+                        </Line.RenderTransform>
+                    </Line>
+                    <Line X1="0" Y1="0" X2="184" Y2="0" Canvas.Left="522.5" Canvas.Top="334" Stroke="Black" HorizontalAlignment="Left" VerticalAlignment="Center" >
+                        <Line.RenderTransform>
+                            <TransformGroup>
+                                <ScaleTransform/>
+                                <SkewTransform/>
+                                <RotateTransform Angle="90"/>
+                                <TranslateTransform/>
+                            </TransformGroup>
+                        </Line.RenderTransform>
+                    </Line>
+                    <Line X1="0" Y1="0" X2="198" Y2="0" Canvas.Left="382.5" Canvas.Top="556" Stroke="Black" HorizontalAlignment="Center" VerticalAlignment="Center" >
+                        <Line.RenderTransform>
+                            <TransformGroup>
+                                <ScaleTransform/>
+                                <SkewTransform/>
+                                <RotateTransform Angle="180"/>
+                                <TranslateTransform/>
+                            </TransformGroup>
+                        </Line.RenderTransform>
+                    </Line>
+                    <Line X1="0" Y1="0" X2="171" Y2="0" Canvas.Left="355" Canvas.Top="204" Stroke="Black" HorizontalAlignment="Left" VerticalAlignment="Top" Width="171" >
+                        <Line.RenderTransform>
+                            <TransformGroup>
+                                <ScaleTransform/>
+                                <SkewTransform/>
+                                <RotateTransform Angle="180"/>
+                                <TranslateTransform/>
+                            </TransformGroup>
+                        </Line.RenderTransform>
+                    </Line>
+                </Canvas>
+
+            </Grid>
+        </Border>
+        <!--<Canvas Visibility="Collapsed">
+         
+            
+            <Border   BorderBrush="Black" BorderThickness="2" Width="525" Height="300" Canvas.Left="131" Canvas.Top="152">
 
             </Border>
             <ed:LineArrow Grid.Column="1" Fill="#FFF4F4F5" HorizontalAlignment="Left" Height="1" Stroke="Black" VerticalAlignment="Center" MinWidth="260" RenderTransformOrigin="0.5,0.5" Canvas.Left="450" Canvas.Top="63">
@@ -284,26 +638,46 @@
             <TextBlock Text="⊙" Canvas.Left="709" Canvas.Top="534" FontSize="30"/>
             <TextBlock Text="⊙" Canvas.Left="709" Canvas.Top="41" FontSize="30"/>
             <TextBlock Text="●" Canvas.Left="140" Canvas.Top="35" FontSize="40"/>
-        </Canvas>
+        </Canvas>-->
         <Grid Grid.Column="1" Margin="2">
             <Grid.RowDefinitions>
-                <RowDefinition Height="40"/>
-                <RowDefinition Height="40"/>
+                <RowDefinition Height="80"/>
                 <RowDefinition Height="*"/>
             </Grid.RowDefinitions>
-
-            <StackPanel Orientation="Horizontal" Margin="0,2,0,0">
-                <Label Content="CJID"  Width="120" Margin="1,1,0,0"  Background="{DynamicResource ThirdLevelElement_BG}" />
-                <Border BorderBrush="Black" BorderThickness="0,1,1,1" Width="272" Margin="0,2,0,-1">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="100"></ColumnDefinition>
+                    <ColumnDefinition Width="*"></ColumnDefinition>
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition  ></RowDefinition>
+                    <RowDefinition  ></RowDefinition>
+                </Grid.RowDefinitions>
+                <Border BorderBrush="Black" BorderThickness="1"  >
+                    <TextBlock  Text="CJID" VerticalAlignment="Center" TextAlignment="Center" FontSize="16" />
+                </Border>
+                <Border Grid.Row="1" BorderBrush="Black" BorderThickness="1,0,1,1"  >
+                    <TextBlock  Text="Start Mode" VerticalAlignment="Center" TextAlignment="Center" FontSize="16" />
+                </Border>
+                <Border Grid.Column="1" BorderBrush="Black" BorderThickness="0,1,1,1"  >
                     <TextBlock  Text="{Binding SelectedControlJobsObjtID}" VerticalAlignment="Center" TextAlignment="Center" FontSize="16" />
                 </Border>
-            </StackPanel>
-            <StackPanel Orientation="Horizontal" Grid.Row="1"  Margin="0,0,0,2">
-                <Label Content="Start Mode"  Width="120" BorderThickness="1,0,1,1" Margin="1,0,0,0" Background="{DynamicResource ThirdLevelElement_BG}" />
-                <Border BorderBrush="Black" BorderThickness="0,0,1,1" Width="272">
+                <Border Grid.Row="1" Grid.Column="1"  BorderBrush="Black" BorderThickness="0,0,1,1"  >
                     <TextBlock  Text="{Binding CurrentStartMode}" VerticalAlignment="Center" TextAlignment="Center" FontSize="16" />
                 </Border>
-            </StackPanel>
+            </Grid>
+            <!--<StackPanel Orientation="Horizontal" Margin="0,2,0,0">
+                        <Label Content="CJID"  Width="120" Margin="1,1,0,0"  Background="{DynamicResource ThirdLevelElement_BG}" />
+                        <Border BorderBrush="Black" BorderThickness="0,1,1,1" Width="272" Margin="0,2,0,-1">
+                            <TextBlock  Text="{Binding SelectedControlJobsObjtID}" VerticalAlignment="Center" TextAlignment="Center" FontSize="16" />
+                        </Border>
+                        </StackPanel>
+                        <StackPanel Orientation="Horizontal" Grid.Row="1"  Margin="0,0,0,2">
+                            <Label Content="Start Mode"  Width="120" BorderThickness="1,0,1,1" Margin="1,0,0,0" Background="{DynamicResource ThirdLevelElement_BG}" />
+                            <Border BorderBrush="Black" BorderThickness="0,0,1,1" Width="272">
+                                <TextBlock  Text="{Binding CurrentStartMode}" VerticalAlignment="Center" TextAlignment="Center" FontSize="16" />
+                            </Border>
+                        </StackPanel> -->
             <DataGrid Grid.Row="2" ItemsSource="{Binding ControlJobsData,Mode=OneWay}"
                        AutoGenerateColumns="False" SelectionUnit="FullRow"
                   VerticalAlignment="Stretch"  VerticalContentAlignment="Stretch"
@@ -338,8 +712,8 @@
                         </cal:ActionMessage>
                     </i:EventTrigger>
                 </i:Interaction.Triggers>
-            </Button>-->
-            <!--<Button Content="" Height="45" FontSize="16" VerticalAlignment="Center" Width="120" Margin="20,0,0,0">
+            </Button>
+            <Button Content="" Height="45" FontSize="16" VerticalAlignment="Center" Width="120" Margin="20,0,0,0">
 
             </Button>
             <Button Content="" Height="45" FontSize="16" VerticalAlignment="Center" Width="120" Margin="20,0,0,0">

+ 69 - 18
Furnace/FurnaceUI/Views/Status/ControlJobStatusViewModel.cs

@@ -31,11 +31,12 @@ namespace FurnaceUI.Views.Status
             public string State { get; set; }
             [DataMember]
             public bool Auto { get; set; }
-            
+
         }
 
         public ObservableCollection<ControlJobData> ControlJobsData { get; set; }
-
+        [Subscription("Rt.Status")]
+        public string RtStatus { get; set; }
         public ICommand ControlJobsCommand { get; set; }
 
         [Subscription("Scheduler.ControlJobList")]
@@ -53,7 +54,7 @@ namespace FurnaceUI.Views.Status
         public ControlJobStatusViewModel()/* : base("MonitorJobViewModel")*/
         {
             ControlJobsData = new ObservableCollection<ControlJobData>();
-           
+
         }
 
         public ControlJobData SelectedControlJob { get; set; }
@@ -68,7 +69,7 @@ namespace FurnaceUI.Views.Status
         {
             get
             {
-                if(SelectedControlJob == null)
+                if (SelectedControlJob == null)
                 {
                     return " ";
                 }
@@ -77,12 +78,12 @@ namespace FurnaceUI.Views.Status
         }
         public bool IsEnablePause
         {
-            get 
+            get
             {
                 if (SelectedControlJob == null)
                     return false;
-                    
-                return SelectedControlJob.State.ToString() == "Executing"; 
+
+                return SelectedControlJob.State.ToString() == "Executing";
             }
         }
         public bool IsEnableCoolingSkip
@@ -105,6 +106,21 @@ namespace FurnaceUI.Views.Status
                 return SelectedControlJob.State.ToString() == "Paused";
             }
         }
+        public int AllInitializeCount { get; set; }
+        private bool _AllInitializeEnable = true;
+        public bool AllInitializeEnable
+        {
+            get => _AllInitializeEnable;
+            set
+            {
+                _AllInitializeEnable = value;
+                NotifyOfPropertyChange("AllInitializeEnable");
+            }
+        }
+        public bool IsEnableInitialize
+        {
+            get { return (RtStatus == "Init" || RtStatus == "Idle") && AllInitializeEnable; }
+        }
         public bool IsEnableStop
         {
             get
@@ -112,17 +128,17 @@ namespace FurnaceUI.Views.Status
                 if (SelectedControlJob == null)
                     return false;
 
-                return SelectedControlJob.State.ToString() == "Executing" || 
-                    SelectedControlJob.State.ToString() == "Paused" || 
-                    SelectedControlJob.State.ToString() == "WaitingForStart" || 
-                    SelectedControlJob.State.ToString() == "Queued" ;
+                return SelectedControlJob.State.ToString() == "Executing" ||
+                    SelectedControlJob.State.ToString() == "Paused" ||
+                    SelectedControlJob.State.ToString() == "WaitingForStart" ||
+                    SelectedControlJob.State.ToString() == "Queued";
             }
         }
         public string CurrentStartMode
         {
             get
             {
-                if(SelectedControlJob == null)
+                if (SelectedControlJob == null)
                 {
                     return "Waiting For Start";
                 }
@@ -161,7 +177,7 @@ namespace FurnaceUI.Views.Status
                 {
                     return "Transparent";
                 }
-                return SelectedControlJob.State.ToString() == "Queued" ? "Green": "Transparent" ;
+                return SelectedControlJob.State.ToString() == "Queued" ? "Green" : "Transparent";
             }
         }
 
@@ -225,13 +241,48 @@ namespace FurnaceUI.Views.Status
             }
         }
 
+        public void BtnClick(string cmd)
+        {
+            switch (cmd)
+            {
+                case "HomeAll":
+                    InvokeClient.Instance.Service.DoOperation("System.HomeAll");
+                    break;
+                case "ABORT":
+                    InvokeClient.Instance.Service.DoOperation("PM1.RecipeAbort");
+                    break;
+                case "RESET":
+                    InvokeClient.Instance.Service.DoOperation("System.Reset");
+                    break;
+                case "IDLE":
+                    InvokeClient.Instance.Service.DoOperation("System.HomeAll");
+                    break;
+                default:
+                    break;
+            }
+        }
 
-       
+        public void Manual(string module)
+        {
+            switch (module)
+            {
+                case "All Initialize":
+                    AllInitializeCount++;
+                    if (AllInitializeCount % 2 == 0)
+                        AllInitializeEnable = false;
+                    else
+                        AllInitializeEnable = true;
+                    break;
+
+                default:
+                    break;
+            }
+        }
         protected override void InvokeAfterUpdateProperty(Dictionary<string, object> data)
         {
             base.InvokeAfterUpdateProperty(data);
 
-           
+
             if (ControlJobs == null || ControlJobs.Count == 0)
             {
                 ControlJobsData.Clear();
@@ -255,7 +306,7 @@ namespace FurnaceUI.Views.Status
                     else
                     {
                         match.State = item.State.ToString();
-                        
+
 
                         match.InvokePropertyChanged();
                     }
@@ -296,13 +347,13 @@ namespace FurnaceUI.Views.Status
         }
         public void AbortJob()
         {
-            if(string.IsNullOrEmpty(SelectedControlJobsObjtID))
+            if (string.IsNullOrEmpty(SelectedControlJobsObjtID))
             {
                 DialogBox.ShowWarning("Control job is not selected");
                 return;
             }
 
-            if(!DialogBox.Confirm("Are you sure to abort the control job"))
+            if (!DialogBox.Confirm("Are you sure to abort the control job"))
             {
                 return;
             }