Sic-Software/SIC-12
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改Routine

Browse Source 
修改PC9相关仿真
This commit is contained in:
hanqiangqiang 2026-06-10 13:11:53 +08:00
parent 9f9c717299
commit 9588fe0121
19 changed files with 219 additions and 242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
App/Modules/SicModules/PMs/PMModuleDevice.cs
View File

@ -522,7 +522,7 @@ namespace SicModules.PMs
"Mfc31", "Mfc33", "Mfc34", "Mfc35", "Mfc36", "Mfc37", "Mfc38","Mfc31", "Mfc31", "Mfc33", "Mfc34", "Mfc35", "Mfc36", "Mfc37", "Mfc38","Mfc31",
"Mfc40", "Mfc41", "Mfc42", "Mfc43", "Mfc44", "Mfc45"}; "Mfc40", "Mfc41", "Mfc42", "Mfc43", "Mfc44", "Mfc45"};
private List<int> _lstPcList = new List<int> { 1, 2, 3, 4, 5, 6, 7 }; private List<int> _lstPcList = new List<int> { 1, 2, 3, 4, 5, 6, 7, 8, 9 };
public List<IoMFC> _mfcList public List<IoMFC> _mfcList
{ {
@ -1247,7 +1247,7 @@ namespace SicModules.PMs
} }
else if (mGroupName == MfcGroupName.All) else if (mGroupName == MfcGroupName.All)
{ {
lst = new List<int>() { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 19, 20, 22, 23, 25, 26, 27, 28, 29, 31, 33, 35, 36, 37, 38, 40, 41, 42, 43, 44, 45 }; lst = new List<int>() { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 22, 23, 25, 26, 27, 28, 29, 31, 33, 35, 36, 37, 38, 40, 41, 42, 43, 44, 45 };
} }
return lst; return lst;

4
App/Modules/SicModules/PMs/Routines/PMCleanRoutine.cs
View File

@ -180,10 +180,6 @@ namespace SicModules.PMs.Routines
private IoThrottleValve2 _IoThrottle; private IoThrottleValve2 _IoThrottle;
private IoInterLock _pmIoInterLock; private IoInterLock _pmIoInterLock;
List<int> _lstPcList = new List<int> { 1, 2, 3, 4, 5, 6, 7 };
private int _rotationCheckSpeed = 0; //设置旋转速度为0后检查是否转速低于此数值 private int _rotationCheckSpeed = 0; //设置旋转速度为0后检查是否转速低于此数值
private int _rotationCloseTimeout = 20; //旋转停止超时 private int _rotationCloseTimeout = 20; //旋转停止超时
private int _heatTimeOut = 5; //Heat关闭等待Di反馈超时时间 private int _heatTimeOut = 5; //Heat关闭等待Di反馈超时时间

3
App/Modules/SicModules/PMs/Routines/PMLeakCheckRoutine.cs
View File

@ -198,9 +198,6 @@ namespace SicModules.PMs.Routines
private IoThrottleValve2 _IoThrottle; private IoThrottleValve2 _IoThrottle;
private IoInterLock _pmIoInterLock; private IoInterLock _pmIoInterLock;
List<int> _lstPcList = new List<int> { 1, 2, 3, 4, 5, 6, 7 };
private int _rotationCheckSpeed = 0; //设置旋转速度为0后检查是否转速低于此数值 private int _rotationCheckSpeed = 0; //设置旋转速度为0后检查是否转速低于此数值
private int _rotationCloseTimeout; //旋转停止超时 private int _rotationCloseTimeout; //旋转停止超时
private int _heatTimeOut = 5; //Heat关闭等待Di反馈超时时间 private int _heatTimeOut = 5; //Heat关闭等待Di反馈超时时间

2
App/Modules/SicModules/PMs/Routines/PMProcessAbortRoutine.cs
View File

@ -47,8 +47,6 @@ namespace SicModules.PMs.Routines
private int _mfc1to16RampTime = 30; private int _mfc1to16RampTime = 30;
private int _mfc2to45RampTime = 30; private int _mfc2to45RampTime = 30;
List<int> _lstPcList = new List<int> { 1, 2, 3, 4, 5, 6, 7 };
private int _IoValueOpenCloseTimeout = 10; private int _IoValueOpenCloseTimeout = 10;
private int _routineTimeOut = 10; private int _routineTimeOut = 10;

