refactor: tidy up the code and change the way to include headers

ichiro-its · May 1, 2024 · 3a9e31f · 3a9e31f
1 parent 8758ac1
commit 3a9e31f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 24 deletions.
diff --git 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 <shisen_cpp/camera/node/camera_node.hpp>
+#include <shisen_cpp/camera/provider/image_provider.hpp>
+#include <shisen_cpp/camera/provider/camera_config_provider.hpp>
+#include <shisen_cpp/node/shisen_cpp_node.hpp>
+#include <shisen_cpp/viewer/consumer/image_consumer.hpp>
+#include <shisen_cpp/viewer/node/viewer_node.hpp>
 
-#include "./utility.hpp"
+#include <shisen_cpp/utility.hpp>
 
 #endif  // SHISEN_CPP__SHISEN_CPP_HPP_
diff --git 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 <shisen_cpp/utility/capture_setting.hpp>
+#include <shisen_cpp/utility/emptiable.hpp>
+#include <shisen_cpp/utility/interface.hpp>
+#include <shisen_cpp/utility/options.hpp>
 
 #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
@@ -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);