Prechádzať zdrojové kódy

20260530001 Release模式下的编译异常解决。

向羽 孟 3 týždňov pred
rodič
commit
340b5857c5

+ 0 - 20
MvvmScaffoldFrame48.DLL/ImageAlgorithm/ProcessingAlgorithm_CCDShuLi.cs

@@ -119,9 +119,6 @@ namespace MvvmScaffoldFrame48.DLL.ImageAlgorithm
                     if ((item.LastSeenLine - item.StartLine) > shuLiConfig.MAX_Idetify_Height)
                     {
                         item.StateCode = 7;
-                        //FaultLog.RecordLogMessage("ShuLiClass-ProcessLine:非颗粒,视野异常", 3);
-                        //TxtLog.log(string.Format("ShuLiClass-ProcessLine:非颗粒,视野异常"), 6);
-                        //Console.WriteLine("ShuLiClass-ProcessLine:非颗粒,视野异常");
                     }
                     else if (shuLiConfig.PandingCode != -1)
                     {
@@ -136,35 +133,25 @@ namespace MvvmScaffoldFrame48.DLL.ImageAlgorithm
                             && (shuLiConfig.PandingCode == 2 || shuLiConfig.PandingCode == 1))
                         {
                             item.StateCode = 5;
-                            //TxtLog.log(string.Format("颗粒编号{0}:面积过小", item.Num));
-                            //Console.WriteLine("颗粒编号{0}:面积过小", item.Num);
                         }
                         else if (item.Area > shuLiConfig.MaxArea
                             && (shuLiConfig.PandingCode == 2 || shuLiConfig.PandingCode == 1))
                         {
                             item.StateCode = 6;
-                            //TxtLog.log(string.Format("颗粒编号{0}:面积过大", item.Num));
-                            //Console.WriteLine("颗粒编号{0}:面积过大", item.Num);
                         }
                         else if (item.MaxLength < shuLiConfig.MIN_Object_LENGTH
                             && (shuLiConfig.PandingCode == 2 || shuLiConfig.PandingCode == 0))
                         {
                             item.StateCode = 2;
-                            //TxtLog.log(string.Format("颗粒编号{0}:超短粒", item.Num));
-                            //Console.WriteLine("颗粒编号{0}:超短粒", item.Num);
                         }
                         else if (item.MaxLength > shuLiConfig.MAX_Object_LENGTH
                             && (shuLiConfig.PandingCode == 2 || shuLiConfig.PandingCode == 0))
                         {
                             item.StateCode = 1;
-                            //TxtLog.log(string.Format("颗粒编号{0}:超长粒", item.Num));
-                            //Console.WriteLine("颗粒编号{0}:超长粒", item.Num);
                         }
                         else
                         {
                             item.StateCode = 0;
-                            //TxtLog.log(string.Format("颗粒编号{0}:正常粒", item.Num));
-                            //Console.WriteLine("颗粒编号{0}:正常粒", item.Num);
                         }
                     }
                     resultValue.Add(item);
@@ -172,13 +159,6 @@ namespace MvvmScaffoldFrame48.DLL.ImageAlgorithm
                 if (resultValue.Count > 0)
                 {
                     result = true;
-                    //LOG.log(string.Format("识别完成,首个颗粒编号:{0},颗粒数量:{1}", OneActive[0].Num, OneActive.Count), 6);
-                    //触发回调事件
-                    //Task.Run(() =>
-                    //{
-                    //    OnWorkCompleted(OneActive);
-                    //});
-                    //ThreadPool.QueueUserWorkItem(_ => OnWorkCompleted(OneActive));
                 }
             }
             else

+ 3 - 2
MvvmScaffoldFrame48.DLL/MvvmScaffoldFrame48.Dll.csproj

@@ -26,12 +26,13 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
+    <Optimize>false</Optimize>
     <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
@@ -46,7 +47,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <OutputPath>bin\x64\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
+    <Optimize>false</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>x64</PlatformTarget>
     <LangVersion>7.3</LangVersion>

