Commit e07dd519 authored by Jesse Mapel's avatar Jesse Mapel
Browse files

Renamed proj to projection to resolve build errors in camtrim, phocube, and camdev. 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/branches/PiecewisePolynomials@8225 41f8697f-d340-4b68-9986-7bafba869bb8
parent 32ca3d77

isis/src/base/apps/camtrim/camtrim.cpp

+8 −8
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ using namespace Isis; 
// Global variables

Cube *icube;

Camera *cam;

TProjection *proj;

TProjection *projection;

double minlat;

double maxlat;

double minlon;
@@ -53,14 +53,14 @@ void IsisMain() { 
  if(ui.WasEntered("MAP")) {

    Pvl lab;

    lab.read(ui.GetFileName("MAP"));

    proj = (TProjection *) ProjectionFactory::Create(lab);

    projection = (TProjection *) ProjectionFactory::Create(lab);



    // add mapping to print.prt

    PvlGroup mapping = proj->Mapping();

    PvlGroup mapping = projection->Mapping();

    Application::Log(mapping);

  }

  else {

    proj = NULL;

    projection = NULL;

  }



  // Start the processing
@@ -86,10 +86,10 @@ void camtrim(Buffer &in, Buffer &out) { 
    if(cam->HasSurfaceIntersection()) {

      lat = cam->UniversalLatitude();

      lon = cam->UniversalLongitude();

      if(proj != NULL) {

        proj->SetUniversalGround(lat, lon);

        lat = proj->Latitude();

        lon = proj->Longitude();

      if(projection != NULL) {

        projection->SetUniversalGround(lat, lon);

        lat = projection->Latitude();

        lon = projection->Longitude();

      }

      // Pixel is outside range

      if((lat < minlat) || (lat > maxlat) ||

isis/src/base/apps/phocube/phocube.cpp

+6 −6
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ using namespace Isis; 


// Global variables

Camera *cam;

TProjection *proj;

TProjection *projection;

int nbands;

bool noCamera;
@@ -89,7 +89,7 @@ void IsisMain() { 


  if(noCamera) {

    try {

      proj = (TProjection *) icube->projection();

      projection = (TProjection *) icube->projection();

    }

    catch(IException &e) {

      QString msg = "Mosaic files must contain mapping labels";
@@ -294,7 +294,7 @@ void phocube(Buffer &out) { 


      bool isGood=false;

      if (noCamera) {

        isGood = proj->SetWorld(samp, line);

        isGood = projection->SetWorld(samp, line);

      }

      else {

        isGood = cam->SetImage(samp, line);
@@ -332,7 +332,7 @@ void phocube(Buffer &out) { 
        }

        if(latitude) {

          if(noCamera) {

            out[index] = proj->UniversalLatitude();

            out[index] = projection->UniversalLatitude();

          }

          else {

            out[index] = cam->UniversalLatitude();
@@ -341,7 +341,7 @@ void phocube(Buffer &out) { 
        }

        if(longitude) {

          if(noCamera) {

            out[index] = proj->UniversalLongitude();

            out[index] = projection->UniversalLongitude();

          }

          else {

            out[index] = cam->UniversalLongitude();
@@ -350,7 +350,7 @@ void phocube(Buffer &out) { 
        }

        if(pixelResolution) {

          if(noCamera) {

            out[index] = proj->Resolution();

            out[index] = projection->Resolution();

          }

          else {

            out[index] = cam->PixelResolution();

isis/src/control/objs/BundleSolutionInfo/BundleSolutionInfo.cpp

+5 −0
Original line number Diff line number Diff line
@@ -643,6 +643,9 @@ namespace Isis { 
        sprintf(buf, "\n POLYNOMIAL OVER EXISTING POINTING: ON"):

        sprintf(buf, "\nPOLYNOMIAL OVER EXISTING POINTING : OFF");

    fpOut << buf;

    sprintf(buf, "\n          POLYNOMIAL SEGMENT COUNT: %d",

            globalSettings.numberCkPolySegments());

    fpOut << buf;



    sprintf(buf, "\n\nINPUT: SPACECRAFT OPTIONS\n=========================\n");

    fpOut << buf;
@@ -673,6 +676,8 @@ namespace Isis { 
        sprintf(buf, "\n POLYNOMIAL OVER HERMITE SPLINE: ON"):

        sprintf(buf, "\nPOLYNOMIAL OVER HERMITE SPLINE : OFF");

    fpOut << buf;

    sprintf(buf, "\n          POLYNOMIAL SEGMENT COUNT: %d",

            globalSettings.numberSpkPolySegments()());



    sprintf(buf, "\n\nINPUT: GLOBAL IMAGE PARAMETER UNCERTAINTIES\n===========================================\n");

    fpOut << buf;

isis/src/local/apps/camdev/camdev.cpp

+6 −6
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ using namespace Isis; 


// Global variables

Camera *cam;

TProjection *proj;

TProjection *projection;

int nbands;

bool noCamera;
@@ -124,7 +124,7 @@ void IsisMain() { 


  if(noCamera) {

    try {

      proj = (TProjection *) icube->projection();

      projection = (TProjection *) icube->projection();

    }

    catch(IException &e) {

      QString msg = "Mosaic files must contain mapping labels";
@@ -415,7 +415,7 @@ void camdev(Buffer &out) { 


      bool isGood=false;

      if (noCamera) {

        isGood = proj->SetWorld(samp, line);

        isGood = projection->SetWorld(samp, line);

      }

      else {

        isGood = cam->SetImage(samp, line);
@@ -432,7 +432,7 @@ void camdev(Buffer &out) { 
        }

        if(planetocentricLatitude) {

          if(noCamera) {

            out[index] = proj->UniversalLatitude();

            out[index] = projection->UniversalLatitude();

          }

          else {

            out[index] = cam->UniversalLatitude();
@@ -453,7 +453,7 @@ void camdev(Buffer &out) { 
        double pe360Lon, pw360Lon;

        if (positiveEast360Longitude) {

          if(noCamera) {

            pe360Lon = proj->UniversalLongitude();

            pe360Lon = projection->UniversalLongitude();

          }

          else {

            pe360Lon = cam->UniversalLongitude();
@@ -494,7 +494,7 @@ void camdev(Buffer &out) { 
        }

        if (pixelResolution) {

          if (noCamera) {

            out[index] = proj->Resolution();

            out[index] = projection->Resolution();

          }

          else {

            out[index] = cam->PixelResolution();