From 3a9e31f551f608661854b46fa7c2ee3dd47dbafe Mon Sep 17 00:00:00 2001 From: mbsaloka Date: Wed, 1 May 2024 22:10:07 +0700 Subject: [PATCH] refactor: tidy up the code and change the way to include headers --- include/shisen_cpp/shisen_cpp.hpp | 14 +++++++------- include/shisen_cpp/utility.hpp | 8 ++++---- .../grpc/call_data_set_capture_setting.cpp | 19 ++++++------------- 3 files changed, 17 insertions(+), 24 deletions(-) diff --git a/include/shisen_cpp/shisen_cpp.hpp b/include/shisen_cpp/shisen_cpp.hpp index 11b1474..6eb85ca 100644 --- a/include/shisen_cpp/shisen_cpp.hpp +++ b/include/shisen_cpp/shisen_cpp.hpp @@ -21,13 +21,13 @@ #ifndef SHISEN_CPP__SHISEN_CPP_HPP_ #define SHISEN_CPP__SHISEN_CPP_HPP_ -#include "./camera/node/camera_node.hpp" -#include "./camera/provider/image_provider.hpp" -#include "./camera/provider/camera_config_provider.hpp" -#include "./node/shisen_cpp_node.hpp" -#include "./viewer/consumer/image_consumer.hpp" -#include "./viewer/node/viewer_node.hpp" +#include +#include +#include +#include +#include +#include -#include "./utility.hpp" +#include #endif // SHISEN_CPP__SHISEN_CPP_HPP_ diff --git a/include/shisen_cpp/utility.hpp b/include/shisen_cpp/utility.hpp index d4e3daf..ba1a6e1 100644 --- a/include/shisen_cpp/utility.hpp +++ b/include/shisen_cpp/utility.hpp @@ -21,9 +21,9 @@ #ifndef SHISEN_CPP__UTILITY_HPP_ #define SHISEN_CPP__UTILITY_HPP_ -#include "./utility/capture_setting.hpp" -#include "./utility/emptiable.hpp" -#include "./utility/interface.hpp" -#include "./utility/options.hpp" +#include +#include +#include +#include #endif // SHISEN_CPP__UTILITY_HPP_ diff --git a/src/shisen_cpp/config/grpc/call_data_set_capture_setting.cpp b/src/shisen_cpp/config/grpc/call_data_set_capture_setting.cpp index 3694783..de3a206 100644 --- a/src/shisen_cpp/config/grpc/call_data_set_capture_setting.cpp +++ b/src/shisen_cpp/config/grpc/call_data_set_capture_setting.cpp @@ -50,19 +50,12 @@ void CallDataSetCaptureSetting::HandleRequest() try { CaptureSetting capture_setting; - int brightness = request_.brightness(); - int contrast = request_.contrast(); - int saturation = request_.saturation(); - int temperature = request_.temperature(); - int exposure = request_.exposure(); - int gain = request_.gain(); - - capture_setting.brightness.set(brightness); - capture_setting.contrast.set(contrast); - capture_setting.saturation.set(saturation); - capture_setting.temperature.set(temperature); - capture_setting.exposure.set(exposure); - capture_setting.gain.set(gain); + capture_setting.brightness.set(request_.brightness()); + capture_setting.contrast.set(request_.contrast()); + capture_setting.saturation.set(request_.saturation()); + capture_setting.temperature.set(request_.temperature()); + capture_setting.exposure.set(request_.exposure()); + capture_setting.gain.set(request_.gain()); camera_node_->configure_capture_setting(capture_setting);