Commit 3e763c06 authored by Makayla Shepherd's avatar Makayla Shepherd
Browse files

Fixed merge issues with re-migration

parent d72e9cac

isis/src/base/objs/LinearAlgebra/LinearAlgebra.h

+38 −39
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ namespace Isis { 
       * we are using without changing all references to this type in the ISIS

       * API.

       */

      typedef boost::numeric::ublas::symmetric_matrix<double, upper> SymmetricMatrix;

      typedef boost::numeric::ublas::symmetric_matrix<double, boost::numeric::ublas::upper> SymmetricMatrix;

      /**

       * Definition for an Isis::LinearAlgebra::Vector of doubles. This is a

       * typedef for a boost vector.
@@ -243,4 +243,3 @@ namespace Isis { 
};



#endif

isis/src/cassini/apps/ciss2isis/ciss2isis.cpp

+9 −13
Original line number Diff line number Diff line
@@ -229,17 +229,12 @@ void CreateStretchPairs() { 
  return;

}



/**

* The input buffer has a raw 16 bit buffer but the values are still 0 to 255.

* We know that 255 (stretched to 4095 if Table converted) is saturated.

* Sky pixels could have valid DN of 0, but missing pixels are also saved as 0,

* so it is impossible to distinguish between them.

* This method is used by ConvertLinePrefixPixels() and IsisMain() for ProcessByLine p2.

* author Jeannie Walldren 2008-08-21

*

* @history 2017-11-22 Summer Stapleton - Changed returned max value from HRS to HIS.

*                        Fixes #5106.

*/

// The input buffer has a raw 16 bit buffer but the values are still 0 to 255.

// We know that 255 (stretched to 4095 if Table converted) is saturated.

// Sky pixels could have valid DN of 0, but missing pixels are also saved as 0,

// so it is impossible to distinguish between them.

// This method is used by ConvertLinePrefixPixels() and IsisMain() for ProcessByLine p2.

// author Jeannie Walldren 2008-08-21

void FixDns(Buffer &buf) {

  for(int i = 0; i < buf.size(); i++) {

    // zeros and negatives are valid DN values, according to scientists,
@@ -251,9 +246,9 @@ void FixDns(Buffer &buf) { 
    else if(dataConversionType == "Table") {

      buf[i] = stretch.Map((int)buf[i]);

    }

    // save max values (4095 for table-converted images and 255 for others) as HIS

    // save max values (4095 for table-converted images and 255 for others) as HRS

    if(buf[i] == validMax) {

      buf[i] = His;

      buf[i] = Hrs;

    }

  }

}
@@ -457,3 +452,4 @@ double ComputeOverclockAvg(vector <double> pixel) { 
//        IDL cisscal application files: cassimg_subtractdark.pro and linetime.pro

// -Jeannie Walldren 08/06/2008

////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

isis/src/cassini/apps/ciss2isis/ciss2isis.xml

+24 −27
Original line number Diff line number Diff line
@@ -64,9 +64,6 @@ 
    <change name="Tracie Sucharski" date="2012-05-04">

      Added error message when input image does not contain Pds labels.

    </change>

    <change name="Summer Stapleton" date="2017-11-22">

      Changed returned max value from HRS to HIS in FixDns method.

    </change>

  </history>

  <liens>

    <item>

isis/src/control/objs/ControlNet/ControlNet.h

+9 −10
Original line number Diff line number Diff line
@@ -27,11 +27,9 @@ 
#include <QMetaType>

#include <QObject> // parent class

#include <QSharedPointer>



#include <map>

#include <vector>



#include <QString>

#include <QMap>

#include <QVector>



template< typename A, typename B > class QHash;

template< typename T > class QList;
@@ -40,7 +38,6 @@ template< typename T > class QSet; 
class QMutex;

class QString;





namespace Isis {

  class Camera;

  class ControlMeasure;
@@ -205,6 +202,8 @@ namespace Isis { 
   *   @history 2017-08-09 Summer Stapleton - Added throw to caught exception for bad control net

   *                           import in constructor. Also removed p_invalid as it was no longer

   *                           being used anywhere. Fixes #5068.

   *   @history 2017-12-12 Kristin Berry - Updated to use QMap and QVector rather than std::map

   *                            and std::vector. Fixes #5259.

   *   @history 2017-12-18 Adam Goins - Added GetLastModified() accessor. References #5258.

   *   @history 2017-12-21 Jesse Mapel - Modified read and write methods to use the refactored

   *                           ControlNetVersioner instead of directly parsing the protobuf
@@ -439,12 +438,12 @@ namespace Isis { 
      QString p_modified;              //!< Date Last Modified

      QString p_description;           //!< Textual Description of network

      QString p_userName;              //!< The user who created the network

      std::map<QString, Isis::Camera *> p_cameraMap; //!< A map from serialnumber to camera

      std::map<QString, int> p_cameraValidMeasuresMap; //!< A map from serialnumber to #measures

      std::map<QString, int> p_cameraRejectedMeasuresMap; //!< A map from serialnumber to

      QMap<QString, Isis::Camera *> p_cameraMap; //!< A map from serialnumber to camera

      QMap<QString, int> p_cameraValidMeasuresMap; //!< A map from serialnumber to #measures

      QMap<QString, int> p_cameraRejectedMeasuresMap; //!< A map from serialnumber to

      //!  #rejected measures

      std::vector<Isis::Camera *> p_cameraList; //!< Vector of image number to camera

      std::vector<Distance> p_targetRadii;        //!< Radii of target body

      QVector<Isis::Camera *> p_cameraList; //!< Vector of image number to camera

      QVector<Distance> p_targetRadii;        //!< Radii of target body



      bool m_ownPoints; //!< Specifies ownership of point list. True if owned by this object.

  };

isis/src/control/objs/ControlNetDiff/cnet.pvl

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ Object = ControlNetwork 
  Created      = 2010-07-10T12:50:15

  LastModified = 2010-07-10T12:50:55

  Description  = "UnitTest of ControlNetwork"

  Version = 3



  Object = ControlPoint

    PointType   = Tie