apoorva/greenhouse
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
107 Commits 1 Branch 0 Tags
Commit Graph

107 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
darrenl
eb87c3d680 Merge pull request #58 from s-alexey/focus 
Set focus on image canvas after image is loaded
 2017-02-27 10:07:21 +08:00
tzutalin
4b9c530b1a Show the prev label text when creating a new label 2017-02-24 22:27:04 +08:00
tzutalin
34420d4053 Fix the wrong path/width/height in annotation files 2017-02-24 22:11:38 +08:00
Alexey
36ab14943e Set focus on canvas after image is loaded 2017-02-23 15:59:54 +03:00
darrenl
700bba348f Merge pull request #55 from tzutalin/py2-qt4 
Update lxml-2.3 to lxml-3.7.3 for windows
 2017-02-20 17:06:51 +08:00
tzutalin
43e62708d4 Update lxml-2.3 to lxml-3.7.3 for windows 2017-02-20 17:04:07 +08:00
tzutalin
c5ceaa687d Fix the issue when failing to open unicode dir and rename filename to 
filePath
 2017-02-16 14:49:46 +08:00
tzutalin
70721ad597 Fix qstring/asic code convert for python 2 2017-02-16 11:00:49 +08:00
tzutalin
8239d1811b Revert "Fix encode filename issues python2" 
This reverts commit 62507a195829e3f0eb93a390997e91033cb52e47.
 2017-02-15 20:35:57 +08:00
tzutalin
62507a1958 Fix encode filename issues python2 2017-02-15 17:33:55 +08:00
tzutalin
afee5a4e95 Remove setting bg features and uncomment some print message 2017-02-15 16:39:06 +08:00
tzutalin
effc3c0a3d Update README 2017-02-13 11:33:35 +08:00
tzutalin
318710c8e3 Draft version for supporting change background color 2017-02-08 16:56:24 +08:00
tzutalin
1fb28d81a7 Fix ascii codec issue when outputing pascal file 2017-01-29 22:51:59 +08:00
tzutalin
b7913f4de9 Add Ryan Flynn as one of the contributors 2017-01-16 10:34:25 +08:00
darrenl
f7b688711e Merge pull request #47 from rflynn/refactor-README 
refactor README for simplicity and clarity
 2017-01-16 10:28:06 +08:00
Ryan Flynn
a6ad229dca refactor README for simplicity and clarity 2017-01-15 17:24:56 -05:00
darrenl
633f26694b Merge pull request #46 from tzutalin/py2-qt4 
Change hotkeys
 2017-01-09 14:31:41 +08:00
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