+ 3 - 2
MvvmScaffoldFrame48.MODEL/MvvmScaffoldFrame48.Model.csproj

@@ -25,11 +25,12 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
+    <Optimize>false</Optimize>
     <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
@@ -43,7 +44,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <OutputPath>bin\x64\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
+    <Optimize>false</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>x64</PlatformTarget>
     <LangVersion>7.3</LangVersion>

+ 3 - 2
MvvmScaffoldFrame48.VIEWMODEL/MvvmScaffoldFrame48.ViewModel.csproj

@@ -25,11 +25,12 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
+    <Optimize>false</Optimize>
     <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
@@ -43,7 +44,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <OutputPath>bin\x64\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
+    <Optimize>false</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>x64</PlatformTarget>
     <LangVersion>7.3</LangVersion>

+ 6 - 6
MvvmScaffoldFrame48.sln

@@ -33,24 +33,24 @@ Global
 		{75C34EE7-6921-492E-B2D4-0314F2F38AB5}.Debug|x64.Build.0 = Debug|x64
 		{75C34EE7-6921-492E-B2D4-0314F2F38AB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{75C34EE7-6921-492E-B2D4-0314F2F38AB5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{75C34EE7-6921-492E-B2D4-0314F2F38AB5}.Release|x64.ActiveCfg = Release|Any CPU
-		{75C34EE7-6921-492E-B2D4-0314F2F38AB5}.Release|x64.Build.0 = Release|Any CPU
+		{75C34EE7-6921-492E-B2D4-0314F2F38AB5}.Release|x64.ActiveCfg = Release|x64
+		{75C34EE7-6921-492E-B2D4-0314F2F38AB5}.Release|x64.Build.0 = Release|x64
 		{56156576-9627-4624-9E1D-26AA7714D1C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{56156576-9627-4624-9E1D-26AA7714D1C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{56156576-9627-4624-9E1D-26AA7714D1C7}.Debug|x64.ActiveCfg = Debug|x64
 		{56156576-9627-4624-9E1D-26AA7714D1C7}.Debug|x64.Build.0 = Debug|x64
 		{56156576-9627-4624-9E1D-26AA7714D1C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{56156576-9627-4624-9E1D-26AA7714D1C7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{56156576-9627-4624-9E1D-26AA7714D1C7}.Release|x64.ActiveCfg = Release|Any CPU
-		{56156576-9627-4624-9E1D-26AA7714D1C7}.Release|x64.Build.0 = Release|Any CPU
+		{56156576-9627-4624-9E1D-26AA7714D1C7}.Release|x64.ActiveCfg = Release|x64
+		{56156576-9627-4624-9E1D-26AA7714D1C7}.Release|x64.Build.0 = Release|x64
 		{ACD4905A-4124-4A51-B9B1-C38D74B794F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{ACD4905A-4124-4A51-B9B1-C38D74B794F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{ACD4905A-4124-4A51-B9B1-C38D74B794F0}.Debug|x64.ActiveCfg = Debug|x64
 		{ACD4905A-4124-4A51-B9B1-C38D74B794F0}.Debug|x64.Build.0 = Debug|x64
 		{ACD4905A-4124-4A51-B9B1-C38D74B794F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ACD4905A-4124-4A51-B9B1-C38D74B794F0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ACD4905A-4124-4A51-B9B1-C38D74B794F0}.Release|x64.ActiveCfg = Release|Any CPU
-		{ACD4905A-4124-4A51-B9B1-C38D74B794F0}.Release|x64.Build.0 = Release|Any CPU
+		{ACD4905A-4124-4A51-B9B1-C38D74B794F0}.Release|x64.ActiveCfg = Release|x64
+		{ACD4905A-4124-4A51-B9B1-C38D74B794F0}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

+ 2 - 1
MvvmScaffoldFrame48/MvvmScaffoldFrame48.csproj

@@ -47,12 +47,13 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <OutputPath>bin\x64\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
+    <Optimize>false</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>x64</PlatformTarget>
     <LangVersion>7.3</LangVersion>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>true</Prefer32Bit>
+    <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />