曲线列表新增时间、配方名称标签,增加界面可读性
This commit is contained in:
parent
c2a25dae69
commit
2c586a0e01
|
@ -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; }
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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"))
|
||||
|
|
Binary file not shown.
After Width: | Height: | Size: 1.1 KiB |
|
@ -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>
|
||||
|
|
Loading…
Reference in New Issue