Ver código fonte

Improve datalog performance

hecl 1 ano atrás
pai
commit
7e0a676b69

+ 1 - 1
Venus/Venus_MainPages/ViewModels/ProcessHistoryViewModel.cs

@@ -566,7 +566,7 @@ namespace Venus_MainPages.ViewModels
                 result[Keys[i]].ForEach(point =>
                 {
                     ProcessData.Add(new HistoryDataItem() { dateTime= point.dateTime, dbName= Keys[i],value= point.value });
-                    points.Add(new Point() { X = point.dateTime.AddSeconds(1).ToOADate(), Y = point.value });
+                    points.Add(new Point() { X = point.dateTime.ToOADate(), Y = point.value });
                     k += 1;
                 });
                 cls.Add(points);

+ 1 - 1
Venus/Venus_MainPages/Views/ProcessHistoryView.xaml.cs

@@ -136,7 +136,7 @@ namespace Venus_MainPages.Views
                 Microsoft.Win32.SaveFileDialog dlg = new Microsoft.Win32.SaveFileDialog();
                 dlg.DefaultExt = ".xls"; // Default file extension 
                 dlg.Filter = "数据表格文件|*.xls"; // Filter files by extension 
-                dlg.FileName = string.Format("{0}-{1}", _viewModel.StartDateTime.ToString("yyyyMMdd"), log.Recipe.Replace("/","-"));
+                dlg.FileName = string.Format("{0}-{1}", _viewModel.StartDateTime.ToString("yyyyMMdd"), log.Recipe.Replace(" ","").Replace("/", ""));
                 Nullable<bool> result = dlg.ShowDialog();// Show open file dialog box
                 if (result != true) // Process open file dialog box results
                     return;

+ 3 - 3
Venus/Venus_RT/Modules/PMs/PMProcessRoutine.cs

@@ -418,7 +418,7 @@ namespace Venus_RT.Modules.PMs
                     WaferId = waferInfo.InnerId.ToString();
                     SlotID = waferInfo.OriginSlot.ToString();
                     LotID = waferInfo.ProcessJob == null || string.IsNullOrEmpty(waferInfo.ProcessJob.ControlJobName) ? "" : waferInfo.ProcessJob.ControlJobName;
-                    FullRecipeName = string.Format(@"{0}/{1}/{2}", ChuckRecipeName, ProcessRecipeName, DechuckRecipeName);
+                    FullRecipeName = string.Format(@"{0} {1} {2}", ChuckRecipeName, ProcessRecipeName, DechuckRecipeName);
                 }
                 Processtime.Stop();
                 RecipeEndTime = RecipeStartTime + Processtime.Elapsed;
@@ -509,7 +509,7 @@ namespace Venus_RT.Modules.PMs
                 WaferId = waferInfo.InnerId.ToString();
                 SlotID = waferInfo.OriginSlot.ToString();
                 LotID = waferInfo.ProcessJob == null || string.IsNullOrEmpty(waferInfo.ProcessJob.ControlJobName) ? "" : waferInfo.ProcessJob.ControlJobName;
-                FullRecipeName = string.Format(@"{0}/{1}/{2}", ChuckRecipeName, ProcessRecipeName, DechuckRecipeName);
+                FullRecipeName = string.Format(@"{0} {1} {2}", ChuckRecipeName, ProcessRecipeName, DechuckRecipeName);
             }
             Processtime.Stop();
             RecipeEndTime = RecipeStartTime + Processtime.Elapsed;
@@ -551,7 +551,7 @@ namespace Venus_RT.Modules.PMs
                 WaferId = waferInfo.InnerId.ToString();
                 SlotID = waferInfo.OriginSlot.ToString();
                 LotID = waferInfo.ProcessJob == null || string.IsNullOrEmpty(waferInfo.ProcessJob.ControlJobName) ? "" : waferInfo.ProcessJob.ControlJobName;
-                FullRecipeName = string.Format(@"{0}/{1}/{2}", ChuckRecipeName, ProcessRecipeName, DechuckRecipeName);
+                FullRecipeName = string.Format(@"{0} {1} {2}", ChuckRecipeName, ProcessRecipeName, DechuckRecipeName);
             }
             Processtime.Stop();
             RecipeEndTime = RecipeStartTime + Processtime.Elapsed;

+ 15 - 3
Venus/Venus_UI/Views/ShellView.xaml.cs

@@ -226,9 +226,21 @@ namespace Venus_UI.Views
             vm.searchlot(queryFilter.WaferGuid);
             //vm.OnDataGridSelectionChanged(vm.Recipes[0]);
             address.DataContext = vm;
-            centerTabViews[7].Items[2]= new TabItem() { Header = menuviewItem, Content = address };
-            centerTabViews[7].SelectedIndex = 2;
-            Main_Frame.Content = centerTabViews[7];
+            int s = 0;
+            for(int i = 0; i < centerTabViews.Count; i++)
+            {
+                var item = centerTabViews[i];
+                foreach(TabItem v in item.Items) 
+                { 
+                    if (v.Header.ToString()== "Process History")
+                    {
+                        s = i;
+                    }
+                }
+            }
+            centerTabViews[s].Items[2]= new TabItem() { Header = menuviewItem, Content = address };
+            centerTabViews[s].SelectedIndex = 2;
+            Main_Frame.Content = centerTabViews[s];
         }
         private void AduRadioButtonIcon_Click(object sender, RoutedEventArgs e)
         {