Jim Rybarski
|
3ff1f4baa2
|
Merge branches '73-new-dockerfile' and 'dev' of https://github.com/jimrybarski/nd2reader into 73-new-dockerfile
|
9 years ago |
jim
|
e75729ea2f
|
fixed dockerfile error
|
9 years ago |
jim
|
46d8ccd019
|
added build files to dockerignore
|
9 years ago |
Jim Rybarski
|
ac94f3789f
|
resolves #73: it's now much easier to do functional testing via docker
|
9 years ago |
Jim Rybarski
|
a0b57ecb53
|
Merge pull request #75 from jimrybarski/69-dockerignore
69 dockerignore
|
9 years ago |
Jim Rybarski
|
d5dc3e3472
|
Merge branch 'dev' into 69-dockerignore
Conflicts:
Makefile
|
9 years ago |
Jim Rybarski
|
1083ff663b
|
resolves #69: Added docker ignore file
|
9 years ago |
Jim Rybarski
|
fa477b7da3
|
Merge remote-tracking branch 'origin/master'
|
9 years ago |
Jim Rybarski
|
fc91ae1633
|
made functional testing easier
|
9 years ago |
Jim Rybarski
|
46cc073104
|
Merge pull request #72 from jimrybarski/71-better-makefile
71 better makefile
|
9 years ago |
jim
|
b267d76924
|
resolves #71: minor improvements to Makefile
|
9 years ago |
Jim Rybarski
|
da6f753fcf
|
Merge pull request #65 from jimrybarski/dev
Dev
|
10 years ago |
Jim Rybarski
|
ab5de06e05
|
Merge pull request #64 from jimrybarski/62-document-version
62 document version
|
10 years ago |
jim
|
8207e78f00
|
resolves #62: fixed typo
|
10 years ago |
jim
|
ae96bd8956
|
resolves #62: added version of NIS Elements
|
10 years ago |
jim
|
de22d09393
|
resolves #62: added version of NIS Elements
|
10 years ago |
Jim Rybarski
|
495139faca
|
Update README.md
|
10 years ago |
Jim Rybarski
|
5dd7a827fa
|
Update README.md
|
10 years ago |
Jim Rybarski
|
d615eea5cc
|
Merge pull request #58 from jimrybarski/dev
Dev
|
10 years ago |
Jim Rybarski
|
04d909f9ed
|
Merge pull request #57 from jimrybarski/56-readme-for-v1-1
56 readme for v1 1
|
10 years ago |
Jim Rybarski
|
092a993dc6
|
#56 fix six version
|
10 years ago |
Jim Rybarski
|
1fc449a6e0
|
#56 clearer README, auto-install dependencies, build numpy from source in Docker
|
10 years ago |
Jim Rybarski
|
49737f678f
|
resolves #56
|
10 years ago |
Jim Rybarski
|
524ec8de84
|
Merge pull request #55 from jimrybarski/54-feature-handle-index-error
resolves #54: raises Index error when you go out of bounds
|
10 years ago |
jim
|
18bb3f5392
|
resolves #54: raises Index error when you go out of bounds
|
10 years ago |
Jim Rybarski
|
9eb8a4b762
|
Merge pull request #53 from jimrybarski/42-feature-unittests
42 feature unittests
|
10 years ago |
jim
|
c16dccd13a
|
#42 tests for calculate_z_level
|
10 years ago |
jim
|
8ae2bf6d06
|
#42 added simple calculate_channel test
|
10 years ago |
jim
|
047af59a1a
|
#42 many passing tests for calculate_channel
|
10 years ago |
jim
|
2b62ed4d2d
|
#42 many passing tests for calculate_field_of_view
|
10 years ago |
jim
|
07e2297aaf
|
#42 fixed dockerfile and makefile, got one passing test
|
10 years ago |
jim
|
ae09b688b2
|
#42 refactored and tidied up a bit, created test files
|
10 years ago |
Jim Rybarski
|
5104a232ff
|
combined python2.7 and 3.4 into one Dockerfile since it's just for testing anyway
|
10 years ago |
Jim Rybarski
|
3f126dadb9
|
two dockerfiles as prelude to testing
|
10 years ago |
Jim Rybarski
|
c78d367c54
|
Merge pull request #51 from jimrybarski/40-feature-slices
resolves #40: adds slicing semantics
|
10 years ago |
Jim Rybarski
|
a40b243abb
|
resolves #40: adds slicing semantics
|
10 years ago |
Jim Rybarski
|
3e0d788e7c
|
Merge pull request #50 from jimrybarski/39-feature-getitem
39 feature getitem
|
10 years ago |
Jim Rybarski
|
454f5529fe
|
#39 fixed image sets
|
10 years ago |
Jim Rybarski
|
89ddce3a7b
|
resolves #39
|
10 years ago |
Jim Rybarski
|
0f9c6128e3
|
#39: field of view works
|
10 years ago |
Jim Rybarski
|
e8cb08f4cc
|
#39: calculating channel and z_level works right
|
10 years ago |
Jim Rybarski
|
c9d3a82930
|
#39: getting individual images works, however, z_level and field of view are wrong
|
10 years ago |
Jim Rybarski
|
d1b4b0bc03
|
merged changes from dev
|
10 years ago |
Jim Rybarski
|
5db4a79abc
|
Merge pull request #49 from jimrybarski/dev
implements len
|
10 years ago |
Jim Rybarski
|
1e49757494
|
Merge pull request #48 from jimrybarski/45-feature-len
45 feature len
|
10 years ago |
Jim Rybarski
|
4c1a4a0330
|
resolves #45: implements the __len__ method
|
10 years ago |
Jim Rybarski
|
7593b5ac3a
|
Merge pull request #47 from jimrybarski/dev
Python 3 support
|
10 years ago |
Jim Rybarski
|
b8c75b2aba
|
Merge pull request #46 from jimrybarski/37-python3-support
resolves #37: Python 3 support!
|
10 years ago |
Jim Rybarski
|
06d6a21586
|
resolves #37: Python 3 support!
|
10 years ago |
Jim Rybarski
|
8733b366d8
|
#39
|
10 years ago |