From 6c2d921c5173397e72812a899045bf1b17db7eb5 Mon Sep 17 00:00:00 2001 From: Tongg Date: Tue, 14 Jan 2025 17:29:57 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E6=A8=A1=E5=9E=8B=E9=9D=A2=E5=8D=8A?= =?UTF-8?q?=E9=80=8F=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Views/UserControl/ViewportData/Helper/ViewportHelperPro.cs | 2 +- Views/UserControl/ViewportData/Helper/ViewportManager.cs | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Views/UserControl/ViewportData/Helper/ViewportHelperPro.cs b/Views/UserControl/ViewportData/Helper/ViewportHelperPro.cs index b5fe55e..24e8542 100644 --- a/Views/UserControl/ViewportData/Helper/ViewportHelperPro.cs +++ b/Views/UserControl/ViewportData/Helper/ViewportHelperPro.cs @@ -77,7 +77,7 @@ public class ViewportHelperPro var material = new PBRMaterial { - AlbedoColor = new Color4(0.0f, 0f,0f,1f), // 黑色，避免其他光照影响 + AlbedoColor = new Color4(0.0f, 0f,0f,0.8f), // 黑色，避免其他光照影响 EmissiveColor =color ?? ViewportManager.ColorConfig.MainFacetColor , // LightGray #D3D3D3 MetallicFactor = 0.0, // 非金属 RoughnessFactor = 1.0, // 高粗糙度，避免反射效果 diff --git a/Views/UserControl/ViewportData/Helper/ViewportManager.cs b/Views/UserControl/ViewportData/Helper/ViewportManager.cs index ea13ac8..0060e3d 100644 --- a/Views/UserControl/ViewportData/Helper/ViewportManager.cs +++ b/Views/UserControl/ViewportData/Helper/ViewportManager.cs @@ -256,8 +256,9 @@ public class ViewportManager ViewportTriangle.AddRange(entities); //初始化 - MainModel3D = ViewportHelperPro.GenerateModelByEntity(_viewport, entities); MainModelLines = ViewportHelperPro.GentrateLineByEntity(_viewport, entities); + MainModel3D = ViewportHelperPro.GenerateModelByEntity(_viewport, entities); + MainModelLighting = ViewportHelperPro.GenerateLightingForModel(_viewport); MainModelMeshes = ViewportHelperPro.GenerateModelByEntityGroupByType(entities); MainModelLines.AddRange(ViewportHelperPro.GentrateLineGirdleByEntity(entities)); From fb76fe3d74cefefd2e6f56fd2e72bf9f690c37d4 Mon Sep 17 00:00:00 2001 From: handefeng <1030428966@qq.com> Date: Wed, 15 Jan 2025 15:08:28 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix=20:=E9=92=BB=E7=9F=B3=E9=87=8D=E9=87=8F?= =?UTF-8?q?=E5=85=AC=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ViewModel/Grading/GradingResultVM.cs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ViewModel/Grading/GradingResultVM.cs b/ViewModel/Grading/GradingResultVM.cs index 055d428..62f8d83 100644 --- a/ViewModel/Grading/GradingResultVM.cs +++ b/ViewModel/Grading/GradingResultVM.cs @@ -712,10 +712,12 @@ public class GradingResultVM : BaseViewModel #endregion private double CalWight(AlgorithmResultEntity result) { - var M1 = result.measurements.M1; - var M2 = result.measurements.M2; - var M3 = result.measurements.M3; - var wight = Square((M1+M2)/2)*M3*0.0061; + // var M1 = result.measurements.M1; + // var M2 = result.measurements.M2; + // var M3 = result.measurements.M3; + // var wight = Square((M1+M2)/2)*M3*0.0061; + var VOLUME = result.measurements.VOLUME; + var wight = VOLUME/57; Wight = wight.ToString("f3"); return wight; } From f5ad593a713c4a05bc365a45334560bf525928f0 Mon Sep 17 00:00:00 2001 From: handefeng <1030428966@qq.com> Date: Wed, 15 Jan 2025 15:17:09 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix=20:=E9=92=BB=E7=9F=B3=E9=87=8D=E9=87=8F?= =?UTF-8?q?=E5=85=AC=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Model/Entity/ApiEntity/AlgorithmResultEntity.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Model/Entity/ApiEntity/AlgorithmResultEntity.cs b/Model/Entity/ApiEntity/AlgorithmResultEntity.cs index d28c64a..f87e1d8 100644 --- a/Model/Entity/ApiEntity/AlgorithmResultEntity.cs +++ b/Model/Entity/ApiEntity/AlgorithmResultEntity.cs @@ -19,6 +19,7 @@ namespace SparkClient.Model.Entity.ApiEntity public class Measurements { + public double VOLUME { get; set; } public double DIAMETER { get; set; } public double DIAMETER_DEV { get; set; } public double M1 { get; set; } From 07a08ede4cf8835b095d2f1b30163e161613f89b Mon Sep 17 00:00:00 2001 From: sunhonglei Date: Wed, 15 Jan 2025 16:36:29 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix=EF=BC=9AMessage=20=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E8=81=94=E7=B3=BB=E7=AE=A1=E7=90=86=E5=91=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Language/zh_CN.xaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Language/zh_CN.xaml b/Language/zh_CN.xaml index 74b3fd0..fd4985e 100644 --- a/Language/zh_CN.xaml +++ b/Language/zh_CN.xaml @@ -157,7 +157,7 @@ 记住密码 登 录 退 出 系 统 - 如果忘记密码，请联系我们 + 如果忘记密码，请联系管理员 保存