Commit 417b714d authored by dcookastrog's avatar dcookastrog
Browse files

Merged Astrog:dev into branch and fixed conflicts

parent 93458d54

isis/src/qisis/objs/JigsawSetupDialog/JigsawSetupDialog.cpp

+2 −2
Original line number Diff line number Diff line
@@ -850,11 +850,11 @@ namespace Isis { 
      }





      boss.setInstrumentPositionSettings(positionSolvingOption,spkDegree,spkSolveDegree,positionOverHermite,

      boss.setInstrumentPositionSettings(positionSolvingOption,spkDegree,spkSolveDegree,1,positionOverHermite,

                                         positionAprioriSigma,velocityAprioriSigma,accelerationAprioriSigma,

                                         &additionalPositionCoefficients);



      boss.setInstrumentPointingSettings(pointSolvingOption,solveTwist,ckDegree,ckSolveDegree,solvePolynomialOverExisting,

      boss.setInstrumentPointingSettings(pointSolvingOption,solveTwist,ckDegree,ckSolveDegree,1,solvePolynomialOverExisting,

                                         anglesAprioriSigma,angularVelocityAprioriSigma,angularAccelerationAprioriSigma,

                                         &additionalAngularCoefficients);

isis/src/qisis/objs/JigsawSetupDialog/JigsawSetupDialog.h

+4 −0
Original line number Diff line number Diff line
@@ -93,6 +93,10 @@ namespace Isis { 
   *                           generalize how the sigma tables are updated. Solve options have

   *                           their respective solve degree and degree combo boxes set to 2 unless

   *                           the solve option is ALL. References #497.

   *   @history 2018-098-28 Debbie A. Cook and Ken Edmundson - added a constant argument of "1"

   *                            to setInstrumentPositionSettings and setInstrumentPointingSettings to indicate

   *                            a single segment in both cases.  This is a new option that is not yet 

   *                            listed in the gui.

   */

  class JigsawSetupDialog : public QDialog {

    Q_OBJECT