Skip to content

Commit be484e8

Browse files
AlgomorphAlgomorph
committed
Refactor FileFetch & FetchInterface
- Move FetchInterface & FileFetch sources to frameio & make corresp. source group in CMake - Refactor FileFetch to VolumeDeformFileFetch (making name more specific to what it does)
1 parent b5c2bb3 commit be484e8

File tree

12 files changed

+24
-21
lines changed

12 files changed

+24
-21
lines changed

‎apps/crf_test/main.cu

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include <iostream>
22
#include "common/ConfigParser.h"
33
#include "visualization/Visualizer.h"
4-
#include "imgproc/FileFetch.h"
4+
#include "imgproc/frameio/VolumeDeformFileFetch.h"
55
#include "imgproc/ImageProcessor.h"
66
#include "imgproc/segmentation/ForegroundSegmenterNaiveCRF.h"
77

‎apps/gpc_test/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include "common/ConfigParser.h"
77
#include "common/data_transfer.h"
88
#include "visualization/Visualizer.h"
9-
#include "imgproc/FileFetch.h"
9+
#include "imgproc/frameio/VolumeDeformFileFetch.h"
1010
#include "imgproc/ImageProcessor.h"
1111
#include "imgproc/correspondence/ImagePairCorrespondence.h"
1212
#include "imgproc/correspondence/PatchColliderRGBCorrespondence.h"

‎apps/imgproc_app/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Created by wei on 5/29/18.
33
//
44
#include "common/ConfigParser.h"
5-
#include "imgproc/FileFetch.h"
5+
#include "imgproc/frameio/VolumeDeformFileFetch.h"
66
#include "imgproc/ImageProcessor.h"
77
#include "visualization/Visualizer.h"
88

‎apps/imgproc_test/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include "common/ConfigParser.h"
44
#include "common/CameraObservation.h"
55
#include "visualization/Visualizer.h"
6-
#include "imgproc/FileFetch.h"
6+
#include "imgproc/frameio/VolumeDeformFileFetch.h"
77
#include "imgproc/ImageProcessor.h"
88
#include <iostream>
99
#include <opencv2/opencv.hpp>

‎apps/render_test/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include "common/Constants.h"
66
#include "common/ConfigParser.h"
77
#include "imgproc/ImageProcessor.h"
8-
#include "imgproc/FileFetch.h"
8+
#include "imgproc/frameio/VolumeDeformFileFetch.h"
99
#include "core/SurfelGeometry.h"
1010
#include "core/WarpField.h"
1111
#include "core/render/Renderer.h"

‎core/SurfelWarpSerial.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include "core/warp_solver/WarpSolver.h"
99
#include "core/geometry/SurfelNodeDeformer.h"
1010
#include "visualization/Visualizer.h"
11+
#include "imgproc/frameio/FetchInterface.h"
1112

1213

