|
|
@@ -2252,11 +2252,13 @@ namespace OTSIMGPROC
|
|
|
|
|
|
}
|
|
|
// calculate all the new segment's position.
|
|
|
- std::vector <COTSParticle*> allSubParts;
|
|
|
- allSubParts.push_back(p);
|
|
|
+ //std::vector <COTSParticle*> allSubParts;
|
|
|
+ COTSParticleList allSubParts;
|
|
|
+ allSubParts.push_back(COTSParticlePtr(p));
|
|
|
+
|
|
|
for (auto other : pair.second)// Get the total area of all these particles for the use of ele calcu.
|
|
|
{
|
|
|
- allSubParts.push_back(other.get());
|
|
|
+ allSubParts.push_back(other);
|
|
|
}
|
|
|
for (auto subp : allSubParts)
|
|
|
{
|
|
|
@@ -2280,7 +2282,7 @@ namespace OTSIMGPROC
|
|
|
newseg->SetLength(s->GetLength());
|
|
|
newSegs.push_back(newseg);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
|
|
|
COTSFeaturePtr newFeature = COTSFeaturePtr(new COTSFeature());
|
|
|
@@ -2336,6 +2338,7 @@ namespace OTSIMGPROC
|
|
|
xray->SetElementQuantifyData(newCheList);
|
|
|
newPart->SetXrayInfo(xray);
|
|
|
newPart->SetConnectedParticlesSequentialString(partsStr);
|
|
|
+ newPart->SetSubParticles(allSubParts);
|
|
|
newPart->SetActualArea(allPartArea);
|
|
|
partTagId++;
|
|
|
newPart->SetParticleId(partTagId);
|