Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
H
hemei
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
潘栩锋
hemei
Commits
2b97e90d
Commit
2b97e90d
authored
Oct 18, 2022
by
潘栩锋
🚴
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复 风环自动控制 输出 块状的加热
修复 风环 数据平滑 为0时,没有数据
parent
b3feab20
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
53 additions
and
24 deletions
+53
-24
PgSetup.xaml.cs
...ckRenZiJia/FLY.FeedbackRenZiJia.UI.Client/PgSetup.xaml.cs
+9
-3
HeatCell.cs
....FeedbackRenZiJia/FLY.FeedbackRenZiJia/Server/HeatCell.cs
+44
-21
No files found.
Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia.UI.Client/PgSetup.xaml.cs
View file @
2b97e90d
...
@@ -19,6 +19,7 @@ using System.ComponentModel;
...
@@ -19,6 +19,7 @@ using System.ComponentModel;
using
Unity
;
using
Unity
;
using
GalaSoft.MvvmLight.Command
;
using
GalaSoft.MvvmLight.Command
;
using
System.Collections.ObjectModel
;
using
System.Collections.ObjectModel
;
using
FLY.Thick.RemoteHistory
;
namespace
FLY.FeedbackRenZiJia.UI.Client
namespace
FLY.FeedbackRenZiJia.UI.Client
{
{
...
@@ -111,6 +112,11 @@ namespace FLY.FeedbackRenZiJia.UI.Client
...
@@ -111,6 +112,11 @@ namespace FLY.FeedbackRenZiJia.UI.Client
/// 对厚度数据横向平滑 单位加热棒数。 特别的当Smooth = ChannelCnt/2 就是膜泡的偏心度
/// 对厚度数据横向平滑 单位加热棒数。 特别的当Smooth = ChannelCnt/2 就是膜泡的偏心度
/// </summary>
/// </summary>
public
int
ThickSmoothRange
{
get
;
set
;
}
public
int
ThickSmoothRange
{
get
;
set
;
}
/// <summary>
/// 启动打断功能,会把长块打断
/// </summary>
public
bool
CanBreakIn
{
get
;
set
;
}
#
endregion
#
endregion
#
region
Command
#
region
Command
...
@@ -171,7 +177,7 @@ namespace FLY.FeedbackRenZiJia.UI.Client
...
@@ -171,7 +177,7 @@ namespace FLY.FeedbackRenZiJia.UI.Client
}
}
});
});
Misc
.
BindingOperations
.
SetBinding
(
this
.
HeatCell
,
nameof
(
IHeatCellService
.
ThickSmoothRange
),
this
,
nameof
(
ThickSmoothRange
));
Misc
.
BindingOperations
.
SetBinding
(
this
.
HeatCell
,
nameof
(
IHeatCellService
.
ThickSmoothRange
),
this
,
nameof
(
ThickSmoothRange
));
Misc
.
BindingOperations
.
SetBinding
(
this
.
HeatCell
,
nameof
(
IHeatCellService
.
CanBreakIn
),
this
,
nameof
(
CanBreakIn
));
Misc
.
BindingOperations
.
SetBinding
(
this
.
Feedback
,
nameof
(
IFeedbackHeatService
.
Step
),
this
,
nameof
(
Step
));
Misc
.
BindingOperations
.
SetBinding
(
this
.
Feedback
,
nameof
(
IFeedbackHeatService
.
Step
),
this
,
nameof
(
Step
));
Misc
.
BindingOperations
.
SetBinding
(
this
.
Feedback
,
nameof
(
IFeedbackHeatService
.
HasCheck
),
this
,
nameof
(
HasCheck
));
Misc
.
BindingOperations
.
SetBinding
(
this
.
Feedback
,
nameof
(
IFeedbackHeatService
.
HasCheck
),
this
,
nameof
(
HasCheck
));
...
@@ -273,7 +279,7 @@ namespace FLY.FeedbackRenZiJia.UI.Client
...
@@ -273,7 +279,7 @@ namespace FLY.FeedbackRenZiJia.UI.Client
HeatCell
.
LvCtrlLines
=
null
;
HeatCell
.
LvCtrlLines
=
null
;
}
}
HeatCell
.
ThickSmoothRange
=
ThickSmoothRange
;
HeatCell
.
ThickSmoothRange
=
ThickSmoothRange
;
HeatCell
.
CanBreakIn
=
this
.
CanBreakIn
;
Feedback
.
Step
=
this
.
Step
;
Feedback
.
Step
=
this
.
Step
;
Feedback
.
HasCheckFilmVelocity
=
this
.
HasCheckFilmVelocity
;
Feedback
.
HasCheckFilmVelocity
=
this
.
HasCheckFilmVelocity
;
...
...
Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia/Server/HeatCell.cs
View file @
2b97e90d
...
@@ -13,6 +13,8 @@ using System.IO;
...
@@ -13,6 +13,8 @@ using System.IO;
using
Newtonsoft.Json
;
using
Newtonsoft.Json
;
using
FLY.Thick.Blowing.IService
;
using
FLY.Thick.Blowing.IService
;
using
Misc
;
using
Misc
;
using
System.Reflection
;
using
MathNet.Numerics.Distributions
;
namespace
FLY.FeedbackRenZiJia.Server
namespace
FLY.FeedbackRenZiJia.Server
{
{
...
@@ -68,10 +70,21 @@ namespace FLY.FeedbackRenZiJia.Server
...
@@ -68,10 +70,21 @@ namespace FLY.FeedbackRenZiJia.Server
/// </summary>
/// </summary>
public
LvCtrlLine
[]
LvCtrlLines
{
get
;
set
;
}
public
LvCtrlLine
[]
LvCtrlLines
{
get
;
set
;
}
private
int
thickSmoothRange
=
5
;
/// <summary>
/// <summary>
/// 对厚度数据横向平滑 单位加热棒数。 特别的当Smooth = ChannelCnt/2 就是膜泡的偏心度
/// 对厚度数据横向平滑 单位加热棒数。 特别的当Smooth = ChannelCnt/2 就是膜泡的偏心度
/// </summary>
/// </summary>
public
int
ThickSmoothRange
{
get
;
set
;
}
=
5
;
public
int
ThickSmoothRange
{
get
{
return
thickSmoothRange
;
}
set
{
if
(
value
<
1
)
value
=
1
;
if
(
thickSmoothRange
!=
value
)
{
thickSmoothRange
=
value
;
}
}
}
/// <summary>
/// <summary>
/// 启动打断功能,会把长块打断
/// 启动打断功能,会把长块打断
...
@@ -296,22 +309,33 @@ namespace FLY.FeedbackRenZiJia.Server
...
@@ -296,22 +309,33 @@ namespace FLY.FeedbackRenZiJia.Server
var
thickPercents
=
ThickPercents
;
//肯定没有 double.NaN
var
thickPercents
=
ThickPercents
;
//肯定没有 double.NaN
double
ctrlLine
=
getCtrlLine
(
CurrMix
);
double
ctrlLine
=
getCtrlLine
(
CurrMix
);
offsets
=
new
int
[
ChannelCnt
];
offsets
=
new
int
[
ChannelCnt
];
double
[]
deltas
=
new
double
[
ChannelCnt
];
//获取偏差
if
(
CanBreakIn
)
//启动打断功能
{
//获取目标线。 正常全部都是0
//获取目标线。 正常全部都是0
//有同向长块的,也需要中间打断。 长块中间的目标值是 反向的ctrlLine
//有同向长块的,也需要中间打断。 长块中间的目标值是 反向的ctrlLine
var
targets
=
getTargets
(
thickPercents
,
ctrlLine
);
var
targets
=
getTargets
(
thickPercents
,
ctrlLine
);
int
range5
=
5
;
for
(
int
i
=
0
;
i
<
ChannelCnt
;
i
++)
for
(
int
i
=
0
;
i
<
ChannelCnt
;
i
++)
{
{
double
delta
;
deltas
[
i
]
=
(
thickPercents
[
i
]
-
targets
[
i
])
;
if
(
CanBreakIn
)
//启动打断功能
}
delta
=
(
thickPercents
[
i
]
-
targets
[
i
]);
}
else
else
delta
=
thickPercents
[
i
];
//普通使用0%为目标值
{
for
(
int
i
=
0
;
i
<
ChannelCnt
;
i
++)
{
deltas
[
i
]
=
thickPercents
[
i
];
}
}
if
(
Math
.
Abs
(
delta
)
>
ctrlLine
)
//计算输出增量
for
(
int
i
=
0
;
i
<
ChannelCnt
;
i
++)
{
int
range5
=
5
;
if
(
Math
.
Abs
(
deltas
[
i
])
>
ctrlLine
)
{
{
//这个点,及附近,都需要调节, 附近为±2
//这个点,及附近,都需要调节, 附近为±2
for
(
int
j
=
0
;
j
<
range5
;
j
++)
for
(
int
j
=
0
;
j
<
range5
;
j
++)
...
@@ -319,7 +343,8 @@ namespace FLY.FeedbackRenZiJia.Server
...
@@ -319,7 +343,8 @@ namespace FLY.FeedbackRenZiJia.Server
int
index
=
i
-
range5
/
2
+
j
;
int
index
=
i
-
range5
/
2
+
j
;
if
(
index
<
0
)
index
+=
ChannelCnt
;
if
(
index
<
0
)
index
+=
ChannelCnt
;
else
if
(
index
>=
ChannelCnt
)
index
-=
ChannelCnt
;
else
if
(
index
>=
ChannelCnt
)
index
-=
ChannelCnt
;
offsets
[
index
]
=
(
int
)
calOffset
(
delta
,
ctrlLine
,
Kp
);
offsets
[
index
]
=
(
int
)
calOffset
(
deltas
[
index
],
ctrlLine
,
Kp
);
}
}
}
}
}
}
...
@@ -418,7 +443,7 @@ namespace FLY.FeedbackRenZiJia.Server
...
@@ -418,7 +443,7 @@ namespace FLY.FeedbackRenZiJia.Server
double
[]
getTargets
(
double
[]
thickPercents
,
double
ctrlLine
)
double
[]
getTargets
(
double
[]
thickPercents
,
double
ctrlLine
)
{
{
int
range6
=
6
;
int
range6
=
6
;
//
int range3 = 3;
int
range3
=
3
;
var
signList
=
getSignList
(
thickPercents
,
1
);
//以1%为盲区,获取同符号的厚度段。
var
signList
=
getSignList
(
thickPercents
,
1
);
//以1%为盲区,获取同符号的厚度段。
...
@@ -433,15 +458,13 @@ namespace FLY.FeedbackRenZiJia.Server
...
@@ -433,15 +458,13 @@ namespace FLY.FeedbackRenZiJia.Server
if
(
thickPercents
[
i
]
>
0
)
//这个块 大于正数
if
(
thickPercents
[
i
]
>
0
)
//这个块 大于正数
{
{
//把长块,中间的位置目标值 设为反向符号的 ctrlLine。 这样实现了打断功能
//把长块,中间的位置目标值 设为反向符号的 ctrlLine。 这样实现了打断功能
//setTargets(targets, -ctrlLine, i, range3);
setTargets
(
targets
,
-
ctrlLine
,
i
,
range3
);
targets
[
i
]
=
-
ctrlLine
;
}
}
else
else
{
{
//这个块负数
//这个块负数
//setTargets(targets, ctrlLine, i, range3);
setTargets
(
targets
,
ctrlLine
,
i
,
range3
);
targets
[
i
]
=
ctrlLine
;
}
}
}
}
return
targets
;
return
targets
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment