Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/avoid image copy #42

Merged
merged 16 commits into from
Aug 8, 2021
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,27 @@ To get your environment setup with it, follow these steps:

---

### Manage and execute filterchains with bags from telemetry
- Run the dockers for ros-master, ros-bridge and octopus-telemetry (only on linux for now)
- Make sure proc_image_processing is launch.
(in VScode `ctrl+shift+p` + `ROS: Show Core Status` to see services)
- In the proc_image_processing docker, go in the folder /bags where you put the bag(s) to run
- Execute `rosbag play -l <name-of-the-bag>`
- Execute in another terminal in the docker
`rosrun image_transport republish compressed in:=<name-of-input-feed> raw out:=<give-a-name-to-the-output>`
to uncompress the feed
(the input feed name can be check in the _Image Viewer_ module of the telemetry by refreshing and looking at the dropdown menu)
- Open a web browser on `localhost:3000` to access the telemetry
- In the _Image Viewer_ module, refresh and select the compressed feed of the bag to see it (wow)
- In the _Vision UI_ module, create a new execution by refreshing and selecting the filterchain to apply
and the media as input (the raw video feed in this case)
- In the _filter_ tab of the _Vision UI_ module, refresh and select your execution to manage filters oyour
filterchain
- Click on them to see the parameters and adjust them, etc
- To see the result, in the _Image Viewer_ module, refresh and select the output of the executiocompressed

---

## Code Quality

This project uses [SonarCloud](https://sonarcloud.io/) to analyze the code base quality continuously using a GitHub
Expand Down
14 changes: 7 additions & 7 deletions config/filterchain/deep_bat_wolf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ filters:
value: 1
- name: Debug contour
value: 1
- name: bat
- name: Bat
value: 1
- name: wolf
- name: Wolf
value: 1
- name: vetalas
- name: Vetalas
value: 0
- name: draugr
- name: Draugr
value: 0
- name: jiangshi
- name: Jiangshi
value: 0
- name: answag
- name: Answag
value: 0
- name: vampire
- name: Vampire
value: 0
14 changes: 7 additions & 7 deletions config/filterchain/deep_draugr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ filters:
value: 1
- name: Debug contour
value: 1
- name: bat
- name: Bat
value: 0
- name: wolf
- name: Wolf
value: 0
- name: vetalas
- name: Vetalas
value: 0
- name: draugr
- name: Draugr
value: 1
- name: jiangshi
- name: Jiangshi
value: 0
- name: answag
- name: Answag
value: 0
- name: vampire
- name: Vampire
value: 0
16 changes: 8 additions & 8 deletions config/filterchain/deep_front.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@ filters:
value: 0
- name: Debug contour
value: 1
- name: vetalas
- name: Vetalas
value: 0
- name: draugr
- name: Draugr
value: 0
- name: jiangshi
- name: Jiangshi
value: 1
- name: answag
- name: Answag
value: 0
- name: vampire
- name: Vampire
value: 0
- name: bat
- name: Bat
value: 0
- name: wolf
- name: Wolf
value: 0
- name: SubtractAllPlanesFilter
parameters:
- name: enable
- name: Enable
value: 1
- name: Plane_1
value: 5
Expand Down
14 changes: 7 additions & 7 deletions config/filterchain/deep_jiangshi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ filters:
value: 1
- name: Debug contour
value: 1
- name: bat
- name: Bat
value: 0
- name: wolf
- name: Wolf
value: 0
- name: vetalas
- name: Vetalas
value: 0
- name: draugr
- name: Draugr
value: 0
- name: jiangshi
- name: Jiangshi
value: 1
- name: answag
- name: Answag
value: 0
- name: vampire
- name: Vampire
value: 0
14 changes: 7 additions & 7 deletions config/filterchain/deep_vampire.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ filters:
value: 1
- name: Debug contour
value: 1
- name: bat
- name: Bat
value: 0
- name: wolf
- name: Wolf
value: 0
- name: vetalas
- name: Vetalas
value: 0
- name: draugr
- name: Draugr
value: 0
- name: jiangshi
- name: Jiangshi
value: 0
- name: answag
- name: Answag
value: 0
- name: vampire
- name: Vampire
value: 1
14 changes: 7 additions & 7 deletions config/filterchain/deep_vetalas.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ filters:
value: 1
- name: Debug contour
value: 1
- name: bat
- name: Bat
value: 0
- name: wolf
- name: Wolf
value: 0
- name: vetalas
- name: Vetalas
value: 1
- name: draugr
- name: Draugr
value: 0
- name: jiangshi
- name: Jiangshi
value: 0
- name: answag
- name: Answag
value: 0
- name: vampire
- name: Vampire
value: 0
2 changes: 1 addition & 1 deletion config/filterchain/simple_align_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: simple_align_test
filters:
- name: SubtractAllPlanesFilter
parameters:
- name: enable
- name: Enable
value: 1
- name: Plane_1
value: 5
Expand Down
2 changes: 1 addition & 1 deletion config/filterchain/simple_bin_handle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ filters:
value: 0
- name: SubtractAllPlanesFilter
parameters:
- name: enable
- name: Enable
value: 1
- name: Plane_1
value: 4
Expand Down
2 changes: 1 addition & 1 deletion config/filterchain/simple_body_baby.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ filters:
value: 0
- name: SubtractAllPlanesFilter
parameters:
- name: enable
- name: Enable
value: 1
- name: Plane_1
value: 6
Expand Down
2 changes: 1 addition & 1 deletion config/filterchain/simple_coffin_handle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ filters:
value: 0
- name: SubtractAllPlanesFilter
parameters:
- name: enable
- name: Enable
value: 1
- name: Plane_1
value: 2
Expand Down
2 changes: 1 addition & 1 deletion config/filterchain/simple_jiangshi_backup.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: simple_jiangshi_backup
filters:
- name: SubtractAllPlanesFilter
parameters:
- name: enable
- name: Enable
value: 1
- name: Plane_1
value: 7
Expand Down
8 changes: 4 additions & 4 deletions config/filterchain/simple_pipe45.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: simple_pipe45
filters:
- name: RotateFilter
parameters:
- name: enable
- name: Enable
value: 0
- name: transpose
- name: Transpose
value: 0
- name: Rotation_type
value: 3
Expand All @@ -22,15 +22,15 @@ filters:
value: 17
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mmmmh normalement dans un yaml tu peux pas avoir 2 fois la même key dans un item (2x value ici)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nvm, github being github

- name: ContrastAndBrightnessFilter
parameters:
- name: enable
- name: Enable
value: 0
- name: Contrast
value: 1.400000
- name: Brightness
value: -134.000000
- name: SubtractAllPlanesFilter
parameters:
- name: enable
- name: Enable
value: 1
- name: Plane_1
value: 3
Expand Down
6 changes: 3 additions & 3 deletions config/filterchain/simple_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ name: simple_test
filters:
- name: ContrastAndBrightnessFilter
parameters:
- name: enable
- name: Enable
value: 0
- name: Contrast
value: 0.000000
- name: Brightness
value: 0.000000
- name: SubtractAllPlanesFilter
parameters:
- name: enable
- name: Enable
value: 1
- name: Plane_1
value: 4
Expand Down Expand Up @@ -50,7 +50,7 @@ filters:
value: 55
- name: SubtractAllPlanesFilter
parameters:
- name: enable
- name: Enable
value: 1
- name: Plane_1
value: 7
Expand Down
2 changes: 1 addition & 1 deletion config/filterchain/simple_test_octogone.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ filters:
value: 0
- name: SubtractAllPlanesFilter
parameters:
- name: enable
- name: Enable
value: 1
- name: Plane_1
value: 3
Expand Down
2 changes: 1 addition & 1 deletion config/filterchain/simple_vampire_torpille.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ filters:
value: 0
- name: SubtractAllPlanesFilter
parameters:
- name: enable
- name: Enable
value: 1
- name: Plane_1
value: 2
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#ifndef PROC_IMAGE_PROCESSING_PARALLEL_LOOP_BODY_WRAPPER_H_
#define PROC_IMAGE_PROCESSING_PARALLEL_LOOP_BODY_WRAPPER_H_

#include "opencv2/opencv.hpp"

namespace proc_image_processing {

/*
* This class can be derived to create a "body" for the OpenCV parallel_for_() function
*/
class ParallelLoopBodyWrapper : public cv::ParallelLoopBody {
public:
ParallelLoopBodyWrapper() = default;

~ParallelLoopBodyWrapper() override = default;

void operator()(const cv::Range &range) const override = 0;
};

} // namespace proc_image_processing

#endif // PROC_IMAGE_PROCESSING_PARALLEL_LOOP_BODY_WRAPPER_H_
14 changes: 7 additions & 7 deletions src/proc_image_processing/cpu/filters/custom/deep_2019_filter.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ namespace proc_image_processing {
nh_(ros::NodeHandle("proc_image_processing")),
enable_("Enable", false, &parameters_),
debug_contour_("Debug contour", false, &parameters_),
vetalas_("vetalas", true, &parameters_),
draugr_("draugr", true, &parameters_),
jiangshi_("jiangshi", true, &parameters_),
answag_("answag", true, &parameters_),
vampire_("vampire", true, &parameters_),
bat_("bat", true, &parameters_),
wolf_("wolf", true, &parameters_),
vetalas_("Vetalas", true, &parameters_),
draugr_("Draugr", true, &parameters_),
jiangshi_("Jiangshi", true, &parameters_),
answag_("Answag", true, &parameters_),
vampire_("Vampire", true, &parameters_),
bat_("Bat", true, &parameters_),
wolf_("Wolf", true, &parameters_),
color_(0, 0, 0) {
image_subscriber_ = ros::NodeHandle("~").subscribe("/deep_detector/bounding_box", 100,
&Deep2019Filter::callbackBoundingBox, this);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,6 @@ namespace proc_image_processing {
Parameter<bool> enable_, debug_contour_, look_for_ellipse_, look_for_heart_;

RangedParameter<double> min_area_, max_area_;

};

} // namespace proc_image_processing
Expand Down
Loading