Commit 7bb490b9 authored by dcookastrog's avatar dcookastrog
Browse files

PR #328

parent 438f2842

isis/src/control/apps/cnetcombinept/cnetcombinept.cpp

+21 −26
Original line number Diff line number Diff line
@@ -112,7 +112,6 @@ void IsisMain() { 
  QString netid;

  QString target;

  QString description;

  QVector<Distance> radii;



  BigInt allPoints(0);

  BigInt validPoints(0);
@@ -136,9 +135,6 @@ void IsisMain() { 
    if ( description.isEmpty() ) {

      description = cnet->Description();

    }

    if ( radii.isEmpty() )  { 

      radii = QVector<Distance>::fromStdVector(cnet->GetTargetRadii()); 

    }



    // Now get list of all cube serials and add all to list

    QList<QString> serials = cnet->GetCubeSerials();
@@ -304,7 +300,7 @@ void IsisMain() { 


    cnet->SetDescription(description);

    cnet->SetCreatedDate(Application::DateTime());

    cnet->SetTarget(target, radii);

    cnet->SetTarget(target);

#if defined(HAS_WRITE_ONLY_OPTION)

    cnet->setWriteOnly();

#endif
@@ -420,4 +416,3 @@ void IsisMain() { 


  pbl.EndProcess();

}

isis/src/control/apps/cnetcombinept/cnetcombinept.xml

+50 −46
Original line number Diff line number Diff line
@@ -76,6 +76,10 @@ 
    <change name="Tyler Wilson" date="2017-06-29">

      cnetcombinept now properly sets apriori lat/lon values to adjusted values.  Fixes #4772.

    </change>

    <change name="Jesse Mapel" date="2018-07-06">

      Removed calls to set control net target radii because they are no longer needed by

      the control network. Fixes #5457.

    </change>

  </history>



  <category>

isis/src/control/apps/cnetsplit/cnetsplit.cpp

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ void IsisMain() { 
      oNet.SetCreatedDate(Application::DateTime());

      oNet.SetDescription(cNet.Description());

      oNet.SetNetworkId(cNet.GetNetworkId());

      oNet.SetTarget(cNet.GetTarget(), QVector<Distance>::fromStdVector(cNet.GetTargetRadii()));

      oNet.SetTarget(cNet.GetTarget());

      oNet.SetUserName(Application::UserName());



      startIndex = endIndex;

isis/src/control/apps/cnetsplit/cnetsplit.xml

+49 −45
Original line number Diff line number Diff line
@@ -69,6 +69,10 @@ 
      Modified to set the new control net's target and radii by using the input control net's

      values. References #3892

    </change>

    <change name="Jesse Mapel" date="2018-07-06">

      Removed calls to set control net target radii because they are no longer needed by

      the control network. Fixes #5457.

    </change>

  </history>



<groups>

isis/src/control/apps/mat2cnet/mat2cnet.cpp

+0 −5
Original line number Diff line number Diff line
@@ -90,11 +90,6 @@ void IsisMain() { 


  // first try to set target from user entered TargetName

  cnet.SetTarget(ui.GetString("TARGET"));

  // if that fails, look in a cube label for the info

  if ( !cnet.GetTargetRadii()[0].isValid() ) {

    Pvl isis3Lab(snl.fileName(0));

    cnet.SetTarget(isis3Lab);

  }

  cnet.SetUserName(Application::UserName());

  cnet.SetCreatedDate(Application::DateTime());

  cnet.SetDescription(ui.GetString("DESCRIPTION"));