Commit 28b2ee69 authored by Kaj Williams's avatar Kaj Williams
Browse files

cleaned up key/newValue and comments

parent cb074f36

tests/FrameCameraTests.cpp

+17 −10
Original line number Diff line number Diff line
@@ -75,8 +75,7 @@ class FrameSensorModel : public ::testing::Test { 
      }

};



//NOTE: The imagePt layour is (Lines,Samples)

//      Also subtract 0.5 from the lines/samples. Hence Samples=0 and Lines=15 -> 14.5,-0.5

//NOTE: The imagePt format is (Lines,Samples)



//centered and slightly off-center:

TEST_F(FrameSensorModel, Center) {
@@ -127,8 +126,10 @@ TEST_F(FrameSensorModel, OffBody4) { 


// Focal Length Tests:

TEST_F(FrameIsdTest, FL500_OffBody4) {

   isd.clearParams("focal_length");

   isd.addParam("focal_length","500.0");

   std::string key = "focal_length";

   std::string newValue = "500.0";

   isd.clearParams(key);

   isd.addParam(key,newValue);

   UsgsAstroFramePlugin frameCameraPlugin;

         

   csm::Model *model = frameCameraPlugin.constructModelFromISD(
@@ -145,8 +146,10 @@ TEST_F(FrameIsdTest, FL500_OffBody4) { 
   EXPECT_NEAR(groundPt.z, -1.48533467, 1e-8);

}

TEST_F(FrameIsdTest, FL500_OffBody3) {

   isd.clearParams("focal_length");

   isd.addParam("focal_length","500.0");

   std::string key = "focal_length";

   std::string newValue = "500.0";

   isd.clearParams(key);

   isd.addParam(key,newValue);

   UsgsAstroFramePlugin frameCameraPlugin;

         

   csm::Model *model = frameCameraPlugin.constructModelFromISD(
@@ -163,8 +166,10 @@ TEST_F(FrameIsdTest, FL500_OffBody3) { 
   EXPECT_NEAR(groundPt.z, 1.48533467, 1e-8);

}

TEST_F(FrameIsdTest, FL500_Center) {

   isd.clearParams("focal_length");

   isd.addParam("focal_length","500.0");

   std::string key = "focal_length";

   std::string newValue = "500.0";

   isd.clearParams(key);

   isd.addParam(key,newValue);

   UsgsAstroFramePlugin frameCameraPlugin;

         

   csm::Model *model = frameCameraPlugin.constructModelFromISD(
@@ -181,8 +186,10 @@ TEST_F(FrameIsdTest, FL500_Center) { 
   EXPECT_NEAR(groundPt.z, 0.0, 1e-8);

}

TEST_F(FrameIsdTest, FL500_SlightlyOffCenter) {

   isd.clearParams("focal_length");

   isd.addParam("focal_length","500.0");

   std::string key = "focal_length";

   std::string newValue = "500.0";

   isd.clearParams(key);

   isd.addParam(key,newValue);

   UsgsAstroFramePlugin frameCameraPlugin;

         

   csm::Model *model = frameCameraPlugin.constructModelFromISD(