Sic-Software
/
Sic.Framework
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

临时保存

This commit is contained in:
hanqiangqiang 2023-11-30 13:42:06 +08:00
parent 027c078534
commit f04d2959ff
16 changed files with 415 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MECF.Framework.UI.Client/CenterViews/Core/UserControls/DataViewDataGrid.xaml
View File

@ -6,13 +6,13 @@
xmlns:converter="clr-namespace:MECF.Framework.UI.Client.Ctrlib.Converter"
xmlns:converters="clr-namespace:Aitex.Core.UI.Converters;assembly=MECF.Framework.UI.Core"
xmlns:converters1="clr-namespace:Sicentury.Core.Converters;assembly=Sicentury.Core"
xmlns:cv="clr-namespace:MECF.Framework.UI.Core.Converters;assembly=MECF.Framework.UI.Core"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:extendedControls="clr-namespace:MECF.Framework.UI.Core.ExtendedControls;assembly=MECF.Framework.UI.Core"
xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
xmlns:local="clr-namespace:MECF.Framework.UI.Client.CenterViews.Core.UserControls"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:micro="clr-namespace:Caliburn.Micro"
xmlns:cv="clr-namespace:MECF.Framework.UI.Core.Converters;assembly=MECF.Framework.UI.Core"
d:DesignHeight="450"
d:DesignWidth="2000"
mc:Ignorable="d">

4
MECF.Framework.UI.Client/CenterViews/DataLogs/DataHistory/DataView.xaml
View File

@ -3,6 +3,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:converter="clr-namespace:MECF.Framework.UI.Client.Ctrlib.Converter"
xmlns:cv="clr-namespace:MECF.Framework.UI.Core.Converters;assembly=MECF.Framework.UI.Core"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:forms="clr-namespace:System.Windows.Forms;assembly=System.Windows.Forms"
xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
@ -12,13 +13,12 @@
xmlns:userControls="clr-namespace:MECF.Framework.UI.Client.CenterViews.Core.UserControls"
xmlns:userControls1="clr-namespace:Sicentury.Core.UserControls;assembly=Sicentury.Core"
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
xmlns:cv="clr-namespace:MECF.Framework.UI.Core.Converters;assembly=MECF.Framework.UI.Core"
d:DesignHeight="450"
d:DesignWidth="1500"
mc:Ignorable="d">
<UserControl.Resources>
<cv:BoolVisibilityConverter x:Key="BoolVisibilityConverter"/>
<cv:BoolVisibilityConverter x:Key="BoolVisibilityConverter" />
<cv:BoolReverseConverter x:Key="BoolReverseConverter" />
<system:Boolean x:Key="True">True</system:Boolean>
<system:Boolean x:Key="False">False</system:Boolean>

100
MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistory/ProcessHistoryTestView.xaml Normal file
View File

@ -0,0 +1,100 @@
<UserControl
x:Class="MECF.Framework.UI.Client.CenterViews.DataLogs.ProcessHistory.ProcessHistoryTestView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:forms="clr-namespace:System.Windows.Forms;assembly=System.Windows.Forms"
xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
xmlns:local="clr-namespace:MECF.Framework.UI.Client.CenterViews.DataLogs.ProcessHistory"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:micro="clr-namespace:Caliburn.Micro"
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
d:DesignHeight="800"
d:DesignWidth="1200"
mc:Ignorable="d">
<Grid Margin="10">
<Grid.RowDefinitions>
<RowDefinition Height="50" />
<RowDefinition />
</Grid.RowDefinitions>
<Border
Padding="1"
Width="720"
HorizontalAlignment="Left"
Background="{StaticResource Table_BG_Content}"
BorderBrush="{StaticResource Table_BD}"
BorderThickness="1,1,1,1">
<StackPanel Orientation="Horizontal">
<StackPanel.Resources>
<Style TargetType="xctk:DateTimeUpDown">
<Setter Property="Width" Value="180" />
<Setter Property="Format" Value="Custom" />
<Setter Property="FormatString" Value="yyyy/MM/dd HH:mm:ss" />
</Style>
</StackPanel.Resources>
<StackPanel Margin="15,0" Orientation="Horizontal">
<TextBlock
VerticalAlignment="Center"
FontFamily="Arial"
FontSize="14"
Text="Start Time" />
<WindowsFormsHost
Width="170"
Height="25"
Margin="5,0,15,0"
VerticalAlignment="Center"
FontFamily="Arial"
FontSize="14">
<forms:DateTimePicker
x:Name="wfTimeFrom"
CustomFormat="yyyy/MM/dd HH:mm:ss"
Format="Custom"
Value="2011-8-1" />
</WindowsFormsHost>
<TextBlock
Margin="0"
VerticalAlignment="Center"
FontFamily="Arial"
FontSize="14"
Text="End Time" />
<WindowsFormsHost
Width="170"
Height="25"
Margin="5,0,0,0"
VerticalAlignment="Center"
FontFamily="Arial"
FontSize="14">
<forms:DateTimePicker
x:Name="wfTimeTo"
CustomFormat="yyyy/MM/dd HH:mm:ss"
Format="Custom"
Value="2011-8-1" />
</WindowsFormsHost>
<ComboBox
Width="80"
Height="30"
Margin="20,0"
Text="PM1">
<ComboBoxItem>MP1</ComboBoxItem>
<ComboBoxItem>MP2</ComboBoxItem>
</ComboBox>
<Button
Width="85"
Height="30"
HorizontalAlignment="Right"
Content="Query">
<i:Interaction.Triggers>
<i:EventTrigger EventName="Click">
<micro:ActionMessage MethodName="Query"/>
</i:EventTrigger>
</i:Interaction.Triggers>
</Button>
</StackPanel>
</StackPanel>
</Border>
</Grid>
</UserControl>

