|
@@ -224,12 +224,13 @@ namespace OTSCLRINTERFACE
|
|
|
|
|
|
listXRayPoints.push_back(pXRayPoint);
|
|
|
}
|
|
|
- std::vector<BrukerSegment> listSegment;
|
|
|
- std::vector<std::vector<BrukerSegment>>listFeatures;
|
|
|
+
|
|
|
+ std::vector<BrukerFeature>listFeatures;
|
|
|
for (int i = 0; i < xraynum; i++)
|
|
|
{
|
|
|
auto feature = features[i]->GetOTSFeaturePtr();
|
|
|
auto otsSegs = feature->GetSegmentsList();
|
|
|
+ std::vector<BrukerSegment> listSegment;
|
|
|
for (int j = 0; j < otsSegs.size(); j++)
|
|
|
{
|
|
|
auto seg = otsSegs[j];
|
|
@@ -239,8 +240,10 @@ namespace OTSCLRINTERFACE
|
|
|
oSegment.Y = seg->GetHeight();
|
|
|
listSegment.push_back(oSegment);
|
|
|
}
|
|
|
-
|
|
|
- listFeatures.push_back(listSegment);
|
|
|
+ BrukerFeature oFeature;
|
|
|
+ oFeature.SegmentCount = listSegment.size();
|
|
|
+ oFeature.pSegment = &listSegment[0];
|
|
|
+ listFeatures.push_back(oFeature);
|
|
|
}
|
|
|
// set get quantify info flag
|
|
|
if (bQuant)
|
|
@@ -299,12 +302,14 @@ namespace OTSCLRINTERFACE
|
|
|
CPosXrayPtr pXRayPoint = parts[i]->GetXray()->GetPosXrayPtr();
|
|
|
listXRayPoints.push_back(pXRayPoint);
|
|
|
}
|
|
|
- std::vector<BrukerSegment> listSegment;
|
|
|
- std::vector<std::vector<BrukerSegment>>listFeatures;
|
|
|
+
|
|
|
+ //std::vector<std::vector<BrukerSegment>>listFeatures;
|
|
|
+ std::vector<BrukerFeature>listFeatures;
|
|
|
for (int i = 0; i < xraynum; i++)
|
|
|
{
|
|
|
auto feature = parts[i]->GetOTSParticlePtr()->GetFeature();
|
|
|
auto otsSegs = feature->GetSegmentsList();
|
|
|
+ std::vector<BrukerSegment> listSegment;
|
|
|
for (int j = 0; j < otsSegs.size(); j++)
|
|
|
{
|
|
|
auto seg = otsSegs[j];
|
|
@@ -314,8 +319,11 @@ namespace OTSCLRINTERFACE
|
|
|
oSegment.Y = seg->GetHeight();
|
|
|
listSegment.push_back(oSegment);
|
|
|
}
|
|
|
+ BrukerFeature oFeature;
|
|
|
+ oFeature.SegmentCount = listSegment.size();
|
|
|
+ oFeature.pSegment = &listSegment[0];
|
|
|
|
|
|
- listFeatures.push_back(listSegment);
|
|
|
+ listFeatures.push_back(oFeature);
|
|
|
}
|
|
|
// set get quantify info flag
|
|
|
if (bQuant)
|
|
@@ -396,7 +404,7 @@ namespace OTSCLRINTERFACE
|
|
|
listXRayPoints.push_back(pXRayPoint);
|
|
|
|
|
|
std::vector<BrukerSegment> listSegment;
|
|
|
- std::vector<std::vector<BrukerSegment>>listFeatures;
|
|
|
+ std::vector<BrukerFeature>listFeatures;
|
|
|
|
|
|
auto otsSegs = feature->GetSegmentsList();
|
|
|
for (int j = 0; j < otsSegs->Count; j++)
|
|
@@ -408,8 +416,10 @@ namespace OTSCLRINTERFACE
|
|
|
oSegment.Y = seg->GetHeight();
|
|
|
listSegment.push_back(oSegment);
|
|
|
}
|
|
|
-
|
|
|
- listFeatures.push_back(listSegment);
|
|
|
+ BrukerFeature ofeature;
|
|
|
+ ofeature.SegmentCount = listSegment.size();
|
|
|
+ ofeature.pSegment = &listSegment[0];
|
|
|
+ listFeatures.push_back(ofeature);
|
|
|
|
|
|
bool bRet = FALSE;
|
|
|
|