Unverified Commit d168ad0d authored by Jesse Mapel's avatar Jesse Mapel Committed by GitHub
Browse files

Update to use new ALE ISD format (#292) 



* ALE Isd Object Update (#275)

* Added the ability to use features from ale in usgscsm

* Updated ale found messages

* Updates to travis and appveyor accordingly

* Removed debug message

* Ale building changes, and initial stab at the line scanner

* Removed another json include

* Chunk of updates to get things building.

* Travis and appveyor updates

* Another app veyor update

* Added ale to travis conda install command

* Travis debug

* Maybe activate conda?

* See what's in ale

* Changed to Load

* Try build with find_package for ale

* Add json install

* Trying USE_EXTERNAL variable

* Trying with manual find_package for json

* Changed json to nlohmann

* Distortion updates and isd changes.

* Updated test ISD to use the new format provided by the ale ISD class for parsing

* Finalized line scan changes and updated the framer to use the new ale ISD object.

* Small test updates to deal with small changes in precision

* Fixed quaternion order and times (#290)

* Fixed quaternion order and times

* Working on framer

* forgot a type

* Updated tests for proper quaternion ordering

* Adjusted framer times

* Direct isd parsing (#291)

* line scanner done

* Updated to parse json with ale methods

* Logging Update (#289) (#293)

* Added and registered the log when a new plugin is being created

* Updated frame and ls models to log to a registered spdlogger only if it exists

* Updated h files in line with new named logger approach

* Fixed failing tests

* Resolved rebase changes that snuck back in

* Set default logger for framer

* Updated default logger for the framer

* Added more checks to prevent seg faults from a poorly set environment variable

* Removed try catch blocks and one register command

* Updated sensor models to carry around a pointer to the logger

Co-authored-by: default avataracpaquette <acpaquette@usgs.gov>

* Revert "Logging Update (#289) (#293)"

This reverts commit d7f3cf525c797699af1d95539a6adecc0e93696f.

* More clean up

* Removed embedded json headers

* tabs to spaces

* Added comments and fixed typo

Co-authored-by: default avataracpaquette <acpaquette@usgs.gov>
parent 932c8ea6

.appveyor.yml

+3 −2
Original line number Diff line number Diff line
@@ -15,13 +15,14 @@ install: 
  - conda update -q conda

  - conda install conda-build anaconda-client

  - conda config --add channels usgs-astrogeology

  - conda install -c conda-forge ale



before_build:

  - mkdir build

  - cd build



build_script:

  - cmake -G "Visual Studio 15 2017 Win64" -DBUILD_TESTS=OFF ..

  - cmake -G "Visual Studio 15 2017 Win64" -DUSGSCSM_BUILD_TESTS=OFF ..

  - cmake --build . --target ALL_BUILD --config Release



artifacts:

.travis.yml

+3 −1
Original line number Diff line number Diff line
@@ -39,9 +39,11 @@ install: 
    fi

  - bash miniconda.sh -b -p $HOME/miniconda

  - source $HOME/miniconda/etc/profile.d/conda.sh

  - conda install -y -c conda-forge cmake

  - conda install -y -c conda-forge cmake ale nlohmann_json



script:

  - conda activate

  - ls $CONDA_PREFIX/include/ale

  - mkdir build

  - cd build

  - cmake -DCOVERAGE=ON ..

CMakeLists.txt

+8 −3
Original line number Diff line number Diff line
@@ -29,6 +29,9 @@ else() 
  message("--Found CSM Include Directory: ${CSM_INCLUDE_DIR}")

endif(BUILD_CSM)



find_package(nlohmann_json REQUIRED)

find_package(ale REQUIRED)



add_library(usgscsm SHARED

            src/UsgsAstroPlugin.cpp

            src/UsgsAstroFrameSensorModel.cpp
@@ -52,7 +55,9 @@ target_include_directories(usgscsm 
)



target_link_libraries(usgscsm

                      ${CSM_LIBRARY})

                      ${CSM_LIBRARY}

                      ale::ale

                      nlohmann_json::nlohmann_json)



if(WIN32)

  install(TARGETS usgscsm RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR})
@@ -63,8 +68,8 @@ install(DIRECTORY ${USGSCSM_INCLUDE_DIRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR 




# Optional build or link against CSM

option (BUILD_TESTS "Build tests" ON)

if(BUILD_TESTS)

option (USGSCSM_BUILD_TESTS "Build tests" ON)

if(USGSCSM_BUILD_TESTS)



  include(GoogleTest)

  include(cmake/gtest.cmake)

gtest @ aee0f9d9

Compare 2fe3bd99 to aee0f9d9
Original line number Diff line number Diff line 
Subproject commit 2fe3bd994b3189899d93f1d5a881e725e046fdc2
 
Subproject commit aee0f9d9b5b87796ee8a0ab26b7587ec30e8858e

include/json/LICENSE.MIT

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
JSON for Modern C++ is licensed under the MIT License

<http://opensource.org/licenses/MIT>:



Copyright (c) 2013-2017 Niels Lohmann



Permission is hereby granted, free of charge, to any person obtaining a copy of

this software and associated documentation files (the "Software"), to deal in

the Software without restriction, including without limitation the rights to

use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies

of the Software, and to permit persons to whom the Software is furnished to do

so, subject to the following conditions:



The above copyright notice and this permission notice shall be included in all

copies or substantial portions of the Software.



THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE