From 2c586a0e0183f894430da2e563e8553dfab0d1b9 Mon Sep 17 00:00:00 2001
From: "SIC1016\\caipeilun" <123456>
Date: Thu, 14 Sep 2023 09:13:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B2=E7=BA=BF=E5=88=97=E8=A1=A8=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=97=B6=E9=97=B4=E3=80=81=E9=85=8D=E6=96=B9=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E6=A0=87=E7=AD=BE=EF=BC=8C=E5=A2=9E=E5=8A=A0=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E5=8F=AF=E8=AF=BB=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SicUI/Models/PMs/Charting/ChartDataLineX.cs   |   4 +++
 .../Models/PMs/Charting/PMChartingV2View.xaml |  26 ++++++++++++++----
 .../PMs/Charting/PMChartingV2ViewModel.cs     |   4 +++
 SicUI/Resources/Images/find.png               | Bin 0 -> 1157 bytes
 SicUI/SicUI.csproj                            |   3 ++
 5 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 SicUI/Resources/Images/find.png

diff --git a/SicUI/Models/PMs/Charting/ChartDataLineX.cs b/SicUI/Models/PMs/Charting/ChartDataLineX.cs
index 97be7a87..aacefe66 100644
--- a/SicUI/Models/PMs/Charting/ChartDataLineX.cs
+++ b/SicUI/Models/PMs/Charting/ChartDataLineX.cs
@@ -39,6 +39,10 @@ namespace SicUI.Models.PMs.Charting
         }
         #endregion
 
+        public string Time { get; set; }
+
+        public string RecipeName { get; set; }
+
         public string UniqueId { get; set; }
 
         public string ProcessGuid { get; set; }
diff --git a/SicUI/Models/PMs/Charting/PMChartingV2View.xaml b/SicUI/Models/PMs/Charting/PMChartingV2View.xaml
index 4e307619..0b46f60a 100644
--- a/SicUI/Models/PMs/Charting/PMChartingV2View.xaml
+++ b/SicUI/Models/PMs/Charting/PMChartingV2View.xaml
@@ -563,14 +563,28 @@
                                                 </DataTemplate>
                                             </DataGridTemplateColumn.CellTemplate>
                                         </DataGridTemplateColumn>
-                                        <DataGridTemplateColumn Header="Mark" MinWidth="150">
+                                        <DataGridTemplateColumn Header="Mark" MinWidth="100">
                                             <DataGridTemplateColumn.CellTemplate>
                                                 <DataTemplate>
                                                     <TextBlock Text="{Binding ProcessGuid}" Margin="5,0" FontFamily="Arial" FontSize="14" Foreground="{DynamicResource FG_Black}" HorizontalAlignment="Left" VerticalAlignment="Center" />
                                                 </DataTemplate>
                                             </DataGridTemplateColumn.CellTemplate>
                                         </DataGridTemplateColumn>
-                                        <DataGridTemplateColumn Header="Color" MinWidth="100">
+                                        <DataGridTemplateColumn Header="Recipe Name" MinWidth="150">
+                                            <DataGridTemplateColumn.CellTemplate>
+                                                <DataTemplate>
+                                                    <TextBlock Text="{Binding RecipeName}" Margin="5,0" FontFamily="Arial" FontSize="14" Foreground="{DynamicResource FG_Black}" HorizontalAlignment="Left" VerticalAlignment="Center" />
+                                                </DataTemplate>
+                                            </DataGridTemplateColumn.CellTemplate>
+                                        </DataGridTemplateColumn>
+                                        <DataGridTemplateColumn Header="Time" MinWidth="150">
+                                            <DataGridTemplateColumn.CellTemplate>
+                                                <DataTemplate>
+                                                    <TextBlock Text="{Binding Time}" Margin="5,0" FontFamily="Arial" FontSize="14" Foreground="{DynamicResource FG_Black}" HorizontalAlignment="Left" VerticalAlignment="Center" />
+                                                </DataTemplate>
+                                            </DataGridTemplateColumn.CellTemplate>
+                                        </DataGridTemplateColumn>
+                                        <DataGridTemplateColumn Header="Color" MinWidth="60">
                                             <DataGridTemplateColumn.CellTemplate>
                                                 <DataTemplate>
                                                     <Button Style="{DynamicResource Color_Button}" Height="25" HorizontalAlignment="Stretch" Background="{Binding Stroke, Converter={StaticResource colorConverter}}" Width="50">
