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 @@
记住密码
登 录
退 出 系 统
- 如果忘记密码,请联系我们
+ 如果忘记密码,请联系管理员
保存
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; }
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;
}
diff --git a/Views/UserControl/ViewportData/Helper/ViewportHelperPro.cs b/Views/UserControl/ViewportData/Helper/ViewportHelperPro.cs
index 3500a2c..9a01f11 100644
--- a/Views/UserControl/ViewportData/Helper/ViewportHelperPro.cs
+++ b/Views/UserControl/ViewportData/Helper/ViewportHelperPro.cs
@@ -79,8 +79,8 @@ public class ViewportHelperPro
var material = new PBRMaterial
{
- AlbedoColor = new Color4(0.0f, 0f, 0f, 1f), // 黑色,避免其他光照影响
- EmissiveColor = color ?? ViewportManager.ColorConfig.MainFacetColor, // LightGray #D3D3D3
+ AlbedoColor = new Color4(0.0f, 0f,0f,0.8f), // 黑色,避免其他光照影响
+ EmissiveColor =color ?? ViewportManager.ColorConfig.MainFacetColor , // LightGray #D3D3D3
MetallicFactor = 0.0, // 非金属
RoughnessFactor = 1.0, // 高粗糙度,避免反射效果
ReflectanceFactor = 0.0, // 无反射
diff --git a/Views/UserControl/ViewportData/Helper/ViewportManager.cs b/Views/UserControl/ViewportData/Helper/ViewportManager.cs
index ef7644c..399d6ec 100644
--- a/Views/UserControl/ViewportData/Helper/ViewportManager.cs
+++ b/Views/UserControl/ViewportData/Helper/ViewportManager.cs
@@ -266,8 +266,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));