Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
T
Thick-Common
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
潘栩锋
Thick-Common
Commits
9be5cc66
Commit
9be5cc66
authored
Jun 27, 2019
by
潘栩锋
🚴
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1. 修复 flyad7.GridIStatusEventAdd(int istatus_no, ) istatus_no的取值范围 0~11
2. 完善 FLY.Simulation.Coating 使用 PropertyChanged.Fody
parent
3146b1f2
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
34 additions
and
73 deletions
+34
-73
Coating.cs
Project.FLY.FlyADBase/FLY.Simulation.Coating/Coating.cs
+12
-70
FLY.Simulation.Coating.csproj
...Base/FLY.Simulation.Coating/FLY.Simulation.Coating.csproj
+5
-0
GageAD.cs
Project.FLY.FlyADBase/FLY.Simulation.Coating/GageAD.cs
+14
-0
FlyAD7.cs
Project.FLY.FlyADBase/FlyADBase/FlyAD7.cs
+1
-1
TimeGridAdvHelper.cs
Project.FLY.FlyADBase/FlyADBase/TimeGridAdvHelper.cs
+2
-2
No files found.
Project.FLY.FlyADBase/FLY.Simulation.Coating/Coating.cs
View file @
9be5cc66
...
@@ -29,24 +29,13 @@ namespace FLY.Simulation.Coating
...
@@ -29,24 +29,13 @@ namespace FLY.Simulation.Coating
coatingmode
=
value
;
coatingmode
=
value
;
hmi_cc
.
CoatingMode
=
value
;
hmi_cc
.
CoatingMode
=
value
;
inner_cc
.
CoatingMode
=
value
;
inner_cc
.
CoatingMode
=
value
;
NotifyPropertyChanged
(
"CoatingMode"
);
}
}
}
private
int
port
=
502
;
public
int
Port
{
get
{
return
port
;
}
set
{
if
(
port
!=
value
)
{
port
=
value
;
NotifyPropertyChanged
(
"Port"
);
}
}
}
}
}
}
public
int
Port
{
get
;
set
;
}
=
502
;
public
class
DataInfo
public
class
DataInfo
{
{
public
bool
IsLight
;
//是亮
public
bool
IsLight
;
//是亮
...
@@ -69,29 +58,13 @@ namespace FLY.Simulation.Coating
...
@@ -69,29 +58,13 @@ namespace FLY.Simulation.Coating
/// <summary>
/// <summary>
/// 膜宽
/// 膜宽
/// </summary>
/// </summary>
public
int
FilmWidth
{
public
int
FilmWidth
=>
Datas_Horizontal
.
Count
();
get
{
return
Datas_Horizontal
.
Count
();
}
}
double
filmvelocity
=
12
;
/// <summary>
/// <summary>
/// 膜速度 m/min
/// 膜速度 m/min
/// </summary>
/// </summary>
public
double
FilmVelocity
public
double
FilmVelocity
{
get
;
set
;
}
=
12
;
{
get
{
return
filmvelocity
;
}
set
{
if
(
filmvelocity
!=
value
)
{
filmvelocity
=
value
;
NotifyPropertyChanged
(
"FilmVelocity"
);
}
}
}
/// <summary>
/// <summary>
...
@@ -110,21 +83,11 @@ namespace FLY.Simulation.Coating
...
@@ -110,21 +83,11 @@ namespace FLY.Simulation.Coating
double
RPosition
=
0
;
double
RPosition
=
0
;
private
double
filmlength
=
0
;
/// <summary>
/// <summary>
/// 膜已经跑了的长度。m
/// 膜已经跑了的长度。m
/// </summary>
/// </summary>
public
double
FilmLength
public
double
FilmLength
{
get
;
set
;
}
{
get
{
return
filmlength
;
}
set
{
if
(
filmlength
!=
value
)
{
filmlength
=
value
;
NotifyPropertyChanged
(
"FilmLength"
);
}
}
}
/// <summary>
/// <summary>
/// 烘箱长度 30m
/// 烘箱长度 30m
/// </summary>
/// </summary>
...
@@ -142,32 +105,11 @@ namespace FLY.Simulation.Coating
...
@@ -142,32 +105,11 @@ namespace FLY.Simulation.Coating
/// </summary>
/// </summary>
public
bool
HSignal
;
public
bool
HSignal
;
private
bool
devicestate
;
public
bool
DeviceState
{
get
{
return
devicestate
;
}
set
{
if
(
devicestate
!=
value
)
{
devicestate
=
value
;
NotifyPropertyChanged
(
"DeviceState"
);
}
}
}
private
double
avg
;
public
bool
DeviceState
{
get
;
set
;
}
public
double
Avg
{
get
{
return
avg
;
}
public
double
Avg
{
get
;
set
;
}
set
{
if
(
avg
!=
value
)
{
avg
=
value
;
NotifyPropertyChanged
(
"Avg"
);
}
}
}
void
Load_Vertical
()
void
Load_Vertical
()
{
{
...
...
Project.FLY.FlyADBase/FLY.Simulation.Coating/FLY.Simulation.Coating.csproj
View file @
9be5cc66
...
@@ -66,6 +66,11 @@
...
@@ -66,6 +66,11 @@
<Name>
FLY.Simulation
</Name>
<Name>
FLY.Simulation
</Name>
</ProjectReference>
</ProjectReference>
</ItemGroup>
</ItemGroup>
<ItemGroup>
<PackageReference
Include=
"PropertyChanged.Fody"
>
<Version>
2.6.1
</Version>
</PackageReference>
</ItemGroup>
<Import
Project=
"$(MSBuildToolsPath)\Microsoft.CSharp.targets"
/>
<Import
Project=
"$(MSBuildToolsPath)\Microsoft.CSharp.targets"
/>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Other similar extension points exist, see Microsoft.Common.targets.
...
...
Project.FLY.FlyADBase/FLY.Simulation.Coating/GageAD.cs
View file @
9be5cc66
...
@@ -98,6 +98,20 @@ namespace FLY.Simulation.Coating
...
@@ -98,6 +98,20 @@ namespace FLY.Simulation.Coating
mCoating
.
OnPoll
(
now
);
mCoating
.
OnPoll
(
now
);
}
}
/// <summary>
/// 横向边界信号 i5
/// </summary>
public
const
int
HSIGN_NO
=
5
;
/// <summary>
/// 辊信号 i11
/// </summary>
public
const
int
RSIGN_NO
=
11
;
/// <summary>
/// 纵向边界信号 i12
/// </summary>
public
const
int
VSIGN_NO
=
12
;
public
UInt16
GetInput
()
public
UInt16
GetInput
()
{
{
UInt16
istatus
=
0x0fff
;
UInt16
istatus
=
0x0fff
;
...
...
Project.FLY.FlyADBase/FlyADBase/FlyAD7.cs
View file @
9be5cc66
...
@@ -955,7 +955,7 @@ namespace FlyADBase
...
@@ -955,7 +955,7 @@ namespace FlyADBase
int
CorrectAD
(
int
grid
,
int
ad
)
int
CorrectAD
(
int
grid
,
int
ad
)
{
{
int
[]
d
=
new
int
[
0
];
int
[]
d
=
new
int
[
1
];
d
[
0
]
=
ad
;
d
[
0
]
=
ad
;
CorrectADs
(
Misc
.
DIRECTION
.
FIX
,
grid
,
d
);
CorrectADs
(
Misc
.
DIRECTION
.
FIX
,
grid
,
d
);
return
d
[
0
];
return
d
[
0
];
...
...
Project.FLY.FlyADBase/FlyADBase/TimeGridAdvHelper.cs
View file @
9be5cc66
...
@@ -509,7 +509,7 @@ namespace FlyADBase
...
@@ -509,7 +509,7 @@ namespace FlyADBase
return
;
return
;
}
}
bool
istatus_no_b
=
Misc
.
MyBase
.
CHECKBIT
(
istatus
,
istatus_no
-
1
);
bool
istatus_no_b
=
Misc
.
MyBase
.
CHECKBIT
(
istatus
,
istatus_no
);
Range
r
=
new
Range
();
Range
r
=
new
Range
();
...
@@ -519,7 +519,7 @@ namespace FlyADBase
...
@@ -519,7 +519,7 @@ namespace FlyADBase
{
{
istatus
=
IStatusPool
[
i
].
istatus
;
istatus
=
IStatusPool
[
i
].
istatus
;
int
pos
=
IStatusPool
[
i
].
pos
;
int
pos
=
IStatusPool
[
i
].
pos
;
bool
b
=
Misc
.
MyBase
.
CHECKBIT
(
istatus
,
istatus_no
-
1
);
bool
b
=
Misc
.
MyBase
.
CHECKBIT
(
istatus
,
istatus_no
);
if
(
IStatusPool
[
i
].
dt
>=
end_dt
)
if
(
IStatusPool
[
i
].
dt
>=
end_dt
)
{
{
//结束,这是最后!!!
//结束,这是最后!!!
...
...
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