@@ -585,10 +599,10 @@
                                                 </DataTemplate>
                                             </DataGridTemplateColumn.CellTemplate>
                                         </DataGridTemplateColumn>
-                                        <DataGridTemplateColumn Header="Factor" MinWidth="100">
+                                        <DataGridTemplateColumn Header="Factor" MinWidth="60">
                                             <DataGridTemplateColumn.CellTemplate>
                                                 <DataTemplate>
-                                                    <controls:TextBoxEx AllowBackgroundChange="False" Text="{Binding DataFactor, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Width="80" Margin="5,0" FontFamily="Arial" FontSize="14" Foreground="{DynamicResource FG_Black}" HorizontalAlignment="Left" VerticalAlignment="Center" />
+                                                    <controls:TextBoxEx AllowBackgroundChange="False" Text="{Binding DataFactor, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Width="50" Margin="5,0" FontFamily="Arial" FontSize="14" Foreground="{DynamicResource FG_Black}" HorizontalAlignment="Left" VerticalAlignment="Center" />
                                                 </DataTemplate>
                                             </DataGridTemplateColumn.CellTemplate>
                                         </DataGridTemplateColumn>
@@ -606,10 +620,10 @@
                                                 </DataTemplate>
                                             </DataGridTemplateColumn.CellTemplate>
                                         </DataGridTemplateColumn>
-                                        <DataGridTemplateColumn Header="Width" MinWidth="100">
+                                        <DataGridTemplateColumn Header="Width" MinWidth="60">
                                             <DataGridTemplateColumn.CellTemplate>
                                                 <DataTemplate>
-                                                    <controls:TextBoxEx AllowBackgroundChange="False" Text="{Binding LineThickness, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Width="80" Margin="5,0" Foreground="{DynamicResource FG_Black}" HorizontalAlignment="Left" VerticalAlignment="Center" />
+                                                    <controls:TextBoxEx AllowBackgroundChange="False" Text="{Binding LineThickness, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Width="50" Margin="5,0" Foreground="{DynamicResource FG_Black}" HorizontalAlignment="Left" VerticalAlignment="Center" />
                                                 </DataTemplate>
                                             </DataGridTemplateColumn.CellTemplate>
                                         </DataGridTemplateColumn>
diff --git a/SicUI/Models/PMs/Charting/PMChartingV2ViewModel.cs b/SicUI/Models/PMs/Charting/PMChartingV2ViewModel.cs
index 5adf7438..65ef8ac0 100644
--- a/SicUI/Models/PMs/Charting/PMChartingV2ViewModel.cs
+++ b/SicUI/Models/PMs/Charting/PMChartingV2ViewModel.cs
@@ -21,6 +21,7 @@ using Cali = Caliburn.Micro;
 using MECF.Framework.UI.Client.CenterViews.DataLogs.ProcessHistory;
 using System.Reflection;
 using SciChart.Charting.Model.ChartSeries;
+using System.IO;
 
 namespace SicUI.Models.PMs.Charting
 {
@@ -258,6 +259,7 @@ namespace SicUI.Models.PMs.Charting
             }
 
             Recipes.Clear();
