Skip to content

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

添加 浙江班奈特旋转PLC通讯

parent f6d4c75f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2050 additions and 14 deletions
FLY.Winder.BanNaiTe.UI.Server/App.config 0 → 100644
View file @ e12c6823
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
</startup>
</configuration>
\ No newline at end of file
FLY.Winder.BanNaiTe.UI.Server/App.xaml 0 → 100644
View file @ e12c6823
<Application x:Class="FLY.Winder.BanNaiTe.UI.Server.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:conv="clr-namespace:FLY.Winder.BanNaiTe.UI.Server.Converters"
StartupUri="MainWindow.xaml">
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="Themes/Styles.xaml"/>
</ResourceDictionary.MergedDictionaries>
<conv:ConnectionValueConverter x:Key="connectionConv"/>
<conv:VisibilityConverter x:Key="visbilityconv" />
</ResourceDictionary>
</Application.Resources>
</Application>
FLY.Winder.BanNaiTe.UI.Server/App.xaml.cs 0 → 100644
View file @ e12c6823
using System;
using System.Collections.Generic;
using System.Configuration;
using System.Data;
using System.Linq;
using System.Threading.Tasks;
using System.Windows;
namespace FLY.Winder.BanNaiTe.UI.Server
{
/// <summary>
/// App.xaml 的交互逻辑
/// </summary>
public partial class App : Application
{
}
}
FLY.Winder.BanNaiTe.UI.Server/Converters/ConnectionValueConverter.cs 0 → 100644
View file @ e12c6823
using System;
using System.Globalization;
using System.Windows.Data;
namespace FLY.Winder.BanNaiTe.UI.Server.Converters
{
public class ConnectionValueConverter : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
bool? b = (bool?)value;
if (b == null)
return null;
else if (b == true)
return "连接成功";
else
return "连接断开";
}
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
{
throw new NotImplementedException();
}
}
}
FLY.Winder.BanNaiTe.UI.Server/Converters/VisibilityConverter.cs 0 → 100644
View file @ e12c6823
using System;
using System.Windows.Data;
namespace FLY.Winder.BanNaiTe.UI.Server.Converters
{
public class VisibilityConverter : IValueConverter
{
#region IValueConverter 成员
public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
{
bool enable = (bool)value;
string p = null;
if (parameter != null)
p = parameter as string;
if (p == "Collapsed")
{
if (enable)
return System.Windows.Visibility.Visible;
else
return System.Windows.Visibility.Collapsed;
}
else if (p == "HiddenWhenTrue")
{
if (!enable)
return System.Windows.Visibility.Visible;
else
return System.Windows.Visibility.Hidden;
}
else if (p == "CollapsedWhenTrue")
{
if (!enable)
return System.Windows.Visibility.Visible;
else
return System.Windows.Visibility.Collapsed;
}
else
{
if (enable)
return System.Windows.Visibility.Visible;
else
return System.Windows.Visibility.Hidden;
}
}
public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
{
throw new NotImplementedException();
}
#endregion
}
}
FLY.Winder.BanNaiTe.UI.Server/FLY.Winder.BanNaiTe.UI.Server.csproj 0 → 100644
View file @ e12c6823
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{209249CF-310A-4107-85DC-A2C7585E73C7}</ProjectGuid>
<OutputType>WinExe</OutputType>
<RootNamespace>FLY.Winder.BanNaiTe.UI.Server</RootNamespace>
<AssemblyName>FLY.Winder.BanNaiTe.UI.Server</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>reload.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xaml">
<RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference>
<Reference Include="WindowsBase" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
</ItemGroup>
<ItemGroup>
<ApplicationDefinition Include="App.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</ApplicationDefinition>
<Compile Include="Converters\ConnectionValueConverter.cs" />
<Compile Include="Converters\VisibilityConverter.cs" />
<Compile Include="OBJProxy.cs" />
<Compile Include="PgMain.xaml.cs">
<DependentUpon>PgMain.xaml</DependentUpon>
</Compile>
<Compile Include="RotarySystem.cs" />
<Compile Include="RotaryPlc.cs" />
<Page Include="MainWindow.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Compile Include="App.xaml.cs">
<DependentUpon>App.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Compile Include="MainWindow.xaml.cs">
<DependentUpon>MainWindow.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Page Include="PgMain.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="RotaryPlcUt.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="RotarySystemUt.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Themes\ButtonStyle.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\Styles.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\TextStyle.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Costura.Fody">
<Version>4.1.0</Version>
</PackageReference>
<PackageReference Include="HslCommunication">
<Version>11.1.1</Version>
</PackageReference>
<PackageReference Include="Newtonsoft.Json">
<Version>12.0.3</Version>
</PackageReference>
<PackageReference Include="NLog">
<Version>4.6.8</Version>
</PackageReference>
<PackageReference Include="PropertyChanged.Fody">
<Version>3.3.1</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Project.FLY.Thick.Blowing\FLY.Thick.Blowing.RotaryMachine\FLY.Thick.Blowing.RotaryMachine.csproj">
<Project>{a1e64379-0509-4b01-8cea-5bc3cb323403}</Project>
<Name>FLY.Thick.Blowing.RotaryMachine</Name>
</ProjectReference>
<ProjectReference Include="..\thick_public\Project.FLY.AppHelper\FLY.AppHelper\FLY.AppHelper.csproj">
<Project>{9c46d98f-6500-490b-9e56-c89dfffa05f8}</Project>
<Name>FLY.AppHelper</Name>
</ProjectReference>
<ProjectReference Include="..\thick_public\Project.FLY.FObjSys\FObjBaseReflect\FObjBase.Reflect.csproj">
<Project>{15f40c32-d546-4b2a-8d80-b3ddbcdaa690}</Project>
<Name>FObjBase.Reflect</Name>
</ProjectReference>
<ProjectReference Include="..\thick_public\Project.FLY.FObjSys\FObjSys\FObjBase.csproj">
<Project>{abfe87d4-b692-4ae9-a8c0-1f470b8acbb8}</Project>
<Name>FObjBase</Name>
</ProjectReference>
<ProjectReference Include="..\thick_public\Project.FLY.Misc\MISC\Misc.csproj">
<Project>{5ee61ac6-5269-4f0f-b8fa-4334fe4a678f}</Project>
<Name>Misc</Name>
</ProjectReference>
<ProjectReference Include="..\thick_public\Project.FLY.OBJComponents\OBJComponents\FLY.OBJComponents.csproj">
<Project>{a539505d-9ac0-426b-a9a0-197df50598b0}</Project>
<Name>FLY.OBJComponents</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Resource Include="reload.ico" />
</ItemGroup>
<ItemGroup>
<Resource Include="FodyWeavers.xml" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
\ No newline at end of file
FLY.Winder.BanNaiTe.UI.Server/FodyWeavers.xml 0 → 100644
View file @ e12c6823
<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
<PropertyChanged />
<Costura />
</Weavers>
\ No newline at end of file
FLY.Winder.BanNaiTe.UI.Server/FodyWeavers.xsd 0 → 100644
View file @ e12c6823
<?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:element name="Costura" minOccurs="0" maxOccurs="1">
<xs:complexType>
<xs:all>
<xs:element minOccurs="0" maxOccurs="1" name="ExcludeAssemblies" type="xs:string">
<xs:annotation>
<xs:documentation>A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" maxOccurs="1" name="IncludeAssemblies" type="xs:string">
<xs:annotation>
<xs:documentation>A list of assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" maxOccurs="1" name="Unmanaged32Assemblies" type="xs:string">
<xs:annotation>
<xs:documentation>A list of unmanaged 32 bit assembly names to include, delimited with line breaks.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" maxOccurs="1" name="Unmanaged64Assemblies" type="xs:string">
<xs:annotation>
<xs:documentation>A list of unmanaged 64 bit assembly names to include, delimited with line breaks.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" maxOccurs="1" name="PreloadOrder" type="xs:string">
<xs:annotation>
<xs:documentation>The order of preloaded assemblies, delimited with line breaks.</xs:documentation>
</xs:annotation>
</xs:element>
</xs:all>
<xs:attribute name="CreateTemporaryAssemblies" type="xs:boolean">
<xs:annotation>
<xs:documentation>This will copy embedded files to disk before loading them into memory. This is helpful for some scenarios that expected an assembly to be loaded from a physical file.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="IncludeDebugSymbols" type="xs:boolean">
<xs:annotation>
<xs:documentation>Controls if .pdbs for reference assemblies are also embedded.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="DisableCompression" type="xs:boolean">
<xs:annotation>
<xs:documentation>Embedded assemblies are compressed by default, and uncompressed when they are loaded. You can turn compression off with this option.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="DisableCleanup" type="xs:boolean">
<xs:annotation>
<xs:documentation>As part of Costura, embedded assemblies are no longer included as part of the build. This cleanup can be turned off.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="LoadAtModuleInit" type="xs:boolean">
<xs:annotation>
<xs:documentation>Costura by default will load as part of the module initialization. This flag disables that behavior. Make sure you call CosturaUtility.Initialize() somewhere in your code.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="IgnoreSatelliteAssemblies" type="xs:boolean">
<xs:annotation>
<xs:documentation>Costura will by default use assemblies with a name like 'resources.dll' as a satellite resource and prepend the output path. This flag disables that behavior.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="ExcludeAssemblies" type="xs:string">
<xs:annotation>
<xs:documentation>A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with |</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="IncludeAssemblies" type="xs:string">
<xs:annotation>
<xs:documentation>A list of assembly names to include from the default action of "embed all Copy Local references", delimited with |.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="Unmanaged32Assemblies" type="xs:string">
<xs:annotation>
<xs:documentation>A list of unmanaged 32 bit assembly names to include, delimited with |.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="Unmanaged64Assemblies" type="xs:string">
<xs:annotation>
<xs:documentation>A list of unmanaged 64 bit assembly names to include, delimited with |.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="PreloadOrder" type="xs:string">
<xs:annotation>
<xs:documentation>The order of preloaded assemblies, delimited with |.</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
FLY.Winder.BanNaiTe.UI.Server/MainWindow.xaml 0 → 100644
View file @ e12c6823
<NavigationWindow x:Class="FLY.Winder.BanNaiTe.UI.Server.MainWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Title="MainWindow" SizeToContent="WidthAndHeight" MinWidth="400" MinHeight="200"
ShowsNavigationUI="False">
</NavigationWindow>
FLY.Winder.BanNaiTe.UI.Server/MainWindow.xaml.cs 0 → 100644
View file @ e12c6823
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace FLY.Winder.BanNaiTe.UI.Server
{
/// <summary>
/// MainWindow.xaml 的交互逻辑
/// </summary>
public partial class MainWindow : NavigationWindow
{
FLY.AppHelper.WindowNotifyIconHelper notifyiconhelper;
RotaryPlc plc;
RotarySystem rotarySystem;
OBJProxy oBJProxy;
public MainWindow()
{
InitializeComponent();
this.Title = (new Misc.Ver() { SrcType = typeof(MainWindow) }).ToString();
notifyiconhelper = new AppHelper.WindowNotifyIconHelper(this, this.Title);
plc = new RotaryPlc();
plc.Init();
plc.Start();
rotarySystem = new RotarySystem();
rotarySystem.Init(plc);
oBJProxy = new OBJProxy(0, rotarySystem);
FObjBase.PollModule.Current.Start();
this.Hide();
PgMain p = new PgMain();
p.Init(plc, rotarySystem);
this.Navigated += MainWindow_Navigated;
this.Navigate(p);
}
private void MainWindow_Navigated(object sender, NavigationEventArgs e)
{
if (CanGoBack) {
this.NavigationService.RemoveBackEntry();
}
this.Navigated -= MainWindow_Navigated;
}
}
}
FLY.Winder.BanNaiTe.UI.Server/OBJProxy.cs 0 → 100644
View file @ e12c6823
using FLY.Thick.Blowing.RotaryMachine.IService;
using System.Net;
namespace FLY.Winder.BanNaiTe.UI.Server
{
public class OBJProxy
{
public OBJProxy(int objsys_idx, RotarySystem rotarySystem)
{
var mRotarySystemOBJProxy = new FObjBase.Reflect.Reflect_Proxy(
objsys_idx,
FLY.Thick.Blowing.RotaryMachine.OBJ_INTERFACE.OBJ_INTERFACE_ID.RotarySerivce_OBJ_ID,
typeof(IRotarySerivce),
rotarySystem);
mRotarySystemOBJProxy.CurrObjSys.Start_Conn_Server(
new IPEndPoint(IPAddress.Any, 20004));
}
}
}
FLY.Winder.BanNaiTe.UI.Server/PgMain.xaml 0 → 100644
View file @ e12c6823
This diff is collapsed.
FLY.Winder.BanNaiTe.UI.Server/PgMain.xaml.cs 0 → 100644
View file @ e12c6823
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace FLY.Winder.BanNaiTe.UI.Server
{
/// <summary>
/// PgMain.xaml 的交互逻辑
/// </summary>
public partial class PgMain : Page
{
RotarySystem rotarySystem;
RotaryPlc rotaryPlc;
public ObservableCollection<SignCell> Signs = new ObservableCollection<SignCell>();
public PgMain()
{
InitializeComponent();
}
public void Init(RotaryPlc rotaryPlc, RotarySystem rotarySystem)
{
this.rotarySystem = rotarySystem;
this.rotaryPlc = rotaryPlc;
spPlc.DataContext = rotaryPlc;
spRotary.DataContext = rotarySystem;
dgrid.ItemsSource = Signs;
}
private void btnRotaryClick(object sender, RoutedEventArgs e)
{
Signs.Clear();
for (int i = 0; i < rotarySystem.Signs.Count(); i++)
{
Signs.Add(rotarySystem.Signs[i]);
}
}
}
}
FLY.Winder.BanNaiTe.UI.Server/Properties/AssemblyInfo.cs 0 → 100644
View file @ e12c6823
using System.Reflection;
using System.Resources;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Windows;
// 有关程序集的一般信息由以下
// 控制。更改这些特性值可修改
// 与程序集关联的信息。
[assembly: AssemblyTitle("FLY.Winder.BanNaiTe.UI.Server")]
[assembly: AssemblyDescription("浙江班奈特旋转采集器")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("佛山市枫莱尔自动化技术有限公司")]
[assembly: AssemblyProduct("FLY.Winder.BanNaiTe.UI.Server")]
[assembly: AssemblyCopyright("Copyright © 2022 flyautomation")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// 将 ComVisible 设置为 false 会使此程序集中的类型
//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
//请将此类型的 ComVisible 特性设置为 true。
[assembly: ComVisible(false)]
//若要开始生成可本地化的应用程序，请设置
//.csproj 文件中的 <UICulture>CultureYouAreCodingWith</UICulture>
//例如，如果您在源文件中使用的是美国英语，
//使用的是美国英语，请将 <UICulture> 设置为 en-US。 然后取消
//对以下 NeutralResourceLanguage 特性的注释。 更新
//以下行中的“en-US”以匹配项目文件中的 UICulture 设置。
//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
[assembly: ThemeInfo(
ResourceDictionaryLocation.None, //主题特定资源词典所处位置
//(未在页面中找到资源时使用，
//或应用程序资源字典中找到时使用)
ResourceDictionaryLocation.SourceAssembly //常规资源词典所处位置
//(未在页面中找到资源时使用，
//、应用程序或任何主题专用资源字典中找到时使用)
)]
// 程序集的版本信息由下列四个值组成:
//
// 主版本
// 次版本
// 生成号
// 修订号
//
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
FLY.Winder.BanNaiTe.UI.Server/Properties/Resources.Designer.cs 0 → 100644
View file @ e12c6823
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
// 运行时版本: 4.0.30319.42000
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </auto-generated>
//------------------------------------------------------------------------------
namespace FLY.Winder.BanNaiTe.UI.Server.Properties
{
/// <summary>
/// 强类型资源类，用于查找本地化字符串等。
/// </summary>
// 此类是由 StronglyTypedResourceBuilder
// 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
// 若要添加或删除成员，请编辑 .ResX 文件，然后重新运行 ResGen
// (以 /str 作为命令选项)，或重新生成 VS 项目。
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources
{
private static global::System.Resources.ResourceManager resourceMan;
private static global::System.Globalization.CultureInfo resourceCulture;
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal Resources()
{
}
/// <summary>
/// 返回此类使用的缓存 ResourceManager 实例。
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager
{
get
{
if ((resourceMan == null))
{
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("FLY.Winder.BanNaiTe.UI.Server.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;
}
}
/// <summary>
/// 重写当前线程的 CurrentUICulture 属性，对
/// 使用此强类型资源类的所有资源查找执行重写。
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture
{
get
{
return resourceCulture;
}
set
{
resourceCulture = value;
}
}
}
}
FLY.Winder.BanNaiTe.UI.Server/Properties/Resources.resx 0 → 100644
View file @ e12c6823
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
\ No newline at end of file
FLY.Winder.BanNaiTe.UI.Server/Properties/Settings.Designer.cs 0 → 100644
View file @ e12c6823
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace FLY.Winder.BanNaiTe.UI.Server.Properties
{
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
{
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
public static Settings Default
{
get
{
return defaultInstance;
}
}
}
}
FLY.Winder.BanNaiTe.UI.Server/Properties/Settings.settings 0 → 100644
View file @ e12c6823
<?xml version='1.0' encoding='utf-8'?>
<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)">
<Profiles>
<Profile Name="(Default)" />
</Profiles>
<Settings />
</SettingsFile>
\ No newline at end of file
FLY.Winder.BanNaiTe.UI.Server/RotaryPlc.cs 0 → 100644
View file @ e12c6823
using HslCommunication;
using HslCommunication.Profinet.Siemens;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
namespace FLY.Winder.BanNaiTe.UI.Server
{
public class RotaryPlc : INotifyPropertyChanged
{
public event PropertyChangedEventHandler PropertyChanged;
const string ADDR_CW = "DB107.0.0";//顺时针（正方向） ，程序会直接读取 DB7.0.0~DB7.0.4
const string ADDR_CCW = "DB107.0.1";//逆时针（反方向）
const string ADDR_Sign0 = "DB107.0.2";//转向信号0 (撞了它， 变为正方向运行)
const string ADDR_Sign1 = "DB107.0.3";//转向信号1 (撞了它， 变为反方向运行)
const string ADDR_OrgSign = "DB107.0.4";//复位原点信号 (撞了它后，证明在中间)
const string ADDR_RotaryVelocity = "DB107.2";//旋转塔速度% 有正负
NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
#region 旋转架
/// <summary>
/// 正方向运行 （顺时针旋转 clockwise)
/// </summary>
public bool IsForw { get; protected set; }
/// <summary>
/// 反方向运行 (逆时针旋转 counter-clockwise)
/// </summary>
public bool IsBackw { get; protected set; }
/// <summary>
/// 转向信号0 撞了它， 变为 正方向运行
/// </summary>
public bool IsTurnSign0 { get; protected set; }
/// <summary>
/// 复位原点信号 (撞了它后， 证明在中间)
/// </summary>
public bool IsOrgSign { get; protected set; }
/// <summary>
/// 转向信号1 撞了它， 变为 反方向运行
/// </summary>
public bool IsTurnSign1 { get; protected set; }
/// <summary>
/// 旋转塔速度%
/// </summary>
public float RotaryVelocity { get; protected set; }
#endregion
public bool IsError => string.IsNullOrEmpty(ErrMsg);
public string ErrMsg { get; protected set; }
public bool IsPlcConnected { get; protected set; }
public int ActiveIntervalms { get; protected set; }
public string PlcAddr { get; set; } = "192.168.0.1";
public int Port { get; set; } = 102;
/// <summary>
/// 工作中
/// </summary>
public bool IsRunning { get; private set; }
protected List<Action> WriteActions = new List<Action>();
CancellationTokenSource cts;
/// <summary>
/// PLC 设备
/// </summary>
HslCommunication.Core.Net.NetworkDeviceBase device;
protected int channelCnt = 60;
public RotaryPlc()
{
}
public void Init()
{
if (!RotaryPlcJsonDb.Load(this, "rotaryPlc.json"))
{
RotaryPlcJsonDb.Save(this, "rotaryPlc.json");
}
device = new HslCommunication.Profinet.Siemens.SiemensS7Net(SiemensPLCS.S1500, PlcAddr)
{
ConnectTimeOut = 5000,
Port = Port
};
}
public void Start()
{
lock (this)
{
if (IsRunning)
return;
IsRunning = true;
cts = new CancellationTokenSource();
Task.Factory.StartNew(MyTask, cts.Token);
}
}
public void Stop()
{
lock (this)
{
if (!IsRunning)
return;
cts.Cancel();
}
}
void MyTask()
{
// 授权示例 Authorization example
//11.0.2 版本后，都是下面的激活码
if (!HslCommunication.Authorization.SetAuthorizationCode("e30dcfe8-f4e1-45d3-9aca-9ac8fa0787b1"))
{
ErrMsg = "激活失败! 当前程序只能连续运行8个小时!";
return;
}
Stopwatch stopwatch1s = new Stopwatch();
stopwatch1s.Start();
Stopwatch stopwatch = new Stopwatch();
stopwatch.Start();
int intervalMs_sum = 0;
int intervalMs_cnt = 0;
//控制一个周期为200ms
while (!cts.IsCancellationRequested)
{
intervalMs_sum += (int)stopwatch.Elapsed.TotalMilliseconds;
intervalMs_cnt++;
stopwatch.Restart();
if (stopwatch1s.Elapsed >= TimeSpan.FromSeconds(1))
{
if (intervalMs_cnt > 0)
{
ActiveIntervalms = intervalMs_sum / intervalMs_cnt;
intervalMs_sum = 0;
intervalMs_cnt = 0;
}
stopwatch1s.Restart();
}
if (!IsPlcConnected)
{
Connect();
}
if (IsPlcConnected)
{
Write();
}
if (IsPlcConnected)
{
Read();
}
if (!IsPlcConnected)
{
Clear();
//连接断开，休息5秒再重试
int sleep = 5000 - (int)stopwatch.Elapsed.TotalMilliseconds;
if (sleep < 0)
sleep = 0;
Thread.Sleep(sleep);
}
else
{
int sleep = 200 - (int)stopwatch.Elapsed.TotalMilliseconds;
if (sleep < 0)
sleep = 0;
Thread.Sleep(sleep);
}
}
IsRunning = false;
}
bool Connect()
{
var result = device.ConnectServer();
if (!SetState(result))
{
return false;
}
return true;
}
bool Read()
{
var resultBools = device.ReadBool(ADDR_CW, 5);
if (!SetState(resultBools))
return false;
IsForw = resultBools.Content[0];
IsBackw = resultBools.Content[1];
IsTurnSign0 = resultBools.Content[2];
IsTurnSign1 = resultBools.Content[3];
IsOrgSign = resultBools.Content[4];
var resultFloat = device.ReadFloat(ADDR_RotaryVelocity);
if (!SetState(resultFloat))
return false;
RotaryVelocity = resultFloat.Content;
return true;
}
bool Write()
{
lock (WriteActions)
{
while (WriteActions.Count > 0)
{
Action action = WriteActions.First();
WriteActions.RemoveAt(0);
action();
if (!IsPlcConnected)
return false;
}
}
return true;
}
void Clear()
{
lock (WriteActions)
{
WriteActions.Clear();
}
}
protected bool SetState(OperateResult result)
{
IsPlcConnected = result.IsSuccess;
if (!IsPlcConnected)
{
ErrMsg = $"{result.Message}";
return false;
}
else
ErrMsg = "";
return true;
}
}
public class RotaryPlcJsonDb
{
public string PlcAddr = "192.168.0.1";
public int Port= 102;
public static bool Save(RotaryPlc plc, string filePath)
{
RotaryPlcJsonDb jsonDb = new RotaryPlcJsonDb()
{
PlcAddr = plc.PlcAddr,
Port = plc.Port
};
string json = JsonConvert.SerializeObject(jsonDb, Formatting.Indented);
File.WriteAllText(filePath, json);
return true;
}
public static bool Load(RotaryPlc plc, string filePath)
{
if (!File.Exists(filePath))
return false;
try
{
string json = File.ReadAllText(filePath);
var jsonDb = JsonConvert.DeserializeObject<RotaryPlcJsonDb>(json);
plc.Port = jsonDb.Port;
plc.PlcAddr = jsonDb.PlcAddr;
}
catch
{
return false;
}
return true;
}
}
public class RotaryPlcUt: RotaryPlc
{
public RotaryPlcUt()
{
IsForw = true;
IsBackw = false;
IsTurnSign0 = false;
IsTurnSign1 = false;
RotaryVelocity = 25.123f;
ErrMsg = "测试出错!!!!!!!!!!!!!";
}
}
}
FLY.Winder.BanNaiTe.UI.Server/RotaryPlcUt.xaml 0 → 100644
View file @ e12c6823
<RotaryPlcUt xmlns="clr-namespace:FLY.Winder.BanNaiTe.UI.Server">
</RotaryPlcUt>
\ No newline at end of file
FLY.Winder.BanNaiTe.UI.Server/RotarySystem.cs 0 → 100644
View file @ e12c6823
This diff is collapsed.
FLY.Winder.BanNaiTe.UI.Server/RotarySystemUt.xaml 0 → 100644
View file @ e12c6823
<RotarySystem xmlns="clr-namespace:FLY.Winder.BanNaiTe.UI.Server"
IsRotaryOn="True" IsForw="True" RPosGlobal="12312" RSpeed="23.1">
</RotarySystem >
\ No newline at end of file
FLY.Winder.BanNaiTe.UI.Server/Themes/ButtonStyle.xaml 0 → 100644
View file @ e12c6823
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Style x:Key="Styles.Button.Square.Accent2" TargetType="Button" >
<Setter Property="FontSize" Value="20"/>
<Setter Property="Width" Value="100"/>
<Setter Property="Margin" Value="5"/>
<Setter Property="Padding" Value="20,5"/>
</Style>
<Style x:Key="Styles.Button.Square2" TargetType="Button" >
<Setter Property="FontSize" Value="12"/>
<Setter Property="Width" Value="100"/>
<Setter Property="Margin" Value="5"/>
<Setter Property="Padding" Value="20,5"/>
</Style>
</ResourceDictionary>
\ No newline at end of file
FLY.Winder.BanNaiTe.UI.Server/Themes/Styles.xaml 0 → 100644
View file @ e12c6823
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="TextStyle.xaml"/>
<ResourceDictionary Source="ButtonStyle.xaml"/>
</ResourceDictionary.MergedDictionaries>
<!-- 标准间隔 -->
<Thickness x:Key="ControlMargin">5</Thickness>
<Style TargetType="TextBlock" x:Key="Styles.Text.FieldContent.Led">
<Setter Property="Margin" Value="2"/>
<Setter Property="Text" Value="(Off)"/>
<Setter Property="Foreground" Value="White"/>
<Setter Property="Background" Value="Gray"/>
<Style.Triggers>
<DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=Self} ,Path=Tag}" Value="true">
<Setter Property="Text" Value="(ON)"/>
<Setter Property="Foreground" Value="Black"/>
<Setter Property="Background" Value="Yellow"/>
</DataTrigger>
</Style.Triggers>
</Style>
</ResourceDictionary>
\ No newline at end of file
FLY.Winder.BanNaiTe.UI.Server/Themes/TextStyle.xaml 0 → 100644
View file @ e12c6823
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<!-- 只读项 的标题 -->
<Style TargetType="TextBlock" x:Key="Styles.Text.FieldHeader">
<Setter Property="Margin" Value="3" />
<Setter Property="Foreground" Value="#FF3B3B3B" />
<Setter Property="FontWeight" Value="Bold" />
<Setter Property="FontSize" Value="12" />
<Setter Property="TextAlignment" Value="Left" />
</Style>
<!-- 只读项 的标题 2行 -->
<Style TargetType="TextBlock" x:Key="Styles.Text.FieldHeader.Row2" BasedOn="{StaticResource Styles.Text.FieldHeader}">
<Setter Property="FontSize" Value="10" />
</Style>
<!-- 可写项 的标题 -->
<Style TargetType="TextBlock" x:Key="Styles.Text.FieldHeader.Editable" BasedOn="{StaticResource Styles.Text.FieldHeader}">
<Setter Property="Foreground" Value="#FF0083D7" />
</Style>
<Style TargetType="TextBlock" x:Key="Styles.Text.FieldHeader.Comment" BasedOn="{StaticResource Styles.Text.FieldHeader}">
<Setter Property="Foreground" Value="#FF888888" />
<Setter Property="FontSize" Value="10" />
</Style>
<!-- 可写项 的标题 2行 -->
<Style TargetType="TextBlock" x:Key="Styles.Text.FieldHeader.Editable.Row2" BasedOn="{StaticResource Styles.Text.FieldHeader.Editable}">
<Setter Property="FontSize" Value="10" />
</Style>
<!-- 只读项 内容 -->
<Style TargetType="TextBlock" x:Key="Styles.Text.FieldContent">
<Setter Property="Margin" Value="3" />
<Setter Property="Foreground" Value="#FF3B3B3B" />
<Setter Property="FontWeight" Value="Bold" />
<Setter Property="FontSize" Value="15" />
<Setter Property="TextAlignment" Value="Left" />
</Style>
<!-- 内容的分割线 -->
<Style TargetType="TextBlock" x:Key="Styles.Text.FieldContent.Separator">
<Setter Property="Foreground" Value="#FF888888" />
<Setter Property="FontSize" Value="15" />
<Setter Property="FontFamily" Value="Arial" />
<Setter Property="TextAlignment" Value="Left" />
<Setter Property="VerticalAlignment" Value="Bottom" />
<Setter Property="Text" Value="|" />
</Style>
<!-- 内容的单位 -->
<Style TargetType="TextBlock" x:Key="Styles.Text.FieldContent.Unit">
<Setter Property="Foreground" Value="#FF888888" />
<Setter Property="FontSize" Value="10" />
<Setter Property="FontFamily" Value="Arial" />
<Setter Property="TextAlignment" Value="Left" />
<Setter Property="VerticalAlignment" Value="Bottom" />
</Style>
<!-- 输入框 内容 -->
<Style TargetType="TextBox" x:Key="Styles.Text.FieldContent.Input" >
<Setter Property="Margin" Value="3" />
<Setter Property="Foreground" Value="#FF3B3B3B" />
<Setter Property="FontWeight" Value="Bold" />
<Setter Property="FontSize" Value="15" />
<Setter Property="TextAlignment" Value="Left" />
<Setter Property="MinWidth" Value="150" />
</Style>
</ResourceDictionary>
\ No newline at end of file
Project.FLY.DownBlowing/FLY.DownBlowing/Server/RotarySystem.cs
View file @ e12c6823
......@@ -24,7 +24,7 @@ namespace FLY.DownBlowing.Server
/// <summary>
/// 最小一圈脉冲
/// </summary>
const int MinRPosOfR = 8000;
const int MinRPosOfR = 3000;
......@@ -147,7 +147,7 @@ namespace FLY.DownBlowing.Server
SaveRPosOfR(rposOfRInFile);
}
if (!double.IsNaN(rposOfRInFile) && rposOfRInFile > MinRPosOfR)
if (rposOfRInFile > MinRPosOfR)
RPosOfR = rposOfRInFile;
RPosAtOrgSign = 0;
......@@ -274,21 +274,14 @@ namespace FLY.DownBlowing.Server
void updateRPosOfR()
{
double rposOfR = (int)(RPosAtTurnSign1 - RPosAtTurnSign0);
if (!double.IsNaN(rposOfRInFile))
{
if (Math.Abs(rposOfRInFile - rposOfR) > 100)
{
//变化量大于1°保存
rposOfRInFile = rposOfR;
SaveRPosOfR(rposOfRInFile);
}
}
else
if (Math.Abs(rposOfRInFile - rposOfR) > 100)
{
//变化量大于1°保存
rposOfRInFile = rposOfR;
SaveRPosOfR(rposOfRInFile);
}
RPosOfR = rposOfR;
}
void updateRPosAtTurnSign0()
......
hemei.sln
View file @ e12c6823
......@@ -129,6 +129,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FLY.Unions", "FLY.Unions",
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FLY.Unions.UI", "Project.FLY.Unions\FLY.Unions.UI\FLY.Unions.UI.csproj", "{703C6559-E0D6-48A2-A54D-5D22447BA33E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FLY.Winder.BanNaiTe.UI.Server", "FLY.Winder.BanNaiTe.UI.Server\FLY.Winder.BanNaiTe.UI.Server.csproj", "{209249CF-310A-4107-85DC-A2C7585E73C7}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
......@@ -734,6 +736,18 @@ Global
{703C6559-E0D6-48A2-A54D-5D22447BA33E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{703C6559-E0D6-48A2-A54D-5D22447BA33E}.Release|x86.ActiveCfg = Release|Any CPU
{703C6559-E0D6-48A2-A54D-5D22447BA33E}.Release|x86.Build.0 = Release|Any CPU
{209249CF-310A-4107-85DC-A2C7585E73C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{209249CF-310A-4107-85DC-A2C7585E73C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{209249CF-310A-4107-85DC-A2C7585E73C7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{209249CF-310A-4107-85DC-A2C7585E73C7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{209249CF-310A-4107-85DC-A2C7585E73C7}.Debug|x86.ActiveCfg = Debug|Any CPU
{209249CF-310A-4107-85DC-A2C7585E73C7}.Debug|x86.Build.0 = Debug|Any CPU
{209249CF-310A-4107-85DC-A2C7585E73C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{209249CF-310A-4107-85DC-A2C7585E73C7}.Release|Any CPU.Build.0 = Release|Any CPU
{209249CF-310A-4107-85DC-A2C7585E73C7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{209249CF-310A-4107-85DC-A2C7585E73C7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{209249CF-310A-4107-85DC-A2C7585E73C7}.Release|x86.ActiveCfg = Release|Any CPU
{209249CF-310A-4107-85DC-A2C7585E73C7}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
......@@ -788,6 +802,7 @@ Global
{349CDC12-8CA8-4606-957E-F378E118B93D} = {DF0E88AF-981B-490A-B739-A7D79B8C5BB2}
{A7ACD496-9D04-4F8E-B97E-C6C29CE2DE06} = {DF0E88AF-981B-490A-B739-A7D79B8C5BB2}
{703C6559-E0D6-48A2-A54D-5D22447BA33E} = {CFCD212D-5CFB-48D4-BFC6-36768FC07E65}
{209249CF-310A-4107-85DC-A2C7585E73C7} = {086F6EF1-272B-4AFE-89DD-D6EDDF8333E6}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {BD78A3E8-6F11-4F24-AB5F-A9F25461F64F}
......
thick_public @ 5b685a50
Subproject commit 6bcbed45940e9dd1474f8a43e8b5bc9e7b5ddf5d
Subproject commit 5b685a509a4a6a96fa3bd226deb23aa00426c21a
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