Commit 51c4f541 authored by Tracie Sucharski's avatar Tracie Sucharski
Browse files

Fixed JigsawDialog compile warnings. Backed out changes made to... 

Fixed JigsawDialog compile warnings.  Backed out changes made to Image,ImageList determining whether to copy cube dn-this caused problems importing Images into cnetsuite.  Fixed problems adding the BundleObservation CSV files to cnetsuite project when jigsaw results were saved.

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/trunk@7665 41f8697f-d340-4b68-9986-7bafba869bb8
parent 635da5ee

isis/src/qisis/objs/Directory/ImportShapesWorkOrder.h

+2 −1
Original line number Diff line number Diff line
@@ -26,10 +26,11 @@ 


#include <QDir>

#include <QMutex>

#include <QString>



#include "IException.h"



class QString;



namespace Isis {

  class Cube;

  class FileName;

isis/src/qisis/objs/Image/Image.cpp

+2 −2
Original line number Diff line number Diff line
@@ -484,7 +484,7 @@ namespace Isis { 
   * @brief Copy the cub/ecub files associated with this image into the new project.

   * @param newProjectRoot  The root directory where the project is stored.

   */

  void Image::copyToNewProjectRoot(const Project *project, FileName newProjectRoot, bool copyCubes) {

  void Image::copyToNewProjectRoot(const Project *project, FileName newProjectRoot) {

    if (FileName(newProjectRoot) != FileName(project->projectRoot())) {

      Cube origImage(m_fileName);
@@ -496,7 +496,7 @@ namespace Isis { 


      // If this is an ecub (it should be) and is pointing to a relative file name,

      //   then we want to copy the DN cube also.

      if (!origImage.storesDnData() && copyCubes) {

      if (!origImage.storesDnData() ) {

        if (origImage.externalCubeFileName().path() == ".") {

          Cube dnFile(

              FileName(m_fileName).path() + "/" + origImage.externalCubeFileName().name());

isis/src/qisis/objs/Image/Image.h

+2 −7
Original line number Diff line number Diff line
@@ -85,12 +85,7 @@ namespace Isis { 
   *                           (the Spacecraft name associated with this image).

   *   @history 2016-06-22 Tyler Wilson - Added documentation to member functions/variables.

   *                           Fixes #3950.

   *   @history 2017-05-07 Tyler Wilson - Added a third bool parameter value (copyCubes)

   *                       to the function copyToNewProjectRoot which is true by default.

   *                       The default behavior is to copy cubes as well as ecub values from

   *                       ImageLists into the results folder.  If this parameter is false,

   *                       then only ecub values are saved (which is the desired behavior

   *                       for running cnetsuite).  Fixes #4848.

   *

   */



  class Image : public QObject {
@@ -128,7 +123,7 @@ namespace Isis { 
      Angle phaseAngle() const;

      double sampleResolution() const;



      void copyToNewProjectRoot(const Project *project, FileName newProjectRoot,bool copyCubes=true);

      void copyToNewProjectRoot(const Project *project, FileName newProjectRoot);

      void deleteFromDisk();

      void save(QXmlStreamWriter &stream, const Project *project, FileName newProjectRoot) const;

isis/src/qisis/objs/ImageList/ImageList.cpp

+1 −1
Original line number Diff line number Diff line
@@ -888,7 +888,7 @@ namespace Isis { 
   * @see save

   */

  void *ImageList::CopyImageDataFunctor::operator()(Image * const &imageToCopy) {

    imageToCopy->copyToNewProjectRoot(m_project, m_newProjectRoot, m_project->copyCubes());

    imageToCopy->copyToNewProjectRoot(m_project, m_newProjectRoot);

    return NULL;

  }

isis/src/qisis/objs/ImageList/ImageList.h

+0 −7
Original line number Diff line number Diff line
@@ -40,13 +40,6 @@ namespace Isis { 
   *                         pointer. TODO:  Currently, serialNumberList created the list on the

   *                         fly.  For speed, this needs to change so that when the ImageList

   *                         changes, update the serial number list.

   * @history 2016-05-07 Tyler Wilson - Changed the CopyImageDataFunctor so that when

   *                         it calls Image::copyToNewProjectRoot it passes in a third

   *                         parameter:  A boolean flag variable indicating whether or

   *                         not cubes are being copied to the results folder in addition

   *                         to ecubs (the cube labels).  This variable is set in the Project

   *                         class.  References #4848.

   *

   */

  class ImageList : public QObject, public QList<Image *> {

    Q_OBJECT