1314
#include <thread>
@@ -19,7 +20,7 @@ surfelwarp::SurfelWarpSerial::SurfelWarpSerial() {
1920
const auto& config = ConfigParser::Instance();
2021

2122
//Construct the image processor
22-
FileFetch::Ptr fetcher = std::make_shared<FileFetch>(config.data_path());
23+
FetchInterface::Ptr fetcher = std::make_shared<VolumeDeformFileFetch>(config.data_path());
2324
m_image_processor = std::make_shared<ImageProcessor>(fetcher);
2425

2526
//Construct the holder for surfel geometry

‎core/SurfelWarpSerial.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include "common/Constants.h"
88
#include "common/ConfigParser.h"
99
#include "imgproc/ImageProcessor.h"
10-
#include "imgproc/FileFetch.h"
10+
#include "imgproc/frameio/VolumeDeformFileFetch.h"
1111
#include "core/SurfelGeometry.h"
1212
#include "core/WarpField.h"
1313
#include "core/Camera.h"

‎imgproc/CMakeLists.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
file(GLOB IMGPROC_SRC *.h *.hpp *.cpp *.cu)
2+
file(GLOB IMGPROC_FRAMEIO_SRC frameio/*.h frameio/*.hpp frameio/*.cpp frameio/*.cu)
3+
source_group("frameio" FILES ${IMGPROC_FRAMEIO_SRC})
24
source_group("src" FILES ${IMGPROC_SRC})
3-
cuda_add_library(imgproc_lib ${IMGPROC_SRC})
5+
cuda_add_library(imgproc_lib ${IMGPROC_SRC} ${IMGPROC_FRAMEIO_SRC})
46
target_link_libraries(imgproc_lib math_lib)
57
target_link_libraries(imgproc_lib common_lib)
68
target_link_libraries(imgproc_lib ${OpenCV_LIBS})

‎imgproc/ImageProcessor.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include "common/DeviceBufferArray.h"
1212
#include "common/CameraObservation.h"
1313
#include "math/device_mat.h"
14-
#include "imgproc/FetchInterface.h"
14+
#include "imgproc/frameio/FetchInterface.h"
1515
#include "imgproc/segmentation/ForegroundSegmenter.h"
1616
#include "imgproc/correspondence/ImagePairCorrespondence.h"
1717

‎imgproc/FetchInterface.h ‎imgproc/frameio/FetchInterface.h

File renamed without changes.

‎imgproc/FileFetch.cpp ‎imgproc/frameio/VolumeDeformFileFetch.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
#include <opencv2/opencv.hpp>
22
#include "common/OpenCV_CrossPlatform.h"
3-
#include "imgproc/FileFetch.h"
3+
#include "VolumeDeformFileFetch.h"
44

5-
void surfelwarp::FileFetch::FetchDepthImage(size_t frame_idx, cv::Mat & depth_img)
5+
void surfelwarp::VolumeDeformFileFetch::FetchDepthImage(size_t frame_idx, cv::Mat & depth_img)
66
{
77
path file_path = FileNameSurfelWarp(frame_idx, true);
88
//Read the image
99
depth_img = cv::imread(file_path.string(), CV_ANYCOLOR | CV_ANYDEPTH);
1010
}
1111

12-
void surfelwarp::FileFetch::FetchDepthImage(size_t frame_idx, void * depth_img)
12+
void surfelwarp::VolumeDeformFileFetch::FetchDepthImage(size_t frame_idx, void * depth_img)
1313
{
1414

1515
}
1616

17-
void surfelwarp::FileFetch::FetchRGBImage(size_t frame_idx, cv::Mat & rgb_img)
17+
void surfelwarp::VolumeDeformFileFetch::FetchRGBImage(size_t frame_idx, cv::Mat & rgb_img)
1818
{
1919
path file_path = FileNameSurfelWarp(frame_idx, false);
2020
//Read the image
2121
rgb_img = cv::imread(file_path.string(), CV_ANYCOLOR | CV_ANYDEPTH);
2222
}
2323

24-
void surfelwarp::FileFetch::FetchRGBImage(size_t frame_idx, void * rgb_img)
24+
void surfelwarp::VolumeDeformFileFetch::FetchRGBImage(size_t frame_idx, void * rgb_img)
2525
{
2626

2727
}
2828

29-
boost::filesystem::path surfelwarp::FileFetch::FileNameVolumeDeform(size_t frame_idx, bool is_depth_img) const
29+
boost::filesystem::path surfelwarp::VolumeDeformFileFetch::FileNameVolumeDeform(size_t frame_idx, bool is_depth_img) const
3030
{
3131
//Construct the file_name
3232
char frame_idx_str[20];
@@ -48,6 +48,6 @@ boost::filesystem::path surfelwarp::FileFetch::FileNameVolumeDeform(size_t frame
4848

4949

5050

51-
boost::filesystem::path surfelwarp::FileFetch::FileNameSurfelWarp(size_t frame_idx, bool is_depth_img) const {
51+
boost::filesystem::path surfelwarp::VolumeDeformFileFetch::FileNameSurfelWarp(size_t frame_idx, bool is_depth_img) const {
5252
return FileNameVolumeDeform(frame_idx, is_depth_img);
5353
}

‎imgproc/FileFetch.h ‎imgproc/frameio/VolumeDeformFileFetch.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
#pragma once
2-
#include "imgproc/FetchInterface.h"
2+
#include "FetchInterface.h"
33
#include <string>
44
#include <boost/filesystem.hpp>
55

66
namespace surfelwarp
77
{
8-
class FileFetch : public FetchInterface
8+
class VolumeDeformFileFetch : public FetchInterface
99
{
1010
public:
11-
using Ptr = std::shared_ptr<FileFetch>;
11+
using Ptr = std::shared_ptr<VolumeDeformFileFetch>;
1212
using path = boost::filesystem::path;
1313

1414
//Just copy the string to data path
15-
explicit FileFetch(
15+
explicit VolumeDeformFileFetch(
1616
const path& data_path
1717
) : m_data_path(data_path) {}
1818

1919

20-
~FileFetch() = default;
20+
~VolumeDeformFileFetch() = default;
2121

2222
//Main interface
2323
void FetchDepthImage(size_t frame_idx, cv::Mat& depth_img) override;

0 commit comments

Comments
 (0)