update Recipe名字过长换行相关页面修改

git-svn-id: http://10.4.3.168:50001/svn/Furnace@66 dbcde07d-dcf5-c148-8a84-ac3097b7778e

FrameworkLocal/UIClient/CenterViews/Editors/Recipe/RecipeSelectDialogView.xaml

@@ -9,12 +9,12 @@
              xmlns:local="clr-namespace:MECF.Framework.UI.Client.CenterViews.Editors.Recipe"
              mc:Ignorable="d"
              Width="520"
-             Height="650">
+             MinHeight="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  TextWrapping="WrapWithOverflow" Text="{Binding Name}" Margin="5,0,0,0" VerticalAlignment="Center" HorizontalAlignment="Left"/>
+                <TextBlock  TextWrapping="Wrap" Width="420" 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 TextWrapping="WrapWithOverflow"  Text="{Binding Name}" FontSize="15" Margin="5,0,0,0" VerticalAlignment="Center" HorizontalAlignment="Left"/>
+                <TextBlock TextWrapping="Wrap"  Width="420" Text="{Binding Name}" FontSize="15" Margin="5,0,0,0" VerticalAlignment="Center" HorizontalAlignment="Left"/>
             </StackPanel>
         </HierarchicalDataTemplate>
         <editors:FolderOrFileTemplateSelector x:Key="FolderFileTemplateSelector" 

Furnace/FurnaceRT/Devices/IoLP.cs

@@ -54,7 +54,7 @@ namespace FurnaceRT.Devices
         {
             get
             {
-                if(_isSimulatorMode)
+                if (_isSimulatorMode)
                     return CarrierManager.Instance.CheckHasCarrier(LPModuleName.ToString(), 0);
                 if (_diInPosition1 != null && _diInPosition2 != null && _diInPosition3 != null && _doPresenceLight != null)
                 {
@@ -164,7 +164,7 @@ namespace FurnaceRT.Devices
                 {
                     ///1.manual模式，如果没有foup，不夹紧
                     //2.manual模式，如果有foup，同时有load job，要夹紧，取走之后，不夹紧
-                    if (!IsFoupPresent && !_doRelease.Value && _previousAccessMode != accessMode.ToString())
+                    if (!IsFoupPresent && _doRelease != null && !_doRelease.Value && _previousAccessMode != accessMode.ToString())
                     {
                         Unclamp(out _);
                     }
@@ -229,12 +229,12 @@ namespace FurnaceRT.Devices
 
         public void Reset()
         {
-           
+
         }
 
         public void Terminate()
         {
-            
+
         }
         //private bool SetExtend(out string reason, int time, object[] param)
         //{

Furnace/FurnaceUI/Views/Editors/RecipeCombinationView.xaml

@@ -7,8 +7,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:converter1="clr-namespace:MECF.Framework.UI.Client.Converter;assembly=MECF.Framework.UI.Client"
-    Width="550"
-    Height="600"
+    Width="560"
     FontFamily="Segoe"
     mc:Ignorable="d">
     <UserControl.Resources>
@@ -21,7 +20,280 @@
             <RowDefinition Height="80"/>
         </Grid.RowDefinitions>
         <DockPanel Background="White">
-            <Canvas>
+            <StackPanel HorizontalAlignment="Center" Margin="10,20,0,0">
+                <StackPanel Orientation="Horizontal">
+                    <Border    Width="110"  Height="50"     Margin="4"     Padding="8,2"     VerticalAlignment="Center"     BorderBrush="Black"     BorderThickness="1">
+                        <TextBlock VerticalAlignment="Center" Text="Sub Recipe"/>
+                    </Border>
+                    <TextBox Height="auto" Width="300" TextWrapping="Wrap"     Margin="4"     IsReadOnly="True"     Tag="None"     Text="{Binding CombinationData.SubRecipePath, Converter={StaticResource FileNameConverter}}">
+                        <i:Interaction.Triggers>
+                            <i:EventTrigger EventName="PreviewMouseDown">
+                                <cal:ActionMessage MethodName="RecipeFileSelect">
+                                    <cal:Parameter Value="SubRecipe"/>
+                                    <cal:Parameter Value="{Binding}"/>
+                                </cal:ActionMessage>
+                            </i:EventTrigger>
+                            <i:EventTrigger EventName="PreviewMouseUp">
+                                <cal:ActionMessage MethodName="RecipeFileSelect">
+                                    <cal:Parameter Value="SubRecipe"/>
+                                    <cal:Parameter Value="{Binding}"/>
+                                </cal:ActionMessage>
+                            </i:EventTrigger>
+                        </i:Interaction.Triggers>
+                    </TextBox>
+                    <Button    Height="50"   Width="110"      Grid.Row="0"             Grid.Column="2"             Margin="4"             Content="Clear">
+                        <i:Interaction.Triggers>
+                            <i:EventTrigger EventName="Click">
+                                <cal:ActionMessage MethodName="ClearClick">
+                                    <cal:Parameter Value="SubRecipe"/>
+                                </cal:ActionMessage>
+                            </i:EventTrigger>
+                        </i:Interaction.Triggers>
+                    </Button>
+                </StackPanel>
+                <StackPanel Orientation="Horizontal">
+                    <Border   Width="110"  Height="50"     Margin="4"     Padding="8,2"     VerticalAlignment="Center"     BorderBrush="Black"     BorderThickness="1">
+                        <TextBlock VerticalAlignment="Center" Text="Alarm Recipe"/>
+                    </Border>
+                    <TextBox Height="auto" Width="300" TextWrapping="Wrap"     Margin="4"     IsReadOnly="True"     Tag="None"      Text="{Binding CombinationData.AlarmRecipePath}">
+                        <i:Interaction.Triggers>
+                            <i:EventTrigger EventName="PreviewMouseDown">
+                                <cal:ActionMessage MethodName="RecipeFileSelect">
+                                    <cal:Parameter Value="AlarmRecipe"/>
+                                    <cal:Parameter Value="{Binding}"/>
+                                </cal:ActionMessage>
+                            </i:EventTrigger>
+                            <i:EventTrigger EventName="PreviewMouseUp">
+                                <cal:ActionMessage MethodName="RecipeFileSelect">
+                                    <cal:Parameter Value="AlarmRecipe"/>
+                                    <cal:Parameter Value="{Binding}"/>
+                                </cal:ActionMessage>
+                            </i:EventTrigger>
+                        </i:Interaction.Triggers>
+                    </TextBox>
+                    <Button    Height="50"   Width="110"      Grid.Row="0"             Grid.Column="2"             Margin="4"             Content="Clear">
+                        <i:Interaction.Triggers>
+                            <i:EventTrigger EventName="Click">
+                                <cal:ActionMessage MethodName="ClearClick">
+                                    <cal:Parameter Value="AlarmRecipe"/>
+                                </cal:ActionMessage>
+                            </i:EventTrigger>
+                        </i:Interaction.Triggers>
+                    </Button>
+                </StackPanel>
+                <StackPanel Orientation="Horizontal">
+                    <Border   Width="110"  Height="50"     Margin="4"     Padding="8,2"     VerticalAlignment="Center"     BorderBrush="Black"     BorderThickness="1">
+                        <TextBlock VerticalAlignment="Center" Text="Alarm Condition"/>
+                    </Border>
+                    <TextBox Height="auto" Width="300" TextWrapping="Wrap"     Margin="4"     IsReadOnly="True"     Tag="None"      Text="{Binding CombinationData.AlarmCondition}">
+                        <i:Interaction.Triggers>
+                            <i:EventTrigger EventName="PreviewMouseDown">
+                                <cal:ActionMessage MethodName="ParameterFileSelect">
+                                    <cal:Parameter Value="AlarmCondition"/>
+                                    <cal:Parameter Value="{Binding}"/>
+                                </cal:ActionMessage>
+                            </i:EventTrigger>
+                            <i:EventTrigger EventName="PreviewMouseUp">
+                                <cal:ActionMessage MethodName="ParameterFileSelect">
+                                    <cal:Parameter Value="AlarmCondition"/>
+                                    <cal:Parameter Value="{Binding}"/>
+                                </cal:ActionMessage>
+                            </i:EventTrigger>
+                        </i:Interaction.Triggers>
+                    </TextBox>
+                    <Button    Height="50"   Width="110"      Grid.Row="0"             Grid.Column="2"             Margin="4"             Content="Clear">
+                        <i:Interaction.Triggers>
+                            <i:EventTrigger EventName="Click">
+                                <cal:ActionMessage MethodName="ClearClick">
+                                    <cal:Parameter Value="AlarmCondition"/>
+                                </cal:ActionMessage>
+                            </i:EventTrigger>
+                        </i:Interaction.Triggers>
+                    </Button>
+                </StackPanel>
+                <StackPanel Orientation="Horizontal">
+                    <Border   Width="110"  Height="50"     Margin="4"     Padding="8,2"     VerticalAlignment="Center"     BorderBrush="Black"     BorderThickness="1">
+                        <TextBlock VerticalAlignment="Center" Text="Leak Check"/>
+                    </Border>
+                    <TextBox Height="auto" Width="300" TextWrapping="Wrap"     Margin="4"     IsReadOnly="True"     Tag="None"      Text="{Binding CombinationData.LeakCheck}">
+                        <i:Interaction.Triggers>
+                            <i:EventTrigger EventName="PreviewMouseDown">
+                                <cal:ActionMessage MethodName="ParameterFileSelect">
+                                    <cal:Parameter Value="LeakCheck"/>
+                                    <cal:Parameter Value="{Binding}"/>
+                                </cal:ActionMessage>
+                            </i:EventTrigger>
+                            <i:EventTrigger EventName="PreviewMouseUp">
+                                <cal:ActionMessage MethodName="ParameterFileSelect">
+                                    <cal:Parameter Value="LeakCheck"/>
+                                    <cal:Parameter Value="{Binding}"/>
+                                </cal:ActionMessage>
+                            </i:EventTrigger>
+                        </i:Interaction.Triggers>
+                    </TextBox>
+                    <Button    Height="50"   Width="110"      Grid.Row="0"             Grid.Column="2"             Margin="4"             Content="Clear">
+                        <i:Interaction.Triggers>
+                            <i:EventTrigger EventName="Click">
+                                <cal:ActionMessage MethodName="ClearClick">
+                                    <cal:Parameter Value="LeakCheck"/>
+                                </cal:ActionMessage>
+                            </i:EventTrigger>
+                        </i:Interaction.Triggers>
+                    </Button>
+                </StackPanel>
+                <StackPanel Orientation="Horizontal">
+                    <Border   Width="110"  Height="50"     Margin="4"     Padding="8,2"     VerticalAlignment="Center"     BorderBrush="Black"     BorderThickness="1">
+                        <TextBlock VerticalAlignment="Center" Text="Abort Recipe"/>
+                    </Border>
+                    <TextBox Height="auto" Width="300" TextWrapping="Wrap"     Margin="4"     IsReadOnly="True"     Tag="None"       Text="{Binding CombinationData.AbortRecipePath}">
+                        <i:Interaction.Triggers>
+                            <i:EventTrigger EventName="PreviewMouseDown">
+                                <cal:ActionMessage MethodName="RecipeFileSelect">
+                                    <cal:Parameter Value="AbortRecipe"/>
+                                    <cal:Parameter Value="{Binding}"/>
+                                </cal:ActionMessage>
+                            </i:EventTrigger>
+                            <i:EventTrigger EventName="PreviewMouseUp">
+                                <cal:ActionMessage MethodName="RecipeFileSelect">
+                                    <cal:Parameter Value="AbortRecipe"/>
+                                    <cal:Parameter Value="{Binding}"/>
+                                </cal:ActionMessage>
+                            </i:EventTrigger>
+                        </i:Interaction.Triggers>
+                    </TextBox>
+                    <Button    Height="50"   Width="110"      Grid.Row="0"             Grid.Column="2"             Margin="4"             Content="Clear">
+                        <i:Interaction.Triggers>
+                            <i:EventTrigger EventName="Click">
+                                <cal:ActionMessage MethodName="ClearClick">
+                                    <cal:Parameter Value="AbortRecipe"/>
+                                </cal:ActionMessage>
+                            </i:EventTrigger>
+                        </i:Interaction.Triggers>
+                    </Button>
+                </StackPanel>
+                <StackPanel Orientation="Horizontal">
+                    <Border   Width="110"  Height="50"     Margin="4"     Padding="8,2"     VerticalAlignment="Center"     BorderBrush="Black"     BorderThickness="1">
+                        <TextBlock VerticalAlignment="Center" Text="APC PID"/>
+                    </Border>
+                    <TextBox Height="auto" Width="300" TextWrapping="Wrap"     Margin="4"     IsReadOnly="True"     Tag="None"      Text="{Binding CombinationData.PressAPC}">
+                        <i:Interaction.Triggers>
+                            <i:EventTrigger EventName="PreviewMouseDown">
+                                <cal:ActionMessage MethodName="ParameterFileSelect">
+                                    <cal:Parameter Value="PressAPC"/>
+                                    <cal:Parameter Value="{Binding}"/>
+                                </cal:ActionMessage>
+                            </i:EventTrigger>
+                            <i:EventTrigger EventName="PreviewMouseUp">
+                                <cal:ActionMessage MethodName="ParameterFileSelect">
+                                    <cal:Parameter Value="PressAPC"/>
+                                    <cal:Parameter Value="{Binding}"/>
+                                </cal:ActionMessage>
+                            </i:EventTrigger>
+                        </i:Interaction.Triggers>
+                    </TextBox>
+                    <Button    Height="50"   Width="110"      Grid.Row="0"             Grid.Column="2"             Margin="4"             Content="Clear">
+                        <i:Interaction.Triggers>
+                            <i:EventTrigger EventName="Click">
+                                <cal:ActionMessage MethodName="ClearClick">
+                                    <cal:Parameter Value="PressAPC"/>
+                                </cal:ActionMessage>
+                            </i:EventTrigger>
+                        </i:Interaction.Triggers>
+                    </Button>
+                </StackPanel>
+                <StackPanel Orientation="Horizontal">
+                    <Border   Width="110"  Height="50"     Margin="4"     Padding="8,2"     VerticalAlignment="Center"     BorderBrush="Black"     BorderThickness="1">
+                        <TextBlock VerticalAlignment="Center" Text="Temp Correction"/>
+                    </Border>
+                    <TextBox Height="auto" Width="300" TextWrapping="Wrap"     Margin="4"     IsReadOnly="True"     Tag="None"      Text="{Binding CombinationData.TempCorrection}">
+                        <i:Interaction.Triggers>
+                            <i:EventTrigger EventName="PreviewMouseDown">
+                                <cal:ActionMessage MethodName="ParameterFileSelect">
+                                    <cal:Parameter Value="TempCorrection"/>
+                                    <cal:Parameter Value="{Binding}"/>
+                                </cal:ActionMessage>
+                            </i:EventTrigger>
+                            <i:EventTrigger EventName="PreviewMouseUp">
+                                <cal:ActionMessage MethodName="ParameterFileSelect">
+                                    <cal:Parameter Value="TempCorrection"/>
+                                    <cal:Parameter Value="{Binding}"/>
+                                </cal:ActionMessage>
+                            </i:EventTrigger>
+                        </i:Interaction.Triggers>
+                    </TextBox>
+                    <Button    Height="50"   Width="110"      Grid.Row="0"             Grid.Column="2"             Margin="4"             Content="Clear">
+                        <i:Interaction.Triggers>
+                            <i:EventTrigger EventName="Click">
+                                <cal:ActionMessage MethodName="ClearClick">
+                                    <cal:Parameter Value="TempCorrect"/>
+                                </cal:ActionMessage>
+                            </i:EventTrigger>
+                        </i:Interaction.Triggers>
+                    </Button>
+                </StackPanel>
+                <StackPanel Orientation="Horizontal">
+                    <Border   Width="110"  Height="50"     Margin="4"     Padding="8,2"     VerticalAlignment="Center"     BorderBrush="Black"     BorderThickness="1">
+                        <TextBlock VerticalAlignment="Center" Text="Temp PID"/>
+                    </Border>
+                    <TextBox Height="auto" Width="300" TextWrapping="Wrap"     Margin="4"     IsReadOnly="True"     Tag="None"       Text="{Binding CombinationData.TempPID}">
+                        <i:Interaction.Triggers>
+                            <i:EventTrigger EventName="PreviewMouseDown">
+                                <cal:ActionMessage MethodName="ParameterFileSelect">
+                                    <cal:Parameter Value="TempPID"/>
+                                    <cal:Parameter Value="{Binding}"/>
+                                </cal:ActionMessage>
+                            </i:EventTrigger>
+                            <i:EventTrigger EventName="PreviewMouseUp">
+                                <cal:ActionMessage MethodName="ParameterFileSelect">
+                                    <cal:Parameter Value="TempPID"/>
+                                    <cal:Parameter Value="{Binding}"/>
+                                </cal:ActionMessage>
+                            </i:EventTrigger>
+                        </i:Interaction.Triggers>
+                    </TextBox>
+                    <Button    Height="50"   Width="110"      Grid.Row="0"             Grid.Column="2"             Margin="4"             Content="Clear">
+                        <i:Interaction.Triggers>
+                            <i:EventTrigger EventName="Click">
+                                <cal:ActionMessage MethodName="ClearClick">
+                                    <cal:Parameter Value="TempPID"/>
+                                </cal:ActionMessage>
+                            </i:EventTrigger>
+                        </i:Interaction.Triggers>
+                    </Button>
+                </StackPanel>
+                <StackPanel Orientation="Horizontal">
+                    <Border   Width="110"  Height="50"     Margin="4"     Padding="8,2"     VerticalAlignment="Center"     BorderBrush="Black"     BorderThickness="1">
+                        <TextBlock VerticalAlignment="Center" Text="Profile Condition"/>
+                    </Border>
+                    <TextBox Height="auto" Width="300" TextWrapping="Wrap"     Margin="4"     IsReadOnly="True"     Tag="None"      Text="{Binding CombinationData.ProfileCondition}">
+                        <i:Interaction.Triggers>
+                            <i:EventTrigger EventName="PreviewMouseDown">
+                                <cal:ActionMessage MethodName="ParameterFileSelect">
+                                    <cal:Parameter Value="ProfileCondition"/>
+                                    <cal:Parameter Value="{Binding}"/>
+                                </cal:ActionMessage>
+                            </i:EventTrigger>
+                            <i:EventTrigger EventName="PreviewMouseUp">
+                                <cal:ActionMessage MethodName="ParameterFileSelect">
+                                    <cal:Parameter Value="ProfileCondition"/>
+                                    <cal:Parameter Value="{Binding}"/>
+                                </cal:ActionMessage>
+                            </i:EventTrigger>
+                        </i:Interaction.Triggers>
+                    </TextBox>
+                    <Button    Height="50"   Width="110"      Grid.Row="0"             Grid.Column="2"             Margin="4"             Content="Clear">
+                        <i:Interaction.Triggers>
+                            <i:EventTrigger EventName="Click">
+                                <cal:ActionMessage MethodName="ClearClick">
+                                    <cal:Parameter Value="ProfileCondition"/>
+                                </cal:ActionMessage>
+                            </i:EventTrigger>
+                        </i:Interaction.Triggers>
+                    </Button>
+                </StackPanel>
+
+            </StackPanel>
+            <!--<Canvas>
                 <StackPanel Canvas.Left="30" Canvas.Top="20">
                     <Grid Width="500" Height="160">
                         <Grid.RowDefinitions>
@@ -472,7 +744,7 @@
                         </Button>
                     </Grid>
                 </StackPanel>
-            </Canvas>
+            </Canvas>-->
         </DockPanel>
         <StackPanel
             Grid.Row="2"

Furnace/FurnaceUI/Views/Editors/RecipeCombinationViewModel.cs

@@ -33,7 +33,8 @@ namespace FurnaceUI.Views.Editors
             var parameterProvider = new ParameterProvider();
             var typeFileList = new ObservableCollection<MECF.Framework.UI.Client.CenterViews.Editors.Recipe.ProcessTypeFileItem>();
             var type = new MECF.Framework.UI.Client.CenterViews.Editors.Recipe.ProcessTypeFileItem();
-            ParameterSelectDialogViewModel parameterSelectDialogViewModel;
+            ParameterSelectDialogViewModel parameterSelectDialogViewModel=new ParameterSelectDialogViewModel();
+            parameterSelectDialogViewModel.DisplayName = cmd;
             string prefix = "";
             switch (cmd)
             {
@@ -43,7 +44,6 @@ namespace FurnaceUI.Views.Editors
                     typeFileList.Add(type);
                     type.ProcessType = "AlarmCondition";
                     prefix = $"Parameter\\AlarmCondition";
-                    parameterSelectDialogViewModel = new ParameterSelectDialogViewModel();
                     SetProcessTypeIndexSelection(typeFileList, CombinationData.AlarmCondition);
 
                     parameterSelectDialogViewModel.ProcessTypeFileList = typeFileList;
@@ -58,7 +58,6 @@ namespace FurnaceUI.Views.Editors
                     typeFileList.Add(type);
                     type.ProcessType = "LeakCheck";
                     prefix = $"Parameter\\LeakCheckCondition";
-                    parameterSelectDialogViewModel = new ParameterSelectDialogViewModel();
                     SetProcessTypeIndexSelection(typeFileList, CombinationData.LeakCheck);
 
                     parameterSelectDialogViewModel.ProcessTypeFileList = typeFileList;
@@ -73,7 +72,6 @@ namespace FurnaceUI.Views.Editors
                     typeFileList.Add(type);
                     type.ProcessType = "PressAPC";
                     prefix = $"Parameter\\APCPID";
-                    parameterSelectDialogViewModel = new ParameterSelectDialogViewModel();
                     SetProcessTypeIndexSelection(typeFileList, CombinationData.PressAPC);
 
                     parameterSelectDialogViewModel.ProcessTypeFileList = typeFileList;
@@ -88,7 +86,6 @@ namespace FurnaceUI.Views.Editors
                     typeFileList.Add(type);
                     type.ProcessType = "TempCorrection";
                     prefix = $"Parameter\\TempCorrection";
-                    parameterSelectDialogViewModel = new ParameterSelectDialogViewModel();
                     SetProcessTypeIndexSelection(typeFileList, CombinationData.TempCorrection);
 
                     parameterSelectDialogViewModel.ProcessTypeFileList = typeFileList;
@@ -105,7 +102,6 @@ namespace FurnaceUI.Views.Editors
                     prefix = $"Parameter\\TempPID";
                     SetProcessTypeIndexSelection(typeFileList, CombinationData.TempPID);
 
-                    parameterSelectDialogViewModel = new ParameterSelectDialogViewModel();
                     parameterSelectDialogViewModel.ProcessTypeFileList = typeFileList;
                     if ((bool)wm.ShowDialog(parameterSelectDialogViewModel))
                     {
@@ -118,7 +114,6 @@ namespace FurnaceUI.Views.Editors
                     typeFileList.Add(type);
                     type.ProcessType = "ProfileCondition";
                     prefix = $"Parameter\\ProfileCondition";
-                    parameterSelectDialogViewModel = new ParameterSelectDialogViewModel();
                     SetProcessTypeIndexSelection(typeFileList, CombinationData.ProfileCondition);
                     parameterSelectDialogViewModel.ProcessTypeFileList = typeFileList;
                     if ((bool)wm.ShowDialog(parameterSelectDialogViewModel))

Furnace/FurnaceUI/Views/Jobs/CreateJobView.xaml

@@ -112,7 +112,31 @@
 
         </Border>
         <Border Grid.Row="2" Grid.Column="0">
-            <Canvas>
+            <StackPanel HorizontalAlignment="Left" Margin="10,20,10,0">
+                <StackPanel Orientation="Horizontal"  >
+                    <Button    Width="200"   Height="50" Content="Job Recipe Select" FontSize="20">
+                        <i:Interaction.Triggers>
+                            <i:EventTrigger EventName="Click">
+                                <cal:ActionMessage MethodName="SelectJobRecipe"/>
+                            </i:EventTrigger>
+                        </i:Interaction.Triggers>
+                    </Button>
+                    <TextBox TextWrapping="Wrap" Tag="None" Width="770"  Margin="10,0,10,0" FontSize="20" Text="{Binding CurrentRecipe.Name}" IsEnabled="False"></TextBox>
+                </StackPanel>
+                <StackPanel  Orientation="Horizontal"  >
+                    <TextBlock Padding="5" TextAlignment="Right"  Margin="0,10,0,0"  Width="200"   Height="50" Text="Process Recipe" FontSize="20">
+                      
+                    </TextBlock>
+                    <TextBox TextWrapping="Wrap" Tag="None" Width="770"  Margin="10,10,10,0" FontSize="20" Text="{Binding CurrentRecipe.ProcessRecipe}" IsEnabled="False"></TextBox>
+                </StackPanel>
+                <StackPanel Orientation="Horizontal"  >
+                    <TextBlock  Padding="5" TextAlignment="Right"  Margin="0,10,0,0"  Width="200"   Height="50" Text="Layout Recipe" FontSize="20">
+                      
+                    </TextBlock>
+                    <TextBox TextWrapping="Wrap" Tag="None" Width="770"  Margin="10,10,10,0" FontSize="20" Text="{Binding CurrentRecipe.LayoutRecipe}" IsEnabled="False"></TextBox>
+                </StackPanel>
+            </StackPanel>
+            <!--<Canvas>
                 <Grid Height="240" Width="700" Canvas.Left="20" Canvas.Top="0">
                     <Grid.RowDefinitions>
                         <RowDefinition Height="20"/>
@@ -159,7 +183,7 @@
                         </i:EventTrigger>
                     </i:Interaction.Triggers>
                 </Button>
-            </Canvas>
+            </Canvas>-->
         </Border>
         <DockPanel Grid.Row="3" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,0,0,0">
             <Border>

Furnace/FurnaceUI/Views/Operations/StatusView.xaml

@@ -334,10 +334,13 @@
                                                 Background="#DAE5F1"
                                                 BorderBrush="Gray"
                                                 BorderThickness="1,1,1,1">
-                                                <TextBlock
+                                                <TextBox
                                                     Grid.Row="1"
                                                     HorizontalAlignment="Center"
                                                     VerticalAlignment="Center"
+                                                          BorderThickness="0"
+      Background="#DAE5F1"
+      Style="{StaticResource TextBox_Top}"
                                                     Text="{Binding PM1SelectedRecipeNameDisplay, Mode=OneWay}"
                                                     ToolTip="{Binding PM1SelectedRecipeNameDisplay, Mode=OneWay}"/>
                                             </Border>

Furnace/FurnaceUI/Views/Recipes/RecipeJobEditView.xaml

@@ -14,9 +14,9 @@
                 <RowDefinition Height="70"/>
                 <RowDefinition Height="70"/>
                 <RowDefinition MinHeight="70"/>
-                <RowDefinition Height="70"/>
-                <RowDefinition Height="70"/>
-                <RowDefinition Height="70"/>
+                <RowDefinition MinHeight="70"/>
+                <RowDefinition MinHeight="70"/>
+                <RowDefinition MinHeight="70"/>
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="200"/>
@@ -55,7 +55,7 @@
                 <TextBox Text="{Binding CurrentRecipe.Description, UpdateSourceTrigger=PropertyChanged}" FontSize="14" HorizontalAlignment="Left" TextWrapping="Wrap" Margin="10,10" Width="600" IsEnabled="{Binding IsEnable}"/>
             </Border>
             <Border Grid.Row="4" Grid.Column="0" IsEnabled="{Binding IsEnable}">
-                <Button Content="Process Recipe Select" Margin="10,10,0,10">
+                <Button Height="70" Content="Process Recipe Select" Margin="10,10,0,10">
                     <i:Interaction.Triggers>
                         <i:EventTrigger EventName="Click">
                             <cal:ActionMessage MethodName="SelectProcessRecipe">
@@ -65,10 +65,10 @@
                 </Button>
             </Border>
             <Border Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="3" CornerRadius="6" BorderBrush="Green" BorderThickness="2" Margin="10,10">
-                <TextBox Tag="None" FontSize="20" Text="{Binding CurrentRecipe.ProcessRecipe}" IsEnabled="False"/>
+                <TextBox Tag="None" TextWrapping="Wrap"  FontSize="20" Text="{Binding CurrentRecipe.ProcessRecipe}" Width="700" IsEnabled="False"/>
             </Border>
             <Border Grid.Row="5" Grid.Column="0" IsEnabled="{Binding IsEnable}">
-                <Button Content="Layout Recipe Select" Margin="10,10,0,10">
+                <Button Height="70" Content="Layout Recipe Select" Margin="10,10,0,10">
                     <i:Interaction.Triggers>
                         <i:EventTrigger EventName="Click">
                             <cal:ActionMessage MethodName="SelectLayoutRecipe">
@@ -78,9 +78,9 @@
                 </Button>
             </Border>
             <Border Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="3" CornerRadius="6" BorderBrush="Green" BorderThickness="2" Margin="10,10">
-                <TextBox Tag="None" FontSize="20" Text="{Binding CurrentRecipe.LayoutRecipe}" IsEnabled="False"/>
+                <TextBox Tag="None" FontSize="20"  TextWrapping="Wrap" Text="{Binding CurrentRecipe.LayoutRecipe}" Width="700" IsEnabled="False"/>
             </Border>
-            <Border Grid.Row="6" Grid.Column="0">
+            <Border  Height="70" Grid.Row="6" Grid.Column="0">
                 <Button Content="Cooling Time" Margin="10,10,0,10">
                     <i:Interaction.Triggers>
                         <i:EventTrigger EventName="Click">

Furnace/FurnaceUI/Views/Recipes/RecipeJobView.xaml

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

Furnace/FurnaceUI/Views/Recipes/RecipeLayoutEditView.xaml

@@ -45,7 +45,7 @@
 
         <Grid Margin="10">
             <Grid.RowDefinitions>
-                <RowDefinition Height="30"/>
+                <RowDefinition Height="80"/>
                 <RowDefinition Height="30"/>
                 <RowDefinition Height="60"/>
                 <RowDefinition/>
@@ -61,9 +61,9 @@
                 <RowDefinition Height="90"/>
             </Grid.RowDefinitions>
             <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
-                <TextBlock Text="File Name" Width="100"/>
+                <TextBlock Text="File Name：" Width="80"/>
                 <Border BorderBrush="Gray" BorderThickness="1">
-                    <TextBlock Text="{Binding RecipeName}" Width="200"/>
+                    <TextBlock Text="{Binding RecipeName}" Width="500" TextWrapping="Wrap" Background="Red"/>
                 </Border>
             </StackPanel>
             <Border Grid.Row="2" BorderBrush="Gray" BorderThickness="1" Padding="4">

Furnace/FurnaceUI/Views/Recipes/RecipeProcessEditView.xaml

@@ -11,7 +11,7 @@
              xmlns:extendedcontrols="clr-namespace:MECF.Framework.UI.Core.ExtendedControls;assembly=MECF.Framework.UI.Core" 
     d:DataContext="{d:DesignInstance Type=recipes:RecipeProcessEditViewModel}"
              mc:Ignorable="d" 
-             Height="800" Width="1260" FontFamily="Segoe" >
+             Height="850" Width="1260" FontFamily="Segoe" >
     <UserControl.Resources>
         <Style x:Key="myHeaderStyle" TargetType="{x:Type GridViewColumnHeader}">
             <Setter Property="Visibility" Value="Collapsed" />
@@ -53,10 +53,11 @@
                             <Button Height="80" Style="{StaticResource Area_Button}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" IsEnabled="{Binding SettingButtonEnable}" >
                                 <ContentControl >
                                     <Canvas>
-                                        <TextBlock Text="Recipe Name" Canvas.Top="10" Canvas.Left="10"/>
-                                        <TextBox  Text="{Binding CurrentRecipe.Name}" FontSize="14" Canvas.Top="10" Canvas.Left="100" Width="171" IsEnabled="False"/>
-                                        <TextBlock Text="Total Time" Canvas.Top="42" Canvas.Left="10"/>
-                                        <TextBox Text="{Binding CurrentRecipe.Time,Mode=OneWay}" FontSize="14" Canvas.Top="40" Canvas.Left="100" Width="171"  IsEnabled="False"/>
+                                        <StackPanel>
+                                            <TextBlock Text="Recipe Name"/>
+                                            <TextBox  Text="{Binding CurrentRecipe.Name}" Background="#DCDCDC" TextWrapping="Wrap" Tag="None" FontSize="14" MaxHeight="52"  Width="270"  />
+                                        </StackPanel>
+                        
                                     </Canvas>
                                 </ContentControl>
                                 <i:Interaction.Triggers>
@@ -71,6 +72,17 @@
                         </Border>
                         <Border Margin="2">
                             <Button Height="40" Style="{StaticResource Area_Button}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" IsEnabled="{Binding IsCommandConditionEventEnabled}" Visibility="{Binding StandbyIsVisibility}">
+                              
+                                <ContentControl >
+                                    <Canvas>
+                                        <TextBlock Text="Tool Time" FontSize="14" Canvas.Top="8" Canvas.Left="10"/>
+                                        <TextBox Text="{Binding CurrentRecipe.Time,Mode=OneWay}" IsEnabled="False" Tag="Number" FontSize="14" Canvas.Top="5" Canvas.Left="100" Width="150"/>
+                                    </Canvas>
+                                </ContentControl>
+                            </Button>
+                        </Border>
+                        <Border Margin="2">
+                            <Button Height="40" Style="{StaticResource Area_Button}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" IsEnabled="{Binding IsCommandConditionEventEnabled}" Visibility="{Binding StandbyIsVisibility}">
                                 <ContentControl >
                                     <Canvas>
                                         <TextBlock Text="Film THK" FontSize="14" Canvas.Top="8" Canvas.Left="10"/>
@@ -400,15 +412,15 @@
 
                         </Border>-->
                         <Border Grid.Row="2" Margin="2">
-                            <Button Height="305" Style="{StaticResource Area_Button}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" IsEnabled="{Binding SettingButtonEnable}" >
+                            <Button Height="345" Style="{StaticResource Area_Button}" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" IsEnabled="{Binding SettingButtonEnable}" >
                                 <ContentControl >
                                     <Canvas>
-                                        <Grid Height="300">
+                                        <Grid Height="340">
                                             <Grid.RowDefinitions>
-                                                <RowDefinition Height="30"/>
-                                                <RowDefinition Height="30"/>
-                                                <RowDefinition Height="30"/>
-                                                <RowDefinition Height="30"/>
+                                                <RowDefinition Height="35"/>
+                                                <RowDefinition Height="35"/>
+                                                <RowDefinition Height="35"/>
+                                                <RowDefinition Height="35"/>
                                                 <RowDefinition Height="Auto"/>
                                                 <RowDefinition Height="30"/>
                                             </Grid.RowDefinitions>

Furnace/FurnaceUI/Views/Recipes/RecipeView.xaml

@@ -28,6 +28,7 @@
                     HorizontalAlignment="Left"
                     VerticalAlignment="Center"
                     FontSize="15"
+                    TextWrapping="WrapWithOverflow"
                     Text="{Binding Name}"/>
 
             </StackPanel>

Furnace/FurnaceUI/Views/Recipes/RecipeViewModel.cs

@@ -2018,7 +2018,7 @@ namespace FurnaceUI.Views.Recipes
             {
                 recipeEditViewModel.SelectedStepName = oldStepName;
             }
-            bool? bret = (windowManager as WindowManager)?.ShowDialogWithTitle(recipeEditViewModel, null, "Recipe Edit");
+            bool? bret = (windowManager as WindowManager)?.ShowDialogWithTitle(recipeEditViewModel, null, $"Recipe Edit");
             if (recipeEditViewModel.CurrentRecipe != null && recipeEditViewModel.selectStep != null)
             {
                 oldPrefix = recipeEditViewModel.CurrentRecipe.PrefixPath;