Skip to content
Snippets Groups Projects
Commit 96747d40 authored by Sonia Minolli's avatar Sonia Minolli
Browse files

cppcheck updates

parent 8a6b9021
Branches
Tags
No related merge requests found
......@@ -922,7 +922,7 @@ void Spectrometer::get_task_values()
//- get data from task
SpectrometerTask::DataReturnValues l_data;
m_task->get_data_return_values(l_data);
m_intensity_buf = l_data.m_intensity_buf;
m_intensity_buf = l_data.intensity_buf;
m_buffer_offset_index = l_data.buffer_offset_index;
if (l_data.intensity != NULL)
......
......@@ -400,12 +400,12 @@ void SpectrometerTask::periodic_job_i()
buf_ptr->capacity(m_data.intensityPtsNb);
buf_ptr->force_length(m_data.intensityPtsNb);
*buf_ptr = m_data.intensity;
m_data.m_intensity_buf.push_back(buf_ptr);
m_data.intensity_buf.push_back(buf_ptr);
if( m_max_buffer_depth > 0 && m_data.m_intensity_buf.size() > m_max_buffer_depth )
if( m_max_buffer_depth > 0 && m_data.intensity_buf.size() > m_max_buffer_depth )
{
//- delete 1st element => fifo list
m_data.m_intensity_buf.erase( m_data.m_intensity_buf.begin() );
m_data.intensity_buf.erase( m_data.intensity_buf.begin() );
++m_data.buffer_offset_index;
}
}
......@@ -534,12 +534,12 @@ void SpectrometerTask::periodic_job_i()
m_data.intensityPtsNb = nb_points;
m_data.lambda = m_lambda_array.base();
m_data.lambdaPtsNb = nb_points;
m_data.m_intensity_buf.push_back(buf_ptr);
m_data.intensity_buf.push_back(buf_ptr);
if( m_max_buffer_depth > 0 && m_data.m_intensity_buf.size() > m_max_buffer_depth )
if( m_max_buffer_depth > 0 && m_data.intensity_buf.size() > m_max_buffer_depth )
{
//- delete 1st element => fifo list
m_data.m_intensity_buf.erase( m_data.m_intensity_buf.begin() );
m_data.intensity_buf.erase( m_data.intensity_buf.begin() );
++m_data.buffer_offset_index;
}
......@@ -564,7 +564,7 @@ void SpectrometerTask::start_i()
m_cfg.host_device->set_status("The acquisition is running...");
m_is_snap = false;
m_is_acq = true;
m_data.m_intensity_buf.clear();
m_data.intensity_buf.clear();
m_data.buffer_offset_index = 0;
post(kDO_ACQ_MSG);
......
......@@ -139,7 +139,8 @@ public:
intensityPtsNb = src.intensityPtsNb;
lambda = src.lambda;
lambdaPtsNb = src.lambdaPtsNb;
m_intensity_buf = src.m_intensity_buf;
intensity_buf = src.intensity_buf;
buffer_offset_index = src.buffer_offset_index;
return *this;
}
......@@ -157,7 +158,7 @@ public:
int lambdaPtsNb;
//- Data accumulation vector in continuous mode
std::vector<DoubleBufPtr> m_intensity_buf;
std::vector<DoubleBufPtr> intensity_buf;
//- offset index corresponding to the number of erased buffer since entered the fifo mode
std::size_t buffer_offset_index;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment