Skip to content

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

修复 扫描吹膜设置界面没有PLC读取旋转 开关

parent 8424f769
Show whitespace changes
Inline Side-by-side
Showing with 126 additions and 22 deletions
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.RotaryMachine/FLY.Thick.Blowing.RotaryMachine.csproj
View file @ aa7d91d6
...@@ -56,5 +56,10 @@ ...@@ -56,5 +56,10 @@
<Name>FObjBase</Name> <Name>FObjBase</Name>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup>
<PackageReference Include="PropertyChanged.Fody">
<Version>3.3.1</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project> </Project>
\ No newline at end of file
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.RotaryMachine/FodyWeavers.xml 0 → 100644
View file @ aa7d91d6
<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
<PropertyChanged />
</Weavers>
\ No newline at end of file
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.RotaryMachine/FodyWeavers.xsd 0 → 100644
View file @ aa7d91d6
<?xml version="1.0" encoding="utf-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
<!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
<xs:element name="Weavers">
<xs:complexType>
<xs:all>
<xs:element name="PropertyChanged" minOccurs="0" maxOccurs="1">
<xs:complexType>
<xs:attribute name="InjectOnPropertyNameChanged" type="xs:boolean">
<xs:annotation>
<xs:documentation>Used to control if the On_PropertyName_Changed feature is enabled.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="TriggerDependentProperties" type="xs:boolean">
<xs:annotation>
<xs:documentation>Used to control if the Dependent properties feature is enabled.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="EnableIsChangedProperty" type="xs:boolean">
<xs:annotation>
<xs:documentation>Used to control if the IsChanged property feature is enabled.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="EventInvokerNames" type="xs:string">
<xs:annotation>
<xs:documentation>Used to change the name of the method that fires the notify event. This is a string that accepts multiple values in a comma separated form.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="CheckForEquality" type="xs:boolean">
<xs:annotation>
<xs:documentation>Used to control if equality checks should be inserted. If false, equality checking will be disabled for the project.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="CheckForEqualityUsingBaseEquals" type="xs:boolean">
<xs:annotation>
<xs:documentation>Used to control if equality checks should use the Equals method resolved from the base class.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="UseStaticEqualsFromBase" type="xs:boolean">
<xs:annotation>
<xs:documentation>Used to control if equality checks should use the static Equals method resolved from the base class.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="SuppressWarnings" type="xs:boolean">
<xs:annotation>
<xs:documentation>Used to turn off build warnings from this weaver.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="SuppressOnPropertyNameChangedWarning" type="xs:boolean">
<xs:annotation>
<xs:documentation>Used to turn off build warnings about mismatched On_PropertyName_Changed methods.</xs:documentation>
</xs:annotation>
</xs:attribute>
</xs:complexType>
</xs:element>
</xs:all>
<xs:attribute name="VerifyAssembly" type="xs:boolean">
<xs:annotation>
<xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="VerifyIgnoreCodes" type="xs:string">
<xs:annotation>
<xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="GenerateXsd" type="xs:boolean">
<xs:annotation>
<xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
</xs:annotation>
</xs:attribute>
</xs:complexType>
</xs:element>
</xs:schema>
\ No newline at end of file
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Server/Properties/AssemblyInfo.cs
View file @ aa7d91d6
...@@ -51,6 +51,6 @@ using System.Windows; ...@@ -51,6 +51,6 @@ using System.Windows;
// 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值， // 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值，
// 方法是按如下所示使用“*”: // 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("7.0.1")] [assembly: AssemblyVersion("7.0.2")]
[assembly: AssemblyFileVersion("7.0.1")] [assembly: AssemblyFileVersion("7.0.2")]
[assembly: Guid("72FBA808-FA10-43BF-8504-C6E814E031E7")] [assembly: Guid("72FBA808-FA10-43BF-8504-C6E814E031E7")]
Project.FLY.Thick.Blowing/FLY.Thick.Blowing/Server/BlowingDetect.cs
View file @ aa7d91d6
...@@ -559,17 +559,17 @@ namespace FLY.Thick.Blowing.Server ...@@ -559,17 +559,17 @@ namespace FLY.Thick.Blowing.Server
//更新其它参数 //更新其它参数
update_param_for_limit(sd.Time); update_param_for_limit(sd.Time);
} }
else if (e.PropertyName == nameof(IRotarySerivce.IsOrgSign)) //else if (e.PropertyName == nameof(IRotarySerivce.IsOrgSign))
{ //{
SignData sd = new SignData() // SignData sd = new SignData()
{ // {
No = 2, // No = 2,
Time = DateTime.Now, // Time = DateTime.Now,
On = rotarySerivce.IsOrgSign, // On = rotarySerivce.IsOrgSign,
GlobalRPos = GlobalRPos // GlobalRPos = GlobalRPos
}; // };
mSignList.RAdd(sd); // mSignList.RAdd(sd);
} //}
else if (propertyNameOfUpdateOrgRPos.Contains(e.PropertyName)) else if (propertyNameOfUpdateOrgRPos.Contains(e.PropertyName))
{ {
update_orgRPos_plc(); update_orgRPos_plc();
...@@ -710,7 +710,7 @@ namespace FLY.Thick.Blowing.Server ...@@ -710,7 +710,7 @@ namespace FLY.Thick.Blowing.Server
void flyad_IStatusChangedEvent(object sender, FlyADBase.IStatusChangedEventArgs e) void flyad_IStatusChangedEvent(object sender, FlyADBase.IStatusChangedEventArgs e)
{ {
if (IsPlcMode) if (IsPlcMode2)
{ {
//PLC模式不采集旋转信号 //PLC模式不采集旋转信号
} }
...@@ -722,7 +722,15 @@ namespace FLY.Thick.Blowing.Server ...@@ -722,7 +722,15 @@ namespace FLY.Thick.Blowing.Server
update_roll(e); update_roll(e);
} }
bool IsPlcMode2
{
get {
if (rotarySerivce != null && IsPlcMode)
return true;
else
return false;
}
}
/// <summary> /// <summary>
/// 1秒触发一次 /// 1秒触发一次
/// </summary> /// </summary>
...@@ -741,7 +749,7 @@ namespace FLY.Thick.Blowing.Server ...@@ -741,7 +749,7 @@ namespace FLY.Thick.Blowing.Server
OnPoll_checkRVelocity(); OnPoll_checkRVelocity();
//-------------------------------------------------------------------- //--------------------------------------------------------------------
if (IsPlcMode) //PLC模式 if (IsPlcMode2) //PLC模式
{ {
//更新旋转脉冲 & 角度 //更新旋转脉冲 & 角度
OnPoll_updateRPos_plc(); OnPoll_updateRPos_plc();
......
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Client/Properties/AssemblyInfo.cs
View file @ aa7d91d6
...@@ -51,6 +51,6 @@ using System.Windows; ...@@ -51,6 +51,6 @@ using System.Windows;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示: //通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("7.0.1")] [assembly: AssemblyVersion("7.0.2")]
[assembly: AssemblyFileVersion("7.0.1")] [assembly: AssemblyFileVersion("7.0.2")]
[assembly: Guid("38E0D8EC-4D1C-49FF-AB08-6289294C5BD4")] [assembly: Guid("38E0D8EC-4D1C-49FF-AB08-6289294C5BD4")]
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Server/Properties/AssemblyInfo.cs
View file @ aa7d91d6
...@@ -51,7 +51,7 @@ using System.Windows; ...@@ -51,7 +51,7 @@ using System.Windows;
// 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值， // 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值，
// 方法是按如下所示使用“*”: // 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("7.0.1.0")] [assembly: AssemblyVersion("7.0.3.0")]
[assembly: AssemblyFileVersion("7.0.1.0")] [assembly: AssemblyFileVersion("7.0.3.0")]
[assembly: Guid("A2277244-BCD4-485B-85F4-AAE96DA235B5")] [assembly: Guid("A2277244-BCD4-485B-85F4-AAE96DA235B5")]
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI/PgBlowing/PgBlowing.xaml
View file @ aa7d91d6
...@@ -269,11 +269,15 @@ ...@@ -269,11 +269,15 @@
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="立式旋转" /> <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="立式旋转" />
<ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" HorizontalAlignment="Left" IsChecked="{Binding Is3D}"/> <ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" HorizontalAlignment="Left" IsChecked="{Binding Is3D}"/>
</StackPanel> </StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}" >
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="旋转PLC模式" />
<ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" HorizontalAlignment="Left" IsChecked="{Binding IsPlcMode}"/>
</StackPanel>
<StackPanel Margin="{StaticResource ControlMargin}" > <StackPanel Margin="{StaticResource ControlMargin}" >
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="旋转编码器" /> <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="旋转编码器" />
<ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" HorizontalAlignment="Left" IsChecked="{Binding IsRPosMode}"/> <ToggleButton Style="{StaticResource Styles.ToggleButton.YESNO}" HorizontalAlignment="Left" IsChecked="{Binding IsRPosMode}"/>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" Visibility="{Binding IsRPosMode,Converter={StaticResource visbilityconv}}"> <StackPanel Orientation="Horizontal" Visibility="{Binding IsRPosParamVisible,Converter={StaticResource visbilityconv}}">
<StackPanel Margin="{StaticResource ControlMargin}"> <StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="旋转总脉冲" /> <TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="旋转总脉冲" />
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
...@@ -282,8 +286,16 @@ ...@@ -282,8 +286,16 @@
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" Visibility="{Binding IsPlcMode,Converter={StaticResource visbilityconv}}">
<StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader.Editable}" Text="旋转PLC服务地址" />
<StackPanel Orientation="Horizontal">
<TextBox Style="{StaticResource Styles.Text.FieldContent.Input.Card}" Text="{Binding PlcAddr}" />
</StackPanel>
</StackPanel>
</StackPanel>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" Visibility="{Binding IsRPosMode,Converter={StaticResource visbilityconv},ConverterParameter=Collapsed}"> <StackPanel Orientation="Horizontal" Visibility="{Binding IsRPosParamVisible,Converter={StaticResource visbilityconv},ConverterParameter=Collapsed}">
<StackPanel Orientation="Horizontal" DataContext="{Binding bDetect}"> <StackPanel Orientation="Horizontal" DataContext="{Binding bDetect}">
<StackPanel Margin="{StaticResource ControlMargin}"> <StackPanel Margin="{StaticResource ControlMargin}">
<TextBlock Style="{StaticResource Styles.Text.FieldHeader}" Text="复位信号脉冲" /> <TextBlock Style="{StaticResource Styles.Text.FieldHeader}" Text="复位信号脉冲" />
......
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI/PgBlowing/PgBlowingVm.cs
View file @ aa7d91d6
...@@ -199,6 +199,8 @@ namespace FLY.Thick.BlowingScan.UI.Client ...@@ -199,6 +199,8 @@ namespace FLY.Thick.BlowingScan.UI.Client
} }
#endregion #endregion
#region Command #region Command
public RelayCommand ApplyCmd { get; } public RelayCommand ApplyCmd { get; }
public RelayCommand DownloadCmd { get; } public RelayCommand DownloadCmd { get; }
......
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