|
@@ -136,26 +136,26 @@ void PipelineManager::create_from_json(const std::string& json_path)
|
|
|
new_node = std::make_shared<GNode::TrackNode>(node_id, track_name, track_frame, track_dist);
|
|
|
|
|
|
}
|
|
|
- else if (node_type == "Analyzer")
|
|
|
+ else if (node_type == "Analyzer")
|
|
|
{
|
|
|
new_node = std::make_shared<GNode::AnalyzeNode>(node_id);
|
|
|
std::shared_ptr<meta::AnalyzeConfigData> config_data = std::make_shared<meta::AnalyzeConfigData>();
|
|
|
config_data->algorithm_names = params.at("algorithm_names").get<std::vector<std::string>>();
|
|
|
- std::vector<std::vector<cv::Point>> multi_fence_points;
|
|
|
- for (const auto& [name, points] : params["algorithm_params_fence"].items())
|
|
|
+ for (const auto& [name, points] : params["algorithm_params_fence"].items())
|
|
|
{
|
|
|
+ std::vector<std::vector<cv::Point>> multi_fence_points;
|
|
|
std::vector<cv::Point> fence_points;
|
|
|
- for (const auto& point : points)
|
|
|
+ for (const auto& point : points)
|
|
|
{
|
|
|
int x = point.at("x").get<int>();
|
|
|
int y = point.at("y").get<int>();
|
|
|
fence_points.emplace_back(x, y);
|
|
|
+ multi_fence_points.push_back(fence_points);
|
|
|
}
|
|
|
- multi_fence_points.push_back(fence_points);
|
|
|
+ config_data->algorithm_params_fence[name] = multi_fence_points;
|
|
|
}
|
|
|
- config_data->algorithm_params_fence[name] = multi_fence_points;
|
|
|
new_node->set_config_data(config_data);
|
|
|
- }
|
|
|
+ }
|
|
|
else if (node_type == "Drawer")
|
|
|
{
|
|
|
new_node = std::make_shared<GNode::DrawNode>(node_id);
|