Commit 1e981d2c authored Dec 19, 2018 by jlaura Committed by Jesse Mapel Dec 19, 2018

Merging dev into master for release (#158)

* Updated ISD and tests  (#87)

* updated tests + RIP TestyMcTestFace

* keys updated

* Probably should not hard code .cpps in the CMakeLists.txt for GTest

* updated specs to mimic synthetic json

* appveyor assumed broken from standup, disabling until fixed

* eulers are now quats

* merge from jay's changes

* merge markers

* renamed quats as per Jessie's reccomendation

* only appends sensor_orientation to missing params

* stupid markers

* updated test ISD

* changes as per some comments

* updated as per comments

* defaults are all 0

* #pragma once to C style header guard

* stragler change

* missed some params

* missed another

* moving things around

* patched segfault error + added detector center as defined in json schema (#94)

* patched segfault error + added detector center as defined in the swagger schema

* verbose travi

* Fixed optical distortion and pixel to focal transforms. (#115)

* Update to use quaternions in test to match new ISD

* Fixes #121

* Fix 1 remaining failing omega rotation test

* Updates token to be in quotes

* Still trying to get the builds working.

* Updates to force upload

* Adds newline

* Update for formatting

* Trying to force travis to deploy with labels

I am editing this on the repo in order to get Travis to do its thing - I can not do this via a PR.

* Update .travis.yml

* Update meta.yaml

to try and force a dev tag on the builds to get labels to work.

* Update meta.yaml

* Update .travis.yml

* test x scaling for reset model state

* test FL500 conversion

* test FL500 conversion

* Add tests to include

* commit to force run of tests on mac with debug output

* switch to using tolerances from dev

* 0.5 pixel offset

* try moving set of filename into setup

* initialize differently test

* more debug output

* Add matrix to debug output

* Even more debug output from matrix calculation

* Add missing quaternion component to state string

* cleanup debug output now that problem is fixed

* fix added spacing

* Adds in check for PR for upload

* echo to check travis env

* fixes equality check for PR

* Clean up some spacing (non-functional) in UsgsAstroFrameModel

* Fixed canModelBeConstructedFromISD throwing an exception when the metadata file doesn't exist. (#134)

* fixed can be converted error

* Added not constructible test for frame plugin

* Removed old LS ISD header (#137)

* Update some of the tests that set a new state value to use a function in the fixture, rather than repeating code

* Windows Build (#139)

* adds win build

* Windows build

* Updates submodules

* Refactoring to move to one plugin and removed unused classes.  (#138)

* merge

* changed varrs

* reset test

* First iteration

* it compiles, although renaming this is still neccessary

* added source

* cleaned up, tests still need to pass

* post merge clean up

* validation updated, validation tests are now passing

* Addressed comments from Jesse

* last Jesse comment, convertISDToModelState doesn't check if pointer is invalid anymore as the sensor model should except

* model_name -> m_modelName for frame getState

* copy paste error in FrameSensorModel

* Resolve merge conflicts with FrameIsdTest vs. SimpleFrameIsdTest names

* Fix hopefully last merge problem

* Conda build on win (#143)

* Conda build on win

* Trying a straight build first

* Unneeded csmapi

* Now trying to upload build

* Trying a build and upload

* Trying syntax change

* trying ps

* Update .appveyor.yml

* Update .appveyor.yml

* Update .appveyor.yml

* Update .appveyor.yml

* Update .appveyor.yml

* Update .appveyor.yml

* Update .appveyor.yml

* Update .appveyor.yml

* Update .appveyor.yml

* Update .appveyor.yml

* Update .appveyor.yml

* Update meta.yaml

* Update bld.bat

This is a test to see where appveyor is failing.

* Update bld.bat

* Update bld.bat

* Update meta.yaml

* Update .appveyor.yml

* Update .appveyor.yml

* Update .appveyor.yml

* Update .appveyor.yml

* Adds if/else into appveyor (#146)

* Adds if/else into appveyor

* Update .appveyor.yml

* Updates to use gcc7

* Update .travis.yml

* Update .appveyor.yml

* Fixed Line Scan construction and condensed plugin tests (#145)

* First pass at test LS ISD

* Initial LS plugin test base

* fixed a test in frame plugin tests

* Initial LS plugin test suite

* Moved to single plugin test file

* Added some new plugin tests

* Fixed LS construction

* Re-updated submodules

* Reverted gtest

* removed debuf prints left in and made getModelName functional (#148)

* Changed line scan sensor model to new ISD spec (#149)

* Changed line scan sensor model to new ISD spec

* Updated LS to the proper spec

* Changed model_name to name_model

* Updated tests to use new name_ format in ISD

* Updated LS test data to new spec

* Fixed typo in ls test ISD

* Moved framer to new ISD format. Added bad debug statements.

* Updated LS to new spec

* Fixed focal length epsilon name

* Added model state test for framer (#152)

* fixed nan issue (#153)

* fixed nan issue

* left in for loop

* Removed switch statement for ls distortion: (#150)

parent 55181f74

.appveyor.yml

+34 −10

Original line number	Diff line number	Diff line
		@@ -7,17 +7,41 @@ platform:

		configuration:
		- Release
		- Debug

		environment:
		CSM_LIBRARY_PATH: C:\\Miniconda36-x64\lib
		CSM_INCLUDE_PATH: C:\\Miniconda36-x64\include

		install:
		- git submodule update --init --recursive
		# This pulls csm from conda
		- cmd: call C:\\Miniconda36-x64\Scripts\activate.bat
		- cmd: conda install -y -c usgs-astrogeology libcsm
		- cmake .
		- call C:\\Miniconda36-x64\Scripts\activate.bat
		- conda config --set always_yes yes --set changeps1 no
		- conda update -q conda
		- conda install conda-build anaconda-client
		- conda config --add channels usgs-astrogeology

		before_build:
		- mkdir build
		- cd build

		build_script:
		- cmake --build . -- %MSBUILD_ARGS%
		- cmake -G "Visual Studio 15 2017 Win64" -DBUILD_TESTS=OFF ..
		- cmake --build . --target ALL_BUILD --config Release

		artifacts:
		- path: build\Release\usgscsm.dll
		name: usgscsm.dll

		on_success:
		- cd ../
		- conda build -q recipe/
		- ps:
		if ($env:APPVEYOR_PULL_REQUEST_NUMBER -eq "") {
		$tar_glob = conda build recipe --output;
		Write-Host "tar_glob $tar_glob";
		if ($env:APPVEYOR_REPO_BRANCH -eq "dev") {
		$anaconda_label = "dev"
		} else {
		$anaconda_label = "main"
		};
		Write-Host "anaconda_label $anaconda_label";
		$parameters = '-t', "$env:CONDA_UPLOAD_TOKEN", 'upload', "$tar_glob", '-l',
		"$anaconda_label", '--force', '--no-progress';
		& cmd /c 'anaconda 2>&1' $parameters;
		};

.travis.yml

+6 −5

Original line number	Diff line number	Diff line
		@@ -14,15 +14,16 @@ matrix:
		sources:
		- ubuntu-toolchain-r-test
		packages:
		- g++-6
		- g++-7
		env:
		- MATRIX_EVAL="CXX=g++-6 && CC=gcc-6"
		- MATRIX_EVAL="CXX=g++-7 && CC=gcc-7"
		- os: osx
		osx_image: xcode9.4
		env:
		- MATRIX_EVAL="CXX=clang++ && CC=clang"

		before_install:
		- echo "$TRAVIS_PULL_REQUEST"
		- eval "${MATRIX_EVAL}"
		- \|
		if [ "$TRAVIS_OS_NAME" == "linux" ]; then
		@@ -58,8 +59,8 @@ after_success:
		- builddir=(`conda build recipe --output`)
		# Label based on the branch and upload to anaconda.org
		- \|
		if [ "$TRAVIS_BRANCH" == "master" ]; then
		if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
		anaconda -t="$CONDA_UPLOAD_TOKEN" upload $builddir;
		elif [ "$TRAVIS_BRANCH" == "dev" ]; then
		anaconda -t="$CONDA_UPLOAD_TOKEN" upload $builddir --label dev;
		elif [ "$TRAVIS_BRANCH" == "dev" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
		anaconda -t="$CONDA_UPLOAD_TOKEN" upload $builddir --label dev --force;
		fi

CMakeLists.txt

+9 −14

Original line number	Diff line number	Diff line
		@@ -18,14 +18,15 @@ else()
		PATH_SUFFIXES "csm"
		PATHS $ENV{CONDA_PREFIX}/include/)
		find_library(CSM_LIBRARY csmapi PATHS $ENV{CONDA_PREFIX}/lib)

		message("--Found CSM Library: ${CSM_LIBRARY}")
		message("--Found CSM Include Directory: ${CSM_INCLUDE_DIR}")
		endif(BUILD_CSM)

		add_library(usgscsm SHARED
		src/UsgsAstroFramePlugin.cpp
		src/UsgsAstroPlugin.cpp
		src/UsgsAstroFrameSensorModel.cpp
		src/UsgsAstroLsPlugin.cpp
		src/UsgsAstroLsSensorModel.cpp
		src/UsgsAstroLsStateData.cpp)
		src/UsgsAstroLsSensorModel.cpp)

		set_target_properties(usgscsm PROPERTIES
		VERSION ${PROJECT_VERSION}
		@@ -42,7 +43,6 @@ target_include_directories(usgscsm
		)

		# Setup for GoogleTest

		find_package (Threads)

		target_link_libraries(usgscsm
		@@ -50,16 +50,11 @@ target_link_libraries(usgscsm
		gtest ${CMAKE_THREAD_LIBS_INIT})

		if(WIN32)
		option(CMAKE_USE_WIN32_THREADS_INIT "using WIN32 threads" ON)
		option(gtest_disable_pthreads "Disable uses of pthreads in gtest." ON)
		install(TARGETS usgscsm
		RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR})
		install(DIRECTORY ${USGSCSM_INCLUDE_DIRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
		install(TARGETS usgscsm RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR})
		else()
		install(TARGETS usgscsm
		LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
		install(DIRECTORY ${USGSCSM_INCLUDE_DIRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
		install(TARGETS usgscsm LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
		endif()
		install(DIRECTORY ${USGSCSM_INCLUDE_DIRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})


		# Optional build or link against CSM

csm @ c78dbba3

Original line number	Diff line number	Diff line
		Subproject commit ea22180f46f86f4c95ade84ab81eb4477bdd8dd6
		Subproject commit c78dbba3731432249a75db9fdd7415b292d46715

gtest @ 2fe3bd99

Original line number	Diff line number	Diff line
		Subproject commit e5e2ef7cd27cc089c1d8302a11970ef870554294
		Subproject commit 2fe3bd994b3189899d93f1d5a881e725e046fdc2