Commit Graph

289 Commits

Author SHA1 Message Date
tzutalin d9ba7b18d0 Change hotkeys 2017-01-09 14:30:17 +08:00
darrenl 43b730b6e6 Merge pull request #45 from rflynn/py3qt5
Py3qt5
2017-01-09 14:18:29 +08:00
Ryan Flynn 87bba51bfe automate anaconda 2017-01-04 23:57:41 -05:00
Ryan Flynn a0a375eaa1 fix OSX+qt4 2017-01-03 22:13:33 -05:00
Ryan Flynn 54d7b3afc4 test linux + conda 2017-01-03 22:09:33 -05:00
Ryan Flynn 226b9552da test QT4 combos on OS X 2017-01-03 21:42:59 -05:00
Ryan Flynn b846c325a8 try OSX10.10/11 to see if the OpenGL issue is there too... 2017-01-02 23:15:01 -05:00
Ryan Flynn b6d1929306 add unit testing via 'make test' 2017-01-02 22:34:55 -05:00
Ryan Flynn 2beed27cf2 add support for QT5, fallback to QT4 2017-01-02 21:55:30 -05:00
Ryan Flynn c7ddf4a3ef make py2 unicode-handling py3-compatibe 2016-12-31 14:53:09 -05:00
Ryan Flynn 67a8583e22 conservative conversion of some python2-isms to py3-compatible code 2016-12-31 14:48:17 -05:00
Ryan Flynn 9afb00d6ee add travis osx 2016-12-31 13:23:33 -05:00
Ryan Flynn f21c538f53 set up travis matrix: py2+qt4, py3+qt5 2016-12-30 01:56:55 -05:00
darrenl d6b3ec8aa8 Merge pull request #42 from rflynn/py3-friendlier-maxint
py3 removes sys.maxint, float(inf) works in py2/py3
2016-12-30 11:29:45 +08:00
Ryan Flynn e7eddf02ab py3 removes sys.maxint, float(inf) works in py2/py3 2016-12-29 21:25:23 -05:00
darrenl 37d968d6b6 Merge pull request #41 from tzutalin/revert-40-build-osx-travis
Revert "include osx in travis build"
2016-12-29 10:20:42 +08:00
darrenl cd4e440c32 Revert "include osx in travis build" 2016-12-29 10:20:32 +08:00
darrenl 445d940968 Merge pull request #38 from rflynn/readme-build-section-canonical
refactor/simplify README build instructions so subsections are linkab…
2016-12-29 09:30:57 +08:00
darrenl 831d5f33f0 Merge pull request #40 from rflynn/build-osx-travis
include osx in travis build
2016-12-29 09:29:51 +08:00
Ryan Flynn d8c8016dcc include osx in travis build 2016-12-28 20:20:12 -05:00
Ryan Flynn 13a0887e3f refactor/simplify README build instructions so subsections are linkable and commands are copy-pasteable 2016-12-28 18:46:56 -05:00
tzutalin 27bc319fba UPdate README.md 2016-12-22 21:26:43 +08:00
tzutalin 89bc590136 Use pyinstall v3.2 to build linux binary 2016-12-22 15:43:51 +08:00
darrenl af76ae25bd Merge pull request #36 from rflynn/unicode-labels
https://github.com/tzutalin/labelImg/issues/31 add support for displa…
2016-12-22 13:17:55 +08:00
Ryan Flynn 03236397d7 https://github.com/tzutalin/labelImg/issues/31 add support for displaying and saving unicode labels 2016-12-21 23:49:40 -05:00
darrenl 9a4c922d98 Merge pull request #35 from WillieMaddox/master
Fix bbox bug.
2016-12-21 10:01:48 +08:00
WillieMaddox b55f6e13a2 Fix bbox bug. 2016-12-20 08:30:11 -06:00
darrenl d9eaef0e40 Merge pull request #32 from Google1234/master
Fix a bug
2016-12-17 00:16:44 +08:00
Number1Tao 7b5a43fce1 Fix a bug
when run :./labelImg.py
Error: 
  File "./labelImg.py", line 815
    extensions = {'.jpeg','.jpg', '.png', '.bmp'}
Fix:
 change {'.jpeg','.jpg', '.png', '.bmp'} to ['.jpeg','.jpg', '.png', '.bmp']
Environment:python=2.6.9   qt=4.11.3 OX=mac os
2016-12-16 22:34:40 +08:00
Tzutalin c73e65eb40 remove clean 2016-12-10 16:24:33 +08:00
tzutalin dbbd6fc0f7 Update scripts for releasing 2016-12-08 10:09:42 +08:00
tzutalin 51bd7b1ca1 Update README 2016-12-07 15:05:53 +08:00
tzutalin 9792a610e2 Update envsetup.sh to download lxml.exe for building windows 2016-12-07 14:52:30 +08:00
tzutalin 3bbf5e23e5 remove numpy and jsos dependencies, and download pytqt for windows 2016-12-07 14:39:45 +08:00
tzutalin 16e6742094 Update script to build window/linux binary 2016-12-07 11:34:58 +08:00
tzutalin 7ff5f77484 Add envsetup.sh build-window-binary.sh for building windows 32 binary 2016-12-07 10:51:50 +08:00
tzutalin c111544e12 Upload build-ubuntu-binary.sh 2016-12-06 18:03:15 +08:00
tzutalin 50a079edc4 Support Unicode for saving and loading Pascal XML format
Use lxml to pretty the xml instead of minidom because minido does not support unicode
Save xml with unicode
Add tests dir to collect more images for unit tests in the future
2016-12-02 11:26:37 +08:00
darrenl 930d111eb8 Merge pull request #25 from Faraadid/pull-request-fixes-issue#18
This fixes #18 where openning previous annotation files causes a bug …
2016-11-08 18:11:41 +08:00
nkh 43f9166aff This fixes #18 where openning previous annotation files causes a bug in resizing bounding boxes, they were not rectangle anymore and could become deformed. 2016-11-08 13:06:13 +03:30
darrenl de98e88dcb Merge pull request #23 from rflynn/ensure-filename-defined
ensure filename variable exists for all code paths
2016-10-24 09:18:42 +08:00
Ryan Flynn 5ae63c09cd ensure filename variable exists for all code paths 2016-10-22 23:37:33 -04:00
tzutalin a550ee426d Update README and add clean in Makefile 2016-10-22 10:27:50 +08:00
tzutalin 616435d8a2 resize demo image 2016-09-06 20:44:19 +08:00
tzutalin 031c6e95bd Add gitignore, README, and demo icon 2016-09-06 20:42:13 +08:00
tzutalin f2712d4cc7 Add file list and dock to move faster 2016-09-06 20:39:42 +08:00
tzutalin 4a3a47a7c7 rm opencv module 2016-09-06 17:24:47 +08:00
tzutalin ab5e4db242 update gif link 2016-06-21 14:14:46 +08:00
tzutalin 110934ca9c remove unused file and update README 2016-05-10 22:42:13 +08:00
tzutalin 9bbfce26c2 remove requirements.txt 2016-04-19 14:58:44 +08:00