54d7b3afc4test linux + conda
Ryan Flynn
2017-01-03 22:09:33 -05:00
226b9552datest QT4 combos on OS X
Ryan Flynn
2017-01-03 21:41:19 -05:00
b846c325a8try OSX10.10/11 to see if the OpenGL issue is there too...
Ryan Flynn
2017-01-02 23:07:12 -05:00
b6d1929306add unit testing via 'make test'
Ryan Flynn
2017-01-02 21:54:08 -05:00
2beed27cf2add support for QT5, fallback to QT4
Ryan Flynn
2017-01-02 20:50:02 -05:00
c7ddf4a3efmake py2 unicode-handling py3-compatibe
Ryan Flynn
2016-12-31 14:53:09 -05:00
67a8583e22conservative conversion of some python2-isms to py3-compatible code
Ryan Flynn
2016-12-31 14:18:59 -05:00
9afb00d6eeadd travis osx
Ryan Flynn
2016-12-30 00:48:52 -05:00
f21c538f53set up travis matrix: py2+qt4, py3+qt5
Ryan Flynn
2016-12-29 22:55:12 -05:00
d6b3ec8aa8Merge pull request #42 from rflynn/py3-friendlier-maxint
darrenl
2016-12-30 11:29:45 +08:00
e7eddf02abpy3 removes sys.maxint, float(inf) works in py2/py3
Ryan Flynn
2016-12-29 21:25:23 -05:00
37d968d6b6Merge pull request #41 from tzutalin/revert-40-build-osx-travis
darrenl
2016-12-29 10:20:42 +08:00
cd4e440c32Revert "include osx in travis build"
darrenl
2016-12-29 10:20:32 +08:00
445d940968Merge pull request #38 from rflynn/readme-build-section-canonical
darrenl
2016-12-29 09:30:57 +08:00
831d5f33f0Merge pull request #40 from rflynn/build-osx-travis
darrenl
2016-12-29 09:29:51 +08:00
d8c8016dccinclude osx in travis build
Ryan Flynn
2016-12-28 19:45:01 -05:00
13a0887e3frefactor/simplify README build instructions so subsections are linkable and commands are copy-pasteable
Ryan Flynn
2016-12-28 18:46:56 -05:00
43f9166affThis fixes#18 where openning previous annotation files causes a bug in resizing bounding boxes, they were not rectangle anymore and could become deformed.
nkh
2016-11-08 13:06:13 +03:30
686502e1acMerge pull request #22 from ros-perception/paulbovbel-patch-1
Paul Bovbel
2016-10-27 11:01:20 -04:00
3f25096398Remove duplicated line
Paul Bovbel
2016-10-27 11:00:13 -04:00
de98e88dcbMerge pull request #23 from rflynn/ensure-filename-defined
darrenl
2016-10-24 09:18:42 +08:00
5ae63c09cdensure filename variable exists for all code paths
Ryan Flynn
2016-10-22 23:37:33 -04:00
a550ee426dUpdate README and add clean in Makefile
tzutalin
2016-10-22 10:27:50 +08:00
1f44524b9dFixed crash when selecting hamming flann distance, then change to bruteforce NN, then change to float descriptor
matlabbe
2016-09-22 12:24:25 -04:00
4b68201a23ROS: added kinect2 example
matlabbe
2016-02-22 18:50:37 -05:00
f6663a6327Merge pull request #8 from markd666/master
darrenl
2016-02-15 19:24:26 +08:00
28062bafc4Filename of current image is used as default name when saving label data
Mark Shilton
2016-02-12 13:23:12 +00:00
1981da9b22Filename of current image is used as default name when saving label data
Mark Shilton
2016-02-12 13:16:29 +00:00
91bce9ac69Added "NearestNeighbor/7ConvertBinToFloat" parameter: This will convert binary descriptors to float so that vocabulary approaches with KD-Tree or K-means can be used with binary descriptors like Brief/ORB/FREAK (use MANHATTAN_L1 too)
matlabbe
2016-02-01 12:53:16 -05:00
9525a55617fixed empty image fatal error when updating objects on ROS
matlabbe
2016-01-19 00:03:10 -05:00
3476d91bb4clear in/out label when updating objects
matlabbe
2016-01-17 18:02:40 -05:00
8b711782fdQt5: fixed crash in PdfPlotCurve::setData()
matlabbe
2016-01-17 17:33:07 -05:00
55b47aa95dfixed build error (<QtGui/QApplication> not found) with Qt5
matlabbe
2016-01-17 16:33:30 -05:00
2c0e121d82Fixed crash (OpenCV Error: Unsupported format or combination of formats) when both detector and descriptors are changed AND new type is not compatible with nearest-beighbor approach used (float vs binary)
matlabbe
2016-01-17 15:21:03 -05:00
706f83ffd4Added ASSERT before detecting features to make sure that an image exist and is CV_8UC1 type
matlabbe
2016-01-17 14:16:19 -05:00
52387f27b3Fixed double re-detection when the camera is not running and objects were updated
matlabbe
2016-01-17 14:01:36 -05:00
9cc9868820Fixed double features re-extraction when both detector and descriptor types are changed at the same time.
matlabbe
2016-01-17 13:50:59 -05:00
ccb679e7c2OpenCV3: added RHO homography type "Homography/method"
matlabbe
2016-01-17 12:24:42 -05:00
c6ee7a27efFixed crash when computing homographies (std::vector() out of bound error)
matlabbe
2016-01-17 11:26:12 -05:00
dd56234989sort by name while importing all images
tzutalin
2016-01-05 13:51:12 +08:00
6dc66d5730Fixed doubleSpinBox max value when default value=0
matlabbe
2015-12-18 17:42:38 -05:00
4da87bd622Avoid to be deformed while resizing it
tzutalin
2015-12-17 13:33:13 +08:00
3b01871851Load Pascal xml for each image if setting saved annotation folder
tzutalin
2015-12-10 17:19:09 +08:00
38c9cabb01If no image, cannot load annotion xml
tzutalin
2015-12-09 21:51:26 +08:00
ed787d4f3aAdd a function which can load xml file
tzutalin
2015-12-09 21:29:26 +08:00