射线+激光AD模拟器整理

109e7b16 · 潘栩锋 · d762af99 · 109e7b16 · 109e7b16 · 109e7b16
Commit 109e7b16 authored May 30, 2021 by 潘栩锋 🚴
7 changed files
--- a/Project.FLY.FlyADBase/FLY.Simulation.Battery.RayLaser/FLY.Simulation.Battery.RayLaser.csproj
+++ b/Project.FLY.FlyADBase/FLY.Simulation.Battery.RayLaser/FLY.Simulation.Battery.RayLaser.csproj
@@ -63,7 +63,7 @@
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="AutoMapper">
-      <Version>9.0.0</Version>
+      <Version>10.1.1</Version>
    </PackageReference>
    <PackageReference Include="Newtonsoft.Json">
      <Version>12.0.3</Version>

--- a/Project.FLY.FlyADBase/FLY.Simulation.Battery.RayLaser/GageAD.cs
+++ b/Project.FLY.FlyADBase/FLY.Simulation.Battery.RayLaser/GageAD.cs
-using FLY.Thick.Base.Common;
+using FLY.Thick.Base.Server;
-using FLY.Thick.Base.Server;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 namespace FLY.Simulation.Battery.RayLaser
 {
@@ -111,13 +108,15 @@ namespace FLY.Simulation.Battery.RayLaser
        public CurveCollection curve_ray;
-        public void Init() {
+        public void Init()
+        {
            curve_ray = new CurveCollection("curve_ray.json");
            curve_laser = new CurveCollection("curve_laser.json");
            Load();
        }
-        void Load() {
+        void Load()
+        {
            Load_DataInfo(HorizontalView, "HorizontalView.csv");
            Load_DataInfo(SegmentView, "SegmentView.csv");
        }
@@ -146,10 +145,12 @@ namespace FLY.Simulation.Battery.RayLaser
        }
        DateTime lastTime = DateTime.MinValue;
-        public void OnPoll(DateTime now) {
+        public void OnPoll(DateTime now)
+        {
-            if (lastTime == DateTime.MinValue) {
+            if (lastTime == DateTime.MinValue)
+            {
                lastTime = now;
                return;
            }
@@ -158,11 +159,12 @@ namespace FLY.Simulation.Battery.RayLaser
            double ms = 1.0 * ts.Ticks / TimeSpan.TicksPerMillisecond;
            double minute = ms / 1000 / 60;
-            if (FilmVelocity != 0) {
+            if (FilmVelocity != 0)
+            {
                FilmPosition += minute * FilmVelocity;
            }
-            int index = (int)(FilmPosition*1000 % SegmentView.Count());
+            int index = (int)(FilmPosition * 1000 % SegmentView.Count());
            IsVSignLight = SegmentView[index].IsLight;
            lastTime = now;
@@ -196,7 +198,8 @@ namespace FLY.Simulation.Battery.RayLaser
        /// <param name="mm_v">相对于极片纵向位置mm</param>
        /// <param name="posType">输出位置类型</param>
        /// <returns></returns>
-        public double GetValue(bool isRay, int mm, int mm_v, out PosType posType) {
+        public double GetValue(bool isRay, int mm, int mm_v, out PosType posType)
+        {
            if (mm >= (HoldPosLeft - HoldWidth / 2) && mm <= (HoldPosLeft + HoldWidth / 2))
@@ -205,16 +208,17 @@ namespace FLY.Simulation.Battery.RayLaser
                return 100000;
            }
-            if (mm >= FilmBegin && mm < FilmBegin + HorizontalView.Count) {
+            if (mm >= FilmBegin && mm < FilmBegin + HorizontalView.Count)
+            {
                posType = PosType.Film;
                var dataInfoH = HorizontalView[mm - FilmBegin];
-                while (mm_v<0)
+                while (mm_v < 0)
                {
                    mm_v += SegmentView.Count();
                }
                var dataInfoV = SegmentView[mm_v % SegmentView.Count()];
-                if ((dataInfoV.IsLight)|| (dataInfoH.IsLight))
+                if ((dataInfoV.IsLight) || (dataInfoH.IsLight))
                {
                    return FoilValue;
                }
@@ -231,7 +235,8 @@ namespace FLY.Simulation.Battery.RayLaser
                return 100000;
            }
-            if (isRay) {
+            if (isRay)
+            {
                if (mm >= (HoldPosRight + HoldWidth / 2) && mm <= (HoldPosRight + HoldWidth / 2 + SampleWidthRay))
                {
                    posType = PosType.Sample;

--- a/Project.FLY.FlyADBase/FLY.Simulation.Battery.RayLaser/Properties/AssemblyInfo.cs
+++ b/Project.FLY.FlyADBase/FLY.Simulation.Battery.RayLaser/Properties/AssemblyInfo.cs
@@ -6,11 +6,11 @@ using System.Runtime.InteropServices;
 // 控制。更改这些特性值可修改
 // 与程序集关联的信息。
 [assembly: AssemblyTitle("FLY.Simulation.Battery.RayLaser")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("射线+激光 测厚仪 AD盒模拟器")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("FLY.Simulation.Battery.RayLaser")]
-[assembly: AssemblyCopyright("Copyright ©  2021")]
+[assembly: AssemblyCopyright("Copyright ©  2021 flyauotmation")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

--- a/Project.FLY.FlyADBase/FLY.Simulation.Flyad7/FLY.Simulation.Flyad7.csproj
+++ b/Project.FLY.FlyADBase/FLY.Simulation.Flyad7/FLY.Simulation.Flyad7.csproj
@@ -92,7 +92,7 @@
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="AutoMapper">
-      <Version>9.0.0</Version>
+      <Version>10.1.1</Version>
    </PackageReference>
    <PackageReference Include="PropertyChanged.Fody">
      <Version>3.3.1</Version>

--- a/Project.FLY.FlyADBase/FLY.Simulation/FLY.Simulation.csproj
+++ b/Project.FLY.FlyADBase/FLY.Simulation/FLY.Simulation.csproj
@@ -59,7 +59,7 @@
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="AutoMapper">
-      <Version>9.0.0</Version>
+      <Version>10.1.1</Version>
    </PackageReference>
    <PackageReference Include="Newtonsoft.Json">
      <Version>12.0.3</Version>

--- a/Project.FLY.FlyADBase/FlyADBase.sln
+++ b/Project.FLY.FlyADBase/FlyADBase.sln
@@ -40,6 +40,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FLY.Simulation.Battery.RayL
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FLYAD7.Simulation.Battery.RayLaser", "FLYAD7.Simulation.Battery.RayLaser\FLYAD7.Simulation.Battery.RayLaser.csproj", "{DFD5FDFA-6E8D-4901-8708-D7EF0269EE6A}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FLY.Simulation.Calender.GuRuiShiYe", "FLY.Simulation.Calender.GuRuiShiYe\FLY.Simulation.Calender.GuRuiShiYe.csproj", "{AEADFC07-59D9-40C4-BB31-47CFFDA6CC5C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FLY.Simulation.Calender.GuRuiShiYe.UI", "FLY.Simulation.Calender.GuRuiShiYe.UI\FLY.Simulation.Calender.GuRuiShiYe.UI.csproj", "{517847E4-5708-4ACE-BDF0-BB2C4495136D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -214,6 +218,30 @@ Global
 		{DFD5FDFA-6E8D-4901-8708-D7EF0269EE6A}.Release|Mixed Platforms.Build.0 = Release|x86
 		{DFD5FDFA-6E8D-4901-8708-D7EF0269EE6A}.Release|x86.ActiveCfg = Release|x86
 		{DFD5FDFA-6E8D-4901-8708-D7EF0269EE6A}.Release|x86.Build.0 = Release|x86
+		{AEADFC07-59D9-40C4-BB31-47CFFDA6CC5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AEADFC07-59D9-40C4-BB31-47CFFDA6CC5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AEADFC07-59D9-40C4-BB31-47CFFDA6CC5C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{AEADFC07-59D9-40C4-BB31-47CFFDA6CC5C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{AEADFC07-59D9-40C4-BB31-47CFFDA6CC5C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{AEADFC07-59D9-40C4-BB31-47CFFDA6CC5C}.Debug|x86.Build.0 = Debug|Any CPU
+		{AEADFC07-59D9-40C4-BB31-47CFFDA6CC5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AEADFC07-59D9-40C4-BB31-47CFFDA6CC5C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AEADFC07-59D9-40C4-BB31-47CFFDA6CC5C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{AEADFC07-59D9-40C4-BB31-47CFFDA6CC5C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{AEADFC07-59D9-40C4-BB31-47CFFDA6CC5C}.Release|x86.ActiveCfg = Release|Any CPU
+		{AEADFC07-59D9-40C4-BB31-47CFFDA6CC5C}.Release|x86.Build.0 = Release|Any CPU
+		{517847E4-5708-4ACE-BDF0-BB2C4495136D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{517847E4-5708-4ACE-BDF0-BB2C4495136D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{517847E4-5708-4ACE-BDF0-BB2C4495136D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{517847E4-5708-4ACE-BDF0-BB2C4495136D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{517847E4-5708-4ACE-BDF0-BB2C4495136D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{517847E4-5708-4ACE-BDF0-BB2C4495136D}.Debug|x86.Build.0 = Debug|Any CPU
+		{517847E4-5708-4ACE-BDF0-BB2C4495136D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{517847E4-5708-4ACE-BDF0-BB2C4495136D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{517847E4-5708-4ACE-BDF0-BB2C4495136D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{517847E4-5708-4ACE-BDF0-BB2C4495136D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{517847E4-5708-4ACE-BDF0-BB2C4495136D}.Release|x86.ActiveCfg = Release|Any CPU
+		{517847E4-5708-4ACE-BDF0-BB2C4495136D}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

--- a/Project.FLY.FlyADBase/FlyADBase/FlyADBase.csproj
+++ b/Project.FLY.FlyADBase/FlyADBase/FlyADBase.csproj
@@ -76,7 +76,7 @@
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="AutoMapper">
-      <Version>9.0.0</Version>
+      <Version>10.1.1</Version>
    </PackageReference>
    <PackageReference Include="NLog">
      <Version>4.6.8</Version>