|
@@ -230,19 +230,22 @@ namespace OTSCLRINTERFACE
|
|
|
{
|
|
|
auto feature = features[i]->GetOTSFeaturePtr();
|
|
|
auto otsSegs = feature->GetSegmentsList();
|
|
|
- std::vector<BrukerSegment> listSegment;
|
|
|
+ //auto otsSegs = feature->GetSegmentsList();
|
|
|
+ //std::vector<BrukerSegment*> listSegment;
|
|
|
+ BrukerSegment* segArray = new BrukerSegment[otsSegs.size()];
|
|
|
for (int j = 0; j < otsSegs.size(); j++)
|
|
|
{
|
|
|
auto seg = otsSegs[j];
|
|
|
- BrukerSegment oSegment;
|
|
|
- oSegment.XCount = seg->GetLength();
|
|
|
- oSegment.XStart = seg->GetStart();
|
|
|
- oSegment.Y = seg->GetHeight();
|
|
|
- listSegment.push_back(oSegment);
|
|
|
+ //BrukerSegment* oSegment=new BrukerSegment();
|
|
|
+ BrukerSegment* oSegment = &segArray[j];
|
|
|
+ oSegment->XCount = seg->GetLength();
|
|
|
+ oSegment->XStart = seg->GetStart();
|
|
|
+ oSegment->Y = seg->GetHeight();
|
|
|
+ //listSegment.push_back(oSegment);
|
|
|
}
|
|
|
BrukerFeature oFeature;
|
|
|
- oFeature.SegmentCount = listSegment.size();
|
|
|
- oFeature.pSegment = &listSegment[0];
|
|
|
+ oFeature.SegmentCount = otsSegs.size();
|
|
|
+ oFeature.pSegment = segArray;
|
|
|
listFeatures.push_back(oFeature);
|
|
|
}
|
|
|
// set get quantify info flag
|
|
@@ -309,19 +312,21 @@ namespace OTSCLRINTERFACE
|
|
|
{
|
|
|
auto feature = parts[i]->GetOTSParticlePtr()->GetFeature();
|
|
|
auto otsSegs = feature->GetSegmentsList();
|
|
|
- std::vector<BrukerSegment> listSegment;
|
|
|
+ //std::vector<BrukerSegment*> listSegment;
|
|
|
+ BrukerSegment* segArray = new BrukerSegment[otsSegs.size()];
|
|
|
for (int j = 0; j < otsSegs.size(); j++)
|
|
|
{
|
|
|
auto seg = otsSegs[j];
|
|
|
- BrukerSegment oSegment;
|
|
|
- oSegment.XCount = seg->GetLength();
|
|
|
- oSegment.XStart = seg->GetStart();
|
|
|
- oSegment.Y = seg->GetHeight();
|
|
|
- listSegment.push_back(oSegment);
|
|
|
+ //BrukerSegment* oSegment=new BrukerSegment();
|
|
|
+ BrukerSegment* oSegment = &segArray[j];
|
|
|
+ oSegment->XCount = seg->GetLength();
|
|
|
+ oSegment->XStart = seg->GetStart();
|
|
|
+ oSegment->Y = seg->GetHeight();
|
|
|
+ //listSegment.push_back(oSegment);
|
|
|
}
|
|
|
BrukerFeature oFeature;
|
|
|
- oFeature.SegmentCount = listSegment.size();
|
|
|
- oFeature.pSegment = &listSegment[0];
|
|
|
+ oFeature.SegmentCount = otsSegs.size();
|
|
|
+ oFeature.pSegment = segArray;
|
|
|
|
|
|
listFeatures.push_back(oFeature);
|
|
|
}
|