diff --git a/applications/gui2/src/modules/calibration/stereo.cpp b/applications/gui2/src/modules/calibration/stereo.cpp index 9d00eca149caf539193cac190bed5479dfd2c48d..1910c0cef2a19d5a08038b8086241f7f15902cd8 100644 --- a/applications/gui2/src/modules/calibration/stereo.cpp +++ b/applications/gui2/src/modules/calibration/stereo.cpp @@ -161,7 +161,7 @@ bool StereoCalibration::onFrame_(const ftl::data::FrameSetPtr& fs) { new_points_r.reserve(pointsl.size()); auto& new_points_obj = state_->points_object.emplace_back(); new_points_obj.reserve(pointsl.size()); - + for (auto p : pointsl) { new_points_l.push_back(p); } for (auto p : pointsr) { new_points_r.push_back(p); } for (auto p : state_->object->object()) { new_points_obj.push_back(p); } @@ -207,7 +207,7 @@ bool StereoCalibration::isBusy() { void StereoCalibration::run() { if (state_->running) { return; } - + state_->running = true; future_ = ftl::pool.push([this](int) { try { @@ -222,7 +222,7 @@ void StereoCalibration::run() { state_->points_object, state_->points_l, state_->points_r, K1, distCoeffs1, K2, distCoeffs2, state_->imsize, R, T, E, F, state_->flags); - + state_->calib.get(Channel::Left).intrinsic = CalibrationData::Intrinsic(K1, distCoeffs1, state_->imsize); state_->calib.get(Channel::Right).intrinsic = @@ -234,11 +234,11 @@ void StereoCalibration::run() { } catch (std::exception &e) { LOG(ERROR) << "exception in calibration: " << e.what(); - running = false; + state_->running = false; throw; } - running = false; + state_->running = false; }); } diff --git a/applications/gui2/src/views/calibration/stereoview.cpp b/applications/gui2/src/views/calibration/stereoview.cpp index dbf18b9a267e2d056da8d2008c91d63d5a15aec7..86677c09018eb3a3cdaff297c74e054c570a8d5d 100644 --- a/applications/gui2/src/views/calibration/stereoview.cpp +++ b/applications/gui2/src/views/calibration/stereoview.cpp @@ -317,9 +317,6 @@ StereoCalibrationView::CalibrationWindow::CalibrationWindow(nanogui::Widget* par view->setMode(Mode::VIDEO); }); - // sensor size - new nanogui::Label(this, "Sensor size (optional)"); - nanogui::GridLayout *grid_layout = new nanogui::GridLayout (nanogui::Orientation::Horizontal, 2, nanogui::Alignment::Fill, 0, 5); grid_layout->setColAlignment @@ -343,6 +340,7 @@ StereoCalibrationView::CalibrationWindow::CalibrationWindow(nanogui::Widget* par else { ctrl_->flags().unset(flag); } }); checkbox->setChecked(ctrl_->flags().has(flag)); + checkbox->setTooltip(ctrl_->flags().explain(flag)); } // reset button @@ -372,7 +370,7 @@ void StereoCalibrationView::CalibrationWindow::draw(NVGcontext* ctx) { bcalibrate_->setEnabled(!ctrl_->isBusy() && (ctrl_->count() > 0)); if (calibrating_ && !ctrl_->isBusy()) { calibrating_ = false; - //view_->setMode(Mode::RESULTS); + view_->setMode(Mode::RESULTS); } FixedWindow::draw(ctx); } @@ -618,12 +616,12 @@ bool StereoCalibrationView::keyboardCharacterEvent(unsigned int codepoint) { imviewl_->center(); imviewr_->center(); return true; - + case 'f': imviewl_->fit(); imviewr_->fit(); return true; - + default: return true; } diff --git a/applications/gui2/src/views/statistics.cpp b/applications/gui2/src/views/statistics.cpp index 096ecabb1e21098708c5b64635594381e73e1ee9..ca6cf535c5eacd9a5422ab4bdc4aa5927ea819f7 100644 --- a/applications/gui2/src/views/statistics.cpp +++ b/applications/gui2/src/views/statistics.cpp @@ -26,7 +26,7 @@ StatisticsWidget::StatisticsWidget(nanogui::Widget* parent, ftl::gui2::Statistic void StatisticsWidget::draw(NVGcontext *ctx) { int margin = 20; - int fsize = 14; + int fsize = 15; const auto &screenSize = screen()->size(); float rowh = 20.0; @@ -42,6 +42,6 @@ void StatisticsWidget::draw(NVGcontext *ctx) { nvgFillColor(ctx, nanogui::Color(8, 8, 8, 255)); // shadow nvgText(ctx, pos[0] + width(), (i + 1)*rowh, msg[i].c_str(), nullptr); nvgFillColor(ctx, nanogui::Color(244, 244, 244, 255)); - nvgText(ctx, pos[0] + width(), (i + 1)*rowh + 1, msg[i].c_str(), nullptr); + nvgText(ctx, pos[0] + width() - 1, (i + 1)*rowh - 1, msg[i].c_str(), nullptr); } }