28
MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistory/ProcessHistoryTestView.xaml.cs Normal file
View File

@ -0,0 +1,28 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace MECF.Framework.UI.Client.CenterViews.DataLogs.ProcessHistory
{
/// <summary>
/// ProcessHistoryTestView.xaml 的交互逻辑
/// </summary>
public partial class ProcessHistoryTestView : UserControl
{
public ProcessHistoryTestView()
{
InitializeComponent();
}
}
}

13
MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistory/ProcessHistoryTestViewModel.cs Normal file
View File

@ -0,0 +1,13 @@
using MECF.Framework.UI.Client.ClientBase;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace MECF.Framework.UI.Client.CenterViews.DataLogs.ProcessHistory
{
public class ProcessHistoryTestViewModel : UiViewModelBase
{
}
}

0
MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistory/ChartParameter.cs → MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistory123/ChartParameter.cs
View File

0
MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistory/ProcessHistoryProvider.cs → MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistory123/ProcessHistoryProvider.cs
View File

323
MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistory/ProcessHistoryView.xaml → MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistory123/ProcessHistoryView.xaml
View File

@ -1,39 +1,46 @@
<UserControl x:Class="MECF.Framework.UI.Client.CenterViews.DataLogs.ProcessHistory.ProcessHistoryView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
xmlns:sciChart="http://schemas.abtsoftware.co.uk/scichart"
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
xmlns:control="clr-namespace:Aitex.Core.UI.Control;assembly=MECF.Framework.UI.Core"
xmlns:converters="clr-namespace:Aitex.Core.UI.Converters;assembly=MECF.Framework.UI.Core"
xmlns:micro="clr-namespace:Caliburn.Micro"
xmlns:controls="clr-namespace:OpenSEMI.Ctrlib.Controls"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="1800">
<UserControl
x:Class="MECF.Framework.UI.Client.CenterViews.DataLogs.ProcessHistory.ProcessHistoryView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:control="clr-namespace:Aitex.Core.UI.Control;assembly=MECF.Framework.UI.Core"
xmlns:controls="clr-namespace:OpenSEMI.Ctrlib.Controls"
xmlns:converters="clr-namespace:Aitex.Core.UI.Converters;assembly=MECF.Framework.UI.Core"
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:micro="clr-namespace:Caliburn.Micro"
xmlns:sciChart="http://schemas.abtsoftware.co.uk/scichart"
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
d:DesignHeight="450"
d:DesignWidth="1800"
mc:Ignorable="d">
<UserControl.Resources>
<converters:LineColorConverter x:Key="colorConverter"/>
<converters:LineColorConverter x:Key="colorConverter" />
</UserControl.Resources>
<Grid>
<Grid.RowDefinitions>
<RowDefinition ></RowDefinition>
<RowDefinition Height="5" ></RowDefinition>
<RowDefinition Height="200" ></RowDefinition>
<RowDefinition />
<RowDefinition Height="5" />
<RowDefinition Height="200" />
</Grid.RowDefinitions>
<Grid>
<Grid.RowDefinitions>
<RowDefinition ></RowDefinition>
<RowDefinition Height="Auto" ></RowDefinition>
<RowDefinition />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid>
<sciChart:SciChartSurface Name="sciChart" RenderableSeries="{Binding SelectedData}"
sciChart:ThemeManager.Theme="ExpressionLight"
Padding="0,0,0,0"
DebugWhyDoesntSciChartRender="False" BorderBrush="Gray" Focusable="False" IsTabStop="False">
<sciChart:SciChartSurface
Name="sciChart"
Padding="0,0,0,0"
sciChart:ThemeManager.Theme="ExpressionLight"
BorderBrush="Gray"
DebugWhyDoesntSciChartRender="False"
Focusable="False"
IsTabStop="False"
RenderableSeries="{Binding SelectedData}">
<sciChart:SciChartSurface.Resources>
<!-- This is the style for the control that hosts the Axis Label -->
<!-- This is the style for the control that hosts the Axis Label -->
<Style x:Key="CursorModAxisLabelStyle" TargetType="sciChart:AxisLabelControl">
<Setter Property="Background" Value="#AAFF6600" />
<Setter Property="BorderBrush" Value="#FFFF6600" />
@ -46,11 +53,12 @@
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="sciChart:CursorLabelControl">
<Border Background="#AAFF6600"
<Border
Padding="2.5"
Background="#AAFF6600"
BorderBrush="#FFFF6600"
BorderThickness="2"
Opacity="0.7"
Padding="2.5">
Opacity="0.7">
<!--<ItemsControl ItemsSource="{Binding DataContext.SeriesData.SeriesInfo, RelativeSource={RelativeSource TemplatedParent}}">
<ItemsControl.ItemTemplate>
<DataTemplate DataType="s:SeriesInfo">
@ -66,47 +74,57 @@
</sciChart:SciChartSurface.Resources>
<sciChart:SciChartSurface.XAxis>
<sciChart:DateTimeAxis DrawMinorTicks="True"
DrawMinorGridLines="True"
sciChart:CursorModifier.AxisLabelContainerStyle="{StaticResource CursorModAxisLabelStyle}"
Margin="0,0,0,0"
SubDayTextFormatting="MM/dd HH:mm:ss"
TitleFontSize="10"
AutoRange="{Binding AutoRangeX}"
VisibleRange="{Binding TimeRange, Mode=TwoWay}"
TextFormatting="yyyy/MM/dd HH:mm:ss"
Id="DefaultAxisId"/>
<sciChart:DateTimeAxis
Margin="0,0,0,0"
sciChart:CursorModifier.AxisLabelContainerStyle="{StaticResource CursorModAxisLabelStyle}"
AutoRange="{Binding AutoRangeX}"
DrawMinorGridLines="True"
DrawMinorTicks="True"
Id="DefaultAxisId"
SubDayTextFormatting="MM/dd HH:mm:ss"
TextFormatting="yyyy/MM/dd HH:mm:ss"
TitleFontSize="10"
VisibleRange="{Binding TimeRange, Mode=TwoWay}" />
</sciChart:SciChartSurface.XAxis>
<!-- Create a Y Axis -->
<!-- Create a Y Axis -->
<sciChart:SciChartSurface.YAxis>
<sciChart:NumericAxis DrawMinorTicks="True"
DrawMinorGridLines="True"
AxisAlignment="Right"
AutoRange="{Binding AutoRangeY}"
VisibleRange="{Binding ValueRange, Mode=TwoWay}"
Id="DefaultAxisId">
<sciChart:NumericAxis
AutoRange="{Binding AutoRangeY}"
AxisAlignment="Right"
DrawMinorGridLines="True"
DrawMinorTicks="True"
Id="DefaultAxisId"
VisibleRange="{Binding ValueRange, Mode=TwoWay}">
<sciChart:NumericAxis.GrowBy>
<sciChart:DoubleRange Min="0.1" Max="0.1"/>
<sciChart:DoubleRange Max="0.1" Min="0.1" />
</sciChart:NumericAxis.GrowBy>
</sciChart:NumericAxis>
</sciChart:SciChartSurface.YAxis>
<sciChart:SciChartSurface.ChartModifier>
<sciChart:ModifierGroup ExecuteOn="MouseDoubleClick">
<sciChart:RubberBandXyZoomModifier x:Name="rubberBandZoomModifier" IsEnabled="True"
IsXAxisOnly="False"
ZoomExtentsY="False"
IsAnimated="True" ExecuteOn="MouseLeftButton" ReceiveHandledEvents="True" />
<sciChart:RubberBandXyZoomModifier
x:Name="rubberBandZoomModifier"
ExecuteOn="MouseLeftButton"
IsAnimated="True"
IsEnabled="True"
IsXAxisOnly="False"
ReceiveHandledEvents="True"
ZoomExtentsY="False" />
<sciChart:SeriesSelectionModifier ExecuteOn="MouseLeftButton" ReceiveHandledEvents="True">
<sciChart:SeriesSelectionModifier.SelectedSeriesStyle>
<Style TargetType="sciChart:BaseRenderableSeries">
<Setter Property="Stroke" Value="Red"/>
<Setter Property="StrokeThickness" Value="3"/>
<Setter Property="Stroke" Value="Red" />
<Setter Property="StrokeThickness" Value="3" />
<Setter Property="PointMarkerTemplate">
<Setter.Value>
<ControlTemplate>
<sciChart:EllipsePointMarker Width="7" Height="7" Fill="#FF00DC" Stroke="White"/>
<sciChart:EllipsePointMarker
Width="7"
Height="7"
Fill="#FF00DC"
Stroke="White" />
</ControlTemplate>
</Setter.Value>
</Setter>
@ -115,26 +133,48 @@
</sciChart:SeriesSelectionModifier.SelectedSeriesStyle>
</sciChart:SeriesSelectionModifier>
<sciChart:ZoomExtentsModifier x:Name="zoomExtentsModifier" XyDirection="XYDirection" ReceiveHandledEvents="True" ExecuteOn="MouseDoubleClick"/>
<sciChart:ZoomExtentsModifier
x:Name="zoomExtentsModifier"
ExecuteOn="MouseDoubleClick"
ReceiveHandledEvents="True"
XyDirection="XYDirection" />
<sciChart:CursorModifier IsEnabled="True" ShowTooltipOn="MouseOver"
ShowAxisLabels="True" SourceMode="AllSeries"
ShowTooltip="False" />
<sciChart:CursorModifier
IsEnabled="True"
ShowAxisLabels="True"
ShowTooltip="False"
ShowTooltipOn="MouseOver"
SourceMode="AllSeries" />
<!--自由平移-->
<sciChart:ZoomPanModifier x:Name="zoomPanModifier" ReceiveHandledEvents="True" IsEnabled="True" ClipModeX="None" XyDirection="XYDirection" ExecuteOn="MouseRightButton" />
<!-- 自由平移 -->
<sciChart:ZoomPanModifier
x:Name="zoomPanModifier"
ClipModeX="None"
ExecuteOn="MouseRightButton"
IsEnabled="True"
ReceiveHandledEvents="True"
XyDirection="XYDirection" />
<sciChart:LegendModifier ShowLegend="False" Orientation="Horizontal" Margin="10" HorizontalAlignment="Right"
LegendPlacement="Inside" GetLegendDataFor="AllSeries"
ShowVisibilityCheckboxes="False"/>
<sciChart:LegendModifier
Margin="10"
HorizontalAlignment="Right"
GetLegendDataFor="AllSeries"
LegendPlacement="Inside"
Orientation="Horizontal"
ShowLegend="False"
ShowVisibilityCheckboxes="False" />
<sciChart:RolloverModifier x:Name="rolloverModifier"
UseInterpolation="False" FontSize="9" IsEnabled="True"
DrawVerticalLine="False" FontFamily="Arial,SimSun"
SnapsToDevicePixels="False"
ShowAxisLabels="False" />
<sciChart:RolloverModifier
x:Name="rolloverModifier"
DrawVerticalLine="False"
FontFamily="Arial,SimSun"
FontSize="9"
IsEnabled="True"
ShowAxisLabels="False"
SnapsToDevicePixels="False"
UseInterpolation="False" />
<sciChart:MouseWheelZoomModifier x:Name="mouseWheelZoomModifier" XyDirection="XYDirection"/>
<sciChart:MouseWheelZoomModifier x:Name="mouseWheelZoomModifier" XyDirection="XYDirection" />
</sciChart:ModifierGroup>
@ -143,28 +183,51 @@
</Grid>
<Button Content="Select Data" Grid.Row="1" Width="100" Height="30" HorizontalAlignment="Left" Margin="0,5" IsEnabled="{Binding IsPermission}">
<Button
Grid.Row="1"
Width="100"
Height="30"
Margin="0,5"
HorizontalAlignment="Left"
Content="Select Data"
IsEnabled="{Binding IsPermission}">
<i:Interaction.Triggers>
<i:EventTrigger EventName="Click">
<micro:ActionMessage MethodName="SelectData">
</micro:ActionMessage>
<micro:ActionMessage MethodName="SelectData" />
</i:EventTrigger>
</i:Interaction.Triggers>
</Button>
</Grid>
<GridSplitter Grid.Row="1" Background="LightBlue" HorizontalAlignment="Stretch" VerticalAlignment="Center" Height="5" Margin="0">
</GridSplitter>
<DataGrid Grid.Row="2" Margin="5,0,0,0"
AlternationCount="2" ColumnHeaderHeight="30" IsEnabled="{Binding IsPermission}"
ItemsSource="{Binding SelectedData}" AutoGenerateColumns="False"
CanUserAddRows="False" CanUserResizeRows="False" CanUserResizeColumns="True" FontFamily="Arial" FontSize="14">
<GridSplitter
Grid.Row="1"
Height="5"
Margin="0"
HorizontalAlignment="Stretch"
VerticalAlignment="Center"
Background="LightBlue" />
<DataGrid
Grid.Row="2"
Margin="5,0,0,0"
AlternationCount="2"
AutoGenerateColumns="False"
CanUserAddRows="False"
CanUserResizeColumns="True"
CanUserResizeRows="False"
ColumnHeaderHeight="30"
FontFamily="Arial"
FontSize="14"
IsEnabled="{Binding IsPermission}"
ItemsSource="{Binding SelectedData}">
<DataGrid.Columns>
<DataGridTemplateColumn>
<DataGridTemplateColumn.HeaderTemplate >
<DataGridTemplateColumn.HeaderTemplate>
<DataTemplate>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
<StackPanel
HorizontalAlignment="Center"
VerticalAlignment="Center"
Orientation="Horizontal">
<!--<CheckBox Foreground="{DynamicResource FG_White}" VerticalAlignment="Center">
<i:Interaction.Triggers>
<i:EventTrigger EventName="Click">
@ -173,13 +236,16 @@
</i:EventTrigger>
</i:Interaction.Triggers>
</CheckBox>-->
<TextBlock Text="Visible" VerticalAlignment="Bottom" Margin="3,0,0,0"/>
<TextBlock
Margin="3,0,0,0"
VerticalAlignment="Bottom"
Text="Visible" />
</StackPanel>
</DataTemplate>
</DataGridTemplateColumn.HeaderTemplate>
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<CheckBox IsChecked="{Binding IsVisible, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" >
<CheckBox IsChecked="{Binding IsVisible, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
<!--<i:Interaction.Triggers>
<i:EventTrigger EventName="Click">
<cal:ActionMessage MethodName="VisibleCheck">
@ -191,28 +257,42 @@
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<DataGridTemplateColumn Header="Source" MinWidth="200">
<DataGridTemplateColumn MinWidth="200" Header="Source">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<TextBlock Text="{Binding DataSource}" Margin="5,0" Foreground="{DynamicResource FG_Black}" HorizontalAlignment="Left" VerticalAlignment="Center" />
<TextBlock
Margin="5,0"
HorizontalAlignment="Left"
VerticalAlignment="Center"
Foreground="{DynamicResource FG_Black}"
Text="{Binding DataSource}" />
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<DataGridTemplateColumn Header="Name" MinWidth="150">
<DataGridTemplateColumn MinWidth="150" Header="Name">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<TextBlock Text="{Binding DataName}" Margin="5,0" Foreground="{DynamicResource FG_Black}" HorizontalAlignment="Left" VerticalAlignment="Center" />
<TextBlock
Margin="5,0"
HorizontalAlignment="Left"
VerticalAlignment="Center"
Foreground="{DynamicResource FG_Black}"
Text="{Binding DataName}" />
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<DataGridTemplateColumn Header="Color" MinWidth="100" >
<DataGridTemplateColumn MinWidth="100" Header="Color">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<Button Style="{DynamicResource Color_Button}" HorizontalAlignment="Stretch" Background="{Binding Stroke, Converter={StaticResource colorConverter}}" Width="50">
<Button
Width="50"
HorizontalAlignment="Stretch"
Background="{Binding Stroke, Converter={StaticResource colorConverter}}"
Style="{DynamicResource Color_Button}">
<i:Interaction.Triggers>
<i:EventTrigger EventName="Click">
<micro:ActionMessage MethodName="SelectColor">
<micro:Parameter Value="{Binding}" ></micro:Parameter>
<micro:Parameter Value="{Binding}" />
</micro:ActionMessage>
</i:EventTrigger>
</i:Interaction.Triggers>
@ -220,10 +300,17 @@
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<DataGridTemplateColumn Header="Factor" MinWidth="100">
<DataGridTemplateColumn MinWidth="100" Header="Factor">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<controls:TextBoxEx AllowBackgroundChange="False" Text="{Binding DataFactor, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Width="80" Margin="5,0" Foreground="{DynamicResource FG_Black}" HorizontalAlignment="Left" VerticalAlignment="Center" />
<controls:TextBoxEx
Width="80"
Margin="5,0"
HorizontalAlignment="Left"
VerticalAlignment="Center"
AllowBackgroundChange="False"
Foreground="{DynamicResource FG_Black}"
Text="{Binding DataFactor, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
<!--<i:Interaction.Triggers>
<i:EventTrigger EventName="LostFocus">
<cal:ActionMessage MethodName="FactorLostFocus">
@ -240,10 +327,17 @@
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<DataGridTemplateColumn Header="Offset" MinWidth="100">
<DataGridTemplateColumn MinWidth="100" Header="Offset">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<controls:TextBoxEx AllowBackgroundChange="False" Text="{Binding DataOffset, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Width="80" Margin="5,0" Foreground="{DynamicResource FG_Black}" HorizontalAlignment="Left" VerticalAlignment="Center" >
<controls:TextBoxEx
Width="80"
Margin="5,0"
HorizontalAlignment="Left"
VerticalAlignment="Center"
AllowBackgroundChange="False"
Foreground="{DynamicResource FG_Black}"
Text="{Binding DataOffset, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
<!--<i:Interaction.Triggers>
<i:EventTrigger EventName="LostFocus">
<cal:ActionMessage MethodName="OffsetLostFocus">
@ -261,10 +355,17 @@
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<DataGridTemplateColumn Header="Width" MinWidth="60">
<DataGridTemplateColumn MinWidth="60" Header="Width">
<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
Width="80"
Margin="5,0"
HorizontalAlignment="Left"
VerticalAlignment="Center"
AllowBackgroundChange="False"
Foreground="{DynamicResource FG_Black}"
Text="{Binding LineThickness, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
<!--<i:Interaction.Triggers>
<i:EventTrigger EventName="LostFocus">
<cal:ActionMessage MethodName="WidthLostFocus">
@ -283,13 +384,15 @@
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<DataGridTemplateColumn Width="120">
<DataGridTemplateColumn.HeaderTemplate >
<DataGridTemplateColumn.HeaderTemplate>
<DataTemplate>
<Button Content="Export All" Width="85" Height="25">
<Button
Width="85"
Height="25"
Content="Export All">
<i:Interaction.Triggers>
<i:EventTrigger EventName="Click">
<micro:ActionMessage MethodName="ExportAll">
</micro:ActionMessage>
<micro:ActionMessage MethodName="ExportAll" />
</i:EventTrigger>
</i:Interaction.Triggers>
</Button>
@ -297,11 +400,14 @@
</DataGridTemplateColumn.HeaderTemplate>
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<Button Content="Export" Width="65" Height="25">
<Button
Width="65"
Height="25"
Content="Export">
<i:Interaction.Triggers>
<i:EventTrigger EventName="Click">
<micro:ActionMessage MethodName="Export">
<micro:Parameter Value="{Binding }"/>
<micro:Parameter Value="{Binding}" />
</micro:ActionMessage>
</i:EventTrigger>
</i:Interaction.Triggers>
@ -310,13 +416,15 @@
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<DataGridTemplateColumn Width="120">
<DataGridTemplateColumn.HeaderTemplate >
<DataGridTemplateColumn.HeaderTemplate>
<DataTemplate>
<Button Content="Delete All" Width="85" Height="25">
<Button
Width="85"
Height="25"
Content="Delete All">
<i:Interaction.Triggers>
<i:EventTrigger EventName="Click">
<micro:ActionMessage MethodName="DeleteAll">
</micro:ActionMessage>
<micro:ActionMessage MethodName="DeleteAll" />
</i:EventTrigger>
</i:Interaction.Triggers>
</Button>
@ -324,11 +432,14 @@
</DataGridTemplateColumn.HeaderTemplate>
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<Button Content="Delete" Width="65" Height="25">
<Button
Width="65"
Height="25"
Content="Delete">
<i:Interaction.Triggers>
<i:EventTrigger EventName="Click">
<micro:ActionMessage MethodName="Delete">
<micro:Parameter Value="{Binding }"/>
<micro:Parameter Value="{Binding}" />
</micro:ActionMessage>
</i:EventTrigger>
</i:Interaction.Triggers>

0
MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistory/ProcessHistoryView.xaml.cs → MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistory123/ProcessHistoryView.xaml.cs
View File

0
MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistory/ProcessHistoryViewModel.cs → MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistory123/ProcessHistoryViewModel.cs
View File

0
MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistory/SelectDataView.xaml → MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistory123/SelectDataView.xaml
View File

0
MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistory/SelectDataView.xaml.cs → MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistory123/SelectDataView.xaml.cs
View File

0
MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistory/SelectDataViewModel.cs → MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistory123/SelectDataViewModel.cs
View File

29
MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistorySqlHelp.cs Normal file
View File

@ -0,0 +1,29 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Xml.XPath;
namespace MECF.Framework.UI.Client.CenterViews.DataLogs.ProcessHistory
{
public class ProcessHistorySqlHelp
{
public void QueryRecipeData()
{
}
}
public class RecipeProcessHistoryData
{
public string PmModel { get; set; }
public string XPath { get; set; }
public string Name { get; set; }
public string Status { get; set; }
public string WaferGuid { get; set; }
public string BeginTime { get; set; }
public string EndTime { get; set; }
}
}

25
MECF.Framework.UI.Client/MECF.Framework.UI.Client.csproj
View File

@ -216,6 +216,11 @@
<DependentUpon>DataConfigView.xaml</DependentUpon>
</Compile>
<Compile Include="CenterViews\Configs\DataConfig\DataConfigViewModel.cs" />
<Compile Include="CenterViews\DataLogs\ProcessHistory\ProcessHistoryTestView.xaml.cs">
<DependentUpon>ProcessHistoryTestView.xaml</DependentUpon>
</Compile>
<Compile Include="CenterViews\DataLogs\ProcessHistory\ProcessHistoryTestViewModel.cs" />
<Compile Include="CenterViews\DataLogs\ProcessHistorySqlHelp.cs" />
<Compile Include="CenterViews\Diagnosis\EventGeneratorView.xaml.cs">
<DependentUpon>EventGeneratorView.xaml</DependentUpon>
</Compile>
@ -406,16 +411,16 @@
<DependentUpon>EventView.xaml</DependentUpon>
</Compile>
<Compile Include="CenterViews\DataLogs\Event\EventViewModel.cs" />
<Compile Include="CenterViews\DataLogs\ProcessHistory\ChartParameter.cs" />
<Compile Include="CenterViews\DataLogs\ProcessHistory\ProcessHistoryProvider.cs" />
<Compile Include="CenterViews\DataLogs\ProcessHistory\ProcessHistoryView.xaml.cs">
<Compile Include="CenterViews\DataLogs\ProcessHistory123\ChartParameter.cs" />
<Compile Include="CenterViews\DataLogs\ProcessHistory123\ProcessHistoryProvider.cs" />
<Compile Include="CenterViews\DataLogs\ProcessHistory123\ProcessHistoryView.xaml.cs">
<DependentUpon>ProcessHistoryView.xaml</DependentUpon>
</Compile>
<Compile Include="CenterViews\DataLogs\ProcessHistory\ProcessHistoryViewModel.cs" />
<Compile Include="CenterViews\DataLogs\ProcessHistory\SelectDataView.xaml.cs">
<Compile Include="CenterViews\DataLogs\ProcessHistory123\ProcessHistoryViewModel.cs" />
<Compile Include="CenterViews\DataLogs\ProcessHistory123\SelectDataView.xaml.cs">
<DependentUpon>SelectDataView.xaml</DependentUpon>
</Compile>
<Compile Include="CenterViews\DataLogs\ProcessHistory\SelectDataViewModel.cs" />
<Compile Include="CenterViews\DataLogs\ProcessHistory123\SelectDataViewModel.cs" />
<Compile Include="CenterViews\DataLogs\Statistics\StatisticsView.xaml.cs">
<DependentUpon>StatisticsView.xaml</DependentUpon>
</Compile>
@ -890,6 +895,10 @@
<Content Include="DataGridTransform\ExtendedGrid\Images\sweep_broom_brush_clear.png" />
<Content Include="DataGridTransform\ExtendedGrid\Images\visualstudio.ico" />
<Content Include="DataGridTransform\ExtendedGrid\Images\vsi.ico" />
<Page Include="CenterViews\DataLogs\ProcessHistory\ProcessHistoryTestView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="CenterViews\Diagnosis\EventGeneratorView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
@ -1146,11 +1155,11 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="CenterViews\DataLogs\ProcessHistory\ProcessHistoryView.xaml">
<Page Include="CenterViews\DataLogs\ProcessHistory123\ProcessHistoryView.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="CenterViews\DataLogs\ProcessHistory\SelectDataView.xaml">
<Page Include="CenterViews\DataLogs\ProcessHistory123\SelectDataView.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>

