From 5f0a9345265c541111f61bb459c48d264efdced3 Mon Sep 17 00:00:00 2001 From: yikestone Date: Mon, 9 Dec 2019 15:06:27 +0530 Subject: [PATCH] corrected zoom in --- qt_pi/resources/playground.pgm | Bin 85545 -> 0 bytes qt_pi/resources/resources.qrc | 1 - qt_pi/src/speller.cpp | 30 ++++++++++++++++-------------- 3 files changed, 16 insertions(+), 15 deletions(-) delete mode 100644 qt_pi/resources/playground.pgm diff --git a/qt_pi/resources/playground.pgm b/qt_pi/resources/playground.pgm deleted file mode 100644 index f4af84ded73a01291d683f9541a77ad595abf937..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 85545 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/blink.vert shaders/map.vert shaders/map.frag - playground.pgm diff --git a/qt_pi/src/speller.cpp b/qt_pi/src/speller.cpp index c72630b..cf1aa35 100644 --- a/qt_pi/src/speller.cpp +++ b/qt_pi/src/speller.cpp @@ -66,24 +66,27 @@ void Speller::classify(int len, struct insight_data *buf) { void Speller::reconfigure_map(int result, int shape) { int w = area_displayed->width(); int h = area_displayed->height(); + int x = area_displayed->x(); + int y = area_displayed->y(); + switch (shape) { case SQUARE: switch (result) { case TOP_LEFT: - area_displayed->setWidth(w / 1.9); - area_displayed->setY(h * 0.9 / 1.9); + area_displayed->setWidth(w / 1.8); + area_displayed->setY(y + h / 1.8); break; case TOP_RIGHT: - area_displayed->setX(w * 0.9 / 1.9); - area_displayed->setY(h * 0.9 / 1.9); + area_displayed->setX(x + w / 1.8); + area_displayed->setY(y + h / 1.8); break; case BOTTOM_LEFT: - area_displayed->setHeight(h / 1.9); - area_displayed->setWidth(w / 1.9); + area_displayed->setHeight(h / 1.8); + area_displayed->setWidth(w / 1.8); break; case BOTTOM_RIGHT: - area_displayed->setHeight(h / 1.9); - area_displayed->setX(w * 0.9 / 1.9); + area_displayed->setHeight(h / 1.8); + area_displayed->setX(x + w / 1.8); break; } break; @@ -91,11 +94,11 @@ void Speller::reconfigure_map(int result, int shape) { switch (result) { case TOP_LEFT: case BOTTOM_LEFT: - area_displayed->setWidth(w / 1.9); + area_displayed->setWidth(w / 1.8); break; case TOP_RIGHT: case BOTTOM_RIGHT: - area_displayed->setX(w * 0.9 / 1.9); + area_displayed->setX(x + w / 1.8); break; } break; @@ -103,11 +106,11 @@ void Speller::reconfigure_map(int result, int shape) { switch (result) { case TOP_LEFT: case TOP_RIGHT: - area_displayed->setY(h * 0.9 / 1.9); + area_displayed->setY(h + h / 1.8); break; case BOTTOM_LEFT: case BOTTOM_RIGHT: - area_displayed->setHeight(h / 1.9); + area_displayed->setHeight(h / 1.8); break; } break; @@ -190,8 +193,7 @@ __inline__ void Speller::init_ros() { } curr_map = new QImage(map_tex_buffer, map.info.width, map.info.height, 3 * map.info.width, QImage::Format_RGB888); - area_displayed = new QRect(QPoint(0, 0), QSize(curr_map->size().height() / 2, - curr_map->size().width())); + area_displayed = new QRect(QPoint(0, 0), curr_map->size()); } void Speller::poseCB(nav_msgs::Odometry::ConstPtr &msg) {