Unverified Commit a3822f5c authored by Austin Sanders's avatar Austin Sanders Committed by GitHub
Browse files

Jigsaw csm error message (#5562) 

* Added fail-early + error message for csminit'd images without csm solve parameters

* Updated changelog
parent 38dc45e6

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ release. 
## [Unreleased]



### Changed

- Added jigsaw error message for csminit'd images without csm parameters[#5486](https://github.com/DOI-USGS/ISIS3/issues/5486)

- Changed `qwt` dependency version to 6.2.0 or below [#5498](https://github.com/DOI-USGS/ISIS3/issues/5498)

- Pinned `suitesparse` dependency version to maximum not including 7.7.0 [#5496](https://github.com/DOI-USGS/ISIS3/issues/5496)

isis/src/control/objs/BundleAdjust/BundleAdjust.cpp

+7 −0
Original line number Diff line number Diff line
@@ -474,6 +474,13 @@ namespace Isis { 
        QString serialNumber = m_serialNumberList->serialNumber(i);

        QString fileName = m_serialNumberList->fileName(i);



        // If any camera is initialized via CSMInit, but no csm solve options are specified, fail early.

        if (camera->GetCameraType() == Camera::Csm && m_bundleSettings->observationSolveSettings(observationNumber).csmSolveOption() == 0){

          QString msg = fileName + " camera was initialized using CSMInit, so jigsaw must use CSM parameters." +

                                   " Please refer to documentation for more information." + "\n";

          throw IException(IException::User, msg, _FILEINFO_);

        }



        // create a new BundleImage and add to new (or existing if observation mode is on)

        // BundleObservation

        BundleImageQsp image = BundleImageQsp(new BundleImage(camera, serialNumber, fileName));