+            RemoveAllLine();
 
             try
             {
@@ -599,6 +601,8 @@ namespace SicUI.Models.PMs.Charting
                             if (SelectedData.Count < MAX_PARAMETERS)
                             {
                                 var line = new ChartDataLineX(nodeWithGuid); 
+                                line.Time=itemSic.StartTime+"-"+itemSic.EndTime;
+                                line.RecipeName = new DirectoryInfo(itemSic.Recipe).Name;
                                 if (itemSic.Chamber.StartsWith("PM1"))
                                     line.Module = "PM1";
                                 else if (itemSic.Chamber.StartsWith("PM2"))
diff --git a/SicUI/Resources/Images/find.png b/SicUI/Resources/Images/find.png
new file mode 100644
index 0000000000000000000000000000000000000000..ebc936de67caafc5bd9fad928f897cdc87d06754
GIT binary patch
literal 1157
zcmV;01bX|4P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px(KS@MERCr$9n_W`dFc5%ulk}a^0}y5!W_pSyCjlOzhX4*y@(7#+I7MejXK)Wt
z$^pRJkrkW#*xnz>PGTNgSz3MjD`|re`EPGJ8}|Ud1K^N|hHiQU82e=?A;1I?lkDHq
z^zpri$?MtZA+i|a=}<hfV&LBN*RThJW4}MRw9Q8eVDBLXx@#MT89=dd^QNm%IT(2R
zayGiM!PI?a0<b@wUD&lP6|fx;Dga-8KAjNajdTlf#!-^u`{ecPTNXEB|A_&#qxJUP
zLImLR_3Zv5lE>D8Vm^e+*s-A&fD3d;gPX0`{G1a3Jp4N!O%&K_ht>kHYu*R26yVXV
zo~Jek)JroMx>|t<#wNH~miT%a141PL{pM{^+ni1#xkD)cUBI(#d{uiU5D_4(0mw>O
zf_sU1#r8+HW(I=#_pX%YWpF7HPeZE5H30k9PtT&oBhatfpvD?Pm9PXrYWgX{B!oJz
zSwEr;d6ofO&xjSSLCu$~y+8eZ14JkFa#8YfessvnUNWEnAXzBX+$;i0YY`+m{rltS
zR=dUr09N~U%37gHGXxEuo3MfmfaH*4B^<i>{CkOoT4GZMfS-JG+Rp*_^vGC&AwGEk
zjQMX``%){g#3+=Q|I7JEbZU%c?$z}HU!<k@cBr{KKsMJ#Ja~ixlDL634j||M+hYDX
zJnoRDm6rveB^s(_?t9*1b(bc{)&5$a;x-Wa|7^@sy6nyY;7+UBOn_Vp+?EXRQ4iE-
z0t0~h<8S9(fQzcz76hZmfL#N?X93-XDVqktP+x~e`nvBqg=yvGD?!-&L1+;O7qqo5
zi(Fc9i)$xs$^uyb2LNr>nx6)li_k4`1K#{~{_hmEL-zsvNl@$m1ptW~_@;$8&ruc^
zVYQ#Rs_rPf06=it0?oeD*FkAgLB&OfB*3^PC+qdIMeFVx$sIsQpe_K2pQKuL1&Qg0
zC}!!ZOJ)UG=#1W|P-Y>r&4;DwB>>V#h)mc9Eul?0N?wO00WsHC{J<y*cnjvDEqqoj
zt@O56><Zazc{j-0o#r-nRS^Fo{ON*!2VDHJf#>mjdiK<{=Ct~5Pv0`*+GX%qxAAxo
zD)0MMepms+SqG-{$Mpl}L;5KVsfP#V{-Dx)YPSToODyXHj@}MytqSVCvq2EO_~_lC
zi498T)I$&fa7%9%0wtohoq15!^bLst<Yj5=jg#|wLs}AhJCR$03P5gzK25@fTq_du
zT^+N&i6$VJ0OZ!tPy6E(@z~VuS;>SFB)F<-cZm(b3}8`yCsY^=T`?6CLKFaHFfvc<
z;lbi>hx`%3)dVi60k~dbYr9=62+;vpyxsau3<x_7Adf|C?@&Q_J+SUPfKUjX01yJ9
zGXQK5-Y1;`poQRi2|5Qr2Z54K0?<I{EC3M%#M@2-sE6P$bUP2AfRNp6&3|~Y@Z;?N
XERG-YLbtLn00000NkvXXu0mjf{_-4L

literal 0
HcmV?d00001

diff --git a/SicUI/SicUI.csproj b/SicUI/SicUI.csproj
index b4bb09d2..9d77db39 100644
--- a/SicUI/SicUI.csproj
+++ b/SicUI/SicUI.csproj
@@ -903,6 +903,9 @@ if exist "$(ProjectDir)..\SicSetup\Packages\SicUI\PresetGroups" rd "$(ProjectDir
   <ItemGroup>
     <Resource Include="Resources\Images\interlock_bypass_watermark.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Images\find.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>