Unverified Commit de2057df authored by Kelvin Rodriguez's avatar Kelvin Rodriguez Committed by GitHub
Browse files

Merge pull request #123 from kberryUSGS/dev 

Merge of master into dev
parents e95cd703 5b43ccb2

.gitignore

+2 −2
Original line number Diff line number Diff line
@@ -4,12 +4,12 @@ lib/* 
include/csm/*



# iPython checkpoint items

.ipynb_checkpoints/*

.ipynb_checkpoints



# Ignore any executables

bin/*



# Ignore any Max stuff

# Ignore any Mac stuff

.DS_Store



*.cpython*

CMakeLists.txt

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ 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})

README.md

+2 −0
Original line number Diff line number Diff line 
# CSM-CameraModel



ISD Specification: https://github.com/USGS-Astrogeology/pfeffernusse/blob/master/swagger.yaml



## Setting up dependencies with conda (RECOMMENDED)



Install conda if you do not already have it.

include/usgscsm/UsgsAstroFramePlugin.h

+2 −0
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ class UsgsAstroFramePlugin : public csm::Plugin { 
    // TODO when implementing, add any other necessary members.



private:

    csm::Isd loadImageSupportData(const csm::Isd &imageSupportData) const; 



    static const UsgsAstroFramePlugin m_registeredPlugin;

    static const std::string _PLUGIN_NAME;

    static const std::string _MANUFACTURER_NAME;

include/usgscsm/UsgsAstroFrameSensorModel.h

+10 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
#include <cmath>

#include <iostream>

#include <vector>



#include <gtest/gtest.h>

#include "RasterGM.h"

#include "CorrelationModel.h"
@@ -298,15 +298,23 @@ class UsgsAstroFrameSensorModel : public csm::RasterGM { 


    static const std::string _SENSOR_MODEL_NAME;





protected:



    FRIEND_TEST(FramerParameterizedTest,JacobianTest);

    FRIEND_TEST(FrameSensorModel, setFocalPlane1);

    FRIEND_TEST(FrameSensorModel, Jacobian1);

    FRIEND_TEST(FrameSensorModel, setFocalPlane_AllCoefficientsOne);

    FRIEND_TEST(FrameSensorModel, distortMe_AllCoefficientsOne);

    FRIEND_TEST(FrameSensorModel, setFocalPlane_AlternatingOnes);

    FRIEND_TEST(FrameSensorModel, distortMe_AlternatingOnes);



    virtual bool setFocalPlane(double dx,double dy,double &undistortedX,double &undistortedY) const;

    virtual void distortionFunction(double ux, double uy, double &dx, double &dy) const;

    virtual void distortionJacobian(double x, double y, double &Jxx,

                                    double &Jxy, double &Jyx, double &Jyy) const;







  private:



    // Input parameters