Skip to content

H
hemei
Commit 3094f6aa authored by 潘栩锋's avatar 潘栩锋 🚴
Browse files
Options

1. 修复 IBC温控 温度无法设置。 因为属性名称 从TempSVSet 被改为 TempSV 

2. 修复 54546_v2 每次配料无法保存
3. 优化 称重V4显示尺寸
parent 5f3befd6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 151 additions and 68 deletions
Project.FLY.DownBlowing/FLY.DownBlowing/Server/RotarySystem.cs
View file @ 3094f6aa
......@@ -15,16 +15,17 @@ using WinderAccessory = FLY.DownBlowing.Common.WinderAccessory;
namespace FLY.DownBlowing.Server
{
public class RotarySystem : IRotarySerivce
public class RotarySystem : IRotarySystem
{
/// <summary>
/// 方向相反
/// </summary>
public bool IsReversed { get; set; }
public bool IsReversed { get; set; } = true;
/// <summary>
/// 最小一圈脉冲
/// </summary>
const int MinRPosOfR = 3000;
const int MinRPosOfR = 8000;
......@@ -116,7 +117,7 @@ namespace FLY.DownBlowing.Server
public bool IsPlcRegDirectionError { get; set; }
public List<SignCell> Signs = new List<SignCell>();
public List<SignCell> Signs { get; } = new List<SignCell>();
WinderAccessory winderAccessory;
DispatcherTimer dispatcherTimer;
......@@ -147,7 +148,7 @@ namespace FLY.DownBlowing.Server
SaveRPosOfR(rposOfRInFile);
}
if (rposOfRInFile > MinRPosOfR)
if (!double.IsNaN(rposOfRInFile) && rposOfRInFile > MinRPosOfR)
RPosOfR = rposOfRInFile;
RPosAtOrgSign = 0;
......@@ -162,13 +163,19 @@ namespace FLY.DownBlowing.Server
Misc.BindingOperations.SetBinding(winderAccessory, nameof(winderAccessory.IsRotaryOn), this, nameof(IsRotaryOn));
Misc.BindingOperations.SetBinding(winderAccessory,
new string[]{
nameof(winderAccessory.IsRotaryForw),
nameof(winderAccessory.IsRotaryBackw)},
updateDirection);
Misc.BindingOperations.SetBinding(winderAccessory,
new string[]{
nameof(winderAccessory.IsRotaryForw),
nameof(winderAccessory.IsRotaryBackw),
nameof(winderAccessory.IsRotaryForwTurn),
nameof(winderAccessory.IsRotaryBackwTurn)},
updateSign);
nameof(winderAccessory.IsRotaryForwTurn),
nameof(winderAccessory.IsRotaryBackwTurn)},
updateTurnSignShortSign);
Misc.BindingOperations.SetBinding(winderAccessory, nameof(winderAccessory.IsRotaryOrgSign), this, nameof(IsOrgSign));
......@@ -188,22 +195,51 @@ namespace FLY.DownBlowing.Server
stopwatch_rpos = new Stopwatch();
}
void updateSign()
{
updateDirection();
}
void updateDirection()
{
setIsForw(winderAccessory.IsRotaryForw);
setIsBackw(winderAccessory.IsRotaryBackw);
}
void setIsTurnSign1(bool onOff)
{
if (!IsReversed)
{
IsForw = winderAccessory.IsRotaryForw;
IsBackw = winderAccessory.IsRotaryBackw;
IsTurnSign0 = winderAccessory.IsRotaryForwTurn;
IsTurnSign1 = winderAccessory.IsRotaryBackwTurn;
}
IsTurnSign1 = onOff;
else
{
IsForw = winderAccessory.IsRotaryBackw;
IsBackw = winderAccessory.IsRotaryForw;
IsTurnSign0 = winderAccessory.IsRotaryBackwTurn;
IsTurnSign1 = winderAccessory.IsRotaryForwTurn;
}
IsTurnSign0 = onOff;
}
void setIsTurnSign0(bool onOff)
{
if (!IsReversed)
IsTurnSign0 = onOff;
else
IsTurnSign1 = onOff;
}
void setIsForw(bool onOff)
{
if (!IsReversed)
IsForw = onOff;
else
IsBackw = onOff;
}
void setIsBackw(bool onOff)
{
if (!IsReversed)
IsBackw = onOff;
else
IsForw = onOff;
}
void updateTurnSignShortSign()
{
setIsTurnSign0(winderAccessory.IsRotaryForwTurn);
setIsTurnSign1(winderAccessory.IsRotaryBackwTurn);
}
void updateRSpeed()
{
if (!IsRotaryOn)
......@@ -274,14 +310,21 @@ namespace FLY.DownBlowing.Server
void updateRPosOfR()
{
double rposOfR = (int)(RPosAtTurnSign1 - RPosAtTurnSign0);
if (Math.Abs(rposOfRInFile - rposOfR) > 100)
if (!double.IsNaN(rposOfRInFile))
{
if (Math.Abs(rposOfRInFile - rposOfR) > 100)
{
//变化量大于1°保存
rposOfRInFile = rposOfR;
SaveRPosOfR(rposOfRInFile);
}
}
else
{
//变化量大于1°保存
rposOfRInFile = rposOfR;
SaveRPosOfR(rposOfRInFile);
}
RPosOfR = rposOfR;
}
void updateRPosAtTurnSign0()
......@@ -492,8 +535,9 @@ namespace FLY.DownBlowing.Server
updateMinuteOfR();
updateRSpeed();
}
else if (e.PropertyName == nameof(IsRotaryOn)) {
updateRSpeed();
else if (e.PropertyName == nameof(IsRotaryOn))
{
updateRSpeed();
}
}
......@@ -546,6 +590,16 @@ namespace FLY.DownBlowing.Server
return double.NaN;
}
}
public interface IRotarySystem : IRotarySerivce
{
List<SignCell> Signs { get; }
void Init(WinderAccessory _winderAccessory);
void StartMeasureRPos();
void StopMeasureRPos();
bool Save();
}
public class RotarySystemJsonDb
{
......@@ -582,7 +636,10 @@ namespace FLY.DownBlowing.Server
{
try
{
var jsonDb = new RotarySystemJsonDb() { IsReversed = src.IsReversed };
var jsonDb = new RotarySystemJsonDb()
{
IsReversed = src.IsReversed
};
string json = JsonConvert.SerializeObject(jsonDb, Formatting.Indented);
File.WriteAllText(file_path, json);
return true;
......@@ -595,7 +652,7 @@ namespace FLY.DownBlowing.Server
return false;
}
public bool IsReversed;
public bool IsReversed = true;
}
public class SignCell : INotifyPropertyChanged
......
Project.FLY.IBC/FLY.IBC.UI.Client/UiModule/TempAreaPanel/UcTcStyle.xaml
View file @ 3094f6aa
......@@ -113,7 +113,7 @@
Style="{StaticResource SegInputStyle}"
Foreground="{StaticResource Color_text_activity}"
Background="{StaticResource Color_background2}"
Text="{Binding TempSVSet,StringFormat={}{0:0.#}}" />
Text="{Binding TempSV,StringFormat={}{0:0.#}}" />
</Grid>
<UniformGrid Margin="2,1" Columns="4">
<ToggleButton IsChecked="{Binding IsHeatingSet,Mode=OneWay}" Content="Run" IsEnabled="False" Style="{StaticResource LedStyle2}"/>
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/Properties/AssemblyInfo.cs
View file @ 3094f6aa
......@@ -12,7 +12,7 @@ using System.Windows;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("枫莱尔自动化技术有限公司")]
[assembly: AssemblyProduct("枫莱尔--追边测厚仪客户端")]
[assembly: AssemblyCopyright("Copyright © 2022 FlyAutomation. All rights reserved.")]
[assembly: AssemblyCopyright("Copyright © 2023 FlyAutomation. All rights reserved.")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
......@@ -51,6 +51,6 @@ using System.Windows;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("7.7.3.1")]
[assembly: AssemblyFileVersion("7.7.3.1")]
[assembly: AssemblyVersion("7.7.4.0")]
[assembly: AssemblyFileVersion("7.7.4.0")]
[assembly: Guid("D12087A7-EEC4-4D9F-9269-8F20324F4B04")]
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Client/Properties/AssemblyInfo.cs
View file @ 3094f6aa
......@@ -12,7 +12,7 @@ using System.Windows;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("枫莱尔自动化技术有限公司")]
[assembly: AssemblyProduct("枫莱尔--吹膜扫描测厚仪客户端")]
[assembly: AssemblyCopyright("Copyright © 2022 FlyAutomation. All rights reserved.")]
[assembly: AssemblyCopyright("Copyright © 2023 FlyAutomation. All rights reserved.")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
......@@ -51,6 +51,6 @@ using System.Windows;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("7.7.3.1")]
[assembly: AssemblyFileVersion("7.7.3.1")]
[assembly: AssemblyVersion("7.7.4.0")]
[assembly: AssemblyFileVersion("7.7.4.0")]
[assembly: Guid("38E0D8EC-4D1C-49FF-AB08-6289294C5BD4")]
Project.FLY.Weight/FLY.Weight.UI.Client/UiModule/V4/MainGraphV4_2.xaml
View file @ 3094f6aa
......@@ -22,39 +22,37 @@
</UserControl.Resources>
<Grid>
<Grid x:Name="container_grid"/>
<Viewbox Stretch="Uniform" VerticalAlignment="Top" HorizontalAlignment="Left">
<Grid Name="root_grid" d:DataContext="{StaticResource weightSystemUt}">
<Grid.RowDefinitions>
<RowDefinition Height="auto"/>
<RowDefinition />
</Grid.RowDefinitions>
<local:UcTotalFlowV4 x:Name="ucTotalFlow" Margin="{StaticResource ControlMargin}" />
<Grid Name="root_grid" d:DataContext="{StaticResource weightSystemUt}">
<Grid.RowDefinitions>
<RowDefinition Height="auto"/>
<RowDefinition />
</Grid.RowDefinitions>
<local:UcTotalFlowV4 x:Name="ucTotalFlow" Margin="{StaticResource ControlMargin}" />
<Grid Grid.Row="1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<local:UcThicknessV4 x:Name="ucThickness" Margin="{StaticResource ControlMargin}"/>
<ItemsControl x:Name="itemsControl" Grid.Column="1" ItemsSource="{Binding Items}">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<StackPanel Orientation="Horizontal" />
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
<ItemsControl.ItemTemplate>
<DataTemplate>
<local:UcWeighterItemV0_2 Margin="{StaticResource ControlMargin}"
<Grid Grid.Row="1">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<local:UcThicknessV4 x:Name="ucThickness" Margin="{StaticResource ControlMargin}"/>
<ItemsControl x:Name="itemsControl" Grid.Column="1" ItemsSource="{Binding Items}">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<UniformGrid Columns="{Binding ElementName=itemsControl,Path=Items.Count}"/>
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
<ItemsControl.ItemTemplate>
<DataTemplate>
<local:UcWeighterItemV0_2 Margin="{StaticResource ControlMargin}"
WeightSystemService="{Binding DataContext,ElementName=root_grid}"
Container="{Binding DataContext,ElementName=container_grid}"/>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
</Grid>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
</Grid>
</Viewbox>
</Grid>
</Grid>
</UserControl>
Resource/Autogen_WS.exe
View file @ 3094f6aa
No preview for this file type
Resource/称重/版本描述.txt
View file @ 3094f6aa
......@@ -14,7 +14,8 @@ v3
//------------------------------
v4
少了内外收卷重量，计算理论线速度,没了边料设置
有特殊的总流量设置, 与IBC联动。
有特殊的总流量设置, 与IBC联动。
就只是杏坛胜亚乐在用
//------------------------------
v5
......
脚本/hemeiInstallZipVersionInfo.json
View file @ 3094f6aa
{
"InstallZipVersion":"7.7.3.1",
"InstallZipUrl":"http://server.flyautomation.net:8889/download/和美安装包_v7.7.3.1_20230104.7z"
"InstallZipVersion":"7.7.4.0",
"InstallZipUrl":"http://server.flyautomation.net:8889/download/和美安装包_v7.7.4.0_20230214.7z"
}
\ No newline at end of file
脚本/版本描述.md
View file @ 3094f6aa
# 和美安装包_v7.7.4-20230214
## 测厚仪服务器 v7.6.2
## 测厚仪客户端 v7.7.4
1. 修复 IBC温控 温度无法设置。 因为属性名称 从TempSVSet 被改为 TempSV
## 扫描测厚仪服务器 v7.6.1
## 扫描测厚仪客户端 v7.7.4
1. 修复 IBC温控 温度无法设置。 因为属性名称 从TempSVSet 被改为 TempSV
## 自动风环 v7.6.1
## 称重 v7.7.0
## 称重单组 v7.6.0
## 收卷 v7.6.0
## IBC v7.6.0
## 下吹 v7.6.0
## 吹膜数据库浏览器 v7.0.0
<br/>
<br/>
<br/>
# 和美安装包_v7.7.2-20221124
## 测厚仪服务器 v7.6.2
......
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