Skip to content

H
hemei
Commit 4ff1f1fd authored by 潘栩锋's avatar 潘栩锋 🚴
Browse files
Options

添加 吹膜测厚 BlowingDetect 添加 输入口自定义 开关

parent a726b77c
Hide whitespace changes
Inline Side-by-side
Showing with 104 additions and 61 deletions
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI/PgBlowing/PgBlowing.xaml
View file @ 4ff1f1fd
......@@ -358,26 +358,33 @@
<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&#13;输入号" />
<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>
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="自定义输入口" />
<ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" HorizontalAlignment="Left" IsChecked="{Binding IsInNoCustomized}" />
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable.Row2}" Text="信号1&#13;输入号" />
<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 Orientation="Horizontal" Visibility="{Binding IsInNoCustomized,Converter={StaticResource visbilityconv},ConverterParameter=Collapsed}">
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable.Row2}" Text="信号0&#13;输入号" />
<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>
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable.Row2}" Text="辊速&#13;输入号" />
<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 Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable.Row2}" Text="信号1&#13;输入号" />
<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="辊速&#13;输入号" />
<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>
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI/PgBlowing/PgBlowingVm.cs
View file @ 4ff1f1fd
......@@ -92,6 +92,10 @@ namespace FLY.Thick.Blowing.UI
/// </summary>
public int RPosOfR { get; set; }
/// <summary>
/// 自定义 输入口
/// </summary>
public bool IsInNoCustomized { get; set; }
/// <summary>
/// 自定义 转向信号 输入口序号 从0开始 默认9-1
/// </summary>
......@@ -191,7 +195,7 @@ namespace FLY.Thick.Blowing.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.IsInNoCustomized), this, nameof(IsInNoCustomized));
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));
......@@ -369,6 +373,7 @@ namespace FLY.Thick.Blowing.UI
bDetect.IsRPosMode = this.IsRPosMode;
bDetect.RPosOfR = this.RPosOfR;
bDetect.IsInNoCustomized = this.IsInNoCustomized;
bDetect.InNo_Limit0 = this.InNo_Limit0;
bDetect.InNo_Limit1 = this.InNo_Limit1;
bDetect.InNo_Roll = this.InNo_Roll;
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI/PgBlowing/PgBlowingVmUt.cs
View file @ 4ff1f1fd
......@@ -99,8 +99,14 @@ namespace FLY.Thick.Blowing.UI
/// </summary>
public int RPosOfR { get; set; }
/// <summary>
/// 自定义 输入口
/// </summary>
public bool IsInNoCustomized { 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;
#endregion
#region 状态
......@@ -168,9 +174,7 @@ namespace FLY.Thick.Blowing.UI
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.UI/PgMenu.xaml.cs
View file @ 4ff1f1fd
......@@ -83,11 +83,5 @@ namespace FLY.Thick.Blowing.UI
NavigationService.Navigate(p);
}
private void button_initparam_Click(object sender, RoutedEventArgs e)
{
PgInitparam p = new PgInitparam();
container.BuildUp(p);
NavigationService.Navigate(p);
}
}
}
Project.FLY.Thick.Blowing/FLY.Thick.Blowing/Client/BlowingDetectServiceClient.cs
View file @ 4ff1f1fd
......@@ -104,6 +104,11 @@ namespace FLY.Thick.Blowing.Client
/// </summary>
public int RPosOfR { get; set; }
/// <summary>
/// 自定义 输入口
/// </summary>
public bool IsInNoCustomized { get; set; }
/// <summary>
/// 自定义 转向信号 输入口序号 从0开始 默认9-1
/// </summary>
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing/IService/IBlowingDetectService.cs
View file @ 4ff1f1fd
......@@ -88,6 +88,11 @@ namespace FLY.Thick.Blowing.IService
/// </summary>
int RPosOfR { get; set; }
/// <summary>
/// 自定义 输入口
/// </summary>
bool IsInNoCustomized { get; set; }
/// <summary>
/// 自定义 转向信号 输入口序号 从0开始 默认9-1
/// </summary>
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing/OBJ_INTERFACE/OBJ_INTERFACE_ID.cs
View file @ 4ff1f1fd
......@@ -9,9 +9,6 @@ namespace FLY.Thick.Blowing.OBJ_INTERFACE
{
public const UInt32 JSONDIST_ID = 10000;
/// <summary>
/// 3个
/// </summary>
public const UInt32 WARNING_OBJ_ID = 20000;
public const UInt32 IO_ID = 30000;
......@@ -20,7 +17,7 @@ namespace FLY.Thick.Blowing.OBJ_INTERFACE
public const UInt32 CURVE_ID = 30003;
//public const UInt32 DYNAREA_ID = 30004;
//public const UInt32 GET_SAMPLE_ID = 30005;
public const UInt32 INITPARAM_ID = 30006;
// public const UInt32 INITPARAM_ID = 30006;
//public const UInt32 SCANCORR_ID = 30008;
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing/Server.OBJProxy/OBJProxy.cs
View file @ 4ff1f1fd
......@@ -22,9 +22,6 @@ namespace FLY.Thick.Blowing.Server.OBJProxy
var curveOBJProxy = new FObjBase.Reflect.Reflect_Proxy(objsys_idx, OBJ_INTERFACE_ID.CURVE_ID,
typeof(ICurveService), gage.curve);
var initParamOBJProxy = new FObjBase.Reflect.Reflect_Proxy(objsys_idx, OBJ_INTERFACE_ID.INITPARAM_ID,
typeof(IInitParamService), gage.initParam);
var flyAdOBJProxy = new FObjBase.Reflect.Reflect_Proxy(objsys_idx, OBJ_INTERFACE_ID.FLYAD_ID,
typeof(IFlyADService), gage.flyAdService);
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing/Server/BlowingDetect.cs
View file @ 4ff1f1fd
......@@ -109,7 +109,10 @@ namespace FLY.Thick.Blowing.Server
/// </summary>
public int RPosOfR { get; set; } = 50000;
/// <summary>
/// 自定义 输入口
/// </summary>
public bool IsInNoCustomized { get; set; }
/// <summary>
/// 自定义 转向信号 输入口序号 从0开始 默认9-1
/// </summary>
......@@ -473,21 +476,24 @@ namespace FLY.Thick.Blowing.Server
int no = -1;//信号序号
bool status = false;//信号的状态 true开始， false结束
int position2 = e.Position2;
if (Misc.MyBase.CHECKBIT(e.IChanged, InNo_Limit0))//信号0 发生变化
int inNo_Limit0 = IsInNoCustomized ? InNo_Limit0 : Common.FlyADIODefine.Instance.InNo_Limit0;
int inNo_Limit1 = IsInNoCustomized ? InNo_Limit1 : Common.FlyADIODefine.Instance.InNo_Limit1;
if (Misc.MyBase.CHECKBIT(e.IChanged, inNo_Limit0))//信号0 发生变化
{
bchanged = true;
no = 0;
if (!Misc.MyBase.CHECKBIT(e.IStatus, InNo_Limit0))
if (!Misc.MyBase.CHECKBIT(e.IStatus, inNo_Limit0))
{
status = true;
}
}
else if (Misc.MyBase.CHECKBIT(e.IChanged, InNo_Limit1))//信号1 发生变化
else if (Misc.MyBase.CHECKBIT(e.IChanged, inNo_Limit1))//信号1 发生变化
{
bchanged = true;
no = 1;
if (!Misc.MyBase.CHECKBIT(e.IStatus, InNo_Limit1))
if (!Misc.MyBase.CHECKBIT(e.IStatus, inNo_Limit1))
{
status = true;
}
......@@ -563,13 +569,14 @@ namespace FLY.Thick.Blowing.Server
void update_roll(FlyADBase.IStatusChangedEventArgs e)
{
int inNo_Roll = IsInNoCustomized ? InNo_Roll : Common.FlyADIODefine.Instance.InNo_Roll;
//----------------------------------------------------------------------
//更新辊信号
if (!Misc.MyBase.CHECKBIT(e.IChanged, InNo_Roll))
if (!Misc.MyBase.CHECKBIT(e.IChanged, inNo_Roll))
return;//没有信号更新
//信号的状态
bool status = !Misc.MyBase.CHECKBIT(e.IStatus, InNo_Roll);
bool status = !Misc.MyBase.CHECKBIT(e.IStatus, inNo_Roll);
if (status)//1->0 触发!!!
{
......@@ -2098,6 +2105,11 @@ namespace FLY.Thick.Blowing.Server
/// 自定义 辊速度 输入口序号 从0开始 默认11-1
/// </summary>
public int InNo_Roll = 11 - 1;
/// <summary>
/// 自定义 输入口
/// </summary>
public bool IsInNoCustomized;
}
......
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI/PgBlowing/PgBlowing.xaml
View file @ 4ff1f1fd
......@@ -394,24 +394,30 @@
<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&#13;输入号" />
<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>
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="自定义输入口" />
<ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" HorizontalAlignment="Left" IsChecked="{Binding IsInNoCustomized}" />
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable.Row2}" Text="信号1&#13;输入号" />
<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 Orientation="Horizontal" Visibility="{Binding IsInNoCustomized,Converter={StaticResource visbilityconv},ConverterParameter=Collapsed}">
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable.Row2}" Text="信号0&#13;输入号" />
<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>
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable.Row2}" Text="辊速&#13;输入号" />
<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 Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable.Row2}" Text="信号1&#13;输入号" />
<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="辊速&#13;输入号" />
<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>
......
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI/PgBlowing/PgBlowingVm.cs
View file @ 4ff1f1fd
......@@ -90,6 +90,10 @@ namespace FLY.Thick.BlowingScan.UI.Client
/// </summary>
public int RPosOfR { get; set; }
/// <summary>
/// 自定义 输入口
/// </summary>
public bool IsInNoCustomized { get; set; }
/// <summary>
/// 自定义 转向信号 输入口序号 从0开始 默认9-1
/// </summary>
......@@ -212,6 +216,7 @@ 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.IsInNoCustomized), this, nameof(IsInNoCustomized));
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));
......@@ -407,6 +412,7 @@ namespace FLY.Thick.BlowingScan.UI.Client
bDetect.IsRPosMode = this.IsRPosMode;
bDetect.RPosOfR = this.RPosOfR;
bDetect.IsInNoCustomized = this.IsInNoCustomized;
bDetect.InNo_Limit0 = this.InNo_Limit0;
bDetect.InNo_Limit1 = this.InNo_Limit1;
bDetect.InNo_Roll = this.InNo_Roll;
......
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI/PgBlowing/PgBlowingVmUt.cs
View file @ 4ff1f1fd
......@@ -98,7 +98,14 @@ namespace FLY.Thick.BlowingScan.UI.Client
/// </summary>
public int RPosOfR { get; set; }
/// <summary>
/// 自定义 输入口
/// </summary>
public bool IsInNoCustomized { 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;
#endregion
......@@ -167,9 +174,7 @@ namespace FLY.Thick.BlowingScan.UI.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;
......
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