Skip to content

H
hemei
Commit 671478c3 authored by 潘栩锋's avatar 潘栩锋 🚴
Browse files
Options

修复 IBC螺杆温区点设置会异常 

修复 中心收卷 按手动 功能少了
parent 4c2ef2cf
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 64 deletions
Project.FLY.IBC/FLY.IBC.UI.Client/FLY.IBC.UI.Client.csproj
View file @ 671478c3
......@@ -203,10 +203,6 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="UiModule\TempAreaPanel\TempAreaPanelStyle.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="UiModule\IbcCtrlGraph\WdGraphSet.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
......
Project.FLY.IBC/FLY.IBC.UI.Client/Themes/StringResources/en/StringResource.PgTempAreaParam.xaml
View file @ 671478c3
......@@ -5,10 +5,14 @@
<!--字符串换行 必须添加 xml:space="preserve" -->
<!--字符串换行 换行符 &#10; -->
<system:String x:Key="str.IBC.PgTempAreaParam.Title">Layout Setting</system:String>
<system:String x:Key="str.IBC.PgTempAreaParam.On">On</system:String>
<system:String x:Key="str.IBC.PgTempAreaParam.Off">Off</system:String>
<system:String x:Key="str.IBC.PgTempAreaParam.Title">Layout Setting</system:String>
<system:String x:Key="str.IBC.PgTempAreaParam.On">On</system:String>
<system:String x:Key="str.IBC.PgTempAreaParam.Off">Off</system:String>
<system:String x:Key="str.IBC.PgTempAreaParam.AllOn">AllOn</system:String>
<system:String x:Key="str.IBC.PgTempAreaParam.AllOff">AllOff</system:String>
<system:String x:Key="str.IBC.PgTempAreaParam.AllTempSetting">All Set</system:String>
<system:String x:Key="str.IBC.PgTempAreaParam.MT">MT</system:String>
<system:String x:Key="str.IBC.PgTempAreaParam.TempPV">TempPV</system:String>
<system:String x:Key="str.IBC.PgTempAreaParam.Channel">Channel</system:String>
<system:String x:Key="str.IBC.PgTempAreaParam.PSet">P set</system:String>
......
Project.FLY.IBC/FLY.IBC.UI.Client/Themes/StringResources/zh/StringResource.PgTempAreaParam.xaml
View file @ 671478c3
......@@ -5,10 +5,14 @@
<!--字符串换行 必须添加 xml:space="preserve" -->
<!--字符串换行 换行符 &#10; -->
<system:String x:Key="str.IBC.PgTempAreaParam.Title">层温度设置</system:String>
<system:String x:Key="str.IBC.PgTempAreaParam.On">启动</system:String>
<system:String x:Key="str.IBC.PgTempAreaParam.Off">停止</system:String>
<system:String x:Key="str.IBC.PgTempAreaParam.Title">层温度设置</system:String>
<system:String x:Key="str.IBC.PgTempAreaParam.On">启动</system:String>
<system:String x:Key="str.IBC.PgTempAreaParam.Off">停止</system:String>
<system:String x:Key="str.IBC.PgTempAreaParam.AllOn">全部启动</system:String>
<system:String x:Key="str.IBC.PgTempAreaParam.AllOff">全部停止</system:String>
<system:String x:Key="str.IBC.PgTempAreaParam.AllTempSetting">全部温度设定</system:String>
<system:String x:Key="str.IBC.PgTempAreaParam.MT">熔温</system:String>
<system:String x:Key="str.IBC.PgTempAreaParam.TempPV">温度显示</system:String>
<system:String x:Key="str.IBC.PgTempAreaParam.Channel">通道设置</system:String>
<system:String x:Key="str.IBC.PgTempAreaParam.PSet">比例设定</system:String>
......
Project.FLY.IBC/FLY.IBC.UI.Client/UiModule/TempAreaPanel/TempAreaPanel2.xaml
View file @ 671478c3
......@@ -10,7 +10,7 @@
<UserControl.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="TempAreaPanelStyle.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.IBC.UI.Client;component/Themes/Styles.xaml"/>
<ResourceDictionary Source="UcTcStyle.xaml"/>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
......
Project.FLY.IBC/FLY.IBC.UI.Client/UiModule/TempAreaPanel/TempAreaPanelStyle.xaml deleted 100644 → 0
View file @ 4c2ef2cf
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:sys="clr-namespace:System;assembly=mscorlib">
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.IBC.UI.Client;component/Themes/Styles.xaml"/>
<!--<ResourceDictionary Source="pack://application:,,,/FLY.IBC.UI.Client;component/Themes/Color.Dark.xaml"/>-->
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
\ No newline at end of file
Project.FLY.IBC/FLY.IBC.UI.Client/UiModule/TempAreaPanel/UcTcStyle.xaml
View file @ 671478c3
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks" xmlns:flyctrl="clr-namespace:FLY.ControlLibrary;assembly=FLY.ControlLibrary">
xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
xmlns:flyctrl="clr-namespace:FLY.ControlLibrary;assembly=FLY.ControlLibrary">
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="TempAreaPanelStyle.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.IBC.UI.Client;component/Themes/Styles.xaml"/>
</ResourceDictionary.MergedDictionaries>
......@@ -18,7 +19,7 @@
</Style>
<!--温度模板中的数码管 输入框 -->
<Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource TextBoxStyle1}" x:Key="SegInputStyle">
<Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource Styles.Text.Input}" x:Key="SegInputStyle">
<Setter Property="FontFamily" Value="NI7SEG"/>
<Setter Property="FontSize" Value="30"/>
<Setter Property="Background" Value="{StaticResource SegBgBrush}"/>
......@@ -122,8 +123,8 @@
<ToggleButton IsChecked="{Binding IsCooling,Mode=OneWay}" Content="OT2" IsEnabled="False" Style="{StaticResource LedStyle2}"/>
</UniformGrid>
<flyctrl:ToggleButtonOnOff Style="{StaticResource ToggleButtonOnOffStyle}" HorizontalAlignment="Center" Margin="{StaticResource ControlMargin}"
OnLabel="运行" OnBrush="{StaticResource Color_on}"
OffLabel="停止" OffBrush="{StaticResource Color_off}"
OnLabel="{StaticResource str.IBC.PgTempAreaParam.On}" OnBrush="{StaticResource Color_on}"
OffLabel="{StaticResource str.IBC.PgTempAreaParam.Off}" OffBrush="{StaticResource Color_off}"
IsChecked="{Binding IsHeatingSet}"/>
</StackPanel>
......@@ -154,13 +155,13 @@
Padding="6,2"
FontSize="20"
Margin="0,-5,-5,0">
<Run Text="{Binding Number}"/><Run Text="层"/>
<Run Text="{Binding Number}"/>
</TextBlock>
<StackPanel>
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Margin="3,0"
Foreground="{StaticResource Color_title_activity}"
FontSize="{StaticResource FontSize_title}"
Text="全部温度设定" />
Text="{StaticResource str.IBC.PgTempAreaParam.AllTempSetting}" />
<TextBox Style="{StaticResource SegInputStyle}"
Foreground="{StaticResource Color_text_activity}"
Background="{StaticResource Color_background2}"
......@@ -168,8 +169,8 @@
</StackPanel>
<flyctrl:ToggleButtonOnOff Style="{StaticResource ToggleButtonOnOffStyle}"
HorizontalAlignment="Left" Margin="{StaticResource ControlMargin}" Width="120"
OnLabel="全部运行" OnBrush="{StaticResource Color_on}"
OffLabel="全部停止" OffBrush="{StaticResource Color_off}"
OnLabel="{StaticResource str.IBC.PgTempAreaParam.AllOn}" OnBrush="{StaticResource Color_on}"
OffLabel="{StaticResource str.IBC.PgTempAreaParam.AllOff}" OffBrush="{StaticResource Color_off}"
IsChecked="{Binding IsAllTempSame}"/>
</StackPanel>
</Grid>
......@@ -258,7 +259,7 @@
Background="{StaticResource Color_badgeBg}" Foreground="{StaticResource Color_badgeText}"
Padding="6,2"
FontSize="30"
Text="熔温" Margin="0,-5,-5,0"/>
Text="{StaticResource str.IBC.PgTempAreaParam.MT}" Margin="0,-5,-5,0"/>
</Grid>
</DataTemplate>
</ResourceDictionary>
\ No newline at end of file
Project.FLY.IBC/FLY.IBC.UI.Client/UiModule/TempAreaPanel/WdTempAreaSet.xaml
View file @ 671478c3
......@@ -14,7 +14,7 @@
<Window.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="TempAreaPanelStyle.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.IBC.UI.Client;component/Themes/Styles.xaml"/>
<ResourceDictionary Source="UcTcStyle.xaml"/>
</ResourceDictionary.MergedDictionaries>
<Style TargetType="ContentControl">
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/Themes/StringResources/en/StringResource.H.xaml
View file @ 671478c3
......@@ -16,17 +16,4 @@
<system:String x:Key="str.H.Temp">Temp</system:String>
<system:String x:Key="str.H.Weigh">Weigh</system:String>
<system:String x:Key="str.H.Suction">Suction</system:String>
<system:String x:Key="str.H.扫描">Scan</system:String>
<system:String x:Key="str.H.风环">AirRing</system:String>
<system:String x:Key="str.H.定点">Fix</system:String>
<system:String x:Key="str.H.环型">Radar</system:String>
<system:String x:Key="str.H.趋势">Trend</system:String>
<system:String x:Key="str.H.趋势2">Trend2</system:String>
<system:String x:Key="str.H.收卷">Winder</system:String>
<system:String x:Key="str.H.中心">Center</system:String>
<system:String x:Key="str.H.手动">Manual</system:String>
<system:String x:Key="str.H.温区">Temp</system:String>
<system:String x:Key="str.H.称重">Weigh</system:String>
<system:String x:Key="str.H.吸料">Suction</system:String>
</ResourceDictionary>
\ No newline at end of file
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/Themes/StringResources/zh/StringResource.H.xaml
View file @ 671478c3
......@@ -16,17 +16,4 @@
<system:String x:Key="str.H.Temp">温区</system:String>
<system:String x:Key="str.H.Weigh">称重</system:String>
<system:String x:Key="str.H.Suction">吸料</system:String>
<system:String x:Key="str.H.扫描">扫描</system:String>
<system:String x:Key="str.H.风环">风环</system:String>
<system:String x:Key="str.H.定点">定点</system:String>
<system:String x:Key="str.H.环型">环型</system:String>
<system:String x:Key="str.H.趋势">趋势</system:String>
<system:String x:Key="str.H.趋势2">趋势2</system:String>
<system:String x:Key="str.H.收卷">收卷</system:String>
<system:String x:Key="str.H.中心">中心</system:String>
<system:String x:Key="str.H.手动">手动</system:String>
<system:String x:Key="str.H.温区">温区</system:String>
<system:String x:Key="str.H.称重">称重</system:String>
<system:String x:Key="str.H.吸料">吸料</system:String>
</ResourceDictionary>
\ No newline at end of file
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Client/Properties/AssemblyInfo.cs
View file @ 671478c3
......@@ -51,6 +51,6 @@ using System.Windows;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("8.1.0.0")]
[assembly: AssemblyFileVersion("8.1.0.0")]
[assembly: AssemblyVersion("8.2.3.0")]
[assembly: AssemblyFileVersion("8.2.3.0")]
[assembly: Guid("38E0D8EC-4D1C-49FF-AB08-6289294C5BD4")]
Project.FLY.Unions/FLY.Unions.UI/Themes/Styles.xaml
View file @ 671478c3
......@@ -3,7 +3,7 @@
xmlns:sys="clr-namespace:System;assembly=mscorlib">
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Styles.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Converter/Converters.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.Unions.UI;component/Themes/Color.xaml"/>
</ResourceDictionary.MergedDictionaries>
......
Project.FLY.Unions/FLY.Unions.UI/UiModule/DynAreaProfile.xaml
View file @ 671478c3
......@@ -8,7 +8,7 @@
<UserControl.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Styles.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Converter/Converters.xaml"/>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</UserControl.Resources>
......
Project.FLY.Unions/FLY.Unions.UI/UiModule/MenuProfile.xaml
View file @ 671478c3
......@@ -8,7 +8,7 @@
<UserControl.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Styles.xaml"/>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Converter/Converters.xaml"/>
</ResourceDictionary.MergedDictionaries>
<SolidColorBrush x:Key="IconBrush" Color="{StaticResource Colors.Text.White}" />
<SolidColorBrush x:Key="TextBrush" Color="{StaticResource Colors.Text.White}" />
......
Project.FLY.Winder/FLY.Winder.UI.Client/UiModule/MainPanel/UiModule2_MainPanel.cs
View file @ 671478c3
......@@ -15,7 +15,7 @@ namespace FLY.Winder.UI.Client.UiModule
/// 控件标题
/// 它的值取决于culture
/// </summary>
public string Title=> "收卷.主界面";
public string Title=> "收卷.主界面(中心)";
public ComponentType Type => ComponentType.Graph;
public bool IsUnique => true;
/// <summary>
......@@ -26,7 +26,8 @@ namespace FLY.Winder.UI.Client.UiModule
/// <returns></returns>
public FrameworkElement GetComponent(int id, IUnityContainer container)
{
var p = container.Resolve<MainPanel>();
//isCenter = false
var p = container.Resolve<MainPanel>(new Unity.Resolution.ParameterOverride("isCenter",true));
return p;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment