added working zbar node
continuous-integration/drone/push Build encountered an error Details

master
Yorick GEOFFRE 3 years ago
parent 0119b1b8a3
commit ef16fd0c38

@ -301,17 +301,18 @@ CMakeFiles/prog.dir/all: model/hardware/psvr/CMakeFiles/psvr.dir/all
CMakeFiles/prog.dir/all: model/hardware/hw/CMakeFiles/hw.dir/all
CMakeFiles/prog.dir/all: model/controllers/CMakeFiles/controllers.dir/all
CMakeFiles/prog.dir/all: model/patterns/observer/CMakeFiles/observers.dir/all
CMakeFiles/prog.dir/all: processing/zbar/CMakeFiles/zbarLib.dir/all
CMakeFiles/prog.dir/all: model/windows/CMakeFiles/windows.dir/all
CMakeFiles/prog.dir/all: ui/support/CMakeFiles/support.dir/all
CMakeFiles/prog.dir/all: pipeline/CMakeFiles/pipelineLib.dir/all
$(MAKE) $(MAKESILENT) -f CMakeFiles/prog.dir/build.make CMakeFiles/prog.dir/depend
$(MAKE) $(MAKESILENT) -f CMakeFiles/prog.dir/build.make CMakeFiles/prog.dir/build
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kanken/code/AHRS_core/src/CMakeFiles --progress-num=22,23,24 "Built target prog"
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kanken/code/AHRS_core/src/CMakeFiles --progress-num=25,26,27 "Built target prog"
.PHONY : CMakeFiles/prog.dir/all
# Build rule for subdir invocation for target.
CMakeFiles/prog.dir/rule: cmake_check_build_system
$(CMAKE_COMMAND) -E cmake_progress_start /home/kanken/code/AHRS_core/src/CMakeFiles 33
$(CMAKE_COMMAND) -E cmake_progress_start /home/kanken/code/AHRS_core/src/CMakeFiles 38
$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 CMakeFiles/prog.dir/all
$(CMAKE_COMMAND) -E cmake_progress_start /home/kanken/code/AHRS_core/src/CMakeFiles 0
.PHONY : CMakeFiles/prog.dir/rule
@ -332,7 +333,7 @@ CMakeFiles/prog.dir/clean:
threadweaver/CMakeFiles/threadweaver.dir/all: model/perfcheckers/CMakeFiles/perfcheckers.dir/all
$(MAKE) $(MAKESILENT) -f threadweaver/CMakeFiles/threadweaver.dir/build.make threadweaver/CMakeFiles/threadweaver.dir/depend
$(MAKE) $(MAKESILENT) -f threadweaver/CMakeFiles/threadweaver.dir/build.make threadweaver/CMakeFiles/threadweaver.dir/build
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kanken/code/AHRS_core/src/CMakeFiles --progress-num=29,30 "Built target threadweaver"
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kanken/code/AHRS_core/src/CMakeFiles --progress-num=32,33 "Built target threadweaver"
.PHONY : threadweaver/CMakeFiles/threadweaver.dir/all
# Build rule for subdir invocation for target.
@ -437,7 +438,7 @@ model/hardware/cameras/CMakeFiles/cameras.dir/clean:
model/hardware/psvr/CMakeFiles/psvr.dir/all: model/hardware/ihidapi/CMakeFiles/ihidapi.dir/all
$(MAKE) $(MAKESILENT) -f model/hardware/psvr/CMakeFiles/psvr.dir/build.make model/hardware/psvr/CMakeFiles/psvr.dir/depend
$(MAKE) $(MAKESILENT) -f model/hardware/psvr/CMakeFiles/psvr.dir/build.make model/hardware/psvr/CMakeFiles/psvr.dir/build
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kanken/code/AHRS_core/src/CMakeFiles --progress-num=25,26 "Built target psvr"
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kanken/code/AHRS_core/src/CMakeFiles --progress-num=28,29 "Built target psvr"
.PHONY : model/hardware/psvr/CMakeFiles/psvr.dir/all
# Build rule for subdir invocation for target.
@ -548,7 +549,7 @@ model/patterns/observer/CMakeFiles/observers.dir/clean:
processing/zbar/CMakeFiles/zbarLib.dir/all:
$(MAKE) $(MAKESILENT) -f processing/zbar/CMakeFiles/zbarLib.dir/build.make processing/zbar/CMakeFiles/zbarLib.dir/depend
$(MAKE) $(MAKESILENT) -f processing/zbar/CMakeFiles/zbarLib.dir/build.make processing/zbar/CMakeFiles/zbarLib.dir/build
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kanken/code/AHRS_core/src/CMakeFiles --progress-num=34,35 "Built target zbarLib"
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kanken/code/AHRS_core/src/CMakeFiles --progress-num=37,38 "Built target zbarLib"
.PHONY : processing/zbar/CMakeFiles/zbarLib.dir/all
# Build rule for subdir invocation for target.
@ -574,7 +575,7 @@ processing/zbar/CMakeFiles/zbarLib.dir/clean:
model/windows/CMakeFiles/windows.dir/all:
$(MAKE) $(MAKESILENT) -f model/windows/CMakeFiles/windows.dir/build.make model/windows/CMakeFiles/windows.dir/depend
$(MAKE) $(MAKESILENT) -f model/windows/CMakeFiles/windows.dir/build.make model/windows/CMakeFiles/windows.dir/build
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kanken/code/AHRS_core/src/CMakeFiles --progress-num=31,32,33 "Built target windows"
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kanken/code/AHRS_core/src/CMakeFiles --progress-num=34,35,36 "Built target windows"
.PHONY : model/windows/CMakeFiles/windows.dir/all
# Build rule for subdir invocation for target.
@ -600,7 +601,7 @@ model/windows/CMakeFiles/windows.dir/clean:
ui/support/CMakeFiles/support.dir/all:
$(MAKE) $(MAKESILENT) -f ui/support/CMakeFiles/support.dir/build.make ui/support/CMakeFiles/support.dir/depend
$(MAKE) $(MAKESILENT) -f ui/support/CMakeFiles/support.dir/build.make ui/support/CMakeFiles/support.dir/build
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kanken/code/AHRS_core/src/CMakeFiles --progress-num=27,28 "Built target support"
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kanken/code/AHRS_core/src/CMakeFiles --progress-num=30,31 "Built target support"
.PHONY : ui/support/CMakeFiles/support.dir/all
# Build rule for subdir invocation for target.
@ -631,16 +632,17 @@ pipeline/CMakeFiles/pipelineLib.dir/all: model/hardware/psvr/CMakeFiles/psvr.dir
pipeline/CMakeFiles/pipelineLib.dir/all: model/hardware/hw/CMakeFiles/hw.dir/all
pipeline/CMakeFiles/pipelineLib.dir/all: model/controllers/CMakeFiles/controllers.dir/all
pipeline/CMakeFiles/pipelineLib.dir/all: model/patterns/observer/CMakeFiles/observers.dir/all
pipeline/CMakeFiles/pipelineLib.dir/all: processing/zbar/CMakeFiles/zbarLib.dir/all
pipeline/CMakeFiles/pipelineLib.dir/all: model/windows/CMakeFiles/windows.dir/all
pipeline/CMakeFiles/pipelineLib.dir/all: ui/support/CMakeFiles/support.dir/all
$(MAKE) $(MAKESILENT) -f pipeline/CMakeFiles/pipelineLib.dir/build.make pipeline/CMakeFiles/pipelineLib.dir/depend
$(MAKE) $(MAKESILENT) -f pipeline/CMakeFiles/pipelineLib.dir/build.make pipeline/CMakeFiles/pipelineLib.dir/build
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kanken/code/AHRS_core/src/CMakeFiles --progress-num=14,15,16,17,18,19,20,21 "Built target pipelineLib"
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/kanken/code/AHRS_core/src/CMakeFiles --progress-num=14,15,16,17,18,19,20,21,22,23,24 "Built target pipelineLib"
.PHONY : pipeline/CMakeFiles/pipelineLib.dir/all
# Build rule for subdir invocation for target.
pipeline/CMakeFiles/pipelineLib.dir/rule: cmake_check_build_system
$(CMAKE_COMMAND) -E cmake_progress_start /home/kanken/code/AHRS_core/src/CMakeFiles 30
$(CMAKE_COMMAND) -E cmake_progress_start /home/kanken/code/AHRS_core/src/CMakeFiles 35
$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 pipeline/CMakeFiles/pipelineLib.dir/all
$(CMAKE_COMMAND) -E cmake_progress_start /home/kanken/code/AHRS_core/src/CMakeFiles 0
.PHONY : pipeline/CMakeFiles/pipelineLib.dir/rule

@ -25,6 +25,7 @@ set(CMAKE_TARGET_LINKED_INFO_FILES
"/home/kanken/code/AHRS_core/src/model/patterns/observer/CMakeFiles/observers.dir/DependInfo.cmake"
"/home/kanken/code/AHRS_core/src/threadweaver/CMakeFiles/threadweaver.dir/DependInfo.cmake"
"/home/kanken/code/AHRS_core/src/model/perfcheckers/CMakeFiles/perfcheckers.dir/DependInfo.cmake"
"/home/kanken/code/AHRS_core/src/processing/zbar/CMakeFiles/zbarLib.dir/DependInfo.cmake"
)
# Fortran module output directory.

@ -119,6 +119,11 @@ prog: model/hardware/psvr/libpsvr.a
prog: model/hardware/ihidapi/libihidapi.a
prog: /usr/local/lib/libhidapi-hidraw.so.0.13.0
prog: model/hardware/cameras/libcameras.a
prog: model/hardware/hw/libhw.a
prog: model/patterns/observer/libobservers.a
prog: threadweaver/libthreadweaver.a
prog: model/perfcheckers/libperfcheckers.a
prog: processing/zbar/libzbarLib.a
prog: /usr/local/lib/libopencv_gapi.so.4.6.0
prog: /usr/local/lib/libopencv_stitching.so.4.6.0
prog: /usr/local/lib/libopencv_aruco.so.4.6.0
@ -172,10 +177,7 @@ prog: /usr/local/lib/libopencv_xphoto.so.4.6.0
prog: /usr/local/lib/libopencv_photo.so.4.6.0
prog: /usr/local/lib/libopencv_imgproc.so.4.6.0
prog: /usr/local/lib/libopencv_core.so.4.6.0
prog: model/hardware/hw/libhw.a
prog: model/patterns/observer/libobservers.a
prog: threadweaver/libthreadweaver.a
prog: model/perfcheckers/libperfcheckers.a
prog: /usr/lib/x86_64-linux-gnu/libzbar.so
prog: CMakeFiles/prog.dir/link.txt
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/home/kanken/code/AHRS_core/src/CMakeFiles --progress-num=$(CMAKE_PROGRESS_3) "Linking CXX executable prog"
$(CMAKE_COMMAND) -E cmake_link_script CMakeFiles/prog.dir/link.txt --verbose=$(VERBOSE)

@ -1 +1 @@
/usr/bin/c++ CMakeFiles/prog.dir/main.cpp.o CMakeFiles/prog.dir/topLevelManager.cpp.o -o prog -L/home/kanken/code/AHRS_core/src -Wl,-rpath,/home/kanken/code/AHRS_core/src:/usr/local/lib pipeline/libpipelineLib.a -ltbb model/windows/libwindows.a ui/support/libsupport.a model/controllers/libcontrollers.a /usr/lib/x86_64-linux-gnu/libOpenGL.so /usr/lib/x86_64-linux-gnu/libGLX.so /usr/lib/x86_64-linux-gnu/libGLU.so model/hardware/psvr/libpsvr.a model/hardware/ihidapi/libihidapi.a /usr/local/lib/libhidapi-hidraw.so.0.13.0 model/hardware/cameras/libcameras.a /usr/local/lib/libopencv_gapi.so.4.6.0 /usr/local/lib/libopencv_stitching.so.4.6.0 /usr/local/lib/libopencv_aruco.so.4.6.0 /usr/local/lib/libopencv_barcode.so.4.6.0 /usr/local/lib/libopencv_bgsegm.so.4.6.0 /usr/local/lib/libopencv_bioinspired.so.4.6.0 /usr/local/lib/libopencv_ccalib.so.4.6.0 /usr/local/lib/libopencv_dnn_objdetect.so.4.6.0 /usr/local/lib/libopencv_dnn_superres.so.4.6.0 /usr/local/lib/libopencv_dpm.so.4.6.0 /usr/local/lib/libopencv_face.so.4.6.0 /usr/local/lib/libopencv_freetype.so.4.6.0 /usr/local/lib/libopencv_fuzzy.so.4.6.0 /usr/local/lib/libopencv_hfs.so.4.6.0 /usr/local/lib/libopencv_img_hash.so.4.6.0 /usr/local/lib/libopencv_intensity_transform.so.4.6.0 /usr/local/lib/libopencv_line_descriptor.so.4.6.0 /usr/local/lib/libopencv_mcc.so.4.6.0 /usr/local/lib/libopencv_quality.so.4.6.0 /usr/local/lib/libopencv_rapid.so.4.6.0 /usr/local/lib/libopencv_reg.so.4.6.0 /usr/local/lib/libopencv_rgbd.so.4.6.0 /usr/local/lib/libopencv_saliency.so.4.6.0 /usr/local/lib/libopencv_stereo.so.4.6.0 /usr/local/lib/libopencv_structured_light.so.4.6.0 /usr/local/lib/libopencv_phase_unwrapping.so.4.6.0 /usr/local/lib/libopencv_superres.so.4.6.0 /usr/local/lib/libopencv_optflow.so.4.6.0 /usr/local/lib/libopencv_surface_matching.so.4.6.0 /usr/local/lib/libopencv_tracking.so.4.6.0 /usr/local/lib/libopencv_highgui.so.4.6.0 /usr/local/lib/libopencv_datasets.so.4.6.0 /usr/local/lib/libopencv_plot.so.4.6.0 /usr/local/lib/libopencv_text.so.4.6.0 /usr/local/lib/libopencv_videostab.so.4.6.0 /usr/local/lib/libopencv_videoio.so.4.6.0 /usr/local/lib/libopencv_wechat_qrcode.so.4.6.0 /usr/local/lib/libopencv_xfeatures2d.so.4.6.0 /usr/local/lib/libopencv_ml.so.4.6.0 /usr/local/lib/libopencv_shape.so.4.6.0 /usr/local/lib/libopencv_ximgproc.so.4.6.0 /usr/local/lib/libopencv_video.so.4.6.0 /usr/local/lib/libopencv_xobjdetect.so.4.6.0 /usr/local/lib/libopencv_imgcodecs.so.4.6.0 /usr/local/lib/libopencv_objdetect.so.4.6.0 /usr/local/lib/libopencv_calib3d.so.4.6.0 /usr/local/lib/libopencv_dnn.so.4.6.0 /usr/local/lib/libopencv_features2d.so.4.6.0 /usr/local/lib/libopencv_flann.so.4.6.0 /usr/local/lib/libopencv_xphoto.so.4.6.0 /usr/local/lib/libopencv_photo.so.4.6.0 /usr/local/lib/libopencv_imgproc.so.4.6.0 /usr/local/lib/libopencv_core.so.4.6.0 model/hardware/hw/libhw.a model/patterns/observer/libobservers.a threadweaver/libthreadweaver.a model/perfcheckers/libperfcheckers.a
/usr/bin/c++ CMakeFiles/prog.dir/main.cpp.o CMakeFiles/prog.dir/topLevelManager.cpp.o -o prog -L/home/kanken/code/AHRS_core/src -Wl,-rpath,/home/kanken/code/AHRS_core/src:/usr/local/lib pipeline/libpipelineLib.a -ltbb model/windows/libwindows.a ui/support/libsupport.a model/controllers/libcontrollers.a /usr/lib/x86_64-linux-gnu/libOpenGL.so /usr/lib/x86_64-linux-gnu/libGLX.so /usr/lib/x86_64-linux-gnu/libGLU.so model/hardware/psvr/libpsvr.a model/hardware/ihidapi/libihidapi.a /usr/local/lib/libhidapi-hidraw.so.0.13.0 model/hardware/cameras/libcameras.a model/hardware/hw/libhw.a model/patterns/observer/libobservers.a threadweaver/libthreadweaver.a model/perfcheckers/libperfcheckers.a processing/zbar/libzbarLib.a /usr/local/lib/libopencv_gapi.so.4.6.0 /usr/local/lib/libopencv_stitching.so.4.6.0 /usr/local/lib/libopencv_aruco.so.4.6.0 /usr/local/lib/libopencv_barcode.so.4.6.0 /usr/local/lib/libopencv_bgsegm.so.4.6.0 /usr/local/lib/libopencv_bioinspired.so.4.6.0 /usr/local/lib/libopencv_ccalib.so.4.6.0 /usr/local/lib/libopencv_dnn_objdetect.so.4.6.0 /usr/local/lib/libopencv_dnn_superres.so.4.6.0 /usr/local/lib/libopencv_dpm.so.4.6.0 /usr/local/lib/libopencv_face.so.4.6.0 /usr/local/lib/libopencv_freetype.so.4.6.0 /usr/local/lib/libopencv_fuzzy.so.4.6.0 /usr/local/lib/libopencv_hfs.so.4.6.0 /usr/local/lib/libopencv_img_hash.so.4.6.0 /usr/local/lib/libopencv_intensity_transform.so.4.6.0 /usr/local/lib/libopencv_line_descriptor.so.4.6.0 /usr/local/lib/libopencv_mcc.so.4.6.0 /usr/local/lib/libopencv_quality.so.4.6.0 /usr/local/lib/libopencv_rapid.so.4.6.0 /usr/local/lib/libopencv_reg.so.4.6.0 /usr/local/lib/libopencv_rgbd.so.4.6.0 /usr/local/lib/libopencv_saliency.so.4.6.0 /usr/local/lib/libopencv_stereo.so.4.6.0 /usr/local/lib/libopencv_structured_light.so.4.6.0 /usr/local/lib/libopencv_phase_unwrapping.so.4.6.0 /usr/local/lib/libopencv_superres.so.4.6.0 /usr/local/lib/libopencv_optflow.so.4.6.0 /usr/local/lib/libopencv_surface_matching.so.4.6.0 /usr/local/lib/libopencv_tracking.so.4.6.0 /usr/local/lib/libopencv_highgui.so.4.6.0 /usr/local/lib/libopencv_datasets.so.4.6.0 /usr/local/lib/libopencv_plot.so.4.6.0 /usr/local/lib/libopencv_text.so.4.6.0 /usr/local/lib/libopencv_videostab.so.4.6.0 /usr/local/lib/libopencv_videoio.so.4.6.0 /usr/local/lib/libopencv_wechat_qrcode.so.4.6.0 /usr/local/lib/libopencv_xfeatures2d.so.4.6.0 /usr/local/lib/libopencv_ml.so.4.6.0 /usr/local/lib/libopencv_shape.so.4.6.0 /usr/local/lib/libopencv_ximgproc.so.4.6.0 /usr/local/lib/libopencv_video.so.4.6.0 /usr/local/lib/libopencv_xobjdetect.so.4.6.0 /usr/local/lib/libopencv_imgcodecs.so.4.6.0 /usr/local/lib/libopencv_objdetect.so.4.6.0 /usr/local/lib/libopencv_calib3d.so.4.6.0 /usr/local/lib/libopencv_dnn.so.4.6.0 /usr/local/lib/libopencv_features2d.so.4.6.0 /usr/local/lib/libopencv_flann.so.4.6.0 /usr/local/lib/libopencv_xphoto.so.4.6.0 /usr/local/lib/libopencv_photo.so.4.6.0 /usr/local/lib/libopencv_imgproc.so.4.6.0 /usr/local/lib/libopencv_core.so.4.6.0 /usr/lib/x86_64-linux-gnu/libzbar.so

@ -1,4 +1,4 @@
CMAKE_PROGRESS_1 = 22
CMAKE_PROGRESS_2 = 23
CMAKE_PROGRESS_3 = 24
CMAKE_PROGRESS_1 = 25
CMAKE_PROGRESS_2 = 26
CMAKE_PROGRESS_3 = 27

@ -1,3 +1,3 @@
CMAKE_PROGRESS_1 = 25
CMAKE_PROGRESS_2 = 26
CMAKE_PROGRESS_1 = 28
CMAKE_PROGRESS_2 = 29

@ -1,4 +1,4 @@
CMAKE_PROGRESS_1 = 31
CMAKE_PROGRESS_2 = 32
CMAKE_PROGRESS_3 = 33
CMAKE_PROGRESS_1 = 34
CMAKE_PROGRESS_2 = 35
CMAKE_PROGRESS_3 = 36

@ -12,8 +12,11 @@ set(CMAKE_DEPENDS_DEPENDENCY_FILES
"/home/kanken/code/AHRS_core/src/pipeline/members/cameraPickerNode.cpp" "pipeline/CMakeFiles/pipelineLib.dir/members/cameraPickerNode.cpp.o" "gcc" "pipeline/CMakeFiles/pipelineLib.dir/members/cameraPickerNode.cpp.o.d"
"/home/kanken/code/AHRS_core/src/pipeline/members/displayOutputNode.cpp" "pipeline/CMakeFiles/pipelineLib.dir/members/displayOutputNode.cpp.o" "gcc" "pipeline/CMakeFiles/pipelineLib.dir/members/displayOutputNode.cpp.o.d"
"/home/kanken/code/AHRS_core/src/pipeline/members/subNodes/fpsCounter.cpp" "pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/fpsCounter.cpp.o" "gcc" "pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/fpsCounter.cpp.o.d"
"/home/kanken/code/AHRS_core/src/pipeline/members/subNodes/staticImageOverlayer.cpp" "pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/staticImageOverlayer.cpp.o" "gcc" "pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/staticImageOverlayer.cpp.o.d"
"/home/kanken/code/AHRS_core/src/pipeline/members/subNodes/zbarOverlayer.cpp" "pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/zbarOverlayer.cpp.o" "gcc" "pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/zbarOverlayer.cpp.o.d"
"/home/kanken/code/AHRS_core/src/pipeline/members/uiDrawerNode.cpp" "pipeline/CMakeFiles/pipelineLib.dir/members/uiDrawerNode.cpp.o" "gcc" "pipeline/CMakeFiles/pipelineLib.dir/members/uiDrawerNode.cpp.o.d"
"/home/kanken/code/AHRS_core/src/pipeline/members/uiMergerNode.cpp" "pipeline/CMakeFiles/pipelineLib.dir/members/uiMergerNode.cpp.o" "gcc" "pipeline/CMakeFiles/pipelineLib.dir/members/uiMergerNode.cpp.o.d"
"/home/kanken/code/AHRS_core/src/pipeline/members/zbarAnalysisNode.cpp" "pipeline/CMakeFiles/pipelineLib.dir/members/zbarAnalysisNode.cpp.o" "gcc" "pipeline/CMakeFiles/pipelineLib.dir/members/zbarAnalysisNode.cpp.o.d"
"/home/kanken/code/AHRS_core/src/pipeline/pipeline.cpp" "pipeline/CMakeFiles/pipelineLib.dir/pipeline.cpp.o" "gcc" "pipeline/CMakeFiles/pipelineLib.dir/pipeline.cpp.o.d"
)
@ -25,6 +28,7 @@ set(CMAKE_TARGET_LINKED_INFO_FILES
"/home/kanken/code/AHRS_core/src/model/controllers/CMakeFiles/controllers.dir/DependInfo.cmake"
"/home/kanken/code/AHRS_core/src/model/hardware/hw/CMakeFiles/hw.dir/DependInfo.cmake"
"/home/kanken/code/AHRS_core/src/threadweaver/CMakeFiles/threadweaver.dir/DependInfo.cmake"
"/home/kanken/code/AHRS_core/src/processing/zbar/CMakeFiles/zbarLib.dir/DependInfo.cmake"
"/home/kanken/code/AHRS_core/src/model/hardware/ihidapi/CMakeFiles/ihidapi.dir/DependInfo.cmake"
"/home/kanken/code/AHRS_core/src/model/hardware/cameras/CMakeFiles/cameras.dir/DependInfo.cmake"
"/home/kanken/code/AHRS_core/src/model/perfcheckers/CMakeFiles/perfcheckers.dir/DependInfo.cmake"

@ -139,10 +139,24 @@ pipeline/CMakeFiles/pipelineLib.dir/members/uiMergerNode.cpp.s: cmake_force
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/pipelineLib.dir/members/uiMergerNode.cpp.s"
cd /home/kanken/code/AHRS_core/src/pipeline && /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/kanken/code/AHRS_core/src/pipeline/members/uiMergerNode.cpp -o CMakeFiles/pipelineLib.dir/members/uiMergerNode.cpp.s
pipeline/CMakeFiles/pipelineLib.dir/members/zbarAnalysisNode.cpp.o: pipeline/CMakeFiles/pipelineLib.dir/flags.make
pipeline/CMakeFiles/pipelineLib.dir/members/zbarAnalysisNode.cpp.o: pipeline/members/zbarAnalysisNode.cpp
pipeline/CMakeFiles/pipelineLib.dir/members/zbarAnalysisNode.cpp.o: pipeline/CMakeFiles/pipelineLib.dir/compiler_depend.ts
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/kanken/code/AHRS_core/src/CMakeFiles --progress-num=$(CMAKE_PROGRESS_6) "Building CXX object pipeline/CMakeFiles/pipelineLib.dir/members/zbarAnalysisNode.cpp.o"
cd /home/kanken/code/AHRS_core/src/pipeline && /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT pipeline/CMakeFiles/pipelineLib.dir/members/zbarAnalysisNode.cpp.o -MF CMakeFiles/pipelineLib.dir/members/zbarAnalysisNode.cpp.o.d -o CMakeFiles/pipelineLib.dir/members/zbarAnalysisNode.cpp.o -c /home/kanken/code/AHRS_core/src/pipeline/members/zbarAnalysisNode.cpp
pipeline/CMakeFiles/pipelineLib.dir/members/zbarAnalysisNode.cpp.i: cmake_force
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/pipelineLib.dir/members/zbarAnalysisNode.cpp.i"
cd /home/kanken/code/AHRS_core/src/pipeline && /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/kanken/code/AHRS_core/src/pipeline/members/zbarAnalysisNode.cpp > CMakeFiles/pipelineLib.dir/members/zbarAnalysisNode.cpp.i
pipeline/CMakeFiles/pipelineLib.dir/members/zbarAnalysisNode.cpp.s: cmake_force
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/pipelineLib.dir/members/zbarAnalysisNode.cpp.s"
cd /home/kanken/code/AHRS_core/src/pipeline && /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/kanken/code/AHRS_core/src/pipeline/members/zbarAnalysisNode.cpp -o CMakeFiles/pipelineLib.dir/members/zbarAnalysisNode.cpp.s
pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/fpsCounter.cpp.o: pipeline/CMakeFiles/pipelineLib.dir/flags.make
pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/fpsCounter.cpp.o: pipeline/members/subNodes/fpsCounter.cpp
pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/fpsCounter.cpp.o: pipeline/CMakeFiles/pipelineLib.dir/compiler_depend.ts
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/kanken/code/AHRS_core/src/CMakeFiles --progress-num=$(CMAKE_PROGRESS_6) "Building CXX object pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/fpsCounter.cpp.o"
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/kanken/code/AHRS_core/src/CMakeFiles --progress-num=$(CMAKE_PROGRESS_7) "Building CXX object pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/fpsCounter.cpp.o"
cd /home/kanken/code/AHRS_core/src/pipeline && /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/fpsCounter.cpp.o -MF CMakeFiles/pipelineLib.dir/members/subNodes/fpsCounter.cpp.o.d -o CMakeFiles/pipelineLib.dir/members/subNodes/fpsCounter.cpp.o -c /home/kanken/code/AHRS_core/src/pipeline/members/subNodes/fpsCounter.cpp
pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/fpsCounter.cpp.i: cmake_force
@ -153,10 +167,38 @@ pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/fpsCounter.cpp.s: cmake_for
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/pipelineLib.dir/members/subNodes/fpsCounter.cpp.s"
cd /home/kanken/code/AHRS_core/src/pipeline && /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/kanken/code/AHRS_core/src/pipeline/members/subNodes/fpsCounter.cpp -o CMakeFiles/pipelineLib.dir/members/subNodes/fpsCounter.cpp.s
pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/staticImageOverlayer.cpp.o: pipeline/CMakeFiles/pipelineLib.dir/flags.make
pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/staticImageOverlayer.cpp.o: pipeline/members/subNodes/staticImageOverlayer.cpp
pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/staticImageOverlayer.cpp.o: pipeline/CMakeFiles/pipelineLib.dir/compiler_depend.ts
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/kanken/code/AHRS_core/src/CMakeFiles --progress-num=$(CMAKE_PROGRESS_8) "Building CXX object pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/staticImageOverlayer.cpp.o"
cd /home/kanken/code/AHRS_core/src/pipeline && /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/staticImageOverlayer.cpp.o -MF CMakeFiles/pipelineLib.dir/members/subNodes/staticImageOverlayer.cpp.o.d -o CMakeFiles/pipelineLib.dir/members/subNodes/staticImageOverlayer.cpp.o -c /home/kanken/code/AHRS_core/src/pipeline/members/subNodes/staticImageOverlayer.cpp
pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/staticImageOverlayer.cpp.i: cmake_force
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/pipelineLib.dir/members/subNodes/staticImageOverlayer.cpp.i"
cd /home/kanken/code/AHRS_core/src/pipeline && /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/kanken/code/AHRS_core/src/pipeline/members/subNodes/staticImageOverlayer.cpp > CMakeFiles/pipelineLib.dir/members/subNodes/staticImageOverlayer.cpp.i
pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/staticImageOverlayer.cpp.s: cmake_force
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/pipelineLib.dir/members/subNodes/staticImageOverlayer.cpp.s"
cd /home/kanken/code/AHRS_core/src/pipeline && /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/kanken/code/AHRS_core/src/pipeline/members/subNodes/staticImageOverlayer.cpp -o CMakeFiles/pipelineLib.dir/members/subNodes/staticImageOverlayer.cpp.s
pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/zbarOverlayer.cpp.o: pipeline/CMakeFiles/pipelineLib.dir/flags.make
pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/zbarOverlayer.cpp.o: pipeline/members/subNodes/zbarOverlayer.cpp
pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/zbarOverlayer.cpp.o: pipeline/CMakeFiles/pipelineLib.dir/compiler_depend.ts
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/kanken/code/AHRS_core/src/CMakeFiles --progress-num=$(CMAKE_PROGRESS_9) "Building CXX object pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/zbarOverlayer.cpp.o"
cd /home/kanken/code/AHRS_core/src/pipeline && /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/zbarOverlayer.cpp.o -MF CMakeFiles/pipelineLib.dir/members/subNodes/zbarOverlayer.cpp.o.d -o CMakeFiles/pipelineLib.dir/members/subNodes/zbarOverlayer.cpp.o -c /home/kanken/code/AHRS_core/src/pipeline/members/subNodes/zbarOverlayer.cpp
pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/zbarOverlayer.cpp.i: cmake_force
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/pipelineLib.dir/members/subNodes/zbarOverlayer.cpp.i"
cd /home/kanken/code/AHRS_core/src/pipeline && /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/kanken/code/AHRS_core/src/pipeline/members/subNodes/zbarOverlayer.cpp > CMakeFiles/pipelineLib.dir/members/subNodes/zbarOverlayer.cpp.i
pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/zbarOverlayer.cpp.s: cmake_force
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/pipelineLib.dir/members/subNodes/zbarOverlayer.cpp.s"
cd /home/kanken/code/AHRS_core/src/pipeline && /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/kanken/code/AHRS_core/src/pipeline/members/subNodes/zbarOverlayer.cpp -o CMakeFiles/pipelineLib.dir/members/subNodes/zbarOverlayer.cpp.s
pipeline/CMakeFiles/pipelineLib.dir/pipeline.cpp.o: pipeline/CMakeFiles/pipelineLib.dir/flags.make
pipeline/CMakeFiles/pipelineLib.dir/pipeline.cpp.o: pipeline/pipeline.cpp
pipeline/CMakeFiles/pipelineLib.dir/pipeline.cpp.o: pipeline/CMakeFiles/pipelineLib.dir/compiler_depend.ts
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/kanken/code/AHRS_core/src/CMakeFiles --progress-num=$(CMAKE_PROGRESS_7) "Building CXX object pipeline/CMakeFiles/pipelineLib.dir/pipeline.cpp.o"
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/kanken/code/AHRS_core/src/CMakeFiles --progress-num=$(CMAKE_PROGRESS_10) "Building CXX object pipeline/CMakeFiles/pipelineLib.dir/pipeline.cpp.o"
cd /home/kanken/code/AHRS_core/src/pipeline && /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT pipeline/CMakeFiles/pipelineLib.dir/pipeline.cpp.o -MF CMakeFiles/pipelineLib.dir/pipeline.cpp.o.d -o CMakeFiles/pipelineLib.dir/pipeline.cpp.o -c /home/kanken/code/AHRS_core/src/pipeline/pipeline.cpp
pipeline/CMakeFiles/pipelineLib.dir/pipeline.cpp.i: cmake_force
@ -174,7 +216,10 @@ pipelineLib_OBJECTS = \
"CMakeFiles/pipelineLib.dir/members/displayOutputNode.cpp.o" \
"CMakeFiles/pipelineLib.dir/members/uiDrawerNode.cpp.o" \
"CMakeFiles/pipelineLib.dir/members/uiMergerNode.cpp.o" \
"CMakeFiles/pipelineLib.dir/members/zbarAnalysisNode.cpp.o" \
"CMakeFiles/pipelineLib.dir/members/subNodes/fpsCounter.cpp.o" \
"CMakeFiles/pipelineLib.dir/members/subNodes/staticImageOverlayer.cpp.o" \
"CMakeFiles/pipelineLib.dir/members/subNodes/zbarOverlayer.cpp.o" \
"CMakeFiles/pipelineLib.dir/pipeline.cpp.o"
# External object files for target pipelineLib
@ -185,11 +230,14 @@ pipeline/libpipelineLib.a: pipeline/CMakeFiles/pipelineLib.dir/members/cameraPic
pipeline/libpipelineLib.a: pipeline/CMakeFiles/pipelineLib.dir/members/displayOutputNode.cpp.o
pipeline/libpipelineLib.a: pipeline/CMakeFiles/pipelineLib.dir/members/uiDrawerNode.cpp.o
pipeline/libpipelineLib.a: pipeline/CMakeFiles/pipelineLib.dir/members/uiMergerNode.cpp.o
pipeline/libpipelineLib.a: pipeline/CMakeFiles/pipelineLib.dir/members/zbarAnalysisNode.cpp.o
pipeline/libpipelineLib.a: pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/fpsCounter.cpp.o
pipeline/libpipelineLib.a: pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/staticImageOverlayer.cpp.o
pipeline/libpipelineLib.a: pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/zbarOverlayer.cpp.o
pipeline/libpipelineLib.a: pipeline/CMakeFiles/pipelineLib.dir/pipeline.cpp.o
pipeline/libpipelineLib.a: pipeline/CMakeFiles/pipelineLib.dir/build.make
pipeline/libpipelineLib.a: pipeline/CMakeFiles/pipelineLib.dir/link.txt
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/home/kanken/code/AHRS_core/src/CMakeFiles --progress-num=$(CMAKE_PROGRESS_8) "Linking CXX static library libpipelineLib.a"
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/home/kanken/code/AHRS_core/src/CMakeFiles --progress-num=$(CMAKE_PROGRESS_11) "Linking CXX static library libpipelineLib.a"
cd /home/kanken/code/AHRS_core/src/pipeline && $(CMAKE_COMMAND) -P CMakeFiles/pipelineLib.dir/cmake_clean_target.cmake
cd /home/kanken/code/AHRS_core/src/pipeline && $(CMAKE_COMMAND) -E cmake_link_script CMakeFiles/pipelineLib.dir/link.txt --verbose=$(VERBOSE)

@ -7,10 +7,16 @@ file(REMOVE_RECURSE
"CMakeFiles/pipelineLib.dir/members/displayOutputNode.cpp.o.d"
"CMakeFiles/pipelineLib.dir/members/subNodes/fpsCounter.cpp.o"
"CMakeFiles/pipelineLib.dir/members/subNodes/fpsCounter.cpp.o.d"
"CMakeFiles/pipelineLib.dir/members/subNodes/staticImageOverlayer.cpp.o"
"CMakeFiles/pipelineLib.dir/members/subNodes/staticImageOverlayer.cpp.o.d"
"CMakeFiles/pipelineLib.dir/members/subNodes/zbarOverlayer.cpp.o"
"CMakeFiles/pipelineLib.dir/members/subNodes/zbarOverlayer.cpp.o.d"
"CMakeFiles/pipelineLib.dir/members/uiDrawerNode.cpp.o"
"CMakeFiles/pipelineLib.dir/members/uiDrawerNode.cpp.o.d"
"CMakeFiles/pipelineLib.dir/members/uiMergerNode.cpp.o"
"CMakeFiles/pipelineLib.dir/members/uiMergerNode.cpp.o.d"
"CMakeFiles/pipelineLib.dir/members/zbarAnalysisNode.cpp.o"
"CMakeFiles/pipelineLib.dir/members/zbarAnalysisNode.cpp.o.d"
"CMakeFiles/pipelineLib.dir/pipeline.cpp.o"
"CMakeFiles/pipelineLib.dir/pipeline.cpp.o.d"
"libpipelineLib.a"

File diff suppressed because it is too large Load Diff

@ -1,2 +1,2 @@
/usr/bin/ar qc libpipelineLib.a CMakeFiles/pipelineLib.dir/abstract/pipelineNode.cpp.o CMakeFiles/pipelineLib.dir/members/cameraPickerNode.cpp.o CMakeFiles/pipelineLib.dir/members/displayOutputNode.cpp.o CMakeFiles/pipelineLib.dir/members/uiDrawerNode.cpp.o CMakeFiles/pipelineLib.dir/members/uiMergerNode.cpp.o CMakeFiles/pipelineLib.dir/members/subNodes/fpsCounter.cpp.o CMakeFiles/pipelineLib.dir/pipeline.cpp.o
/usr/bin/ar qc libpipelineLib.a CMakeFiles/pipelineLib.dir/abstract/pipelineNode.cpp.o CMakeFiles/pipelineLib.dir/members/cameraPickerNode.cpp.o CMakeFiles/pipelineLib.dir/members/displayOutputNode.cpp.o CMakeFiles/pipelineLib.dir/members/uiDrawerNode.cpp.o CMakeFiles/pipelineLib.dir/members/uiMergerNode.cpp.o CMakeFiles/pipelineLib.dir/members/zbarAnalysisNode.cpp.o CMakeFiles/pipelineLib.dir/members/subNodes/fpsCounter.cpp.o CMakeFiles/pipelineLib.dir/members/subNodes/staticImageOverlayer.cpp.o CMakeFiles/pipelineLib.dir/members/subNodes/zbarOverlayer.cpp.o CMakeFiles/pipelineLib.dir/pipeline.cpp.o
/usr/bin/ranlib libpipelineLib.a

@ -6,4 +6,7 @@ CMAKE_PROGRESS_5 = 18
CMAKE_PROGRESS_6 = 19
CMAKE_PROGRESS_7 = 20
CMAKE_PROGRESS_8 = 21
CMAKE_PROGRESS_9 = 22
CMAKE_PROGRESS_10 = 23
CMAKE_PROGRESS_11 = 24

@ -9,8 +9,14 @@ set(pipeline_src
./members/uiDrawerNode.hpp
./members/uiMergerNode.cpp
./members/uiMergerNode.hpp
./members/subNodes/fpsCounter.hpp
./members/zbarAnalysisNode.cpp
./members/zbarAnalysisNode.hpp
./members/subNodes/subNodes.hpp
./members/subNodes/fpsCounter.cpp
./members/subNodes/staticImageOverlayer.cpp
./members/subNodes/zbarOverlayer.cpp
./pipeline.cpp
./pipeline.hpp)
MESSAGE(STATUS "building pipeline")
@ -37,8 +43,6 @@ target_link_libraries(pipelineLib psvr)
target_link_libraries(pipelineLib controllers)
target_link_libraries(pipelineLib hw)
target_link_libraries(pipelineLib threadweaver)
#target_link_libraries(ui cameras)
#target_link_libraries(ui zbarLib)
target_link_libraries(pipelineLib zbarLib)
MESSAGE(STATUS "Done building pipeline")

@ -226,6 +226,54 @@ members/subNodes/fpsCounter.cpp.s:
cd /home/kanken/code/AHRS_core/src && $(MAKE) $(MAKESILENT) -f pipeline/CMakeFiles/pipelineLib.dir/build.make pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/fpsCounter.cpp.s
.PHONY : members/subNodes/fpsCounter.cpp.s
members/subNodes/staticImageOverlayer.o: members/subNodes/staticImageOverlayer.cpp.o
.PHONY : members/subNodes/staticImageOverlayer.o
# target to build an object file
members/subNodes/staticImageOverlayer.cpp.o:
cd /home/kanken/code/AHRS_core/src && $(MAKE) $(MAKESILENT) -f pipeline/CMakeFiles/pipelineLib.dir/build.make pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/staticImageOverlayer.cpp.o
.PHONY : members/subNodes/staticImageOverlayer.cpp.o
members/subNodes/staticImageOverlayer.i: members/subNodes/staticImageOverlayer.cpp.i
.PHONY : members/subNodes/staticImageOverlayer.i
# target to preprocess a source file
members/subNodes/staticImageOverlayer.cpp.i:
cd /home/kanken/code/AHRS_core/src && $(MAKE) $(MAKESILENT) -f pipeline/CMakeFiles/pipelineLib.dir/build.make pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/staticImageOverlayer.cpp.i
.PHONY : members/subNodes/staticImageOverlayer.cpp.i
members/subNodes/staticImageOverlayer.s: members/subNodes/staticImageOverlayer.cpp.s
.PHONY : members/subNodes/staticImageOverlayer.s
# target to generate assembly for a file
members/subNodes/staticImageOverlayer.cpp.s:
cd /home/kanken/code/AHRS_core/src && $(MAKE) $(MAKESILENT) -f pipeline/CMakeFiles/pipelineLib.dir/build.make pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/staticImageOverlayer.cpp.s
.PHONY : members/subNodes/staticImageOverlayer.cpp.s
members/subNodes/zbarOverlayer.o: members/subNodes/zbarOverlayer.cpp.o
.PHONY : members/subNodes/zbarOverlayer.o
# target to build an object file
members/subNodes/zbarOverlayer.cpp.o:
cd /home/kanken/code/AHRS_core/src && $(MAKE) $(MAKESILENT) -f pipeline/CMakeFiles/pipelineLib.dir/build.make pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/zbarOverlayer.cpp.o
.PHONY : members/subNodes/zbarOverlayer.cpp.o
members/subNodes/zbarOverlayer.i: members/subNodes/zbarOverlayer.cpp.i
.PHONY : members/subNodes/zbarOverlayer.i
# target to preprocess a source file
members/subNodes/zbarOverlayer.cpp.i:
cd /home/kanken/code/AHRS_core/src && $(MAKE) $(MAKESILENT) -f pipeline/CMakeFiles/pipelineLib.dir/build.make pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/zbarOverlayer.cpp.i
.PHONY : members/subNodes/zbarOverlayer.cpp.i
members/subNodes/zbarOverlayer.s: members/subNodes/zbarOverlayer.cpp.s
.PHONY : members/subNodes/zbarOverlayer.s
# target to generate assembly for a file
members/subNodes/zbarOverlayer.cpp.s:
cd /home/kanken/code/AHRS_core/src && $(MAKE) $(MAKESILENT) -f pipeline/CMakeFiles/pipelineLib.dir/build.make pipeline/CMakeFiles/pipelineLib.dir/members/subNodes/zbarOverlayer.cpp.s
.PHONY : members/subNodes/zbarOverlayer.cpp.s
members/uiDrawerNode.o: members/uiDrawerNode.cpp.o
.PHONY : members/uiDrawerNode.o
@ -274,6 +322,30 @@ members/uiMergerNode.cpp.s:
cd /home/kanken/code/AHRS_core/src && $(MAKE) $(MAKESILENT) -f pipeline/CMakeFiles/pipelineLib.dir/build.make pipeline/CMakeFiles/pipelineLib.dir/members/uiMergerNode.cpp.s
.PHONY : members/uiMergerNode.cpp.s
members/zbarAnalysisNode.o: members/zbarAnalysisNode.cpp.o
.PHONY : members/zbarAnalysisNode.o
# target to build an object file
members/zbarAnalysisNode.cpp.o:
cd /home/kanken/code/AHRS_core/src && $(MAKE) $(MAKESILENT) -f pipeline/CMakeFiles/pipelineLib.dir/build.make pipeline/CMakeFiles/pipelineLib.dir/members/zbarAnalysisNode.cpp.o
.PHONY : members/zbarAnalysisNode.cpp.o
members/zbarAnalysisNode.i: members/zbarAnalysisNode.cpp.i
.PHONY : members/zbarAnalysisNode.i
# target to preprocess a source file
members/zbarAnalysisNode.cpp.i:
cd /home/kanken/code/AHRS_core/src && $(MAKE) $(MAKESILENT) -f pipeline/CMakeFiles/pipelineLib.dir/build.make pipeline/CMakeFiles/pipelineLib.dir/members/zbarAnalysisNode.cpp.i
.PHONY : members/zbarAnalysisNode.cpp.i
members/zbarAnalysisNode.s: members/zbarAnalysisNode.cpp.s
.PHONY : members/zbarAnalysisNode.s
# target to generate assembly for a file
members/zbarAnalysisNode.cpp.s:
cd /home/kanken/code/AHRS_core/src && $(MAKE) $(MAKESILENT) -f pipeline/CMakeFiles/pipelineLib.dir/build.make pipeline/CMakeFiles/pipelineLib.dir/members/zbarAnalysisNode.cpp.s
.PHONY : members/zbarAnalysisNode.cpp.s
pipeline.o: pipeline.cpp.o
.PHONY : pipeline.o
@ -319,12 +391,21 @@ help:
@echo "... members/subNodes/fpsCounter.o"
@echo "... members/subNodes/fpsCounter.i"
@echo "... members/subNodes/fpsCounter.s"
@echo "... members/subNodes/staticImageOverlayer.o"
@echo "... members/subNodes/staticImageOverlayer.i"
@echo "... members/subNodes/staticImageOverlayer.s"
@echo "... members/subNodes/zbarOverlayer.o"
@echo "... members/subNodes/zbarOverlayer.i"
@echo "... members/subNodes/zbarOverlayer.s"
@echo "... members/uiDrawerNode.o"
@echo "... members/uiDrawerNode.i"
@echo "... members/uiDrawerNode.s"
@echo "... members/uiMergerNode.o"
@echo "... members/uiMergerNode.i"
@echo "... members/uiMergerNode.s"
@echo "... members/zbarAnalysisNode.o"
@echo "... members/zbarAnalysisNode.i"
@echo "... members/zbarAnalysisNode.s"
@echo "... pipeline.o"
@echo "... pipeline.i"
@echo "... pipeline.s"

@ -33,9 +33,9 @@ class PipelineNode{
void addSubNode(SubNode* sn);
//virtual ~PipelineNode();
float cost = 1;
std::mutex outputLock;
protected:
std::vector<SubNode*> subNodes;
std::mutex outputLock;
cv::UMat output;
std::atomic_bool shouldRun = false;
std::atomic_bool disabled = false; //if true short circuit your input to your output

@ -1,4 +1,4 @@
#include "fpsCounter.hpp"
#include "subNodes.hpp"
#include <opencv2/imgproc.hpp>
void FpsCounter::processFrame(cv::UMat& input, cv::Point2d& cursorPos){

@ -1,12 +0,0 @@
#include "../../abstract/pipelineNode.hpp"
#include <map>
class FpsCounter : public SubNode
{
public:
void processFrame(cv::UMat &input, cv::Point2d &cursorPos) override;
void addChecker(std::string name, framerateChecker *fc);
protected:
std::map<std::string, framerateChecker *> checkers;
};

@ -0,0 +1,10 @@
#include "subNodes.hpp"
#include "./../../../ui/support/UiSupport.hpp"
void StaticImageOverlayer::processFrame(cv::UMat& input, cv::Point2d& cursorPos){
input = UiSupport::OverlayBlackMask(input, image);
}
void StaticImageOverlayer::setImage(std::string str){
image = cv::imread("./media/hud_fixed.png",-1).getUMat(cv::ACCESS_READ);
}

@ -0,0 +1,31 @@
#include "../../abstract/pipelineNode.hpp"
#include "../zbarAnalysisNode.hpp"
#include <map>
class FpsCounter : public SubNode
{
public:
void processFrame(cv::UMat &input, cv::Point2d &cursorPos) override;
void addChecker(std::string name, framerateChecker *fc);
protected:
std::map<std::string, framerateChecker *> checkers;
};
class StaticImageOverlayer : public SubNode
{
public:
void processFrame(cv::UMat &input, cv::Point2d &cursorPos) override;
void setImage(std::string str);
protected:
cv::UMat image;
};
class ZbarOverlayer : public SubNode
{
public:
ZbarOverlayer(zbarScanner* backend);
void processFrame(cv::UMat &input, cv::Point2d &cursorPos) override;
protected:
zbarScanner* localScanner;
};

@ -0,0 +1,42 @@
#include "subNodes.hpp"
#include "../../../ui/support/UiSupport.hpp"
ZbarOverlayer::ZbarOverlayer(zbarScanner *backend) : localScanner(backend)
{
}
void ZbarOverlayer::processFrame(cv::UMat &input, cv::Point2d &cursorPos)
{
vector<decodedObject> objects = localScanner->getFoundElements();
if(objects.size() > 0){
float ogH = objects.at(0).originalHeight;
float ogW = objects.at(0).originalWidth;
cv::UMat toWriteOn = cv::UMat(cv::Size(ogW,ogH), CV_8UC3, cv::Scalar(0, 0, 0));
// Loop over all decoded objects
for (decodedObject deo : objects)
{
vector<cv::Point> points = deo.location;
vector<cv::Point> hull;
// If the points do not form a quad, find convex hull
if (points.size() > 4)
cv::convexHull(points, hull);
else
hull = points;
// Number of points in the convex hull
int n = hull.size();
for (int j = 0; j < n; j++)
{
cv::line(toWriteOn, hull[j], hull[(j + 1) % n], cv::Scalar(255, 0, 0), 3);
}
cv::Point pos = cv::Point(deo.location.at(0).x*(960/ogH),deo.location.at(0).y*(1080/ogW));
cv::putText(input, cv::format("%s", deo.data.c_str()), pos, cv::HersheyFonts::FONT_HERSHEY_PLAIN, 1, cv::Scalar(255, 255, 255), 1, 8, false);
}
cv::UMat toOverlay = UiSupport::resizeIn(toWriteOn);
input = UiSupport::OverlayBlackMask(toOverlay, input);
}
}

@ -21,7 +21,7 @@ void UiDrawerNode::processFrame()
int &wd = _backController->menuSize.width;
int &he = _backController->menuSize.height;
unsigned int stackerIndex = 0;
cv::UMat MenuMat(cv::Size(wd, he), CV_8UC3, cv::Scalar(0, 0, 0));
cv::UMat MenuMat = cv::UMat(cv::Size(960, 1080), CV_8UC3, cv::Scalar(0, 0, 0));
cv::rectangle(MenuMat, cv::Rect2i(0, 0, wd, he), cv::Scalar(255, 0, 0), 5, 8, 0);
_backController->update();
cv::putText(MenuMat, _backController->menuTitle, cv::Point2i(5, stackerIndex += 20), cv::HersheyFonts::FONT_HERSHEY_PLAIN, 1, Scalar(255, 255, 255), 1, 8, false);

@ -0,0 +1,34 @@
#include "zbarAnalysisNode.hpp"
#include <opencv2/imgproc.hpp>
#include <map>
#include <iostream>
ZbarAnalysisNode::ZbarAnalysisNode(PipelineNode* _previous, zbarScanner* scanner) : localScanner(scanner)
{
isFirst = false;
previous = _previous;
fpsLimit = 30;
}
void ZbarAnalysisNode::processFrame()
{
DEBUG_LOG("ZbarAnalysisNode on thread " << localThread->get_id() << " is processing its camera frame");
try
{
if(!previous->getOutput().empty()){
cv::UMat toDecode = previous->getOutput();
DEBUG_LOG("ZbarAnalysisNode on thread " << localThread->get_id() << " fetched camera frame");
localScanner->decode(toDecode);
DEBUG_LOG("ZbarAnalysisNode on thread " << localThread->get_id() << " processed camera frame");
}
}
catch (std::exception& e)
{
std::cerr << "\033[1;31m caught ZbarAnalysisNode::processFrame thread exception :"<< e.what() <<" \033[0m" << std::endl;
exit(1);
}
}
std::string ZbarAnalysisNode::getName(){
return "zbar analyzer";
}

@ -0,0 +1,12 @@
#include "../abstract/pipelineNode.hpp"
#include "../../processing/zbar/zbar.hpp"
/// @brief this class is used to check a mat for any bar codes
class ZbarAnalysisNode : public PipelineNode
{
public:
ZbarAnalysisNode(PipelineNode* previous,zbarScanner* scanner);
std::string getName() override;
protected:
void processFrame() override;
zbarScanner* localScanner;
};

@ -1,7 +1,7 @@
#include "pipeline.hpp"
#include "./../model/windows/windowManager.hpp"
#include "../model/hardware/hw/serial.hpp"
#include "./members/subNodes/fpsCounter.hpp"
#include "./members/subNodes/subNodes.hpp"
Pipeline::Pipeline(){
WindowManager* wm = new WindowManager();
@ -14,13 +14,21 @@ Pipeline::Pipeline(){
sp->Attach(uc);
FpsCounter* fc = new FpsCounter();
StaticImageOverlayer* sio = new StaticImageOverlayer();
sio->setImage("./media/hud_fixed.png");
zbarScanner* zs = new zbarScanner();
ZbarOverlayer* zo = new ZbarOverlayer(zs);
nodes.push_back(new cameraPickerNode(cm));
nodes.push_back(new ZbarAnalysisNode(nodes.at(0), zs));
nodes.push_back(new UiDrawerNode(uc));
nodes.at(1)->addSubNode(fc);
nodes.at(1)->fpsLimit = 30;
nodes.push_back(new UiMergerNode(nodes.at(0),nodes.at(1),uc));
nodes.push_back(new DisplayOutputNode(nodes.at(2), wm->managedUIs.at(0)));
nodes.at(2)->addSubNode(fc);
nodes.at(2)->addSubNode(sio);
nodes.at(2)->addSubNode(zo);
nodes.at(2)->fpsLimit = 30;
nodes.push_back(new UiMergerNode(nodes.at(0),nodes.at(2),uc));
nodes.push_back(new DisplayOutputNode(nodes.at(3), wm->managedUIs.at(0)));
for(PipelineNode* pn : nodes)
fc->addChecker(pn->getName(),pn->localES);

@ -1,3 +1,3 @@
CMAKE_PROGRESS_1 = 34
CMAKE_PROGRESS_2 = 35
CMAKE_PROGRESS_1 = 37
CMAKE_PROGRESS_2 = 38

@ -1,6 +1,11 @@
#include "zbar.hpp"
void zbarScanner::decode(cv::UMat &im)
vector<decodedObject> zbarScanner::getFoundElements(){
const std::lock_guard<std::mutex> lock(decodedObjectsAccessLock);
return decodedObjects;
}
void zbarScanner::decode(cv::UMat im)
{
cv::Mat imGray;
@ -9,13 +14,16 @@ void zbarScanner::decode(cv::UMat &im)
Image image(im.cols, im.rows, "Y800", (uchar *)imGray.data, im.cols * im.rows);
int n = scanner.scan(image);
const std::lock_guard<std::mutex> lock(decodedObjectsAccessLock);
decodedObjects.clear();
for (Image::SymbolIterator symbol = image.symbol_begin(); symbol != image.symbol_end(); ++symbol)
{
decodedObject obj;
obj.type = symbol->get_type_name();
obj.data = symbol->get_data();
obj.originalHeight = im.rows;
obj.originalWidth = im.cols;
for (int i = 0; i < symbol->get_location_size(); i++)
{

@ -14,13 +14,17 @@ typedef struct
string type;
string data;
vector <cv::Point> location;
int originalWidth;
int originalHeight;
} decodedObject;
class zbarScanner{
private:
ImageScanner scanner = ImageScanner();
vector<decodedObject> decodedObjects;
std::mutex decodedObjectsAccessLock;
public:
zbarScanner();
void decode(cv::UMat &im);
void decode(cv::UMat im);
vector<decodedObject> getFoundElements();
};

Binary file not shown.

@ -1,3 +1,3 @@
CMAKE_PROGRESS_1 = 29
CMAKE_PROGRESS_2 = 30
CMAKE_PROGRESS_1 = 32
CMAKE_PROGRESS_2 = 33

@ -1,3 +1,3 @@
CMAKE_PROGRESS_1 = 27
CMAKE_PROGRESS_2 = 28
CMAKE_PROGRESS_1 = 30
CMAKE_PROGRESS_2 = 31

@ -26,7 +26,7 @@ cv::UMat UiSupport::OverlayBlackMask(cv::UMat input, cv::UMat toOverlay, int x,
// return input;
if (input.cols < toOverlay.cols || input.rows < toOverlay.rows)
{
std::cerr << "Wrong size for inout file!!! overlay was bigger" << std::endl;
std::cerr << "Wrong size for input file!!! overlay was bigger" << std::endl;
return input;
}

Loading…
Cancel
Save