Unverified Commit a0da50eb authored by dcookastro's avatar dcookastro Committed by GitHub
Browse files

Merge pull request #328 from jessemapel/devRadii 

Removed radii from control networks
parents 7b0b3f8b 29aa0463

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

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

  QString netid;

  QString target;

  QString target;

  QString description;

  QString description;

  QVector<Distance> radii;





  BigInt allPoints(0);

  BigInt allPoints(0);

  BigInt validPoints(0);

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

    if ( description.isEmpty() ) {

      description = cnet->Description();

      description = cnet->Description();

    }

    }

    if ( radii.isEmpty() )  { 

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

    }





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

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

    QList<QString> serials = cnet->GetCubeSerials();

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




    cnet->SetDescription(description);

    cnet->SetDescription(description);

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

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

    cnet->SetTarget(target, radii);

    cnet->SetTarget(target);

#if defined(HAS_WRITE_ONLY_OPTION)

#if defined(HAS_WRITE_ONLY_OPTION)

    cnet->setWriteOnly();

    cnet->setWriteOnly();

#endif

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




  pbl.EndProcess();

  pbl.EndProcess();

}
 
}

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

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

    <change name="Tyler Wilson" date="2017-06-29">

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

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

    </change>

    </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>

  </history>





  <category>

  <category>

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

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

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

      oNet.SetDescription(cNet.Description());

      oNet.SetDescription(cNet.Description());

      oNet.SetNetworkId(cNet.GetNetworkId());

      oNet.SetNetworkId(cNet.GetNetworkId());

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

      oNet.SetTarget(cNet.GetTarget());

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

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





      startIndex = endIndex;

      startIndex = endIndex;

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

+49 −45
Original line number Original line 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

      Modified to set the new control net's target and radii by using the input control net's

      values. References #3892

      values. References #3892

    </change>

    </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>

  </history>





<groups>

<groups>

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

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




  // first try to set target from user entered TargetName

  // first try to set target from user entered TargetName

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

  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.SetUserName(Application::UserName());

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

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

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

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