Skip to content

Commit 358e806

Browse files
committed
Add accessor for individual measurments, that isnt ambigous
1 parent 7543b4a commit 358e806

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

SpecUtils/SpecFile.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1369,6 +1369,10 @@ class SpecFile
13691369
const std::string &instrument_model() const;
13701370
const std::string &instrument_id() const;
13711371
std::vector< std::shared_ptr<const Measurement> > measurements() const;
1372+
std::shared_ptr<const Measurement> measurement_at_index( size_t num ) const;
1373+
#if __cplusplus >= 201402L
1374+
[[deprecated( "Replaced by measurement_at_index to remove ambigiuty of calling" )]]
1375+
#endif
13721376
std::shared_ptr<const Measurement> measurement( size_t num ) const;
13731377
std::shared_ptr<const DetectorAnalysis> detectors_analysis() const;
13741378
const std::vector<std::shared_ptr<const MultimediaData>> &multimedia_data() const;

src/SpecFile.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ size_t SpecFile::num_measurements() const
492492
}//size_t num_measurements() const
493493

494494

495-
std::shared_ptr<const Measurement> SpecFile::measurement(
495+
std::shared_ptr<const Measurement> SpecFile::measurement_at_index(
496496
size_t num ) const
497497
{
498498
std::unique_lock<std::recursive_mutex> lock( mutex_ );
@@ -504,6 +504,10 @@ std::shared_ptr<const Measurement> SpecFile::measurement(
504504
return measurements_[num];
505505
}
506506

507+
std::shared_ptr<const Measurement> SpecFile::measurement( size_t num ) const
508+
{
509+
return measurement_at_index( num );
510+
}
507511

508512
DetectorType SpecFile::detector_type() const
509513
{

0 commit comments

Comments
 (0)