diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2021-09-26 19:26:20 +0200 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2022-03-29 00:04:47 +0200 |
commit | dd3384edb253c474df054321e2cce7dbab6cc2ce (patch) | |
tree | 54d98fbd2c473737bdb61c51624499c17956b89e /tracker-trackhat | |
parent | ae0374700e8c76b1a752f9a0b952ac8f26b79dcf (diff) |
tracker/trackhat: fix widget without hidpi
Diffstat (limited to 'tracker-trackhat')
-rw-r--r-- | tracker-trackhat/frame.cpp | 8 | ||||
-rw-r--r-- | tracker-trackhat/trackhat.hpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tracker-trackhat/frame.cpp b/tracker-trackhat/frame.cpp index fe492beb..12d9d890 100644 --- a/tracker-trackhat/frame.cpp +++ b/tracker-trackhat/frame.cpp @@ -67,8 +67,8 @@ void trackhat_preview::draw_points() continue; constexpr f sz = trackhat_camera::sensor_size; - f x = std::clamp((f)pt.m_x, f(0), sz-1) * (f)frame_bgr.cols / sz, - y = std::clamp((f)pt.m_y, f(0), sz-1) * (f)frame_bgr.rows / sz; + int x = iround(std::clamp((f)pt.m_x, f(0), sz-1) * (f)frame_bgr.cols / sz), + y = iround(std::clamp((f)pt.m_y, f(0), sz-1) * (f)frame_bgr.rows / sz); const f dpi = (f)frame_bgr.cols / f(320); int c = (int)pt.m_brightness; @@ -76,13 +76,13 @@ void trackhat_preview::draw_points() auto outline_color = i < 3 ? cv::Scalar{255, 255, 0} : cv::Scalar{192, 192, 192}; cv::circle(frame_bgr, - {iround(x*dpi), iround(y*dpi)}, + {x, y}, iround(point_size * dpi), outline_color, iround(dpi), cv::LINE_AA); cv::circle(frame_bgr, - {iround(x*dpi), iround(y*dpi)}, + {x, y}, iround((point_size-2) * dpi), cv::Scalar(c, c, c), -1); diff --git a/tracker-trackhat/trackhat.hpp b/tracker-trackhat/trackhat.hpp index eaf0e2df..26738839 100644 --- a/tracker-trackhat/trackhat.hpp +++ b/tracker-trackhat/trackhat.hpp @@ -26,7 +26,7 @@ struct trackhat_camera final : pt_camera void set_fov(f value) override; void show_camera_settings() override; - static constexpr int sensor_size = 2940*2; + static constexpr int sensor_size = 2940; static constexpr int sensor_fov = 52; static constexpr int point_count = TRACK_HAT_NUMBER_OF_POINTS; |