Commit 1b91c2da authored by Alejandro Homs Puron's avatar Alejandro Homs Puron Committed by operator for beamline
Browse files

Using NumaSoftBufferCtrlObj

parent 23069964
Pipeline #9838 failed with stages
in 3 minutes and 31 seconds
......@@ -81,7 +81,7 @@ public:
{ return std::pair<int, int>(port_idx / m_recv_nb_ports,
port_idx % m_recv_nb_ports); }
void setBufferCtrlObj(SoftBufferCtrlObj *buffer_ctrl_obj)
void setBufferCtrlObj(NumaSoftBufferCtrlObj *buffer_ctrl_obj)
{ m_buffer_ctrl_obj = buffer_ctrl_obj; }
void setPixelDepth(PixelDepth pixel_depth);
......@@ -300,7 +300,7 @@ private:
double m_lat_time;
double m_frame_period;
Settings m_settings;
SoftBufferCtrlObj *m_buffer_ctrl_obj;
NumaSoftBufferCtrlObj *m_buffer_ctrl_obj;
PixelDepth m_pixel_depth;
ImageType m_image_type;
bool m_raw_mode;
......
......@@ -183,7 +183,7 @@ class Interface : public HwInterface
CapList m_cap_list;
DetInfoCtrlObj m_det_info;
SoftBufferCtrlObj m_buffer;
NumaSoftBufferCtrlObj m_buffer;
SyncCtrlObj m_sync;
EventCtrlObj m_event;
......
......@@ -41,7 +41,7 @@ public:
int getTotNbPorts();
int getPortIndex(int recv_idx, int port);
void setBufferCtrlObj(SoftBufferCtrlObj *buffer_ctrl_obj);
// void setBufferCtrlObj(NumaSoftBufferCtrlObj *buffer_ctrl_obj);
void setPixelDepth(SlsDetector::PixelDepth pixel_depth);
void getPixelDepth(SlsDetector::PixelDepth& pixel_depth /Out/);
......
......@@ -137,10 +137,9 @@ TestApp::TestApp(int argc, char *argv[])
DebParams::enableTypeFlags(m_pars.debug_type_flags);
m_cam = new Camera(m_pars.config_fname);
m_alloc_mgr = new SoftBufferAllocMgr();
m_buffer_mgr = new StdBufferCbMgr(*m_alloc_mgr);
m_buffer_mgr->registerFrameCallback(m_cb);
m_cam->setBufferCbMgr(m_buffer_mgr);
m_buffer_ctrl_obj = new NumaSoftBufferCtrlObj();
m_buffer_ctrl_obj->registerFrameCallback(m_cb);
m_cam->setBufferCtrlObj(m_buffer_ctrl_obj);
Type det_type = m_cam->getType();
if (det_type != EigerDet)
......
......@@ -156,8 +156,7 @@ class TestApp
void save_edf_frame(ofstream& of, int acq_idx, int edf_idx);
Pars m_pars;
AutoPtr<SoftBufferAllocMgr> m_alloc_mgr;
AutoPtr<StdBufferCbMgr> m_buffer_mgr;
AutoPtr<NumaSoftBufferCtrlObj> m_buffer_ctrl_obj;
AutoPtr<Camera> m_cam;
AutoPtr<Model> m_model;
AcqState m_state;
......
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