2
App/Modules/SicModules/PMs/Routines/PMPumpRoutine.cs
View File

@ -106,8 +106,6 @@ namespace SicModules.PMs.Routines
private IoThrottleValve2 _IoThrottle; private IoThrottleValve2 _IoThrottle;
private IoInterLock _pmIoInterLock; private IoInterLock _pmIoInterLock;
List<int> _lstPcList = new List<int> { 1, 2, 3, 4, 5, 6, 7 };
private int _rotationCheckSpeed = 0; //设置旋转速度为0后检查是否转速低于此数值 private int _rotationCheckSpeed = 0; //设置旋转速度为0后检查是否转速低于此数值
private int _rotationCloseTimeout; //旋转停止超时 private int _rotationCloseTimeout; //旋转停止超时
private int _IoValueOpenCloseTimeout = 10; //开关超时时间 private int _IoValueOpenCloseTimeout = 10; //开关超时时间

2
App/Modules/SicModules/PMs/Routines/PMPurgeRoutine.cs
View File

@ -202,8 +202,6 @@ namespace SicModules.PMs.Routines
private IoInterLock _pmIoInterLock; private IoInterLock _pmIoInterLock;
List<int> _lstPcList = new List<int> { 1, 2, 3, 4, 5, 6, 7 };
private int _rotationCheckSpeed = 0; //设置旋转速度为0后检查是否转速低于此数值 private int _rotationCheckSpeed = 0; //设置旋转速度为0后检查是否转速低于此数值
private int _rotationCloseTimeout; //旋转停止超时 private int _rotationCloseTimeout; //旋转停止超时
private int _heatTimeOut = 5; //Heat关闭等待Di反馈超时时间 private int _heatTimeOut = 5; //Heat关闭等待Di反馈超时时间

2
App/Modules/SicModules/PMs/Routines/PMToAtmIdleRoutine.cs
View File

@ -110,8 +110,6 @@ namespace SicModules.PMs.Routines
private IoThrottleValve2 _IoThrottle; private IoThrottleValve2 _IoThrottle;
private IoInterLock _pmIoInterLock; private IoInterLock _pmIoInterLock;
List<int> _lstPcList = new List<int> { 1, 2, 3, 4, 5, 6, 7 };
private int _rotationCheckSpeed = 0; //设置旋转速度为0后检查是否转速低于此数值 private int _rotationCheckSpeed = 0; //设置旋转速度为0后检查是否转速低于此数值
private int _rotationCloseTimeout; //旋转停止超时 private int _rotationCloseTimeout; //旋转停止超时

2
App/Modules/SicModules/PMs/Routines/PMToIsolationRoutine.cs
View File

@ -91,8 +91,6 @@ namespace SicModules.PMs.Routines
private PMModule _pm1Module; private PMModule _pm1Module;
private IoThrottleValve2 _IoThrottle; private IoThrottleValve2 _IoThrottle;
private List<int> _lstPcList = new List<int> { 1, 2, 3, 4, 5, 6, 7 };
private int _rotationCloseTimeout = 20; //旋转停止超时 private int _rotationCloseTimeout = 20; //旋转停止超时
private int _IoValueOpenCloseTimeout = 10; //开关超时时间 private int _IoValueOpenCloseTimeout = 10; //开关超时时间
private int _heatTimeOut = 5; //Heat关闭等待Di反馈超时时间 private int _heatTimeOut = 5; //Heat关闭等待Di反馈超时时间

1
App/Modules/SicModules/PMs/Routines/PMToProcessIdleRoutine.cs
View File

@ -165,7 +165,6 @@ namespace SicModules.PMs.Routines
private IoThrottleValve2 _IoThrottle; private IoThrottleValve2 _IoThrottle;
List<int> _lstPcList = new List<int> { 1, 2, 3, 4, 5, 6, 7 };
private int _rotationCheckSpeed = 0; //设置旋转速度为0后检查是否转速低于此数值 private int _rotationCheckSpeed = 0; //设置旋转速度为0后检查是否转速低于此数值
private int _rotationCloseTimeout; //旋转停止超时 private int _rotationCloseTimeout; //旋转停止超时

2
App/Modules/SicModules/PMs/Routines/PMVacIdleRoutine.cs
View File

@ -108,8 +108,6 @@ namespace SicModules.PMs.Routines
private IoThrottleValve2 _IoThrottle; private IoThrottleValve2 _IoThrottle;
private IoInterLock _pmIoInterLock; private IoInterLock _pmIoInterLock;
List<int> _lstPcList = new List<int> { 1, 2, 3, 4, 5, 6, 7 };
private int _rotationCheckSpeed = 0; //设置旋转速度为0后检查是否转速低于此数值 private int _rotationCheckSpeed = 0; //设置旋转速度为0后检查是否转速低于此数值
private int _rotationCloseTimeout; //旋转停止超时 private int _rotationCloseTimeout; //旋转停止超时
private int _IoValueOpenCloseTimeout = 10; //开关超时时间 private int _IoValueOpenCloseTimeout = 10; //开关超时时间

2
App/Modules/SicModules/PMs/Routines/PMVentRoutine.cs
View File

@ -110,7 +110,7 @@ namespace SicModules.PMs.Routines
private IoThrottleValve2 _IoThrottle; private IoThrottleValve2 _IoThrottle;
private IoInterLock _pmIoInterLock; private IoInterLock _pmIoInterLock;
List<int> _lstPcList = new List<int> { 1, 2, 3, 4, 5, 6, 7 };
private int _rotationCheckSpeed = 0; //设置旋转速度为0后检查是否转速低于此数值 private int _rotationCheckSpeed = 0; //设置旋转速度为0后检查是否转速低于此数值
private int _rotationCloseTimeout; //旋转停止超时 private int _rotationCloseTimeout; //旋转停止超时

2
App/SicRT/Properties/AssemblyInfo.cs
View File

@ -51,7 +51,7 @@ using System.Windows;
// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号 // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
// 方法是按如下所示使用“*”: : // 方法是按如下所示使用“*”: :
[assembly: AssemblyVersion("1.1.6.60606")] [assembly: AssemblyVersion("1.1.7.60610")]
[assembly: AssemblyInformationalVersion("氮化硅12寸（无EFEM）")] [assembly: AssemblyInformationalVersion("氮化硅12寸（无EFEM）")]

2
App/SicSimulator/Instances/SimulatorSystem.cs
View File

@ -445,6 +445,8 @@ namespace SicSimulator.Instances
new Tuple<string, string>("AI_PressCtrl5","AO_PressCtrl5"), new Tuple<string, string>("AI_PressCtrl5","AO_PressCtrl5"),
new Tuple<string, string>("AI_PressCtrl6","AO_PressCtrl6"), new Tuple<string, string>("AI_PressCtrl6","AO_PressCtrl6"),
new Tuple<string, string>("AI_PressCtrl7","AO_PressCtrl7"), new Tuple<string, string>("AI_PressCtrl7","AO_PressCtrl7"),
new Tuple<string, string>("AI_PressCtrl8","AO_PressCtrl8"),
new Tuple<string, string>("AI_PressCtrl9","AO_PressCtrl9"),

2
App/SicUI/Properties/AssemblyInfo.cs
View File

@ -55,6 +55,6 @@ using System.Windows;
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.1.6.60606")] [assembly: AssemblyVersion("1.1.7.60610")]
[assembly: AssemblyInformationalVersion("氮化硅12寸（无EFEM）")] [assembly: AssemblyInformationalVersion("氮化硅12寸（无EFEM）")]

55
Framework/MECF.Framework.UI.Client/CenterViews/DataLogs/Event/EventView.xaml
View File

@ -2,30 +2,29 @@
x:Class="MECF.Framework.UI.Client.CenterViews.DataLogs.Event.EventView" x:Class="MECF.Framework.UI.Client.CenterViews.DataLogs.Event.EventView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:cv="clr-namespace:MECF.Framework.UI.Core.Converters;assembly=MECF.Framework.UI.Core"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:forms="clr-namespace:System.Windows.Forms;assembly=System.Windows.Forms" xmlns:forms="clr-namespace:System.Windows.Forms;assembly=System.Windows.Forms"
xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity" xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
xmlns:lex="http://wpflocalizeextension.codeplex.com"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:micro="clr-namespace:Caliburn.Micro" xmlns:micro="clr-namespace:Caliburn.Micro"
xmlns:toolkit="http://schemas.xceed.com/wpf/xaml/toolkit" xmlns:toolkit="http://schemas.xceed.com/wpf/xaml/toolkit"
xmlns:userControls1="clr-namespace:Sicentury.Core.UserControls;assembly=Sicentury.Core" xmlns:userControls1="clr-namespace:Sicentury.Core.UserControls;assembly=Sicentury.Core"
xmlns:cv="clr-namespace:MECF.Framework.UI.Core.Converters;assembly=MECF.Framework.UI.Core"
xmlns:lex="http://wpflocalizeextension.codeplex.com"
Name="uc" Name="uc"
d:DesignHeight="800" d:DesignHeight="800"
d:DesignWidth="1400" d:DesignWidth="1400"
mc:Ignorable="d"
lex:LocalizeDictionary.DesignCulture="en" lex:LocalizeDictionary.DesignCulture="en"
lex:ResxLocalizationProvider.DefaultAssembly="Sicentury.Localization" lex:ResxLocalizationProvider.DefaultAssembly="Sicentury.Localization"
lex:ResxLocalizationProvider.DefaultDictionary="lang_common"> lex:ResxLocalizationProvider.DefaultDictionary="lang_common"
mc:Ignorable="d">
<UserControl.Resources> <UserControl.Resources>
<cv:BoolReverseConverter x:Key="boolReverseConverter" /> <cv:BoolReverseConverter x:Key="boolReverseConverter" />
<cv:BoolVisibilityConverter x:Key="BoolVisibilityConverter" /> <cv:BoolVisibilityConverter x:Key="BoolVisibilityConverter" />
<Style x:Key="{x:Type userControls1:CirclePointRingLoading}" <Style x:Key="{x:Type userControls1:CirclePointRingLoading}" TargetType="{x:Type userControls1:CirclePointRingLoading}">
TargetType="{x:Type userControls1:CirclePointRingLoading}">
<Setter Property="Foreground" Value="#FFFFFFFF" /> <Setter Property="Foreground" Value="#FFFFFFFF" />
<Setter Property="UIElement.IsHitTestVisible" Value="False" /> <Setter Property="UIElement.IsHitTestVisible" Value="False" />
<Setter Property="HorizontalAlignment" Value="Center" /> <Setter Property="HorizontalAlignment" Value="Center" />
@ -444,9 +443,7 @@
<!-- Query Condition Card --> <!-- Query Condition Card -->
<GroupBox BorderThickness="1"> <GroupBox BorderThickness="1">
<GroupBox.Header> <GroupBox.Header>
<TextBlock <TextBlock lex:ResxLocalizationProvider.DefaultDictionary="lang_datalogviews" Text="{lex:Loc ID_TXT_QueryCondition}" />
lex:ResxLocalizationProvider.DefaultDictionary="lang_datalogviews"
Text="{lex:Loc ID_TXT_QueryCondition}" />
</GroupBox.Header> </GroupBox.Header>
<StackPanel Margin="0,5"> <StackPanel Margin="0,5">
<StackPanel.Resources> <StackPanel.Resources>
@ -507,9 +504,7 @@
<!-- Query Condition Card --> <!-- Query Condition Card -->
<GroupBox> <GroupBox>
<GroupBox.Header> <GroupBox.Header>
<TextBlock <TextBlock lex:ResxLocalizationProvider.DefaultDictionary="lang_datalogviews" Text="{lex:Loc ID_TXT_QueryOption}" />
lex:ResxLocalizationProvider.DefaultDictionary="lang_datalogviews"
Text="{lex:Loc ID_TXT_QueryOption}" />
</GroupBox.Header> </GroupBox.Header>
<UniformGrid Margin="0,5" Columns="2"> <UniformGrid Margin="0,5" Columns="2">
<CheckBox <CheckBox
@ -531,9 +526,7 @@
<!-- Extra Condition --> <!-- Extra Condition -->
<GroupBox> <GroupBox>
<GroupBox.Header> <GroupBox.Header>
<TextBlock <TextBlock lex:ResxLocalizationProvider.DefaultDictionary="lang_datalogviews" Text="{lex:Loc ID_TXT_ExtraCondition}" />
lex:ResxLocalizationProvider.DefaultDictionary="lang_datalogviews"
Text="{lex:Loc ID_TXT_ExtraCondition}" />
</GroupBox.Header> </GroupBox.Header>
<StackPanel Margin="0,5" Orientation="Horizontal"> <StackPanel Margin="0,5" Orientation="Horizontal">
<TextBlock <TextBlock
@ -590,8 +583,8 @@
Grid.Column="1" Grid.Column="1"
Margin="10,0,0,0"> Margin="10,0,0,0">
<TextBlock <TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_datalogviews"
VerticalAlignment="Center" VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_datalogviews"
FontSize="9" FontSize="9"
Text="{lex:Loc ID_TXT_Loading}" Text="{lex:Loc ID_TXT_Loading}"
Visibility="{Binding IsLoading, Converter={StaticResource BoolVisibilityConverter}}" /> Visibility="{Binding IsLoading, Converter={StaticResource BoolVisibilityConverter}}" />
@ -606,12 +599,12 @@
</Grid> </Grid>
<Button <Button
lex:ResxLocalizationProvider.DefaultDictionary="lang_datalogviews"
Grid.Row="1" Grid.Row="1"
Grid.Column="0" Grid.Column="0"
Width="100" Width="100"
Height="30" Height="30"
Margin="0,10,0,0" Margin="0,10,0,0"
lex:ResxLocalizationProvider.DefaultDictionary="lang_datalogviews"
Content="{lex:Loc ID_BTN_Export_Content}" Content="{lex:Loc ID_BTN_Export_Content}"
FontFamily="Arial"> FontFamily="Arial">
<i:Interaction.Triggers> <i:Interaction.Triggers>
@ -646,9 +639,7 @@
<!-- Filter Condition Card --> <!-- Filter Condition Card -->
<GroupBox> <GroupBox>
<GroupBox.Header> <GroupBox.Header>
<TextBlock <TextBlock lex:ResxLocalizationProvider.DefaultDictionary="lang_datalogviews" Text="{lex:Loc ID_TXT_FilterCondition}" />
lex:ResxLocalizationProvider.DefaultDictionary="lang_datalogviews"
Text="{lex:Loc ID_TXT_FilterCondition}" />
</GroupBox.Header> </GroupBox.Header>
<StackPanel Margin="0,5"> <StackPanel Margin="0,5">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
@ -675,8 +666,7 @@
ToolTip="{Binding ElementName=tbLoadPort1, Path=SelectedValue}"> ToolTip="{Binding ElementName=tbLoadPort1, Path=SelectedValue}">
<i:Interaction.Triggers> <i:Interaction.Triggers>
<i:EventTrigger EventName="ItemSelectionChanged"> <i:EventTrigger EventName="ItemSelectionChanged">
<i:InvokeCommandAction Command="{Binding tbLoadPort1SelectionChangedCommand}" <i:InvokeCommandAction Command="{Binding tbLoadPort1SelectionChangedCommand}" CommandParameter="{Binding ElementName=uc, Path=tbLoadPort1ToolTipValueData}" />
CommandParameter="{Binding ElementName=uc, Path=tbLoadPort1ToolTipValueData}" />
</i:EventTrigger> </i:EventTrigger>
</i:Interaction.Triggers> </i:Interaction.Triggers>
</toolkit:CheckComboBox> </toolkit:CheckComboBox>
@ -729,8 +719,8 @@
<StackPanel Grid.Row="0" Orientation="Horizontal"> <StackPanel Grid.Row="0" Orientation="Horizontal">
<TextBlock <TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_datalogviews"
VerticalAlignment="Center" VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_datalogviews"
FontSize="16" FontSize="16"
Text="{lex:Loc ID_TXT_Show}" /> Text="{lex:Loc ID_TXT_Show}" />
@ -744,16 +734,16 @@
SelectedItem="{Binding SelectedPaginationCapacity}" /> SelectedItem="{Binding SelectedPaginationCapacity}" />
<TextBlock <TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_datalogviews"
Margin="5,0,0,0" Margin="5,0,0,0"
VerticalAlignment="Center" VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_datalogviews"
FontSize="16" FontSize="16"
Text="{lex:Loc ID_TXT_ItemsPerPage}" /> Text="{lex:Loc ID_TXT_ItemsPerPage}" />
<Button <Button
lex:ResxLocalizationProvider.DefaultDictionary="lang_datalogviews"
Height="29" Height="29"
Margin="10,0,0,0" Margin="10,0,0,0"
lex:ResxLocalizationProvider.DefaultDictionary="lang_datalogviews"
Command="{Binding NavigateCommand}" Command="{Binding NavigateCommand}"
CommandParameter="first" CommandParameter="first"
Content="{lex:Loc ID_BTN_First_Content}" Content="{lex:Loc ID_BTN_First_Content}"
@ -762,9 +752,9 @@
IsEnabled="{Binding IsLoading, Converter={StaticResource boolReverseConverter}}" /> IsEnabled="{Binding IsLoading, Converter={StaticResource boolReverseConverter}}" />
<Button <Button
lex:ResxLocalizationProvider.DefaultDictionary="lang_datalogviews"
Height="29" Height="29"
Margin="10,0,0,0" Margin="10,0,0,0"
lex:ResxLocalizationProvider.DefaultDictionary="lang_datalogviews"
Command="{Binding NavigateCommand}" Command="{Binding NavigateCommand}"
CommandParameter="previous" CommandParameter="previous"
Content="{lex:Loc ID_BTN_Previous_Content}" Content="{lex:Loc ID_BTN_Previous_Content}"
@ -782,9 +772,9 @@
<Button <Button
lex:ResxLocalizationProvider.DefaultDictionary="lang_datalogviews"
Height="29" Height="29"
Margin="10,0,0,0" Margin="10,0,0,0"
lex:ResxLocalizationProvider.DefaultDictionary="lang_datalogviews"
Command="{Binding NavigateCommand}" Command="{Binding NavigateCommand}"
CommandParameter="next" CommandParameter="next"
Content="{lex:Loc ID_BTN_Next_Content}" Content="{lex:Loc ID_BTN_Next_Content}"
@ -793,9 +783,9 @@
IsEnabled="{Binding IsLoading, Converter={StaticResource boolReverseConverter}}" /> IsEnabled="{Binding IsLoading, Converter={StaticResource boolReverseConverter}}" />
<Button <Button
lex:ResxLocalizationProvider.DefaultDictionary="lang_datalogviews"
Height="29" Height="29"
Margin="10,0,0,0" Margin="10,0,0,0"
lex:ResxLocalizationProvider.DefaultDictionary="lang_datalogviews"
Command="{Binding NavigateCommand}" Command="{Binding NavigateCommand}"
CommandParameter="last" CommandParameter="last"
Content="{lex:Loc ID_BTN_Last_Content}" Content="{lex:Loc ID_BTN_Last_Content}"
@ -804,9 +794,9 @@
IsEnabled="{Binding IsLoading, Converter={StaticResource boolReverseConverter}}" /> IsEnabled="{Binding IsLoading, Converter={StaticResource boolReverseConverter}}" />
<TextBlock <TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_datalogviews"
Margin="20,0,0,0" Margin="20,0,0,0"
VerticalAlignment="Center" VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_datalogviews"
FontSize="16" FontSize="16"
Text="{lex:Loc ID_TXT_QuickGoTo}" /> Text="{lex:Loc ID_TXT_QuickGoTo}" />
@ -819,7 +809,8 @@
ItemsSource="{Binding Path=PaginationSource, Mode=OneWay}" ItemsSource="{Binding Path=PaginationSource, Mode=OneWay}"
SelectedValue="{Binding Path=SelectedPage, Mode=TwoWay, Delay=10}" /> SelectedValue="{Binding Path=SelectedPage, Mode=TwoWay, Delay=10}" />
</StackPanel> </StackPanel>
<DataGrid Grid.Row="1" <DataGrid
Grid.Row="1"
AutoGenerateColumns="False" AutoGenerateColumns="False"
CanUserAddRows="False" CanUserAddRows="False"
CanUserReorderColumns="False" CanUserReorderColumns="False"
@ -827,11 +818,11 @@
FontSize="13" FontSize="13"
IsReadOnly="True" IsReadOnly="True"
ItemsSource="{Binding SearchedResult, Mode=OneWay}" ItemsSource="{Binding SearchedResult, Mode=OneWay}"
SelectionMode="Single"
SelectionUnit="FullRow"
ScrollViewer.CanContentScroll="True" ScrollViewer.CanContentScroll="True"
ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.HorizontalScrollBarVisibility="Auto"
ScrollViewer.VerticalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto"
SelectionMode="Single"
SelectionUnit="FullRow"
VirtualizingPanel.IsVirtualizing="True" VirtualizingPanel.IsVirtualizing="True"
VirtualizingPanel.VirtualizationMode="Recycling"> VirtualizingPanel.VirtualizationMode="Recycling">
<DataGrid.Columns> <DataGrid.Columns>

