Skip to content
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

Added AlphaCube group to outputlabel in the event the image is cropped. #645

Merged
merged 18 commits into from
Feb 7, 2019
Merged

Added AlphaCube group to outputlabel in the event the image is cropped. #645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
a59a951
Added AlphaCube group to outputlabel in the event the image is cropped.
twilson271828 Dec 14, 2018
c00f88e
Fix libtiff dependency (#636) (#644)
seignovert Dec 17, 2018
645a838
Moved ISIS3 conda-build recipe from ISIS3_deps repository (#650)
jessemapel Dec 17, 2018
08edafe
Fixed warning in Pixel unit tests
jessemapel Dec 17, 2018
ca9e666
Made a tweak to the dimensions of the alpha cube for cropped images t…
twilson271828 Dec 17, 2018
c3f4513
Changed the transform function so it could process an array of double…
twilson271828 Dec 17, 2018
d9439fa
Smear correction was being incorrectly applied to onboard smear corre…
twilson271828 Dec 17, 2018
90baaa7
Merge pull request #652 from jessemapel/warnings
krlberry Dec 18, 2018
23978de
Added gtest capability to hyb2onc2isis
twilson271828 Dec 18, 2018
8fa370e
Removing build numbers from external libraries (#660)
SgStapleton Dec 19, 2018
a92a0c4
Added pixel type attribute to the output image of program shadow. Fix…
kaitlyndlee Dec 19, 2018
997f8c7
Added section for Environment and PreferemcesSetup in the Getting Sta…
kaitlyndlee Dec 19, 2018
520ccca
Updated .gitmodules to use https rather than ssh (#673)
SgStapleton Dec 19, 2018
d7ab32c
Added build type release to conda recipe (#676)
SgStapleton Dec 20, 2018
0128bdb
Merge branch 'dev' into hayabusa2_fy19: Needed updated environment.y…
Jan 2, 2019
401b2cf
Modified isis/tests/CMakeLists.txt as well as hyb2onc2isis to fix unr…
twilson271828 Jan 30, 2019
78e8bce
Added w1 test to hyb2onc2isisTests.cpp
twilson271828 Jan 30, 2019
e6db077
Modified hyb2onccal to be a callable function.
twilson271828 Feb 1, 2019
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
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "gtest"]
path = gtest
url = git@github.com:google/googletest.git
url = https://github.com/google/googletest.git
61 changes: 29 additions & 32 deletions environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,65 +6,62 @@ channels:

dependencies:
- armadillo==8.200.0
- blas==1.1=openblas
- bullet==2.86.1=0
- blas==1.1
- bullet==2.86.1
- bz2file==0.98
- bzip2==1.0.6=1
- bzip2==1.0.6
- cmake>=3.10
- cspice==66=h470a237_3
- curl==7.60.0=0
- doxygen==1.8.14=0
- eigen==3.3.3=0
- embree==2.14.0=0
- cspice==66
- curl==7.60.0
- doxygen==1.8.14
- eigen==3.3.3
- embree==2.14.0
- geos==3.5.1
- geotiff==1.4.2=1
- geotiff==1.4.2
- gmm==5.0
- gmp==6.1.2=0
- gsl==2.2.1=blas_openblas_3
- hdf5==1.8.18=2
- icu==58.2=0
- gmp==6.1.2
- gsl==2.2.1
- hdf5==1.8.18
- icu==58.2
- jama==125
- jpeg==9b=2
- jpeg==9b
- kakadu==1
- krb5==1.14.2=0
- krb5==1.14.2
- libpng>=1.6.34
- libprotobuf==3.5.2
- libtiff==4.0.9=0
- libxml2==2.9.7=0
- libtiff>=4.0.9
- libxml2==2.9.7
- make
- mesalib==17.2.0=0
- mesalib==17.2.0
- mysql==5.7.20
- mysql-connector-c==6.1.6=0
- mysql-connector-c==6.1.6
- nanoflann==1.2.2
- ninja==1.7.2=0
- ninja==1.7.2
- conda-forge/label/gcc7::nn
# - numpy==1.13.3=py36_blas_openblas_200
- openblas==0.2.19=2
- openblas==0.2.19
- opencv
- openssl==1.0.2n=0
- openssl==1.0.2n
- patchelf==0.9
- pcl==1.8.1
- pip==9.0.1
- protobuf==3.5.2
# - pyqt==5.6.0
- python==3.6
- qhull==7.2.0=0
- qt=5.9.6
- qwt=6.1.3
- setuptools=38.5.1
- sip==4.18
- sqlite==3.13.0=1
- suitesparse==4.5.4=blas_openblas_200
- superlu==5.2.1=blas_openblas_201
- sqlite==3.13.0
- suitesparse==4.5.4
- superlu==5.2.1
- tnt==126=0
- wheel==0.30.0
- x264==20131218
- xalan-c==1.11
- xerces-c==3.1.4=0
- xorg-kbproto==1.0.7=1
- xerces-c==3.1.4
- xorg-kbproto==1.0.7
- xorg-libice
- xorg-libsm
- xorg-libx11==1.6.4=6
- xorg-libx11==1.6.4
- xorg-libxi
- zlib==1.2.11=0

- zlib==1.2.11
59 changes: 28 additions & 31 deletions environment_gcc4.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,64 +8,61 @@ channels:
dependencies:
- armadillo==8.200.0
- blas==1.1=openblas
- bullet==2.86.1=0
- bullet==2.86.1
- bz2file==0.98
- bzip2==1.0.6=1
- bzip2==1.0.6
- cmake>=3.10
- cspice==66=h470a237_3
- curl==7.60.0=0
- doxygen==1.8.14=0
- eigen==3.3.3=0
- embree==2.14.0=0
- cspice==66
- curl==7.60.0
- doxygen==1.8.14
- eigen==3.3.3
- embree==2.14.0
- geos==3.5.1
- geotiff==1.4.2=1
- geotiff==1.4.2
- gmm==5.0
- gmp==6.1.2=0
- gsl==2.2.1=blas_openblas_3
- hdf5==1.8.18=2
- icu==58.2=0
- gmp==6.1.2
- gsl==2.2.1
- hdf5==1.8.18
- icu==58.2
- jama==125
- jpeg==9b=2
- jpeg==9b
- kakadu==1
- krb5==1.14.2=0
- krb5==1.14.2
- libpng>=1.6.34
- libprotobuf==3.5.2
- libtiff==4.0.9=0
- libxml2==2.9.7=0
- libtiff>=4.0.9
- libxml2==2.9.7
- make
- mesalib==17.2.0=0
- mesalib==17.2.0
- mysql==5.7.20
- mysql-connector-c==6.1.6=0
- mysql-connector-c==6.1.6
- nanoflann==1.2.2
- ninja==1.7.2=0
- ninja==1.7.2
- nn==1.86.0
# - numpy==1.13.3=py36_blas_openblas_200
- openblas==0.2.19=2
- openblas==0.2.19
- opencv
- openssl==1.0.2n=0
- openssl==1.0.2n
- patchelf==0.9
- pcl==1.8.1
- pip==9.0.1
- protobuf==3.5.2
# - pyqt==5.6.0
- python==3.6
- qhull==7.2.0=0
- qt=5.9.6
- qwt=6.1.3
- setuptools=38.5.1
- sip==4.18
- sqlite==3.13.0=1
- suitesparse==4.5.4=blas_openblas_200
- superlu==5.2.1=blas_openblas_201
- sqlite==3.13.0
- suitesparse==4.5.4
- superlu==5.2.1
- tnt==126=0
- wheel==0.30.0
- x264==20131218
- xalan-c==1.11
- xerces-c==3.1.4=0
- xorg-kbproto==1.0.7=1
- xerces-c==3.1.4
- xorg-kbproto==1.0.7
- xorg-libice
- xorg-libsm
- xorg-libx11==1.6.4=6
- xorg-libx11==1.6.4
- xorg-libxi
- zlib==1.2.11=0

- zlib==1.2.11
Loading