Commit 241be9d2 authored by jay's avatar jay
Browse files

Fixes 142 for framer

parent 1179600b

include/usgscsm/UsgsAstroFrameSensorModel.h

+1 −0
Original line number Diff line number Diff line
@@ -356,6 +356,7 @@ protected: 
    double m_startingDetectorLine;

    std::string m_targetName;

    std::string m_modelName;

    std::string m_imageIdentifier;

    double m_ifov;

    std::string m_instrumentID;

    double m_focalLengthEpsilon;

src/UsgsAstroFrameSensorModel.cpp

+7 −8
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ UsgsAstroFrameSensorModel::UsgsAstroFrameSensorModel() { 


void UsgsAstroFrameSensorModel::reset() {

    m_modelName = _SENSOR_MODEL_NAME;

    m_imageIdentifier = "";

    m_majorAxis = 0.0;

    m_minorAxis = 0.0;

    m_focalLength = 0.0;
@@ -557,17 +558,13 @@ std::string UsgsAstroFrameSensorModel::getPedigree() const { 




std::string UsgsAstroFrameSensorModel::getImageIdentifier() const {

  throw csm::Error(csm::Error::UNSUPPORTED_FUNCTION,

                   "Unsupported function",

                   "UsgsAstroFrameSensorModel::getImageIdentifier");

  return m_imageIdentifier;

}





void UsgsAstroFrameSensorModel::setImageIdentifier(const std::string& imageId,

                                            csm::WarningList* warnings) {

  throw csm::Error(csm::Error::UNSUPPORTED_FUNCTION,

                   "Unsupported function",

                   "UsgsAstroFrameSensorModel::setImageIdentifier");

  m_imageIdentifier = imageId;

}
@@ -657,7 +654,8 @@ std::string UsgsAstroFrameSensorModel::getModelState() const { 
                                   m_currentParameterValue[2], m_currentParameterValue[3],

                                   m_currentParameterValue[4], m_currentParameterValue[5],

                                   m_currentParameterValue[6]}},

      {"m_currentParameterCovariance", m_currentParameterCovariance}

      {"m_currentParameterCovariance", m_currentParameterCovariance},

      {"m_imageIdentifier", m_imageIdentifier}

    };



    return state.dump();
@@ -759,7 +757,7 @@ void UsgsAstroFrameSensorModel::replaceModelState(const std::string& stringState 
        m_transY = state.at("m_transY").get<std::vector<double>>();

        m_iTransS = state.at("m_iTransS").get<std::vector<double>>();

        m_iTransL = state.at("m_iTransL").get<std::vector<double>>();



        m_imageIdentifier = state.at("m_imageIdentifier").get<std::string>();

        // Leaving unused params commented out

        // m_targetName = state.at("m_targetName").get<std::string>();

        // m_ifov = state.at("m_ifov").get<double>();
@@ -809,6 +807,7 @@ std::string UsgsAstroFrameSensorModel::constructStateFromIsd(const std::string& 


    try {

      state["m_modelName"] = isd.at("name_model");

      state["m_imageIdentifier"] = isd.at("image_identifier");

      std::cerr << "Model Name Parsed!" << std::endl;



      state["m_startingDetectorSample"] = isd.at("starting_detector_sample");

src/UsgsAstroPlugin.cpp

+3 −0
Original line number Diff line number Diff line
@@ -154,12 +154,15 @@ std::string UsgsAstroPlugin::loadImageSupportData(const csm::Isd &imageSupportDa 
  std::string imageFilename = imageSupportDataOriginal.filename();

  size_t lastIndex = imageFilename.find_last_of(".");

  std::string baseName = imageFilename.substr(0, lastIndex);

  lastIndex = baseName.find_last_of("/");

  std::string filename = baseName.substr(lastIndex + 1);

  std::string isdFilename = baseName.append(".json");



  try {

    std::ifstream isd_sidecar(isdFilename);

    json jsonisd;

    isd_sidecar >> jsonisd;

    jsonisd["image_identifier"] = filename;

    return jsonisd.dump();



  } catch (...) {

tests/FrameCameraTests.cpp

+4 −0
Original line number Diff line number Diff line
@@ -86,6 +86,10 @@ TEST_F(FrameSensorModel, OffBody4) { 
   EXPECT_NEAR(groundPt.z, -14.99325304, 1e-8);

}



TEST_F(FrameSensorModel, getImageIdentifier) {

  EXPECT_EQ("simpleFramerISD", sensorModel->getImageIdentifier());

}



TEST_F(FrameSensorModel, setFocalPlane1) {

  csm::ImageCoord imagePt(7.5, 7.5);

  double ux,uy;