Bläddra i källkod

improve merge big boundary particle algorithm.

gsp 2 år sedan
förälder
incheckning
acca2d9d3b

+ 2 - 2
OTSCPP/OTSClrInterface/CommonClr/OTSParticleClr.h

@@ -190,11 +190,11 @@ namespace OTSCLRINTERFACE {
 			std::string val1 = marshal_as<std::string>(val);
 			return m_Particle->get()->TypeColor(val1);
 		}
-		String^ GetSubParticlesName()
+		String^ GetConnectedParticlesName()
 		{
 			return gcnew String(m_Particle->get()->GetConnectedParticlesSequentialString().c_str());
 		}
-		void SetSubParticlesName(String^ val)
+		void SetConnectedParticlesName(String^ val)
 		{
 			std::string val1 = marshal_as<std::string>(val);
 			return m_Particle->get()->SetConnectedParticlesSequentialString(val1);

+ 1 - 1
OTSIncAMeasureApp/0-OTSModel/Measure/DBDataTransition/IncADataDB.cs

@@ -129,7 +129,7 @@ namespace OTSModelSharp
                     int height = Convert.ToInt32(allRecords.Rows[i][(int)CIncADataTable.ColumnID.N_RECT_HEIGHT]);
                     Rectangle r = new Rectangle(left, top, left + width, top + height);
                     p.SetParticleRect(r);
-                    p.SetSubParticlesName("");
+                    p.SetConnectedParticlesName("");
                     byte aveGray = Convert.ToByte(allRecords.Rows[i][(int)CIncADataTable.ColumnID.N_AVE_GRAY]);
                     p.SetAveGray(aveGray);
                     p.SetActualArea(Convert.ToInt32(allRecords.Rows[i][(int)CIncADataTable.ColumnID.F_AREA]));

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

@@ -56,7 +56,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);