save work and start templating file with detector

.vscode/settings.json

@@ -88,7 +88,8 @@
         "locale": "cpp",
         "__tree": "cpp",
         "queue": "cpp",
-        "stack": "cpp"
+        "stack": "cpp",
+        "shared_mutex": "cpp"
     },
     "C_Cpp.errorSquiggles": "enabled"
 }

src/core/Frame.cpp

@@ -2,25 +2,21 @@
 #include <iostream>
 
 
-template <class DataType>
-Frame<DataType>::Frame(std::byte* bytes, ssize_t rows, ssize_t cols)
+IFrame::IFrame(std::byte* bytes, ssize_t rows, ssize_t cols, ssize_t bitdepth)
  {
   this->rows = rows;
   this->cols = cols;
-  data = new DataType[rows * cols];
-  std::memcpy(data, bytes, sizeof(DataType) * rows * cols);
+  data = new std::byte[rows * cols*bitdepth/8];
+  std::memcpy(data, bytes, bitdepth/8 * rows * cols);
 }
 
-template <class DataType>
-DataType Frame<DataType>::get(int row, int col) {
+std::byte* IFrame::get(int row, int col) {
   if (row < 0 || row >= rows || col < 0 || col >= cols) {
     std::cerr << "Invalid row or column index" << std::endl;
     return 0;
   }
-  return  data[row * cols + col];
+  return  data+(row * cols + col)*bitdepth/8;
 
 
 }
 
-template class Frame<uint16_t>;
-template class Frame<uint32_t>;

src/core/Frame.hpp

@@ -7,21 +7,30 @@
 #include "defs.hpp"
 
 
+
 /**
  * @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 {
+class IFrame {
 
-    DataType* data{nullptr};
+    std::byte* data{nullptr};
     ssize_t rows{};
     ssize_t cols{};
+    ssize_t bitdepth{};
     public:
-    Frame(std::byte* fp, ssize_t rows, ssize_t cols);
-    DataType get(int row, int col);
-    ~Frame(){
+    IFrame(std::byte* fp, ssize_t rows, ssize_t cols, ssize_t bitdepth);
+    std::byte* get(int row, int col);
+    ~IFrame(){
         delete[] data;
     }
+};
+
+template <class DataType> class Frame: public IFrame {
+    public:
+    Frame(std::byte* fp, ssize_t rows, ssize_t cols):IFrame(fp, rows, cols, sizeof(DataType)){}
+    DataType get(int row, int col){
+        return *((DataType*) IFrame::get(row, col));
+    }
 };

src/file_io/file/JsonFile.cpp

@@ -1,7 +1,8 @@
 #include "JsonFile.hpp"
 #include <typeinfo>
 
-Frame<uint16_t> JsonFile::get_frame(int frame_number){
+template <class T>
+Frame<T> JsonFile::get_frame(int frame_number){
     int subfile_id=frame_number/max_frames_per_file;
     std::byte* buffer;
     size_t frame_size = subfiles[subfile_id]->bytes_per_frame();
@@ -11,7 +12,7 @@ Frame<uint16_t> JsonFile::get_frame(int frame_number){
 
 
 
-    auto f =  Frame<uint16_t>(buffer, rows, cols);
+    auto f =  Frame<T>(buffer, rows, cols);
 
     delete[] buffer;
     return f;

src/file_io/file/JsonFile.hpp

@@ -5,6 +5,9 @@
 
 class JsonFile: public File
 {
-    Frame<uint16_t> get_frame(int frame_number);
+    template <class T>
+    Frame<T> get_frame(int frame_number);
+
+    IFrame get_frame(int frame_number);
     
 };