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

merge with branch developer (commit: ea8efa)

Browse Source
This commit is contained in:
Bechir
2024-03-08 18:32:32 +01:00
parent 765bbdc295 ea8efa64b2
commit 565cad0fca
9 changed files with 90 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,21 +1,22 @@
#pragma once
#include <cstddef>
#include <sys/types.h>
#include <cstdint>
#include <bits/unique_ptr.h>
#include <vector>
#include "aare/defs.hpp"
#include <bits/unique_ptr.h>
#include <cstddef>
#include <cstdint>
#include <sys/types.h>
#include <vector>
/**
* @brief Frame class to represent a single frame of data
* model class
* should be able to work with streams coming from files or network
*/
*/
template <class DataType> class Frame{
template <class DataType> class Frame {
ssize_t m_rows;
ssize_t m_cols;
DataType *m_data;
ssize_t m_bitdepth = sizeof(DataType) * 8;
public:
ssize_t rows;
@ -24,13 +25,19 @@ template <class DataType> class Frame{
ssize_t bitdepth = sizeof(DataType)*8;
Frame(ssize_t rows, ssize_t cols);
Frame(std::byte* fp, ssize_t rows, ssize_t cols);
Frame(std::byte *fp, ssize_t rows, ssize_t cols);
DataType get(int row, int col);
~Frame(){
delete[] data;
ssize_t rows() const{
return m_rows;
}
ssize_t cols() const{
return m_cols;
}
ssize_t bitdepth() const{
return m_bitdepth;
}
~Frame() { delete[] m_data; }
};
typedef Frame<uint16_t> Frame16;

13
core/src/Frame.cpp
View File

@ -3,9 +3,9 @@
template <typename DataType>
Frame<DataType>::Frame(std::byte* bytes, ssize_t rows, ssize_t cols):
rows(rows), cols(cols) {
data = new DataType[rows*cols];
std::memcpy(data, bytes, rows*cols*sizeof(DataType));
m_rows(rows), m_cols(cols) {
m_data = new DataType[rows*cols];
std::memcpy(m_data, bytes, m_rows*m_cols*sizeof(DataType));
}
template <typename DataType>
@ -18,10 +18,11 @@ Frame<DataType>::Frame(ssize_t rows, ssize_t cols):
template <typename DataType>
DataType Frame<DataType>::get(int row, int col) {
if (row < 0 || row >= rows || col < 0 || col >= cols) {
throw std::runtime_error("Invalid row or column index");
if (row < 0 || row >= m_rows || col < 0 || col >= m_cols) {
std::cerr << "Invalid row or column index" << std::endl;
return 0;
}
return data[row*cols + col];
return m_data[row*m_cols + col];
}