Commit 0b8084ef authored by Ian Humphrey's avatar Ian Humphrey
Browse files

Updated from v006LibrariesV2. 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/branches/ipce@6742 41f8697f-d340-4b68-9986-7bafba869bb8
parents 53d4d28a 73c10ddc

isis/src/base/objs/Target/Target.cpp

+1 −1
Original line number Diff line number Diff line
@@ -427,7 +427,7 @@ namespace Isis { 
    QString kernName = kern.expanded();



    if(!pckLoaded) {

      furnsh_c(kernName.toAscii().data());

      furnsh_c(kernName.toLatin1().data());

      pckLoaded = true;

    }

isis/src/control/apps/deltack/deltack.cpp

+7 −7
Original line number Diff line number Diff line
@@ -27,12 +27,12 @@ BundleSettingsQsp bundleSettings(); 


void IsisMain() {

  UserInterface &ui = Application::GetUserInterface();

  QString inputFile = ui.GetFileName("FROM");

  QString filename = ui.GetFileName("FROM");



  try {

    // Create a serial number list

    SerialNumberList serialNumberList;

    serialNumberList.add(inputFile);

    serialNumberList.add(filename);

    

    // Get the coordinate for updating the camera pointing

    // We will want to make the camera pointing match the lat/lon at this
@@ -70,7 +70,7 @@ void IsisMain() { 


    // We need the target body

    Cube c;

    c.open(inputFile, "rw");

    c.open(filename, "rw");

    // we will check for target name inside the SetTarget() call

    cnet.SetTarget(*c.label());

    // ??? c.close();
@@ -112,7 +112,7 @@ void IsisMain() { 
//    bundleAdjust.solveCholeskyBR();



    // ??? Cube c;

    // ??? c.open(inputFile, "rw");

    // ??? c.open(filename, "rw");



    //check for existing polygon, if exists delete it

    if (c.label()->hasObject("Polygon")) {
@@ -149,15 +149,15 @@ void IsisMain() { 
    Application::Log(gp);

  }

  catch (IException &e) {

    QString msg = "Unable to update camera pointing for [" + inputFile + "]";

    QString msg = "Unable to update camera pointing for [" + filename + "]";

    throw IException(e, IException::Unknown, msg, _FILEINFO_);

  }



}



// Compute the radius at the lat/lon

Distance GetRadius(QString inputFile, Latitude lat, Longitude lon) {

  Cube cube(inputFile, "r");

Distance GetRadius(QString filename, Latitude lat, Longitude lon) {

  Cube cube(filename, "r");

  Camera *sensor = CameraFactory::Create(cube);

  sensor->SetGround(SurfacePoint(lat, lon, sensor->LocalRadius(lat, lon)));

  Distance radius = sensor->LocalRadius();

isis/src/control/objs/BundleResults/unitTest.cpp

+5 −5
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ int main(int argc, char *argv[]) { 
      results.incrementMaximumLikelihoodModelIndex();



    }

    qDebug();

    qDebug() << "";



    qDebug() << "Testing assignment operator=...";

    results = results;
@@ -154,7 +154,7 @@ int main(int argc, char *argv[]) { 
    results.incrementIgnoredPoints();

    pvl = results.pvlObject("MutatedResultsObject");

    cout << pvl << endl << endl;

    qDebug();

    qDebug() << "";



    qDebug() << "Testing more computation methods...";

    results.computeSigma0(28.0, BundleSettings::Sigma0);
@@ -171,7 +171,7 @@ int main(int argc, char *argv[]) { 
    imgsAndParams.insert("img1", list1);

    imgsAndParams.insert("img2", list2);

    results.setCorrMatImgsAndParams(imgsAndParams);

    qDebug();

    qDebug() << "";



    qDebug() << "Testing accessor methods...";

    qDebug() << "maximum likelihood index = " << toString(results.maximumLikelihoodModelIndex());
@@ -186,7 +186,7 @@ int main(int argc, char *argv[]) { 
  //??       QList< QPair< MaximumLikelihoodWFunctions, double > > maximumLikelihoodModels() const;

    }



    qDebug();

    qDebug() << "";

 

  

    qDebug() << "Testing serialization...";
@@ -198,7 +198,7 @@ int main(int argc, char *argv[]) { 
    inputData >> newResults;

    pvl = newResults.pvlObject();

    cout << pvl << endl;

    qDebug();

    qDebug() << "";

 

    qDebug() << "Testing XML write/read...";

    // write xml

isis/src/control/objs/BundleSettings/unitTest.cpp

+4 −4
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ int main(int argc, char *argv[]) { 
      qDebug() << MaximumLikelihoodWFunctions::modelToString(models[i].first)

               << toString(models[i].second);

    }

    qDebug();

    qDebug() << "";



    qDebug() << "Testing static enum-to-string and string-to-enum methods...";

    qDebug() << BundleSettings::solveMethodToString(BundleSettings::stringToSolveMethod("SPARSE"));
@@ -202,7 +202,7 @@ int main(int argc, char *argv[]) { 
                               BundleSettings::stringToConvergenceCriteria("SIGMA0")); 

    qDebug() << BundleSettings::convergenceCriteriaToString(

                               BundleSettings::stringToConvergenceCriteria("PARAMETERCORRECTIONS")); 

    qDebug();

    qDebug() << "";

 

    qDebug() << "Testing serialization...";

    QByteArray byteArray;
@@ -213,7 +213,7 @@ int main(int argc, char *argv[]) { 
    inputData >> newSettings;

    pvl = newSettings.pvlObject();

    cout << pvl << endl;

    qDebug();

    qDebug() << "";



    qDebug() << "Testing XML: write XML from BundleSettings object...";

    // write xml
@@ -313,7 +313,7 @@ int main(int argc, char *argv[]) { 
    catch (IException &e) {

      e.print();

    }

    qDebug();    // read xml with no attributes or values

    qDebug() << "";    // read xml with no attributes or values

    qDebug() << "Testing XML: read XML with no attributes or values to object...";

    FileName emptyXmlFile("./unitTest_NoElementValues.xml");

    BundleSettingsXmlHandlerTester bsFromEmptyXml(project, &reader, emptyXmlFile);

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

+3 −3
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ int main(int argc, char *argv[]) { 
    // but we will call the method for test coverage

    results.id();

    qDebug() << "runTime = " << results.runTime();

    qDebug();

    qDebug() << "";



    qDebug() << "Testing error throws...";

    try {
@@ -127,7 +127,7 @@ int main(int argc, char *argv[]) { 
    catch (IException &e) {

      e.print();

    }

    qDebug();

    qDebug() << "";
@@ -228,7 +228,7 @@ int main(int argc, char *argv[]) { 
// ???     pvl = bsToFill.pvlObject("BundleSolutionInfoFromXml");

// ???     cout << pvl << endl << endl;

#endif

    qDebug();

    qDebug() << "";



    qDebug() << "Testing HDF5 write/read...";

    // write hdf