Commit bbed8149 authored by Tracie Sucharski's avatar Tracie Sucharski
Browse files

m3loc2net - Always create control point for last sample and last line in cube. 

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

isis/src/local/apps/m3loc2net/m3loc2net.cpp

+12 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ void IsisMain() { 
    locBrick.SetBasePosition(1, line + 1, 1);

    locCube.read(locBrick);

    for (int samp = 0; samp < inputCube.sampleCount(); samp += sampInc) {



      qDebug()<<"samp : line = "<<samp<<" : "<<line;

      ControlPoint *point = new ControlPoint(pointId.Next());

      point->SetId(pointId.Next());

      point->SetType(ControlPoint::Fixed);
@@ -109,8 +109,19 @@ void IsisMain() { 


      cnet.AddPoint(point);



      //  Make sure last sample is always included

      if ((samp != (inputCube.sampleCount() - 1)) && ((samp + sampInc) >= inputCube.sampleCount())) {

        samp = inputCube.sampleCount() - sampInc - 1;

        qDebug()<<"lastSamp = "<<samp;

      }

 

//      gridStatus.CheckStatus();

    }

    //  Make sure last line is always included

    if ((line != (inputCube.lineCount() - 1)) && ((line + lineInc) >= inputCube.lineCount())) {

      line = inputCube.lineCount() - lineInc - 1;

      qDebug()<<"lastLine = "<<line;

    }

  }



  cnet.Write(ui.GetFileName("ONET"));

isis/src/local/apps/m3loc2net/m3loc2net.xml

+3 −0
Original line number Diff line number Diff line
@@ -23,6 +23,9 @@ 
  <change name="Tracie Sucharski" date="2013-07-19">

    Original version

  </change>

  <change name="Tracie Sucharski" date="2014-04-17">

    Make sure control points are always included for last line and last sample in cube.

  </change>

</history>



<groups>