Commit 2f558935 authored by Cole Neubauer's avatar Cole Neubauer Committed by Makayla Shepherd
Browse files

had to alter the code slightly to send and read the label

parent ba7abb5a

isis/src/base/apps/spiceinit/SpiceClient.cpp

+5 −0
Original line number Diff line number Diff line
@@ -57,7 +57,12 @@ namespace Isis { 
    QString version = Application::Version();

    QByteArray isisVersionRaw(version.toLatin1());



    stringstream labelStream;

    labelStream << cubeLabel;

    QString labelText = QString( QByteArray( labelStream.str().c_str() ).toHex().constData() );



    QJsonObject properties {

      {"label", labelText},

      {"cksmithed value", ckSmithed},

      {"ckrecon value", ckRecon},

      {"cknadir value", ckNadir},

isis/src/base/apps/spiceserver/spiceserver.cpp

+13 −12
Original line number Diff line number Diff line
@@ -6,8 +6,6 @@ 
#include <QJsonDocument>

#include <QJsonObject>

#include <QFile>

#include <QJsonDocument>

#include <QJsonObject>

#include <QString>

#include <QStringList>

#include <QTextStream>
@@ -118,11 +116,11 @@ void IsisMain() { 
      parseParameters(jsonObject);



      // Get the cube label

      QString encoded = jsonObject.value("kernels_label").toString();

      QString encoded = jsonObject.value("label").toString();

      stringstream labStream;

      labStream << QString( QByteArray::fromHex( encoded.toLatin1() ).constData() );

      labStream >> label;



      std::cout << "label: "<<label << '\n';

    }

    else {

      QString msg = "Unable to read input file";
@@ -562,12 +560,10 @@ void packageKernels(QString toFile) { 
  QString labelText = QString( QByteArray( labelStream.str().c_str() ).toHex().constData() );

  spiceData.insert("Kernels Label", QJsonValue::fromVariant(labelText));



  QJsonObject tables;

  tables.insert("Instrument Pointing", tableToJson(toFile + ".pointing"));

  tables.insert("Instrument Position", tableToJson(toFile + ".position"));

  tables.insert("Body Rotation", tableToJson(toFile + ".bodyrot"));

  tables.insert("Sun Position", tableToJson(toFile + ".sun"));

  spiceData.insert("Tables", tables);

  spiceData.insert("Instrument Pointing", tableToJson(toFile + ".pointing"));

  spiceData.insert("Instrument Position", tableToJson(toFile + ".position"));

  spiceData.insert("Body Rotation", tableToJson(toFile + ".bodyrot"));

  spiceData.insert("Sun Position", tableToJson(toFile + ".sun"));



  QJsonDocument doc(spiceData);
@@ -604,10 +600,15 @@ void packageKernels(QString toFile) { 
  //

  // xml += "  </tables>\n";

  // xml += "</spice_data>\n";

  QString encodedXml( QByteArray( doc.toJson().toLatin1() ).toHex().constData() );

  QString encodedXml( doc.toJson().toHex().constData() );



  QFile finalOutput(toFile);

  finalOutput.open(QIODevice::WriteOnly);

  finalOutput.write(encodedXml.toLatin1());

  finalOutput.close();



  QFile finalsOutput("toFile.txt");

  finalsOutput.open(QIODevice::WriteOnly);

  finalsOutput.write(doc.toJson());

  finalsOutput.close();

}