Commit 13842990 authored by Samuel Debionne's avatar Samuel Debionne
Browse files

Rename getNextFrame to getFrame

parent a99c3cc3
Pipeline #61522 failed with stages
in 18 minutes and 22 seconds
......@@ -116,7 +116,7 @@ public:
void getDiffractionSpeed(double &sx, double &sy) const;
void setDiffractionSpeed(const double &sx, const double &sy);
bool getNextFrame(unsigned long frame_nr, unsigned char *ptr) override;
bool getFrame(unsigned long frame_nr, unsigned char *ptr) override;
void prepareAcq() {}
/// Gets the maximum "hardware" image size
......
......@@ -46,7 +46,7 @@ struct SIMULATOR_EXPORT FrameGetter : public HwMaxImageSizeCallbackGen {
virtual void prepareAcq() = 0;
virtual bool getNextFrame(unsigned long frame_nr, unsigned char *ptr) = 0;
virtual bool getFrame(unsigned long frame_nr, unsigned char *ptr) = 0;
virtual void setFrameDim(const FrameDim &frame_dim) = 0;
virtual void getFrameDim(FrameDim &frame_dim) const = 0;
......
......@@ -53,7 +53,7 @@ public:
void setFilePattern(const std::string &file_pattern);
void getFilePattern(std::string &file_pattern) const { file_pattern = m_file_pattern; }
bool getNextFrame(unsigned long frame_nr, unsigned char *ptr) override;
bool getFrame(unsigned long frame_nr, unsigned char *ptr) override;
void prepareAcq();
void setFrameDim(const FrameDim &frame_dim)
......
......@@ -100,15 +100,15 @@ public:
// Parallel for loop
#pragma omp parallel for
for (int i = 0; i < m_prefetched_frame_buffers.size(); i++)
FrameGetterImpl::getNextFrame(i, m_prefetched_frame_buffers[i].get());
FrameGetterImpl::getFrame(i, m_prefetched_frame_buffers[i].get());
} else
// Serial for loop
for (size_t i = 0; i < m_prefetched_frame_buffers.size(); i++)
FrameGetterImpl::getNextFrame(i, m_prefetched_frame_buffers[i].get());
FrameGetterImpl::getFrame(i, m_prefetched_frame_buffers[i].get());
}
}
bool getNextFrame(unsigned long frame_nr, unsigned char *ptr) override
bool getFrame(unsigned long frame_nr, unsigned char *ptr) override
{
DEB_MEMBER_FUNCT();
......
......@@ -41,7 +41,7 @@ public:
void setNbPrefetchedFrames(unsigned int nb_prefetched_frames);
void prepareAcq();
bool getNextFrame(unsigned long frame_nr, unsigned char *ptr);
bool getFrame(unsigned long frame_nr, unsigned char *ptr);
void setFrameDim(const FrameDim& frame_dim);
void getFrameDim(FrameDim& frame_dim) const;
......@@ -76,7 +76,7 @@ public:
void setNbPrefetchedFrames(unsigned int nb_prefetched_frames);
void prepareAcq();
bool getNextFrame(unsigned long frame_nr, unsigned char *ptr);
bool getFrame(unsigned long frame_nr, unsigned char *ptr);
void setFrameDim(const FrameDim& frame_dim);
void getFrameDim(FrameDim& frame_dim) const;
......
......@@ -132,7 +132,7 @@ void Camera::SimuThread::execStartAcq()
DEB_TRACE() << DEB_VAR1(frame_dim);
// Get the next frame
bool res = frame_getter->getNextFrame(frame_nb, ptr);
bool res = frame_getter->getFrame(frame_nb, ptr);
if (!res)
throw LIMA_HW_EXC(InvalidValue, "Failed to get next frame");
......
......@@ -615,7 +615,7 @@ void FrameBuilder::fillData(unsigned long frame_nr, unsigned char *ptr) const
* @exception lima::Exception The image depth is not
*1,2 or 4
*******************************************************************/
bool FrameBuilder::getNextFrame(unsigned long frame_nr, unsigned char *ptr)
bool FrameBuilder::getFrame(unsigned long frame_nr, unsigned char *ptr)
{
switch (m_frame_dim.getDepth()) {
case 1:
......
......@@ -256,7 +256,7 @@ void FrameLoader::prepareAcq()
}
}
bool FrameLoader::getNextFrame(unsigned long frame_nr, unsigned char *ptr)
bool FrameLoader::getFrame(unsigned long frame_nr, unsigned char *ptr)
{
DEB_MEMBER_FUNCT();
......
......@@ -71,7 +71,7 @@ int main( void )
for( int i=0; i<10; i++ ) {
int frame_nb = fb.getFrameNr();
fb.getNextFrame( buffer );
fb.getFrame( buffer );
Timestamp t = Timestamp::now() - start;
int pixels = Point(fd.getSize()).getArea();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment