diff --git a/.vs/CPSO/FileContentIndex/0e58e5c8-6e26-43b8-a144-873cd6c77cbb.vsidx b/.vs/CPSO/FileContentIndex/0e58e5c8-6e26-43b8-a144-873cd6c77cbb.vsidx new file mode 100644 index 0000000..352f507 Binary files /dev/null and b/.vs/CPSO/FileContentIndex/0e58e5c8-6e26-43b8-a144-873cd6c77cbb.vsidx differ diff --git a/.vs/CPSO/FileContentIndex/f90280cc-b4a5-4989-a19b-c664b761d5dc.vsidx b/.vs/CPSO/FileContentIndex/f90280cc-b4a5-4989-a19b-c664b761d5dc.vsidx deleted file mode 100644 index 379bd82..0000000 Binary files a/.vs/CPSO/FileContentIndex/f90280cc-b4a5-4989-a19b-c664b761d5dc.vsidx and /dev/null differ diff --git a/.vs/CPSO/v17/.futdcache.v2 b/.vs/CPSO/v17/.futdcache.v2 index 979bb02..f714304 100644 Binary files a/.vs/CPSO/v17/.futdcache.v2 and b/.vs/CPSO/v17/.futdcache.v2 differ diff --git a/.vs/CPSO/v17/.suo b/.vs/CPSO/v17/.suo index f6c3b47..715971f 100644 Binary files a/.vs/CPSO/v17/.suo and b/.vs/CPSO/v17/.suo differ diff --git a/.vs/CPSO/v17/Browse.VC.db b/.vs/CPSO/v17/Browse.VC.db index ab7549a..8f7823d 100644 Binary files a/.vs/CPSO/v17/Browse.VC.db and b/.vs/CPSO/v17/Browse.VC.db differ diff --git a/CPSO/Forms/92_Knowledge/FrmStepsManager.cs b/CPSO/Forms/92_Knowledge/FrmStepsManager.cs index c5a0291..17258b3 100644 --- a/CPSO/Forms/92_Knowledge/FrmStepsManager.cs +++ b/CPSO/Forms/92_Knowledge/FrmStepsManager.cs @@ -10,11 +10,6 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -// ReSharper disable SuggestVarOrType_SimpleTypes -// ReSharper disable SuggestVarOrType_BuiltInTypes -// ReSharper disable SuggestVarOrType_Elsewhere -// ReSharper disable InvertIf - namespace CPSO.Forms._92_Knowledge { public partial class FrmStepsManager : UserControls.FrmProperties @@ -74,40 +69,42 @@ namespace CPSO.Forms._92_Knowledge Self.Form.SetStateWorking(@"构建切削力分析模型..."); - // 先把所有计算步反激活 + // 1. 先把所有计算步反激活 var stepList = Self.GetAllSteps().ToList(); stepList.ForEach(x => { Self.ActivateDeactivateStep(x.Name, false); }); + // 2. 加载网格 + var mesh = LoadMesh(surface); + List jobs = new List(); await Task.Run(() => { - // 加载网格 - var mesh = LoadMesh(surface); - foreach (var tp in Self.ToolPositions) { // 1. 计算最接近的顶点 int vertId = GetClosedVertex(mesh, tp.Base); // PlanktonMesh中存储的Id - if (vertId < 0) + if (vertId < 0) // 找不到最近节点，继续执行 { continue; } // 2. 最接近节点 - int nodeId = _vertexToNodeMapping[vertId]; // 全局网格中的Id - FeNode node = Self.Model.Mesh.Nodes[nodeId]; + // int nodeId = _vertexToNodeMapping[vertId]; // 全局网格中的Id + FeNode node = Self.Model.Mesh.Nodes[_vertexToNodeMapping[vertId]]; // 3. 最近节点周围的面单元 List faces = new List(); foreach (var f in mesh.Vertices.GetVertexFaces(vertId)) { if (_cellToFaceMapping.TryGetValue(f, out var face)) + { faces.Add(face); + } } // 4. 复制一份基础计算步并激活 @@ -154,7 +151,7 @@ namespace CPSO.Forms._92_Knowledge // 5.3 添加载荷 Self.AddLoad(newStep.Name, stLoad); - // 5.4 添加到 List jobs + // 6. 添加到 List jobs jobs.Add(new ProcessingJob(tp.Base) { StepName = newStep.Name, @@ -175,6 +172,7 @@ namespace CPSO.Forms._92_Knowledge catch (Exception ex) { ExceptionTools.Show(ex); + Self.Form.SetStateReady(@"构建切削力分析模型..."); } } diff --git a/CPSO/bin/x64/Debug/CPSO.exe b/CPSO/bin/x64/Debug/CPSO.exe index fd83004..8c80261 100644 Binary files a/CPSO/bin/x64/Debug/CPSO.exe and b/CPSO/bin/x64/Debug/CPSO.exe differ diff --git a/CPSO/bin/x64/Debug/CPSO.pdb b/CPSO/bin/x64/Debug/CPSO.pdb index ab27812..bc2f09f 100644 Binary files a/CPSO/bin/x64/Debug/CPSO.pdb and b/CPSO/bin/x64/Debug/CPSO.pdb differ diff --git a/CPSO/bin/x64/Debug/settings.bin b/CPSO/bin/x64/Debug/settings.bin index 9d885c8..34a4e8d 100644 Binary files a/CPSO/bin/x64/Debug/settings.bin and b/CPSO/bin/x64/Debug/settings.bin differ diff --git a/CPSO/obj/x64/Debug/CPSO.csproj.AssemblyReference.cache b/CPSO/obj/x64/Debug/CPSO.csproj.AssemblyReference.cache index 5cd1ae4..82b65f0 100644 Binary files a/CPSO/obj/x64/Debug/CPSO.csproj.AssemblyReference.cache and b/CPSO/obj/x64/Debug/CPSO.csproj.AssemblyReference.cache differ diff --git a/CPSO/obj/x64/Debug/CPSO.exe b/CPSO/obj/x64/Debug/CPSO.exe index fd83004..8c80261 100644 Binary files a/CPSO/obj/x64/Debug/CPSO.exe and b/CPSO/obj/x64/Debug/CPSO.exe differ diff --git a/CPSO/obj/x64/Debug/CPSO.pdb b/CPSO/obj/x64/Debug/CPSO.pdb index ab27812..bc2f09f 100644 Binary files a/CPSO/obj/x64/Debug/CPSO.pdb and b/CPSO/obj/x64/Debug/CPSO.pdb differ diff --git a/CPSO/obj/x64/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/CPSO/obj/x64/Debug/DesignTimeResolveAssemblyReferencesInput.cache index d204eff..dcbb4a6 100644 Binary files a/CPSO/obj/x64/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/CPSO/obj/x64/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/CaeCuttingForce/obj/Debug/CaeCuttingForce.csproj.AssemblyReference.cache b/CaeCuttingForce/obj/Debug/CaeCuttingForce.csproj.AssemblyReference.cache index b066225..1a653a6 100644 Binary files a/CaeCuttingForce/obj/Debug/CaeCuttingForce.csproj.AssemblyReference.cache and b/CaeCuttingForce/obj/Debug/CaeCuttingForce.csproj.AssemblyReference.cache differ diff --git a/CaeKnowledge/obj/Debug/CaeKnowledge.csproj.AssemblyReference.cache b/CaeKnowledge/obj/Debug/CaeKnowledge.csproj.AssemblyReference.cache index adece65..58d7c45 100644 Binary files a/CaeKnowledge/obj/Debug/CaeKnowledge.csproj.AssemblyReference.cache and b/CaeKnowledge/obj/Debug/CaeKnowledge.csproj.AssemblyReference.cache differ diff --git a/ConsoleAppCuttingForce/bin/Debug/CaeKnowledge.dll b/ConsoleAppCuttingForce/bin/Debug/CaeKnowledge.dll index e387a23..7125cda 100644 Binary files a/ConsoleAppCuttingForce/bin/Debug/CaeKnowledge.dll and b/ConsoleAppCuttingForce/bin/Debug/CaeKnowledge.dll differ diff --git a/ConsoleAppCuttingForce/bin/Debug/CaeKnowledge.pdb b/ConsoleAppCuttingForce/bin/Debug/CaeKnowledge.pdb index 49b8e45..e655629 100644 Binary files a/ConsoleAppCuttingForce/bin/Debug/CaeKnowledge.pdb and b/ConsoleAppCuttingForce/bin/Debug/CaeKnowledge.pdb differ diff --git a/ConsoleAppCuttingForce/obj/Debug/ConsoleAppCuttingForce.csproj.AssemblyReference.cache b/ConsoleAppCuttingForce/obj/Debug/ConsoleAppCuttingForce.csproj.AssemblyReference.cache index 41e7cd8..d79fb6d 100644 Binary files a/ConsoleAppCuttingForce/obj/Debug/ConsoleAppCuttingForce.csproj.AssemblyReference.cache and b/ConsoleAppCuttingForce/obj/Debug/ConsoleAppCuttingForce.csproj.AssemblyReference.cache differ diff --git a/ToolPathParser/obj/Debug/ToolPathParser.csproj.AssemblyReference.cache b/ToolPathParser/obj/Debug/ToolPathParser.csproj.AssemblyReference.cache index 2b41661..9d60464 100644 Binary files a/ToolPathParser/obj/Debug/ToolPathParser.csproj.AssemblyReference.cache and b/ToolPathParser/obj/Debug/ToolPathParser.csproj.AssemblyReference.cache differ