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
d2d1fcd6
Commit
d2d1fcd6
authored
Jul 04, 2021
by
潘栩锋
🚴
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加 吹膜测厚 添加 信号0,信号1,辊速 输入口自定义
parent
496486c5
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
343 additions
and
31 deletions
+343
-31
PgBlowing.xaml
...ick.Blowing/FLY.Thick.Blowing.UI/PgBlowing/PgBlowing.xaml
+25
-2
PgBlowing.xaml.cs
....Blowing/FLY.Thick.Blowing.UI/PgBlowing/PgBlowing.xaml.cs
+21
-0
PgBlowingVm.cs
...ick.Blowing/FLY.Thick.Blowing.UI/PgBlowing/PgBlowingVm.cs
+23
-0
PgBlowingVmUt.cs
...k.Blowing/FLY.Thick.Blowing.UI/PgBlowing/PgBlowingVmUt.cs
+3
-0
BlowingDetectServiceClient.cs
...ng/FLY.Thick.Blowing/Client/BlowingDetectServiceClient.cs
+16
-0
IBlowingDetectService.cs
...owing/FLY.Thick.Blowing/IService/IBlowingDetectService.cs
+13
-1
BlowingDetect.cs
...Y.Thick.Blowing/FLY.Thick.Blowing/Server/BlowingDetect.cs
+39
-12
PgBlowing.xaml
...owing360/FLY.Thick.Blowing360.UI/PgBlowing/PgBlowing.xaml
+36
-1
PgBlowing.xaml.cs
...ng360/FLY.Thick.Blowing360.UI/PgBlowing/PgBlowing.xaml.cs
+21
-0
PgBlowingVm.cs
...owing360/FLY.Thick.Blowing360.UI/PgBlowing/PgBlowingVm.cs
+23
-0
PgBlowingVmUt.cs
...ing360/FLY.Thick.Blowing360.UI/PgBlowing/PgBlowingVmUt.cs
+13
-0
BlowingDetect360.cs
...lowing360/FLY.Thick.Blowing360/Server/BlowingDetect360.cs
+21
-6
PgBlowing.xaml
...ingScan/FLY.Thick.BlowingScan.UI/PgBlowing/PgBlowing.xaml
+31
-9
PgBlowing.xaml.cs
...Scan/FLY.Thick.BlowingScan.UI/PgBlowing/PgBlowing.xaml.cs
+23
-0
PgBlowingVm.cs
...ingScan/FLY.Thick.BlowingScan.UI/PgBlowing/PgBlowingVm.cs
+22
-0
PgBlowingVmUt.cs
...gScan/FLY.Thick.BlowingScan.UI/PgBlowing/PgBlowingVmUt.cs
+13
-0
No files found.
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI/PgBlowing/PgBlowing.xaml
View file @
d2d1fcd6
...
...
@@ -22,7 +22,9 @@
</ResourceDictionary.MergedDictionaries>
<local:OnOffConverter x:Key="onOffConv"/>
<local:InNoConverter x:Key="inNoConv"/>
<local:PgBlowingVmUt x:Key="viewModel" IsRPosMode ="False"/>
</ResourceDictionary>
</Page.Resources>
...
...
@@ -144,14 +146,14 @@
</StackPanel>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource
TextBlockStyle_FieldHeader
Editable}" Text="膜距离" />
<TextBlock Style="{StaticResource
Styles.Text.FieldHeader.
Editable}" Text="膜距离" />
<StackPanel Orientation="Horizontal">
<TextBox HorizontalAlignment="Left" MaxWidth="150" Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding FilmLength,StringFormat={}{0:F1}}" />
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" Text="m" />
</StackPanel>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource
TextBlockStyle_FieldHeader
Editable}" Text="辊周长" />
<TextBlock Style="{StaticResource
Styles.Text.FieldHeader.
Editable}" Text="辊周长" />
<StackPanel Orientation="Horizontal">
<TextBox HorizontalAlignment="Left" MaxWidth="150" Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding RollPerimeter}" />
<TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" Text="mm" />
...
...
@@ -355,6 +357,27 @@
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="信号缺少模式" />
<ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" HorizontalAlignment="Left" IsChecked="{Binding IsLackSignMode}" />
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable.Row2}" Text="信号0 输入号" />
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource Styles.Text.FieldContent}" Text="i"/>
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding InNo_Limit0,Converter={StaticResource inNoConv}}" />
</StackPanel>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable.Row2}" Text="信号1 输入号" />
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource Styles.Text.FieldContent}" Text="i"/>
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding InNo_Limit1,Converter={StaticResource inNoConv}}" />
</StackPanel>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable.Row2}" Text="辊速 输入号" />
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource Styles.Text.FieldContent}" Text="i"/>
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding InNo_Roll,Converter={StaticResource inNoConv}}" />
</StackPanel>
</StackPanel>
</StackPanel>
</StackPanel>
</StackPanel>
...
...
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI/PgBlowing/PgBlowing.xaml.cs
View file @
d2d1fcd6
...
...
@@ -70,6 +70,27 @@ namespace FLY.Thick.Blowing.UI.Fix.Client
}
}
public
class
InNoConverter
:
IValueConverter
{
public
object
Convert
(
object
value
,
Type
targetType
,
object
parameter
,
CultureInfo
culture
)
{
if
(
value
is
int
)
{
return
((
int
)
value
+
1
).
ToString
();
}
return
null
;
}
public
object
ConvertBack
(
object
value
,
Type
targetType
,
object
parameter
,
CultureInfo
culture
)
{
if
(
value
is
string
)
{
if
(!
int
.
TryParse
((
string
)
value
,
out
int
no
))
return
null
;
return
no
-
1
;
}
return
null
;
}
}
}
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI/PgBlowing/PgBlowingVm.cs
View file @
d2d1fcd6
...
...
@@ -92,6 +92,20 @@ namespace FLY.Thick.Blowing.UI.Fix.Client
/// </summary>
public
int
RPosOfR
{
get
;
set
;
}
/// <summary>
/// 自定义 转向信号 输入口序号 从0开始 默认9-1
/// </summary>
public
int
InNo_Limit0
{
get
;
set
;
}
=
9
-
1
;
/// <summary>
/// 自定义 转向信号 输入口序号 从0开始 默认10-1
/// </summary>
public
int
InNo_Limit1
{
get
;
set
;
}
=
10
-
1
;
/// <summary>
/// 自定义 辊速度 输入口序号 从0开始 默认11-1
/// </summary>
public
int
InNo_Roll
{
get
;
set
;
}
=
11
-
1
;
#
endregion
#
region
分区设定
/// <summary>
...
...
@@ -178,6 +192,11 @@ namespace FLY.Thick.Blowing.UI.Fix.Client
Misc
.
BindingOperations
.
SetBinding
(
bDetect
,
nameof
(
bDetect
.
RPosOfR
),
this
,
nameof
(
RPosOfR
));
Misc
.
BindingOperations
.
SetBinding
(
bDetect
,
nameof
(
bDetect
.
InNo_Limit0
),
this
,
nameof
(
InNo_Limit0
));
Misc
.
BindingOperations
.
SetBinding
(
bDetect
,
nameof
(
bDetect
.
InNo_Limit1
),
this
,
nameof
(
InNo_Limit1
));
Misc
.
BindingOperations
.
SetBinding
(
bDetect
,
nameof
(
bDetect
.
InNo_Roll
),
this
,
nameof
(
InNo_Roll
));
Misc
.
BindingOperations
.
SetBinding
(
renZiJiaService
,
nameof
(
renZiJiaService
.
IsProbeRight
),
this
,
nameof
(
IsProbeRight
));
Misc
.
BindingOperations
.
SetBinding
(
renZiJiaService
,
nameof
(
renZiJiaService
.
ChannelCnt
),
this
,
nameof
(
ChannelCnt
));
...
...
@@ -350,6 +369,10 @@ namespace FLY.Thick.Blowing.UI.Fix.Client
bDetect
.
IsRPosMode
=
this
.
IsRPosMode
;
bDetect
.
RPosOfR
=
this
.
RPosOfR
;
bDetect
.
InNo_Limit0
=
this
.
InNo_Limit0
;
bDetect
.
InNo_Limit1
=
this
.
InNo_Limit1
;
bDetect
.
InNo_Roll
=
this
.
InNo_Roll
;
bDetect
.
Apply
();
renZiJiaService
.
ChannelCnt
=
this
.
ChannelCnt
;
...
...
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI/PgBlowing/PgBlowingVmUt.cs
View file @
d2d1fcd6
...
...
@@ -168,6 +168,9 @@ namespace FLY.Thick.Blowing.UI.Fix.Client
public
int
RSpeed
{
get
;
set
;
}
public
DateTime
DefaultTime
{
get
;
set
;
}
public
int
InNo_Limit0
{
get
;
set
;
}
=
9
-
1
;
public
int
InNo_Limit1
{
get
;
set
;
}
=
10
-
1
;
public
int
InNo_Roll
{
get
;
set
;
}
=
11
-
1
;
public
event
PropertyChangedEventHandler
PropertyChanged
;
...
...
Project.FLY.Thick.Blowing/FLY.Thick.Blowing/Client/BlowingDetectServiceClient.cs
View file @
d2d1fcd6
...
...
@@ -103,6 +103,22 @@ namespace FLY.Thick.Blowing.Client
/// 通过看 转向信号列表,可以看到
/// </summary>
public
int
RPosOfR
{
get
;
set
;
}
/// <summary>
/// 自定义 转向信号 输入口序号 从0开始 默认9-1
/// </summary>
public
int
InNo_Limit0
{
get
;
set
;
}
/// <summary>
/// 自定义 转向信号 输入口序号 从0开始 默认10-1
/// </summary>
public
int
InNo_Limit1
{
get
;
set
;
}
/// <summary>
/// 自定义 辊速度 输入口序号 从0开始 默认11-1
/// </summary>
public
int
InNo_Roll
{
get
;
set
;
}
#
endregion
#
region
状态
...
...
Project.FLY.Thick.Blowing/FLY.Thick.Blowing/IService/IBlowingDetectService.cs
View file @
d2d1fcd6
...
...
@@ -88,8 +88,20 @@ namespace FLY.Thick.Blowing.IService
/// </summary>
int
RPosOfR
{
get
;
set
;
}
/// <summary>
/// 自定义 转向信号 输入口序号 从0开始 默认9-1
/// </summary>
int
InNo_Limit0
{
get
;
set
;
}
/// <summary>
/// 自定义 转向信号 输入口序号 从0开始 默认10-1
/// </summary>
int
InNo_Limit1
{
get
;
set
;
}
/// <summary>
/// 自定义 辊速度 输入口序号 从0开始 默认11-1
/// </summary>
int
InNo_Roll
{
get
;
set
;
}
#
endregion
#
region
状态
...
...
Project.FLY.Thick.Blowing/FLY.Thick.Blowing/Server/BlowingDetect.cs
View file @
d2d1fcd6
...
...
@@ -28,21 +28,21 @@ namespace FLY.Thick.Blowing.Server
/// <summary>
/// 限位0 对应输入位
/// </summary>
const
int
Limit0_bit
=
9
;
const
int
Limit0_bit
=
9
-
1
;
/// <summary>
/// 限位1 对应输入位
/// </summary>
const
int
Limit1_bit
=
10
;
const
int
Limit1_bit
=
10
-
1
;
/// <summary>
/// 辊信号 对应输入位
/// </summary>
const
int
Roll_bit
=
11
;
const
int
Roll_bit
=
11
-
1
;
#
endregion
...
...
@@ -132,11 +132,21 @@ namespace FLY.Thick.Blowing.Server
/// </summary>
public
int
RPosOfR
{
get
;
set
;
}
=
50000
;
/// <summary>
/// 刚开机,信号列表一个信号都没有,创造一个时间点,作为信号点
/// </summary>
public
DateTime
DefaultTime
{
get
;
set
;
}
/// 自定义 转向信号 输入口序号 从0开始 默认9-1
/// </summary>
public
int
InNo_Limit0
{
get
;
set
;
}
=
Limit0_bit
;
/// <summary>
/// 自定义 转向信号 输入口序号 从0开始 默认10-1
/// </summary>
public
int
InNo_Limit1
{
get
;
set
;
}
=
Limit1_bit
;
/// <summary>
/// 自定义 辊速度 输入口序号 从0开始 默认11-1
/// </summary>
public
int
InNo_Roll
{
get
;
set
;
}
=
Roll_bit
;
#
endregion
#
region
状态
...
...
@@ -194,6 +204,10 @@ namespace FLY.Thick.Blowing.Server
/// </summary>
public
int
RSpeed
{
get
;
protected
set
;
}
/// <summary>
/// 刚开机,信号列表一个信号都没有,创造一个时间点,作为信号点
/// </summary>
public
DateTime
DefaultTime
{
get
;
protected
set
;
}
#
endregion
...
...
@@ -483,20 +497,20 @@ namespace FLY.Thick.Blowing.Server
bool
status
=
false
;
//信号的状态 true开始, false结束
int
position2
=
e
.
Position2
;
if
(
Misc
.
MyBase
.
CHECKBIT
(
e
.
IChanged
,
Limit0_bit
-
1
))
//信号0 发生变化
if
(
Misc
.
MyBase
.
CHECKBIT
(
e
.
IChanged
,
InNo_Limit0
))
//信号0 发生变化
{
bchanged
=
true
;
no
=
0
;
if
(!
Misc
.
MyBase
.
CHECKBIT
(
e
.
IStatus
,
Limit0_bit
-
1
))
if
(!
Misc
.
MyBase
.
CHECKBIT
(
e
.
IStatus
,
InNo_Limit0
))
{
status
=
true
;
}
}
else
if
(
Misc
.
MyBase
.
CHECKBIT
(
e
.
IChanged
,
Limit1_bit
-
1
))
//信号1 发生变化
else
if
(
Misc
.
MyBase
.
CHECKBIT
(
e
.
IChanged
,
InNo_Limit
1
))
//信号1 发生变化
{
bchanged
=
true
;
no
=
1
;
if
(!
Misc
.
MyBase
.
CHECKBIT
(
e
.
IStatus
,
Limit1_bit
-
1
))
if
(!
Misc
.
MyBase
.
CHECKBIT
(
e
.
IStatus
,
InNo_Limit
1
))
{
status
=
true
;
}
...
...
@@ -574,11 +588,11 @@ namespace FLY.Thick.Blowing.Server
{
//----------------------------------------------------------------------
//更新辊信号
if
(!
Misc
.
MyBase
.
CHECKBIT
(
e
.
IChanged
,
Roll_bit
-
1
))
if
(!
Misc
.
MyBase
.
CHECKBIT
(
e
.
IChanged
,
InNo_Roll
))
return
;
//没有信号更新
//信号的状态
bool
status
=
!
Misc
.
MyBase
.
CHECKBIT
(
e
.
IStatus
,
Roll_bit
-
1
);
bool
status
=
!
Misc
.
MyBase
.
CHECKBIT
(
e
.
IStatus
,
InNo_Roll
);
if
(
status
)
//1->0 触发!!!
{
...
...
@@ -2070,7 +2084,20 @@ namespace FLY.Thick.Blowing.Server
/// </summary>
public
int
RPosOfR
=
50000
;
/// <summary>
/// 自定义 转向信号 输入口序号 从0开始 默认9-1
/// </summary>
public
int
InNo_Limit0
=
9
-
1
;
/// <summary>
/// 自定义 转向信号 输入口序号 从0开始 默认10-1
/// </summary>
public
int
InNo_Limit1
=
10
-
1
;
/// <summary>
/// 自定义 辊速度 输入口序号 从0开始 默认11-1
/// </summary>
public
int
InNo_Roll
=
11
-
1
;
}
...
...
Project.FLY.Thick.Blowing360/FLY.Thick.Blowing360.UI/PgBlowing/PgBlowing.xaml
View file @
d2d1fcd6
...
...
@@ -22,6 +22,7 @@
</ResourceDictionary.MergedDictionaries>
<local:OnOffConverter x:Key="onOffConv"/>
<local:InNoConverter x:Key="inNoConv"/>
<local:PgBlowingVmUt x:Key="viewModel" IsRPosMode ="False"/>
</ResourceDictionary>
...
...
@@ -296,7 +297,41 @@
</Grid.ColumnDefinitions>
<ScrollViewer CanContentScroll="True" PanningMode="Both" >
<StackPanel>
<Border Style="{StaticResource Styles.Card.Border}" >
<StackPanel >
<TextBlock Style="{StaticResource Styles.Card.Title}" Text="转向信号"/>
<StackPanel>
<StackPanel Orientation="Horizontal">
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable.Row2}" Text="信号0 输入号" />
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource Styles.Text.FieldContent}" Text="i"/>
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding InNo_Limit0,Converter={StaticResource inNoConv}}" />
</StackPanel>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable.Row2}" Text="信号1 输入号" />
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource Styles.Text.FieldContent}" Text="i"/>
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding InNo_Limit1,Converter={StaticResource inNoConv}}" />
</StackPanel>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable.Row2}" Text="辊速 输入号" />
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource Styles.Text.FieldContent}" Text="i"/>
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding InNo_Roll,Converter={StaticResource inNoConv}}" />
</StackPanel>
</StackPanel>
</StackPanel>
</StackPanel>
</StackPanel>
</Border>
</StackPanel>
</ScrollViewer>
<Border Style="{StaticResource Styles.Card.Border}" Grid.Column="1">
<Grid >
<Grid.RowDefinitions>
...
...
Project.FLY.Thick.Blowing360/FLY.Thick.Blowing360.UI/PgBlowing/PgBlowing.xaml.cs
View file @
d2d1fcd6
...
...
@@ -70,6 +70,27 @@ namespace FLY.Thick.Blowing360.UI
}
}
public
class
InNoConverter
:
IValueConverter
{
public
object
Convert
(
object
value
,
Type
targetType
,
object
parameter
,
CultureInfo
culture
)
{
if
(
value
is
int
)
{
return
((
int
)
value
+
1
).
ToString
();
}
return
null
;
}
public
object
ConvertBack
(
object
value
,
Type
targetType
,
object
parameter
,
CultureInfo
culture
)
{
if
(
value
is
string
)
{
if
(!
int
.
TryParse
((
string
)
value
,
out
int
no
))
return
null
;
return
no
-
1
;
}
return
null
;
}
}
}
Project.FLY.Thick.Blowing360/FLY.Thick.Blowing360.UI/PgBlowing/PgBlowingVm.cs
View file @
d2d1fcd6
...
...
@@ -56,6 +56,21 @@ namespace FLY.Thick.Blowing360.UI
/// </summary>
public
int
RPosOfR
{
get
;
set
;
}
/// <summary>
/// 自定义 转向信号 输入口序号 从0开始 默认9-1
/// </summary>
public
int
InNo_Limit0
{
get
;
set
;
}
=
9
-
1
;
/// <summary>
/// 自定义 转向信号 输入口序号 从0开始 默认10-1
/// </summary>
public
int
InNo_Limit1
{
get
;
set
;
}
=
10
-
1
;
/// <summary>
/// 自定义 辊速度 输入口序号 从0开始 默认11-1
/// </summary>
public
int
InNo_Roll
{
get
;
set
;
}
=
11
-
1
;
#
endregion
#
region
分区设定
/// <summary>
...
...
@@ -134,6 +149,10 @@ namespace FLY.Thick.Blowing360.UI
Misc
.
BindingOperations
.
SetBinding
(
bDetect
,
nameof
(
bDetect
.
IsRPosMode
),
this
,
nameof
(
IsRPosMode
));
Misc
.
BindingOperations
.
SetBinding
(
bDetect
,
nameof
(
bDetect
.
RPosOfR
),
this
,
nameof
(
RPosOfR
));
Misc
.
BindingOperations
.
SetBinding
(
bDetect
,
nameof
(
bDetect
.
InNo_Limit0
),
this
,
nameof
(
InNo_Limit0
));
Misc
.
BindingOperations
.
SetBinding
(
bDetect
,
nameof
(
bDetect
.
InNo_Limit1
),
this
,
nameof
(
InNo_Limit1
));
Misc
.
BindingOperations
.
SetBinding
(
bDetect
,
nameof
(
bDetect
.
InNo_Roll
),
this
,
nameof
(
InNo_Roll
));
Misc
.
BindingOperations
.
SetBinding
(
renZiJiaService
,
nameof
(
renZiJiaService
.
IsProbeRight
),
this
,
nameof
(
IsProbeRight
));
...
...
@@ -299,6 +318,10 @@ namespace FLY.Thick.Blowing360.UI
bDetect
.
IsRPosMode
=
this
.
IsRPosMode
;
bDetect
.
RPosOfR
=
this
.
RPosOfR
;
bDetect
.
InNo_Limit0
=
this
.
InNo_Limit0
;
bDetect
.
InNo_Limit1
=
this
.
InNo_Limit1
;
bDetect
.
InNo_Roll
=
this
.
InNo_Roll
;
bDetect
.
Apply
();
renZiJiaService
.
ChannelCnt
=
this
.
ChannelCnt
;
...
...
Project.FLY.Thick.Blowing360/FLY.Thick.Blowing360.UI/PgBlowing/PgBlowingVmUt.cs
View file @
d2d1fcd6
...
...
@@ -99,7 +99,20 @@ namespace FLY.Thick.Blowing360.UI
/// </summary>
public
int
RPosOfR
{
get
;
set
;
}
/// <summary>
/// 自定义 转向信号 输入口序号 从0开始 默认9-1
/// </summary>
public
int
InNo_Limit0
{
get
;
set
;
}
=
9
-
1
;
/// <summary>
/// 自定义 转向信号 输入口序号 从0开始 默认10-1
/// </summary>
public
int
InNo_Limit1
{
get
;
set
;
}
=
10
-
1
;
/// <summary>
/// 自定义 辊速度 输入口序号 从0开始 默认11-1
/// </summary>
public
int
InNo_Roll
{
get
;
set
;
}
=
11
-
1
;
#
endregion
...
...
Project.FLY.Thick.Blowing360/FLY.Thick.Blowing360/Server/BlowingDetect360.cs
View file @
d2d1fcd6
...
...
@@ -141,6 +141,21 @@ namespace FLY.Thick.Blowing360.Server
/// </summary>
double
MofR
=>
RollPerimeter
/
1000.0
;
/// <summary>
/// 自定义 转向信号 输入口序号 从0开始 默认9-1
/// </summary>
public
int
InNo_Limit0
{
get
;
set
;
}
=
9
-
1
;
/// <summary>
/// 自定义 转向信号 输入口序号 从0开始 默认10-1
/// </summary>
public
int
InNo_Limit1
{
get
;
set
;
}
=
10
-
1
;
/// <summary>
/// 自定义 辊速度 输入口序号 从0开始 默认11-1
/// </summary>
public
int
InNo_Roll
{
get
;
set
;
}
=
11
-
1
;
#
endregion
#
region
状态
...
...
@@ -435,20 +450,20 @@ namespace FLY.Thick.Blowing360.Server
bool
status
=
false
;
//信号的状态 true开始, false结束
int
position2
=
e
.
Position2
;
if
(
Misc
.
MyBase
.
CHECKBIT
(
e
.
IChanged
,
Limit0_bit
-
1
))
//信号0 发生变化
if
(
Misc
.
MyBase
.
CHECKBIT
(
e
.
IChanged
,
InNo_Limit0
))
//信号0 发生变化
{
bchanged
=
true
;
no
=
0
;
if
(!
Misc
.
MyBase
.
CHECKBIT
(
e
.
IStatus
,
Limit0_bit
-
1
))
if
(!
Misc
.
MyBase
.
CHECKBIT
(
e
.
IStatus
,
InNo_Limit0
))
{
status
=
true
;
}
}
else
if
(
Misc
.
MyBase
.
CHECKBIT
(
e
.
IChanged
,
Limit1_bit
-
1
))
//信号1 发生变化
else
if
(
Misc
.
MyBase
.
CHECKBIT
(
e
.
IChanged
,
InNo_Limit
1
))
//信号1 发生变化
{
bchanged
=
true
;
no
=
1
;
if
(!
Misc
.
MyBase
.
CHECKBIT
(
e
.
IStatus
,
Limit1_bit
-
1
))
if
(!
Misc
.
MyBase
.
CHECKBIT
(
e
.
IStatus
,
InNo_Limit
1
))
{
status
=
true
;
}
...
...
@@ -565,11 +580,11 @@ namespace FLY.Thick.Blowing360.Server
{
//----------------------------------------------------------------------
//更新辊信号
if
(!
Misc
.
MyBase
.
CHECKBIT
(
e
.
IChanged
,
Roll_bit
-
1
))
if
(!
Misc
.
MyBase
.
CHECKBIT
(
e
.
IChanged
,
InNo_Roll
))
return
;
//没有信号更新
//信号的状态
bool
status
=
!
Misc
.
MyBase
.
CHECKBIT
(
e
.
IStatus
,
Roll_bit
-
1
);
bool
status
=
!
Misc
.
MyBase
.
CHECKBIT
(
e
.
IStatus
,
InNo_Roll
);
if
(
status
)
//1->0 触发!!!
{
...
...
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI/PgBlowing/PgBlowing.xaml
View file @
d2d1fcd6
...
...
@@ -22,6 +22,7 @@
</ResourceDictionary.MergedDictionaries>
<local:OnOffConverter x:Key="onOffConv"/>
<local:InNoConverter x:Key="inNoConv"/>
<local:PgBlowingVmUt x:Key="viewModel" IsRPosMode ="False"/>
</ResourceDictionary>
...
...
@@ -383,17 +384,38 @@
</StackPanel>
</StackPanel>
</WrapPanel>
<StackPanel Orientation="Horizontal">
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="信号滤波" />
<ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" HorizontalAlignment="Left" IsChecked="{Binding IsSignFilter}" />
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="信号缺少模式" />
<ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" HorizontalAlignment="Left" IsChecked="{Binding IsLackSignMode}" />
<StackPanel Orientation="Horizontal">
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="信号滤波" />
<ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" HorizontalAlignment="Left" IsChecked="{Binding IsSignFilter}" />
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="信号缺少模式" />
<ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" HorizontalAlignment="Left" IsChecked="{Binding IsLackSignMode}" />
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable.Row2}" Text="信号0 输入号" />
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource Styles.Text.FieldContent}" Text="i"/>
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding InNo_Limit0,Converter={StaticResource inNoConv}}" />
</StackPanel>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable.Row2}" Text="信号1 输入号" />
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource Styles.Text.FieldContent}" Text="i"/>
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding InNo_Limit1,Converter={StaticResource inNoConv}}" />
</StackPanel>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable.Row2}" Text="辊速 输入号" />
<StackPanel Orientation="Horizontal">
<TextBlock Style="{StaticResource Styles.Text.FieldContent}" Text="i"/>
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding InNo_Roll,Converter={StaticResource inNoConv}}" />
</StackPanel>
</StackPanel>
</StackPanel>
</StackPanel>
</StackPanel>
</StackPanel>
</Border>
</StackPanel>
...
...
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI/PgBlowing/PgBlowing.xaml.cs
View file @
d2d1fcd6
...
...
@@ -83,4 +83,27 @@ namespace FLY.Thick.BlowingScan.UI.Client
throw
new
NotImplementedException
();
}
}
public
class
InNoConverter
:
IValueConverter
{
public
object
Convert
(
object
value
,
Type
targetType
,
object
parameter
,
CultureInfo
culture
)
{
if
(
value
is
int
)
{
return
((
int
)
value
+
1
).
ToString
();
}
return
null
;
}
public
object
ConvertBack
(
object
value
,
Type
targetType
,
object
parameter
,
CultureInfo
culture
)
{
if
(
value
is
string
)
{
if
(!
int
.
TryParse
((
string
)
value
,
out
int
no
))
return
null
;
return
no
-
1
;
}
return
null
;
}
}
}
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI/PgBlowing/PgBlowingVm.cs
View file @
d2d1fcd6
...
...
@@ -90,6 +90,21 @@ namespace FLY.Thick.BlowingScan.UI.Client
/// </summary>
public
int
RPosOfR
{
get
;
set
;
}
/// <summary>
/// 自定义 转向信号 输入口序号 从0开始 默认9-1
/// </summary>
public
int
InNo_Limit0
{
get
;
set
;
}
=
9
-
1
;
/// <summary>
/// 自定义 转向信号 输入口序号 从0开始 默认10-1
/// </summary>
public
int
InNo_Limit1
{
get
;
set
;
}
=
10
-
1
;
/// <summary>
/// 自定义 辊速度 输入口序号 从0开始 默认11-1
/// </summary>
public
int
InNo_Roll
{
get
;
set
;
}
=
11
-
1
;
#
endregion
#
region
分区设定
/// <summary>
...
...
@@ -198,6 +213,9 @@ namespace FLY.Thick.BlowingScan.UI.Client
Misc
.
BindingOperations
.
SetBinding
(
bDetect
,
nameof
(
bDetect
.
IsRPosMode
),
this
,
nameof
(
IsRPosMode
));
Misc
.
BindingOperations
.
SetBinding
(
bDetect
,
nameof
(
bDetect
.
RPosOfR
),
this
,
nameof
(
RPosOfR
));
Misc
.
BindingOperations
.
SetBinding
(
bDetect
,
nameof
(
bDetect
.
InNo_Limit0
),
this
,
nameof
(
InNo_Limit0
));
Misc
.
BindingOperations
.
SetBinding
(
bDetect
,
nameof
(
bDetect
.
InNo_Limit1
),
this
,
nameof
(
InNo_Limit1
));
Misc
.
BindingOperations
.
SetBinding
(
bDetect
,
nameof
(
bDetect
.
InNo_Roll
),
this
,
nameof
(
InNo_Roll
));
Misc
.
BindingOperations
.
SetBinding
(
renZiJiaService
,
nameof
(
renZiJiaService
.
IsProbeRight
),
this
,
nameof
(
IsProbeRight
));
Misc
.
BindingOperations
.
SetBinding
(
renZiJiaService
,
nameof
(
renZiJiaService
.
ChannelCnt
),
this
,
nameof
(
ChannelCnt
));
...
...
@@ -390,6 +408,10 @@ namespace FLY.Thick.BlowingScan.UI.Client
bDetect
.
IsRPosMode
=
this
.
IsRPosMode
;
bDetect
.
RPosOfR
=
this
.
RPosOfR
;
bDetect
.
InNo_Limit0
=
this
.
InNo_Limit0
;
bDetect
.
InNo_Limit1
=
this
.
InNo_Limit1
;
bDetect
.
InNo_Roll
=
this
.
InNo_Roll
;
bDetect
.
Apply
();
renZiJiaService
.
ChannelCnt
=
this
.
ChannelCnt
;
...
...
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI/PgBlowing/PgBlowingVmUt.cs
View file @
d2d1fcd6
...
...
@@ -99,7 +99,20 @@ namespace FLY.Thick.BlowingScan.UI.Client
public
int
RPosOfR
{
get
;
set
;
}
/// <summary>
/// 自定义 转向信号 输入口序号 从0开始 默认9-1
/// </summary>
public
int
InNo_Limit0
{
get
;
set
;
}
=
9
-
1
;
/// <summary>
/// 自定义 转向信号 输入口序号 从0开始 默认10-1
/// </summary>
public
int
InNo_Limit1
{
get
;
set
;
}
=
10
-
1
;
/// <summary>
/// 自定义 辊速度 输入口序号 从0开始 默认11-1
/// </summary>
public
int
InNo_Roll
{
get
;
set
;
}
=
11
-
1
;
#
endregion
#
region
状态
...
...
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