update 优化parameter界面卡顿+调整温度Tempsetting交互设定

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

FrameworkLocal/UIClient/CenterViews/Parameter/MainParameterEditView.xaml

@@ -19,7 +19,7 @@
                 <Border Grid.Column="0"  BorderThickness="1" BorderBrush="Black" HorizontalAlignment="Center"  Width="40">
                     <TextBlock Text="{Binding Name}" HorizontalAlignment="Center" VerticalAlignment="Center"></TextBlock>
                 </Border>
-                <TextBox Grid.Column="1" Width="90" HorizontalContentAlignment="Left" Text="{Binding CurrentValue}" ToolTip="{Binding CurrentValue}" Height="30"  HorizontalAlignment="Center">
+                <Label  BorderBrush="Black" BorderThickness="1" Padding="5" Background="White" HorizontalContentAlignment="Center" Grid.Column="1" Width="90" Content="{Binding CurrentValue}"  Height="30"  >
                     <i:Interaction.Triggers>
                         <i:EventTrigger EventName="PreviewMouseLeftButtonDown">
                             <cal:ActionMessage MethodName="SetStepNameValue">
@@ -28,7 +28,7 @@
                             </cal:ActionMessage>
                         </i:EventTrigger>
                     </i:Interaction.Triggers>
-                </TextBox>
+                </Label>
             </Grid>
         </DataTemplate>
     </UserControl.Resources>

FrameworkLocal/UIClient/CenterViews/Parameter/MainParameterEditViewModel.cs

@@ -108,7 +108,7 @@ namespace MECF.Framework.UI.Client.CenterViews.Parameter
         {
             var node = SystemConfigProvider.Instance.GetConfigTree(SystemName).SubNodes;
             ParameterTree.Add(new ParamBase() { ID = 1, ParentID = 0, Name = "StepName", ConfigName = "StepName" });
-            ParameterTree.Add(new ParamBase() { ID = 2, ParentID = 0, Name = "TempSetting", ConfigName = "TempSetting" });
+            //ParameterTree.Add(new ParamBase() { ID = 2, ParentID = 0, Name = "TempSetting", ConfigName = "TempSetting" });
 
             //ParameterTree.Add(new ParamBase() { ID = 3, ParentID = 0, Name = "TempSetting", ConfigName = "TempSetting" });
 

Furnace/FurnaceUI/Views/Editors/RecipeTempSetViewModel.cs

@@ -158,41 +158,41 @@ namespace FurnaceUI.Views.Editors
             switch (setName)
             {
                 case "TempSet":
-                    //string strRetValue = ShowNumberKeyboard(sender as Button, "");
-                    //foreach (var item in TempSetDataList)
-                    //{
-                    //    if (strRetValue.Equals("Cancel"))
-                    //    {
-                    //        continue;
-                    //    }
-                    //    item.SetValue = strRetValue;
-                    //}
-
-                    TempAllZoneValueSetViewModel tempAllZoneValueSetViewModel = new TempAllZoneValueSetViewModel();
-                    tempAllZoneValueSetViewModel.RecipeType = RecipeType;
-                    var result1 = (windowManager as WindowManager)?.ShowDialogWithTitle(tempAllZoneValueSetViewModel, null, "Temperature All Zone Value Set");
-                    if (tempAllZoneValueSetViewModel.IsSave)
+                    string strRetValue = ShowNumberKeyboard(sender as Button, "");
+                    foreach (var item in TempSetDataList)
                     {
-                        string strTemp;
-                        if (tempAllZoneValueSetViewModel.SelectedNode is null) return;
-                        string strNodeName = tempAllZoneValueSetViewModel.SelectedNode.Name;
-                        if (tempAllZoneValueSetViewModel.SelectedNode.Items.Count > 1)
+                        if (strRetValue.Equals("Cancel"))
                         {
-                            for (int i = 0; i < tempAllZoneValueSetViewModel.SelectedNode.Items.Count; i++)
-                            {
-                                strTemp =tempAllZoneValueSetViewModel.SelectedNode.Items[i].CurrentValue;
-                                if (strTemp.StartsWith(":")) strTemp = strTemp.Substring(1);
-                                //TemperatureValues[TemperatureName[i]] = strTemp;
-                                //SetViewData(i + 1, strTemp);
-                                var tempData = TempSetDataList.FirstOrDefault(x => x.Name == tempAllZoneValueSetViewModel.SelectedNode.Items[i].Name);
-                                if (tempData != null)
-                                {
-                                    tempData.SetValue.SetValue(strTemp);
-                                }
-                            }
+                            continue;
                         }
-
+                        item.SetValue.SetValue(strRetValue);
                     }
+
+                    //TempAllZoneValueSetViewModel tempAllZoneValueSetViewModel = new TempAllZoneValueSetViewModel();
+                    //tempAllZoneValueSetViewModel.RecipeType = RecipeType;
+                    //var result1 = (windowManager as WindowManager)?.ShowDialogWithTitle(tempAllZoneValueSetViewModel, null, "Temperature All Zone Value Set");
+                    //if (tempAllZoneValueSetViewModel.IsSave)
+                    //{
+                    //    string strTemp;
+                    //    if (tempAllZoneValueSetViewModel.SelectedNode is null) return;
+                    //    string strNodeName = tempAllZoneValueSetViewModel.SelectedNode.Name;
+                    //    if (tempAllZoneValueSetViewModel.SelectedNode.Items.Count > 1)
+                    //    {
+                    //        for (int i = 0; i < tempAllZoneValueSetViewModel.SelectedNode.Items.Count; i++)
+                    //        {
+                    //            strTemp =tempAllZoneValueSetViewModel.SelectedNode.Items[i].CurrentValue;
+                    //            if (strTemp.StartsWith(":")) strTemp = strTemp.Substring(1);
+                    //            //TemperatureValues[TemperatureName[i]] = strTemp;
+                    //            //SetViewData(i + 1, strTemp);
+                    //            var tempData = TempSetDataList.FirstOrDefault(x => x.Name == tempAllZoneValueSetViewModel.SelectedNode.Items[i].Name);
+                    //            if (tempData != null)
+                    //            {
+                    //                tempData.SetValue.SetValue(strTemp);
+                    //            }
+                    //        }
+                    //    }
+
+                    //}
                     break;
                 case "RampSet":
                     string strRetRamp = ShowNumberKeyboard(sender as Button, "");