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: acpaquette <acpaquette@usgs.gov>

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

This reverts commit d7f3cf5.

* More clean up

* Removed embedded json headers

* tabs to spaces

* Added comments and fixed typo

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

.appveyor.yml

@@ -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

@@ -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

@@ -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)