Unverified Commit b5f8e237 authored by Christopher Ryan Combs Jr's avatar Christopher Ryan Combs Jr Committed by GitHub
Browse files

Merge pull request #15 from SgStapleton/m01949 

Modified interpolation in SpatialPlotTool
parents 4638e51c 8737f7a6

isis/src/qisis/objs/SpatialPlotTool/SpatialPlotTool.cpp

+1 −6
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ namespace Isis { 
    m_interpolationCombo->addItem("Cubic Convolution",

        Interpolator::CubicConvolutionType);

    m_interpolationCombo->setCurrentIndex(

        m_interpolationCombo->findText("BiLinear"));

        m_interpolationCombo->findText("Nearest Neighbor"));

    connect(m_interpolationCombo, SIGNAL(currentIndexChanged(int)),

            this, SLOT(refreshPlot()));
@@ -467,11 +467,6 @@ namespace Isis { 
        int acrossLength = qRound(sqrt(acrossVectorX * acrossVectorX +

                                       acrossVectorY * acrossVectorY));

        

        // Prevent length of zero for later calculations

        if (acrossLength == 0) {

          acrossLength = 1;

        }

        

        double sampleStepAcross = (1.0 / (double)acrossLength) * acrossVectorX;

        double lineStepAcross = (1.0 / (double)acrossLength) * acrossVectorY;

isis/src/qisis/objs/SpatialPlotTool/SpatialPlotTool.h

+2 −0
Original line number Diff line number Diff line
@@ -56,6 +56,8 @@ namespace Isis { 
   *                           References #2089.

   *   @history 2018-01-12 Summer Stapleton - Prevented lengths of zero for the rotated rectangle 

   *                           selection to address segfault. Fixes #4953.

   *   @history 2018-01-18 Summer Stapleton - Modified the default interpolation mode to

   *                           "Nearest Neighbor". Fixes #1949, 5257.

   */

  class SpatialPlotTool : public AbstractPlotTool {

      Q_OBJECT