Commit fe6564f3 authored by Makayla Shepherd's avatar Makayla Shepherd
Browse files

works with real input and doesn't add the cube as a measure if setGround doesn't work

parent 6ceab785

isis/src/lro/apps/lrolola2isis/lrolola2isis.cpp

+18 −12
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ void IsisMain() { 
  UserInterface &ui = Application::GetUserInterface();

  FileName dataFile = ui.GetFileName("FROM");

  SerialNumberList cubeList = SerialNumberList(ui.GetFileName("CUBES"));

  FileName output = ui.GetFileName("TO");



  QList<LidarCube> images;
@@ -64,9 +63,9 @@ void IsisMain() { 
  for (int i = 1; i < lidarDataFile.rows(); i++) {

    CSVReader::CSVAxis row = lidarDataFile.getRow(i);



    iTime time(row[0].toDouble());

    Latitude lat(row[1].toDouble(), Angle::Units::Degrees);

    Longitude lon(row[2].toDouble(), Angle::Units::Degrees);

    iTime time(row[0]);

    Latitude lat(row[2].toDouble(), Angle::Units::Degrees);

    Longitude lon(row[1].toDouble(), Angle::Units::Degrees);

    Distance radius(row[3].toDouble(), Distance::Units::Kilometers);

    double range = row[4].toDouble();

    QString id = "POINT" + QString::number(i);
@@ -89,7 +88,7 @@ void IsisMain() { 
          Camera *camera = cube->camera();

          

          if (camera != NULL) {

            camera->SetGround(lat, lon);

            if (camera->SetGround(lat, lon)) {

        

              ControlMeasure *measure = new ControlMeasure;

              measure->SetCoordinate(camera->Line(), camera->Sample());
@@ -97,6 +96,7 @@ void IsisMain() { 
          

              lidarPoint->Add(measure);

            }

          }

          else {

            QString msg = "Unable to create a camera from " + images[j].name.expanded();

            throw IException(IException::Unknown, msg, _FILEINFO_);
@@ -113,5 +113,11 @@ void IsisMain() { 
    lidarDataSet.insert(QSharedPointer<LidarControlPoint>(lidarPoint));

  }



  return;

  

  if (ui.GetString("OUTPUTTYPE") == "JSON") {

    lidarDataSet.write(ui.GetFileName("TO"), LidarData::Format::Json);

  }

  else {

    lidarDataSet.write(ui.GetFileName("TO"), LidarData::Format::Binary);

  }

}

isis/src/lro/apps/lrolola2isis/lrolola2isis.xml

+14 −0
Original line number Diff line number Diff line
@@ -90,6 +90,20 @@ 
            *.txt

          </filter>

        </parameter>

        <parameter name="OUTPUTTYPE">

          <type>string</type>

          <description>

            The output type, either binary or json.

          </description>

          <list>

            <option value="BINARY">

              <brief> Binary output file (.dat)</brief>

            </option>

            <option value="JSON">

              <brief> JSON output file (.json)</brief>

            </option>

          </list>

        </parameter>

    </group>

  </groups>