Skip to content

Fix/18.04 #241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Feb 3, 2020
Merged

Fix/18.04 #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
daa4c00
switch to PIL library for Image
floriantschopp Nov 13, 2018
0a58b38
deactivate threading for cv image displays
floriantschopp Nov 13, 2018
d8fc0e2
Update MulticamGraph.py
HannesSommer Feb 17, 2019
ee2b09d
fix opencv windows
floriantschopp Jul 22, 2019
732e551
add option to manually input forcal length
floriantschopp Oct 1, 2019
a518620
remove debug option
floriantschopp Oct 2, 2019
b4542fe
PR review @lbern
floriantschopp Oct 22, 2019
7a29676
switch to double in the first place
floriantschopp Oct 22, 2019
2999e18
Merge pull request #304 from ethz-asl/feature/input_focal_length_guess
floriantschopp Oct 23, 2019
aac34c2
Revert "Merge pull request #304 from ethz-asl/feature/input_focal_len…
floriantschopp Feb 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions aslam_cv/aslam_cameras/src/GridDetector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ GridDetector::GridDetector(boost::shared_ptr<CameraGeometryBase> geometry,
void GridDetector::initializeDetector()
{
if (_options.plotCornerReprojection) {
cv::namedWindow("Corner reprojection");
cvStartWindowThread();
cv::namedWindow("Corner reprojection", cv::WINDOW_NORMAL);
}
}

Expand Down
5 changes: 2 additions & 3 deletions aslam_cv/aslam_cameras_april/src/GridCalibrationTargetAprilgrid.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,8 @@ GridCalibrationTargetAprilgrid::GridCalibrationTargetAprilgrid() :
void GridCalibrationTargetAprilgrid::initialize()
{
if (_options.showExtractionVideo) {
cv::namedWindow("Aprilgrid: Tag detection");
cv::namedWindow("Aprilgrid: Tag corners");
cvStartWindowThread();
cv::namedWindow("Aprilgrid: Tag detection", cv::WINDOW_NORMAL);
cv::namedWindow("Aprilgrid: Tag corners", cv::WINDOW_NORMAL);
}

//create the tag detector
Expand Down
7 changes: 5 additions & 2 deletions aslam_offline_calibration/kalibr/python/kalibr_camera_calibration/CameraCalibrator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,8 +598,11 @@ def printParameters(cself, dest=sys.stdout):
corners, reprojs, rerrs = getReprojectionErrors(cself, cidx)
if len(rerrs)>0:
me, se = getReprojectionErrorStatistics(rerrs)
print >> dest, "\t reprojection error: [%f, %f] +- [%f, %f]" % (me[0], me[1], se[0], se[1])
print >> dest
try:
print >> dest, "\t reprojection error: [%f, %f] +- [%f, %f]" % (me[0], me[1], se[0], se[1])
except:
print >> dest, "\t Failed printing the reprojection error."
print >> dest

#print baselines
for bidx, baseline in enumerate(cself.baselines):
Expand Down
5 changes: 4 additions & 1 deletion aslam_offline_calibration/kalibr/python/kalibr_camera_calibration/MulticamGraph.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@
import itertools
import sys
import pylab as pl
import Image
try:
from PIL import Image # Modern
except ImportError:
import Image # Old import (backward compatibility)
import time

# make numpy print prettier
Expand Down