Browse Source

修改拼接颗粒存储错误

cxs 1 year ago
parent
commit
f36cc987ae

+ 2 - 2
Bin/x64/Debug/Config/ProData/HardwareConfig.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XMLData PathName="HardwareConfig.xml" ID="1">
-  <Member RegName="SemControllerName" Value="Oxford" ImageInputSources="SE" />
-  <Member RegName="EDSName" Value="Oxford" />
+  <Member RegName="SemControllerName" Value="OffLine" ImageInputSources="SE" />
+  <Member RegName="EDSName" Value="OffLine" />
   <Member RegName="BrukerDllVersion" Version="Bruker.API.Esprit64.dll" />
   <Member RegName="FEIIP" Value="192.168.0.1" />
   <Member RegName="FEIPORT" Value="7520" />

+ 1 - 1
OTSIncAMeasureApp/0-OTSModel/Measure/DBDataTransition/MergedParticles/MergeParticleDB.cs

@@ -54,7 +54,7 @@ namespace OTSModelSharp
             paras[24].Value = a_pParticle.GetFeretDiameter();
             paras[25].Value = a_pParticle.GetTypeName();
             paras[26].Value = a_pParticle.GetTypeColor();
-            paras[27].Value = a_pParticle.GetSubParticles();
+            paras[27].Value = a_pParticle.GetConnectedParticlesName();
 
             List<KeyValuePair<string, SQLiteParameter[]>> cmds = new List<KeyValuePair<string, SQLiteParameter[]>>();
             cmds.Add(cmd);

+ 4 - 0
OTSIncAMeasureApp/7-OTSProgMgrInfo/Stage/StageDisplayHelp.cs

@@ -72,6 +72,10 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
                 SolidBrush solidBrush = new SolidBrush(Color.FromArgb(50, Color.Black));
                 //字体大小 根据样品孔Rectangle大小
                 float fontSize = PixRect.Width / 4;
+                if(fontSize==0)
+                {
+                    fontSize = 1;
+                }
                 Font font = new Font("宋体", fontSize, FontStyle.Regular);
                 if (fontSize == 0)
                 {