Commits · 23409b013a0527e0038d8b97e5be2c27bb6e5ee1 · aflab / astrogeology / ISIS3 · GitLab

Feb 07, 2018
- Merge remote-tracking branch 'remotes/upstream/LroLidar_Infrastructure' into BundleLidar · 23409b01
  Ken Edmundson authored Feb 07, 2018
  
  23409b01
- Merge pull request #58 from kledmundson/BundleLidar · c9de813e
  kledmundson authored Feb 07, 2018
  c9de813e
- fixed merge conflicts · 9194159c
  Ken Edmundson authored Feb 07, 2018
  
  9194159c
- Merge pull request #55 from makaylas/PP · 9525c6d9
  Makayla Shepherd authored Feb 07, 2018
  9525c6d9
- Merged dev into Piecewise · dfe2db14
  Makayla Shepherd authored Feb 07, 2018
  
  dfe2db14
Feb 06, 2018
- Merge pull request #50 from makaylas/lidar · 08d12055
  ihumphrey authored Feb 06, 2018
  08d12055
Feb 05, 2018
- Cleaned up repeated constructor, added a POINTID parameter, and cleaned up the documentation · ee973d2b
  Makayla Shepherd authored Feb 05, 2018
  
  ee973d2b
- Merge pull request #48 from makaylas/lidarDevMerge · 942aa244
  Makayla Shepherd authored Feb 05, 2018
  942aa244
- Fixed .gitignore merge conflict · 8ef99774
  Makayla Shepherd authored Feb 05, 2018
  
  8ef99774
- Removed constructor declaration · edc089e6
  Makayla Shepherd authored Feb 05, 2018
  
  edc089e6
- Fixed LidarData constructor · 407bd311
  Makayla Shepherd authored Feb 05, 2018
  
  407bd311
- Removed a QDebug include · 975804bd
  Makayla Shepherd authored Feb 05, 2018
  
  975804bd
- works with real input and doesn't add the cube as a measure if setGround doesn't work · fe6564f3
  Makayla Shepherd authored Feb 05, 2018
  
  fe6564f3
- Removed readCSV, csv reading is now in app · 6ceab785
  Makayla Shepherd authored Feb 05, 2018
  
  6ceab785
- Merge remote-tracking branch 'upstream/LroLidar_Infrastructure' into lidar · b5add168
  Makayla Shepherd authored Feb 05, 2018
  
  b5add168
- lrolola2isis runs now · afaefbba
  Makayla Shepherd authored Feb 05, 2018
  
  afaefbba
Feb 04, 2018
- Merge pull request #39 from USGS-Astrogeology/CNetImprovements · 68b6bd41
  jcwbacker authored Feb 04, 2018
  68b6bd41
Feb 03, 2018
- Merge pull request #40 from ihumphrey-usgs/LidarData-json · 762a4a7a
  ihumphrey authored Feb 03, 2018
  762a4a7a
- Added back iTime header to LidarData.cpp · 01f92643
  Ian Humphrey authored Feb 03, 2018
  
  01f92643
- updated documentation for LidarData (continued) · 6ec7d827
  Ian Humphrey authored Feb 03, 2018
  
  6ec7d827
- updated documentation for LidarData · 584f3285
  Ian Humphrey authored Feb 03, 2018
  
  584f3285
- improved json/binary serialization of LidarData class · cbb0ba30
  Ian Humphrey authored Feb 03, 2018
  
  cbb0ba30
- merged in changes to LidarData. Rename read to readCsv · fc389249
  Ian Humphrey authored Feb 03, 2018
  
  fc389249
- lrolola2isis compiles. Unable to test right now because of a lack of test data. · 06077cb0
  Makayla Shepherd authored Feb 03, 2018
  
  06077cb0
- Merge pull request #29 from twilson271828/LroLidar_Infrastructure · 52130a4f
  ihumphrey authored Feb 03, 2018
  52130a4f
- Merge branch 'LroLidar_Infrastructure' into LroLidar_Infrastructure · 1639082a
  ihumphrey authored Feb 03, 2018
  
  1639082a
- Merge branch 'LroLidar_Infrastructure' of github.com:USGS-Astrogeology/ISIS3 into LidarData-json · e46346de
  Ian Humphrey authored Feb 03, 2018
  
  e46346de
- Merge remote-tracking branch 'upstream/LroLidar_Infrastructure' into lidar · c0c00993
  Makayla Shepherd authored Feb 03, 2018
  
  c0c00993
- udpated LidarData to support JSON and binary serialization · 84af3fa5
  Ian Humphrey authored Feb 03, 2018
  
  84af3fa5
- lrolola2isis compiles now · b30888c3
  Makayla Shepherd authored Feb 03, 2018
  
  b30888c3
- Merge pull request #34 from ihumphrey-usgs/LidarData-insert · 9cfbbac0
  Makayla Shepherd authored Feb 03, 2018
  9cfbbac0
Feb 02, 2018
- Merge pull request #38 from jessemapel/cnet · 7a016b2c
  Jesse Mapel authored Feb 02, 2018
  7a016b2c
- updated LidarData::read from JSON · 5d22a1e0
  Ian Humphrey authored Feb 02, 2018
  
  5d22a1e0
- Merge branch 'dev' of github.com:USGS-Astrogeology/ISIS3 into cnet · aba6bb7c
  Jesse Mapel authored Feb 02, 2018
  
  aba6bb7c
- Merge branch 'CNetImprovements' of github.com:USGS-Astrogeology/ISIS3 into cnet · 4a7ded26
  Jesse Mapel authored Feb 02, 2018
  
  4a7ded26
- Added JSON writing to LidarData · f797286e
  Ian Humphrey authored Feb 02, 2018
  
  f797286e
- Merge branch 'LidarData-insert' into LidarData-json · b314a42a
  Ian Humphrey authored Feb 02, 2018
  
  b314a42a
- added json write serialization to LidarData · 83df7901
  Ian Humphrey authored Feb 02, 2018
  
  83df7901
- Merge remote-tracking branch 'origin/lidar' into lidar · 0fa70012
  Makayla Shepherd authored Feb 02, 2018
  
  0fa70012
- Added the start of the ingestion app and modified LidarControlPoint to behave... · cb01231b
  Makayla Shepherd authored Feb 02, 2018
  cb01231b