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

remove templates

Browse Source
This commit is contained in:
Bechir Braham
2024-03-20 13:14:14 +01:00
parent 4da9bc0813
commit cd905e96f3
25 changed files with 223 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/CMakeLists.txt
View File

@ -10,8 +10,10 @@ target_include_directories(core PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
target_link_libraries(core PUBLIC fmt::fmt PRIVATE aare_compiler_flags)
set_property(TARGET core PROPERTY POSITION_INDEPENDENT_CODE ON)
if (AARE_PYTHON_BINDINGS)
set_property(TARGET core PROPERTY POSITION_INDEPENDENT_CODE ON)
endif()
if(AARE_TESTS)
set(TestSources

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

@ -12,17 +12,18 @@
* should be able to work with streams coming from files or network
*/
template <class DataType> class Frame {
class Frame {
ssize_t m_rows;
ssize_t m_cols;
DataType *m_data;
ssize_t m_bitdepth = sizeof(DataType) * 8;
ssize_t m_bitdepth;
std::byte* m_data;
public:
Frame(ssize_t rows, ssize_t cols);
Frame(std::byte *fp, ssize_t rows, ssize_t cols);
DataType get(int row, int col);
std::vector<std::vector<DataType>> get_array();
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);
std::byte* get(int row, int col);
// std::vector<std::vector<DataType>> get_array();
ssize_t rows() const{
return m_rows;
}
@ -32,13 +33,17 @@ template <class DataType> class Frame {
ssize_t bitdepth() const{
return m_bitdepth;
}
DataType* _get_data(){
std::byte* _get_data(){
return m_data;
}
Frame& operator=(Frame& other){
m_rows = other.rows();
m_cols = other.cols();
m_bitdepth = other.bitdepth();
m_data = new std::byte[m_rows*m_cols*m_bitdepth/8];
std::memcpy(m_data, other.m_data, m_rows*m_cols*m_bitdepth/8);
return *this;
}
~Frame() { delete[] m_data; }
};
typedef Frame<uint16_t> Frame16;
typedef Frame<uint8_t> Frame8;
typedef Frame<uint32_t> Frame32;

41
core/src/Frame.cpp
View File

@ -1,41 +1,36 @@
#include "aare/Frame.hpp"
#include <iostream>
template <typename DataType>
Frame<DataType>::Frame(std::byte* bytes, ssize_t rows, ssize_t cols):
m_rows(rows), m_cols(cols) {
m_data = new DataType[rows*cols];
std::memcpy(m_data, bytes, m_rows*m_cols*sizeof(DataType));
Frame::Frame(std::byte* bytes, ssize_t rows, ssize_t cols, ssize_t bitdepth):
m_rows(rows), m_cols(cols), m_bitdepth(bitdepth) {
m_data = new std::byte[rows*cols*bitdepth/8];
std::memcpy(m_data, bytes, rows*cols*bitdepth/8);
}
template <typename DataType>
Frame<DataType>::Frame(ssize_t rows, ssize_t cols):
m_rows(rows), m_cols(cols) {
m_data = new DataType[m_rows*m_cols];
Frame::Frame(ssize_t rows, ssize_t cols, ssize_t bitdepth):
m_rows(rows), m_cols(cols), m_bitdepth(bitdepth) {
m_data = new std::byte[rows*cols*bitdepth/8];
}
template <typename DataType>
DataType Frame<DataType>::get(int row, int col) {
std::byte* Frame::get(int row, int col) {
if (row < 0 || row >= m_rows || col < 0 || col >= m_cols) {
std::cerr << "Invalid row or column index" << std::endl;
return 0;
}
return m_data[row*m_cols + col];
return m_data+(row*m_cols + col)*(m_bitdepth/8);
}
template <typename DataType>
std::vector<std::vector<DataType>> Frame<DataType>::get_array() {
std::vector<std::vector<DataType>> array;
for (int i = 0; i < m_rows; i++) {
std::vector<DataType> row;
row.assign(m_data + i*m_cols, m_data + (i+1)*m_cols);
array.push_back(row);
}
// std::vector<std::vector<DataType>> Frame<DataType>::get_array() {
// std::vector<std::vector<DataType>> array;
// for (int i = 0; i < m_rows; i++) {
// std::vector<DataType> row;
// row.assign(m_data + i*m_cols, m_data + (i+1)*m_cols);
// array.push_back(row);
// }
return array;
}
// return array;
// }
template class Frame<uint16_t>;