4
Framework/MECF.Framework.UI.Client/Themes/SeaBlue/ComboBox.xaml
View File

@ -1,4 +1,6 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" <ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:deviceControl="clr-namespace:MECF.Framework.UI.Core.DeviceControl;assembly=MECF.Framework.UI.Core"> xmlns:deviceControl="clr-namespace:MECF.Framework.UI.Core.DeviceControl;assembly=MECF.Framework.UI.Core">
<Style x:Key="ComboBoxFocusVisual"> <Style x:Key="ComboBoxFocusVisual">

23
Framework/MECF.Framework.UI.Client/Themes/SeaBlue/DataGrid.xaml
View File

@ -271,18 +271,21 @@
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="DataGridRow"> <ControlTemplate TargetType="DataGridRow">
<Grid> <Grid>
<Border x:Name="border" Margin="0" Background="{TemplateBinding Background}" BorderThickness="0" BorderBrush="Transparent"> <Border
<DataGridCellsPresenter x:Name="border"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Margin="0"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"/> Background="{TemplateBinding Background}"
BorderBrush="Transparent"
BorderThickness="0">
<DataGridCellsPresenter HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
</Border> </Border>
</Grid> </Grid>
<ControlTemplate.Triggers> <ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True"> <Trigger Property="IsMouseOver" Value="True">
<Setter Property="Background" TargetName="border" Value="#FF91B0CD"/> <Setter TargetName="border" Property="Background" Value="#FF91B0CD" />
</Trigger> </Trigger>
<Trigger Property="IsSelected" Value="true"> <Trigger Property="IsSelected" Value="true">
<Setter Property="BorderBrush" TargetName="border" Value="#FF91B0CD"/> <Setter TargetName="border" Property="BorderBrush" Value="#FF91B0CD" />
</Trigger> </Trigger>
</ControlTemplate.Triggers> </ControlTemplate.Triggers>
</ControlTemplate> </ControlTemplate>
@ -307,11 +310,9 @@
<ControlTemplate TargetType="DataGridCell"> <ControlTemplate TargetType="DataGridCell">
<Border <Border
Padding="2" Padding="2"
BorderThickness="0" Background="{TemplateBinding Background}"
Background="{TemplateBinding Background}"> BorderThickness="0">
<ContentPresenter <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"/>
</Border> </Border>
<ControlTemplate.Triggers> <ControlTemplate.Triggers>
<Trigger Property="IsSelected" Value="true"> <Trigger Property="IsSelected" Value="true">

3
Framework/MECF.Framework.UI.Client/Themes/SeaBlue/Listview.xaml
View File

@ -182,7 +182,8 @@
Columns="{Binding TemplatedParent.View.Columns, RelativeSource={RelativeSource TemplatedParent}}" Columns="{Binding TemplatedParent.View.Columns, RelativeSource={RelativeSource TemplatedParent}}"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" /> SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
</Border> </Border>
<Border Grid.Row="1" <Border
Grid.Row="1"
Background="{DynamicResource Listview_BG_First}" Background="{DynamicResource Listview_BG_First}"
BorderBrush="{DynamicResource Listview_Content_BD}" BorderBrush="{DynamicResource Listview_Content_BD}"
BorderThickness="1,0,1,1"> BorderThickness="1,0,1,1">