13
Sicentury.Core/UserControls/ParameterNodeTreeViewControl.xaml
View File

@ -50,9 +50,10 @@
</Grid.RowDefinitions>
<!-- Group management Group list -->
<Grid Grid.Row="1" Margin="0,5,0,0"
Visibility="{Binding RelativeSource={RelativeSource AncestorType=UserControl, Mode=FindAncestor}, Path=VisibilityTopTools}"
>
<Grid
Grid.Row="1"
Margin="0,5,0,0"
Visibility="{Binding RelativeSource={RelativeSource AncestorType=UserControl, Mode=FindAncestor}, Path=VisibilityTopTools}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="70" />
<ColumnDefinition />
@ -201,11 +202,11 @@
Orientation=" Horizontal">
<Button
x:Name="btnExcludeNode"
Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=UserControl}, Path=VisibilityExcludeNodesButton}"
Click="BtnExcludeNode_OnClick"
ToolTip="Edit Exclude Nodes List">
ToolTip="Edit Exclude Nodes List"
Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=UserControl}, Path=VisibilityExcludeNodesButton}">
<Button.Content>
<Path Data="M117.65 187.5H82.35L76.3 157.2125L50.6 174.3375L25.65 149.4L42.775 123.7L12.5 117.65V82.35L42.7875 76.3L25.6625 50.6L50.6 25.65L76.3 42.775L82.35 12.5H108.3875A56.575 56.575 0 0 0 96.925 25.0625H92.65L89.05 43.075A55.9125 55.9125 0 0 0 88.2125 47.25L86.7625 54.5375L77.2125 58.4875L52.2125 41.8125L41.8125 52.2L58.5 77.2125L54.55 86.7625L25.075 92.65V107.35L54.55 113.2375L58.5 122.7875L41.825 147.7875L52.2125 158.1875L77.2125 141.5L86.7625 145.45L92.65 174.925H107.35L113.2375 145.45L122.7875 141.5L147.7875 158.175L158.1875 147.7875L141.5125 122.775L145.4625 113.225L152.7375 111.775C154.15 111.55 155.55 111.275 156.925 110.9375L174.9375 107.3375V103.0625C179.6875000000001 99.8875 183.9250000000001 96.025 187.5000000000001 91.6V117.65L157.225 123.7L174.3500000000001 149.4L149.4 174.35L123.7000000000001 157.225L117.65 187.5zM100 125A25 25 0 0 0 123.4375 108.725A55.75 55.75 0 0 1 112.1875 102.8125A12.5 12.5 0 1 1 97.1875 87.8125A55.75 55.75 0 0 1 91.275 76.5625A25 25 0 0 0 100 125zM116 90.0625A43.75 43.75 0 1 0 171.5 22.4375A43.75 43.75 0 0 0 116 90.0625zM112.5 62.5V50H175V62.5H112.5z" >
<Path Data="M117.65 187.5H82.35L76.3 157.2125L50.6 174.3375L25.65 149.4L42.775 123.7L12.5 117.65V82.35L42.7875 76.3L25.6625 50.6L50.6 25.65L76.3 42.775L82.35 12.5H108.3875A56.575 56.575 0 0 0 96.925 25.0625H92.65L89.05 43.075A55.9125 55.9125 0 0 0 88.2125 47.25L86.7625 54.5375L77.2125 58.4875L52.2125 41.8125L41.8125 52.2L58.5 77.2125L54.55 86.7625L25.075 92.65V107.35L54.55 113.2375L58.5 122.7875L41.825 147.7875L52.2125 158.1875L77.2125 141.5L86.7625 145.45L92.65 174.925H107.35L113.2375 145.45L122.7875 141.5L147.7875 158.175L158.1875 147.7875L141.5125 122.775L145.4625 113.225L152.7375 111.775C154.15 111.55 155.55 111.275 156.925 110.9375L174.9375 107.3375V103.0625C179.6875000000001 99.8875 183.9250000000001 96.025 187.5000000000001 91.6V117.65L157.225 123.7L174.3500000000001 149.4L149.4 174.35L123.7000000000001 157.225L117.65 187.5zM100 125A25 25 0 0 0 123.4375 108.725A55.75 55.75 0 0 1 112.1875 102.8125A12.5 12.5 0 1 1 97.1875 87.8125A55.75 55.75 0 0 1 91.275 76.5625A25 25 0 0 0 100 125zM116 90.0625A43.75 43.75 0 1 0 171.5 22.4375A43.75 43.75 0 0 0 116 90.0625zM112.5 62.5V50H175V62.5H112.5z">
<Path.LayoutTransform>
<TransformGroup>
<ScaleTransform ScaleY="-1" />