detectors/aare
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/aare.git synced 2025-06-06 21:00:41 +02:00
Code Issues Actions Packages Releases Activity

renamed _get_data() to data()

Browse Source
This commit is contained in:
Erik Frojdh 2024-04-03 12:14:59 +02:00
parent 3f83e37e6b
commit d80ea2269f
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/include/aare/Frame.hpp
View File

@ -26,22 +26,23 @@ class Frame {
Frame(ssize_t rows, ssize_t cols, ssize_t m_bitdepth); Frame(ssize_t rows, ssize_t cols, ssize_t m_bitdepth);
Frame(std::byte *fp, ssize_t rows, ssize_t cols, ssize_t m_bitdepth); Frame(std::byte *fp, ssize_t rows, ssize_t cols, ssize_t m_bitdepth);
std::byte *get(int row, int col); std::byte *get(int row, int col);
// template <typename T> void set(int row, int col, T data);
//TODO! can we, or even want to remove the template?
template <typename T> template <typename T>
void set(int row, int col, T data) { void set(int row, int col, T data) {
assert(sizeof(T) == m_bitdepth/8); assert(sizeof(T) == m_bitdepth/8);
if (row < 0 || row >= m_rows || col < 0 || col >= m_cols) { if (row < 0 || row >= m_rows || col < 0 || col >= m_cols) {
std::cerr << "Invalid row or column index" << std::endl; throw std::out_of_range("Invalid row or column index");
return; }
} std::memcpy(m_data+(row*m_cols + col)*(m_bitdepth/8), &data, m_bitdepth/8);
std::memcpy(m_data+(row*m_cols + col)*(m_bitdepth/8), &data, m_bitdepth/8); }
}
ssize_t rows() const { return m_rows; } ssize_t rows() const { return m_rows; }
ssize_t cols() const { return m_cols; } ssize_t cols() const { return m_cols; }
ssize_t bitdepth() const { return m_bitdepth; } ssize_t bitdepth() const { return m_bitdepth; }
ssize_t size() const { return m_rows * m_cols * m_bitdepth / 8; } ssize_t size() const { return m_rows * m_cols * m_bitdepth / 8; }
std::byte *_get_data() { return m_data; } std::byte *data() { return m_data; }
Frame &operator=(Frame &other) { Frame &operator=(Frame &other) {
m_rows = other.rows(); m_rows = other.rows();

4
file_io/src/NumpyFile.cpp
View File

@ -38,14 +38,14 @@ void NumpyFile::write(Frame &frame) {
throw std::runtime_error("File not open for writing"); throw std::runtime_error("File not open for writing");
} }
fseek(fp, 0, SEEK_END); fseek(fp, 0, SEEK_END);
fwrite(frame._get_data(), frame.size(), 1, fp); fwrite(frame.data(), frame.size(), 1, fp);
} }
Frame NumpyFile::get_frame(size_t frame_number) { Frame NumpyFile::get_frame(size_t frame_number) {
Frame frame(m_header.shape[1], m_header.shape[2], m_header.dtype.bitdepth()); Frame frame(m_header.shape[1], m_header.shape[2], m_header.dtype.bitdepth());
get_frame_into(frame_number, frame._get_data()); get_frame_into(frame_number, frame.data());
return frame; return frame;
} }
void NumpyFile::get_frame_into(size_t frame_number, std::byte *image_buf) { void NumpyFile::get_frame_into(size_t frame_number, std::byte *image_buf) {

2
file_io/src/RawFile.cpp
View File

@ -5,7 +5,7 @@ namespace aare{
Frame RawFile::get_frame(size_t frame_number) { Frame RawFile::get_frame(size_t frame_number) {
auto f = Frame(this->m_rows, this->m_cols, this->m_bitdepth); auto f = Frame(this->m_rows, this->m_cols, this->m_bitdepth);
std::byte *frame_buffer = f._get_data(); std::byte *frame_buffer = f.data();
get_frame_into(frame_number, frame_buffer); get_frame_into(frame_number, frame_buffer);
return f; return f;
} }