From 83c00c29e7732518f78a826efac76cc266d1d002 Mon Sep 17 00:00:00 2001 From: Amy Stamile <74275278+amystamile-usgs@users.noreply.github.com> Date: Thu, 18 Feb 2021 21:26:37 -0700 Subject: [PATCH] Disclaimer updates in Mission apps and objects (#4295) * Updated disclaimers to .cpp and .h files * Updated disclaimers * Updated disclaimers to mission .cpp and .h files * Updated disclaimers. * Fixed accidental deletion. Co-authored-by: Stuart Sides --- isis/src/apollo/apps/apollo2isis/main.cpp | 68 ++-- isis/src/apollo/apps/apollocal/apollocal.cpp | 32 +- isis/src/apollo/apps/apollocal/apollocal.h | 12 +- isis/src/apollo/apps/apollocal/main.cpp | 10 +- .../apollo/apps/apollofindrx/apollofindrx.cpp | 10 +- .../apollo/apps/apollofindrx/apollofindrx.h | 10 +- isis/src/apollo/apps/apollofindrx/main.cpp | 10 +- isis/src/apollo/apps/apollopaninit/main.cpp | 25 +- .../apollo/apps/apollopanstitcher/Trans2d3p.h | 32 +- .../apollopanstitcher/apollopanstitcher.cpp | 8 + .../apollopanstitcher/apollopanstitcher.h | 8 + .../apollo/apps/apollopanstitcher/main.cpp | 8 + isis/src/apollo/apps/apolloremrx/main.cpp | 8 + .../apollo/apps/apollowarp/WarpTransform.cpp | 32 +- .../apollo/apps/apollowarp/WarpTransform.h | 18 +- isis/src/apollo/apps/apollowarp/main.cpp | 8 + isis/src/apollo/objs/Apollo/Apollo.h | 173 ++++----- .../ApolloMetricCamera/ApolloMetricCamera.cpp | 31 +- .../ApolloMetricCamera/ApolloMetricCamera.h | 54 ++- .../ApolloMetricDistortionMap.cpp | 33 +- .../ApolloMetricDistortionMap.h | 55 ++- .../objs/ApolloMetricCamera/unitTest.cpp | 26 +- .../ApolloPanoramicCamera/ApolloPanIO.cpp | 198 +++++----- .../objs/ApolloPanoramicCamera/ApolloPanIO.h | 65 ++-- .../ApolloPanoramicCamera.cpp | 60 +-- .../ApolloPanoramicCamera.h | 77 ++-- .../ApolloPanoramicDetectorMap.cpp | 34 +- .../ApolloPanoramicDetectorMap.h | 57 +-- .../objs/ApolloPanoramicCamera/unitTest.cpp | 42 +- .../CentroidApolloPan/CentroidApolloPan.cpp | 119 +++--- .../CentroidApolloPan/CentroidApolloPan.h | 46 +-- .../objs/CentroidApolloPan/unitTest.cpp | 8 + isis/src/cassini/apps/ciss2isis/main.cpp | 8 + isis/src/cassini/apps/cisscal/DarkCurrent.cpp | 28 +- isis/src/cassini/apps/cisscal/DarkCurrent.h | 29 +- isis/src/cassini/apps/cisscal/main.cpp | 8 + isis/src/cassini/apps/vims2isis/main.cpp | 8 + isis/src/cassini/apps/vimscal/main.cpp | 8 + isis/src/cassini/apps/vimscal/vimscalUtil.h | 8 + .../cassini/objs/CissLabels/CissLabels.cpp | 8 + isis/src/cassini/objs/CissLabels/CissLabels.h | 31 +- isis/src/cassini/objs/CissLabels/unitTest.cpp | 8 + .../cassini/objs/CisscalFile/CisscalFile.cpp | 28 +- .../cassini/objs/CisscalFile/CisscalFile.h | 39 +- .../src/cassini/objs/CisscalFile/unitTest.cpp | 38 +- .../cassini/objs/IssNACamera/IssNACamera.cpp | 36 +- .../cassini/objs/IssNACamera/IssNACamera.h | 67 ++-- .../src/cassini/objs/IssNACamera/unitTest.cpp | 34 +- .../cassini/objs/IssWACamera/IssWACamera.cpp | 32 +- .../cassini/objs/IssWACamera/IssWACamera.h | 67 ++-- .../src/cassini/objs/IssWACamera/unitTest.cpp | 34 +- .../cassini/objs/VimsCamera/VimsCamera.cpp | 28 +- isis/src/cassini/objs/VimsCamera/VimsCamera.h | 28 +- .../cassini/objs/VimsCamera/VimsGroundMap.cpp | 28 +- .../cassini/objs/VimsCamera/VimsGroundMap.h | 32 +- .../cassini/objs/VimsCamera/VimsSkyMap.cpp | 27 +- isis/src/cassini/objs/VimsCamera/VimsSkyMap.h | 32 +- isis/src/cassini/objs/VimsCamera/unitTest.cpp | 38 +- .../apps/chan1m32isis/chan1m32isis.cpp | 8 + .../apps/chan1m32isis/chan1m32isis.h | 8 + .../chandrayaan1/apps/chan1m32isis/main.cpp | 8 + .../Chandrayaan1M3Camera.cpp | 38 +- .../Chandrayaan1M3Camera.h | 44 +-- .../Chandrayaan1M3DistortionMap.cpp | 33 +- .../Chandrayaan1M3DistortionMap.h | 31 +- .../objs/Chandrayaan1M3Camera/unitTest.cpp | 34 +- .../src/clementine/apps/clem2isis/bitstrm.cpp | 8 + isis/src/clementine/apps/clem2isis/decomp.cpp | 8 + .../src/clementine/apps/clem2isis/huffman.cpp | 8 + isis/src/clementine/apps/clem2isis/jpeg_c.h | 8 + isis/src/clementine/apps/clem2isis/main.cpp | 10 +- isis/src/clementine/apps/clem2isis/pds.cpp | 9 +- isis/src/clementine/apps/clem2isis/pds.h | 8 + .../src/clementine/apps/clemhirescal/main.cpp | 8 + isis/src/clementine/apps/clemnircal/main.cpp | 8 + .../src/clementine/apps/clemnirclean/main.cpp | 48 ++- .../src/clementine/apps/clemnirnoise/main.cpp | 8 + .../src/clementine/apps/clemuvviscal/main.cpp | 8 + .../objs/HiresCamera/HiresCamera.cpp | 34 +- .../clementine/objs/HiresCamera/HiresCamera.h | 55 ++- .../clementine/objs/HiresCamera/unitTest.cpp | 32 +- .../clementine/objs/LwirCamera/LwirCamera.cpp | 26 +- .../clementine/objs/LwirCamera/LwirCamera.h | 51 +-- .../clementine/objs/LwirCamera/unitTest.cpp | 32 +- .../clementine/objs/NirCamera/NirCamera.cpp | 29 +- .../src/clementine/objs/NirCamera/NirCamera.h | 57 ++- .../clementine/objs/NirCamera/unitTest.cpp | 32 +- .../ClementineUvvisDistortionMap.cpp | 59 ++- .../ClementineUvvisDistortionMap.h | 28 +- .../objs/UvvisCamera/UvvisCamera.cpp | 44 +-- .../clementine/objs/UvvisCamera/UvvisCamera.h | 57 ++- .../clementine/objs/UvvisCamera/unitTest.cpp | 31 +- isis/src/clipper/apps/eis2isis/main.cpp | 8 + isis/src/clipper/apps/jitterfit/main.cpp | 74 ++-- .../ClipperNacRollingShutterCamera.cpp | 53 +-- .../ClipperNacRollingShutterCamera.h | 32 +- .../unitTest.cpp | 31 +- .../ClipperWacFcCamera/ClipperWacFcCamera.cpp | 40 +- .../ClipperWacFcCamera/ClipperWacFcCamera.h | 49 +-- .../objs/ClipperWacFcCamera/unitTest.cpp | 27 +- isis/src/control/apps/autoseed/autoseed.cpp | 8 + isis/src/control/apps/autoseed/autoseed.h | 8 + isis/src/control/apps/autoseed/main.cpp | 8 + .../apps/cnet2dem/ControlPointCloudPt.h | 99 +++-- .../control/apps/cnet2dem/DatumFunctoid.cpp | 57 +-- .../src/control/apps/cnet2dem/DatumFunctoid.h | 29 +- .../control/apps/cnet2dem/MapPointCollector.h | 89 ++--- isis/src/control/apps/cnet2dem/PointCloud.h | 179 ++++----- .../apps/cnet2dem/PointCloudSearchResult.h | 125 +++--- .../control/apps/cnet2dem/PointCloudTree.h | 161 ++++---- isis/src/control/apps/cnet2dem/main.cpp | 67 ++-- isis/src/control/apps/cnet2mat/main.cpp | 8 + isis/src/control/apps/cnetadd/main.cpp | 9 +- .../control/apps/cnetbin2pvl/cnetbin2pvl.cpp | 8 + .../control/apps/cnetbin2pvl/cnetbin2pvl.h | 8 + isis/src/control/apps/cnetbin2pvl/main.cpp | 8 + isis/src/control/apps/cnetcheck/cnetcheck.cpp | 35 +- isis/src/control/apps/cnetcheck/cnetcheck.h | 8 + isis/src/control/apps/cnetcheck/main.cpp | 10 +- .../apps/cnetcombinept/ControlPointMerger.cpp | 28 +- .../apps/cnetcombinept/ControlPointMerger.h | 29 +- .../control/apps/cnetcombinept/MeasurePoint.h | 103 +++-- .../control/apps/cnetcombinept/PointCloud.h | 175 ++++----- .../apps/cnetcombinept/PointCloudTree.h | 145 ++++--- .../apps/cnetcombinept/cnetcombinept.cpp | 8 + .../apps/cnetcombinept/cnetcombinept.h | 8 + isis/src/control/apps/cnetcombinept/main.cpp | 8 + isis/src/control/apps/cnetdiff/main.cpp | 9 +- isis/src/control/apps/cnetedit/main.cpp | 8 + .../control/apps/cnetextract/cnetextract.cpp | 8 + .../control/apps/cnetextract/cnetextract.h | 8 + isis/src/control/apps/cnetextract/main.cpp | 8 + isis/src/control/apps/cnethist/main.cpp | 8 + isis/src/control/apps/cnetmerge/main.cpp | 13 +- isis/src/control/apps/cnetnewradii/main.cpp | 8 + .../control/apps/cnetpvl2bin/cnetpvl2bin.cpp | 8 + .../control/apps/cnetpvl2bin/cnetpvl2bin.h | 8 + isis/src/control/apps/cnetpvl2bin/main.cpp | 8 + .../apps/cnetref/CnetRefByEmission.cpp | 20 +- .../control/apps/cnetref/CnetRefByEmission.h | 39 +- .../apps/cnetref/CnetRefByIncidence.cpp | 16 +- .../control/apps/cnetref/CnetRefByIncidence.h | 33 +- .../apps/cnetref/CnetRefByResolution.cpp | 33 +- .../apps/cnetref/CnetRefByResolution.h | 32 +- isis/src/control/apps/cnetref/main.cpp | 9 +- isis/src/control/apps/cnetsplit/main.cpp | 8 + isis/src/control/apps/cnetstats/cnetstats.cpp | 11 +- isis/src/control/apps/cnetstats/cnetstats.h | 8 + isis/src/control/apps/cnetstats/main.cpp | 12 +- isis/src/control/apps/cnettable/main.cpp | 26 +- .../control/apps/cnetthinner/CnetManager.cpp | 141 ++++--- .../control/apps/cnetthinner/CnetManager.h | 84 ++-- .../apps/cnetthinner/CnetSuppression.cpp | 360 +++++++++--------- .../apps/cnetthinner/CnetSuppression.h | 118 +++--- isis/src/control/apps/cnetthinner/main.cpp | 17 +- .../control/apps/cnetwinnow/cnetwinnow.cpp | 8 + isis/src/control/apps/cnetwinnow/cnetwinnow.h | 8 + isis/src/control/apps/cnetwinnow/main.cpp | 8 + isis/src/control/apps/coreg/main.cpp | 8 + isis/src/control/apps/deltack/main.cpp | 92 +++-- .../apps/findfeatures/AKAZEAlgorithm.cpp | 93 ++--- .../apps/findfeatures/AKAZEAlgorithm.h | 47 +-- .../apps/findfeatures/AgastAlgorithm.cpp | 81 ++-- .../apps/findfeatures/AgastAlgorithm.h | 46 +-- .../apps/findfeatures/BRISKAlgorithm.cpp | 91 ++--- .../apps/findfeatures/BRISKAlgorithm.h | 48 +-- .../findfeatures/BlobDetectionAlgorithm.cpp | 87 ++--- .../findfeatures/BlobDetectionAlgorithm.h | 48 +-- .../findfeatures/BriefDescriptorAlgorithm.cpp | 87 ++--- .../findfeatures/BriefDescriptorAlgorithm.h | 46 +-- .../apps/findfeatures/BruteForceMatcher.cpp | 83 ++-- .../apps/findfeatures/BruteForceMatcher.h | 46 +-- .../apps/findfeatures/CropTransform.cpp | 68 ++-- .../control/apps/findfeatures/CropTransform.h | 48 +-- .../apps/findfeatures/DaisyAlgorithm.cpp | 138 +++---- .../apps/findfeatures/DaisyAlgorithm.h | 52 +-- .../apps/findfeatures/DaisyExtractor.cpp | 96 ++--- .../apps/findfeatures/DaisyExtractor.h | 37 +- .../apps/findfeatures/FASTAlgorithm.cpp | 82 ++-- .../control/apps/findfeatures/FASTAlgorithm.h | 46 +-- .../apps/findfeatures/FREAKAlgorithm.cpp | 87 ++--- .../apps/findfeatures/FREAKAlgorithm.h | 46 +-- .../control/apps/findfeatures/FastGeom.cpp | 88 ++--- isis/src/control/apps/findfeatures/FastGeom.h | 78 ++-- .../apps/findfeatures/FeatureAlgorithm.h | 316 ++++++++------- .../findfeatures/FeatureAlgorithmFactory.cpp | 31 +- .../findfeatures/FeatureAlgorithmFactory.h | 30 +- .../apps/findfeatures/FeatureInventory.cpp | 60 ++- .../apps/findfeatures/FeatureInventory.h | 82 ++-- .../apps/findfeatures/FeatureMatcherTypes.h | 30 +- .../apps/findfeatures/FlannBasedMatcher.cpp | 77 ++-- .../apps/findfeatures/FlannBasedMatcher.h | 46 +-- .../apps/findfeatures/GFTTAlgorithm.cpp | 89 ++--- .../control/apps/findfeatures/GFTTAlgorithm.h | 46 +-- .../apps/findfeatures/GenericTransform.cpp | 28 +- .../apps/findfeatures/GenericTransform.h | 52 +-- .../control/apps/findfeatures/ImageSource.cpp | 73 ++-- .../control/apps/findfeatures/ImageSource.h | 93 ++--- .../apps/findfeatures/ImageTransform.cpp | 71 ++-- .../apps/findfeatures/ImageTransform.h | 45 +-- .../apps/findfeatures/KAZEAlgorithm.cpp | 88 ++--- .../control/apps/findfeatures/KAZEAlgorithm.h | 44 +-- .../apps/findfeatures/LATCHAlgorithm.cpp | 88 ++--- .../apps/findfeatures/LATCHAlgorithm.h | 45 +-- .../apps/findfeatures/LUCIDAlgorithm.cpp | 88 ++--- .../apps/findfeatures/LUCIDAlgorithm.h | 44 +-- .../apps/findfeatures/MSDAlgorithm.cpp | 88 ++--- .../control/apps/findfeatures/MSDAlgorithm.h | 49 +-- .../apps/findfeatures/MSERAlgorithm.cpp | 74 ++-- .../control/apps/findfeatures/MSERAlgorithm.h | 46 +-- .../apps/findfeatures/MSERExtractor.cpp | 116 +++--- .../control/apps/findfeatures/MSERExtractor.h | 20 +- .../control/apps/findfeatures/MatchImage.h | 80 ++-- .../control/apps/findfeatures/MatchMaker.cpp | 29 +- .../control/apps/findfeatures/MatchMaker.h | 59 ++- .../src/control/apps/findfeatures/MatchPair.h | 89 ++--- .../apps/findfeatures/MatcherAlgorithms.cpp | 75 ++-- .../apps/findfeatures/MatcherAlgorithms.h | 46 +-- .../apps/findfeatures/MatcherSolution.h | 64 ++-- .../apps/findfeatures/ORBAlgorithm.cpp | 104 +++-- .../control/apps/findfeatures/ORBAlgorithm.h | 44 +-- .../control/apps/findfeatures/QDebugLogger.h | 112 +++--- .../apps/findfeatures/RobustMatcher.cpp | 49 +-- .../control/apps/findfeatures/RobustMatcher.h | 82 ++-- .../apps/findfeatures/SIFTAlgorithm.cpp | 106 +++--- .../control/apps/findfeatures/SIFTAlgorithm.h | 45 +-- .../apps/findfeatures/SURFAlgorithm.cpp | 115 +++--- .../control/apps/findfeatures/SURFAlgorithm.h | 50 +-- .../apps/findfeatures/ScalingTransform.cpp | 43 +-- .../apps/findfeatures/ScalingTransform.h | 49 +-- .../apps/findfeatures/ScharrTransform.h | 56 ++- .../apps/findfeatures/SobelTransform.h | 56 ++- .../apps/findfeatures/StarAlgorithm.cpp | 85 ++--- .../control/apps/findfeatures/StarAlgorithm.h | 48 +-- .../control/apps/findfeatures/Transformer.cpp | 80 ++-- .../control/apps/findfeatures/Transformer.h | 66 ++-- .../apps/findfeatures/findfeatures.cpp | 8 + .../control/apps/findfeatures/findfeatures.h | 8 + isis/src/control/apps/findfeatures/main.cpp | 8 + isis/src/control/apps/fplanemap/main.cpp | 19 +- isis/src/control/apps/jigsaw/jigsaw.cpp | 8 + isis/src/control/apps/jigsaw/jigsaw.h | 8 + isis/src/control/apps/jigsaw/main.cpp | 8 + isis/src/control/apps/mat2cnet/main.cpp | 8 + isis/src/control/apps/pointreg/main.cpp | 8 + isis/src/control/apps/pointreg/pointreg.cpp | 9 +- isis/src/control/apps/pointreg/pointreg.h | 8 + isis/src/control/apps/seedgrid/main.cpp | 8 + isis/src/control/apps/slither/ControlByRow.h | 30 +- .../control/apps/slither/SlitherTransform.cpp | 8 + .../control/apps/slither/SlitherTransform.h | 10 +- isis/src/control/apps/slither/main.cpp | 9 +- isis/src/control/apps/sumspice/SumFile.cpp | 352 ++++++++--------- isis/src/control/apps/sumspice/SumFile.h | 86 ++--- isis/src/control/apps/sumspice/SumFinder.cpp | 30 +- isis/src/control/apps/sumspice/SumFinder.h | 30 +- isis/src/control/apps/sumspice/main.cpp | 9 + isis/src/control/apps/warp/WarpTransform.cpp | 8 + isis/src/control/apps/warp/WarpTransform.h | 10 +- isis/src/control/apps/warp/main.cpp | 9 +- .../objs/BundleAdjust/BundleAdjust.cpp | 10 +- .../control/objs/BundleAdjust/BundleAdjust.h | 31 +- .../control/objs/BundleAdjust/unitTest.cpp | 10 +- .../objs/BundleResults/BundleResults.cpp | 8 + .../objs/BundleResults/BundleResults.h | 44 +-- .../control/objs/BundleResults/unitTest.cpp | 8 + .../objs/BundleSettings/BundleSettings.cpp | 30 +- .../objs/BundleSettings/BundleSettings.h | 51 +-- .../control/objs/BundleSettings/unitTest.cpp | 13 +- .../BundleSolutionInfo/BundleSolutionInfo.cpp | 8 + .../BundleSolutionInfo/BundleSolutionInfo.h | 27 +- .../objs/BundleSolutionInfo/unitTest.cpp | 8 + .../BundleUtilities/BundleControlPoint.cpp | 280 +++++++------- .../objs/BundleUtilities/BundleControlPoint.h | 69 ++-- .../objs/BundleUtilities/BundleImage.cpp | 28 +- .../objs/BundleUtilities/BundleImage.h | 33 +- .../objs/BundleUtilities/BundleMeasure.cpp | 30 +- .../objs/BundleUtilities/BundleMeasure.h | 34 +- .../BundleUtilities/BundleObservation.cpp | 8 + .../objs/BundleUtilities/BundleObservation.h | 30 +- .../BundleObservationSolveSettings.cpp | 8 + .../BundleObservationSolveSettings.h | 30 +- .../BundleObservationVector.cpp | 44 ++- .../BundleUtilities/BundleObservationVector.h | 30 +- .../objs/BundleUtilities/BundleTargetBody.cpp | 166 ++++---- .../objs/BundleUtilities/BundleTargetBody.h | 31 +- .../control/objs/BundleUtilities/unitTest.cpp | 56 +-- .../objs/ControlMeasure/ControlMeasure.cpp | 29 +- .../objs/ControlMeasure/ControlMeasure.h | 30 +- .../control/objs/ControlMeasure/unitTest.cpp | 8 + .../ControlMeasureLogData.cpp | 8 + .../ControlMeasureLogData.h | 30 +- .../objs/ControlMeasureLogData/unitTest.cpp | 8 + .../control/objs/ControlNet/ControlNet.cpp | 16 +- isis/src/control/objs/ControlNet/ControlNet.h | 38 +- isis/src/control/objs/ControlNet/unitTest.cpp | 8 + .../objs/ControlNetDiff/ControlNetDiff.cpp | 17 +- .../objs/ControlNetDiff/ControlNetDiff.h | 28 +- .../control/objs/ControlNetDiff/unitTest.cpp | 9 +- .../ControlNetFilter/ControlNetFilter.cpp | 8 + .../objs/ControlNetFilter/ControlNetFilter.h | 41 +- .../objs/ControlNetFilter/unitTest.cpp | 8 + .../ControlNetStatistics.cpp | 8 + .../ControlNetStatistics.h | 34 +- .../objs/ControlNetStatistics/unitTest.cpp | 8 + .../ControlNetValidMeasure.cpp | 9 +- .../ControlNetValidMeasure.h | 106 +++--- .../MeasureValidationResults.cpp | 9 +- .../MeasureValidationResults.h | 31 +- .../objs/ControlNetValidMeasure/unitTest.cpp | 8 + .../ControlNetVersioner.cpp | 8 + .../ControlNetVersioner/ControlNetVersioner.h | 40 +- .../ControlNetVersioner/ControlPointV0001.cpp | 10 +- .../ControlNetVersioner/ControlPointV0001.h | 32 +- .../ControlNetVersioner/ControlPointV0002.cpp | 8 + .../ControlNetVersioner/ControlPointV0002.h | 30 +- .../ControlNetVersioner/ControlPointV0003.cpp | 8 + .../ControlNetVersioner/ControlPointV0003.h | 30 +- .../objs/ControlNetVersioner/unitTest.cpp | 110 +++--- .../ControlNetVitals/ControlNetVitals.cpp | 8 + .../objs/ControlNetVitals/ControlNetVitals.h | 30 +- .../objs/ControlNetVitals/unitTest.cpp | 12 +- .../objs/ControlPoint/ControlPoint.cpp | 18 +- .../control/objs/ControlPoint/ControlPoint.h | 31 +- .../control/objs/ControlPoint/unitTest.cpp | 8 + .../ControlPointList/ControlPointList.cpp | 9 +- .../objs/ControlPointList/ControlPointList.h | 32 +- .../objs/ControlPointList/unitTest.cpp | 12 +- .../CorrelationMatrix/CorrelationMatrix.cpp | 36 +- .../CorrelationMatrix/CorrelationMatrix.h | 27 +- .../objs/CorrelationMatrix/unitTest.cpp | 22 +- .../InterestOperator/InterestOperator.cpp | 8 + .../objs/InterestOperator/InterestOperator.h | 36 +- .../objs/InterestOperator/unitTest.cpp | 8 + .../InterestOperatorFactory.cpp | 29 +- .../InterestOperatorFactory.h | 30 +- .../objs/InterestOperatorFactory/unitTest.cpp | 8 + .../MaximumLikelihoodWFunctions.cpp | 150 ++++---- .../MaximumLikelihoodWFunctions.h | 59 ++- .../MaximumLikelihoodWFunctions/unitTest.cpp | 160 ++++---- isis/src/database/objs/Database/Database.cpp | 29 +- isis/src/database/objs/Database/Database.h | 30 +- isis/src/database/objs/Database/unitTest.cpp | 8 + .../objs/DatabaseFactory/DatabaseFactory.cpp | 29 +- .../objs/DatabaseFactory/DatabaseFactory.h | 33 +- .../objs/DatabaseFactory/unitTest.cpp | 8 + isis/src/database/objs/DbAccess/DbAccess.cpp | 28 +- isis/src/database/objs/DbAccess/DbAccess.h | 32 +- isis/src/database/objs/DbAccess/unitTest.cpp | 8 + .../src/database/objs/DbProfile/DbProfile.cpp | 28 +- isis/src/database/objs/DbProfile/DbProfile.h | 32 +- isis/src/database/objs/DbProfile/unitTest.cpp | 8 + isis/src/database/objs/SqlQuery/SqlQuery.cpp | 29 +- isis/src/database/objs/SqlQuery/SqlQuery.h | 30 +- isis/src/database/objs/SqlQuery/unitTest.cpp | 8 + .../src/database/objs/SqlRecord/SqlRecord.cpp | 29 +- isis/src/database/objs/SqlRecord/SqlRecord.h | 30 +- isis/src/database/objs/SqlRecord/unitTest.cpp | 8 + isis/src/dawn/apps/dawnfc2isis/main.cpp | 8 + isis/src/dawn/apps/dawnvir2isis/main.cpp | 8 + .../dawn/objs/DawnFcCamera/DawnFcCamera.cpp | 26 +- .../src/dawn/objs/DawnFcCamera/DawnFcCamera.h | 49 +-- .../objs/DawnFcCamera/DawnFcDistortionMap.h | 8 + isis/src/dawn/objs/DawnFcCamera/unitTest.cpp | 34 +- .../dawn/objs/DawnVirCamera/DawnVirCamera.cpp | 86 +++-- .../dawn/objs/DawnVirCamera/DawnVirCamera.h | 88 +++-- isis/src/dawn/objs/DawnVirCamera/unitTest.cpp | 34 +- isis/src/dev/apps/camcoeffs/main.cpp | 8 + isis/src/dev/apps/camdev/camdev.cpp | 146 +++---- isis/src/dev/apps/camdev/camdev.h | 12 +- isis/src/dev/apps/camdev/main.cpp | 57 +-- isis/src/dev/apps/camtest/main.cpp | 32 +- isis/src/dev/apps/m3loc2net/main.cpp | 11 +- isis/src/galileo/apps/gllnims2isis/main.cpp | 27 +- isis/src/galileo/apps/gllssi2isis/main.cpp | 8 + isis/src/galileo/apps/gllssical/main.cpp | 8 + isis/src/galileo/objs/SsiCamera/SsiCamera.cpp | 49 +-- isis/src/galileo/objs/SsiCamera/SsiCamera.h | 52 +-- isis/src/galileo/objs/SsiCamera/unitTest.cpp | 34 +- .../apps/amica2isis/AmicaImportFits.cpp | 29 +- .../apps/amica2isis/AmicaImportFits.h | 29 +- isis/src/hayabusa/apps/amica2isis/main.cpp | 8 + .../hayabusa/apps/amicacal/AmicaCalUtils.h | 21 +- isis/src/hayabusa/apps/amicacal/main.cpp | 133 ++++--- isis/src/hayabusa/apps/hyb1pds4gen/main.cpp | 8 + .../apps/nirs2isis/NirsImportFits.cpp | 29 +- .../hayabusa/apps/nirs2isis/NirsImportFits.h | 29 +- isis/src/hayabusa/apps/nirs2isis/main.cpp | 8 + .../HayabusaAmicaCamera.cpp | 48 +-- .../HayabusaAmicaCamera/HayabusaAmicaCamera.h | 29 +- .../objs/HayabusaAmicaCamera/unitTest.cpp | 32 +- .../HayabusaNirsCamera/HayabusaNirsCamera.cpp | 34 +- .../HayabusaNirsCamera/HayabusaNirsCamera.h | 27 +- .../HayabusaNirsCamera/NirsDetectorMap.cpp | 42 +- .../objs/HayabusaNirsCamera/NirsDetectorMap.h | 31 +- .../objs/HayabusaNirsCamera/unitTest.cpp | 30 +- isis/src/hayabusa2/apps/hyb2onc2isis/main.cpp | 8 + isis/src/hayabusa2/apps/hyb2onccal/main.cpp | 8 + .../objs/Hyb2OncCamera/Hyb2OncCamera.cpp | 54 +-- .../objs/Hyb2OncCamera/Hyb2OncCamera.h | 28 +- .../Hyb2OncCamera/Hyb2OncDistortionMap.cpp | 52 +-- .../objs/Hyb2OncCamera/Hyb2OncDistortionMap.h | 30 +- .../hayabusa2/objs/Hyb2OncCamera/unitTest.cpp | 32 +- isis/src/juno/apps/junocam2isis/main.cpp | 8 + isis/src/juno/objs/JunoCamera/JunoCamera.cpp | 29 +- isis/src/juno/objs/JunoCamera/JunoCamera.h | 30 +- .../objs/JunoCamera/JunoDistortionMap.cpp | 70 ++-- .../juno/objs/JunoCamera/JunoDistortionMap.h | 36 +- isis/src/juno/objs/JunoCamera/unitTest.cpp | 36 +- .../apps/kaguyami2isis/kaguyami2isis.cpp | 8 + .../kaguya/apps/kaguyami2isis/kaguyami2isis.h | 8 + isis/src/kaguya/apps/kaguyami2isis/main.cpp | 8 + isis/src/kaguya/apps/kaguyasp2ascii/main.cpp | 42 +- isis/src/kaguya/apps/kaguyasp2isis/main.cpp | 10 +- .../apps/kaguyatc2isis/kaguyatc2isis.cpp | 8 + .../kaguya/apps/kaguyatc2isis/kaguyatc2isis.h | 8 + isis/src/kaguya/apps/kaguyatc2isis/main.cpp | 8 + isis/src/kaguya/apps/mimap2isis/main.cpp | 10 +- .../src/kaguya/apps/mimap2isis/mimap2isis.cpp | 9 +- isis/src/kaguya/apps/mimap2isis/mimap2isis.h | 8 + .../objs/KaguyaMiCamera/KaguyaMiCamera.cpp | 33 +- .../objs/KaguyaMiCamera/KaguyaMiCamera.h | 47 +-- .../KaguyaMiCameraDistortionMap.cpp | 53 +-- .../KaguyaMiCameraDistortionMap.h | 27 +- .../kaguya/objs/KaguyaMiCamera/unitTest.cpp | 43 +-- .../objs/KaguyaTcCamera/KaguyaTcCamera.cpp | 43 +-- .../objs/KaguyaTcCamera/KaguyaTcCamera.h | 33 +- .../KaguyaTcCameraDistortionMap.cpp | 29 +- .../KaguyaTcCameraDistortionMap.h | 30 +- .../kaguya/objs/KaguyaTcCamera/unitTest.cpp | 27 +- isis/src/lo/apps/lo2isis/lo2isis.cpp | 8 + isis/src/lo/apps/lo2isis/lo2isis.h | 8 + isis/src/lo/apps/lo2isis/main.cpp | 8 + isis/src/lo/apps/lopdsgen/main.cpp | 8 + .../LoCameraFiducialMap.cpp | 8 + .../LoCameraFiducialMap/LoCameraFiducialMap.h | 27 +- .../lo/objs/LoCameraFiducialMap/unitTest.cpp | 27 +- .../src/lo/objs/LoHighCamera/LoHighCamera.cpp | 42 +- isis/src/lo/objs/LoHighCamera/LoHighCamera.h | 49 +-- .../objs/LoHighCamera/LoHighDistortionMap.cpp | 27 +- .../objs/LoHighCamera/LoHighDistortionMap.h | 35 +- isis/src/lo/objs/LoHighCamera/unitTest.cpp | 65 ++-- .../lo/objs/LoMediumCamera/LoMediumCamera.cpp | 34 +- .../lo/objs/LoMediumCamera/LoMediumCamera.h | 59 ++- .../LoMediumCamera/LoMediumDistortionMap.cpp | 29 +- .../LoMediumCamera/LoMediumDistortionMap.h | 37 +- isis/src/lo/objs/LoMediumCamera/unitTest.cpp | 61 ++- isis/src/lro/apps/lromakeflat/main.cpp | 8 + isis/src/lro/apps/lronac2isis/lronac2isis.cpp | 68 ++-- isis/src/lro/apps/lronac2isis/lronac2isis.h | 12 +- isis/src/lro/apps/lronac2isis/main.cpp | 10 +- isis/src/lro/apps/lronac2pds/lronac2pds.cpp | 8 + isis/src/lro/apps/lronac2pds/lronac2pds.h | 8 + isis/src/lro/apps/lronac2pds/main.cpp | 8 + isis/src/lro/apps/lronaccal/main.cpp | 18 +- isis/src/lro/apps/lronacecho/main.cpp | 10 +- isis/src/lro/apps/lronacpho/LROCEmpirical.cpp | 42 +- isis/src/lro/apps/lronacpho/LROCEmpirical.h | 10 +- isis/src/lro/apps/lronacpho/main.cpp | 18 +- isis/src/lro/apps/lrowac2isis/main.cpp | 8 + isis/src/lro/apps/lrowac2pds/main.cpp | 9 +- isis/src/lro/apps/lrowaccal/main.cpp | 20 +- isis/src/lro/apps/lrowacpho/Exponential.cpp | 30 +- isis/src/lro/apps/lrowacpho/Exponential.h | 30 +- .../lro/apps/lrowacpho/HapkeExponential.cpp | 30 +- .../src/lro/apps/lrowacpho/HapkeExponential.h | 30 +- isis/src/lro/apps/lrowacpho/Hillier.cpp | 30 +- isis/src/lro/apps/lrowacpho/Hillier.h | 30 +- isis/src/lro/apps/lrowacpho/main.cpp | 8 + isis/src/lro/apps/mrf2isis/main.cpp | 10 +- .../mrf2pds/ProcessExportMiniRFLroPds.cpp | 26 +- .../apps/mrf2pds/ProcessExportMiniRFLroPds.h | 25 +- isis/src/lro/apps/mrf2pds/main.cpp | 8 + .../LroNarrowAngleCamera.cpp | 29 +- .../LroNarrowAngleCamera.h | 47 +-- .../LroNarrowAngleDistortionMap.cpp | 31 +- .../LroNarrowAngleDistortionMap.h | 33 +- .../objs/LroNarrowAngleCamera/unitTest.cpp | 54 +-- .../LroWideAngleCamera/LroWideAngleCamera.cpp | 46 +-- .../LroWideAngleCamera/LroWideAngleCamera.h | 27 +- .../LroWideAngleCameraDistortionMap.cpp | 82 ++-- .../LroWideAngleCameraDistortionMap.h | 31 +- .../LroWideAngleCameraFocalPlaneMap.cpp | 74 ++-- .../LroWideAngleCameraFocalPlaneMap.h | 29 +- .../lro/objs/LroWideAngleCamera/unitTest.cpp | 36 +- isis/src/lro/objs/MiniRF/MiniRF.cpp | 31 +- isis/src/lro/objs/MiniRF/MiniRF.h | 52 +-- isis/src/lro/objs/MiniRF/unitTest.cpp | 27 +- .../PhotometricFunction.cpp | 8 + .../PhotometricFunction/PhotometricFunction.h | 20 +- isis/src/mariner/apps/mar102isis/main.cpp | 8 + isis/src/mariner/apps/mar10cal/main.cpp | 8 + isis/src/mariner/apps/mar10clean/main.cpp | 9 +- isis/src/mariner/apps/mar10nonoise/main.cpp | 9 +- isis/src/mariner/apps/mar10restore/main.cpp | 10 +- .../objs/Mariner10Camera/Mariner10Camera.cpp | 32 +- .../objs/Mariner10Camera/Mariner10Camera.h | 49 +-- .../mariner/objs/Mariner10Camera/unitTest.cpp | 36 +- isis/src/mer/apps/mer2isis/main.cpp | 8 + isis/src/mer/apps/mical/MiCalibration.cpp | 10 +- isis/src/mer/apps/mical/MiCalibration.h | 8 + isis/src/mer/apps/mical/main.cpp | 8 + isis/src/messenger/apps/mdis2isis/main.cpp | 10 +- isis/src/messenger/apps/mdis2pds/main.cpp | 8 + .../messenger/apps/mdiscal/DarkModelPixel.h | 34 +- .../src/messenger/apps/mdiscal/MdisCalUtils.h | 129 +++---- isis/src/messenger/apps/mdiscal/main.cpp | 8 + isis/src/messenger/apps/mdisddr/main.cpp | 8 + .../messenger/apps/mdisedrinfo/MdisEdrKeys.h | 31 +- .../apps/mdisedrinfo/MdisGeometry.cpp | 37 +- .../messenger/apps/mdisedrinfo/MdisGeometry.h | 39 +- .../apps/mdisedrinfo/SpiceManager.cpp | 37 +- .../messenger/apps/mdisedrinfo/SpiceManager.h | 33 +- isis/src/messenger/apps/mdisedrinfo/main.cpp | 9 +- isis/src/messenger/apps/mdisproc/main.cpp | 8 + .../messenger/objs/MdisCamera/MdisCamera.cpp | 88 ++--- .../messenger/objs/MdisCamera/MdisCamera.h | 52 +-- .../MdisCamera/TaylorCameraDistortionMap.cpp | 41 +- .../MdisCamera/TaylorCameraDistortionMap.h | 37 +- .../messenger/objs/MdisCamera/unitTest.cpp | 34 +- isis/src/mex/apps/hrsc2isis/hrsc2isis.cpp | 8 + isis/src/mex/apps/hrsc2isis/hrsc2isis.h | 8 + isis/src/mex/apps/hrsc2isis/main.cpp | 8 + isis/src/mex/objs/HrscCamera/HrscCamera.cpp | 54 +-- isis/src/mex/objs/HrscCamera/HrscCamera.h | 39 +- isis/src/mex/objs/HrscCamera/unitTest.cpp | 36 +- .../MexHrscSrcCamera/MexHrscSrcCamera.cpp | 36 +- .../objs/MexHrscSrcCamera/MexHrscSrcCamera.h | 51 +-- .../mex/objs/MexHrscSrcCamera/unitTest.cpp | 32 +- isis/src/mgs/apps/moc2isis/main.cpp | 9 +- isis/src/mgs/apps/moccal/main.cpp | 26 +- isis/src/mgs/apps/mocevenodd/main.cpp | 27 +- isis/src/mgs/apps/mocgap/main.cpp | 8 + isis/src/mgs/apps/mocnoise50/main.cpp | 26 +- isis/src/mgs/apps/mocproc/main.cpp | 8 + isis/src/mgs/objs/MocLabels/MocLabels.cpp | 9 +- isis/src/mgs/objs/MocLabels/MocLabels.h | 33 +- isis/src/mgs/objs/MocLabels/mocxtrack.h | 8 + isis/src/mgs/objs/MocLabels/unitTest.cpp | 9 +- .../MocNarrowAngleCamera.cpp | 33 +- .../MocNarrowAngleCamera.h | 48 +-- .../objs/MocNarrowAngleCamera/unitTest.cpp | 32 +- .../MocNarrowAngleSumming.h | 50 +-- .../objs/MocNarrowAngleSumming/unitTest.cpp | 27 +- .../MocWideAngleCamera/MocWideAngleCamera.cpp | 29 +- .../MocWideAngleCamera/MocWideAngleCamera.h | 46 +-- .../MocWideAngleDetectorMap.cpp | 36 +- .../MocWideAngleDetectorMap.h | 30 +- .../MocWideAngleDistortionMap.cpp | 27 +- .../MocWideAngleDistortionMap.h | 34 +- .../mgs/objs/MocWideAngleCamera/unitTest.cpp | 30 +- isis/src/mro/apps/crism2isis/crism2isis.cpp | 8 + isis/src/mro/apps/crism2isis/crism2isis.h | 8 + isis/src/mro/apps/crism2isis/main.cpp | 8 + isis/src/mro/apps/ctxcal/main.cpp | 8 + isis/src/mro/apps/ctxevenodd/main.cpp | 9 +- isis/src/mro/apps/hi2isis/main.cpp | 8 + isis/src/mro/apps/hical/main.cpp | 9 +- isis/src/mro/apps/hicalbeta/main.cpp | 9 +- isis/src/mro/apps/hicalproc/main.cpp | 9 +- isis/src/mro/apps/hiccdstitch/main.cpp | 9 +- isis/src/mro/apps/hicolormos/hicolormos.cpp | 20 +- isis/src/mro/apps/hicolormos/hicolormos.h | 12 +- isis/src/mro/apps/hicolormos/main.cpp | 12 +- isis/src/mro/apps/hicrop/hicrop.cpp | 310 +++++++-------- isis/src/mro/apps/hicrop/hicrop.h | 12 +- isis/src/mro/apps/hicrop/main.cpp | 12 +- isis/src/mro/apps/hicubeit/hicubeit.cpp | 8 + isis/src/mro/apps/hicubeit/hicubeit.h | 8 + isis/src/mro/apps/hicubeit/main.cpp | 8 + isis/src/mro/apps/hicubenorm/hicubenorm.cpp | 20 +- isis/src/mro/apps/hicubenorm/hicubenorm.h | 10 +- isis/src/mro/apps/hicubenorm/main.cpp | 10 +- isis/src/mro/apps/hideal2pds/main.cpp | 8 + isis/src/mro/apps/hidestripe/main.cpp | 8 + isis/src/mro/apps/hidtmgen/hidtmgen.cpp | 8 + isis/src/mro/apps/hidtmgen/hidtmgen.h | 10 +- isis/src/mro/apps/hidtmgen/main.cpp | 8 + isis/src/mro/apps/hiequal/main.cpp | 9 +- isis/src/mro/apps/hifringe/main.cpp | 8 + isis/src/mro/apps/hifurrows/main.cpp | 9 +- isis/src/mro/apps/higlob/main.cpp | 9 +- isis/src/mro/apps/hijitreg/HiJitCube.cpp | 28 +- isis/src/mro/apps/hijitreg/HiJitCube.h | 30 +- isis/src/mro/apps/hijitreg/main.cpp | 8 + isis/src/mro/apps/hijitter/main.cpp | 119 +++--- isis/src/mro/apps/himos/himos.cpp | 8 + isis/src/mro/apps/himos/himos.h | 8 + isis/src/mro/apps/himos/main.cpp | 8 + isis/src/mro/apps/hinoise/main.cpp | 8 + isis/src/mro/apps/hirdr2isis/main.cpp | 8 + isis/src/mro/apps/hirdrgen/main.cpp | 10 +- isis/src/mro/apps/hisharpen/main.cpp | 8 + isis/src/mro/apps/histat/main.cpp | 8 + isis/src/mro/apps/histitch/main.cpp | 8 + isis/src/mro/apps/marci2isis/main.cpp | 10 +- isis/src/mro/apps/marci2isis/marci2isis.cpp | 28 +- isis/src/mro/apps/marci2isis/marci2isis.h | 8 + isis/src/mro/apps/marcical/main.cpp | 28 +- isis/src/mro/apps/marciflip/main.cpp | 8 + isis/src/mro/apps/mroctx2isis/main.cpp | 8 + isis/src/mro/apps/pds2hideal/main.cpp | 17 +- isis/src/mro/objs/CTXCamera/CTXCamera.cpp | 30 +- isis/src/mro/objs/CTXCamera/CTXCamera.h | 56 ++- isis/src/mro/objs/CTXCamera/unitTest.cpp | 33 +- isis/src/mro/objs/CrismCamera/CrismCamera.cpp | 26 +- isis/src/mro/objs/CrismCamera/CrismCamera.h | 30 +- isis/src/mro/objs/CrismCamera/unitTest.cpp | 30 +- .../src/mro/objs/HiCal/GainChannelNormalize.h | 32 +- isis/src/mro/objs/HiCal/GainFlatField.h | 32 +- isis/src/mro/objs/HiCal/GainLineDrift.h | 32 +- isis/src/mro/objs/HiCal/GainNonLinearity.h | 32 +- isis/src/mro/objs/HiCal/GainTemperature.h | 32 +- isis/src/mro/objs/HiCal/GainUnitConversion.h | 32 +- isis/src/mro/objs/HiCal/HiBlob.h | 30 +- isis/src/mro/objs/HiCal/HiCalConf.cpp | 30 +- isis/src/mro/objs/HiCal/HiCalConf.h | 31 +- isis/src/mro/objs/HiCal/HiCalData.h | 33 +- isis/src/mro/objs/HiCal/HiCalTypes.h | 39 +- isis/src/mro/objs/HiCal/HiCalUtil.h | 30 +- isis/src/mro/objs/HiCal/LoadCSV.cpp | 31 +- isis/src/mro/objs/HiCal/LoadCSV.h | 33 +- isis/src/mro/objs/HiCal/LowPassFilter.h | 52 +-- isis/src/mro/objs/HiCal/Module.h | 31 +- isis/src/mro/objs/HiCal/NonLinearLSQ.cpp | 31 +- isis/src/mro/objs/HiCal/NonLinearLSQ.h | 62 ++- isis/src/mro/objs/HiCal/SplineFill.h | 52 +-- isis/src/mro/objs/HiCal/ZeroBufferFit.cpp | 135 +++---- isis/src/mro/objs/HiCal/ZeroBufferFit.h | 98 ++--- isis/src/mro/objs/HiCal/ZeroBufferSmooth.h | 103 +++-- isis/src/mro/objs/HiCal/ZeroDark.h | 32 +- isis/src/mro/objs/HiCal/ZeroReverse.h | 85 ++--- .../objs/HiEqualization/HiEqualization.cpp | 8 + .../mro/objs/HiEqualization/HiEqualization.h | 30 +- isis/src/mro/objs/HiEqualization/unitTest.cpp | 9 +- isis/src/mro/objs/HiLab/HiLab.cpp | 31 +- isis/src/mro/objs/HiLab/HiLab.h | 29 +- isis/src/mro/objs/HiLab/unitTest.cpp | 8 + .../mro/objs/HiriseCamera/HiriseCamera.cpp | 32 +- isis/src/mro/objs/HiriseCamera/HiriseCamera.h | 47 +-- isis/src/mro/objs/HiriseCamera/unitTest.cpp | 30 +- isis/src/mro/objs/MarciCamera/MarciCamera.cpp | 41 +- isis/src/mro/objs/MarciCamera/MarciCamera.h | 33 +- .../objs/MarciCamera/MarciDistortionMap.cpp | 31 +- .../mro/objs/MarciCamera/MarciDistortionMap.h | 34 +- isis/src/mro/objs/MarciCamera/unitTest.cpp | 30 +- isis/src/near/apps/msi2isis/main.cpp | 8 + isis/src/near/objs/MsiCamera/MsiCamera.cpp | 29 +- isis/src/near/objs/MsiCamera/MsiCamera.h | 30 +- isis/src/near/objs/MsiCamera/unitTest.cpp | 34 +- .../apps/leisa2isis/leisa2isis.cpp | 8 + .../newhorizons/apps/leisa2isis/leisa2isis.h | 8 + isis/src/newhorizons/apps/leisa2isis/main.cpp | 10 +- isis/src/newhorizons/apps/lorri2isis/main.cpp | 8 + isis/src/newhorizons/apps/mvic2isis/main.cpp | 8 + .../newhorizons/apps/mvic2isis/mvic2isis.cpp | 8 + .../newhorizons/apps/mvic2isis/mvic2isis.h | 8 + .../NewHorizonsLeisaCamera.cpp | 69 ++-- .../NewHorizonsLeisaCamera.h | 53 +-- .../objs/NewHorizonsLeisaCamera/unitTest.cpp | 37 +- .../NewHorizonsLorriCamera.cpp | 60 ++- .../NewHorizonsLorriCamera.h | 57 ++- .../NewHorizonsLorriDistortionMap.cpp | 42 +- .../NewHorizonsLorriDistortionMap.h | 37 +- .../objs/NewHorizonsLorriCamera/unitTest.cpp | 104 +++-- .../NewHorizonsMvicFrameCamera.cpp | 42 +- .../NewHorizonsMvicFrameCamera.h | 47 +-- ...ewHorizonsMvicFrameCameraDistortionMap.cpp | 29 +- .../NewHorizonsMvicFrameCameraDistortionMap.h | 29 +- .../NewHorizonsMvicFrameCamera/unitTest.cpp | 32 +- .../NewHorizonsMvicTdiCamera.cpp | 28 +- .../NewHorizonsMvicTdiCamera.h | 44 +-- .../NewHorizonsMvicTdiCameraDistortionMap.cpp | 27 +- .../NewHorizonsMvicTdiCameraDistortionMap.h | 29 +- .../NewHorizonsMvicTdiCamera/unitTest.cpp | 94 ++--- isis/src/odyssey/apps/thm2isis/main.cpp | 10 +- isis/src/odyssey/apps/thmbasemap1/main.cpp | 8 + isis/src/odyssey/apps/thmdriftcor/main.cpp | 8 + isis/src/odyssey/apps/thmnoseam/main.cpp | 12 +- isis/src/odyssey/apps/thmproc/main.cpp | 14 +- isis/src/odyssey/apps/thmvisflat/main.cpp | 13 +- isis/src/odyssey/apps/thmvistrim/main.cpp | 10 +- .../objs/ThemisIrCamera/ThemisIrCamera.cpp | 28 +- .../objs/ThemisIrCamera/ThemisIrCamera.h | 52 +-- .../ThemisIrCamera/ThemisIrDistortionMap.cpp | 27 +- .../ThemisIrCamera/ThemisIrDistortionMap.h | 36 +- .../odyssey/objs/ThemisIrCamera/unitTest.cpp | 32 +- .../objs/ThemisVisCamera/ThemisVisCamera.cpp | 51 +-- .../objs/ThemisVisCamera/ThemisVisCamera.h | 57 ++- .../ThemisVisDistortionMap.cpp | 65 ++-- .../ThemisVisCamera/ThemisVisDistortionMap.h | 38 +- .../odyssey/objs/ThemisVisCamera/unitTest.cpp | 44 +-- isis/src/osirisrex/apps/ocams2isis/main.cpp | 8 + .../OsirisRexDistortionMap.cpp | 82 ++-- .../OsirisRexDistortionMap.h | 34 +- .../OsirisRexOcamsCamera.cpp | 26 +- .../OsirisRexOcamsCamera.h | 27 +- .../objs/OsirisRexOcamsCamera/unitTest.cpp | 28 +- .../apps/cneteditor/CnetEditorWindow.cpp | 8 + .../qisis/apps/cneteditor/CnetEditorWindow.h | 8 + isis/src/qisis/apps/cneteditor/main.cpp | 9 +- isis/src/qisis/apps/ipce/IpceMainWindow.cpp | 32 +- isis/src/qisis/apps/ipce/IpceMainWindow.h | 30 +- isis/src/qisis/apps/ipce/ProgressWidget.cpp | 8 + isis/src/qisis/apps/ipce/ProgressWidget.h | 9 +- isis/src/qisis/apps/ipce/main.cpp | 30 +- isis/src/qisis/apps/qmos/main.cpp | 8 + isis/src/qisis/apps/qnet/main.cpp | 8 + isis/src/qisis/apps/qtie/QtieFileTool.cpp | 14 +- isis/src/qisis/apps/qtie/QtieFileTool.h | 39 +- isis/src/qisis/apps/qtie/QtieTool.cpp | 30 +- isis/src/qisis/apps/qtie/QtieTool.h | 12 +- isis/src/qisis/apps/qtie/main.cpp | 8 + isis/src/qisis/apps/qview/main.cpp | 8 + .../AbstractPlotTool/AbstractPlotTool.cpp | 11 +- .../objs/AbstractPlotTool/AbstractPlotTool.h | 27 +- .../AbstractProjectItemView.cpp | 30 +- .../AbstractProjectItemView.h | 30 +- .../ProjectItemViewMenu.cpp | 30 +- .../ProjectItemViewMenu.h | 30 +- .../AdvancedTrackTool/AdvancedTrackTool.cpp | 8 + .../AdvancedTrackTool/AdvancedTrackTool.h | 31 +- .../qisis/objs/BandSpinBox/BandSpinBox.cpp | 8 + isis/src/qisis/objs/BandSpinBox/BandSpinBox.h | 8 + isis/src/qisis/objs/BandTool/BandTool.cpp | 10 +- isis/src/qisis/objs/BandTool/BandTool.h | 8 + isis/src/qisis/objs/BlinkTool/BlinkTool.cpp | 8 + isis/src/qisis/objs/BlinkTool/BlinkTool.h | 11 +- .../qisis/objs/BrowseDialog/BrowseDialog.cpp | 9 +- .../qisis/objs/BrowseDialog/BrowseDialog.h | 8 + .../BundleObservationView.cpp | 27 +- .../BundleObservationView.h | 28 +- .../qisis/objs/ChipViewport/ChipViewport.cpp | 24 +- .../qisis/objs/ChipViewport/ChipViewport.h | 36 +- .../ChipViewportsWidget.cpp | 17 +- .../ChipViewportsWidget/ChipViewportsWidget.h | 10 +- .../objs/CnetEditorView/CnetEditorView.cpp | 30 +- .../objs/CnetEditorView/CnetEditorView.h | 31 +- .../APrioriLatitudeFilter.cpp | 8 + .../CnetEditorWidget/APrioriLatitudeFilter.h | 8 + .../APrioriLatitudeSigmaFilter.cpp | 8 + .../APrioriLatitudeSigmaFilter.h | 8 + .../APrioriLongitudeFilter.cpp | 8 + .../CnetEditorWidget/APrioriLongitudeFilter.h | 8 + .../APrioriLongitudeSigmaFilter.cpp | 8 + .../APrioriLongitudeSigmaFilter.h | 8 + .../CnetEditorWidget/APrioriRadiusFilter.cpp | 8 + .../CnetEditorWidget/APrioriRadiusFilter.h | 8 + .../APrioriRadiusSigmaFilter.cpp | 8 + .../APrioriRadiusSigmaFilter.h | 8 + .../objs/CnetEditorWidget/AbstractFilter.cpp | 8 + .../objs/CnetEditorWidget/AbstractFilter.h | 8 + .../AbstractFilterSelector.cpp | 8 + .../CnetEditorWidget/AbstractFilterSelector.h | 8 + .../CnetEditorWidget/AbstractImageItem.cpp | 8 + .../objs/CnetEditorWidget/AbstractImageItem.h | 7 + .../CnetEditorWidget/AbstractLeafItem.cpp | 8 + .../objs/CnetEditorWidget/AbstractLeafItem.h | 11 +- .../CnetEditorWidget/AbstractMeasureItem.cpp | 9 +- .../CnetEditorWidget/AbstractMeasureItem.h | 8 + .../AbstractMultipleChoiceFilter.cpp | 8 + .../AbstractMultipleChoiceFilter.h | 7 + .../CnetEditorWidget/AbstractNullDataItem.cpp | 8 + .../CnetEditorWidget/AbstractNullDataItem.h | 11 +- .../CnetEditorWidget/AbstractNumberFilter.cpp | 8 + .../CnetEditorWidget/AbstractNumberFilter.h | 7 + .../CnetEditorWidget/AbstractParentItem.cpp | 9 +- .../CnetEditorWidget/AbstractParentItem.h | 7 + .../CnetEditorWidget/AbstractPointItem.cpp | 9 +- .../objs/CnetEditorWidget/AbstractPointItem.h | 8 + .../CnetEditorWidget/AbstractStringFilter.cpp | 8 + .../CnetEditorWidget/AbstractStringFilter.h | 8 + .../AbstractTableDelegate.cpp | 9 +- .../CnetEditorWidget/AbstractTableDelegate.h | 13 +- .../CnetEditorWidget/AbstractTableModel.cpp | 9 +- .../CnetEditorWidget/AbstractTableModel.h | 8 + .../CnetEditorWidget/AbstractTreeItem.cpp | 8 + .../objs/CnetEditorWidget/AbstractTreeItem.h | 8 + .../CnetEditorWidget/AbstractTreeModel.cpp | 8 + .../objs/CnetEditorWidget/AbstractTreeModel.h | 8 + .../AdjustedLatitudeFilter.cpp | 8 + .../CnetEditorWidget/AdjustedLatitudeFilter.h | 8 + .../AdjustedLatitudeSigmaFilter.cpp | 8 + .../AdjustedLatitudeSigmaFilter.h | 8 + .../AdjustedLongitudeFilter.cpp | 8 + .../AdjustedLongitudeFilter.h | 8 + .../AdjustedLongitudeSigmaFilter.cpp | 8 + .../AdjustedLongitudeSigmaFilter.h | 8 + .../CnetEditorWidget/AdjustedRadiusFilter.cpp | 8 + .../CnetEditorWidget/AdjustedRadiusFilter.h | 8 + .../AdjustedRadiusSigmaFilter.cpp | 8 + .../AdjustedRadiusSigmaFilter.h | 8 + .../objs/CnetEditorWidget/BusyLeafItem.cpp | 8 + .../objs/CnetEditorWidget/BusyLeafItem.h | 12 +- .../CnetEditorWidget/ChooserNameFilter.cpp | 8 + .../objs/CnetEditorWidget/ChooserNameFilter.h | 8 + .../CnetDisplayProperties.cpp | 8 + .../CnetEditorWidget/CnetDisplayProperties.h | 8 +- .../CnetEditorSortConfigDialog.cpp | 8 + .../CnetEditorSortConfigDialog.h | 8 + .../CnetEditorWidget/CnetEditorWidget.cpp | 8 + .../objs/CnetEditorWidget/CnetEditorWidget.h | 8 + .../CnetEditorWidget/ConnectionParentItem.cpp | 8 + .../CnetEditorWidget/ConnectionParentItem.h | 7 + .../objs/CnetEditorWidget/FilterGroup.cpp | 8 + .../qisis/objs/CnetEditorWidget/FilterGroup.h | 7 + .../objs/CnetEditorWidget/FilterWidget.cpp | 8 + .../objs/CnetEditorWidget/FilterWidget.h | 7 + .../CnetEditorWidget/GoodnessOfFitFilter.cpp | 8 + .../CnetEditorWidget/GoodnessOfFitFilter.h | 8 + .../objs/CnetEditorWidget/ImageIdFilter.cpp | 8 + .../objs/CnetEditorWidget/ImageIdFilter.h | 8 + .../ImageImageFilterSelector.cpp | 8 + .../ImageImageFilterSelector.h | 11 +- .../CnetEditorWidget/ImageImageTreeModel.cpp | 8 + .../CnetEditorWidget/ImageImageTreeModel.h | 7 + .../objs/CnetEditorWidget/ImageLeafItem.cpp | 8 + .../objs/CnetEditorWidget/ImageLeafItem.h | 8 + .../objs/CnetEditorWidget/ImageParentItem.cpp | 8 + .../objs/CnetEditorWidget/ImageParentItem.h | 8 + .../ImagePointFilterSelector.cpp | 8 + .../ImagePointFilterSelector.h | 8 + .../CnetEditorWidget/ImagePointTreeModel.cpp | 8 + .../CnetEditorWidget/ImagePointTreeModel.h | 8 + .../objs/CnetEditorWidget/LineFilter.cpp | 8 + .../qisis/objs/CnetEditorWidget/LineFilter.h | 8 + .../CnetEditorWidget/LineResidualFilter.cpp | 8 + .../CnetEditorWidget/LineResidualFilter.h | 8 + .../objs/CnetEditorWidget/LineShiftFilter.cpp | 8 + .../objs/CnetEditorWidget/LineShiftFilter.h | 8 + .../CnetEditorWidget/MeasureCountFilter.cpp | 8 + .../CnetEditorWidget/MeasureCountFilter.h | 7 + .../CnetEditorWidget/MeasureIgnoredFilter.cpp | 8 + .../CnetEditorWidget/MeasureIgnoredFilter.h | 8 + .../MeasureJigsawRejectedFilter.cpp | 8 + .../MeasureJigsawRejectedFilter.h | 8 + .../objs/CnetEditorWidget/MeasureLeafItem.cpp | 8 + .../objs/CnetEditorWidget/MeasureLeafItem.h | 12 +- .../CnetEditorWidget/MeasureTableDelegate.cpp | 8 + .../CnetEditorWidget/MeasureTableDelegate.h | 13 +- .../CnetEditorWidget/MeasureTableModel.cpp | 8 + .../objs/CnetEditorWidget/MeasureTableModel.h | 11 +- .../CnetEditorWidget/MeasureTypeFilter.cpp | 8 + .../objs/CnetEditorWidget/MeasureTypeFilter.h | 8 + .../PointEditLockedFilter.cpp | 8 + .../CnetEditorWidget/PointEditLockedFilter.h | 8 + .../objs/CnetEditorWidget/PointIdFilter.cpp | 8 + .../objs/CnetEditorWidget/PointIdFilter.h | 8 + .../CnetEditorWidget/PointIgnoredFilter.cpp | 8 + .../CnetEditorWidget/PointIgnoredFilter.h | 8 + .../PointJigsawRejectedFilter.cpp | 8 + .../PointJigsawRejectedFilter.h | 8 + .../objs/CnetEditorWidget/PointLeafItem.cpp | 8 + .../objs/CnetEditorWidget/PointLeafItem.h | 11 +- .../PointMeasureFilterSelector.cpp | 9 +- .../PointMeasureFilterSelector.h | 11 +- .../PointMeasureTreeModel.cpp | 9 +- .../CnetEditorWidget/PointMeasureTreeModel.h | 9 +- .../objs/CnetEditorWidget/PointParentItem.cpp | 8 + .../objs/CnetEditorWidget/PointParentItem.h | 12 +- .../CnetEditorWidget/PointTableDelegate.cpp | 8 + .../CnetEditorWidget/PointTableDelegate.h | 9 +- .../objs/CnetEditorWidget/PointTableModel.cpp | 8 + .../objs/CnetEditorWidget/PointTableModel.h | 11 +- .../objs/CnetEditorWidget/PointTypeFilter.cpp | 8 + .../objs/CnetEditorWidget/PointTypeFilter.h | 8 + .../ResidualMagnitudeFilter.cpp | 8 + .../ResidualMagnitudeFilter.h | 8 + .../qisis/objs/CnetEditorWidget/RootItem.cpp | 8 + .../qisis/objs/CnetEditorWidget/RootItem.h | 7 + .../objs/CnetEditorWidget/SampleFilter.cpp | 8 + .../objs/CnetEditorWidget/SampleFilter.h | 8 + .../CnetEditorWidget/SampleResidualFilter.cpp | 8 + .../CnetEditorWidget/SampleResidualFilter.h | 8 + .../CnetEditorWidget/SampleShiftFilter.cpp | 8 + .../objs/CnetEditorWidget/SampleShiftFilter.h | 8 + .../objs/CnetEditorWidget/TableColumn.cpp | 8 + .../qisis/objs/CnetEditorWidget/TableColumn.h | 8 + .../objs/CnetEditorWidget/TableColumnList.cpp | 8 + .../objs/CnetEditorWidget/TableColumnList.h | 8 + .../qisis/objs/CnetEditorWidget/TableView.cpp | 30 +- .../qisis/objs/CnetEditorWidget/TableView.h | 18 +- .../CnetEditorWidget/TableViewContent.cpp | 124 +++--- .../objs/CnetEditorWidget/TableViewContent.h | 18 +- .../objs/CnetEditorWidget/TableViewHeader.cpp | 66 ++-- .../objs/CnetEditorWidget/TableViewHeader.h | 8 + .../qisis/objs/CnetEditorWidget/TreeView.cpp | 8 + .../qisis/objs/CnetEditorWidget/TreeView.h | 8 + .../objs/CnetEditorWidget/TreeViewContent.cpp | 8 + .../objs/CnetEditorWidget/TreeViewContent.h | 7 + .../objs/CnetEditorWidget/TreeViewHeader.cpp | 8 + .../objs/CnetEditorWidget/TreeViewHeader.h | 8 + .../ConcurrentControlNetReader.cpp | 60 ++- .../ConcurrentControlNetReader.h | 30 +- isis/src/qisis/objs/Control/Control.cpp | 40 +- isis/src/qisis/objs/Control/Control.h | 33 +- .../ControlDisplayProperties.cpp | 8 + .../ControlDisplayProperties.h | 31 +- .../ControlHealthMonitorView.cpp | 30 +- .../ControlHealthMonitorView.h | 31 +- .../ControlHealthMonitorWidget.cpp | 30 +- .../ControlHealthMonitorWidget.h | 30 +- .../qisis/objs/ControlList/ControlList.cpp | 32 +- isis/src/qisis/objs/ControlList/ControlList.h | 8 + .../ControlMeasureEditWidget.cpp | 22 +- .../ControlMeasureEditWidget.h | 10 +- .../objs/ControlNetTool/ControlNetTool.cpp | 16 +- .../objs/ControlNetTool/ControlNetTool.h | 12 +- .../ControlPointEdit/ControlPointEdit.cpp | 8 + .../objs/ControlPointEdit/ControlPointEdit.h | 14 +- .../ControlPointEditView.cpp | 30 +- .../ControlPointEditView.h | 31 +- .../ControlPointEditWidget.cpp | 72 ++-- .../ControlPointEditWidget.h | 10 +- .../DeleteControlPointDialog.cpp | 8 + .../DeleteControlPointDialog.h | 8 + .../NewGroundSourceLocationDialog.cpp | 29 +- .../NewGroundSourceLocationDialog.h | 35 +- isis/src/qisis/objs/CubeDnView/CubeDnView.cpp | 30 +- isis/src/qisis/objs/CubeDnView/CubeDnView.h | 30 +- .../objs/CubePlotCurve/CubePlotCurve.cpp | 14 +- .../qisis/objs/CubePlotCurve/CubePlotCurve.h | 36 +- .../CubePlotCurveConfigureDialog.cpp | 36 +- .../CubePlotCurveConfigureDialog.h | 12 +- .../qisis/objs/CubeViewport/CubeViewport.cpp | 29 +- .../qisis/objs/CubeViewport/CubeViewport.h | 28 +- .../objs/CubeViewport/ViewportBuffer.cpp | 8 + .../qisis/objs/CubeViewport/ViewportBuffer.h | 33 +- .../CubeViewport/ViewportBufferAction.cpp | 8 + .../objs/CubeViewport/ViewportBufferAction.h | 7 + .../objs/CubeViewport/ViewportBufferFill.cpp | 7 + .../objs/CubeViewport/ViewportBufferFill.h | 12 +- .../CubeViewport/ViewportBufferStretch.cpp | 8 + .../objs/CubeViewport/ViewportBufferStretch.h | 8 + .../CubeViewport/ViewportBufferTransform.cpp | 8 + .../CubeViewport/ViewportBufferTransform.h | 9 +- .../BundleObservationViewWorkOrder.cpp | 28 +- .../BundleObservationViewWorkOrder.h | 29 +- .../objs/Directory/CloseProjectWorkOrder.cpp | 30 +- .../objs/Directory/CloseProjectWorkOrder.h | 31 +- .../Directory/CnetEditorViewWorkOrder.cpp | 30 +- .../objs/Directory/CnetEditorViewWorkOrder.h | 31 +- .../ControlHealthMonitorWorkOrder.cpp | 28 +- .../Directory/ControlHealthMonitorWorkOrder.h | 29 +- .../objs/Directory/CubeDnViewWorkOrder.cpp | 28 +- .../objs/Directory/CubeDnViewWorkOrder.h | 31 +- isis/src/qisis/objs/Directory/Directory.cpp | 30 +- isis/src/qisis/objs/Directory/Directory.h | 30 +- .../DisplayProperties/DisplayProperties.cpp | 9 +- .../DisplayProperties/DisplayProperties.h | 9 +- isis/src/qisis/objs/EditTool/EditTool.cpp | 28 +- isis/src/qisis/objs/EditTool/EditTool.h | 30 +- isis/src/qisis/objs/FileItem/FileItem.h | 30 +- isis/src/qisis/objs/FindTool/FindTool.h | 33 +- .../objs/Footprint2DView/Footprint2DView.cpp | 44 +-- .../objs/Footprint2DView/Footprint2DView.h | 33 +- isis/src/qisis/objs/HelpTool/HelpTool.h | 25 +- .../IndependentCubeViewport.cpp | 74 ++-- .../IndependentCubeViewport.h | 56 +-- .../objs/MdiCubeViewport/MdiCubeViewport.cpp | 26 +- .../objs/MdiCubeViewport/MdiCubeViewport.h | 28 +- isis/src/qisis/objs/ProjectItem/ProjectItem.h | 28 +- .../ProjectItemModel/ProjectItemModel.cpp | 28 +- .../objs/ProjectItemModel/ProjectItemModel.h | 30 +- .../ProjectItemProxyModel.cpp | 70 ++-- .../ProjectItemProxyModel.h | 44 +-- .../ProjectItemTreeView.cpp | 30 +- .../ProjectItemTreeView/ProjectItemTreeView.h | 30 +- isis/src/qisis/objs/QHistogram/QHistogram.cpp | 29 +- isis/src/qisis/objs/QHistogram/QHistogram.h | 29 +- .../objs/QIsisApplication/QIsisApplication.h | 28 +- isis/src/qisis/objs/QnetTools/QnetFileTool.h | 28 +- isis/src/qisis/objs/QnetTools/QnetNavTool.h | 25 +- .../objs/QnetTools/QnetPointCubeNameFilter.h | 27 +- .../QnetTools/QnetPointJigsawErrorFilter.h | 27 +- .../QnetPointRegistrationErrorFilter.h | 31 +- .../qisis/objs/SaveAsDialog/SaveAsDialog.h | 48 +-- isis/src/qisis/objs/Shape/Shape.h | 28 +- .../ShapeDisplayProperties.h | 31 +- isis/src/qisis/objs/ShapeList/ShapeList.cpp | 172 ++++----- .../SortFilterProxyModel.h | 30 +- .../SpectralPlotTool/SpectralPlotWindow.h | 29 +- .../objs/StatisticsTool/StatisticsTool.h | 25 +- isis/src/qisis/objs/StretchTool/StretchTool.h | 37 +- isis/src/qisis/objs/Tab/Tab.h | 34 +- isis/src/qisis/objs/TabBar/TabBar.h | 28 +- isis/src/qisis/objs/TargetBody/TargetBody.h | 39 +- .../TargetBodyDisplayProperties.h | 30 +- .../objs/TargetBodyList/TargetBodyList.cpp | 152 ++++---- isis/src/qisis/objs/Template/Template.h | 34 +- .../qisis/objs/TemplateList/TemplateList.cpp | 43 +-- .../qisis/objs/TemplateList/TemplateList.h | 34 +- isis/src/qisis/objs/Tool/Tool.h | 28 +- isis/src/qisis/objs/ToolList/ToolList.h | 28 +- .../objs/ViewSubWindow/ViewSubWindow.cpp | 37 +- .../qisis/objs/ViewSubWindow/ViewSubWindow.h | 35 +- .../qisis/objs/WarningWidget/WarningWidget.h | 29 +- isis/src/qisis/objs/WorkOrder/WorkOrder.cpp | 30 +- isis/src/qisis/objs/WorkOrder/WorkOrder.h | 33 +- .../qisis/objs/WorkOrder/WorkOrderFactory.h | 33 +- isis/src/qisis/objs/Workspace/Workspace.h | 30 +- isis/src/qisis/objs/ZoomTool/ZoomTool.cpp | 27 +- isis/src/qisis/objs/ZoomTool/ZoomTool.h | 29 +- isis/src/rolo/apps/rolo2isis/main.cpp | 8 + isis/src/rosetta/apps/rososiris2isis/main.cpp | 28 +- .../rosetta/apps/rosvirtis2isis/VirtisHK.cpp | 44 +-- .../rosetta/apps/rosvirtis2isis/VirtisHK.h | 38 +- isis/src/rosetta/apps/rosvirtis2isis/main.cpp | 74 ++-- .../RosettaOsirisCamera.cpp | 31 +- .../RosettaOsirisCamera/RosettaOsirisCamera.h | 28 +- .../RosettaOsirisCameraDistortionMap.cpp | 66 ++-- .../RosettaOsirisCameraDistortionMap.h | 37 +- .../objs/RosettaOsirisCamera/unitTest.cpp | 8 + .../RosettaVirtisCamera.cpp | 96 ++--- .../RosettaVirtisCamera/RosettaVirtisCamera.h | 28 +- .../objs/RosettaVirtisCamera/unitTest.cpp | 66 ++-- .../socet/apps/socetframesettings/main.cpp | 8 + isis/src/system/apps/blobdump/main.cpp | 8 + isis/src/system/apps/csspckgen/main.cpp | 9 +- isis/src/system/apps/dempack/main.cpp | 9 +- isis/src/system/apps/isiscomplete/main.cpp | 8 + .../system/apps/kerneldbgen/SpiceDbGen.cpp | 29 +- isis/src/system/apps/kerneldbgen/SpiceDbGen.h | 30 +- isis/src/system/apps/kerneldbgen/main.cpp | 8 + isis/src/system/apps/messckgen/main.cpp | 9 +- isis/src/system/apps/messspkgen/main.cpp | 8 + .../apps/prtloganalyzer/ProgramAnalyzer.cpp | 30 +- .../apps/prtloganalyzer/ProgramAnalyzer.h | 31 +- isis/src/system/apps/prtloganalyzer/main.cpp | 8 + isis/src/system/objs/Kernel/Kernel.cpp | 29 +- isis/src/system/objs/Kernel/Kernel.h | 29 +- isis/src/system/objs/KernelDb/KernelDb.cpp | 29 +- isis/src/system/objs/KernelDb/KernelDb.h | 29 +- isis/src/tgo/apps/tgocassis2isis/main.cpp | 8 + isis/src/tgo/apps/tgocassismos/main.cpp | 20 +- isis/src/tgo/apps/tgocassisrdrgen/main.cpp | 30 +- isis/src/tgo/apps/tgocassisstitch/main.cpp | 8 + isis/src/tgo/apps/tgocassisunstitch/main.cpp | 8 + .../objs/TgoCassisCamera/TgoCassisCamera.cpp | 59 ++- .../objs/TgoCassisCamera/TgoCassisCamera.h | 38 +- .../TgoCassisDistortionMap.cpp | 137 +++---- .../TgoCassisCamera/TgoCassisDistortionMap.h | 49 +-- .../src/tgo/objs/TgoCassisCamera/unitTest.cpp | 38 +- isis/src/viking/apps/vik2isis/main.cpp | 9 +- isis/src/viking/apps/vikcal/CalParameters.cpp | 29 +- isis/src/viking/apps/vikcal/CalParameters.h | 30 +- isis/src/viking/apps/vikcal/main.cpp | 11 +- isis/src/viking/apps/vikclean/main.cpp | 9 +- isis/src/viking/apps/vikfixtrx/main.cpp | 9 +- isis/src/viking/apps/viknobutter/main.cpp | 9 +- isis/src/viking/apps/viknonoodle/main.cpp | 8 + isis/src/viking/apps/viknopepper/main.cpp | 9 +- isis/src/viking/apps/viknosalt/main.cpp | 9 +- .../viking/objs/VikingCamera/VikingCamera.cpp | 31 +- .../viking/objs/VikingCamera/VikingCamera.h | 68 ++-- .../src/viking/objs/VikingCamera/unitTest.cpp | 58 ++- isis/src/voyager/apps/voy2isis/main.cpp | 16 +- isis/src/voyager/apps/voycal/main.cpp | 8 + isis/src/voyager/apps/voyramp/main.cpp | 8 + .../objs/VoyagerCamera/VoyagerCamera.cpp | 33 +- .../objs/VoyagerCamera/VoyagerCamera.h | 90 ++--- .../voyager/objs/VoyagerCamera/unitTest.cpp | 64 ++-- 1062 files changed, 15030 insertions(+), 17379 deletions(-) diff --git a/isis/src/apollo/apps/apollo2isis/main.cpp b/isis/src/apollo/apps/apollo2isis/main.cpp index 2b078f0f95..a16e686da1 100644 --- a/isis/src/apollo/apps/apollo2isis/main.cpp +++ b/isis/src/apollo/apps/apollo2isis/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "Chip.h" #include "UserInterface.h" @@ -49,11 +57,11 @@ void IsisMain() { QString filename = FileName(ui.GetFileName("FROM")).baseName(); FileName toFile = ui.GetFileName("TO"); - + apollo = new Apollo(filename); - utcTime = (QString)pdsLabel["START_TIME"]; - + utcTime = (QString)pdsLabel["START_TIME"]; + // Setup the output cube attributes for a 16-bit unsigned tiff Isis::CubeAttributeOutput cao; cao.setPixelType(Isis::Real); @@ -64,11 +72,11 @@ void IsisMain() { p.EndProcess(); cube.open(toFile.expanded(), "rw"); - + // Once the image is imported, we need to find and decrypt the code if (apollo->IsMetric() && FindCode()) TranslateCode(); - + CalculateTransform(); // Once we have decrypted the code, we need to populate the image labels TranslateApolloLabels(filename, &cube); @@ -88,7 +96,7 @@ bool FindCode() { for (int i=1; i 60000 && chip.GetValue(i+2*RADIUS, j) > 60000 && - chip.GetValue(i+2*RADIUS, j+2*RADIUS) < 60000 && + chip.GetValue(i+2*RADIUS, j+2*RADIUS) < 60000 && chip.GetValue(i+2*RADIUS, j+4*RADIUS) > 60000) { // Now that we've found one, let's refine the location codeFound = true; @@ -99,7 +107,7 @@ bool FindCode() { } } } - + // If the code was not found, we will use the default location codeFound = false; codeSample = CENTER_SAMPLE; @@ -119,7 +127,7 @@ void CalculateTransform() { sampleUR, lineUR, sampleLL, lineLL, sampleLR, lineLR; - + RefineCodeLocation(); sampleUL = codeSample; lineUL = codeLine; @@ -135,7 +143,7 @@ void CalculateTransform() { RefineCodeLocation(); sampleLL = codeSample; lineLL = codeLine; - + if (code[0][0] == 1 && code[0][31] ==1 && code[3][0] == 1 && code[3][31] == 1) { rotation = -1*atan((sampleLR-sampleUR+sampleLL-sampleUL)/(lineLR-lineUR+lineLL-lineUL)) - 0.00281891751001 - 0.000648055741779; sampleTranslation = (sampleUL+sampleUR+sampleLL+sampleLR)/4; @@ -151,7 +159,7 @@ void CalculateTransform() { sampleTranslation = 600; lineTranslation = 22700; } - + if (apollo->IsApollo17()) rotation += 0.0111002410269388; } @@ -207,7 +215,7 @@ void TranslateCode() { else code[i][31-j] = false; } } - + for (int j=0; j<32; j++) { for (int i=0; i<4; i++) { } @@ -222,11 +230,11 @@ void TranslateApolloLabels (IString filename, Cube *opack) { PvlGroup inst("Instrument"); PvlGroup kern("Kernels"); PvlGroup codeGroup("Code"); - + inst += PvlKeyword("SpacecraftName", apollo->SpacecraftName()); inst += PvlKeyword("InstrumentId", apollo->InstrumentId()); inst += PvlKeyword("TargetName", apollo->TargetName()); - + if ( !IsValidCode() ){ PvlGroup error("ERROR"); error.addComment("The decrypted code is invalid."); @@ -243,12 +251,12 @@ void TranslateApolloLabels (IString filename, Cube *opack) { else { codeGroup += PvlKeyword("StartTime", FrameTime()); codeGroup += PvlKeyword("SpacecraftAltitude", toString(Altitude()),"meters"); - + if (apollo->IsMetric()){ codeGroup += PvlKeyword("ExposureDuration", toString(ShutterInterval()), "milliseconds"); codeGroup += PvlKeyword("ForwardMotionCompensation", FMC()); } - + for (int i=0; i<4; i++) { PvlKeyword keyword("Column"+toString(i+1)); for (int j=0; j<32; j++) { @@ -257,13 +265,13 @@ void TranslateApolloLabels (IString filename, Cube *opack) { codeGroup += keyword; } } - + PvlGroup bandBin("BandBin"); // There are no filters on the camera, so the default is clear with id # of 1 // the BandBin group is only included to work with the spiceinit application bandBin += PvlKeyword("FilterName", "CLEAR"); bandBin += PvlKeyword("FilterId", "1"); - + kern += PvlKeyword("NaifFrameCode", apollo->NaifFrameCode()); // Set up the nominal reseaus group @@ -273,24 +281,24 @@ void TranslateApolloLabels (IString filename, Cube *opack) { QString missionDir = dataDir[tTable.Translate("MissionName", apollo->SpacecraftName())][0]; Pvl resTemplate(missionDir + "/reseaus/" + apollo->InstrumentId() + "_NOMINAL.pvl"); PvlGroup *reseaus = &resTemplate.findGroup("Reseaus"); - + // Update reseau locations based on refined code location for (int i=0; i<(reseaus->findKeyword("Type")).size(); i++) { double x = toDouble(reseaus->findKeyword("Sample")[i]) + sampleTranslation + 2278, y = toDouble(reseaus->findKeyword("Line")[i]) + lineTranslation - 20231; - + if (apollo->IsApollo17()) { x += 50; y += 20; } - + reseaus->findKeyword("Sample")[i] = toString( cos(rotation)*(x-sampleTranslation) - sin(rotation)*(y-lineTranslation) + sampleTranslation); reseaus->findKeyword("Line")[i] = toString( sin(rotation)*(x-sampleTranslation) + cos(rotation)*(y-lineTranslation) + lineTranslation); } inst += PvlKeyword("StartTime", utcTime); - + opack->putGroup(inst); opack->putGroup(bandBin); opack->putGroup(kern); @@ -303,7 +311,7 @@ bool IsValidCode() { return codeFound && ( code[0][0] || !code[0][3] || !code[0][5] || code[0][10] || !code[0][11] || !code[0][12] || code[0][15] || !code[0][16] || code[0][21] || !code[0][22] || !code[0][26] || code[0][31] || code[1][0] || !code[1][6] || !code[1][11] || code[1][12] || !code[1][13] || !code[1][14] || code[1][15] || !code[1][28] || code[1][29] || !code[1][30] || code[1][31] || code[2][0] || code[2][15] || !code[2][21] || code[2][22] || !code[2][23] || !code[2][24] || !code[2][25] || !code[2][26] || !code[2][27] || !code[2][28] || !code[2][29] || !code[2][30] || code[2][31] ) - && (!(apollo->IsMetric()) || (code[3][0] || !code[3][13] || !code[3][14] || code[3][15] || !code[3][16] || !code[3][17] || !code[3][18] || !code[3][19] || !code[3][20] || !code[3][21] || + && (!(apollo->IsMetric()) || (code[3][0] || !code[3][13] || !code[3][14] || code[3][15] || !code[3][16] || !code[3][17] || !code[3][18] || !code[3][19] || !code[3][20] || !code[3][21] || !code[3][22] || !code[3][23] || !code[3][24] || !code[3][25] || !code[3][26] || !code[3][27] || !code[3][28] || !code[3][30] || code[3][31])); } @@ -319,29 +327,29 @@ QString FrameTime() { if (i<4) days += (int)pow(2.0, i)*code[0][9-i]; else days += 10*(int)pow(2.0, i-4)*code[0][8-i]; } - + for (int i=0; i<6; i++) { if (i<4) hours += (int)pow(2.0, i)*code[0][20-i]; else hours += 10*(int)pow(2.0, i-4)*code[0][18-i]; } - + for (int i=0; i<7; i++) { if (i<4) minutes += (int)pow(2.0, i)*code[0][30-i]; else minutes += 10*(int)pow(2.0, i-4)*code[0][29-i]; } - + for (int i=0; i<7; i++) { if (i<4) seconds += (int)pow(2.0, i)*code[1][10-i]; else seconds += 10*(int)pow(2.0, i-4)*code[1][9-i]; } - + // And the milliseconds for (int i=0; i<12; i++) { if (i<4) seconds += 0.001* pow(2.0, i)*code[1][27-i]; else if (i<8) seconds += 0.01*pow(2.0, i-4)*code[1][27-i]; else seconds += 0.1*pow(2.0, i-8)*code[1][27-i]; } - + // Perform checks to make sure the time is correct // (i.e. convert 60 seconds to a minute, etc.) if (seconds > 60) { @@ -358,11 +366,11 @@ QString FrameTime() { } // This last check will only affect Apollo 15 which launched in July (31 days) and landed in August // Both Apollo 16 and Apollo 17 launched and landed in the same month - if (days > 31){ + if (days > 31){ days -= 31; month += 1; } - + QString sTime = toString(year) + "-"; if (month < 10) sTime += "0"; sTime += toString(month)+ "-"; @@ -374,7 +382,7 @@ QString FrameTime() { sTime += toString(minutes) + ":"; if (seconds <10) sTime += "0"; sTime += toString(seconds); - + return sTime; } diff --git a/isis/src/apollo/apps/apollocal/apollocal.cpp b/isis/src/apollo/apps/apollocal/apollocal.cpp index cecdf18b33..5d42998a6a 100644 --- a/isis/src/apollo/apps/apollocal/apollocal.cpp +++ b/isis/src/apollo/apps/apollocal/apollocal.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "CubeAttribute.h" #include "ProcessByTile.h" #include "Pvl.h" @@ -11,23 +19,23 @@ using namespace std; namespace Isis { - void cal(vector &in, + void cal(vector &in, vector &out); - + void apollocal(UserInterface &ui) { Cube cube(ui.GetFileName("FROM"), "r"); apollocal(&cube, ui); } - - + + void apollocal(Cube *inCube, UserInterface &ui) { // We will be processing by line ProcessByTile p; p.SetTileSize(128, 128); - + p.SetInputCube(inCube); - + PvlGroup &dataDir = Preference::Preferences().findGroup("DataDirectory"); PvlTranslationTable tTable("$ISISROOT/appdata/translations/MissionName2DataDir.trn"); @@ -35,17 +43,17 @@ namespace Isis { (inCube->group("Instrument")).findKeyword("SpacecraftName")[0])][0]; QString camera = (inCube->group("Instrument")).findKeyword("InstrumentId")[0]; - + CubeAttributeInput cai; p.SetInputCube(missionDir + "/calibration/" + camera + "_flatfield.cub", cai); - + CubeAttributeOutput cao; cao.setPixelType(Real); p.SetOutputCube( FileName(ui.GetAsString("TO")).expanded(), cao, inCube->sampleCount(), inCube->lineCount(), inCube->bandCount()); - + p.StartProcess(cal); p.EndProcess(); } @@ -55,8 +63,8 @@ namespace Isis { Buffer &inp = *in[0]; // Input Cube Buffer &fff = *in[1]; // Flat Field File Buffer &outp = *out[0]; // Output Cube - - + + // Loop for each pixel in the line. for (int i=0; i tolerance) return false; GoodnessOfFit = bestFit; diff --git a/isis/src/apollo/apps/apollofindrx/apollofindrx.h b/isis/src/apollo/apps/apollofindrx/apollofindrx.h index b0973b08b3..04c9efecb1 100644 --- a/isis/src/apollo/apps/apollofindrx/apollofindrx.h +++ b/isis/src/apollo/apps/apollofindrx/apollofindrx.h @@ -1,6 +1,14 @@ -#ifndef apollofindrx_h +#ifndef apollofindrx_h #define apollofindrx_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Cube.h" #include "UserInterface.h" diff --git a/isis/src/apollo/apps/apollofindrx/main.cpp b/isis/src/apollo/apps/apollofindrx/main.cpp index 967510cae4..fb4383c50d 100644 --- a/isis/src/apollo/apps/apollofindrx/main.cpp +++ b/isis/src/apollo/apps/apollofindrx/main.cpp @@ -1,7 +1,15 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "Application.h" -#include "apollofindrx.h" +#include "apollofindrx.h" using namespace Isis; diff --git a/isis/src/apollo/apps/apollopaninit/main.cpp b/isis/src/apollo/apps/apollopaninit/main.cpp index c2a8de8faa..fc347871f9 100644 --- a/isis/src/apollo/apps/apollopaninit/main.cpp +++ b/isis/src/apollo/apps/apollopaninit/main.cpp @@ -1,21 +1,10 @@ -/** - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ //Isis.h and IsisDebug.h if needed diff --git a/isis/src/apollo/apps/apollopanstitcher/Trans2d3p.h b/isis/src/apollo/apps/apollopanstitcher/Trans2d3p.h index 4b6bcbfe97..d569d589ee 100644 --- a/isis/src/apollo/apps/apollopanstitcher/Trans2d3p.h +++ b/isis/src/apollo/apps/apollopanstitcher/Trans2d3p.h @@ -1,34 +1,18 @@ #ifndef trans2d3p_h #define trans2d3p_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Cube.h" #include "Transform.h" #include -/** - * @file - * $Revision: 1.7 $ - * $Date: 2005/10/03 22:43:39 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ - - using namespace Isis; /** diff --git a/isis/src/apollo/apps/apollopanstitcher/apollopanstitcher.cpp b/isis/src/apollo/apps/apollopanstitcher/apollopanstitcher.cpp index 97b5809a13..a8a9a8df30 100644 --- a/isis/src/apollo/apps/apollopanstitcher/apollopanstitcher.cpp +++ b/isis/src/apollo/apps/apollopanstitcher/apollopanstitcher.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + /* Program uses the fiducial marks along the edges of Apollo Panoramic Images to stich eight sub-scans into a single conitinuous image diff --git a/isis/src/apollo/apps/apollopanstitcher/apollopanstitcher.h b/isis/src/apollo/apps/apollopanstitcher/apollopanstitcher.h index 4e6bb91107..df8793c244 100644 --- a/isis/src/apollo/apps/apollopanstitcher/apollopanstitcher.h +++ b/isis/src/apollo/apps/apollopanstitcher/apollopanstitcher.h @@ -1,6 +1,14 @@ #ifndef apollopanstitcher_h #define apollopanstitcher_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Pvl.h" #include "UserInterface.h" diff --git a/isis/src/apollo/apps/apollopanstitcher/main.cpp b/isis/src/apollo/apps/apollopanstitcher/main.cpp index cbf3b429b3..7ce76f2227 100644 --- a/isis/src/apollo/apps/apollopanstitcher/main.cpp +++ b/isis/src/apollo/apps/apollopanstitcher/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "apollopanstitcher.h" diff --git a/isis/src/apollo/apps/apolloremrx/main.cpp b/isis/src/apollo/apps/apolloremrx/main.cpp index 96f55c8221..4391b0d766 100644 --- a/isis/src/apollo/apps/apolloremrx/main.cpp +++ b/isis/src/apollo/apps/apolloremrx/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "ProcessByTile.h" #include "SpecialPixel.h" diff --git a/isis/src/apollo/apps/apollowarp/WarpTransform.cpp b/isis/src/apollo/apps/apollowarp/WarpTransform.cpp index a7c8a5ac70..27d1e548be 100644 --- a/isis/src/apollo/apps/apollowarp/WarpTransform.cpp +++ b/isis/src/apollo/apps/apollowarp/WarpTransform.cpp @@ -1,18 +1,26 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include "WarpTransform.h" namespace Isis { - WarpTransform::WarpTransform(BasisFunction &basisLine, - BasisFunction &basisSamp, bool weighted, std::vector &inputLine, + WarpTransform::WarpTransform(BasisFunction &basisLine, + BasisFunction &basisSamp, bool weighted, std::vector &inputLine, std::vector &inputSample, std::vector &outputLine, - std::vector &outputSample, int inputLines, int inputSamples, + std::vector &outputSample, int inputLines, int inputSamples, int outputLines, int outputSamples) { - + p_outputLines = outputLines; p_outputSamples = outputSamples; - + // Create the equations for the control points using a least squares fit p_lsqInputSamp = new LeastSquares(basisSamp); p_lsqInputLine = new LeastSquares(basisLine); @@ -24,23 +32,23 @@ namespace Isis { p_lsqInputLine->AddKnown(known,inputLine[i]); p_lsqInputSamp->AddKnown(known,inputSample[i]); } - + p_lsqInputLine->Solve(); p_lsqInputSamp->Solve(); - + p_weighted = weighted; if (weighted) { p_outputLine = outputLine; p_outputSample = outputSample; } } - + WarpTransform::~WarpTransform() { if (p_lsqInputLine != NULL) delete p_lsqInputLine; if (p_lsqInputSamp != NULL) delete p_lsqInputSamp; } - - + + // Convert the requested output samp/line to an input samp/line bool WarpTransform::Xform (double &inSample, double &inLine, const double outSample, const double outLine) { @@ -59,7 +67,7 @@ namespace Isis { p_lsqInputLine->Solve(); p_lsqInputSamp->Solve(); } - + static std::vector vars; if (vars.size() != 2) vars.resize(2); vars[0] = outLine; @@ -68,7 +76,7 @@ namespace Isis { inSample = p_lsqInputSamp->Evaluate(vars); return true; } - + PvlGroup WarpTransform::Residuals () { PvlGroup errs("Residuals"); for (int i=0; iKnowns(); i++) { diff --git a/isis/src/apollo/apps/apollowarp/WarpTransform.h b/isis/src/apollo/apps/apollowarp/WarpTransform.h index 00d976dd1e..75bcdba5f5 100644 --- a/isis/src/apollo/apps/apollowarp/WarpTransform.h +++ b/isis/src/apollo/apps/apollowarp/WarpTransform.h @@ -1,6 +1,14 @@ #ifndef WarpTransform_h #define WarpTransform_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include "Transform.h" #include "BasisFunction.h" @@ -16,26 +24,26 @@ namespace Isis { */ class WarpTransform : public Transform { public: - WarpTransform(Isis::BasisFunction &basisLine, + WarpTransform(Isis::BasisFunction &basisLine, Isis::BasisFunction &basisSamp, bool weighted, std::vector &inputLine, std::vector &inputSample, std::vector &outputLine, std::vector &outputSample, int inputLines, int inputSamples, int outputLines, int outputSamples); ~WarpTransform(); - + // Implementations for parent's pure virtual members bool Xform (double &inSample, double &inLine, const double outSample, const double outLine); int OutputSamples () const { return p_outputSamples; }; int OutputLines () const { return p_outputLines; }; Isis::PvlGroup Residuals(); - + private: int p_outputSamples; int p_outputLines; Isis::LeastSquares *p_lsqInputLine; Isis::LeastSquares *p_lsqInputSamp; - + std::vector p_outputLine; std::vector p_outputSample; bool p_weighted; @@ -43,5 +51,3 @@ class WarpTransform : public Transform { } #endif - - diff --git a/isis/src/apollo/apps/apollowarp/main.cpp b/isis/src/apollo/apps/apollowarp/main.cpp index c8a0850bce..a554a26757 100644 --- a/isis/src/apollo/apps/apollowarp/main.cpp +++ b/isis/src/apollo/apps/apollowarp/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include #include diff --git a/isis/src/apollo/objs/Apollo/Apollo.h b/isis/src/apollo/objs/Apollo/Apollo.h index f4bf45856f..d5e6c11c64 100644 --- a/isis/src/apollo/objs/Apollo/Apollo.h +++ b/isis/src/apollo/objs/Apollo/Apollo.h @@ -1,28 +1,13 @@ #ifndef Apollo_h #define Apollo_h -/** - * @file - * $Revision: 1.7 $ - * $Date: 2005/10/03 22:43:39 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "iTime.h" #include "IString.h" @@ -46,23 +31,23 @@ namespace Isis { /** * Constructor. Calls initialize() to set variables based on the QStrings passed in. - * + * * @param spacecraft The name of the spacecraft * @param instrument The name of the instrument - * + * * @see initialize(QString spacecraft, QString instrument) */ Apollo (QString spacecraft, QString instrument) { initialize(spacecraft.toUpper(), instrument.toUpper()); }; - + /** * Constructor. Parses the filename passed in and sets the spacecraft name and instrument. * Calls initialize() to set variables based on the spacecraft and instrument. - * + * * @param filename The image filename that will be parsed to get the spacecraft and instrument - * + * * @see initialize(QString spacecraft, QString instrument) */ Apollo(QString filename) { @@ -88,154 +73,154 @@ namespace Isis { initialize(spacecraft, instrument); }; - + //! Destroys the Apollo object ~Apollo () {}; /** * Checks if the instrument is an Apollo Metric camera. - * + * * @return bool True if the instrument is Metric */ bool IsMetric () {return p_instrumentId == "METRIC";} - - + + /** * Checks if the instrument is an Apollo Panoramic camera. - * + * * @return bool True if the instrument is Panoramic */ bool IsPanoramic () {return p_instrumentId == "PANORAMIC";} - - + + /** * Checks if the instrument is an Apollo Hasselblad camera. - * + * * @return bool True if the instrument is Hasselblad */ bool IsHasselblad () {return p_instrumentId == "HASSELBLAD";} - - + + /** * Checks if the spacecraft is Apollo 15 - * + * * @return bool True if the spacecraft is Apollo 15 */ bool IsApollo15 () {return p_spacecraftName == "APOLLO 15";} - - + + /** * Checks if the spacecraft is Apollo 16 - * + * * @return bool True if the spacecraft is Apollo 16 */ bool IsApollo16 () {return p_spacecraftName == "APOLLO 16";} - - + + /** * Checks if the spacecraft is Apollo 17 - * + * * @return bool True if the spacecraft is Apollo 17 */ bool IsApollo17 () {return p_spacecraftName == "APOLLO 17";} - - + + /** - * Returns the width of the image. The image width is set in initialize() based on the + * Returns the width of the image. The image width is set in initialize() based on the * instrument. - * + * * @see initialize(QString spacecraft, QString instrument) - * + * * @return int Width of the image. */ int Width () {return p_imageWidth;}; - - + + /** - * Returns the height of the image. The image height is set in initialize() based on the + * Returns the height of the image. The image height is set in initialize() based on the * instrument. - * + * * @see initialize(QString spacecraft, QString instrument) - * + * * @return int Height of the image. */ int Height () {return p_imageHeight;}; - - + + /** - * Returns number of bands in the image. The number of bands is set in initialize() based on + * Returns number of bands in the image. The number of bands is set in initialize() based on * the instrument. - * + * * @see initialize(QString spacecraft, QString instrument) - * + * * @return int Bands of the image. */ int Bands () { return p_imageBands;}; - - + + /** - * Returns the reseau dimension of the image. The reseau dimenstion is set in initialize() + * Returns the reseau dimension of the image. The reseau dimenstion is set in initialize() * based on the instrument. - * + * * @see initialize(QString spacecraft, QString instrument) - * + * * @return int Reseau dimension of the image. */ int ReseauDimension () {return p_reseauDimension;}; - - + + /** - * Returns pixel pitch for the image. The pixel patch is set in initialize() based on - * the instrument. - * + * Returns pixel pitch for the image. The pixel patch is set in initialize() based on + * the instrument. + * * @see initialize(QString spacecraft, QString instrument) - * + * * @return double Pixel pitch of the image. */ double PixelPitch () {return p_imagePixelPitch;}; - - + + /** * Returns the spacecraft name. - * + * * @return QString Spacecraft name. */ QString SpacecraftName () {return p_spacecraftName;}; - - + + /** * Returns the instrument ID. - * + * * @return QString Instrument ID. */ QString InstrumentId () {return p_instrumentId;}; - - + + /** - * Returns the NAIF frame code. The NAIF frame code is set in initialize() based on the - * spacecraft and instrument. - * + * Returns the NAIF frame code. The NAIF frame code is set in initialize() based on the + * spacecraft and instrument. + * * @see initialize(QString spacecraft, QString instrument) - * + * * @return QString NAIF frame code of the image. */ QString NaifFrameCode () {return p_naifFrameCode;}; - - + + /** * Returns the target name which is always the Moon. - * + * * @return QString Moon. */ QString TargetName () {return "MOON";}; - - + + /** - * Returns the launch date of the mission. The launch date is set in initialize() based on the + * Returns the launch date of the mission. The launch date is set in initialize() based on the * spacecraft and instrument. - * + * * @see initialize(QString spacecraft, QString instrument) - * + * * @return QString Launch date of mission */ iTime LaunchDate () {return p_launchDate;}; @@ -244,13 +229,13 @@ namespace Isis { /** * Sets variables based on the spacecraft name and instrument. - * + * * @param spacecraft Spacecraft name * @param instrument Instrument ID - * + * * @throws IException::Unknown "Unknown instrument" * @throws IException::Unknown "Unknown spacecraft" - * + * * @return void */ void initialize(QString spacecraft, QString instrument) { @@ -310,7 +295,7 @@ namespace Isis { } } - + int p_imageWidth; //!< Image width int p_imageHeight; //!< Image height int p_imageBands; //!< Number of bands in the image diff --git a/isis/src/apollo/objs/ApolloMetricCamera/ApolloMetricCamera.cpp b/isis/src/apollo/objs/ApolloMetricCamera/ApolloMetricCamera.cpp index 5f9b8d1617..287846f475 100644 --- a/isis/src/apollo/objs/ApolloMetricCamera/ApolloMetricCamera.cpp +++ b/isis/src/apollo/objs/ApolloMetricCamera/ApolloMetricCamera.cpp @@ -1,21 +1,10 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ */ #include "ApolloMetricCamera.h" @@ -49,7 +38,7 @@ namespace Isis { */ ApolloMetricCamera::ApolloMetricCamera(Cube &cube) : FramingCamera(cube) { NaifStatus::CheckErrors(); - + m_instrumentNameLong = "Metric Camera"; m_instrumentNameShort = "Metric"; @@ -89,7 +78,7 @@ namespace Isis { QString msg = "File does not appear to be an Apollo image"; throw IException(IException::User, msg, _FILEINFO_); } - + // Get the camera characteristics SetFocalLength(); SetPixelPitch(); @@ -122,7 +111,7 @@ namespace Isis { NaifStatus::CheckErrors(); } - + /** * Returns the shutter open and close times. The user should pass in the * exposure duration in seconds and the StartTime keyword value, converted to diff --git a/isis/src/apollo/objs/ApolloMetricCamera/ApolloMetricCamera.h b/isis/src/apollo/objs/ApolloMetricCamera/ApolloMetricCamera.h index c0051d6f81..dcf66cb1f1 100644 --- a/isis/src/apollo/objs/ApolloMetricCamera/ApolloMetricCamera.h +++ b/isis/src/apollo/objs/ApolloMetricCamera/ApolloMetricCamera.h @@ -1,23 +1,13 @@ #ifndef ApolloMetricCamera_h #define ApolloMetricCamera_h -/** - * @file - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "FramingCamera.h" @@ -47,7 +37,7 @@ namespace Isis { * Updated documentation. Removed Apollo namespace * wrap inside Isis namespace. Added Isis Disclaimer * to files. - * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis + * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis * coding standards. References #972. * @history 2014-01-17 Kris Becker - Set CkReferenceID to J2000 to resolve * problem with ckwriter. Also, set the SpkReferenceId @@ -55,7 +45,7 @@ namespace Isis { * @history 2015-08-24 Ian Humphrey and Makayla Shepherd - Added new data members and methods * to get spacecraft and instrument names. Extended unit test to test * these methods and added test data for Apollo 16 and 17. - * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument + * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument * members and methods and removed implementation of these methods * since Camera now handles this. References #2335. * @history 2017-06-28 Makayla Shepherd - Updated documentation. References #4807. @@ -65,16 +55,16 @@ namespace Isis { ApolloMetricCamera(Cube &cube); //! Destroys the ApolloMetricCamera Object ~ApolloMetricCamera() {}; - virtual std::pair ShutterOpenCloseTimes(double time, + virtual std::pair ShutterOpenCloseTimes(double time, double exposureDuration); /** * CK frame ID - * Apollo 15 instrument code (A15_METRIC) = -915240 * Apollo 16 instrument code (A16_METRIC) = -916240 - * Apollo 17 instrument code (A17_METRIC) = -917240 - * - * @return @b int The appropriate instrument code for the "Camera-matrix" + * Apollo 17 instrument code (A17_METRIC) = -917240 + * + * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Frame ID */ virtual int CkFrameId() const { return p_ckFrameId; } @@ -84,8 +74,8 @@ namespace Isis { * APOLLO_15_NADIR = 1 * APOLLO_16_NADIR = 1 * APOLLO_17_NADIR = 1 - * - * @return @b int The appropriate instrument code for the "Camera-matrix" Kernel + * + * @return @b int The appropriate instrument code for the "Camera-matrix" Kernel * Reference ID */ virtual int CkReferenceId() const { return p_ckReferenceId; } @@ -94,21 +84,21 @@ namespace Isis { * SPK Target Body ID - * Apollo 15 = -915 * Apollo 16 = -916 - * Apollo 17 = -917 - * - * @return @b int The appropriate instrument code for the Spacecraft + * Apollo 17 = -917 + * + * @return @b int The appropriate instrument code for the Spacecraft * Kernel Target ID */ virtual int SpkTargetId() const { return p_spkTargetId; } - /** + /** * SPK Reference ID - J2000 - * + * * Even thought the ephemeris is relative to B1950, this specification * is for writing SPK kernels. We should stay with the J2000 epoch in * these cases. * - * @return @b int The appropriate instrument code for the Spacecraft + * @return @b int The appropriate instrument code for the Spacecraft * Kernel Reference ID, */ virtual int SpkReferenceId() const { return (1); } diff --git a/isis/src/apollo/objs/ApolloMetricCamera/ApolloMetricDistortionMap.cpp b/isis/src/apollo/objs/ApolloMetricCamera/ApolloMetricDistortionMap.cpp index da6a44c445..f10be468fb 100644 --- a/isis/src/apollo/objs/ApolloMetricCamera/ApolloMetricDistortionMap.cpp +++ b/isis/src/apollo/objs/ApolloMetricCamera/ApolloMetricDistortionMap.cpp @@ -1,21 +1,10 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ */ #include "ApolloMetricDistortionMap.h" #include "CameraFocalPlaneMap.h" @@ -23,9 +12,9 @@ using namespace std; namespace Isis { /** - * - * Constructs a Distortion Map object for the Apollo Metric Camera. - * + * + * Constructs a Distortion Map object for the Apollo Metric Camera. + * * @param parent Pointer to parent Camera object * @param xp Pricipal point x-coordinate * @param yp Pricipal point y-coordinate @@ -35,7 +24,7 @@ namespace Isis { * @param j1 First coefficient of decentering distortion * @param j2 Second coefficient of decentering distortion * @param t0 Angle between positive x-axis of image and vector to imaged point - * + * * @internal * @history 2011-05-03 Jeannie Walldren - Added documentation. * @history 2013-03-18 Debbie A. Cook - Added flag to flip focal plane z axis diff --git a/isis/src/apollo/objs/ApolloMetricCamera/ApolloMetricDistortionMap.h b/isis/src/apollo/objs/ApolloMetricCamera/ApolloMetricDistortionMap.h index 545b18e3e7..f379e641cf 100644 --- a/isis/src/apollo/objs/ApolloMetricCamera/ApolloMetricDistortionMap.h +++ b/isis/src/apollo/objs/ApolloMetricCamera/ApolloMetricDistortionMap.h @@ -1,22 +1,13 @@ #ifndef ApolloMetricDistortionMap_h #define ApolloMetricDistortionMap_h -/** - * @file - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ */ #include "CameraDistortionMap.h" #include "Camera.h" @@ -37,9 +28,9 @@ namespace Isis { class ApolloMetricDistortionMap : public CameraDistortionMap { public: /** - * - * Constructs a Distortion Map object for the Apollo Metric Camera. - * + * + * Constructs a Distortion Map object for the Apollo Metric Camera. + * * @param parent Pointer to parent Camera object * @param xp Pricipal point x-coordinate * @param yp Pricipal point y-coordinate @@ -49,20 +40,20 @@ namespace Isis { * @param j1 First coefficient of decentering distortion * @param j2 Second coefficient of decentering distortion * @param t0 Angle between positive x-axis of image and vector to imaged point - * + * * @internal * @history 2011-05-03 Jeannie Walldren - Added documentation. * @history 2013-03-18 Debbie A. Cook - Added flag to flip focal plane z axis */ - ApolloMetricDistortionMap(Camera *parent, double xp, double yp, - double k1, double k2, double k3, double j1, + ApolloMetricDistortionMap(Camera *parent, double xp, double yp, + double k1, double k2, double k3, double j1, double j2, double t0); - - + + //! Destroys ApolloMetricDistortionMap object. ~ApolloMetricDistortionMap() {}; - - + + /** * Compute undistorted focal plane x/y * @@ -76,8 +67,8 @@ namespace Isis { * @return whether the conversion was successful */ bool SetFocalPlane(const double dx, const double dy); - - + + /** * Compute distorted focal plane x/y * @@ -91,8 +82,8 @@ namespace Isis { * @return whether the conversion was successful */ bool SetUndistortedFocalPlane(const double ux, const double uy); - - private: + + private: // parameters below are from camera calibration report double p_xp; //!< Principal point x-coordinate. double p_yp; //!< Principal point y-coordinate. @@ -102,7 +93,7 @@ namespace Isis { double p_j1; //!< First coefficient of decentering distortion. double p_j2; //!< Second coefficient of decentering distortion. double p_t0; /**< Angle between positive x-axis of image and vector to - imaged point. Used in computation of decentering + imaged point. Used in computation of decentering distortion.*/ }; }; diff --git a/isis/src/apollo/objs/ApolloMetricCamera/unitTest.cpp b/isis/src/apollo/objs/ApolloMetricCamera/unitTest.cpp index 06350495d3..1e72c67d09 100644 --- a/isis/src/apollo/objs/ApolloMetricCamera/unitTest.cpp +++ b/isis/src/apollo/objs/ApolloMetricCamera/unitTest.cpp @@ -1,22 +1,10 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include diff --git a/isis/src/apollo/objs/ApolloPanoramicCamera/ApolloPanIO.cpp b/isis/src/apollo/objs/ApolloPanoramicCamera/ApolloPanIO.cpp index a5994816b8..d2b83f07cc 100644 --- a/isis/src/apollo/objs/ApolloPanoramicCamera/ApolloPanIO.cpp +++ b/isis/src/apollo/objs/ApolloPanoramicCamera/ApolloPanIO.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "ApolloPanIO.h" #include @@ -55,16 +63,16 @@ namespace Isis { obs[i].image[0] = FIDS/2; else obs[i].image[0] = -FIDS/2; - + obs[i].image[1] = (-21.5 + double(int(i/2)))*FIDL; - //adjustment to account for the half spacing among the 22nd, 23rd, and 24th + //adjustment to account for the half spacing among the 22nd, 23rd, and 24th // fiducials on each side if (int(i/2)==22) obs[i].image[1] -= FIDL/2; else if ( int(i/2) > 22) obs[i].image[1] -= FIDL; - + obs[i].image[1] = -obs[i].image[1]; //sign reversal to match camera layout } @@ -101,7 +109,7 @@ namespace Isis { if (fiducialNumber < 0 || fiducialNumber > 89) return -1; - //next check the range of the machine coordinates + //next check the range of the machine coordinates // (this is just a nonsense number check) if (fabs(machineX) > 1e20) return -1; @@ -142,13 +150,13 @@ namespace Isis { } /** - * This method leverages all the fiducial obersatvions to caculate a series of affine + * This method leverages all the fiducial obersatvions to caculate a series of affine * transformations for cube (machine) space into image space. The quality of solution * can be accessed using the residual stats accessors. * * @return 1 success * @return -1 failure, insufficient fiducial measurements - */ + */ int ApolloPanIO::computeInteriorOrienation() { int i,j,k,l,m; //indeces-counters for linear algebra computations @@ -161,12 +169,12 @@ namespace Isis { cndot[43][4][12], cxstar[172], //cX* matrix, Uotila course notes page 122 cnct[14878], //CNCt matrix, Uotila course notes page 122 - atw[44][6]; //right side of normal equation (see Uotila course notes) + atw[44][6]; //right side of normal equation (see Uotila course notes) // NOTE: I store w with reversed signs compared to Uotila's notes double adot[2][6],wdot[2]; - //adot is a sub matrix of A (see Uotila Course notes page 122). + //adot is a sub matrix of A (see Uotila Course notes page 122). // It is composed of partials WRT to unknowns. //some affine partials are the same for every point so might as well hard code them now... adot[0][2] = 0.0; @@ -174,14 +182,14 @@ namespace Isis { adot[0][4] = 1.0; adot[0][5] = 0.0; - + adot[1][0] = 0.0; adot[1][1] = 0.0; adot[1][4] = 0.0; adot[1][5] = 1.0; - //first order of business... + //first order of business... // figure out how many affines there will be and which fiducial measures belong to each //the first affine always begins with point zero @@ -191,7 +199,7 @@ namespace Isis { for (i=2, n=0; i<90; i+=2) { // i is counting the fiducials // n is counting the affines - + //every time both fiducials in a horizontal (equal x coordinate) pair have been measured start // a new affine if (obs[i].flag && obs[i+1].flag) { @@ -208,7 +216,7 @@ namespace Isis { //now that we know how many affines will be needed we can get started //solve each affine individually - + //for each affine for (i =0; i= affines[i].mI) + if( temp >= affines[i].mI) break; } } @@ -650,7 +658,7 @@ namespace Isis { } /** - * This method does a conversion of an image coordinates + * This method does a conversion of an image coordinates * to a cube (sample, line) coordinates. * Call after computeInteriorOrienation() * @@ -663,24 +671,24 @@ namespace Isis { * @param machineY Output, the y coordinate (line) in cube space * * @return 1 success - * @return -1 failure, y coordinate to be converted is too small, it is not within the + * @return -1 failure, y coordinate to be converted is too small, it is not within the * domain of the image machine space - * @return -2 failure, y coordinate to be converted is too large, it is not within the + * @return -2 failure, y coordinate to be converted is too large, it is not within the * domain of the image machine space * @return 0 failure, coordinate not within domain of the affines * @return 1 successful conversion * */ - int ApolloPanIO::image2Machine(double imageX, - double imageY, - double *machineX, + int ApolloPanIO::image2Machine(double imageX, + double imageY, + double *machineX, double *machineY) { - /* This class method converts a machine coordinate to an image coordinate + /* This class method converts a machine coordinate to an image coordinate (overwriting the input arguments) - + imageX -> machine x input imageY -> machine y input - machineX <- to be overwritten as the converted coordinate + machineX <- to be overwritten as the converted coordinate machineY <- to be overwritten as the converted coordinate */ @@ -709,7 +717,7 @@ namespace Isis { for (i=0; i<90; i++) { if (obs[i].flag) { - l = sqrt(obs[i].residuals[0]*obs[i].residuals[0] + + l = sqrt(obs[i].residuals[0]*obs[i].residuals[0] + obs[i].residuals[1]*obs[i].residuals[1]); if( l > maxR) @@ -725,7 +733,7 @@ namespace Isis { for (i=0; i<90; i++) { if(obs[i].flag) { - l = sqrt(obs[i].residuals[0]*obs[i].residuals[0] + + l = sqrt(obs[i].residuals[0]*obs[i].residuals[0] + obs[i].residuals[1]*obs[i].residuals[1]); stdevR += (l-meanR)*(l-meanR); @@ -740,7 +748,7 @@ namespace Isis { /** * Accessor for the standard deviation of the residual vector lenghts * Call after computeInteriorOrienation() and calc_residual_stats() - * + * * @return -1 value not yet calculated */ double ApolloPanIO::stdevResiduals() { @@ -752,7 +760,7 @@ namespace Isis { /** * Accessor for the mean (average) of the residual vector lenghts * Call after computeInteriorOrienation() and calc_residual_stats() - * + * * @return -1 value not yet calculated */ double ApolloPanIO::meanResiduals() @@ -763,7 +771,7 @@ namespace Isis { /** * Accessor for the mean (average) of the residual vector lenghts * Call after computeInteriorOrienation() and calc_residual_stats() - * + * * @return -1 value not yet calculated */ double ApolloPanIO::maxResiduals() diff --git a/isis/src/apollo/objs/ApolloPanoramicCamera/ApolloPanIO.h b/isis/src/apollo/objs/ApolloPanoramicCamera/ApolloPanIO.h index b778c6d524..15f4463fe2 100644 --- a/isis/src/apollo/objs/ApolloPanoramicCamera/ApolloPanIO.h +++ b/isis/src/apollo/objs/ApolloPanoramicCamera/ApolloPanIO.h @@ -1,28 +1,13 @@ #ifndef ApolloPanIO_h #define ApolloPanIO_h -/** - * @file - * $Revision: 1.7 $ - * $Date: 2005/10/03 22:43:39 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ namespace Isis { /* Numbering scheme for the fiducial marks @@ -35,30 +20,30 @@ namespace Isis { */ - /** + /** * @brief Calculates a series of affine transformations from the measured coordinates of the * up to 90 fiducial marks on a complete (stiched) apollo panoramic cube - * + * * Description: The 90 Fiducial marks effectively divide a complete (stitched) apollo panormaic - * cube into 44 rectangular regions. 42 of these represent the same period of time, T, the + * cube into 44 rectangular regions. 42 of these represent the same period of time, T, the * center two are 0.5T. This class uses up to 44 2 dimensional affine transformations linked * together with first order continuity conditions at the boundaries to enforce consistent * line scan durations and correct warping in the film. - * + * * @ingroup Apollo - * + * * @author 2011-09-19 Orrin Thomas - * - * @internal + * + * @internal * @history 2011-09-19 Orrin Thomas - Original version * @history 2012-07-10 Orrin Thomas - Updated to current coding standards * @history 2017-06-28 Makayla Shepherd - Updated documentation. References #4807. - */ + */ class ApolloPanIO { private: - - /** + + /** * C style structure for storing the calculation optimized parameters of a forward and * reverse 2D affine transformation */ @@ -66,17 +51,17 @@ namespace Isis { int flag; //!< solve flag double A2I[6]; //!< transformation coefficients to go to image coordinates double A2M[6]; //!< transformation coefficients to go to machine coordinates - + /** * Coefficients to rotate machine coordinates so that the right edge of the region is vertical */ - double rotM[2]; - + double rotM[2]; + /** * Coefficients to rotate Image coordinates so that the right edge of the region is vertical */ - double rotI[2]; - + double rotI[2]; + double mI; //!< max rotated image y coordinate in the region double mM; //!< max rotate machine y coordinate in the region int indeces[2]; //!< indeces of the first and last fiducial marks included in this region @@ -93,7 +78,7 @@ namespace Isis { }FidObs; /** - * an array of discreet affine transformations pertaining to regions of the image + * an array of discreet affine transformations pertaining to regions of the image * (there can never be more than 44) */ Affine2D affines[44]; @@ -101,8 +86,8 @@ namespace Isis { FidObs obs[90]; //!< array to hold all possible observations of fiducial marks int n; //!< the number of affines used to model the image double maxR; //!< maximum residual vector length - double meanR; //!< mean of residual vector lenghts - double stdevR; //!< standard deviation of residual vector lengths + double meanR; //!< mean of residual vector lenghts + double stdevR; //!< standard deviation of residual vector lengths void calc_residual_stats(); diff --git a/isis/src/apollo/objs/ApolloPanoramicCamera/ApolloPanoramicCamera.cpp b/isis/src/apollo/objs/ApolloPanoramicCamera/ApolloPanoramicCamera.cpp index e73055c90e..8b485ca84d 100644 --- a/isis/src/apollo/objs/ApolloPanoramicCamera/ApolloPanoramicCamera.cpp +++ b/isis/src/apollo/objs/ApolloPanoramicCamera/ApolloPanoramicCamera.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "ApolloPanoramicCamera.h" #include "ApolloPanIO.h" @@ -29,16 +37,16 @@ namespace Isis { SetFocalLength(610.0); //nominal (uncalibrated) focal length in mm from "Apollo 15 SIM Bay // Photographic Equipment and Mission Summary" August, 1971 SetPixelPitch(0.005); //internally all images are modeled as if they have 5 micron pixels - + double constantTimeOffset = 0.0, additionalPreroll = 0.0, additiveLineTimeError = 0.0, multiplicativeLineTimeError = 0.0; - + // Set up naming info m_instrumentNameLong = "Panoramic Camera"; m_instrumentNameShort = "Pan"; - + // Apollo15 Pan naif code = -915230 if (naifIkCode() == -915230) { m_spacecraftNameLong = "Apollo 15"; @@ -58,78 +66,78 @@ namespace Isis { QString msg = "File does not appear to be an Apollo image"; throw IException(IException::User, msg, _FILEINFO_); } - + //following keywords in InstrumentAddendum file QString ikernKey = "INS" + toString((int)naifIkCode()) + "_CONSTANT_TIME_OFFSET"; constantTimeOffset = getDouble(ikernKey); - + ikernKey = "INS" + toString((int)naifIkCode()) + "_ADDITIONAL_PREROLL"; additionalPreroll = getDouble(ikernKey); - + ikernKey = "INS" + toString((int)naifIkCode()) + "_ADDITIVE_LINE_ERROR"; additiveLineTimeError = getDouble(ikernKey); - + ikernKey = "INS" + toString((int)naifIkCode()) + "_MULTIPLI_LINE_ERROR"; multiplicativeLineTimeError = getDouble(ikernKey); - - Pvl &lab = *cube.label(); + + Pvl &lab = *cube.label(); PvlGroup &inst = lab.findGroup("Instrument", Pvl::Traverse); - QString stime = (QString)inst["StartTime"]; + QString stime = (QString)inst["StartTime"]; SpiceDouble etStart; str2et_c(stime.toLatin1().data(), &etStart); stime = (QString) inst["StopTime"]; SpiceDouble etStop; str2et_c(stime.toLatin1().data(), &etStop); iTime isisTime( (QString) inst["StartTime"]); - + // Get other info from labels // line exposure duration, sec/mm - double lineRate = ( (double) inst["LineExposureDuration"] )*0.005; - + double lineRate = ( (double) inst["LineExposureDuration"] )*0.005; + lineRate *= 1.0 + multiplicativeLineTimeError; lineRate += additiveLineTimeError; etStart += additionalPreroll * lineRate; etStart += constantTimeOffset; - + setTime(isisTime); - + // Setup detector map - //note (etStart+etStop)/2.0 is the time in the middle of image + //note (etStart+etStop)/2.0 is the time in the middle of image // (line = 0 after interior orientation) - ApolloPanoramicDetectorMap *detectorMap = - new ApolloPanoramicDetectorMap((Camera *)this, - (etStart+etStop)/2.0, + ApolloPanoramicDetectorMap *detectorMap = + new ApolloPanoramicDetectorMap((Camera *)this, + (etStart+etStop)/2.0, (double)lineRate, &lab); //interior orientation residual stats m_residualMean = detectorMap->meanResidual(); m_residualMax = detectorMap->maxResidual(); m_residualStdev = detectorMap->stdevResidual(); - + detectorMap->SetDetectorSampleSumming(1.0); detectorMap->SetStartingDetectorSample(0.0); // Setup focal plane map PvlGroup &kernel = lab.findGroup("Kernels", Pvl::Traverse); CameraFocalPlaneMap *focalMap = new CameraFocalPlaneMap(this, (int) kernel["NaifFrameCode"]); - + // Retrieve boresight location from instrument kernel (IK) (addendum?) double sampleBoreSight = 0.0; //Presently no NAIF keywords for this sensor double lineBoreSight = 0.0; //Presently no NAIF keywords for this sensor - + focalMap->SetDetectorOrigin(sampleBoreSight, lineBoreSight); focalMap->SetDetectorOffset(0.0, 0.0); - + // Setup distortion map new CameraDistortionMap(this, -1.0); //distMap->SetDistortion(naifIkCode()); Presently no NAIF keywords for this sensor - + //Setup the ground and sky map new LineScanCameraGroundMap(this); new LineScanCameraSkyMap(this); - + PvlGroup &instP = lab.findGroup("Kernels", Pvl::Traverse); m_CkFrameId = toInt(instP["NaifFrameCode"][0]); m_CkFrameId = -int(-m_CkFrameId/1000)*1000; - + LoadCache(); } }// end Isis namespace diff --git a/isis/src/apollo/objs/ApolloPanoramicCamera/ApolloPanoramicCamera.h b/isis/src/apollo/objs/ApolloPanoramicCamera/ApolloPanoramicCamera.h index 1a0e5bfceb..384a1be062 100644 --- a/isis/src/apollo/objs/ApolloPanoramicCamera/ApolloPanoramicCamera.h +++ b/isis/src/apollo/objs/ApolloPanoramicCamera/ApolloPanoramicCamera.h @@ -1,55 +1,40 @@ #ifndef ApolloPanoramicCamera_h #define ApolloPanoramicCamera_h -/** - * @file - * $Revision: 1.7 $ - * $Date: 2005/10/03 22:43:39 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "LineScanCamera.h" namespace Isis { class PvlGroup; - /** + /** * @brief Apollo Panoramic Camera - * + * * Description: Geometric camera model for the Apollo Panoramic Camera * * @ingroup Apollo - * + * * @author 2011-09-19 Orrin Thomas - * - * @internal + * + * @internal * @history 2011-09-19 Orrin Thomas - Original version - * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis + * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis * coding standards. References #972. * @history 2012-07-10 Orrin Thomas - Updated to current coding standards * @history 2015-09-01 Ian Humphrey and Makayla Shepherd - Added new data members and * methods to get spacecraft and instrument names. - * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument + * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument * members and methods and removed implementation of these methods - * since Camera now handles this. References #2335. Fixed + * since Camera now handles this. References #2335. Fixed * indentation. * @history 2017-06-28 Makayla Shepherd - Updated documentation. References #4807. - */ + */ class ApolloPanoramicCamera : public LineScanCamera { public: ApolloPanoramicCamera(Cube &lab); @@ -58,54 +43,54 @@ namespace Isis { ~ApolloPanoramicCamera() {}; /** - * CK frame ID - - Instrument Code - * - * @return @b int The appropriate instrument code for the "Camera-matrix" + * CK frame ID - - Instrument Code + * + * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Frame ID */ - //this sensor was used on multiple missions so it is necessary to check which Apollo - virtual int CkFrameId() const {return m_CkFrameId; } + //this sensor was used on multiple missions so it is necessary to check which Apollo + virtual int CkFrameId() const {return m_CkFrameId; } - /** + /** * CK Reference ID - J2000 - * + * * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Reference ID */ virtual int CkReferenceId() const { return (1); } - /** + /** * SPK Reference ID - J2000 - * - * @return @b int The appropriate instrument code for the Spacecraft + * + * @return @b int The appropriate instrument code for the Spacecraft * Kernel Reference ID */ virtual int SpkReferenceId() const { return (1); } - /** + /** * Returns residual summary statistics from interior orientation as a PvlGroup - * + * * @return PvlGroup Residuals report. */ PvlGroup intOriResidualsReport(); /** * Max interior orientation residual vector length, accesor - * + * * @return double Residual max */ double intOriResidualMax() const { return m_residualMax; } /** * Mean (average) of interior orientation residual vector length, accesor - * + * * @return double Residual mean */ double intOriResidualMean() const { return m_residualMean; } /** * Standard deviation of interior orientation residual vector length, accesor - * + * * @return double Residual standard deviation */ double intOriResidualStdev() const { return m_residualStdev; } diff --git a/isis/src/apollo/objs/ApolloPanoramicCamera/ApolloPanoramicDetectorMap.cpp b/isis/src/apollo/objs/ApolloPanoramicCamera/ApolloPanoramicDetectorMap.cpp index 66a768b831..01fddfbb1d 100644 --- a/isis/src/apollo/objs/ApolloPanoramicCamera/ApolloPanoramicDetectorMap.cpp +++ b/isis/src/apollo/objs/ApolloPanoramicCamera/ApolloPanoramicDetectorMap.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "ApolloPanoramicDetectorMap.h" #include "Application.h" #include "PvlGroup.h" @@ -19,12 +27,12 @@ namespace Isis { * @return bool Always returns true */ bool ApolloPanoramicDetectorMap::SetDetector(const double sample, const double line) { - //given a detector coordinate and a time (read from the 'parent' camera class) + //given a detector coordinate and a time (read from the 'parent' camera class) // set the image coordinates //save the detector coordinates //negative signs are counterintuitive and I cannot fully explain them, I believe they are // because of the negative z direction in the distortion map.... - p_detectorLine = -line; + p_detectorLine = -line; p_detectorSample = -sample; //convert from detector to fiducial coordinants @@ -48,14 +56,14 @@ namespace Isis { * @return bool Always returns true */ bool ApolloPanoramicDetectorMap::SetParent(const double sample, const double line) { - //Given an image (aka 'Parent', aka encoder, aka machine) coordinate set the detector + //Given an image (aka 'Parent', aka encoder, aka machine) coordinate set the detector //coordiante and the time (time is set in the 'parent' camera class) //save the parent data p_parentLine = line; p_parentSample = sample; //convert from machine to fiducial coordinates //cout << "cube coordinates sent to IO: " << sample << " " << line << endl; //debug - + p_intOri.machine2Image(sample,line,&p_detectorSample, &p_detectorLine); //cout << "fiducial coordinate return from IO: " << p_detectorSample << " " << p_detectorLine << endl; @@ -63,32 +71,32 @@ namespace Isis { iTime isisTime(m_etMiddle + p_detectorLine*m_lineRate); p_camera->setTime(isisTime); //This declaration may cause some debate. Regardless it seems to that - // since we model the motion of the camera as continuous smooth motion + // since we model the motion of the camera as continuous smooth motion // (not some discretely defined series of 1 pixel or 1 mm wide 'push-frames'), // and we calculate the positions, pointings, etc at the specific time implied // by the sub-pixel/mm line then the line in the dector will always be the same // (in this case zero) - p_detectorLine = 0.0; + p_detectorLine = 0.0; return true; } /** - * This method uses the ApolloPanIO class to compute transforamtion from cube to image + * This method uses the ApolloPanIO class to compute transforamtion from cube to image * (aka fiducial cooraintes) - * + * * @throws IException::User "No FID_MEASURES table found in cube blobs." * @throws IException::User "Less than four FID_MEASURES found in cube blobs." * @throws IException::User "Insufficient Fiducial Observations for computation of the interior - * orientation. At least one vertical pair must be measured, many + * orientation. At least one vertical pair must be measured, many * more is recomented." - * + * * @returns int Returns 1 on success and -1 on failure. */ int ApolloPanoramicDetectorMap::initializeInteriorOrientation() { int i,nrec; - //read the fidicial measurements from the attached table in the camera labels to define a - // series of affine transformation between image (aka encoder aka machine) coordinates + //read the fidicial measurements from the attached table in the camera labels to define a + // series of affine transformation between image (aka encoder aka machine) coordinates // and fiducial coordinates Table tableFid("Fiducial Measurement", m_lab->fileName()); @@ -110,7 +118,7 @@ namespace Isis { p_intOri.fiducialObservation(tableFid[i][0], tableFid[i][1], tableFid[i][2]); i = p_intOri.computeInteriorOrienation(); - + if( i != 1) { //unsuccessful computation of the interior orienation throw IException(IException::User,"Insufficient Fiducial Observations for computation of " "the interior orientation.\nAt least one vertical pair " diff --git a/isis/src/apollo/objs/ApolloPanoramicCamera/ApolloPanoramicDetectorMap.h b/isis/src/apollo/objs/ApolloPanoramicCamera/ApolloPanoramicDetectorMap.h index 314ee44091..c4666448d0 100644 --- a/isis/src/apollo/objs/ApolloPanoramicCamera/ApolloPanoramicDetectorMap.h +++ b/isis/src/apollo/objs/ApolloPanoramicCamera/ApolloPanoramicDetectorMap.h @@ -1,29 +1,13 @@ #ifndef ApolloPanoramicDetectorMap_h #define ApolloPanoramicDetectorMap_h -/** - * @file - * $Revision: 1.7 $ - * $Date: 2005/10/03 22:43:39 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "ApolloPanIO.h" #include "LineScanCameraDetectorMap.h" @@ -31,20 +15,20 @@ #include "PvlGroup.h" namespace Isis { - /** - * @brief Convert between parent image (aka encoder aka machine) coordinates and detector + /** + * @brief Convert between parent image (aka encoder aka machine) coordinates and detector * coordinates - * + * * This class is used to convert between parent image (aka encoder aka machine) coordinates - * (sample/line) and detector coordinates for a the Apollo Panoramic Image. - * + * (sample/line) and detector coordinates for a the Apollo Panoramic Image. + * * @author 2011-11-21 Orrin Thomas - * - * @internal + * + * @internal * @history 2011-11-21 Orrin Thomas - Original version * @history 2012-07-10 Orrin Thomas - Updated to current coding standards * @history 2017-06-28 Makayla Shepherd - Updated documentation. References #4807. - */ + */ class ApolloPanoramicDetectorMap : public CameraDetectorMap { public: /** @@ -87,7 +71,7 @@ namespace Isis { /** * Return the time in seconds between scan lines - * + * * @return double Time in seconds between scan lines */ double LineRate() const { @@ -96,28 +80,28 @@ namespace Isis { /** * Mean (average) of interior orientation residual vector lengths, accesor - * + * * @return double Mean of interior orientation residual vector lengths */ double meanResidual() { return p_intOri.meanResiduals(); }; /** * Max interior orientation residual vector length, accesor - * + * * @return double Max interior orientation residual vector length */ double maxResidual() { return p_intOri.maxResiduals(); }; /** * Standard deviation of interior orientation residual vector lengths, accesor - * + * * @return double Standard deviation of interior orientation residual vector lengths */ double stdevResidual() { return p_intOri.stdevResiduals(); }; private: - - double m_etMiddle; //!< Ephemeris time at the middle line + + double m_etMiddle; //!< Ephemeris time at the middle line double m_lineRate; //!< line exposure duration Pvl *m_lab; //!< Image label used to construct camera object @@ -130,4 +114,3 @@ namespace Isis { }; }; #endif - diff --git a/isis/src/apollo/objs/ApolloPanoramicCamera/unitTest.cpp b/isis/src/apollo/objs/ApolloPanoramicCamera/unitTest.cpp index d077609439..b38b74efea 100644 --- a/isis/src/apollo/objs/ApolloPanoramicCamera/unitTest.cpp +++ b/isis/src/apollo/objs/ApolloPanoramicCamera/unitTest.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -44,7 +33,7 @@ int main(void) { cout << "Unit Test for ApolloCamera..." << endl; try { - + // These should be lat/lon at center of image. To obtain these numbers for a new cube/camera, // set both the known lat and known lon to zero and copy the unit test output "Latitude off by: " @@ -78,8 +67,8 @@ int main(void) { cout << "CK Reference ID = " << camTL->CkReferenceId() << endl; cout << "SPK Target ID = " << camTL->SpkTargetId() << endl; cout << "SPK Reference ID = " << camTL->SpkReferenceId() << endl << endl; - - + + // Test all four corners to make sure the conversions are right cout << "For upper left corner ..." << endl; TestLineSamp(camTL, 1.0, 1.0); @@ -113,7 +102,7 @@ int main(void) { else { cout << setprecision(16) << "Longitude off by: " << camM->UniversalLongitude() - knownLon << endl; } - + //TODO - test name methods for Apollo16 and 17 Panoramic // Test name methods cout << endl << endl << "Testing name methods ..." << endl; @@ -121,17 +110,17 @@ int main(void) { cout << "Spacecraft Name Short: " << camM->spacecraftNameShort() << endl; cout << "Instrument Name Long: " << camM->instrumentNameLong() << endl; cout << "Instrument Name Short: " << camM->instrumentNameShort() << endl << endl; - + // Test exception: camera is not a supported Kaguya camera cout << endl << "Testing exceptions:" << endl << endl; Cube test("$ISISTESTDATA/isis/src/hayabusa/unitTestData/st_2530292409_v.cub", "r"); ApolloPanoramicCamera pCam(test); - + } catch(IException &e) { e.print(); } - + } void TestLineSamp(Camera *cam, double samp, double line) { @@ -153,4 +142,3 @@ void TestLineSamp(Camera *cam, double samp, double line) { cout << "DeltaLine = ERROR" << endl; } } - diff --git a/isis/src/apollo/objs/CentroidApolloPan/CentroidApolloPan.cpp b/isis/src/apollo/objs/CentroidApolloPan/CentroidApolloPan.cpp index 2c963d4b28..c0eeb2808c 100644 --- a/isis/src/apollo/objs/CentroidApolloPan/CentroidApolloPan.cpp +++ b/isis/src/apollo/objs/CentroidApolloPan/CentroidApolloPan.cpp @@ -1,21 +1,10 @@ -/** - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ //Isis.h and IsisDebug.h if needed @@ -41,7 +30,7 @@ namespace Isis { /** * Constructs a CentroidApolloPan object. - * + * * @param pixelSizeMicrons The pixel size in microns */ CentroidApolloPan::CentroidApolloPan(double pixelSizeMicrons) @@ -52,7 +41,7 @@ namespace Isis { this->m_pixelSize = 5.0; //if a negative or zero value is passed set the default } - + /** * Destroys the CentroidApolloPan object */ @@ -60,9 +49,9 @@ namespace Isis { /** * Set the pixel size in microns - * + * * @param microns The pixel size value to set - * + * * @return bool Returns false if microns is <= 0, else true. */ bool CentroidApolloPan::setPixelSize(double microns) @@ -73,29 +62,29 @@ namespace Isis { } /** - * Given a range of DN this function creates a biniary chip for all continuous pixels that have - * the DN within the specified range using the center pixel of the chip as the seed value - * - * @param inputChip Chip centered around some centroidable feature (dark or light continous + * Given a range of DN this function creates a biniary chip for all continuous pixels that have + * the DN within the specified range using the center pixel of the chip as the seed value + * + * @param inputChip Chip centered around some centroidable feature (dark or light continous * block of pixels) * @param[out] selectionChip Binary chip of selected and unselected pixels - * + * * @return int Returns 0 if the input chips aren't 2D, else return 1 */ int CentroidApolloPan::selectAdaptive(Chip *inputChip,Chip *selectionChip) { /* - Given a range of DN this function creates a biniary chip for all continuous pixels that have the + Given a range of DN this function creates a biniary chip for all continuous pixels that have the DN within the specified range using the center pixel of the chip as the seed value input: m_minDN,m_maxDN set using the this->SetDNRange(..) - inputChip chip centered around some centroidable feature (dark or light continous block of + inputChip chip centered around some centroidable feature (dark or light continous block of pixels) - + output: selectionChip binary chip of selected and unselected pixels */ - + //check the sizes of the chips and make the selectionChip match the inputChip int lines, samples; @@ -104,7 +93,7 @@ namespace Isis { double minDN,maxDN,temp; vector< double> dn; - + lines = inputChip->Lines(); samples = inputChip->Samples(); //printf("DEBUG: samples: %d lines: %d\n",samples,lines); @@ -152,55 +141,55 @@ namespace Isis { this->select(inputChip,selectionChip); - this->setDNRange(minDN,maxDN); //restore original DN range + this->setDNRange(minDN,maxDN); //restore original DN range return 1; - } + } /** - * This method will take advantage of all the apriori knowlege we have of the size and orientation - * of the ellipse to speed up elliptical reduction. - * - * The general elliptical reduction tool provided in the selection class is slow for the very + * This method will take advantage of all the apriori knowlege we have of the size and orientation + * of the ellipse to speed up elliptical reduction. + * + * The general elliptical reduction tool provided in the selection class is slow for the very * large and potentially noisy ellipses of the apollo pan data. - * + * * Specifically we know: - * semiMajor Axis,a, is approximately parrallel to the sample chip axis and is + * semiMajor Axis,a, is approximately parrallel to the sample chip axis and is * approximately 60 5-micron pixels long - * semiMinor Axis,b, is approximately parrallel to the line chip axis and is + * semiMinor Axis,b, is approximately parrallel to the line chip axis and is * approximately 60 5-micron pixels long - * - * Hence we know the center of the ellipse is on the range [a+1,Samples-a],[b+1,lines-b] + * + * Hence we know the center of the ellipse is on the range [a+1,Samples-a],[b+1,lines-b] * (because the entire ellipse must be within the chip) - * + * * this->pixel_size will be used to do any scaling neccessary - * + * * Algorithim: * Step 1: Compile an array of all points on the border of the selected area - * Step 2: Choose a previously unused hypothesis center point from the range + * Step 2: Choose a previously unused hypothesis center point from the range * [a+1,samples-a],[b+1,lines-b] * Step 3: For a given hypothesized ellipse center in the search set, define the Ellipse. - * Step 4: Do a least squares generization. Any points within a distance of play pixels to - * the edge of the ellipse are included in the gernalization. The distance check is repeated + * Step 4: Do a least squares generization. Any points within a distance of play pixels to + * the edge of the ellipse are included in the gernalization. The distance check is repeated * for every iteration so the ellipse can effective grow to include more points. - * Step 5: If the generization is successfully check to see if the area is at least as great as + * Step 5: If the generization is successfully check to see if the area is at least as great as * the current best, and that the ellipse is contained in the chip - * Step 6: If the area is great enough check that the percent selected is at least + * Step 6: If the area is great enough check that the percent selected is at least * percent_selected. - * Step 7: If all above tests are passed then we have a new Best ellipse and the number of + * Step 7: If all above tests are passed then we have a new Best ellipse and the number of * consecutive emptySets is zeroed. Otherwise emptySets++ - * Step 8: repeat steps 2 through 7 until pacience_limit consecquitive failures to find a + * Step 8: repeat steps 2 through 7 until pacience_limit consecquitive failures to find a * better (larger area) elipse have occured - * + * * @param selectionChip Binary chip of selected and unselected pixels * @param percent_selected Minimum percent of selected points * @param play Distance allowed in the least squares generization * @param patience_limit Maximum number of empty sets allowed - * + * * @return int Return 0 if there isn't an ellipse that meets the selection criteria, else return 1 */ - int CentroidApolloPan::elipticalReduction(Chip *selectionChip, double percent_selected, + int CentroidApolloPan::elipticalReduction(Chip *selectionChip, double percent_selected, double play, int patience_limit) { int i,j,k,l, @@ -219,11 +208,11 @@ namespace Isis { double a = 60.0*5.0/m_pixelSize, //approximate semiMajor axis length b = 60.0*5.0/m_pixelSize, //approximate semiMinor axis length dpt[2]; //double 2D point - - //printf("DEBUG: a: %lf b: %lf pixel_size: %lf\n",a,b,m_pixelSize); + + //printf("DEBUG: a: %lf b: %lf pixel_size: %lf\n",a,b,m_pixelSize); gsl_rng *randGen = gsl_rng_alloc(gsl_rng_taus); gsl_rng_set(randGen, time(NULL)); //using the current time as a seed value - + samples = selectionChip->Samples(); lines = selectionChip->Lines(); //printf("DEBUG selectionchip samples: %d lines: %d\n",samples,lines); @@ -235,10 +224,10 @@ namespace Isis { i=int(floor(a+1.0)); cen_pts.clear(); - + /* - * inorder to concentrate the search near the center of the chip we'll varry the step size for - * the center search nodes quadratically from 1*5.0/m_pixelSize at the center to + * inorder to concentrate the search near the center of the chip we'll varry the step size for + * the center search nodes quadratically from 1*5.0/m_pixelSize at the center to * 5.0*5.0/m_pixelSize at the edge */ double searchStep = 5.0*5.0/m_pixelSize; @@ -247,7 +236,7 @@ namespace Isis { centerSample = double((k+i)/2.0); centerLine = double((l+j)/2.0); delta = (centerSample-double(i))*(centerSample-double(i)) + (centerLine -double(l))*(centerLine -double(l)); //square of the maximum distance from center of the search space - + aSearch = (searchStep-cSearch)/delta; for (pt[0]=floor(a+1.0); pt[0]GetValue(i,j) == 1) selectionChip->SetValue(i,j,3.0); @@ -346,5 +335,5 @@ namespace Isis { return 1; } - + } diff --git a/isis/src/apollo/objs/CentroidApolloPan/CentroidApolloPan.h b/isis/src/apollo/objs/CentroidApolloPan/CentroidApolloPan.h index 8f2f6f275d..03dc30a6da 100644 --- a/isis/src/apollo/objs/CentroidApolloPan/CentroidApolloPan.h +++ b/isis/src/apollo/objs/CentroidApolloPan/CentroidApolloPan.h @@ -1,51 +1,37 @@ #ifndef CentroidApolloPan_h #define CentroidApolloPan_h -/** - * @file - * $Revision: 1.0 $ - * $Date: 2011/10/12 12:52:30 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "Centroid.h" namespace Isis { - /** + /** * @brief Selection class derived from the Pure Virtual Parent Class for all Selection classes - * + * * Description coming soon * * @ingroup Selection - * + * * @author 2011-10-22 Orrin Thomas - * - * @internal + * + * @internal * @history 2011-10-22 Orrin Thomas - Original version * @history 2017-06-28 Makayla Shepherd - Updated documentation. References #4807. - */ + */ class CentroidApolloPan : public Centroid { public: - + CentroidApolloPan(double pixel_size_microns); virtual ~CentroidApolloPan(); bool setPixelSize(double microns); - + int elipticalReduction(Chip *selectionChip, double percent_selected, double play, int patience_limit); int selectAdaptive(Chip *inputChip,Chip *selectionChip); diff --git a/isis/src/apollo/objs/CentroidApolloPan/unitTest.cpp b/isis/src/apollo/objs/CentroidApolloPan/unitTest.cpp index 1a072cd152..8672ef8fb3 100644 --- a/isis/src/apollo/objs/CentroidApolloPan/unitTest.cpp +++ b/isis/src/apollo/objs/CentroidApolloPan/unitTest.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include "CentroidApolloPan.h" diff --git a/isis/src/cassini/apps/ciss2isis/main.cpp b/isis/src/cassini/apps/ciss2isis/main.cpp index 244848ae7f..af65931be8 100644 --- a/isis/src/cassini/apps/ciss2isis/main.cpp +++ b/isis/src/cassini/apps/ciss2isis/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + //Source: Cassini ISS Tour VICAR Image Data File and Detatched PDS Label SIS, Tour Version 1.1 December 1, 2004 #include "Isis.h" diff --git a/isis/src/cassini/apps/cisscal/DarkCurrent.cpp b/isis/src/cassini/apps/cisscal/DarkCurrent.cpp index 091ed6a27d..30ec2d27d3 100644 --- a/isis/src/cassini/apps/cisscal/DarkCurrent.cpp +++ b/isis/src/cassini/apps/cisscal/DarkCurrent.cpp @@ -1,24 +1,10 @@ -/** - * @file - * $Revision: 1.3 $ - * $Date: 2009/05/27 21:26:15 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include diff --git a/isis/src/cassini/apps/cisscal/DarkCurrent.h b/isis/src/cassini/apps/cisscal/DarkCurrent.h index 2323df1534..b2478195eb 100644 --- a/isis/src/cassini/apps/cisscal/DarkCurrent.h +++ b/isis/src/cassini/apps/cisscal/DarkCurrent.h @@ -1,26 +1,13 @@ #ifndef DARKCURRENT_H #define DARKCURRENT_H -/** - * @file - * $Revision: 1.3 $ - * $Date: 2009/05/27 21:26:15 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include diff --git a/isis/src/cassini/apps/cisscal/main.cpp b/isis/src/cassini/apps/cisscal/main.cpp index dcb69fce6b..e78a490006 100644 --- a/isis/src/cassini/apps/cisscal/main.cpp +++ b/isis/src/cassini/apps/cisscal/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include // sort, unique #include diff --git a/isis/src/cassini/apps/vims2isis/main.cpp b/isis/src/cassini/apps/vims2isis/main.cpp index 6abcd97f49..cce1439dfc 100644 --- a/isis/src/cassini/apps/vims2isis/main.cpp +++ b/isis/src/cassini/apps/vims2isis/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include diff --git a/isis/src/cassini/apps/vimscal/main.cpp b/isis/src/cassini/apps/vimscal/main.cpp index 13b14f7b4e..fe78ac3f1d 100644 --- a/isis/src/cassini/apps/vimscal/main.cpp +++ b/isis/src/cassini/apps/vimscal/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include diff --git a/isis/src/cassini/apps/vimscal/vimscalUtil.h b/isis/src/cassini/apps/vimscal/vimscalUtil.h index 516c20ff1d..3f433e4984 100644 --- a/isis/src/cassini/apps/vimscal/vimscalUtil.h +++ b/isis/src/cassini/apps/vimscal/vimscalUtil.h @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #ifndef VIMSCALUTIL_H #define VIMSCALUTIL_H diff --git a/isis/src/cassini/objs/CissLabels/CissLabels.cpp b/isis/src/cassini/objs/CissLabels/CissLabels.cpp index 863f26917b..4503676f7b 100644 --- a/isis/src/cassini/objs/CissLabels/CissLabels.cpp +++ b/isis/src/cassini/objs/CissLabels/CissLabels.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include "CissLabels.h" #include "Pvl.h" diff --git a/isis/src/cassini/objs/CissLabels/CissLabels.h b/isis/src/cassini/objs/CissLabels/CissLabels.h index 287b06d228..b54cb7139a 100644 --- a/isis/src/cassini/objs/CissLabels/CissLabels.h +++ b/isis/src/cassini/objs/CissLabels/CissLabels.h @@ -1,26 +1,13 @@ #ifndef CISSLABELS_H #define CISSLABELS_H -/** - * @file - * $Revision: 1.2 $ - * $Date: 2008/11/07 22:45:20 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include @@ -392,7 +379,7 @@ namespace Isis { /** * @brief Returns ShutterStateId from the Instrument group. * - * Indicates whether the shutter was enabled during image + * Indicates whether the shutter was enabled during image * exposure. Valid values include "Disabled" and "Enabled". * * @returns @b QString ShutterStateId diff --git a/isis/src/cassini/objs/CissLabels/unitTest.cpp b/isis/src/cassini/objs/CissLabels/unitTest.cpp index 80247c3816..7981f7323e 100644 --- a/isis/src/cassini/objs/CissLabels/unitTest.cpp +++ b/isis/src/cassini/objs/CissLabels/unitTest.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include "CissLabels.h" #include "IException.h" diff --git a/isis/src/cassini/objs/CisscalFile/CisscalFile.cpp b/isis/src/cassini/objs/CisscalFile/CisscalFile.cpp index 7c196a5cb3..bb596464e2 100644 --- a/isis/src/cassini/objs/CisscalFile/CisscalFile.cpp +++ b/isis/src/cassini/objs/CisscalFile/CisscalFile.cpp @@ -1,24 +1,10 @@ -/** - * @file - * $Revision: 1.1 $ - * $Date: 2008/08/25 21:58:30 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include "IException.h" diff --git a/isis/src/cassini/objs/CisscalFile/CisscalFile.h b/isis/src/cassini/objs/CisscalFile/CisscalFile.h index 678e443f20..9f48e78ad2 100644 --- a/isis/src/cassini/objs/CisscalFile/CisscalFile.h +++ b/isis/src/cassini/objs/CisscalFile/CisscalFile.h @@ -1,26 +1,13 @@ #ifndef CISSCALFILE_H #define CISSCALFILE_H -/** - * @file - * $Revision: 1.1 $ - * $Date: 2008/08/25 21:58:30 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include @@ -40,11 +27,11 @@ namespace Isis { * "\begindata". * * @ingroup Cassini-Huygens - * @author 2008-03-27 Jeannie Walldren - * @internal + * @author 2008-03-27 Jeannie Walldren + * @internal * @history 2008-03-27 Jeannie Walldren - Original Version. * @history 2011-05-03 Jeannie Walldren - Fixed documentation of ingroup - * name and added Isis disclaimer. + * name and added ISISdisclaimer. */ class CisscalFile : public TextFile { public: @@ -53,7 +40,7 @@ namespace Isis { //!> Destructor closes the text file. ~CisscalFile() { TextFile::Close(); - }; + }; bool GetLine(QString &line); protected: bool p_begindataFound; //!> Flag variable indicates whether the tag "\begindata" has been found. @@ -61,5 +48,3 @@ namespace Isis { }; }; #endif - - diff --git a/isis/src/cassini/objs/CisscalFile/unitTest.cpp b/isis/src/cassini/objs/CisscalFile/unitTest.cpp index 6a95ba43c6..91851cf90c 100644 --- a/isis/src/cassini/objs/CisscalFile/unitTest.cpp +++ b/isis/src/cassini/objs/CisscalFile/unitTest.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include @@ -31,11 +20,11 @@ using namespace std; using namespace Isis; -/** - * - * @internal - * @history 2012-03-12 Tracie Sucharski - Replaced /tmp with $temporary - * +/** + * + * @internal + * @history 2012-03-12 Tracie Sucharski - Replaced /tmp with $temporary + * */ int main(int argc, char *argv[]) { Preference::Preferences(true); @@ -153,4 +142,3 @@ int main(int argc, char *argv[]) { } return 0; } - diff --git a/isis/src/cassini/objs/IssNACamera/IssNACamera.cpp b/isis/src/cassini/objs/IssNACamera/IssNACamera.cpp index dc6b910939..7e0419b62f 100644 --- a/isis/src/cassini/objs/IssNACamera/IssNACamera.cpp +++ b/isis/src/cassini/objs/IssNACamera/IssNACamera.cpp @@ -1,22 +1,10 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ // $Id: IssNACamera.cpp,v 1.6 2009/08/31 15:12:29 slambright Exp $ #include "IssNACamera.h" @@ -48,7 +36,7 @@ namespace Isis { m_instrumentNameShort = "ISSNA"; m_spacecraftNameLong = "Cassini Huygens"; m_spacecraftNameShort = "Cassini"; - + Pvl &lab = *cube.label(); // Get the filter wheels positions dependent focal length. @@ -60,12 +48,12 @@ namespace Isis { QString key = QString("INS%1_%2_FOCAL_LENGTH"). arg(naifIkCode()).arg(bandBin["FilterName"][0]); key = key.replace("/", "_"); - focalLength = getDouble(key); + focalLength = getDouble(key); } catch (IException &firstException) { try { QString key = "INS-82360_DEFAULT_FOCAL_LENGTH"; - focalLength = getDouble(key); + focalLength = getDouble(key); } catch (IException &secondException) { PvlGroup bandBin = lab.findGroup("BandBin", Pvl::Traverse); @@ -155,12 +143,12 @@ namespace Isis { /** * This is the function that is called in order to instantiate a IssNACamera - * object. + * object. * * @param lab Cube labels * * @return Isis::Camera* IssNACamera - * @internal + * @internal * @history 2011-05-03 Jeannie Walldren - Added documentation. Removed * Cassini namespace. */ diff --git a/isis/src/cassini/objs/IssNACamera/IssNACamera.h b/isis/src/cassini/objs/IssNACamera/IssNACamera.h index bce876fed7..c79ec30642 100644 --- a/isis/src/cassini/objs/IssNACamera/IssNACamera.h +++ b/isis/src/cassini/objs/IssNACamera/IssNACamera.h @@ -1,41 +1,32 @@ // $Id: IssNACamera.h,v 1.7 2009/08/31 15:12:29 slambright Exp $ #ifndef IssNACamera_h #define IssNACamera_h -/** - * @file - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "FramingCamera.h" namespace Isis { /** * @brief Cassini ISS Narrow Angle Camera Model * - * * This is the camera model for the Cassini Imaging Science Subsystem Narrow - * Angle Camera + * * This is the camera model for the Cassini Imaging Science Subsystem Narrow + * Angle Camera * * @ingroup SpiceInstrumentsAndCameras * @ingroup Cassini-Huygens - * - * @see + * + * @see * http://saturn.jpl.nasa.gov/spacecraft/cassiniorbiterinstruments/instrumentscassiniiss * @see http://pds-imaging.jpl.nasa.gov/portal/cassini_mission.html * @see http://astrogeology.usgs.gov/Missions/Cassini - * + * * @author 2007-07-10 Steven Koechle * * @internal @@ -51,13 +42,13 @@ namespace Isis { * @history 2009-08-28 Steven Lambright - Changed inheritance to no longer inherit directly * from Camera * @history 2011-01-14 Travis Addair - Added new CK/SPK accessor methods, pure virtual in - * Camera, implemented in mission specific cameras + * Camera, implemented in mission specific cameras * @history 2011-02-09 Steven Lambright - Major changes to camera classes documentation. * @history 2011-05-03 Jeannie Walldren - Added ShutterOpenCloseTimes() method. Updated * unitTest to test for new methods. Updated documentation. Replaced - * Cassini namespace wrap with Isis namespace. Added Isis Disclaimer + * Cassini namespace wrap with ISISnamespace. Added ISISDisclaimer * to files. Added NAIF error check to constructor. - * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis + * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis * coding standards. References #972. * @history 2012-09-12 Stuart C. Sides - Added ability for the camera to use the default * focal length if the observation was taken using a filter @@ -65,7 +56,7 @@ namespace Isis { * @history 2015-08-11 Ian Humphrey and Makayla Shepherd - Added new data members and methods * to get spacecraft and instrument names. Extended unit test to test * these methods. - * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument + * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument * members and methods and removed implementation of these methods * since Camera now handles this. References #2335. */ @@ -74,37 +65,37 @@ namespace Isis { IssNACamera(Cube &cube); //! Destroys the IssNACamera object. ~IssNACamera() {}; - virtual std::pair ShutterOpenCloseTimes(double time, + virtual std::pair ShutterOpenCloseTimes(double time, double exposureDuration); /** * CK frame ID - - Instrument Code from spacit run on CK - * - * @return @b int The appropriate instrument code for the "Camera-matrix" + * + * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Frame ID */ virtual int CkFrameId() const { return (-82000); } - /** + /** * CK Reference ID - J2000 - * + * * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Reference ID */ virtual int CkReferenceId() const { return (1); } - /** + /** * SPK Center ID - 6 (Saturn) - * - * @return @b int The appropriate instrument code for the Spacecraft + * + * @return @b int The appropriate instrument code for the Spacecraft * Kernel Center ID */ virtual int SpkCenterId() const { return 6; } - /** + /** * SPK Reference ID - J2000 - * - * @return @b int The appropriate instrument code for the Spacecraft + * + * @return @b int The appropriate instrument code for the Spacecraft * Kernel Reference ID */ virtual int SpkReferenceId() const { return (1); } diff --git a/isis/src/cassini/objs/IssNACamera/unitTest.cpp b/isis/src/cassini/objs/IssNACamera/unitTest.cpp index 84f5fbb169..d6a500c947 100644 --- a/isis/src/cassini/objs/IssNACamera/unitTest.cpp +++ b/isis/src/cassini/objs/IssNACamera/unitTest.cpp @@ -1,22 +1,10 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ // $Id: unitTest.cpp,v 1.6 2009/01/22 22:04:55 kbecker Exp $ #include #include @@ -60,11 +48,11 @@ int main(void) { cout << "CK Reference ID = " << cam->CkReferenceId() << endl; cout << "SPK Target ID = " << cam->SpkTargetId() << endl; cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl; - - // Test Shutter Open/Close + + // Test Shutter Open/Close const PvlGroup &inst = c.label()->findGroup("Instrument", Pvl::Traverse); - double exposureDuration = ((double) inst["ExposureDuration"])/1000; + double exposureDuration = ((double) inst["ExposureDuration"])/1000; QString stime = inst["StartTime"]; double et; // StartTime keyword is the center exposure time str2et_c(stime.toLatin1().data(), &et); @@ -89,7 +77,7 @@ int main(void) { double line = cam->Lines() / 2.0 + 0.5; cout << "\nFor center pixel position ..." << endl; TestLineSamp(cam, samp, line); - + // Test name methods cout << endl << endl << "Testing name methods ..." << endl; cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl; diff --git a/isis/src/cassini/objs/IssWACamera/IssWACamera.cpp b/isis/src/cassini/objs/IssWACamera/IssWACamera.cpp index b3db5880e0..2f488ca43f 100644 --- a/isis/src/cassini/objs/IssWACamera/IssWACamera.cpp +++ b/isis/src/cassini/objs/IssWACamera/IssWACamera.cpp @@ -1,22 +1,10 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ // $Id: IssWACamera.cpp,v 1.6 2009/08/31 15:12:29 slambright Exp $ #include "IssWACamera.h" @@ -48,7 +36,7 @@ namespace Isis { m_instrumentNameShort = "ISSWA"; m_spacecraftNameLong = "Cassini Huygens"; m_spacecraftNameShort = "Cassini"; - + NaifStatus::CheckErrors(); Pvl &lab = *cube.label(); PvlGroup &bandBin = lab.findGroup("BandBin", Pvl::Traverse); @@ -99,7 +87,7 @@ namespace Isis { NaifStatus::CheckErrors(); } - + /** * Returns the shutter open and close times. The user should pass in the * ExposureDuration keyword value, converted from milliseconds to seconds, and @@ -137,7 +125,7 @@ namespace Isis { * @param lab Cube labels * * @return Isis::Camera* IssWACamera - * @internal + * @internal * @history 2011-05-03 Jeannie Walldren - Added documentation. Removed * Cassini namespace. */ diff --git a/isis/src/cassini/objs/IssWACamera/IssWACamera.h b/isis/src/cassini/objs/IssWACamera/IssWACamera.h index 48d91676b6..1bb359ca85 100644 --- a/isis/src/cassini/objs/IssWACamera/IssWACamera.h +++ b/isis/src/cassini/objs/IssWACamera/IssWACamera.h @@ -1,41 +1,32 @@ // $Id: IssWACamera.h,v 1.7 2009/08/31 15:12:29 slambright Exp $ #ifndef IssWACamera_h #define IssWACamera_h -/** - * @file - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "FramingCamera.h" namespace Isis { - /** + /** * @brief Cassini ISS Wide Angle Camera Model * - * This is the camera model for the Cassini Imaging Science Subsystem Wide - * Angle Camera + * This is the camera model for the Cassini Imaging Science Subsystem Wide + * Angle Camera * * @ingroup SpiceInstrumentsAndCameras * @ingroup Cassini-Huygens - * - * @see + * + * @see * http://saturn.jpl.nasa.gov/spacecraft/cassiniorbiterinstruments/instrumentscassiniiss * @see http://pds-imaging.jpl.nasa.gov/portal/cassini_mission.html * @see http://astrogeology.usgs.gov/Missions/Cassini - * + * * @author 2007-07-10 Steven Koechle * * @internal @@ -59,14 +50,14 @@ namespace Isis { * @history 2011-05-03 Jeannie Walldren - Added ShutterOpenCloseTimes() * method. Updated unitTest to test for new methods. * Updated documentation. Replaced Cassini namespace - * wrap with Isis namespace. Added Isis Disclaimer + * wrap with ISISnamespace. Added ISISDisclaimer * to files. Added NAIF error check to constructor. - * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis + * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis * coding standards. References #972. * @history 2015-08-11 Ian Humphrey and Makayla Shepherd - Added new data members and methods * to get spacecraft and instrument names. Extended unit test to test * these methods. - * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument + * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument * members and methods and removed implementation of these methods * since Camera now handles this. References #2335. */ @@ -75,37 +66,37 @@ namespace Isis { IssWACamera(Cube &cube); //! Destroys the IssWACamera object. ~IssWACamera() {}; - virtual std::pair ShutterOpenCloseTimes(double time, + virtual std::pair ShutterOpenCloseTimes(double time, double exposureDuration); /** * CK frame ID - - Instrument Code from spacit run on CK - * - * @return @b int The appropriate instrument code for the "Camera-matrix" + * + * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Frame ID */ virtual int CkFrameId() const { return (-82000); } - /** + /** * CK Reference ID - J2000 - * + * * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Reference ID */ virtual int CkReferenceId() const { return (1); } - /** + /** * SPK Center ID - 6 (Saturn) - * - * @return @b int The appropriate instrument code for the Spacecraft + * + * @return @b int The appropriate instrument code for the Spacecraft * Kernel Center ID */ virtual int SpkCenterId() const { return 6; } - /** + /** * SPK Reference ID - J2000 - * - * @return @b int The appropriate instrument code for the Spacecraft + * + * @return @b int The appropriate instrument code for the Spacecraft * Kernel Reference ID */ virtual int SpkReferenceId() const { return (1); } diff --git a/isis/src/cassini/objs/IssWACamera/unitTest.cpp b/isis/src/cassini/objs/IssWACamera/unitTest.cpp index 19e1422737..4d31f0649c 100644 --- a/isis/src/cassini/objs/IssWACamera/unitTest.cpp +++ b/isis/src/cassini/objs/IssWACamera/unitTest.cpp @@ -1,22 +1,10 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ // $Id: unitTest.cpp,v 1.6 2009/01/22 22:43:29 kbecker Exp $ #include #include @@ -58,11 +46,11 @@ int main(void) { cout << "CK Reference ID = " << cam->CkReferenceId() << endl; cout << "SPK Target ID = " << cam->SpkTargetId() << endl; cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl; - - // Test Shutter Open/Close + + // Test Shutter Open/Close const PvlGroup &inst = c.label()->findGroup("Instrument", Pvl::Traverse); - double exposureDuration = ((double) inst["ExposureDuration"])/1000; + double exposureDuration = ((double) inst["ExposureDuration"])/1000; QString stime = inst["StartTime"]; double et; // StartTime keyword is the center exposure time str2et_c(stime.toLatin1().data(), &et); @@ -87,7 +75,7 @@ int main(void) { double line = cam->Lines() / 2.0 + 0.5; cout << "\nFor center pixel position ..." << endl; TestLineSamp(cam, samp, line); - + // Test name methods cout << endl << endl << "Testing name methods ..." << endl; cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl; diff --git a/isis/src/cassini/objs/VimsCamera/VimsCamera.cpp b/isis/src/cassini/objs/VimsCamera/VimsCamera.cpp index 4b78ac01ba..25ab7a752b 100644 --- a/isis/src/cassini/objs/VimsCamera/VimsCamera.cpp +++ b/isis/src/cassini/objs/VimsCamera/VimsCamera.cpp @@ -1,22 +1,10 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "VimsCamera.h" #include "VimsGroundMap.h" @@ -74,7 +62,7 @@ namespace Isis { PvlGroup &inst = lab.findGroup("Instrument", Pvl::Traverse); QString channel = (QString) inst ["Channel"]; - // Vims pixel pitch is not always square, but Isis does not have the ability to store + // Vims pixel pitch is not always square, but ISISdoes not have the ability to store // more than a single value for pixel pitch. Member variables for pixelPitch x and y // were created for proper calculation of ifov. if (channel == "VIS") { diff --git a/isis/src/cassini/objs/VimsCamera/VimsCamera.h b/isis/src/cassini/objs/VimsCamera/VimsCamera.h index b2052ef05d..92d09936ef 100644 --- a/isis/src/cassini/objs/VimsCamera/VimsCamera.h +++ b/isis/src/cassini/objs/VimsCamera/VimsCamera.h @@ -1,25 +1,13 @@ #ifndef VimsCamera_h #define VimsCamera_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "Camera.h" diff --git a/isis/src/cassini/objs/VimsCamera/VimsGroundMap.cpp b/isis/src/cassini/objs/VimsCamera/VimsGroundMap.cpp index 9e6343f329..eef598c496 100644 --- a/isis/src/cassini/objs/VimsCamera/VimsGroundMap.cpp +++ b/isis/src/cassini/objs/VimsCamera/VimsGroundMap.cpp @@ -1,23 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "VimsGroundMap.h" #include diff --git a/isis/src/cassini/objs/VimsCamera/VimsGroundMap.h b/isis/src/cassini/objs/VimsCamera/VimsGroundMap.h index 0f44e3be2c..d1c9b52a53 100644 --- a/isis/src/cassini/objs/VimsCamera/VimsGroundMap.h +++ b/isis/src/cassini/objs/VimsCamera/VimsGroundMap.h @@ -1,27 +1,13 @@ #ifndef VimsGroundMap_h #define VimsGroundMap_h -/** - * @file - * $Revision: 1.6 $ - * $Date: 2009/08/07 22:08:33 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "CameraGroundMap.h" @@ -125,7 +111,7 @@ namespace Isis { Possible values are IR or VIS */ double p_visExp; //!< VIS exposure duration, divided by 1000 double p_irExp; //!< IR exposure duration, divided by 1000 - int p_swathWidth; /**< SwathWidth keyword value from the instrument group of the labels. + int p_swathWidth; /**< SwathWidth keyword value from the instrument group of the labels. This will be image size unless occultation image */ int p_swathLength; /**< SwathLength keyword value from the instrument group of the labels. This will be image size unless occultation image */ diff --git a/isis/src/cassini/objs/VimsCamera/VimsSkyMap.cpp b/isis/src/cassini/objs/VimsCamera/VimsSkyMap.cpp index 16a7b8d3ea..45d306b2ba 100644 --- a/isis/src/cassini/objs/VimsCamera/VimsSkyMap.cpp +++ b/isis/src/cassini/objs/VimsCamera/VimsSkyMap.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "VimsSkyMap.h" #include diff --git a/isis/src/cassini/objs/VimsCamera/VimsSkyMap.h b/isis/src/cassini/objs/VimsCamera/VimsSkyMap.h index c59b2a0676..cd94374839 100644 --- a/isis/src/cassini/objs/VimsCamera/VimsSkyMap.h +++ b/isis/src/cassini/objs/VimsCamera/VimsSkyMap.h @@ -1,27 +1,13 @@ #ifndef VimsSkyMap_h #define VimsSkyMap_h -/** - * @file - * $Revision: 1.2 $ - * $Date: 2009/04/06 15:23:27 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "CameraSkyMap.h" @@ -55,7 +41,7 @@ namespace Isis { * @history 2013-11-18 Tracie Sucharski - Added LookDirection method to calculate unit vectors * so that old unit vector files are no longer needed. * @history 2016-08-28 Kelvin Rodriguez - Removed unused member variables to squash warnings - * in clang. Part of porting to OS X 10.11 + * in clang. Part of porting to OS X 10.11 */ class VimsSkyMap : public CameraSkyMap { public: diff --git a/isis/src/cassini/objs/VimsCamera/unitTest.cpp b/isis/src/cassini/objs/VimsCamera/unitTest.cpp index 1492f380e3..1c576dfd86 100644 --- a/isis/src/cassini/objs/VimsCamera/unitTest.cpp +++ b/isis/src/cassini/objs/VimsCamera/unitTest.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include @@ -46,9 +35,9 @@ void TestLineSamp(Camera *cam, double samp, double line); * calculated in code-the label keywords for Ir exposure and interline * delay is incorrect. The camera model is also now doing calculations * in x, y, z instead of lat, lon. - * @history 2014-06-23 Ian Humphrey - Modified hard coded /usgs/cpkgs/ paths to + * @history 2014-06-23 Ian Humphrey - Modified hard coded /usgs/cpkgs/ paths to * relative pathnames. Fixes #2054. - * @history 2015-08-12 Ian Humphrey and Makayla Shepherd - Added tests for spacecraft and + * @history 2015-08-12 Ian Humphrey and Makayla Shepherd - Added tests for spacecraft and * instrument name methods. */ int main(void) { @@ -76,7 +65,7 @@ int main(void) { // Tested separatedly: Ir Normal partial field of view -none of the C1465336166_1.ir.cub // pixels' centers intersect with the ground. // However, right around the bottom of pixel, samp:3 line:4 and top of samp:3 line:5 there - // are some intersections, which means we can get lat/lon, but we cannot back project. + // are some intersections, which means we can get lat/lon, but we cannot back project. char files[5][1024] = { "$ISISTESTDATA/isis/src/cassini/unitTestData/CM_1515951157_1.ir.cub", "$ISISTESTDATA/isis/src/cassini/unitTestData/CM_1514390782_1.ir.cub", "$ISISTESTDATA/isis/src/cassini/unitTestData/CM_1514390782_1.vis.cub", @@ -201,7 +190,7 @@ int main(void) { cout << "CK Reference ID = " << cam->CkReferenceId() << endl; cout << "SPK Target ID = " << cam->SpkTargetId() << endl; cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl; - + // Test a non-intersecting pixel double samp = 3.; double line = 4.; @@ -233,7 +222,7 @@ int main(void) { } cout << endl; - + // Test name methods cout << endl << "Testing name methods ..." << endl; cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl; @@ -266,4 +255,3 @@ void TestLineSamp(Camera *cam, double samp, double line) { cout << "DeltaLine = ERROR" << endl << endl; } } - diff --git a/isis/src/chandrayaan1/apps/chan1m32isis/chan1m32isis.cpp b/isis/src/chandrayaan1/apps/chan1m32isis/chan1m32isis.cpp index 4d51d3d48b..dc2d017ad1 100644 --- a/isis/src/chandrayaan1/apps/chan1m32isis/chan1m32isis.cpp +++ b/isis/src/chandrayaan1/apps/chan1m32isis/chan1m32isis.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "chan1m32isis.h" #include diff --git a/isis/src/chandrayaan1/apps/chan1m32isis/chan1m32isis.h b/isis/src/chandrayaan1/apps/chan1m32isis/chan1m32isis.h index d3b9d92956..72495d469c 100644 --- a/isis/src/chandrayaan1/apps/chan1m32isis/chan1m32isis.h +++ b/isis/src/chandrayaan1/apps/chan1m32isis/chan1m32isis.h @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #ifndef chan1m32isis_h #define chan1m32isis_h diff --git a/isis/src/chandrayaan1/apps/chan1m32isis/main.cpp b/isis/src/chandrayaan1/apps/chan1m32isis/main.cpp index 707aff3856..bd380e71f2 100644 --- a/isis/src/chandrayaan1/apps/chan1m32isis/main.cpp +++ b/isis/src/chandrayaan1/apps/chan1m32isis/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "chan1m32isis.h" #include "Application.h" diff --git a/isis/src/chandrayaan1/objs/Chandrayaan1M3Camera/Chandrayaan1M3Camera.cpp b/isis/src/chandrayaan1/objs/Chandrayaan1M3Camera/Chandrayaan1M3Camera.cpp index f7d43b0f53..e82256bc46 100644 --- a/isis/src/chandrayaan1/objs/Chandrayaan1M3Camera/Chandrayaan1M3Camera.cpp +++ b/isis/src/chandrayaan1/objs/Chandrayaan1M3Camera/Chandrayaan1M3Camera.cpp @@ -1,22 +1,10 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "Chandrayaan1M3Camera.h" @@ -37,10 +25,10 @@ using namespace std; namespace Isis { /** * Constructs a Chandrayaan 1 M3 Camera object using the image labels. - * + * * @ingroup SpiceInstrumentsAndCameras * @ingroup MarsReconnaissanceOrbiter - * + * * @author 2013-08-18 Stuart Sides and Tracie Sucharski * * @internal @@ -92,7 +80,7 @@ namespace Isis { // Setup distortion map - new Chandrayaan1M3DistortionMap(this, + new Chandrayaan1M3DistortionMap(this, getDouble(ppKey, 0), getDouble(ppKey, 1), getDouble(odKey, 0), getDouble(odKey, 1), getDouble(odKey, 2), getDouble(decenterKey, 0), getDouble(decenterKey, 1)); @@ -108,12 +96,12 @@ namespace Isis { /** - * This is the function that is called in order to instantiate an Chandrayaan1M3Camera object. + * This is the function that is called in order to instantiate an Chandrayaan1M3Camera object. * * @param lab Cube labels * - * @return Isis::Camera* Chandrayaan1M3Camera - * + * @return Isis::Camera* Chandrayaan1M3Camera + * */ extern "C" Isis::Camera *Chandrayaan1M3CameraPlugin(Isis::Cube &cube) { return new Isis::Chandrayaan1M3Camera(cube); diff --git a/isis/src/chandrayaan1/objs/Chandrayaan1M3Camera/Chandrayaan1M3Camera.h b/isis/src/chandrayaan1/objs/Chandrayaan1M3Camera/Chandrayaan1M3Camera.h index bd0002c79d..6edf477d16 100644 --- a/isis/src/chandrayaan1/objs/Chandrayaan1M3Camera/Chandrayaan1M3Camera.h +++ b/isis/src/chandrayaan1/objs/Chandrayaan1M3Camera/Chandrayaan1M3Camera.h @@ -1,25 +1,13 @@ #ifndef Chandrayaan1M3Camera_h #define Chandrayaan1M3Camera_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "LineScanCamera.h" @@ -38,11 +26,11 @@ namespace Isis { * @history 2015-08-11 Ian Humphrey and Makayla Shepherd - Added new data members and methods * to get spacecraft and instrument names. Extended unit test to test * these methods. - * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument + * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument * members and methods and removed implementation of these methods * since Camera now handles this. References #2335. * @history 2016-08-01 Kristin Berry - Added to unitTest to test camera model performance on - * level 2 cubes and to test RA/DEC values. References #2400. + * level 2 cubes and to test RA/DEC values. References #2400. */ class Chandrayaan1M3Camera : public LineScanCamera { public: @@ -53,23 +41,23 @@ namespace Isis { /** * CK frame ID - - Instrument Code from spacit run on CK - * - * @return @b int The appropriate instrument code for the "Camera-matrix" + * + * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Frame ID */ virtual int CkFrameId() const { return (-86000); } - /** + /** * CK Reference ID - J2000 - * + * * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Reference ID */ virtual int CkReferenceId() const { return (1); } - /** + /** * SPK Reference ID - J2000 - * + * * @return @b int The appropriate instrument code for the Spacecraft * Kernel Reference ID */ diff --git a/isis/src/chandrayaan1/objs/Chandrayaan1M3Camera/Chandrayaan1M3DistortionMap.cpp b/isis/src/chandrayaan1/objs/Chandrayaan1M3Camera/Chandrayaan1M3DistortionMap.cpp index 50a2a815b0..6849a7d71f 100644 --- a/isis/src/chandrayaan1/objs/Chandrayaan1M3Camera/Chandrayaan1M3DistortionMap.cpp +++ b/isis/src/chandrayaan1/objs/Chandrayaan1M3Camera/Chandrayaan1M3DistortionMap.cpp @@ -1,25 +1,10 @@ -/** - * @file - * $Revision: 1.19 $ - * $Date: 2010/03/22 19:44:53 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include @@ -107,10 +92,10 @@ namespace Isis { double xdistortion, ydistortion; double xdistorted, ydistorted; double xprevious, yprevious; - + // dr is the radial distortion contribution // dtx and dty are the decentering distortion contributions in x and y - + xprevious = 1000000.0; yprevious = 1000000.0; diff --git a/isis/src/chandrayaan1/objs/Chandrayaan1M3Camera/Chandrayaan1M3DistortionMap.h b/isis/src/chandrayaan1/objs/Chandrayaan1M3Camera/Chandrayaan1M3DistortionMap.h index b563d8e6c1..f894a37ddd 100644 --- a/isis/src/chandrayaan1/objs/Chandrayaan1M3Camera/Chandrayaan1M3DistortionMap.h +++ b/isis/src/chandrayaan1/objs/Chandrayaan1M3Camera/Chandrayaan1M3DistortionMap.h @@ -1,28 +1,13 @@ #ifndef Chandrayaan1M3DistortionMap_h #define Chandrayaan1M3DistortionMap_h -/** - * @file - * $Revision: 1.17 $ - * $Date: 2010/03/22 19:44:53 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "Camera.h" @@ -43,7 +28,7 @@ namespace Isis { * @internal * @history 2013-11-24 Stuart Sides - Modified from ApolloMetricDistortionMap * @history 2016-08-28 Kelvin Rodriguez - Removed unused member variable p_p3 to squash warnings - * in clang. Part of porting to OS X 10.11 + * in clang. Part of porting to OS X 10.11 * */ diff --git a/isis/src/chandrayaan1/objs/Chandrayaan1M3Camera/unitTest.cpp b/isis/src/chandrayaan1/objs/Chandrayaan1M3Camera/unitTest.cpp index 2e80942e71..8b8a22b9c5 100644 --- a/isis/src/chandrayaan1/objs/Chandrayaan1M3Camera/unitTest.cpp +++ b/isis/src/chandrayaan1/objs/Chandrayaan1M3Camera/unitTest.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -59,7 +48,7 @@ int main(void) { cout << "CK Reference ID = " << cam->CkReferenceId() << endl; cout << "SPK Target ID = " << cam->SpkTargetId() << endl; cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl; - + // Test name methods cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl; cout << "Spacecraft Name Short: " << cam->spacecraftNameShort() << endl; @@ -103,8 +92,8 @@ int main(void) { } cout << "RightAscension = " << cam->RightAscension() << endl; - cout << "Declination = " << cam->Declination() << endl; - + cout << "Declination = " << cam->Declination() << endl; + } catch (IException &e) { e.print(); @@ -132,4 +121,3 @@ void TestLineSamp(Camera *cam, double samp, double line) { cout << "DeltaLine = ERROR" << endl << endl; } } - diff --git a/isis/src/clementine/apps/clem2isis/bitstrm.cpp b/isis/src/clementine/apps/clem2isis/bitstrm.cpp index 9b2f565e1c..27a50ec128 100644 --- a/isis/src/clementine/apps/clem2isis/bitstrm.cpp +++ b/isis/src/clementine/apps/clem2isis/bitstrm.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + /* * THIS ROUTINE IS PART OF THE CLEMENTINE PDS FILE READER PROGRAM. * IT WAS WRITTEN BY ACT CORP. IN DIRECT SUPPORT TO THE diff --git a/isis/src/clementine/apps/clem2isis/decomp.cpp b/isis/src/clementine/apps/clem2isis/decomp.cpp index 10c05261e9..e928c1a8c7 100644 --- a/isis/src/clementine/apps/clem2isis/decomp.cpp +++ b/isis/src/clementine/apps/clem2isis/decomp.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + /* * THIS ROUTINE IS PART OF THE CLEMENTINE PDS FILE READER PROGRAM. * IT WAS WRITTEN BY ACT CORP. IN DIRECT SUPPORT TO THE diff --git a/isis/src/clementine/apps/clem2isis/huffman.cpp b/isis/src/clementine/apps/clem2isis/huffman.cpp index 51ef4efbbe..0bef18e340 100644 --- a/isis/src/clementine/apps/clem2isis/huffman.cpp +++ b/isis/src/clementine/apps/clem2isis/huffman.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + /* * THIS ROUTINE IS PART OF THE CLEMENTINE PDS FILE READER PROGRAM. * IT WAS WRITTEN BY ACT CORP. IN DIRECT SUPPORT TO THE diff --git a/isis/src/clementine/apps/clem2isis/jpeg_c.h b/isis/src/clementine/apps/clem2isis/jpeg_c.h index 1aeaeb79db..205f3b14d2 100644 --- a/isis/src/clementine/apps/clem2isis/jpeg_c.h +++ b/isis/src/clementine/apps/clem2isis/jpeg_c.h @@ -1,6 +1,14 @@ #ifndef jpeg_c_h #define jpeg_c_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + /* Structure Definitions */ enum FmodeDef { INPUT, OUTPUT }; typedef enum FmodeDef Fmode; diff --git a/isis/src/clementine/apps/clem2isis/main.cpp b/isis/src/clementine/apps/clem2isis/main.cpp index e7a03a6bb3..6e7435f82f 100755 --- a/isis/src/clementine/apps/clem2isis/main.cpp +++ b/isis/src/clementine/apps/clem2isis/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include @@ -91,7 +99,7 @@ void writeLine(Buffer &b) { * Function to propagate the labels. * * @internal - * @history 2009-02-17 Tracie Sucharski - Added BandBin keywords Center and + * @history 2009-02-17 Tracie Sucharski - Added BandBin keywords Center and * Width to the translation table, Clementine.trn. Do not alter this * keywords for filter F, simply translate. * diff --git a/isis/src/clementine/apps/clem2isis/pds.cpp b/isis/src/clementine/apps/clem2isis/pds.cpp index aa922307ef..659f72550d 100644 --- a/isis/src/clementine/apps/clem2isis/pds.cpp +++ b/isis/src/clementine/apps/clem2isis/pds.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + /* * THIS ROUTINE IS PART OF THE CLEMENTINE PDS FILE READER PROGRAM. * IT WAS WRITTEN BY ACT CORP. IN DIRECT SUPPORT TO THE @@ -532,4 +540,3 @@ void PCshort2SUNshortVector(unsigned short invec[], int npts) { } } #endif - diff --git a/isis/src/clementine/apps/clem2isis/pds.h b/isis/src/clementine/apps/clem2isis/pds.h index 79d316f7d4..f063ac2988 100644 --- a/isis/src/clementine/apps/clem2isis/pds.h +++ b/isis/src/clementine/apps/clem2isis/pds.h @@ -1,6 +1,14 @@ #ifndef pds_h #define pds_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #if defined(__BORLANDC__) && !defined(__WIN32__) #define CHARH unsigned char huge #else diff --git a/isis/src/clementine/apps/clemhirescal/main.cpp b/isis/src/clementine/apps/clemhirescal/main.cpp index 157abfba28..ecdbec6306 100644 --- a/isis/src/clementine/apps/clemhirescal/main.cpp +++ b/isis/src/clementine/apps/clemhirescal/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "Cube.h" diff --git a/isis/src/clementine/apps/clemnircal/main.cpp b/isis/src/clementine/apps/clemnircal/main.cpp index 9a1d43dce8..1ca06312f1 100644 --- a/isis/src/clementine/apps/clemnircal/main.cpp +++ b/isis/src/clementine/apps/clemnircal/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "ProcessByLine.h" #include "Pixel.h" diff --git a/isis/src/clementine/apps/clemnirclean/main.cpp b/isis/src/clementine/apps/clemnirclean/main.cpp index 59a1b68bc6..3c434ce958 100644 --- a/isis/src/clementine/apps/clemnirclean/main.cpp +++ b/isis/src/clementine/apps/clemnirclean/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "Application.h" @@ -20,47 +28,47 @@ void IsisMain() { p.AddToPipeline("noisefilter", "noisefilter1"); p.Application("noisefilter1").SetInputParameter("FROM", true); p.Application("noisefilter1").SetOutputParameter("TO", "box1"); - p.Application("noisefilter1").AddConstParameter("toldef", "stddev"); - p.Application("noisefilter1").AddConstParameter("tolmin", "1.25"); - p.Application("noisefilter1").AddConstParameter("tolmax", "1.25"); - p.Application("noisefilter1").AddConstParameter("samples", "3"); - p.Application("noisefilter1").AddConstParameter("lines", "3"); - p.Application("noisefilter1").AddConstParameter("replace", "null"); + p.Application("noisefilter1").AddConstParameter("toldef", "stddev"); + p.Application("noisefilter1").AddConstParameter("tolmin", "1.25"); + p.Application("noisefilter1").AddConstParameter("tolmax", "1.25"); + p.Application("noisefilter1").AddConstParameter("samples", "3"); + p.Application("noisefilter1").AddConstParameter("lines", "3"); + p.Application("noisefilter1").AddConstParameter("replace", "null"); // Run lowpass on the cube using outside filter, 3x3 boxcar p.AddToPipeline("lowpass", "lowpass1"); p.Application("lowpass1").SetInputParameter("FROM", true); p.Application("lowpass1").SetOutputParameter("TO", "box2"); - p.Application("lowpass1").AddConstParameter("samples", "3"); - p.Application("lowpass1").AddConstParameter("lines", "3"); - p.Application("lowpass1").AddConstParameter("filter", "outside"); + p.Application("lowpass1").AddConstParameter("samples", "3"); + p.Application("lowpass1").AddConstParameter("lines", "3"); + p.Application("lowpass1").AddConstParameter("filter", "outside"); // Run lowpass on the cube using outside filter, 3x3 boxcar p.AddToPipeline("lowpass", "lowpass2"); p.Application("lowpass2").SetInputParameter("FROM", true); p.Application("lowpass2").SetOutputParameter("TO", "box3"); - p.Application("lowpass2").AddConstParameter("samples", "3"); - p.Application("lowpass2").AddConstParameter("lines", "3"); - p.Application("lowpass2").AddConstParameter("filter", "outside"); + p.Application("lowpass2").AddConstParameter("samples", "3"); + p.Application("lowpass2").AddConstParameter("lines", "3"); + p.Application("lowpass2").AddConstParameter("filter", "outside"); // Run lowpass on the cube using outside filter, 3x3 boxcar p.AddToPipeline("noisefilter", "noisefilter2"); p.Application("noisefilter2").SetInputParameter("FROM", true); p.Application("noisefilter2").SetOutputParameter("TO", "box4"); - p.Application("noisefilter2").AddConstParameter("toldef", "stddev"); - p.Application("noisefilter2").AddConstParameter("tolmin", "1.5"); - p.Application("noisefilter2").AddConstParameter("tolmax", "1.5"); - p.Application("noisefilter2").AddConstParameter("samples", "3"); - p.Application("noisefilter2").AddConstParameter("lines", "3"); + p.Application("noisefilter2").AddConstParameter("toldef", "stddev"); + p.Application("noisefilter2").AddConstParameter("tolmin", "1.5"); + p.Application("noisefilter2").AddConstParameter("tolmax", "1.5"); + p.Application("noisefilter2").AddConstParameter("samples", "3"); + p.Application("noisefilter2").AddConstParameter("lines", "3"); p.Application("noisefilter2").AddConstParameter("nullisnoise", "yes"); // Run lowpass on the cube using outside filter, 3x3 boxcar p.AddToPipeline("lowpass", "lowpass3"); p.Application("lowpass3").SetInputParameter("FROM", true); p.Application("lowpass3").SetOutputParameter("TO", "box5"); - p.Application("lowpass3").AddConstParameter("samples", "5"); - p.Application("lowpass3").AddConstParameter("lines", "5"); - p.Application("lowpass3").AddConstParameter("filter", "outside"); + p.Application("lowpass3").AddConstParameter("samples", "5"); + p.Application("lowpass3").AddConstParameter("lines", "5"); + p.Application("lowpass3").AddConstParameter("filter", "outside"); p.Run(); } diff --git a/isis/src/clementine/apps/clemnirnoise/main.cpp b/isis/src/clementine/apps/clemnirnoise/main.cpp index 8ecdee6079..fb862dd09b 100644 --- a/isis/src/clementine/apps/clemnirnoise/main.cpp +++ b/isis/src/clementine/apps/clemnirnoise/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include diff --git a/isis/src/clementine/apps/clemuvviscal/main.cpp b/isis/src/clementine/apps/clemuvviscal/main.cpp index d6e18ab220..1df043e9dc 100644 --- a/isis/src/clementine/apps/clemuvviscal/main.cpp +++ b/isis/src/clementine/apps/clemuvviscal/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include diff --git a/isis/src/clementine/objs/HiresCamera/HiresCamera.cpp b/isis/src/clementine/objs/HiresCamera/HiresCamera.cpp index d448898604..75cdfaf3a6 100644 --- a/isis/src/clementine/objs/HiresCamera/HiresCamera.cpp +++ b/isis/src/clementine/objs/HiresCamera/HiresCamera.cpp @@ -1,22 +1,10 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "HiresCamera.h" @@ -44,14 +32,14 @@ namespace Isis { * call to ShutterOpenCloseTimes() method. Changed * centertime to add half exposure duration to start * time to maintain consistency with other Clementine - * models. + * models. */ HiresCamera::HiresCamera(Cube &cube) : FramingCamera(cube) { m_instrumentNameLong = "High Resolution Camera"; m_instrumentNameShort = "HiRES"; m_spacecraftNameLong = "Clementine 1"; m_spacecraftNameShort = "Clementine1"; - + NaifStatus::CheckErrors(); Pvl &lab = *cube.label(); // Get the camera characteristics @@ -76,7 +64,7 @@ namespace Isis { * clementine camera models. Not sure why the following was originally * commented out: * 2010-08-05 Jeannie Walldren - ***********************************************************************/ + ***********************************************************************/ // Do not correct time for center of the exposure duration. This is because // the kernels were built to accept the start times of the images. iTime centerTime = shuttertimes.first.Et() + exposureDuration / 2.0; @@ -142,7 +130,7 @@ namespace Isis { * @param lab Cube labels * * @return Isis::Camera* HiresCamera - * @internal + * @internal * @history 2011-05-03 Jeannie Walldren - Added documentation. Removed * Clementine namespace. */ diff --git a/isis/src/clementine/objs/HiresCamera/HiresCamera.h b/isis/src/clementine/objs/HiresCamera/HiresCamera.h index f9d84f0890..4d5e35f8fd 100644 --- a/isis/src/clementine/objs/HiresCamera/HiresCamera.h +++ b/isis/src/clementine/objs/HiresCamera/HiresCamera.h @@ -1,24 +1,13 @@ #ifndef HiresCamera_h #define HiresCamera_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "FramingCamera.h" @@ -28,17 +17,17 @@ namespace Isis { * * @ingroup SpiceInstrumentsAndCameras * @ingroup Clementine - * - * @see + * + * @see * http://astrogeology.usgs.gov/Projects/Clementine/nasaclem/sensors/hires/hires.html - * @see + * @see * http://astrogeology.usgs.gov/Projects/Clementine/nasaclem/clemhome.html - * @see http://pds-imaging.jpl.nasa.gov/portal/clementine_mission.html + * @see http://pds-imaging.jpl.nasa.gov/portal/clementine_mission.html * @see http://astrogeology.usgs.gov/Missions/Clementine * * @author 2009-01-16 Tracie Sucharski * - * @internal + * @internal * @history 2009-01-21 Tracie Sucharski - Original version * @history 2009-08-28 Steven Lambright - Changed inheritance to no longer * inherit directly from Camera. Camera is now pure @@ -56,12 +45,12 @@ namespace Isis { * constructor. Changed centertime in constructor to * add half exposure duration to start time to * maintain consistency with other Clementine models. - * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis + * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis * coding standards. References #972. * @history 2015-08-12 Ian Humphrey and Makayla Shepherd - Added new data members and methods * to get spacecraft and instrument names. Extended unit test to test * these methods. - * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument + * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument * members and methods and removed implementation of these methods * since Camera now handles this. References #2335. */ @@ -70,28 +59,28 @@ namespace Isis { HiresCamera(Cube &cube); //! Destroys the HiresCamera object. ~HiresCamera() {}; - virtual std::pair ShutterOpenCloseTimes(double time, + virtual std::pair ShutterOpenCloseTimes(double time, double exposureDuration); /** * CK frame ID - - Instrument Code from spacit run on CK - * - * @return @b int The appropriate instrument code for the "Camera-matrix" + * + * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Frame ID */ virtual int CkFrameId() const { return (-40000); } - /** + /** * CK Reference ID - J2000 - * + * * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Reference ID */ virtual int CkReferenceId() const { return (1); } - /** + /** * SPK Reference ID - J2000 - * + * * @return @b int The appropriate instrument code for the Spacecraft * Kernel Reference ID */ diff --git a/isis/src/clementine/objs/HiresCamera/unitTest.cpp b/isis/src/clementine/objs/HiresCamera/unitTest.cpp index 9505cdfb6d..a41cf3ba17 100644 --- a/isis/src/clementine/objs/HiresCamera/unitTest.cpp +++ b/isis/src/clementine/objs/HiresCamera/unitTest.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -59,7 +48,7 @@ int main(void) { cout << "SPK Target ID = " << cam->SpkTargetId() << endl; cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl; - // Test Shutter Open/Close + // Test Shutter Open/Close const PvlGroup &inst = c.label()->findGroup("Instrument", Pvl::Traverse); double exposureDuration = ((double) inst["ExposureDuration"])/1000; QString stime = inst["StartTime"]; @@ -104,7 +93,7 @@ int main(void) { else { cout << setprecision(16) << "Longitude off by: " << cam->UniversalLongitude() - knownLon << endl; } - + // Test name methods cout << endl << endl << "Testing name methods ..." << endl; cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl; @@ -137,4 +126,3 @@ void TestLineSamp(Camera *cam, double samp, double line) { cout << "DeltaLine = ERROR" << endl << endl; } } - diff --git a/isis/src/clementine/objs/LwirCamera/LwirCamera.cpp b/isis/src/clementine/objs/LwirCamera/LwirCamera.cpp index e62819a828..4a302ca216 100644 --- a/isis/src/clementine/objs/LwirCamera/LwirCamera.cpp +++ b/isis/src/clementine/objs/LwirCamera/LwirCamera.cpp @@ -1,22 +1,10 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "LwirCamera.h" diff --git a/isis/src/clementine/objs/LwirCamera/LwirCamera.h b/isis/src/clementine/objs/LwirCamera/LwirCamera.h index a72fe386c7..d7516feaa8 100644 --- a/isis/src/clementine/objs/LwirCamera/LwirCamera.h +++ b/isis/src/clementine/objs/LwirCamera/LwirCamera.h @@ -1,24 +1,13 @@ #ifndef LwirCamera_h #define LwirCamera_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "FramingCamera.h" @@ -28,12 +17,12 @@ namespace Isis { * * @ingroup SpiceInstrumentsAndCameras * @ingroup Clementine - * - * @see + * + * @see * http://astrogeology.usgs.gov/Projects/Clementine/nasaclem/sensors/lwir/lwir.html - * @see + * @see * http://astrogeology.usgs.gov/Projects/Clementine/nasaclem/clemhome.html - * @see http://pds-imaging.jpl.nasa.gov/portal/clementine_mission.html + * @see http://pds-imaging.jpl.nasa.gov/portal/clementine_mission.html * @see http://astrogeology.usgs.gov/Missions/Clementine * * @author 2009-01-16 Jeannie Walldren @@ -56,12 +45,12 @@ namespace Isis { * constructor. Changed centertime in constructor to * add half exposure duration to start time to * maintain consistency with other Clementine models. - * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis + * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis * coding standards. References #972. * @history 2015-08-12 Ian Humphrey and Makayla Shepherd - Added new data members and methods * to get spacecraft and instrument names. Extended unit test to test * these methods. - * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument + * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument * members and methods and removed implementation of these methods * since Camera now handles this. References #2335. */ @@ -75,23 +64,23 @@ namespace Isis { /** * CK frame ID - - Instrument Code from spacit run on CK - * - * @return @b int The appropriate instrument code for the "Camera-matrix" + * + * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Frame ID */ virtual int CkFrameId() const { return (-40000); } - /** + /** * CK Reference ID - J2000 - * + * * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Reference ID */ virtual int CkReferenceId() const { return (1); } - /** + /** * SPK Reference ID - J2000 - * + * * @return @b int The appropriate instrument code for the Spacecraft * Kernel Reference ID */ diff --git a/isis/src/clementine/objs/LwirCamera/unitTest.cpp b/isis/src/clementine/objs/LwirCamera/unitTest.cpp index 4062cc3d93..972b229d05 100644 --- a/isis/src/clementine/objs/LwirCamera/unitTest.cpp +++ b/isis/src/clementine/objs/LwirCamera/unitTest.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -59,7 +48,7 @@ int main(void) { cout << "SPK Target ID = " << cam->SpkTargetId() << endl; cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl; - // Test Shutter Open/Close + // Test Shutter Open/Close const PvlGroup &inst = c.label()->findGroup("Instrument", Pvl::Traverse); double exposureDuration = ((double) inst["ExposureDuration"])/1000; QString stime = inst["StartTime"]; @@ -104,7 +93,7 @@ int main(void) { else { cout << setprecision(16) << "Longitude off by: " << cam->UniversalLongitude() - knownCenterLon << endl; } - + // Test name methods cout << endl << endl << "Testing name methods ..." << endl; cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl; @@ -137,4 +126,3 @@ void TestLineSamp(Camera *cam, double samp, double line) { cout << "DeltaLine = ERROR" << endl << endl; } } - diff --git a/isis/src/clementine/objs/NirCamera/NirCamera.cpp b/isis/src/clementine/objs/NirCamera/NirCamera.cpp index 3f8ffc60f1..dd04a3bb3c 100644 --- a/isis/src/clementine/objs/NirCamera/NirCamera.cpp +++ b/isis/src/clementine/objs/NirCamera/NirCamera.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "NirCamera.h" #include @@ -50,7 +39,7 @@ namespace Isis { m_instrumentNameShort = "NIR"; m_spacecraftNameLong = "Clementine 1"; m_spacecraftNameShort = "Clementine1"; - + NaifStatus::CheckErrors(); // Get the camera characteristics diff --git a/isis/src/clementine/objs/NirCamera/NirCamera.h b/isis/src/clementine/objs/NirCamera/NirCamera.h index b00e3b4acd..53cf085e40 100644 --- a/isis/src/clementine/objs/NirCamera/NirCamera.h +++ b/isis/src/clementine/objs/NirCamera/NirCamera.h @@ -1,41 +1,30 @@ #ifndef NirCamera_h #define NirCamera_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "FramingCamera.h" namespace Isis { /** - * This is the camera model for the Clementine Near Infrared Camera + * This is the camera model for the Clementine Near Infrared Camera * * @ingroup SpiceInstrumentsAndCameras * @ingroup Clementine - * - * @see + * + * @see * http://astrogeology.usgs.gov/Projects/Clementine/nasaclem/sensors/nir/nir.html - * @see + * @see * http://astrogeology.usgs.gov/Projects/Clementine/nasaclem/clemhome.html - * @see http://pds-imaging.jpl.nasa.gov/portal/clementine_mission.html + * @see http://pds-imaging.jpl.nasa.gov/portal/clementine_mission.html * @see http://astrogeology.usgs.gov/Missions/Clementine - * + * * @author 2007-07-10 Steven Lambright * * @internal @@ -63,12 +52,12 @@ namespace Isis { * constructor. Changed centertime in constructor to * add half exposure duration to start time to * maintain consistency with other Clementine models. - * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis + * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis * coding standards. References #972. * @history 2015-08-12 Ian Humphrey and Makayla Shepherd - Added new data members and methods * to get spacecraft and instrument names. Extended unit test to test * these methods. - * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument + * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument * members and methods and removed implementation of these methods * since Camera now handles this. References #2335. */ @@ -77,28 +66,28 @@ namespace Isis { NirCamera(Cube &cube); //! Destroys the NirCamera object ~NirCamera() {}; - virtual std::pair ShutterOpenCloseTimes(double time, + virtual std::pair ShutterOpenCloseTimes(double time, double exposureDuration); /** * CK frame ID - - Instrument Code from spacit run on CK - * - * @return @b int The appropriate instrument code for the "Camera-matrix" + * + * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Frame ID */ virtual int CkFrameId() const { return (-40000); } - /** + /** * CK Reference ID - J2000 - * + * * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Reference ID */ virtual int CkReferenceId() const { return (1); } - /** + /** * SPK Reference ID - J2000 - * + * * @return @b int The appropriate instrument code for the Spacecraft * Kernel Reference ID */ diff --git a/isis/src/clementine/objs/NirCamera/unitTest.cpp b/isis/src/clementine/objs/NirCamera/unitTest.cpp index 53f9614475..1f85ad0bda 100644 --- a/isis/src/clementine/objs/NirCamera/unitTest.cpp +++ b/isis/src/clementine/objs/NirCamera/unitTest.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -59,7 +48,7 @@ int main(void) { cout << "SPK Target ID = " << cam->SpkTargetId() << endl; cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl; - // Test Shutter Open/Close + // Test Shutter Open/Close const PvlGroup &inst = c.label()->findGroup("Instrument", Pvl::Traverse); double exposureDuration = ((double) inst["ExposureDuration"])/1000; QString stime = inst["StartTime"]; @@ -104,7 +93,7 @@ int main(void) { else { cout << setprecision(16) << "Longitude off by: " << cam->UniversalLongitude() - knownLon << endl; } - + // Test name methods cout << endl << endl << "Testing name methods ..." << endl; cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl; @@ -137,4 +126,3 @@ void TestLineSamp(Camera *cam, double samp, double line) { cout << "DeltaLine = ERROR" << endl << endl; } } - diff --git a/isis/src/clementine/objs/UvvisCamera/ClementineUvvisDistortionMap.cpp b/isis/src/clementine/objs/UvvisCamera/ClementineUvvisDistortionMap.cpp index 047eb050fe..680bf9a78d 100755 --- a/isis/src/clementine/objs/UvvisCamera/ClementineUvvisDistortionMap.cpp +++ b/isis/src/clementine/objs/UvvisCamera/ClementineUvvisDistortionMap.cpp @@ -1,25 +1,10 @@ -/** - * @file - * $Revision: 1.19 $ - * $Date: 2010/03/22 19:44:53 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include @@ -29,22 +14,22 @@ using namespace std; namespace Isis { - /** - * Construct a distortion map for the Clementine UVVIS instrument. - * - * @param parent Camera object corresponding to this distortion map. + /** + * Construct a distortion map for the Clementine UVVIS instrument. + * + * @param parent Camera object corresponding to this distortion map. * @param xp The x coordinate for the principal point offset. - * @param yp The y coordinate for the principal point offset. - * @param k1 The constant term coefficient for the radial distortion + * @param yp The y coordinate for the principal point offset. + * @param k1 The constant term coefficient for the radial distortion * contribution polynomial. - * @param k2 The linear term coefficient for the radial distortion + * @param k2 The linear term coefficient for the radial distortion * contribution polynomial. - * @param k3 The quadratic term coefficient for the radial distortion + * @param k3 The quadratic term coefficient for the radial distortion * contribution polynomial. * @param p1 First decentering distortion term. * @param p2 Second decentering distortion term. - * - */ + * + */ ClementineUvvisDistortionMap::ClementineUvvisDistortionMap(Camera *parent, double xp, double yp, double k1, double k2, double k3, @@ -62,9 +47,9 @@ namespace Isis { } - /** - * Deconstruct the distortion map for the Clementine UVVIS instrument. - */ + /** + * Deconstruct the distortion map for the Clementine UVVIS instrument. + */ ClementineUvvisDistortionMap::~ClementineUvvisDistortionMap() { } @@ -132,10 +117,10 @@ namespace Isis { double xdistortion, ydistortion; double xdistorted, ydistorted; double xprevious, yprevious; - + // dr is the radial distortion contribution // dtx and dty are the decentering distortion contributions in x and y - + xprevious = 1000000.0; yprevious = 1000000.0; diff --git a/isis/src/clementine/objs/UvvisCamera/ClementineUvvisDistortionMap.h b/isis/src/clementine/objs/UvvisCamera/ClementineUvvisDistortionMap.h index 78453cb8c6..ec4dc4ae4e 100644 --- a/isis/src/clementine/objs/UvvisCamera/ClementineUvvisDistortionMap.h +++ b/isis/src/clementine/objs/UvvisCamera/ClementineUvvisDistortionMap.h @@ -1,29 +1,13 @@ #ifndef ClementineUvvisDistortionMap_h #define ClementineUvvisDistortionMap_h -/** - * @file - * $Revision: 1.17 $ - * $Date: 2010/03/22 19:44:53 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "Camera.h" #include "CameraDistortionMap.h" diff --git a/isis/src/clementine/objs/UvvisCamera/UvvisCamera.cpp b/isis/src/clementine/objs/UvvisCamera/UvvisCamera.cpp index 2e8189e6e4..7c7f73e1ea 100755 --- a/isis/src/clementine/objs/UvvisCamera/UvvisCamera.cpp +++ b/isis/src/clementine/objs/UvvisCamera/UvvisCamera.cpp @@ -1,22 +1,10 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "UvvisCamera.h" @@ -36,10 +24,10 @@ using namespace std; namespace Isis { /** * Constructs a Clementine UV/VIS Model using the image labels. - * - * @param lab Pvl label from a Clementine UVVIS image. - * - * @internal + * + * @param lab Pvl label from a Clementine UVVIS image. + * + * @internal * @history 2011-05-03 Jeannie Walldren - Added NAIF error check. Added * call to ShutterOpenCloseTimes() method. */ @@ -48,7 +36,7 @@ namespace Isis { m_instrumentNameShort = "UVVIS"; m_spacecraftNameLong = "Clementine 1"; m_spacecraftNameShort = "Clementine1"; - + NaifStatus::CheckErrors(); // Get the camera characteristics SetFocalLength(); @@ -74,9 +62,9 @@ namespace Isis { CameraFocalPlaneMap *focalMap = new CameraFocalPlaneMap(this, naifIkCode()); focalMap->SetDetectorOrigin( - Spice::getDouble("INS" + toString(naifIkCode()) + + Spice::getDouble("INS" + toString(naifIkCode()) + "_BORESIGHT_SAMPLE"), - Spice::getDouble("INS" + toString(naifIkCode()) + + Spice::getDouble("INS" + toString(naifIkCode()) + "_BORESIGHT_LINE")); QString ppKey("INS" + toString(naifIkCode()) + "_PP"); @@ -84,7 +72,7 @@ namespace Isis { QString decenterKey("INS" + toString(naifIkCode()) + "_DECENTER"); // Setup distortion map - new ClementineUvvisDistortionMap(this, + new ClementineUvvisDistortionMap(this, getDouble(ppKey, 0), getDouble(ppKey, 1), getDouble(odKey, 0), getDouble(odKey, 1), getDouble(odKey, 2), getDouble(decenterKey, 0), getDouble(decenterKey, 1)); @@ -137,7 +125,7 @@ namespace Isis { * @param lab Cube labels * * @return Isis::Camera* UvvisCamera - * @internal + * @internal * @history 2011-05-03 Jeannie Walldren - Added documentation. Removed * Clementine namespace. */ diff --git a/isis/src/clementine/objs/UvvisCamera/UvvisCamera.h b/isis/src/clementine/objs/UvvisCamera/UvvisCamera.h index 0b90136221..d752b6da63 100644 --- a/isis/src/clementine/objs/UvvisCamera/UvvisCamera.h +++ b/isis/src/clementine/objs/UvvisCamera/UvvisCamera.h @@ -1,41 +1,30 @@ #ifndef UvvisCamera_h #define UvvisCamera_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "FramingCamera.h" namespace Isis { /** - * This is the camera model for the Clementine Ultraviolet/Visible Camera + * This is the camera model for the Clementine Ultraviolet/Visible Camera * * @ingroup SpiceInstrumentsAndCameras * @ingroup Clementine - * - * @see + * + * @see * http://astrogeology.usgs.gov/Projects/Clementine/nasaclem/sensors/uvvis/uvvis.html - * @see + * @see * http://astrogeology.usgs.gov/Projects/Clementine/nasaclem/clemhome.html - * @see http://pds-imaging.jpl.nasa.gov/portal/clementine_mission.html + * @see http://pds-imaging.jpl.nasa.gov/portal/clementine_mission.html * @see http://astrogeology.usgs.gov/Missions/Clementine - * + * * @author 2007-07-10 Tracie Sucharski * * @internal @@ -64,12 +53,12 @@ namespace Isis { * namespace wrap with Isis namespace. Added Isis * Disclaimer to files. Added NAIF error check to * constructor. - * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis + * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis * coding standards. References #972. * @history 2015-08-12 Ian Humphrey and Makayla Shepherd - Added new data members and methods * to get spacecraft and instrument names. Extended unit test to test * these methods. - * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument + * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument * members and methods and removed implementation of these methods * since Camera now handles this. References #2335. * @history 2017-12-27 Jeff Anderson & Victor Silva - Added instrument specific distortion @@ -82,28 +71,28 @@ namespace Isis { UvvisCamera(Cube &cube); //! Destroys the UvvisCamera object. ~UvvisCamera() {}; - virtual std::pair ShutterOpenCloseTimes(double time, + virtual std::pair ShutterOpenCloseTimes(double time, double exposureDuration); /** * CK frame ID - - Instrument Code from spacit run on CK - * - * @return @b int The appropriate instrument code for the "Camera-matrix" + * + * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Frame ID */ virtual int CkFrameId() const { return (-40000); } - /** + /** * CK Reference ID - J2000 - * + * * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Reference ID */ virtual int CkReferenceId() const { return (1); } - /** + /** * SPK Reference ID - J2000 - * + * * @return @b int The appropriate instrument code for the Spacecraft * Kernel Reference ID */ diff --git a/isis/src/clementine/objs/UvvisCamera/unitTest.cpp b/isis/src/clementine/objs/UvvisCamera/unitTest.cpp index 33f7179d5c..742319f655 100644 --- a/isis/src/clementine/objs/UvvisCamera/unitTest.cpp +++ b/isis/src/clementine/objs/UvvisCamera/unitTest.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -64,7 +53,7 @@ int main(void) { cout << "SPK Target ID = " << cam->SpkTargetId() << endl; cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl; - // Test Shutter Open/Close + // Test Shutter Open/Close const PvlGroup &inst = c.label()->findGroup("Instrument", Pvl::Traverse); double exposureDuration = ((double) inst["ExposureDuration"])/1000; QString stime = inst["StartTime"]; @@ -109,7 +98,7 @@ int main(void) { else { cout << setprecision(16) << "Longitude off by: " << cam->UniversalLongitude() - knownLon << endl; } - + // Test name methods cout << endl << endl << "Testing name methods ..." << endl; cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl; diff --git a/isis/src/clipper/apps/eis2isis/main.cpp b/isis/src/clipper/apps/eis2isis/main.cpp index 3eaa4e11a3..fa1fd8fcde 100644 --- a/isis/src/clipper/apps/eis2isis/main.cpp +++ b/isis/src/clipper/apps/eis2isis/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "CSVReader.h" diff --git a/isis/src/clipper/apps/jitterfit/main.cpp b/isis/src/clipper/apps/jitterfit/main.cpp index 4ace5f5ec4..2df543678a 100644 --- a/isis/src/clipper/apps/jitterfit/main.cpp +++ b/isis/src/clipper/apps/jitterfit/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include @@ -35,17 +43,17 @@ struct RegistrationData { }; void IsisMain() { - + bool registrationFileSpecified = false; - + UserInterface &ui = Application::GetUserInterface(); - + Cube jitterCube; jitterCube.open(ui.GetFileName("FROM"), "rw"); - + Cube checkCube; checkCube.open(ui.GetFileName("FROM2"), "r"); - + Pvl defFile; defFile.read(ui.GetFileName("DEFFILE")); AutoReg *ar = AutoRegFactory::Create(defFile); @@ -69,35 +77,35 @@ void IsisMain() { // ???? Question: Why use a file name here? Can't Table/blob read from an open Cube? Table mainReadouts(QString("Normalized Main Readout Line Times"), jitterCube.fileName()); Table checklineReadouts(QString("Normalized Checkline Readout Line Times"), checkCube.fileName()); - - // Register each check line to the area near the corrisponding main image line using the + + // Register each check line to the area near the corrisponding main image line using the // registration definition file QList registrationData; for (int k = 0; k < checkCube.lineCount(); k++) { - + int checklineLine = checklineReadouts[k][0]; int mainLine = mainReadouts[checklineLine][0]; - + int sample = (int)(pointSpacing / 2.0 + 0.5); - - ar->PatternChip()->TackCube(sample, k + 1); + + ar->PatternChip()->TackCube(sample, k + 1); ar->PatternChip()->Load(checkCube); - + ar->SearchChip()->TackCube(sample, checklineLine * scale); // The checkline will correspond to the line number that the checkCube was taken at ar->SearchChip()->Load(jitterCube); - + ar->Register(); - + if (registrationFileSpecified) { - outputFile << checklineLine << "," << sample/scale << "," << - std::setprecision(14) << double(checklineReadouts[k][1]) << "," << - ar->CubeLine()/scale << "," << ar->CubeSample()/scale << "," << - double(mainReadouts[mainLine][1]) << "," << - checklineLine - ar->CubeLine()/scale << "," << - sample/scale - ar->CubeSample()/scale << "," << + outputFile << checklineLine << "," << sample/scale << "," << + std::setprecision(14) << double(checklineReadouts[k][1]) << "," << + ar->CubeLine()/scale << "," << ar->CubeSample()/scale << "," << + double(mainReadouts[mainLine][1]) << "," << + checklineLine - ar->CubeLine()/scale << "," << + sample/scale - ar->CubeSample()/scale << "," << ar->GoodnessOfFit() << "," << ar->Success() << endl; } - + RegistrationData checkLineRegistration; checkLineRegistration.checkLine = checklineLine; checkLineRegistration.checkSample = sample/scale; @@ -148,12 +156,12 @@ void IsisMain() { if (checkLineRow.goodness >= tolerance) { /* Normalization Equation - * - * a = min of scale + * + * a = min of scale * b = max of scale - * - * ((b - a)(x - min(x)) / (max(x) - min(x))) + a - * + * + * ((b - a)(x - min(x)) / (max(x) - min(x))) + a + * * We're normalizing from -1 to 1 so the equation below is simplified */ @@ -175,9 +183,9 @@ void IsisMain() { outputCoefficientFile.open(coefficientTo.toLatin1().data()); outputCoefficientFile << "# Line, Sample" << endl; - PvlKeyword &jitterLineCoefficients = + PvlKeyword &jitterLineCoefficients = jitterCube.label()->findKeyword("JitterLineCoefficients", PvlObject::Traverse); - PvlKeyword &jitterSampleCoefficients = + PvlKeyword &jitterSampleCoefficients = jitterCube.label()->findKeyword("JitterSampleCoefficients", PvlObject::Traverse); for (int i = 0; i < degree; i++) { @@ -216,12 +224,12 @@ void IsisMain() { solvedSample = solvedSample + sampleFunction->Coefficient(k) * pow(checkLineRow.matchedTime, k+1); } - outputResidualFile << std::setprecision(14) << checkLineRow.matchedLine << "," << + outputResidualFile << std::setprecision(14) << checkLineRow.matchedLine << "," << std::setprecision(14) << checkLineRow.checkLine - solvedLine << "," << - std::setprecision(14) << lsqLine.Residual(i) << "," << - std::setprecision(14) << checkLineRow.matchedSample << "," << - std::setprecision(14) << checkLineRow.checkSample - solvedSample << "," << - std::setprecision(14) << lsqSample.Residual(i) << "," << + std::setprecision(14) << lsqLine.Residual(i) << "," << + std::setprecision(14) << checkLineRow.matchedSample << "," << + std::setprecision(14) << checkLineRow.checkSample - solvedSample << "," << + std::setprecision(14) << lsqSample.Residual(i) << "," << std::setprecision(14) << checkLineRow.matchedTime << endl; } diff --git a/isis/src/clipper/objs/ClipperNacRollingShutterCamera/ClipperNacRollingShutterCamera.cpp b/isis/src/clipper/objs/ClipperNacRollingShutterCamera/ClipperNacRollingShutterCamera.cpp index bd6b5cb5a2..db2c9a1eae 100644 --- a/isis/src/clipper/objs/ClipperNacRollingShutterCamera/ClipperNacRollingShutterCamera.cpp +++ b/isis/src/clipper/objs/ClipperNacRollingShutterCamera/ClipperNacRollingShutterCamera.cpp @@ -1,23 +1,10 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "ClipperNacRollingShutterCamera.h" @@ -43,7 +30,7 @@ namespace Isis { * * @param Cube &cube Clipper EIS image. */ - ClipperNacRollingShutterCamera::ClipperNacRollingShutterCamera(Cube &cube) : + ClipperNacRollingShutterCamera::ClipperNacRollingShutterCamera(Cube &cube) : RollingShutterCamera(cube) { m_spacecraftNameLong = "Europa Clipper"; @@ -62,34 +49,34 @@ namespace Isis { // Set up start time and exposure duration QString startTime = inst["StartTime"]; - iTime etStart(startTime); + iTime etStart(startTime); // Use to calculate center time when exposure duration is available // double exposureDuration = ((double) inst["ExposureDuration"]); // Grab the coefficients for the polynomial that fit the jitter and the normal readout times of // the lines of the image - - // The two keywords and table below are _all_ required for remove/addJitter in the + + // The two keywords and table below are _all_ required for remove/addJitter in the // RollingShutterCameraDetectorMap to work. If any are missing, just leave the below arrays - // unitialized, and add/removeJitter will default to 0. + // unitialized, and add/removeJitter will default to 0. std::vector sampleCoeffs, lineCoeffs, readoutTimes; if ( (inst.hasKeyword("JitterSampleCoefficients") && inst.hasKeyword("JitterLineCoefficients") ) && cube.hasTable("Normalized Main Readout Line Times")) { - PvlKeyword sampleCoefficients = inst.findKeyword("JitterSampleCoefficients"); + PvlKeyword sampleCoefficients = inst.findKeyword("JitterSampleCoefficients"); for (int i = 0; i < sampleCoefficients.size(); i++) { sampleCoeffs.push_back(sampleCoefficients[i].toDouble()); } - + PvlKeyword lineCoefficients = inst.findKeyword("JitterLineCoefficients"); for (int i = 0; i < lineCoefficients.size(); i++) { lineCoeffs.push_back(lineCoefficients[i].toDouble()); } - - Table normalizedReadoutTimes("Normalized Main Readout Line Times", lab.fileName(), lab); - + + Table normalizedReadoutTimes("Normalized Main Readout Line Times", lab.fileName(), lab); + for (int i = 0; i < normalizedReadoutTimes.Records(); i++) { TableRecord record = normalizedReadoutTimes[i]; readoutTimes.push_back((double) record["time"]); @@ -109,7 +96,7 @@ namespace Isis { new CameraGroundMap(this); new CameraSkyMap(this); - setTime(etStart.Et()); // Consider changing to center in future. + setTime(etStart.Et()); // Consider changing to center in future. LoadCache(); NaifStatus::CheckErrors(); } @@ -135,7 +122,7 @@ namespace Isis { * spacit -> R -> ck/europa_sa_17F12v2_tour_eom_ecr3018.bc -> INSTRUMENT_ID * @note Could not use spacit's S option, we do not have a SCLK for Clipper EIS yet. - * + * * @return int The appropriate instrument code for the "Camera-Matrix" Kernel Frame ID. */ int ClipperNacRollingShutterCamera::CkFrameId() const { @@ -179,7 +166,7 @@ namespace Isis { /** - * This is the function that is called in order to instantiate an ClipperNacRollingShutterCamera + * This is the function that is called in order to instantiate an ClipperNacRollingShutterCamera * object. * * @param Isis::Cube &cube Clipper EIS image. diff --git a/isis/src/clipper/objs/ClipperNacRollingShutterCamera/ClipperNacRollingShutterCamera.h b/isis/src/clipper/objs/ClipperNacRollingShutterCamera/ClipperNacRollingShutterCamera.h index 359a908d44..bd650d704d 100644 --- a/isis/src/clipper/objs/ClipperNacRollingShutterCamera/ClipperNacRollingShutterCamera.h +++ b/isis/src/clipper/objs/ClipperNacRollingShutterCamera/ClipperNacRollingShutterCamera.h @@ -1,25 +1,13 @@ #ifndef ClipperNacRollingShutterCamera_h #define ClipperNacRollingShutterCamera_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "RollingShutterCamera.h" @@ -34,8 +22,8 @@ namespace Isis { * @ingroup SpiceInstrumentsAndCameras * @ingroup Clipper * - * @author 2018-04-09 Makayla Shepherd and Ian Humphrey - * + * @author 2018-04-09 Makayla Shepherd and Ian Humphrey + * * */ class ClipperNacRollingShutterCamera : public RollingShutterCamera { diff --git a/isis/src/clipper/objs/ClipperNacRollingShutterCamera/unitTest.cpp b/isis/src/clipper/objs/ClipperNacRollingShutterCamera/unitTest.cpp index d262d8747b..9d91834ca4 100644 --- a/isis/src/clipper/objs/ClipperNacRollingShutterCamera/unitTest.cpp +++ b/isis/src/clipper/objs/ClipperNacRollingShutterCamera/unitTest.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -47,9 +36,9 @@ void TestLineSamp(Camera *cam, double samp, double line); */ // IMPORTANT NOTE: This test is believed to be failing because the test data has an arbitrary date -// for the StartTime, which means that the spice probably shows the spacecraft as not being near and +// for the StartTime, which means that the spice probably shows the spacecraft as not being near and // pointed at Europa. If the spacecraft isn't near and pointed at Europa, there will be no intersection -// and SetImage will fail. +// and SetImage will fail. int main(void) { Preference::Preferences(true); diff --git a/isis/src/clipper/objs/ClipperWacFcCamera/ClipperWacFcCamera.cpp b/isis/src/clipper/objs/ClipperWacFcCamera/ClipperWacFcCamera.cpp index ad096be4fa..f5b41c4472 100644 --- a/isis/src/clipper/objs/ClipperWacFcCamera/ClipperWacFcCamera.cpp +++ b/isis/src/clipper/objs/ClipperWacFcCamera/ClipperWacFcCamera.cpp @@ -1,22 +1,10 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "ClipperWacFcCamera.h" @@ -40,8 +28,8 @@ namespace Isis { * * @param lab Pvl label from a Clipper wide angle framing camera image. * - * @author Stuart Sides and Summer Stapleton-Greig - * + * @author Stuart Sides and Summer Stapleton-Greig + * * @internal */ ClipperWacFcCamera::ClipperWacFcCamera(Cube &cube) : FramingCamera(cube) { @@ -53,14 +41,14 @@ namespace Isis { NaifStatus::CheckErrors(); - SetFocalLength(); + SetFocalLength(); SetPixelPitch(); // Set up detector map, focal plane map, and distortion map new CameraDetectorMap(this); new CameraFocalPlaneMap(this, naifIkCode()); new CameraDistortionMap(this); - + // Setup the ground and sky map new CameraGroundMap(this); new CameraSkyMap(this); @@ -81,10 +69,10 @@ namespace Isis { } /** - * Returns the shutter open and close times. The LORRI camera doesn't use a shutter to start and + * Returns the shutter open and close times. The LORRI camera doesn't use a shutter to start and * end an observation, but this function is being used to get the observation start and end times, - * so we will simulate a shutter. - * + * so we will simulate a shutter. + * * @param exposureDuration ExposureDuration keyword value from the labels, * converted to seconds. * @param time The StartTime keyword value from the labels, converted to diff --git a/isis/src/clipper/objs/ClipperWacFcCamera/ClipperWacFcCamera.h b/isis/src/clipper/objs/ClipperWacFcCamera/ClipperWacFcCamera.h index b413825452..7c8d39b4e2 100644 --- a/isis/src/clipper/objs/ClipperWacFcCamera/ClipperWacFcCamera.h +++ b/isis/src/clipper/objs/ClipperWacFcCamera/ClipperWacFcCamera.h @@ -1,24 +1,13 @@ #ifndef ClipperWacFcCamera_h #define ClipperWacFcCamera_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "FramingCamera.h" @@ -26,7 +15,7 @@ namespace Isis { /** - * This is the camera model for the Europa Clipper WAC Framing Camera + * This is the camera model for the Europa Clipper WAC Framing Camera * */ class ClipperWacFcCamera : public FramingCamera { @@ -37,12 +26,12 @@ namespace Isis { //! Destroys the ClipperWacFcCamera object ~ClipperWacFcCamera() {}; - /** - * Reimplemented from FrameCamera - * + /** + * Reimplemented from FrameCamera + * * @param time Start time of the observation * @param exposureDuration The exposure duration of the observation - * + * * @return std::pair The start and end times of the observation */ virtual std::pair ShutterOpenCloseTimes(double time, @@ -51,25 +40,25 @@ namespace Isis { /** * CK frame ID - Instrument Code from spacit run on CK - * - * @return @b int The appropriate instrument code for the "Camera-matrix" + * + * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Frame ID */ virtual int CkFrameId() const { return (-159011); } - /** + /** * CK Reference ID - J2000 - * + * * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Reference ID */ virtual int CkReferenceId() const { return (1); } - /** + /** * SPK Reference ID - J2000 - * + * * @return @b int The appropriate instrument code for the Spacecraft * Kernel Reference ID */ diff --git a/isis/src/clipper/objs/ClipperWacFcCamera/unitTest.cpp b/isis/src/clipper/objs/ClipperWacFcCamera/unitTest.cpp index ecb542835d..846f760647 100644 --- a/isis/src/clipper/objs/ClipperWacFcCamera/unitTest.cpp +++ b/isis/src/clipper/objs/ClipperWacFcCamera/unitTest.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include diff --git a/isis/src/control/apps/autoseed/autoseed.cpp b/isis/src/control/apps/autoseed/autoseed.cpp index 567e9aa9cf..c49717efd0 100644 --- a/isis/src/control/apps/autoseed/autoseed.cpp +++ b/isis/src/control/apps/autoseed/autoseed.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "autoseed.h" #include diff --git a/isis/src/control/apps/autoseed/autoseed.h b/isis/src/control/apps/autoseed/autoseed.h index 76cd71066f..ccc0d7a92a 100644 --- a/isis/src/control/apps/autoseed/autoseed.h +++ b/isis/src/control/apps/autoseed/autoseed.h @@ -1,6 +1,14 @@ #ifndef autoseed_h #define autoseed_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "ControlNet.h" #include "Pvl.h" #include "UserInterface.h" diff --git a/isis/src/control/apps/autoseed/main.cpp b/isis/src/control/apps/autoseed/main.cpp index aad402f29d..6b81a86896 100644 --- a/isis/src/control/apps/autoseed/main.cpp +++ b/isis/src/control/apps/autoseed/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "autoseed.h" diff --git a/isis/src/control/apps/cnet2dem/ControlPointCloudPt.h b/isis/src/control/apps/cnet2dem/ControlPointCloudPt.h index 13c9eb671b..2be51105b3 100644 --- a/isis/src/control/apps/cnet2dem/ControlPointCloudPt.h +++ b/isis/src/control/apps/cnet2dem/ControlPointCloudPt.h @@ -1,26 +1,13 @@ #ifndef ControlPointCloudPt_h #define ControlPointCloudPt_h -/** - * @file - * $Revision: 1.0 $ - * $Date: 2014/02/27 18:49:25 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include @@ -38,14 +25,14 @@ namespace Isis { /** * @brief 3-D ControlPoint class for use in PointCloud datasets - * + * * The ControlPoint container is required to not change its content for the * duration of use of the nanoflann kd-tree built from the points. - * + * * @author 2015-10-11 Kris Becker - * - * @internal - * @history 2015-10-11 Kris Becker - Original Version + * + * @internal + * @history 2015-10-11 Kris Becker - Original Version */ class ControlPointCloudPt { @@ -62,25 +49,25 @@ class ControlPointCloudPt { ControlPointCloudPt() : m_xyz(), m_type(Image), m_serialno(), m_data( new ControlPointData() ), m_merged() { - m_data->getImageCoordinates(m_xyz); + m_data->getImageCoordinates(m_xyz); } ControlPointCloudPt(ControlPoint *point, const CoordinateType &ptype, const Ownership owner, - const QString &serialno = "", - const double &weight = 1.0) : + const QString &serialno = "", + const double &weight = 1.0) : m_xyz( ), m_type(ptype), m_serialno(serialno), m_data(new ControlPointData(point, owner, weight)), m_merged() { if ( Image == ptype ) { m_data->setReference(serialno); - if ( !selectImageCoordinates() ) { - m_data->disable(); + if ( !selectImageCoordinates() ) { + m_data->disable(); } } else { // ( Ground == ptype ) - if ( !selectGroundCoordinates() ) { - m_data->disable(); + if ( !selectGroundCoordinates() ) { + m_data->disable(); } } } @@ -158,9 +145,9 @@ class ControlPointCloudPt { inline double w() const { return ( m_xyz[3] ); } inline const double *array() const { return ( m_xyz ); } - /** Compute real vector length (radius) from ControlPoint - * - * Radius is returned in meters + /** Compute real vector length (radius) from ControlPoint + * + * Radius is returned in meters */ inline double radius() const { // compute magnitude @@ -171,7 +158,7 @@ class ControlPointCloudPt { /** Compute vector length (radius) - code based upon NAIF - * + * * Radius is returned in units of input parameters */ inline double radius(const double x, const double y, const double z) const { @@ -198,27 +185,27 @@ class ControlPointCloudPt { } private: - /** - * @brief Shared ControlPoint data pointer - * + /** + * @brief Shared ControlPoint data pointer + * * @author 2015-10-11 Kris Becker - * - * @internal + * + * @internal * @history 2015-10-11 Kris Becker - Original Version */ class ControlPointData : public QSharedData { typedef ControlPointCloudPt::Ownership Ownership; public: - ControlPointData() : QSharedData(), m_point(0), m_reference(0), + ControlPointData() : QSharedData(), m_point(0), m_reference(0), m_weight(1.0), m_initial(0), m_owner(Exclusive){ } - ControlPointData(ControlPoint *point, const Ownership owner, + ControlPointData(ControlPoint *point, const Ownership owner, const double weight = 1.0) : - QSharedData(), m_point(point), - m_reference(0), + QSharedData(), m_point(point), + m_reference(0), m_weight(weight), - m_initial(point->GetNumValidMeasures()), - m_owner(owner) { + m_initial(point->GetNumValidMeasures()), + m_owner(owner) { if ( m_point->GetNumMeasures() > 0) { m_reference = m_point->GetRefMeasure(); } @@ -229,7 +216,7 @@ class ControlPointCloudPt { m_weight(other.m_weight), m_initial(other.m_initial), m_owner(Shared) { } - ~ControlPointData() { + ~ControlPointData() { if ( Exclusive == m_owner ) { delete (m_point); m_point = 0; @@ -294,12 +281,12 @@ class ControlPointCloudPt { inline bool isDisabled() const { if ( 0 == m_point ) return ( true ); return ( - m_point->IsInvalid() || - m_point->IsIgnored() || + m_point->IsInvalid() || + m_point->IsIgnored() || m_point->IsRejected() || m_point->IsEditLocked() || ( 0 == m_reference ) - ); + ); } inline void disable() { @@ -309,10 +296,10 @@ class ControlPointCloudPt { return; } - // The first to call this method will take ownership of the + // The first to call this method will take ownership of the // ControlPoint if Exclusive. Cloned otherwise. ControlPoint *take() { - ControlPoint *p(m_point); + ControlPoint *p(m_point); if ( 0 == m_point ) { return (p); } // If someone else owns the point, clone it @@ -329,7 +316,7 @@ class ControlPointCloudPt { } // Data.... - ControlPoint *m_point; + ControlPoint *m_point; ControlMeasure *m_reference; double m_weight; int m_initial; @@ -338,7 +325,7 @@ class ControlPointCloudPt { private: inline bool getNoPointData(double coords[4]) const { - coords[0] = coords[1] = coords[2] = 0.0; + coords[0] = coords[1] = coords[2] = 0.0; coords[3] = m_weight; return ( false ); } diff --git a/isis/src/control/apps/cnet2dem/DatumFunctoid.cpp b/isis/src/control/apps/cnet2dem/DatumFunctoid.cpp index 1615ecc7f4..67be26564a 100644 --- a/isis/src/control/apps/cnet2dem/DatumFunctoid.cpp +++ b/isis/src/control/apps/cnet2dem/DatumFunctoid.cpp @@ -1,26 +1,11 @@ -/** - * @file - * $Revision$ - * $Date$ - * $Id$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include @@ -57,9 +42,9 @@ DatumFunctoidFactory::DatumFunctoidFactory() { return; } -DatumFunctoidFactory::~DatumFunctoidFactory() { } +DatumFunctoidFactory::~DatumFunctoidFactory() { } -DatumFunctoidFactory *DatumFunctoidFactory::getInstance() { +DatumFunctoidFactory *DatumFunctoidFactory::getInstance() { if (!m_maker) { m_maker = new DatumFunctoidFactory(); } @@ -78,16 +63,16 @@ QStringList DatumFunctoidFactory::algorithms() const { } DatumFunctoidList DatumFunctoidFactory::create(const QString &specs, - const bool &errorIfEmpty) + const bool &errorIfEmpty) const { - DatumFunctoidList functoids; + DatumFunctoidList functoids; // Individual algorithm specifications are separated by vertical bars QStringList algorithms = specs.split(",", QString::SkipEmptyParts); // cout << "create: got " << algorithms.size() << " algorithms...\n"; if ( algorithms.size() == 0 ) { if ( errorIfEmpty ) { - QString mess = "No functoid algorithm specifictions found!"; + QString mess = "No functoid algorithm specifictions found!"; throw IException(IException::User, mess, _FILEINFO_); } return ( functoids ); @@ -103,7 +88,7 @@ DatumFunctoidList DatumFunctoidFactory::create(const QString &specs, nerrors++; } else { - functoids.append(f); + functoids.append(f); } } @@ -130,14 +115,14 @@ DatumFunctoid *DatumFunctoidFactory::make(const QString &funcspec) const { /** * @brief Parse a parameter string for values and return in parameter map - * + * * @author 2015-09-08 Kris Becker - * - * @param parameters - * - * @return PvlFlatMap + * + * @param parameters + * + * @return PvlFlatMap */ -PvlFlatMap DatumFunctoidFactory::parseParameters(const QString ¶meters) +PvlFlatMap DatumFunctoidFactory::parseParameters(const QString ¶meters) const { PvlFlatMap pmap; @@ -173,7 +158,7 @@ PvlFlatMap DatumFunctoidFactory::parseParameters(const QString ¶meters) /** * @brief Exit termination routine * - * This (static) method ensure this object is destroyed when Qt exits. + * This (static) method ensure this object is destroyed when Qt exits. * * Note that it is error to add this to the system _atexit() routine because * this object utilizes Qt classes. At the time the atexit call stack is diff --git a/isis/src/control/apps/cnet2dem/DatumFunctoid.h b/isis/src/control/apps/cnet2dem/DatumFunctoid.h index 41b558384d..0c9dedac28 100644 --- a/isis/src/control/apps/cnet2dem/DatumFunctoid.h +++ b/isis/src/control/apps/cnet2dem/DatumFunctoid.h @@ -1,26 +1,13 @@ #ifndef DatumFunctoid_h #define DatumFunctoid_h -/** - * @file - * $Revision: 1.0 $ - * $Date: 2014/02/27 18:49:25 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include diff --git a/isis/src/control/apps/cnet2dem/MapPointCollector.h b/isis/src/control/apps/cnet2dem/MapPointCollector.h index ea18445268..0913c5cdf8 100644 --- a/isis/src/control/apps/cnet2dem/MapPointCollector.h +++ b/isis/src/control/apps/cnet2dem/MapPointCollector.h @@ -1,26 +1,13 @@ #ifndef MapPointCollector_h #define MapPointCollector_h -/** - * @file - * $Revision: 1.0 $ - * $Date: 2014/02/27 18:49:25 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include @@ -36,90 +23,90 @@ namespace Isis { /** * @brief Gather ControlPoints for generation of an output map (radius) pixel - * - * This class will collect ControlPoint candidates that are within + * + * This class will collect ControlPoint candidates that are within * a tolerance generation of an output radius map pixel - * - * @author 2015-11-16 Kris Becker - * - * @internal + * + * @author 2015-11-16 Kris Becker + * + * @internal * @history 2015-11-16 Kris Becker - Original Version */ - + class MapPointCollector { public: enum SearchType { UnDefined, Radius, NearestNeighbor }; MapPointCollector() : m_source(), m_candidates(), m_radius_stats(), m_distance_stats() { } virtual ~MapPointCollector() { } - + int size() const { return ( m_candidates.size() ); } - + const Statistics &getRadiusStatistics() const { return ( m_radius_stats ); } - + const Statistics &getDistanceStatistics() const { return ( m_distance_stats ); } - + const ControlPointCloudPt &getSource() const { return ( m_source ); } - + const ControlPointCloudPt &getPoint(const int index) const { Q_ASSERT (index >= 0); Q_ASSERT ( index < m_candidates.size() ); return ( m_candidates[index].first ); } - + double getDistance(const int index) const { Q_ASSERT (index >= 0); Q_ASSERT ( index < m_candidates.size() ); return ( m_candidates[index].second ); } - + SearchType getSearchType() const { return ( m_search_type ); } - + void setSearchType (const SearchType stype) { m_search_type = stype; } - + void apply(ControlPointCloudPt &source, ControlPointCloudPt &candidate, const double distance) { #if 0 if ( !source.isValid() ) { return; } if ( !candidate.isValid() ) { return; } #endif - + m_source = source; m_candidates.push_back( qMakePair(candidate, distance)); m_radius_stats.AddData(candidate.radius()); m_distance_stats.AddData(distance); return; } - + /** * @brief Noise remove using standard deviations with radius - * + * * @author 2015-12-10 Kris Becker - * - * @param sigma Number of standard deviations from the median to filter as + * + * @param sigma Number of standard deviations from the median to filter as * noise - * + * * @return int number removed */ int removeNoise(const double sigma = 3.0) { if ( size() < 3 ) return (0); // Can't really do with less - + double v_median = computeMedian(m_candidates); double v_stddev = m_radius_stats.StandardDeviation(); double v_tolerance = v_stddev * sigma; - + PointDistPair v_outpairs; Statistics v_radiusStats, v_distanceStats; for (int i = 0; i < m_candidates.size(); i++) { @@ -131,7 +118,7 @@ namespace Isis { v_distanceStats.AddData(m_candidates[i].second); } } - + // Recompute statistics int v_removed = m_candidates.size() - v_outpairs.size(); m_candidates = v_outpairs; @@ -139,7 +126,7 @@ namespace Isis { m_distance_stats = v_distanceStats; return ( v_removed ); } - + private: typedef QList< QPair > PointDistPair; ControlPointCloudPt m_source; @@ -147,17 +134,17 @@ namespace Isis { Statistics m_radius_stats; Statistics m_distance_stats; SearchType m_search_type; - + double computeMedian(const PointDistPair &points) const { double median = Null; if ( points.size() == 0 ) return ( median ); if ( points.size() == 1 ) return ( points[0].first.radius() ); - + QVector v_radii; for (int i = 0; i < points.size(); i++) { v_radii.push_back(points[i].first.radius() ); } - + qSort(v_radii); if ( (v_radii.size() % 2) == 0 ) { int ndx0 = (v_radii.size() - 1) / 2; @@ -166,7 +153,7 @@ namespace Isis { else { median = v_radii[v_radii.size()/2]; } - return ( median ); + return ( median ); } }; diff --git a/isis/src/control/apps/cnet2dem/PointCloud.h b/isis/src/control/apps/cnet2dem/PointCloud.h index 08f94318b4..ac43aad074 100644 --- a/isis/src/control/apps/cnet2dem/PointCloud.h +++ b/isis/src/control/apps/cnet2dem/PointCloud.h @@ -1,38 +1,25 @@ #ifndef PointCloud_h #define PointCloud_h -/** - * @file - * $Revision: 1.0 $ - * $Date: 2014/02/27 18:49:25 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include namespace Isis { - /** + /** * Functor to compute 3-d Euclidean distances * * @author 2014-02-17 Kris Becker - * - * @internal + * + * @internal * @history 2014-02-17 Kris Becker - Original version. */ template class Dist3d { @@ -40,18 +27,18 @@ namespace Isis { enum { Dimension = 3 }; Dist3d() { } ~Dist3d() { } - + inline int dimension() const { return ( Dimension ); } - + inline double operator()(const T &datum1, const T &datum2) const { double dx = datum1.x() - datum2.x(); double dy = datum1.y() - datum2.y(); double dz = datum1.z() - datum2.z(); return ( dx*dx + dy*dy + dz*dz ); } - + inline double operator()(const double *datum1, const T &datum2) const { double dx = datum1[0] - datum2.x(); double dy = datum1[1] - datum2.y(); @@ -59,14 +46,14 @@ namespace Isis { return ( dx*dx + dy*dy + dz*dz ); } }; - - /** + + /** * Functor to compute 2-d Euclidean distances * * @author 2014-02-17 Kris Becker - * - * @internal + * + * @internal * @history 2014-02-17 Kris Becker - Original version. */ template class Dist2d { @@ -74,31 +61,31 @@ namespace Isis { enum { Dimension = 2 }; Dist2d() { } ~Dist2d() { } - + inline int dimension() const { return ( Dimension ); } - + inline double operator()(const T &datum1, const T &datum2) const { double dx = datum1.x() - datum2.x(); double dy = datum1.y() - datum2.y(); return ( dx*dx + dy*dy ); } - + inline double operator()(const double *datum1, const T &datum2) const { double dx = datum1[0] - datum2.x(); double dy = datum1[1] - datum2.y(); return ( dx*dx + dy*dy ); } }; - - /** - * Functor to compute 1-d Manhattan distances - * + + /** + * Functor to compute 1-d Manhattan distances + * * @author 2014-02-17 Kris Becker - * - * @internal + * + * @internal * @history 2014-02-17 Kris Becker - Original version. */ template class Dist1d { @@ -106,71 +93,71 @@ namespace Isis { enum { Dimension = 1 }; Dist1d() { } ~Dist1d() { } - + inline int dimension() const { return ( Dimension ); } - - + + inline double operator()(const T &datum1, const T &datum2) const { double dx = datum1.x() - datum2.x(); return ( dx*dx ); } - + inline double operator()(const double *datum1, const T &datum2) const { double dx = datum1[0] - datum2.x(); return ( dx*dx ); } }; - - + + /** - * @brief Point cloud adapter class for nanoflann kd-tree interface - * - * This class provides the point cloud class for Point3d clouds that interface - * with the nanoflann (http://code.google.com/p/nanoflann/) kd-tree fast search - * query library. The reference for this approach can be found in an example - * found at + * @brief Point cloud adapter class for nanoflann kd-tree interface + * + * This class provides the point cloud class for Point3d clouds that interface + * with the nanoflann (http://code.google.com/p/nanoflann/) kd-tree fast search + * query library. The reference for this approach can be found in an example + * found at * http://nanoflann.googlecode.com/svn/trunk/examples/pointcloud_kdd_radius.cpp. - * - * This class is designed to accept a reference to a container of 3-d points. - * In addition, this class accesses individual points from PointCloud using a - * vector component operator so as to standardize and complete this interface: - * + * + * This class is designed to accept a reference to a container of 3-d points. + * In addition, this class accesses individual points from PointCloud using a + * vector component operator so as to standardize and complete this interface: + * * @code * double x() const; // X component of point * double y() const; // Y component of point * double z() const; // Z component of point * double w() const; // Optional weight of point (default should be 1.0) * @endcode - * + * * The point container is required to not change its content for the duration * of use of the nanoflann kd-tree built from the points. Because of this, * there is no clear() method to discard existing points. - * + * * This class supports 2D and 3D Euclidean distant calculations. This option is * specified in the PointCloudTree class constructor when building the kd-tree * index. - * + * * The routines kdtree_get_point_count(), kdtree_distance(), kdtree_get_pt() * and kdtree_get_bbox() (default implementation) satisfy the needs of the * Nanoflann kd-tree template library. - * + * * This class is not a template, but all its methods are inlined for efficiency * reasons. This implemetation approach allows us to take best advantage of the * optimization that the Nanoflann library offers. - * + * * The Point3d class is also optimized in the same fashion and offers a * flexible point base class to complete the implementation. - * + * * This point cloud class is designed with the body-fixed coordinate system in * mind. Therfore, the units of the point vectors is assumed to be kilometers * but this is not required - as long as Euclidean distances apply to the point * dataset, any 3D vector representation could utilize this class. - * + * * @author 2014-02-17 Kris Becker - * - * @internal + * + * @internal * @history 2014-02-17 Kris Becker - Original version. */ template > class PointCloud { @@ -178,56 +165,56 @@ namespace Isis { PointCloud() : m_distance(), m_points() { } PointCloud(const Distance &functor) : m_distance(functor), m_points() { } PointCloud(const int &npoints, const Distance &functor = Distance()) : - m_distance(functor), m_points() { - m_points.reserve(npoints); + m_distance(functor), m_points() { + m_points.reserve(npoints); } - + PointCloud(const QVector &points) : m_points(points) { } virtual ~PointCloud() { } - - + + /** Standard size method */ inline int size() const { return ( m_points.size() ); } - + Distance &getDistance() { return ( m_distance ); } - + /** Add a new point to the list */ inline void addPoint(const T &point) { m_points.push_back(point); } - + /** Return a reference to the point at index idx */ inline const T &point(const size_t idx) const { Q_ASSERT( idx >= 0 ); Q_ASSERT( idx < (size_t) size() ); return (m_points[idx]); } - + inline double distance( const T &first, const T &second ) const { return ( m_distance(first, second) ); } - + /** Return number of points in cloud */ inline size_t kdtree_get_point_count() const { return ( m_points.size() ); } - + /** * @brief Return Euclidean distance from a source point to the indexed point - * + * * This method returns the Euclidean (L2) distance from a dataset point and a - * source point (p1). We only use X and Y components to compute this - * distance since our objective is to identify points in 2-d space. - * + * source point (p1). We only use X and Y components to compute this + * distance since our objective is to identify points in 2-d space. + * * @author 2014-02-27 Kris Becker - * + * * @param p1 3-vector of the source point * @param idx_p2 Index into point data set contained herein - * + * * @return double Returns the squared distance - not the square root! */ inline double kdtree_distance(const double *p1, const size_t idx_p2, @@ -236,18 +223,18 @@ namespace Isis { Q_ASSERT( idx_p2 < (size_t) size() ); return ( m_distance(p1, point(idx_p2)) ); } - + /** - * @brief Returns a value for a single dimemsion of a vector - * - * This method provides a simple interface to each vector element in the point + * @brief Returns a value for a single dimemsion of a vector + * + * This method provides a simple interface to each vector element in the point * cloud. - * + * * @history 2014-03-03 Kris Becker - * + * * @param idx Index of the point to get element from - * @param dim The index (0 - 2)of the ith element of the vector - * + * @param dim The index (0 - 2)of the ith element of the vector + * * @return double Value at the specfied vector point index */ inline double kdtree_get_pt(const size_t idx, int dim) const { @@ -255,16 +242,16 @@ namespace Isis { if ( dim == 1 ) return ( point(idx).y() ); return ( point(idx).z() ); } - + /** Let nanoflann range algorithm compute the bounding box */ - template bool kdtree_get_bbox(BBOX &bb) const { - return (false); + template bool kdtree_get_bbox(BBOX &bb) const { + return (false); } - + private: Distance m_distance; ///!< Instantiation of distance functor QVector m_points; ///!< points in the point cloud - + }; }; // namespace Isis diff --git a/isis/src/control/apps/cnet2dem/PointCloudSearchResult.h b/isis/src/control/apps/cnet2dem/PointCloudSearchResult.h index 309ffd15af..b6837fadf3 100644 --- a/isis/src/control/apps/cnet2dem/PointCloudSearchResult.h +++ b/isis/src/control/apps/cnet2dem/PointCloudSearchResult.h @@ -1,26 +1,13 @@ #ifndef PointCloudSearchResult_h #define PointCloudSearchResult_h -/** - * @file - * $Revision: 1.0 $ - * $Date: 2014/02/27 18:49:25 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include @@ -29,39 +16,39 @@ namespace Isis { template class PointCloud; - + /** - * @brief Point cloud query result container - * - * This class provides a convenient and efficent implementation to contain the - * results of a PointCloudTree search result. - * + * @brief Point cloud query result container + * + * This class provides a convenient and efficent implementation to contain the + * results of a PointCloudTree search result. + * * Contained in this object is all the ControlPoints resulting from a radial or * neighbor proximity search. - * - * It is up to the calling enviroment to use the results whilst preserving the - * content of the PointCloud elements as they are provided via a reference into - * the original point cloud. - * - * Care is taken to filter out the source, as it will likely be included in - * every search query, and any invalid points since the status of the points - * could change during processing. - * + * + * It is up to the calling enviroment to use the results whilst preserving the + * content of the PointCloud elements as they are provided via a reference into + * the original point cloud. + * + * Care is taken to filter out the source, as it will likely be included in + * every search query, and any invalid points since the status of the points + * could change during processing. + * * For any type T, here are only two required methods - and operator!=() and an - * isValid() method. Well I suppose the only other required is a default - * constructor as well. - * - * @author 2015-10-11 Kris Becker - * - * @internal + * isValid() method. Well I suppose the only other required is a default + * constructor as well. + * + * @author 2015-10-11 Kris Becker + * + * @internal * @history 2015-10-11 Kris Becker - Original Version */ - + template class PointCloudSearchResult { public: enum SearchType { UnDefined, Radius, NearestNeighbor }; - PointCloudSearchResult() { + PointCloudSearchResult() { m_search_type = UnDefined; m_source = T(); m_neighbors = 0; @@ -69,13 +56,13 @@ namespace Isis { m_matches.clear(); m_pc = QSharedPointer > (0); } - - PointCloudSearchResult(const T &source, int neighbors, - QVector &indices, QVector &distances, - QSharedPointer > &pc) { + + PointCloudSearchResult(const T &source, int neighbors, + QVector &indices, QVector &distances, + QSharedPointer > &pc) { Q_ASSERT ( indices.size() == distances.size() ); Q_ASSERT ( neighbors == indices.size() ); - + m_search_type = NearestNeighbor; m_source = source; m_neighbors = neighbors; @@ -86,15 +73,15 @@ namespace Isis { const T &p = m_pc->point(indices[i]); if ( m_source != p) { if ( p.isValid() ) { - m_matches.push_back(qMakePair(p, std::sqrt(distances[i]))); + m_matches.push_back(qMakePair(p, std::sqrt(distances[i]))); } } } } - - PointCloudSearchResult(const T &source, const double radius_sq, + + PointCloudSearchResult(const T &source, const double radius_sq, std::vector< std::pair > &matches, - const QSharedPointer > &pc, + const QSharedPointer > &pc, const int nfound = 0) { m_search_type = Radius; m_source = source; @@ -106,68 +93,68 @@ namespace Isis { const T &p = m_pc->point(matches[i].first); if ( m_source != p) { if ( p.isValid() ) { - m_matches.push_back(qMakePair(p, std::sqrt(matches[i].second))); + m_matches.push_back(qMakePair(p, std::sqrt(matches[i].second))); } } } } - + virtual ~PointCloudSearchResult() { } - + inline bool isValid() const { return ( !(UnDefined == m_search_type) ); } - + inline SearchType type() const { return ( m_search_type ); } - + /** Return number of points from the cloud search */ inline int size() const { return ( m_matches.size() ); } - + inline double search_radius() const { return ( m_search_radius ); } - + inline double neighbors() const { return ( m_neighbors ); } - + inline const T &source() const { return ( m_source ); } - + inline const T &point(const size_t idx) const { // Fetch the point from the PointCloud return ( m_pc->point(m_matches[idx].first) ); } - + /** Return search distance in search units */ inline double distance(const size_t idx) const { return ( m_matches[idx].second ); } - + template int forEachPair( P &process ) { int npairs( 0 ); for ( int m = 0; m < m_matches.size(); m++) { - process.apply(m_source, m_matches[m].first, m_matches[m].second); + process.apply(m_source, m_matches[m].first, m_matches[m].second); npairs++; } return ( npairs ); } - - + + private: SearchType m_search_type; T m_source; int m_neighbors; double m_search_radius; - + QVector< QPair > m_matches; QSharedPointer > m_pc; - + }; }; // namespace Isis diff --git a/isis/src/control/apps/cnet2dem/PointCloudTree.h b/isis/src/control/apps/cnet2dem/PointCloudTree.h index df2b3912e6..680188ddb2 100644 --- a/isis/src/control/apps/cnet2dem/PointCloudTree.h +++ b/isis/src/control/apps/cnet2dem/PointCloudTree.h @@ -1,26 +1,13 @@ #ifndef PointCloudTree_h #define PointCloudTree_h -/** - * @file - * $Revision: 1.0 $ - * $Date: 2014/02/27 18:49:25 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include @@ -36,109 +23,109 @@ namespace Isis { /** - * @brief Point cloud kd-tree class using the nanoflann kd-tree library - * - * This class renders a point cloud in a kd-tree for very fast/efficient point - * queries. This particular implementation uses Nanoflann - * (http://code.google.com/p/nanoflann/) kd-tree fast search query library. - * - * This class is specifically designed to support body-fixed 3D point vectors. - * Its units are assumed to be kilometers, but is not a requirement. - * - * PointCloudTree utilizes the PointCloud and Point3d classes to provide fast, - * efficient and flexible 3D vector proximity searches. The implemenations of - * these classes are optimized using inline methods to take advantage of the - * template optimization of the Nanoflann library. - * - * Developers can decide at the time of the object instantiation to use 2D or 3D - * Euclidean distances in its query with the nDim parameter in the constructor. - * This flexibility sacrifices a little compiler optimization using template - * parameters (see the -1 KcKdTree_t). The PointCloud classes support both 2D + * @brief Point cloud kd-tree class using the nanoflann kd-tree library + * + * This class renders a point cloud in a kd-tree for very fast/efficient point + * queries. This particular implementation uses Nanoflann + * (http://code.google.com/p/nanoflann/) kd-tree fast search query library. + * + * This class is specifically designed to support body-fixed 3D point vectors. + * Its units are assumed to be kilometers, but is not a requirement. + * + * PointCloudTree utilizes the PointCloud and Point3d classes to provide fast, + * efficient and flexible 3D vector proximity searches. The implemenations of + * these classes are optimized using inline methods to take advantage of the + * template optimization of the Nanoflann library. + * + * Developers can decide at the time of the object instantiation to use 2D or 3D + * Euclidean distances in its query with the nDim parameter in the constructor. + * This flexibility sacrifices a little compiler optimization using template + * parameters (see the -1 KcKdTree_t). The PointCloud classes support both 2D * and 3D lookups. 2D are common for mapping - 3D for apply restrictions in that - * dimension for radius queries, particularly. - * - * It is important to note that the class will take ownership of the PointCloud - * pointer required in the constructor. This futher ensures that the PointCloud - * will not be tampered with while the tree index is built from it. - * - * Query/search results are returned in a PCSearchResult object that can be used - * to process the subset of points that satisfy the search parameters. Along + * dimension for radius queries, particularly. + * + * It is important to note that the class will take ownership of the PointCloud + * pointer required in the constructor. This futher ensures that the PointCloud + * will not be tampered with while the tree index is built from it. + * + * Query/search results are returned in a PCSearchResult object that can be used + * to process the subset of points that satisfy the search parameters. Along * with the results is a shared pointer to the PointCloud. This provides access * to the Point3d points and their data variant for additional processing. - * + * * These classes are also designed to be thread-safe - maybe. - * - * @author 2014-02-17 Kris Becker - * - * @internal - * @history 2014-02-17 Kris Becker - Original Version + * + * @author 2014-02-17 Kris Becker + * + * @internal + * @history 2014-02-17 Kris Becker - Original Version */ - + template class PointCloudTree { - + private: // Declaration of the Nanoflann interface for our PointCloud. Note the - // DIM template parameter is defined by the type of distance compution - // function type so the dimensionality of the distance can be + // DIM template parameter is defined by the type of distance compution + // function type so the dimensionality of the distance can be // specified at compile time typedef nanoflann::KDTreeSingleIndexAdaptor< - nanoflann::L2_Simple_Adaptor >, + nanoflann::L2_Simple_Adaptor >, PointCloud, D::Dimension > PcKdTree_t; - + public: /** - * @brief Constructor of PointCloudTree for the kd-tree point representaion - * - * This constructor accepts a pointer to a prebuilt PointCloud. Once provided, - * this object takes over complete management/use of the PointCloud. The nDim - * parameter sets the dimensionality of the point. Valid dimensions of the - * kd-tree is 2 or 3. The data provided in the PointCloud must support 2D or - * 3D Euclidean distances. The parameter, leafNodes, allows developers to - * specify the number of leaves on each node. See - * https://code.google.com/p/nanoflann/#2._Any_help_choosing_the_KD-tree_parameters? - * for additional details. - * + * @brief Constructor of PointCloudTree for the kd-tree point representaion + * + * This constructor accepts a pointer to a prebuilt PointCloud. Once provided, + * this object takes over complete management/use of the PointCloud. The nDim + * parameter sets the dimensionality of the point. Valid dimensions of the + * kd-tree is 2 or 3. The data provided in the PointCloud must support 2D or + * 3D Euclidean distances. The parameter, leafNodes, allows developers to + * specify the number of leaves on each node. See + * https://code.google.com/p/nanoflann/#2._Any_help_choosing_the_KD-tree_parameters? + * for additional details. + * * @history 2014-03-03 Kris Becker Original Version - * - * @param pc Pointer to PointCloud to build the kd-tree from. This + * + * @param pc Pointer to PointCloud to build the kd-tree from. This * object takes complete ownership of the PointCloud pointer. * @param leafNodes Maximum number of leaves stored at each kd-tree node */ PointCloudTree(PointCloud *pc, const int &leafNodes = 10) : m_pc(pc), m_kd_index(D::Dimension, *pc, nanoflann::KDTreeSingleIndexAdaptorParams(leafNodes)) { m_kd_index.buildIndex(); - } - + } + /** Destructor */ virtual ~PointCloudTree() { } - + /** Perform radius query for points in kilometer units */ - PointCloudSearchResult radius_query(const T &point, - const double &radius_sq) { + PointCloudSearchResult radius_query(const T &point, + const double &radius_sq) { std::vector > matches; - - int n = m_kd_index.radiusSearch(point.array(), radius_sq, matches, + + int n = m_kd_index.radiusSearch(point.array(), radius_sq, matches, nanoflann::SearchParams()); return (PointCloudSearchResult(point, radius_sq, matches, m_pc, n)); } - + /** Perform nearest set of points from its neighbors */ - PointCloudSearchResult neighbor_query(const T &point, - const int &neighbors) { + PointCloudSearchResult neighbor_query(const T &point, + const int &neighbors) { QVector indices(neighbors); QVector distances(neighbors); - m_kd_index.knnSearch(point.array(), neighbors, indices.data(), + m_kd_index.knnSearch(point.array(), neighbors, indices.data(), distances.data()); - return (PointCloudSearchResult(point, neighbors, indices, distances, m_pc)); + return (PointCloudSearchResult(point, neighbors, indices, distances, m_pc)); } - + /** Returns a reference to the point cloud */ inline const PointCloud &cloud() const { return ( *m_pc ); } - + private: QSharedPointer > m_pc; PcKdTree_t m_kd_index; - + }; }; // namespace Isis diff --git a/isis/src/control/apps/cnet2dem/main.cpp b/isis/src/control/apps/cnet2dem/main.cpp index 2571604327..94e994b008 100644 --- a/isis/src/control/apps/cnet2dem/main.cpp +++ b/isis/src/control/apps/cnet2dem/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include @@ -38,11 +46,11 @@ using namespace Isis; // Control network manager typedef QList > ControlNetList; -/** +/** * Functor for normalized 3D-to-2D Euclidean distances - * + * * @author 2015-03-14 Kris Becker - * + * * @internal * @history 2015-03-14 Kris Becker - Original version. */ @@ -76,9 +84,9 @@ public: datum2.x(), datum2.y(), datum2.z()) ); } - inline double normalize(const double dx1, const double dy1, const double dz1, - const double dx2, const double dy2, const double dz2) - const { + inline double normalize(const double dx1, const double dy1, const double dz1, + const double dx2, const double dy2, const double dz2) + const { double scale = m_znorm / radius(dx2, dy2, dz2); double nx = dx2 * scale; double ny = dy2 * scale; @@ -88,7 +96,7 @@ public: inline double distance(const double dx1, const double dy1, const double dz1, const double dx2, const double dy2, const double dz2) - const { + const { double dx = dx1 - dx2; double dy = dy1 - dy2; double dz = dz1 - dz2; @@ -125,7 +133,7 @@ typedef PointCloudSearchResult ResultType; void IsisMain() { - + // We will be processing by line ProcessByLine p; UserInterface &ui = Application::GetUserInterface(); @@ -141,8 +149,8 @@ void IsisMain() { DatumFunctoidList functors = dfactory->create(algorithm); QStringList cnetfiles; - if ( ui.WasEntered("CNET") ) { - cnetfiles.append(ui.GetAsString("CNET")); + if ( ui.WasEntered("CNET") ) { + cnetfiles.append(ui.GetAsString("CNET")); } if ( ui.WasEntered("CNETLIST") ) { @@ -158,7 +166,7 @@ void IsisMain() { throw IException(IException::User, mess, _FILEINFO_); } // Create the point cloud container and load the control networks - QScopedPointer cloud(new CNetPointCloud()); + QScopedPointer cloud(new CNetPointCloud()); // Collect some stuff from input nets for the output net QString netid; @@ -177,10 +185,10 @@ void IsisMain() { int npoints(0); QList points = cnet->take(); BOOST_FOREACH ( ControlPoint *point, points) { - ControlPointCloudPt cpt(point, ControlPointCloudPt::Ground, + ControlPointCloudPt cpt(point, ControlPointCloudPt::Ground, ControlPointCloudPt::Exclusive); - if ( cpt.isValid() ) { - cloud->addPoint(cpt); + if ( cpt.isValid() ) { + cloud->addPoint(cpt); npoints++; } } @@ -189,7 +197,7 @@ void IsisMain() { // Instead of having to save the ControlNet instances, we take ownership // of all the points from ControlNet and turn it over to the cloud... - // + // // cnetlist.append( QSharedPointer ( cnet.take() ) ); } std::cout << "\nTotal " << cloud->size() << " of " << allPoints << "\n"; @@ -232,7 +240,7 @@ void IsisMain() { // Only worry about this if a range search is requested if ( radial_search) { if (ui.WasEntered("DISTANCE")) { - search_radius = ui.GetDouble("DISTANCE"); + search_radius = ui.GetDouble("DISTANCE"); } else { // Compute range from center of pixel to corner in meters @@ -268,11 +276,11 @@ void IsisMain() { mapper.SetMaximumSteps(tile.Bricks()); mapper.CheckStatus(); - // Process data using 3-D brick + // Process data using 3-D brick int npixels = tsamps * tlines; int nbands = tile.BandDimension(); SurfacePoint point; - + for ( int brick = 1 ; brick <= tile.Bricks() ; brick++ ) { tile.SetBrick(brick); @@ -286,14 +294,14 @@ void IsisMain() { QVector datum(nbands, Null); // Map only valid projection translation - if ( (samp <= csamps) && (line <= clines) && + if ( (samp <= csamps) && (line <= clines) && ( tproj->SetWorld(samp, line) ) ) { -#if 0 +#if 0 std::cout << "Line: " << line << " Sample: " << samp << "\n"; - std::cout << "Lat: " << tproj->UniversalLatitude() + std::cout << "Lat: " << tproj->UniversalLatitude() << " Long: " << tproj->UniversalLongitude() << "\n"; #endif - + // Trim if requested bool mapit(true); if ( ( trim ) && ( tproj->HasGroundRange() ) ) { @@ -305,11 +313,11 @@ void IsisMain() { // Plot it only if its within mapping boundary conditions if ( mapit ) { - double lat = tproj->UniversalLatitude(); + double lat = tproj->UniversalLatitude(); double lon = tproj->UniversalLongitude(); double radius = tproj->LocalRadius(lat); - point.SetSphericalCoordinates(Latitude(lat, Angle::Degrees), + point.SetSphericalCoordinates(Latitude(lat, Angle::Degrees), Longitude(lon, Angle::Degrees), Distance(radius, Distance::Meters)); @@ -321,15 +329,15 @@ void IsisMain() { "MapPoint"); // There are several combinations to consider - // 1) RADIAL search from RANGE at the lat/lon pixel center - // 2) NEIGHBOR search selecting the NEIGHBORS closest to the center + // 1) RADIAL search from RANGE at the lat/lon pixel center + // 2) NEIGHBOR search selecting the NEIGHBORS closest to the center // 3) BOTH searches requested will apply the RADIAL search first, then - // and only if MINPOINTS points resulting from the RADIAL - // search are within RANGE , otherwise a NEIGHBOR + // and only if MINPOINTS points resulting from the RADIAL + // search are within RANGE , otherwise a NEIGHBOR // search is performed. ResultType results; if ( both_searches ) { - results = cloud_t.radius_query(cpt, search_radius_sq); + results = cloud_t.radius_query(cpt, search_radius_sq); if ( minpoints > results.size() ) { results = cloud_t.neighbor_query(cpt, neighbors); } @@ -392,4 +400,3 @@ void IsisMain() { p.EndProcess(); } - diff --git a/isis/src/control/apps/cnet2mat/main.cpp b/isis/src/control/apps/cnet2mat/main.cpp index 4795040267..49bb72cbf5 100644 --- a/isis/src/control/apps/cnet2mat/main.cpp +++ b/isis/src/control/apps/cnet2mat/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include diff --git a/isis/src/control/apps/cnetadd/main.cpp b/isis/src/control/apps/cnetadd/main.cpp index 7fd2d7eae9..ddebf1d7e6 100644 --- a/isis/src/control/apps/cnetadd/main.cpp +++ b/isis/src/control/apps/cnetadd/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include @@ -415,4 +423,3 @@ QList getValidPoints(Cube &cube, STRtree &coordTree) { return results; } - diff --git a/isis/src/control/apps/cnetbin2pvl/cnetbin2pvl.cpp b/isis/src/control/apps/cnetbin2pvl/cnetbin2pvl.cpp index 137d7bb382..b7f4b05d73 100644 --- a/isis/src/control/apps/cnetbin2pvl/cnetbin2pvl.cpp +++ b/isis/src/control/apps/cnetbin2pvl/cnetbin2pvl.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "cnetbin2pvl.h" using namespace std; diff --git a/isis/src/control/apps/cnetbin2pvl/cnetbin2pvl.h b/isis/src/control/apps/cnetbin2pvl/cnetbin2pvl.h index 6e2e231683..725f9f0ad0 100644 --- a/isis/src/control/apps/cnetbin2pvl/cnetbin2pvl.h +++ b/isis/src/control/apps/cnetbin2pvl/cnetbin2pvl.h @@ -1,6 +1,14 @@ #ifndef cnetbin2pvl_h #define cnetbin2pvl_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "UserInterface.h" #include "ControlNet.h" #include "Progress.h" diff --git a/isis/src/control/apps/cnetbin2pvl/main.cpp b/isis/src/control/apps/cnetbin2pvl/main.cpp index d3e3083fb5..70b4e2c885 100644 --- a/isis/src/control/apps/cnetbin2pvl/main.cpp +++ b/isis/src/control/apps/cnetbin2pvl/main.cpp @@ -1,5 +1,13 @@ #include "Isis.h" +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "cnetbin2pvl.h" #include "Application.h" diff --git a/isis/src/control/apps/cnetcheck/cnetcheck.cpp b/isis/src/control/apps/cnetcheck/cnetcheck.cpp index 3479d424ac..195acf4955 100644 --- a/isis/src/control/apps/cnetcheck/cnetcheck.cpp +++ b/isis/src/control/apps/cnetcheck/cnetcheck.cpp @@ -1,3 +1,12 @@ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include @@ -65,24 +74,24 @@ namespace Isis { QString g_delimiter; /** - * check control network validity + * check control network validity * - * @param ui UserInterface object containing parameters - * @param(out) log The Pvl that outlier results logged to check + * @param ui UserInterface object containing parameters + * @param(out) log The Pvl that outlier results logged to check */ QString cnetcheck(UserInterface &ui, Pvl *log) { ControlNet innet(ui.GetFileName("CNET")); FileList inlist(ui.GetFileName("FROMLIST")); - + return cnetcheck(innet, inlist, ui, log); } /** - * check control network validity + * check control network validity * - * @param innet input control network - * @param inlist input file list - * @param ui UserInterface object containing parameters + * @param innet input control network + * @param inlist input file list + * @param ui UserInterface object containing parameters * @param(out) log The Pvl that outlier results logged to */ QString cnetcheck(ControlNet &innet, FileList &inlist, UserInterface &ui, Pvl *log) { @@ -248,9 +257,9 @@ namespace Isis { // Output the results to screen and files accordingly PvlGroup results("Results"); - - QString networkName = ui.WasEntered("CNET") ? FileName(ui.GetFileName("CNET")).name() : innet.GetNetworkId(); - + + QString networkName = ui.WasEntered("CNET") ? FileName(ui.GetFileName("CNET")).name() : innet.GetNetworkId(); + stringstream ss(stringstream::in | stringstream::out); results.addKeyword(PvlKeyword("Islands", toString((BigInt)islands.size()))); @@ -448,10 +457,10 @@ namespace Isis { ss << "----------------------------------------" \ "----------------------------------------" << endl << endl; QString logstr = ss.str().c_str(); - + if (log){ log->addGroup(results); - } + } if (!ui.IsInteractive()) { std::cout << ss.str(); diff --git a/isis/src/control/apps/cnetcheck/cnetcheck.h b/isis/src/control/apps/cnetcheck/cnetcheck.h index a9ebd2e7de..55d28c55e0 100644 --- a/isis/src/control/apps/cnetcheck/cnetcheck.h +++ b/isis/src/control/apps/cnetcheck/cnetcheck.h @@ -1,6 +1,14 @@ #ifndef cnetcheck_h #define cnetcheck_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include "UserInterface.h" diff --git a/isis/src/control/apps/cnetcheck/main.cpp b/isis/src/control/apps/cnetcheck/main.cpp index 20b043c536..3af4678ddb 100644 --- a/isis/src/control/apps/cnetcheck/main.cpp +++ b/isis/src/control/apps/cnetcheck/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "cnetcheck.h" @@ -15,7 +23,7 @@ void IsisMain() { try { QString results = cnetcheck(ui, &appLog); - + if (ui.IsInteractive()){ Application::GuiLog(results); } diff --git a/isis/src/control/apps/cnetcombinept/ControlPointMerger.cpp b/isis/src/control/apps/cnetcombinept/ControlPointMerger.cpp index 9bac9193cf..3efd813716 100644 --- a/isis/src/control/apps/cnetcombinept/ControlPointMerger.cpp +++ b/isis/src/control/apps/cnetcombinept/ControlPointMerger.cpp @@ -1,24 +1,10 @@ -/** - * @file - * $Revision: 1.0 $ - * $Date: 2014/02/27 18:49:25 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "ControlPointMerger.h" diff --git a/isis/src/control/apps/cnetcombinept/ControlPointMerger.h b/isis/src/control/apps/cnetcombinept/ControlPointMerger.h index 5776b03e4d..ad61c0b2c2 100644 --- a/isis/src/control/apps/cnetcombinept/ControlPointMerger.h +++ b/isis/src/control/apps/cnetcombinept/ControlPointMerger.h @@ -1,26 +1,13 @@ #ifndef ControlPointMerger_h #define ControlPointMerger_h -/** - * @file - * $Revision: 1.0 $ - * $Date: 2014/02/27 18:49:25 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include diff --git a/isis/src/control/apps/cnetcombinept/MeasurePoint.h b/isis/src/control/apps/cnetcombinept/MeasurePoint.h index 682b6475cd..0da636ffc2 100644 --- a/isis/src/control/apps/cnetcombinept/MeasurePoint.h +++ b/isis/src/control/apps/cnetcombinept/MeasurePoint.h @@ -1,26 +1,13 @@ #ifndef MeasurePoint_h #define MeasurePoint_h -/** - * @file - * $Revision: 1.0 $ - * $Date: 2014/02/27 18:49:25 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include @@ -37,13 +24,13 @@ namespace Isis { /** * @brief ControlPoint class for use in PointCloud datasets - * + * * The ControlPoint container is required to not change its content for the * duration of use of the nanoflann kd-tree built from the points. - * + * * @author 2015-10-11 Kris Becker - * - * @internal + * + * @internal * @history 2015-10-11 Kris Becker - Original Version * @history 2016-12-06 Jesse Mapel - Updated documentation. References #4558. */ @@ -58,13 +45,13 @@ class MeasurePoint { /** * Constructs a MeasurePoint from a measure. - * + * * @param measure The measure that the MeasurePoint represents. - * @param weight The weight of the MeasurePoint in the + * @param weight The weight of the MeasurePoint in the */ - MeasurePoint(ControlMeasure *measure, const double &weight = 1.0) : + MeasurePoint(ControlMeasure *measure, const double &weight = 1.0) : m_data(new ControlMeasureData(measure, weight) ) { - m_data->m_isvalid = validMeasure(); + m_data->m_isvalid = validMeasure(); } @@ -76,7 +63,7 @@ class MeasurePoint { /** * Determines if the MeasurePoint's parent control point is valid. - * + * * @return @b bool If the measure's parent control point is valid. */ inline bool validPoint() const { @@ -84,17 +71,17 @@ class MeasurePoint { BOOST_ASSERT ( m != 0 ); ControlPoint *p = m->Parent(); BOOST_ASSERT ( p != 0 ); - return (!(p->IsIgnored() || p->IsRejected() || p->IsEditLocked() || p->IsInvalid()) ); + return (!(p->IsIgnored() || p->IsRejected() || p->IsEditLocked() || p->IsInvalid()) ); } /** * If the MeasurePoint and parent control point are valid. - * + * * @return @b bool If the MeasurePoint and parent control point are both valid. */ inline bool isValid() const { - return ( m_data->m_isvalid && validPoint() ); + return ( m_data->m_isvalid && validPoint() ); } @@ -109,7 +96,7 @@ class MeasurePoint { /** * Returns the size of the MeasurePoint. - * + * * @return @b int Always one. */ inline int size() const { @@ -119,7 +106,7 @@ class MeasurePoint { /** * Returns the measure's point ID - * + * * @return @b QString The point ID of the measure's parent control point. */ inline QString id() const { @@ -129,7 +116,7 @@ class MeasurePoint { /** * Returns the MeasurePoint's measure. - * + * * @return @b ControlMeasure* A pointer to the contained measure. */ inline const ControlMeasure *data() const { @@ -139,7 +126,7 @@ class MeasurePoint { /** * Returns the parent control point. - * + * * @return @b ControlPoint* A pointer to the parent control point. */ inline ControlPoint *getPoint() const { @@ -149,7 +136,7 @@ class MeasurePoint { /** * Returns the serial number of the cube the measure is on. - * + * * @return @b QString The serial number of the cube the measure is on. */ inline QString getSerialNumber() const { @@ -159,7 +146,7 @@ class MeasurePoint { /** * Returns the MeasurePoint's x coordinate. - * + * * @return @b double the MeasurePoint's x coordinate. */ inline double x() const { @@ -169,17 +156,17 @@ class MeasurePoint { /** * Returns the MeasurePoint's y coordinate. - * + * * @return @b double the MeasurePoint's y coordinate. */ - inline double y() const { + inline double y() const { return ( m_data->m_xyz[1] ); } /** * Returns the MeasurePoint's z coordinate. - * + * * @return @b double the MeasurePoint's z coordinate. */ inline double z() const { @@ -189,7 +176,7 @@ class MeasurePoint { /** * Returns the MeasurePoint's weight. - * + * * @return @b double the MeasurePoint's weight. */ inline double w() const { @@ -199,7 +186,7 @@ class MeasurePoint { /** * Returns the coordinates and weight of the MeasurePoint. - * + * * @return @b double* A pointer to an array containing (in order) * the x, y, z, and weight of the MeasurePoint. */ @@ -211,9 +198,9 @@ class MeasurePoint { /** * Determines if the measures contained by this MeasurePoint and * another MeasurePoint are the same. - * + * * @param other The MeasurePoint to compare against. - * + * * @return @b bool If the measures are the same. */ inline bool operator==(const MeasurePoint &other) const { @@ -224,9 +211,9 @@ class MeasurePoint { /** * Determines if the measures contained by this MeasurePoint and * another MeasurePoint are not the same. - * + * * @param other The MeasurePoint to compare against. - * + * * @return @b bool If the measures are not the same. */ inline bool operator!=(const MeasurePoint &other) const { @@ -237,12 +224,12 @@ class MeasurePoint { /** * Data wrapper class for ControlMeasures. - * + * * @see QSharedData - * + * * @author 2015-10-11 Kris Becker - * - * @internal + * + * @internal * @history 2015-10-11 Kris Becker - Original Version * @history 2016-12-06 Jesse Mapel - Updated documentation. References #4558. */ @@ -252,7 +239,7 @@ class MeasurePoint { /** * Constructs and empty ControlMeasureData. */ - ControlMeasureData() : QSharedData(), m_measure(0), + ControlMeasureData() : QSharedData(), m_measure(0), m_weight(1.0), m_xyz(), m_isvalid(false) { getImageCoordinates(); } @@ -260,12 +247,12 @@ class MeasurePoint { /** * Constructs a ControlMeasureData from a measure. - * + * * @param measure The ControlMeasure to wrap. * @param weight The weight for the measure. Defaults to 1.0. */ - ControlMeasureData(ControlMeasure *measure, const double &weight = 1.0) : - QSharedData(), m_measure(measure), m_weight(weight), + ControlMeasureData(ControlMeasure *measure, const double &weight = 1.0) : + QSharedData(), m_measure(measure), m_weight(weight), m_xyz(), m_isvalid(false) { getImageCoordinates(); } @@ -315,13 +302,13 @@ class MeasurePoint { /** * Returns if the internal measure is valid. - * + * * @return @b bool If the internal measure is valid. */ inline bool validMeasure() const { ControlMeasure *m = m_data->m_measure; BOOST_ASSERT ( m != 0 ); - return (!(m->IsIgnored() || m->IsRejected()) ); + return (!(m->IsIgnored() || m->IsRejected()) ); } }; diff --git a/isis/src/control/apps/cnetcombinept/PointCloud.h b/isis/src/control/apps/cnetcombinept/PointCloud.h index 77a1fbb8d7..e125931b6d 100644 --- a/isis/src/control/apps/cnetcombinept/PointCloud.h +++ b/isis/src/control/apps/cnetcombinept/PointCloud.h @@ -1,38 +1,25 @@ #ifndef PointCloud_h #define PointCloud_h -/** - * @file - * $Revision: 1.0 $ - * $Date: 2014/02/27 18:49:25 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include namespace Isis { -/** +/** * Functor to compute 2-d Euclidean distances - * + * * @author 2014-02-17 Kris Becker - * - * @internal + * + * @internal * @history 2014-02-17 Kris Becker - Original Version * @history 2016-12-06 Jesse Mapel - Updated documentation. References #4558. */ @@ -55,7 +42,7 @@ public: /** * Returns the dimension of the distance metric. - * + * * @return @b int Always 2. */ inline int dimension() const { @@ -65,10 +52,10 @@ public: /** * Computes the two dimensional distance between two points. - * + * * @param datum1 The first point * @param datum2 The second point - * + * * @return @b double The distance between the two points. */ inline double operator()(const T &datum1, const T &datum2) const { @@ -80,10 +67,10 @@ public: /** * Computes the two dimensional distance between two points. - * + * * @param datum1 The first point as a double array * @param datum2 The second point - * + * * @return @b double The distance between the two points. */ inline double operator()(const double *datum1, const T &datum2) const { @@ -95,53 +82,53 @@ public: /** - * @brief Point cloud adapter class for nanoflann kd-tree interface - * - * This class provides the point cloud class for Point3d clouds that interface - * with the nanoflann (http://code.google.com/p/nanoflann/) kd-tree fast search - * query library. The reference for this approach can be found in an example - * found at + * @brief Point cloud adapter class for nanoflann kd-tree interface + * + * This class provides the point cloud class for Point3d clouds that interface + * with the nanoflann (http://code.google.com/p/nanoflann/) kd-tree fast search + * query library. The reference for this approach can be found in an example + * found at * http://nanoflann.googlecode.com/svn/trunk/examples/pointcloud_kdd_radius.cpp. - * - * This class is designed to accept a reference to a container of 3-d points. - * In addition, this class accesses individual points from PointCloud using a - * vector component operator so as to standardize and complete this interface: - * + * + * This class is designed to accept a reference to a container of 3-d points. + * In addition, this class accesses individual points from PointCloud using a + * vector component operator so as to standardize and complete this interface: + * * @code * double x() const; // X component of point * double y() const; // Y component of point * double z() const; // Z component of point * double w() const; // Optional weight of point (default should be 1.0) * @endcode - * + * * The point container is required to not change its content for the duration * of use of the nanoflann kd-tree built from the points. Because of this, * there is no clear() method to discard existing points. - * + * * This class supports 2D and 3D Euclidean distant calculations. This option is * specified in the PointCloudTree class constructor when building the kd-tree * index. - * + * * The routines kdtree_get_point_count(), kdtree_distance(), kdtree_get_pt() * and kdtree_get_bbox() (default implementation) satisfy the needs of the * Nanoflann kd-tree template library. - * + * * This class is not a template, but all its methods are inlined for efficiency * reasons. This implemetation approach allows us to take best advantage of the * optimization that the Nanoflann library offers. - * + * * The Point3d class is also optimized in the same fashion and offers a * flexible point base class to complete the implementation. - * + * * This point cloud class is designed with the body-fixed coordinate system in * mind. Therfore, the units of the point vectors is assumed to be kilometers * but this is not required - as long as Euclidean distances apply to the point * dataset, any 3D vector representation could utilize this class. - * + * * @author 2014-02-17 Kris Becker - * - * @internal - * @history 2014-02-17 Kris Becker - Original Version + * + * @internal + * @history 2014-02-17 Kris Becker - Original Version */ template class PointCloud { public: @@ -154,7 +141,7 @@ template class PointCloud { /** * Constructs a PointCloud with a given ID. - * + * * @param id The ID of the PointCloud. */ explicit PointCloud(const QString &id) : m_id(id), m_points(), m_distance() { } @@ -163,36 +150,36 @@ template class PointCloud { /** * Constructs a PointCloud with a given ID and * space for a given number of points reserved. - * + * * @param npoints The number of points to reserve space for. - * @param id The ID of the PointCloud. Defaults to "PointCloud". + * @param id The ID of the PointCloud. Defaults to "PointCloud". */ - PointCloud(const int &npoints, const QString &id = "PointCloud") : - m_id(id), m_points(), m_distance() { - m_points.reserve(npoints); + PointCloud(const int &npoints, const QString &id = "PointCloud") : + m_id(id), m_points(), m_distance() { + m_points.reserve(npoints); } /** * Constructs a PointCloud with a given ID and set of points. - * + * * @param points The set of points to add to the PointCloud. - * @param id The ID of the PointCloud. Defaults to "PointCloud". + * @param id The ID of the PointCloud. Defaults to "PointCloud". */ - PointCloud(const QVector &points, const QString &id = "PointCloud") : + PointCloud(const QVector &points, const QString &id = "PointCloud") : m_id(id), m_points(points), m_distance() { } /** * Constructs a PointCloud with a given ID and set measures. * The measures will be used to construct the internal set of points. - * + * * @param points The set of measures to add to the PointCloud. - * @param id The ID of the PointCloud. Defaults to "PointCloud". + * @param id The ID of the PointCloud. Defaults to "PointCloud". */ - PointCloud(const QList &points, - const QString &id = "PointCloud") : - m_id(id), m_points(), m_distance() { + PointCloud(const QList &points, + const QString &id = "PointCloud") : + m_id(id), m_points(), m_distance() { for (int i = 0 ; i < points.size() ; i++ ) { m_points.push_back( T(points[i]) ); } @@ -207,7 +194,7 @@ template class PointCloud { /** * Returns the size of the PointCloud. - * + * * @return @b int The number of points in the PointCloud. */ inline int size() const { @@ -217,7 +204,7 @@ template class PointCloud { /** * Returns the PointCloud's ID. - * + * * @return @b QString The PointCloud's ID. */ inline QString identifier() const { @@ -227,7 +214,7 @@ template class PointCloud { /** * Adds a new point to the list - * + * * @param point The point to add. */ inline void addPoint(const T &point) { @@ -237,9 +224,9 @@ template class PointCloud { /** * Return a reference to the point at a given index. - * + * * @param idx The index of the point to return. - * + * * @return @b T& A constant reference to the point. */ inline const T &point(const size_t idx) const { @@ -251,10 +238,10 @@ template class PointCloud { /** * Returns the Euclidean distance between two points. - * + * * @param first The first point. * @param second The second point. - * + * * @return @b double The squared Euclidean distance between first and second. */ inline double distance( const T &first, const T &second ) const { @@ -262,9 +249,9 @@ template class PointCloud { } - /** + /** * Returns the number of points in the PointCloud. - * + * * @return @b size_t The number of points in the PointCloud. */ inline size_t kdtree_get_point_count() const { @@ -274,16 +261,16 @@ template class PointCloud { /** * @brief Return Euclidean distance from a source point to the indexed point - * + * * This method returns the Euclidean (L2) distance from a dataset point and a - * source point (p1). We only use X and Y components to compute this - * distance since our objective is to identify points in 2-d space. - * + * source point (p1). We only use X and Y components to compute this + * distance since our objective is to identify points in 2-d space. + * * @author 2014-02-27 Kris Becker - * + * * @param p1 3-vector of the source point * @param idx_p2 Index into point data set contained herein - * + * * @return @b double Returns the squared distance - not the square root! */ inline double kdtree_distance(const double *p1, const size_t idx_p2, @@ -295,16 +282,16 @@ template class PointCloud { /** - * @brief Returns a value for a single dimemsion of a vector - * - * This method provides a simple interface to each vector element in the point + * @brief Returns a value for a single dimemsion of a vector + * + * This method provides a simple interface to each vector element in the point * cloud. - * + * * @history 2014-03-03 Kris Becker - * + * * @param idx Index of the point to get element from - * @param dim The index (0 - 2)of the ith element of the vector - * + * @param dim The index (0 - 2)of the ith element of the vector + * * @return @b double Value at the specfied vector point index */ inline double kdtree_get_pt(const size_t idx, int dim) const { @@ -314,16 +301,16 @@ template class PointCloud { } - /** + /** * Let nanoflann range algorithm compute the bounding box - * + * * @author 2014-02-17 Kris Becker - * - * @internal - * @history 2014-02-17 Kris Becker - Original Version + * + * @internal + * @history 2014-02-17 Kris Becker - Original Version */ - template bool kdtree_get_bbox(BBOX &bb) const { - return (false); + template bool kdtree_get_bbox(BBOX &bb) const { + return (false); } private: diff --git a/isis/src/control/apps/cnetcombinept/PointCloudTree.h b/isis/src/control/apps/cnetcombinept/PointCloudTree.h index ddaf7cfb59..760230d13e 100644 --- a/isis/src/control/apps/cnetcombinept/PointCloudTree.h +++ b/isis/src/control/apps/cnetcombinept/PointCloudTree.h @@ -1,26 +1,13 @@ #ifndef PointCloudTree_h #define PointCloudTree_h -/** - * @file - * $Revision: 1.0 $ - * $Date: 2014/02/27 18:49:25 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include @@ -35,41 +22,41 @@ namespace Isis { /** - * @brief Point cloud kd-tree class using the nanoflann kd-tree library - * - * This class renders a point cloud in a kd-tree for very fast/efficient point - * queries. This particular implementation uses Nanoflann - * (http://code.google.com/p/nanoflann/) kd-tree fast search query library. - * - * This class is specifically designed to support body-fixed 3D point vectors. - * Its units are assumed to be kilometers, but is not a requirement. - * - * PointCloudTree utilizes the PointCloud and Point3d classes to provide fast, - * efficient and flexible 3D vector proximity searches. The implemenations of - * these classes are optimized using inline methods to take advantage of the - * template optimization of the Nanoflann library. - * - * Developers can decide at the time of the object instantiation to use 2D or 3D - * Euclidean distances in its query with the nDim parameter in the constructor. - * This flexibility sacrifices a little compiler optimization using template - * parameters (see the -1 KcKdTree_t). The PointCloud classes support both 2D + * @brief Point cloud kd-tree class using the nanoflann kd-tree library + * + * This class renders a point cloud in a kd-tree for very fast/efficient point + * queries. This particular implementation uses Nanoflann + * (http://code.google.com/p/nanoflann/) kd-tree fast search query library. + * + * This class is specifically designed to support body-fixed 3D point vectors. + * Its units are assumed to be kilometers, but is not a requirement. + * + * PointCloudTree utilizes the PointCloud and Point3d classes to provide fast, + * efficient and flexible 3D vector proximity searches. The implemenations of + * these classes are optimized using inline methods to take advantage of the + * template optimization of the Nanoflann library. + * + * Developers can decide at the time of the object instantiation to use 2D or 3D + * Euclidean distances in its query with the nDim parameter in the constructor. + * This flexibility sacrifices a little compiler optimization using template + * parameters (see the -1 KcKdTree_t). The PointCloud classes support both 2D * and 3D lookups. 2D are common for mapping - 3D for apply restrictions in that - * dimension for radius queries, particularly. - * - * It is important to note that the class will take ownership of the PointCloud - * pointer required in the constructor. This futher ensures that the PointCloud - * will not be tampered with while the tree index is built from it. - * - * Query/search results are returned in a PCSearchResult object that can be used - * to process the subset of points that satisfy the search parameters. Along + * dimension for radius queries, particularly. + * + * It is important to note that the class will take ownership of the PointCloud + * pointer required in the constructor. This futher ensures that the PointCloud + * will not be tampered with while the tree index is built from it. + * + * Query/search results are returned in a PCSearchResult object that can be used + * to process the subset of points that satisfy the search parameters. Along * with the results is a shared pointer to the PointCloud. This provides access * to the Point3d points and their data variant for additional processing. - * + * * These classes are also designed to be thread-safe - maybe. - * + * * @author 2014-02-17 Kris Becker - * - * @internal + * + * @internal * @history 2014-02-17 Kris Becker - Original Version * @history 2016-12-06 Jesse Mapel - Updated documentation. References #4558. */ @@ -78,30 +65,30 @@ template class PointCloudTree { private: // Declaration of the Nanoflann interface for our PointCloud. Note the - // DIM template parameter is defined by the type of distance compution - // function type so the dimensionality of the distance can be + // DIM template parameter is defined by the type of distance compution + // function type so the dimensionality of the distance can be // specified at compile time typedef nanoflann::KDTreeSingleIndexAdaptor< - nanoflann::L2_Simple_Adaptor >, + nanoflann::L2_Simple_Adaptor >, PointCloud, 2 > PcKdTree_t; public: /** - * @brief Constructor of PointCloudTree for the kd-tree point representaion - * - * This constructor accepts a pointer to a prebuilt PointCloud. Once provided, - * this object takes over complete management/use of the PointCloud. The nDim - * parameter sets the dimensionality of the point. Valid dimensions of the - * kd-tree is 2 or 3. The data provided in the PointCloud must support 2D or - * 3D Euclidean distances. The parameter, leafNodes, allows developers to - * specify the number of leaves on each node. See - * https://code.google.com/p/nanoflann/#2._Any_help_choosing_the_KD-tree_parameters? - * for additional details. - * + * @brief Constructor of PointCloudTree for the kd-tree point representaion + * + * This constructor accepts a pointer to a prebuilt PointCloud. Once provided, + * this object takes over complete management/use of the PointCloud. The nDim + * parameter sets the dimensionality of the point. Valid dimensions of the + * kd-tree is 2 or 3. The data provided in the PointCloud must support 2D or + * 3D Euclidean distances. The parameter, leafNodes, allows developers to + * specify the number of leaves on each node. See + * https://code.google.com/p/nanoflann/#2._Any_help_choosing_the_KD-tree_parameters? + * for additional details. + * * @history 2014-03-03 Kris Becker Original Version - * - * @param pc Pointer to PointCloud to build the kd-tree from. This + * + * @param pc Pointer to PointCloud to build the kd-tree from. This * object takes complete ownership of the PointCloud pointer. * @param leafNodes Maximum number of leaves stored at each kd-tree node. * Defaults to 10 leaves. @@ -109,7 +96,7 @@ template class PointCloudTree { PointCloudTree(PointCloud *pc, const int &leafNodes = 10) : m_pc(pc), m_kd_index(2, *pc, nanoflann::KDTreeSingleIndexAdaptorParams(leafNodes)) { m_kd_index.buildIndex(); - } + } /** @@ -118,18 +105,18 @@ template class PointCloudTree { virtual ~PointCloudTree() { } - /** + /** * Performs a radius query for points in kilometer units. - * + * * @param point The point to search around. * @param radius_sq The square of the radius to search around point. - * + * * @return @b QList A list of all the points within the radius. */ - QList radius_query(const T &point, const double &radius_sq) { + QList radius_query(const T &point, const double &radius_sq) { std::vector > matches; - (void) m_kd_index.radiusSearch(point.array(), radius_sq, matches, + (void) m_kd_index.radiusSearch(point.array(), radius_sq, matches, nanoflann::SearchParams()); QList points; @@ -141,18 +128,18 @@ template class PointCloudTree { } - /** + /** * Performs a query for the nearest neighbors to a point. - * + * * @param point The point to find neighbors around. * @param neighbors The number of neighbors to find. - * + * * @return @b QList A list of the neighbors. */ - QList neighbor_query(const T &point, const int &neighbors) { + QList neighbor_query(const T &point, const int &neighbors) { QVector indices(neighbors); QVector distances(neighbors); - m_kd_index.knnSearch(point.array(), neighbors, indices.data(), + m_kd_index.knnSearch(point.array(), neighbors, indices.data(), distances.data()); QList points; @@ -167,7 +154,7 @@ template class PointCloudTree { /** * Returns a reference to the point cloud. - * + * * @return @b A PointCloud& A constant reference to the point cloud. */ inline const PointCloud &cloud() const { diff --git a/isis/src/control/apps/cnetcombinept/cnetcombinept.cpp b/isis/src/control/apps/cnetcombinept/cnetcombinept.cpp index 39ff2aed83..5af46b2aba 100644 --- a/isis/src/control/apps/cnetcombinept/cnetcombinept.cpp +++ b/isis/src/control/apps/cnetcombinept/cnetcombinept.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "cnetcombinept.h" #include diff --git a/isis/src/control/apps/cnetcombinept/cnetcombinept.h b/isis/src/control/apps/cnetcombinept/cnetcombinept.h index 4a776a0c5a..27d0d24707 100644 --- a/isis/src/control/apps/cnetcombinept/cnetcombinept.h +++ b/isis/src/control/apps/cnetcombinept/cnetcombinept.h @@ -1,6 +1,14 @@ #ifndef cnetcombinept_h #define cnetcombinept_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include "Pvl.h" diff --git a/isis/src/control/apps/cnetcombinept/main.cpp b/isis/src/control/apps/cnetcombinept/main.cpp index 85926a6119..ff9da6a7c1 100644 --- a/isis/src/control/apps/cnetcombinept/main.cpp +++ b/isis/src/control/apps/cnetcombinept/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "cnetcombinept.h" diff --git a/isis/src/control/apps/cnetdiff/main.cpp b/isis/src/control/apps/cnetdiff/main.cpp index dfb48196f1..c3ed771e64 100644 --- a/isis/src/control/apps/cnetdiff/main.cpp +++ b/isis/src/control/apps/cnetdiff/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include @@ -319,4 +327,3 @@ void CompareKeywords(const PvlKeyword &pvl1, const PvlKeyword &pvl2) { } } } - diff --git a/isis/src/control/apps/cnetedit/main.cpp b/isis/src/control/apps/cnetedit/main.cpp index 421e60db7e..2d09cb4cde 100644 --- a/isis/src/control/apps/cnetedit/main.cpp +++ b/isis/src/control/apps/cnetedit/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #define GUIHELPERS #include "Isis.h" diff --git a/isis/src/control/apps/cnetextract/cnetextract.cpp b/isis/src/control/apps/cnetextract/cnetextract.cpp index 249481a133..7e8969adc7 100644 --- a/isis/src/control/apps/cnetextract/cnetextract.cpp +++ b/isis/src/control/apps/cnetextract/cnetextract.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "cnetextract.h" using namespace std; diff --git a/isis/src/control/apps/cnetextract/cnetextract.h b/isis/src/control/apps/cnetextract/cnetextract.h index 3007023a14..863941fbe8 100644 --- a/isis/src/control/apps/cnetextract/cnetextract.h +++ b/isis/src/control/apps/cnetextract/cnetextract.h @@ -1,6 +1,14 @@ #ifndef cnetextract_h #define cnetextract_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include diff --git a/isis/src/control/apps/cnetextract/main.cpp b/isis/src/control/apps/cnetextract/main.cpp index 1c1eb0bd0e..88261f17ef 100644 --- a/isis/src/control/apps/cnetextract/main.cpp +++ b/isis/src/control/apps/cnetextract/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "cnetextract.h" diff --git a/isis/src/control/apps/cnethist/main.cpp b/isis/src/control/apps/cnethist/main.cpp index d744562816..f01e24cc59 100644 --- a/isis/src/control/apps/cnethist/main.cpp +++ b/isis/src/control/apps/cnethist/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include diff --git a/isis/src/control/apps/cnetmerge/main.cpp b/isis/src/control/apps/cnetmerge/main.cpp index aa767110c2..5679d4cced 100644 --- a/isis/src/control/apps/cnetmerge/main.cpp +++ b/isis/src/control/apps/cnetmerge/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include @@ -20,7 +28,7 @@ using namespace Isis; ControlNet * mergeNetworks(FileList &filelist, PvlObject &conflictLog, QString networkId, QString description); -void mergeNetwork(ControlNet &baseNet, ControlNet &newNet, +void mergeNetwork(ControlNet &baseNet, ControlNet &newNet, PvlObject &cnetLog, Progress progress); ControlPoint * mergePoint( @@ -243,7 +251,7 @@ ControlNet * mergeNetworks(FileList &filelist, PvlObject &conflictLog, PvlObject cnetLog = createNetworkLog(newNet); // Merge the network, add the resulting conflicts to the log - progress.SetText("Merging file " + QString::number(cnetIndex+1) + progress.SetText("Merging file " + QString::number(cnetIndex+1) + " of " + QString::number(filelist.size())); mergeNetwork(*baseNet, newNet, cnetLog, progress); addLog(conflictLog, cnetLog); @@ -531,4 +539,3 @@ void addLog(PvlObject &cnetLog, PvlObject &pointLog, PvlGroup &measureLog) { if (pointLog.keywords() > 1 || pointLog.groups() > 0) cnetLog.addObject(pointLog); } - diff --git a/isis/src/control/apps/cnetnewradii/main.cpp b/isis/src/control/apps/cnetnewradii/main.cpp index d704146ff8..cc6f8117c2 100644 --- a/isis/src/control/apps/cnetnewradii/main.cpp +++ b/isis/src/control/apps/cnetnewradii/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include diff --git a/isis/src/control/apps/cnetpvl2bin/cnetpvl2bin.cpp b/isis/src/control/apps/cnetpvl2bin/cnetpvl2bin.cpp index 18fa665223..a300019800 100644 --- a/isis/src/control/apps/cnetpvl2bin/cnetpvl2bin.cpp +++ b/isis/src/control/apps/cnetpvl2bin/cnetpvl2bin.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "cnetpvl2bin.h" using namespace std; diff --git a/isis/src/control/apps/cnetpvl2bin/cnetpvl2bin.h b/isis/src/control/apps/cnetpvl2bin/cnetpvl2bin.h index b4d074f041..7073c8b155 100644 --- a/isis/src/control/apps/cnetpvl2bin/cnetpvl2bin.h +++ b/isis/src/control/apps/cnetpvl2bin/cnetpvl2bin.h @@ -1,6 +1,14 @@ #ifndef cnetpvl2bin_h #define cnetpvl2bin_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "UserInterface.h" #include "ControlNet.h" #include "Progress.h" diff --git a/isis/src/control/apps/cnetpvl2bin/main.cpp b/isis/src/control/apps/cnetpvl2bin/main.cpp index 3da4db18d8..824177ef90 100644 --- a/isis/src/control/apps/cnetpvl2bin/main.cpp +++ b/isis/src/control/apps/cnetpvl2bin/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "cnetpvl2bin.h" #include "Application.h" diff --git a/isis/src/control/apps/cnetref/CnetRefByEmission.cpp b/isis/src/control/apps/cnetref/CnetRefByEmission.cpp index 6c790c6a69..397ff8edda 100644 --- a/isis/src/control/apps/cnetref/CnetRefByEmission.cpp +++ b/isis/src/control/apps/cnetref/CnetRefByEmission.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Application.h" #include "CnetRefByEmission.h" #include "ControlNet.h" @@ -50,7 +58,7 @@ namespace Isis { mStatus.SetText("Choosing Reference by Emission..."); mStatus.SetMaximumSteps(pNewNet.GetNumPoints()); mStatus.CheckStatus(); - + for (int point = 0; point < pNewNet.GetNumPoints(); ++point) { ControlPoint *newPnt = pNewNet.GetPoint(point); @@ -69,7 +77,7 @@ namespace Isis { newPnt->SetDateTime(Application::DateTime()); } else { - pvlPointObj += Isis::PvlKeyword("Reference", "No Change, PointEditLock"); + pvlPointObj += Isis::PvlKeyword("Reference", "No Change, PointEditLock"); } int iNumMeasuresLocked = newPnt->GetNumLockedMeasures(); @@ -89,12 +97,12 @@ namespace Isis { // Points having atleast 1 measure and Points not Ignored // Check for EditLock in the Measures and also verfify that // only a Reference Measure can be Locked else error - if (!newPnt->IsIgnored() && newPnt->GetType() == ControlPoint::Free && numMeasures > 0 && + if (!newPnt->IsIgnored() && newPnt->GetType() == ControlPoint::Free && numMeasures > 0 && (iNumMeasuresLocked == 0 || (iNumMeasuresLocked > 0 && bRefLocked))) { int iNumIgnore = 0; QString istrTemp; double dBestEmissionAngle = 135; - + for (int measure = 0; measure < numMeasures; ++measure) { ControlMeasure *newMsr = newPnt->GetMeasure(measure); bool bMeasureLocked = newMsr->IsEditLocked(); @@ -209,7 +217,7 @@ namespace Isis { sComment += toString(++iComment); pvlPointObj += Isis::PvlKeyword(sComment, "Constrained Point"); } - + if (iNumMeasuresLocked > 0 && !bRefLocked) { pvlPointObj += Isis::PvlKeyword("Error", "Point has a Measure with EditLock set to true " "but the Reference is not Locked"); @@ -239,7 +247,7 @@ namespace Isis { origPnt.GetReferenceSN()); pvlRefChangeGrp += Isis::PvlKeyword("PrevEmAngle", toString(bestEmissionAngle[iRefIndex])); - + istrTemp = toString((int)origPnt.GetMeasure(iRefIndex)->GetSample()); istrTemp += ","; istrTemp += toString((int)origPnt.GetMeasure(iRefIndex)->GetLine()); diff --git a/isis/src/control/apps/cnetref/CnetRefByEmission.h b/isis/src/control/apps/cnetref/CnetRefByEmission.h index 2794a6b4fe..7559d88328 100644 --- a/isis/src/control/apps/cnetref/CnetRefByEmission.h +++ b/isis/src/control/apps/cnetref/CnetRefByEmission.h @@ -1,30 +1,24 @@ #ifndef _CnetRefByEmission_h_ #define _CnetRefByEmission_h_ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "ControlNetValidMeasure.h" -/** - * @file - * $Revision: 1.5 $ - * $Date: 2010/06/23 22:29:14 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + namespace Isis { class Pvl; @@ -80,4 +74,3 @@ namespace Isis { }; }; #endif - diff --git a/isis/src/control/apps/cnetref/CnetRefByIncidence.cpp b/isis/src/control/apps/cnetref/CnetRefByIncidence.cpp index c808612964..b83ca6408f 100644 --- a/isis/src/control/apps/cnetref/CnetRefByIncidence.cpp +++ b/isis/src/control/apps/cnetref/CnetRefByIncidence.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Application.h" #include "CnetRefByIncidence.h" #include "ControlNet.h" @@ -64,13 +72,13 @@ namespace Isis { newPnt->SetDateTime(Application::DateTime()); } else { - pvlPointObj += Isis::PvlKeyword("Reference", "No Change, PointEditLock"); + pvlPointObj += Isis::PvlKeyword("Reference", "No Change, PointEditLock"); } int iNumMeasuresLocked = newPnt->GetNumLockedMeasures(); bool bRefLocked = newPnt->GetRefMeasure()->IsEditLocked(); int numMeasures = newPnt->GetNumMeasures(); - + int iRefIndex = -1; if (newPnt->IsReferenceExplicit()) iRefIndex = newPnt->IndexOfRefMeasure(); @@ -219,14 +227,14 @@ namespace Isis { cm->SetChooserName("Application cnetref(Incidence)"); //newPnt.UpdateMeasure(cm); // Redesign fixed this } - } + } } if (*newPnt != origPnt) { iPointsModified++; } - if (!bError && !newPnt->IsIgnored() && newPnt->IsReferenceExplicit() && iBestIndex != iRefIndex + if (!bError && !newPnt->IsIgnored() && newPnt->IsReferenceExplicit() && iBestIndex != iRefIndex && !bPntEditLock && !bRefLocked) { iRefChanged++; PvlGroup pvlRefChangeGrp("ReferenceChangeDetails"); diff --git a/isis/src/control/apps/cnetref/CnetRefByIncidence.h b/isis/src/control/apps/cnetref/CnetRefByIncidence.h index 33bfd03137..d043c9481b 100644 --- a/isis/src/control/apps/cnetref/CnetRefByIncidence.h +++ b/isis/src/control/apps/cnetref/CnetRefByIncidence.h @@ -1,30 +1,16 @@ #ifndef _CnetRefByIncidence_h_ #define _CnetRefByIncidence_h_ -#include "ControlNetValidMeasure.h" +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ -/** - * @file - * $Revision: 1.5 $ - * $Date: - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +#include "ControlNetValidMeasure.h" namespace Isis { class ControlNet; @@ -80,4 +66,3 @@ namespace Isis { }; }; #endif - diff --git a/isis/src/control/apps/cnetref/CnetRefByResolution.cpp b/isis/src/control/apps/cnetref/CnetRefByResolution.cpp index cdadb2f4be..9ae3418b07 100644 --- a/isis/src/control/apps/cnetref/CnetRefByResolution.cpp +++ b/isis/src/control/apps/cnetref/CnetRefByResolution.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Application.h" #include "ControlNet.h" #include "ControlPoint.h" @@ -65,7 +73,7 @@ namespace Isis { for (int point = 0; point < pNewNet.GetNumPoints(); ++point) { ControlPoint *newPnt = pNewNet.GetPoint(point); bool bError = false; - + // Create a copy of original control point const ControlPoint origPnt(*newPnt); @@ -81,13 +89,13 @@ namespace Isis { newPnt->SetDateTime(Application::DateTime()); } else { - pvlPointObj += Isis::PvlKeyword("Reference", "No Change, PointEditLock"); + pvlPointObj += Isis::PvlKeyword("Reference", "No Change, PointEditLock"); } int iNumMeasuresLocked = newPnt->GetNumLockedMeasures(); bool bRefLocked = newPnt->GetRefMeasure()->IsEditLocked(); int numMeasures = newPnt->GetNumMeasures(); - + int iRefIndex = -1; if (newPnt->IsReferenceExplicit()) iRefIndex = newPnt->IndexOfRefMeasure(); @@ -115,7 +123,7 @@ namespace Isis { newMsr->SetDateTime(Application::DateTime()); newMsr->SetChooserName("Application cnetref(Resolution)"); } - + // Log PvlGroup pvlMeasureGrp("MeasureDetails"); pvlMeasureGrp += Isis::PvlKeyword("SerialNum", sn); @@ -126,7 +134,7 @@ namespace Isis { if (!newMsr->IsIgnored()) { Cube *measureCube = mCubeMgr.OpenCube(mSerialNumbers.fileName(sn)); - + MeasureValidationResults results = ValidStandardOptions(newMsr, measureCube, &pvlMeasureGrp); if (!results.isValid()) { @@ -237,14 +245,14 @@ namespace Isis { cm->SetChooserName("Application cnetref(Resolution)"); //newPnt.UpdateMeasure(cm); // Redesign fixed this } - } + } } if (*newPnt != origPnt) { iPointsModified++; } - - if (!bError && !newPnt->IsIgnored() && newPnt->IsReferenceExplicit() && iBestIndex != iRefIndex + + if (!bError && !newPnt->IsIgnored() && newPnt->IsReferenceExplicit() && iBestIndex != iRefIndex && !bPntEditLock && !bRefLocked) { iRefChanged++; PvlGroup pvlRefChangeGrp("ReferenceChangeDetails"); @@ -252,7 +260,7 @@ namespace Isis { pvlRefChangeGrp += Isis::PvlKeyword("PrevSerialNumber", origPnt.GetMeasure(iRefIndex)->GetCubeSerialNumber()); pvlRefChangeGrp += Isis::PvlKeyword("PrevResolution", toString(mdResVector[iRefIndex])); - + istrTemp = QString((int)origPnt.GetMeasure(iRefIndex)->GetSample()); istrTemp += ","; istrTemp += QString((int)origPnt.GetMeasure(iRefIndex)->GetLine()); @@ -261,7 +269,7 @@ namespace Isis { else { pvlRefChangeGrp += Isis::PvlKeyword("PrevReference", "Not Set"); } - + pvlRefChangeGrp += Isis::PvlKeyword("NewSerialNumber", newPnt->GetMeasure(iBestIndex)->GetCubeSerialNumber()); QString sKeyName = "NewHighestResolution"; @@ -357,11 +365,11 @@ namespace Isis { } } else if (meType == Mean) { - if ((int)mdResVector.size() == 2) { + if ((int)mdResVector.size() == 2) { // Arbitrarily assign the 1st measure to be reference for a point with only 2 measures iBestIndex = 0; } - else { + else { double dDiff = fabs(dMean - mdResVector[i]); if (dBestResolution == -1 || dDiff < dBestResolution) { dBestResolution = dDiff; @@ -387,4 +395,3 @@ namespace Isis { return iBestIndex; } }; - diff --git a/isis/src/control/apps/cnetref/CnetRefByResolution.h b/isis/src/control/apps/cnetref/CnetRefByResolution.h index fef1089f5a..dbeaad695f 100644 --- a/isis/src/control/apps/cnetref/CnetRefByResolution.h +++ b/isis/src/control/apps/cnetref/CnetRefByResolution.h @@ -1,30 +1,15 @@ #ifndef _CnetRefByResolution_H_ #define _CnetRefByResolution_H_ -#include "ControlNetValidMeasure.h" +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ -/** - * @file - * $Revision: 1.5 $ - * $Date: - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/* SPDX-License-Identifier: CC0-1.0 */ + +#include "ControlNetValidMeasure.h" namespace Isis { /** @@ -106,4 +91,3 @@ namespace Isis { }; }; #endif - diff --git a/isis/src/control/apps/cnetref/main.cpp b/isis/src/control/apps/cnetref/main.cpp index 28d82adcc5..5c40ebcab1 100644 --- a/isis/src/control/apps/cnetref/main.cpp +++ b/isis/src/control/apps/cnetref/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #define GUIHELPERS // should always be the first command #include "Isis.h" @@ -254,4 +262,3 @@ void EditDefFile(void) { GuiEditFile::EditFile(ui, sDefFile); } - diff --git a/isis/src/control/apps/cnetsplit/main.cpp b/isis/src/control/apps/cnetsplit/main.cpp index 196a63e960..25fcb352b1 100644 --- a/isis/src/control/apps/cnetsplit/main.cpp +++ b/isis/src/control/apps/cnetsplit/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "IsisDebug.h" diff --git a/isis/src/control/apps/cnetstats/cnetstats.cpp b/isis/src/control/apps/cnetstats/cnetstats.cpp index bf322e17d6..cc3bfa7362 100644 --- a/isis/src/control/apps/cnetstats/cnetstats.cpp +++ b/isis/src/control/apps/cnetstats/cnetstats.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "cnetstats.h" @@ -31,7 +39,7 @@ namespace Isis{ } /** - * Given some control network and criteria passed in through the UI, + * Given some control network and criteria passed in through the UI, * return some stats on the control network and its images. * * @param net A control network object. @@ -230,4 +238,3 @@ namespace Isis{ return NULL; } } - diff --git a/isis/src/control/apps/cnetstats/cnetstats.h b/isis/src/control/apps/cnetstats/cnetstats.h index f44950fe42..ea5e042858 100644 --- a/isis/src/control/apps/cnetstats/cnetstats.h +++ b/isis/src/control/apps/cnetstats/cnetstats.h @@ -1,6 +1,14 @@ #ifndef cnetstats_h #define cnetstats_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include "ControlNet.h" diff --git a/isis/src/control/apps/cnetstats/main.cpp b/isis/src/control/apps/cnetstats/main.cpp index fbf9b1d924..7b464b90fa 100644 --- a/isis/src/control/apps/cnetstats/main.cpp +++ b/isis/src/control/apps/cnetstats/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "cnetstats.h" @@ -19,8 +27,8 @@ void IsisMain() { } throw; } - + for (auto grpIt = appLog.beginGroup(); grpIt!= appLog.endGroup(); grpIt++) { Application::Log(*grpIt); } -} \ No newline at end of file +} diff --git a/isis/src/control/apps/cnettable/main.cpp b/isis/src/control/apps/cnettable/main.cpp index 0197197049..2345a12886 100644 --- a/isis/src/control/apps/cnettable/main.cpp +++ b/isis/src/control/apps/cnettable/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include @@ -190,14 +198,14 @@ void IsisMain() { measureInfo += QString(CheckValue(Asp.GetLatSigma().degrees())) + ","; measureInfo += QString(CheckValue(Asp.GetLonSigma().degrees())) + ","; measureInfo += QString(CheckValue(Asp.GetLocalRadiusSigma().kilometers())) + ","; - try { - measureInfo += QString(CheckValue(Asp.GetLatSigmaDistance().kilometers())) + ","; + try { + measureInfo += QString(CheckValue(Asp.GetLatSigmaDistance().kilometers())) + ","; } catch (IException &) { measureInfo += ","; } - try { - measureInfo += QString(CheckValue(Asp.GetLonSigmaDistance().kilometers())) + ","; + try { + measureInfo += QString(CheckValue(Asp.GetLonSigmaDistance().kilometers())) + ","; } catch (IException &) { measureInfo += ","; @@ -216,14 +224,14 @@ void IsisMain() { measureInfo += QString(CheckValue(sp.GetLatSigma().degrees())) + ","; measureInfo += QString(CheckValue(sp.GetLonSigma().degrees())) + ","; measureInfo += QString(CheckValue(sp.GetLocalRadiusSigma().kilometers())) + ","; - try { - measureInfo += QString(CheckValue(sp.GetLatSigmaDistance().kilometers())) + ","; + try { + measureInfo += QString(CheckValue(sp.GetLatSigmaDistance().kilometers())) + ","; } catch (IException &e) { measureInfo += ","; } - try { - measureInfo += QString(CheckValue(sp.GetLonSigmaDistance().kilometers())) + ","; + try { + measureInfo += QString(CheckValue(sp.GetLonSigmaDistance().kilometers())) + ","; } catch (IException &e) { measureInfo += ","; @@ -398,7 +406,7 @@ void Write(PvlGroup *point, const ControlMeasure &cm) { output += QString(CheckValue((*point)[i][0])) + ","; output += QString(CheckValue((*point)[i][1])) + ","; output += QString(CheckValue((*point)[i][2])) + ","; - } + } else { output += QString(CheckValue((*point)[i][0])) + ","; } diff --git a/isis/src/control/apps/cnetthinner/CnetManager.cpp b/isis/src/control/apps/cnetthinner/CnetManager.cpp index 0bcfc4236d..78566d9e21 100644 --- a/isis/src/control/apps/cnetthinner/CnetManager.cpp +++ b/isis/src/control/apps/cnetthinner/CnetManager.cpp @@ -1,24 +1,11 @@ -/** - * @file - * $Revision: 6565 $ - * $Date: 2016-02-10 17:15:35 -0700 (Wed, 10 Feb 2016) $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include @@ -51,7 +38,7 @@ namespace Isis { /** * Empty Constructor. Disabled at runtime. - * + * */ KPoint::KPoint() { m_point = 0; @@ -63,12 +50,12 @@ namespace Isis { /** - * Constructs a KPoint. - * + * Constructs a KPoint. + * * @param point The control point to make a KPoint from. * @param index The source index. - * @param weight The point's weight. - * + * @param weight The point's weight. + * */ KPoint::KPoint(ControlPoint *point, const int &index, const double &weight) { BOOST_ASSERT ( point != 0 ); @@ -80,9 +67,9 @@ namespace Isis { /** - * Set the status of the KPoint to true for selected or - * false for unselected. - * + * Set the status of the KPoint to true for selected or + * false for unselected. + * * @param state If true, the KPoint is set to selected. */ void KPoint::select(const bool &state) { @@ -91,30 +78,30 @@ namespace Isis { /** - * Calculate the strength of a control point. A negative return value indicates - * an invalid result. - * - * @param point - * @param weight - * - * @return double + * Calculate the strength of a control point. A negative return value indicates + * an invalid result. + * + * @param point + * @param weight + * + * @return double */ - double KPoint::calculateStrength(const ControlPoint *point, + double KPoint::calculateStrength(const ControlPoint *point, const double &weight) const { // Gut check for validity if ( !point ) return (-2.0); // Don't use points which have only 1 valid measure or fewer, since - // we don't use refIncides in the strength calculation. + // we don't use refIncides in the strength calculation. if ( point->GetNumValidMeasures() < 2.0 ) return (-1.0); // Got some good ones, compute strength - double sum(0.0); + double sum(0.0); int count(0); int refIndex = point->IndexOfRefMeasure(); for ( int i = 0 ; i < point->GetNumMeasures() ; i++) { if ( i != refIndex ) { // Check all but the reference measure - const ControlMeasure *m = point->GetMeasure(i); + const ControlMeasure *m = point->GetMeasure(i); if ( !m->IsIgnored() && m->HasLogData(ControlMeasureLogData::GoodnessOfFit) ) { sum += m->GetLogData(ControlMeasureLogData::GoodnessOfFit).GetNumericalValue(); count++; @@ -132,15 +119,15 @@ namespace Isis { // CnetManager implementation /** - * Constructs an emtpy CnetManager. - * + * Constructs an emtpy CnetManager. + * */ CnetManager::CnetManager() : m_kpts() { } /** * Constructs a CnetManager using an input control network and a weight. - * + * * @param cnet Input control network to be managed. * @param weight Weights to apply to the control network. */ @@ -149,17 +136,17 @@ namespace Isis { } -/** - * - * Default Destructor - * +/** + * + * Default Destructor + * */ CnetManager::~CnetManager() { } /** * The number of points managed by CnetManager. - * + * * @return @b int The number of points in this CnetManager. */ int CnetManager::size() const { @@ -168,11 +155,11 @@ namespace Isis { /** - * Loads a list of control points into the CnetManager. - * + * Loads a list of control points into the CnetManager. + * * @param pts The QList of ControlPoints to load into the CnetManager. - * @param weight The weight to apply to each ControlPoint in the list. - * + * @param weight The weight to apply to each ControlPoint in the list. + * * @return @b int The number of ControlPoints loaded into the CnetManager. */ int CnetManager::load(const QList &pts, const double &weight) { @@ -204,9 +191,9 @@ namespace Isis { /** - * Get a list of control points in this CnetManager. - * - * @return @b const QList List of control points in CnetManager. + * Get a list of control points in this CnetManager. + * + * @return @b const QList List of control points in CnetManager. */ const QList CnetManager::getControlPoints() const { QList pts; @@ -219,10 +206,10 @@ namespace Isis { /** * Return a map of the number of measures per cube. - * + * * @return @b QMap Serial number, number of measures per that serial number (cube) */ - QMap CnetManager::getCubeMeasureCount() const { + QMap CnetManager::getCubeMeasureCount() const { QMap k_map; BOOST_FOREACH ( const KPoint &p, m_kpts ) { QList measures = p.point()->getMeasures(true); @@ -237,18 +224,18 @@ namespace Isis { /** - * Returns control measures and their associated indicies for a given cube (serial number.) - * + * Returns control measures and their associated indicies for a given cube (serial number.) + * * @param serialNo Serial number (indicates a specific cube) to get the measure indicies for. - * + * * @return @b CnetManager::PointSet Data structure containing the calculated index and measure. */ CnetManager::PointSet CnetManager::getCubeMeasureIndices(const QString &serialNo) const { PointSet cubeNdx; BOOST_FOREACH ( const KPoint &p, m_kpts ) { int index = p.point()->IndexOf(serialNo, false); - if ( index >= 0 ) { - cubeNdx.append( qMakePair(p.index(), p.point()->GetMeasure(index)) ); + if ( index >= 0 ) { + cubeNdx.append( qMakePair(p.index(), p.point()->GetMeasure(index)) ); } } return ( cubeNdx ); @@ -256,8 +243,8 @@ namespace Isis { /** - * Will return the KPoint at an input index. - * + * Will return the KPoint at an input index. + * * @return @b const KPoint& The KPoint at the requested index. */ const KPoint &CnetManager::operator()(const int index) const { @@ -267,12 +254,12 @@ namespace Isis { /** - * - * Get a point at a specificed index. - * - * @param index Index of the point to get. - * - * @return @b const ControlPoint* The point at the requested index. + * + * Get a point at a specificed index. + * + * @param index Index of the point to get. + * + * @return @b const ControlPoint* The point at the requested index. */ const ControlPoint *CnetManager::point(const int &index) const { BOOST_ASSERT ( index < m_kpts.size() ); @@ -281,8 +268,8 @@ namespace Isis { /** - * Gets the list of KPoints managed by this CubeManager. - * + * Gets the list of KPoints managed by this CubeManager. + * * @return @b const QList& List of KPoints managed by this CnetManager. */ const QList &CnetManager::pointList() const { @@ -291,11 +278,11 @@ namespace Isis { /** - * Get a point at a specificed index. - * - * @param index Index of the point. - * - * @return @b ControlPoint* The point at the requested index. + * Get a point at a specificed index. + * + * @param index Index of the point. + * + * @return @b ControlPoint* The point at the requested index. */ ControlPoint *CnetManager::point(const int index) { BOOST_ASSERT ( index < m_kpts.size() ); diff --git a/isis/src/control/apps/cnetthinner/CnetManager.h b/isis/src/control/apps/cnetthinner/CnetManager.h index 867166e712..fbf62be0e3 100644 --- a/isis/src/control/apps/cnetthinner/CnetManager.h +++ b/isis/src/control/apps/cnetthinner/CnetManager.h @@ -1,26 +1,14 @@ #ifndef CnetManager_h #define CnetManager_h -/** - * @file - * $Revision: 6565 $ - * $Date: 2016-02-10 17:15:35 -0700 (Wed, 10 Feb 2016) $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include @@ -53,14 +41,14 @@ namespace Isis { class CnetManager; /** - * Class to store control points with a weight and computed strength for CnetManager. - * - * @author 2016-09-30 Kris Becker - * - * @internal + * Class to store control points with a weight and computed strength for CnetManager. + * + * @author 2016-09-30 Kris Becker + * + * @internal * @history 2016-09-30 Kris Becker - Original Version * @history 2016-12-28 Kristin Berry - Added documentation and tests for checkin - * + * */ class KPoint { @@ -72,22 +60,22 @@ namespace Isis { void select(const bool &state = true); - //definitions of inline functions + //definitions of inline functions /** * Get the control point the KPoint was constructed from. - * - * @return @b ControlPoint* The original control point. + * + * @return @b ControlPoint* The original control point. */ inline ControlPoint *point() const { BOOST_ASSERT ( m_point != 0 ); return ( m_point ); } - + /** * Gets the calculated strength of this KPoint. - * + * * @return @b double The calculated strength of this KPoint. */ inline double strength() const { @@ -97,7 +85,7 @@ namespace Isis { /** * Gets the index of this KPoint. - * + * * @return @b int The index of this KPoint. */ inline int index () const { @@ -106,8 +94,8 @@ namespace Isis { /** - * Gets the original index of this KPoint. - * + * Gets the original index of this KPoint. + * * @return @b int The original or source index of this KPoint. */ inline int sourceIndex() const { @@ -119,7 +107,7 @@ namespace Isis { double m_strength; //! The calulated strength of this KPoint. int m_sourceIndex; //! The original index of this KPoint. int m_index; //! The calculated index of this KPoint. - bool m_selected; //! Flag to indicated whether to use this KPoint or not. + bool m_selected; //! Flag to indicated whether to use this KPoint or not. double calculateStrength(const ControlPoint *point, const double &weight) const; @@ -128,10 +116,10 @@ namespace Isis { /** * Container class for the network and suppression data. - * - * @author 2016-09-30 Kris Becker - * - * @internal + * + * @author 2016-09-30 Kris Becker + * + * @internal * @history 2016-09-30 Kris Becker - Original Version * @history 2016-12-28 Kristin Berry - Added documentation and tests for checkin */ @@ -144,7 +132,7 @@ namespace Isis { CnetManager(ControlNet &cnet, const double &weight = 0.0); virtual ~CnetManager(); - int size() const; + int size() const; int load(const QList &pts, const double &weight = 0.0); QMap getCubeMeasureCount() const; @@ -157,21 +145,21 @@ namespace Isis { protected: ControlPoint *point(const int index); - + private: QList m_kpts; //! List of KPoints managed by this class /** * @brief Ascending order sort functor - * + * * This is a comparison class used to sort lists of KPoint objects by strength, in * ascending order. - * - * @author 2016-09-30 Kris Becker - * - * @internal + * + * @author 2016-09-30 Kris Becker + * + * @internal * @history 2016-09-30 Kris Becker - Original Version - * + * */ class SortStrengthDescending { public: diff --git a/isis/src/control/apps/cnetthinner/CnetSuppression.cpp b/isis/src/control/apps/cnetthinner/CnetSuppression.cpp index 6eca770e40..8be3dcfb7a 100644 --- a/isis/src/control/apps/cnetthinner/CnetSuppression.cpp +++ b/isis/src/control/apps/cnetthinner/CnetSuppression.cpp @@ -1,24 +1,11 @@ -/** - * @file - * $Revision: 6565 $ - * $Date: 2016-02-10 17:15:35 -0700 (Wed, 10 Feb 2016) $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -51,24 +38,24 @@ namespace Isis { /** - * Constructs an empty CnetSuppression object. - * + * Constructs an empty CnetSuppression object. + * */ - CnetSuppression::CnetSuppression() : CnetManager(), m_cnet(), m_points(), m_results(), - m_early_term(EARLY_TERMINATION), + CnetSuppression::CnetSuppression() : CnetManager(), m_cnet(), m_points(), m_results(), + m_early_term(EARLY_TERMINATION), m_area() { } /** - * Constructs a CentSuppression object using a filename and a weight. - * - * @param cnetfile Filename of the controlnet file. - * @param weight Weight to apply to all points in controlnet. - * - * @throws IException::User "Control Net filename [FILENAME] is invalid." + * Constructs a CentSuppression object using a filename and a weight. + * + * @param cnetfile Filename of the controlnet file. + * @param weight Weight to apply to all points in controlnet. + * + * @throws IException::User "Control Net filename [FILENAME] is invalid." */ - CnetSuppression::CnetSuppression(const QString &cnetfile, const double &weight) : - CnetManager( ), m_cnet(), m_points(), m_results(), - m_early_term(EARLY_TERMINATION), + CnetSuppression::CnetSuppression(const QString &cnetfile, const double &weight) : + CnetManager( ), m_cnet(), m_points(), m_results(), + m_early_term(EARLY_TERMINATION), m_area() { Progress progress; @@ -79,29 +66,29 @@ namespace Isis { throw e; } - m_points = m_cnet->take(); + m_points = m_cnet->take(); load(m_points, weight); } /** * Constructs a CnetSuppression object using a CnetManager - * + * * @param cman CnetManager used to construct a CnetSuppression. */ - CnetSuppression::CnetSuppression(const CnetManager &cman) : - CnetManager(cman), - m_cnet(), m_points(), - m_results(), - m_early_term(EARLY_TERMINATION), + CnetSuppression::CnetSuppression(const CnetManager &cman) : + CnetManager(cman), + m_cnet(), m_points(), + m_results(), + m_early_term(EARLY_TERMINATION), m_area() { } -/** - * - * Destructor. Cleans up dynamically allocated control points. - * +/** + * + * Destructor. Cleans up dynamically allocated control points. + * */ - CnetSuppression::~CnetSuppression() { + CnetSuppression::~CnetSuppression() { BOOST_FOREACH ( ControlPoint *p, m_points ) { delete p; } @@ -110,30 +97,30 @@ namespace Isis { /** * Sets the early termiation flag - * + * * @param state Will terminate early if true */ - void CnetSuppression::setEarlyTermination(const bool &state) { //TODO this is not used right now at all? + void CnetSuppression::setEarlyTermination(const bool &state) { //TODO this is not used right now at all? m_early_term = state; return; } /** - * Performs a suppression on all cubes associated with the CnetSuppression object and returns the - * results as a Results object. An input bitmask will be used to mask all pointsets associated with - * all cubes before running the suppression. - * + * Performs a suppression on all cubes associated with the CnetSuppression object and returns the + * results as a Results object. An input bitmask will be used to mask all pointsets associated with + * all cubes before running the suppression. + * * @param minpts minimum points to keep in the result set - * @param maxpts maximum points to keep in the result set. - * @param min_radius The minimum radius to use for the suppression calculation. - * @param tolerance A multiplicative tolerance on the number of maxpoints to return. - * @param bm A BitMask to apply to the input point set. - * - * @return @b CnetSuppression::Results The Results set for the suppression run. + * @param maxpts maximum points to keep in the result set. + * @param min_radius The minimum radius to use for the suppression calculation. + * @param tolerance A multiplicative tolerance on the number of maxpoints to return. + * @param bm A BitMask to apply to the input point set. + * + * @return @b CnetSuppression::Results The Results set for the suppression run. */ CnetSuppression::Results CnetSuppression::suppress(const int &minpts, const int &maxpts, - const double &min_radius, + const double &min_radius, const double &tolerance, const CnetSuppression::BitMask &bm) { @@ -167,40 +154,40 @@ namespace Isis { std::cout << "\n--> Serial: " << serialno.toStdString() << "\n"; #endif - Results r = suppress(serialno, minpts, maxpts, min_radius, + Results r = suppress(serialno, minpts, maxpts, min_radius, tolerance, myBm); m_results.append(r); #if defined(DEBUG) - std::cout << " Total Saved: " << r.size() << " at cell radius " + std::cout << " Total Saved: " << r.size() << " at cell radius " << r.m_radius << "\n"; #endif final = merge(r,final); myBm = final.m_selected; } - + return (final); } /** - * Performs a suppression on the PointSet associated with a single cube as indicated by - * its serial number and returns the results as a new PointSet. An input bitmask will - * be used to mask the input pointset before running the suppression. - * + * Performs a suppression on the PointSet associated with a single cube as indicated by + * its serial number and returns the results as a new PointSet. An input bitmask will + * be used to mask the input pointset before running the suppression. + * * @param serialno The serial number for the image/cube to run suppression on. - * @param minpts The minimum possible points to keep after a suppression run. - * @param maxpts The maximum possible points to keep after a suppression run. - * @param min_radius The minimum radius to use for the suppression calculation. - * @param tolerance A multiplicative tolerance on the number of maxpoints to return. - * @param bm A BitMask to apply to the input point set. - * - * @return @b CnetSuppression::Results The Result set for the suppression run. + * @param minpts The minimum possible points to keep after a suppression run. + * @param maxpts The maximum possible points to keep after a suppression run. + * @param min_radius The minimum radius to use for the suppression calculation. + * @param tolerance A multiplicative tolerance on the number of maxpoints to return. + * @param bm A BitMask to apply to the input point set. + * + * @return @b CnetSuppression::Results The Result set for the suppression run. */ - CnetSuppression::Results CnetSuppression::suppress(const QString &serialno, const int minpts, + CnetSuppression::Results CnetSuppression::suppress(const QString &serialno, const int minpts, const int &maxpts, const double &min_radius, - const double &tolerance, + const double &tolerance, const CnetSuppression::BitMask &bm) { PointSet cubeset = getCubeMeasureIndices(serialno); @@ -213,22 +200,22 @@ namespace Isis { /** - * Performs a suppression on the input PointSet and returns the result as a new PointSet. - * An input bitmask will be used to mask the input pointset before running the suppression. - * + * Performs a suppression on the input PointSet and returns the result as a new PointSet. + * An input bitmask will be used to mask the input pointset before running the suppression. + * * @param points The point set to run suppression on. - * @param minpts The minimum possible points to keep after a suppression run. - * @param maxpts The maximum possible points to keep after a suppression run. - * @param min_radius The minimum radius to use for the suppression calculation. - * @param tolerance A tolerance factor which scales the size of the search space for suppression. - * @param bm A BitMask to apply to the input point set. - * - * @return @b CnetSuppression::Results The Result set for the suppression run. + * @param minpts The minimum possible points to keep after a suppression run. + * @param maxpts The maximum possible points to keep after a suppression run. + * @param min_radius The minimum radius to use for the suppression calculation. + * @param tolerance A tolerance factor which scales the size of the search space for suppression. + * @param bm A BitMask to apply to the input point set. + * + * @return @b CnetSuppression::Results The Result set for the suppression run. */ - CnetSuppression::Results CnetSuppression::suppress(const CnetSuppression::PointSet &points, - const int &minpts, const int &maxpts, + CnetSuppression::Results CnetSuppression::suppress(const CnetSuppression::PointSet &points, + const int &minpts, const int &maxpts, const double &min_radius, - const double &tolerance, + const double &tolerance, const CnetSuppression::BitMask &bm) { // Bounding box of control points @@ -236,14 +223,14 @@ namespace Isis { double max_radius = qMax(d.width(), d.height()); int num = qMax(qFloor(max_radius - min_radius), 11); //TODO not sure where the 11 came from...? - QVector radii = linspace(min_radius, max_radius, num, + QVector radii = linspace(min_radius, max_radius, num, 1.0/qSqrt(2.0) ); QPointF botR = d.bottomRight(); #if defined(DEBUG) QPointF topL = d.topLeft(); - std::cout << " Domain((x), (y)): (" << topL.x() << "," << botR.x() + std::cout << " Domain((x), (y)): (" << topL.x() << "," << botR.x() << "), (" << topL.y() << "," << botR.y() << ")\n"; std::cout << " Min.Max, count Radius: " << min_radius << ", " << max_radius << " ," << num << "\n"; @@ -259,7 +246,7 @@ namespace Isis { PointSet fixed( contains(bm, points) ); #if defined(DEBUG) - std::cout << " FixedPoints: " << fixed.size() << " - ToSave: " + std::cout << " FixedPoints: " << fixed.size() << " - ToSave: " << v_maxpts << " (scaled) - Pnttol: " << pnttol << "\n"; #endif @@ -276,7 +263,7 @@ namespace Isis { m_results.append(result); return (result); } - + // Binary loop around cell radius list int bmin = 0; int bmax = radii.size() - 1; @@ -334,8 +321,8 @@ namespace Isis { #if defined(DEBUG) int ncov = cover(grid, x_center, y_center, cell_size); - std::cout << " TotalCovered: " << ncov << "(" << nCovered(grid) - << ") of " << (n_x_cells*n_y_cells) << "\n"; + std::cout << " TotalCovered: " << ncov << "(" << nCovered(grid) + << ") of " << (n_x_cells*n_y_cells) << "\n"; #endif } @@ -345,7 +332,7 @@ namespace Isis { // std::cout << " PointsFound: " << result.size() << "\n"; // Now determine if we have enough points to call it good - if ( (result.size() >= (v_maxpts - pnttol) ) && + if ( (result.size() >= (v_maxpts - pnttol) ) && (result.size() <= (v_maxpts + pnttol) ) ) { bmax = bmin; // This will terminate the binary search } @@ -367,11 +354,11 @@ namespace Isis { /** - * Write out a Results object to an output control network. - * + * Write out a Results object to an output control network. + * * @param onetfile Filename for output control network * @param result Object containin the results of a suppression calculation - * @param saveall If true, copies all points to the output control net, even if ignored. + * @param saveall If true, copies all points to the output control net, even if ignored. * @param netid Control networkd id */ void CnetSuppression::write(const QString &onetfile, const Results &result, @@ -386,12 +373,12 @@ namespace Isis { onet->SetCreatedDate(Application::DateTime()); } else { - onet.reset( new ControlNet(*m_cnet) ); + onet.reset( new ControlNet(*m_cnet) ); } if ( !netid.isEmpty() ) { onet->SetNetworkId(netid); } - // Set states from result set and add points if + // Set states from result set and add points if for ( int i = 0 ; i < size() ; i++ ) { ControlPoint *p = point(i); p->SetIgnored( !result.m_selected[i] ); @@ -404,7 +391,7 @@ namespace Isis { onet->AddPoint( m_points[i] ); } } - + // Write the points onet->Write(onetfile); (void) onet->take(); // Not necessary to retain these points @@ -414,7 +401,7 @@ namespace Isis { /** * Gets the control net associated with the CnetSuppresssion. - * + * * @return @b const ControlNet* The control net for this CnetSuppression */ const ControlNet *CnetSuppression::net() const { @@ -424,9 +411,9 @@ namespace Isis { /** * Gets the index of an input IndexPoint - * + * * @param p An IndexPoint to get the index of. - * + * * @return @b int The index of the input index point. */ int CnetSuppression::index(const CnetSuppression::IndexPoint &p) const { @@ -436,9 +423,9 @@ namespace Isis { /** * Gets the control measure from the input IndexPoint. - * + * * @param p The IndexPoint to get the control measure from - * + * * @return @b ControlMeasure* The control measure of the input IndexPoint */ ControlMeasure *CnetSuppression::measure(const CnetSuppression::IndexPoint &p) const { @@ -447,16 +434,16 @@ namespace Isis { /** - * Create a BitMask of a specified size for an input PointSet. - * + * Create a BitMask of a specified size for an input PointSet. + * * @param nbits The size of a BitMask to create. * @param p The PointSet used to create a BitMask. - * - * @return @b CnetSuppression::BitMask A bit mask with entires set to true if their index is in the - * input PointSet. + * + * @return @b CnetSuppression::BitMask A bit mask with entires set to true if their index is in the + * input PointSet. */ - CnetSuppression::BitMask CnetSuppression::maskPoints(int nbits, - const CnetSuppression::PointSet &p) + CnetSuppression::BitMask CnetSuppression::maskPoints(int nbits, + const CnetSuppression::PointSet &p) const { BOOST_ASSERT (nbits > 0); BitMask bm(nbits, false); @@ -469,14 +456,14 @@ namespace Isis { /** - * Use an input BitMask to mask the input PointSet, and return the results. - * + * Use an input BitMask to mask the input PointSet, and return the results. + * * @param bm BitMask contining true for indices to keep and false for indicies to get rid of. * @param pset The PointSet to apply the BitMask to. - * - * @return @b CnetSuppression::PointSet A PointSet containing only the points not masked out. + * + * @return @b CnetSuppression::PointSet A PointSet containing only the points not masked out. */ - CnetSuppression::PointSet CnetSuppression::contains(const CnetSuppression::BitMask &bm, + CnetSuppression::PointSet CnetSuppression::contains(const CnetSuppression::BitMask &bm, const CnetSuppression::PointSet &pset) const { PointSet result; if ( bm.dim1() == 0 ) { return (result); } @@ -493,16 +480,16 @@ namespace Isis { /** - * Calculates the (x,y) coordinates for an IndexPoint inside of a cell - * of input size. - * + * Calculates the (x,y) coordinates for an IndexPoint inside of a cell + * of input size. + * * @param p The index point to calculate the x_center and y_center of. * @param cell_size Size of the cell. * @param x_center The x-coordinate of the center of the cell (Result). * @param y_center The y-coordinate of the center of the cell (Result). */ - void CnetSuppression::cellIndex(const CnetSuppression::IndexPoint &p, - const double &cell_size, + void CnetSuppression::cellIndex(const CnetSuppression::IndexPoint &p, + const double &cell_size, int &x_center, int &y_center) const { x_center = int((measure(p)->GetSample()) / cell_size); y_center = int((measure(p)->GetLine()) / cell_size); @@ -511,12 +498,12 @@ namespace Isis { /** - * Determine the number of (x,y) positions in the input grid which are set to true. - * - * @param grid The grid to calculate the number of covered points from. - * - * @return @b int The number of convered points; the number of (x,y) positions for which the bitmask - * is set to true. + * Determine the number of (x,y) positions in the input grid which are set to true. + * + * @param grid The grid to calculate the number of covered points from. + * + * @return @b int The number of convered points; the number of (x,y) positions for which the bitmask + * is set to true. */ int CnetSuppression::nCovered(const CnetSuppression::GridMask &grid) const { int ncov(0); @@ -530,18 +517,18 @@ namespace Isis { /** - * Update a grid to contain true values where it is covered by cells as defined by the input - * PointSet. - * - * @param grid The grid to update by setting to true grid entries which are contained within cells - * definted by the input PointSet. - * @param points The input PointSet to use to update the grid. + * Update a grid to contain true values where it is covered by cells as defined by the input + * PointSet. + * + * @param grid The grid to update by setting to true grid entries which are contained within cells + * definted by the input PointSet. + * @param points The input PointSet to use to update the grid. * @param cell_size The size of a cell. - * - * @return @b int The number of grid entries updated. + * + * @return @b int The number of grid entries updated. */ - int CnetSuppression::cover(CnetSuppression::GridMask &grid, - const CnetSuppression::PointSet &points, + int CnetSuppression::cover(CnetSuppression::GridMask &grid, + const CnetSuppression::PointSet &points, const double &cell_size) const { int x_center, y_center, ncov(0); @@ -549,24 +536,24 @@ namespace Isis { cellIndex(p, cell_size, x_center, y_center); ncov = cover(grid, x_center, y_center, cell_size); } - return (ncov); //ncov should be += for _all_ covered? + return (ncov); //ncov should be += for _all_ covered? } /** - * Update a grid to contain true values where it overlaps a rectangle defined by the - * input paramters and return the number of values contained in this rectange. - * - * @param grid The grid to update by setting to true grid entries contained within the + * Update a grid to contain true values where it overlaps a rectangle defined by the + * input paramters and return the number of values contained in this rectange. + * + * @param grid The grid to update by setting to true grid entries contained within the * rectangle defined by the paramters passed to this function. - * @param x_center The x-coordinate of the center of the grid. - * @param y_center The y-coordinate of the center of the grid. - * @param cell_size The size of a cell. - * - * @return @b int The number of covered cells. + * @param x_center The x-coordinate of the center of the grid. + * @param y_center The y-coordinate of the center of the grid. + * @param cell_size The size of a cell. + * + * @return @b int The number of covered cells. */ - int CnetSuppression::cover(CnetSuppression::GridMask &grid, - const int &x_center, const int &y_center, + int CnetSuppression::cover(CnetSuppression::GridMask &grid, + const int &x_center, const int &y_center, const double &cell_size) const { int n_x_cells = grid.dim1(); @@ -590,14 +577,14 @@ namespace Isis { /** - * Merge two PointSets together and return the result. - * - * @param s1 The first PointSet to be merged. - * @param s2 The second PointSet to be merged. - * + * Merge two PointSets together and return the result. + * + * @param s1 The first PointSet to be merged. + * @param s2 The second PointSet to be merged. + * * @return @b CnetSuppression::PointSet The merged PointSet. */ - CnetSuppression::PointSet CnetSuppression::merge(const CnetSuppression::PointSet &s1, + CnetSuppression::PointSet CnetSuppression::merge(const CnetSuppression::PointSet &s1, const CnetSuppression::PointSet &s2) const { BitMask bm2 = maskPoints(size(), s2); PointSet merged = s2; @@ -611,14 +598,14 @@ namespace Isis { /** - * Merge two CnetSuppression::Results objects together and return the result. - * - * @param r1 The first Results to be merged. + * Merge two CnetSuppression::Results objects together and return the result. + * + * @param r1 The first Results to be merged. * @param r2 The second Results to be merged. - * - * @return @b CnetSuppression::Results The merged Results. + * + * @return @b CnetSuppression::Results The merged Results. */ - CnetSuppression::Results CnetSuppression::merge(const CnetSuppression::Results &r1, + CnetSuppression::Results CnetSuppression::merge(const CnetSuppression::Results &r1, const CnetSuppression::Results &r2) const { if ( !r1.isValid() ) { return (r2); } if ( !r2.isValid() ) { return (r1); } @@ -647,30 +634,30 @@ namespace Isis { /** - * Calculates the ratio between the area contained in a square of side-length d and the area - * of the CnetSuppression. - * - * @param d The length of a side of a square. - * - * @return @b double The fraction: area of a square of size d / the area of the CnetSuppression. + * Calculates the ratio between the area contained in a square of side-length d and the area + * of the CnetSuppression. + * + * @param d The length of a side of a square. + * + * @return @b double The fraction: area of a square of size d / the area of the CnetSuppression. */ double CnetSuppression::getScale(const QSizeF &d) const { if ( m_area.isEmpty() ) { m_area = d; } - double area = d.width() * d.height(); + double area = d.width() * d.height(); double pcnt = area / (m_area.width() * m_area.height()); return ( pcnt ); } /** - * Computes and returns the bitwise 'or' of the two input bitmasks. - * + * Computes and returns the bitwise 'or' of the two input bitmasks. + * * @param b1 First input BitMask * @param b2 Second input BitMask - * + * * @return @b CnetSuppression::BitMask A BitMask which is the bitwise result of 'b1 or b2' */ - CnetSuppression::BitMask CnetSuppression::orMasks(const CnetSuppression::BitMask &b1, + CnetSuppression::BitMask CnetSuppression::orMasks(const CnetSuppression::BitMask &b1, const CnetSuppression::BitMask &b2) const { BOOST_ASSERT ( b1.dim1() == b2.dim1() ); BitMask omask(b1.dim1()); @@ -682,22 +669,22 @@ namespace Isis { /** - * Creates and returns a vector which contains num entries, starting at dmin and ending at dmax. - * The entires in-between span the space between dmin and dmax with equal steps each time. The - * entire vector is multiplied by an input scale factor. - * + * Creates and returns a vector which contains num entries, starting at dmin and ending at dmax. + * The entires in-between span the space between dmin and dmax with equal steps each time. The + * entire vector is multiplied by an input scale factor. + * * @param dmin The minimum value of the vector. - * @param dmax The maximum value of the vector. - * @param num The number of entries that should be in the returned vector. + * @param dmax The maximum value of the vector. + * @param num The number of entries that should be in the returned vector. * @param scale Multiplicative scale factor to multiply the entire vector by. - * - * @return @b QVector A vector of size num with entries starting at dmin and ending + * + * @return @b QVector A vector of size num with entries starting at dmin and ending * at dmax with values of equal increment spanning the space between them and - * with all entries multiplied by scale. + * with all entries multiplied by scale. */ - QVector CnetSuppression::linspace(const double dmin, - const double dmax, - const int num, + QVector CnetSuppression::linspace(const double dmin, + const double dmax, + const int num, const double &scale) const { double inc = (dmax - dmin) / (double) (num - 1); QVector ndarray(num); @@ -710,4 +697,3 @@ namespace Isis { } // namespace Isis - diff --git a/isis/src/control/apps/cnetthinner/CnetSuppression.h b/isis/src/control/apps/cnetthinner/CnetSuppression.h index 3acfdfabc6..1ae0abd91d 100644 --- a/isis/src/control/apps/cnetthinner/CnetSuppression.h +++ b/isis/src/control/apps/cnetthinner/CnetSuppression.h @@ -1,26 +1,14 @@ #ifndef CnetSuppression_h #define CnetSuppression_h -/** - * @file - * $Revision: 6565 $ - * $Date: 2016-02-10 17:15:35 -0700 (Wed, 10 Feb 2016) $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include @@ -45,15 +33,15 @@ namespace Isis { /** * Container class for CnetManager - * - * @author 2016-09-30 Kris Becker - * - * @internal + * + * @author 2016-09-30 Kris Becker + * + * @internal * @history 2016-09-30 Kris Becker - Original Version * @history 2016-12-28 Kristin Berry - Added documentation and tests for checkin * @history 2017-08-09 Summer Stapleton - Added a try-catch in constructor to throw proper * error for invalid control net. Fixes #5068. - * + * */ class CnetSuppression : public CnetManager { public: @@ -63,20 +51,20 @@ namespace Isis { typedef TNT::Array2D GridMask; typedef TNT::Array1D BitMask; - /** + /** * Results of a particular suppression - * - * @author 2016-09-30 Kris Becker - * - * @internal + * + * @author 2016-09-30 Kris Becker + * + * @internal * @history 2016-09-30 Kris Becker - Original Version - * + * */ class Results { public: - Results() : m_candidates(), m_selected(), m_points(), - m_domain(), m_radius(0) { } - Results(const int n, const QRectF domain, const double &radius) : + Results() : m_candidates(), m_selected(), m_points(), + m_domain(), m_radius(0) { } + Results(const int n, const QRectF domain, const double &radius) : m_candidates(n, false), m_selected(n, false), m_points(), m_domain(domain),m_radius(radius) { } @@ -84,7 +72,7 @@ namespace Isis { /** * True if the Results are valid. - * + * * @return @b bool True if results are valid. */ inline bool isValid() const { @@ -93,9 +81,9 @@ namespace Isis { /** - * The number of points in the Result. - * - * @return @b int Number of points in the Result. + * The number of points in the Result. + * + * @return @b int Number of points in the Result. */ inline int size() const { return ( m_points.size() ); @@ -103,9 +91,9 @@ namespace Isis { /** - * Add a PointSet to the Results. - * - * @param points The points to add to the Result set. + * Add a PointSet to the Results. + * + * @param points The points to add to the Result set. */ inline void add(const PointSet &points) { BOOST_FOREACH (const IndexPoint &p, points) { add(p); } @@ -114,9 +102,9 @@ namespace Isis { /** - * Add a single point to the Result. - * - * @param point The point to add to the Result. + * Add a single point to the Result. + * + * @param point The point to add to the Result. */ inline void add(const IndexPoint &point) { m_points.append(point); @@ -126,11 +114,11 @@ namespace Isis { return; } - BitMask m_candidates; //! - BitMask m_selected; //! - PointSet m_points; //! + BitMask m_candidates; //! + BitMask m_selected; //! + PointSet m_points; //! QRectF m_domain; //! - double m_radius; //! + double m_radius; //! }; CnetSuppression(); @@ -142,21 +130,21 @@ namespace Isis { void setEarlyTermination(const bool &state = true); Results suppress(const int &minpts, const int &maxpts, - const double &min_radius = 1.5, + const double &min_radius = 1.5, const double &tolerance = 0.1, const BitMask &bm = BitMask()); - Results suppress(const QString &serialno, const int minpts, + Results suppress(const QString &serialno, const int minpts, const int &maxpts, const double &min_radius, - const double &tolerance, + const double &tolerance, const BitMask &bm = BitMask()); - Results suppress(const PointSet &points, const int &minpts, + Results suppress(const PointSet &points, const int &minpts, const int &maxpts, const double &min_radius, - const double &tolerance, + const double &tolerance, const BitMask &bm = BitMask()); - + void write(const QString &onetfile, const Results &result, const bool saveall = false, const QString &netid = ""); @@ -180,9 +168,9 @@ namespace Isis { void cellIndex(const IndexPoint &p, const double &cell_size, int &x_center, int &y_center) const; int nCovered(const GridMask &grid) const; - int cover(GridMask &grid, const PointSet &points, + int cover(GridMask &grid, const PointSet &points, const double &cell_size) const; - int cover(GridMask &grid, const int &x_center, const int &y_center, + int cover(GridMask &grid, const int &x_center, const int &y_center, const double &cell_size) const; PointSet merge(const PointSet &s1, const PointSet &s2) const; @@ -191,21 +179,21 @@ namespace Isis { QRectF domain(const PointSet &pts) const; double getScale(const QSizeF &d) const; BitMask orMasks(const BitMask &b1, const BitMask &b2) const; - QVector linspace(const double dmin, const double dmax, + QVector linspace(const double dmin, const double dmax, const int num, const double &scale = 1.0) const; /** * @brief Descending order sort functor - * - * This is a comparison class used to sort lists of objects, + * + * This is a comparison class used to sort lists of objects, * where the QPair.second datum is a number in descending order. - * - * @author 2016-09-30 Kris Becker - * - * @internal + * + * @author 2016-09-30 Kris Becker + * + * @internal * @history 2016-09-30 Kris Becker - Original Version - * + * */ class SortSerialsByPntSize { public: diff --git a/isis/src/control/apps/cnetthinner/main.cpp b/isis/src/control/apps/cnetthinner/main.cpp index 82c07ed5fe..0df6e6e2fd 100644 --- a/isis/src/control/apps/cnetthinner/main.cpp +++ b/isis/src/control/apps/cnetthinner/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include @@ -12,12 +20,12 @@ using namespace std; using namespace Isis; void IsisMain() { - + // We will be processing by line ProcessByLine p; UserInterface &ui = Application::GetUserInterface(); - QString cnetfrom = ui.GetAsString("CNET"); + QString cnetfrom = ui.GetAsString("CNET"); double weight = ui.GetDouble("WEIGHT"); double tolerance = ui.GetDouble("TOLERANCE"); int maxpoints = ui.GetDouble("MAXPOINTS"); @@ -25,7 +33,7 @@ void IsisMain() { QString suppressed = ui.GetString("SUPPRESSED").toLower(); if (tolerance < 0.0 || tolerance > 1.0) { - QString msg = "TOLERANCE must be between 0.0 and 1.0"; + QString msg = "TOLERANCE must be between 0.0 and 1.0"; throw IException(IException::User, msg, _FILEINFO_); } @@ -47,7 +55,7 @@ void IsisMain() { if ( ui.WasEntered("NETWORKID") ) { netid = ui.GetString("NETWORKID"); } - suppressor->write(ui.GetAsString("ONET"), result, saveall, netid); + suppressor->write(ui.GetAsString("ONET"), result, saveall, netid); } // Report results @@ -61,4 +69,3 @@ void IsisMain() { p.EndProcess(); } - diff --git a/isis/src/control/apps/cnetwinnow/cnetwinnow.cpp b/isis/src/control/apps/cnetwinnow/cnetwinnow.cpp index 4ec30a67c4..96551d352f 100644 --- a/isis/src/control/apps/cnetwinnow/cnetwinnow.cpp +++ b/isis/src/control/apps/cnetwinnow/cnetwinnow.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "cnetwinnow.h" #include diff --git a/isis/src/control/apps/cnetwinnow/cnetwinnow.h b/isis/src/control/apps/cnetwinnow/cnetwinnow.h index 6c5c18320d..f2e8ae3374 100644 --- a/isis/src/control/apps/cnetwinnow/cnetwinnow.h +++ b/isis/src/control/apps/cnetwinnow/cnetwinnow.h @@ -1,6 +1,14 @@ #ifndef cnetwinnow_h #define cnetwinnow_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "ControlNet.h" #include "ControlMeasure.h" #include "UserInterface.h" diff --git a/isis/src/control/apps/cnetwinnow/main.cpp b/isis/src/control/apps/cnetwinnow/main.cpp index d8fce75b03..801e67e483 100644 --- a/isis/src/control/apps/cnetwinnow/main.cpp +++ b/isis/src/control/apps/cnetwinnow/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "cnetwinnow.h" diff --git a/isis/src/control/apps/coreg/main.cpp b/isis/src/control/apps/coreg/main.cpp index 264812f792..a6396993bf 100644 --- a/isis/src/control/apps/coreg/main.cpp +++ b/isis/src/control/apps/coreg/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #define GUIHELPERS #include "Isis.h" diff --git a/isis/src/control/apps/deltack/main.cpp b/isis/src/control/apps/deltack/main.cpp index 1b78cb116a..97f4b5b782 100644 --- a/isis/src/control/apps/deltack/main.cpp +++ b/isis/src/control/apps/deltack/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include @@ -43,7 +51,7 @@ void printMatrix(const SpiceDouble m[3][3]); void IsisMain() { - Progress progress; + Progress progress; UserInterface &ui = Application::GetUserInterface(); QString filename = ui.GetFileName("FROM"); //ControlNet m_cnet(ui.GetFileName("NET"),&progress); @@ -58,7 +66,7 @@ void IsisMain() { // Create a serial number list SerialNumberList serialNumberList; serialNumberList.add(filename); - + // Get the coordinate for updating the camera pointing // We will want to make the camera pointing match the lat/lon at this // line sample @@ -90,13 +98,13 @@ void IsisMain() { results += PvlKeyword("Method", method); if ( "direct" == method ) { Camera *v_cam = c.camera(); - + // Map the latitude/longitude to a line/sample of the desired update // cout << "Input Lat, Lon = " << lat1.degrees() << "," << lon1.degrees() << "\n"; results += PvlKeyword("Lat1", toString(lat1.degrees()), "degrees"); results += PvlKeyword("Lon1", toString(lon1.degrees()), "degrees"); if ( !v_cam->SetUniversalGround(lat1.degrees(), lon1.degrees()) ) { - QString mess = "Geometry coordinate does not map into image at location (" + + QString mess = "Geometry coordinate does not map into image at location (" + QString::number(lat1.degrees()) + "," + QString::number(lon1.degrees()) + ")"; throw IException(IException::User, mess, _FILEINFO_); } @@ -122,7 +130,7 @@ void IsisMain() { } // At this point, we only need the look direction which is always - // set at this stage - just don't have surface geometry. + // set at this stage - just don't have surface geometry. PvlKeyword offbody = PvlKeyword("Samp1Line1Lat"); offbody.addComment("Does not intersect surface - can still adjust pointing!"); results += offbody; @@ -172,7 +180,7 @@ void IsisMain() { } // We have three fields which indicates euler angle polynimials. We must // handle this differently. - else { + else { // We only know how to handle a cache with just four records. Anything // else and we have to abort... @@ -190,7 +198,7 @@ void IsisMain() { v_cam->instrumentRotation()->SetPolynomial(); o_cmat = v_cam->instrumentRotation()->Cache("InstrumentPointing"); } - + // Write out a description in the spice table results += PvlKeyword("RecordsUpdated", toString(o_cmat.Records())); QString deltackComment = "deltackDirectAdjusted = " + Isis::iTime::CurrentLocalTime(); @@ -200,7 +208,7 @@ void IsisMain() { c.write(o_cmat); } else { // ( "bundle" == method ) - + Distance rad1; if (ui.WasEntered("RAD1")) { rad1 = Distance(ui.GetDouble("RAD1"), Distance::Meters); @@ -208,7 +216,7 @@ void IsisMain() { else { rad1 = GetRadius(ui.GetFileName("FROM"), lat1, lon1); } - + // In order to use the bundle adjustment class we will need a control // network ControlMeasure * m = new ControlMeasure; @@ -217,13 +225,13 @@ void IsisMain() { // m->SetType(ControlMeasure::Manual); m->SetType(ControlMeasure::RegisteredPixel); - + ControlPoint * p = new ControlPoint; p->SetAprioriSurfacePoint(SurfacePoint(lat1, lon1, rad1)); p->SetId("Point1"); p->SetType(ControlPoint::Fixed); p->Add(m); - + ControlNet cnet; // cnet.SetType(ControlNet::ImageToGround); cnet.AddPoint(p); @@ -244,21 +252,21 @@ void IsisMain() { else { rad2 = GetRadius(ui.GetFileName("FROM"), lat2, lon2); } - + ControlMeasure * m = new ControlMeasure; m->SetCubeSerialNumber(serialNumberList.serialNumber(0)); m->SetCoordinate(samp2, line2); m->SetType(ControlMeasure::Manual); - + ControlPoint * p = new ControlPoint; p->SetAprioriSurfacePoint(SurfacePoint(lat2, lon2, rad2)); p->SetId("Point2"); p->SetType(ControlPoint::Fixed); p->Add(m); - + cnet.AddPoint(p); } - + // Bundle adjust to solve for new pointing BundleSettingsQsp settings = bundleSettings(); BundleAdjust *bundleAdjust = new BundleAdjust(settings, cnet, serialNumberList); @@ -285,13 +293,13 @@ void IsisMain() { //cmatrix.Label().findObject("Table",Pvl::Traverse).addKeyword(description); c.write(cmatrix); - + delete bundleAdjust; delete bundleSolution; } // Now do final clean up as the update was successful if we reach here... - + // Check for existing polygon, if exists delete it if (c.label()->hasObject("Polygon")) { c.label()->deleteObject("Polygon"); @@ -354,7 +362,7 @@ BundleSettingsQsp bundleSettings() { // longitude sigma = 1000.0 // radius sigma = Null since we are not solving for radius // outlier rejection = false - settings->setSolveOptions(false, false, false, false, SurfacePoint::Latitudinal, + settings->setSolveOptions(false, false, false, false, SurfacePoint::Latitudinal, SurfacePoint::Latitudinal, 1000.0, 1000.0, Isis::Null); settings->setOutlierRejection(false); @@ -400,26 +408,26 @@ BundleSettingsQsp bundleSettings() { } /** - * @brief Compute rotation matrix of one vector into another - * - * This function computes the 3x3 rotation matrix of one vector into another - * using Rodriques' formula. See - * https://math.stackexchange.com/questions/293116/rotating-one-3d-vector-to-another. - * - * The basic equation is: - * + * @brief Compute rotation matrix of one vector into another + * + * This function computes the 3x3 rotation matrix of one vector into another + * using Rodriques' formula. See + * https://math.stackexchange.com/questions/293116/rotating-one-3d-vector-to-another. + * + * The basic equation is: + * * R = I + sin(theta) * A + (1 - cos(theta)) * A^2 - * + * * where I is the identity matrix, theta is essentially the separation angle of * the two vectors and A is the skew matrix of the cross product of the two * vectors. Note that if theta ~= 0, then the identity matrix is returned. - * + * * Note this implementation does not handle the case where (pi - theta) ~= 0 as * it doesn't seem possible in this case (choose for x any vector orthogonal to * v1). - * + * * @author 2017-05-22 Kris Becker - * + * * @param v1 Vector to rotate into v2 * @param v2 Desired vector of rotation * @param rmat Returns 3x3 rotation matrix to rotate v1 -> v2 @@ -441,16 +449,16 @@ void Vector2VectorRotation(const double v1[3], const double v2[3], double rmat[3 ident_c ( rmat ); return; } - + // Need identity matrix SpiceDouble I[3][3]; ident_c ( I ); // Skew-symmetric matrix A corresponding to x - SpiceDouble A[3][3] = { + SpiceDouble A[3][3] = { { 0.0, -x[2], x[1] }, { x[2], 0.0, -x[0] }, - { -x[1], x[0], 0.0 } + { -x[1], x[0], 0.0 } }; // Scale skew matrix by sin(theta) @@ -474,17 +482,17 @@ void Vector2VectorRotation(const double v1[3], const double v2[3], double rmat[3 } /** - * @brief Apply rotation matrix to each quaterion stored in the pointing table - * - * This routine will apply a 3x3 rotation matrix to every record in the table. - * The table is assumed to be an InstrumentPointing compatible (CK) table + * @brief Apply rotation matrix to each quaterion stored in the pointing table + * + * This routine will apply a 3x3 rotation matrix to every record in the table. + * The table is assumed to be an InstrumentPointing compatible (CK) table * containing at least four elements/row. The first four elements are assumed to - * be quaterions that are converted to a matrix such that simple matrix - * multiplication is applied to achieve an updated pointing quaternion. The - * results are stored back into the table. - * + * be quaterions that are converted to a matrix such that simple matrix + * multiplication is applied to achieve an updated pointing quaternion. The + * results are stored back into the table. + * * @author 2017-08-01 Kris Becker - * + * * @param R The constant angular pointing matrix that will be applied * @param table Instrument pointing table containing quaternions */ diff --git a/isis/src/control/apps/findfeatures/AKAZEAlgorithm.cpp b/isis/src/control/apps/findfeatures/AKAZEAlgorithm.cpp index c1b7f9c121..43a7334540 100644 --- a/isis/src/control/apps/findfeatures/AKAZEAlgorithm.cpp +++ b/isis/src/control/apps/findfeatures/AKAZEAlgorithm.cpp @@ -1,24 +1,11 @@ -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include "opencv2/opencv.hpp" @@ -33,9 +20,9 @@ namespace Isis { /** * Constructs the algorithm with default variables. */ - AKAZEAlgorithm::AKAZEAlgorithm() : + AKAZEAlgorithm::AKAZEAlgorithm() : Feature2DAlgorithm("AKAZE", "Feature2D", - AKAZEType::create()) { + AKAZEType::create()) { setupMaps(); m_variables.merge(getAlgorithmVariables()); } @@ -43,13 +30,13 @@ namespace Isis { /** * Constructs the algorithm with the input variables - * + * * @param cvars The variables and values the algorithm will use. * Variables that are not included will be set to their default. * @param config The config string used to construct cvars. */ AKAZEAlgorithm::AKAZEAlgorithm(const PvlFlatMap &cvars, const QString &config) : - Feature2DAlgorithm("AKAZE", "Feature2D", + Feature2DAlgorithm("AKAZE", "Feature2D", AKAZEType::create(), cvars) { setupMaps(); setConfig(config); @@ -84,7 +71,7 @@ namespace Isis { /** * Returns a description of the algorithm. - * + * * @return @b QString A description of the algorithm. */ QString AKAZEAlgorithm::description() const { @@ -97,50 +84,50 @@ namespace Isis { /** * Creates an instance of the algorithm. - * + * * @param cvars The variables and values the algorithm will use. * Variables that are not included will be set to their default. * @param config The config string used to construct cvars. */ - Feature2DAlgorithm *AKAZEAlgorithm::create(const PvlFlatMap &vars, + Feature2DAlgorithm *AKAZEAlgorithm::create(const PvlFlatMap &vars, const QString &config) { return ( new AKAZEAlgorithm(vars, config) ); } /** - * Returns true if the algorithm has a detector. - * - * @return @b true if the algorithm has a detector. + * Returns true if the algorithm has a detector. + * + * @return @b true if the algorithm has a detector. */ - bool AKAZEAlgorithm::hasDetector() const { - return true; + bool AKAZEAlgorithm::hasDetector() const { + return true; } /** - * Returns true if the algorithm has an extractor. - * - * @return @b true if the algorithm has an extractor. + * Returns true if the algorithm has an extractor. + * + * @return @b true if the algorithm has an extractor. */ - bool AKAZEAlgorithm::hasExtractor() const { - return true; + bool AKAZEAlgorithm::hasExtractor() const { + return true; } /** - * Returns true if the algorithm has a matcher. - * - * @return @b true if the algorithm has a matcher. + * Returns true if the algorithm has a matcher. + * + * @return @b true if the algorithm has a matcher. */ - bool AKAZEAlgorithm::hasMatcher() const { - return false; + bool AKAZEAlgorithm::hasMatcher() const { + return false; } /** * Returns the variables and their values used by the algorithm. - * + * * @return @b PvlFlatMap The variables and their values as keyword, value pairs. */ PvlFlatMap AKAZEAlgorithm::getAlgorithmVariables( ) const { @@ -161,11 +148,11 @@ namespace Isis { /** * Set parameters as provided by the variables - * + * * @param variables Container of parameters to set - * + * * @return @b int Number of variables actually set - * + * * @throws IException::User "The input value is not valid for AKAZE's [DescriptorType] variable" * @throws IException::User "The input value is not valid for AKAZE's [Diffusivity] variable" */ @@ -174,7 +161,7 @@ namespace Isis { AKAZEPtr algorithm = m_algorithm.dynamicCast(); int numSet(0); - if ( variables.exists("DescriptorType") ) { + if ( variables.exists("DescriptorType") ) { QString value = variables.get("DescriptorType"); bool isInt; // Check if the value is an integer @@ -198,27 +185,27 @@ namespace Isis { numSet++; } - if ( variables.exists("DescriptorSize") ) { + if ( variables.exists("DescriptorSize") ) { algorithm->setDescriptorSize(toInt(variables.get("DescriptorSize"))); numSet++; } - if ( variables.exists("DescriptorChannels") ) { + if ( variables.exists("DescriptorChannels") ) { algorithm->setDescriptorChannels(toInt(variables.get("DescriptorChannels"))); numSet++; } - if ( variables.exists("Threshold") ) { + if ( variables.exists("Threshold") ) { algorithm->setThreshold(toInt(variables.get("Threshold"))); numSet++; } - if ( variables.exists("NOctaves") ) { + if ( variables.exists("NOctaves") ) { algorithm->setNOctaves(toInt(variables.get("NOctaves"))); numSet++; } - if ( variables.exists("NOctaveLayers") ) { + if ( variables.exists("NOctaveLayers") ) { algorithm->setNOctaveLayers(toInt(variables.get("NOctaveLayers"))); numSet++; } diff --git a/isis/src/control/apps/findfeatures/AKAZEAlgorithm.h b/isis/src/control/apps/findfeatures/AKAZEAlgorithm.h index e35307f6d5..01d26f317b 100644 --- a/isis/src/control/apps/findfeatures/AKAZEAlgorithm.h +++ b/isis/src/control/apps/findfeatures/AKAZEAlgorithm.h @@ -1,26 +1,13 @@ #ifndef AKAZEAlgorithm_h #define AKAZEAlgorithm_h -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include "FeatureAlgorithm.h" @@ -32,15 +19,15 @@ namespace Isis { /** - * @brief AKAZE Feature matcher algorithm - * - * This class provides the OpenCV3 AKAZE Feature2D algortithm. Only the - * necesary methods are implemented here. - * + * @brief AKAZE Feature matcher algorithm + * + * This class provides the OpenCV3 AKAZE Feature2D algortithm. Only the + * necesary methods are implemented here. + * * @author 2016-12-07 Jesse Mapel - * - * @internal - * @history 2016-12-07 Jesse Mapel - Original Version + * + * @internal + * @history 2016-12-07 Jesse Mapel - Original Version */ class AKAZEAlgorithm : public Feature2DAlgorithm { // See FeatureAlgorithm.h @@ -71,7 +58,7 @@ class AKAZEAlgorithm : public Feature2DAlgorithm { // See FeatureAlgorithm.h boost::bimap m_diffusivityMap; /**!< Bi-directional map for converting Diffusivity values.*/ - + private: typedef cv::AKAZE AKAZEType; typedef cv::Ptr AKAZEPtr; diff --git a/isis/src/control/apps/findfeatures/AgastAlgorithm.cpp b/isis/src/control/apps/findfeatures/AgastAlgorithm.cpp index f22c4a9ca1..1f8e04a267 100644 --- a/isis/src/control/apps/findfeatures/AgastAlgorithm.cpp +++ b/isis/src/control/apps/findfeatures/AgastAlgorithm.cpp @@ -1,24 +1,11 @@ -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "AgastAlgorithm.h" @@ -28,9 +15,9 @@ namespace Isis { /** * Constructs the algorithm with default variables. */ - AgastAlgorithm::AgastAlgorithm() : + AgastAlgorithm::AgastAlgorithm() : Feature2DAlgorithm("AGAST", "Feature2D", - AgastType::create()) { + AgastType::create()) { setupTypeMap(); m_variables.merge( getAlgorithmVariables() ); } @@ -38,13 +25,13 @@ namespace Isis { /** * Constructs the algorithm with the input variables - * + * * @param cvars The variables and values the algorithm will use. * Variables that are not included will be set to their default. * @param config The config string used to construct cvars. */ AgastAlgorithm::AgastAlgorithm(const PvlFlatMap &cvars, const QString &config) : - Feature2DAlgorithm("AGAST", "Feature2D", + Feature2DAlgorithm("AGAST", "Feature2D", AgastType::create(), cvars) { setupTypeMap(); setConfig(config); @@ -61,7 +48,7 @@ namespace Isis { /** * Returns a description of the algorithm. - * + * * @return @b QString A description of the algorithm. */ QString AgastAlgorithm::description() const { @@ -85,7 +72,7 @@ namespace Isis { /** * Creates an instance of the algorithm. - * + * * @param cvars The variables and values the algorithm will use. * Variables that are not included will be set to their default. * @param config The config string used to construct cvars. @@ -96,38 +83,38 @@ namespace Isis { /** - * Returns true if the algorithm has a detector. - * - * @return @b true if the algorithm has a detector. + * Returns true if the algorithm has a detector. + * + * @return @b true if the algorithm has a detector. */ - bool AgastAlgorithm::hasDetector() const { - return true; + bool AgastAlgorithm::hasDetector() const { + return true; } /** - * Returns true if the algorithm has an extractor. - * - * @return @b true if the algorithm has an extractor. + * Returns true if the algorithm has an extractor. + * + * @return @b true if the algorithm has an extractor. */ - bool AgastAlgorithm::hasExtractor() const { - return false; + bool AgastAlgorithm::hasExtractor() const { + return false; } /** - * Returns true if the algorithm has a matcher. - * - * @return @b true if the algorithm has a matcher. + * Returns true if the algorithm has a matcher. + * + * @return @b true if the algorithm has a matcher. */ bool AgastAlgorithm::hasMatcher() const { - return false; + return false; } /** * Returns the variables and their values used by the algorithm. - * + * * @return @b PvlFlatMap The variables and their values as keyword, value pairs. */ PvlFlatMap AgastAlgorithm::getAlgorithmVariables( ) const { @@ -142,11 +129,11 @@ namespace Isis { /** * Set parameters as provided by the variables - * + * * @param variables Container of parameters to set - * + * * @return @b int Number of variables actually set - * + * * @throws IException::User "The input value is not valid for AGAST's [Type] variable" */ int AgastAlgorithm::setAlgorithmVariables(const PvlFlatMap &variables) { @@ -154,12 +141,12 @@ namespace Isis { AgastPtr algorithm = m_algorithm.dynamicCast(); int numSet(0); - if ( variables.exists("NonmaxSuppression") ) { + if ( variables.exists("NonmaxSuppression") ) { algorithm->setNonmaxSuppression(toInt(variables.get("NonmaxSuppression"))); numSet++; } - if ( variables.exists("Threshold") ) { + if ( variables.exists("Threshold") ) { algorithm->setThreshold(toInt(variables.get("Threshold"))); numSet++; } diff --git a/isis/src/control/apps/findfeatures/AgastAlgorithm.h b/isis/src/control/apps/findfeatures/AgastAlgorithm.h index 154d006416..e80b94744f 100644 --- a/isis/src/control/apps/findfeatures/AgastAlgorithm.h +++ b/isis/src/control/apps/findfeatures/AgastAlgorithm.h @@ -1,26 +1,14 @@ #ifndef AgastAlgorithm_h #define AgastAlgorithm_h -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "FeatureAlgorithm.h" @@ -32,15 +20,15 @@ namespace Isis { /** - * @brief AGAST Feature matcher algorithm - * - * This class provides the OpenCV3 AGAST Feature2D algortithm. Only the - * necesary methods are implemented here. - * + * @brief AGAST Feature matcher algorithm + * + * This class provides the OpenCV3 AGAST Feature2D algortithm. Only the + * necesary methods are implemented here. + * * @author 2016-12-07 Jesse Mapel - * - * @internal - * @history 2016-12-07 Jesse Mapel - Original Version + * + * @internal + * @history 2016-12-07 Jesse Mapel - Original Version */ class AgastAlgorithm : public Feature2DAlgorithm { // See FeatureAlgorithm.h diff --git a/isis/src/control/apps/findfeatures/BRISKAlgorithm.cpp b/isis/src/control/apps/findfeatures/BRISKAlgorithm.cpp index 14e286a6b7..8baf9667c2 100644 --- a/isis/src/control/apps/findfeatures/BRISKAlgorithm.cpp +++ b/isis/src/control/apps/findfeatures/BRISKAlgorithm.cpp @@ -1,24 +1,11 @@ -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include "opencv2/opencv.hpp" @@ -33,22 +20,22 @@ namespace Isis { /** * Constructs the algorithm with default variables. */ - BRISKAlgorithm::BRISKAlgorithm() : + BRISKAlgorithm::BRISKAlgorithm() : Feature2DAlgorithm("BRISK", "Feature2D", - BRISKType::create()) { + BRISKType::create()) { setupParameters(); } /** * Constructs the algorithm with the input variables - * + * * @param cvars The variables and values the algorithm will use. * Variables that are not included will be set to their default. * @param config The config string used to construct cvars. */ BRISKAlgorithm::BRISKAlgorithm(const PvlFlatMap &cvars, const QString &config) : - Feature2DAlgorithm("BRISK", "Feature2D", + Feature2DAlgorithm("BRISK", "Feature2D", BRISKType::create(), cvars) { setConfig(config); PvlFlatMap variables = setupParameters(); @@ -83,8 +70,8 @@ namespace Isis { else { const int thresh = toInt(variables.get("Threshold")); const int octaves = toInt(variables.get("NOctaves")); - const float patternScale = variables.get("PatternScale").toFloat(); - + const float patternScale = variables.get("PatternScale").toFloat(); + m_algorithm = BRISKType::create(thresh, octaves, patternScale); } m_variables.merge(variables); @@ -95,12 +82,12 @@ namespace Isis { * Destroys the algorithm */ BRISKAlgorithm::~BRISKAlgorithm() { } - + /** - * Sets up the algorithm parameters with default values. - * - * @return PvlFlatMap Algorithm parameters and their default values. + * Sets up the algorithm parameters with default values. + * + * @return PvlFlatMap Algorithm parameters and their default values. */ PvlFlatMap BRISKAlgorithm::setupParameters() { PvlFlatMap variables; @@ -114,7 +101,7 @@ namespace Isis { /** * Returns a description of the algorithm. - * + * * @return @b QString A description of the algorithm. */ QString BRISKAlgorithm::description() const { @@ -127,7 +114,7 @@ namespace Isis { /** * Creates an instance of the algorithm. - * + * * @param cvars The variables and values the algorithm will use. * Variables that are not included will be set to their default. * @param config The config string used to construct cvars. @@ -138,38 +125,38 @@ namespace Isis { /** - * Returns true if the algorithm has a detector. - * - * @return @b true if the algorithm has a detector. + * Returns true if the algorithm has a detector. + * + * @return @b true if the algorithm has a detector. */ - bool BRISKAlgorithm::hasDetector() const { - return true; + bool BRISKAlgorithm::hasDetector() const { + return true; } /** - * Returns true if the algorithm has an extractor. - * - * @return @b true if the algorithm has an extractor. + * Returns true if the algorithm has an extractor. + * + * @return @b true if the algorithm has an extractor. */ - bool BRISKAlgorithm::hasExtractor() const { - return true; + bool BRISKAlgorithm::hasExtractor() const { + return true; } /** - * Returns true if the algorithm has a matcher. - * - * @return @b true if the algorithm has a matcher. + * Returns true if the algorithm has a matcher. + * + * @return @b true if the algorithm has a matcher. */ - bool BRISKAlgorithm::hasMatcher() const { - return false; + bool BRISKAlgorithm::hasMatcher() const { + return false; } /** * Returns the variables and their values used by the algorithm. - * + * * @return @b PvlFlatMap The variables and their values as keyword, value pairs. */ PvlFlatMap BRISKAlgorithm::getAlgorithmVariables( ) const { @@ -179,11 +166,11 @@ namespace Isis { /** * @brief Set parameters as provided by the variables - * + * * @param variables Container of parameters to set - * + * * @return @b int Always -1, variables cannot be set after initialization. - * + * * @throws IException::Programmer "BRISKAlgorithm does not have the ability * to set algorithm parameters." */ diff --git a/isis/src/control/apps/findfeatures/BRISKAlgorithm.h b/isis/src/control/apps/findfeatures/BRISKAlgorithm.h index 295cf07fa1..e701428d2a 100644 --- a/isis/src/control/apps/findfeatures/BRISKAlgorithm.h +++ b/isis/src/control/apps/findfeatures/BRISKAlgorithm.h @@ -1,26 +1,14 @@ #ifndef BRISKAlgorithm_h #define BRISKAlgorithm_h -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "FeatureAlgorithm.h" #include "opencv2/features2d.hpp" @@ -30,22 +18,22 @@ namespace Isis { /** - * @brief BRISK Feature matcher algorithm - * - * This class provides the OpenCV3 BRISK Feature2D algortithm. Only the - * necesary methods are implemented here. - * + * @brief BRISK Feature matcher algorithm + * + * This class provides the OpenCV3 BRISK Feature2D algortithm. Only the + * necesary methods are implemented here. + * * @author 2016-12-12 Jesse Mapel - * - * @internal - * @history 2016-12-12 Jesse Mapel - Original Version + * + * @internal + * @history 2016-12-12 Jesse Mapel - Original Version */ class BRISKAlgorithm : public Feature2DAlgorithm { // See FeatureAlgorithm.h // OpenCV 3 API public: BRISKAlgorithm(); - BRISKAlgorithm( const PvlFlatMap &cvars, const QString &config = QString() ); + BRISKAlgorithm( const PvlFlatMap &cvars, const QString &config = QString() ); virtual ~BRISKAlgorithm(); QString description() const; diff --git a/isis/src/control/apps/findfeatures/BlobDetectionAlgorithm.cpp b/isis/src/control/apps/findfeatures/BlobDetectionAlgorithm.cpp index a015fa79e7..ab976b22a9 100644 --- a/isis/src/control/apps/findfeatures/BlobDetectionAlgorithm.cpp +++ b/isis/src/control/apps/findfeatures/BlobDetectionAlgorithm.cpp @@ -1,24 +1,11 @@ -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include "opencv2/opencv.hpp" @@ -32,22 +19,22 @@ namespace Isis { /** * Constructs the algorithm with default variables. */ - BlobDetectionAlgorithm::BlobDetectionAlgorithm() : + BlobDetectionAlgorithm::BlobDetectionAlgorithm() : Feature2DAlgorithm("Blob", "Feature2D", - BLOBType::create()) { + BLOBType::create()) { setupParameters(); } /** * Constructs the algorithm with the input variables - * + * * @param cvars The variables and values the algorithm will use. * Variables that are not included will be set to their default. * @param config The config string used to construct cvars. */ BlobDetectionAlgorithm::BlobDetectionAlgorithm(const PvlFlatMap &cvars, const QString &config) : - Feature2DAlgorithm("Blob", "Feature2D", + Feature2DAlgorithm("Blob", "Feature2D", BLOBType::create(), cvars) { setConfig(config); PvlFlatMap variables = setupParameters(); @@ -73,7 +60,7 @@ namespace Isis { params.minConvexity = variables.get("MinConvexity").toFloat(); params.maxConvexity = variables.get("MaxConvexity").toFloat(); - m_algorithm = BLOBType::create(params); + m_algorithm = BLOBType::create(params); m_variables.merge(variables); } @@ -86,9 +73,9 @@ namespace Isis { /** - * Sets up the algorithm parameters with default values. - * - * @return PvlFlatMap Algorithm parameters and their default values. + * Sets up the algorithm parameters with default values. + * + * @return PvlFlatMap Algorithm parameters and their default values. */ PvlFlatMap BlobDetectionAlgorithm::setupParameters() { PvlFlatMap variables; @@ -118,7 +105,7 @@ namespace Isis { /** * Returns a description of the algorithm. - * + * * @return @b QString A description of the algorithm. */ QString BlobDetectionAlgorithm::description() const { @@ -131,7 +118,7 @@ namespace Isis { /** * Creates an instance of the algorithm. - * + * * @param cvars The variables and values the algorithm will use. * Variables that are not included will be set to their default. * @param config The config string used to construct cvars. @@ -143,38 +130,38 @@ namespace Isis { /** - * Returns true if the algorithm has a detector. - * - * @return @b true if the algorithm has a detector. + * Returns true if the algorithm has a detector. + * + * @return @b true if the algorithm has a detector. */ - bool BlobDetectionAlgorithm::hasDetector() const { - return true; + bool BlobDetectionAlgorithm::hasDetector() const { + return true; } /** - * Returns true if the algorithm has an extractor. - * - * @return @b true if the algorithm has an extractor. + * Returns true if the algorithm has an extractor. + * + * @return @b true if the algorithm has an extractor. */ - bool BlobDetectionAlgorithm::hasExtractor() const { - return false; + bool BlobDetectionAlgorithm::hasExtractor() const { + return false; } /** - * Returns true if the algorithm has a matcher. - * - * @return @b true if the algorithm has a matcher. + * Returns true if the algorithm has a matcher. + * + * @return @b true if the algorithm has a matcher. */ - bool BlobDetectionAlgorithm::hasMatcher() const { - return false; + bool BlobDetectionAlgorithm::hasMatcher() const { + return false; } /** * Returns the variables and their values used by the algorithm. - * + * * @return @b PvlFlatMap The variables and their values as keyword, value pairs. */ PvlFlatMap BlobDetectionAlgorithm::getAlgorithmVariables( ) const{ @@ -184,11 +171,11 @@ namespace Isis { /** * @brief Set parameters as provided by the variables - * + * * @param variables Container of parameters to set - * + * * @return @b int Always -1, variables cannot be set after initialization. - * + * * @throws IException::Programmer "BlobDetectionAlgorithm does not have the ability * to set algorithm parameters." */ diff --git a/isis/src/control/apps/findfeatures/BlobDetectionAlgorithm.h b/isis/src/control/apps/findfeatures/BlobDetectionAlgorithm.h index 3f855b2787..f89a46632d 100644 --- a/isis/src/control/apps/findfeatures/BlobDetectionAlgorithm.h +++ b/isis/src/control/apps/findfeatures/BlobDetectionAlgorithm.h @@ -1,26 +1,14 @@ #ifndef BlobDetectionAlgorithm_h #define BlobDetectionAlgorithm_h -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "FeatureAlgorithm.h" #include "opencv2/features2d.hpp" @@ -30,17 +18,17 @@ namespace Isis { /** - * @brief Blob detection algorithm - * - * This class provides the OpenCV3 Simple Blob Feature2D algortithm. Only the - * necesary methods are implemented here. - * + * @brief Blob detection algorithm + * + * This class provides the OpenCV3 Simple Blob Feature2D algortithm. Only the + * necesary methods are implemented here. + * * @author 2016-12-07 Jesse Mapel - * - * @internal + * + * @internal * @history 2016-12-07 Jesse Mapel - Original Version * @history 2016-12-23 Kristin Berry - Added hasDetector, hasExtractor, hasMatcher and reorganized - * constructor/create code. + * constructor/create code. */ class BlobDetectionAlgorithm : public Feature2DAlgorithm { // See FeatureAlgorithm.h @@ -48,7 +36,7 @@ class BlobDetectionAlgorithm : public Feature2DAlgorithm { // See FeatureAlgori public: BlobDetectionAlgorithm(); BlobDetectionAlgorithm( const PvlFlatMap &cvars, const QString &config = QString() ); - + virtual ~BlobDetectionAlgorithm(); QString description() const; diff --git a/isis/src/control/apps/findfeatures/BriefDescriptorAlgorithm.cpp b/isis/src/control/apps/findfeatures/BriefDescriptorAlgorithm.cpp index e03b37ed28..d56fb75488 100644 --- a/isis/src/control/apps/findfeatures/BriefDescriptorAlgorithm.cpp +++ b/isis/src/control/apps/findfeatures/BriefDescriptorAlgorithm.cpp @@ -1,24 +1,11 @@ -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include "opencv2/opencv.hpp" @@ -33,23 +20,23 @@ namespace Isis { /** * Constructs the algorithm with default variables. */ - BriefDescriptorAlgorithm::BriefDescriptorAlgorithm() : + BriefDescriptorAlgorithm::BriefDescriptorAlgorithm() : Feature2DAlgorithm("Brief", "Feature2D", - BriefType::create()) { + BriefType::create()) { setupParameters(); } /** * Constructs the algorithm with the input variables - * + * * @param cvars The variables and values the algorithm will use. * Variables that are not included will be set to their default. * @param config The config string used to construct cvars. */ - BriefDescriptorAlgorithm::BriefDescriptorAlgorithm(const PvlFlatMap &cvars, + BriefDescriptorAlgorithm::BriefDescriptorAlgorithm(const PvlFlatMap &cvars, const QString &config) : - Feature2DAlgorithm("Brief", "Feature2D", + Feature2DAlgorithm("Brief", "Feature2D", BriefType::create(), cvars) { setConfig(config); PvlFlatMap variables = setupParameters(); @@ -70,9 +57,9 @@ namespace Isis { /** - * Sets up the algorithm parameters with default values. - * - * @return PvlFlatMap Algorithm parameters and their default values. + * Sets up the algorithm parameters with default values. + * + * @return PvlFlatMap Algorithm parameters and their default values. */ PvlFlatMap BriefDescriptorAlgorithm::setupParameters() { PvlFlatMap variables; @@ -85,7 +72,7 @@ namespace Isis { /** * Returns a description of the algorithm. - * + * * @return @b QString A description of the algorithm. */ QString BriefDescriptorAlgorithm::description() const { @@ -98,7 +85,7 @@ namespace Isis { /** * Creates an instance of the algorithm. - * + * * @param cvars The variables and values the algorithm will use. * Variables that are not included will be set to their default. * @param config The config string used to construct cvars. @@ -112,38 +99,38 @@ namespace Isis { /** - * Returns true if the algorithm has a detector. - * - * @return @b true if the algorithm has a detector. + * Returns true if the algorithm has a detector. + * + * @return @b true if the algorithm has a detector. */ - bool BriefDescriptorAlgorithm::hasDetector() const { - return false; + bool BriefDescriptorAlgorithm::hasDetector() const { + return false; } /** - * Returns true if the algorithm has an extractor. - * - * @return @b true if the algorithm has an extractor. + * Returns true if the algorithm has an extractor. + * + * @return @b true if the algorithm has an extractor. */ - bool BriefDescriptorAlgorithm::hasExtractor() const { - return true; + bool BriefDescriptorAlgorithm::hasExtractor() const { + return true; } /** - * Returns true if the algorithm has a matcher. - * - * @return @b true if the algorithm has a matcher. + * Returns true if the algorithm has a matcher. + * + * @return @b true if the algorithm has a matcher. */ - bool BriefDescriptorAlgorithm::hasMatcher() const { - return false; + bool BriefDescriptorAlgorithm::hasMatcher() const { + return false; } /** * Returns the variables and their values used by the algorithm. - * + * * @return @b PvlFlatMap The variables and their values as keyword, value pairs. */ PvlFlatMap BriefDescriptorAlgorithm::getAlgorithmVariables( ) const{ @@ -153,11 +140,11 @@ namespace Isis { /** * @brief Set parameters as provided by the variables - * + * * @param variables Container of parameters to set - * + * * @return @b int Always -1, variables cannot be set after initialization. - * + * * @throws IException::Programmer "BriefDescriptorAlgorithm does not have the ability * to set algorithm parameters." */ diff --git a/isis/src/control/apps/findfeatures/BriefDescriptorAlgorithm.h b/isis/src/control/apps/findfeatures/BriefDescriptorAlgorithm.h index 476068820b..6cb995be31 100644 --- a/isis/src/control/apps/findfeatures/BriefDescriptorAlgorithm.h +++ b/isis/src/control/apps/findfeatures/BriefDescriptorAlgorithm.h @@ -1,26 +1,14 @@ #ifndef BriefDescriptorAlgorithm_h #define BriefDescriptorAlgorithm_h -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "FeatureAlgorithm.h" #include "opencv2/xfeatures2d.hpp" @@ -30,15 +18,15 @@ namespace Isis { /** - * @brief Brief descriptor algorithm - * - * This class provides the OpenCV3 Brief Feature2D algortithm. Only the - * necesary methods are implemented here. - * + * @brief Brief descriptor algorithm + * + * This class provides the OpenCV3 Brief Feature2D algortithm. Only the + * necesary methods are implemented here. + * * @author 2016-12-09 Jesse Mapel - * - * @internal - * @history 2016-12-09 Jesse Mapel - Original Version + * + * @internal + * @history 2016-12-09 Jesse Mapel - Original Version */ class BriefDescriptorAlgorithm : public Feature2DAlgorithm { // See FeatureAlgorithm.h diff --git a/isis/src/control/apps/findfeatures/BruteForceMatcher.cpp b/isis/src/control/apps/findfeatures/BruteForceMatcher.cpp index dd715650f5..517c1d1be6 100644 --- a/isis/src/control/apps/findfeatures/BruteForceMatcher.cpp +++ b/isis/src/control/apps/findfeatures/BruteForceMatcher.cpp @@ -1,24 +1,11 @@ -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "opencv2/opencv.hpp" #include "opencv2/xfeatures2d.hpp" @@ -35,7 +22,7 @@ namespace Isis { /** * Constructs the algorithm with default variables. */ - BruteForceMatcher::BruteForceMatcher() : + BruteForceMatcher::BruteForceMatcher() : DescriptorMatcherAlgorithm("BFMatcher", "DecriptorMatcher", cv::makePtr()) { m_normTypeMap = setupNormTypeMap(); @@ -48,7 +35,7 @@ namespace Isis { /** * Constructs the algorithm with the input variables - * + * * @param cvars The variables and values the algorithm will use. * Variables that are not included will be set to their default. * @param config The config string used to construct cvars. @@ -60,10 +47,10 @@ namespace Isis { * @param crossCheck If true; when j, the nearest neightbor to a point i, is * found it will be checked that i is the nearest neighbor * to j. Defaults to false. - * + * * @throws IException::User "The input value is not valid for * BruteForceMatcher's [NormType] variable" - * + * * @see cv::NormTypes */ BruteForceMatcher::BruteForceMatcher(const PvlFlatMap &cvars, const QString &config, @@ -94,7 +81,7 @@ namespace Isis { /** * Sets up and returns the bi-directional map for norm type. - * + * * @return @b boost:bimap The map between name and int for norm type. * * @see cv::NormTypes @@ -113,7 +100,7 @@ namespace Isis { /** * Returns a description of the algorithm. - * + * * @return @b QString A description of the algorithm. */ QString BruteForceMatcher::description() const { @@ -126,11 +113,11 @@ namespace Isis { /** * Creates an instance of the algorithm. - * + * * @param cvars The variables and values the algorithm will use. * Variables that are not included will be set to their default. * @param config The config string used to construct cvars. - * + * * @throws IException::User "The input value is not valid for * BruteForceMatcher's [NormType] variable" */ @@ -161,38 +148,38 @@ namespace Isis { /** - * Returns true if the algorithm has a detector. - * - * @return @b true if the algorithm has a detector. + * Returns true if the algorithm has a detector. + * + * @return @b true if the algorithm has a detector. */ - bool BruteForceMatcher::hasDetector() const { - return false; + bool BruteForceMatcher::hasDetector() const { + return false; } /** - * Returns true if the algorithm has an extractor. - * - * @return @b true if the algorithm has an extractor. + * Returns true if the algorithm has an extractor. + * + * @return @b true if the algorithm has an extractor. */ - bool BruteForceMatcher::hasExtractor() const { - return false; + bool BruteForceMatcher::hasExtractor() const { + return false; } /** - * Returns true if the algorithm has a matcher. - * - * @return @b true if the algorithm has a matcher. + * Returns true if the algorithm has a matcher. + * + * @return @b true if the algorithm has a matcher. */ - bool BruteForceMatcher::hasMatcher() const { - return true; + bool BruteForceMatcher::hasMatcher() const { + return true; } /** * Returns the variables and their values used by the algorithm. - * + * * @return @b PvlFlatMap The variables and their values as keyword, value pairs. */ PvlFlatMap BruteForceMatcher::getAlgorithmVariables( ) const { @@ -202,11 +189,11 @@ namespace Isis { /** * @brief Set parameters as provided by the variables - * + * * @param variables Container of parameters to set - * + * * @return @b int Always -1, variables cannot be set after initialization. - * + * * @throws IException::Programmer "BruteForceMatcher does not have the ability * to set algorithm parameters." */ diff --git a/isis/src/control/apps/findfeatures/BruteForceMatcher.h b/isis/src/control/apps/findfeatures/BruteForceMatcher.h index cf994d55d6..d65b6be919 100644 --- a/isis/src/control/apps/findfeatures/BruteForceMatcher.h +++ b/isis/src/control/apps/findfeatures/BruteForceMatcher.h @@ -1,26 +1,14 @@ #ifndef BruteForceMatcher_h #define BruteForceMatcher_h -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include "FeatureAlgorithm.h" @@ -29,15 +17,15 @@ namespace Isis { /** - * @brief Brute Force Feature matcher algorithm - * - * This class provides the OpenCV3 BFMatcher DescriptorMatcher algortithm. Only the - * necesary methods are implemented here. - * + * @brief Brute Force Feature matcher algorithm + * + * This class provides the OpenCV3 BFMatcher DescriptorMatcher algortithm. Only the + * necesary methods are implemented here. + * * @author 2016-12-08 Jesse Mapel - * - * @internal - * @history 2016-12-08 Jesse Mapel - Original Version + * + * @internal + * @history 2016-12-08 Jesse Mapel - Original Version */ class BruteForceMatcher : public DescriptorMatcherAlgorithm { // See FeatureAlgorithm.h diff --git a/isis/src/control/apps/findfeatures/CropTransform.cpp b/isis/src/control/apps/findfeatures/CropTransform.cpp index 5902b5484a..c7945da21b 100644 --- a/isis/src/control/apps/findfeatures/CropTransform.cpp +++ b/isis/src/control/apps/findfeatures/CropTransform.cpp @@ -1,26 +1,10 @@ -/** - * @file - * $Revision$ - * $Date$ - * $Id$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include @@ -40,7 +24,7 @@ namespace Isis { /* Constructor */ -CropTransform::CropTransform() : GenericTransform("CropTransform"), m_crop() { +CropTransform::CropTransform() : GenericTransform("CropTransform"), m_crop() { } /* Constructor with name of transform */ @@ -51,16 +35,16 @@ CropTransform::~CropTransform() { } /** * @brief Construct a full crop transform with specified region - * - * This constructor will create an object that will crop a specified region of - * an image. - * + * + * This constructor will create an object that will crop a specified region of + * an image. + * * @param name Name of the transform * @param orgSize Original size of the image * @param tfSize New size and starting line/samples of image * @param tform Transformation of the crop */ -CropTransform::CropTransform(const QString &name, const cv::Size &orgSize, +CropTransform::CropTransform(const QString &name, const cv::Size &orgSize, const cv::Size &tfSize, const cv::Mat &tform) : GenericTransform(name, tform, orgSize) { @@ -76,16 +60,16 @@ CropTransform::CropTransform(const QString &name, const cv::Size &orgSize, } /** - * @brief Crop and image as specified in as a region - * - * The starting coordinates of the image region and size are provided to create - * a crop transform. - * + * @brief Crop and image as specified in as a region + * + * The starting coordinates of the image region and size are provided to create + * a crop transform. + * * @param name Name of transform * @param region Region of the image to crop */ -CropTransform::CropTransform(const QString &name, - const CropTransform::RectArea ®ion) : +CropTransform::CropTransform(const QString &name, + const CropTransform::RectArea ®ion) : GenericTransform(name), m_crop(region) { setMatrix(translation(-m_crop.x, -m_crop.y)); @@ -98,9 +82,9 @@ CropTransform::CropTransform(const QString &name, /** * @brief Crop the input image as specfied in the contructor - * + * * @param image Image to crop - * + * * @return cv::Mat Cropped region of the image */ cv::Mat CropTransform::render(const cv::Mat &image) const { @@ -112,14 +96,14 @@ cv::Mat CropTransform::render(const cv::Mat &image) const { /** * @brief Determine the crop elements of a given specification - * + * * @param tform Matrix specification of the transform * @param imSize Input image size * @param tfSize Desired size of the cropped image - * + * * @return CropTransform::RectArea Specs of the region of the cropped image */ -CropTransform::RectArea CropTransform::findCrop(const cv::Mat &tform, +CropTransform::RectArea CropTransform::findCrop(const cv::Mat &tform, const cv::Size &imSize, const cv::Size &tfSize) const { @@ -127,7 +111,7 @@ CropTransform::RectArea CropTransform::findCrop(const cv::Mat &tform, cv::perspectiveTransform(corners(imSize), t_corners, tform); double xmin(qMax(0.0f, t_corners[0].x)), xmax(xmin); - double ymin(qMax(0.0f, t_corners[0].y)), ymax(ymin); + double ymin(qMax(0.0f, t_corners[0].y)), ymax(ymin); for (unsigned int i = 1 ; i < t_corners.size() ; i++) { if ( t_corners[i].x < xmin) xmin = t_corners[i].x; if ( t_corners[i].x > xmax) xmax = t_corners[i].x; diff --git a/isis/src/control/apps/findfeatures/CropTransform.h b/isis/src/control/apps/findfeatures/CropTransform.h index 91a4c6d24e..68a8989569 100644 --- a/isis/src/control/apps/findfeatures/CropTransform.h +++ b/isis/src/control/apps/findfeatures/CropTransform.h @@ -1,26 +1,14 @@ #ifndef CropTransform_h #define CropTransform_h -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -36,13 +24,13 @@ namespace Isis { /** * @brief Crop a section from an image using a translation (affine) transform - * - * This image transform will crop a section of an image stored in an OpenCV - * matrix and return the cropped version of the image. - * - * @author 2015-10-01 Kris Becker - * @internal - * @history 2015-10-01 Kris Becker - Original Version + * + * This image transform will crop a section of an image stored in an OpenCV + * matrix and return the cropped version of the image. + * + * @author 2015-10-01 Kris Becker + * @internal + * @history 2015-10-01 Kris Becker - Original Version */ class CropTransform : public GenericTransform { @@ -50,8 +38,8 @@ class CropTransform : public GenericTransform { typedef GenericTransform::RectArea RectArea; CropTransform(); CropTransform(const QString &name); - CropTransform(const QString &name, const cv::Size &orgSize, - const cv::Size &tfSize, const cv::Mat &tform); + CropTransform(const QString &name, const cv::Size &orgSize, + const cv::Size &tfSize, const cv::Mat &tform); CropTransform(const QString &name, const RectArea ®ion); virtual ~CropTransform(); diff --git a/isis/src/control/apps/findfeatures/DaisyAlgorithm.cpp b/isis/src/control/apps/findfeatures/DaisyAlgorithm.cpp index ee2f8a55e2..30f03c701f 100644 --- a/isis/src/control/apps/findfeatures/DaisyAlgorithm.cpp +++ b/isis/src/control/apps/findfeatures/DaisyAlgorithm.cpp @@ -1,24 +1,11 @@ -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "opencv2/opencv.hpp" #include "opencv2/xfeatures2d.hpp" @@ -32,30 +19,30 @@ namespace Isis { /** - * Constructs a default DaisyAlgorithm with default variables. Note the OpenCV + * Constructs a default DaisyAlgorithm with default variables. Note the OpenCV * Daisy algorithm does not provide direct parameter access after construction * so all variable values must be know when constructed. */ DaisyAlgorithm::DaisyAlgorithm() : Feature2DAlgorithm("DAISY", "Feature2D", - DAISYType::create()) { + DAISYType::create()) { setupTypeMap(); setupParameters(); } /** - * Constructs a DaisyAlgorithm with input variables. - * - * This constuctor provides a custom Daisy algorithm that allows users to - * provide specfic values for all algorithm parameters. - * - * H is an optional 3x3 homography matrix used to warp the grid of Daisy. If - * not entereted, it will default to the identity matrix. - * - * - * @throws IException::Programmer "Homography matrix, H, was not input as a string of the form - * \"d,d,d,d,d,d,d,d,d\" where d is a double or integer numerical value." - * + * Constructs a DaisyAlgorithm with input variables. + * + * This constuctor provides a custom Daisy algorithm that allows users to + * provide specfic values for all algorithm parameters. + * + * H is an optional 3x3 homography matrix used to warp the grid of Daisy. If + * not entereted, it will default to the identity matrix. + * + * + * @throws IException::Programmer "Homography matrix, H, was not input as a string of the form + * \"d,d,d,d,d,d,d,d,d\" where d is a double or integer numerical value." + * * @param cvars Variables that are not included will be set to their default. * @param config The config string used to construct cvars. */ @@ -73,7 +60,7 @@ namespace Isis { int norm = m_typeMap.left.at(variables.get("norm")); cv::Mat H = cv::Mat::eye(3,3,CV_64FC1); if ( variables.exists("H")) { - // Convert H-string to a 3x3 matrix represented by a std::vector (opencv will accept this + // Convert H-string to a 3x3 matrix represented by a std::vector (opencv will accept this // as an alternative to a cv::InputArray) QString Hparm = QString(variables.get("H")); QStringList elts = Hparm.split( "," ); @@ -81,7 +68,7 @@ namespace Isis { if (elts.size() != 9 ) { QString mess = "Homography matrix, H, was not input as a string of the form \"d,d,d,d,d,d,d," "d,d\" where d is a double or integer numerical value."; - throw IException(IException::Programmer, mess, _FILEINFO_); + throw IException(IException::Programmer, mess, _FILEINFO_); } // potentially add a try/catch around this for failed .at's or .toDoubles @@ -95,7 +82,7 @@ namespace Isis { bool interpolation = toBool(variables.get("interpolation")); bool use_orientation = toBool(variables.get("use_orientation")); - // Direct creation of DAISY algorithm, replacing default in constructor + // Direct creation of DAISY algorithm, replacing default in constructor // initialization in FeatureAlgorithm::m_algorithm m_algorithm = DAISYType::create(radius, q_radius, q_theta, q_hist, norm, H, interpolation, use_orientation); @@ -113,7 +100,7 @@ namespace Isis { /** * Returns a description of the DaisyAlgorithm. - * + * * @return @b QString A description of the algorithm. */ QString DaisyAlgorithm::description() const { @@ -137,52 +124,52 @@ namespace Isis { /** * Creates and returns an instance of DaisyAlgorithm. - * + * * @param vars PvlFlatMap containing algorithm parameters and their values - * @param config A configuration string input by the user - * + * @param config A configuration string input by the user + * * @return @b Feature2DAlgorithm A DaisyAlgorithm instance */ - Feature2DAlgorithm *DaisyAlgorithm::create(const PvlFlatMap &vars, + Feature2DAlgorithm *DaisyAlgorithm::create(const PvlFlatMap &vars, const QString &config) { return ( new DaisyAlgorithm(vars, config) ); } /** - * Returns true if the algorithm has a detector. - * - * @return @b true if the algorithm has a detector. + * Returns true if the algorithm has a detector. + * + * @return @b true if the algorithm has a detector. */ - bool DaisyAlgorithm::hasDetector() const { - return false; + bool DaisyAlgorithm::hasDetector() const { + return false; } /** - * Returns true if the algorithm has an extractor. - * - * @return @b true if the algorithm has an extractor. + * Returns true if the algorithm has an extractor. + * + * @return @b true if the algorithm has an extractor. */ - bool DaisyAlgorithm::hasExtractor() const { - return true; + bool DaisyAlgorithm::hasExtractor() const { + return true; } /** - * Returns true if the algorithm has a matcher. - * - * @return @b true if the algorithm has a matcher. + * Returns true if the algorithm has a matcher. + * + * @return @b true if the algorithm has a matcher. */ - bool DaisyAlgorithm::hasMatcher() const { - return false; + bool DaisyAlgorithm::hasMatcher() const { + return false; } /** * Get and return DAISY's parameters and what they're set to as a PvlFlatMap. - * - * @return PvlFlatMap A PvlFlatMap of DAISY's currently set variables and their values. + * + * @return PvlFlatMap A PvlFlatMap of DAISY's currently set variables and their values. */ PvlFlatMap DaisyAlgorithm::getAlgorithmVariables( ) const { return ( variables() ); @@ -190,33 +177,33 @@ namespace Isis { /** - * @brief Set parameters as provided by the variables, does not work for the + * @brief Set parameters as provided by the variables, does not work for the * DAISY algorithm in OpenCV3, so calling this will throw an exception. - * + * * @param variables Container of parameters to set - * + * * @return int Number of variables actually set */ int DaisyAlgorithm::setAlgorithmVariables(const PvlFlatMap &variables) { QString message = "DAISY does not have the ability to set algorithm parameters."; - throw IException(IException::Programmer, message, _FILEINFO_); + throw IException(IException::Programmer, message, _FILEINFO_); return (-1); } /** - * @brief Initiolize the Daisy default parameters according to documentation - * - * This methiod provides the Daisy algorithm parameter defaults according to the - * OpenCV documentation found at - * http://docs.opencv.org/3.1.0/d9/d37/classcv_1_1xfeatures2d_1_1DAISY.html. - * - * This will reset the Daisy parameters to the default conditions and cotnained - * in FeatureAlgorithm::m_variables. - * + * @brief Initiolize the Daisy default parameters according to documentation + * + * This methiod provides the Daisy algorithm parameter defaults according to the + * OpenCV documentation found at + * http://docs.opencv.org/3.1.0/d9/d37/classcv_1_1xfeatures2d_1_1DAISY.html. + * + * This will reset the Daisy parameters to the default conditions and cotnained + * in FeatureAlgorithm::m_variables. + * * @author Kris Becker 2016-12-18 - * + * * @return PvlFlatMap Container of all Daisy parameters */ PvlFlatMap DaisyAlgorithm::setupParameters() { @@ -226,7 +213,7 @@ namespace Isis { variables.add("q_theta", "8"); variables.add("q_hist", "8"); variables.add("norm", "NRM_NONE"); - variables.add("H", "1,0,0,0,1,0,0,0,1"); + variables.add("H", "1,0,0,0,1,0,0,0,1"); variables.add("interpolation", "true"); variables.add("use_orientation", "false"); m_variables = variables; @@ -235,4 +222,3 @@ namespace Isis { }; // namespace Isis - diff --git a/isis/src/control/apps/findfeatures/DaisyAlgorithm.h b/isis/src/control/apps/findfeatures/DaisyAlgorithm.h index 69cae4faec..0014cc0ed1 100644 --- a/isis/src/control/apps/findfeatures/DaisyAlgorithm.h +++ b/isis/src/control/apps/findfeatures/DaisyAlgorithm.h @@ -1,26 +1,14 @@ #ifndef DaisyAlgorithm_h #define DaisyAlgorithm_h -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "DaisyExtractor.h" #include "FeatureAlgorithm.h" @@ -34,15 +22,15 @@ namespace Isis { /** - * @brief Daisy Feature matcher algorithm - * - * This class provides the OpenCV3 SURF Feature2D algortithm. Only the - * necesary methods are implemented here. - * + * @brief Daisy Feature matcher algorithm + * + * This class provides the OpenCV3 SURF Feature2D algortithm. Only the + * necesary methods are implemented here. + * * @author 2016-11-30 Kristin Berry - * - * @internal - * @history 2016-11-30 Kristin Berry - Original Version + * + * @internal + * @history 2016-11-30 Kristin Berry - Original Version */ class DaisyAlgorithm : public Feature2DAlgorithm { // See FeatureAlgorithm.h @@ -51,8 +39,8 @@ class DaisyAlgorithm : public Feature2DAlgorithm { // See FeatureAlgorithm.h DaisyAlgorithm(); DaisyAlgorithm(const PvlFlatMap &cvars, const QString &config = QString()); #if 0 - DaisyAlgorithm(float radius=15, int q_radius=3, int q_theta=8, int q_hist=8, - int norm=DAISY::NRM_NONE, InputArray H=noArray(), + DaisyAlgorithm(float radius=15, int q_radius=3, int q_theta=8, int q_hist=8, + int norm=DAISY::NRM_NONE, InputArray H=noArray(), bool interpolation=true, bool use_orientation=false); #endif virtual ~DaisyAlgorithm(); @@ -62,7 +50,7 @@ class DaisyAlgorithm : public Feature2DAlgorithm { // See FeatureAlgorithm.h // Required for all algorithms static Feature2DAlgorithm *create(const PvlFlatMap &vars, const QString &config = QString()); - + virtual bool hasDetector() const; virtual bool hasExtractor() const; virtual bool hasMatcher() const; diff --git a/isis/src/control/apps/findfeatures/DaisyExtractor.cpp b/isis/src/control/apps/findfeatures/DaisyExtractor.cpp index bc937aa89e..d2bb06d997 100644 --- a/isis/src/control/apps/findfeatures/DaisyExtractor.cpp +++ b/isis/src/control/apps/findfeatures/DaisyExtractor.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "DaisyExtractor.h" #include "IException.h" @@ -7,127 +15,125 @@ namespace Isis { /** * Always throws an exception. This function is not actually implemented. - * - * @param image image + * + * @param image image * @param keypoints keypoints * @param descriptors descriptors - * + * * @throws IException::Programmer "Daisy is unable to run compute with these arguments." */ - void DaisyExtractor::compute( cv::InputArray image, std::vector& keypoints, + void DaisyExtractor::compute( cv::InputArray image, std::vector& keypoints, cv::OutputArray descriptors ) { QString mess = "Daisy is unable to run compute with these arguments."; - throw IException(IException::Programmer, mess, _FILEINFO_); + throw IException(IException::Programmer, mess, _FILEINFO_); } /** - * Always throws an exception. This function is not actually implemented. - * + * Always throws an exception. This function is not actually implemented. + * * @param image image * @param roi region of interest * @param descriptors descriptors - * - * @throws IException::Programmer "Daisy is unable to run compute with these arguments." + * + * @throws IException::Programmer "Daisy is unable to run compute with these arguments." */ void DaisyExtractor::compute( cv::InputArray image, cv::Rect roi, cv::OutputArray descriptors ){ QString mess = "Daisy is unable to run compute with these arguments."; - throw IException(IException::Programmer, mess, _FILEINFO_); + throw IException(IException::Programmer, mess, _FILEINFO_); } /** - * - * Always throws an exception. This function is not actually implemented. - * + * + * Always throws an exception. This function is not actually implemented. + * * @param image image - * @param descriptors descriptors - * + * @param descriptors descriptors + * * @throws IException::Programmer "Daisy is unable to run compute with these arguments." */ void DaisyExtractor::compute( cv::InputArray image, cv::OutputArray descriptors ){ QString mess = "Daisy is unable to run compute with these arguments."; - throw IException(IException::Programmer, mess, _FILEINFO_); + throw IException(IException::Programmer, mess, _FILEINFO_); } /** * Always throws an exception. This function is not actually implemented. - * + * * @param y y coordinate for descriptor * @param x x coordinate for descriptor * @param orientation orientation * @param descriptor descriptor - * - * @throws IException::Programmer "Daisy cannot run GetDescriptor." + * + * @throws IException::Programmer "Daisy cannot run GetDescriptor." */ - void DaisyExtractor::GetDescriptor( double y, double x, int orientation, + void DaisyExtractor::GetDescriptor( double y, double x, int orientation, float* descriptor ) const { QString mess = "Daisy cannot run GetDescriptor"; - throw IException(IException::Programmer, mess, _FILEINFO_); + throw IException(IException::Programmer, mess, _FILEINFO_); } /** * Always throws an exception. This function is not actually implemented. - * - * + * + * * @param y y coordinate * @param x x coordinate * @param orientation orientation * @param descriptor descriptor * @param H transformation matrix - * - * @throws IException::Programmer "Daisy cannot run GetDescriptor." - * + * + * @throws IException::Programmer "Daisy cannot run GetDescriptor." + * * @return @b bool Always false. */ - bool DaisyExtractor::GetDescriptor( double y, double x, int orientation, float* descriptor, + bool DaisyExtractor::GetDescriptor( double y, double x, int orientation, float* descriptor, double* H ) const { QString mess = "Daisy cannot run GetDescriptor."; - throw IException(IException::Programmer, mess, _FILEINFO_); + throw IException(IException::Programmer, mess, _FILEINFO_); return false; } - + /** - * - * Always throws an exception. This function is not actually implemented. - * + * + * Always throws an exception. This function is not actually implemented. + * * @param y y coordinate * @param x x coordinate * @param orientation orientation * @param descriptor descriptor - * + * * @throws IException::Programmer "Daisy cannot run GetUnnormalizedDescriptor." */ - void DaisyExtractor::GetUnnormalizedDescriptor( double y, double x, int orientation, + void DaisyExtractor::GetUnnormalizedDescriptor( double y, double x, int orientation, float* descriptor ) const { QString mess = "Daisy cannot run GetUnnormalizedDescriptor."; - throw IException(IException::Programmer, mess, _FILEINFO_); + throw IException(IException::Programmer, mess, _FILEINFO_); } - + /** - * Always throws an exception. This function is not actually implemented. * - * + * Always throws an exception. This function is not actually implemented. * + * * @param y y coordinate * @param x x coordinate * @param orientation orientation * @param descriptor descriptor * @param H transformation matrix - * + * * @throws IException::Programmer "Daisy cannot run GetUnnormalizedDescriptor." - * - * @return @b bool Always false. + * + * @return @b bool Always false. */ - bool DaisyExtractor::GetUnnormalizedDescriptor( double y, double x, int orientation, + bool DaisyExtractor::GetUnnormalizedDescriptor( double y, double x, int orientation, float* descriptor , double *H ) const { QString mess = "Daisy cannot run GetUnnormalizedDescriptor."; - throw IException(IException::Programmer, mess, _FILEINFO_); + throw IException(IException::Programmer, mess, _FILEINFO_); return false; } }; - - diff --git a/isis/src/control/apps/findfeatures/DaisyExtractor.h b/isis/src/control/apps/findfeatures/DaisyExtractor.h index 5a8a765258..f021f27141 100644 --- a/isis/src/control/apps/findfeatures/DaisyExtractor.h +++ b/isis/src/control/apps/findfeatures/DaisyExtractor.h @@ -1,28 +1,36 @@ #ifndef DaisyExtractor_h #define DaisyExtractor_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "opencv2/xfeatures2d.hpp" #include "opencv2/opencv.hpp" namespace Isis { /** - * @brief Wrap of OpenCV3 DAISY algorithm to implement pure virtual functions. - * - * This class wraps the abstract DAISY algorithm so it can be used. - * - * @author 2016-12-20 Kristin Berry - * - * @internal - * @history 2016-12-20 Kristin Berry - Original Version - * + * @brief Wrap of OpenCV3 DAISY algorithm to implement pure virtual functions. + * + * This class wraps the abstract DAISY algorithm so it can be used. + * + * @author 2016-12-20 Kristin Berry + * + * @internal + * @history 2016-12-20 Kristin Berry - Original Version + * */ -class DaisyExtractor : public cv::xfeatures2d::DAISY { +class DaisyExtractor : public cv::xfeatures2d::DAISY { public: - virtual void compute( cv::InputArray image, std::vector& keypoints, + virtual void compute( cv::InputArray image, std::vector& keypoints, cv::OutputArray descriptors ); virtual void compute( cv::InputArray image, cv::Rect roi, cv::OutputArray descriptors ); @@ -31,16 +39,15 @@ public: virtual void GetDescriptor( double y, double x, int orientation, float* descriptor ) const; - virtual bool GetDescriptor( double y, double x, int orientation, float* descriptor, + virtual bool GetDescriptor( double y, double x, int orientation, float* descriptor, double* H ) const; - virtual void GetUnnormalizedDescriptor( double y, double x, int orientation, + virtual void GetUnnormalizedDescriptor( double y, double x, int orientation, float* descriptor ) const; - virtual bool GetUnnormalizedDescriptor( double y, double x, int orientation, + virtual bool GetUnnormalizedDescriptor( double y, double x, int orientation, float* descriptor , double *H ) const; }; } #endif - diff --git a/isis/src/control/apps/findfeatures/FASTAlgorithm.cpp b/isis/src/control/apps/findfeatures/FASTAlgorithm.cpp index b9e55efe62..ef818fd683 100644 --- a/isis/src/control/apps/findfeatures/FASTAlgorithm.cpp +++ b/isis/src/control/apps/findfeatures/FASTAlgorithm.cpp @@ -1,24 +1,10 @@ -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include "opencv2/opencv.hpp" @@ -33,9 +19,9 @@ namespace Isis { /** * Constructs the algorithm with default variables. */ - FASTAlgorithm::FASTAlgorithm() : + FASTAlgorithm::FASTAlgorithm() : Feature2DAlgorithm("FAST", "Feature2D", - FASTType::create()) { + FASTType::create()) { setupTypeMap(); m_variables.merge( getAlgorithmVariables() ); } @@ -43,13 +29,13 @@ namespace Isis { /** * Constructs the algorithm with the input variables - * + * * @param cvars The variables and values the algorithm will use. * Variables that are not included will be set to their default. * @param config The config string used to construct cvars. */ FASTAlgorithm::FASTAlgorithm(const PvlFlatMap &cvars, const QString &config) : - Feature2DAlgorithm("FAST", "Feature2D", + Feature2DAlgorithm("FAST", "Feature2D", FASTType::create(), cvars) { setupTypeMap(); setConfig(config); @@ -66,7 +52,7 @@ namespace Isis { /** * Returns a description of the algorithm. - * + * * @return @b QString A description of the algorithm. */ QString FASTAlgorithm::description() const { @@ -89,7 +75,7 @@ namespace Isis { /** * Creates an instance of the algorithm. - * + * * @param cvars The variables and values the algorithm will use. * Variables that are not included will be set to their default. * @param config The config string used to construct cvars. @@ -100,38 +86,38 @@ namespace Isis { /** - * Returns true if the algorithm has a detector. - * - * @return @b true if the algorithm has a detector. + * Returns true if the algorithm has a detector. + * + * @return @b true if the algorithm has a detector. */ - bool FASTAlgorithm::hasDetector() const { - return true; + bool FASTAlgorithm::hasDetector() const { + return true; } /** - * Returns true if the algorithm has an extractor. - * - * @return @b true if the algorithm has an extractor. + * Returns true if the algorithm has an extractor. + * + * @return @b true if the algorithm has an extractor. */ - bool FASTAlgorithm::hasExtractor() const { - return false; + bool FASTAlgorithm::hasExtractor() const { + return false; } /** - * Returns true if the algorithm has a matcher. - * - * @return @b true if the algorithm has a matcher. + * Returns true if the algorithm has a matcher. + * + * @return @b true if the algorithm has a matcher. */ - bool FASTAlgorithm::hasMatcher() const { - return false; + bool FASTAlgorithm::hasMatcher() const { + return false; } /** * Returns the variables and their values used by the algorithm. - * + * * @return @b PvlFlatMap The variables and their values as keyword, value pairs. */ PvlFlatMap FASTAlgorithm::getAlgorithmVariables( ) const { @@ -146,11 +132,11 @@ namespace Isis { /** * Set parameters as provided by the variables - * + * * @param variables Container of parameters to set - * + * * @return @b int Number of variables actually set - * + * * @throws IException::User "The input value is not valid for FAST's [Type] variable" */ int FASTAlgorithm::setAlgorithmVariables(const PvlFlatMap &variables) { @@ -158,12 +144,12 @@ namespace Isis { FASTPtr algorithm = m_algorithm.dynamicCast(); int numSet(0); - if ( variables.exists("NonmaxSuppression") ) { + if ( variables.exists("NonmaxSuppression") ) { algorithm->setNonmaxSuppression(toInt(variables.get("NonmaxSuppression"))); numSet++; } - if ( variables.exists("Threshold") ) { + if ( variables.exists("Threshold") ) { algorithm->setThreshold(toInt(variables.get("Threshold"))); numSet++; } diff --git a/isis/src/control/apps/findfeatures/FASTAlgorithm.h b/isis/src/control/apps/findfeatures/FASTAlgorithm.h index bd39917c78..3cb83342f9 100644 --- a/isis/src/control/apps/findfeatures/FASTAlgorithm.h +++ b/isis/src/control/apps/findfeatures/FASTAlgorithm.h @@ -1,26 +1,14 @@ #ifndef FASTAlgorithm_h #define FASTAlgorithm_h -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include "FeatureAlgorithm.h" @@ -32,15 +20,15 @@ namespace Isis { /** - * @brief FAST Feature matcher algorithm - * - * This class provides the OpenCV3 FAST Feature2D algortithm. Only the - * necesary methods are implemented here. - * + * @brief FAST Feature matcher algorithm + * + * This class provides the OpenCV3 FAST Feature2D algortithm. Only the + * necesary methods are implemented here. + * * @author 2016-12-07 Jesse Mapel - * - * @internal - * @history 2016-12-07 Jesse Mapel - Original Version + * + * @internal + * @history 2016-12-07 Jesse Mapel - Original Version */ class FASTAlgorithm : public Feature2DAlgorithm { // See FeatureAlgorithm.h diff --git a/isis/src/control/apps/findfeatures/FREAKAlgorithm.cpp b/isis/src/control/apps/findfeatures/FREAKAlgorithm.cpp index 419e631def..05c56a571e 100644 --- a/isis/src/control/apps/findfeatures/FREAKAlgorithm.cpp +++ b/isis/src/control/apps/findfeatures/FREAKAlgorithm.cpp @@ -1,24 +1,11 @@ -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include "opencv2/opencv.hpp" @@ -33,22 +20,22 @@ namespace Isis { /** * Constructs the algorithm with default variables. */ - FREAKAlgorithm::FREAKAlgorithm() : + FREAKAlgorithm::FREAKAlgorithm() : Feature2DAlgorithm("FREAK", "Feature2D", - FREAKType::create()) { + FREAKType::create()) { setupParameters(); } /** * Constructs the algorithm with the input variables - * + * * @param cvars The variables and values the algorithm will use. * Variables that are not included will be set to their default. * @param config The config string used to construct cvars. */ FREAKAlgorithm::FREAKAlgorithm(const PvlFlatMap &cvars, const QString &config) : - Feature2DAlgorithm("FREAK", "Feature2D", + Feature2DAlgorithm("FREAK", "Feature2D", FREAKType::create(), cvars) { setConfig(config); PvlFlatMap variables = setupParameters(); @@ -65,7 +52,7 @@ namespace Isis { } } - m_algorithm = FREAKType::create(orientationNormalized, scaleNormalized, patternScale, + m_algorithm = FREAKType::create(orientationNormalized, scaleNormalized, patternScale, nOctaves, selectedPairs); m_variables.merge(variables); @@ -73,9 +60,9 @@ namespace Isis { /** - * Sets up the algorithm parameters with default values. - * - * @return PvlFlatMap Algorithm parameters and their default values. + * Sets up the algorithm parameters with default values. + * + * @return PvlFlatMap Algorithm parameters and their default values. */ PvlFlatMap FREAKAlgorithm::setupParameters() { PvlFlatMap variables; @@ -97,7 +84,7 @@ namespace Isis { /** * Returns a description of the algorithm. - * + * * @return @b QString A description of the algorithm. */ QString FREAKAlgorithm::description() const { @@ -110,7 +97,7 @@ namespace Isis { /** * Creates an instance of the algorithm. - * + * * @param cvars The variables and values the algorithm will use. * Variables that are not included will be set to their default. * @param config The config string used to construct cvars. @@ -121,38 +108,38 @@ namespace Isis { /** - * Returns true if the algorithm has a detector. - * - * @return @b true if the algorithm has a detector. + * Returns true if the algorithm has a detector. + * + * @return @b true if the algorithm has a detector. */ - bool FREAKAlgorithm::hasDetector() const { - return false; + bool FREAKAlgorithm::hasDetector() const { + return false; } /** - * Returns true if the algorithm has an extractor. - * - * @return @b true if the algorithm has an extractor. + * Returns true if the algorithm has an extractor. + * + * @return @b true if the algorithm has an extractor. */ - bool FREAKAlgorithm::hasExtractor() const { - return true; + bool FREAKAlgorithm::hasExtractor() const { + return true; } /** - * Returns true if the algorithm has a matcher. - * - * @return @b true if the algorithm has a matcher. + * Returns true if the algorithm has a matcher. + * + * @return @b true if the algorithm has a matcher. */ - bool FREAKAlgorithm::hasMatcher() const { - return false; + bool FREAKAlgorithm::hasMatcher() const { + return false; } /** * Returns the variables and their values used by the algorithm. - * + * * @return @b PvlFlatMap The variables and their values as keyword, value pairs. */ PvlFlatMap FREAKAlgorithm::getAlgorithmVariables( ) const { @@ -162,11 +149,11 @@ namespace Isis { /** * @brief Set parameters as provided by the variables - * + * * @param variables Container of parameters to set - * + * * @return @b int Always -1, variables cannot be set after initialization. - * + * * @throws IException::Programmer "FREAKAlgorithm does not have the ability * to set algorithm parameters." */ diff --git a/isis/src/control/apps/findfeatures/FREAKAlgorithm.h b/isis/src/control/apps/findfeatures/FREAKAlgorithm.h index eae8a5db65..261868ede7 100644 --- a/isis/src/control/apps/findfeatures/FREAKAlgorithm.h +++ b/isis/src/control/apps/findfeatures/FREAKAlgorithm.h @@ -1,26 +1,14 @@ #ifndef FREAKAlgorithm_h #define FREAKAlgorithm_h -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "FeatureAlgorithm.h" #include @@ -28,15 +16,15 @@ namespace Isis { /** - * @brief FREAK Feature matcher algorithm - * - * This class provides the OpenCV3 FREAK Feature2D algortithm. Only the - * necesary methods are implemented here. - * + * @brief FREAK Feature matcher algorithm + * + * This class provides the OpenCV3 FREAK Feature2D algortithm. Only the + * necesary methods are implemented here. + * * @author 2016-12-12 Jesse Mapel - * - * @internal - * @history 2016-12-12 Jesse Mapel - Original Version + * + * @internal + * @history 2016-12-12 Jesse Mapel - Original Version */ class FREAKAlgorithm : public Feature2DAlgorithm { // See FeatureAlgorithm.h diff --git a/isis/src/control/apps/findfeatures/FastGeom.cpp b/isis/src/control/apps/findfeatures/FastGeom.cpp index 638d90bbaa..250a854de4 100644 --- a/isis/src/control/apps/findfeatures/FastGeom.cpp +++ b/isis/src/control/apps/findfeatures/FastGeom.cpp @@ -1,24 +1,11 @@ -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include @@ -28,17 +15,17 @@ namespace Isis { /* Constructor */ -FastGeom::FastGeom() : m_fastpts(25), m_tolerance(1.0), m_geomtype("camera"), - m_maxarea(3.0), m_parameters() { +FastGeom::FastGeom() : m_fastpts(25), m_tolerance(1.0), m_geomtype("camera"), + m_maxarea(3.0), m_parameters() { validate(m_geomtype); } /* Construct with parameters */ -FastGeom::FastGeom(const PvlFlatMap ¶meters) : m_fastpts(25), - m_tolerance(1.0), +FastGeom::FastGeom(const PvlFlatMap ¶meters) : m_fastpts(25), + m_tolerance(1.0), m_geomtype("camera"), m_maxarea(3.0), - m_parameters(parameters) { + m_parameters(parameters) { m_fastpts = toInt(m_parameters.get("FastGeomPoints", "25")); m_tolerance = toDouble(m_parameters.get("FastGeomTolerance", "1.0")); m_geomtype = m_parameters.get("GeomType", "camera").toLower(); @@ -48,9 +35,9 @@ FastGeom::FastGeom(const PvlFlatMap ¶meters) : m_fastpts(25), /* Construct with individual parameters to compute the fast geom transform */ FastGeom::FastGeom(const int maxpts, const double tolerance, const bool crop, - const bool preserve, const double &maxarea) : + const bool preserve, const double &maxarea) : m_fastpts(maxpts), m_tolerance(tolerance), m_geomtype("camera"), - m_maxarea(maxarea), m_parameters() { + m_maxarea(maxarea), m_parameters() { validate(m_geomtype); } @@ -58,19 +45,19 @@ FastGeom::FastGeom(const int maxpts, const double tolerance, const bool crop, FastGeom::~FastGeom() { } /** - * @brief Compute train->query fast geom transformation - * + * @brief Compute train->query fast geom transformation + * * This method computes a fast geometric transform that "projects" the train * image into the query image space. This method assumes both images have * camera models or map projections that can compute longitude/latitude * coordinates from sample/line coordinates and back. - * + * * The query line/samples coordinates are converted to latitude/longitude * coordinates. The latitude/longitude coordinates are then used in the train * image to compute its corresponding line/sample. A minimum number of points * (m_fastpts) are computed to create a perspective transform that maps image * coordinates of the two images. - * + * * @param query Query image * @param train Train image * @return ImageTransform* Pointer to FastGeom transform @@ -84,25 +71,25 @@ ImageTransform *FastGeom::compute(MatchImage &query, MatchImage &train) { RectArea tSize(0.0f, 0.0f, train.source().samples(), train.source().lines() ); // std::cout << "Train-to-query mapping...\n"; - cv::Mat t_to_q = train.source().getGeometryMapping(query.source(), - m_fastpts, - m_tolerance); + cv::Mat t_to_q = train.source().getGeometryMapping(query.source(), + m_fastpts, + m_tolerance); // The above matrix is for simply computing the direct fastgeom of the // training image into the image space of the query image, just like // cam2cam does. - // + // // Now consider cropping to only the mininmum common coverage or // preserving all the train image in the transformation (this option can // be really big and is not recommended for some situations!). - - // Set up the transform pointer for applying the desired affect. Do + + // Set up the transform pointer for applying the desired affect. Do // preserve option first. QScopedPointer fastg(0); if ( "map" == m_geomtype ) { // Compute preserved image output size and translation matrix cv::Mat tMat; - RectArea tSizeFull = ImageTransform::transformedSize(t_to_q, + RectArea tSizeFull = ImageTransform::transformedSize(t_to_q, tSize.size(), tMat); // std::cout << "FullTrain: " << tSizeFull << "\n"; @@ -111,7 +98,7 @@ ImageTransform *FastGeom::compute(MatchImage &query, MatchImage &train) { // same size as the output image below. if ( tSizeFull.area() < (m_maxarea * qSize.area()) ) { // std::cout << "Use direct full mapping of Train-to-Query...\n"; - fastg.reset(new GenericTransform("FastGeomMap", t_to_q, + fastg.reset(new GenericTransform("FastGeomMap", t_to_q, tSizeFull)); } } @@ -119,24 +106,24 @@ ImageTransform *FastGeom::compute(MatchImage &query, MatchImage &train) { // Crop train image to only common area in query image using inverse // std::cout << "Compute train to query BB...\n"; - RectArea qbbox = ImageTransform::boundingBox( t_to_q.inv(), qSize, + RectArea qbbox = ImageTransform::boundingBox( t_to_q.inv(), qSize, tSize.size()); // std::cout << "TrainBB: " << qbbox << "\n"; // std::cout << "Compute query to train BB...\n"; - RectArea tbbox = ImageTransform::boundingBox( t_to_q, qbbox, + RectArea tbbox = ImageTransform::boundingBox( t_to_q, qbbox, qSize.size()); // std::cout << "MapBB: " << tbbox << "\n"; - fastg.reset(new GenericTransform("FastGeomCrop", t_to_q, tbbox)); + fastg.reset(new GenericTransform("FastGeomCrop", t_to_q, tbbox)); } // If a mapper has not been allocated, allocate mapping to query image size // (as cam2cam does). if ( fastg.isNull() ) { // std::cout << "FastGeom cam2map map created...\n"; - fastg.reset(new GenericTransform("FastGeomCamera", t_to_q, qSize.size())); + fastg.reset(new GenericTransform("FastGeomCamera", t_to_q, qSize.size())); } return ( fastg.take() ); @@ -149,12 +136,12 @@ void FastGeom::apply(MatchImage &query, MatchImage &train) { } /** - * @brief Checks for valid fast geom transform options - * - * This method checks that geomtype is "camera", "crop" or "map". If some other - * value is found, an exception is thrown. - * - * @param geomtype String specification of geom type - must be camera, crop or + * @brief Checks for valid fast geom transform options + * + * This method checks that geomtype is "camera", "crop" or "map". If some other + * value is found, an exception is thrown. + * + * @param geomtype String specification of geom type - must be camera, crop or * map */ void FastGeom::validate( const QString &geomtype ) const { @@ -168,4 +155,3 @@ void FastGeom::validate( const QString &geomtype ) const { } } // namespace Isis - diff --git a/isis/src/control/apps/findfeatures/FastGeom.h b/isis/src/control/apps/findfeatures/FastGeom.h index 1725feecb9..b795b98b2d 100644 --- a/isis/src/control/apps/findfeatures/FastGeom.h +++ b/isis/src/control/apps/findfeatures/FastGeom.h @@ -1,26 +1,14 @@ #ifndef FastGeom_h #define FastGeom_h -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -38,31 +26,31 @@ class ImageTransform; /** * @brief Compute fast geom transform for pair of images - * - * This class computes a fast geometric transformation of a query and train - * image pair using available geometry. - * - * It is assumed the two images have overlapping regions and in these regions - * there are geometries that map from one image to the other. - * - * There are three types of fast geometric transforms that are computed in this - * class: camera, crop and map. - * - * The camera fast geom works in the same way that the ISIS application cam2map - * works. It transforms the train image directly into camera space of the query - * image. The crop fast transform option computes the common area of overlap of - * the train image and minimumizes the outputs size of the transformed image. - * The map fast transform behaves just like cam2map where the output image is - * fully retained and projected into the camera space. This option has the - * highest degree of problems that can occur particularly if the image scales - * differ significantly. - * - * The resulting fast geom transform is added to the train transform list. This + * + * This class computes a fast geometric transformation of a query and train + * image pair using available geometry. + * + * It is assumed the two images have overlapping regions and in these regions + * there are geometries that map from one image to the other. + * + * There are three types of fast geometric transforms that are computed in this + * class: camera, crop and map. + * + * The camera fast geom works in the same way that the ISIS application cam2map + * works. It transforms the train image directly into camera space of the query + * image. The crop fast transform option computes the common area of overlap of + * the train image and minimumizes the outputs size of the transformed image. + * The map fast transform behaves just like cam2map where the output image is + * fully retained and projected into the camera space. This option has the + * highest degree of problems that can occur particularly if the image scales + * differ significantly. + * + * The resulting fast geom transform is added to the train transform list. This * approach is well suited for the template MatchMaker::foreachpPair method. - * - * @author 2015-10-01 Kris Becker - * @internal - * @history 2015-10-01 Kris Becker - Original Version + * + * @author 2015-10-01 Kris Becker + * @internal + * @history 2015-10-01 Kris Becker - Original Version * @history 2016-04-06 Kris Becker Created .cpp file and completed documentation */ diff --git a/isis/src/control/apps/findfeatures/FeatureAlgorithm.h b/isis/src/control/apps/findfeatures/FeatureAlgorithm.h index fcd06684fb..9b2edd5804 100644 --- a/isis/src/control/apps/findfeatures/FeatureAlgorithm.h +++ b/isis/src/control/apps/findfeatures/FeatureAlgorithm.h @@ -1,26 +1,14 @@ #ifndef FeatureAlgorithm_h #define FeatureAlgorithm_h -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IException.h" #include "PvlFlatMap.h" @@ -39,38 +27,38 @@ namespace Isis { /** - * @brief Wrapper for generic algorithm OpenCV3 feature matcher algorithms - * - * This class provides a generic wrapper that is intended to restore some of the - * functionality for these algorithms that were lost in the upgrade from version - * 2. Hence, the class T is intended to be an OpenCV Ptr type that contains - * either a Feature2D or DescriptorMatcher algorithm pointer. - * - * However, the design does lend itself to overide some the OpenCV specifics - * if needed. - * - * The OpenCV implementation can simply extract and populate the - * the PvlFlatMap variable structure to allow the default - * implementation to serve up the algorithm variables to the - * calling environment - or provide a specific implementation if - * inadequate. - * - * The config variable provides a direct way to store how the - * invocation string in the form of - * "algorithmname@var:value@var:value...". - * + * @brief Wrapper for generic algorithm OpenCV3 feature matcher algorithms + * + * This class provides a generic wrapper that is intended to restore some of the + * functionality for these algorithms that were lost in the upgrade from version + * 2. Hence, the class T is intended to be an OpenCV Ptr type that contains + * either a Feature2D or DescriptorMatcher algorithm pointer. + * + * However, the design does lend itself to overide some the OpenCV specifics + * if needed. + * + * The OpenCV implementation can simply extract and populate the + * the PvlFlatMap variable structure to allow the default + * implementation to serve up the algorithm variables to the + * calling environment - or provide a specific implementation if + * inadequate. + * + * The config variable provides a direct way to store how the + * invocation string in the form of + * "algorithmname@var:value@var:value...". + * * @author 2016-11-30 Kris Becker - * - * @internal - * @history 2016-11-30 Kris Becker - Original Version + * + * @internal + * @history 2016-11-30 Kris Becker - Original Version */ template class FeatureAlgorithm { public: FeatureAlgorithm(); FeatureAlgorithm(const QString &name, const QString &type); - FeatureAlgorithm(const QString &name, const QString &type, - const T algorithm, + FeatureAlgorithm(const QString &name, const QString &type, + const T algorithm, const PvlFlatMap &variables = PvlFlatMap()); virtual ~FeatureAlgorithm(); @@ -86,7 +74,7 @@ template class FeatureAlgorithm { void setConfig(const QString &config); QString config() const; - // Setter/getter for algorithm variable + // Setter/getter for algorithm variable virtual bool setVariable(const QString &var, const QString &value); virtual QString getVariable(const QString &var, const QString &separator = ","); @@ -130,42 +118,42 @@ template class FeatureAlgorithm { /** * @brief Default constructor, which is likely needed but useless - * - * @author 2016-12-07 Kris Becker + * + * @author 2016-12-07 Kris Becker */ -template FeatureAlgorithm::FeatureAlgorithm() : - m_name("FeatureAlgorithm"), - m_type("Algorithm"), m_config(), +template FeatureAlgorithm::FeatureAlgorithm() : + m_name("FeatureAlgorithm"), + m_type("Algorithm"), m_config(), m_algorithm(), m_variables() { } /** - * @brief Construct a named feature algorithm - * - * This constructor is partially valid but assumes the deriving class defines - * the algoritm after construction - * - * @author 2016-12-07 Kris Becker - * + * @brief Construct a named feature algorithm + * + * This constructor is partially valid but assumes the deriving class defines + * the algoritm after construction + * + * @author 2016-12-07 Kris Becker + * * @param name Name of algorithm * @param type Type of Algorithm, typically "Feature2D" or "DecriptorMatcher" */ -template FeatureAlgorithm::FeatureAlgorithm(const QString &name, - const QString &type) : - m_name(name), - m_type(type), - m_config(), +template FeatureAlgorithm::FeatureAlgorithm(const QString &name, + const QString &type) : + m_name(name), + m_type(type), + m_config(), m_algorithm(), m_variables() { } /** - * @brief Construct a complete algorithm - * - * This constructor will provide a complete algorithm with the parameters - * provided. - * - * @author 2016-12-07 Kris Becker - * + * @brief Construct a complete algorithm + * + * This constructor will provide a complete algorithm with the parameters + * provided. + * + * @author 2016-12-07 Kris Becker + * * @param name Name of algorithm * @param type Type of Algorithm, typically "Feature2D" or "DecriptorMatcher" * @param algorithm Algorithm (assumed to be a cv::Ptr-type parameter @@ -173,34 +161,34 @@ template FeatureAlgorithm::FeatureAlgorithm(const QString &name, */ template FeatureAlgorithm::FeatureAlgorithm(const QString &name, const QString &type, - const T algorithm, - const PvlFlatMap &variables) : - m_name(name), - m_type(type), - m_config(), - m_algorithm(algorithm), + const T algorithm, + const PvlFlatMap &variables) : + m_name(name), + m_type(type), + m_config(), + m_algorithm(algorithm), m_variables(variables) { } /** Destructor */ template FeatureAlgorithm::~FeatureAlgorithm() { } /** - * @brief Check validity of algorithm - * - * The default implementation is to simply test if the cv::Ptr is valid. - * Derived classes can reimplement this method if needed. - * - * @author 2016-12-07 Kris Becker - * + * @brief Check validity of algorithm + * + * The default implementation is to simply test if the cv::Ptr is valid. + * Derived classes can reimplement this method if needed. + * + * @author 2016-12-07 Kris Becker + * * @return bool Returns true if all is well, false if not */ template bool FeatureAlgorithm::isValid() const { - return ( !m_algorithm.empty() ); + return ( !m_algorithm.empty() ); } /** Return the name of the algorithm */ template QString FeatureAlgorithm::name() const { - return ( m_name ); + return ( m_name ); } /** Returns the type of the algorithm */ @@ -215,44 +203,44 @@ template QString FeatureAlgorithm::description() const { /** Set the config string if appropriate (typically seen at higher level) */ template void FeatureAlgorithm::setConfig(const QString &config) { - m_config = config; + m_config = config; } /** Return the config string */ template QString FeatureAlgorithm::config() const { - return ( m_config ); + return ( m_config ); } /** - * @brief Set an algorithm variable to a specific value - * - * The parameters provided in this method are deferred to the - * setAlgorithmVariables() method that derived classes must implement. A - * PvlFlatMap of the value is constructed and passed into the derived routine - * that implenents the setting of all variables. The derived class must return - * the number of valid variables set, which in this case is expected to be 1, - * which is tested for success. If it fails, an exception is thrown. The - * deriving class can also throw an exception if indicated, which is trapped - * and propagated up the call chain. - * - * If the setting succeeds the value is added to the existing Pvl container to - * maintain consistent states of the algorithm variable settings. - * - * If the needed, the deriving class can reimplement this method if the - * behavior is not acceptable. - * - * @author 2016-12-07 Kris Becker - * + * @brief Set an algorithm variable to a specific value + * + * The parameters provided in this method are deferred to the + * setAlgorithmVariables() method that derived classes must implement. A + * PvlFlatMap of the value is constructed and passed into the derived routine + * that implenents the setting of all variables. The derived class must return + * the number of valid variables set, which in this case is expected to be 1, + * which is tested for success. If it fails, an exception is thrown. The + * deriving class can also throw an exception if indicated, which is trapped + * and propagated up the call chain. + * + * If the setting succeeds the value is added to the existing Pvl container to + * maintain consistent states of the algorithm variable settings. + * + * If the needed, the deriving class can reimplement this method if the + * behavior is not acceptable. + * + * @author 2016-12-07 Kris Becker + * * @param var Name of variable to set. Deriving classes should not expect * case insensitive variable names. Note PvlFlatMap is case - * insensitive. + * insensitive. * @param value String value to set - * - * @return bool True if the variable was successfully set. A false condition - * will never be returned as an exception is thrown on failure. + * + * @return bool True if the variable was successfully set. A false condition + * will never be returned as an exception is thrown on failure. */ template bool FeatureAlgorithm::setVariable(const QString &var, - const QString &value) { + const QString &value) { PvlFlatMap variable; variable.add(var, value); try { @@ -267,54 +255,54 @@ template bool FeatureAlgorithm::setVariable(const QString &var, } m_variables.merge(variable); - return (true); + return (true); } /** * @brief Return the values of an algorithm parameter - * - * This method returns the value of an algorithm as it is currently set. - * - * @author 2016-12-12 Kris Becker - * + * + * This method returns the value of an algorithm as it is currently set. + * + * @author 2016-12-12 Kris Becker + * * @param var Name of variable to retrieve - * - * @return QString The value of the variable. Multiple values are separateed by + * + * @return QString The value of the variable. Multiple values are separateed by * commas. */ template QString FeatureAlgorithm::getVariable(const QString &var, - const QString &separator) { + const QString &separator) { if ( m_variables.exists(var) ) { return (m_variables.allValues(var).join(separator)); } - return (QString()); + return (QString()); } /** - * @brief Set variable with value contained in a QVariant - * - * This method is for those algorithm uncommon variable types that are not - * suitable to be represented as a string or may require special consideration - * (such as higher precision of doubles). The default implementation, however, - * attempts to convert the QVariant content to a string and apply it using the - * setAlgorithmnVariables() method. - * - * Deriving classes can reimplement this method should it need specialized - * value treatment. - * - * @author 2016-12-07 Kris Becker - * - * @param name Name of variable to set + * @brief Set variable with value contained in a QVariant + * + * This method is for those algorithm uncommon variable types that are not + * suitable to be represented as a string or may require special consideration + * (such as higher precision of doubles). The default implementation, however, + * attempts to convert the QVariant content to a string and apply it using the + * setAlgorithmnVariables() method. + * + * Deriving classes can reimplement this method should it need specialized + * value treatment. + * + * @author 2016-12-07 Kris Becker + * + * @param name Name of variable to set * @param var QVariant containing the value to appy in the algorithm - * - * @return bool True if successful, however failures result in a thrown + * + * @return bool True if successful, however failures result in a thrown * exception */ template bool FeatureAlgorithm::setVariable(const QString &vname, - const QVariant &var) { + const QVariant &var) { QString value = var.toString(); - if ( value.isEmpty() ) { - QString mess = "Variant/variable " + vname + + if ( value.isEmpty() ) { + QString mess = "Variant/variable " + vname + " cannot be converted in " + name(); throw IException(IException::Programmer, mess, _FILEINFO_); } @@ -327,30 +315,30 @@ template bool FeatureAlgorithm::setVariable(const QString &vname, } m_variables.merge(variable); - return (true); + return (true); } /** - * @brief Retreive an algorithm variable in a QVariant - * - * This method is provided for algorithm variable types that are not well - * suited for representation in strings. One such example may be a cv::Mat - * variable type. - * - * This method should be reimplemented by deriving classes with special - * variable types if needed. The deffault behavior is to convert the parameter - * data to a QStringList. - * - * @author 2016-12-07 Kris Becker - * + * @brief Retreive an algorithm variable in a QVariant + * + * This method is provided for algorithm variable types that are not well + * suited for representation in strings. One such example may be a cv::Mat + * variable type. + * + * This method should be reimplemented by deriving classes with special + * variable types if needed. The deffault behavior is to convert the parameter + * data to a QStringList. + * + * @author 2016-12-07 Kris Becker + * * @param var Name of variable to retrieve its value from * @param value A QVariont to return the value in - * - * @return bool True if successful, however failures result in a thrown + * + * @return bool True if successful, however failures result in a thrown * exception */ template bool FeatureAlgorithm::getVariable(const QString &var, - QVariant &value) { + QVariant &value) { value = QVariant(QStringList()); if ( m_variables.exists(var) ) { if ( m_variables.count(var) > 0 ) { @@ -358,7 +346,7 @@ template bool FeatureAlgorithm::getVariable(const QString &var, } return (true); } - return (false); + return (false); } /** Returns the PvlFlatMap containing all the variable/values as @@ -369,11 +357,11 @@ template const PvlFlatMap &FeatureAlgorithm::variables() const { /** * @brief Create an object structure of algorithm definition - * - * @author 2016-12-07 Kris Becker - * + * + * @author 2016-12-07 Kris Becker + * * @param objname Optional name for the PvlObject of the description - * + * * @return PvlObject PvlObject containing a description of the algorithm */ template PvlObject FeatureAlgorithm::info(const QString &objname) const { @@ -406,9 +394,9 @@ template PvlFlatMap FeatureAlgorithm::getAlgorithmVariables() const template int FeatureAlgorithm::setAlgorithmVariables(const PvlFlatMap &variables) { - throw IException(IException::Programmer, "Derived classes must reimplement this method", + throw IException(IException::Programmer, "Derived classes must reimplement this method", _FILEINFO_); - + return (0); } diff --git a/isis/src/control/apps/findfeatures/FeatureAlgorithmFactory.cpp b/isis/src/control/apps/findfeatures/FeatureAlgorithmFactory.cpp index 719f033ec4..a263f19455 100644 --- a/isis/src/control/apps/findfeatures/FeatureAlgorithmFactory.cpp +++ b/isis/src/control/apps/findfeatures/FeatureAlgorithmFactory.cpp @@ -1,26 +1,11 @@ -/** - * @file - * $Revision$ - * $Date$ - * $Id$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include diff --git a/isis/src/control/apps/findfeatures/FeatureAlgorithmFactory.h b/isis/src/control/apps/findfeatures/FeatureAlgorithmFactory.h index 5fafa9d085..6558375771 100644 --- a/isis/src/control/apps/findfeatures/FeatureAlgorithmFactory.h +++ b/isis/src/control/apps/findfeatures/FeatureAlgorithmFactory.h @@ -1,26 +1,14 @@ #ifndef FeatureAlgorithmFactory_h #define FeatureAlgorithmFactory_h -/** - * @file - * $Revision $ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include diff --git a/isis/src/control/apps/findfeatures/FeatureInventory.cpp b/isis/src/control/apps/findfeatures/FeatureInventory.cpp index 9b5eafe64b..22fe97118c 100644 --- a/isis/src/control/apps/findfeatures/FeatureInventory.cpp +++ b/isis/src/control/apps/findfeatures/FeatureInventory.cpp @@ -1,24 +1,11 @@ -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include @@ -32,7 +19,7 @@ #include "FeatureInventory.h" namespace Isis { - FeatureInventory::FeatureInventory() : m_theFeatureCreator(), + FeatureInventory::FeatureInventory() : m_theFeatureCreator(), m_theMatcherCreator() { } @@ -43,11 +30,11 @@ namespace Isis { FeatureInventory::FeatureCreator maker, const QStringList &aliases) { - // Add the fundamental - int v_made(0); + // Add the fundamental + int v_made(0); // There cannot be withspace at the begging or end of the name - its okay // to embed them. - QString v_name = name.toLower().trimmed(); + QString v_name = name.toLower().trimmed(); m_theFeatureCreator.insert(v_name, maker); v_made++; @@ -58,11 +45,11 @@ namespace Isis { QString l_name = a_name.toLower().trimmed(); m_theFeatureCreator.insert(l_name, maker); v_made++; - if ( l_name.contains(QRegularExpression("^detector\\.*", + if ( l_name.contains(QRegularExpression("^detector\\.*", QRegularExpression::CaseInsensitiveOption) ) ) { m_detectorNames.append( l_name.toLower() ); } - if ( a_name.contains(QRegularExpression("^extractor\\.*", + if ( a_name.contains(QRegularExpression("^extractor\\.*", QRegularExpression::CaseInsensitiveOption) ) ) { m_extractorNames.append( l_name.toLower() ); } @@ -77,9 +64,9 @@ namespace Isis { FeatureInventory::MatcherCreator maker, const QStringList &aliases) { int v_made(0); - // There cannot be whitespace at the begining or end of the name - its okay - // to embed them. - QString v_name = name.toLower().trimmed(); + // There cannot be whitespace at the begining or end of the name - its okay + // to embed them. + QString v_name = name.toLower().trimmed(); m_theMatcherCreator.insert(v_name, maker); m_matcherNames.append( name.toLower() ); v_made++; @@ -87,7 +74,7 @@ namespace Isis { // Add all aliases. Expected to of form "detector.name, extractor.name", // etc.... BOOST_FOREACH ( QString a_name, aliases ) { - QString l_name = a_name.toLower().trimmed(); + QString l_name = a_name.toLower().trimmed(); if ( !l_name.isEmpty() ) { m_theMatcherCreator.insert(l_name, maker); } @@ -108,7 +95,7 @@ namespace Isis { QString name = parts.takeFirst().toLower().trimmed(); PvlFlatMap variables = parameters(parts); - + if ( m_theFeatureCreator.contains(name) ) { FeatureCreator creator = m_theFeatureCreator.value(name); return ( creator( variables, config) ); @@ -133,7 +120,7 @@ namespace Isis { return ( algo ); } - + FeatureAlgorithmPtr FeatureInventory::getExtractor(const QString &config) const { FeatureAlgorithmPtr algo = getFeature(config); if ( !algo->hasExtractor() ) { @@ -202,7 +189,7 @@ namespace Isis { else { QString mess = "Algorithm [" + algorithmName + "] is not a supported OpenCV3 algorithm."; - throw IException(IException::User, mess, _FILEINFO_); + throw IException(IException::User, mess, _FILEINFO_); } algorithmObject += aliases( lowerName ); @@ -237,7 +224,7 @@ namespace Isis { else { QString mess = "Algorithm [" + algorithmName + "] is not a supported OpenCV3 algorithm."; - throw IException(IException::Programmer, mess, _FILEINFO_); + throw IException(IException::Programmer, mess, _FILEINFO_); } return ( aliasKey ); @@ -279,7 +266,7 @@ namespace Isis { /** Split the string with the provided separator in individual parts */ - QStringList FeatureInventory::parse(const QString &config, + QStringList FeatureInventory::parse(const QString &config, const QString &sep) const { return ( config.split(sep, QString::SkipEmptyParts) ); } @@ -301,4 +288,3 @@ namespace Isis { } }; - diff --git a/isis/src/control/apps/findfeatures/FeatureInventory.h b/isis/src/control/apps/findfeatures/FeatureInventory.h index 55bcbc167d..a22fd159b5 100644 --- a/isis/src/control/apps/findfeatures/FeatureInventory.h +++ b/isis/src/control/apps/findfeatures/FeatureInventory.h @@ -1,26 +1,14 @@ #ifndef FeatureInventory_h #define FeatureInventory_h -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IException.h" #include "PvlFlatMap.h" @@ -38,38 +26,38 @@ namespace Isis { /** - * @brief Wrapper for generic algorithm OpenCV3 feature matcher algorithms - * - * This class provides a generic wrapper that is intended to restore some of the - * functionality for these algorithms that were lost in the upgrade from version - * 2. Hence, the class T is intended to be an OpenCV Ptr type that contains - * either a Feature2D or DescriptorMatcher algorithm pointer. - * - * However, the design does lend itself to overide some the OpenCV specifics - * if needed. - * - * The OpenCV implementation can simply extract and populate the - * the PvlFlatMap variable structure to allow the default - * implementation to serve up the algorithm variables to the - * calling environment - or provide a specific implementation if - * inadequate. - * - * The config variable provides a direct way to store how the - * invocation string in the form of - * "algorithmname@var:value@var:value...". - * + * @brief Wrapper for generic algorithm OpenCV3 feature matcher algorithms + * + * This class provides a generic wrapper that is intended to restore some of the + * functionality for these algorithms that were lost in the upgrade from version + * 2. Hence, the class T is intended to be an OpenCV Ptr type that contains + * either a Feature2D or DescriptorMatcher algorithm pointer. + * + * However, the design does lend itself to overide some the OpenCV specifics + * if needed. + * + * The OpenCV implementation can simply extract and populate the + * the PvlFlatMap variable structure to allow the default + * implementation to serve up the algorithm variables to the + * calling environment - or provide a specific implementation if + * inadequate. + * + * The config variable provides a direct way to store how the + * invocation string in the form of + * "algorithmname@var:value@var:value...". + * * @author 2016-11-30 Kris Becker - * - * @internal - * @history 2016-11-30 Kris Becker - Original Version + * + * @internal + * @history 2016-11-30 Kris Becker - Original Version */ class FeatureInventory { public: // Creator and storage types - typedef Feature2DAlgorithm* (*FeatureCreator)(const PvlFlatMap &object, + typedef Feature2DAlgorithm* (*FeatureCreator)(const PvlFlatMap &object, const QString &config); - typedef DescriptorMatcherAlgorithm* (*MatcherCreator)(const PvlFlatMap &object, + typedef DescriptorMatcherAlgorithm* (*MatcherCreator)(const PvlFlatMap &object, const QString &config); FeatureInventory(); @@ -143,7 +131,7 @@ class FeatureInventory { return ( numAliases ); } - + private: typedef QMap Features; diff --git a/isis/src/control/apps/findfeatures/FeatureMatcherTypes.h b/isis/src/control/apps/findfeatures/FeatureMatcherTypes.h index 8895ce3f9a..33d9c98426 100644 --- a/isis/src/control/apps/findfeatures/FeatureMatcherTypes.h +++ b/isis/src/control/apps/findfeatures/FeatureMatcherTypes.h @@ -1,26 +1,14 @@ #ifndef FeatureMatcherTypes_h #define FeatureMatcherTypes_h -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include diff --git a/isis/src/control/apps/findfeatures/FlannBasedMatcher.cpp b/isis/src/control/apps/findfeatures/FlannBasedMatcher.cpp index 91fd9ffe3a..7af08f7263 100644 --- a/isis/src/control/apps/findfeatures/FlannBasedMatcher.cpp +++ b/isis/src/control/apps/findfeatures/FlannBasedMatcher.cpp @@ -1,24 +1,11 @@ -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include @@ -37,7 +24,7 @@ namespace Isis { /** * Constructs the algorithm with default variables. */ - FlannBasedMatcher::FlannBasedMatcher() : + FlannBasedMatcher::FlannBasedMatcher() : DescriptorMatcherAlgorithm("FlannBasedMatcher", "DecriptorMatcher", cv::makePtr()) { PvlFlatMap variables; @@ -50,7 +37,7 @@ namespace Isis { /** * Constructs the algorithm with the input variables - * + * * @param cvars The variables and values the algorithm will use. * Variables that are not included will be set to their default. * @param config The config string used to construct cvars. @@ -77,7 +64,7 @@ namespace Isis { /** * Returns a description of the algorithm. - * + * * @return @b QString A description of the algorithm. */ QString FlannBasedMatcher::description() const { @@ -90,7 +77,7 @@ namespace Isis { /** * Creates an instance of the algorithm. - * + * * @param cvars The variables and values the algorithm will use. * Variables that are not included will be set to their default. * @param config The config string used to construct cvars. @@ -106,38 +93,38 @@ namespace Isis { /** - * Returns true if the algorithm has a detector. - * - * @return @b true if the algorithm has a detector. + * Returns true if the algorithm has a detector. + * + * @return @b true if the algorithm has a detector. */ - bool FlannBasedMatcher::hasDetector() const { - return false; + bool FlannBasedMatcher::hasDetector() const { + return false; } /** - * Returns true if the algorithm has an extractor. - * - * @return @b true if the algorithm has an extractor. + * Returns true if the algorithm has an extractor. + * + * @return @b true if the algorithm has an extractor. */ - bool FlannBasedMatcher::hasExtractor() const { - return false; + bool FlannBasedMatcher::hasExtractor() const { + return false; } /** - * Returns true if the algorithm has a matcher. - * - * @return @b true if the algorithm has a matcher. + * Returns true if the algorithm has a matcher. + * + * @return @b true if the algorithm has a matcher. */ - bool FlannBasedMatcher::hasMatcher() const { - return true; + bool FlannBasedMatcher::hasMatcher() const { + return true; } /** * Returns the variables and their values used by the algorithm. - * + * * @return @b PvlFlatMap The variables and their values as keyword, value pairs. */ PvlFlatMap FlannBasedMatcher::getAlgorithmVariables( ) const { @@ -147,17 +134,17 @@ namespace Isis { /** * @brief Set parameters as provided by the variables - * + * * @param variables Container of parameters to set - * + * * @return @b int Always -1, variables cannot be set after initialization. - * + * * @throws IException::Programmer "FlannBasedMatcher does not have the ability * to set algorithm parameters." */ int FlannBasedMatcher::setAlgorithmVariables(const PvlFlatMap &variables) { QString msg = "FlannBasedMatcher does not have the ability to set algorithm parameters."; - throw IException(IException::Programmer, msg, _FILEINFO_); + throw IException(IException::Programmer, msg, _FILEINFO_); return (-1); } diff --git a/isis/src/control/apps/findfeatures/FlannBasedMatcher.h b/isis/src/control/apps/findfeatures/FlannBasedMatcher.h index 244fe87f37..30f5083f80 100644 --- a/isis/src/control/apps/findfeatures/FlannBasedMatcher.h +++ b/isis/src/control/apps/findfeatures/FlannBasedMatcher.h @@ -1,26 +1,14 @@ #ifndef FlannBasedMatcher_h #define FlannBasedMatcher_h -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "FeatureAlgorithm.h" #include @@ -28,15 +16,15 @@ namespace Isis { /** - * @brief Flann Based Feature matcher algorithm - * - * This class provides the OpenCV3 FlannBasedMatcher DescriptorMatcher algortithm. Only the - * necesary methods are implemented here. - * + * @brief Flann Based Feature matcher algorithm + * + * This class provides the OpenCV3 FlannBasedMatcher DescriptorMatcher algortithm. Only the + * necesary methods are implemented here. + * * @author 2016-12-08 Jesse Mapel - * - * @internal - * @history 2016-12-08 Jesse Mapel - Original Version + * + * @internal + * @history 2016-12-08 Jesse Mapel - Original Version */ class FlannBasedMatcher : public DescriptorMatcherAlgorithm { // See FeatureAlgorithm.h diff --git a/isis/src/control/apps/findfeatures/GFTTAlgorithm.cpp b/isis/src/control/apps/findfeatures/GFTTAlgorithm.cpp index 0cc07ee615..aa3335fe8c 100644 --- a/isis/src/control/apps/findfeatures/GFTTAlgorithm.cpp +++ b/isis/src/control/apps/findfeatures/GFTTAlgorithm.cpp @@ -1,24 +1,11 @@ -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include "opencv2/opencv.hpp" @@ -33,22 +20,22 @@ namespace Isis { /** * Constructs the algorithm with default variables. */ - GFTTAlgorithm::GFTTAlgorithm() : + GFTTAlgorithm::GFTTAlgorithm() : Feature2DAlgorithm("GFTT", "Feature2D", - GFTTType::create()) { + GFTTType::create()) { m_variables.merge(getAlgorithmVariables()); } /** * Constructs the algorithm with the input variables - * + * * @param cvars The variables and values the algorithm will use. * Variables that are not included will be set to their default. * @param config The config string used to construct cvars. */ GFTTAlgorithm::GFTTAlgorithm(const PvlFlatMap &cvars, const QString &config) : - Feature2DAlgorithm("GFTT", "Feature2D", + Feature2DAlgorithm("GFTT", "Feature2D", GFTTType::create(), cvars) { setConfig(config); setAlgorithmVariables(cvars); @@ -64,7 +51,7 @@ namespace Isis { /** * Returns a description of the algorithm. - * + * * @return @b QString A description of the algorithm. */ QString GFTTAlgorithm::description() const { @@ -77,7 +64,7 @@ namespace Isis { /** * Creates an instance of the algorithm. - * + * * @param cvars The variables and values the algorithm will use. * Variables that are not included will be set to their default. * @param config The config string used to construct cvars. @@ -88,38 +75,38 @@ namespace Isis { /** - * Returns true if the algorithm has a detector. - * - * @return @b true if the algorithm has a detector. + * Returns true if the algorithm has a detector. + * + * @return @b true if the algorithm has a detector. */ - bool GFTTAlgorithm::hasDetector() const { - return true; + bool GFTTAlgorithm::hasDetector() const { + return true; } /** - * Returns true if the algorithm has an extractor. - * - * @return @b true if the algorithm has an extractor. + * Returns true if the algorithm has an extractor. + * + * @return @b true if the algorithm has an extractor. */ - bool GFTTAlgorithm::hasExtractor() const { - return false; + bool GFTTAlgorithm::hasExtractor() const { + return false; } /** - * Returns true if the algorithm has a matcher. - * - * @return @b true if the algorithm has a matcher. + * Returns true if the algorithm has a matcher. + * + * @return @b true if the algorithm has a matcher. */ - bool GFTTAlgorithm::hasMatcher() const { - return false; + bool GFTTAlgorithm::hasMatcher() const { + return false; } /** * Returns the variables and their values used by the algorithm. - * + * * @return @b PvlFlatMap The variables and their values as keyword, value pairs. */ PvlFlatMap GFTTAlgorithm::getAlgorithmVariables( ) const { @@ -137,9 +124,9 @@ namespace Isis { /** * @brief Set parameters as provided by the variables - * + * * @param variables Container of parameters to set - * + * * @return int Number of variables actually set */ int GFTTAlgorithm::setAlgorithmVariables(const PvlFlatMap &variables) { @@ -147,32 +134,32 @@ namespace Isis { GFTTPtr algorithm = m_algorithm.dynamicCast(); int nset(0); - if ( variables.exists("MaxFeatures") ) { + if ( variables.exists("MaxFeatures") ) { algorithm->setMaxFeatures(toInt(variables.get("MaxFeatures"))); nset++; } - if ( variables.exists("QualityLevel") ) { + if ( variables.exists("QualityLevel") ) { algorithm->setQualityLevel(toDouble(variables.get("QualityLevel"))); nset++; } - if ( variables.exists("MinDistance") ) { + if ( variables.exists("MinDistance") ) { algorithm->setMinDistance(toDouble(variables.get("MinDistance"))); nset++; } - if ( variables.exists("BlockSize") ) { + if ( variables.exists("BlockSize") ) { algorithm->setBlockSize(toInt(variables.get("BlockSize"))); nset++; } - if ( variables.exists("HarrisDetector") ) { + if ( variables.exists("HarrisDetector") ) { algorithm->setHarrisDetector(toBool(variables.get("HarrisDetector"))); nset++; } - if ( variables.exists("K") ) { + if ( variables.exists("K") ) { algorithm->setK(toDouble(variables.get("K"))); nset++; } diff --git a/isis/src/control/apps/findfeatures/GFTTAlgorithm.h b/isis/src/control/apps/findfeatures/GFTTAlgorithm.h index f722fe5098..6443c5ea08 100644 --- a/isis/src/control/apps/findfeatures/GFTTAlgorithm.h +++ b/isis/src/control/apps/findfeatures/GFTTAlgorithm.h @@ -1,26 +1,14 @@ #ifndef GFTTAlgorithm_h #define GFTTAlgorithm_h -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "FeatureAlgorithm.h" #include "opencv2/features2d.hpp" @@ -30,15 +18,15 @@ namespace Isis { /** - * @brief GFTT Feature matcher algorithm - * - * This class provides the OpenCV3 GFTT Feature2D algortithm. Only the - * necesary methods are implemented here. - * + * @brief GFTT Feature matcher algorithm + * + * This class provides the OpenCV3 GFTT Feature2D algortithm. Only the + * necesary methods are implemented here. + * * @author 2016-12-07 Jesse Mapel - * - * @internal - * @history 2016-12-07 Jesse Mapel - Original Version + * + * @internal + * @history 2016-12-07 Jesse Mapel - Original Version */ class GFTTAlgorithm : public Feature2DAlgorithm { // See FeatureAlgorithm.h diff --git a/isis/src/control/apps/findfeatures/GenericTransform.cpp b/isis/src/control/apps/findfeatures/GenericTransform.cpp index 97da827630..0ee97f036b 100644 --- a/isis/src/control/apps/findfeatures/GenericTransform.cpp +++ b/isis/src/control/apps/findfeatures/GenericTransform.cpp @@ -1,24 +1,10 @@ -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include diff --git a/isis/src/control/apps/findfeatures/GenericTransform.h b/isis/src/control/apps/findfeatures/GenericTransform.h index c1acafc46b..650a8b4242 100644 --- a/isis/src/control/apps/findfeatures/GenericTransform.h +++ b/isis/src/control/apps/findfeatures/GenericTransform.h @@ -1,26 +1,14 @@ #ifndef GenericTransform_h #define GenericTransform_h -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -32,16 +20,16 @@ namespace Isis { /** - * @brief Apply a generic transform using a matrix with various options - * - * This class privides a generic interface to the ImageTransform image and point - * transform conversion transform. It supports the transform with a specified - * 3x3 matrix and optional sizing operations. - * - * @author 2014-07-01 Kris Becker - * @internal - * @history 2014-07-01 Kris Becker - Original Version - * @history 2016-03-08 Kris Becker Created .cpp from header and completed + * @brief Apply a generic transform using a matrix with various options + * + * This class privides a generic interface to the ImageTransform image and point + * transform conversion transform. It supports the transform with a specified + * 3x3 matrix and optional sizing operations. + * + * @author 2014-07-01 Kris Becker + * @internal + * @history 2014-07-01 Kris Becker - Original Version + * @history 2016-03-08 Kris Becker Created .cpp from header and completed * documentation */ class GenericTransform : public ImageTransform { @@ -59,7 +47,7 @@ class GenericTransform : public ImageTransform { cv::Mat getMatrix() const; cv::Mat getInverse() const; - + cv::Size getSize(const cv::Mat &image = cv::Mat()) const; virtual cv::Mat render(const cv::Mat &image) const; diff --git a/isis/src/control/apps/findfeatures/ImageSource.cpp b/isis/src/control/apps/findfeatures/ImageSource.cpp index a6a09dafbf..9b34419cbc 100644 --- a/isis/src/control/apps/findfeatures/ImageSource.cpp +++ b/isis/src/control/apps/findfeatures/ImageSource.cpp @@ -1,27 +1,10 @@ -/** - 4 @file - * $Revision$ - * $Date$ - * $Id$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include @@ -64,22 +47,22 @@ namespace Isis { ImageSource::ImageSource() : m_data( new SourceData() ) { } -ImageSource::ImageSource(const QString &name, +ImageSource::ImageSource(const QString &name, const bool geometryOnly, const double minPercent, - const double maxPercent) : + const double maxPercent) : m_data( new SourceData(name) ) { if ( geometryOnly == true) { initGeometry(); } else { - load(name, minPercent, maxPercent); + load(name, minPercent, maxPercent); } } ImageSource::ImageSource(const QString &name, const cv::Mat &image, - const QString &identity) : + const QString &identity) : m_data( new SourceData(name, image, identity) ) { if ( identity.isEmpty() ) { m_data->m_serialno = m_data->m_name; @@ -87,7 +70,7 @@ ImageSource::ImageSource(const QString &name, const cv::Mat &image, } ImageSource::ImageSource(const ImageSource &other, - const bool getGeometry) : m_data( other.m_data ) { + const bool getGeometry) : m_data( other.m_data ) { if ( getGeometry == true ) { initGeometry(); } @@ -140,7 +123,7 @@ void ImageSource::load(const double minPercent,const double maxPercent) { QString name = m_data->m_name; FileName ifile(name); - // Handle ISIS cube specifically. If its not a cube, use OpenCV's image + // Handle ISIS cube specifically. If its not a cube, use OpenCV's image // reader if ( "cub" == ifile.extension() ) { Cube cube; @@ -150,7 +133,7 @@ void ImageSource::load(const double minPercent,const double maxPercent) { cube.open(ifile.expanded(), "r"); if( cube.bandCount() != 1 ) { - QString msg = "Input cube " + name + " must only have one band!"; + QString msg = "Input cube " + name + " must only have one band!"; throw IException(IException::User, msg, _FILEINFO_); } @@ -195,9 +178,9 @@ void ImageSource::load(const double minPercent,const double maxPercent) { } } } - catch (IException &ie) { - throw IException(ie, IException::Programmer, - "Could not read and create grayscale image from " + + catch (IException &ie) { + throw IException(ie, IException::Programmer, + "Could not read and create grayscale image from " + name, _FILEINFO_); } } @@ -205,7 +188,7 @@ void ImageSource::load(const double minPercent,const double maxPercent) { // Assume OpenCV can read it try { m_data->m_image = cv::imread(ifile.expanded().toStdString(), - CV_LOAD_IMAGE_GRAYSCALE); + CV_LOAD_IMAGE_GRAYSCALE); if ( m_data->m_image.empty() ) { QString mess = "Failed to read image from " + name; throw IException(IException::User, mess, _FILEINFO_); @@ -217,7 +200,7 @@ void ImageSource::load(const double minPercent,const double maxPercent) { } catch (cv::Exception &e) { QString mess = "OpenCV cannot process file " + name + " " + - QString::fromStdString(e.what()); + QString::fromStdString(e.what()); throw IException(IException::User, mess, _FILEINFO_); } } @@ -239,12 +222,12 @@ SurfacePoint ImageSource::getLatLon(const double &line, const double &sample) { double lat = m_data->m_projection->UniversalLatitude(); double lon = m_data->m_projection->UniversalLongitude(); double radius = m_data->m_projection->LocalRadius(lat); - point.SetSphericalCoordinates(Latitude(lat, Angle::Degrees), + point.SetSphericalCoordinates(Latitude(lat, Angle::Degrees), Longitude(lon, Angle::Degrees), Distance(radius, Distance::Meters)); } } - else if ( hasCamera() ) { + else if ( hasCamera() ) { if ( m_data->m_camera->SetImage(sample, line) ) { point = m_data->m_camera->GetSurfacePoint(); } @@ -281,7 +264,7 @@ bool ImageSource::getLineSamp(const SurfacePoint &point, } } else if ( hasCamera() ) { - if ( m_data->m_camera->SetUniversalGround(lat, lon) ) { + if ( m_data->m_camera->SetUniversalGround(lat, lon) ) { isGood = true; line = m_data->m_camera->Line(); samp = m_data->m_camera->Sample(); @@ -293,7 +276,7 @@ bool ImageSource::getLineSamp(const SurfacePoint &point, } cv::Mat ImageSource::getGeometryMapping(ImageSource &match, - const int &minpts, + const int &minpts, const double &tol, const cv::Rect &subarea) { @@ -307,7 +290,7 @@ cv::Mat ImageSource::getGeometryMapping(ImageSource &match, cv::Rect iSize(0.0f, 0.0f, samples(), lines()); if ( subarea.area() != 0.0 ) { iSize = subarea; } - + int nsamps = iSize.width; int nlines = iSize.height; @@ -320,7 +303,7 @@ cv::Mat ImageSource::getGeometryMapping(ImageSource &match, while ( ((int) source.size() < v_minpts) && (!done) ) { - double sSpacing = qMax(1.0, (double) nsamps / (double)(increment)); + double sSpacing = qMax(1.0, (double) nsamps / (double)(increment)); double lSpacing = qMax(1.0, (double) nlines / (double) (increment)); if ( qMax(sSpacing, lSpacing) <= 1 ) done = true; // Last possible loop @@ -377,7 +360,7 @@ cv::Mat ImageSource::getGeometryMapping(ImageSource &match, mapper = cv::findHomography(source, train, CV_RANSAC, tol, inliers); } - return (mapper); + return (mapper); } Histogram *ImageSource::getHistogram(Cube &cube) const { @@ -405,7 +388,7 @@ bool ImageSource::initGeometry() { cube.open(ifile.expanded(), "r"); if( cube.bandCount() != 1 ) { - QString msg = "Input cube " + m_data->m_name + + QString msg = "Input cube " + m_data->m_name + " must only have one band!"; throw IException(IException::User, msg, _FILEINFO_); } @@ -423,9 +406,9 @@ bool ImageSource::initGeometry(Cube &cube) { try { if ( cube.isProjected() ) { int ns, nl; - m_data->m_projection = ((TProjection *) ProjectionFactory::CreateForCube(*cube.label(), ns, nl, true) ); + m_data->m_projection = ((TProjection *) ProjectionFactory::CreateForCube(*cube.label(), ns, nl, true) ); gotOne = true; - } + } // Try camera also, independantly m_data->m_camera= ( CameraFactory::Create(cube) ); diff --git a/isis/src/control/apps/findfeatures/ImageSource.h b/isis/src/control/apps/findfeatures/ImageSource.h index 0f9509273d..cc5103e2db 100644 --- a/isis/src/control/apps/findfeatures/ImageSource.h +++ b/isis/src/control/apps/findfeatures/ImageSource.h @@ -1,26 +1,13 @@ #ifndef ImageSource_h #define ImageSource_h -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include @@ -41,25 +28,25 @@ namespace Isis { class Histogram; /** - * @brief Provides Image I/O and geometry support for matching purposes - * - * This class provides I/O and geometry support that is tailored to the ISIS - * environment but not limited to it. It will also read any format supported by - * the OpenCV image interfaces. - * - * @author 2014-07-01 Kris Becker - * @internal - * @history 2014-07-01 Kris Becker - Original Version - * @history 2016-02-08 Kris Becker - Changed call to ISIS Histogram class for + * @brief Provides Image I/O and geometry support for matching purposes + * + * This class provides I/O and geometry support that is tailored to the ISIS + * environment but not limited to it. It will also read any format supported by + * the OpenCV image interfaces. + * + * @author 2014-07-01 Kris Becker + * @internal + * @history 2014-07-01 Kris Becker - Original Version + * @history 2016-02-08 Kris Becker - Changed call to ISIS Histogram class for * recent changes */ class ImageSource { public: ImageSource(); - ImageSource(const QString &name, - const bool geometryOnly = false, - const double minPercent = 0.5, + ImageSource(const QString &name, + const bool geometryOnly = false, + const double minPercent = 0.5, const double maxPercent = 99.5); explicit ImageSource(const QString &name, const cv::Mat &image, const QString &identifier = ""); @@ -67,9 +54,9 @@ class ImageSource { virtual ~ImageSource() { } - void load(const double minPercent = 0.5,const double maxPercent = 99.5); + void load(const double minPercent = 0.5,const double maxPercent = 99.5); void load(const QString &name, const double minPercent = 0.5, - const double maxPercent = 99.5); + const double maxPercent = 99.5); inline QString name() const { return ( m_data->m_name ); } inline QString serialno() const { return ( m_data->m_serialno ); } @@ -88,44 +75,44 @@ class ImageSource { SurfacePoint getLatLon(const double &line, const double &sample); bool getLineSamp(const SurfacePoint &point, double &line, double &samp, double &radius); - cv::Mat getGeometryMapping(ImageSource &match, const int &minpts = 25, + cv::Mat getGeometryMapping(ImageSource &match, const int &minpts = 25, const double &tol = 3.0, const cv::Rect &subarea = cv::Rect()); private: - /** + /** * Shared Image data pointer - * - * @author 2014-07-01 Kris Becker - * @internal - * @history 2014-07-01 Kris Becker - Original Version + * + * @author 2014-07-01 Kris Becker + * @internal + * @history 2014-07-01 Kris Becker - Original Version */ class SourceData : public QSharedData { public: SourceData() : m_name("Image"), m_serialno("none"), m_projection(0), m_camera(0), m_image(), m_mutex(new QMutex()) { } - SourceData(const QString &name) : m_name(name), m_serialno("none"), - m_projection(0),m_camera(0), + SourceData(const QString &name) : m_name(name), m_serialno("none"), + m_projection(0),m_camera(0), m_image(), m_mutex(new QMutex()) { } - SourceData(const QString &name, const cv::Mat &image, + SourceData(const QString &name, const cv::Mat &image, const QString &serialno) : m_name(name), m_serialno(serialno), - m_projection(0), m_camera(0), + m_projection(0), m_camera(0), m_image(image), m_mutex(new QMutex()) { } SourceData(const QString &name, const QString &serialno, - TProjection *proj, Camera *camera, const cv::Mat &image) : + TProjection *proj, Camera *camera, const cv::Mat &image) : m_name(name), m_serialno(serialno), - m_projection(proj), m_camera(camera), + m_projection(proj), m_camera(camera), m_image(image), m_mutex(new QMutex()) { } - SourceData(const SourceData &other) : QSharedData(other), + SourceData(const SourceData &other) : QSharedData(other), m_name(other.m_name), m_serialno(other.m_serialno), m_projection(0), - m_camera(0), - m_image(), + m_camera(0), + m_image(), m_mutex( new QMutex() ) { } - + ~SourceData() { delete m_projection; delete m_camera; @@ -150,7 +137,7 @@ class ImageSource { bool initGeometry(); bool initGeometry(Cube &cube); - + }; diff --git a/isis/src/control/apps/findfeatures/ImageTransform.cpp b/isis/src/control/apps/findfeatures/ImageTransform.cpp index d1e0706f8f..0ed1ef844b 100644 --- a/isis/src/control/apps/findfeatures/ImageTransform.cpp +++ b/isis/src/control/apps/findfeatures/ImageTransform.cpp @@ -1,27 +1,10 @@ -/** - * @file - * $Revision$ - * $Date$ - * $Id$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include @@ -44,8 +27,8 @@ ImageTransform::ImageTransform(const QString &name) : m_name(name) { } ImageTransform::~ImageTransform() { } -QString ImageTransform::name() const { - return ( m_name ); +QString ImageTransform::name() const { + return ( m_name ); } @@ -53,11 +36,11 @@ QString ImageTransform::name() const { * Perform the transformation on an image matrix. * Child classes should override this method with to implement transformation * process. - * + * * @param image The input image data matrix to transform. - * + * * @return @b cv::Mat The transformed matrix. - * + * * @note The cv::Mat class implicilty shares, so if the input image matrix, or * a copy of it, will be modified you need to clone() the matrix prior * to modification or the input matrix will be changed. @@ -74,7 +57,7 @@ cv::Point2f ImageTransform::inverse(const cv::Point2f &point) const { } -ImageTransform::RectArea ImageTransform::boundingBox(const cv::Mat &tform, +ImageTransform::RectArea ImageTransform::boundingBox(const cv::Mat &tform, const ImageTransform::RectArea ®ion, const cv::Size &bounds) { @@ -83,13 +66,13 @@ ImageTransform::RectArea ImageTransform::boundingBox(const cv::Mat &tform, cv::perspectiveTransform(b_corners, t_corners, tform); float xmin(t_corners[0].x), xmax(t_corners[0].x); - float ymin(t_corners[0].y), ymax(t_corners[0].y); + float ymin(t_corners[0].y), ymax(t_corners[0].y); for (unsigned int i = 0 ; i < t_corners.size() ; i++) { #if 0 - std::cout << "(x,y) -> (x',y') = (" - << b_corners[i].x << "," << b_corners[i].y << ") -> (" + std::cout << "(x,y) -> (x',y') = (" + << b_corners[i].x << "," << b_corners[i].y << ") -> (" << t_corners[i].x << "," << t_corners[i].y << ")\n"; -#endif +#endif if ( t_corners[i].x < xmin) xmin = t_corners[i].x; if ( t_corners[i].x > xmax) xmax = t_corners[i].x; if ( t_corners[i].y < ymin) ymin = t_corners[i].y; @@ -97,23 +80,23 @@ ImageTransform::RectArea ImageTransform::boundingBox(const cv::Mat &tform, } cv::Point2f xymin( qMax(0.0f, xmin), qMax(0.0f, ymin) ); - cv::Point2f xymax( qMin(xmax, bounds.width-1.0f), - qMin(ymax, bounds.height-1.0f) ); - cv::Rect bbox( xymin.x , xymin.y, - (int) (xymax.x-xymin.x+0.5), + cv::Point2f xymax( qMin(xmax, bounds.width-1.0f), + qMin(ymax, bounds.height-1.0f) ); + cv::Rect bbox( xymin.x , xymin.y, + (int) (xymax.x-xymin.x+0.5), (int) (xymax.y-xymin.y+0.5) ); return ( bbox ); } -ImageTransform::RectArea ImageTransform::transformedSize(const cv::Mat &tmat, - const cv::Size &imSize, +ImageTransform::RectArea ImageTransform::transformedSize(const cv::Mat &tmat, + const cv::Size &imSize, cv::Mat &tmat_t) { std::vector t_corners; cv::perspectiveTransform(corners(imSize), t_corners, tmat); double xmin(t_corners[0].x), xmax(t_corners[0].x); - double ymin(t_corners[0].y), ymax(t_corners[0].y); + double ymin(t_corners[0].y), ymax(t_corners[0].y); for (unsigned int i = 1 ; i < t_corners.size() ; i++) { if ( t_corners[i].x < xmin) xmin = t_corners[i].x; if ( t_corners[i].x > xmax) xmax = t_corners[i].x; @@ -122,7 +105,7 @@ ImageTransform::RectArea ImageTransform::transformedSize(const cv::Mat &tmat, } #if 0 - std::cout << "\nImageSize: " << imSize.width << ", " << imSize.height << "\n"; + std::cout << "\nImageSize: " << imSize.width << ", " << imSize.height << "\n"; std::cout << "Min x,y: " << xmin << ", " << ymin << "\n"; std::cout << "NewImageSize: " << (xmax-xmin) << ", " << (ymax-ymin) << "\n"; #endif @@ -130,7 +113,7 @@ ImageTransform::RectArea ImageTransform::transformedSize(const cv::Mat &tmat, // Compute translation to orient the image at line 0. cv::Mat zMap = translation(-xmin, -ymin); tmat_t = zMap * tmat; - return ( RectArea(xmin, ymin, (int) (xmax-xmin+0.5), (int) (ymax-ymin+0.5)) ); + return ( RectArea(xmin, ymin, (int) (xmax-xmin+0.5), (int) (ymax-ymin+0.5)) ); } std::vector ImageTransform::corners(const cv::Size &imSize) { @@ -146,8 +129,8 @@ std::vector ImageTransform::corners(const ImageTransform::RectArea std::vector points; points.push_back(cv::Point2f(region.x, region.y) ); points.push_back(cv::Point2f(region.x + region.width - 1.0, region.y)); - points.push_back(cv::Point2f(region.x + region.width - 1.0, - region.y + region.height - 1.0)); + points.push_back(cv::Point2f(region.x + region.width - 1.0, + region.y + region.height - 1.0)); points.push_back(cv::Point2f(region.x, region.y + region.height - 1.0)); return ( points ); } diff --git a/isis/src/control/apps/findfeatures/ImageTransform.h b/isis/src/control/apps/findfeatures/ImageTransform.h index 51af04ef9e..9877a87f06 100644 --- a/isis/src/control/apps/findfeatures/ImageTransform.h +++ b/isis/src/control/apps/findfeatures/ImageTransform.h @@ -1,26 +1,13 @@ #ifndef ImageTransform_h #define ImageTransform_h -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include @@ -34,10 +21,10 @@ namespace Isis { /** * @brief OpenCV-based image transformation base class - * - * - * @author 2014-07-01 Kris Becker - * @internal + * + * + * @author 2014-07-01 Kris Becker + * @internal * @history 2014-07-01 Kris Becker - Original Version * @history 2017-06-22 Jesse Mapel - Added a warning to render about * cv::Mat copying and modification. @@ -60,11 +47,11 @@ class ImageTransform { virtual cv::Point2f inverse(const cv::Point2f &point) const; - static RectArea boundingBox(const cv::Mat &tform, + static RectArea boundingBox(const cv::Mat &tform, const RectArea ®ion, const cv::Size &bounds); - static RectArea transformedSize(const cv::Mat &tmat, - const cv::Size &imSize, + static RectArea transformedSize(const cv::Mat &tmat, + const cv::Size &imSize, cv::Mat &tmat_t); static std::vector corners(const cv::Size &imSize); @@ -77,7 +64,7 @@ class ImageTransform { QString m_name; }; -///!< Shared ImageTransformpointer that everyone can use +///!< Shared ImageTransformpointer that everyone can use typedef QSharedPointer SharedImageTransform; ///!< Define a ImageTransform list diff --git a/isis/src/control/apps/findfeatures/KAZEAlgorithm.cpp b/isis/src/control/apps/findfeatures/KAZEAlgorithm.cpp index cf03ab8e52..fc2d9393a7 100644 --- a/isis/src/control/apps/findfeatures/KAZEAlgorithm.cpp +++ b/isis/src/control/apps/findfeatures/KAZEAlgorithm.cpp @@ -1,24 +1,10 @@ -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "KAZEAlgorithm.h" #include @@ -29,9 +15,9 @@ namespace Isis { /** * Constructs the algorithm with default variables. */ - KAZEAlgorithm::KAZEAlgorithm() : + KAZEAlgorithm::KAZEAlgorithm() : Feature2DAlgorithm("KAZE", "Feature2D", - KAZEType::create()) { + KAZEType::create()) { setupTypeMap(); m_variables.merge( getAlgorithmVariables() ); } @@ -39,13 +25,13 @@ namespace Isis { /** * Constructs the algorithm with the input variables - * + * * @param cvars The variables and values the algorithm will use. * Variables that are not included will be set to their default. * @param config The config string used to construct cvars. */ KAZEAlgorithm::KAZEAlgorithm(const PvlFlatMap &cvars, const QString &config) : - Feature2DAlgorithm("KAZE", "Feature2D", + Feature2DAlgorithm("KAZE", "Feature2D", KAZEType::create(), cvars) { setupTypeMap(); setConfig(config); @@ -62,7 +48,7 @@ namespace Isis { /** * Returns a description of the algorithm. - * + * * @return @b QString A description of the algorithm. */ QString KAZEAlgorithm::description() const { @@ -86,7 +72,7 @@ namespace Isis { /** * Creates an instance of the algorithm. - * + * * @param cvars The variables and values the algorithm will use. * Variables that are not included will be set to their default. * @param config The config string used to construct cvars. @@ -97,38 +83,38 @@ namespace Isis { /** - * Returns true if the algorithm has a detector. - * - * @return @b true if the algorithm has a detector. + * Returns true if the algorithm has a detector. + * + * @return @b true if the algorithm has a detector. */ - bool KAZEAlgorithm::hasDetector() const { - return true; + bool KAZEAlgorithm::hasDetector() const { + return true; } /** - * Returns true if the algorithm has an extractor. - * - * @return @b true if the algorithm has an extractor. + * Returns true if the algorithm has an extractor. + * + * @return @b true if the algorithm has an extractor. */ - bool KAZEAlgorithm::hasExtractor() const { - return true; + bool KAZEAlgorithm::hasExtractor() const { + return true; } /** - * Returns true if the algorithm has a matcher. - * - * @return @b true if the algorithm has a matcher. + * Returns true if the algorithm has a matcher. + * + * @return @b true if the algorithm has a matcher. */ - bool KAZEAlgorithm::hasMatcher() const { - return false; + bool KAZEAlgorithm::hasMatcher() const { + return false; } /** * Returns the variables and their values used by the algorithm. - * + * * @return @b PvlFlatMap The variables and their values as keyword, value pairs. */ PvlFlatMap KAZEAlgorithm::getAlgorithmVariables( ) const { @@ -146,38 +132,38 @@ namespace Isis { /** * Set parameters as provided by the variables - * + * * @param variables Container of parameters to set - * + * * @return @b int Number of variables actually set - * + * * @throws IException::User "The input value is not valid for KAZE's [Type] variable" */ int KAZEAlgorithm::setAlgorithmVariables(const PvlFlatMap &variables) { KAZEPtr algorithm = m_algorithm.dynamicCast(); int numSet(0); - if ( variables.exists("Extended") ) { + if ( variables.exists("Extended") ) { algorithm->setExtended(toInt(variables.get("Extended"))); numSet++; } - if ( variables.exists("Threshold") ) { + if ( variables.exists("Threshold") ) { algorithm->setThreshold(toInt(variables.get("Threshold"))); numSet++; } - if ( variables.exists("NOctaveLayers") ) { + if ( variables.exists("NOctaveLayers") ) { algorithm->setNOctaveLayers(toInt(variables.get("NOctaveLayers"))); numSet++; } - if ( variables.exists("NOctaves") ) { + if ( variables.exists("NOctaves") ) { algorithm->setNOctaves(toInt(variables.get("NOctaves"))); numSet++; } - if ( variables.exists("Upright") ) { + if ( variables.exists("Upright") ) { algorithm->setUpright(toInt(variables.get("Upright"))); numSet++; } diff --git a/isis/src/control/apps/findfeatures/KAZEAlgorithm.h b/isis/src/control/apps/findfeatures/KAZEAlgorithm.h index 4dabc98ae9..f6b64a361d 100644 --- a/isis/src/control/apps/findfeatures/KAZEAlgorithm.h +++ b/isis/src/control/apps/findfeatures/KAZEAlgorithm.h @@ -1,27 +1,13 @@ #ifndef KAZEAlgorithm_h #define KAZEAlgorithm_h -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "FeatureAlgorithm.h" #include "opencv2/features2d.hpp" @@ -35,15 +21,15 @@ namespace Isis { /** - * @brief KAZE Feature matcher algorithm - * - * This class provides the OpenCV3 KAZE Feature2D algortithm. Only the - * necesary methods are implemented here. - * + * @brief KAZE Feature matcher algorithm + * + * This class provides the OpenCV3 KAZE Feature2D algortithm. Only the + * necesary methods are implemented here. + * * @author 2016-12-09 Kristin Berry - * - * @internal - * @history 2016-12-09 Kristin Berry - Original Version + * + * @internal + * @history 2016-12-09 Kristin Berry - Original Version */ class KAZEAlgorithm : public Feature2DAlgorithm { // See FeatureAlgorithm.h diff --git a/isis/src/control/apps/findfeatures/LATCHAlgorithm.cpp b/isis/src/control/apps/findfeatures/LATCHAlgorithm.cpp index 3c278568dc..10e0c62aff 100644 --- a/isis/src/control/apps/findfeatures/LATCHAlgorithm.cpp +++ b/isis/src/control/apps/findfeatures/LATCHAlgorithm.cpp @@ -1,24 +1,10 @@ -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include "opencv2/opencv.hpp" @@ -33,9 +19,9 @@ namespace Isis { /** * Constructs the algorithm with default variables. */ - LATCHAlgorithm::LATCHAlgorithm() : + LATCHAlgorithm::LATCHAlgorithm() : Feature2DAlgorithm("LATCH", "Feature2D", - LATCHType::create()) { + LATCHType::create()) { setupParameters(); } @@ -43,15 +29,15 @@ namespace Isis { /** * Constructs the algorithm with the input variables - * + * * @param cvars The variables and values the algorithm will use. * Variables that are not included will be set to their default. * @param config The config string used to construct cvars. */ - LATCHAlgorithm::LATCHAlgorithm(const PvlFlatMap &cvars, const QString &config) : - Feature2DAlgorithm("LATCH", "Feature2D", + LATCHAlgorithm::LATCHAlgorithm(const PvlFlatMap &cvars, const QString &config) : + Feature2DAlgorithm("LATCH", "Feature2D", LATCHType::create(), cvars) { - setConfig(config); + setConfig(config); PvlFlatMap variables = setupParameters(); variables.merge(cvars); const int bytes = toInt(variables.get("Bytes")); @@ -71,9 +57,9 @@ namespace Isis { /** - * Sets up the algorithm parameters with default values. - * - * @return PvlFlatMap Algorithm parameters and their default values. + * Sets up the algorithm parameters with default values. + * + * @return PvlFlatMap Algorithm parameters and their default values. */ PvlFlatMap LATCHAlgorithm::setupParameters() { PvlFlatMap variables; @@ -87,7 +73,7 @@ namespace Isis { /** * Returns a description of the algorithm. - * + * * @return @b QString A description of the algorithm. */ QString LATCHAlgorithm::description() const { @@ -100,7 +86,7 @@ namespace Isis { /** * Creates an instance of the algorithm. - * + * * @param cvars The variables and values the algorithm will use. * Variables that are not included will be set to their default. * @param config The config string used to construct cvars. @@ -111,38 +97,38 @@ namespace Isis { /** - * Returns true if the algorithm has a detector. - * - * @return @b true if the algorithm has a detector. + * Returns true if the algorithm has a detector. + * + * @return @b true if the algorithm has a detector. */ - bool LATCHAlgorithm::hasDetector() const { - return false; + bool LATCHAlgorithm::hasDetector() const { + return false; } /** - * Returns true if the algorithm has an extractor. - * - * @return @b true if the algorithm has an extractor. + * Returns true if the algorithm has an extractor. + * + * @return @b true if the algorithm has an extractor. */ - bool LATCHAlgorithm::hasExtractor() const { - return true; + bool LATCHAlgorithm::hasExtractor() const { + return true; } /** - * Returns true if the algorithm has a matcher. - * - * @return @b true if the algorithm has a matcher. + * Returns true if the algorithm has a matcher. + * + * @return @b true if the algorithm has a matcher. */ - bool LATCHAlgorithm::hasMatcher() const { - return false; + bool LATCHAlgorithm::hasMatcher() const { + return false; } /** * Returns the variables and their values used by the algorithm. - * + * * @return @b PvlFlatMap The variables and their values as keyword, value pairs. */ PvlFlatMap LATCHAlgorithm::getAlgorithmVariables( ) const { @@ -152,11 +138,11 @@ namespace Isis { /** * @brief Set parameters as provided by the variables - * + * * @param variables Container of parameters to set - * + * * @return @b int Always -1, variables cannot be set after initialization. - * + * * @throws IException::Programmer "LATCHAlgorithm does not have the ability * to set algorithm parameters." */ diff --git a/isis/src/control/apps/findfeatures/LATCHAlgorithm.h b/isis/src/control/apps/findfeatures/LATCHAlgorithm.h index 86602cea15..2c308b43ab 100644 --- a/isis/src/control/apps/findfeatures/LATCHAlgorithm.h +++ b/isis/src/control/apps/findfeatures/LATCHAlgorithm.h @@ -1,26 +1,13 @@ #ifndef LATCHAlgorithm_h #define LATCHAlgorithm_h -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "FeatureAlgorithm.h" #include "opencv2/xfeatures2d.hpp" @@ -30,15 +17,15 @@ namespace Isis { /** - * @brief LATCH Feature matcher algorithm - * - * This class provides the OpenCV3 LATCH Feature2D algortithm. Only the - * necesary methods are implemented here. - * + * @brief LATCH Feature matcher algorithm + * + * This class provides the OpenCV3 LATCH Feature2D algortithm. Only the + * necesary methods are implemented here. + * * @author 2016-12-12 Jesse Mapel - * - * @internal - * @history 2016-12-12 Jesse Mapel - Original Version + * + * @internal + * @history 2016-12-12 Jesse Mapel - Original Version */ class LATCHAlgorithm : public Feature2DAlgorithm { // See FeatureAlgorithm.h diff --git a/isis/src/control/apps/findfeatures/LUCIDAlgorithm.cpp b/isis/src/control/apps/findfeatures/LUCIDAlgorithm.cpp index 6ef700cd74..d8f5ce6046 100644 --- a/isis/src/control/apps/findfeatures/LUCIDAlgorithm.cpp +++ b/isis/src/control/apps/findfeatures/LUCIDAlgorithm.cpp @@ -1,24 +1,10 @@ -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include "opencv2/opencv.hpp" @@ -33,32 +19,32 @@ namespace Isis { /** * Constructs the algorithm with default variables. */ - LUCIDAlgorithm::LUCIDAlgorithm() : + LUCIDAlgorithm::LUCIDAlgorithm() : Feature2DAlgorithm( "LUCID", "Feature2D", - LUCIDType::create(1,1) ) { + LUCIDType::create(1,1) ) { setupParameters(); } /** * Constructs the algorithm with the input variables - * + * * @param cvars The variables and values the algorithm will use. * Variables that are not included will be set to their default. * @param config The config string used to construct cvars. */ LUCIDAlgorithm::LUCIDAlgorithm(const PvlFlatMap &cvars, const QString &config) : - Feature2DAlgorithm("LUCID", "Feature2D", + Feature2DAlgorithm("LUCID", "Feature2D", LUCIDType::create(1,1), cvars) { setConfig(config); PvlFlatMap variables = setupParameters(); variables.merge(cvars); const int lucidKernel = toInt(variables.get("LucidKernel")); const int blurKernel = toInt(variables.get("BlurKernel")); - + m_algorithm = LUCIDType::create(lucidKernel, blurKernel); - m_variables.merge(variables); + m_variables.merge(variables); } @@ -69,9 +55,9 @@ namespace Isis { /** - * Sets up the algorithm parameters with default values. - * - * @return PvlFlatMap Algorithm parameters and their default values. + * Sets up the algorithm parameters with default values. + * + * @return PvlFlatMap Algorithm parameters and their default values. */ PvlFlatMap LUCIDAlgorithm::setupParameters() { PvlFlatMap variables; @@ -84,7 +70,7 @@ namespace Isis { /** * Returns a description of the algorithm. - * + * * @return @b QString A description of the algorithm. */ QString LUCIDAlgorithm::description() const { @@ -97,7 +83,7 @@ namespace Isis { /** * Creates an instance of the algorithm. - * + * * @param cvars The variables and values the algorithm will use. * Variables that are not included will be set to their default. * @param config The config string used to construct cvars. @@ -108,38 +94,38 @@ namespace Isis { /** - * Returns true if the algorithm has a detector. - * - * @return @b true if the algorithm has a detector. + * Returns true if the algorithm has a detector. + * + * @return @b true if the algorithm has a detector. */ - bool LUCIDAlgorithm::hasDetector() const { - return false; + bool LUCIDAlgorithm::hasDetector() const { + return false; } /** - * Returns true if the algorithm has an extractor. - * - * @return @b true if the algorithm has an extractor. + * Returns true if the algorithm has an extractor. + * + * @return @b true if the algorithm has an extractor. */ - bool LUCIDAlgorithm::hasExtractor() const { - return true; + bool LUCIDAlgorithm::hasExtractor() const { + return true; } /** - * Returns true if the algorithm has a matcher. - * - * @return @b true if the algorithm has a matcher. + * Returns true if the algorithm has a matcher. + * + * @return @b true if the algorithm has a matcher. */ - bool LUCIDAlgorithm::hasMatcher() const { - return false; + bool LUCIDAlgorithm::hasMatcher() const { + return false; } /** * Returns the variables and their values used by the algorithm. - * + * * @return @b PvlFlatMap The variables and their values as keyword, value pairs. */ PvlFlatMap LUCIDAlgorithm::getAlgorithmVariables( ) const { @@ -149,11 +135,11 @@ namespace Isis { /** * @brief Set parameters as provided by the variables - * + * * @param variables Container of parameters to set - * + * * @return @b int Always -1, variables cannot be set after initialization. - * + * * @throws IException::Programmer "LUCIDAlgorithm does not have the ability * to set algorithm parameters." */ diff --git a/isis/src/control/apps/findfeatures/LUCIDAlgorithm.h b/isis/src/control/apps/findfeatures/LUCIDAlgorithm.h index 6a8afc876a..09d6fd33de 100644 --- a/isis/src/control/apps/findfeatures/LUCIDAlgorithm.h +++ b/isis/src/control/apps/findfeatures/LUCIDAlgorithm.h @@ -1,26 +1,12 @@ #ifndef LUCIDAlgorithm_h #define LUCIDAlgorithm_h -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "FeatureAlgorithm.h" #include @@ -28,15 +14,15 @@ namespace Isis { /** - * @brief LUCID Feature matcher algorithm - * - * This class provides the OpenCV3 LUCID Feature2D algortithm. Only the - * necesary methods are implemented here. - * + * @brief LUCID Feature matcher algorithm + * + * This class provides the OpenCV3 LUCID Feature2D algortithm. Only the + * necesary methods are implemented here. + * * @author 2016-12-12 Jesse Mapel - * - * @internal - * @history 2016-12-12 Jesse Mapel - Original Version + * + * @internal + * @history 2016-12-12 Jesse Mapel - Original Version */ class LUCIDAlgorithm : public Feature2DAlgorithm { // See FeatureAlgorithm.h diff --git a/isis/src/control/apps/findfeatures/MSDAlgorithm.cpp b/isis/src/control/apps/findfeatures/MSDAlgorithm.cpp index af037a1c3c..2e6949b95d 100644 --- a/isis/src/control/apps/findfeatures/MSDAlgorithm.cpp +++ b/isis/src/control/apps/findfeatures/MSDAlgorithm.cpp @@ -1,24 +1,10 @@ -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include "opencv2/opencv.hpp" @@ -33,9 +19,9 @@ namespace Isis { /** * Constructs the algorithm with default variables. */ - MSDAlgorithm::MSDAlgorithm() : + MSDAlgorithm::MSDAlgorithm() : Feature2DAlgorithm("MSD", "Feature2D", - MSDType::create()) { + MSDType::create()) { setupParameters(); } @@ -43,13 +29,13 @@ namespace Isis { /** * Constructs the algorithm with the input variables - * + * * @param cvars The variables and values the algorithm will use. * Variables that are not included will be set to their default. * @param config The config string used to construct cvars. */ MSDAlgorithm::MSDAlgorithm(const PvlFlatMap &cvars, const QString &config) : - Feature2DAlgorithm("MSD", "Feature2D", + Feature2DAlgorithm("MSD", "Feature2D", MSDType::create(), cvars) { setConfig(config); PvlFlatMap variables = setupParameters(); @@ -64,9 +50,9 @@ namespace Isis { const int nScales = toInt(variables.get("NScales")); const bool computeOrientation = toBool(variables.get("ComputeOrientation")); - m_algorithm = MSDType::create(patchRadius, searchAreaRadius, nmsRadius, nmsScaleRadius, + m_algorithm = MSDType::create(patchRadius, searchAreaRadius, nmsRadius, nmsScaleRadius, thSaliency, kNN, scaleFactor, nScales, computeOrientation); - + m_variables.merge(variables); } @@ -78,9 +64,9 @@ namespace Isis { /** - * Sets up the algorithm parameters with default values. - * - * @return PvlFlatMap Algorithm parameters and their default values. + * Sets up the algorithm parameters with default values. + * + * @return PvlFlatMap Algorithm parameters and their default values. */ PvlFlatMap MSDAlgorithm::setupParameters() { PvlFlatMap variables; @@ -100,7 +86,7 @@ namespace Isis { /** * Returns a description of the algorithm. - * + * * @return @b QString A description of the algorithm. */ QString MSDAlgorithm::description() const { @@ -113,7 +99,7 @@ namespace Isis { /** * Creates an instance of the algorithm. - * + * * @param cvars The variables and values the algorithm will use. * Variables that are not included will be set to their default. * @param config The config string used to construct cvars. @@ -125,38 +111,38 @@ namespace Isis { /** - * Returns true if the algorithm has a detector. - * - * @return @b true if the algorithm has a detector. + * Returns true if the algorithm has a detector. + * + * @return @b true if the algorithm has a detector. */ - bool MSDAlgorithm::hasDetector() const { - return true; + bool MSDAlgorithm::hasDetector() const { + return true; } /** - * Returns true if the algorithm has an extractor. - * - * @return @b true if the algorithm has an extractor. + * Returns true if the algorithm has an extractor. + * + * @return @b true if the algorithm has an extractor. */ - bool MSDAlgorithm::hasExtractor() const { - return false; + bool MSDAlgorithm::hasExtractor() const { + return false; } /** - * Returns true if the algorithm has a matcher. - * - * @return @b true if the algorithm has a matcher. + * Returns true if the algorithm has a matcher. + * + * @return @b true if the algorithm has a matcher. */ - bool MSDAlgorithm::hasMatcher() const { - return false; + bool MSDAlgorithm::hasMatcher() const { + return false; } /** * Returns the variables and their values used by the algorithm. - * + * * @return @b PvlFlatMap The variables and their values as keyword, value pairs. */ PvlFlatMap MSDAlgorithm::getAlgorithmVariables( ) const { @@ -166,11 +152,11 @@ namespace Isis { /** * @brief Set parameters as provided by the variables - * + * * @param variables Container of parameters to set - * + * * @return @b int Always -1, variables cannot be set after initialization. - * + * * @throws IException::Programmer "MSDAlgorithm does not have the ability * to set algorithm parameters." */ diff --git a/isis/src/control/apps/findfeatures/MSDAlgorithm.h b/isis/src/control/apps/findfeatures/MSDAlgorithm.h index 7cf9fc794e..81c03fbaff 100644 --- a/isis/src/control/apps/findfeatures/MSDAlgorithm.h +++ b/isis/src/control/apps/findfeatures/MSDAlgorithm.h @@ -1,26 +1,13 @@ #ifndef MSDAlgorithm_h #define MSDAlgorithm_h -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "FeatureAlgorithm.h" #include "opencv2/xfeatures2d.hpp" @@ -30,15 +17,15 @@ namespace Isis { /** - * @brief MSD Feature matcher algorithm - * - * This class provides the OpenCV3 MSDDetector Feature2D algortithm. Only the - * necesary methods are implemented here. - * + * @brief MSD Feature matcher algorithm + * + * This class provides the OpenCV3 MSDDetector Feature2D algortithm. Only the + * necesary methods are implemented here. + * * @author 2016-12-12 Jesse Mapel - * - * @internal - * @history 2016-12-12 Jesse Mapel - Original Version + * + * @internal + * @history 2016-12-12 Jesse Mapel - Original Version */ class MSDAlgorithm : public Feature2DAlgorithm { // See FeatureAlgorithm.h @@ -46,7 +33,7 @@ class MSDAlgorithm : public Feature2DAlgorithm { // See FeatureAlgorithm.h public: MSDAlgorithm(); MSDAlgorithm( const PvlFlatMap &cvars, const QString &config = QString() ); - + virtual ~MSDAlgorithm(); QString description() const; @@ -59,7 +46,7 @@ class MSDAlgorithm : public Feature2DAlgorithm { // See FeatureAlgorithm.h virtual bool hasExtractor() const; virtual bool hasMatcher() const; - protected: + protected: virtual PvlFlatMap setupParameters(); virtual PvlFlatMap getAlgorithmVariables() const; virtual int setAlgorithmVariables(const PvlFlatMap &variables); diff --git a/isis/src/control/apps/findfeatures/MSERAlgorithm.cpp b/isis/src/control/apps/findfeatures/MSERAlgorithm.cpp index db0ee82e42..c098900b0f 100644 --- a/isis/src/control/apps/findfeatures/MSERAlgorithm.cpp +++ b/isis/src/control/apps/findfeatures/MSERAlgorithm.cpp @@ -1,24 +1,10 @@ -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include "opencv2/opencv.hpp" @@ -33,22 +19,22 @@ namespace Isis { /** * Constructs the algorithm with default variables. */ - MSERAlgorithm::MSERAlgorithm() : + MSERAlgorithm::MSERAlgorithm() : Feature2DAlgorithm("MSER", "Feature2D", - MSERType::create()) { + MSERType::create()) { setupParameters(); } /** * Constructs the algorithm with the input variables - * + * * @param cvars The variables and values the algorithm will use. * Variables that are not included will be set to their default. * @param config The config string used to construct cvars. */ MSERAlgorithm::MSERAlgorithm(const PvlFlatMap &cvars, const QString &config) : - Feature2DAlgorithm("MSER", "Feature2D", + Feature2DAlgorithm("MSER", "Feature2D", MSERType::create(), cvars) { setConfig(config); PvlFlatMap variables = setupParameters(); @@ -77,9 +63,9 @@ namespace Isis { /** - * Sets up the algorithm parameters with default values. - * - * @return PvlFlatMap Algorithm parameters and their default values. + * Sets up the algorithm parameters with default values. + * + * @return PvlFlatMap Algorithm parameters and their default values. */ PvlFlatMap MSERAlgorithm::setupParameters() { PvlFlatMap variables; @@ -88,7 +74,7 @@ namespace Isis { variables.add("MaxArea", "14400"); variables.add("MaxVariation", "0.25"); variables.add("MinDiversity", "0.2"); - variables.add("MaxEvolution", "200"); + variables.add("MaxEvolution", "200"); variables.add("AreaThreshold", "1.01"); variables.add("MinMargin", "0.003"); variables.add("EdgeBlurSize", "5"); @@ -99,7 +85,7 @@ namespace Isis { /** * Returns a description of the algorithm. - * + * * @return @b QString A description of the algorithm. */ QString MSERAlgorithm::description() const { @@ -112,7 +98,7 @@ namespace Isis { /** * Creates an instance of the algorithm. - * + * * @param cvars The variables and values the algorithm will use. * Variables that are not included will be set to their default. * @param config The config string used to construct cvars. @@ -123,9 +109,9 @@ namespace Isis { /** - * Returns true if the algorithm has a detector. - * - * @return @b true if the algorithm has a detector. + * Returns true if the algorithm has a detector. + * + * @return @b true if the algorithm has a detector. */ bool MSERAlgorithm::hasDetector() const { return true; @@ -133,9 +119,9 @@ namespace Isis { /** - * Returns true if the algorithm has an extractor. - * - * @return @b true if the algorithm has an extractor. + * Returns true if the algorithm has an extractor. + * + * @return @b true if the algorithm has an extractor. */ bool MSERAlgorithm::hasExtractor() const { return false; @@ -143,9 +129,9 @@ namespace Isis { /** - * Returns true if the algorithm has a matcher. - * - * @return @b true if the algorithm has a matcher. + * Returns true if the algorithm has a matcher. + * + * @return @b true if the algorithm has a matcher. */ bool MSERAlgorithm::hasMatcher() const { return false; @@ -154,7 +140,7 @@ namespace Isis { /** * Returns the variables and their values used by the algorithm. - * + * * @return @b PvlFlatMap The variables and their values as keyword, value pairs. */ PvlFlatMap MSERAlgorithm::getAlgorithmVariables( ) const { @@ -164,11 +150,11 @@ namespace Isis { /** * @brief Set parameters as provided by the variables - * + * * @param variables Container of parameters to set - * + * * @return @b int Always -1, variables cannot be set after initialization. - * + * * @throws IException::Programmer "BriefDescriptorAlgorithm does not have the ability * to set algorithm parameters." */ diff --git a/isis/src/control/apps/findfeatures/MSERAlgorithm.h b/isis/src/control/apps/findfeatures/MSERAlgorithm.h index 4f9ba3aef1..3621913c02 100644 --- a/isis/src/control/apps/findfeatures/MSERAlgorithm.h +++ b/isis/src/control/apps/findfeatures/MSERAlgorithm.h @@ -1,26 +1,14 @@ #ifndef MSERAlgorithm_h #define MSERAlgorithm_h -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "opencv2/features2d.hpp" @@ -32,15 +20,15 @@ namespace Isis { /** - * @brief MSER Feature matcher algorithm - * - * This class provides the OpenCV3 MSER Feature2D algortithm. Only the - * necesary methods are implemented here. - * + * @brief MSER Feature matcher algorithm + * + * This class provides the OpenCV3 MSER Feature2D algortithm. Only the + * necesary methods are implemented here. + * * @author 2016-12-08 Jesse Mapel - * - * @internal - * @history 2016-12-08 Jesse Mapel - Original Version + * + * @internal + * @history 2016-12-08 Jesse Mapel - Original Version */ class MSERAlgorithm : public Feature2DAlgorithm { // See FeatureAlgorithm.h diff --git a/isis/src/control/apps/findfeatures/MSERExtractor.cpp b/isis/src/control/apps/findfeatures/MSERExtractor.cpp index 0b2a3bcfb3..0df2ea05b9 100644 --- a/isis/src/control/apps/findfeatures/MSERExtractor.cpp +++ b/isis/src/control/apps/findfeatures/MSERExtractor.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "MSERExtractor.h" #include "IException.h" @@ -5,132 +13,132 @@ namespace Isis { - /** - * Always throws an exception. - * + /** + * Always throws an exception. + * * @param image input image * @param msers resulting list of point sets * @param bboxes bounding boxes - * - * @throws IException::Programmer "ISIS does not support this method for the OpenCV MSER - * algorithm." + * + * @throws IException::Programmer "ISIS does not support this method for the OpenCV MSER + * algorithm." */ void MSERExtractor::detectRegions (cv::InputArray image, std::vector< std::vector< cv::Point > > &msers, std::vector< cv::Rect > &bboxes) { QString mess = "ISIS does not support this method for the OpenCV MSER algorithm."; - throw IException(IException::Programmer, mess, _FILEINFO_); + throw IException(IException::Programmer, mess, _FILEINFO_); } /** - * Always throws an exception. - * + * Always throws an exception. + * * @return int (-1) - * - * @throws IException::Programmer "ISIS does not support this method for the OpenCV MSER - * algorithm." + * + * @throws IException::Programmer "ISIS does not support this method for the OpenCV MSER + * algorithm." */ int MSERExtractor::getDelta () const { QString mess = "ISIS does not support this method for the OpenCV MSER algorithm."; - throw IException(IException::Programmer, mess, _FILEINFO_); + throw IException(IException::Programmer, mess, _FILEINFO_); } /** - * Always throws an exception. - * + * Always throws an exception. + * * @return int (-1) - * - * @throws IException::Programmer "ISIS does not support this method for the OpenCV MSER - * algorithm." + * + * @throws IException::Programmer "ISIS does not support this method for the OpenCV MSER + * algorithm." */ int MSERExtractor::getMaxArea () const { QString mess = "ISIS does not support this method for the OpenCV MSER algorithm."; - throw IException(IException::Programmer, mess, _FILEINFO_); + throw IException(IException::Programmer, mess, _FILEINFO_); } /** - * Always throws an exception. - * + * Always throws an exception. + * * @return int (-1) - * - * @throws IException::Programmer "ISIS does not support this method for the OpenCV MSER - * algorithm." + * + * @throws IException::Programmer "ISIS does not support this method for the OpenCV MSER + * algorithm." */ int MSERExtractor::getMinArea () const { QString mess = "ISIS does not support this method for the OpenCV MSER algorithm."; - throw IException(IException::Programmer, mess, _FILEINFO_); + throw IException(IException::Programmer, mess, _FILEINFO_); } /** - * Always throws an exception. - * + * Always throws an exception. + * * @return bool false - * - * @throws IException::Programmer "ISIS does not support this method for the OpenCV MSER - * algorithm." + * + * @throws IException::Programmer "ISIS does not support this method for the OpenCV MSER + * algorithm." */ bool MSERExtractor::getPass2Only () const { QString mess = "ISIS does not support this method for the OpenCV MSER algorithm."; - throw IException(IException::Programmer, mess, _FILEINFO_); + throw IException(IException::Programmer, mess, _FILEINFO_); } /** - * Always throws an exception. - * + * Always throws an exception. + * * @param delta input delta to set - * + * * @throws IException::Programmer "ISIS does not support this method for the OpenCV MSER * algorithm." */ void MSERExtractor::setDelta (int delta) { QString mess = "ISIS does not support this method for the OpenCV MSER algorithm."; - throw IException(IException::Programmer, mess, _FILEINFO_); + throw IException(IException::Programmer, mess, _FILEINFO_); } /** - * Always throws an exception. - * + * Always throws an exception. + * * @param maxArea input maximum area - * - * @throws IException::Programmer "ISIS does not support this method for the OpenCV MSER - * algorithm." + * + * @throws IException::Programmer "ISIS does not support this method for the OpenCV MSER + * algorithm." */ void MSERExtractor::setMaxArea (int maxArea) { QString mess = "ISIS does not support this method for the OpenCV MSER algorithm."; - throw IException(IException::Programmer, mess, _FILEINFO_); + throw IException(IException::Programmer, mess, _FILEINFO_); } /** - * Always throws an exception. - * + * Always throws an exception. + * * @param minArea input minimum area - * - * @throws IException::Programmer "ISIS does not support this method for the OpenCV MSER - * algorithm." + * + * @throws IException::Programmer "ISIS does not support this method for the OpenCV MSER + * algorithm." */ void MSERExtractor::setMinArea (int minArea) { QString mess = "ISIS does not support this method for the OpenCV MSER algorithm."; - throw IException(IException::Programmer, mess, _FILEINFO_); + throw IException(IException::Programmer, mess, _FILEINFO_); } /** - * Always throws an exception. - * - * @param f input value - * - * @throws IException::Programmer "ISIS does not support this method for the OpenCV MSER - * algorithm." + * Always throws an exception. + * + * @param f input value + * + * @throws IException::Programmer "ISIS does not support this method for the OpenCV MSER + * algorithm." */ void MSERExtractor::setPass2Only (bool f) { QString mess = "ISIS does not support this method for the OpenCV MSER algorithm."; - throw IException(IException::Programmer, mess, _FILEINFO_); + throw IException(IException::Programmer, mess, _FILEINFO_); } }; diff --git a/isis/src/control/apps/findfeatures/MSERExtractor.h b/isis/src/control/apps/findfeatures/MSERExtractor.h index d131100579..9e3d44ac75 100644 --- a/isis/src/control/apps/findfeatures/MSERExtractor.h +++ b/isis/src/control/apps/findfeatures/MSERExtractor.h @@ -1,22 +1,30 @@ #ifndef MSERExtractor_h #define MSERExtractor_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "opencv2/xfeatures2d.hpp" #include "opencv2/opencv.hpp" namespace Isis { /** - * Wrap of OpenCV3 MSER algorithm to implement pure virtual functions. - * - * @author 2016-12-20 Jesse Mapel - * - * @internal + * Wrap of OpenCV3 MSER algorithm to implement pure virtual functions. + * + * @author 2016-12-20 Jesse Mapel + * + * @internal * @history 2016-12-20 Jesse Mapel - Original Version * @history 2016-12-27 Kristin Berry - Added documentation */ -class MSERExtractor : public cv::MSER { +class MSERExtractor : public cv::MSER { public: virtual void detectRegions (cv::InputArray image, diff --git a/isis/src/control/apps/findfeatures/MatchImage.h b/isis/src/control/apps/findfeatures/MatchImage.h index 63d28983c7..bb74504710 100644 --- a/isis/src/control/apps/findfeatures/MatchImage.h +++ b/isis/src/control/apps/findfeatures/MatchImage.h @@ -1,26 +1,14 @@ #ifndef MatchImage_h #define MatchImage_h -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -38,19 +26,19 @@ namespace Isis { /** * @brief Container for match image data - * - * This class provides storage and computational conversion from original - * source image to transformed image. The transformed image takes the original - * source image and applies any image transformations to render the image that - * is to used in the matcher. - * - * Its internal data storage is explicitly shared so the object can be copied - * freely. When a new image is set, the match data is cleared including the + * + * This class provides storage and computational conversion from original + * source image to transformed image. The transformed image takes the original + * source image and applies any image transformations to render the image that + * is to used in the matcher. + * + * Its internal data storage is explicitly shared so the object can be copied + * freely. When a new image is set, the match data is cleared including the * transforms for clean match rendering. - * - * @author 2015-10-03 Kris Becker - * @internal - * @history 2015-10-03 Kris Becker - Original Version + * + * @author 2015-10-03 Kris Becker + * @internal + * @history 2015-10-03 Kris Becker - Original Version */ class MatchImage { @@ -62,8 +50,8 @@ class MatchImage { m_data->m_source = source; } - MatchImage(const ImageSource &source, - const Keypoints &keypoints, + MatchImage(const ImageSource &source, + const Keypoints &keypoints, const Descriptors &descriptor, const double &ptime = 0.0) { m_data = new ImageData(); @@ -172,23 +160,23 @@ class MatchImage { } private: - /** + /** * Shared Image data pointer - * - * @author 2015-10-03 Kris Becker - * @internal - * @history 2015-10-03 Kris Becker - Original Version + * + * @author 2015-10-03 Kris Becker + * @internal + * @history 2015-10-03 Kris Becker - Original Version */ class ImageData : public QSharedData { public: ImageData() : m_source(), m_transforms(), - m_keypoints(), m_descriptors(), + m_keypoints(), m_descriptors(), m_duration(0) { } ImageData(const ImageData &other) : QSharedData(other), - m_source(other.m_source), - m_transforms(other.m_transforms), - m_keypoints(), - m_descriptors(), + m_source(other.m_source), + m_transforms(other.m_transforms), + m_keypoints(), + m_descriptors(), m_duration(0) { } ~ImageData() { } @@ -197,7 +185,7 @@ class MatchImage { } // Data.... - ImageSource m_source; + ImageSource m_source; Transformer m_transforms; Keypoints m_keypoints; Descriptors m_descriptors; diff --git a/isis/src/control/apps/findfeatures/MatchMaker.cpp b/isis/src/control/apps/findfeatures/MatchMaker.cpp index cb2aeed4af..d27e3f6626 100644 --- a/isis/src/control/apps/findfeatures/MatchMaker.cpp +++ b/isis/src/control/apps/findfeatures/MatchMaker.cpp @@ -1,27 +1,10 @@ -/** - * @file - * $Revision$ - * $Date$ - * $Id$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include diff --git a/isis/src/control/apps/findfeatures/MatchMaker.h b/isis/src/control/apps/findfeatures/MatchMaker.h index 541481c3f2..643befdad7 100644 --- a/isis/src/control/apps/findfeatures/MatchMaker.h +++ b/isis/src/control/apps/findfeatures/MatchMaker.h @@ -1,26 +1,13 @@ #ifndef MatchMaker_h #define MatchMaker_h -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include @@ -45,12 +32,12 @@ class ControlMeasure; /** * @brief Container for a feature match pair/set of data sources - * - * - * @author 2015-08-18 Kris Becker - * @internal - * @history 2015-08-18 Kris Becker - Original Version - * @history 2015-09-29 Kris Becker - Had line/sample transposed when computing + * + * + * @author 2015-08-18 Kris Becker + * @internal + * @history 2015-08-18 Kris Becker - Original Version + * @history 2015-09-29 Kris Becker - Had line/sample transposed when computing * apriori lat/lon */ @@ -58,7 +45,7 @@ class MatchMaker : public QLogger { public: enum GeometrySourceFlag { None, Query, Train }; MatchMaker(); - MatchMaker(const QString &name, + MatchMaker(const QString &name, const PvlFlatMap ¶meters = PvlFlatMap(), const QLogger &logger = QLogger()); @@ -115,24 +102,24 @@ class MatchMaker : public QLogger { MatchImageQList m_trainers; GeometrySourceFlag m_geomFlag; - double getParameter(const QString &name, const PvlFlatMap ¶meters, + double getParameter(const QString &name, const PvlFlatMap ¶meters, const double &defaultParm) const; - int addMeasure(ControlPoint **cpt, const MatchPair &mpair, - const cv::DMatch &point, const MatcherSolution &solution) - const; + int addMeasure(ControlPoint **cpt, const MatchPair &mpair, + const cv::DMatch &point, const MatcherSolution &solution) + const; - ControlMeasure *makeMeasure(const MatchImage &image, - const int &keyindex, + ControlMeasure *makeMeasure(const MatchImage &image, + const int &keyindex, const QString &name = "ControlMeasure") const; bool setAprioriLatLon(ControlPoint &point, const ControlMeasure &measure, const MatchImage &image) const; - double goodnessOfFit(const cv::KeyPoint &query, const cv::KeyPoint &train) + double goodnessOfFit(const cv::KeyPoint &query, const cv::KeyPoint &train) const; }; -///!< Shared FeatureAlgorithm pointer that everyone can use +///!< Shared FeatureAlgorithm pointer that everyone can use typedef QSharedPointer SharedMatchMaker; typedef QList MatchMakerQList; diff --git a/isis/src/control/apps/findfeatures/MatchPair.h b/isis/src/control/apps/findfeatures/MatchPair.h index 5bfccf53d8..eac16539e7 100644 --- a/isis/src/control/apps/findfeatures/MatchPair.h +++ b/isis/src/control/apps/findfeatures/MatchPair.h @@ -1,26 +1,13 @@ #ifndef MatchPair_h #define MatchPair_h -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include @@ -34,21 +21,21 @@ namespace Isis { /** * @brief Container for a feature match pair of data sources - * - * - * @author 2015-08-10 Kris Becker - * @internal - * @history 2015-08-10 Kris Becker - Original Version + * + * + * @author 2015-08-10 Kris Becker + * @internal + * @history 2015-08-10 Kris Becker - Original Version */ class MatchPair { public: MatchPair(const MatchImage &query, - const MatchImage &train, - const Matches &matches, + const MatchImage &train, + const Matches &matches, const cv::Mat &homography, const cv::Mat &fundamental, - const double &matchTime) { + const double &matchTime) { m_data = new MatchData(); m_data->m_query = query; m_data->m_train = train; @@ -73,7 +60,7 @@ class MatchPair { QString target() const { QString v_target = m_data->m_query.target(); if ( v_target.isEmpty() ) { v_target = m_data->m_train.target(); } - return ( v_target ); + return ( v_target ); } inline const MatchImage &query() const { @@ -148,20 +135,20 @@ class MatchPair { inline int correspondence(double *p_repeatability = 0) const { float v_repeatability; int v_correspondence; - evaluateFeatureDetector(m_data->m_query.image(), - m_data->m_train.image(), + evaluateFeatureDetector(m_data->m_query.image(), + m_data->m_train.image(), m_data->m_homography, - &m_data->m_query.keypoints(), - &m_data->m_train.keypoints(), + &m_data->m_query.keypoints(), + &m_data->m_train.keypoints(), v_repeatability, v_correspondence); if ( p_repeatability != 0 ) { *p_repeatability = v_repeatability; } - return (v_correspondence); + return (v_correspondence); } inline double repeatability() const { double v_repeatability; (void) correspondence(&v_repeatability); - // return ( (double) correspondence() / (double) m_data->m_query.size() ); + // return ( (double) correspondence() / (double) m_data->m_query.size() ); return ( v_repeatability ); } @@ -178,11 +165,11 @@ class MatchPair { } inline double duration() const { - return ( query().time() + train().time() + this->time() ); + return ( query().time() + train().time() + this->time() ); } inline double speed() const { - return ( duration() / (double) (query().size() + train().size()) ); + return ( duration() / (double) (query().size() + train().size()) ); } inline double distance() const { @@ -245,31 +232,31 @@ class MatchPair { } private: - /** + /** * Shared Image data pointer - * - * @author 2015-08-10 Kris Becker - * @internal - * @history 2015-08-10 Kris Becker - Original Version + * + * @author 2015-08-10 Kris Becker + * @internal + * @history 2015-08-10 Kris Becker - Original Version */ class MatchData : public QSharedData { public: - MatchData() : QSharedData(), m_query(), m_train(), + MatchData() : QSharedData(), m_query(), m_train(), m_epipolar_matches(), m_homography_matches(), m_matches(), m_duration(0), m_homography(cv::Mat::eye(3,3,CV_64F)), m_homography_inverse(cv::Mat::eye(3,3,CV_64F)), m_epipolar(cv::Mat::eye(3,3,CV_64F)), m_errors() { } MatchData(const MatchData &other) : QSharedData(other), - m_query(other.m_query), - m_train(other.m_train), - m_epipolar_matches(), + m_query(other.m_query), + m_train(other.m_train), + m_epipolar_matches(), m_homography_matches(), m_matches(), - m_duration(0), + m_duration(0), m_homography(cv::Mat::eye(3,3,CV_64F)), - m_homography_inverse(cv::Mat::eye(3,3,CV_64F)), - m_epipolar(cv::Mat::eye(3,3,CV_64F)), - m_errors() { } + m_homography_inverse(cv::Mat::eye(3,3,CV_64F)), + m_epipolar(cv::Mat::eye(3,3,CV_64F)), + m_errors() { } ~MatchData() { } inline void addTime(const double &delta) { diff --git a/isis/src/control/apps/findfeatures/MatcherAlgorithms.cpp b/isis/src/control/apps/findfeatures/MatcherAlgorithms.cpp index 0e3609b01b..f7a3e981b7 100644 --- a/isis/src/control/apps/findfeatures/MatcherAlgorithms.cpp +++ b/isis/src/control/apps/findfeatures/MatcherAlgorithms.cpp @@ -1,24 +1,11 @@ -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include @@ -32,10 +19,10 @@ namespace Isis { MatcherAlgorithms::MatcherAlgorithms() { } - MatcherAlgorithms::MatcherAlgorithms(FeatureAlgorithmPtr &detector, + MatcherAlgorithms::MatcherAlgorithms(FeatureAlgorithmPtr &detector, FeatureAlgorithmPtr &extractor, MatcherAlgorithmPtr &matcher, - PvlFlatMap parameters) : + PvlFlatMap parameters) : m_detector(detector), m_extractor(extractor), m_matcher(matcher), @@ -53,18 +40,18 @@ namespace Isis { /** - * @brief This method throughly vets the matcher algorithms for validity - * - * This method insures the contents of this container is valid for its intend - * operations. This includes ensuring that the detector, extractor and matcher - * algorithms have all been allocated. If this is valid - * + * @brief This method throughly vets the matcher algorithms for validity + * + * This method insures the contents of this container is valid for its intend + * operations. This includes ensuring that the detector, extractor and matcher + * algorithms have all been allocated. If this is valid + * * @author 2016-12-23 Kris Becker - * + * * @param throwOnErrors Throw a cummulative exception reporting errors if true - * - * @return bool Returns true if no errors are found. If errors are found and - * the throwOnErrors parameters is false, it will return false. + * + * @return bool Returns true if no errors are found. If errors are found and + * the throwOnErrors parameters is false, it will return false. */ bool MatcherAlgorithms::validate(const bool &throwOnErrors) const { // Accumulate errors for a comprehensive list of issues @@ -72,16 +59,16 @@ namespace Isis { int nerrors(0); // Check the detector algorithm to ensure all are allocated properly - // and it contains the require functionality + // and it contains the require functionality if ( m_detector.empty() ){ - ie.append(IException(IException::Programmer, + ie.append(IException(IException::Programmer, "Required detector algorithm has not been allocated", _FILEINFO_)); nerrors++; } else { if ( !m_detector->isValid() ) { - ie.append(IException(IException::Programmer, + ie.append(IException(IException::Programmer, "Required detector algorithm is not present/valid", _FILEINFO_)); nerrors++; @@ -96,16 +83,16 @@ namespace Isis { } // Check the extractor algorithm to ensure all are allocated properly and it - // contains the require functionality + // contains the require functionality if ( m_extractor.empty() ) { - ie.append(IException(IException::Programmer, + ie.append(IException(IException::Programmer, "Required extractor algorithm has not been allocated", _FILEINFO_)); nerrors++; } else { if ( !m_extractor->isValid() ) { - ie.append(IException(IException::Programmer, + ie.append(IException(IException::Programmer, "Required extractor algorithm is not present", _FILEINFO_)); nerrors++; @@ -119,17 +106,17 @@ namespace Isis { } } - // Check the matcher algorithm to ensure all are allocated properly and it - // contains the require functionality + // Check the matcher algorithm to ensure all are allocated properly and it + // contains the require functionality if ( m_matcher.empty() ) { - ie.append(IException(IException::Programmer, + ie.append(IException(IException::Programmer, "Required matcher algorithm has not been allocated", _FILEINFO_)); nerrors++; } else { if ( !m_matcher->isValid() ) { - ie.append(IException(IException::Programmer, + ie.append(IException(IException::Programmer, "Required matcher algorithm is not present", _FILEINFO_)); nerrors++; @@ -145,7 +132,7 @@ namespace Isis { // Shall we throw an exception to report the issues? if ( (0 < nerrors) && (true == throwOnErrors)) { - QString mess = "There were " + QString::number(nerrors) + + QString mess = "There were " + QString::number(nerrors) + " errors found in this matcher algorithm set"; ie.append(IException(IException::Programmer, mess, _FILEINFO_)); throw ie; diff --git a/isis/src/control/apps/findfeatures/MatcherAlgorithms.h b/isis/src/control/apps/findfeatures/MatcherAlgorithms.h index 961716ea3a..ddbbcd8337 100644 --- a/isis/src/control/apps/findfeatures/MatcherAlgorithms.h +++ b/isis/src/control/apps/findfeatures/MatcherAlgorithms.h @@ -1,26 +1,14 @@ #ifndef MatcherAlgorithms_h #define MatcherAlgorithms_h -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -36,14 +24,14 @@ namespace Isis { /** * @brief Generic container for ISIS/OpenCV-type feature matcher algorithms - * - * This class provides a container for the three elements of feature-based - * matching: detector, extractor and matcher. An addition container of robust - * matcher outlier detection is added as a "paramters" specification. - * + * + * This class provides a container for the three elements of feature-based + * matching: detector, extractor and matcher. An addition container of robust + * matcher outlier detection is added as a "paramters" specification. + * * @author 2016-11-29 Kris Becker - * - * @internal + * + * @internal * @history 2016-11-29 Kris Becker - Original Version */ @@ -51,7 +39,7 @@ class MatcherAlgorithms { public: MatcherAlgorithms(); - MatcherAlgorithms(FeatureAlgorithmPtr &detector, + MatcherAlgorithms(FeatureAlgorithmPtr &detector, FeatureAlgorithmPtr &extractor, MatcherAlgorithmPtr &matcher, PvlFlatMap parameters = PvlFlatMap()); diff --git a/isis/src/control/apps/findfeatures/MatcherSolution.h b/isis/src/control/apps/findfeatures/MatcherSolution.h index 03e497addb..3b0bcacd52 100644 --- a/isis/src/control/apps/findfeatures/MatcherSolution.h +++ b/isis/src/control/apps/findfeatures/MatcherSolution.h @@ -1,26 +1,14 @@ #ifndef MatcherSolution_h #define MatcherSolution_h -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -46,11 +34,11 @@ typedef QList MatcherSolutionList; /** * @brief Contains a feature-based match solution - * - * - * @author 2015-08-10 Kris Becker - * @internal - * @history 2015-08-10 Kris Becker - Original Version + * + * + * @author 2015-08-10 Kris Becker + * @internal + * @history 2015-08-10 Kris Becker - Original Version */ class MatcherSolution : public QLogger { @@ -59,17 +47,17 @@ class MatcherSolution : public QLogger { typedef MatchPairQList::const_iterator MatchPairConstIterator; MatcherSolution() { } - MatcherSolution(const SharedRobustMatcher &matcher, + MatcherSolution(const SharedRobustMatcher &matcher, const MatchPair &pair, const QLogger &logger = QLogger()) : QLogger(logger), - m_matcher(matcher), m_pairs() { + m_matcher(matcher), m_pairs() { m_pairs.push_back(pair); - } + } MatcherSolution(const SharedRobustMatcher &matcher, - const MatchPairQList &pairs, + const MatchPairQList &pairs, const QLogger &logger = QLogger()) : QLogger(logger), - m_matcher(matcher), m_pairs(pairs) { } + m_matcher(matcher), m_pairs(pairs) { } virtual ~MatcherSolution() { } @@ -101,11 +89,11 @@ class MatcherSolution : public QLogger { } return ( stats ); } - + double quality() const { return ( qualityStatistics().Average() ); } - + MatchPairIterator begin() { return ( m_pairs.begin() ); } @@ -144,15 +132,15 @@ class MatcherSolution : public QLogger { /** * @brief Determine match with best solution - * + * * @author Kris Becker 2015-08-29 - * + * * @param matches List of match solutions with some unique elements - * - * @return MatcherSolution* Pointer to best match. This SHOULD NOT be freed + * + * @return MatcherSolution* Pointer to best match. This SHOULD NOT be freed * as ownership is retained in this object */ - static const MatcherSolution *best( const MatcherSolutionList &matches ) { + static const MatcherSolution *best( const MatcherSolutionList &matches ) { if ( matches.size() <= 0 ) { return ( 0 ); } SharedMatcherSolution candidate(matches[0]); diff --git a/isis/src/control/apps/findfeatures/ORBAlgorithm.cpp b/isis/src/control/apps/findfeatures/ORBAlgorithm.cpp index a6272484eb..5c4dfb9ca7 100644 --- a/isis/src/control/apps/findfeatures/ORBAlgorithm.cpp +++ b/isis/src/control/apps/findfeatures/ORBAlgorithm.cpp @@ -1,24 +1,11 @@ -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -34,9 +21,9 @@ namespace Isis { /** * Constructs the ORB algorithm with default variables. */ - ORBAlgorithm::ORBAlgorithm() : + ORBAlgorithm::ORBAlgorithm() : Feature2DAlgorithm("ORB", "Feature2D", - ORBType::create()) { + ORBType::create()) { setupTypeMap(); m_variables.merge( getAlgorithmVariables() ); } @@ -44,13 +31,13 @@ namespace Isis { /** * Constructs the ORB algorithm with the input variables - * + * * @param cvars The variables and values the algorithm will use. * Variables that are not included will be set to their default. * @param config The config string used to construct cvars. */ ORBAlgorithm::ORBAlgorithm(const PvlFlatMap &cvars, const QString &config) : - Feature2DAlgorithm("ORB", "Feature2D", + Feature2DAlgorithm("ORB", "Feature2D", ORBType::create(), cvars) { setupTypeMap(); setConfig(config); @@ -67,7 +54,7 @@ namespace Isis { /** * Returns a description of the ORB algorithm. - * + * * @return @b QString A description of the ORB algorithm. */ QString ORBAlgorithm::description() const { @@ -90,7 +77,7 @@ namespace Isis { /** * Creates an instance of the ORB algorithm. - * + * * @param cvars The variables and values the algorithm will use. * Variables that are not included will be set to their default. * @param config The config string used to construct cvars. @@ -101,38 +88,38 @@ namespace Isis { /** - * Returns true if the algorithm has a detector. - * - * @return @b true if the algorithm has a detector. + * Returns true if the algorithm has a detector. + * + * @return @b true if the algorithm has a detector. */ - bool ORBAlgorithm::hasDetector() const { - return true; + bool ORBAlgorithm::hasDetector() const { + return true; } /** - * Returns true if the algorithm has an extractor. - * - * @return @b true if the algorithm has an extractor. + * Returns true if the algorithm has an extractor. + * + * @return @b true if the algorithm has an extractor. */ - bool ORBAlgorithm::hasExtractor() const { - return true; + bool ORBAlgorithm::hasExtractor() const { + return true; } /** - * Returns true if the algorithm has a matcher. - * - * @return @b true if the algorithm has a matcher. + * Returns true if the algorithm has a matcher. + * + * @return @b true if the algorithm has a matcher. */ - bool ORBAlgorithm::hasMatcher() const { - return false; + bool ORBAlgorithm::hasMatcher() const { + return false; } /** * Returns the variables and their values used by the ORB algorithm. - * + * * @return @b PvlFlatMap The variables and their values as keyword, value pairs. */ PvlFlatMap ORBAlgorithm::getAlgorithmVariables( ) const { @@ -154,11 +141,11 @@ namespace Isis { /** * Set parameters as provided by the variables - * + * * @param variables Container of parameters to set - * + * * @return @b int Number of variables actually set - * + * * @throws IException::User "The input value is not valid for ORB's [scoreType] variable" */ int ORBAlgorithm::setAlgorithmVariables(const PvlFlatMap &variables) { @@ -166,36 +153,36 @@ namespace Isis { ORBPtr algorithm = m_algorithm.dynamicCast(); int numSet(0); - if ( variables.exists("nfeatures") ) { + if ( variables.exists("nfeatures") ) { algorithm->setMaxFeatures(toInt(variables.get("nfeatures"))); numSet++; } - if ( variables.exists("scaleFactor") ) { + if ( variables.exists("scaleFactor") ) { algorithm->setScaleFactor(toDouble(variables.get("scaleFactor"))); numSet++; } - if ( variables.exists("nlevels") ) { + if ( variables.exists("nlevels") ) { algorithm->setNLevels(toInt(variables.get("nlevels"))); numSet++; } - if ( variables.exists("edgeThreshold") ) { + if ( variables.exists("edgeThreshold") ) { algorithm->setEdgeThreshold(toInt(variables.get("edgeThreshold"))); numSet++; - } + } - if ( variables.exists("firstLevel") ) { + if ( variables.exists("firstLevel") ) { algorithm->setFirstLevel(toInt(variables.get("firstLevel"))); numSet++; - } + } - if ( variables.exists("WTA_K") ) { + if ( variables.exists("WTA_K") ) { algorithm->setWTA_K(toInt(variables.get("WTA_K"))); numSet++; - } + } if ( variables.exists("scoreType") ) { @@ -222,12 +209,12 @@ namespace Isis { algorithm->setScoreType(intValue); numSet++; - if ( variables.exists("patchSize") ) { + if ( variables.exists("patchSize") ) { algorithm->setPatchSize(toInt(variables.get("patchSize"))); numSet++; - } + } - if ( variables.exists("fastThreshold") ) { + if ( variables.exists("fastThreshold") ) { algorithm->setPatchSize(toInt(variables.get("fastThreshold"))); numSet++; } @@ -236,4 +223,3 @@ namespace Isis { } }; // namespace Isis - diff --git a/isis/src/control/apps/findfeatures/ORBAlgorithm.h b/isis/src/control/apps/findfeatures/ORBAlgorithm.h index 28c567b504..59a4558ccc 100644 --- a/isis/src/control/apps/findfeatures/ORBAlgorithm.h +++ b/isis/src/control/apps/findfeatures/ORBAlgorithm.h @@ -1,26 +1,14 @@ #ifndef ORBAlgorithm_h #define ORBAlgorithm_h -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "FeatureAlgorithm.h" #include "opencv2/features2d.hpp" @@ -31,14 +19,14 @@ namespace Isis { /** - * @brief ORB Feature matcher algorithm - * - * This class provides the OpenCV3 ORB Feature2D algortithm. - * + * @brief ORB Feature matcher algorithm + * + * This class provides the OpenCV3 ORB Feature2D algortithm. + * * @author 2016-12-08 Kristin Berry - * - * @internal - * @history 2016-12-08 Kristin Berry - Original Version + * + * @internal + * @history 2016-12-08 Kristin Berry - Original Version */ class ORBAlgorithm : public Feature2DAlgorithm { // See FeatureAlgorithm.h diff --git a/isis/src/control/apps/findfeatures/QDebugLogger.h b/isis/src/control/apps/findfeatures/QDebugLogger.h index 60990bde9a..3a530b6605 100644 --- a/isis/src/control/apps/findfeatures/QDebugLogger.h +++ b/isis/src/control/apps/findfeatures/QDebugLogger.h @@ -1,26 +1,14 @@ #ifndef QDebugLogger_h #define QDebugLogger_h -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -47,18 +35,18 @@ typedef QSharedPointer QDebugStream; /** * @brief Specialized class to provide consistent interface to debug logger - * - * This interface provides some flexibility in constructing an easy to use - * interface to a generic output streams. The methods available here are - * designed to enforce a shared pointer API. This is necessary as QFILE and - * QDebugStreamType must coexist. Scoped pointers enforce this requirement. - * - * Some QDebugStreamTypes may require flushing after writing in order - * immediately to see the output. - * - * @author 2015-09-09 Kris Becker - * @internal - * @history 2015-09-09 Kris Becker - Original Version + * + * This interface provides some flexibility in constructing an easy to use + * interface to a generic output streams. The methods available here are + * designed to enforce a shared pointer API. This is necessary as QFILE and + * QDebugStreamType must coexist. Scoped pointers enforce this requirement. + * + * Some QDebugStreamTypes may require flushing after writing in order + * immediately to see the output. + * + * @author 2015-09-09 Kris Becker + * @internal + * @history 2015-09-09 Kris Becker - Original Version * @history 2016-04-26 Ian Humphrey - Modified open mode for /dev/null so that QIODevice::Append * is not set. This causes a seek to occur (to end of device) on a * sequential device (see Qt5 documentation on QIODevice::isSequential), @@ -68,32 +56,32 @@ typedef QSharedPointer QDebugStream; class QDebugLogger { public: /** Release in specific order */ - ~QDebugLogger() { + ~QDebugLogger() { m_dbuglog.reset(); m_dbugfile.reset(); } /** Map files to the logger using this method */ - static QDebugStream create(const QString &filename, - const QIODevice::OpenMode &omode = - (QIODevice::WriteOnly | - QIODevice::Append | + static QDebugStream create(const QString &filename, + const QIODevice::OpenMode &omode = + (QIODevice::WriteOnly | + QIODevice::Append | QIODevice::Text | - QIODevice::Unbuffered) ) { + QIODevice::Unbuffered) ) { // Default condition is to write to std::cout if ( filename.isEmpty() ) { return ( toStdOut() ); } // Set up file access logging - FileName t_fname(filename); + FileName t_fname(filename); QScopedPointer t_dbugfile( QDebugLogger::open( t_fname.expanded(), omode) ); QScopedPointer t_dbuglog( new QDebugStreamType( t_dbugfile.data() ) ); return ( QDebugStream( new QDebugLogger( t_dbugfile.take(), t_dbuglog.take() ) ) ); } /** Map streams like stdout, stderr, etc..., using this method */ - static QDebugStream create(FILE *fh, const QIODevice::OpenMode &omode = - (QIODevice::WriteOnly | - QIODevice::Append | + static QDebugStream create(FILE *fh, const QIODevice::OpenMode &omode = + (QIODevice::WriteOnly | + QIODevice::Append | QIODevice::Text | QIODevice::Unbuffered) ) { QScopedPointer t_dbugfile( new QFile() ); @@ -105,12 +93,12 @@ class QDebugLogger { /** Map strings to debugger output device using this method. Set * appropriate parameters for proper compilation above. */ - static QDebugStream create(QString *dbstring, + static QDebugStream create(QString *dbstring, const QIODevice::OpenMode &omode = QIODevice::WriteOnly ) { // Check for string support in debugger #if ( STRING_DEBUG_SUPPORT == 0 ) - throw IException(IException::Programmer, + throw IException(IException::Programmer, "QDebugLogger does not support strings as an output device!", _FILEINFO_); #endif @@ -154,8 +142,8 @@ class QDebugLogger { // shared pointer API /** Default constructor defined here to deny direct instantiation. This * helps enforces the shared pointer API */ - QDebugLogger() { - m_dbugfile.reset( QDebugLogger::open("/dev/null", QIODevice::WriteOnly | + QDebugLogger() { + m_dbugfile.reset( QDebugLogger::open("/dev/null", QIODevice::WriteOnly | QIODevice::Unbuffered) ); m_dbuglog.reset( new QDebugStreamType( m_dbugfile.data() ) ); } @@ -166,7 +154,7 @@ class QDebugLogger { QDebugLogger operator=(const QDebugLogger &other); /** Direct instantiation of prepared components for a logger stream */ - QDebugLogger(QFile *logfile, QDebugStreamType *logger) : + QDebugLogger(QFile *logfile, QDebugStreamType *logger) : m_dbugfile(logfile), m_dbuglog(logger) { } // These variables consistently manage logging activities @@ -174,30 +162,30 @@ class QDebugLogger { QScopedPointer m_dbuglog; /** Method creates a QFile from a filename */ - static QFile *open(const QString &filename, - const QIODevice::OpenMode &omode) { + static QFile *open(const QString &filename, + const QIODevice::OpenMode &omode) { FileName t_fname(filename); QScopedPointer t_dbugfile(new QFile( t_fname.expanded() ) ); if ( !t_dbugfile->open(omode) ) { - QString mess = "Unable to open/create debug log stream for file: " + - filename; + QString mess = "Unable to open/create debug log stream for file: " + + filename; throw IException(IException::User, mess, _FILEINFO_); - } + } return ( t_dbugfile.take() ); } }; /** - * @brief API for indepent logger usage - * - * Users of the QDebugLogger system can inherit from this class and include the - * interface in their classes seamlessly. Or can make an instance of it and use - * it directly as a member class. - * - * @author 2015-09-09 Kris Becker - * @internal - * @history 2015-09-09 Kris Becker - Original Version + * @brief API for indepent logger usage + * + * Users of the QDebugLogger system can inherit from this class and include the + * interface in their classes seamlessly. Or can make an instance of it and use + * it directly as a member class. + * + * @author 2015-09-09 Kris Becker + * @internal + * @history 2015-09-09 Kris Becker - Original Version */ class QLogger { public: diff --git a/isis/src/control/apps/findfeatures/RobustMatcher.cpp b/isis/src/control/apps/findfeatures/RobustMatcher.cpp index 156be235b2..3977959bed 100644 --- a/isis/src/control/apps/findfeatures/RobustMatcher.cpp +++ b/isis/src/control/apps/findfeatures/RobustMatcher.cpp @@ -1,26 +1,11 @@ -/** - * @file - * $Revision$ - * $Date$ - * $Id$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include @@ -61,17 +46,17 @@ RobustMatcher::RobustMatcher() : MatcherAlgorithms(), QLogger(), } -RobustMatcher::RobustMatcher(const QString &name) : - MatcherAlgorithms(), - QLogger(),m_name(name), +RobustMatcher::RobustMatcher(const QString &name) : + MatcherAlgorithms(), + QLogger(),m_name(name), m_parameters() { init(); } -RobustMatcher::RobustMatcher(const QString &name, +RobustMatcher::RobustMatcher(const QString &name, const MatcherAlgorithms &algorithms, const PvlFlatMap ¶meters, - const QLogger &logger) : + const QLogger &logger) : MatcherAlgorithms(algorithms),QLogger(logger), m_name(name), m_parameters() { init(parameters); @@ -672,7 +657,7 @@ bool RobustMatcher::removeOutliers(const cv::Mat &queryDescriptors, // i.e. size will be 0) int RobustMatcher::ratioTest(std::vector > &matches, double &mtime) const { - + double v_ratio = toDouble(m_parameters.get("Ratio")); if ( isDebug() ) { logger() << "Entered RobustMatcher::ratioTest(matches[2]) for 2 NearestNeighbors (NN)...\n"; @@ -817,7 +802,7 @@ cv::Mat RobustMatcher::ransacTest(const std::vector& matches, cv::Mat fundamental = cv::Mat::eye(3,3,CV_64F); // See if enough points to compute fundamental matrix. Minumum number needed - // for RANSAC is 8 points. + // for RANSAC is 8 points. int v_minEpiPoints = toInt(m_parameters.get("MinimumFundamentalPoints")); if ( (unsigned int) v_minEpiPoints > matches.size() ) { if ( isDebug() ) { @@ -884,8 +869,8 @@ cv::Mat RobustMatcher::ransacTest(const std::vector& matches, if ( toBool(m_parameters.get("RefineFundamentalMatrix")) ) { // See if enough points to compute fundamental matrix. Minumum number needed - // for RANSAC is 8 points. - int v_minEpiPoints = toInt(m_parameters.get("MinimumFundamentalPoints")); + // for RANSAC is 8 points. + int v_minEpiPoints = toInt(m_parameters.get("MinimumFundamentalPoints")); if ( (unsigned int) v_minEpiPoints <= outMatches.size() ) { // Make a copy of the inliers of the first fundamental processing diff --git a/isis/src/control/apps/findfeatures/RobustMatcher.h b/isis/src/control/apps/findfeatures/RobustMatcher.h index d1b1ffde4e..a643f3985e 100644 --- a/isis/src/control/apps/findfeatures/RobustMatcher.h +++ b/isis/src/control/apps/findfeatures/RobustMatcher.h @@ -1,26 +1,14 @@ #ifndef RobustMatcher_h #define RobustMatcher_h -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -42,77 +30,77 @@ class QDebug; /** * @brief Container for a feature match pair of data sources - * - * - * @author 2015-08-18 Kris Becker - * @internal - * @history 2015-08-18 Kris Becker - Original Version + * + * + * @author 2015-08-18 Kris Becker + * @internal + * @history 2015-08-18 Kris Becker - Original Version * @history 2016-10-05 Ian Humphrey & Makayla Shepherd - Changed headers to OpenCV2. */ class RobustMatcher : public MatcherAlgorithms, public QLogger { - + public: RobustMatcher(); RobustMatcher(const QString &name); - RobustMatcher(const QString &name, + RobustMatcher(const QString &name, const MatcherAlgorithms &algorithms, const PvlFlatMap ¶meters = PvlFlatMap(), const QLogger &logger = QLogger()); virtual ~RobustMatcher(); - + void setName(const QString &name); inline QString name() const { return ( m_name ); } - - // For just images, MatchImage objects are created generically using the + + // For just images, MatchImage objects are created generically using the // other match interfaces MatchPair match(cv::Mat& query, cv::Mat& trainer) const; MatchPairQList match(cv::Mat& query, std::vector& trainers) const; - + // Formal matching methods MatchPair match(MatchImage &query, MatchImage &train) const; MatchPairQList match(MatchImage &query, MatchImageQList &trainers) const; - + // Robust outlier removal bool removeOutliers(const cv::Mat &queryDescriptors, const cv::Mat &trainDescriptors, std::vector& queryKeypoints, std::vector& trainKeypoints, - std::vector &homography_matches, - std::vector &epipolar_matches, + std::vector &homography_matches, + std::vector &epipolar_matches, std::vector &matches, cv::Mat &homography, cv::Mat &fundamental, - double &mtime, const bool onErrorThrow = true) + double &mtime, const bool onErrorThrow = true) const; - + int ratioTest( std::vector > &matches, double &mtime) const; - + void symmetryTest(const std::vector >& matches1, const std::vector >& matches2, std::vector& symMatches, double &mtime) const; - + cv::Mat ransacTest(const std::vector& matches, const std::vector& keypoints1, const std::vector& keypoints2, std::vector& outMatches, double &mtime, const bool onErrorThrow = true) const; - + cv::Mat computeHomography(const std::vector& query, - const std::vector& train, + const std::vector& train, const std::vector &matches, std::vector &inliers, double &mtime, const int method = CV_FM_RANSAC, const double tolerance = 3.0, const bool refine = true, - const bool onErrorThrow = true) + const bool onErrorThrow = true) const; const PvlFlatMap ¶meters() const; - + // This hides the MatcherAlgorithm version which will be augmented PvlObject info(const QString &p_name = "RobustMatcher") const; - + private: QString m_name; // Name of matcher PvlFlatMap m_parameters; // Parameters for matcher @@ -120,10 +108,10 @@ class QDebug; void init(const PvlFlatMap ¶meters = PvlFlatMap()); void RootSift(cv::Mat &descriptors, const float eps = 1.0E-7) const; double elapsed(const QTime &runtime) const; // returns seconds - + }; - - ///!< Shared FeatureAlgorithm pointer that everyone can use + + ///!< Shared FeatureAlgorithm pointer that everyone can use typedef QSharedPointer SharedRobustMatcher; typedef QList RobustMatcherList; diff --git a/isis/src/control/apps/findfeatures/SIFTAlgorithm.cpp b/isis/src/control/apps/findfeatures/SIFTAlgorithm.cpp index 5f31cc9ba1..608c6888af 100644 --- a/isis/src/control/apps/findfeatures/SIFTAlgorithm.cpp +++ b/isis/src/control/apps/findfeatures/SIFTAlgorithm.cpp @@ -1,24 +1,11 @@ -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include "opencv2/opencv.hpp" @@ -30,23 +17,23 @@ namespace Isis { /** - * Constructs an empty SiftAlgorithm with default variables. + * Constructs an empty SiftAlgorithm with default variables. */ - SIFTAlgorithm::SIFTAlgorithm() : + SIFTAlgorithm::SIFTAlgorithm() : Feature2DAlgorithm( "SIFT", "Feature2D", - SIFTType::create() ) { + SIFTType::create() ) { setupParameters(); } /** - * Constructs a SIFTAlgorithm with input variables. - * + * Constructs a SIFTAlgorithm with input variables. + * * @param cvars Variables that are not included will be set to their default. * @param config The config string used to construct cvars. */ - SIFTAlgorithm::SIFTAlgorithm(const PvlFlatMap &cvars, const QString &config) : - Feature2DAlgorithm("SIFT", "Feature2D", + SIFTAlgorithm::SIFTAlgorithm(const PvlFlatMap &cvars, const QString &config) : + Feature2DAlgorithm("SIFT", "Feature2D", SIFTType::create(), cvars) { setConfig(config); PvlFlatMap variables = setupParameters(); @@ -57,7 +44,7 @@ namespace Isis { const double edgeThreshold = toDouble(variables.get("edgeThreshold")); const double sigma = toDouble(variables.get("sigma")); - m_algorithm = SIFTType::create(nfeatures, nOctaveLayers, contrastThreshold, + m_algorithm = SIFTType::create(nfeatures, nOctaveLayers, contrastThreshold, edgeThreshold, sigma); m_variables.merge(variables); @@ -71,9 +58,9 @@ namespace Isis { /** - * Sets up the algorithm parameters with default values. - * - * @return PvlFlatMap Algorithm parameters and their default values. + * Sets up the algorithm parameters with default values. + * + * @return PvlFlatMap Algorithm parameters and their default values. */ PvlFlatMap SIFTAlgorithm::setupParameters() { PvlFlatMap variables; @@ -89,7 +76,7 @@ namespace Isis { /** * Returns a description of the algorithm. - * + * * @return @b QString A description of the algorithm. */ QString SIFTAlgorithm::description() const { @@ -102,10 +89,10 @@ namespace Isis { /** * Creates and returns an intance of SIFTAlgorithm. - * + * * @param vars PvlFlatMap containing algorithm parameters and their values * @param config A configuration string input by the user - * + * * @return @b Feature2DAlgorithm An instance of SIFTAlgorithm */ Feature2DAlgorithm *SIFTAlgorithm::create(const PvlFlatMap &vars, const QString &config) { @@ -115,39 +102,39 @@ namespace Isis { /** - * Returns true if the algorithm has a detector. - * - * @return @b true if the algorithm has a detector. + * Returns true if the algorithm has a detector. + * + * @return @b true if the algorithm has a detector. */ - bool SIFTAlgorithm::hasDetector() const { - return true; + bool SIFTAlgorithm::hasDetector() const { + return true; } /** - * Returns true if the algorithm has an extractor. - * - * @return @b true if the algorithm has an extractor. + * Returns true if the algorithm has an extractor. + * + * @return @b true if the algorithm has an extractor. */ - bool SIFTAlgorithm::hasExtractor() const { - return true; + bool SIFTAlgorithm::hasExtractor() const { + return true; } /** - * Returns true if the algorithm has a matcher. - * - * @return @b true if the algorithm has a matcher. + * Returns true if the algorithm has a matcher. + * + * @return @b true if the algorithm has a matcher. */ - bool SIFTAlgorithm::hasMatcher() const { - return false; + bool SIFTAlgorithm::hasMatcher() const { + return false; } /** * Get and return SIFT's parameters and what they're set to as a PvlFlatMap. - * - * @return @b PvlFlatMap A PvlFlatMap of SIFT's currently set variables and their values. + * + * @return @b PvlFlatMap A PvlFlatMap of SIFT's currently set variables and their values. */ PvlFlatMap SIFTAlgorithm::getAlgorithmVariables( ) const { return ( variables() ); @@ -155,22 +142,21 @@ namespace Isis { /** - * @brief Set parameters as provided by the variables, does not work for the - * SIFT algorithm in OpenCV3, so calling this will throw an exception. - * Always returns -1. - * + * @brief Set parameters as provided by the variables, does not work for the + * SIFT algorithm in OpenCV3, so calling this will throw an exception. + * Always returns -1. + * * @param variables Container of parameters to set - * + * * @throws IException::Programmer "SIFT does not have the ability to set algorithm parameters."; - * + * * @return @b int -1 Cannot set the Algorithm Variables */ int SIFTAlgorithm::setAlgorithmVariables(const PvlFlatMap &variables) { QString message = "SIFT does not have the ability to set algorithm parameters."; - throw IException(IException::Programmer, message, _FILEINFO_); + throw IException(IException::Programmer, message, _FILEINFO_); return (-1); } }; // namespace Isis - diff --git a/isis/src/control/apps/findfeatures/SIFTAlgorithm.h b/isis/src/control/apps/findfeatures/SIFTAlgorithm.h index 4c3304dba0..b5b5fa1436 100644 --- a/isis/src/control/apps/findfeatures/SIFTAlgorithm.h +++ b/isis/src/control/apps/findfeatures/SIFTAlgorithm.h @@ -1,26 +1,13 @@ #ifndef SIFTAlgorithm_h #define SIFTAlgorithm_h -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "FeatureAlgorithm.h" #include "opencv2/xfeatures2d.hpp" @@ -30,16 +17,16 @@ namespace Isis { /** - * @brief SIFT Feature matcher algorithm - * - * This class provides the OpenCV3 SIFT Feature2D algortithm. Only the - * necesary methods are implemented here. - * + * @brief SIFT Feature matcher algorithm + * + * This class provides the OpenCV3 SIFT Feature2D algortithm. Only the + * necesary methods are implemented here. + * * @author 2016-11-30 Kris Becker - * - * @internal + * + * @internal * @history 2016-11-30 Kris Becker - Original Version - * @history 2016-12-06 Kristin Berry - Updates for OpenCV3 + * @history 2016-12-06 Kristin Berry - Updates for OpenCV3 */ class SIFTAlgorithm : public Feature2DAlgorithm { // See FeatureAlgorithm.h diff --git a/isis/src/control/apps/findfeatures/SURFAlgorithm.cpp b/isis/src/control/apps/findfeatures/SURFAlgorithm.cpp index d9dca5f897..1e8085ff06 100644 --- a/isis/src/control/apps/findfeatures/SURFAlgorithm.cpp +++ b/isis/src/control/apps/findfeatures/SURFAlgorithm.cpp @@ -1,24 +1,10 @@ -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include "opencv2/opencv.hpp" @@ -30,7 +16,7 @@ namespace Isis { /** - * Constructs a default SURFAlgorithm with default variables. + * Constructs a default SURFAlgorithm with default variables. */ SURFAlgorithm::SURFAlgorithm() : Feature2DAlgorithm("SURF", "Feature2D", SURFType::create()) { m_variables.merge( getAlgorithmVariables() ); @@ -38,13 +24,13 @@ namespace Isis { /** - * Constructs a SURFAlgorithm with input variables. - * + * Constructs a SURFAlgorithm with input variables. + * * @param cvars Variables that are not included will be set to their default. * @param config The config string used to construct cvars. */ SURFAlgorithm::SURFAlgorithm(const PvlFlatMap &cvars, const QString &config) : - Feature2DAlgorithm("SURF", "Feature2D", + Feature2DAlgorithm("SURF", "Feature2D", SURFType::create()) { setConfig(config); setAlgorithmVariables(cvars); @@ -61,8 +47,8 @@ namespace Isis { /** - * Returns a description of the DaisyAlgorithm. - * + * Returns a description of the DaisyAlgorithm. + * * @return @b QString A description of the algorithm. */ QString SURFAlgorithm::description() const { @@ -75,11 +61,11 @@ namespace Isis { /** * Creates and returns an instance of SURFAlgorithm. - * + * * @param vars PvlFlatMap containing algorithm parameters and their values * @param config A configuration string input by the user - * - * @return Feature2DAlgorithm + * + * @return Feature2DAlgorithm */ Feature2DAlgorithm *SURFAlgorithm::create(const PvlFlatMap &vars, const QString &config) { return ( new SURFAlgorithm(vars, config) ); @@ -87,48 +73,48 @@ namespace Isis { /** - * Returns true if the algorithm has a detector. - * - * @return @b true if the algorithm has a detector. + * Returns true if the algorithm has a detector. + * + * @return @b true if the algorithm has a detector. */ - bool SURFAlgorithm::hasDetector() const { - return true; + bool SURFAlgorithm::hasDetector() const { + return true; } /** - * Returns true if the algorithm has an extractor. - * - * @return @b true if the algorithm has an extractor. + * Returns true if the algorithm has an extractor. + * + * @return @b true if the algorithm has an extractor. */ - bool SURFAlgorithm::hasExtractor() const { - return true; + bool SURFAlgorithm::hasExtractor() const { + return true; } /** - * Returns true if the algorithm has a matcher. - * - * @return @b true if the algorithm has a matcher. + * Returns true if the algorithm has a matcher. + * + * @return @b true if the algorithm has a matcher. */ - bool SURFAlgorithm::hasMatcher() const { - return false; + bool SURFAlgorithm::hasMatcher() const { + return false; } /** - * @brief Retreive all SURF algorithm variable defaults and populate container - * - * This method will retreive the current values of all the variables as they - * are currently set in the algorithm. - * - * Typically, this is called upon instantiation of the algorithm which provides - * the default state of the variables. However, it is reentrant such that it - * will return the current state of all the variables. - * - * @author 2016-12-07 Kris Becker - * + * @brief Retreive all SURF algorithm variable defaults and populate container + * + * This method will retreive the current values of all the variables as they + * are currently set in the algorithm. + * + * Typically, this is called upon instantiation of the algorithm which provides + * the default state of the variables. However, it is reentrant such that it + * will return the current state of all the variables. + * + * @author 2016-12-07 Kris Becker + * * @return PvlFlatMap Container with all the SURF variables and values */ PvlFlatMap SURFAlgorithm::getAlgorithmVariables( ) const { @@ -144,38 +130,38 @@ namespace Isis { /** * @brief Set parameters as provided by the variables - * + * * @author 2016-12-06 Kris Becker - * + * * @param variables Container of parameters to set in the algorithm - * + * * @return int Number of variables actually set */ int SURFAlgorithm::setAlgorithmVariables(const PvlFlatMap &variables) { SURFPtr v_ref = m_algorithm.dynamicCast(); int nset(0); - if ( variables.exists("HessianThreshold") ) { + if ( variables.exists("HessianThreshold") ) { v_ref->setHessianThreshold(toDouble(variables.get("HessianThreshold"))); nset++; } - if ( variables.exists("NOctaves") ) { + if ( variables.exists("NOctaves") ) { v_ref->setNOctaves(toInt(variables.get("NOctaves"))); nset++; } - if ( variables.exists("NOctaveLayers") ) { + if ( variables.exists("NOctaveLayers") ) { v_ref->setNOctaveLayers(toInt(variables.get("NOctaveLayers"))); nset++; } - if ( variables.exists("Extended") ) { + if ( variables.exists("Extended") ) { v_ref->setExtended(toBool(variables.get("Extended"))); nset++; } - if ( variables.exists("Upright") ) { + if ( variables.exists("Upright") ) { v_ref->setUpright(toBool(variables.get("Upright"))); nset++; } @@ -184,4 +170,3 @@ namespace Isis { } }; - diff --git a/isis/src/control/apps/findfeatures/SURFAlgorithm.h b/isis/src/control/apps/findfeatures/SURFAlgorithm.h index 5de47cdbd0..142ea41b4c 100644 --- a/isis/src/control/apps/findfeatures/SURFAlgorithm.h +++ b/isis/src/control/apps/findfeatures/SURFAlgorithm.h @@ -1,26 +1,14 @@ #ifndef SURFAlgorithm_h #define SURFAlgorithm_h -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "FeatureAlgorithm.h" #include "opencv2/xfeatures2d.hpp" @@ -30,17 +18,17 @@ namespace Isis { /** - * @brief SURF Feature matcher algorithm - * - * This class provides the OpenCV3 SURF Feature2D algortithm. Only the - * necessary methods are implemented here. - * - * The SURF algorithm is in the contrib portion of the OpenCV 3 API. - * + * @brief SURF Feature matcher algorithm + * + * This class provides the OpenCV3 SURF Feature2D algortithm. Only the + * necessary methods are implemented here. + * + * The SURF algorithm is in the contrib portion of the OpenCV 3 API. + * * @author 2016-11-30 Kris Becker - * - * @internal - * @history 2016-11-30 Kris Becker - Original Version + * + * @internal + * @history 2016-11-30 Kris Becker - Original Version */ class SURFAlgorithm : public Feature2DAlgorithm { // See FeatureAlgorithm.h diff --git a/isis/src/control/apps/findfeatures/ScalingTransform.cpp b/isis/src/control/apps/findfeatures/ScalingTransform.cpp index ffdeb210a2..4c10bab39f 100644 --- a/isis/src/control/apps/findfeatures/ScalingTransform.cpp +++ b/isis/src/control/apps/findfeatures/ScalingTransform.cpp @@ -1,27 +1,10 @@ -/** - * @file - * $Revision$ - * $Date$ - * $Id$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include @@ -33,25 +16,25 @@ namespace Isis { -ScalingTransform::ScalingTransform() : ImageTransform("ScaleTransform"), +ScalingTransform::ScalingTransform() : ImageTransform("ScaleTransform"), m_scale(1.0) { } -ScalingTransform::ScalingTransform(const double &scale, const QString &name) : +ScalingTransform::ScalingTransform(const double &scale, const QString &name) : ImageTransform(name), m_scale(scale) { } - + /** * @brief Implementation of scaling transform - * + * * @author 2014-07-02 Kris Becker - * + * * @param scale Scale to apply to source image * @param source Input images to apply transform to - * + * * @return cv::Mat Returns the scaled image */ cv::Mat ScalingTransform::render(const cv::Mat &image) const { - cv::Size dstSize(static_cast(image.cols * m_scale + 0.5), + cv::Size dstSize(static_cast(image.cols * m_scale + 0.5), static_cast(image.rows * m_scale + 0.5)); cv::Mat scaled; cv::resize(image, scaled, dstSize, cv::INTER_AREA); diff --git a/isis/src/control/apps/findfeatures/ScalingTransform.h b/isis/src/control/apps/findfeatures/ScalingTransform.h index 19b477d406..16ff3ef00f 100644 --- a/isis/src/control/apps/findfeatures/ScalingTransform.h +++ b/isis/src/control/apps/findfeatures/ScalingTransform.h @@ -1,26 +1,13 @@ #ifndef ScalingTransform_h #define ScalingTransform_h -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include @@ -35,27 +22,27 @@ namespace Isis { /** * @brief Scale an image size up or down - * - * - * @author 2014-07-01 Kris Becker - * @internal - * @history 2014-07-01 Kris Becker - Original Version + * + * + * @author 2014-07-01 Kris Becker + * @internal + * @history 2014-07-01 Kris Becker - Original Version */ class ScalingTransform : public ImageTransform { public: ScalingTransform(); - ScalingTransform(const double &scale, - const QString &name = "ScaleTransform"); + ScalingTransform(const double &scale, + const QString &name = "ScaleTransform"); virtual ~ScalingTransform() { } - + virtual cv::Mat render(const cv::Mat &image) const; virtual cv::Point2f forward(const cv::Point2f &point) const; virtual cv::Point2f inverse(const cv::Point2f &point) const; - + private: double m_scale; - + }; } // namespace Isis diff --git a/isis/src/control/apps/findfeatures/ScharrTransform.h b/isis/src/control/apps/findfeatures/ScharrTransform.h index 059198531a..b958c7c01e 100644 --- a/isis/src/control/apps/findfeatures/ScharrTransform.h +++ b/isis/src/control/apps/findfeatures/ScharrTransform.h @@ -1,26 +1,14 @@ #ifndef ScharrTransform_h #define ScharrTransform_h -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -34,12 +22,12 @@ namespace Isis { /** * @brief Apply a Sobel transform the image - * + * * @see * http://docs.opencv.org/doc/tutorials/imgproc/imgtrans/sobel_derivatives/sobel_derivatives.html - * - * @author 2015-10-14 Kris Becker - * @internal + * + * @author 2015-10-14 Kris Becker + * @internal * @history 2015-10-14 Kris Becker - Original Version * @history 2017-06-22 Jesse Mapel - Modified render to make a deep copy of * the input matrix. References #4904. @@ -47,9 +35,9 @@ namespace Isis { class ScharrTransform : public ImageTransform { public: - ScharrTransform() : ImageTransform("ScharrTransform"), m_reduceNoise(true) { } - ScharrTransform(const QString &name, const bool reduceNoise = true) : - ImageTransform(name), m_reduceNoise(reduceNoise) { } + ScharrTransform() : ImageTransform("ScharrTransform"), m_reduceNoise(true) { } + ScharrTransform(const QString &name, const bool reduceNoise = true) : + ImageTransform(name), m_reduceNoise(reduceNoise) { } virtual ~ScharrTransform() { } @@ -57,11 +45,11 @@ class ScharrTransform : public ImageTransform { * Perform the transformation on an image matrix. If the reduce noise flag * is set, then this will apply a Gaussian filter with a 3x3 kernel prior * to performing the Scharr transformation. - * + * * @param image The input image data matrix to transform. - * + * * @return @b cv::Mat The transformed matrix. - * + * * @note If the reduce noise flag is set, this method creates a deep copy * of the image data matrix which may consume a large amount of memory. */ @@ -79,7 +67,7 @@ class ScharrTransform : public ImageTransform { cv::Mat src; if ( m_reduceNoise ) { src = image.clone(); - cv::GaussianBlur(src, src, cv::Size(3, 3), 0, 0, cv::BORDER_REFLECT ); + cv::GaussianBlur(src, src, cv::Size(3, 3), 0, 0, cv::BORDER_REFLECT ); } else { src = image; @@ -90,11 +78,11 @@ class ScharrTransform : public ImageTransform { cv::Mat abs_grad_x, abs_grad_y; /// Gradient X - cv::Scharr( src, grad_x, ddepth, 1, 0, scale, delta, cv::BORDER_REFLECT ); + cv::Scharr( src, grad_x, ddepth, 1, 0, scale, delta, cv::BORDER_REFLECT ); cv::convertScaleAbs( grad_x, abs_grad_x ); /// Gradient Y - cv::Scharr( src, grad_y, ddepth, 0, 1, scale, delta, cv::BORDER_REFLECT ); + cv::Scharr( src, grad_y, ddepth, 0, 1, scale, delta, cv::BORDER_REFLECT ); cv::convertScaleAbs( grad_y, abs_grad_y ); /// Total Gradient (approximate) diff --git a/isis/src/control/apps/findfeatures/SobelTransform.h b/isis/src/control/apps/findfeatures/SobelTransform.h index 8842a8c6b5..b7c7d70292 100644 --- a/isis/src/control/apps/findfeatures/SobelTransform.h +++ b/isis/src/control/apps/findfeatures/SobelTransform.h @@ -1,26 +1,14 @@ #ifndef SobelTransform_h #define SobelTransform_h -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -34,33 +22,33 @@ namespace Isis { /** * @brief Apply a Sobel transform the image - * - * @see + * + * @see * http://docs.opencv.org/doc/tutorials/imgproc/imgtrans/sobel_derivatives/sobel_derivatives.html - * - * @author 2015-10-14 Kris Becker - * @internal - * @history 2015-10-14 Kris Becker - Original Version + * + * @author 2015-10-14 Kris Becker + * @internal + * @history 2015-10-14 Kris Becker - Original Version * @history 2017-06-22 Jesse Mapel - Modified render to make a deep copy of * the input matrix. References #4904. */ class SobelTransform : public ImageTransform { public: - SobelTransform() : ImageTransform("SobelTransform"), m_reduceNoise(true) { } - SobelTransform(const QString &name, const bool reduceNoise = true) : - ImageTransform(name), m_reduceNoise(reduceNoise) { } + SobelTransform() : ImageTransform("SobelTransform"), m_reduceNoise(true) { } + SobelTransform(const QString &name, const bool reduceNoise = true) : + ImageTransform(name), m_reduceNoise(reduceNoise) { } virtual ~SobelTransform() { } /** * Perform the transformation on an image matrix. If the reduce noise flag * is set, then this will apply a Gaussian filter with a 3x3 kernel prior * to performing the Sobel transformation. - * + * * @param image The input image data matrix to transform. - * + * * @return @b cv::Mat The transformed matrix. - * + * * @note If the reduce noise flag is set, this method creates a deep copy * of the image data matrix which may consume a large amount of memory. */ @@ -78,7 +66,7 @@ class SobelTransform : public ImageTransform { cv::Mat src; if ( m_reduceNoise ) { src = image.clone(); - cv::GaussianBlur(src, src, cv::Size(3, 3), 0, 0, cv::BORDER_REFLECT ); + cv::GaussianBlur(src, src, cv::Size(3, 3), 0, 0, cv::BORDER_REFLECT ); } else { src = image; diff --git a/isis/src/control/apps/findfeatures/StarAlgorithm.cpp b/isis/src/control/apps/findfeatures/StarAlgorithm.cpp index 1dd0be0267..e1798424ee 100644 --- a/isis/src/control/apps/findfeatures/StarAlgorithm.cpp +++ b/isis/src/control/apps/findfeatures/StarAlgorithm.cpp @@ -1,24 +1,11 @@ -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include "opencv2/opencv.hpp" @@ -33,7 +20,7 @@ namespace Isis { /** * Constructs the algorithm with default variables. */ - StarAlgorithm::StarAlgorithm() : + StarAlgorithm::StarAlgorithm() : Feature2DAlgorithm("Star", "Feature2D", StarType::create()) { setupParameters(); @@ -42,13 +29,13 @@ namespace Isis { /** * Constructs the algorithm with the input variables - * + * * @param cvars The variables and values the algorithm will use. * Variables that are not included will be set to their default. * @param config The config string used to construct cvars. */ StarAlgorithm::StarAlgorithm(const PvlFlatMap &cvars, const QString &config) : - Feature2DAlgorithm("Star", "Feature2D", + Feature2DAlgorithm("Star", "Feature2D", StarType::create(), cvars) { setConfig(config); PvlFlatMap variables = setupParameters(); @@ -59,7 +46,7 @@ namespace Isis { const int lineThresholdBinarized = toInt(variables.get("LineThresholdBinarized")); const int SuppressNonmaxSize = toInt(variables.get("SuppressNonmaxSize")); - m_algorithm = StarType::create(maxSize, responseThreshold, lineThresholdProjected, + m_algorithm = StarType::create(maxSize, responseThreshold, lineThresholdProjected, lineThresholdBinarized, SuppressNonmaxSize); m_variables.merge(variables); @@ -73,9 +60,9 @@ namespace Isis { /** - * Sets up the algorithm parameters with default values. - * - * @return PvlFlatMap Algorithm parameters and their default values. + * Sets up the algorithm parameters with default values. + * + * @return PvlFlatMap Algorithm parameters and their default values. */ PvlFlatMap StarAlgorithm::setupParameters() { PvlFlatMap variables; @@ -91,7 +78,7 @@ namespace Isis { /** * Returns a description of the algorithm. - * + * * @return @b QString A description of the algorithm. */ QString StarAlgorithm::description() const { @@ -104,7 +91,7 @@ namespace Isis { /** * Creates an instance of the algorithm. - * + * * @param cvars The variables and values the algorithm will use. * Variables that are not included will be set to their default. * @param config The config string used to construct cvars. @@ -116,38 +103,38 @@ namespace Isis { /** - * Returns true if the algorithm has a detector. - * - * @return @b true if the algorithm has a detector. + * Returns true if the algorithm has a detector. + * + * @return @b true if the algorithm has a detector. */ - bool StarAlgorithm::hasDetector() const { - return true; + bool StarAlgorithm::hasDetector() const { + return true; } /** - * Returns true if the algorithm has an extractor. - * - * @return @b true if the algorithm has an extractor. + * Returns true if the algorithm has an extractor. + * + * @return @b true if the algorithm has an extractor. */ - bool StarAlgorithm::hasExtractor() const { - return false; + bool StarAlgorithm::hasExtractor() const { + return false; } /** - * Returns true if the algorithm has a matcher. - * - * @return @b true if the algorithm has a matcher. + * Returns true if the algorithm has a matcher. + * + * @return @b true if the algorithm has a matcher. */ - bool StarAlgorithm::hasMatcher() const { - return false; + bool StarAlgorithm::hasMatcher() const { + return false; } /** * Returns the variables and their values used by the algorithm. - * + * * @return @b PvlFlatMap The variables and their values as keyword, value pairs. */ PvlFlatMap StarAlgorithm::getAlgorithmVariables( ) const { @@ -157,11 +144,11 @@ namespace Isis { /** * @brief Set parameters as provided by the variables - * + * * @param variables Container of parameters to set - * + * * @return @b int Always -1, variables cannot be set after initialization. - * + * * @throws IException::Programmer "StarAlgorithm does not have the ability * to set algorithm parameters." */ diff --git a/isis/src/control/apps/findfeatures/StarAlgorithm.h b/isis/src/control/apps/findfeatures/StarAlgorithm.h index bfb91d2e1c..aca8ba5174 100644 --- a/isis/src/control/apps/findfeatures/StarAlgorithm.h +++ b/isis/src/control/apps/findfeatures/StarAlgorithm.h @@ -1,26 +1,14 @@ #ifndef StarAlgorithm_h #define StarAlgorithm_h -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "FeatureAlgorithm.h" #include @@ -28,15 +16,15 @@ namespace Isis { /** - * @brief StarDetector Feature matcher algorithm - * - * This class provides the OpenCV3 StarDetector Feature2D algortithm. Only the - * necesary methods are implemented here. - * + * @brief StarDetector Feature matcher algorithm + * + * This class provides the OpenCV3 StarDetector Feature2D algortithm. Only the + * necesary methods are implemented here. + * * @author 2016-12-12 Jesse Mapel - * - * @internal - * @history 2016-12-12 Jesse Mapel - Original Version + * + * @internal + * @history 2016-12-12 Jesse Mapel - Original Version */ class StarAlgorithm : public Feature2DAlgorithm { // See FeatureAlgorithm.h @@ -44,7 +32,7 @@ class StarAlgorithm : public Feature2DAlgorithm { // See FeatureAlgorithm.h public: StarAlgorithm(); StarAlgorithm(const PvlFlatMap &cvars, const QString &config = QString() ); - + virtual ~StarAlgorithm(); QString description() const; diff --git a/isis/src/control/apps/findfeatures/Transformer.cpp b/isis/src/control/apps/findfeatures/Transformer.cpp index 973b5aaef8..df020d66c0 100644 --- a/isis/src/control/apps/findfeatures/Transformer.cpp +++ b/isis/src/control/apps/findfeatures/Transformer.cpp @@ -1,26 +1,10 @@ -/** - * @file - * $Revision$ - * $Date$ - * $Id$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include @@ -53,12 +37,12 @@ int Transformer::size() const { } /** - * @brief Add a transform to the list - * - * Caller supplies a pointer to an image transform and inherits ownership of the - * pointer. The pointers are stored in a shared pointer to memory management is - * handled automatically. - * + * @brief Add a transform to the list + * + * Caller supplies a pointer to an image transform and inherits ownership of the + * pointer. The pointers are stored in a shared pointer to memory management is + * handled automatically. + * * @param transform Pointer to add to list */ void Transformer::add(ImageTransform *transform) { @@ -67,13 +51,13 @@ void Transformer::add(ImageTransform *transform) { } /** - * @brief Apply image transforms to an image - * - * The incoming image is rendered in each transform, apply the results of the - * previous transform to the next transform. - * + * @brief Apply image transforms to an image + * + * The incoming image is rendered in each transform, apply the results of the + * previous transform to the next transform. + * * @param image Image to transform - * @return cv::Mat Final result of all image transforms + * @return cv::Mat Final result of all image transforms */ cv::Mat Transformer::render(const cv::Mat &image) const { cv::Mat t_image = image; @@ -84,11 +68,11 @@ cv::Mat Transformer::render(const cv::Mat &image) const { } /** - * @brief Convert a point coordinate applied in each transform - * - * The point passed into this method has the forward point transform of each - * ImageTransform applied to result in the final coordinate. - * + * @brief Convert a point coordinate applied in each transform + * + * The point passed into this method has the forward point transform of each + * ImageTransform applied to result in the final coordinate. + * * @param point Point to transform with the transform list * @return cv::Point2f Transformed point coordinate */ @@ -101,14 +85,14 @@ cv::Point2f Transformer::forward(const cv::Point2f &point) const { } /** - * @brief Convert the inverse of the point from the list of imaage tranforms - * - * The given point is assumed to have been appled with the forward() method, - * and modified or computed in the final transform data space. This method - * converts the coordinates back the the original coordinate system (typically - * raw image space) by traversing the list in reverse and applying the inverse - * point conversion method. - * + * @brief Convert the inverse of the point from the list of imaage tranforms + * + * The given point is assumed to have been appled with the forward() method, + * and modified or computed in the final transform data space. This method + * converts the coordinates back the the original coordinate system (typically + * raw image space) by traversing the list in reverse and applying the inverse + * point conversion method. + * * @param point Point to invert * @return cv::Point2f Resulting inverted point */ diff --git a/isis/src/control/apps/findfeatures/Transformer.h b/isis/src/control/apps/findfeatures/Transformer.h index c5e12f72e6..aba3855f0d 100644 --- a/isis/src/control/apps/findfeatures/Transformer.h +++ b/isis/src/control/apps/findfeatures/Transformer.h @@ -1,26 +1,14 @@ #ifndef Transformer_h #define Transformer_h -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -35,41 +23,41 @@ namespace Isis { /** * @brief Provide a series of image transforms - * - * This class serves as a container class for all image transformations and + * + * This class serves as a container class for all image transformations and * point conversions, both forward and inverse. - * - * As each image is read, the list of transforms are applied for each transform - * added to the this class. There is typically a list of transforms for each - * image. - * - * @author 2015-10-03 Kris Becker - * @internal - * @history 2015-10-03 Kris Becker - Original Version - * @history 2016-04-05 Kris Becker Completed documentation + * + * As each image is read, the list of transforms are applied for each transform + * added to the this class. There is typically a list of transforms for each + * image. + * + * @author 2015-10-03 Kris Becker + * @internal + * @history 2015-10-03 Kris Becker - Original Version + * @history 2016-04-05 Kris Becker Completed documentation */ class Transformer { public: typedef ImageTransformQList::iterator ImageTransformIterator; typedef ImageTransformQList::const_iterator ImageTransformConstIterator; - + Transformer(); virtual ~Transformer(); - + int size() const; - + void add(ImageTransform *transform); cv::Mat render(const cv::Mat &image) const; - + cv::Point2f forward(const cv::Point2f &point) const; cv::Point2f inverse(const cv::Point2f &point) const; - + ImageTransformConstIterator begin() const; ImageTransformConstIterator end() const; - + void clear(); - + private: ImageTransformQList m_transforms; //!< List of transforms }; diff --git a/isis/src/control/apps/findfeatures/findfeatures.cpp b/isis/src/control/apps/findfeatures/findfeatures.cpp index 2df8ef32ea..5ef5ff0038 100644 --- a/isis/src/control/apps/findfeatures/findfeatures.cpp +++ b/isis/src/control/apps/findfeatures/findfeatures.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include /*#define USE_GUI_QAPP 1*/ diff --git a/isis/src/control/apps/findfeatures/findfeatures.h b/isis/src/control/apps/findfeatures/findfeatures.h index 55c39ffbce..16f481b917 100644 --- a/isis/src/control/apps/findfeatures/findfeatures.h +++ b/isis/src/control/apps/findfeatures/findfeatures.h @@ -1,6 +1,14 @@ #ifndef findfeatures_h #define findfeatures_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "UserInterface.h" #include "Pvl.h" diff --git a/isis/src/control/apps/findfeatures/main.cpp b/isis/src/control/apps/findfeatures/main.cpp index 62dc2464ed..dd75cdc0e5 100644 --- a/isis/src/control/apps/findfeatures/main.cpp +++ b/isis/src/control/apps/findfeatures/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "Application.h" diff --git a/isis/src/control/apps/fplanemap/main.cpp b/isis/src/control/apps/fplanemap/main.cpp index fc65e88ae5..50a005f5ef 100644 --- a/isis/src/control/apps/fplanemap/main.cpp +++ b/isis/src/control/apps/fplanemap/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "PvlGroup.h" #include "UserInterface.h" @@ -30,7 +38,7 @@ struct Coordinate { double longitude; //!< Longitude of the point }; -inline double distance(const double &x1, const double &y1, +inline double distance(const double &x1, const double &y1, const double &x2, const double &y2) { return (sqrt((x2-x1)*(x2-x1) + (y2-y1)*(y2-y1))); } @@ -136,14 +144,14 @@ void IsisMain() { else nulls++; } else { - badPoint++; + badPoint++; } prog.CheckStatus(); } PvlGroup results("Results"); - results += PvlKeyword("PixelPitch", toString(pp), "millimeters"); - results += PvlKeyword("TotalPoints", toString(cn.GetNumPoints())); + results += PvlKeyword("PixelPitch", toString(pp), "millimeters"); + results += PvlKeyword("TotalPoints", toString(cn.GetNumPoints())); results += PvlKeyword("ValidPoints", toString((BigInt) coords.size())); results += PvlKeyword("InvalidPoints", toString(badPoint)); if (checkForNulls) results += PvlKeyword("NullDNs", toString(nulls)); @@ -170,7 +178,7 @@ void IsisMain() { for(unsigned int i = 0; i < coords.size(); i++) { Coordinate &c = coords[i]; os << c.samp << "," << c.line << "," << c.errSamp << "," << c.errLine << "," - << c.olddetX << "," << c.olddetY << "," << c.newdetX << "," << c.newdetY << "," + << c.olddetX << "," << c.olddetY << "," << c.newdetX << "," << c.newdetY << "," << c.gof << "," << c.latitude << "," << c.longitude << endl; } @@ -178,4 +186,3 @@ void IsisMain() { return; } - diff --git a/isis/src/control/apps/jigsaw/jigsaw.cpp b/isis/src/control/apps/jigsaw/jigsaw.cpp index c01dd195f9..6038368ef2 100644 --- a/isis/src/control/apps/jigsaw/jigsaw.cpp +++ b/isis/src/control/apps/jigsaw/jigsaw.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include diff --git a/isis/src/control/apps/jigsaw/jigsaw.h b/isis/src/control/apps/jigsaw/jigsaw.h index 955c11dc71..04c0110f10 100644 --- a/isis/src/control/apps/jigsaw/jigsaw.h +++ b/isis/src/control/apps/jigsaw/jigsaw.h @@ -1,6 +1,14 @@ #ifndef jigsaw_h #define jigsaw_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include diff --git a/isis/src/control/apps/jigsaw/main.cpp b/isis/src/control/apps/jigsaw/main.cpp index 785b680d30..f457e6ed68 100644 --- a/isis/src/control/apps/jigsaw/main.cpp +++ b/isis/src/control/apps/jigsaw/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "jigsaw.h" diff --git a/isis/src/control/apps/mat2cnet/main.cpp b/isis/src/control/apps/mat2cnet/main.cpp index 519cef17fe..00fbbaf827 100644 --- a/isis/src/control/apps/mat2cnet/main.cpp +++ b/isis/src/control/apps/mat2cnet/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include diff --git a/isis/src/control/apps/pointreg/main.cpp b/isis/src/control/apps/pointreg/main.cpp index d9bdff1659..799c4d1c42 100644 --- a/isis/src/control/apps/pointreg/main.cpp +++ b/isis/src/control/apps/pointreg/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "Application.h" diff --git a/isis/src/control/apps/pointreg/pointreg.cpp b/isis/src/control/apps/pointreg/pointreg.cpp index 63cd2cf2dc..f85cea1435 100644 --- a/isis/src/control/apps/pointreg/pointreg.cpp +++ b/isis/src/control/apps/pointreg/pointreg.cpp @@ -1,3 +1,10 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include @@ -731,7 +738,7 @@ namespace Isis { double searchRes = getResolution(searchCube, *reference); validation.compareResolutions(patternRes, searchRes, resTolerance); - if (validation.skipped()) + if (validation.skipped()) return validation; validator->SearchChip()->TackCube( diff --git a/isis/src/control/apps/pointreg/pointreg.h b/isis/src/control/apps/pointreg/pointreg.h index 70fa85b9af..43972f0476 100644 --- a/isis/src/control/apps/pointreg/pointreg.h +++ b/isis/src/control/apps/pointreg/pointreg.h @@ -1,6 +1,14 @@ #ifndef pointreg_h #define pointreg_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "UserInterface.h" #include "Pvl.h" diff --git a/isis/src/control/apps/seedgrid/main.cpp b/isis/src/control/apps/seedgrid/main.cpp index 8b99f07275..88cb7e1082 100644 --- a/isis/src/control/apps/seedgrid/main.cpp +++ b/isis/src/control/apps/seedgrid/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #define GUIHELPERS #include "Isis.h" diff --git a/isis/src/control/apps/slither/ControlByRow.h b/isis/src/control/apps/slither/ControlByRow.h index fd1cbd9759..3b0fc13bc2 100644 --- a/isis/src/control/apps/slither/ControlByRow.h +++ b/isis/src/control/apps/slither/ControlByRow.h @@ -1,27 +1,13 @@ #ifndef ControlByRow_h #define ControlByRow_h -/** - * @file - * $Revision: 1.2 $ - * $Date: 2007/01/30 22:12:21 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include "ControlMeasure.h" diff --git a/isis/src/control/apps/slither/SlitherTransform.cpp b/isis/src/control/apps/slither/SlitherTransform.cpp index 7a81b58b4e..572448cb03 100644 --- a/isis/src/control/apps/slither/SlitherTransform.cpp +++ b/isis/src/control/apps/slither/SlitherTransform.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include diff --git a/isis/src/control/apps/slither/SlitherTransform.h b/isis/src/control/apps/slither/SlitherTransform.h index 4577fa254b..3e2c9b687d 100644 --- a/isis/src/control/apps/slither/SlitherTransform.h +++ b/isis/src/control/apps/slither/SlitherTransform.h @@ -1,6 +1,14 @@ #ifndef SlitherTransform_h #define SlitherTransform_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include @@ -305,5 +313,3 @@ namespace Isis { } #endif - - diff --git a/isis/src/control/apps/slither/main.cpp b/isis/src/control/apps/slither/main.cpp index 9f0daaa68e..6dcf03c6cb 100644 --- a/isis/src/control/apps/slither/main.cpp +++ b/isis/src/control/apps/slither/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include @@ -95,4 +103,3 @@ void IsisMain() { p.EndProcess(); delete interp; } - diff --git a/isis/src/control/apps/sumspice/SumFile.cpp b/isis/src/control/apps/sumspice/SumFile.cpp index 7283c33722..5e5d727acb 100644 --- a/isis/src/control/apps/sumspice/SumFile.cpp +++ b/isis/src/control/apps/sumspice/SumFile.cpp @@ -1,26 +1,10 @@ -/** - * @file - * $Revision: 6565 $ - * $Date: 2016-02-10 17:15:35 -0700 (Wed, 10 Feb 2016) $ - * $Id: SumFile.cpp 6565 2016-02-11 00:15:35Z kbecker@GS.DOI.NET $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "SumFile.h" @@ -49,66 +33,66 @@ using namespace std; namespace Isis { - /** + /** * Default constructor creates empty SumFile object. */ SumFile::SumFile() { } - + /** - * @brief Constructor reads and parses contents of SUMFILE - * + * @brief Constructor reads and parses contents of SUMFILE + * * @param sumFile Name of SUMFILE to read/parse */ SumFile::SumFile(const QString &sumFile) { parseSumFile(sumFile); } - - -// /** + + +// /** // * Tests vailidty of the SumFile point. -// * +// * // * @return @b bool // */ // bool SumFile::isValid() const { -// return (true); +// return (true); // } - - /** + + /** * Returns the name of the SUMFILE (contents of first line). - * + * * @return @b QString Name of sumfile identifier */ QString SumFile::name() const { return (m_id); - + } - - /** + + /** * Returns the time found in the SUMFILE in UTC form - * + * * @return @b QString Time found in SUMFILE */ QString SumFile::utc() const { return (m_obsTime.UTC()); - + } - - /** + + /** * Returns the SUMFILE time, in ET. - * + * * @return @b double Time converted to ET */ double SumFile::et() const { return (m_obsTime.Et()); } - + /** - * @brief Returns the Time object found in SUMFILE - * + * @brief Returns the Time object found in SUMFILE + * * @return const iTime& Time in SUMFILE */ const iTime &SumFile::time() const { @@ -116,16 +100,16 @@ namespace Isis { } /** - * @brief Update SPICE data in ISIS cube - * - * This method will update the SPICE blobs with the contents of the SUMSPICE. - * The contents of the InstrumentPosition will be replaced with SUMSPICE SZ + * @brief Update SPICE data in ISIS cube + * + * This method will update the SPICE blobs with the contents of the SUMSPICE. + * The contents of the InstrumentPosition will be replaced with SUMSPICE SZ * vector and InstrumentPointing is replaced by the CX, CY, CZ matrix. - * + * * @param cube An intialized ISIS Cube object - * @param camera An option pointer to the camera. If not provided, it is + * @param camera An option pointer to the camera. If not provided, it is * retrieved from the Cube object - * + * * @return bool True if succesful, false if the operation fails */ bool SumFile::updateSpice(Cube &cube, Camera *camera) const { @@ -135,21 +119,21 @@ namespace Isis { } return (good); } - - + + /** - * @brief Convert the SUMFILE contents and apply pointing to ISIS camera - * - * It is up to the caller to ensure appropriate kernels are loaded. See - * loadKernels(); - * + * @brief Convert the SUMFILE contents and apply pointing to ISIS camera + * + * It is up to the caller to ensure appropriate kernels are loaded. See + * loadKernels(); + * * @param cube Cube to update pointing for * @param camera Camera object associated with cube for update - * + * * @return bool True if successful, false otherwise */ bool SumFile::updatePointing(Cube &cube, Camera *camera) const { - + Camera *mycam = ( camera != NULL ) ? camera : cube.camera(); // get new pointing quaternion from sum file @@ -162,13 +146,13 @@ namespace Isis { SpiceRotation *oldRotation = mycam->instrumentRotation(); Quaternion oldConstantRotation(oldRotation->ConstantRotation()); // old TC rotation - // Get the new rotation from the sum file. + // Get the new rotation from the sum file. // this is the instrument frame (relative to the target, i.e. body-fixed) Quaternion newRotation = getPointing(); // new target to instrument rotation (TC) is found by // TC = inverse(rotation from sum file) * (old TC rotation) - // + // // So, the new instrument frame relative to J2000 is // CJ = inverse(TC) * TJ Quaternion newTimeBasedRotation = oldConstantRotation.Conjugate() * newRotation * j2000ToTarget; // new CJ @@ -180,7 +164,7 @@ namespace Isis { toString(table.Records()) + " for file " + cube.fileName(); throw IException(IException::User, message, _FILEINFO_); } - + TableRecord &rec0 = table[0]; if ( rec0.Fields() < 5 ) { QString message = "Expected/support quaternion Table containing 5 or more fields " @@ -192,35 +176,35 @@ namespace Isis { for (int i = 0; i < 4; i++) { rec0[i] = newTimeBasedRotation[i]; } - + // Put a comment in the record QString message = "Updated pointing with SUMFILE " + name() + " on " + iTime::CurrentLocalTime(); PvlKeyword sumFileKeyword("SUMFILE", name()); sumFileKeyword.addComment(message); table.Label().addKeyword(sumFileKeyword, PvlContainer::Replace); table.Update(rec0, 0); - + cube.write(table); - + // Delete polygon if it has one if ( cube.label()->hasObject("Polygon") ) { cube.label()->deleteObject("Polygon"); } - + return (true); } - + /** * @brief Update spacecraft position with SUMFILE data - * + * * @param cube Cube to update position for * @param camera Camera object associated with cube for update - * + * * @return bool True if successful, false otherwise */ bool SumFile::updatePosition(Cube &cube, Camera *camera) const { - + Camera *mycam = ( !camera ) ? cube.camera() : camera; SpiceRotation *body = mycam->bodyRotation(); @@ -233,17 +217,17 @@ namespace Isis { vminus_c(&spacecraftPos[0], &spacecraftPos[0]); // Transform position vector from body-fixed to J2000 spacecraftPos = j2000ToTarget.Conjugate().Qxv(spacecraftPos); - + // Retrieve s/c cache and update the position SpicePosition *oldPosition = mycam->instrumentPosition(); Table table = oldPosition->Cache("InstrumentPosition"); if ( table.Records() > 1 ) { - QString message = "Expected/support only one InstrumentPosition record " + QString message = "Expected/support only one InstrumentPosition record " "(i.e., Framing camera) but got " + toString(table.Records()) + " for file " + cube.fileName(); throw IException(IException::User, message, _FILEINFO_); } - + TableRecord &rec0 = table[0]; if ( rec0.Fields() < 4 ) { QString message = "Expected/support vector Table containing 4 or more fields " @@ -256,35 +240,35 @@ namespace Isis { for (unsigned int i = 0; i < spacecraftPos.size(); i++) { rec0[i] = spacecraftPos[i]; } - - // Put a comment in the record + + // Put a comment in the record QString message = "Updated position with SUMFILE " + name() + " on " + iTime::CurrentLocalTime(); PvlKeyword sumFileKeyword("SUMFILE", name()); sumFileKeyword.addComment(message); table.Label().addKeyword(sumFileKeyword, PvlContainer::Replace); table.Update(rec0, 0); - + cube.write(table); - + // Delete polygon if it has one if ( cube.label()->hasObject("Polygon") ) { cube.label()->deleteObject("Polygon"); } - + return (true); - + } - + /** - * @brief Return the point matrix, in body-fixed format. - * - * This method will return a quaternion, in body fixed coordinates, + * @brief Return the point matrix, in body-fixed format. + * + * This method will return a quaternion, in body fixed coordinates, * corresponding to the 3x3 instrument pointing matrix found in the SUMFILE. - * Note that there is no need to load kernels (or have transformations - * determined) to provide this data. - * + * Note that there is no need to load kernels (or have transformations + * determined) to provide this data. + * * @return Quaternion The SUMFILE's pointing matrix */ Quaternion SumFile::getPointing() const { @@ -300,14 +284,14 @@ namespace Isis { Quaternion quaternionBodyFixed(cmatrixBodyFixed); return quaternionBodyFixed; } - + /** * @brief Get spacecraft postion in body-fixed coordinates - * - * This method will return the vector found in the SUMFILE that represents - * the coordinates of the spacecraft, in body fixed position. - * + * + * This method will return the vector found in the SUMFILE that represents + * the coordinates of the spacecraft, in body fixed position. + * * @return std::vector The SUMFILE's spacecraft position */ std::vector SumFile::getPosition() const{ @@ -318,15 +302,15 @@ namespace Isis { spacecraftPosition.push_back(m_spacecraftPosition[2]); return (spacecraftPosition); } - + /** * @brief Get Sun postion in body-fixed coordinates - * - * This method will return the vector found in the SUMFILE that represents - * the coordinates of the Sun, in body fixed position. - * + * + * This method will return the vector found in the SUMFILE that represents + * the coordinates of the Sun, in body fixed position. + * * @return std::vector The SUMFILE's Sun position */ std::vector SumFile::getSunPosition() const{ @@ -337,31 +321,31 @@ namespace Isis { sunPosition.push_back(m_sunPosition[2]); return (sunPosition); } - + /** - * Adds information about the SUMFILE to the output stream: name, start time - * (UTC), start time (ET), number of lines, number of samples, DN minimum, DN - * maximum. - * + * Adds information about the SUMFILE to the output stream: name, start time + * (UTC), start time (ET), number of lines, number of samples, DN minimum, DN + * maximum. + * * @param outs The output Stream to be filled. - * + * * @return @b std::ostream& The filled output stream. */ std::ostream &SumFile::brief(std::ostream &outs) const { - outs << name() << ", " << utc() << ", " << std::fixed << et() << ", " - << m_numLines << ", " << m_numSamples + outs << name() << ", " << utc() << ", " << std::fixed << et() << ", " + << m_numLines << ", " << m_numSamples << ", " << m_dnMin << ", " << m_dnMax; - return (outs); + return (outs); } - + /** * @brief Opens and parses the contents of a SUMFILE. - * - * THis method will open a Gaskell SPC SUMFILE and parse the contents. The - * SUMFILE contents are internalized in the SumFile object. - * + * + * THis method will open a Gaskell SPC SUMFILE and parse the contents. The + * SUMFILE contents are internalized in the SumFile object. + * * @param sumFile Name of a SPC SUMFILE */ void SumFile::parseSumFile(const QString &sumFile) { @@ -371,127 +355,127 @@ namespace Isis { QString message = "Failed to open FROM file \"" + sfile.original() + "\""; throw IException(IException::User, message, _FILEINFO_); } - + // Open the text stream QTextStream sumin(&sumF); - + // Get the image id QStringList values = getSumLine(sumin.readLine(), 1); m_id = values.first(); - + // Get the time. We expect spaces in the time specification values = getSumLine(sumin.readLine(), 4); m_obsTime = iTime(values.join("-")); - + // Get image lines/samples and lower/upper dn boundaries values = getSumLine(sumin.readLine(), 7, "THRSH"); m_numSamples = cvtDouble(values[0]); m_numLines = cvtDouble(values[1]); m_dnMin = cvtDouble(values[2]); m_dnMax = cvtDouble(values[3]); - + // Get pixel size and boresight line/sample values = getSumLine(sumin.readLine(), 5, "CTR"); m_pxlSize = cvtDouble(values[0]); m_centerSample = cvtDouble(values[1]); m_centerLine = cvtDouble(values[2]); - + // Get spacecraft position values = getSumLine(sumin.readLine(), 4, "SCOBJ"); for (int i = 0; i < 3; i++) { m_spacecraftPosition[i] = cvtDouble(values[i]); } - + // Get X component of pointing matrix values = getSumLine(sumin.readLine(), 4, "CX"); for (int i = 0; i < 3; i++) m_pointingMatrix[0][i] = cvtDouble(values[i]); - + // Get Y component of pointing matrix values = getSumLine(sumin.readLine(), 4,"CY"); for (int i = 0; i < 3; i++) m_pointingMatrix[1][i] = cvtDouble(values[i]); - + // Get Z component of pointing matrix values = getSumLine(sumin.readLine(), 4, "CZ"); for (int i = 0; i < 3; i++) m_pointingMatrix[2][i] = cvtDouble(values[i]); - - + + // Get sun position values = getSumLine(sumin.readLine(), 4, "SZ"); for (int i = 0; i < 3; i++) m_sunPosition[i] = cvtDouble(values[i]); - + // Get K-matrix values = getSumLine(sumin.readLine(), 7, "K-MATRIX"); for (int i = 0; i < 6; i++) m_kmatrix[i] = cvtDouble(values[i]); - + // Get distortion parameters or SIGPXL values. values = getSumLine(sumin.readLine(), 0); - + if ( values.last() == "DISTORTION" ) { - for (int i = 0; i < 4; i++) m_distortion[i] = cvtDouble(values[i]); + for (int i = 0; i < 4; i++) m_distortion[i] = cvtDouble(values[i]); } - + // Get formal spacecraft position uncertainty values = getSumLine(sumin.readLine(), 4, "SIGMA_VSO"); for (int i = 0; i < 3; i++) m_sigmaSCPos[i] = cvtDouble(values[i]); - - + + // Get formal pointing uncertainty values = getSumLine(sumin.readLine(), 4, "SIGMA_PTG"); for (int i = 0; i < 3; i++) m_sigmaSCPos[i] = cvtDouble(values[i]); - + // Should be at the landmarks line in the file now. This test ensures it values = getSumLine(sumin.readLine(), 1, "LANDMARKS"); - - // Read all landmarks (ControlMeasures) in this section until we encounter + + // Read all landmarks (ControlMeasures) in this section until we encounter //limb fits... - + // Read to end of file while ( !sumin.atEnd() ) { values = getSumLine(sumin.readLine()); } - + return; } - + /** * @brief Get referred input line from SUMFILE line - * - * This method will tokenize a simple string with optional error checking for - * known line content. The string is expected to be line of a Gaskell SUMFILE. - * - * Each data string has control characters removed, commas converted to spaces - * and multiple spaces compressed to a single space. The string is then - * tokenized with each value separated by a space. - * - * Callers can use the nexpected parameter to ensure the expected fields are - * read from the input stream. If 0, it will accept any number of tokens - * (including 0). If the expected number of tokens are not met, an exception is - * thrown to indicate unexpected input. - * - * The tag parameter is provided to check for a specific value in the last - * column of a parsed SUMFILE line. The tag string is compared to the last - * field string parsed from the processed input data string using a case - * insensitve comparison. If the values are not equivalent, an exception is - * thrown. If a value is not provided, this check is not applied. - * - * @param data Line from a Gaskell SUMFILE - * @param nexpected Optional number of columns/fields after tokenization. a + * + * This method will tokenize a simple string with optional error checking for + * known line content. The string is expected to be line of a Gaskell SUMFILE. + * + * Each data string has control characters removed, commas converted to spaces + * and multiple spaces compressed to a single space. The string is then + * tokenized with each value separated by a space. + * + * Callers can use the nexpected parameter to ensure the expected fields are + * read from the input stream. If 0, it will accept any number of tokens + * (including 0). If the expected number of tokens are not met, an exception is + * thrown to indicate unexpected input. + * + * The tag parameter is provided to check for a specific value in the last + * column of a parsed SUMFILE line. The tag string is compared to the last + * field string parsed from the processed input data string using a case + * insensitve comparison. If the values are not equivalent, an exception is + * thrown. If a value is not provided, this check is not applied. + * + * @param data Line from a Gaskell SUMFILE + * @param nexpected Optional number of columns/fields after tokenization. a * value of 0 will not apply this check. - * @param tag If specified, is the expect string in last column of a + * @param tag If specified, is the expect string in last column of a * parsed SUMFILE line. String comparison is case * insensitive. - * + * * @return QStringList List of tokenized string fields */ - QStringList SumFile::getSumLine(const QString &data, const int &nexpected, + QStringList SumFile::getSumLine(const QString &data, const int &nexpected, const QString &tag) const { - + // Copy string and parse results QString line = data.simplified(); line.replace(",", " "); QStringList values = line.split(" ", QString::SkipEmptyParts); - + if ( nexpected > 0 ) { if ( values.size() != nexpected ) { QString message = "Expected " + toString(nexpected) + " but got " @@ -499,12 +483,12 @@ namespace Isis { throw IException(IException::User, message, _FILEINFO_); } } - + // Check for tags if ( !tag.isEmpty() ) { if ( values.size() > 0 ) { if ( values.last().toLower() != tag.toLower() ) { - QString message = "Expected line tag given (" + tag + + QString message = "Expected line tag given (" + tag + ") does not match contents (" + values.last() + ")"; throw IException(IException::User, message, _FILEINFO_); } @@ -514,21 +498,21 @@ namespace Isis { throw IException(IException::User, message, _FILEINFO_); } } - + return (values); } - + /** - * @brief Convert text to double value - * + * @brief Convert text to double value + * * This method will convert special forms of double text value formats to binary - * form. It is particulary useful when handle text of the form 2.440D+3". This - * format is not directly supported by conversion facilities. The "D" is - * converted to "e" in these cases. - * + * form. It is particulary useful when handle text of the form 2.440D+3". This + * format is not directly supported by conversion facilities. The "D" is + * converted to "e" in these cases. + * * @param value Text value to convert - * + * * @return double Converted text value */ double SumFile::cvtDouble(const QString &value) const { @@ -538,14 +522,14 @@ namespace Isis { /** - * @brief Load a list of SUMFILEs from a file - * - * This static method loads a list of SUMFILEs contained in a file. Each line in - * the file is assumsed to be a SUMFILE and will be initialized using a new - * SumFile object for each file contained in the list. - * + * @brief Load a list of SUMFILEs from a file + * + * This static method loads a list of SUMFILEs contained in a file. Each line in + * the file is assumsed to be a SUMFILE and will be initialized using a new + * SumFile object for each file contained in the list. + * * @param sumFiles Name of file containing SUMFILEs - * + * * @return SumFileList List of SumFile objects created from SUMFILE list */ SumFileList loadSumFiles(const FileList &sumFiles) { @@ -553,17 +537,15 @@ namespace Isis { progress.SetText("Loading Sum File List"); progress.SetMaximumSteps(sumFiles.size()); SumFileList sum_list; - + for (int f = 0; f < sumFiles.size(); f++) { progress.CheckStatus(); SharedSumFile sumF(new SumFile(sumFiles[f].original())); sum_list.append(sumF); } - + return (sum_list); } } // namespace Isis - - diff --git a/isis/src/control/apps/sumspice/SumFile.h b/isis/src/control/apps/sumspice/SumFile.h index 23d3e92f55..c0b75f4305 100644 --- a/isis/src/control/apps/sumspice/SumFile.h +++ b/isis/src/control/apps/sumspice/SumFile.h @@ -1,26 +1,14 @@ #ifndef SumFile_h #define SumFile_h -/** - * @file - * $Revision: 6565 $ - * $Date: 2016-02-10 17:15:35 -0700 (Wed, 10 Feb 2016) $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include @@ -41,44 +29,44 @@ namespace Isis { /** * @brief Container for a Gaskell SUMFILE - * - * This class will parse the contents of a R. Gaskell SUMFILE used in his - * stereo photoclinometry (SPC) system and provide access to the elements that + * + * This class will parse the contents of a R. Gaskell SUMFILE used in his + * stereo photoclinometry (SPC) system and provide access to the elements that * are stored therein. - * + * * @author 2015-02-02 Kris Becker - * + * * @internal - * @history 2015-02-02 Kris Becker Original Version - * @history 2016-02-09 Kris Becker - Updated documentation - * @history 2016-06-07 Kris Becker - Renamed getIlluminationPosition() to + * @history 2015-02-02 Kris Becker Original Version + * @history 2016-02-09 Kris Becker - Updated documentation + * @history 2016-06-07 Kris Becker - Renamed getIlluminationPosition() to * getSunPosition(). updateIlluminationPosition() did * not have an implementation so it was removed. - * @history 2016-09-14 Kris Becker - Moved updateTimes() to new SumFinder + * @history 2016-09-14 Kris Becker - Moved updateTimes() to new SumFinder * class as there is not enough information to do it * correctly in SumFile. */ class SumFile { public: - + SumFile(); SumFile(const QString &sumfile); virtual ~SumFile() { } - + bool isValid() const; QString name() const; QString utc() const; double et() const; const iTime &time() const; - + bool updateSpice(Cube &cube, Camera *camera = 0) const; bool updatePointing(Cube &cube, Camera *camera = 0) const; bool updatePosition(Cube &cube, Camera *camera = 0) const; - + Quaternion getPointing() const; std::vector getPosition() const; std::vector getSunPosition() const; - + std::ostream &brief(std::ostream &outs) const; private: @@ -91,7 +79,7 @@ namespace Isis { double m_pxlSize; double m_centerSample; double m_centerLine; - + double m_spacecraftPosition[3]; double m_pointingMatrix[3][3]; double m_sunPosition[3]; @@ -100,23 +88,23 @@ namespace Isis { double m_sigmaSCPos[3]; double m_sigmaPntg[3]; // QList m_measures; - + void parseSumFile(const QString &sumfile); - QStringList getSumLine(const QString &data, const int &nexpected = 0, + QStringList getSumLine(const QString &data, const int &nexpected = 0, const QString &tag = "") const; double cvtDouble(const QString &value) const; - + Quaternion getBFtoJ2000(Camera *camera) const; Quaternion getFrameRotation(const int &fromId, const int &toId, const double &timeEt) const; QString getFrameName(const int &frameid) const; int getFrameCode(const QString &frameName) const; - + }; - - ///!< Shared Resource pointer that everyone can use + + ///!< Shared Resource pointer that everyone can use typedef QSharedPointer SharedSumFile; - + ///!< Define a resource list typedef QList SumFileList; @@ -127,15 +115,15 @@ namespace Isis { /** * @brief Ascending order sort functor - * + * * This is a comparison class used to sort lists of SharedSumFile objects, in - * ascending order. Two shared sum files are passed in and the ephemeris - * times of each is compared using the less than operator. - * + * ascending order. Two shared sum files are passed in and the ephemeris + * times of each is compared using the less than operator. + * * @author 2015-07-28 Kris Becker - * + * * @internal - * @history 2015-07-28 Kris Becker Original Version + * @history 2015-07-28 Kris Becker Original Version */ class SortEtAscending { public: diff --git a/isis/src/control/apps/sumspice/SumFinder.cpp b/isis/src/control/apps/sumspice/SumFinder.cpp index a22d418e65..9b0b372730 100644 --- a/isis/src/control/apps/sumspice/SumFinder.cpp +++ b/isis/src/control/apps/sumspice/SumFinder.cpp @@ -1,26 +1,10 @@ -/** - * @file - * $Revision: 6565 $ - * $Date: 2016-02-10 17:15:35 -0700 (Wed, 10 Feb 2016) $ - * $Id: SumFile.cpp 6565 2016-02-11 00:15:35Z kbecker@GS.DOI.NET $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "SumFinder.h" diff --git a/isis/src/control/apps/sumspice/SumFinder.h b/isis/src/control/apps/sumspice/SumFinder.h index 7c635efa2c..5a1588bbe1 100644 --- a/isis/src/control/apps/sumspice/SumFinder.h +++ b/isis/src/control/apps/sumspice/SumFinder.h @@ -1,26 +1,14 @@ #ifndef SumFinder_h #define SumFinder_h -/** - * @file - * $Revision: 6565 $ - * $Date: 2016-02-10 17:15:35 -0700 (Wed, 10 Feb 2016) $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include diff --git a/isis/src/control/apps/sumspice/main.cpp b/isis/src/control/apps/sumspice/main.cpp index c18d2fe36f..e487256447 100644 --- a/isis/src/control/apps/sumspice/main.cpp +++ b/isis/src/control/apps/sumspice/main.cpp @@ -1,3 +1,12 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + + // $Id: sumspice.cpp 6565 2016-02-11 00:15:35Z kbecker@GS.DOI.NET $ #include "Isis.h" diff --git a/isis/src/control/apps/warp/WarpTransform.cpp b/isis/src/control/apps/warp/WarpTransform.cpp index 82f6561a00..ee8b64cf4d 100644 --- a/isis/src/control/apps/warp/WarpTransform.cpp +++ b/isis/src/control/apps/warp/WarpTransform.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include diff --git a/isis/src/control/apps/warp/WarpTransform.h b/isis/src/control/apps/warp/WarpTransform.h index bd91d0f88f..eafab04877 100644 --- a/isis/src/control/apps/warp/WarpTransform.h +++ b/isis/src/control/apps/warp/WarpTransform.h @@ -1,6 +1,14 @@ #ifndef WarpTransform_h #define WarpTransform_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include "Transform.h" #include "BasisFunction.h" @@ -41,5 +49,3 @@ namespace Isis { } #endif - - diff --git a/isis/src/control/apps/warp/main.cpp b/isis/src/control/apps/warp/main.cpp index f456a88f5c..9e142498c3 100644 --- a/isis/src/control/apps/warp/main.cpp +++ b/isis/src/control/apps/warp/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include @@ -111,4 +119,3 @@ void IsisMain() { delete basisLine; delete basisSamp; } - diff --git a/isis/src/control/objs/BundleAdjust/BundleAdjust.cpp b/isis/src/control/objs/BundleAdjust/BundleAdjust.cpp index 852693e659..2c8696cd30 100644 --- a/isis/src/control/objs/BundleAdjust/BundleAdjust.cpp +++ b/isis/src/control/objs/BundleAdjust/BundleAdjust.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "BundleAdjust.h" // std lib @@ -3062,7 +3070,7 @@ namespace Isis { std::ostringstream ostr; ostr << summaryGroup << std::endl; m_iterationSummary += QString::fromStdString( ostr.str() ); - + if (m_printSummary && iApp != NULL) { Application::Log(summaryGroup); } diff --git a/isis/src/control/objs/BundleAdjust/BundleAdjust.h b/isis/src/control/objs/BundleAdjust/BundleAdjust.h index bdb9afbaa9..1fcf848fa5 100644 --- a/isis/src/control/objs/BundleAdjust/BundleAdjust.h +++ b/isis/src/control/objs/BundleAdjust/BundleAdjust.h @@ -1,29 +1,14 @@ #ifndef BundleAdjust_h #define BundleAdjust_h -/** - * @file - * $Revision: 1.20 $ - * $Date: 2009/10/15 01:35:17 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ -// Qt lib +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include // parent class // std lib diff --git a/isis/src/control/objs/BundleAdjust/unitTest.cpp b/isis/src/control/objs/BundleAdjust/unitTest.cpp index 7b797b5554..1f3855ecbc 100644 --- a/isis/src/control/objs/BundleAdjust/unitTest.cpp +++ b/isis/src/control/objs/BundleAdjust/unitTest.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include "BundleAdjust.h" @@ -42,7 +50,7 @@ Errors: void BundleAdjust::init(Progress *progress) { (image==false) for BundleImage* image = new BundleImage(camera, serialNumber, fileName); QString msg = "In BundleAdjust::init(): image " + fileName + "is null" + "\n"; - (observation==false) for BundleObservation *observation = m_bundleObservations.addNew(image, observationNumber, instrumentId, m_bundleSettings); + (observation==false) for BundleObservation *observation = m_bundleObservations.addNew(image, observationNumber, instrumentId, m_bundleSettings); QString msg = "In BundleAdjust::init(): observation " + observationNumber + "is null" + "\n"; diff --git a/isis/src/control/objs/BundleResults/BundleResults.cpp b/isis/src/control/objs/BundleResults/BundleResults.cpp index 3d7c1d2954..f8d3447f49 100644 --- a/isis/src/control/objs/BundleResults/BundleResults.cpp +++ b/isis/src/control/objs/BundleResults/BundleResults.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "BundleResults.h" #include diff --git a/isis/src/control/objs/BundleResults/BundleResults.h b/isis/src/control/objs/BundleResults/BundleResults.h index 3fd2b27e0d..0e4c75b96b 100644 --- a/isis/src/control/objs/BundleResults/BundleResults.h +++ b/isis/src/control/objs/BundleResults/BundleResults.h @@ -1,28 +1,14 @@ #ifndef BundleResults_h #define BundleResults_h -/** - * @file - * $Revision: 1.20 $ - * $Date: 2009/10/15 01:35:17 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + // Qt Library #include #include @@ -85,12 +71,12 @@ namespace Isis { * @history 2017-04-24 Ian Humphrey - Removed pvlObject() method. Commented out m_id serialization * for save() (causes segfault in unit test for empty xml). Fixes #4797. * @history 2017-04-27 J Bonn - Updated serialization code and tests. - * @history 2017-05-30 Debbie A. Cook - Corrected class names in method comments and generalized - * control point coordinate names. Methods changed: copy constructor, + * @history 2017-05-30 Debbie A. Cook - Corrected class names in method comments and generalized + * control point coordinate names. Methods changed: copy constructor, * assignment operator, initialize, Also added access methods for coordinate types. * References #4649 and #501. - * @history 2018-09-30 Debbie A. Cook - Removed methods setRadiansToMeters and - * radiansToMeters and member variable m_radiansToMeters. References #4649 + * @history 2018-09-30 Debbie A. Cook - Removed methods setRadiansToMeters and + * radiansToMeters and member variable m_radiansToMeters. References #4649 * and #501. */ class BundleResults : public QObject { @@ -208,7 +194,7 @@ namespace Isis { double sigmaCoord1StatisticsRms() const; double sigmaCoord2StatisticsRms() const; double sigmaCoord3StatisticsRms() const; - + double rmsRx() const; // currently unused ??? double rmsRy() const; // currently unused ??? double rmsRxy() const; // currently unused ??? @@ -324,9 +310,9 @@ namespace Isis { double m_elapsedTime; //!< elapsed time for bundle double m_elapsedTimeErrorProp; //!< elapsed time for error propagation bool m_converged; - + // Variables for output methods in BundleSolutionInfo - + QVector m_bundleControlPoints; /**< The vector of BundleControlPoints from BundleAdjust. Equivalent to the output control net minus diff --git a/isis/src/control/objs/BundleResults/unitTest.cpp b/isis/src/control/objs/BundleResults/unitTest.cpp index fb3d05fd19..543730ea90 100755 --- a/isis/src/control/objs/BundleResults/unitTest.cpp +++ b/isis/src/control/objs/BundleResults/unitTest.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include diff --git a/isis/src/control/objs/BundleSettings/BundleSettings.cpp b/isis/src/control/objs/BundleSettings/BundleSettings.cpp index 0a67497149..5d59ee3d68 100644 --- a/isis/src/control/objs/BundleSettings/BundleSettings.cpp +++ b/isis/src/control/objs/BundleSettings/BundleSettings.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "BundleSettings.h" #include @@ -264,13 +272,13 @@ namespace Isis { bool solveRadius, SurfacePoint::CoordinateType coordTypeBundle, SurfacePoint::CoordinateType coordTypeReports, - double globalPointCoord1AprioriSigma, - double globalPointCoord2AprioriSigma, + double globalPointCoord1AprioriSigma, + double globalPointCoord2AprioriSigma, double globalPointCoord3AprioriSigma) { m_solveObservationMode = solveObservationMode; m_solveRadius = solveRadius; m_updateCubeLabel = updateCubeLabel; - m_errorPropagation = errorPropagation; + m_errorPropagation = errorPropagation; m_cpCoordTypeReports = coordTypeReports; m_cpCoordTypeBundle = coordTypeBundle; // m_cpCoordTypeBundle = SurfacePoint::Latitudinal; @@ -471,8 +479,8 @@ namespace Isis { /** - * Retrieves global a priori sigma for 1st coordinate of points for this bundle - * + * Retrieves global a priori sigma for 1st coordinate of points for this bundle + * * @return @b double The global a priori sigma for point coordinate 1. */ double BundleSettings::globalPointCoord1AprioriSigma() const { @@ -482,7 +490,7 @@ namespace Isis { /** * Retrieves the global a priori sigma for 2nd coordinate of points for this bundle - * + * * @return @b double The global a priori sigma for point coordinate 2. */ double BundleSettings::globalPointCoord2AprioriSigma() const { @@ -491,8 +499,8 @@ namespace Isis { /** - * Retrieves the global a priori sigma 3rd coordinate of points for this bundle - * + * Retrieves the global a priori sigma 3rd coordinate of points for this bundle + * * @return @b double The global a priori sigma for point coordinate 3. */ double BundleSettings::globalPointCoord3AprioriSigma() const { @@ -512,8 +520,8 @@ namespace Isis { /** - * Retrieves solve settings for the observation corresponding to the given observation number. - * If no corresponding settings object exists, return a new solve settings with no related + * Retrieves solve settings for the observation corresponding to the given observation number. + * If no corresponding settings object exists, return a new solve settings with no related * observation numbers. * * @param observationNumber The observation number associated with the @@ -570,7 +578,7 @@ namespace Isis { */ QList BundleSettings::observationSolveSettings() const { return m_observationSolveSettings; - } + } // =============================================================================================// diff --git a/isis/src/control/objs/BundleSettings/BundleSettings.h b/isis/src/control/objs/BundleSettings/BundleSettings.h index 4b1ab834e9..7757d5feb2 100644 --- a/isis/src/control/objs/BundleSettings/BundleSettings.h +++ b/isis/src/control/objs/BundleSettings/BundleSettings.h @@ -1,26 +1,13 @@ #ifndef BundleSettings_h #define BundleSettings_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ // Qt library #include @@ -110,20 +97,20 @@ namespace Isis { * @history 2018-06-28 Christopher Combs - Added observationSolveSettings() method to retrieve * m_observationSolveSettings. Fixes #497. * - * @history 2017-06-25 Debbie Cook - Added m_cpCoordTypeReports and m_cpCoordTypeBundle. - * The 2nd type determines how control point coordinates are entered - * into the the matrix and interpreted throughout the adjustment. The + * @history 2017-06-25 Debbie Cook - Added m_cpCoordTypeReports and m_cpCoordTypeBundle. + * The 2nd type determines how control point coordinates are entered + * into the the matrix and interpreted throughout the adjustment. The * 1st type determines the coordinate type of control points in reports. - * Added the new coordinate type as an argument to SetSolveOptions. + * Added the new coordinate type as an argument to SetSolveOptions. * Changed GlobalAprioriSigmas names to more generic names: Latitude to * PointCoord1, Longitude to PointCoord2, and Radius to PointCoord3 so - * they can be used for either lat/lon/radius or x/y/z. Also added + * they can be used for either lat/lon/radius or x/y/z. Also added * accessor methods, CoordTypeReports() & CoordTypeBundle() * for the new coordinate type members. * References #4649 and #501. * @history 2019-05-17 Tyler Wilson - Added QString m_cubeList member function as well * as get/set member functions. References #3267. - * + * * @todo Determine which XmlStackedHandlerReader constructor is preferred * @todo Determine which XmlStackedHandler needs a Project pointer (see constructors) * @todo Determine whether QList m_observationSolveSettings @@ -171,10 +158,10 @@ namespace Isis { bool solveRadius = false, SurfacePoint::CoordinateType coordTypeBundle = SurfacePoint::Latitudinal, SurfacePoint::CoordinateType coordTypeReports = SurfacePoint::Latitudinal, - double globalPointCoord1AprioriSigma = Isis::Null, - double globalPointCoord2AprioriSigma = Isis::Null, - double globalPointCoord3AprioriSigma = Isis::Null); - void setOutlierRejection(bool outlierRejection, + double globalPointCoord1AprioriSigma = Isis::Null, + double globalPointCoord2AprioriSigma = Isis::Null, + double globalPointCoord3AprioriSigma = Isis::Null); + void setOutlierRejection(bool outlierRejection, double multiplier = 1.0); void setObservationSolveOptions(QList obsSolveSettingsList); void setCreateInverseMatrix(bool createMatrix); @@ -197,7 +184,7 @@ namespace Isis { int numberSolveSettings() const; BundleObservationSolveSettings observationSolveSettings(QString instrumentId) const; BundleObservationSolveSettings observationSolveSettings(int n) const; - QList observationSolveSettings() const; + QList observationSolveSettings() const; //=====================================================================// @@ -405,7 +392,7 @@ namespace Isis { // Control Points SurfacePoint::CoordinateType m_cpCoordTypeReports; /**< Indicates the coordinate type for outputting control points in reports. */ - SurfacePoint::CoordinateType m_cpCoordTypeBundle; /**< Indicates the coordinate type used + SurfacePoint::CoordinateType m_cpCoordTypeBundle; /**< Indicates the coordinate type used for control points in the bundle adjustment */ // Output Options QString m_outputFilePrefix; /**< The prefix for all output files. If the user does not want diff --git a/isis/src/control/objs/BundleSettings/unitTest.cpp b/isis/src/control/objs/BundleSettings/unitTest.cpp index 3dc1caa844..bce54ee887 100755 --- a/isis/src/control/objs/BundleSettings/unitTest.cpp +++ b/isis/src/control/objs/BundleSettings/unitTest.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include @@ -49,8 +57,8 @@ void printXml(const T &); * Fixes #4797. * @history 2018-05-24 Ken Edmundson - Updated truth data to indicate default value for * m_createInverseMatrix was changed from true to false. - * @history 2018-06-04 Debbie A. Cook - (added to BundleXYZ branch on 2017-06-25) Updated to - * reflect added argument for control pointcoordinate type. References + * @history 2018-06-04 Debbie A. Cook - (added to BundleXYZ branch on 2017-06-25) Updated to + * reflect added argument for control pointcoordinate type. References * #4649 and #501. * * @todo Truth updated so that the name of the BundleObservationSolveSettings object is Null, @@ -373,4 +381,3 @@ void printXml(const T &printable) { output.remove(QRegExp("[^<]*")); qDebug().noquote() << output << endl << endl; } - diff --git a/isis/src/control/objs/BundleSolutionInfo/BundleSolutionInfo.cpp b/isis/src/control/objs/BundleSolutionInfo/BundleSolutionInfo.cpp index b96b89926b..a818ed20e5 100755 --- a/isis/src/control/objs/BundleSolutionInfo/BundleSolutionInfo.cpp +++ b/isis/src/control/objs/BundleSolutionInfo/BundleSolutionInfo.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "BundleSolutionInfo.h" #include diff --git a/isis/src/control/objs/BundleSolutionInfo/BundleSolutionInfo.h b/isis/src/control/objs/BundleSolutionInfo/BundleSolutionInfo.h index 2922d12f2f..f34e7b3e0d 100755 --- a/isis/src/control/objs/BundleSolutionInfo/BundleSolutionInfo.h +++ b/isis/src/control/objs/BundleSolutionInfo/BundleSolutionInfo.h @@ -1,26 +1,13 @@ #ifndef BundleSolutionInfo_h #define BundleSolutionInfo_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include diff --git a/isis/src/control/objs/BundleSolutionInfo/unitTest.cpp b/isis/src/control/objs/BundleSolutionInfo/unitTest.cpp index 2751b0a090..17d0ebf79e 100755 --- a/isis/src/control/objs/BundleSolutionInfo/unitTest.cpp +++ b/isis/src/control/objs/BundleSolutionInfo/unitTest.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include diff --git a/isis/src/control/objs/BundleUtilities/BundleControlPoint.cpp b/isis/src/control/objs/BundleUtilities/BundleControlPoint.cpp index 01ebc9a490..090d57f98c 100644 --- a/isis/src/control/objs/BundleUtilities/BundleControlPoint.cpp +++ b/isis/src/control/objs/BundleUtilities/BundleControlPoint.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "BundleControlPoint.h" #include @@ -17,9 +25,9 @@ namespace Isis { /** - * Constructs a BundleControlPoint object from a ControlPoint. Only the - * non-ignored measures are added to the BundleControlPoint. - * @param controlPoint Pointer to a ControlPoint that will be used to + * Constructs a BundleControlPoint object from a ControlPoint. Only the + * non-ignored measures are added to the BundleControlPoint. + * @param controlPoint Pointer to a ControlPoint that will be used to * construct this BundleControlPoint. */ BundleControlPoint::BundleControlPoint(const BundleSettingsQsp bundleSettings, @@ -34,7 +42,7 @@ namespace Isis { continue; } - addMeasure(controlMeasure); + addMeasure(controlMeasure); } // initialize to 0.0 @@ -61,9 +69,9 @@ namespace Isis { /** - * Copy constructor. Constructs a BundleControlPoint object from an existing - * BundleControlPoint. - * + * Copy constructor. Constructs a BundleControlPoint object from an existing + * BundleControlPoint. + * * @param src The BundleControlPoint to be copied. */ BundleControlPoint::BundleControlPoint(const BundleControlPoint &src) { @@ -72,22 +80,22 @@ namespace Isis { /** - * Destructor for BundleControlPoint. + * Destructor for BundleControlPoint. */ BundleControlPoint::~BundleControlPoint() { } /** - * Copies given BundleControlPoint to this BundleControlPoint. - * + * Copies given BundleControlPoint to this BundleControlPoint. + * * @param src The BundleControlPoint to be copied. */ void BundleControlPoint::copy(const BundleControlPoint &src) { // sanity check clear(); - + m_controlPoint = src.m_controlPoint; int numMeasures = src.size(); @@ -107,11 +115,11 @@ namespace Isis { /** - * Creates a BundleMeasure from the given ControlMeasure and appends it to - * this BundleControlPoint's measure list. - * + * Creates a BundleMeasure from the given ControlMeasure and appends it to + * this BundleControlPoint's measure list. + * * @param controlMeasure The ControlMeasure to be converted. - * + * * @return @b BundleMeasure* A pointer to the new BundleMeasure. */ BundleMeasureQsp BundleControlPoint::addMeasure(ControlMeasure *controlMeasure) { @@ -135,8 +143,8 @@ namespace Isis { /** - * Sets the adjusted surface point for this BundleControlPoint. - * + * Sets the adjusted surface point for this BundleControlPoint. + * * @param surfacePoint The surface point to be set. */ void BundleControlPoint::setAdjustedSurfacePoint(SurfacePoint surfacePoint) { @@ -169,9 +177,9 @@ namespace Isis { /** - * Sets the weights using the given BundleSettings QSharedPointer and a - * conversion value for meters to radians. - * + * Sets the weights using the given BundleSettings QSharedPointer and a + * conversion value for meters to radians. + * * @param settings A QSharedPointer to BundleSettings object. * @param metersToRadians A double precision conversion factor. */ @@ -187,7 +195,7 @@ namespace Isis { m_weights[2] = 1.0e+50; // m_aprioriSigmas = Isis::Null by default } - + if (m_controlPoint->GetType() == ControlPoint::Free) { // Global sigmas are temporary and should not be stored in the control net. Currently // global sigmas are always in meters. Make sure unit of weights is 1/(var unit squared), @@ -207,7 +215,7 @@ namespace Isis { } else { if (!IsSpecial(globalPointCoord3AprioriSigma)) { - setSigmaWeightFromGlobals(globalPointCoord3AprioriSigma, 2); + setSigmaWeightFromGlobals(globalPointCoord3AprioriSigma, 2); } } } @@ -226,7 +234,7 @@ namespace Isis { m_controlPoint->GetAprioriSurfacePoint().GetWeight(m_coordTypeBundle, SurfacePoint::One); } else if (!IsSpecial(globalPointCoord1AprioriSigma)) { - setSigmaWeightFromGlobals(globalPointCoord1AprioriSigma, 0); + setSigmaWeightFromGlobals(globalPointCoord1AprioriSigma, 0); } // else not constrained and global sigma is Null, then m_aprioriSigmas = Isis::Null // m_weights = 0.0 @@ -238,7 +246,7 @@ namespace Isis { m_controlPoint->GetAprioriSurfacePoint().GetWeight(m_coordTypeBundle, SurfacePoint::Two); } else if (!IsSpecial(globalPointCoord2AprioriSigma)) { - setSigmaWeightFromGlobals(globalPointCoord2AprioriSigma, 1); + setSigmaWeightFromGlobals(globalPointCoord2AprioriSigma, 1); } // else not constrained and global sigma is Null, then m_aprioriSigmas = Isis::Null // m_weights = 0.0 @@ -254,7 +262,7 @@ namespace Isis { (m_coordTypeBundle, SurfacePoint::Three); } else if (!IsSpecial(globalPointCoord3AprioriSigma)) { - setSigmaWeightFromGlobals(globalPointCoord3AprioriSigma, 2); + setSigmaWeightFromGlobals(globalPointCoord3AprioriSigma, 2); } // else not constrained and global sigma is Null, then m_aprioriSigmas = Isis::Null // m_weights = 0.0 } @@ -263,18 +271,18 @@ namespace Isis { /** - * Sets the member sigmas and weights from a global sigma.. - * -// *** TODO *** Should index be SurfacePoint::CoordIndex? + * Sets the member sigmas and weights from a global sigma.. + * +// *** TODO *** Should index be SurfacePoint::CoordIndex? * @param gSigma The global sigma to assign. * @param index The index of the point coordinate being set (0, 1, or 2). * @param cFactor The conversion factor applied to gSigma to match bundle variable units. - * - * @see formatAprioriSigmaString() + * + * @see formatAprioriSigmaString() */ - void BundleControlPoint::setSigmaWeightFromGlobals(double gSigma, int index) { + void BundleControlPoint::setSigmaWeightFromGlobals(double gSigma, int index) { m_aprioriSigmas[index] = gSigma; - + switch (index) { case 0: if (m_coordTypeBundle == SurfacePoint::Latitudinal) { @@ -297,7 +305,7 @@ namespace Isis { throw IException(IException::Programmer, msg, _FILEINFO_); } break; - case 1: + case 1: // if (!IsSpecial(globalPointCoord2AprioriSigma)) { if (m_coordTypeBundle == SurfacePoint::Latitudinal) { double sigmaRadians = @@ -314,9 +322,9 @@ namespace Isis { IString msg ="Unknown surface point coordinate type enum [" + toString(m_coordTypeBundle) + "]." ; throw IException(IException::Programmer, msg, _FILEINFO_); - } + } break; - + case 2: // Coordinate 2 is either latitudinal radius or rectangular z, both in m { @@ -324,7 +332,7 @@ namespace Isis { m_weights[2] = 1./ (sigmakm*sigmakm); // 1/km^2 } break; - + default: IString msg ="Unknown coordinate index [" + toString(index) + "]." ; throw IException(IException::Programmer, msg, _FILEINFO_); @@ -358,7 +366,7 @@ namespace Isis { QMapIterator< int, LinearAlgebra::Matrix * > Qit(m_cholmodQMatrix); int subrangeStart, subrangeEnd; - + while ( Qit.hasNext() ) { Qit.next(); @@ -366,7 +374,7 @@ namespace Isis { subrangeStart = sparseNormals.at(columnIndex)->startColumn(); subrangeEnd = subrangeStart + Qit.value()->size2(); - + m_nicVector += alpha * prod(*(Qit.value()),subrange(v1,subrangeStart,subrangeEnd)); } } @@ -383,10 +391,10 @@ namespace Isis { SparseBlockMatrix &sparseNormals, const BundleTargetBodyQsp target) { if (!isRejected()) { - + // subtract product of Q and nj from NIC productAlphaAV(-1.0, sparseNormals, imageSolution); - + // update adjusted surface point appropriately for the coordinate type switch (m_coordTypeBundle) { case SurfacePoint::Latitudinal: @@ -400,7 +408,7 @@ namespace Isis { + toString(m_coordTypeBundle) + "]." ; throw IException(IException::Programmer, msg, _FILEINFO_); } - + // sum and save corrections m_corrections(0) += m_nicVector[0]; m_corrections(1) += m_nicVector[1]; @@ -408,10 +416,10 @@ namespace Isis { } } - + /** * Accessor for the raw ControlPoint object used for this BundleControlPoint. - * + * * @return @b ControlPoint* A pointer to the raw ControlPoint. */ ControlPoint *BundleControlPoint::rawControlPoint() const { @@ -421,7 +429,7 @@ namespace Isis { /** * Method used to determine whether this control point is rejected. - * + * * @return @b bool Indicates whether this control point is rejected. */ bool BundleControlPoint::isRejected() const { @@ -431,7 +439,7 @@ namespace Isis { /** * Accesses number of measures associated with this BundleControlPoint. - * + * * @return @b int The number of measures for this point. */ int BundleControlPoint::numberOfMeasures() const { @@ -465,7 +473,7 @@ namespace Isis { /** * Accesses the adjusted SurfacePoint associated with this BundleControlPoint. - * + * * @return @b SurfacePoint The adjusted surface point. */ SurfacePoint BundleControlPoint::adjustedSurfacePoint() const { @@ -474,8 +482,8 @@ namespace Isis { /** - * Accesses the Point ID associated with this BundleControlPoint. - * + * Accesses the Point ID associated with this BundleControlPoint. + * * @return @b QString The ID for this point. */ QString BundleControlPoint::id() const { @@ -485,10 +493,10 @@ namespace Isis { /** * Accesses BundleControlPoint's type. - * + * * @return @b ControlPoint::PointType The BundleControlPoint's type. Options are: * Fixed = 0, Constrained = 1, Free = 2. - * + * * @see ControlPoint::GetType() */ ControlPoint::PointType BundleControlPoint::type() const{ @@ -498,10 +506,10 @@ namespace Isis { /** * Accesses BundleControlPoint's coordinate type for reports. - * - * @return @b ControlPoint::CoordinateType The BundleControlPoint's coordinate type. + * + * @return @b ControlPoint::CoordinateType The BundleControlPoint's coordinate type. * See SurfacePoint for the options. - * + * * @see ControlPoint::getCoordType() */ SurfacePoint::CoordinateType BundleControlPoint::coordTypeReports() const{ @@ -511,10 +519,10 @@ namespace Isis { /** * Accesses BundleControlPoint's control point coordinate type for the bundle adjustment. - * - * @return @b ControlPoint::CoordinateType The BundleControlPoint's coordinate type. + * + * @return @b ControlPoint::CoordinateType The BundleControlPoint's coordinate type. * See SurfacePoint for the options. - * + * * @see ControlPoint::getCoordTypeBundle() */ SurfacePoint::CoordinateType BundleControlPoint::coordTypeBundle() const{ @@ -524,10 +532,10 @@ namespace Isis { // *** TODO *** Need to add bounded vectors to Linear Algebra class /** - * Accesses the 3 dimensional ordered vector of correction values associated - * with coord1, coord2, and coord 3 (latitude, longitude, and radius or X, Y, and Z. + * Accesses the 3 dimensional ordered vector of correction values associated + * with coord1, coord2, and coord 3 (latitude, longitude, and radius or X, Y, and Z. * A bounded vector is recommended because the size will always be 3. - * + * * @return @b boost::numeric::ublas::bounded_vector& The vector of correction values. */ boost::numeric::ublas::bounded_vector< double, 3 > &BundleControlPoint::corrections() { @@ -536,9 +544,9 @@ namespace Isis { /** - * Accesses the 3 dimensional ordered vector of apriori sigmas (apriori - * coordinate1, apriori coordinate2, apriori coordinate3). - * + * Accesses the 3 dimensional ordered vector of apriori sigmas (apriori + * coordinate1, apriori coordinate2, apriori coordinate3). + * * @return @b boost::numeric::ublas::bounded_vector& The vector of apriori sigmas. */ boost::numeric::ublas::bounded_vector< double, 3 > &BundleControlPoint::aprioriSigmas() { @@ -550,9 +558,9 @@ namespace Isis { /** - * Accesses the 3 dimensional ordered vector of adjusted sigmas (adjusted - * coordinate1, adjusted coordinate2, adjusted coordinate3). - * + * Accesses the 3 dimensional ordered vector of adjusted sigmas (adjusted + * coordinate1, adjusted coordinate2, adjusted coordinate3). + * * @return @b boost::numeric::ublas::bounded_vector& The vector of adjusted sigmas. */ boost::numeric::ublas::bounded_vector< double, 3 > &BundleControlPoint::adjustedSigmas() { @@ -561,9 +569,9 @@ namespace Isis { /** - * Accesses the 3 dimensional ordered vector of weight values associated - * with coordinate1, coordinate2, and coordinate3. - * + * Accesses the 3 dimensional ordered vector of weight values associated + * with coordinate1, coordinate2, and coordinate3. + * * @return @b boost::numeric::ublas::bounded_vector& The vector of weight values. */ boost::numeric::ublas::bounded_vector< double, 3 > &BundleControlPoint::weights() { @@ -572,8 +580,8 @@ namespace Isis { /** - * Accesses the 3 dimensional ordered NIC vector. - * + * Accesses the 3 dimensional ordered NIC vector. + * * @return @b boost::numeric::ublas::bounded_vector& The NIC vector. */ boost::numeric::ublas::bounded_vector &BundleControlPoint::nicVector() { @@ -583,7 +591,7 @@ namespace Isis { /** * Accesses the CholMod matrix associated with this BundleControlPoint. - * + * * @return @b SparseBlockRowMatrix& The CholMod row matrix. */ SparseBlockRowMatrix &BundleControlPoint::cholmodQMatrix() { @@ -592,17 +600,17 @@ namespace Isis { /** - * Formats an output summary string for this BundleControlPoint. This string - * includes ID, point type, number of rays from non-rejected measures, - * residual RMS, adjusted coordinate1, adjusted coordinate 2, and adjusted - * coordinate 3 followed by the adjusted sigmas. In the case of Latitudinal - * coordinates, the coordinates will be adjusted latitude and longitude (in degrees), - * the adjusted radius (in km), and the adjusted sigmas for latitude, longitude and - * radius all in meters. In the case of Rectangular coordinates, the coordinates - * will be X, Y, Z (in km), and the adjusted sigmas for X, Y, and Z all in meters. - * + * Formats an output summary string for this BundleControlPoint. This string + * includes ID, point type, number of rays from non-rejected measures, + * residual RMS, adjusted coordinate1, adjusted coordinate 2, and adjusted + * coordinate 3 followed by the adjusted sigmas. In the case of Latitudinal + * coordinates, the coordinates will be adjusted latitude and longitude (in degrees), + * the adjusted radius (in km), and the adjusted sigmas for latitude, longitude and + * radius all in meters. In the case of Rectangular coordinates, the coordinates + * will be X, Y, Z (in km), and the adjusted sigmas for X, Y, and Z all in meters. + * * @param errorPropagation Indicates whether error propagation was selected. - * + * * @return @b QString The formatted output summary string. */ QString BundleControlPoint::formatBundleOutputSummaryString(bool errorPropagation) const { @@ -611,7 +619,7 @@ namespace Isis { int numGoodRays = numRays - numberOfRejectedMeasures(); double ResidualRms = residualRms(); - // Return generic set of control point coordinates as floating point values + // Return generic set of control point coordinates as floating point values // Be careful because of the potential to confuse units. SurfacePoint::CoordUnits units = SurfacePoint::Degrees; if (m_coordTypeReports == SurfacePoint::Rectangular) units = SurfacePoint::Kilometers; @@ -642,20 +650,20 @@ namespace Isis { /** - * Formats a detailed output string table for this BundleControlPoint. - * + * Formats a detailed output string table for this BundleControlPoint. + * * @param errorPropagation Indicates whether error propagation was selected. - * @param RTM Conversion factor from radians to meters. Used to convert the + * @param RTM Conversion factor from radians to meters. Used to convert the * latitude and longitude corrections to meters. * @param solveRadius A flag indicating to solve for each points individual radius. * When solveRadius is false, the point radius is heavily weighted - * + * * @return @b QString The formatted output detailed string. */ QString BundleControlPoint::formatBundleOutputDetailString(bool errorPropagation, bool solveRadius) const { QString output; - + switch (m_coordTypeReports) { case SurfacePoint::Latitudinal: output = formatBundleLatitudinalOutputDetailString(errorPropagation, solveRadius); @@ -669,19 +677,19 @@ namespace Isis { } return output; } - + /** - * Formats a detailed output string table for this Latitudinal BundleControlPoint. - * + * Formats a detailed output string table for this Latitudinal BundleControlPoint. + * * @param errorPropagation Indicates whether error propagation was selected. - * @param RTM Conversion factor from radians to meters. Used to convert the + * @param RTM Conversion factor from radians to meters. Used to convert the * latitude and longitude corrections to meters. * @param solveRadius A flag indicating to solve for each points individual radius. * When solveRadius is false, the point radius is heavily weighted - * + * * @return @b QString The formatted output detailed string. - * + * * @internal * @history 2017-08-24 Debbie A. Cook - Revised units of cor_rad to be km instead of meters * when outputting latitudinal corrections in degrees. Fixed @@ -725,7 +733,7 @@ namespace Isis { double yCor = m_corrections(1); // km double z = m_controlPoint->GetAdjustedSurfacePoint().GetZ().kilometers(); double zCor = m_corrections(2); // km - + if (!IsSpecial(x) && !IsSpecial(y) && !IsSpecial(z)) { SurfacePoint rectPoint(Displacement(x - xCor, Displacement::Kilometers), Displacement(y - yCor, Displacement::Kilometers), @@ -753,7 +761,7 @@ namespace Isis { cor_rad_m = m_corrections(2) * 1000.0; // radius correction, meters cor_lat_m = m_controlPoint->GetAdjustedSurfacePoint().LatitudeToMeters(m_corrections(0)); - cor_lon_m = m_controlPoint->GetAdjustedSurfacePoint().LongitudeToMeters(m_corrections(1)); + cor_lon_m = m_controlPoint->GetAdjustedSurfacePoint().LongitudeToMeters(m_corrections(1)); cor_rad_km = m_corrections(2); if (!IsSpecial(lat)) { @@ -796,10 +804,10 @@ namespace Isis { output += QString(" LATITUDE%1%2%3%4%5%6\n") .arg(formatValue(latInit, 17, 8)) // deg .arg(formatValue(cor_lat_dd, 21, 8)) // deg - .arg(formatValue(cor_lat_m, 20, 8)) // m + .arg(formatValue(cor_lat_m, 20, 8)) // m .arg(formatValue(lat, 20, 8)) // deg .arg(formatCoordAprioriSigmaString(idx, 18,8, true)) // m - .arg(formatCoordAdjustedSigmaString(idx, 18,8,errorPropagation)); // m + .arg(formatCoordAdjustedSigmaString(idx, 18,8,errorPropagation)); // m idx = SurfacePoint::Two; output += QString(" LONGITUDE%1%2%3%4%5%6\n") @@ -821,17 +829,17 @@ namespace Isis { return output; } - + /** - * Formats a detailed output string table for this Rectangular BundleControlPoint. - * + * Formats a detailed output string table for this Rectangular BundleControlPoint. + * * @param errorPropagation Indicates whether error propagation was selected. - * + * * @return @b QString The formatted output detailed string. - * + * * @internal - * @history 2017-08-24 Debbie A. Cook - Corrected units reported in comments to correctly report + * @history 2017-08-24 Debbie A. Cook - Corrected units reported in comments to correctly report * km and also in label line. */ QString BundleControlPoint::formatBundleRectangularOutputDetailString @@ -851,7 +859,7 @@ namespace Isis { double XInit = Isis::Null; double YInit = Isis::Null; double ZInit = Isis::Null; - + if (m_coordTypeBundle == SurfacePoint::Latitudinal) { double lat = m_controlPoint->GetAdjustedSurfacePoint().GetLatitude().degrees(); double latcor = m_corrections(0) * RAD2DEG; @@ -923,10 +931,10 @@ namespace Isis { SurfacePoint::CoordIndex idx = SurfacePoint::One; output += QString(" BODY-FIXED-X%1%2%3%4%5\n") .arg(formatValue(XInit, 17, 8)) // km - .arg(formatValue(cor_X_m, 20, 8)) // km + .arg(formatValue(cor_X_m, 20, 8)) // km .arg(formatValue(X, 20, 8)) // km .arg(formatCoordAprioriSigmaString(idx, 18,8, true)) // m - .arg(formatCoordAdjustedSigmaString(idx, 18,8,errorPropagation)); // m + .arg(formatCoordAdjustedSigmaString(idx, 18,8,errorPropagation)); // m idx = SurfacePoint::Two; output += QString(" BODY-FIXED-Y%1%2%3%4%5\n") @@ -951,35 +959,35 @@ namespace Isis { /** - * Formats the given double precision value using the specified field width - * and precision. If the given value is special, then "Null" is returned. - * + * Formats the given double precision value using the specified field width + * and precision. If the given value is special, then "Null" is returned. + * * @param value The double value to be formattted. * @param fieldWidth The return string's field width. * @param precision The precision of the given double value to be saved off. - * + * * @return @b QString The formatted value, as a string. */ QString BundleControlPoint::formatValue(double value, int fieldWidth, int precision) const { QString output; - IsSpecial(value) ? + IsSpecial(value) ? output = QString("%1").arg("Null", fieldWidth) : output = QString("%1").arg(value, fieldWidth, 'f', precision); return output; } - + /** - * Formats the apriori sigma value indicated by the given type code. If no - * sigma was set, then the string "N/A" will be returned. - * - * @param index CoordIndex Coordinate index One: Latitude or X, Two: Longitude or Y, + * Formats the apriori sigma value indicated by the given type code. If no + * sigma was set, then the string "N/A" will be returned. + * + * @param index CoordIndex Coordinate index One: Latitude or X, Two: Longitude or Y, * or Three: Radius or Z * @param fieldWidth The return string's field width. * @param precision The precision of the double to be saved off. * @param solveRadius A flag indicating to solve for each points individual radius. * When solveRadius is false, the point radius is heavily weighted - * + * * @return @b QString The formatted value, as a string. */ QString BundleControlPoint::formatAprioriSigmaString(SurfacePoint::CoordIndex index, @@ -1002,17 +1010,17 @@ namespace Isis { /** - * Formats the apriori coordinate 1 (latitude or X) sigma value. - * + * Formats the apriori coordinate 1 (latitude or X) sigma value. + * * @param fieldWidth The return string's field width. * @param precision The precision of the double to be saved off. - * + * * @return @b QString The formatted apriori coordinate 1 sigma value, as a string. - * - * @see formatAprioriSigmaString() + * + * @see formatAprioriSigmaString() */ QString BundleControlPoint::formatCoordAprioriSigmaString(SurfacePoint::CoordIndex index, - int fieldWidth, + int fieldWidth, int precision, bool solveRadius) const { return formatAprioriSigmaString(index, fieldWidth, precision, solveRadius); @@ -1020,16 +1028,16 @@ QString BundleControlPoint::formatCoordAprioriSigmaString(SurfacePoint::CoordInd /** - * Formats the adjusted sigma value indicated by the given type code. If error - * propagation is false or the selected sigma type was set to Null, then only - * "N/A" will be returned. - * - * @param index CoordIndex Coordinate index One: Latitude or X, Two: Longitude or Y, + * Formats the adjusted sigma value indicated by the given type code. If error + * propagation is false or the selected sigma type was set to Null, then only + * "N/A" will be returned. + * + * @param index CoordIndex Coordinate index One: Latitude or X, Two: Longitude or Y, * or Three: Radius or Z * @param fieldWidth The return string's field width. * @param precision The precision of the double to be saved off. * @param errorPropagation Indicates whether error propagation was selected. - * + * * @return @b QString The formatted value, as a string. */ QString BundleControlPoint::formatAdjustedSigmaString(SurfacePoint::CoordIndex index, @@ -1057,16 +1065,16 @@ QString BundleControlPoint::formatCoordAprioriSigmaString(SurfacePoint::CoordInd /** - * Formats the adjusted coordinate sigma value. - * + * Formats the adjusted coordinate sigma value. + * * @param index The coordinate index of the sigma to return. * @param fieldWidth The return string's field width. * @param precision The precision of the double to be saved off. * @param errorPropagation Indicates whether error propagation was selected. - * + * * @return @b QString The formatted adjusted coordinate sigma value, as a string. - * - * @see formatAdjustedSigmaString() + * + * @see formatAdjustedSigmaString() */ QString BundleControlPoint::formatCoordAdjustedSigmaString(SurfacePoint::CoordIndex index, int fieldWidth, int precision, @@ -1115,7 +1123,7 @@ QString BundleControlPoint::formatCoordAdjustedSigmaString(SurfacePoint::CoordIn // convert to meters and apply pointRad += 1000. * radCorrection; - + // ken testing - if solving for target body mean radius, set radius to current // mean radius value // Only allow radius options for Latitudinal coordinates @@ -1163,7 +1171,7 @@ QString BundleControlPoint::formatCoordAdjustedSigmaString(SurfacePoint::CoordIn pointX += 1000. * XCorrection; pointY += 1000. * YCorrection; pointZ += 1000. * ZCorrection; - + surfacepoint.SetRectangularCoordinates( Displacement(pointX, Displacement::Meters), Displacement(pointY, Displacement::Meters), diff --git a/isis/src/control/objs/BundleUtilities/BundleControlPoint.h b/isis/src/control/objs/BundleUtilities/BundleControlPoint.h index 852164af04..2693694de8 100644 --- a/isis/src/control/objs/BundleUtilities/BundleControlPoint.h +++ b/isis/src/control/objs/BundleUtilities/BundleControlPoint.h @@ -1,27 +1,13 @@ #ifndef BundleControlPoint_h #define BundleControlPoint_h -/** - * @file - * $Revision: 1.20 $ - * $Date: 2014/5/22 01:35:17 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include @@ -41,7 +27,7 @@ namespace Isis { /** * This class holds information about a control point that BundleAdjust needs to run correctly. - * + * * This class was created to extract functionality from BundleAdjust and wrap a ControlPoint * with the extra necessary information to correctly perform a bundle adjustment. * @@ -57,7 +43,7 @@ namespace Isis { * @history 2016-06-27 Jesse Mapel - Updated documentation and ISIS coding standards in * preparation for merging IPCE into ISIS. Fixes #4075. * @history 2016-08-15 Ian Humphrey - Added computeResiduals(), setNumberOfRejectedMeasures(), - * setRejected(), zeroNumberOfRejectedMeasures(), + * setRejected(), zeroNumberOfRejectedMeasures(), * numberOfRejectedMeasures(), residualRms(), and type(). Modified * numberMeasures() to return this->size(), since only non-ignored * control measures will be added to this BundleControlPoint. @@ -69,22 +55,22 @@ namespace Isis { * @history 2016-10-27 Tyler Wilson - Modified formatRadiusAprioriSigmaString, formatAprioriSigmaString, * and formatBundleOutputDetailString to accept a third argument (bool solveRadius) * with a default value = false. References #4317. - * @history 2017-07-26 Debbie A. Cook - Added BundleSettings and metersToRadians as arguments - * to constructor and moved setWeights call from BundleAdjust::init into - * constructor. Added m_bundleControlPointCoordinateType. This option - * determines how control point coordinates are entered into - * BundleControlPoint, interpreted throughout the adjustment, and + * @history 2017-07-26 Debbie A. Cook - Added BundleSettings and metersToRadians as arguments + * to constructor and moved setWeights call from BundleAdjust::init into + * constructor. Added m_bundleControlPointCoordinateType. This option + * determines how control point coordinates are entered into + * BundleControlPoint, interpreted throughout the adjustment, and * output. The coordinate type needs to be in this class, because - * BundleControlPoints are created without a parent control net and added to + * BundleControlPoints are created without a parent control net and added to * a control net later. Made format methods generic in regards to coordinate type. * Added utility method setSigmaWeightFromGlobals. - * Merged methods formatLatitudeAdjustedSigmaString, + * Merged methods formatLatitudeAdjustedSigmaString, * formatLongitudeAdjustedSigmaString, and formatRadiusAdjustedSigmaString - * into a single generic coordinate method with an additional argument - * for the coordinate index. Did a similar merge for the family of + * into a single generic coordinate method with an additional argument + * for the coordinate index. Did a similar merge for the family of * methods like formatLatitudeAprioriSigmaString. Moved some of the - * functionality from BundleAdjust to this class as a new method - * applyParameterCorrections. Also had to move BundleAdjust method + * functionality from BundleAdjust to this class as a new method + * applyParameterCorrections. Also had to move BundleAdjust method * productAlphaAV to this class to support applyParameterCorrections. * References #4649 and #501. * @history 2017-08-24 Debbie A. Cook - Revised output units to be compatible with output from @@ -95,11 +81,11 @@ namespace Isis { * @history 2018-05-31 Debbie A. Cook - Moved code from BundleAdjust::applyParameterCorrections * pertaining to updating the adjusted surface point and method productAlphaAv into new * methods applyParameterCorrections, updateAdjustedSurfacePointLatitudinally, and - * updateAdjustedSurfacePointRectangularly in BundleControlPoint. Reference + * updateAdjustedSurfacePointRectangularly in BundleControlPoint. Reference * #4649 and #501. * @history 2018-09-28 Debbie A. Cook - Removed the metersToRadians argument from * the constructor and from the setWeights method since we are now - * using the local radius of the point to convert lat/lon sigmas + * using the local radius of the point to convert lat/lon sigmas * from meters to radians. References #4649 and #501. */ class BundleControlPoint : public QVector { @@ -127,8 +113,8 @@ namespace Isis { void setNumberOfRejectedMeasures(int numRejected); void setRejected(bool reject); void setWeights(const BundleSettingsQsp settings); - void setSigmaWeightFromGlobals(double gSigma, int index); - void setSigmaWeightFromGlobals(double gSigma, int index, double cFactor); + void setSigmaWeightFromGlobals(double gSigma, int index); + void setSigmaWeightFromGlobals(double gSigma, int index, double cFactor); void zeroNumberOfRejectedMeasures(); void productAlphaAV(double alpha, SparseBlockMatrix &sparseNormals, @@ -159,7 +145,7 @@ namespace Isis { // string format methods QString formatBundleOutputSummaryString(bool errorPropagation) const; QString formatBundleOutputDetailString(bool errorPropagation, bool solveRadius=false) const; - QString formatBundleLatitudinalOutputDetailString(bool errorPropagation, + QString formatBundleLatitudinalOutputDetailString(bool errorPropagation, bool solveRadius=false) const; QString formatBundleRectangularOutputDetailString(bool errorPropagation) const; QString formatValue(double value, int fieldWidth, int precision) const; @@ -176,7 +162,7 @@ namespace Isis { // methods void updateAdjustedSurfacePointLatitudinally(const BundleTargetBodyQsp target); void updateAdjustedSurfacePointRectangularly(); - + //!< pointer to the control point object this represents ControlPoint *m_controlPoint; @@ -203,4 +189,3 @@ namespace Isis { } #endif // BundleControlPoint_h - diff --git a/isis/src/control/objs/BundleUtilities/BundleImage.cpp b/isis/src/control/objs/BundleUtilities/BundleImage.cpp index 62308ca8cc..1fef1b9a66 100644 --- a/isis/src/control/objs/BundleUtilities/BundleImage.cpp +++ b/isis/src/control/objs/BundleUtilities/BundleImage.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "BundleImage.h" #include "BundleObservation.h" @@ -9,7 +17,7 @@ namespace Isis { /** * Constructs a BundleImage with the given camera pointer, serial number, and filename. * Parent observation defaults to NULL. - * + * * @param camera The camera model for the BundleImage * @param serialNumber The serial number for the BundleImage * @param fileName The file name for the BundleImage @@ -17,13 +25,13 @@ namespace Isis { BundleImage::BundleImage(Camera *camera, QString serialNumber, QString fileName) { m_camera = camera; m_serialNumber = serialNumber; - m_fileName = fileName; + m_fileName = fileName; } /** * Constructs a BundleImage from another BundleImage object. - * + * * @param other The BundleImage to copy from. */ BundleImage::BundleImage(const BundleImage &other) { @@ -43,9 +51,9 @@ namespace Isis { /** * An assignment operator to set this BundleImage to another BundleImage object. - * + * * @param other The BundleImage to copy from. - * + * * @return @b BundleImage& A reference to this BundleImage after being assigned to. */ BundleImage &BundleImage::operator=(const BundleImage &other) { @@ -61,7 +69,7 @@ namespace Isis { /** * Sets the parent BundleObservation object. - * + * * @param parentObservation The parent BundleObservation. */ void BundleImage::setParentObservation(QSharedPointer parentObservation) { @@ -75,7 +83,7 @@ namespace Isis { /** * Returns the camera model used for the BundleImage. - * + * * @return @b Camera* A pointer to the camera model. */ Camera *BundleImage::camera() { @@ -85,7 +93,7 @@ namespace Isis { /** * Returns the parent BundleObservation object. - * + * * @return @b QSharedPointer A pointer to the parent BundleObservation. */ QSharedPointer BundleImage::parentObservation() { @@ -95,7 +103,7 @@ namespace Isis { /** * Returns the serial number for the BundleImage. - * + * * @return @b QString The image's serial number. */ QString BundleImage::serialNumber() { @@ -105,7 +113,7 @@ namespace Isis { /** * Returns the file name for the BundleImage. - * + * * @return @b QString The image's file name. */ QString BundleImage::fileName() { diff --git a/isis/src/control/objs/BundleUtilities/BundleImage.h b/isis/src/control/objs/BundleUtilities/BundleImage.h index 5fa312dc91..83afd67523 100644 --- a/isis/src/control/objs/BundleUtilities/BundleImage.h +++ b/isis/src/control/objs/BundleUtilities/BundleImage.h @@ -1,28 +1,13 @@ #ifndef BundleImage_h #define BundleImage_h -/** - * @file - * $Revision: 1.20 $ - * $Date: 2014/5/22 01:35:17 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include @@ -33,7 +18,7 @@ namespace Isis { /** * This class hold image information that BundleAdjust needs to run correctly. - * + * * @author 2014-05-22 Ken Edmundson * * @internal @@ -46,7 +31,7 @@ namespace Isis { * @history 2016-08-03 Jesse Mapel - Changed parent observation to a QSharedPointer. * Fixes #4150. * @history 2016-08-18 Jesse Mapel - Changed to no longer inherit from QObject. Fixes #4192. - * + * */ class BundleImage { diff --git a/isis/src/control/objs/BundleUtilities/BundleMeasure.cpp b/isis/src/control/objs/BundleUtilities/BundleMeasure.cpp index 1de008d3a2..37ac85685e 100644 --- a/isis/src/control/objs/BundleUtilities/BundleMeasure.cpp +++ b/isis/src/control/objs/BundleUtilities/BundleMeasure.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "BundleMeasure.h" #include "BundleObservation.h" #include "BundleObservationSolveSettings.h" @@ -11,7 +19,7 @@ namespace Isis { * Constructor * * Constructs a BundleMeasure from a ControlMeasure with the passed BundleControlPoint as its - * parent control point + * parent control point * * @param controlMeasure Pointer to the ControlMeasure to store * @param bundleControlPoint Pointer to the BundleControlPoint that contains this @@ -51,7 +59,7 @@ namespace Isis { * * Assigns the state of this BundleMeasure from another BundleMeasure * - * @param src The source BundleMeasure to assign state from + * @param src The source BundleMeasure to assign state from * * @return @b BundleMeasure& Returns a reference to this BundleMeasure */ @@ -71,7 +79,7 @@ namespace Isis { /** * Sets the parent bundle observation * - * @param observation Pointer to the parent BundleObservation + * @param observation Pointer to the parent BundleObservation */ void BundleMeasure::setParentObservation(QSharedPointer observation) { m_parentObservation = observation; @@ -81,7 +89,7 @@ namespace Isis { /** * Sets the parent bundle image * - * @param image Pointer to the parent BundleImage + * @param image Pointer to the parent BundleImage */ void BundleMeasure::setParentImage(QSharedPointer image) { m_parentBundleImage = image; @@ -96,7 +104,7 @@ namespace Isis { * @see ControlMeasure::SetRejected(bool reject) */ void BundleMeasure::setRejected(bool reject) { - m_controlMeasure->SetRejected(reject); + m_controlMeasure->SetRejected(reject); } @@ -159,7 +167,7 @@ namespace Isis { * * @return @b const QSharedPointer Returns a const pointer to * the BundleObservationSolveSettings for the parent BundleObservation - * + * * @throws IException::Programmer "In BundleMeasure::observationSolveSettings: * parent observation has not been set." */ @@ -178,7 +186,7 @@ namespace Isis { * * @see ControlMeasure::GetSample() * - * @return @b double Returns the sample measurement for this control measure + * @return @b double Returns the sample measurement for this control measure */ double BundleMeasure::sample() const { return m_controlMeasure->GetSample(); @@ -202,7 +210,7 @@ namespace Isis { * * @see ControlMeasure::GetLine() * - * @return @b double Returns the line measurement for this control measure + * @return @b double Returns the line measurement for this control measure */ double BundleMeasure::line() const { return m_controlMeasure->GetLine(); @@ -234,10 +242,10 @@ namespace Isis { /** - * Accesses the serial number of the cube containing this control measure + * Accesses the serial number of the cube containing this control measure * * @see ControlMeasure::GetCubeSerialNumber() - * + * * @return @b QString Returns the serial number of the cube that contains this control measure */ QString BundleMeasure::cubeSerialNumber() const { @@ -299,7 +307,7 @@ namespace Isis { * @see BundleObservation::index() * * @return @b int Returns the observation index of the parent observation - * + * * @throws IException::Programmer "In BundleMeasure::observationIndex: * parent observation has not been set." */ diff --git a/isis/src/control/objs/BundleUtilities/BundleMeasure.h b/isis/src/control/objs/BundleUtilities/BundleMeasure.h index 82a2d0f977..9fe05fbe84 100644 --- a/isis/src/control/objs/BundleUtilities/BundleMeasure.h +++ b/isis/src/control/objs/BundleUtilities/BundleMeasure.h @@ -1,27 +1,13 @@ #ifndef BundleMeasure_h #define BundleMeasure_h -/** - * @file - * $Revision: 1.20 $ - * $Date: 2014/5/22 01:35:17 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include @@ -37,10 +23,10 @@ namespace Isis { * @brief A container class for a ControlMeasure. * * This class is used as a wrapper around a ControlMeasure to provide the necessary information - * for BundleAdjust. This class can be used to get the parent bundle observation solve settings + * for BundleAdjust. This class can be used to get the parent bundle observation solve settings * for observation mode adjustment. * - * Note that a BundleMeasure should be created from a non-ignored ControlMeasure. + * Note that a BundleMeasure should be created from a non-ignored ControlMeasure. * * @ingroup ControlNetworks * diff --git a/isis/src/control/objs/BundleUtilities/BundleObservation.cpp b/isis/src/control/objs/BundleUtilities/BundleObservation.cpp index cc0eae051c..4b1817bf7d 100644 --- a/isis/src/control/objs/BundleUtilities/BundleObservation.cpp +++ b/isis/src/control/objs/BundleUtilities/BundleObservation.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "BundleObservation.h" #include diff --git a/isis/src/control/objs/BundleUtilities/BundleObservation.h b/isis/src/control/objs/BundleUtilities/BundleObservation.h index 5b47719127..1e0faae6d4 100644 --- a/isis/src/control/objs/BundleUtilities/BundleObservation.h +++ b/isis/src/control/objs/BundleUtilities/BundleObservation.h @@ -1,27 +1,13 @@ #ifndef BundleObservation_h #define BundleObservation_h -/** - * @file - * $Revision: 1.20 $ - * $Date: 2014/5/22 01:35:17 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include diff --git a/isis/src/control/objs/BundleUtilities/BundleObservationSolveSettings.cpp b/isis/src/control/objs/BundleUtilities/BundleObservationSolveSettings.cpp index 5fed7b0456..0d728bc9f7 100644 --- a/isis/src/control/objs/BundleUtilities/BundleObservationSolveSettings.cpp +++ b/isis/src/control/objs/BundleUtilities/BundleObservationSolveSettings.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "BundleObservationSolveSettings.h" #include diff --git a/isis/src/control/objs/BundleUtilities/BundleObservationSolveSettings.h b/isis/src/control/objs/BundleUtilities/BundleObservationSolveSettings.h index a758d96ec7..54cd5573bc 100644 --- a/isis/src/control/objs/BundleUtilities/BundleObservationSolveSettings.h +++ b/isis/src/control/objs/BundleUtilities/BundleObservationSolveSettings.h @@ -1,27 +1,13 @@ #ifndef BundleObservationSolveSettings_h #define BundleObservationSolveSettings_h -/** - * @file - * $Revision: 1.20 $ - * $Date: 2014/5/28 09:31:00 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include diff --git a/isis/src/control/objs/BundleUtilities/BundleObservationVector.cpp b/isis/src/control/objs/BundleUtilities/BundleObservationVector.cpp index db1bf7c3d8..697d8e2009 100644 --- a/isis/src/control/objs/BundleUtilities/BundleObservationVector.cpp +++ b/isis/src/control/objs/BundleUtilities/BundleObservationVector.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "BundleObservationVector.h" #include @@ -16,9 +24,9 @@ namespace Isis { /** * Copy constructor. - * + * * Constructs a BundleObservationVector as a copy of another BundleObservationVector. - * + * * @param src A reference to the BundleObservationVector to copy from. */ BundleObservationVector::BundleObservationVector(const BundleObservationVector &src) @@ -40,11 +48,11 @@ namespace Isis { /** * Assignment operator. - * + * * Assigns the state of the source BundleObservationVector to this BundleObservationVector. - * + * * @param src The BundleObservationVector to assign from. - * + * * @return @b BundleObservationVector& A reference to this BundleObservationVector. */ BundleObservationVector &BundleObservationVector::operator=(const BundleObservationVector &src) { @@ -70,14 +78,14 @@ namespace Isis { * @param observationNumber Observation number of the observation to add or fetch * @param instrumentId Instrument id of the observation * @param bundleSettings Qsp to BundleSettings for the observation - * + * * @throws IException::Programmer "Unable to allocate new BundleObservation" * * @return @b BundleObservationQsp Returns a pointer to the BundleObservation that was added - * + * * @internal - * @history 2016-10-13 Ian Humphrey - When appending a new BundleObservation and there are - * multiple BundleObservationSolveSettings, we set the settings + * @history 2016-10-13 Ian Humphrey - When appending a new BundleObservation and there are + * multiple BundleObservationSolveSettings, we set the settings * according to the observation number passed. References #4293. */ BundleObservationQsp BundleObservationVector::addNew(BundleImageQsp bundleImage, @@ -90,7 +98,7 @@ namespace Isis { if (bundleSettings->solveObservationMode() && m_observationNumberToObservationMap.contains(observationNumber)) { bundleObservation = m_observationNumberToObservationMap.value(observationNumber); - + addToExisting = true; } @@ -121,7 +129,7 @@ namespace Isis { } bundleImage->setParentObservation(bundleObservation); - + // Find the bundle observation solve settings for this new observation BundleObservationSolveSettings solveSettings; // When there is only one bundle observation solve setting, use it for all observations @@ -131,7 +139,7 @@ namespace Isis { // Otherwise, we want to grab the bundle observation solve settings that is associated with // the observation number for this new observation else { - solveSettings = bundleSettings->observationSolveSettings(observationNumber); + solveSettings = bundleSettings->observationSolveSettings(observationNumber); } bundleObservation->setSolveSettings(solveSettings); @@ -154,7 +162,7 @@ namespace Isis { /** * Accesses the number of position parameters for the contained BundleObservations. * - * @return @b int Returns the total number of position parameters for the BundleObservations + * @return @b int Returns the total number of position parameters for the BundleObservations */ int BundleObservationVector::numberPositionParameters() { int positionParameters = 0; @@ -171,7 +179,7 @@ namespace Isis { /** * Accesses the number of pointing parameters for the contained BundleObservations. * - * @return @b int Returns the total number of pointing parameters for the BundleObservations + * @return @b int Returns the total number of pointing parameters for the BundleObservations */ int BundleObservationVector::numberPointingParameters() { int pointingParameters = 0; @@ -189,7 +197,7 @@ namespace Isis { * Returns the sum of the position parameters and pointing parameters for the contained * BundleObservations. * - * @return @b int Returns the total number of parameters for the contained BundleObservations + * @return @b int Returns the total number of parameters for the contained BundleObservations */ int BundleObservationVector::numberParameters() { return numberPositionParameters() + numberPointingParameters(); @@ -220,7 +228,7 @@ namespace Isis { /** * Initializes the exterior orientations for the contained BundleObservations. * - * @return @b bool Returns true upon successful initialization + * @return @b bool Returns true upon successful initialization */ bool BundleObservationVector::initializeExteriorOrientation() { int nObservations = size(); @@ -236,7 +244,7 @@ namespace Isis { /** * Initializes the body rotations for the contained BundleObservations. * - * @return @b bool Returns true upon successful initialization + * @return @b bool Returns true upon successful initialization */ bool BundleObservationVector::initializeBodyRotation() { int nObservations = size(); @@ -248,5 +256,3 @@ namespace Isis { return true; } } - - diff --git a/isis/src/control/objs/BundleUtilities/BundleObservationVector.h b/isis/src/control/objs/BundleUtilities/BundleObservationVector.h index 4441e57a66..b3b6b10a26 100644 --- a/isis/src/control/objs/BundleUtilities/BundleObservationVector.h +++ b/isis/src/control/objs/BundleUtilities/BundleObservationVector.h @@ -1,27 +1,13 @@ #ifndef BundleObservationVector_h #define BundleObservationVector_h -/** - * @file - * $Revision: 1.20 $ - * $Date: 2014/5/22 01:35:17 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include diff --git a/isis/src/control/objs/BundleUtilities/BundleTargetBody.cpp b/isis/src/control/objs/BundleUtilities/BundleTargetBody.cpp index e0affaff46..a575b18fcc 100644 --- a/isis/src/control/objs/BundleUtilities/BundleTargetBody.cpp +++ b/isis/src/control/objs/BundleUtilities/BundleTargetBody.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "BundleTargetBody.h" #include @@ -35,7 +43,7 @@ namespace Isis { /** * Creates an BundleTargetBody object from a target. - * + * * @param target A pointer to the target body that this object will represent. */ BundleTargetBody::BundleTargetBody(Target *target) { @@ -62,13 +70,13 @@ namespace Isis { m_raPole = target->poleRaCoefs(); m_decPole = target->poleDecCoefs(); - m_pm = target->pmCoefs(); + m_pm = target->pmCoefs(); } /** * Copy constructor. Makes a copy of another BundleTargetBody. - * + * * @param src The BundleTargetBody to copy from. */ BundleTargetBody::BundleTargetBody(const BundleTargetBody &src) { @@ -91,9 +99,9 @@ namespace Isis { m_pm = src.m_pm; m_parameterSolveCodes = src.m_parameterSolveCodes; - + m_parameterNamesList = src.m_parameterNamesList; - + m_weights = src.m_weights; m_corrections = src.m_corrections; m_solution = src.m_solution; @@ -135,27 +143,27 @@ namespace Isis { m_pm = src.m_pm; m_parameterSolveCodes = src.m_parameterSolveCodes; - + m_parameterNamesList = src.m_parameterNamesList; - + m_weights = src.m_weights; m_corrections = src.m_corrections; m_solution = src.m_solution; m_aprioriSigmas = src.m_aprioriSigmas; m_adjustedSigmas = src.m_adjustedSigmas; } - + return *this; } /** * @brief Sets the solve settings for the target body. - * + * * Sets the solve settings for the target body's right ascension, declination, * prime meridian, and radius based on the input values. * Parameter vectors, sigma vectors and the weight vector will be filled in the following order: - * + * * pole right ascension, * pole right ascension velocity, * pole right ascension acceleration, @@ -169,16 +177,16 @@ namespace Isis { * triaxial radius B, * triaxial radius C, * mean radius. - * + * * Any parameters that are not being solved for (based on targetParameterSolveCodes) * will be omitted. For example, if solving for pole right ascension, pole declination, * prime meridian, and mean radius; the vectors would be: - * + * * pole right ascension, * pole declination, * prime meridian, * mean radius. - * + * * @param targetParameterSolveCodes A set of TargetSolveCodes indicating what to solve for. * @param aprioriPoleRA The apriori pole right ascension angle. * @param sigmaPoleRA The apriori pole right ascension angle sigma. @@ -201,7 +209,7 @@ namespace Isis { * @param sigmaRadiusC The apriori C radius distance sigma. * @param aprioriMeanRadius The apriori mean radius distance. * @param sigmaMeanRadius the apriori mean radius distance sigma. - * + * * @see readFromPvl(PvlObject &tbObject) */ void BundleTargetBody::setSolveSettings(std::set targetParameterSolveCodes, @@ -421,7 +429,7 @@ namespace Isis { /** * If the pole right ascension angle will be solved for with this target body. - * + * * @return @b bool If it will be solved for. */ bool BundleTargetBody::solvePoleRA() { @@ -433,7 +441,7 @@ namespace Isis { /** * If the pole right ascension velocity will be solved for with this target body. - * + * * @return @b bool If it will be solved for. */ bool BundleTargetBody::solvePoleRAVelocity() { @@ -445,7 +453,7 @@ namespace Isis { /** * If the pole right ascension acceleration will be solved for with this target body. - * + * * @return @b bool If it will be solved for. */ bool BundleTargetBody::solvePoleRAAcceleration() { @@ -457,7 +465,7 @@ namespace Isis { /** * If the pole declination angle will be solved for with this target body. - * + * * @return @b bool If it will be solved for. */ bool BundleTargetBody::solvePoleDec() { @@ -469,7 +477,7 @@ namespace Isis { /** * If the pole declination velocity will be solved for with this target body. - * + * * @return @b bool If it will be solved for. */ bool BundleTargetBody::solvePoleDecVelocity() { @@ -481,7 +489,7 @@ namespace Isis { /** * If the pole declination acceleration will be solved for with this target body. - * + * * @return @b bool If it will be solved for. */ bool BundleTargetBody::solvePoleDecAcceleration() { @@ -493,7 +501,7 @@ namespace Isis { /** * If the prime meridian angle will be solved for with this target body. - * + * * @return @b bool If it will be solved for. */ bool BundleTargetBody::solvePM() { @@ -505,7 +513,7 @@ namespace Isis { /** * If the prime meridian velocity will be solved for with this target body. - * + * * @return @b bool If it will be solved for. */ bool BundleTargetBody::solvePMVelocity() { @@ -517,7 +525,7 @@ namespace Isis { /** * If the prime meridian acceleration will be solved for with this target body. - * + * * @return @b bool If it will be solved for. */ bool BundleTargetBody::solvePMAcceleration() { @@ -529,7 +537,7 @@ namespace Isis { /** * If the triaxial radii will be solved for with this target body. - * + * * @return @b bool If it will be solved for. */ bool BundleTargetBody::solveTriaxialRadii() { @@ -543,7 +551,7 @@ namespace Isis { /** * If the mean radius will be solved for with this target body. - * + * * @return @b bool If it will be solved for. */ bool BundleTargetBody::solveMeanRadius() { @@ -555,18 +563,18 @@ namespace Isis { /** * @brief Applies a vector of corrections to the parameters for the target body. - * + * * Applies a vector of corrections to the internal parameters for the * target body and records the corrections in the internal corrections vector. * The corrections vector should be ordered the same as the parameter vector descriped * in setSolveSettings. - * + * * @param corrections The vector containing correction values. - * + * * @throws IException::Programmer "In BundleTargetBody::applyParameterCorrections: * correction and m_targetParameter vectors sizes don't match." * @throws IException::Unknown "Unable to apply parameter corrections to BundleTargetBody." - * + * * @see setSolveSettings */ void BundleTargetBody::applyParameterCorrections( @@ -583,7 +591,7 @@ namespace Isis { try { int n = 0; - for (std::set::iterator it=m_parameterSolveCodes.begin(); + for (std::set::iterator it=m_parameterSolveCodes.begin(); it!=m_parameterSolveCodes.end(); ++it) { switch (*it) { case PoleRA: @@ -663,11 +671,11 @@ namespace Isis { /** * Converts a QString to a TargetRadiiSolveMethod. - * + * * @param method The Qstring of a solve method. - * + * * @return @b TargetRadiiSolveMethod The converted solve method. - * + * * @throws IException::Programmer "Unknown target body radius solution method" */ BundleTargetBody::TargetRadiiSolveMethod BundleTargetBody::stringToTargetRadiiOption( @@ -691,11 +699,11 @@ namespace Isis { /** * Converts a TargetRadiiSolveMethod to a QString - * + * * @param method The TargetRadiiSolveMethod to convert. - * + * * @return @b QString The solve method as a QString. - * + * * @throws IException::Programmer "Unknown target body radius solve method enum" */ QString BundleTargetBody::targetRadiiOptionToString(TargetRadiiSolveMethod method) { @@ -714,9 +722,9 @@ namespace Isis { /** * Returns the vector of parameter weights. * See setSolveSettings for how the vector is ordered. - * + * * @return @b vector& The vector of parameter weights. - * + * * @see setSolveSettings */ LinearAlgebra::Vector &BundleTargetBody::parameterWeights() { @@ -727,9 +735,9 @@ namespace Isis { /** * Returns the vector of corrections applied to the parameters. * See setSolveSettings for how the vector is ordered. - * + * * @return @b vector& The vector of parameter corrections. - * + * * @see setSolveSettings */ LinearAlgebra::Vector &BundleTargetBody::parameterCorrections() { @@ -740,9 +748,9 @@ namespace Isis { /** * Returns the vector of parameters solution. * See setSolveSettings for how the vector is ordered. - * + * * @return @b vector& The vector of parameter solution. - * + * * @see setSolveSettings */ LinearAlgebra::Vector &BundleTargetBody::parameterSolution() { @@ -753,9 +761,9 @@ namespace Isis { /** * Returns the vector of apriori parameters sigmas. * See setSolveSettings for how the vector is ordered. - * + * * @return @b vector& The vector of apriori parameter sigmas. - * + * * @see setSolveSettings */ LinearAlgebra::Vector &BundleTargetBody::aprioriSigmas() { @@ -766,9 +774,9 @@ namespace Isis { /** * Returns the vector of adjusted parameters sigmas. * See setSolveSettings for how the vector is ordered. - * + * * @return @b vector& The vector of adjusted parameter sigmas. - * + * * @see setSolveSettings */ LinearAlgebra::Vector &BundleTargetBody::adjustedSigmas() { @@ -801,15 +809,15 @@ namespace Isis { /** * @brief Returns the number of radius parameters being solved for. - * + * * Returns the number of radius parameters being solved for * which is based on the target radius solve method: * None -> 0 * Mean -> 1 * All -> 3 - * + * * @return @b int The number of radius parameters being solved for. - * + * * @see TargetRadiiSolveMethod */ int BundleTargetBody::numberRadiusParameters() { @@ -823,7 +831,7 @@ namespace Isis { /** * Returns the total number of parameters being solved for. - * + * * @return @b int The number of parameters being solved for. */ int BundleTargetBody::numberParameters() { @@ -833,15 +841,15 @@ namespace Isis { /** * @brief Returns the coefficients of the right ascension polynomial. - * + * * Returns The vector of right ascension polynomial coefficients ordered as: - * + * * angle, * velocity, * acceleration. - * + * * Only coefficients that are being solved for will be included. - * + * * @return @b vector The right ascension polynomial coefficients. */ std::vector BundleTargetBody::poleRaCoefs() { @@ -851,15 +859,15 @@ namespace Isis { /** * @brief Returns the coefficients of the declination polynomial. - * + * * Returns The vector of declination polynomial coefficients ordered as: - * + * * angle, * velocity, * acceleration. - * + * * Only coefficients that are being solved for will be included. - * + * * @return @b vector The declination polynomial coefficients. */ std::vector BundleTargetBody::poleDecCoefs() { @@ -869,15 +877,15 @@ namespace Isis { /** * @brief Returns the coefficients of the prime meridian polynomial. - * + * * Returns The vector of prime meridian polynomial coefficients ordered as: - * + * * angle, * velocity, * acceleration. - * + * * Only coefficients that are being solved for will be included. - * + * * @return @b vector The prime meridian polynomial coefficients. */ std::vector BundleTargetBody::pmCoefs() { @@ -887,11 +895,11 @@ namespace Isis { /** * @brief Returns the radius values. - * + * * Returns the vector of radius values formatted as RadiusA, RadiusB, RadiusC. - * + * * @return @b vector The vector of radius values. - * + * * @throws IException::Programmer "The triaxial radii can only be accessed * when solving for triaxial radii." */ @@ -906,9 +914,9 @@ namespace Isis { /** * Returns the mean radius. - * + * * @return @b Distance The mean radius. - * + * * @throws IException::Programmer "The mean radius can only be accessed * when solving for mean radius." */ @@ -923,13 +931,13 @@ namespace Isis { /** * @brief Calculates and returns the weighted sum of the squares of the corrections. - * + * * Calculates and returns the weighted sum of the squares of the corrections * computed by V(T)*P*V where: * V is the vector of corrections, * P is the weight matrix, * V(T) is the transpose of V. - * + * * @return @b double The weighted sum of the squares of the corrections (vtpv). */ double BundleTargetBody::vtpv() { @@ -950,9 +958,9 @@ namespace Isis { /** * Formats and returns the parameter values as a QString. - * + * * @param errorPropagation If adjusted sigmas should be output. - * + * * @return @b QString A formatted QString containing the parameter values. */ QString BundleTargetBody::formatBundleOutputString(bool errorPropagation) { @@ -1100,9 +1108,9 @@ namespace Isis { /** * Returns a list of all the parameters being solved for as QStrings. * This should only be called after formatBundleOutputString. - * + * * @return @b QStringList A list of the parameters being solved for. - * + * * @see formatBundleOutputString */ QStringList BundleTargetBody::parameterList() { @@ -1115,11 +1123,11 @@ namespace Isis { * * specifically for standard jigsaw interface, not the * Integrated Photogrammetric Control Environment (IPCE) - * + * * @param tbObject The Pvl file to read from. - * + * * @return @b bool If the solve parameters were successfuly set. - * + * * @throws IException::User "Ra must be given as none, position, velocity, or acceleration" * @throws IException::User "Dec must be given as none, position, velocity, or acceleration" * @throws IException::User "Pm must be given as none, position, velocity, or acceleration" @@ -1166,7 +1174,7 @@ namespace Isis { * @throws IException::User "MeanRadiusValue must be >= 0". * @throws IException::User "MeanRadiusSigma must be a valid double (blank defaults to 0)." * @throws IException::User "MeanRadiusSigma must be >= 0". - * + * * @see setSolveSettings */ bool BundleTargetBody::readFromPvl(PvlObject &tbObject) { @@ -1298,7 +1306,7 @@ namespace Isis { Distance sigmaRadiusC; Distance aprioriMeanRadius; Distance sigmaMeanRadius; - + //TODO Determine which need to be non-negative. JAM for (g = tbObject.beginGroup(); g != tbObject.endGroup(); ++g) { @@ -1675,7 +1683,7 @@ namespace Isis { * * @return @b Distance The distance from the center of the ellipsoid to its surface * at the given lat/lon location. - * + * * @throws IException::Programmer "Local radius can only be found if * triaxial radii were solved for." */ diff --git a/isis/src/control/objs/BundleUtilities/BundleTargetBody.h b/isis/src/control/objs/BundleUtilities/BundleTargetBody.h index 7fa8cec75f..9f55f82a3e 100644 --- a/isis/src/control/objs/BundleUtilities/BundleTargetBody.h +++ b/isis/src/control/objs/BundleUtilities/BundleTargetBody.h @@ -1,27 +1,14 @@ #ifndef BundleTargetBody_h #define BundleTargetBody_h -/** - * @file - * $Revision: 1.20 $ - * $Date: 2015/5/15 08:00:00 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include diff --git a/isis/src/control/objs/BundleUtilities/unitTest.cpp b/isis/src/control/objs/BundleUtilities/unitTest.cpp index b765dbb86d..3e0d42b98d 100755 --- a/isis/src/control/objs/BundleUtilities/unitTest.cpp +++ b/isis/src/control/objs/BundleUtilities/unitTest.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Angle.h" #include "BundleControlPoint.h" #include "BundleImage.h" @@ -51,19 +59,19 @@ void printXml(const BundleObservationSolveSettings &); * @internal * @history 2018-07-03 Debbie A Cook - Removed target radii. References #5457. * @history 2014-12-11 - Original version. - * @history 2018-09-06 Debbie A. Cook - Merged dev into BundleXYZ branch - * Original branch history entry on 2017-06-26 - * Updated to reflect changes made to BundleControlPoint. - * Some tests were no longer valid and new tests were added to exercise + * @history 2018-09-06 Debbie A. Cook - Merged dev into BundleXYZ branch + * Original branch history entry on 2017-06-26 + * Updated to reflect changes made to BundleControlPoint. + * Some tests were no longer valid and new tests were added to exercise * the new option of adjusting in Rectangular coordinates. The - * Latitudinal covariance was being populated only along the diagonal - * (using the latitudinal sigmas). This produced inaccurate results. - * Now it is created by converting the rectangular covariance + * Latitudinal covariance was being populated only along the diagonal + * (using the latitudinal sigmas). This produced inaccurate results. + * Now it is created by converting the rectangular covariance * matrix to latitudinal. References #4649 and #501. * @history 2018 -09-06 Debbie A. Cook - Merged dev into BundleXYZ branch - * Original branch history entry on 2017-11-29 - Updated to reflect - * changes made to units of covariance matrix in SurfacePoint methods - * and removal of SurfacePoint::SetRadii method. + * Original branch history entry on 2017-11-29 - Updated to reflect + * changes made to units of covariance matrix in SurfacePoint methods + * and removal of SurfacePoint::SetRadii method. * @history 2018-09-28 Debbie A. Cook - Removed metersToRadians argument from * constructor because we are now using the local radius instead of * the target body equatorial radius to convert meters to radians. To @@ -119,15 +127,15 @@ namespace Isis { * @history 2016-12-01 Ian Humphrey - Added extra qDebug() stream so the "apply param * corrections successful?" string will be in the unitTest output. * @history 2017-04-24 Ian Humphrey - Replaced pvlObject() with XML save(). Fixes #4797. - * @history 2017-03-05 Debbie A. Cook - updated to conform to changes made to - * BundleControlPointConstructor. Fixed test + * @history 2017-03-05 Debbie A. Cook - updated to conform to changes made to + * BundleControlPointConstructor. Fixed test * "Modify FreePoint - setWeights() - solveRadius=true, apriori lat/lon/rad <= 0" * to output radius type as free instead of N/A under Inital Accuracy column and * fixed weight value to be 0. Corrections were made by creating a new contol * point when the settings were changed instead of just calling setWeights. - * Deleted tests "Modified FreePoint - setWeights, "Modify FixedPoint - - * setWeights() and ModifyConstrainedPoint - setWeights()" since - * setWeights is always called in the constructor now. References + * Deleted tests "Modified FreePoint - setWeights, "Modify FixedPoint - + * setWeights() and ModifyConstrainedPoint - setWeights()" since + * setWeights is always called in the constructor now. References * #4649 and #501 */ int main(int argc, char *argv[]) { @@ -459,7 +467,7 @@ int main(int argc, char *argv[]) { std::stringstream fpOut2; bo2.bundleOutputString(fpOut2, true); qDebug().noquote() << QString::fromStdString(fpOut2.str()); - + qDebug() << " Set solve settings using with TWIST=FALSE..."; bo2.setSolveSettings(bossToFill); bossFromBo = *bo2.solveSettings(); @@ -666,7 +674,7 @@ int main(int argc, char *argv[]) { bcp1.zeroNumberOfRejectedMeasures(); qDebug() << "Zero out number of rejected measures:" << bcp1.numberOfRejectedMeasures(); - // ??? these print outs are not pretty... fix??? + // ??? these print outs are not pretty... fix??? qDebug().noquote() << bcp1.formatBundleOutputSummaryString(errorProp); // ??? these print outs are not pretty... fix??? improved somewhat 6-9-2017 qDebug().noquote() << bcp1.formatBundleOutputDetailString(errorProp); @@ -678,7 +686,7 @@ int main(int argc, char *argv[]) { qDebug().noquote() << bcp1.formatBundleOutputDetailString(errorProp); qDebug() << ""; -// #2 Same as test 1, but assign coordinate values (0., 0., 10.) to adjusted surface points of FREE +// #2 Same as test 1, but assign coordinate values (0., 0., 10.) to adjusted surface points of FREE // point with solve radius still false -- radius weight is fixed (1.0e+50). Other coordinates are free qDebug() << "BCP test 2 - Modify FreePoint - setAdjustedSurfacePoint(0,0,10) and addMeasure()"; SurfacePoint sp1(Latitude(0.0, Angle::Degrees), @@ -768,9 +776,9 @@ int main(int argc, char *argv[]) { // #4 Test with global sigmas now. Everything else is the same as test #3. qDebug() << "BCP test 4 - Create FreePoint - solveRadius=true, apriori lat/lon/rad > 0 "; qDebug() << " from globals - coordinate type = Latitudinal"; - settings->setSolveOptions(false, false, false, true, SurfacePoint::Latitudinal, + settings->setSolveOptions(false, false, false, true, SurfacePoint::Latitudinal, SurfacePoint::Latitudinal, 2.0, 3.0, 4.0); - freePoint->SetAprioriSurfacePoint(sp1); + freePoint->SetAprioriSurfacePoint(sp1); BundleControlPoint bcp1b(settings, freePoint); bcp1b.setAdjustedSurfacePoint(sp1); BundleMeasure bcm1b = *(bcp1b.addMeasure(cm1)); @@ -812,7 +820,7 @@ int main(int argc, char *argv[]) { qDebug().noquote() << bcp3a->formatBundleOutputSummaryString(errorProp); qDebug().noquote() << bcp3a->formatBundleOutputDetailString(errorProp); - qDebug() << "BCP test 6 - Create FixedPoint from empty fixed point, solveRadius = True"; + qDebug() << "BCP test 6 - Create FixedPoint from empty fixed point, solveRadius = True"; qDebug() << " adjusted surface point (90, 180, 10)..."; settings->setSolveOptions(false, false, false, true, SurfacePoint::Latitudinal, SurfacePoint::Latitudinal, Isis::Null); @@ -890,7 +898,7 @@ settings->setSolveOptions(false, false, false, true, SurfacePoint::Latitudinal, else { qDebug() << "weights: NA"; } - + qDebug() << ""; qDebug() << ""; @@ -909,12 +917,12 @@ settings->setSolveOptions(false, false, false, true, SurfacePoint::Latitudinal, Displacement(529.919264, Displacement::Meters), covar); // Extract the covar matrix converted to latitudinal coordinates now to use for test 10. // Usage note: In order to get accurate results, the full correlation matrix should be -// used as opposed to only setting the diagonal elements with the sigmas. +// used as opposed to only setting the diagonal elements with the sigmas. boost::numeric::ublas::symmetric_matrix covarLat(3); covarLat.clear(); covarLat = aprioriSurfPt.GetSphericalMatrix(); -// These results match what is being set in adjusted surface point. +// These results match what is being set in adjusted surface point. Angle latSigma = aprioriSurfPt.GetLatSigma(); Angle lonSigma = aprioriSurfPt.GetLonSigma(); Distance localRad = aprioriSurfPt.GetLocalRadiusSigma(); diff --git a/isis/src/control/objs/ControlMeasure/ControlMeasure.cpp b/isis/src/control/objs/ControlMeasure/ControlMeasure.cpp index aac404555b..046e6e851d 100644 --- a/isis/src/control/objs/ControlMeasure/ControlMeasure.cpp +++ b/isis/src/control/objs/ControlMeasure/ControlMeasure.cpp @@ -1,24 +1,11 @@ -/** - * @file - * $Revision: 1.5 $ - * $Date: 2009/09/01 17:53:05 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "ControlMeasure.h" diff --git a/isis/src/control/objs/ControlMeasure/ControlMeasure.h b/isis/src/control/objs/ControlMeasure/ControlMeasure.h index 6c6b26a324..807e0990dc 100644 --- a/isis/src/control/objs/ControlMeasure/ControlMeasure.h +++ b/isis/src/control/objs/ControlMeasure/ControlMeasure.h @@ -1,27 +1,13 @@ #ifndef ControlMeasure_h #define ControlMeasure_h -/** - * @file - * $Revision: 1.6 $ - * $Date: 2009/09/01 17:53:05 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include diff --git a/isis/src/control/objs/ControlMeasure/unitTest.cpp b/isis/src/control/objs/ControlMeasure/unitTest.cpp index b1c57e534f..87b087ca99 100644 --- a/isis/src/control/objs/ControlMeasure/unitTest.cpp +++ b/isis/src/control/objs/ControlMeasure/unitTest.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include diff --git a/isis/src/control/objs/ControlMeasureLogData/ControlMeasureLogData.cpp b/isis/src/control/objs/ControlMeasureLogData/ControlMeasureLogData.cpp index fc0b548207..9091f734a9 100644 --- a/isis/src/control/objs/ControlMeasureLogData/ControlMeasureLogData.cpp +++ b/isis/src/control/objs/ControlMeasureLogData/ControlMeasureLogData.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "ControlMeasureLogData.h" #include diff --git a/isis/src/control/objs/ControlMeasureLogData/ControlMeasureLogData.h b/isis/src/control/objs/ControlMeasureLogData/ControlMeasureLogData.h index c790d33fc2..8eb505a526 100644 --- a/isis/src/control/objs/ControlMeasureLogData/ControlMeasureLogData.h +++ b/isis/src/control/objs/ControlMeasureLogData/ControlMeasureLogData.h @@ -1,27 +1,13 @@ #ifndef ControlMeasureLogData_h #define ControlMeasureLogData_h -/** - * @file - * $Revision: 1.6 $ - * $Date: 2009/09/01 17:53:05 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ class QString; class QVariant; diff --git a/isis/src/control/objs/ControlMeasureLogData/unitTest.cpp b/isis/src/control/objs/ControlMeasureLogData/unitTest.cpp index df25d5e534..fcde04ae2b 100644 --- a/isis/src/control/objs/ControlMeasureLogData/unitTest.cpp +++ b/isis/src/control/objs/ControlMeasureLogData/unitTest.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "ControlMeasureLogData.h" #include diff --git a/isis/src/control/objs/ControlNet/ControlNet.cpp b/isis/src/control/objs/ControlNet/ControlNet.cpp index c4ab2d53a8..cc1361c82c 100644 --- a/isis/src/control/objs/ControlNet/ControlNet.cpp +++ b/isis/src/control/objs/ControlNet/ControlNet.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "ControlNet.h" @@ -50,7 +58,7 @@ namespace Isis { //!Creates an empty ControlNet object ControlNet::ControlNet(SurfacePoint::CoordinateType coordType) { - + //! Creates an empty ControlNet object // ControlNet::ControlNet() { nullify(); @@ -98,7 +106,7 @@ namespace Isis { */ ControlNet::ControlNet(const QString &ptfile, Progress *progress, SurfacePoint::CoordinateType coordType) { - + nullify(); points = new QHash< QString, ControlPoint * >; @@ -106,7 +114,7 @@ namespace Isis { m_ownPoints = true; m_coordType = coordType; - + try { ReadControl(ptfile, progress); } @@ -846,7 +854,7 @@ namespace Isis { /** - * Sets the control point coordinate type + * Sets the control point coordinate type * * @param coordType Control point coordinate type */ diff --git a/isis/src/control/objs/ControlNet/ControlNet.h b/isis/src/control/objs/ControlNet/ControlNet.h index ae1adb5463..fcf476b8ca 100644 --- a/isis/src/control/objs/ControlNet/ControlNet.h +++ b/isis/src/control/objs/ControlNet/ControlNet.h @@ -1,27 +1,13 @@ #ifndef ControlNet_h #define ControlNet_h -/** - * @file - * $Revision: 1.9 $ - * $Date: 2009/07/15 17:33:52 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ // This is needed for the QVariant macro #include @@ -214,9 +200,9 @@ namespace Isis { * @history 2017-08-09 Summer Stapleton - Added throw to caught exception for bad control net * import in constructor. Also removed p_invalid as it was no longer * being used anywhere. Fixes #5068. - * @history 2017-08-30 Debbie A. Cook - Added an optional argument to the constructor - * for the control point coordinate type. At this point this value is only - * stored in the active ControlNet. It will be added to the stored + * @history 2017-08-30 Debbie A. Cook - Added an optional argument to the constructor + * for the control point coordinate type. At this point this value is only + * stored in the active ControlNet. It will be added to the stored * ControlNet at a later date. References #4649 and #501. * @history 2017-12-12 Kristin Berry - Updated to use QMap and QVector rather than std::map * and std::vector. Fixes #5259. @@ -488,7 +474,7 @@ namespace Isis { //! #rejected measures QVector p_cameraList; //!< Vector of image number to camera - bool m_ownPoints; //!< Specifies ownership of point list. True if owned by this object. + bool m_ownPoints; //!< Specifies ownership of point list. True if owned by this object. SurfacePoint::CoordinateType m_coordType; //!< The coordinate type of the control points }; diff --git a/isis/src/control/objs/ControlNet/unitTest.cpp b/isis/src/control/objs/ControlNet/unitTest.cpp index 15c46c9c80..019b1e3dba 100644 --- a/isis/src/control/objs/ControlNet/unitTest.cpp +++ b/isis/src/control/objs/ControlNet/unitTest.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "ControlNet.h" #include diff --git a/isis/src/control/objs/ControlNetDiff/ControlNetDiff.cpp b/isis/src/control/objs/ControlNetDiff/ControlNetDiff.cpp index 573cc6aa35..1ea671f943 100644 --- a/isis/src/control/objs/ControlNetDiff/ControlNetDiff.cpp +++ b/isis/src/control/objs/ControlNetDiff/ControlNetDiff.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "ControlNetDiff.h" @@ -99,12 +107,12 @@ namespace Isis { Pvl net1Pvl = cnv1.toPvl(); Pvl net2Pvl = cnv2.toPvl(); - + PvlObject &net1Obj = net1Pvl.findObject("ControlNetwork"); PvlObject &net2Obj = net2Pvl.findObject("ControlNetwork"); - + QMap< QString, QMap > pointMap; - + for (int p = 0; p < net1NumPts; p++) { PvlObject &point = net1Obj.object(p); pointMap[point.findKeyword("PointId")[0]].insert( @@ -118,7 +126,7 @@ namespace Isis { } QList pointNames = pointMap.keys(); - + for (int i = 0; i < pointNames.size(); i++) { QMap idMap = pointMap[pointNames[i]]; if (idMap.size() == 2) { @@ -416,4 +424,3 @@ namespace Isis { m_ignoreKeys->insert("DateTime"); } } - diff --git a/isis/src/control/objs/ControlNetDiff/ControlNetDiff.h b/isis/src/control/objs/ControlNetDiff/ControlNetDiff.h index 8443bb5631..3e3935ac5e 100644 --- a/isis/src/control/objs/ControlNetDiff/ControlNetDiff.h +++ b/isis/src/control/objs/ControlNetDiff/ControlNetDiff.h @@ -1,27 +1,13 @@ #ifndef ControlNetDiff_h #define ControlNetDiff_h -/** - * @file - * $Revision: 1.8 $ - * $Date: 2008/06/18 18:54:11 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include diff --git a/isis/src/control/objs/ControlNetDiff/unitTest.cpp b/isis/src/control/objs/ControlNetDiff/unitTest.cpp index e6d71860f5..7ba38927b5 100644 --- a/isis/src/control/objs/ControlNetDiff/unitTest.cpp +++ b/isis/src/control/objs/ControlNetDiff/unitTest.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -41,4 +49,3 @@ int main() { return 0; } - diff --git a/isis/src/control/objs/ControlNetFilter/ControlNetFilter.cpp b/isis/src/control/objs/ControlNetFilter/ControlNetFilter.cpp index a5e80cb740..76af1ea2c2 100644 --- a/isis/src/control/objs/ControlNetFilter/ControlNetFilter.cpp +++ b/isis/src/control/objs/ControlNetFilter/ControlNetFilter.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "ControlNetFilter.h" #include diff --git a/isis/src/control/objs/ControlNetFilter/ControlNetFilter.h b/isis/src/control/objs/ControlNetFilter/ControlNetFilter.h index a9b940bd96..8de31ceb39 100644 --- a/isis/src/control/objs/ControlNetFilter/ControlNetFilter.h +++ b/isis/src/control/objs/ControlNetFilter/ControlNetFilter.h @@ -4,28 +4,13 @@ #include "ControlNetStatistics.h" #include -/** - * @file - * $Revision: $ - * $Date: $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ namespace Isis { class ControlNet; @@ -64,7 +49,7 @@ namespace Isis { * @history 2011-10-05 Sharmila Prasad - Report double values with 10 digit precision * @history 2011-11-03 Sharmila Prasad - Added functionality to filter by Convex Hull Ratio * @history 2011-12-29 Sharmila Prasad - Updated GoodnessOfFit Filter. Fixes Mantis #652 - * @history 2017-08-08 Adam Goins - Changed references to SerialNumberList::Delete() to + * @history 2017-08-08 Adam Goins - Changed references to SerialNumberList::Delete() to * SerialNumberList::remove() * @history 2017-12-12 Kristin Berry - Updated to use QVector instead of std::vector. Fixes * #5259. @@ -80,19 +65,19 @@ namespace Isis { // Point Filters //! Filter Points by Pixel Shift void PointPixelShiftFilter(const PvlGroup &pvlGrp, bool pbLastFilter); - + //! Filter Points by Edit Lock void PointEditLockFilter(const PvlGroup &pvlGrp, bool pbLastFilter); //! Filter Points by Measure Edit Lock number void PointNumMeasuresEditLockFilter(const PvlGroup &pvlGrp, bool pbLastFilter); - + //! Filter Points by Residual Magnitude void PointResMagnitudeFilter(const PvlGroup &pvlGrp, bool pbLastFilter); //! Filter Points by GoodnessOfFit void PointGoodnessOfFitFilter(const PvlGroup & pvlGrp, bool pbLastFilter); - + //! Filter Points by Point ID Expression void PointIDFilter(const PvlGroup &pvlGrp, bool pbLastFilter); @@ -129,7 +114,7 @@ namespace Isis { //! Filter Cubes by Distance between points in a Cube void CubeDistanceFilter(const PvlGroup &pvlGrp, bool pbLastFilter); - + //! Filter Cubes by its ConvexHull Ratio void CubeConvexHullFilter(const PvlGroup &pvlGrp, bool pbLastFilter); @@ -144,7 +129,7 @@ namespace Isis { private: std::ofstream mOstm; //!< output stream for printing to output file SerialNumberList mSerialNumFilter; //!< Serial Number List file - + void FilterOutPoint(int pindex); void FilterOutMeasuresBySerialNum(QString serialNum); }; diff --git a/isis/src/control/objs/ControlNetFilter/unitTest.cpp b/isis/src/control/objs/ControlNetFilter/unitTest.cpp index c92f515be7..3bb077f67d 100644 --- a/isis/src/control/objs/ControlNetFilter/unitTest.cpp +++ b/isis/src/control/objs/ControlNetFilter/unitTest.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "IsisDebug.h" #include "Application.h" diff --git a/isis/src/control/objs/ControlNetStatistics/ControlNetStatistics.cpp b/isis/src/control/objs/ControlNetStatistics/ControlNetStatistics.cpp index b502cb035a..dfe54a19ff 100644 --- a/isis/src/control/objs/ControlNetStatistics/ControlNetStatistics.cpp +++ b/isis/src/control/objs/ControlNetStatistics/ControlNetStatistics.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "ControlNetStatistics.h" #include diff --git a/isis/src/control/objs/ControlNetStatistics/ControlNetStatistics.h b/isis/src/control/objs/ControlNetStatistics/ControlNetStatistics.h index 79244cd53d..3709011573 100644 --- a/isis/src/control/objs/ControlNetStatistics/ControlNetStatistics.h +++ b/isis/src/control/objs/ControlNetStatistics/ControlNetStatistics.h @@ -1,38 +1,22 @@ #ifndef _CONTROLNETSTATISTICS_H_ #define _CONTROLNETSTATISTICS_H_ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include -#include +#include #include "Progress.h" #include "PvlGroup.h" #include "SerialNumberList.h" #include "Statistics.h" - -/** - * @file - * $Revision: $ - * $Date: $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ - namespace Isis { class ControlNet; class Progress; diff --git a/isis/src/control/objs/ControlNetStatistics/unitTest.cpp b/isis/src/control/objs/ControlNetStatistics/unitTest.cpp index be25657e85..dfaf6fbde8 100644 --- a/isis/src/control/objs/ControlNetStatistics/unitTest.cpp +++ b/isis/src/control/objs/ControlNetStatistics/unitTest.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "IsisDebug.h" #include "Application.h" diff --git a/isis/src/control/objs/ControlNetValidMeasure/ControlNetValidMeasure.cpp b/isis/src/control/objs/ControlNetValidMeasure/ControlNetValidMeasure.cpp index ede97e14ba..35466def10 100644 --- a/isis/src/control/objs/ControlNetValidMeasure/ControlNetValidMeasure.cpp +++ b/isis/src/control/objs/ControlNetValidMeasure/ControlNetValidMeasure.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "ControlNetValidMeasure.h" #include "Cube.h" #include "Camera.h" @@ -935,4 +943,3 @@ namespace Isis { } } }; - diff --git a/isis/src/control/objs/ControlNetValidMeasure/ControlNetValidMeasure.h b/isis/src/control/objs/ControlNetValidMeasure/ControlNetValidMeasure.h index 9f2fdd5c15..4da11e7cc6 100644 --- a/isis/src/control/objs/ControlNetValidMeasure/ControlNetValidMeasure.h +++ b/isis/src/control/objs/ControlNetValidMeasure/ControlNetValidMeasure.h @@ -1,6 +1,14 @@ #ifndef _ControlNetValidMeasure_h_ #define _ControlNetValidMeasure_h_ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "CubeManager.h" #include "IString.h" #include "Pvl.h" @@ -8,28 +16,13 @@ #include "Progress.h" #include "SerialNumberList.h" -/** - * @file - * $Revision: $ - * $Date: $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ namespace Isis { class Camera; @@ -71,7 +64,7 @@ namespace Isis { * ValidMeasure Group is found. Fixes Mantis #584 * @history 2013-01-31 Steven Lambright - Fixed LocationString() to return * valid text. Also, added a test for this text. - * Fixes #1436. + * Fixes #1436. * @history 2014-03-03 Janet Barrett - Initialize the mdDnValue variable in * the ValidStandardOptions method. Fixes #2040. * @history 2016-07-13 Adam Paquette - Updated ValidStandardOptions to only @@ -85,10 +78,10 @@ namespace Isis { ControlNetValidMeasure(Pvl &pvl); //! Initialize the Standard Options - void InitStdOptions(void); - + void InitStdOptions(void); + //! Initialize the Standard Options Pvl Group with no DefFile - void InitStdOptionsGroup(void); + void InitStdOptionsGroup(void); virtual ~ControlNetValidMeasure(); @@ -105,25 +98,25 @@ namespace Isis { //! Validate whether the Emission Angle is in the set Range bool ValidEmissionAngle(double pdEmissionAngle); - + //! Validate whether the Incidence Angle is in the set Range bool ValidIncidenceAngle(double pdIncidenceAngle); - + //! Validate whether the DN Value is in the set Range bool ValidDnValue(double pdDnValue); - + //! Validate whether the Resolution is in the set Range bool ValidResolution(double pdResolution); - + //! Validate whether the Residuals are within the set Tolerance - bool ValidResidualTolerances(double pdSampleResidual, double pdLineResidual, + bool ValidResidualTolerances(double pdSampleResidual, double pdLineResidual, double pdResidualMagnitude, MeasureValidationResults & pResults); bool ValidShiftTolerances(double sampleShift, double lineShift, double pixelShift, MeasureValidationResults &results); - + //! Validate the Lat/Lon - bool ValidLatLon(Isis::Camera *pCamera, int piSample, int piLine); + bool ValidLatLon(Isis::Camera *pCamera, int piSample, int piLine); //! Get the Standard Options Pvl Group PvlGroup &GetStdOptions(void) { @@ -193,17 +186,17 @@ namespace Isis { //! Validate Standard options to pick a reference based on a particular criteria MeasureValidationResults ValidStandardOptions(const ControlMeasure *pMeasure, Cube *pCube, Camera *camera, PvlGroup *pMeasureGrp = NULL); - + //! Validate Standard options to pick a reference based on a particular criteria - MeasureValidationResults ValidStandardOptions(double pSample, double pLine, + MeasureValidationResults ValidStandardOptions(double pSample, double pLine, const ControlMeasure *pMeasure, Cube *pCube, PvlGroup *pMeasureGrp = NULL); - MeasureValidationResults ValidStandardOptions(double pSample, double pLine, + MeasureValidationResults ValidStandardOptions(double pSample, double pLine, const ControlMeasure *pMeasure, Cube *pCube, Camera *measureCamera, PvlGroup *pMeasureGrp = NULL); - + //! Validate Standard options to pick a reference based on a particular criteria - MeasureValidationResults ValidStandardOptions(double pSample, double pLine, + MeasureValidationResults ValidStandardOptions(double pSample, double pLine, Cube *pCube, PvlGroup *pMeasureGrp = NULL); bool IsCubeRequired() { @@ -212,10 +205,10 @@ namespace Isis { /** * API to get status of CameraRequired flag - * + * * @author Sharmila Prasad (5/19/2011) - * - * @return bool + * + * @return bool */ bool IsCameraRequired() { return mbCameraRequired; @@ -224,40 +217,40 @@ namespace Isis { protected: //! Validate PVL Min & Max DN Standard Options void ValidatePvlDN(void); - + //! Validate PVL Min & Max EmissionAngle Standard Options void ValidatePvlEmissionAngle(void); - + //! Validate PVL Min & Max IncidenceAngle Standard Options void ValidatePvlIncidenceAngle(void); - + //! Validate PVL Min & Max Resolution Standard Options void ValidatePvlResolution(void); - + //! Validate and read Pixels and Meters from Edge Standard Options void ValidatePvlFromEdge(void); - + //! Validate Pvl Sample, Line, Residual Magnitude Tolerances void ValidatePvlResidualTolerances(void); void ValidatePvlShiftTolerances(); - + //! Read the Serial Numbers from the file and open assocaited cubes void ReadSerialNumbers(QString psSerialNumfile); - + /** - * Set the CameraRequired Flag. This flag indicates whether a camera is required - * to Validate a Control Measure. Camera is required to get Emission, Incidence - * angles and Resolution - * + * Set the CameraRequired Flag. This flag indicates whether a camera is required + * to Validate a Control Measure. Camera is required to get Emission, Incidence + * angles and Resolution + * * @author Sharmila Prasad (5/19/2011) - * - * @param pbFlag + * + * @param pbFlag */ void SetCameraRequiredFlag(bool pbFlag){ mbCameraRequired = pbFlag; } - + double mdMinDN; //!< Standard Option MinDN double mdMaxDN; //!< Standard Option MaxDN double mdMinResolution; //!< Standard Option MinResolution @@ -296,11 +289,10 @@ namespace Isis { CubeManager mCubeMgr; //!< CubeManager to open and read cubes SerialNumberList mSerialNumbers; //!< Serial numbers list - bool mbCameraRequired; //!< To improve speed, flag to indicate if + bool mbCameraRequired; //!< To improve speed, flag to indicate if //!< Camera needs to be opened bool mbValidateDN; //!< Check if DN needs to be Validated bool mbValidateFromEdge; //!< Check if Pixels/Meters from edge needs to be Validated }; }; #endif - diff --git a/isis/src/control/objs/ControlNetValidMeasure/MeasureValidationResults.cpp b/isis/src/control/objs/ControlNetValidMeasure/MeasureValidationResults.cpp index dcb94def7a..2ac3fa4a31 100644 --- a/isis/src/control/objs/ControlNetValidMeasure/MeasureValidationResults.cpp +++ b/isis/src/control/objs/ControlNetValidMeasure/MeasureValidationResults.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "MeasureValidationResults.h" #include @@ -121,4 +129,3 @@ namespace Isis { return ((errorMsg->isEmpty()) ? "failed: " : "") + optString; } }; - diff --git a/isis/src/control/objs/ControlNetValidMeasure/MeasureValidationResults.h b/isis/src/control/objs/ControlNetValidMeasure/MeasureValidationResults.h index a7f66178e8..ccbb05dcce 100644 --- a/isis/src/control/objs/ControlNetValidMeasure/MeasureValidationResults.h +++ b/isis/src/control/objs/ControlNetValidMeasure/MeasureValidationResults.h @@ -1,31 +1,17 @@ #ifndef _MeasureValidationResults_h_ #define _MeasureValidationResults_h_ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + class QString; template< class T > class QVector; -/** - * @file - * $Revision: $ - * $Date: $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ namespace Isis { /** * @brief MeasureValidationResults class @@ -81,4 +67,3 @@ namespace Isis { }; #endif - diff --git a/isis/src/control/objs/ControlNetValidMeasure/unitTest.cpp b/isis/src/control/objs/ControlNetValidMeasure/unitTest.cpp index 1298786547..0ba64dcd43 100644 --- a/isis/src/control/objs/ControlNetValidMeasure/unitTest.cpp +++ b/isis/src/control/objs/ControlNetValidMeasure/unitTest.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "ControlNetValidMeasure.h" #include "Preference.h" #include "IException.h" diff --git a/isis/src/control/objs/ControlNetVersioner/ControlNetVersioner.cpp b/isis/src/control/objs/ControlNetVersioner/ControlNetVersioner.cpp index b71b779954..9f3e0a4c31 100644 --- a/isis/src/control/objs/ControlNetVersioner/ControlNetVersioner.cpp +++ b/isis/src/control/objs/ControlNetVersioner/ControlNetVersioner.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "ControlNetVersioner.h" #include diff --git a/isis/src/control/objs/ControlNetVersioner/ControlNetVersioner.h b/isis/src/control/objs/ControlNetVersioner/ControlNetVersioner.h index 4623cfff02..c39dc83457 100644 --- a/isis/src/control/objs/ControlNetVersioner/ControlNetVersioner.h +++ b/isis/src/control/objs/ControlNetVersioner/ControlNetVersioner.h @@ -1,27 +1,13 @@ #ifndef ControlNetVersioner_h #define ControlNetVersioner_h -/** - * @file - * $Revision: 1.9 $ - * $Date: 2009/07/15 17:33:52 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include @@ -399,13 +385,13 @@ namespace Isis { * Target::GetRadii calls to speed up createPoint(). * @history 2018-01-12 Adam Goins - Added Progress during reads. * @history 2018-01-24 Jesse Mapel - Fixed c++11 build warnings. - * + * * @history 2018-01-27 Jesse Mapel - Fixed some documentation formatting. Added a section * describing the different file format versions. * @history 2018-01-30 Adam Goins - Ensured point sizes are written/read as lsb by using * EndianSwapper. - * @history 2018-02-25 Debbie A. Cook - Generalized calls to - * ControlPoint::IsLatitudeConstrained to IsCoord1Constained + * @history 2018-02-25 Debbie A. Cook - Generalized calls to + * ControlPoint::IsLatitudeConstrained to IsCoord1Constained * and added or updated a few comments. *** TODO *** make sure * the new methods are fully functional for either coordinate type * once the new header keyword is added. @@ -416,11 +402,11 @@ namespace Isis { * so that these values can be grabbed from a ControlNet on read. * Also Fixes #5361. * @history 2018-06-01 Debbie A. Cook - (added to BundleXYZ 2018-02-25) - * Generalized calls to ControlPoint::IsLatitudeConstrained to + * Generalized calls to ControlPoint::IsLatitudeConstrained to * IsCoord1Constained and added or updated a few comments. * *** TODO *** make sure the new methods are fully functional * for either coordinate type once the new header keyword is added. - * + * * @history 2018-07-03 Jesse Mapel - Removed target radii from versioner. References #5457. */ class ControlNetVersioner { diff --git a/isis/src/control/objs/ControlNetVersioner/ControlPointV0001.cpp b/isis/src/control/objs/ControlNetVersioner/ControlPointV0001.cpp index 4d63de4974..77ff48adb1 100644 --- a/isis/src/control/objs/ControlNetVersioner/ControlPointV0001.cpp +++ b/isis/src/control/objs/ControlNetVersioner/ControlPointV0001.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "ControlPointV0001.h" #include @@ -36,7 +44,7 @@ namespace Isis { * Create a ControlPointV0001 object from a version 1 control point Pvl object * * @param pointObject The control point and its measures in a Pvl object - * @param targetName The name of the target + * @param targetName The name of the target */ ControlPointV0001::ControlPointV0001(PvlObject &pointObject, const QString targetName) : m_pointData(new ControlNetFileProtoV0001_PBControlPoint), diff --git a/isis/src/control/objs/ControlNetVersioner/ControlPointV0001.h b/isis/src/control/objs/ControlNetVersioner/ControlPointV0001.h index a2caa40dca..7df1f7b4e8 100644 --- a/isis/src/control/objs/ControlNetVersioner/ControlPointV0001.h +++ b/isis/src/control/objs/ControlNetVersioner/ControlPointV0001.h @@ -1,27 +1,13 @@ #ifndef ControlPointV0001_h #define ControlPointV0001_h -/** - * @file - * $Revision: 1.9 $ - * $Date: 2009/07/15 17:33:52 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include @@ -69,7 +55,7 @@ namespace Isis { * SurfacePoint::SetRadii. References #5457. * @history 2018-07-11 Debbie A Cook - Removed obsolete tests for failure * due to missing target radii. SurfacePoint - * now uses the local radius of the point to + * now uses the local radius of the point to * convert sigmas to target radii are no longer * used. References #5457 */ diff --git a/isis/src/control/objs/ControlNetVersioner/ControlPointV0002.cpp b/isis/src/control/objs/ControlNetVersioner/ControlPointV0002.cpp index a4d088bea9..d78e5c5de5 100644 --- a/isis/src/control/objs/ControlNetVersioner/ControlPointV0002.cpp +++ b/isis/src/control/objs/ControlNetVersioner/ControlPointV0002.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "ControlPointV0002.h" #include diff --git a/isis/src/control/objs/ControlNetVersioner/ControlPointV0002.h b/isis/src/control/objs/ControlNetVersioner/ControlPointV0002.h index 95d18e5077..9eb764f775 100644 --- a/isis/src/control/objs/ControlNetVersioner/ControlPointV0002.h +++ b/isis/src/control/objs/ControlNetVersioner/ControlPointV0002.h @@ -1,27 +1,13 @@ #ifndef ControlPointV0002_h #define ControlPointV0002_h -/** - * @file - * $Revision: 1.9 $ - * $Date: 2009/07/15 17:33:52 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include diff --git a/isis/src/control/objs/ControlNetVersioner/ControlPointV0003.cpp b/isis/src/control/objs/ControlNetVersioner/ControlPointV0003.cpp index 86b3526a5f..cfc28a21a8 100644 --- a/isis/src/control/objs/ControlNetVersioner/ControlPointV0003.cpp +++ b/isis/src/control/objs/ControlNetVersioner/ControlPointV0003.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "ControlPointV0003.h" #include diff --git a/isis/src/control/objs/ControlNetVersioner/ControlPointV0003.h b/isis/src/control/objs/ControlNetVersioner/ControlPointV0003.h index e01ad9b747..57b7df1c4b 100644 --- a/isis/src/control/objs/ControlNetVersioner/ControlPointV0003.h +++ b/isis/src/control/objs/ControlNetVersioner/ControlPointV0003.h @@ -1,27 +1,13 @@ #ifndef ControlPointV0003_h #define ControlPointV0003_h -/** - * @file - * $Revision: 1.9 $ - * $Date: 2009/07/15 17:33:52 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include diff --git a/isis/src/control/objs/ControlNetVersioner/unitTest.cpp b/isis/src/control/objs/ControlNetVersioner/unitTest.cpp index 677a0cd4b8..43bad6df41 100644 --- a/isis/src/control/objs/ControlNetVersioner/unitTest.cpp +++ b/isis/src/control/objs/ControlNetVersioner/unitTest.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "ControlNetVersioner.h" #include @@ -16,82 +24,82 @@ using namespace Isis; void TestNetwork(const QString &filename, Progress *progress, bool printNetwork = true, bool pvlInput = false); -/** +/** * Unit test for ControlNetVersioner class - * - * @author ????-??-?? Unknown - * + * + * @author ????-??-?? Unknown + * * @internal * @history 2018-06-06 Jeannie Backer - Removed file paths from error message written to * test output. - * + * */ int main(int argc, char *argv[]) { Preference::Preferences(true); Progress *testProgress = new Progress(); cout << "Test ControlNetVersioner"; - // No target - TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/unitTest_ControlNetVersioner_PvlNetwork2_PvlV0001.net", + // No target + TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/unitTest_ControlNetVersioner_PvlNetwork2_PvlV0001.net", testProgress, false); // no print network here because the datetimes will change - // Really odd keywords with target - TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/unitTest_ControlNetVersioner_PvlNetwork3_PvlV0001.net", - testProgress); + // Really odd keywords with target + TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/unitTest_ControlNetVersioner_PvlNetwork3_PvlV0001.net", + testProgress); - // Another set of odd keywords - TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/unitTest_ControlNetVersioner_PvlNetwork1_PvlV0001.net", - testProgress); + // Another set of odd keywords + TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/unitTest_ControlNetVersioner_PvlNetwork1_PvlV0001.net", + testProgress); - // Binary V1 - TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/unitTest_ControlNetVersioner_ProtoNetwork1_ProtoV0001.net", - testProgress); + // Binary V1 + TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/unitTest_ControlNetVersioner_ProtoNetwork1_ProtoV0001.net", + testProgress); - // Corrupted (based off of oldNetwork2.net) - TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/unitTest_ControlNetVersioner_BadNetwork_ProtoV0001.net", - testProgress); + // Corrupted (based off of oldNetwork2.net) + TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/unitTest_ControlNetVersioner_BadNetwork_ProtoV0001.net", + testProgress); - // Binary V2 - TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/unitTest_ControlNetVersioner_ProtoNetwork2_ProtoV0002.net", - testProgress, - false); + // Binary V2 + TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/unitTest_ControlNetVersioner_ProtoNetwork2_ProtoV0002.net", + testProgress, + false); - // Network with rejected jigsaw points - TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/unitTest_ControlNetVersioner_PvlNetwork8_PvlV0005.pvl", - testProgress, - true, - true); + // Network with rejected jigsaw points + TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/unitTest_ControlNetVersioner_PvlNetwork8_PvlV0005.pvl", + testProgress, + true, + true); - // Network full of weird test cases (based on PvlNetwork4) - TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/unitTest_ControlNetVersioner_PvlNetwork5_PvlV0003.pvl", + // Network full of weird test cases (based on PvlNetwork4) + TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/unitTest_ControlNetVersioner_PvlNetwork5_PvlV0003.pvl", testProgress, - false, + false, false); // Test Network 1 created for code coverage. - TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/PvlNet_TestNetwork1_V2.net", - testProgress, - false, - false); + TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/PvlNet_TestNetwork1_V2.net", + testProgress, + false, + false); // Test Network 2 created for code coverage. - TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/PvlNet_TestNetwork2_V3.net", - testProgress, - false, - false); + TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/PvlNet_TestNetwork2_V3.net", + testProgress, + false, + false); // Re-test each version without progress - TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/unitTest_ControlNetVersioner_PvlNetwork3_PvlV0001.net", - 0, + TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/unitTest_ControlNetVersioner_PvlNetwork3_PvlV0001.net", + 0, false); - TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/unitTest_ControlNetVersioner_ProtoNetwork1_ProtoV0001.net", - 0, + TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/unitTest_ControlNetVersioner_ProtoNetwork1_ProtoV0001.net", + 0, false); - TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/unitTest_ControlNetVersioner_ProtoNetwork2_ProtoV0002.net", - 0, + TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/unitTest_ControlNetVersioner_ProtoNetwork2_ProtoV0002.net", + 0, false); - TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/unitTest_ControlNetVersioner_PvlNetwork4_PvlV0003.pvl", - 0, + TestNetwork("$ISISTESTDATA/isis/src/control/unitTestData/unitTest_ControlNetVersioner_PvlNetwork4_PvlV0003.pvl", + 0, false); cout << endl << "Test writing from ControlNet objects" << endl << endl; @@ -217,11 +225,11 @@ int main(int argc, char *argv[]) { /** - * Runs various test on the given network. - * + * Runs various test on the given network. + * * @param filename Name of the control network file. - * @param progress - * @param printNetwork Indicates whether to print the network as + * @param progress + * @param printNetwork Indicates whether to print the network as * a PVL. * @param pvlInput Indicates whether the given network is in PVL * format. diff --git a/isis/src/control/objs/ControlNetVitals/ControlNetVitals.cpp b/isis/src/control/objs/ControlNetVitals/ControlNetVitals.cpp index 9f6b66f80c..2c726fd1af 100644 --- a/isis/src/control/objs/ControlNetVitals/ControlNetVitals.cpp +++ b/isis/src/control/objs/ControlNetVitals/ControlNetVitals.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "ControlNetVitals.h" #include diff --git a/isis/src/control/objs/ControlNetVitals/ControlNetVitals.h b/isis/src/control/objs/ControlNetVitals/ControlNetVitals.h index b0528c100e..dcd70604e1 100644 --- a/isis/src/control/objs/ControlNetVitals/ControlNetVitals.h +++ b/isis/src/control/objs/ControlNetVitals/ControlNetVitals.h @@ -1,27 +1,13 @@ #ifndef ControlNetVitals_h #define ControlNetVitals_h -/** - * @file - * $Revision: 1.2 $ - * $Date: 2010/06/28 17:15:01 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc/documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include diff --git a/isis/src/control/objs/ControlNetVitals/unitTest.cpp b/isis/src/control/objs/ControlNetVitals/unitTest.cpp index 74c48a9860..3722fd5082 100644 --- a/isis/src/control/objs/ControlNetVitals/unitTest.cpp +++ b/isis/src/control/objs/ControlNetVitals/unitTest.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -14,8 +22,8 @@ using namespace Isis; using namespace std; /** - * Unit test for ControlNetVitals class - * + * Unit test for ControlNetVitals class + * * @author 2018-06-18 Adam Goins * @internal * @history 2018-06-22 Kristin Berry - Upated after fix to numImagesBelowMeasureThreshold() diff --git a/isis/src/control/objs/ControlPoint/ControlPoint.cpp b/isis/src/control/objs/ControlPoint/ControlPoint.cpp index 0ad026f756..8c934eb219 100644 --- a/isis/src/control/objs/ControlPoint/ControlPoint.cpp +++ b/isis/src/control/objs/ControlPoint/ControlPoint.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "ControlPoint.h" @@ -839,7 +847,7 @@ namespace Isis { } - /** + /** * Computes a priori lat/lon/radius point coordinates by determining the average lat/lon/radius of * all measures. Note that this does not change ignored, fixed or constrained points. * @@ -1003,12 +1011,12 @@ namespace Isis { * @history 2012-01-18 Debbie A. Cook, Revised to call * ComputeResidualsMillimeters() to avoid duplication of code. * @history 2019-05-16 Debbie A. Cook, The calls to CameraGroundMap::GetXY - * were changed to allow not testing for points on the back side of the - * planet during bundle adjustment. Now, the instrument coordinates + * were changed to allow not testing for points on the back side of the + * planet during bundle adjustment. Now, the instrument coordinates * will be calculated and returned always to this method. In the future, - * a separate diagnostic tool may be helpful to check for non-visable + * a separate diagnostic tool may be helpful to check for non-visable * points in a control net AFTER bundle adjustment. References #2591. - * + * */ ControlPoint::Status ControlPoint::ComputeResiduals() { if (IsIgnored()) { diff --git a/isis/src/control/objs/ControlPoint/ControlPoint.h b/isis/src/control/objs/ControlPoint/ControlPoint.h index fd9cc9e1d2..c8d5121ba5 100644 --- a/isis/src/control/objs/ControlPoint/ControlPoint.h +++ b/isis/src/control/objs/ControlPoint/ControlPoint.h @@ -1,28 +1,13 @@ #ifndef ControlPoint_h #define ControlPoint_h -/** - * @file - * $Revision: 1.14 $ - * $Date: 2009/09/08 17:38:17 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include @@ -363,7 +348,7 @@ namespace Isis { * #2591). Added check to IsConstrained() method to see if point type is * Free, in which case we ignore stored a priori sigmas on the * coordinates. - * @history 2019-05-16 Debbie A. Cook See history entry for ComputeResiduals. Modified call to + * @history 2019-05-16 Debbie A. Cook See history entry for ComputeResiduals. Modified call to * CameraGroundMap to not do back-of-planet test. References #2591. */ class ControlPoint : public QObject { diff --git a/isis/src/control/objs/ControlPoint/unitTest.cpp b/isis/src/control/objs/ControlPoint/unitTest.cpp index 6ad1b08a34..45dddb9951 100644 --- a/isis/src/control/objs/ControlPoint/unitTest.cpp +++ b/isis/src/control/objs/ControlPoint/unitTest.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include diff --git a/isis/src/control/objs/ControlPointList/ControlPointList.cpp b/isis/src/control/objs/ControlPointList/ControlPointList.cpp index b6553ece3b..bfd4955803 100644 --- a/isis/src/control/objs/ControlPointList/ControlPointList.cpp +++ b/isis/src/control/objs/ControlPointList/ControlPointList.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "ControlPointList.h" #include @@ -134,4 +142,3 @@ namespace Isis { pcPvlLog += Isis::PvlKeyword("InvalidPointIds", sPointsNotFound); } } - diff --git a/isis/src/control/objs/ControlPointList/ControlPointList.h b/isis/src/control/objs/ControlPointList/ControlPointList.h index 05a71273f8..083439e97d 100644 --- a/isis/src/control/objs/ControlPointList/ControlPointList.h +++ b/isis/src/control/objs/ControlPointList/ControlPointList.h @@ -1,27 +1,13 @@ #ifndef ControlPointList_h #define ControlPointList_h -/** - * @file - * $Revision: 1.2 $ - * $Date: 2010/06/28 17:15:01 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc/documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include @@ -68,7 +54,7 @@ namespace Isis { //! holds one to one correspondence with "mqCpList" on //! whether the point was valid - QVector mbFound; + QVector mbFound; }; }; diff --git a/isis/src/control/objs/ControlPointList/unitTest.cpp b/isis/src/control/objs/ControlPointList/unitTest.cpp index cf66d58666..4315dd29af 100644 --- a/isis/src/control/objs/ControlPointList/unitTest.cpp +++ b/isis/src/control/objs/ControlPointList/unitTest.cpp @@ -1,11 +1,19 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "ControlPointList.h" #include #include #include "IException.h" -#include "FileName.h" -#include "Preference.h" +#include "FileName.h" +#include "Preference.h" using namespace Isis; using namespace std; diff --git a/isis/src/control/objs/CorrelationMatrix/CorrelationMatrix.cpp b/isis/src/control/objs/CorrelationMatrix/CorrelationMatrix.cpp index 5b0ec3bac7..c32a20243b 100644 --- a/isis/src/control/objs/CorrelationMatrix/CorrelationMatrix.cpp +++ b/isis/src/control/objs/CorrelationMatrix/CorrelationMatrix.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "CorrelationMatrix.h" #include @@ -19,8 +27,8 @@ namespace Isis { * Default Constructor */ CorrelationMatrix::CorrelationMatrix() { - m_covarianceFileName = new FileName(""); - m_correlationFileName = new FileName(""); + m_covarianceFileName = new FileName(""); + m_correlationFileName = new FileName(""); m_visibleBlocks = new QList(); m_imagesAndParameters = new QMap(); m_diagonals = new QList(); @@ -78,7 +86,7 @@ namespace Isis { QString msg = "Could not find the Covariance Matrix .dat file name."; throw IException(e, IException::User, msg, _FILEINFO_); } - + try { QString corrFileName = storedMatrixData.findKeyword("CorrelationMatrixFileName")[0]; if (corrFileName == "NULL") { @@ -159,19 +167,19 @@ namespace Isis { delete m_imagesAndParameters; m_imagesAndParameters = NULL; m_imagesAndParameters = new QMap(*other.m_imagesAndParameters); - + delete m_covarianceFileName; m_covarianceFileName = NULL; m_covarianceFileName = new FileName(*other.m_covarianceFileName); - + delete m_correlationFileName; m_correlationFileName = NULL; m_correlationFileName = new FileName(*other.m_correlationFileName); - + delete m_diagonals; m_diagonals = NULL; m_diagonals = new QList(*other.m_diagonals); - + delete m_visibleBlocks; m_visibleBlocks = NULL; m_visibleBlocks = new QList(*other.m_visibleBlocks); @@ -241,7 +249,7 @@ namespace Isis { while ( block.hasNext() ) { // each block in the column block.next(); for (int row = 0; row < (int)block.value()->size1(); row++) { // each row in the block - for (int column = 0; column < (int)block.value()->size2(); column++) { // each column + for (int column = 0; column < (int)block.value()->size2(); column++) { // each column // correlation = covariance / (variance1 * variance2) ( *block.value() )(row, column) = ( *block.value() )(row, column) / sqrt( (*m_diagonals)[param1] * @@ -262,7 +270,7 @@ namespace Isis { outStream << sbcm; m_visibleBlocks->append(sbcm); } - + // close file matrixInput.close(); matrixOutput.close(); @@ -376,7 +384,7 @@ namespace Isis { } else { *m_imagesAndParameters = imagesAndParameters; - } + } } @@ -455,19 +463,19 @@ namespace Isis { * Object = CorrelationMatrixData * CovarianceMatrixFileName = /location/covarianceTmpFileName.dat * CorrelationMatrixFileName = /location/correlationTmpFileName.dat - * + * * Group = ImagesAndParameters * Image1Name = "Param1, Param2, ..., ParamN" * ... * ImageNName = "..." * End_Group * End_Object - * + * * @return @b PvlGroup Returns the information needed to recreate this correlation matrix. */ PvlObject CorrelationMatrix::pvlObject() { PvlObject corrMatInfo("CorrelationMatrixData"); - + corrMatInfo += PvlKeyword( "CovarianceMatrixFileName", m_covarianceFileName->expanded() ); corrMatInfo += PvlKeyword( "CorrelationMatrixFileName", m_correlationFileName->expanded() ); @@ -478,7 +486,7 @@ namespace Isis { imgsAndParams += PvlKeyword( imgParamIt.key(), imgParamIt.value().join(",") ); } corrMatInfo += imgsAndParams; - + return corrMatInfo; } } diff --git a/isis/src/control/objs/CorrelationMatrix/CorrelationMatrix.h b/isis/src/control/objs/CorrelationMatrix/CorrelationMatrix.h index d7a55ad3c0..c17fc395a8 100644 --- a/isis/src/control/objs/CorrelationMatrix/CorrelationMatrix.h +++ b/isis/src/control/objs/CorrelationMatrix/CorrelationMatrix.h @@ -1,24 +1,13 @@ #ifndef CorrelationMatrix_h #define CorrelationMatrix_h -/** - * @file - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "FileName.h" @@ -75,7 +64,7 @@ namespace Isis { CorrelationMatrix(PvlObject storedMatrixData); CorrelationMatrix(const CorrelationMatrix &other); ~CorrelationMatrix(); - + CorrelationMatrix &operator=(const CorrelationMatrix &other); void computeCorrelationMatrix(); diff --git a/isis/src/control/objs/CorrelationMatrix/unitTest.cpp b/isis/src/control/objs/CorrelationMatrix/unitTest.cpp index 89de1965c2..1765dc2e3b 100644 --- a/isis/src/control/objs/CorrelationMatrix/unitTest.cpp +++ b/isis/src/control/objs/CorrelationMatrix/unitTest.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -18,9 +26,9 @@ using namespace boost::numeric::ublas; using namespace Isis; int main() { - Preference::Preferences(true); + Preference::Preferences(true); qDebug() << "Test Default Constructor"; - + CorrelationMatrix corrMat; qDebug() << "Test Copy Constructor"; @@ -33,9 +41,9 @@ int main() { "Failed to create object with copy constructor", _FILEINFO_); } - + qDebug() << "Test Equal Operator ( = )"; - + try { CorrelationMatrix corrMat3 = corrMat; } @@ -108,7 +116,7 @@ int main() { } qDebug() << "Does the matrix exist?" << corrMat.isValid(); - + QMap imgsAndParams; QStringList param; @@ -222,9 +230,9 @@ int main() { } - + //delete mat files covQFile.remove(); QFile(corrMat.correlationFileName().expanded()).remove(); - + } diff --git a/isis/src/control/objs/InterestOperator/InterestOperator.cpp b/isis/src/control/objs/InterestOperator/InterestOperator.cpp index bd885055cd..59b68b42d7 100644 --- a/isis/src/control/objs/InterestOperator/InterestOperator.cpp +++ b/isis/src/control/objs/InterestOperator/InterestOperator.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Chip.h" #include "Pvl.h" #include "InterestOperator.h" diff --git a/isis/src/control/objs/InterestOperator/InterestOperator.h b/isis/src/control/objs/InterestOperator/InterestOperator.h index 438888c6a9..f2b18a1f8a 100644 --- a/isis/src/control/objs/InterestOperator/InterestOperator.h +++ b/isis/src/control/objs/InterestOperator/InterestOperator.h @@ -1,27 +1,13 @@ #ifndef InterestOperator_h #define InterestOperator_h -/** - * @file - * $Revision: 1.20 $ - * $Date: 2010/07/02 23:38:14 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include @@ -118,14 +104,14 @@ namespace Isis { * InterestByPoint(). References #825. * @history 2014-03-03 Janet Barrett - Changed the FindCnetRef method to report status on number * of points processed instead of number of measures. Fixes #2040. - * + * */ class InterestOperator : public ControlNetValidMeasure { public: InterestOperator(Pvl &pPvl); - + virtual ~InterestOperator(); - + void InitInterestOptions(); void SetPatternValidPercent(const double percent); diff --git a/isis/src/control/objs/InterestOperator/unitTest.cpp b/isis/src/control/objs/InterestOperator/unitTest.cpp index 084b5e4de1..0d6c39e2d4 100644 --- a/isis/src/control/objs/InterestOperator/unitTest.cpp +++ b/isis/src/control/objs/InterestOperator/unitTest.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include "InterestOperator.h" diff --git a/isis/src/control/objs/InterestOperatorFactory/InterestOperatorFactory.cpp b/isis/src/control/objs/InterestOperatorFactory/InterestOperatorFactory.cpp index c23a4de8d7..ffa872601c 100644 --- a/isis/src/control/objs/InterestOperatorFactory/InterestOperatorFactory.cpp +++ b/isis/src/control/objs/InterestOperatorFactory/InterestOperatorFactory.cpp @@ -1,25 +1,10 @@ -/** - * @file - * $Revision: 1.3 $ - * $Date: 2010/06/10 23:42:31 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "InterestOperatorFactory.h" #include "InterestOperator.h" diff --git a/isis/src/control/objs/InterestOperatorFactory/InterestOperatorFactory.h b/isis/src/control/objs/InterestOperatorFactory/InterestOperatorFactory.h index e97ace2f88..76b8d415e7 100644 --- a/isis/src/control/objs/InterestOperatorFactory/InterestOperatorFactory.h +++ b/isis/src/control/objs/InterestOperatorFactory/InterestOperatorFactory.h @@ -1,27 +1,13 @@ #ifndef InterestOperatorFactory_h #define InterestOperatorFactory_h -/** - * @file - * $Revision: 1.3 $ - * $Date: 2010/06/10 23:42:31 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ namespace Isis { class Pvl; diff --git a/isis/src/control/objs/InterestOperatorFactory/unitTest.cpp b/isis/src/control/objs/InterestOperatorFactory/unitTest.cpp index 51c0fad3bd..6c1ac326c3 100644 --- a/isis/src/control/objs/InterestOperatorFactory/unitTest.cpp +++ b/isis/src/control/objs/InterestOperatorFactory/unitTest.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include "Preference.h" diff --git a/isis/src/control/objs/MaximumLikelihoodWFunctions/MaximumLikelihoodWFunctions.cpp b/isis/src/control/objs/MaximumLikelihoodWFunctions/MaximumLikelihoodWFunctions.cpp index 0a49bdfce5..33d1bb715d 100644 --- a/isis/src/control/objs/MaximumLikelihoodWFunctions/MaximumLikelihoodWFunctions.cpp +++ b/isis/src/control/objs/MaximumLikelihoodWFunctions/MaximumLikelihoodWFunctions.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "MaximumLikelihoodWFunctions.h" #include @@ -10,20 +18,20 @@ #include "IString.h" namespace Isis { - /** + /** * Sets up a maximumlikelihood estimation function with Huber model and default tweaking * constant - */ + */ MaximumLikelihoodWFunctions::MaximumLikelihoodWFunctions() { this->setModel(Huber); } // choose Model and define the tweaking constant - /** + /** * Sets up a maximumlikelihood estimation function with specified model and default tweaking * constant - * + * * @param[in] enum Model modelSelection, the model to be used * (see documentation for enum Model) */ @@ -33,10 +41,10 @@ namespace Isis { } - - /** + + /** * Sets up a maximumlikelihood estimation function with specified model and tweaking constant - * + * * @param[in] enum Model modelSelection, the model to be used * (see documentation for enum Model) * @param[in] double tweaking constant, exact meaning varies by model, but generally the larger @@ -45,7 +53,7 @@ namespace Isis { * included in the solution. * @throws IsisProgrammerError if tweakingConstant <= 0.0 */ - MaximumLikelihoodWFunctions::MaximumLikelihoodWFunctions(Model modelSelection, + MaximumLikelihoodWFunctions::MaximumLikelihoodWFunctions(Model modelSelection, double tweakingConstant) { // choose Model and define the tweaking constant setModel(modelSelection, tweakingConstant); @@ -53,7 +61,7 @@ namespace Isis { MaximumLikelihoodWFunctions::MaximumLikelihoodWFunctions( const MaximumLikelihoodWFunctions &other) - : m_model(other.m_model), + : m_model(other.m_model), m_tweakingConstant(other.m_tweakingConstant) { } @@ -69,7 +77,7 @@ namespace Isis { return *this; } - /** + /** * Allows the maximum likelihood model to be changed together and the default tweaking constant * to be set * @@ -84,7 +92,7 @@ namespace Isis { - /** + /** * Sets default tweaking constants based on the maximum likelihood estimation model being used. */ void MaximumLikelihoodWFunctions::setTweakingConstantDefault() { @@ -92,7 +100,7 @@ namespace Isis { switch (m_model) { case Huber: m_tweakingConstant = 1.345; // "95% asymptotic efficiecy on the standard normal distribution" - // is obtained with this constant, + // is obtained with this constant, // see Zhang's "Parameter Estimation" break; case HuberModified: @@ -106,7 +114,7 @@ namespace Isis { // see Zhang's "Parameter Estimation" break; case Chen: - m_tweakingConstant = 1; // This is the constant used by Chen in his paper, + m_tweakingConstant = 1; // This is the constant used by Chen in his paper, // no specific reason why is stated break; default: @@ -117,7 +125,7 @@ namespace Isis { -/** +/** * Allows the maximum likelihood model to be changed together with the tweaking constant * * @param[in] enum Model modelSelection, the model to be used @@ -128,7 +136,7 @@ namespace Isis { * measures are included in the solution. * @throws IsisProgrammerError if tweakingConstant <= 0.0 */ - void MaximumLikelihoodWFunctions::setModel(Model modelSelection, double tweakingConstant) { + void MaximumLikelihoodWFunctions::setModel(Model modelSelection, double tweakingConstant) { // choose Model and define the tweaking constant m_model = modelSelection; setTweakingConstant(tweakingConstant); @@ -136,16 +144,16 @@ namespace Isis { - /** + /** * Allows the tweaking constant to be changed without changing the maximum likelihood function * * @param[in] tweakingConstant, exact meaning varies by model, but generally the larger * the value the more influence larger resiudals have on the solution. As well as possiblly the * more measures are included in the solution. - * + * * @throws IsisProgrammerError if tweakingConstant <= 0.0 */ - void MaximumLikelihoodWFunctions::setTweakingConstant(double tweakingConstant) { + void MaximumLikelihoodWFunctions::setTweakingConstant(double tweakingConstant) { // leave model type unaltered and change tweaking constant if (tweakingConstant <= 0.0) { IString msg = "Maximum likelihood estimation tweaking constants must be > 0.0"; @@ -156,7 +164,7 @@ namespace Isis { - /** + /** * Returns the current tweaking constant */ double MaximumLikelihoodWFunctions::tweakingConstant() const { @@ -165,45 +173,45 @@ namespace Isis { - /** + /** * This provides the scalar for the weight (not the scaler for the square * root of the weight, which is generally more useful) * - * @param[in] double residualZScore, this the residual of a particulare measure in a particular + * @param[in] double residualZScore, this the residual of a particulare measure in a particular * iteration divided by the standard deviation (sigma) of that * measure - * @return double the scaler adjustment to the weight for the measure + * @return double the scaler adjustment to the weight for the measure * nominal weight = 1 /sigma/sigma and weight' = scaler/sigma/sigma */ - double MaximumLikelihoodWFunctions::weightScaler(double residualZScore) { + double MaximumLikelihoodWFunctions::weightScaler(double residualZScore) { // this is likely the least usefull of the scaler functions but it is provided for completness. // This directly provides the scaler for the weight (instead of the radical weight), thus it - // provides sqrtWeightScaler^2 + // provides sqrtWeightScaler^2 switch(m_model) { case Huber: - return this->huber(residualZScore); + return this->huber(residualZScore); case HuberModified: return this->huberModified(residualZScore); case Welsch: - return this->welsch(residualZScore); + return this->welsch(residualZScore); case Chen: return this->chen(residualZScore); default: - return 1.0; // default to prevent nonsense from being returned, + return 1.0; // default to prevent nonsense from being returned, // but the program should never reach this line } } - /** - * This provides the scaler to the sqrt of the weight, which is very useful for building normal + /** + * This provides the scaler to the sqrt of the weight, which is very useful for building normal * equations. * - * @param[in] double residualZScore, this the residual of a particulare measure in a particular + * @param[in] double residualZScore, this the residual of a particulare measure in a particular * iteration divided by the standard deviation (sigma) of that * measure - * @return double the scaler adjustment to the sqrt of the weight for the measure + * @return double the scaler adjustment to the sqrt of the weight for the measure * nominal sqrt(weight) = 1 /sigma and sqrt(weight') = scaler/sigma */ double MaximumLikelihoodWFunctions::sqrtWeightScaler(double residualZScore) { @@ -219,14 +227,14 @@ namespace Isis { - /** - * Huber maximum likelihood estimation function evaluation. For details, see documentation of the - * enum, MaximumLikelihoodWFunctions::Model + /** + * Huber maximum likelihood estimation function evaluation. For details, see documentation of the + * enum, MaximumLikelihoodWFunctions::Model * - * @param[in] double residualZScore, this the residual of a particulare measure in a particular + * @param[in] double residualZScore, this the residual of a particulare measure in a particular * iteration divided by the standard deviation (sigma) of that * measure - * @return double the scaler adjustment to the weight for the measure + * @return double the scaler adjustment to the weight for the measure * nominal weight = 1 /sigma/sigma and weight' = scaler/sigma/sigma */ double MaximumLikelihoodWFunctions::huber(double residualZScore) { @@ -241,14 +249,14 @@ namespace Isis { - /** - * Modified Huber maximum likelihood estimation function evaluation. For - * details see documentation of enum Model + /** + * Modified Huber maximum likelihood estimation function evaluation. For + * details see documentation of enum Model * - * @param[in] double residualZScore, this the residual of a particulare measure in a particular + * @param[in] double residualZScore, this the residual of a particulare measure in a particular * iteration divided by the standard deviation (sigma) of that * measure - * @return double the scaler adjustment to the weight for the measure + * @return double the scaler adjustment to the weight for the measure * nominal weight = 1 /sigma/sigma and weight' = scaler/sigma/sigma */ double MaximumLikelihoodWFunctions::huberModified(double residualZScore) { @@ -263,14 +271,14 @@ namespace Isis { - /** - * Modified Huber maximum likelihood estimation function evaluation. For - * details see documentation of enum Model + /** + * Modified Huber maximum likelihood estimation function evaluation. For + * details see documentation of enum Model * - * @param[in] double residualZScore, this the residual of a particulare measure in a particular + * @param[in] double residualZScore, this the residual of a particulare measure in a particular * iteration divided by the standard deviation (sigma) of that * measure - * @return double the scaler adjustment to the weight for the measure + * @return double the scaler adjustment to the weight for the measure * nominal weight = 1 /sigma/sigma and weight' = scaler/sigma/sigma */ double MaximumLikelihoodWFunctions::welsch(double residualZScore) { @@ -281,23 +289,23 @@ namespace Isis { - /** - * Modified Huber maximum likelihood estimation function evaluation. + /** + * Modified Huber maximum likelihood estimation function evaluation. * For details, see documentation of enum Model. * - * @param[in] double residualZScore, this the residual of a particulare measure in a particular + * @param[in] double residualZScore, this the residual of a particulare measure in a particular * iteration divided by the standard deviation (sigma) of that - * measure - * @return double the scaler adjustment to the weight for the measure + * measure + * @return double the scaler adjustment to the weight for the measure * nominal weight = 1 /sigma/sigma and weight' = scaler/sigma/sigma */ double MaximumLikelihoodWFunctions::chen(double residualZScore) { // chen weight function if ( fabs(residualZScore) <= m_tweakingConstant) { - double weightFactor = m_tweakingConstant * m_tweakingConstant + double weightFactor = m_tweakingConstant * m_tweakingConstant - residualZScore * residualZScore; return 6 * weightFactor * weightFactor; // use of weight factor variable reduces number of - // operations from 7 to 4 + // operations from 7 to 4 } else { return 0.0; @@ -306,15 +314,15 @@ namespace Isis { - /** - * Suggest a quantile of the probility distribution of the residuals to use as the tweaking + /** + * Suggest a quantile of the probility distribution of the residuals to use as the tweaking * constants based on the maximum likelihood estimation model being used. * - * @return double quantile [0,1] the value pretaining to this quantile (in the probility + * @return double quantile [0,1] the value pretaining to this quantile (in the probility * distribution of the residuals) should be used as the tweaking constant. */ - double MaximumLikelihoodWFunctions::tweakingConstantQuantile() { - // returns which quantile of the sqaured residuals is recommended to use as the tweaking + double MaximumLikelihoodWFunctions::tweakingConstantQuantile() { + // returns which quantile of the sqaured residuals is recommended to use as the tweaking // constants, this varies as a function of the model being employed desired quantiles for // various models, these parameters are estimated based on inspection of the fucntions and // should be tested and revised with experience @@ -325,7 +333,7 @@ namespace Isis { // have the same effect on the solution regardless of magnitude case HuberModified: return 0.4; // In this model after residualZScore >= m_tweakingConstant*Isis::HALFPI the residuals have the same - // influence on the solution, + // influence on the solution, case Welsch: return 0.7; // at about double m_tweakingConstant the residuals have very little influence case Chen: @@ -337,12 +345,12 @@ namespace Isis { - /** - * Static method to return a string represtentation for a given MaximumLikelihoodWFunctions::Model - * enum. - * + /** + * Static method to return a string represtentation for a given MaximumLikelihoodWFunctions::Model + * enum. + * * @param model Enumerated value for a MaximumLikelihoodWFunctions model. - * @return QString label for the enumeration. + * @return QString label for the enumeration. */ QString MaximumLikelihoodWFunctions::modelToString(MaximumLikelihoodWFunctions::Model model) { if (model == MaximumLikelihoodWFunctions::Huber) return "Huber"; @@ -380,11 +388,11 @@ namespace Isis { - /** - * Method to return a string represtentation of the weighted residual cutoff (if it exists) for - * the MaximumLikelihoodWFunctions::Model. If no cutoff exists, the string "N/A" is returned. - * - * @return QString label for the weighted residual cut off of the maximum likelihood estimation + /** + * Method to return a string represtentation of the weighted residual cutoff (if it exists) for + * the MaximumLikelihoodWFunctions::Model. If no cutoff exists, the string "N/A" is returned. + * + * @return QString label for the weighted residual cut off of the maximum likelihood estimation * model. * @throw "Estimation model has not been set." */ @@ -397,9 +405,9 @@ namespace Isis { - /** + /** * Accessor method to return the MaximumLikelihoodWFunctions::Model enumeration. - * + * * @return enum for the maximum likelihood estimation model. */ MaximumLikelihoodWFunctions::Model MaximumLikelihoodWFunctions::model() const { diff --git a/isis/src/control/objs/MaximumLikelihoodWFunctions/MaximumLikelihoodWFunctions.h b/isis/src/control/objs/MaximumLikelihoodWFunctions/MaximumLikelihoodWFunctions.h index f31ee3a0eb..2c0ecdabe2 100644 --- a/isis/src/control/objs/MaximumLikelihoodWFunctions/MaximumLikelihoodWFunctions.h +++ b/isis/src/control/objs/MaximumLikelihoodWFunctions/MaximumLikelihoodWFunctions.h @@ -1,42 +1,27 @@ #ifndef MaximumLikelihoodWFunctions_h #define MaximumLikelihoodWFunctions_h -/** - * @file - * $Revision: 1.14 $ - * $Date: 2009/09/08 17:38:17 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include namespace Isis { /** - * @brief Class provides maximum likelihood estimation functions for robust parameter estimation, + * @brief Class provides maximum likelihood estimation functions for robust parameter estimation, * e.g. in bundle adjustment. * - * A maximum likelihood estimation W function provides a scheme for 're-weighting' observations so - * that measures with large residuals have reduced or negligible effect on the solution. There - * are many such functions available, a few have been programmed into this class. See enum Model - * documentation for specifics of the estimation models. - * - * References: Zhangs, "Parameter Estimation: A Tutorial with Application to Conic Fitting" + * A maximum likelihood estimation W function provides a scheme for 're-weighting' observations so + * that measures with large residuals have reduced or negligible effect on the solution. There + * are many such functions available, a few have been programmed into this class. See enum Model + * documentation for specifics of the estimation models. + * + * References: Zhangs, "Parameter Estimation: A Tutorial with Application to Conic Fitting" * Koch, "Parameter Estimation and Hypothesis Testing in Linear Systems" * 2nd edition, chapter 3.8 * Manual of Photogrammetry, 5th edition, chapter 2.2 (particularly 2.2.6) @@ -58,12 +43,12 @@ namespace Isis { * methods. * @history 2014-09-19 Jeannie Backer - Removed bugs. Added documentation. Cleaned * duplicate code. - * @history 2018-06-29 Christopher Combs - Added extra HuberModified case to stringToModel(). + * @history 2018-06-29 Christopher Combs - Added extra HuberModified case to stringToModel(). * Fixes #5446. */ class MaximumLikelihoodWFunctions { public: - /** + /** * The supported maximum likelihood estimation models. */ // Each model has an accompannying private method that converts from a @@ -77,15 +62,15 @@ namespace Isis { * No measures are totally disregarded. * http://research.microsoft.com/en-us/um/people/zhang/Papers/ZhangIVC-97-01.pdf */ - Huber, - + Huber, + /** A modification to Huber's method propsed by William J.J. Rey in Introduction to Robust * and Quasi-Robust Statistical Methods. Springer, Berlin, Heidelberg, 1983. It has similiar * properties to the Huber, but with a continuous second derivative. This comes at the cost * of being somewhat more computationally expernsive. No measures are totally disregarded. * http://research.microsoft.com/en-us/um/people/zhang/Papers/ZhangIVC-97-01.pdf */ - HuberModified, + HuberModified, /** The Welsch method aggresively discounts measures with large resiudals. Residuals two * times greater than the tweaking constant are all but ignored. This method can be risky to @@ -96,7 +81,7 @@ namespace Isis { * (such as Huber's). * http://research.microsoft.com/en-us/um/people/zhang/Papers/ZhangIVC-97-01.pdf */ - Welsch, + Welsch, /** The Chen method was found in "Robust Regression with Projection Based M-estimators" Chen, * et. al., though Chen does not take credit as the author. It was of interest because he @@ -132,7 +117,7 @@ namespace Isis { // scalar functions provide access to various flavors of this scalar (as // a function of the residual divided by the residuals sigma) - double sqrtWeightScaler(double residualZScore); //it is often convient to use square roots of + double sqrtWeightScaler(double residualZScore); //it is often convient to use square roots of //weights when building normals, this function // provides the scaler for the square root of // the weight directly @@ -158,7 +143,7 @@ namespace Isis { double m_tweakingConstant; /**< The tweaking constant for the maximum likelihood models. Default values are available for each model using the method setTweakingConstantDefault(). This value can also be manually - adjusted using the method setTweakingConstant(). If there is + adjusted using the method setTweakingConstant(). If there is knowlege of the probility distrubtion of the residuals in an adjustment, tweakingConstantQuantile() will recommend which quantile to use as the tweaking constant.*/ diff --git a/isis/src/control/objs/MaximumLikelihoodWFunctions/unitTest.cpp b/isis/src/control/objs/MaximumLikelihoodWFunctions/unitTest.cpp index 7e60a2bf27..e881c9289a 100644 --- a/isis/src/control/objs/MaximumLikelihoodWFunctions/unitTest.cpp +++ b/isis/src/control/objs/MaximumLikelihoodWFunctions/unitTest.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -31,7 +39,7 @@ int main(int argc, char *argv[]) { qDebug() << "Default constructor sets model to Huber and corresponding default TC:"; MaximumLikelihoodWFunctions wFunc; - qDebug() << "Model = " + qDebug() << "Model = " << MaximumLikelihoodWFunctions::modelToString(wFunc.model()); qDebug() << "TweakingConstant = " << toString(wFunc.tweakingConstant()); qDebug() << "WeightedResidualCutoff = " << wFunc.weightedResidualCutoff(); @@ -43,12 +51,12 @@ int main(int argc, char *argv[]) { temp = wFunc.sqrtWeightScaler(-2.0); qDebug() << "wFunc->sqrtWeightScaler(-2): " << temp; temp = wFunc.sqrtWeightScaler(2.5); - qDebug() << "wFunc->sqrtWeightScaler(2.5): " << temp; - qDebug() << ""; + qDebug() << "wFunc->sqrtWeightScaler(2.5): " << temp; + qDebug() << ""; wFunc.setTweakingConstant(2.0); qDebug() << "TC constant re-set to 2.0:"; - qDebug() << "Model = " + qDebug() << "Model = " << MaximumLikelihoodWFunctions::modelToString(wFunc.model()); qDebug() << "TweakingConstant = " << toString(wFunc.tweakingConstant()); qDebug() << "WeightedResidualCutoff = " << wFunc.weightedResidualCutoff(); @@ -60,12 +68,12 @@ int main(int argc, char *argv[]) { temp = wFunc.sqrtWeightScaler(-2.0); qDebug() << "wFunc->sqrtWeightScaler(-2): " << temp; temp = wFunc.sqrtWeightScaler(2.5); - qDebug() << "wFunc->sqrtWeightScaler(2.5): " << temp; - qDebug() << ""; + qDebug() << "wFunc->sqrtWeightScaler(2.5): " << temp; + qDebug() << ""; wFunc.setTweakingConstantDefault(); qDebug() << "TC constant re-set to default:"; - qDebug() << "Model = " + qDebug() << "Model = " << MaximumLikelihoodWFunctions::modelToString(wFunc.model()); qDebug() << "TweakingConstant = " << toString(wFunc.tweakingConstant()); qDebug() << "WeightedResidualCutoff = " << wFunc.weightedResidualCutoff(); @@ -77,12 +85,12 @@ int main(int argc, char *argv[]) { temp = wFunc.sqrtWeightScaler(-2.0); qDebug() << "wFunc->sqrtWeightScaler(-2): " << temp; temp = wFunc.sqrtWeightScaler(2.5); - qDebug() << "wFunc->sqrtWeightScaler(2.5): " << temp; - qDebug() << ""; + qDebug() << "wFunc->sqrtWeightScaler(2.5): " << temp; + qDebug() << ""; wFunc.setModel(MaximumLikelihoodWFunctions::Huber); qDebug() << "Model manually set with default TC:"; - qDebug() << "Model = " + qDebug() << "Model = " << MaximumLikelihoodWFunctions::modelToString(wFunc.model()); qDebug() << "TweakingConstant = " << toString(wFunc.tweakingConstant()); qDebug() << "WeightedResidualCutoff = " << wFunc.weightedResidualCutoff(); @@ -94,12 +102,12 @@ int main(int argc, char *argv[]) { temp = wFunc.sqrtWeightScaler(-2.0); qDebug() << "wFunc->sqrtWeightScaler(-2): " << temp; temp = wFunc.sqrtWeightScaler(2.5); - qDebug() << "wFunc->sqrtWeightScaler(2.5): " << temp; - qDebug() << ""; - + qDebug() << "wFunc->sqrtWeightScaler(2.5): " << temp; + qDebug() << ""; + wFunc.setModel(MaximumLikelihoodWFunctions::Huber, 2.0); qDebug() << "Model manually set with TC = 2.0:"; - qDebug() << "Model = " + qDebug() << "Model = " << MaximumLikelihoodWFunctions::modelToString(wFunc.model()); qDebug() << "TweakingConstant = " << toString(wFunc.tweakingConstant()); qDebug() << "WeightedResidualCutoff = " << wFunc.weightedResidualCutoff(); @@ -111,12 +119,12 @@ int main(int argc, char *argv[]) { temp = wFunc.sqrtWeightScaler(-2.0); qDebug() << "wFunc->sqrtWeightScaler(-2): " << temp; temp = wFunc.sqrtWeightScaler(2.5); - qDebug() << "wFunc->sqrtWeightScaler(2.5): " << temp; - qDebug() << ""; + qDebug() << "wFunc->sqrtWeightScaler(2.5): " << temp; + qDebug() << ""; MaximumLikelihoodWFunctions copyWFunc(wFunc); qDebug() << "Testing Copy constructor:"; - qDebug() << "Model = " + qDebug() << "Model = " << MaximumLikelihoodWFunctions::modelToString(copyWFunc.model()); qDebug() << "TweakingConstant = " << toString(copyWFunc.tweakingConstant()); qDebug() << "WeightedResidualCutoff = " << copyWFunc.weightedResidualCutoff(); @@ -128,16 +136,16 @@ int main(int argc, char *argv[]) { temp = copyWFunc.sqrtWeightScaler(-2.0); qDebug() << "copyWFunc->sqrtWeightScaler(-2): " << temp; temp = copyWFunc.sqrtWeightScaler(2.5); - qDebug() << "copyWFunc->sqrtWeightScaler(2.5): " << temp; - qDebug() << ""; - qDebug() << ""; + qDebug() << "copyWFunc->sqrtWeightScaler(2.5): " << temp; + qDebug() << ""; + qDebug() << ""; qDebug() << "Reassign object using operator= and passing HuberModified to constructor with " "default TC:"; wFunc = MaximumLikelihoodWFunctions(MaximumLikelihoodWFunctions::stringToModel("HuberModified")); - qDebug() << "Model = " + qDebug() << "Model = " << MaximumLikelihoodWFunctions::modelToString(wFunc.model()); qDebug() << "TweakingConstant = " << toString(wFunc.tweakingConstant()); qDebug() << "WeightedResidualCutoff = " << wFunc.weightedResidualCutoff(); @@ -149,12 +157,12 @@ int main(int argc, char *argv[]) { temp = wFunc.sqrtWeightScaler(-2.0); qDebug() << "wFunc->sqrtWeightScaler(-2): " << temp; temp = wFunc.sqrtWeightScaler(2.5); - qDebug() << "wFunc->sqrtWeightScaler(2.5): " << temp; - qDebug() << ""; + qDebug() << "wFunc->sqrtWeightScaler(2.5): " << temp; + qDebug() << ""; wFunc.setTweakingConstant(2.0); qDebug() << "TC constant re-set to 2.0:"; - qDebug() << "Model = " + qDebug() << "Model = " << MaximumLikelihoodWFunctions::modelToString(wFunc.model()); qDebug() << "TweakingConstant = " << toString(wFunc.tweakingConstant()); qDebug() << "WeightedResidualCutoff = " << wFunc.weightedResidualCutoff(); @@ -166,12 +174,12 @@ int main(int argc, char *argv[]) { temp = wFunc.sqrtWeightScaler(-2.0); qDebug() << "wFunc->sqrtWeightScaler(-2): " << temp; temp = wFunc.sqrtWeightScaler(2.5); - qDebug() << "wFunc->sqrtWeightScaler(2.5): " << temp; - qDebug() << ""; + qDebug() << "wFunc->sqrtWeightScaler(2.5): " << temp; + qDebug() << ""; wFunc.setTweakingConstantDefault(); qDebug() << "TC constant re-set to default:"; - qDebug() << "Model = " + qDebug() << "Model = " << MaximumLikelihoodWFunctions::modelToString(wFunc.model()); qDebug() << "TweakingConstant = " << toString(wFunc.tweakingConstant()); qDebug() << "WeightedResidualCutoff = " << wFunc.weightedResidualCutoff(); @@ -183,12 +191,12 @@ int main(int argc, char *argv[]) { temp = wFunc.sqrtWeightScaler(-2.0); qDebug() << "wFunc->sqrtWeightScaler(-2): " << temp; temp = wFunc.sqrtWeightScaler(2.5); - qDebug() << "wFunc->sqrtWeightScaler(2.5): " << temp; - qDebug() << ""; + qDebug() << "wFunc->sqrtWeightScaler(2.5): " << temp; + qDebug() << ""; wFunc.setModel(MaximumLikelihoodWFunctions::stringToModel("Huber_Modified")); qDebug() << "Model manually set to Huber_Modified with default TC:"; - qDebug() << "Model = " + qDebug() << "Model = " << MaximumLikelihoodWFunctions::modelToString(wFunc.model()); qDebug() << "TweakingConstant = " << toString(wFunc.tweakingConstant()); qDebug() << "WeightedResidualCutoff = " << wFunc.weightedResidualCutoff(); @@ -200,12 +208,12 @@ int main(int argc, char *argv[]) { temp = wFunc.sqrtWeightScaler(-2.0); qDebug() << "wFunc->sqrtWeightScaler(-2): " << temp; temp = wFunc.sqrtWeightScaler(2.5); - qDebug() << "wFunc->sqrtWeightScaler(2.5): " << temp; - qDebug() << ""; - + qDebug() << "wFunc->sqrtWeightScaler(2.5): " << temp; + qDebug() << ""; + wFunc.setModel(MaximumLikelihoodWFunctions::HuberModified, 2.0); qDebug() << "Model manually set with TC = 2.0:"; - qDebug() << "Model = " + qDebug() << "Model = " << MaximumLikelihoodWFunctions::modelToString(wFunc.model()); qDebug() << "TweakingConstant = " << toString(wFunc.tweakingConstant()); qDebug() << "WeightedResidualCutoff = " << wFunc.weightedResidualCutoff(); @@ -217,15 +225,15 @@ int main(int argc, char *argv[]) { temp = wFunc.sqrtWeightScaler(-2.0); qDebug() << "wFunc->sqrtWeightScaler(-2): " << temp; temp = wFunc.sqrtWeightScaler(2.5); - qDebug() << "wFunc->sqrtWeightScaler(2.5): " << temp; - qDebug() << ""; - qDebug() << ""; + qDebug() << "wFunc->sqrtWeightScaler(2.5): " << temp; + qDebug() << ""; + qDebug() << ""; qDebug() << "Reassign object using operator= and passing Welsch with TC = 2.0:"; wFunc = MaximumLikelihoodWFunctions(MaximumLikelihoodWFunctions::stringToModel("Welsch"), 2.0); - qDebug() << "Model = " + qDebug() << "Model = " << MaximumLikelihoodWFunctions::modelToString(wFunc.model()); qDebug() << "TweakingConstant = " << toString(wFunc.tweakingConstant()); qDebug() << "WeightedResidualCutoff = " << wFunc.weightedResidualCutoff(); @@ -237,12 +245,12 @@ int main(int argc, char *argv[]) { temp = wFunc.sqrtWeightScaler(-2.0); qDebug() << "wFunc->sqrtWeightScaler(-2): " << temp; temp = wFunc.sqrtWeightScaler(2.5); - qDebug() << "wFunc->sqrtWeightScaler(2.5): " << temp; - qDebug() << ""; + qDebug() << "wFunc->sqrtWeightScaler(2.5): " << temp; + qDebug() << ""; wFunc.setTweakingConstantDefault(); qDebug() << "TC constant set to default:"; - qDebug() << "Model = " + qDebug() << "Model = " << MaximumLikelihoodWFunctions::modelToString(wFunc.model()); qDebug() << "TweakingConstant = " << toString(wFunc.tweakingConstant()); qDebug() << "WeightedResidualCutoff = " << wFunc.weightedResidualCutoff(); @@ -254,12 +262,12 @@ int main(int argc, char *argv[]) { temp = wFunc.sqrtWeightScaler(-2.0); qDebug() << "wFunc->sqrtWeightScaler(-2): " << temp; temp = wFunc.sqrtWeightScaler(2.5); - qDebug() << "wFunc->sqrtWeightScaler(2.5): " << temp; - qDebug() << ""; + qDebug() << "wFunc->sqrtWeightScaler(2.5): " << temp; + qDebug() << ""; wFunc.setModel(MaximumLikelihoodWFunctions::Welsch); qDebug() << "Model manually set with default TC:"; - qDebug() << "Model = " + qDebug() << "Model = " << MaximumLikelihoodWFunctions::modelToString(wFunc.model()); qDebug() << "TweakingConstant = " << toString(wFunc.tweakingConstant()); qDebug() << "WeightedResidualCutoff = " << wFunc.weightedResidualCutoff(); @@ -271,12 +279,12 @@ int main(int argc, char *argv[]) { temp = wFunc.sqrtWeightScaler(-2.0); qDebug() << "wFunc->sqrtWeightScaler(-2): " << temp; temp = wFunc.sqrtWeightScaler(2.5); - qDebug() << "wFunc->sqrtWeightScaler(2.5): " << temp; - qDebug() << ""; - + qDebug() << "wFunc->sqrtWeightScaler(2.5): " << temp; + qDebug() << ""; + wFunc.setModel(MaximumLikelihoodWFunctions::Welsch, 2.0); qDebug() << "Model manually set with TC = 2.0:"; - qDebug() << "Model = " + qDebug() << "Model = " << MaximumLikelihoodWFunctions::modelToString(wFunc.model()); qDebug() << "TweakingConstant = " << toString(wFunc.tweakingConstant()); qDebug() << "WeightedResidualCutoff = " << wFunc.weightedResidualCutoff(); @@ -288,16 +296,16 @@ int main(int argc, char *argv[]) { temp = wFunc.sqrtWeightScaler(-2.0); qDebug() << "wFunc->sqrtWeightScaler(-2): " << temp; temp = wFunc.sqrtWeightScaler(2.5); - qDebug() << "wFunc->sqrtWeightScaler(2.5): " << temp; - qDebug() << ""; - qDebug() << ""; + qDebug() << "wFunc->sqrtWeightScaler(2.5): " << temp; + qDebug() << ""; + qDebug() << ""; qDebug() << "Reassign object using operator= and passing Chen with default TC:"; wFunc = MaximumLikelihoodWFunctions(MaximumLikelihoodWFunctions::stringToModel("Chen")); - qDebug() << "Model = " + qDebug() << "Model = " << MaximumLikelihoodWFunctions::modelToString(wFunc.model()); qDebug() << "TweakingConstant = " << toString(wFunc.tweakingConstant()); qDebug() << "WeightedResidualCutoff = " << wFunc.weightedResidualCutoff(); @@ -309,12 +317,12 @@ int main(int argc, char *argv[]) { temp = wFunc.sqrtWeightScaler(-2.0); qDebug() << "wFunc->sqrtWeightScaler(-2): " << temp; temp = wFunc.sqrtWeightScaler(2.5); - qDebug() << "wFunc->sqrtWeightScaler(2.5): " << temp; - qDebug() << ""; + qDebug() << "wFunc->sqrtWeightScaler(2.5): " << temp; + qDebug() << ""; wFunc.setTweakingConstant(2.0); qDebug() << "TC constant re-set to 2.0:"; - qDebug() << "Model = " + qDebug() << "Model = " << MaximumLikelihoodWFunctions::modelToString(wFunc.model()); qDebug() << "TweakingConstant = " << toString(wFunc.tweakingConstant()); qDebug() << "WeightedResidualCutoff = " << wFunc.weightedResidualCutoff(); @@ -326,12 +334,12 @@ int main(int argc, char *argv[]) { temp = wFunc.sqrtWeightScaler(-2.0); qDebug() << "wFunc->sqrtWeightScaler(-2): " << temp; temp = wFunc.sqrtWeightScaler(2.5); - qDebug() << "wFunc->sqrtWeightScaler(2.5): " << temp; - qDebug() << ""; + qDebug() << "wFunc->sqrtWeightScaler(2.5): " << temp; + qDebug() << ""; wFunc.setTweakingConstantDefault(); qDebug() << "TC constant re-set to default:"; - qDebug() << "Model = " + qDebug() << "Model = " << MaximumLikelihoodWFunctions::modelToString(wFunc.model()); qDebug() << "TweakingConstant = " << toString(wFunc.tweakingConstant()); qDebug() << "WeightedResidualCutoff = " << wFunc.weightedResidualCutoff(); @@ -343,12 +351,12 @@ int main(int argc, char *argv[]) { temp = wFunc.sqrtWeightScaler(-2.0); qDebug() << "wFunc->sqrtWeightScaler(-2): " << temp; temp = wFunc.sqrtWeightScaler(2.5); - qDebug() << "wFunc->sqrtWeightScaler(2.5): " << temp; - qDebug() << ""; + qDebug() << "wFunc->sqrtWeightScaler(2.5): " << temp; + qDebug() << ""; wFunc.setModel(MaximumLikelihoodWFunctions::Chen); qDebug() << "Model manually set with default TC:"; - qDebug() << "Model = " + qDebug() << "Model = " << MaximumLikelihoodWFunctions::modelToString(wFunc.model()); qDebug() << "TweakingConstant = " << toString(wFunc.tweakingConstant()); qDebug() << "WeightedResidualCutoff = " << wFunc.weightedResidualCutoff(); @@ -360,12 +368,12 @@ int main(int argc, char *argv[]) { temp = wFunc.sqrtWeightScaler(-2.0); qDebug() << "wFunc->sqrtWeightScaler(-2): " << temp; temp = wFunc.sqrtWeightScaler(2.5); - qDebug() << "wFunc->sqrtWeightScaler(2.5): " << temp; - qDebug() << ""; - + qDebug() << "wFunc->sqrtWeightScaler(2.5): " << temp; + qDebug() << ""; + wFunc.setModel(MaximumLikelihoodWFunctions::Chen, 2.0); qDebug() << "Model manually set with TC = 2.0:"; - qDebug() << "Model = " + qDebug() << "Model = " << MaximumLikelihoodWFunctions::modelToString(wFunc.model()); qDebug() << "TweakingConstant = " << toString(wFunc.tweakingConstant()); qDebug() << "WeightedResidualCutoff = " << wFunc.weightedResidualCutoff(); @@ -377,9 +385,9 @@ int main(int argc, char *argv[]) { temp = wFunc.sqrtWeightScaler(-2.0); qDebug() << "wFunc->sqrtWeightScaler(-2): " << temp; temp = wFunc.sqrtWeightScaler(2.5); - qDebug() << "wFunc->sqrtWeightScaler(2.5): " << temp; - qDebug() << ""; - qDebug() << ""; + qDebug() << "wFunc->sqrtWeightScaler(2.5): " << temp; + qDebug() << ""; + qDebug() << ""; qDebug() << "Testing serialization..."; @@ -390,7 +398,7 @@ int main(int argc, char *argv[]) { QDataStream inputData(byteArray); MaximumLikelihoodWFunctions newWFunc; inputData >> newWFunc; - qDebug() << "Model = " + qDebug() << "Model = " << MaximumLikelihoodWFunctions::modelToString(wFunc.model()); qDebug() << "TweakingConstant = " << toString(wFunc.tweakingConstant()); qDebug() << "WeightedResidualCutoff = " << wFunc.weightedResidualCutoff(); @@ -402,8 +410,8 @@ int main(int argc, char *argv[]) { temp = wFunc.sqrtWeightScaler(-2.0); qDebug() << "wFunc->sqrtWeightScaler(-2): " << temp; temp = wFunc.sqrtWeightScaler(2.5); - qDebug() << "wFunc->sqrtWeightScaler(2.5): " << temp; - qDebug() << ""; + qDebug() << "wFunc->sqrtWeightScaler(2.5): " << temp; + qDebug() << ""; qDebug() << "Huber enum written to and read from QByteArray:"; QByteArray enumByteArray; QDataStream outputEnumData(&enumByteArray, QIODevice::WriteOnly); @@ -412,25 +420,25 @@ int main(int argc, char *argv[]) { MaximumLikelihoodWFunctions::Model model; inputEnumData >> model; qDebug() << "Model = " << MaximumLikelihoodWFunctions::modelToString(model); - qDebug() << ""; - qDebug() << ""; + qDebug() << ""; + qDebug() << ""; qDebug() << "Testing error throws..."; try { wFunc.setTweakingConstant(-1.0); - } + } catch (IException &e) { e.print(); } try { MaximumLikelihoodWFunctions::modelToString((MaximumLikelihoodWFunctions::Model)4); - } + } catch (IException &e) { e.print(); } try { MaximumLikelihoodWFunctions::stringToModel("Nonsense"); - } + } catch (IException &e) { e.print(); } diff --git a/isis/src/database/objs/Database/Database.cpp b/isis/src/database/objs/Database/Database.cpp index 7397f3f3fa..549b9ee8b8 100644 --- a/isis/src/database/objs/Database/Database.cpp +++ b/isis/src/database/objs/Database/Database.cpp @@ -1,24 +1,11 @@ -/** - * @file - * $Revision: 1.4 $ - * $Date: 2010/06/26 01:19:21 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include diff --git a/isis/src/database/objs/Database/Database.h b/isis/src/database/objs/Database/Database.h index 25ce4bf3d9..123b8e2d12 100644 --- a/isis/src/database/objs/Database/Database.h +++ b/isis/src/database/objs/Database/Database.h @@ -1,27 +1,13 @@ #ifndef Database_h #define Database_h -/** - * @file - * $Revision: 1.3 $ - * $Date: 2008/10/30 16:38:23 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include diff --git a/isis/src/database/objs/Database/unitTest.cpp b/isis/src/database/objs/Database/unitTest.cpp index 25e3e9a021..adb10c46bc 100644 --- a/isis/src/database/objs/Database/unitTest.cpp +++ b/isis/src/database/objs/Database/unitTest.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include "Database.h" diff --git a/isis/src/database/objs/DatabaseFactory/DatabaseFactory.cpp b/isis/src/database/objs/DatabaseFactory/DatabaseFactory.cpp index 8048ce1416..f7d37d1578 100644 --- a/isis/src/database/objs/DatabaseFactory/DatabaseFactory.cpp +++ b/isis/src/database/objs/DatabaseFactory/DatabaseFactory.cpp @@ -1,24 +1,11 @@ -/** - * @file - * $Revision: 1.3 $ - * $Date: 2009/11/27 23:09:58 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include diff --git a/isis/src/database/objs/DatabaseFactory/DatabaseFactory.h b/isis/src/database/objs/DatabaseFactory/DatabaseFactory.h index 565bac5163..dffc1abd62 100644 --- a/isis/src/database/objs/DatabaseFactory/DatabaseFactory.h +++ b/isis/src/database/objs/DatabaseFactory/DatabaseFactory.h @@ -1,27 +1,13 @@ #ifndef DatabaseFactory_h #define DatabaseFactory_h -/** - * @file - * $Revision: 1.3 $ - * $Date: 2009/11/27 23:09:58 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include @@ -363,6 +349,3 @@ namespace Isis { }; } #endif - - - diff --git a/isis/src/database/objs/DatabaseFactory/unitTest.cpp b/isis/src/database/objs/DatabaseFactory/unitTest.cpp index 2ad32d80eb..512476be36 100644 --- a/isis/src/database/objs/DatabaseFactory/unitTest.cpp +++ b/isis/src/database/objs/DatabaseFactory/unitTest.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "DbProfile.h" #include "Database.h" #include "DatabaseFactory.h" diff --git a/isis/src/database/objs/DbAccess/DbAccess.cpp b/isis/src/database/objs/DbAccess/DbAccess.cpp index 0c1b3697fe..dfa24d58ab 100644 --- a/isis/src/database/objs/DbAccess/DbAccess.cpp +++ b/isis/src/database/objs/DbAccess/DbAccess.cpp @@ -1,24 +1,10 @@ -/** - * @file - * $Revision: 1.2 $ - * $Date: 2007/06/06 00:35:33 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include diff --git a/isis/src/database/objs/DbAccess/DbAccess.h b/isis/src/database/objs/DbAccess/DbAccess.h index 94ef6ac966..d27a819421 100644 --- a/isis/src/database/objs/DbAccess/DbAccess.h +++ b/isis/src/database/objs/DbAccess/DbAccess.h @@ -1,27 +1,13 @@ #ifndef DbAccess_h #define DbAccess_h -/** - * @file - * $Revision: 1.2 $ - * $Date: 2007/06/06 00:35:33 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include @@ -186,5 +172,3 @@ namespace Isis { } #endif - - diff --git a/isis/src/database/objs/DbAccess/unitTest.cpp b/isis/src/database/objs/DbAccess/unitTest.cpp index e7fae975d7..0aa2fd6d54 100644 --- a/isis/src/database/objs/DbAccess/unitTest.cpp +++ b/isis/src/database/objs/DbAccess/unitTest.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "DbAccess.h" #include "Preference.h" diff --git a/isis/src/database/objs/DbProfile/DbProfile.cpp b/isis/src/database/objs/DbProfile/DbProfile.cpp index b1702f0e60..49870faec9 100644 --- a/isis/src/database/objs/DbProfile/DbProfile.cpp +++ b/isis/src/database/objs/DbProfile/DbProfile.cpp @@ -1,24 +1,10 @@ -/** - * @file - * $Revision: 1.3 $ - * $Date: 2008/09/06 06:47:48 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include diff --git a/isis/src/database/objs/DbProfile/DbProfile.h b/isis/src/database/objs/DbProfile/DbProfile.h index 2fa5807f74..4e07cc9507 100644 --- a/isis/src/database/objs/DbProfile/DbProfile.h +++ b/isis/src/database/objs/DbProfile/DbProfile.h @@ -1,27 +1,13 @@ #ifndef DbProfile_h #define DbProfile_h -/** - * @file - * $Revision: 1.7 $ - * $Date: 2008/09/06 06:47:48 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include @@ -182,5 +168,3 @@ namespace Isis { #endif - - diff --git a/isis/src/database/objs/DbProfile/unitTest.cpp b/isis/src/database/objs/DbProfile/unitTest.cpp index 9acb74ab66..6be0be9df5 100644 --- a/isis/src/database/objs/DbProfile/unitTest.cpp +++ b/isis/src/database/objs/DbProfile/unitTest.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "DbProfile.h" #include "Preference.h" diff --git a/isis/src/database/objs/SqlQuery/SqlQuery.cpp b/isis/src/database/objs/SqlQuery/SqlQuery.cpp index 2e8cbdf148..9e312cec5b 100644 --- a/isis/src/database/objs/SqlQuery/SqlQuery.cpp +++ b/isis/src/database/objs/SqlQuery/SqlQuery.cpp @@ -1,24 +1,11 @@ -/** - * @file - * $Revision: 1.6 $ - * $Date: 2008/10/30 16:40:50 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include diff --git a/isis/src/database/objs/SqlQuery/SqlQuery.h b/isis/src/database/objs/SqlQuery/SqlQuery.h index 75a313be25..af4c591487 100644 --- a/isis/src/database/objs/SqlQuery/SqlQuery.h +++ b/isis/src/database/objs/SqlQuery/SqlQuery.h @@ -1,27 +1,13 @@ #ifndef SqlQuery_h #define SqlQuery_h -/** - * @file - * $Revision: 1.5 $ - * $Date: 2008/10/30 16:40:50 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include diff --git a/isis/src/database/objs/SqlQuery/unitTest.cpp b/isis/src/database/objs/SqlQuery/unitTest.cpp index e47f9de904..044b9e0189 100644 --- a/isis/src/database/objs/SqlQuery/unitTest.cpp +++ b/isis/src/database/objs/SqlQuery/unitTest.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "SqlQuery.h" #include "SqlRecord.h" #include "FileName.h" diff --git a/isis/src/database/objs/SqlRecord/SqlRecord.cpp b/isis/src/database/objs/SqlRecord/SqlRecord.cpp index 9a9501cd2c..72a774357e 100644 --- a/isis/src/database/objs/SqlRecord/SqlRecord.cpp +++ b/isis/src/database/objs/SqlRecord/SqlRecord.cpp @@ -1,24 +1,11 @@ -/** - * @file - * $Revision: 1.3 $ - * $Date: 2007/06/06 00:46:52 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include diff --git a/isis/src/database/objs/SqlRecord/SqlRecord.h b/isis/src/database/objs/SqlRecord/SqlRecord.h index 979177afe0..bf16943ed9 100644 --- a/isis/src/database/objs/SqlRecord/SqlRecord.h +++ b/isis/src/database/objs/SqlRecord/SqlRecord.h @@ -1,27 +1,13 @@ #ifndef SqlRecord_h #define SqlRecord_h -/** - * @file - * $Revision: 1.3 $ - * $Date: 2007/06/06 00:46:52 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include diff --git a/isis/src/database/objs/SqlRecord/unitTest.cpp b/isis/src/database/objs/SqlRecord/unitTest.cpp index 13fd088a5d..3f14aaa7d7 100644 --- a/isis/src/database/objs/SqlRecord/unitTest.cpp +++ b/isis/src/database/objs/SqlRecord/unitTest.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Database.h" #include diff --git a/isis/src/dawn/apps/dawnfc2isis/main.cpp b/isis/src/dawn/apps/dawnfc2isis/main.cpp index 82215efc4f..691a36795b 100644 --- a/isis/src/dawn/apps/dawnfc2isis/main.cpp +++ b/isis/src/dawn/apps/dawnfc2isis/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include diff --git a/isis/src/dawn/apps/dawnvir2isis/main.cpp b/isis/src/dawn/apps/dawnvir2isis/main.cpp index 3ca99386b1..74487cd4f3 100644 --- a/isis/src/dawn/apps/dawnvir2isis/main.cpp +++ b/isis/src/dawn/apps/dawnvir2isis/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include diff --git a/isis/src/dawn/objs/DawnFcCamera/DawnFcCamera.cpp b/isis/src/dawn/objs/DawnFcCamera/DawnFcCamera.cpp index cd6b0a460e..a1a7f02404 100644 --- a/isis/src/dawn/objs/DawnFcCamera/DawnFcCamera.cpp +++ b/isis/src/dawn/objs/DawnFcCamera/DawnFcCamera.cpp @@ -1,22 +1,10 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "DawnFcCamera.h" #include "DawnFcDistortionMap.h" diff --git a/isis/src/dawn/objs/DawnFcCamera/DawnFcCamera.h b/isis/src/dawn/objs/DawnFcCamera/DawnFcCamera.h index 11000e9970..c9f7424fed 100644 --- a/isis/src/dawn/objs/DawnFcCamera/DawnFcCamera.h +++ b/isis/src/dawn/objs/DawnFcCamera/DawnFcCamera.h @@ -1,30 +1,19 @@ #ifndef DawnFcCamera_h #define DawnFcCamera_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "FramingCamera.h" namespace Isis { /** - * This is the camera model for the Dawn Framing Camera + * This is the camera model for the Dawn Framing Camera * * @ingroup SpiceInstrumentsAndCameras * @ingroup Dawn @@ -43,15 +32,15 @@ namespace Isis { * Updated documentation. Replaced Dawn namespace * wrap with Isis namespace. Added Isis Disclaimer to * files. Added NAIF error check to constructor. - * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis + * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis * coding standards. References #972. * @history 2015-08-25 Ian Humphrey and Makayla Shepherd - Added new data members and methods * to get spacecraft and instrument names. Extended unit test to test * these methods. - * @history 2015-10-01 Ian Humphrey and Makayla Shepherd - Modified check for determing - * the instrument name to also accept filter instrument kernal codes. + * @history 2015-10-01 Ian Humphrey and Makayla Shepherd - Modified check for determing + * the instrument name to also accept filter instrument kernal codes. * References #2335. - * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument + * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument * members and methods and removed implementation of these methods * since Camera now handles this. References #2335. */ @@ -65,23 +54,23 @@ namespace Isis { /** * CK frame ID - - Instrument Code from spacit run on CK - * - * @return @b int The appropriate instrument code for the "Camera-matrix" + * + * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Frame ID */ virtual int CkFrameId() const { return (-203000); } - /** + /** * CK Reference ID - J2000 - * + * * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Reference ID */ virtual int CkReferenceId() const { return (1); } - /** + /** * SPK Reference ID - J2000 - * + * * @return @b int The appropriate instrument code for the Spacecraft * Kernel Reference ID */ diff --git a/isis/src/dawn/objs/DawnFcCamera/DawnFcDistortionMap.h b/isis/src/dawn/objs/DawnFcCamera/DawnFcDistortionMap.h index 2e392c1b2f..acf0ec107e 100644 --- a/isis/src/dawn/objs/DawnFcCamera/DawnFcDistortionMap.h +++ b/isis/src/dawn/objs/DawnFcCamera/DawnFcDistortionMap.h @@ -1,6 +1,14 @@ #ifndef DawnFcDistortionMap_h #define DawnFcDistortionMap_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "CameraDistortionMap.h" #include "Camera.h" diff --git a/isis/src/dawn/objs/DawnFcCamera/unitTest.cpp b/isis/src/dawn/objs/DawnFcCamera/unitTest.cpp index e115e0758d..192b3cb705 100644 --- a/isis/src/dawn/objs/DawnFcCamera/unitTest.cpp +++ b/isis/src/dawn/objs/DawnFcCamera/unitTest.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -58,7 +47,7 @@ int main(void) { cout << "CK Reference ID = " << cam->CkReferenceId() << endl; cout << "SPK Target ID = " << cam->SpkTargetId() << endl; cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl; - + // Test name methods // TODO - test an FC1 image when data can be found. cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl; @@ -66,7 +55,7 @@ int main(void) { cout << "Instrument Name Long: " << cam->instrumentNameLong() << endl; cout << "Instrument Name Short: " << cam->instrumentNameShort() << endl << endl; - // Test Shutter Open/Close + // Test Shutter Open/Close const PvlGroup &inst = c.label()->findGroup("Instrument", Pvl::Traverse); double exposureDuration = ((double) inst["ExposureDuration"])/1000; QString stime = inst["StartTime"]; @@ -111,7 +100,7 @@ int main(void) { else { cout << setprecision(16) << "Longitude off by: " << cam->UniversalLongitude() - knownLon << endl; } - + // Test exception cout << endl << "Testing exceptions ..." << endl << endl; Cube test("$ISISTESTDATA/isis/src/hayabusa/unitTestData/st_2530292409_v.cub", "r"); @@ -142,4 +131,3 @@ void TestLineSamp(Camera *cam, double samp, double line) { cout << "DeltaLine = ERROR" << endl << endl; } } - diff --git a/isis/src/dawn/objs/DawnVirCamera/DawnVirCamera.cpp b/isis/src/dawn/objs/DawnVirCamera/DawnVirCamera.cpp index 6e17decd05..a0b4f9ae7e 100644 --- a/isis/src/dawn/objs/DawnVirCamera/DawnVirCamera.cpp +++ b/isis/src/dawn/objs/DawnVirCamera/DawnVirCamera.cpp @@ -1,4 +1,12 @@ - #include "DawnVirCamera.h" +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + +#include "DawnVirCamera.h" #include #include @@ -30,12 +38,12 @@ namespace Isis { // constructors /** * Creates a camera for a Dawn VIR cube - * + * * @param cube The cube to make a camera for - * + * */ DawnVirCamera::DawnVirCamera(Cube &cube) : LineScanCamera(cube) { - + m_instrumentNameLong = "Visual and Infrared Spectrometer"; m_instrumentNameShort = "VIR"; m_spacecraftNameLong = "Dawn"; @@ -151,33 +159,33 @@ namespace Isis { DawnVirCamera::~DawnVirCamera() { } - /** + /** * Returns CK frame identifier - * + * * @return @b int The CK frame identifier. */ - int DawnVirCamera::CkFrameId() const { - return (-203000); + int DawnVirCamera::CkFrameId() const { + return (-203000); } - /** + /** * Returns CK reference frame identifier - * + * * @return @b int The CK reference frame identifier. */ - int DawnVirCamera::CkReferenceId() const { - return (1); + int DawnVirCamera::CkReferenceId() const { + return (1); } - /** + /** * Return PK reference frame identifier - * + * * @return @b int The PK reference frame identifier */ - int DawnVirCamera::SpkReferenceId() const { - return (1); + int DawnVirCamera::SpkReferenceId() const { + return (1); } @@ -203,9 +211,9 @@ namespace Isis { } - /** + /** * Return the pixel summing rate - * + * * @return @b int The pixel summing rate. */ int DawnVirCamera::pixelSumming() const { @@ -213,9 +221,9 @@ namespace Isis { } - /** + /** * Return the exposure time - * + * * @return @b double The exposure time for a pixel. */ double DawnVirCamera::exposureTime() const { @@ -223,9 +231,9 @@ namespace Isis { } - /** + /** * Return the line scan rate - * + * * @return @b double The time between lines in the cube. */ double DawnVirCamera::scanLineTime() const { @@ -233,9 +241,9 @@ namespace Isis { } - /** + /** * Return the start time for a given line exposure time - * + * * @return @b double The et time at the start of the line's exposure. */ double DawnVirCamera::lineStartTime(const double midExpTime) const { @@ -243,9 +251,9 @@ namespace Isis { } - /** + /** * Return the end time for a given line exposure time - * + * * @return @b double The et time at the end of the line's exposure. */ double DawnVirCamera::lineEndTime(const double midExpTime) const { @@ -253,9 +261,9 @@ namespace Isis { } - /** + /** * Return start time for the entire cube. - * + * * @return @b double The et time at the start of the cube. */ double DawnVirCamera::startTime() const { @@ -263,9 +271,9 @@ namespace Isis { } - /** + /** * Return end time for the entire cube. - * + * * @return @b double The et time at the end of the cube. */ double DawnVirCamera::endTime() const { @@ -273,9 +281,9 @@ namespace Isis { } - /** + /** * Returns number of housekeeping records found in the cube Table - * + * * @return @b int The number of housekeeping records. */ int DawnVirCamera::hkLineCount() const { @@ -291,7 +299,7 @@ namespace Isis { * MirrorSin, and MirrorCos. These fields contain the scan line time in * SCLK, status of shutter - open, closed (dark), sine and cosine of the * scan mirror, respectively. - * + * * @param filename The filename of the cube with the house keeping table. * @param linerate The linerate for the cube. * @@ -395,9 +403,9 @@ namespace Isis { * From the VIR housekeeping data, compute the pointing table for each line * in the image. This table is for instrumentRotation(Table &) to establish * line/sample pointing information. - * + * * @internal - * @history 2011-07-22 Kris Becker + * @history 2011-07-22 Kris Becker */ Table DawnVirCamera::getPointingTable(const QString &virChannel, const int zeroFrame) { @@ -519,7 +527,7 @@ namespace Isis { * acceleration vectors are then set to 0. * * @internal - * @history 2011-07-22 Kris Becker + * @history 2011-07-22 Kris Becker */ DawnVirCamera::SMatrix DawnVirCamera::getStateRotation(const QString &frame1, @@ -562,12 +570,12 @@ namespace Isis { * the labels. If a kernel with the file pattern "dawn_vir_?????????_?.bc" * is present as a CK kernel, then that kernel contains mirror scan angles * for each line. - * + * * If the kernel does not exist, this camera model will provide these angles * from the VIR housekeeping data. * * @internal - * @history 2011-07-22 Kris Becker + * @history 2011-07-22 Kris Becker */ bool DawnVirCamera::hasArticulationKernel(Pvl &label) const { Kernels kerns(label); @@ -582,7 +590,7 @@ namespace Isis { } -/** +/** * Instantiate a new DawnVirCamera model for the given label content */ extern "C" Isis::Camera *DawnVirCameraPlugin(Isis::Cube &cube) { diff --git a/isis/src/dawn/objs/DawnVirCamera/DawnVirCamera.h b/isis/src/dawn/objs/DawnVirCamera/DawnVirCamera.h index ee0044e52f..27a301bf8f 100644 --- a/isis/src/dawn/objs/DawnVirCamera/DawnVirCamera.h +++ b/isis/src/dawn/objs/DawnVirCamera/DawnVirCamera.h @@ -1,6 +1,14 @@ #ifndef DawnVirCamera_h #define DawnVirCamera_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "LineScanCamera.h" #include @@ -10,40 +18,40 @@ #include "VariableLineScanCameraDetectorMap.h" namespace Isis { - /** - * @brief Camera model for both Danw VIR VIS and IR instruments - * - * This class provides the camera model for the Dawn VIR VIS and + /** + * @brief Camera model for both Danw VIR VIS and IR instruments + * + * This class provides the camera model for the Dawn VIR VIS and * IR instrumetns. These instruments are on the Dawn spacecraft - * which will orbit the astroids Vesta (2011) and Ceres (2013). - * - * The ISIS cubes must contain a table called VIRHouseKeeping - * that contains critical information. Stored here is a row for - * each line in the cube which contains the time (scan lines are - * not strictly contiguous), electrical scan angles and shutter - * state (closed == dark current). The VIR instrument team will - * provide a dynamic articulation kernel that has the physical - * scan angle of the mirror but the contents of the tabel can be - * used to compute it should it not exist (determined by the - * file name pattern of the CK kernels). - * - * Without the articulation kernel, this camera model will - * create a CK SpiceRotation table from the contents of the - * houskeeping table. This table is create only when spiceinit - * is run for the first time on the image. - * - * Note that it works for calibrated (1B) and uncalibrated (1A). - * One major issue is the dark current is typically collected at - * the start and end of an observation. The dark current - * appears to always slew to a specific position, crossing the - * observation scans. This is the apparent cause of loss of - * mapping lat/lons to line/samp. To fix this, a Cubic spline - * is fit to all scan angles and all closed shutter scan line - * mirror angles are replaced by the (typcially extrapolated) - * values of the spline. - * - * @ingroup SpiceInstrumentsAndCameras - * @ingroup Dawn + * which will orbit the astroids Vesta (2011) and Ceres (2013). + * + * The ISIS cubes must contain a table called VIRHouseKeeping + * that contains critical information. Stored here is a row for + * each line in the cube which contains the time (scan lines are + * not strictly contiguous), electrical scan angles and shutter + * state (closed == dark current). The VIR instrument team will + * provide a dynamic articulation kernel that has the physical + * scan angle of the mirror but the contents of the tabel can be + * used to compute it should it not exist (determined by the + * file name pattern of the CK kernels). + * + * Without the articulation kernel, this camera model will + * create a CK SpiceRotation table from the contents of the + * houskeeping table. This table is create only when spiceinit + * is run for the first time on the image. + * + * Note that it works for calibrated (1B) and uncalibrated (1A). + * One major issue is the dark current is typically collected at + * the start and end of an observation. The dark current + * appears to always slew to a specific position, crossing the + * observation scans. This is the apparent cause of loss of + * mapping lat/lons to line/samp. To fix this, a Cubic spline + * is fit to all scan angles and all closed shutter scan line + * mirror angles are replaced by the (typcially extrapolated) + * values of the spline. + * + * @ingroup SpiceInstrumentsAndCameras + * @ingroup Dawn * * @author 2011-03-10 Kris Becker * @@ -52,12 +60,12 @@ namespace Isis { * @history 2011-08-23 Kris Becker - Correct length of scan * line to be the EXTERNAL_REPETITION_TIME of the * FRAME_PARAMETER[2] value. - * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis + * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis * coding standards. References #972. * @history 2015-08-12 Ian Humphrey and Makayla Shepherd - Added new data members and methods * to get spacecraft and instrument names. Extended unit test to test * these methods. - * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument + * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument * members and methods and removed implementation of these methods * since Camera now handles this. References #2335. * @histroy 2016-10-27 Jesse Mapel - Modified to store exposure time instead of line rate in @@ -96,16 +104,16 @@ namespace Isis { double startTime() const; double endTime() const; - Table getPointingTable(const QString &channelId, + Table getPointingTable(const QString &channelId, const int zeroFrame); - SMatrix getStateRotation(const QString &frame1, - const QString &frame2, + SMatrix getStateRotation(const QString &frame1, + const QString &frame2, const double &et) const; bool hasArticulationKernel(Pvl &label) const; - /** - * + /** + * * @author ????-??-?? Unknown * @internal * @history ????-??-?? Unknown - Original version. diff --git a/isis/src/dawn/objs/DawnVirCamera/unitTest.cpp b/isis/src/dawn/objs/DawnVirCamera/unitTest.cpp index 3bde08b187..689c13256c 100644 --- a/isis/src/dawn/objs/DawnVirCamera/unitTest.cpp +++ b/isis/src/dawn/objs/DawnVirCamera/unitTest.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include @@ -44,7 +33,7 @@ void TestLineSamp(Camera *cam, double samp, double line); * @internal * @history 2016-10-28 Kristin Berry - Updated known latitude, longitude, image start time, * and image stop time. References #4476. - */ + */ int main(void) { Preference::Preferences(true); @@ -69,14 +58,14 @@ int main(void) { cout << "CK Reference ID = " << cam->CkReferenceId() << endl; cout << "SPK Target ID = " << cam->SpkTargetId() << endl; cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl; - + // Test name methods cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl; cout << "Spacecraft Name Short: " << cam->spacecraftNameShort() << endl; cout << "Instrument Name Long: " << cam->instrumentNameLong() << endl; cout << "Instrument Name Short: " << cam->instrumentNameShort() << endl << endl; - // Test Shutter Open/Close + // Test Shutter Open/Close //const PvlGroup &inst = p.findGroup("Instrument", Pvl::Traverse); std::pair< double, double > imgTimes = cam->StartEndEphemerisTimes(); cout << "Start Time: " << imgTimes.first << "\n"; @@ -142,4 +131,3 @@ void TestLineSamp(Camera *cam, double samp, double line) { cout << "DeltaLine = ERROR" << endl << endl; } } - diff --git a/isis/src/dev/apps/camcoeffs/main.cpp b/isis/src/dev/apps/camcoeffs/main.cpp index 989ab9d8e1..5354d67ea5 100644 --- a/isis/src/dev/apps/camcoeffs/main.cpp +++ b/isis/src/dev/apps/camcoeffs/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include diff --git a/isis/src/dev/apps/camdev/camdev.cpp b/isis/src/dev/apps/camdev/camdev.cpp index 864883f3a2..d459ca3bf7 100644 --- a/isis/src/dev/apps/camdev/camdev.cpp +++ b/isis/src/dev/apps/camdev/camdev.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include "Angle.h" @@ -22,14 +30,14 @@ using namespace std; -namespace Isis { - +namespace Isis { + // Global variables static Camera *cam; static TProjection *proj; static int nbands; static bool noCamera; - + static bool dn; static bool ra; static bool declination; @@ -66,7 +74,7 @@ namespace Isis { static bool subSolarLatitude; static bool subSolarLongitude; static bool subSolarGroundAzimuth; - static bool phase; + static bool phase; static bool emission; static bool incidence; static bool localEmission; @@ -83,28 +91,28 @@ namespace Isis { static bool solarLongitude; static bool morphologyRank; static bool albedoRank; - - + + static void camdevDN(Buffer &in, Buffer &out); static void camdev(Buffer &out); - - + + // Function to create a keyword with same values of a specified count - template static PvlKeyword makeKey(const QString &name, - const int &nvals, + template static PvlKeyword makeKey(const QString &name, + const int &nvals, const T &value); - + // Structure containing new mosaic planes struct MosData { MosData() : m_morph(Null), m_albedo(Null) { } double m_morph; double m_albedo; }; - + // Computes the special MORPHOLOGYRANK and ALBEDORANK planes MosData *getMosaicIndicies(Camera &camera, MosData &md); // Updates BandBin keyword - static void UpdateBandKey(const QString &keyname, PvlGroup &bb, const int &nvals, + static void UpdateBandKey(const QString &keyname, PvlGroup &bb, const int &nvals, const QString &default_value = "Null"); @@ -126,7 +134,7 @@ namespace Isis { else { noCamera = true; } - + if(noCamera) { try { proj = (TProjection *) icube->projection(); @@ -135,7 +143,7 @@ namespace Isis { QString msg = "Mosaic files must contain mapping labels"; throw IException(e, IException::User, msg, _FILEINFO_); } - } + } else { try { cam = icube->camera(); @@ -146,10 +154,10 @@ namespace Isis { throw IException(e, IException::User, msg, _FILEINFO_); } } - + // We will be processing by brick. ProcessByBrick p; - + // Find out which bands are to be created nbands = 0; ra = false; @@ -183,7 +191,7 @@ namespace Isis { solarDistance = false; subSolarLatitude = false; subSolarLongitude = false; - subSolarGroundAzimuth = false; + subSolarGroundAzimuth = false; phase = false; emission = false; incidence = false; @@ -198,11 +206,11 @@ namespace Isis { ephemerisTime = false; UTC = false; localSolarTime = false; - solarLongitude = false; + solarLongitude = false; morphologyRank = false; - albedoRank = false; - - + albedoRank = false; + + if (!noCamera) { if ((ra = ui.GetBoolean("RADEC"))) nbands++; if ((declination = ui.GetBoolean("RADEC"))) nbands++; @@ -235,13 +243,13 @@ namespace Isis { if ((solarDistance = ui.GetBoolean("SOLARDISTANCE"))) nbands++; if ((subSolarLatitude = ui.GetBoolean("SUBSOLARLATITUDE"))) nbands++; if ((subSolarLongitude = ui.GetBoolean("SUBSOLARLONGITUDE"))) nbands++; - if ((subSolarGroundAzimuth = ui.GetBoolean("SUBSOLARGROUNDAZIMUTH"))) nbands++; + if ((subSolarGroundAzimuth = ui.GetBoolean("SUBSOLARGROUNDAZIMUTH"))) nbands++; if ((phase = ui.GetBoolean("PHASE"))) nbands++; if ((incidence = ui.GetBoolean("INCIDENCE"))) nbands++; if ((emission = ui.GetBoolean("EMISSION"))) nbands++; if ((localEmission = ui.GetBoolean("LOCALEMISSION"))) nbands++; if ((localIncidence = ui.GetBoolean("LOCALINCIDENCE"))) nbands++; - if ((northAzimuth = ui.GetBoolean("NORTHAZIMUTH"))) nbands++; + if ((northAzimuth = ui.GetBoolean("NORTHAZIMUTH"))) nbands++; if ((distortedFocalPlaneX = ui.GetBoolean("DISTORTEDFOCALPLANE"))) nbands++; if ((distortedFocalPlaneY = ui.GetBoolean("DISTORTEDFOCALPLANE"))) nbands++; if ((undistortedFocalPlaneX = ui.GetBoolean("UNDISTORTEDFOCALPLANE"))) nbands++; @@ -250,22 +258,22 @@ namespace Isis { if ((ephemerisTime = ui.GetBoolean("EPHEMERISTIME"))) nbands++; if ((UTC = ui.GetBoolean("UTC"))) nbands++; if ((localSolarTime = ui.GetBoolean("LOCALSOLARTIME"))) nbands++; - if ((solarLongitude = ui.GetBoolean("SOLARLONGITUDE"))) nbands++; - if ((morphologyRank = ui.GetBoolean("MORPHOLOGYRANK"))) nbands++; + if ((solarLongitude = ui.GetBoolean("SOLARLONGITUDE"))) nbands++; + if ((morphologyRank = ui.GetBoolean("MORPHOLOGYRANK"))) nbands++; if ((albedoRank = ui.GetBoolean("ALBEDORANK"))) nbands++; - + } if((dn = ui.GetBoolean("DN"))) nbands++; if((planetocentricLatitude = ui.GetBoolean("PLANETOCENTRICLATITUDE"))) nbands++; if((positiveEast360Longitude = ui.GetBoolean("POSITIVEEAST360LONGITUDE"))) nbands++; if((pixelResolution = ui.GetBoolean("PIXELRESOLUTION"))) nbands++; - + if(nbands < 1) { QString message = "At least one parameter must be entered" "[PHASE, EMISSION, INCIDENCE, LATITUDE, LONGITUDE...]"; throw IException(IException::User, message, _FILEINFO_); } - + // If outputting a a dn band, retrieve the orignal values for the filter name from the input cube, // if it exists. Otherwise, the default will be "DN" QString bname = "DN"; @@ -278,7 +286,7 @@ namespace Isis { bname = mybb["FilterName"][0]; } } - + // Create a bandbin group for the output label PvlKeyword name("Name"); if (dn) name += bname; @@ -297,7 +305,7 @@ namespace Isis { if (pixelResolution) name += "Pixel Resolution"; if (lineResolution) name += "Line Resolution"; if (sampleResolution) name += "Sample Resolution"; - if (detectorResolution) name += "Detector Resolution"; + if (detectorResolution) name += "Detector Resolution"; if (spacecraftPositionX) name += "Spacecraft Position X"; if (spacecraftPositionY) name += "Spacecraft Position Y"; if (spacecraftPositionZ) name += "Spacecraft Position Z"; @@ -334,17 +342,17 @@ namespace Isis { if (solarLongitude) name += "Solar Longitude"; if (morphologyRank) name += "morphologyRank"; if (albedoRank) name += "albedoRank"; - - - - + + + + // Create the output cube. Note we add the input cube to expedite propagation // of input cube elements (label, blobs, etc...). It will be cleared // prior to systematic processing only if the DN option is not selected. - // If DN is chosen by the user, then we propagate the input buffer with a + // If DN is chosen by the user, then we propagate the input buffer with a // different function - one that accepts both input and output buffers. p.SetInputCube(icube, OneBand); - Cube *ocube = p.SetOutputCube(ui.GetFileName("TO"), ui.GetOutputAttribute("TO"), icube->sampleCount(), + Cube *ocube = p.SetOutputCube(ui.GetFileName("TO"), ui.GetOutputAttribute("TO"), icube->sampleCount(), icube->lineCount(), nbands); p.SetBrickSize(64, 64, nbands); if (dn) { @@ -364,25 +372,25 @@ namespace Isis { if(!cobj.hasGroup("BandBin")) { cobj.addGroup(PvlGroup("BandBin")); } - + PvlGroup &bb = cobj.findGroup("BandBin"); bb.addKeyword(name, PvlContainer::Replace); int nvals = name.size(); UpdateBandKey("Center", bb, nvals, "1.0"); - + if ( bb.hasKeyword("OriginalBand") ) { UpdateBandKey("OriginalBand", bb, nvals, "1.0"); } - + if ( bb.hasKeyword("Number") ) { UpdateBandKey("Number", bb, nvals, "1.0"); } - + UpdateBandKey("Width", bb, nvals, "1.0"); p.EndProcess(); } - - + + // This propagates the input plane to the output plane, then passes it off to // the general routine void camdevDN(Buffer &in, Buffer &out) { @@ -391,8 +399,8 @@ namespace Isis { } camdev(out); } - - + + // Computes all the geometric properties for the output buffer. Certain // knowledge of the buffers size is assumed below, so ensure the buffer // is still of the expected size. @@ -402,13 +410,13 @@ namespace Isis { int skipDN = (dn) ? 64 * 64 : 0; for(int i = 0; i < 64; i++) { for(int j = 0; j < 64; j++) { - + MosData mosd, *p_mosd(0); // For special mosaic angles - + int index = i * 64 + j + skipDN; double samp = out.Sample(index); double line = out.Line(index); - + bool isGood=false; if (noCamera) { isGood = proj->SetWorld(samp, line); @@ -416,7 +424,7 @@ namespace Isis { else { isGood = cam->SetImage(samp, line); } - + if (isGood) { if (ra) { out[index] = cam->RightAscension(); @@ -439,9 +447,9 @@ namespace Isis { if (planetographicLatitude) { Distance radii[3]; cam->radii(radii); - double ocentricLat; + double ocentricLat; ocentricLat = cam->UniversalLatitude(); - out[index] = TProjection::ToPlanetographic(ocentricLat, radii[0].kilometers(), + out[index] = TProjection::ToPlanetographic(ocentricLat, radii[0].kilometers(), radii[2].kilometers()); index += 64 * 64; } @@ -534,7 +542,7 @@ namespace Isis { } if(!noCamera) { double ssplat, ssplon; - ssplat = 0.0; + ssplat = 0.0; ssplon = 0.0; cam->subSpacecraftPoint(ssplat, ssplon); if(subSpacecraftLatitude) { @@ -615,17 +623,17 @@ namespace Isis { Angle emission; bool success; cam->LocalPhotometricAngles(phase, incidence, emission, success); - + if (localEmission) { out[index] = emission.degrees(); index += 64 * 64; } - + if (localIncidence) { out[index] = incidence.degrees(); index += 64 * 64; } - } + } if(northAzimuth) { out[index] = cam->NorthAzimuth(); index += 64 * 64; @@ -671,7 +679,7 @@ namespace Isis { out[index] = mosd.m_morph; index += 64 * 64; } - + if (albedoRank) { if (!p_mosd) { p_mosd = getMosaicIndicies(*cam, mosd); } out[index] = mosd.m_albedo; @@ -688,8 +696,8 @@ namespace Isis { } } } - - + + // Function to create a keyword with same values of a specified count template PvlKeyword makeKey(const QString &name, const int &nvals, @@ -700,8 +708,8 @@ namespace Isis { } return (key); } - - + + // Computes the special morphologyRank and albedoRank planes MosData *getMosaicIndicies(Camera &camera, MosData &md) { const double Epsilon(1.0E-8); @@ -716,7 +724,7 @@ namespace Isis { } double res = camera.PixelResolution(); if (fabs(res) < Epsilon) res = Epsilon; - + md = MosData(); // Nullifies the data if (myemission.isValid()) { // Compute morphologyRank @@ -724,7 +732,7 @@ namespace Isis { if (fabs(cose) < Epsilon) cose = Epsilon; // Convert resolution to units of KM md.m_morph = (res / 1000.0) / cose; - + if (myincidence.isValid()) { // Compute albedoRank double cosi = cos(myincidence.radians()); @@ -733,11 +741,11 @@ namespace Isis { md.m_albedo = (res / 1000.0 ) * ( (1.0 / cose) + (1.0 / cosi) ); } } - + return (&md); } - - + + // Updates existing BandBin keywords with additional values to ensure // label compilancy (which should support Camera models). It checks for the // existance of the keyword and uses its (assumed) first value to set nvals @@ -745,14 +753,14 @@ namespace Isis { // value. void UpdateBandKey(const QString &keyname, PvlGroup &bb, const int &nvals, const QString &default_value) { - + QString defVal(default_value); if ( bb.hasKeyword(keyname) ) { defVal = bb[keyname][0]; } - + bb.addKeyword(makeKey(keyname, nvals, defVal), PvlContainer::Replace); return; } - -} \ No newline at end of file + +} diff --git a/isis/src/dev/apps/camdev/camdev.h b/isis/src/dev/apps/camdev/camdev.h index bb0e38a09a..df6577e13f 100644 --- a/isis/src/dev/apps/camdev/camdev.h +++ b/isis/src/dev/apps/camdev/camdev.h @@ -1,6 +1,14 @@ -#ifndef camdev_h +#ifndef camdev_h #define camdev_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "UserInterface.h" #include "Cube.h" @@ -9,4 +17,4 @@ namespace Isis { extern void camdev(UserInterface &ui); } -#endif \ No newline at end of file +#endif diff --git a/isis/src/dev/apps/camdev/main.cpp b/isis/src/dev/apps/camdev/main.cpp index 05ea262494..bb3b966815 100644 --- a/isis/src/dev/apps/camdev/main.cpp +++ b/isis/src/dev/apps/camdev/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include @@ -64,7 +72,7 @@ bool solarDistance; bool subSolarLatitude; bool subSolarLongitude; bool subSolarGroundAzimuth; -bool phase; +bool phase; bool emission; bool incidence; bool localEmission; @@ -89,8 +97,8 @@ void camdev(Buffer &out); // Function to create a keyword with same values of a specified count -template PvlKeyword makeKey(const QString &name, - const int &nvals, +template PvlKeyword makeKey(const QString &name, + const int &nvals, const T &value); // Structure containing new mosaic planes @@ -103,7 +111,7 @@ struct MosData { // Computes the special MORPHOLOGYRANK and ALBEDORANK planes MosData *getMosaicIndicies(Camera &camera, MosData &md); // Updates BandBin keyword -void UpdateBandKey(const QString &keyname, PvlGroup &bb, const int &nvals, +void UpdateBandKey(const QString &keyname, PvlGroup &bb, const int &nvals, const QString &default_value = "Null"); @@ -130,7 +138,7 @@ void IsisMain() { QString msg = "Mosaic files must contain mapping labels"; throw IException(e, IException::User, msg, _FILEINFO_); } - } + } else { try { cam = icube->camera(); @@ -178,7 +186,7 @@ void IsisMain() { solarDistance = false; subSolarLatitude = false; subSolarLongitude = false; - subSolarGroundAzimuth = false; + subSolarGroundAzimuth = false; phase = false; emission = false; incidence = false; @@ -193,11 +201,11 @@ void IsisMain() { ephemerisTime = false; UTC = false; localSolarTime = false; - solarLongitude = false; + solarLongitude = false; morphologyRank = false; - albedoRank = false; - - + albedoRank = false; + + if (!noCamera) { if ((ra = ui.GetBoolean("RADEC"))) nbands++; if ((declination = ui.GetBoolean("RADEC"))) nbands++; @@ -230,13 +238,13 @@ void IsisMain() { if ((solarDistance = ui.GetBoolean("SOLARDISTANCE"))) nbands++; if ((subSolarLatitude = ui.GetBoolean("SUBSOLARLATITUDE"))) nbands++; if ((subSolarLongitude = ui.GetBoolean("SUBSOLARLONGITUDE"))) nbands++; - if ((subSolarGroundAzimuth = ui.GetBoolean("SUBSOLARGROUNDAZIMUTH"))) nbands++; + if ((subSolarGroundAzimuth = ui.GetBoolean("SUBSOLARGROUNDAZIMUTH"))) nbands++; if ((phase = ui.GetBoolean("PHASE"))) nbands++; if ((incidence = ui.GetBoolean("INCIDENCE"))) nbands++; if ((emission = ui.GetBoolean("EMISSION"))) nbands++; if ((localEmission = ui.GetBoolean("LOCALEMISSION"))) nbands++; if ((localIncidence = ui.GetBoolean("LOCALINCIDENCE"))) nbands++; - if ((northAzimuth = ui.GetBoolean("NORTHAZIMUTH"))) nbands++; + if ((northAzimuth = ui.GetBoolean("NORTHAZIMUTH"))) nbands++; if ((distortedFocalPlaneX = ui.GetBoolean("DISTORTEDFOCALPLANE"))) nbands++; if ((distortedFocalPlaneY = ui.GetBoolean("DISTORTEDFOCALPLANE"))) nbands++; if ((undistortedFocalPlaneX = ui.GetBoolean("UNDISTORTEDFOCALPLANE"))) nbands++; @@ -245,10 +253,10 @@ void IsisMain() { if ((ephemerisTime = ui.GetBoolean("EPHEMERISTIME"))) nbands++; if ((UTC = ui.GetBoolean("UTC"))) nbands++; if ((localSolarTime = ui.GetBoolean("LOCALSOLARTIME"))) nbands++; - if ((solarLongitude = ui.GetBoolean("SOLARLONGITUDE"))) nbands++; - if ((morphologyRank = ui.GetBoolean("MORPHOLOGYRANK"))) nbands++; + if ((solarLongitude = ui.GetBoolean("SOLARLONGITUDE"))) nbands++; + if ((morphologyRank = ui.GetBoolean("MORPHOLOGYRANK"))) nbands++; if ((albedoRank = ui.GetBoolean("ALBEDORANK"))) nbands++; - + } if((dn = ui.GetBoolean("DN"))) nbands++; if((planetocentricLatitude = ui.GetBoolean("PLANETOCENTRICLATITUDE"))) nbands++; @@ -292,7 +300,7 @@ void IsisMain() { if (pixelResolution) name += "Pixel Resolution"; if (lineResolution) name += "Line Resolution"; if (sampleResolution) name += "Sample Resolution"; - if (detectorResolution) name += "Detector Resolution"; + if (detectorResolution) name += "Detector Resolution"; if (spacecraftPositionX) name += "Spacecraft Position X"; if (spacecraftPositionY) name += "Spacecraft Position Y"; if (spacecraftPositionZ) name += "Spacecraft Position Z"; @@ -329,17 +337,17 @@ void IsisMain() { if (solarLongitude) name += "Solar Longitude"; if (morphologyRank) name += "morphologyRank"; if (albedoRank) name += "albedoRank"; - - + + // Create the output cube. Note we add the input cube to expedite propagation // of input cube elements (label, blobs, etc...). It will be cleared // prior to systematic processing only if the DN option is not selected. - // If DN is chosen by the user, then we propagate the input buffer with a + // If DN is chosen by the user, then we propagate the input buffer with a // different function - one that accepts both input and output buffers. (void) p.SetInputCube("FROM", OneBand); - Cube *ocube = p.SetOutputCube("TO", icube->sampleCount(), + Cube *ocube = p.SetOutputCube("TO", icube->sampleCount(), icube->lineCount(), nbands); p.SetBrickSize(64, 64, nbands); @@ -443,9 +451,9 @@ void camdev(Buffer &out) { if (planetographicLatitude) { Distance radii[3]; cam->radii(radii); - double ocentricLat; + double ocentricLat; ocentricLat = cam->UniversalLatitude(); - out[index] = TProjection::ToPlanetographic(ocentricLat, radii[0].kilometers(), + out[index] = TProjection::ToPlanetographic(ocentricLat, radii[0].kilometers(), radii[2].kilometers()); index += 64 * 64; } @@ -538,7 +546,7 @@ void camdev(Buffer &out) { } if(!noCamera) { double ssplat, ssplon; - ssplat = 0.0; + ssplat = 0.0; ssplon = 0.0; cam->subSpacecraftPoint(ssplat, ssplon); if(subSpacecraftLatitude) { @@ -629,7 +637,7 @@ void camdev(Buffer &out) { out[index] = incidence.degrees(); index += 64 * 64; } - } + } if(northAzimuth) { out[index] = cam->NorthAzimuth(); index += 64 * 64; @@ -758,4 +766,3 @@ void UpdateBandKey(const QString &keyname, PvlGroup &bb, const int &nvals, bb.addKeyword(makeKey(keyname, nvals, defVal), PvlContainer::Replace); return; } - diff --git a/isis/src/dev/apps/camtest/main.cpp b/isis/src/dev/apps/camtest/main.cpp index 4484d7054e..0bc50fb784 100644 --- a/isis/src/dev/apps/camtest/main.cpp +++ b/isis/src/dev/apps/camtest/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "ProcessByLine.h" #include "Camera.h" @@ -21,7 +29,7 @@ enum OutputType { /** * Functor for collecting camera statistics. - * + * * @author 2016-11-16 Jesse Mapel * @internal * @history 2016-11-16 Original Version. @@ -29,12 +37,12 @@ enum OutputType { class CamTestFunctor { public: CamTestFunctor() {}; - ~CamTestFunctor() {}; + ~CamTestFunctor() {}; void setCamera(Camera* cam); void setOutType(OutputType outType); void setResults(Statistics* results); void operator()(Buffer &in, Buffer &out) const; - + private: Camera* m_cam; OutputType m_outType; @@ -50,10 +58,10 @@ void IsisMain() { Cube *iCube = p.SetInputCube("FROM"); Camera *cam = iCube->camera(); p.SetOutputCube("TO"); - + // Set to process by line p.SetBrickSize(iCube->sampleCount(), 1, 1); - + IString format = ui.GetString("FORMAT"); OutputType outFormat = Lat; @@ -79,9 +87,9 @@ void IsisMain() { func.setOutType(outFormat); Statistics resultsStats; func.setResults(&resultsStats); - + p.ProcessCube(func, false); - + // Collect results PvlGroup results = PvlGroup("CamTestResults"); results += PvlKeyword("FailedConversionsToLatLong", toString(resultsStats.LrsPixels())); @@ -93,15 +101,15 @@ void IsisMain() { results += PvlKeyword("Minimum", toString(resultsStats.Minimum())); results += PvlKeyword("Maximum", toString(resultsStats.Maximum())); } - + // Log output results Application::Log(results); - + p.EndProcess(); } // Functor Definitions - + void CamTestFunctor::setCamera(Camera* cam) { m_cam = cam; } @@ -154,7 +162,7 @@ void CamTestFunctor::operator()(Buffer &in, Buffer &out) const { } } - + m_resultsStats->AddData(out.DoubleBuffer(), out.size()); } /* Old Processing Routine @@ -200,4 +208,4 @@ void doIt(Buffer &in, Buffer &out) { } } } -*/ \ No newline at end of file +*/ diff --git a/isis/src/dev/apps/m3loc2net/main.cpp b/isis/src/dev/apps/m3loc2net/main.cpp index 3f923128ef..b6473f8215 100644 --- a/isis/src/dev/apps/m3loc2net/main.cpp +++ b/isis/src/dev/apps/m3loc2net/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "Brick.h" @@ -114,7 +122,7 @@ void IsisMain() { samp = inputCube.sampleCount() - sampInc - 1; qDebug()<<"lastSamp = "<addCachingAlgorithm(new BoxcarCachingAlgorithm()); - importPds.StartProcess(); + importPds.StartProcess(); translateNIMSLabels(*pdsLabel,g_suffixCube,inFile,SUFFIX); importPds.EndProcess(); @@ -256,13 +264,13 @@ PvlGroup originalMappingGroup = qube.findGroup("IMAGE_MAP_PROJECTION", Pvl::Trav mappingInfo += Isis::PvlKeyword("MinimumLatitude"); mappingInfo += Isis::PvlKeyword("MaximumLatitude"); mappingInfo += Isis::PvlKeyword("MinimumLongitude"); - mappingInfo += Isis::PvlKeyword("MaximumLongitude"); + mappingInfo += Isis::PvlKeyword("MaximumLongitude"); mappingInfo += Isis::PvlKeyword("MapProjectionType"); - mappingInfo += Isis::PvlKeyword("MapScale"); - mappingInfo += Isis::PvlKeyword("MapProjectionRotation"); - mappingInfo += Isis::PvlKeyword("MajorEquatorialRadius"); - mappingInfo += Isis::PvlKeyword("MinorEquatorialRadius"); - mappingInfo += Isis::PvlKeyword("PolarRadius"); + mappingInfo += Isis::PvlKeyword("MapScale"); + mappingInfo += Isis::PvlKeyword("MapProjectionRotation"); + mappingInfo += Isis::PvlKeyword("MajorEquatorialRadius"); + mappingInfo += Isis::PvlKeyword("MinorEquatorialRadius"); + mappingInfo += Isis::PvlKeyword("PolarRadius"); if (originalMappingGroup["COORDINATE_SYSTEM_NAME"][0] == "PLANETOCENTRIC") { mappingInfo["LatitudeType"] = "Planetocentric"; @@ -314,7 +322,7 @@ PvlGroup originalMappingGroup = qube.findGroup("IMAGE_MAP_PROJECTION", Pvl::Trav coreCube.close(); suffixCube.close(); -// Mapping group code -- keep in case we can use this in the future. +// Mapping group code -- keep in case we can use this in the future. #if 0 // Reopen the cubes in order to fix the mapping group @@ -412,7 +420,7 @@ PvlGroup originalMappingGroup = qube.findGroup("IMAGE_MAP_PROJECTION", Pvl::Trav coreCube.close(); suffixCube.close(); -#endif +#endif } @@ -593,4 +601,3 @@ void ProcessBands(Pvl &pdsLab, Cube *nimsCube, ProcessImportPds &importPds) { importPds.SetBase(base); nimsCube->putGroup(bandBin); } - diff --git a/isis/src/galileo/apps/gllssi2isis/main.cpp b/isis/src/galileo/apps/gllssi2isis/main.cpp index 3c7f5922b9..e2aeb48748 100644 --- a/isis/src/galileo/apps/gllssi2isis/main.cpp +++ b/isis/src/galileo/apps/gllssi2isis/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "CubeAttribute.h" diff --git a/isis/src/galileo/apps/gllssical/main.cpp b/isis/src/galileo/apps/gllssical/main.cpp index c805c1e768..e442d0b00a 100644 --- a/isis/src/galileo/apps/gllssical/main.cpp +++ b/isis/src/galileo/apps/gllssical/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "ProcessByLine.h" #include "Buffer.h" diff --git a/isis/src/galileo/objs/SsiCamera/SsiCamera.cpp b/isis/src/galileo/objs/SsiCamera/SsiCamera.cpp index a2826a5345..0bca4d9f81 100644 --- a/isis/src/galileo/objs/SsiCamera/SsiCamera.cpp +++ b/isis/src/galileo/objs/SsiCamera/SsiCamera.cpp @@ -1,24 +1,11 @@ -/** - * @file - * $Revision: 1.4 $ - * $Date: 2008/05/14 21:07:11 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "SsiCamera.h" #include @@ -41,10 +28,10 @@ using namespace std; namespace Isis { /** * Constructs a SsiCamera object using the image labels. - * - * @param lab Pvl label from a Galileo SSI image. - * - * @internal + * + * @param lab Pvl label from a Galileo SSI image. + * + * @internal * @history 2011-05-03 Jeannie Walldren - Added NAIF error check. Added call * to ShutterOpenCloseTimes() method. */ @@ -53,7 +40,7 @@ namespace Isis { m_instrumentNameShort = "SSI"; m_spacecraftNameLong = "Galileo Orbiter"; m_spacecraftNameShort = "Galileo"; - + NaifStatus::CheckErrors(); // Get the camera characteristics double k1; @@ -100,9 +87,9 @@ namespace Isis { CameraFocalPlaneMap *focalMap = new CameraFocalPlaneMap(this, naifIkCode()); focalMap->SetDetectorOrigin( - Spice::getDouble("INS" + toString(naifIkCode()) + + Spice::getDouble("INS" + toString(naifIkCode()) + "_BORESIGHT_SAMPLE"), - Spice::getDouble("INS" + toString(naifIkCode()) + + Spice::getDouble("INS" + toString(naifIkCode()) + "_BORESIGHT_LINE")); // Setup distortion map @@ -152,12 +139,12 @@ namespace Isis { /** * This is the function that is called in order to instantiate a SsiCamera - * object. + * object. * * @param lab Cube labels * - * @return Isis::Camera* SsiCamera - * @internal + * @return Isis::Camera* SsiCamera + * @internal * @history 2011-05-03 Jeannie Walldren - Added documentation. Removed * Galileo namespace. */ diff --git a/isis/src/galileo/objs/SsiCamera/SsiCamera.h b/isis/src/galileo/objs/SsiCamera/SsiCamera.h index c937586269..13cdc18bae 100644 --- a/isis/src/galileo/objs/SsiCamera/SsiCamera.h +++ b/isis/src/galileo/objs/SsiCamera/SsiCamera.h @@ -1,36 +1,26 @@ #ifndef SsiCamera_h #define SsiCamera_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "FramingCamera.h" namespace Isis { /** - * This is the camera model for the Galileo Solid State Imaging Camera + * This is the camera model for the Galileo Solid State Imaging Camera * * @ingroup SpiceInstrumentsAndCameras * @ingroup Galileo - * + * * @see http://astrogeology.usgs.gov/Missions/Galileo * @see http://www2.jpl.nasa.gov/galileo/sepo - * @see http://pds-imaging.jpl.nasa.gov/portal/galileo_mission.html + * @see http://pds-imaging.jpl.nasa.gov/portal/galileo_mission.html * * * @author ????-??-?? Jeff Anderson @@ -52,12 +42,12 @@ namespace Isis { * Updated documentation. Replaced Galileo namespace * wrap with Isis namespace. Added Isis Disclaimer to * files. Added NAIF error check to constructor. - * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis + * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis * coding standards. References #972. * @history 2015-08-12 Ian Humphrey and Makayla Shepherd - Added new data members and methods * to get spacecraft and instrument names. Extended unit test to * test these methods. - * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument + * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument * members and methods and removed implementation of these methods * since Camera now handles this. References #2335. */ @@ -71,24 +61,24 @@ namespace Isis { /** * CK frame ID - - Instrument Code from spacit run on CK - * - * @return @b int The appropriate instrument code for the "Camera-matrix" + * + * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Frame ID */ virtual int CkFrameId() const { return (-77001); } - /** + /** * CK Reference ID - J2000 - * + * * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Reference ID */ virtual int CkReferenceId() const { return (2); } - /** + /** * SPK Reference ID - J2000 - * - * @return @b int The appropriate instrument code for the Spacecraft + * + * @return @b int The appropriate instrument code for the Spacecraft * Kernel Reference ID */ virtual int SpkReferenceId() const { return (21); } diff --git a/isis/src/galileo/objs/SsiCamera/unitTest.cpp b/isis/src/galileo/objs/SsiCamera/unitTest.cpp index e6737ca997..f68d45e6bc 100644 --- a/isis/src/galileo/objs/SsiCamera/unitTest.cpp +++ b/isis/src/galileo/objs/SsiCamera/unitTest.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -60,10 +49,10 @@ int main(void) { cout << "SPK Target ID = " << cam->SpkTargetId() << endl; cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl; - // Test Shutter Open/Close + // Test Shutter Open/Close const PvlGroup &inst = c.label()->findGroup("Instrument", Pvl::Traverse); - double exposureDuration = ((double) inst["ExposureDuration"])/1000; + double exposureDuration = ((double) inst["ExposureDuration"])/1000; QString stime = inst["StartTime"]; double et; // StartTime keyword is the center exposure time str2et_c(stime.toLatin1().data(), &et); @@ -106,7 +95,7 @@ int main(void) { else { cout << setprecision(16) << "Longitude off by: " << cam->UniversalLongitude() - knownLon << endl; } - + // Test name methods cout << endl << endl << "Testing name methods ..." << endl; cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl; @@ -139,4 +128,3 @@ void TestLineSamp(Camera *cam, double samp, double line) { cout << "DeltaLine = ERROR" << endl << endl; } } - diff --git a/isis/src/hayabusa/apps/amica2isis/AmicaImportFits.cpp b/isis/src/hayabusa/apps/amica2isis/AmicaImportFits.cpp index 7588718c78..1f8fa66c56 100644 --- a/isis/src/hayabusa/apps/amica2isis/AmicaImportFits.cpp +++ b/isis/src/hayabusa/apps/amica2isis/AmicaImportFits.cpp @@ -1,24 +1,11 @@ -/** - * @file - * $Revision: 6715 $ - * $Date: 2016-04-28 10:58:43 -0700 (Thu, 28 Apr 2016) $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "AmicaImportFits.h" #include diff --git a/isis/src/hayabusa/apps/amica2isis/AmicaImportFits.h b/isis/src/hayabusa/apps/amica2isis/AmicaImportFits.h index 63237afddf..cbb5870e5a 100644 --- a/isis/src/hayabusa/apps/amica2isis/AmicaImportFits.h +++ b/isis/src/hayabusa/apps/amica2isis/AmicaImportFits.h @@ -1,26 +1,13 @@ #ifndef AmicaImportFits_h #define AmicaImportFits_h -/** - * @file - * $Revision: 5602 $ - * $Date: 2013-11-27 11:40:00 -0700 (Wed, 27 Nov 2013) $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include diff --git a/isis/src/hayabusa/apps/amica2isis/main.cpp b/isis/src/hayabusa/apps/amica2isis/main.cpp index c4ad213663..16cb76ce3b 100644 --- a/isis/src/hayabusa/apps/amica2isis/main.cpp +++ b/isis/src/hayabusa/apps/amica2isis/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include diff --git a/isis/src/hayabusa/apps/amicacal/AmicaCalUtils.h b/isis/src/hayabusa/apps/amicacal/AmicaCalUtils.h index 1d02e8cfe3..f1974d7e4c 100644 --- a/isis/src/hayabusa/apps/amicacal/AmicaCalUtils.h +++ b/isis/src/hayabusa/apps/amicacal/AmicaCalUtils.h @@ -1,6 +1,14 @@ #ifndef AmicaCalUtils_h #define AmicaCalUtils_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include @@ -49,7 +57,7 @@ static void loadNaifTiming() { // Load the NAIF kernels to determine timing data Isis::FileName leapseconds("$base/kernels/lsk/naif????.tls"); leapseconds = leapseconds.highestVersion(); - Isis::FileName sclk("$hayabusa/kernels/sclk/hayabusa.tsc"); + Isis::FileName sclk("$hayabusa/kernels/sclk/hayabusa.tsc"); Isis::FileName pck1("$hayabusa/kernels/tspk/de403s.bsp"); Isis::FileName pck2("$hayabusa/kernels/tspk/sb_25143_140.bsp"); Isis::FileName pck3("$hayabusa/kernels/spk/hay_jaxa_050916_051119_v1n.bsp"); @@ -85,7 +93,7 @@ static void loadNaifTiming() { * * This method requires the appropriate NAIK kernels to be loaded that * provides instrument time support, leap seconds and planet body ephemeris. - * + * * @return @b double Distance in AU between Sun and observed body. */ static bool sunDistanceAU(const QString &scStartTime, @@ -230,7 +238,7 @@ void translate(Cube *flatField, int *transform, QString fname) { Mat originalCropped = temp(Rect(startsample,startline,width+1,height+1)); - if (scale ==1) { + if (scale ==1) { mat2isis(&originalCropped,fname); } else { @@ -303,7 +311,7 @@ static double f_unfocused(double * A,double * sigma, int N,int binning,double x, double r = sqrt(X*X+Y*Y); double sum = 0; - for (int i = 0; i < N; i ++) { + for (int i = 0; i < N; i ++) { sum += (A[i]/(sigma[i]*sqrt(2.0*pi_c() ) ) )*exp(-(r*r)/(2*sigma[i]*sigma[i]) ); } @@ -345,9 +353,9 @@ double * setPSFFilter(int size, double *A,double *sigma, double alpha,int N,int i++; } else { - psfVals[i]=f_unfocused(A,sigma,N,binning,x,y) +f_focused(alpha,binning,x,y); + psfVals[i]=f_unfocused(A,sigma,N,binning,x,y) +f_focused(alpha,binning,x,y); i++; - } + } } } @@ -360,4 +368,3 @@ double * setPSFFilter(int size, double *A,double *sigma, double alpha,int N,int #endif - diff --git a/isis/src/hayabusa/apps/amicacal/main.cpp b/isis/src/hayabusa/apps/amicacal/main.cpp index 8ceecb5fae..d9a62c7591 100644 --- a/isis/src/hayabusa/apps/amicacal/main.cpp +++ b/isis/src/hayabusa/apps/amicacal/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + // $Id: amicacal.cpp 6045 2015-02-07 02:06:59Z moses@GS.DOI.NET $ #include "Isis.h" @@ -43,7 +51,7 @@ void calibrate(vector& in, vector& out); QString loadCalibrationVariables(const QString &config); #if 0 -// PSF correction is currently not working and has been removed as an option. +// PSF correction is currently not working and has been removed as an option. //void psfCorrection(vector& in, vector& out); //void psfCorrectionBoxcar(Buffer &in, double &result); #endif @@ -120,8 +128,8 @@ static double g_radStd = 3.42E-3;//!< Base conversion for all filters (Tbl. 9) static QVector hotPixelVector; //!< A pixel vector that contains the Hot Pixel locations #if 0 -// PSF correction is currently not working and has been removed as an option. -// PSF variables +// PSF correction is currently not working and has been removed as an option. +// PSF variables //static bool g_applyPSF = false; //static int ns, nl, nb; //!< Number of samples, lines, bands of the input cube //static int g_size = 23; //!< The size of the Boxcar used for calculating the light diffusion model. @@ -148,14 +156,14 @@ void IsisMain() { Cube *inputCube = process.SetInputCube("FROM"); #if 0 -// PSF correction is currently not working and has been removed as an option. +// PSF correction is currently not working and has been removed as an option. // g_applyPSF = ui.GetBoolean("APPLYPSF"); #endif // Basic assurances... if (inputCube->bandCount() != 1) { - throw IException(IException::User, - "AMICA images may only contain one band", + throw IException(IException::User, + "AMICA images may only contain one band", _FILEINFO_); } @@ -174,17 +182,17 @@ void IsisMain() { //Set up binning and image subarea mapping - AlphaCube myAlpha(1024, 1024, inputCube->sampleCount(), - inputCube->lineCount(), - startSample + 1, - startLine + 1, - lastSample + 1, + AlphaCube myAlpha(1024, 1024, inputCube->sampleCount(), + inputCube->lineCount(), + startSample + 1, + startLine + 1, + lastSample + 1, lastLine + 1); alpha = &myAlpha; try { - g_exposureTime = inst["ExposureDuration"] ; + g_exposureTime = inst["ExposureDuration"] ; } catch(IException &e) { QString msg = "Unable to read [ExposureDuration] keyword in the Instrument group " @@ -212,7 +220,7 @@ void IsisMain() { int lastline = inst["LastLine"]; int lastsample = inst["LastSample"]; - nsubImages = archive["SubImageCount"]; // If > 1, some correction is + nsubImages = archive["SubImageCount"]; // If > 1, some correction is // not needed/performed QString compmode = archive["OutputMode"]; @@ -261,14 +269,14 @@ void IsisMain() { } else { // Image is cropped so we have to deal with it - FileName transFlat = FileName::createTempFile("$TEMPORARY/" - + flatfile.baseName() + FileName transFlat = FileName::createTempFile("$TEMPORARY/" + + flatfile.baseName() + "_translated.cub"); Cube *flatOriginal = new Cube(flatfile.expanded() ); - + int transform[5] = {binning, startsample, firstLine, lastsample, lastline}; - + // Translates and scales the flatfield image. Scaling // might be necessary in the event that the raw image was also binned. @@ -276,7 +284,7 @@ void IsisMain() { QScopedPointer translated(new Cube(transFlat.expanded(), "r")); flatcube.swap(translated); - + CubeAttributeInput att; process.SetInputCube(transFlat.expanded(), att); } @@ -285,7 +293,7 @@ void IsisMain() { QString fname = outputCube->fileName(); #if 0 -// PSF correction is currently not working and has been removed as an option. +// PSF correction is currently not working and has been removed as an option. //ns = inputCube->sampleCount(); //nl = inputCube->lineCount(); //nb = inputCube->bandCount(); @@ -299,8 +307,8 @@ void IsisMain() { QString g_units = "DN"; if ( !sunDistanceAU(startTime, target, g_solarDist) ) { - throw IException(IException::Programmer, - "Cannot calculated distance to sun!", + throw IException(IException::Programmer, + "Cannot calculated distance to sun!", _FILEINFO_); } @@ -311,35 +319,35 @@ void IsisMain() { } else if ( QString::compare(g_iofCorrection, "dn", Qt::CaseInsensitive) != 0 ) { /* Note - this radiance calibration scaling factor is applied to both radiance and iof - * + * * Units of RADIANCE * equation: * Rad(i)=image(DN/s) * C * S(i) where - * C = radStd = 3.42.10^-3 - * S(i) = iofScale, - * with S(v) = 1, + * C = radStd = 3.42.10^-3 + * S(i) = iofScale, + * with S(v) = 1, * S(zs)=3.286 (factor computed by Lucille Le Corre of PSI), * and the remaining scale factors from table 9 of the Ishiguro et al. 2010 paper - */ - g_calibrationScale = g_radStd * g_iofScale / g_exposureTime; + */ + g_calibrationScale = g_radStd * g_iofScale / g_exposureTime; g_units = "W / (m**2 micrometer sr)"; if ( QString::compare(g_iofCorrection, "iof", Qt::CaseInsensitive) == 0 ) { /* Note: iof (i.e. reflectance) equation described below is just * Ref(i) = Rad(i) * pi * d^2 /Fv - * so this if-statement is nested + * so this if-statement is nested * * Units of I/F (reflectance) * equation: - * Ref(v)=image(DN/s) * C * S(i) * pi * d^2/F(v) where + * Ref(v)=image(DN/s) * C * S(i) * pi * d^2/F(v) where * C, S(i) are as described above, * d is the solar distance from the label of the v filter image, - * Fv = solarflux(v) = 1861.145142 is the solar flux + * Fv = solarflux(v) = 1861.145142 is the solar flux * resampled to V filter bandpass with Quantum Efficiency */ - g_calibrationScale = g_calibrationScale - * Isis::PI - * (g_solarDist * g_solarDist) + g_calibrationScale = g_calibrationScale + * Isis::PI + * (g_solarDist * g_solarDist) / g_solarFlux; g_units = "I over F"; } @@ -351,9 +359,9 @@ void IsisMain() { process.StartProcess(calibrate); } catch (IException &ie) { - throw IException(ie, - IException::Programmer, - "Radiometric calibration failed!", + throw IException(ie, + IException::Programmer, + "Radiometric calibration failed!", _FILEINFO_); } @@ -391,8 +399,8 @@ void IsisMain() { calibrationLog.addKeyword(PvlKeyword("IOFFactor", toString(g_calibrationScale, 16))); calibrationLog.addKeyword(PvlKeyword("Units", g_units)); -#if 0 -// PSF correction is currently not working and has been removed as an option. +#if 0 +// PSF correction is currently not working and has been removed as an option. // This section will apply the PSF correction if ( g_applyPSF ) { //PSF correction @@ -408,9 +416,9 @@ void IsisMain() { processDiffusionModel.SetInputCube(outputCube); - processDiffusionModel.SetOutputCube(psfModel.name(), attOutput, - outputCube->sampleCount(), - outputCube->lineCount(), + processDiffusionModel.SetOutputCube(psfModel.name(), attOutput, + outputCube->sampleCount(), + outputCube->lineCount(), outputCube->bandCount()); processDiffusionModel.SetBoxcarSize(g_size, g_size); @@ -428,9 +436,9 @@ void IsisMain() { outputCube->putGroup(calibrationLog); process.EndProcess(); remove( psfModel.expanded().toLatin1().data() ); - throw IException(ie, - IException::Programmer, - "Calculating the diffusion model failed!", + throw IException(ie, + IException::Programmer, + "Calculating the diffusion model failed!", _FILEINFO_); } @@ -460,14 +468,14 @@ void IsisMain() { calibrationLog.addKeyword(PvlKeyword("PSF_Focused", toString(g_alpha, 6))); key = PvlKeyword("PSF_Sigma"); - for (int i = 0 ; i < g_N ; i++ ) { - key.addValue(toString(g_sigma[i])); + for (int i = 0 ; i < g_N ; i++ ) { + key.addValue(toString(g_sigma[i])); } calibrationLog.addKeyword(key); key = PvlKeyword("PSF_Diffuse"); - for (int i = 0 ; i < g_N ; i++ ) { - key.addValue(toString(g_A[i])); + for (int i = 0 ; i < g_N ; i++ ) { + key.addValue(toString(g_A[i])); } } @@ -477,19 +485,19 @@ void IsisMain() { outputCube->putGroup(calibrationLog); process.EndProcess(); remove( psfModel.expanded().toLatin1().data() ); - throw IException(ie, - IException::Programmer, - "Applying the PSF correction failed!", + throw IException(ie, + IException::Programmer, + "Applying the PSF correction failed!", _FILEINFO_); - } - + } + processPSFCorrection.EndProcess(); - // Remove the PSF file + // Remove the PSF file remove( psfModel.expanded().toLatin1().data() ); } -#endif +#endif // Write Calibration group to output file outputCube->putGroup(calibrationLog); @@ -530,7 +538,7 @@ FileName determineFlatFieldFile(const QString &filter, const bool nullPolarPix) #if 0 -// PSF correction is currently not working and has been removed as an option. +// PSF correction is currently not working and has been removed as an option. /** * @brief This function moves the PSF kernel through each pixel of the input cube and approximates * the amount of light diffusion produced by that pixel. @@ -585,7 +593,7 @@ void psfCorrection(vector &in, vector &out) { } } -#endif +#endif /** @@ -613,7 +621,7 @@ QString loadCalibrationVariables(const QString &config) { PvlGroup &solarFluxGroup = g_configFile.findGroup("SolarFlux"); #if 0 -// PSF correction is currently not working and has been removed as an option. +// PSF correction is currently not working and has been removed as an option. // PvlGroup &psfDiffuse = g_configFile.findGroup("PSFDiffuse"); // PvlGroup &psfFocused = g_configFile.findGroup("PSFFocused"); #endif @@ -663,15 +671,15 @@ QString loadCalibrationVariables(const QString &config) { loadNaifTiming(); // Ensure the proper kernels are loaded - scs2e_c(g_hayabusaNaifCode, g_startTime.toLatin1().data(), &obsStartTime); + scs2e_c(g_hayabusaNaifCode, g_startTime.toLatin1().data(), &obsStartTime); tsecs = obsStartTime - g_launchTime.Et(); tdays = tsecs / 86400; - g_bias = g_b0 - + g_b1 * tdays + g_bias = g_b0 + + g_b1 * tdays + g_b2 * (tdays * tdays); #if 0 -// PSF correction is not working and is temporarily removed. +// PSF correction is not working and is temporarily removed. //g_bias = 0; //cout << "g_bias = " << g_bias << endl; @@ -821,4 +829,3 @@ void calibrate(vector& in, vector& out) { } return; } - diff --git a/isis/src/hayabusa/apps/hyb1pds4gen/main.cpp b/isis/src/hayabusa/apps/hyb1pds4gen/main.cpp index 153cde8b03..ebca385c61 100644 --- a/isis/src/hayabusa/apps/hyb1pds4gen/main.cpp +++ b/isis/src/hayabusa/apps/hyb1pds4gen/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include diff --git a/isis/src/hayabusa/apps/nirs2isis/NirsImportFits.cpp b/isis/src/hayabusa/apps/nirs2isis/NirsImportFits.cpp index b790725f2c..4db082cf87 100644 --- a/isis/src/hayabusa/apps/nirs2isis/NirsImportFits.cpp +++ b/isis/src/hayabusa/apps/nirs2isis/NirsImportFits.cpp @@ -1,24 +1,11 @@ -/** - * @file - * $Revision: 6715 $ - * $Date: 2016-04-28 10:58:43 -0700 (Thu, 28 Apr 2016) $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "NirsImportFits.h" #include diff --git a/isis/src/hayabusa/apps/nirs2isis/NirsImportFits.h b/isis/src/hayabusa/apps/nirs2isis/NirsImportFits.h index 27226109cc..bb05a38c31 100644 --- a/isis/src/hayabusa/apps/nirs2isis/NirsImportFits.h +++ b/isis/src/hayabusa/apps/nirs2isis/NirsImportFits.h @@ -1,26 +1,13 @@ #ifndef NirsImportFits_h #define NirsImportFits_h -/** - * @file - * $Revision: 5602 $ - * $Date: 2013-11-27 11:40:00 -0700 (Wed, 27 Nov 2013) $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include diff --git a/isis/src/hayabusa/apps/nirs2isis/main.cpp b/isis/src/hayabusa/apps/nirs2isis/main.cpp index 805dc82762..f5abbab7f7 100644 --- a/isis/src/hayabusa/apps/nirs2isis/main.cpp +++ b/isis/src/hayabusa/apps/nirs2isis/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "Cube.h" diff --git a/isis/src/hayabusa/objs/HayabusaAmicaCamera/HayabusaAmicaCamera.cpp b/isis/src/hayabusa/objs/HayabusaAmicaCamera/HayabusaAmicaCamera.cpp index ab5d34c246..ad25cfacda 100644 --- a/isis/src/hayabusa/objs/HayabusaAmicaCamera/HayabusaAmicaCamera.cpp +++ b/isis/src/hayabusa/objs/HayabusaAmicaCamera/HayabusaAmicaCamera.cpp @@ -1,22 +1,10 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "HayabusaAmicaCamera.h" @@ -71,7 +59,7 @@ namespace Isis { // Setup focal plane map CameraFocalPlaneMap *focalMap = new CameraFocalPlaneMap(this, naifIkCode()); - + // lines and samples added to the pvl in the order you // call getDouble() double bLines = Spice::getDouble("INS" + toString(naifIkCode()) + "_BORESIGHT_LINE"); @@ -91,7 +79,7 @@ namespace Isis { // line index is 1023. int actualFirstLine = 1023 - ((int) inst["LastLine"]); - //The detector line indexing is one-based. + //The detector line indexing is one-based. detMap->SetStartingDetectorLine(actualFirstLine + 1); // Handle summing @@ -113,9 +101,9 @@ namespace Isis { } - /** - * Destructor - */ + /** + * Destructor + */ HayabusaAmicaCamera::~HayabusaAmicaCamera() { } @@ -154,8 +142,8 @@ namespace Isis { * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Frame ID */ - int HayabusaAmicaCamera::CkFrameId() const { - return (-130000); + int HayabusaAmicaCamera::CkFrameId() const { + return (-130000); } @@ -165,8 +153,8 @@ namespace Isis { * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Reference ID */ - int HayabusaAmicaCamera::CkReferenceId() const { - return (1); + int HayabusaAmicaCamera::CkReferenceId() const { + return (1); } @@ -176,8 +164,8 @@ namespace Isis { * @return @b int The appropriate instrument code for the Spacecraft * Kernel Reference ID */ - int HayabusaAmicaCamera::SpkReferenceId() const { - return (1); + int HayabusaAmicaCamera::SpkReferenceId() const { + return (1); } } diff --git a/isis/src/hayabusa/objs/HayabusaAmicaCamera/HayabusaAmicaCamera.h b/isis/src/hayabusa/objs/HayabusaAmicaCamera/HayabusaAmicaCamera.h index 6c67df6a2c..33835f2795 100644 --- a/isis/src/hayabusa/objs/HayabusaAmicaCamera/HayabusaAmicaCamera.h +++ b/isis/src/hayabusa/objs/HayabusaAmicaCamera/HayabusaAmicaCamera.h @@ -1,24 +1,13 @@ #ifndef HayabusaAmicaCamera_h #define HayabusaAmicaCamera_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "FramingCamera.h" @@ -46,7 +35,7 @@ namespace Isis { * since Camera now handles this. References #2335. * @history 2016-09-14 Kelvin Rodriguez - Enforced the order in which BORESIGHT_LINE and * BORESIGHT_SAMPLE are added to the PVL. Part of porting to - * OSX 10.11 + * OSX 10.11 * @history 2017-01-03 Jeannie Backer - Renamed from AmicaCamera to HayabusaAmicaCamera. * @history 2017-01-03 Jeannie Backer - Fixed bug in constructor. When setting the detector * start line, the camera model was not taking into account the image diff --git a/isis/src/hayabusa/objs/HayabusaAmicaCamera/unitTest.cpp b/isis/src/hayabusa/objs/HayabusaAmicaCamera/unitTest.cpp index 14c551697f..5f0f9ebc2e 100644 --- a/isis/src/hayabusa/objs/HayabusaAmicaCamera/unitTest.cpp +++ b/isis/src/hayabusa/objs/HayabusaAmicaCamera/unitTest.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -90,7 +79,7 @@ void testCamera(Cube &c, double knownLat, double knownLon) { qDebug() << "SPK Target ID = " << cam->SpkTargetId(); qDebug() << "SPK Reference ID = " << cam->SpkReferenceId(); qDebug() << ""; - + // Test name methods qDebug() << "Spacecraft Name Long: " << cam->spacecraftNameLong(); qDebug() << "Spacecraft Name Short: " << cam->spacecraftNameShort(); @@ -98,7 +87,7 @@ void testCamera(Cube &c, double knownLat, double knownLon) { qDebug() << "Instrument Name Short: " << cam->instrumentNameShort(); qDebug() << ""; - // Test Shutter Open/Close + // Test Shutter Open/Close const PvlGroup &inst = c.label()->findGroup("Instrument", Pvl::Traverse); double exposureDuration = ((double) inst["ExposureDuration"])/1000; QString stime = inst["StartTime"]; @@ -171,4 +160,3 @@ void testLineSamp(Camera *cam, double sample, double line) { qDebug() << ""; } } - diff --git a/isis/src/hayabusa/objs/HayabusaNirsCamera/HayabusaNirsCamera.cpp b/isis/src/hayabusa/objs/HayabusaNirsCamera/HayabusaNirsCamera.cpp index 643f90f57d..aff2b188c2 100644 --- a/isis/src/hayabusa/objs/HayabusaNirsCamera/HayabusaNirsCamera.cpp +++ b/isis/src/hayabusa/objs/HayabusaNirsCamera/HayabusaNirsCamera.cpp @@ -1,22 +1,10 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "HayabusaNirsCamera.h" @@ -69,7 +57,7 @@ namespace Isis { // Setup focal plane map CameraFocalPlaneMap *focalMap = new CameraFocalPlaneMap(this, naifIkCode()); - + // lines and samples added to the pvl in the order you // call getDouble() double bLines = Spice::getDouble("INS" + toString(naifIkCode()) + "_BORESIGHT_LINE"); @@ -99,7 +87,7 @@ namespace Isis { * Destroys a HayabusaNirsCamera object */ HayabusaNirsCamera::~HayabusaNirsCamera() { - + } @@ -133,12 +121,12 @@ namespace Isis { /** * @brief Returns the pixel ifov offsets from center of pixel. - * + * * Returns the pixel ifov offset from the center of pixel for 8 points along * each edge of the fov. The Camera implementation only uses the four * corners. Because the FOV of each pixel is so large, this uses 8 points on * each edge for a total of 28 points. - * + * * @return @b QList A list of offset values to add to the look vector. */ QList HayabusaNirsCamera::PixelIfovOffsets() { diff --git a/isis/src/hayabusa/objs/HayabusaNirsCamera/HayabusaNirsCamera.h b/isis/src/hayabusa/objs/HayabusaNirsCamera/HayabusaNirsCamera.h index 2ccaf6cbb3..d774de8482 100644 --- a/isis/src/hayabusa/objs/HayabusaNirsCamera/HayabusaNirsCamera.h +++ b/isis/src/hayabusa/objs/HayabusaNirsCamera/HayabusaNirsCamera.h @@ -1,24 +1,13 @@ #ifndef HayabusaNirsCamera_h #define HayabusaNirsCamera_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "FramingCamera.h" diff --git a/isis/src/hayabusa/objs/HayabusaNirsCamera/NirsDetectorMap.cpp b/isis/src/hayabusa/objs/HayabusaNirsCamera/NirsDetectorMap.cpp index a3f791fa4f..404ead142e 100644 --- a/isis/src/hayabusa/objs/HayabusaNirsCamera/NirsDetectorMap.cpp +++ b/isis/src/hayabusa/objs/HayabusaNirsCamera/NirsDetectorMap.cpp @@ -1,32 +1,18 @@ -/** - * @file - * $Revision: 1.2 $ - * $Date: 2009/04/08 02:32:55 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "NirsDetectorMap.h" namespace Isis { /** * Constructs a NirsDetectorMap object. - * + * * @param exposureDuration The time for the observations. * @param parent The parent camera that uses the detector map. */ @@ -40,13 +26,13 @@ namespace Isis { * Destroys a NirsDetectorMap object. */ NirsDetectorMap::~NirsDetectorMap() { - + } /** * Sets the exposure duration - * + * * @param exposureDuration The time for the observations. */ void NirsDetectorMap::setExposureDuration(double exposureDuration) { @@ -56,11 +42,11 @@ namespace Isis { /** * Returns the exposure duration for a given pixel. - * + * * @param sample The sample location of the pixel. * @param line The line location of the pixel. * @param band The band location of the pixel. - * + * * @return @b double The exposure duration for the pixel in seconds. */ double NirsDetectorMap::exposureDuration(const double sample, @@ -68,4 +54,4 @@ namespace Isis { const int band) const { return m_exposureDuration; } -} \ No newline at end of file +} diff --git a/isis/src/hayabusa/objs/HayabusaNirsCamera/NirsDetectorMap.h b/isis/src/hayabusa/objs/HayabusaNirsCamera/NirsDetectorMap.h index ed2aef2149..970678acb4 100644 --- a/isis/src/hayabusa/objs/HayabusaNirsCamera/NirsDetectorMap.h +++ b/isis/src/hayabusa/objs/HayabusaNirsCamera/NirsDetectorMap.h @@ -1,31 +1,20 @@ #ifndef NirsDetectorMap_h #define NirsDetectorMap_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "CameraDetectorMap.h" namespace Isis { /** * @brief The detector map class for the Hayabusa NIRS camera. - * + * * The detector map class to allow for exposure duration storage and retrieval * in the Hayabusa NIRS camera. * @@ -52,4 +41,4 @@ namespace Isis { double m_exposureDuration; //!< The total time for the observation }; }; -#endif \ No newline at end of file +#endif diff --git a/isis/src/hayabusa/objs/HayabusaNirsCamera/unitTest.cpp b/isis/src/hayabusa/objs/HayabusaNirsCamera/unitTest.cpp index b894483e57..d2d08f77be 100644 --- a/isis/src/hayabusa/objs/HayabusaNirsCamera/unitTest.cpp +++ b/isis/src/hayabusa/objs/HayabusaNirsCamera/unitTest.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -58,7 +47,7 @@ int main(void) { cout << "CK Reference ID = " << cam->CkReferenceId() << endl; cout << "SPK Target ID = " << cam->SpkTargetId() << endl; cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl; - + // Test name methods cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl; cout << "Spacecraft Name Short: " << cam->spacecraftNameShort() << endl; @@ -128,4 +117,3 @@ void TestLineSamp(Camera *cam, double samp, double line) { cout << "DeltaLine = ERROR" << endl << endl; } } - diff --git a/isis/src/hayabusa2/apps/hyb2onc2isis/main.cpp b/isis/src/hayabusa2/apps/hyb2onc2isis/main.cpp index 85ca026ae0..209c1fca70 100644 --- a/isis/src/hayabusa2/apps/hyb2onc2isis/main.cpp +++ b/isis/src/hayabusa2/apps/hyb2onc2isis/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include diff --git a/isis/src/hayabusa2/apps/hyb2onccal/main.cpp b/isis/src/hayabusa2/apps/hyb2onccal/main.cpp index a46b7356aa..1fe9c9a901 100644 --- a/isis/src/hayabusa2/apps/hyb2onccal/main.cpp +++ b/isis/src/hayabusa2/apps/hyb2onccal/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + // $Id: hyb2onccal.cpp 6045 2015-02-07 02:06:59Z moses@GS.DOI.NET $ #include "Isis.h" diff --git a/isis/src/hayabusa2/objs/Hyb2OncCamera/Hyb2OncCamera.cpp b/isis/src/hayabusa2/objs/Hyb2OncCamera/Hyb2OncCamera.cpp index 52b5570610..e390a89d18 100644 --- a/isis/src/hayabusa2/objs/Hyb2OncCamera/Hyb2OncCamera.cpp +++ b/isis/src/hayabusa2/objs/Hyb2OncCamera/Hyb2OncCamera.cpp @@ -1,22 +1,10 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "Hyb2OncCamera.h" @@ -86,14 +74,14 @@ namespace Isis { // Setup focal plane map CameraFocalPlaneMap *focalMap = new CameraFocalPlaneMap(this, naifIkCode()); - - // BORESIGHT SAMPLE AND LINE still need to be added to the IAK + + // BORESIGHT SAMPLE AND LINE still need to be added to the IAK double bLines = Spice::getDouble("INS" + toString(naifIkCode()) + "_BORESIGHT_LINE"); double bSamples = Spice::getDouble("INS" + toString(naifIkCode()) + "_BORESIGHT_SAMPLE"); focalMap->SetDetectorOrigin(bSamples, bLines); - - // Setup detector map (use default for now) + + // Setup detector map (use default for now) CameraDetectorMap *detMap = new CameraDetectorMap(this); // Handle summing @@ -101,7 +89,7 @@ namespace Isis { detMap->SetDetectorLineSumming(binning); detMap->SetDetectorSampleSumming(binning); - // Setup distortion map (use default for now) + // Setup distortion map (use default for now) CameraDistortionMap *distortionMap = new Hyb2OncDistortionMap(this); distortionMap->SetDistortion(naifIkCode()); @@ -115,9 +103,9 @@ namespace Isis { } - /** - * Default Destructor - */ + /** + * Default Destructor + */ Hyb2OncCamera::~Hyb2OncCamera() { } @@ -152,8 +140,8 @@ namespace Isis { * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Frame ID */ - int Hyb2OncCamera::CkFrameId() const { - return (-37000); + int Hyb2OncCamera::CkFrameId() const { + return (-37000); } @@ -163,8 +151,8 @@ namespace Isis { * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Reference ID */ - int Hyb2OncCamera::CkReferenceId() const { - return (1); + int Hyb2OncCamera::CkReferenceId() const { + return (1); } @@ -174,8 +162,8 @@ namespace Isis { * @return @b int The appropriate instrument code for the Spacecraft * Kernel Reference ID */ - int Hyb2OncCamera::SpkReferenceId() const { - return (1); + int Hyb2OncCamera::SpkReferenceId() const { + return (1); } } diff --git a/isis/src/hayabusa2/objs/Hyb2OncCamera/Hyb2OncCamera.h b/isis/src/hayabusa2/objs/Hyb2OncCamera/Hyb2OncCamera.h index 610b0d544d..dc74f2a33e 100644 --- a/isis/src/hayabusa2/objs/Hyb2OncCamera/Hyb2OncCamera.h +++ b/isis/src/hayabusa2/objs/Hyb2OncCamera/Hyb2OncCamera.h @@ -1,25 +1,13 @@ #ifndef Hyb2OncCamera_h #define Hyb2OncCamera_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "FramingCamera.h" @@ -34,7 +22,7 @@ namespace Isis { * * @internal * @history 2017-07-07 Kristin Berry - Original version - * + * */ class Hyb2OncCamera : public FramingCamera { public: diff --git a/isis/src/hayabusa2/objs/Hyb2OncCamera/Hyb2OncDistortionMap.cpp b/isis/src/hayabusa2/objs/Hyb2OncCamera/Hyb2OncDistortionMap.cpp index 820a31f167..5633624c27 100644 --- a/isis/src/hayabusa2/objs/Hyb2OncCamera/Hyb2OncDistortionMap.cpp +++ b/isis/src/hayabusa2/objs/Hyb2OncCamera/Hyb2OncDistortionMap.cpp @@ -1,25 +1,10 @@ -/** - * @file - * $Revision: 1.4 $ - * $Date: 2008/02/21 16:04:33 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include @@ -28,21 +13,21 @@ #include "Hyb2OncDistortionMap.h" namespace Isis { - /** + /** * Hayabusa 2 ONC Camera distortion map constructor * * Create a camera distortion map for Hayabusa 2's ONC-T, ONC-W1, and - * ONC-W2. This class maps between distorted and undistorted - * focal plane x/y's. The default mapping is the identity, that is, - * the focal plane x/y and undistorted focal plane x/y will be - * identical. + * ONC-W2. This class maps between distorted and undistorted + * focal plane x/y's. The default mapping is the identity, that is, + * the focal plane x/y and undistorted focal plane x/y will be + * identical. * * @param parent the parent camera that will use this distortion map * @param zDirection the direction of the focal plane Z-axis * (either 1 or -1) * */ - Hyb2OncDistortionMap::Hyb2OncDistortionMap(Camera *parent, double zDirection) + Hyb2OncDistortionMap::Hyb2OncDistortionMap(Camera *parent, double zDirection) : CameraDistortionMap(parent, zDirection) { } @@ -54,7 +39,7 @@ namespace Isis { } - /** + /** * Compute undistorted focal plane x/y * * Compute undistorted focal plane x/y given a distorted focal plane x/y. @@ -101,7 +86,7 @@ namespace Isis { } - /** + /** * Compute distorted focal plane x/y * * Compute distorted focal plane x/y given an undistorted focal plane x/y. @@ -140,14 +125,14 @@ namespace Isis { return true; } double rPrevious = r; - + while (!converged && qAbs(r - rPrevious) > tolMilliMeters) { double r2 = r*r; double r4 = r2*r2; double dr = p_odk[0] + p_odk[1] * r2 + p_odk[2] * r4; rPrevious = r; - x = dr * x; - y = dr * y; + x = dr * x; + y = dr * y; r = x*x + y*y; iteration++; @@ -165,4 +150,3 @@ namespace Isis { } } - diff --git a/isis/src/hayabusa2/objs/Hyb2OncCamera/Hyb2OncDistortionMap.h b/isis/src/hayabusa2/objs/Hyb2OncCamera/Hyb2OncDistortionMap.h index 5f46598dee..1be581dcdc 100644 --- a/isis/src/hayabusa2/objs/Hyb2OncCamera/Hyb2OncDistortionMap.h +++ b/isis/src/hayabusa2/objs/Hyb2OncCamera/Hyb2OncDistortionMap.h @@ -1,28 +1,14 @@ -/** - * @file - * $Revision: 1.3 $ - * $Date: 2008/02/21 16:04:33 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ #ifndef Hyb2OncDistortionMap_h #define Hyb2OncDistortionMap_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "CameraDistortionMap.h" namespace Isis { diff --git a/isis/src/hayabusa2/objs/Hyb2OncCamera/unitTest.cpp b/isis/src/hayabusa2/objs/Hyb2OncCamera/unitTest.cpp index cf7f1dac45..f167ec883b 100644 --- a/isis/src/hayabusa2/objs/Hyb2OncCamera/unitTest.cpp +++ b/isis/src/hayabusa2/objs/Hyb2OncCamera/unitTest.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -98,7 +87,7 @@ void testCamera(Cube &c, double knownLat, double knownLon) { qDebug() << "SPK Target ID = " << cam->SpkTargetId(); qDebug() << "SPK Reference ID = " << cam->SpkReferenceId(); qDebug() << ""; - + // Test name methods qDebug() << "Spacecraft Name Long: " << cam->spacecraftNameLong(); qDebug() << "Spacecraft Name Short: " << cam->spacecraftNameShort(); @@ -106,7 +95,7 @@ void testCamera(Cube &c, double knownLat, double knownLon) { qDebug() << "Instrument Name Short: " << cam->instrumentNameShort(); qDebug() << ""; - // Test Shutter Open/Close + // Test Shutter Open/Close const PvlGroup &inst = c.label()->findGroup("Instrument", Pvl::Traverse); double exposureDuration = ((double) inst["ExposureDuration"])/1000; QString stime = inst["StartTime"]; @@ -176,4 +165,3 @@ void testLineSamp(Camera *cam, double sample, double line) { qDebug() << ""; } } - diff --git a/isis/src/juno/apps/junocam2isis/main.cpp b/isis/src/juno/apps/junocam2isis/main.cpp index 9dee039103..566784d5b0 100644 --- a/isis/src/juno/apps/junocam2isis/main.cpp +++ b/isis/src/juno/apps/junocam2isis/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include diff --git a/isis/src/juno/objs/JunoCamera/JunoCamera.cpp b/isis/src/juno/objs/JunoCamera/JunoCamera.cpp index f7c098c864..7e70f33054 100644 --- a/isis/src/juno/objs/JunoCamera/JunoCamera.cpp +++ b/isis/src/juno/objs/JunoCamera/JunoCamera.cpp @@ -1,24 +1,11 @@ -/** - * @file - * $Revision:$ - * $Date:$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "JunoCamera.h" #include diff --git a/isis/src/juno/objs/JunoCamera/JunoCamera.h b/isis/src/juno/objs/JunoCamera/JunoCamera.h index a61108f25c..45affce37e 100644 --- a/isis/src/juno/objs/JunoCamera/JunoCamera.h +++ b/isis/src/juno/objs/JunoCamera/JunoCamera.h @@ -1,26 +1,14 @@ #ifndef JunoCamera_h #define JunoCamera_h -/** - * @file - * $Revision: $ - * $Date: $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "FramingCamera.h" #include diff --git a/isis/src/juno/objs/JunoCamera/JunoDistortionMap.cpp b/isis/src/juno/objs/JunoCamera/JunoDistortionMap.cpp index afd2eb09e4..bbefd8d4ca 100644 --- a/isis/src/juno/objs/JunoCamera/JunoDistortionMap.cpp +++ b/isis/src/juno/objs/JunoCamera/JunoDistortionMap.cpp @@ -1,42 +1,28 @@ -/** - * @file - * $Revision: 1.4 $ - * $Date: 2008/02/21 16:04:33 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IString.h" #include "JunoDistortionMap.h" namespace Isis { - /** - * Juno JunoCam distortion map constructor - * + /** + * Juno JunoCam distortion map constructor + * * Create a distortion map for Juno's JunoCam camera. This class maps between distorted * and undistorted focal plane x/y's. The default mapping is the * identity, that is, the focal plane x/y and undistorted focal plane - * x/y will be identical. The Z direction is set internally to positive for - * JunoCam. + * x/y will be identical. The Z direction is set internally to positive for + * JunoCam. * * @param parent the parent camera that will use this distortion map - * + * */ - JunoDistortionMap::JunoDistortionMap(Camera *parent) + JunoDistortionMap::JunoDistortionMap(Camera *parent) : CameraDistortionMap(parent, 1.0) { } @@ -44,28 +30,28 @@ namespace Isis { /** * Destructor */ - JunoDistortionMap::~JunoDistortionMap() { + JunoDistortionMap::~JunoDistortionMap() { } - /** - * Load distortion coefficients for JunoCam + /** + * Load distortion coefficients for JunoCam * * This method loads the distortion coefficients from the instrument * kernel. JunoCam's coefficients in the NAIF instrument kernel are * expected to be in the form of: * * @code - * INS-61500_DISTORTION_K0 = coefficient, index 0 - * INS-61500_DISTORTION_K1 = coefficient, index 1 - * INS-61500_DISTORTION_K2 = coefficient, index 2 + * INS-61500_DISTORTION_K0 = coefficient, index 0 + * INS-61500_DISTORTION_K1 = coefficient, index 1 + * INS-61500_DISTORTION_K2 = coefficient, index 2 * @endcode * * These coefficients are designed for use with pixel coordinates, so they * are scaled based on the pixel pitch to operate in focal plane millimeters. * These coefficient will be used to convert from undistorted focal plane x,y * to distorted focal plane x,y as follows - * + * * @code * r2 = r2 = (ux * ux) + (uy * uy); * dr = 1 + INS-61500_DISTORTION_K0 + INS-61500_DISTORTION_K1*r2 +INS-61500_DISTORTION_K2*r2*r2; @@ -102,7 +88,7 @@ namespace Isis { } - /** + /** * Compute distorted focal plane x/y * * Compute distorted focal plane x/y given an undistorted focal plane x/y. @@ -117,7 +103,7 @@ namespace Isis { * @param uy undistorted focal plane y in millimeters * * @return @b if the conversion was successful - * + * * @see SetDistortion */ bool JunoDistortionMap::SetUndistortedFocalPlane(const double ux, @@ -127,7 +113,7 @@ namespace Isis { p_undistortedFocalPlaneY = uy; // Compute the distance from the focal plane center and if we are - // close to the center then assume no distortion + // close to the center then assume no distortion double r2 = (ux * ux) + (uy * uy); if (r2 <= 1.0E-6) { p_focalPlaneX = ux; @@ -146,7 +132,7 @@ namespace Isis { } - /** + /** * Compute undistorted focal plane x/y * * Compute undistorted focal plane x/y given a distorted focal plane x/y. @@ -163,7 +149,7 @@ namespace Isis { * @see SetDistortion * @todo Generalize polynomial equation */ - bool JunoDistortionMap::SetFocalPlane(double dx, + bool JunoDistortionMap::SetFocalPlane(double dx, double dy) { p_focalPlaneX = dx; p_focalPlaneY = dy; @@ -192,7 +178,7 @@ namespace Isis { dr = p_odk[0] + p_odk[1]*r2 + p_odk[2]*r2*r2; xDistortion = uxEstimate * dr; yDistortion = uyEstimate * dr; - uxEstimate = dx - xDistortion; + uxEstimate = dx - xDistortion; uyEstimate = dy - yDistortion; i++; if (fabs(uxEstimate - uxPrev) < tolerance && diff --git a/isis/src/juno/objs/JunoCamera/JunoDistortionMap.h b/isis/src/juno/objs/JunoCamera/JunoDistortionMap.h index 3c27a96feb..a14bfec4ac 100644 --- a/isis/src/juno/objs/JunoCamera/JunoDistortionMap.h +++ b/isis/src/juno/objs/JunoCamera/JunoDistortionMap.h @@ -1,33 +1,19 @@ -/** - * @file - * $Revision: 1.3 $ - * $Date: 2008/02/21 16:04:33 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ #ifndef JunoDistortionMap_h #define JunoDistortionMap_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include "CameraDistortionMap.h" namespace Isis { - /** Distort/undistort focal plane coordinates for Juno's JunoCam camera. + /** Distort/undistort focal plane coordinates for Juno's JunoCam camera. * * Creates a map for adding/removing optical distortions * from the focal plane of a camera. @@ -38,8 +24,8 @@ namespace Isis { * * @author 2017-08-04 Jeannie Backer and Kristin Berry * - * @internal - * @history 2017-08-04 Jeannie Backer and Kristin Berry - Original version. + * @internal + * @history 2017-08-04 Jeannie Backer and Kristin Berry - Original version. * */ class JunoDistortionMap : public CameraDistortionMap { diff --git a/isis/src/juno/objs/JunoCamera/unitTest.cpp b/isis/src/juno/objs/JunoCamera/unitTest.cpp index f1c6bcf886..ca93b9227d 100644 --- a/isis/src/juno/objs/JunoCamera/unitTest.cpp +++ b/isis/src/juno/objs/JunoCamera/unitTest.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -39,7 +28,7 @@ void TestSampLine(Camera *cam, double samp, double line); /** * Unit test for Juno's JunoCam instrument. - * + * * @author 2017-09-11 Jesse Mapel * @internal * @history 2017-09-11 Jesse Mapel - Original version. @@ -70,7 +59,7 @@ int main(void) { qDebug() << "SPK Reference ID = " << cam->SpkReferenceId(); qDebug() << ""; - // Test Shutter Open/Close + // Test Shutter Open/Close const PvlGroup &inst = c.label()->findGroup("Instrument", Pvl::Traverse); double exposureDuration = toDouble( inst["ExposureDuration"][0] ); QString stime = inst["StartTime"]; @@ -108,7 +97,7 @@ int main(void) { qDebug() << "Latitude OK"; } else { - qDebug() << qSetRealNumberPrecision(18) + qDebug() << qSetRealNumberPrecision(18) << "Latitude off by: " << cam->UniversalLatitude() - knownLat; } @@ -116,7 +105,7 @@ int main(void) { qDebug() << "Longitude OK"; } else { - qDebug() << qSetRealNumberPrecision(18) + qDebug() << qSetRealNumberPrecision(18) << "Longitude off by: " << cam->UniversalLongitude() - knownLon; } } @@ -147,4 +136,3 @@ void TestSampLine(Camera *cam, double samp, double line) { qDebug() << ""; } } - diff --git a/isis/src/kaguya/apps/kaguyami2isis/kaguyami2isis.cpp b/isis/src/kaguya/apps/kaguyami2isis/kaguyami2isis.cpp index 9d4d60c0c9..7fa954fbad 100644 --- a/isis/src/kaguya/apps/kaguyami2isis/kaguyami2isis.cpp +++ b/isis/src/kaguya/apps/kaguyami2isis/kaguyami2isis.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "kaguyami2isis.h" #include diff --git a/isis/src/kaguya/apps/kaguyami2isis/kaguyami2isis.h b/isis/src/kaguya/apps/kaguyami2isis/kaguyami2isis.h index 6dcd366e92..e65a9248ec 100644 --- a/isis/src/kaguya/apps/kaguyami2isis/kaguyami2isis.h +++ b/isis/src/kaguya/apps/kaguyami2isis/kaguyami2isis.h @@ -1,6 +1,14 @@ #ifndef kaguyami2isis_h #define kaguyami2isis_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "UserInterface.h" namespace Isis { diff --git a/isis/src/kaguya/apps/kaguyami2isis/main.cpp b/isis/src/kaguya/apps/kaguyami2isis/main.cpp index 0f2d424ad4..88793ae9dd 100644 --- a/isis/src/kaguya/apps/kaguyami2isis/main.cpp +++ b/isis/src/kaguya/apps/kaguyami2isis/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "kaguyami2isis.h" diff --git a/isis/src/kaguya/apps/kaguyasp2ascii/main.cpp b/isis/src/kaguya/apps/kaguyasp2ascii/main.cpp index edbbe6897a..7fa27fab97 100644 --- a/isis/src/kaguya/apps/kaguyasp2ascii/main.cpp +++ b/isis/src/kaguya/apps/kaguyasp2ascii/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include @@ -32,7 +40,7 @@ void IsisMain() { if (minobs < 1) { minobs = 1; } - } + } if (ui.WasEntered("MAXOBS")) { QString keyval = ui.GetString("MAXOBS"); maxobs = toInt(keyval); @@ -91,7 +99,7 @@ void IsisMain() { } obuf; if (!lab.hasObject("SP_SPECTRUM_WAV") || !lab.hasObject("SP_SPECTRUM_QA") || - !lab.hasObject("SP_SPECTRUM_RAD") || !(lab.hasObject("SP_SPECTRUM_REF") || + !lab.hasObject("SP_SPECTRUM_RAD") || !(lab.hasObject("SP_SPECTRUM_REF") || (lab.hasObject("SP_SPECTRUM_REF1") && lab.hasObject("SP_SPECTRUM_REF2")))) { QString msg = "Input file [" + inFile.expanded() + "] is not a valid "; msg += "Kaguya Spectral Profiler file"; @@ -252,13 +260,13 @@ void IsisMain() { } PvlObject refobj; - PvlObject refobj2; + PvlObject refobj2; if (lab.hasKeyword("^SP_SPECTRUM_REF")) { refobj = lab.findObject("SP_SPECTRUM_REF"); - } + } else { - refobj = lab.findObject("SP_SPECTRUM_REF1"); - refobj2 = lab.findObject("SP_SPECTRUM_REF2"); + refobj = lab.findObject("SP_SPECTRUM_REF1"); + refobj2 = lab.findObject("SP_SPECTRUM_REF2"); } int reflines = toInt(refobj.findKeyword("LINES")[0]); @@ -298,11 +306,11 @@ void IsisMain() { ref[j+i*296] = (float)obuf.iword * refscale + refoffset; } } - + //import reflectance 2 if it exists - double *ref2 = NULL; + double *ref2 = NULL; if (lab.hasKeyword("^SP_SPECTRUM_REF2")) { - int reflines2 = toInt(refobj2.findKeyword("LINES")[0]); + int reflines2 = toInt(refobj2.findKeyword("LINES")[0]); int refsamps2 = toInt(refobj2.findKeyword("LINE_SAMPLES")[0]); QString reftype2 = refobj2.findKeyword("SAMPLE_TYPE"); int refbits2 = toInt(refobj2.findKeyword("SAMPLE_BITS")[0]); @@ -357,33 +365,33 @@ void IsisMain() { os << "Wavelength"; //If we have a newer-format file with two Reflectances, output both - if (ref2 != NULL) { + if (ref2 != NULL) { for (int i=minobs; i<=maxobs; i++) { - os << "\t" << "Raw" << i << "\t"<< "Rad" << i << "\t" <<"Ref1_" << i << "\t" << "Ref2_" << i + os << "\t" << "Raw" << i << "\t"<< "Rad" << i << "\t" <<"Ref1_" << i << "\t" << "Ref2_" << i << "\t" << "QA" << i; } - os << endl; + os << endl; for (int j = 0; j < 296; j++) { os << wavelength[j]; for (int i=minobs-1; i) qa[j+i*296]; } os << endl; } - delete ref2; - } + delete ref2; + } else { for (int i=minobs; i<=maxobs; i++) { os << "\t" << "Raw" << i << "\t" << "Rad" << i << "\t" << "Ref" << i << "\t" << "QA" << i; } - os << endl; + os << endl; for (int j = 0; j < 296; j++) { os << wavelength[j]; for (int i=minobs-1; i) qa[j+i*296]; } os << endl; diff --git a/isis/src/kaguya/apps/kaguyasp2isis/main.cpp b/isis/src/kaguya/apps/kaguyasp2isis/main.cpp index b5bcd4fb8a..1db52986fa 100644 --- a/isis/src/kaguya/apps/kaguyasp2isis/main.cpp +++ b/isis/src/kaguya/apps/kaguyasp2isis/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include @@ -32,7 +40,7 @@ void IsisMain() { if (minobs < 1) { minobs = 1; } - } + } if (ui.WasEntered("MAXOBS")) { QString keyval = ui.GetString("MAXOBS"); maxobs = toInt(keyval); diff --git a/isis/src/kaguya/apps/kaguyatc2isis/kaguyatc2isis.cpp b/isis/src/kaguya/apps/kaguyatc2isis/kaguyatc2isis.cpp index 3d3cc89b4d..66a979cfe1 100644 --- a/isis/src/kaguya/apps/kaguyatc2isis/kaguyatc2isis.cpp +++ b/isis/src/kaguya/apps/kaguyatc2isis/kaguyatc2isis.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "kaguyatc2isis.h" #include diff --git a/isis/src/kaguya/apps/kaguyatc2isis/kaguyatc2isis.h b/isis/src/kaguya/apps/kaguyatc2isis/kaguyatc2isis.h index 9c2db22777..07664c63e4 100644 --- a/isis/src/kaguya/apps/kaguyatc2isis/kaguyatc2isis.h +++ b/isis/src/kaguya/apps/kaguyatc2isis/kaguyatc2isis.h @@ -1,6 +1,14 @@ #ifndef kaguyatc2isis_h #define kaguyatc2isis_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "UserInterface.h" #include "Pvl.h" diff --git a/isis/src/kaguya/apps/kaguyatc2isis/main.cpp b/isis/src/kaguya/apps/kaguyatc2isis/main.cpp index c92d257f8f..0e318628bf 100644 --- a/isis/src/kaguya/apps/kaguyatc2isis/main.cpp +++ b/isis/src/kaguya/apps/kaguyatc2isis/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "kaguyatc2isis.h" diff --git a/isis/src/kaguya/apps/mimap2isis/main.cpp b/isis/src/kaguya/apps/mimap2isis/main.cpp index 77e9b28c3f..132056e039 100644 --- a/isis/src/kaguya/apps/mimap2isis/main.cpp +++ b/isis/src/kaguya/apps/mimap2isis/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "mimap2isis.h" @@ -20,7 +28,7 @@ void IsisMain() { } throw; } - + for (auto grpIt = appLog.beginGroup(); grpIt!= appLog.endGroup(); grpIt++) { Application::Log(*grpIt); } diff --git a/isis/src/kaguya/apps/mimap2isis/mimap2isis.cpp b/isis/src/kaguya/apps/mimap2isis/mimap2isis.cpp index 3099466927..eb74693495 100644 --- a/isis/src/kaguya/apps/mimap2isis/mimap2isis.cpp +++ b/isis/src/kaguya/apps/mimap2isis/mimap2isis.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "mimap2isis.h" #include "FileName.h" @@ -111,4 +119,3 @@ namespace Isis { return; } } - \ No newline at end of file diff --git a/isis/src/kaguya/apps/mimap2isis/mimap2isis.h b/isis/src/kaguya/apps/mimap2isis/mimap2isis.h index 6f498da1ff..54fe0df1ae 100644 --- a/isis/src/kaguya/apps/mimap2isis/mimap2isis.h +++ b/isis/src/kaguya/apps/mimap2isis/mimap2isis.h @@ -1,6 +1,14 @@ #ifndef mimap2isis_h #define mimap2isis_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Pvl.h" #include "UserInterface.h" diff --git a/isis/src/kaguya/objs/KaguyaMiCamera/KaguyaMiCamera.cpp b/isis/src/kaguya/objs/KaguyaMiCamera/KaguyaMiCamera.cpp index 62a3849d7c..de4ba37cf9 100644 --- a/isis/src/kaguya/objs/KaguyaMiCamera/KaguyaMiCamera.cpp +++ b/isis/src/kaguya/objs/KaguyaMiCamera/KaguyaMiCamera.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "KaguyaMiCamera.h" #include @@ -40,7 +29,7 @@ namespace Isis { * * @param lab Pvl Label to create the camera model from * - * @internal + * @internal * @history 2012-06-14 Orrin Thomas - original version */ KaguyaMiCamera::KaguyaMiCamera(Cube &cube) : LineScanCamera(cube) { @@ -65,7 +54,7 @@ namespace Isis { msg += " is not a supported instrument kernel code for Kaguya."; throw IException(IException::Programmer, msg, _FILEINFO_); } - + NaifStatus::CheckErrors(); // Set up the camera info from ik/iak kernels @@ -73,7 +62,7 @@ namespace Isis { //Kaguya IK kernal uses INS-131???_PIXEL_SIZE instead of PIXEL_PITCH QString ikernKey = "INS" + toString(naifIkCode()) + "_PIXEL_SIZE"; SetPixelPitch(getDouble(ikernKey)); - + // Get the start time from labels Pvl &lab = *cube.label(); diff --git a/isis/src/kaguya/objs/KaguyaMiCamera/KaguyaMiCamera.h b/isis/src/kaguya/objs/KaguyaMiCamera/KaguyaMiCamera.h index 2de86700e4..e2399e5e9c 100644 --- a/isis/src/kaguya/objs/KaguyaMiCamera/KaguyaMiCamera.h +++ b/isis/src/kaguya/objs/KaguyaMiCamera/KaguyaMiCamera.h @@ -1,24 +1,13 @@ #ifndef KaguyaMiCamera_h #define KaguyaMiCamera_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "LineScanCamera.h" @@ -35,15 +24,15 @@ namespace Isis { * * @internal * @history 2012-06-14 Orrin Thomas - original version - * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis + * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis * coding standards. References #972. * @history 2015-08-12 Ian Humphrey and Makayla Shepherd - Added new data members and methods * to get spacecraft and instrument names. Extended unit test to test * these methods. * @history 2015-10-01 Ian Humphrey and Makayla Shepherd - Updated check for determining - * instrument names to check all valid MI camera naif codes. + * instrument names to check all valid MI camera naif codes. * References #2335. - * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument + * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument * members and methods and removed implementation of these methods * since Camera now handles this. References #2335. */ @@ -56,24 +45,24 @@ namespace Isis { /** * CK frame ID - - Instrument Code from spacit run on CK - * - * @return @b int The appropriate instrument code for the "Camera-matrix" + * + * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Frame ID */ virtual int CkFrameId() const { return (-131000); } - /** + /** * CK Reference ID - J2000 - * + * * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Reference ID */ virtual int CkReferenceId() const { return (1); } - /** + /** * SPK Reference ID - J2000 - * - * @return @b int The appropriate instrument code for the Spacecraft + * + * @return @b int The appropriate instrument code for the Spacecraft * Kernel Reference ID */ virtual int SpkReferenceId() const { return (1); } diff --git a/isis/src/kaguya/objs/KaguyaMiCamera/KaguyaMiCameraDistortionMap.cpp b/isis/src/kaguya/objs/KaguyaMiCamera/KaguyaMiCameraDistortionMap.cpp index 1ddfc019cd..36e62e6583 100644 --- a/isis/src/kaguya/objs/KaguyaMiCamera/KaguyaMiCameraDistortionMap.cpp +++ b/isis/src/kaguya/objs/KaguyaMiCamera/KaguyaMiCameraDistortionMap.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -45,13 +34,13 @@ namespace Isis { } /** - * @param naifIkCode + * @param naifIkCode */ void KaguyaMiCameraDistortionMap::SetDistortion(const int naifIkCode) { //determine if this is the VIS or the NIR sensor, by loooking at the pixel pitch if (p_camera->PixelPitch() == 0.013) m_numDistCoef = 3; //VIS camera has 3 distortion coefs else m_numDistCoef = 4; //NIR camera has 4 distortion coefs - + //read the distortion coefs from the NAIF Kernels QString naifXKey = "INS" + toString(naifIkCode) + "_DISTORTION_COEF_X"; QString naifYKey = "INS" + toString(naifIkCode) + "_DISTORTION_COEF_Y"; @@ -80,7 +69,7 @@ namespace Isis { p_focalPlaneX = dx; p_focalPlaneY = dy; //cout << "focal plane: " << dx << " " << dy << "\n"; - //NOTE: the IK/FK kernel does not include the " + dx" as I do below. They also define the + //NOTE: the IK/FK kernel does not include the " + dx" as I do below. They also define the // radial distance only in terms of Y. Erroneously (I believe) they use only the // DISTORTION_COEF_X's in their model definition. Finally, they provide different distortion // coefficients for each line of the CCD--despite them going throught the same optical path. @@ -93,9 +82,9 @@ namespace Isis { // small adjustmenst being provided by the distortion model are only relevant as the offsets (x) // approach zero. if (m_numDistCoef == 3) { //VIS camera - p_undistortedFocalPlaneX = + p_undistortedFocalPlaneX = m_boreX + m_distCoefX[0] + dy*(m_distCoefX[1] + dy*m_distCoefX[2]) + dx; - p_undistortedFocalPlaneY = + p_undistortedFocalPlaneY = m_boreY + m_distCoefY[0] + dy*(m_distCoefY[1] + dy*m_distCoefY[2]) + dy; } else { //NIR camera @@ -128,7 +117,7 @@ namespace Isis { if (m_numDistCoef == 3) { //quadratic distortion model //use the quadratic equation to find the distorted Y value double A,B,C; //coefficients of the quadric equation - + A = m_distCoefY[2]; B = 1.0 + m_distCoefY[1]; C = m_distCoefY[0] +m_boreY - uy; @@ -142,7 +131,7 @@ namespace Isis { p_focalPlaneY = fabs(uy - roots[0]) < fabs(uy - roots[1]) ? roots[0] : roots[1]; //now that we know the distortedY we can directly calculate the X - p_focalPlaneX = ux - + p_focalPlaneX = ux - (m_boreX + m_distCoefX[0] + p_focalPlaneY*(m_distCoefX[1] + p_focalPlaneY*m_distCoefX[2])); return true; @@ -168,17 +157,17 @@ namespace Isis { delta << fabs(roots[i]-uy); if ( roots.size() == 3) //three roots to choose among - p_focalPlaneY = delta[0] < delta[1] ? - (delta[0] < delta[2] ? roots[0]:roots[2]) : + p_focalPlaneY = delta[0] < delta[1] ? + (delta[0] < delta[2] ? roots[0]:roots[2]) : (delta[1] < delta[2] ? roots[1]:roots[2]) ; else //two roots to choose between p_focalPlaneY = delta[0] < delta[1] ? roots[0]:roots[1] ; } - + //now that we know the distortedY we can directly calculate the X - p_focalPlaneX = ux - (m_boreX +m_distCoefX[0] + - p_focalPlaneY*(m_distCoefX[1] + - p_focalPlaneY*(m_distCoefX[2] + + p_focalPlaneX = ux - (m_boreX +m_distCoefX[0] + + p_focalPlaneY*(m_distCoefX[1] + + p_focalPlaneY*(m_distCoefX[2] + p_focalPlaneY* m_distCoefX[3]))); return true; } diff --git a/isis/src/kaguya/objs/KaguyaMiCamera/KaguyaMiCameraDistortionMap.h b/isis/src/kaguya/objs/KaguyaMiCamera/KaguyaMiCameraDistortionMap.h index c7700e10d5..1a7232b9d8 100644 --- a/isis/src/kaguya/objs/KaguyaMiCamera/KaguyaMiCameraDistortionMap.h +++ b/isis/src/kaguya/objs/KaguyaMiCamera/KaguyaMiCameraDistortionMap.h @@ -1,24 +1,13 @@ #ifndef KaguyaMiCameraDistortionMap_h #define KaguyaMiCameraDistortionMap_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include "CameraDistortionMap.h" diff --git a/isis/src/kaguya/objs/KaguyaMiCamera/unitTest.cpp b/isis/src/kaguya/objs/KaguyaMiCamera/unitTest.cpp index f181e71dbb..4e07e6ac29 100644 --- a/isis/src/kaguya/objs/KaguyaMiCamera/unitTest.cpp +++ b/isis/src/kaguya/objs/KaguyaMiCamera/unitTest.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include "Camera.h" @@ -44,15 +33,15 @@ int main(int argc, char *argv[]) { // These should be lat/lon at center of image. To obtain these numbers for a new cube/camera, // set both the known lat and known lon to zero and copy the unit test output "Latitude off by: " // and "Longitude off by: " values directly into these variables. - double knownLat[4] = { -12.0400820752276996, 47.7445483329470406, + double knownLat[4] = { -12.0400820752276996, 47.7445483329470406, 60.8041933170744215, 60.1567063916710580}; - double knownLon[4] = { 355.7272261079595523, 42.9611485167199660, + double knownLon[4] = { 355.7272261079595523, 42.9611485167199660, 135.3886983694549713, 135.3809757236753057}; - char files[4][1024] = { "$ISISTESTDATA/isis/src/kaguya/unitTestData/MI_VIS.cub", "$ISISTESTDATA/isis/src/kaguya/unitTestData/MI_NIR.cub", - "$ISISTESTDATA/isis/src/kaguya/unitTestData/MVA_2B2_01_01228N608E1354.cub", + char files[4][1024] = { "$ISISTESTDATA/isis/src/kaguya/unitTestData/MI_VIS.cub", "$ISISTESTDATA/isis/src/kaguya/unitTestData/MI_NIR.cub", + "$ISISTESTDATA/isis/src/kaguya/unitTestData/MVA_2B2_01_01228N608E1354.cub", "$ISISTESTDATA/isis/src/kaguya/unitTestData/MNA_2B2_01_01228N602E1354.cub"}; - + for (unsigned int i = 0; i < sizeof(knownLat) / sizeof(double); i++) { Cube c(files[i], "r"); Camera *cam = CameraFactory::Create(c); @@ -60,14 +49,14 @@ int main(int argc, char *argv[]) { cout << "CK Frame: " << cam->instrumentRotation()->Frame() << endl << endl; cout.setf(std::ios::fixed); cout << setprecision(9); - + // Test kernel IDs cout << "Kernel IDs: " << endl; cout << "CK Frame ID = " << cam->CkFrameId() << endl; cout << "CK Reference ID = " << cam->CkReferenceId() << endl; cout << "SPK Target ID = " << cam->SpkTargetId() << endl; cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl; - + // Test name methods cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl; cout << "Spacecraft Name Short: " << cam->spacecraftNameShort() << endl; @@ -113,7 +102,7 @@ int main(int argc, char *argv[]) { } cout << endl << "--------------------------------------------" << endl; } - + // Test exception: camera is not a supported Kaguya camera cout << endl << "Testing exceptions:" << endl << endl; Cube test("$ISISTESTDATA/isis/src/hayabusa/unitTestData/st_2530292409_v.cub", "r"); diff --git a/isis/src/kaguya/objs/KaguyaTcCamera/KaguyaTcCamera.cpp b/isis/src/kaguya/objs/KaguyaTcCamera/KaguyaTcCamera.cpp index a7ececb4cb..8aa594bf04 100644 --- a/isis/src/kaguya/objs/KaguyaTcCamera/KaguyaTcCamera.cpp +++ b/isis/src/kaguya/objs/KaguyaTcCamera/KaguyaTcCamera.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "KaguyaTcCamera.h" #include "KaguyaTcCameraDistortionMap.h" @@ -61,38 +50,38 @@ namespace Isis { // Setup detector map double lineRate = (double) inst["LineSamplingInterval"] / 1000.0; - - // Convert between parent image coordinates and detector coordinates (detector coordinate line, detector coordinate sample) + + // Convert between parent image coordinates and detector coordinates (detector coordinate line, detector coordinate sample) LineScanCameraDetectorMap *detectorMap = new LineScanCameraDetectorMap(this, time, lineRate); // Detetermine what to set the starting detector sample to, based on swath mode QString swathMode = inst["SwathModeId"]; - double startingDetectorSample = 1; + double startingDetectorSample = 1; if (swathMode.compare("FULL") == 0) { - startingDetectorSample = 1; + startingDetectorSample = 1; } else if (swathMode.compare("NOMINAL") == 0) { - startingDetectorSample = 297; + startingDetectorSample = 297; } else if (swathMode.compare("HALF") == 0) { startingDetectorSample = 1172; } detectorMap->SetStartingDetectorSample(startingDetectorSample); - + CameraFocalPlaneMap *focalMap = new CameraFocalPlaneMap(this, naifIkCode()); // This sets the origin of the detector (not image samp,line). It is zero bassed. // The detector offsets are 0,0 because the borsight is in the center of the array - // The origin of the detector does not depend on swath mode. + // The origin of the detector does not depend on swath mode. QString key; key = "INS" + toString(naifIkCode()) + "_BORESIGHT_SAMPLE"; double sampleBoreSight = getDouble(key); key = "INS" + toString(naifIkCode()) + "_BORESIGHT_LINE"; double lineBoreSight = getDouble(key); - focalMap->SetDetectorOrigin(sampleBoreSight, lineBoreSight); + focalMap->SetDetectorOrigin(sampleBoreSight, lineBoreSight); // Setup distortion map new KaguyaTcCameraDistortionMap(this, naifIkCode()); diff --git a/isis/src/kaguya/objs/KaguyaTcCamera/KaguyaTcCamera.h b/isis/src/kaguya/objs/KaguyaTcCamera/KaguyaTcCamera.h index 40e68e88c9..651d33b4c1 100644 --- a/isis/src/kaguya/objs/KaguyaTcCamera/KaguyaTcCamera.h +++ b/isis/src/kaguya/objs/KaguyaTcCamera/KaguyaTcCamera.h @@ -1,41 +1,30 @@ #ifndef KaguyaTcCamera_h #define KaguyaTcCamera_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "LineScanCamera.h" namespace Isis { /** - * This is the camera model for the Kaguya Terrain Cameras TC1 and TC2 + * This is the camera model for the Kaguya Terrain Cameras TC1 and TC2 * * @internal * @history 2018-10-01 Adam Goins and Jeannie Backer - Original Version - * + * * @history 2019-04-26 Stuart Sides and Kristin Berry - Updates to Kaguya TC camera model * including updating to use LineScanCamera detector and ground maps, adding * detector offsets for swath modes, setting the focal plane map center to * the center of the detector, regardless of swath mode, and using the * spacecraft clock start count, rather than the StartTime for image timing. * See Git issue #3215 for more information. - * + * */ class KaguyaTcCamera : public LineScanCamera { public: diff --git a/isis/src/kaguya/objs/KaguyaTcCamera/KaguyaTcCameraDistortionMap.cpp b/isis/src/kaguya/objs/KaguyaTcCamera/KaguyaTcCameraDistortionMap.cpp index 9cea6f3f5b..2d567acf3d 100644 --- a/isis/src/kaguya/objs/KaguyaTcCamera/KaguyaTcCameraDistortionMap.cpp +++ b/isis/src/kaguya/objs/KaguyaTcCamera/KaguyaTcCameraDistortionMap.cpp @@ -1,25 +1,10 @@ -/** - * @file - * $Revision: 1.4 $ - * $Date: 2008/02/21 16:04:33 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include diff --git a/isis/src/kaguya/objs/KaguyaTcCamera/KaguyaTcCameraDistortionMap.h b/isis/src/kaguya/objs/KaguyaTcCamera/KaguyaTcCameraDistortionMap.h index 07e673201a..9dfbe5481e 100644 --- a/isis/src/kaguya/objs/KaguyaTcCamera/KaguyaTcCameraDistortionMap.h +++ b/isis/src/kaguya/objs/KaguyaTcCamera/KaguyaTcCameraDistortionMap.h @@ -1,25 +1,11 @@ -/** - * @file - * $Revision: 1.3 $ - * $Date: 2008/02/21 16:04:33 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #ifndef KaguyaTcCameraDistortionMap_h #define KaguyaTcCameraDistortionMap_h diff --git a/isis/src/kaguya/objs/KaguyaTcCamera/unitTest.cpp b/isis/src/kaguya/objs/KaguyaTcCamera/unitTest.cpp index d66d625e72..96e31a11e1 100644 --- a/isis/src/kaguya/objs/KaguyaTcCamera/unitTest.cpp +++ b/isis/src/kaguya/objs/KaguyaTcCamera/unitTest.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include diff --git a/isis/src/lo/apps/lo2isis/lo2isis.cpp b/isis/src/lo/apps/lo2isis/lo2isis.cpp index 3ebf018f5e..b47ce75c72 100644 --- a/isis/src/lo/apps/lo2isis/lo2isis.cpp +++ b/isis/src/lo/apps/lo2isis/lo2isis.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "lo2isis.h" #include "ProcessImportPds.h" #include "UserInterface.h" diff --git a/isis/src/lo/apps/lo2isis/lo2isis.h b/isis/src/lo/apps/lo2isis/lo2isis.h index 1bf030a3ec..730c585304 100644 --- a/isis/src/lo/apps/lo2isis/lo2isis.h +++ b/isis/src/lo/apps/lo2isis/lo2isis.h @@ -1,6 +1,14 @@ #ifndef lo2isis_h #define lo2isis_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Pvl.h" #include "UserInterface.h" diff --git a/isis/src/lo/apps/lo2isis/main.cpp b/isis/src/lo/apps/lo2isis/main.cpp index 883c1d6b23..891a173cb2 100644 --- a/isis/src/lo/apps/lo2isis/main.cpp +++ b/isis/src/lo/apps/lo2isis/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "lo2isis.h" #include "Application.h" diff --git a/isis/src/lo/apps/lopdsgen/main.cpp b/isis/src/lo/apps/lopdsgen/main.cpp index 52f6864022..9a9a047261 100644 --- a/isis/src/lo/apps/lopdsgen/main.cpp +++ b/isis/src/lo/apps/lopdsgen/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "iTime.h" diff --git a/isis/src/lo/objs/LoCameraFiducialMap/LoCameraFiducialMap.cpp b/isis/src/lo/objs/LoCameraFiducialMap/LoCameraFiducialMap.cpp index b056053729..d75987f28a 100644 --- a/isis/src/lo/objs/LoCameraFiducialMap/LoCameraFiducialMap.cpp +++ b/isis/src/lo/objs/LoCameraFiducialMap/LoCameraFiducialMap.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "LoCameraFiducialMap.h" #include "Affine.h" diff --git a/isis/src/lo/objs/LoCameraFiducialMap/LoCameraFiducialMap.h b/isis/src/lo/objs/LoCameraFiducialMap/LoCameraFiducialMap.h index 43ade5f9ba..3bfa0fbd57 100644 --- a/isis/src/lo/objs/LoCameraFiducialMap/LoCameraFiducialMap.h +++ b/isis/src/lo/objs/LoCameraFiducialMap/LoCameraFiducialMap.h @@ -1,24 +1,13 @@ #ifndef LoCameraFiducialMap_h #define LoCameraFiducialMap_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "PvlGroup.h" diff --git a/isis/src/lo/objs/LoCameraFiducialMap/unitTest.cpp b/isis/src/lo/objs/LoCameraFiducialMap/unitTest.cpp index c73ef42750..d8fa72d8ae 100644 --- a/isis/src/lo/objs/LoCameraFiducialMap/unitTest.cpp +++ b/isis/src/lo/objs/LoCameraFiducialMap/unitTest.cpp @@ -1,22 +1,10 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include @@ -248,4 +236,3 @@ int main(void) { e.print(); } } - diff --git a/isis/src/lo/objs/LoHighCamera/LoHighCamera.cpp b/isis/src/lo/objs/LoHighCamera/LoHighCamera.cpp index a2fa51ba1c..1e7bd943b0 100644 --- a/isis/src/lo/objs/LoHighCamera/LoHighCamera.cpp +++ b/isis/src/lo/objs/LoHighCamera/LoHighCamera.cpp @@ -1,25 +1,11 @@ -/** - * @file - * $Revision: 1.7 $ - * $Date: 2010/06/17 18:59:11 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "LoHighCamera.h" #include "LoHighDistortionMap.h" #include "LoCameraFiducialMap.h" @@ -45,16 +31,16 @@ namespace Isis { * resolution images. * * @param lab Pvl label from a Lunar Orbiter High image. - * @internal + * @internal * @history 2011-05-03 Jeannie Walldren - Added NAIF error check. * */ LoHighCamera::LoHighCamera(Cube &cube) : FramingCamera(cube) { NaifStatus::CheckErrors(); - + m_instrumentNameLong = "High Resolution Camera"; m_instrumentNameShort = "High"; - + // LO3 High instrument kernel code = -533001 if (naifIkCode() == -533001) { m_spacecraftNameLong = "Lunar Orbiter 3"; @@ -76,7 +62,7 @@ namespace Isis { msg += " is not a supported instrument kernel code for Lunar Orbiter."; throw IException(IException::Programmer, msg, _FILEINFO_); } - + // Get the Instrument label information needed to define the camera for this frame Pvl &lab = *cube.label(); PvlGroup inst = lab.findGroup("Instrument", Pvl::Traverse); @@ -131,7 +117,7 @@ namespace Isis { NaifStatus::CheckErrors(); } - + /** * Returns the shutter open and close times. The user should pass in the * exposure duration in seconds and the StartTime keyword value, converted to @@ -173,7 +159,7 @@ namespace Isis { * @param lab Cube labels * * @return Isis::Camera* LoHighCamera - * @internal + * @internal * @history 2011-05-03 Jeannie Walldren - Added documentation. Removed Lo * namespace. */ diff --git a/isis/src/lo/objs/LoHighCamera/LoHighCamera.h b/isis/src/lo/objs/LoHighCamera/LoHighCamera.h index 8df4445b92..53afe60566 100644 --- a/isis/src/lo/objs/LoHighCamera/LoHighCamera.h +++ b/isis/src/lo/objs/LoHighCamera/LoHighCamera.h @@ -1,24 +1,13 @@ #ifndef LoHighCamera_h #define LoHighCamera_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "FramingCamera.h" @@ -52,15 +41,15 @@ namespace Isis { * Updated documentation. Removed Lo namespace wrap * inside Isis namespace wrap. Added Isis Disclaimer * to files. Added NAIF error check to constructor. - * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis + * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis * coding standards. References #972. * @history 2014-01-17 Kris Becker Corrected CkFrameId reference to * properly define LO 3,4,5 at runtime for generation * of CKs using ckwriter. References #1737. * @history 2015-08-24 Ian Humphrey and Makayla Shepherd - Added new data members and methods - * to get spacecraft and instrument names. Extended unit test for + * to get spacecraft and instrument names. Extended unit test for * testing name methods and added data for L03 and L05. - * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument + * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument * members and methods and removed implementation of these methods * since Camera now handles this. References #2335. */ @@ -69,28 +58,28 @@ namespace Isis { LoHighCamera(Cube &cube); //! Destroys the LoHighCamera Object ~LoHighCamera() {}; - virtual std::pair ShutterOpenCloseTimes(double time, + virtual std::pair ShutterOpenCloseTimes(double time, double exposureDuration); /** * CK frame ID - - Instrument Code from spacit run on CK - * - * @return @b int The appropriate instrument code for the "Camera-matrix" + * + * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Frame ID */ virtual int CkFrameId() const { return (m_ckFrameId); } - /** + /** * CK Reference ID - J2000 - * + * * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Reference ID */ virtual int CkReferenceId() const { return (1); } - /** + /** * SPK Reference ID - J2000 - * - * @return @b int The appropriate instrument code for the Spacecraft + * + * @return @b int The appropriate instrument code for the Spacecraft * Kernel Reference ID */ virtual int SpkReferenceId() const { return (1); } diff --git a/isis/src/lo/objs/LoHighCamera/LoHighDistortionMap.cpp b/isis/src/lo/objs/LoHighCamera/LoHighDistortionMap.cpp index fdbc9bd8fd..9a950b789c 100644 --- a/isis/src/lo/objs/LoHighCamera/LoHighDistortionMap.cpp +++ b/isis/src/lo/objs/LoHighCamera/LoHighDistortionMap.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "LoHighDistortionMap.h" #include "IString.h" diff --git a/isis/src/lo/objs/LoHighCamera/LoHighDistortionMap.h b/isis/src/lo/objs/LoHighCamera/LoHighDistortionMap.h index f2e463126a..4243881ef9 100644 --- a/isis/src/lo/objs/LoHighCamera/LoHighDistortionMap.h +++ b/isis/src/lo/objs/LoHighCamera/LoHighDistortionMap.h @@ -1,30 +1,19 @@ #ifndef LoHighDistortionMap_h #define LoHighDistortionMap_h -/** - * @file - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include "CameraDistortionMap.h" namespace Isis { - /** + /** * Distort/undistort focal plane coordinates * * Creates a map for adding/removing optical distortions @@ -53,11 +42,11 @@ namespace Isis { * constructor was finished. * @history 2011-05-03 Jeannie Walldren - Updated documentation. Removed Lo * namespace wrap. - * @history 2012-07-06 Debbie A. Cook - Updated Spice members to be more compliant with Isis + * @history 2012-07-06 Debbie A. Cook - Updated Spice members to be more compliant with Isis * coding standards. References #972. - * @history 2013-02-22 Debbie A. Cook - Updated SetUndistortedFocalPlane method to reflect - * correction made to LookCtoFocalPlaneXY in CameraGroundMap. The - * adjustment for the z direction occurs in CameraGroundMap and is no + * @history 2013-02-22 Debbie A. Cook - Updated SetUndistortedFocalPlane method to reflect + * correction made to LookCtoFocalPlaneXY in CameraGroundMap. The + * adjustment for the z direction occurs in CameraGroundMap and is no * needed here. Fixes Mantis ticket #1524 */ class LoHighDistortionMap : public CameraDistortionMap { diff --git a/isis/src/lo/objs/LoHighCamera/unitTest.cpp b/isis/src/lo/objs/LoHighCamera/unitTest.cpp index e2c6db926c..69bf3f3f67 100644 --- a/isis/src/lo/objs/LoHighCamera/unitTest.cpp +++ b/isis/src/lo/objs/LoHighCamera/unitTest.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -56,7 +45,7 @@ int main(void) { files.append("$ISISTESTDATA/isis/src/lo/unitTestData/3133_h1.cropped.cub"); // LO3 High files.append("$ISISTESTDATA/isis/src/lo/unitTestData/4164H_Full_mirror.cub"); // L04 High files.append("$ISISTESTDATA/isis/src/lo/unitTestData/5006_high_res_1.cropped.cub"); // L05 High - + for (int i = 0; i < files.size(); i++) { Cube c(files[i], "r"); LoHighCamera *cam = (LoHighCamera *) CameraFactory::Create(c); @@ -64,73 +53,73 @@ int main(void) { cout << "CK Frame: " << cam->instrumentRotation()->Frame() << endl << endl; cout.setf(std::ios::fixed); cout << setprecision(9); - + // Test kernel IDs cout << "Kernel IDs: " << endl; cout << "CK Frame ID = " << cam->CkFrameId() << endl; cout << "CK Reference ID = " << cam->CkReferenceId() << endl; cout << "SPK Target ID = " << cam->SpkTargetId() << endl; cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl; - + // Test name methods cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl; cout << "Spacecraft Name Short: " << cam->spacecraftNameShort() << endl; cout << "Instrument Name Long: " << cam->instrumentNameLong() << endl; cout << "Instrument Name Short: " << cam->instrumentNameShort() << endl << endl; - - // Test Shutter Open/Close - + + // Test Shutter Open/Close + const PvlGroup &inst = c.label()->findGroup("Instrument", Pvl::Traverse); // approximate 1 tenth of a second since Lunar Orbiter did not provide - double exposureDuration = .1; + double exposureDuration = .1; QString stime = inst["StartTime"]; double et; // StartTime keyword is the center exposure time str2et_c(stime.toLatin1().data(), &et); pair shuttertimes = cam->ShutterOpenCloseTimes(et, exposureDuration); cout << "Shutter open = " << shuttertimes.first.Et() << endl; cout << "Shutter close = " << shuttertimes.second.Et() << endl << endl; - - + + // Test all four corners to make sure the conversions are right cout << "For upper left corner ..." << endl; TestLineSamp(cam, 1.0, 1.0); - + cout << "For upper right corner ..." << endl; TestLineSamp(cam, cam->Samples(), 1.0); - + cout << "For lower left corner ..." << endl; TestLineSamp(cam, 1.0, cam->Lines()); - + cout << "For lower right corner ..." << endl; TestLineSamp(cam, cam->Samples(), cam->Lines()); - + double samp = cam->Samples() / 2; double line = cam->Lines() / 2; cout << "For center pixel position ..." << endl; - + if(!cam->SetImage(samp, line)) { cout << "ERROR" << endl; return 0; } - + if(abs(cam->UniversalLatitude() - knownLat[i]) < 1E-10) { cout << "Latitude OK" << endl; } else { - cout << setprecision(16) << "Latitude off by: " << cam->UniversalLatitude() - knownLat[i] + cout << setprecision(16) << "Latitude off by: " << cam->UniversalLatitude() - knownLat[i] << endl; } - + if(abs(cam->UniversalLongitude() - knownLon[i]) < 1E-10) { cout << "Longitude OK" << endl; } else { - cout << setprecision(16) << "Longitude off by: " << cam->UniversalLongitude() - knownLon[i] + cout << setprecision(16) << "Longitude off by: " << cam->UniversalLongitude() - knownLon[i] << endl; } cout << endl << "--------------------------------------------" << endl; } - + // Test exception: camera is not a supported Kaguya camera cout << endl << "Testing exceptions:" << endl << endl; Cube test("$ISISTESTDATA/isis/src/hayabusa/unitTestData/st_2530292409_v.cub", "r"); diff --git a/isis/src/lo/objs/LoMediumCamera/LoMediumCamera.cpp b/isis/src/lo/objs/LoMediumCamera/LoMediumCamera.cpp index 03edf75454..87c022a611 100644 --- a/isis/src/lo/objs/LoMediumCamera/LoMediumCamera.cpp +++ b/isis/src/lo/objs/LoMediumCamera/LoMediumCamera.cpp @@ -1,22 +1,10 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "LoMediumCamera.h" #include "LoMediumDistortionMap.h" @@ -51,10 +39,10 @@ namespace Isis { */ LoMediumCamera::LoMediumCamera(Cube &cube) : FramingCamera(cube) { NaifStatus::CheckErrors(); - + m_instrumentNameLong = "Medium Resolution Camera"; m_instrumentNameShort = "Medium"; - + // L03 Medium instrument kernel code = -533002 if (naifIkCode() == -533002) { m_spacecraftNameLong = "Lunar Orbiter 3"; @@ -76,7 +64,7 @@ namespace Isis { msg += " is not a supported instrument kernel code for Lunar Orbiter."; throw IException(IException::Programmer, msg, _FILEINFO_); } - + // Get the Instrument label information needed to define the camera for this frame Pvl &lab = *cube.label(); PvlGroup inst = lab.findGroup("Instrument", Pvl::Traverse); @@ -153,7 +141,7 @@ namespace Isis { NaifStatus::CheckErrors(); } - + /** * Returns the shutter open and close times. The user should pass in the * exposure duration in seconds and the StartTime keyword value, converted to diff --git a/isis/src/lo/objs/LoMediumCamera/LoMediumCamera.h b/isis/src/lo/objs/LoMediumCamera/LoMediumCamera.h index 35446dffb9..73cbec8af4 100644 --- a/isis/src/lo/objs/LoMediumCamera/LoMediumCamera.h +++ b/isis/src/lo/objs/LoMediumCamera/LoMediumCamera.h @@ -1,24 +1,13 @@ #ifndef LoMediumCamera_h #define LoMediumCamera_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "FramingCamera.h" @@ -26,8 +15,8 @@ namespace Isis { /** * @brief Defines the Lunar Orbiter Medium Resolution camera class * - * The LoMediumCamera class defines the Medium Resolution camera for the last - * three Lunar Orbiter missions (3, 4, and 5). + * The LoMediumCamera class defines the Medium Resolution camera for the last + * three Lunar Orbiter missions (3, 4, and 5). * * @ingroup SpiceInstrumentsAndCameras * @ingroup LunarOrbiter @@ -54,15 +43,15 @@ namespace Isis { * Updated documentation. Removed Lo namespace wrap * inside Isis namespace wrap. Added Isis Disclaimer * to files. Added NAIF error check to constructor. - * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis + * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis * coding standards. References #972. * @history 2014-01-17 Kris Becker Corrected CkFrameId reference to * properly define LO 3,4,5 at runtime for generation - * of CKs using ckwriter. References #1737. + * of CKs using ckwriter. References #1737. * @history 2015-08-24 Ian Humphrey and Makayla Shepherd - Added new data members and methods * to get spacecraft and instrument names. Extended unit test for these * methods and added data for LO4 and LO5. - * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument + * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument * members and methods and removed implementation of these methods * since Camera now handles this. References #2335. */ @@ -72,36 +61,36 @@ namespace Isis { //! Destroys the LoMediumCamera Object ~LoMediumCamera() {}; /** - * This enum defines the types of focal plane maps supported in this - * class. + * This enum defines the types of focal plane maps supported in this + * class. */ enum FocalPlaneMapType { Fiducial, //!< Fiducial Focal Plane Map - Boresight,//!< Boresight Focal Plane Map + Boresight,//!< Boresight Focal Plane Map None //!< No Focal Plane Map }; - virtual std::pair ShutterOpenCloseTimes(double time, + virtual std::pair ShutterOpenCloseTimes(double time, double exposureDuration); /** * CK frame ID - - Instrument Code from spacit run on CK - * - * @return @b int The appropriate instrument code for the "Camera-matrix" + * + * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Frame ID */ virtual int CkFrameId() const { return (m_ckFrameId); } - /** + /** * CK Reference ID - J2000 - * + * * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Reference ID */ virtual int CkReferenceId() const { return (1); } - /** + /** * SPK Reference ID - J2000 - * - * @return @b int The appropriate instrument code for the Spacecraft + * + * @return @b int The appropriate instrument code for the Spacecraft * Kernel Reference ID */ virtual int SpkReferenceId() const { return (1); } diff --git a/isis/src/lo/objs/LoMediumCamera/LoMediumDistortionMap.cpp b/isis/src/lo/objs/LoMediumCamera/LoMediumDistortionMap.cpp index 455d0036b7..3eb0332db3 100644 --- a/isis/src/lo/objs/LoMediumCamera/LoMediumDistortionMap.cpp +++ b/isis/src/lo/objs/LoMediumCamera/LoMediumDistortionMap.cpp @@ -1,25 +1,10 @@ -/** - * @file - * $Revision: 1777 $ - * $Date: 2011-02-14 10:47:03 -0700 (Mon, 14 Feb 2011) $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "LoMediumDistortionMap.h" diff --git a/isis/src/lo/objs/LoMediumCamera/LoMediumDistortionMap.h b/isis/src/lo/objs/LoMediumCamera/LoMediumDistortionMap.h index 0bb5fa2beb..00a478d537 100644 --- a/isis/src/lo/objs/LoMediumCamera/LoMediumDistortionMap.h +++ b/isis/src/lo/objs/LoMediumCamera/LoMediumDistortionMap.h @@ -1,30 +1,19 @@ #ifndef LoMediumDistortionMap_h #define LoMediumDistortionMap_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include "CameraDistortionMap.h" namespace Isis { - /** + /** * Distort/undistort focal plane coordinates * * Creates a map for adding/removing optical distortions @@ -63,11 +52,11 @@ namespace Isis { * defined to the image edges * @history 2011-05-03 Jeannie Walldren - Updated documentation. Removed Lo * namespace wrap. - * @history 2012-07-06 Debbie A. Cook - Updated Spice members to be more compliant with Isis + * @history 2012-07-06 Debbie A. Cook - Updated Spice members to be more compliant with Isis * coding standards. References #972. - * @history 2013-02-22 Debbie A. Cook - Updated SetUndistortedFocalPlane method to reflect - * correction made to LookCtoFocalPlaneXY in CameraGroundMap. The - * adjustment for the z direction occurs in CameraGroundMap and is no + * @history 2013-02-22 Debbie A. Cook - Updated SetUndistortedFocalPlane method to reflect + * correction made to LookCtoFocalPlaneXY in CameraGroundMap. The + * adjustment for the z direction occurs in CameraGroundMap and is no * needed here. Fixes Mantis ticket #1524 */ class LoMediumDistortionMap : public CameraDistortionMap { diff --git a/isis/src/lo/objs/LoMediumCamera/unitTest.cpp b/isis/src/lo/objs/LoMediumCamera/unitTest.cpp index 4e45cf771a..4a63f87785 100644 --- a/isis/src/lo/objs/LoMediumCamera/unitTest.cpp +++ b/isis/src/lo/objs/LoMediumCamera/unitTest.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -51,12 +40,12 @@ int main(void) { // and "Longitude off by: " values directly into these variables. double knownLat[3] = { -2.430081939831881, -74.8893438078403477, 0.5289151367076288 }; double knownLon[3] = { 13.55999413494297, 12.5149409284581896, 23.4631767915001923 }; - + QList files; files.append("$ISISTESTDATA/isis/src/lo/unitTestData/3083_med_tohi.cub"); files.append("$ISISTESTDATA/isis/src/lo/unitTestData/4008_med_res.cropped.cub"); files.append("$ISISTESTDATA/isis/src/lo/unitTestData/5072_med_res.cropped.cub"); - + for (int i = 0; i < files.size(); i++) { Cube c(files[i], "r"); LoMediumCamera *cam = (LoMediumCamera *) CameraFactory::Create(c); @@ -64,54 +53,54 @@ int main(void) { cout << "CK Frame: " << cam->instrumentRotation()->Frame() << endl << endl; cout.setf(std::ios::fixed); cout << setprecision(9); - + // Test kernel IDs cout << "Kernel IDs: " << endl; cout << "CK Frame ID = " << cam->CkFrameId() << endl; cout << "CK Reference ID = " << cam->CkReferenceId() << endl; cout << "SPK Target ID = " << cam->SpkTargetId() << endl; cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl; - + // Test name methods cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl; cout << "Spacecraft Name Short: " << cam->spacecraftNameShort() << endl; cout << "Instrument Name Long: " << cam->instrumentNameLong() << endl; cout << "Instrument Name Short: " << cam->instrumentNameShort() << endl << endl; - - // Test Shutter Open/Close - + + // Test Shutter Open/Close + const PvlGroup &inst = c.label()->findGroup("Instrument", Pvl::Traverse); // approximate 1 tenth of a second since Lunar Orbiter did not provide - double exposureDuration = .1; + double exposureDuration = .1; QString stime = inst["StartTime"]; double et; // StartTime keyword is the center exposure time str2et_c(stime.toLatin1().data(), &et); pair shuttertimes = cam->ShutterOpenCloseTimes(et, exposureDuration); cout << "Shutter open = " << shuttertimes.first.Et() << endl; cout << "Shutter close = " << shuttertimes.second.Et() << endl << endl; - + // Test all four corners to make sure the conversions are right cout << "For upper left corner ..." << endl; TestLineSamp(cam, 1.0, 1.0); - + cout << "For upper right corner ..." << endl; TestLineSamp(cam, cam->Samples(), 1.0); - + cout << "For lower left corner ..." << endl; TestLineSamp(cam, 1.0, cam->Lines()); - + cout << "For lower right corner ..." << endl; TestLineSamp(cam, cam->Samples(), cam->Lines()); - + double samp = cam->Samples() / 2; double line = cam->Lines() / 2; cout << "For center pixel position ..." << endl; - + if(!cam->SetImage(samp, line)) { cout << "ERROR" << endl; return 0; } - + if(abs(cam->UniversalLatitude() - knownLat[i]) < 1E-10) { cout << "Latitude OK" << endl; } @@ -119,7 +108,7 @@ int main(void) { cout << setprecision(16) << "Latitude off by: " << cam->UniversalLatitude() - knownLat[i] << endl; } - + if(abs(cam->UniversalLongitude() - knownLon[i]) < 1E-10) { cout << "Longitude OK" << endl; } @@ -129,7 +118,7 @@ int main(void) { } cout << endl << "--------------------------------------------" << endl; } - + // Test exception: camera is not a supported Kaguya camera cout << endl << "Testing exceptions:" << endl << endl; Cube test("$ISISTESTDATA/isis/src/hayabusa/unitTestData/st_2530292409_v.cub", "r"); diff --git a/isis/src/lro/apps/lromakeflat/main.cpp b/isis/src/lro/apps/lromakeflat/main.cpp index 16d622b076..29e57445fd 100644 --- a/isis/src/lro/apps/lromakeflat/main.cpp +++ b/isis/src/lro/apps/lromakeflat/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + /** * @Brief This application creates three flatfield (Sensitivity Non-Uniformity Matrix) cubes used for calibration * diff --git a/isis/src/lro/apps/lronac2isis/lronac2isis.cpp b/isis/src/lro/apps/lronac2isis/lronac2isis.cpp index ac9e79fc1c..536f4ce3dc 100644 --- a/isis/src/lro/apps/lronac2isis/lronac2isis.cpp +++ b/isis/src/lro/apps/lronac2isis/lronac2isis.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "ProcessImportPds.h" #include "UserInterface.h" #include "FileName.h" @@ -22,12 +30,12 @@ namespace Isis { static void ResetGlobals(); static void Import(Buffer &buf); static void TranslateLrocNacLabels(FileName &labelFile, Cube *ocube); - + // Global variables for processing functions Cube *g_ocube; std::vector< double> g_xterm, g_bterm, g_mterm; bool g_flip = false; - + void lronac2isis(UserInterface &ui) { // Initialize variables ResetGlobals(); @@ -49,7 +57,7 @@ namespace Isis { msg += " Use pds2isis."; throw IException(IException::User, msg, _FILEINFO_); } - + // Store the decompanding information PvlKeyword xtermKeyword = lab.findKeyword("LRO:XTERM"), mtermKeyword = lab.findKeyword("LRO:MTERM"), @@ -59,13 +67,13 @@ namespace Isis { QString msg = "The decompanding terms do not have the same dimensions"; throw IException(IException::Io, msg, _FILEINFO_); } - + for(int i = 0; i < xtermKeyword.size(); i++) { g_xterm.push_back(toDouble(xtermKeyword[i])); g_mterm.push_back(toDouble(mtermKeyword[i])); g_bterm.push_back(toDouble(btermKeyword[i])); } - + double versionId = toDouble(lab.findKeyword("PRODUCT_VERSION_ID")[0].remove(QRegExp("^v"))); if(lab.findKeyword("FRAME_ID")[0] == "RIGHT" && versionId < 1.30) g_flip = true; @@ -78,21 +86,21 @@ namespace Isis { finalException.append(e); throw finalException; } - + id = id.simplified().trimmed(); if(id.mid(13, 3) != "EDR") { QString msg = "Input file [" + inFile.expanded() + "] does not appear to be " + "in LROC-NAC EDR format. DATA_SET_ID is [" + id + "]"; throw IException(IException::Io, msg, _FILEINFO_); } - + //Process the file Pvl pdsLab; ProcessImportPds p; p.SetPdsFile(inFile.expanded(), "", pdsLab); // Set the output bit type to Real CubeAttributeOutput &outAtt = ui.GetOutputAttribute("TO"); - + g_ocube = new Cube(); g_ocube->setByteOrder(outAtt.byteOrder()); g_ocube->setFormat(outAtt.fileFormat()); @@ -104,13 +112,13 @@ namespace Isis { // Do 8 bit to 12 bit conversion // And if NAC-R, flip the frame p.StartProcess(Import); - + // Then translate the labels TranslateLrocNacLabels(inFile, g_ocube); p.EndProcess(); // Add History - if (iApp) { + if (iApp) { History history("IsisCube"); history.AddEntry(); g_ocube->write(history); @@ -122,7 +130,7 @@ namespace Isis { g_ocube->close(); delete g_ocube; } - + // The input buffer has a raw 16 bit buffer but the values are still 0 to 255. // See "Appendix B - NAC and WAC Companding Schemes" of the LROC_SOC_SPEC // document for reference. @@ -131,24 +139,24 @@ namespace Isis { outLines.SetLine(in.Line(), in.Band()); Buffer buf(in.SampleDimension(), in.LineDimension(), in.BandDimension(), g_ocube->pixelType()); - + // Do the decompanding for(int pixin = 0; pixin < in.size(); pixin++) { - + // if pixin < xtermo0, then it is in "segment 0" if(in[pixin] < g_xterm[0]) buf[pixin] = (int) in[pixin]; - + // otherwise, it is in segments 1 to 5 else { unsigned int segment = 1; while(segment < g_xterm.size() && (in[pixin] - g_bterm[segment - 1]) / g_mterm[segment - 1] >= g_xterm[segment]) segment++; - + // Compute the upper and lower bin values double upper = (in[pixin] + 1 - g_bterm[segment - 1]) / g_mterm[segment - 1] - 1; double lower = (in[pixin] - g_bterm[segment - 1]) / g_mterm[segment - 1]; - + // Check if the bin is on the upper boundary of the last segment if(upper > MAX_INPUT_VALUE) upper = MAX_INPUT_VALUE; @@ -156,17 +164,17 @@ namespace Isis { if((int)(g_bterm[segment] + g_mterm[segment]*upper) != in[pixin]) upper = g_xterm[segment] - 1; } - + // Check if it is on the lower boundary of a segment if(lower < g_xterm[segment-1]) lower = g_xterm[segment-1]; - + // Output the middle bin value buf[pixin] = (upper + lower) / 2.0; - + } } - + // flip the NAC-R frame if(g_flip) { Buffer tmpbuf(buf); @@ -176,39 +184,39 @@ namespace Isis { outLines.Copy(buf); g_ocube->write(outLines); } - + //Function to translate the labels void TranslateLrocNacLabels(FileName &labelFile, Cube *ocube) { - + //Pvl to store the labels Pvl outLabel; //Set up the directory where the translations are Pvl labelPvl(labelFile.expanded()); - + //Translate the Instrument group FileName transFile("$ISISROOT/appdata/translations/LroNacInstrument.trn"); PvlToPvlTranslationManager instrumentXlator(labelPvl, transFile.expanded()); instrumentXlator.Auto(outLabel); - + //Translate the Archive group transFile = "$ISISROOT/appdata/translations/LroNacArchive.trn"; PvlToPvlTranslationManager archiveXlater(labelPvl, transFile.expanded()); archiveXlater.Auto(outLabel); - + //Translate the BandBin group transFile = "$ISISROOT/appdata/translations/LroNacBandBin.trn"; PvlToPvlTranslationManager bandBinXlater(labelPvl, transFile.expanded()); bandBinXlater.Auto(outLabel); - + Pvl lab(labelFile.expanded()); - + //Set up the Kernels group PvlGroup kern("Kernels"); if(lab.findKeyword("FRAME_ID")[0] == "LEFT") kern += PvlKeyword("NaifFrameCode", "-85600"); else kern += PvlKeyword("NaifFrameCode", "-85610"); - + PvlGroup inst = outLabel.findGroup("Instrument", Pvl::Traverse); if(lab.findKeyword("FRAME_ID")[0] == "LEFT") { inst.findKeyword("InstrumentId") = "NACL"; @@ -218,14 +226,14 @@ namespace Isis { inst.findKeyword("InstrumentId") = "NACR"; inst.findKeyword("InstrumentName") = "LUNAR RECONNAISSANCE ORBITER NARROW ANGLE CAMERA RIGHT"; } - + //Add all groups to the output cube ocube->putGroup(inst); ocube->putGroup(outLabel.findGroup("Archive", Pvl::Traverse)); ocube->putGroup(outLabel.findGroup("BandBin", Pvl::Traverse)); ocube->putGroup(kern); } - + void ResetGlobals() { g_ocube = NULL; g_xterm.clear(); diff --git a/isis/src/lro/apps/lronac2isis/lronac2isis.h b/isis/src/lro/apps/lronac2isis/lronac2isis.h index 947423c1d9..68ff06f6fa 100644 --- a/isis/src/lro/apps/lronac2isis/lronac2isis.h +++ b/isis/src/lro/apps/lronac2isis/lronac2isis.h @@ -1,6 +1,14 @@ -#ifndef lronac2isis_h // Change this to your app name in all lower case suffixed with _h (e.g. campt_h, cam2map_h etc.) +#ifndef lronac2isis_h #define lronac2isis_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Cube.h" #include "UserInterface.h" @@ -9,4 +17,4 @@ namespace Isis{ extern void lronac2isis(UserInterface &ui); } -#endif \ No newline at end of file +#endif diff --git a/isis/src/lro/apps/lronac2isis/main.cpp b/isis/src/lro/apps/lronac2isis/main.cpp index b361350667..64450bdeb2 100644 --- a/isis/src/lro/apps/lronac2isis/main.cpp +++ b/isis/src/lro/apps/lronac2isis/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "Application.h" @@ -8,4 +16,4 @@ using namespace Isis; void IsisMain() { UserInterface &ui = Application::GetUserInterface(); lronac2isis(ui); -} \ No newline at end of file +} diff --git a/isis/src/lro/apps/lronac2pds/lronac2pds.cpp b/isis/src/lro/apps/lronac2pds/lronac2pds.cpp index 07ddac9b68..98322bb34e 100644 --- a/isis/src/lro/apps/lronac2pds/lronac2pds.cpp +++ b/isis/src/lro/apps/lronac2pds/lronac2pds.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "lronac2pds.h" #include diff --git a/isis/src/lro/apps/lronac2pds/lronac2pds.h b/isis/src/lro/apps/lronac2pds/lronac2pds.h index 7b8dadb117..c64ba87da3 100644 --- a/isis/src/lro/apps/lronac2pds/lronac2pds.h +++ b/isis/src/lro/apps/lronac2pds/lronac2pds.h @@ -1,6 +1,14 @@ #ifndef lronac2pds_h #define lronac2pds_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Pvl.h" #include "UserInterface.h" diff --git a/isis/src/lro/apps/lronac2pds/main.cpp b/isis/src/lro/apps/lronac2pds/main.cpp index 99d8a850cd..f962753464 100644 --- a/isis/src/lro/apps/lronac2pds/main.cpp +++ b/isis/src/lro/apps/lronac2pds/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "lronac2pds.h" diff --git a/isis/src/lro/apps/lronaccal/main.cpp b/isis/src/lro/apps/lronaccal/main.cpp index 3048bf76d8..64dd00e677 100644 --- a/isis/src/lro/apps/lronaccal/main.cpp +++ b/isis/src/lro/apps/lronaccal/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "ProcessByLine.h" #include "SpecialPixel.h" @@ -197,16 +205,16 @@ void IsisMain() { if(g_iof) { iTime startTime((QString) inst["StartTime"]); - + try { - Camera *cam; + Camera *cam; cam = iCube->camera(); cam->setTime(startTime); - g_solarDistance = cam->sunToBodyDist() / KM_PER_AU; - + g_solarDistance = cam->sunToBodyDist() / KM_PER_AU; + } catch(IException &e) { - // Failed to instantiate a camera, try furnishing kernels directly + // Failed to instantiate a camera, try furnishing kernels directly try { double etStart = startTime.Et(); diff --git a/isis/src/lro/apps/lronacecho/main.cpp b/isis/src/lro/apps/lronacecho/main.cpp index 7402d7b1cf..f9ca3b6cb0 100644 --- a/isis/src/lro/apps/lronacecho/main.cpp +++ b/isis/src/lro/apps/lronacecho/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "ProcessByLine.h" @@ -68,7 +76,7 @@ void IsisMain() { } void correct(Buffer &in, Buffer &out) { - double delta = 0; // #include #include @@ -19,7 +27,7 @@ namespace Isis { /** * Create an LROCEmpirical photometric object - * + * * @author 2016-08-15 Victor Silva * * @internal @@ -41,14 +49,14 @@ namespace Isis { * @brief Initialize class from input PVL and Cube files * * This method is typically called at the class instantiation - * time but is reentrant. It reads the parameter PVL file and + * time but is reentrant. It reads the parameter PVL file and * extracts Photometric model and Normalization models from it. * The cube is needed to match all potential profiles for each * band. * * @param pvl Input PVL parameter files * @param cube Input cube file to correct - * + * * @throws IException::User "Errors in the input PVL file." * @throws IException::User "Band with wavelength Center does not have * PhotometricModel Algorithm group/profile." @@ -96,7 +104,7 @@ namespace Isis { } else { // Appropriate photometric parameters not found ostringstream mess; - mess << "Band [" << i + 1 << "] with wavelength Center = [" << center[i] << + mess << "Band [" << i + 1 << "] with wavelength Center = [" << center[i] << "] does not have PhotometricModel Algorithm group/profile"; IException e(IException::User, mess.str(), _FILEINFO_); errs += e.toString() + "\n"; @@ -116,15 +124,15 @@ namespace Isis { /** * @brief Method to get photometric property given angles * - * This method computes photometric property at the given cube location after + * This method computes photometric property at the given cube location after * proper parameter container is found for the specific band. - * + * * @param i Incidence angle in degrees * @param e Emission angle in degrees * @param g Phase angle in degrees * @param band cube band to be tested * - * + * * @throws IException::Programmer "Provided band out of range." * * @return @b double The photometric property @@ -150,7 +158,7 @@ namespace Isis { /** * @brief Performs actual photometric correction calculations * - * This routine computes photometric correction using parameters for the + * This routine computes photometric correction using parameters for the * LROC Emperical equation. * * @param parms Container of band-specific exponential parameters @@ -193,13 +201,13 @@ namespace Isis { /** * @brief Return parameters used for all bands - * + * * Method creates keyword vector of band-specific parameters * used in the photometric correction. * * @param pvl Output PVL container for keywords written * - * @author 2016-08-15 Victor Silva + * @author 2016-08-15 Victor Silva * * @internal * @history 2016-08-15 Victor Silva - Adapted code from lrowacpho application @@ -267,11 +275,11 @@ namespace Isis { * * This method determines the set of LROCEmpirical parameters to * use for a given wavelength. It iterates through all band profiles - * as read from the PVL file and computes the difference between - * wavelength parameter and the BandBinCenter keyword. The absolute - * value of this value is checke against the BandBinCenterTolerance - * parameter and if it is less than or equal to it, a Parameter - * container is returned. + * as read from the PVL file and computes the difference between + * wavelength parameter and the BandBinCenter keyword. The absolute + * value of this value is checke against the BandBinCenterTolerance + * parameter and if it is less than or equal to it, a Parameter + * container is returned. * * @param wavelength The wavelength to find parameters for * @@ -280,8 +288,8 @@ namespace Isis { * found for the wavelength then a * default parameters object is returned. * - * @author 2016-08-15 Victor Silva - * + * @author 2016-08-15 Victor Silva + * * @internal * @history 2016-08-15 Victor Silva - Adapted from the lrowacpho application * written by Kris Becker. diff --git a/isis/src/lro/apps/lronacpho/LROCEmpirical.h b/isis/src/lro/apps/lronacpho/LROCEmpirical.h index 5ce915fb89..5ace4c69f0 100644 --- a/isis/src/lro/apps/lronacpho/LROCEmpirical.h +++ b/isis/src/lro/apps/lronacpho/LROCEmpirical.h @@ -1,6 +1,14 @@ #ifndef LROCEmpirical_h #define LROCEmpirical_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include @@ -42,7 +50,7 @@ namespace Isis { * Container for band photometric correction parameters * * @author 2016-08-15 Victor Silva - * + * * @internal * @history 2016-08-05 - Code adapted from lrowacpho written by Kris Becker */ diff --git a/isis/src/lro/apps/lronacpho/main.cpp b/isis/src/lro/apps/lronacpho/main.cpp index 68bd934630..ed3e5d27e2 100644 --- a/isis/src/lro/apps/lronacpho/main.cpp +++ b/isis/src/lro/apps/lronacpho/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include @@ -23,14 +31,14 @@ void phoCalWithBackplane (std::vector &in, std::vector diff --git a/isis/src/lro/apps/lrowac2pds/main.cpp b/isis/src/lro/apps/lrowac2pds/main.cpp index 5caa9b28ff..7b06c7551f 100644 --- a/isis/src/lro/apps/lrowac2pds/main.cpp +++ b/isis/src/lro/apps/lrowac2pds/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include #include @@ -474,4 +482,3 @@ void CopyData ( std::ifstream &fin, std::ofstream &fout ) { fout.write(line, fin.gcount()); } } - diff --git a/isis/src/lro/apps/lrowaccal/main.cpp b/isis/src/lro/apps/lrowaccal/main.cpp index d3407ba3a4..fa31a5d07f 100644 --- a/isis/src/lro/apps/lrowaccal/main.cpp +++ b/isis/src/lro/apps/lrowaccal/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include @@ -126,7 +134,7 @@ void IsisMain () { Isis::PvlGroup &bandBin = icube->label()->findGroup("BandBin", Pvl::Traverse); QString filter = (QString) bandBin["Center"][0]; QString filterNum = (QString) bandBin["FilterNumber"][0]; - //We have to pay special attention incase we are passed a + //We have to pay special attention incase we are passed a //single band image that has been "exploded" from a multiband wac if (instModeId == "COLOR" && g_bands.size() == 1) g_bands[0] = (toInt(filterNum) -2); @@ -259,7 +267,7 @@ void IsisMain () { PvlKeyword temperaturePvl("TemperatureFile"); if (g_temprature) { if (tempFile.toLower() == "default" || tempFile.length() == 0) - tempFile = GetCalibrationDirectory("") + "WAC_TempratureConstants.????.pvl"; + tempFile = GetCalibrationDirectory("") + "WAC_TempratureConstants.????.pvl"; FileName tempFileName(tempFile); if (tempFileName.isVersioned()) @@ -518,15 +526,15 @@ void Calibrate ( Buffer &inCube, Buffer &outCube ) { // // Where: // 'a' and 'b' are band dependant constants read in via a pvl file - // + // // AND - // + // // frameTemp: (Pre-Calculated as it is used in multiple places) // // (WAC end temp - WAC start temp) // ------------------------------- * frame + WAC start temp // (WAC num framelets) - // + // // // if (correctBand != -1) @@ -771,7 +779,7 @@ void GetMask(QString &fileString, double temp, Buffer* &data) { * LRO calibration directory * * @param calibrationType The type of calibration data - * + * * @return @b QString Path of the calibration directory * * @internal diff --git a/isis/src/lro/apps/lrowacpho/Exponential.cpp b/isis/src/lro/apps/lrowacpho/Exponential.cpp index 97c5a96320..e6fa2fafa9 100644 --- a/isis/src/lro/apps/lrowacpho/Exponential.cpp +++ b/isis/src/lro/apps/lrowacpho/Exponential.cpp @@ -1,25 +1,11 @@ -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include diff --git a/isis/src/lro/apps/lrowacpho/Exponential.h b/isis/src/lro/apps/lrowacpho/Exponential.h index 95148f0a9d..865e68818f 100644 --- a/isis/src/lro/apps/lrowacpho/Exponential.h +++ b/isis/src/lro/apps/lrowacpho/Exponential.h @@ -1,27 +1,13 @@ #ifndef Exponential_h #define Exponential_h -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include diff --git a/isis/src/lro/apps/lrowacpho/HapkeExponential.cpp b/isis/src/lro/apps/lrowacpho/HapkeExponential.cpp index a44dc219fb..e79260e75f 100644 --- a/isis/src/lro/apps/lrowacpho/HapkeExponential.cpp +++ b/isis/src/lro/apps/lrowacpho/HapkeExponential.cpp @@ -1,25 +1,11 @@ -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include diff --git a/isis/src/lro/apps/lrowacpho/HapkeExponential.h b/isis/src/lro/apps/lrowacpho/HapkeExponential.h index 6a9fe46942..054b64c336 100644 --- a/isis/src/lro/apps/lrowacpho/HapkeExponential.h +++ b/isis/src/lro/apps/lrowacpho/HapkeExponential.h @@ -1,27 +1,13 @@ #ifndef HapkeExponential_h #define HapkeExponential_h -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include diff --git a/isis/src/lro/apps/lrowacpho/Hillier.cpp b/isis/src/lro/apps/lrowacpho/Hillier.cpp index 0726d71328..fc0246474d 100644 --- a/isis/src/lro/apps/lrowacpho/Hillier.cpp +++ b/isis/src/lro/apps/lrowacpho/Hillier.cpp @@ -1,25 +1,11 @@ -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include diff --git a/isis/src/lro/apps/lrowacpho/Hillier.h b/isis/src/lro/apps/lrowacpho/Hillier.h index fde0bdb18e..1a4748d3cf 100644 --- a/isis/src/lro/apps/lrowacpho/Hillier.h +++ b/isis/src/lro/apps/lrowacpho/Hillier.h @@ -1,27 +1,13 @@ #ifndef Hillier_h #define Hillier_h -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include diff --git a/isis/src/lro/apps/lrowacpho/main.cpp b/isis/src/lro/apps/lrowacpho/main.cpp index ac853d6056..eef83ddd95 100644 --- a/isis/src/lro/apps/lrowacpho/main.cpp +++ b/isis/src/lro/apps/lrowacpho/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + // $Id$ #include "Isis.h" diff --git a/isis/src/lro/apps/mrf2isis/main.cpp b/isis/src/lro/apps/mrf2isis/main.cpp index c6114b60b7..057cab1e54 100644 --- a/isis/src/lro/apps/mrf2isis/main.cpp +++ b/isis/src/lro/apps/mrf2isis/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include @@ -153,7 +161,7 @@ void IsisMain() { } outcube->putGroup(kerns); } - + // Check for and log any change from the default projection offsets and multipliers if (p.GetProjectionOffsetChange()) { PvlGroup results = p.GetProjectionOffsetGroup(); diff --git a/isis/src/lro/apps/mrf2pds/ProcessExportMiniRFLroPds.cpp b/isis/src/lro/apps/mrf2pds/ProcessExportMiniRFLroPds.cpp index e7afc70449..5322fc9be3 100644 --- a/isis/src/lro/apps/mrf2pds/ProcessExportMiniRFLroPds.cpp +++ b/isis/src/lro/apps/mrf2pds/ProcessExportMiniRFLroPds.cpp @@ -1,21 +1,11 @@ -/** - * Unless noted otherwise, the portions of Isis written by the - * USGS are public domain. See individual third-party library - * and package descriptions for intellectual property - * information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include diff --git a/isis/src/lro/apps/mrf2pds/ProcessExportMiniRFLroPds.h b/isis/src/lro/apps/mrf2pds/ProcessExportMiniRFLroPds.h index ec6efad39a..ab8e45e417 100644 --- a/isis/src/lro/apps/mrf2pds/ProcessExportMiniRFLroPds.h +++ b/isis/src/lro/apps/mrf2pds/ProcessExportMiniRFLroPds.h @@ -1,24 +1,13 @@ #ifndef processexportminirflropds_h #define processexportminirflropds_h -/** - * Unless noted otherwise, the portions of Isis written by the - * USGS are public domain. See individual third-party library - * and package descriptions for intellectual property - * information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "ProcessExportPds.h" diff --git a/isis/src/lro/apps/mrf2pds/main.cpp b/isis/src/lro/apps/mrf2pds/main.cpp index bcfb0587cd..f7ab8a4d2d 100644 --- a/isis/src/lro/apps/mrf2pds/main.cpp +++ b/isis/src/lro/apps/mrf2pds/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "UserInterface.h" #include "FileName.h" diff --git a/isis/src/lro/objs/LroNarrowAngleCamera/LroNarrowAngleCamera.cpp b/isis/src/lro/objs/LroNarrowAngleCamera/LroNarrowAngleCamera.cpp index 795e7cadf0..b3494d24d4 100644 --- a/isis/src/lro/objs/LroNarrowAngleCamera/LroNarrowAngleCamera.cpp +++ b/isis/src/lro/objs/LroNarrowAngleCamera/LroNarrowAngleCamera.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "LroNarrowAngleCamera.h" #include @@ -38,7 +27,7 @@ namespace Isis { * * @param lab Pvl Label to create the camera model from * - * @internal + * @internal * @history 2011-05-03 Jeannie Walldren - Added NAIF error check. */ LroNarrowAngleCamera::LroNarrowAngleCamera(Cube &cube) : LineScanCamera(cube) { diff --git a/isis/src/lro/objs/LroNarrowAngleCamera/LroNarrowAngleCamera.h b/isis/src/lro/objs/LroNarrowAngleCamera/LroNarrowAngleCamera.h index fe0a49c27a..6ac883e8d5 100644 --- a/isis/src/lro/objs/LroNarrowAngleCamera/LroNarrowAngleCamera.h +++ b/isis/src/lro/objs/LroNarrowAngleCamera/LroNarrowAngleCamera.h @@ -1,24 +1,13 @@ #ifndef LroNarrowAngleCamera_h #define LroNarrowAngleCamera_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "LineScanCamera.h" @@ -26,8 +15,8 @@ namespace Isis { /** * @brief LRO Narrow Angle Camera Model * - * This is the camera model for the Lunar Reconnaissance Orbiter narrow angle - * camera. + * This is the camera model for the Lunar Reconnaissance Orbiter narrow angle + * camera. * * @ingroup SpiceInstrumentsAndCameras * @ingroup LunarReconnaissanceOrbiter @@ -45,7 +34,7 @@ namespace Isis { * @history 2015-08-14 Ian Humphrey and Makayla Shepherd - Added new data members and methods * to get spacecraft and instrument names. Extended unit test to test * added methods and added test data for LRO NACL. - * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument + * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument * members and methods and removed implementation of these methods * since Camera now handles this. References #2335. */ @@ -58,24 +47,24 @@ namespace Isis { /** * CK frame ID - - Instrument Code from spacit run on CK - * - * @return @b int The appropriate instrument code for the "Camera-matrix" + * + * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Frame ID */ virtual int CkFrameId() const { return (-85000); } - /** + /** * CK Reference ID - J2000 - * + * * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Reference ID */ virtual int CkReferenceId() const { return (1); } - /** + /** * SPK Reference ID - J2000 - * - * @return @b int The appropriate instrument code for the Spacecraft + * + * @return @b int The appropriate instrument code for the Spacecraft * Kernel Reference ID */ virtual int SpkReferenceId() const { return (1); } diff --git a/isis/src/lro/objs/LroNarrowAngleCamera/LroNarrowAngleDistortionMap.cpp b/isis/src/lro/objs/LroNarrowAngleCamera/LroNarrowAngleDistortionMap.cpp index 25213ec273..d27e4671f4 100644 --- a/isis/src/lro/objs/LroNarrowAngleCamera/LroNarrowAngleDistortionMap.cpp +++ b/isis/src/lro/objs/LroNarrowAngleCamera/LroNarrowAngleDistortionMap.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include "IString.h" @@ -39,7 +28,7 @@ namespace Isis { } /** - * @param naifIkCode + * @param naifIkCode */ void LroNarrowAngleDistortionMap::SetDistortion(const int naifIkCode) { QString odkkey = "INS" + toString(naifIkCode) + "_OD_K"; @@ -137,7 +126,7 @@ namespace Isis { yprevious = yt; } - + if(bConverged) { p_focalPlaneX = p_undistortedFocalPlaneX; p_focalPlaneY = ydistorted; diff --git a/isis/src/lro/objs/LroNarrowAngleCamera/LroNarrowAngleDistortionMap.h b/isis/src/lro/objs/LroNarrowAngleCamera/LroNarrowAngleDistortionMap.h index 998c0eb96f..cac74319a1 100644 --- a/isis/src/lro/objs/LroNarrowAngleCamera/LroNarrowAngleDistortionMap.h +++ b/isis/src/lro/objs/LroNarrowAngleCamera/LroNarrowAngleDistortionMap.h @@ -1,31 +1,20 @@ #ifndef LroNarrowAngleDistortionMap_h #define LroNarrowAngleDistortionMap_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include "CameraDistortionMap.h" namespace Isis { - /** + /** * Distort/undistort focal plane coordinates * * Creates a map for adding/removing optical distortions @@ -40,14 +29,14 @@ namespace Isis { * @internal * @history 2010-05-10 Ken Edmundson - Corrected computation of distorted * and undistorted locations - * @history 2010-08-21 Kris Becker - Changed the sign of the distortion + * @history 2010-08-21 Kris Becker - Changed the sign of the distortion * parameter to match the calibration report. The LRO/LROC IK * lro_lroc_v14.ti and above contain the appropriate parameters * to coincide with the code change made here. IMPORTANT: This * results in Version = 2 of the LroNarrowAngleCamera as depicted * in the Camera.plugin for both NAC-L and NAC-R. * @history 2011-05-03 Jeannie Walldren - Removed Lro namespace wrap. - * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis + * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis * coding standards. References #972. */ class LroNarrowAngleDistortionMap : public CameraDistortionMap { diff --git a/isis/src/lro/objs/LroNarrowAngleCamera/unitTest.cpp b/isis/src/lro/objs/LroNarrowAngleCamera/unitTest.cpp index 1eaecbd66f..d59ce9b3dc 100644 --- a/isis/src/lro/objs/LroNarrowAngleCamera/unitTest.cpp +++ b/isis/src/lro/objs/LroNarrowAngleCamera/unitTest.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -50,60 +39,60 @@ int main(void) { double knownLon = 353.9497987082821737; Cube c("$ISISTESTDATA/isis/src/lro/unitTestData/M111607830RE_crop.cub", "r"); Camera *cam = CameraFactory::Create(c); - + cout << "FileName: " << FileName(c.fileName()).name() << endl; cout << "CK Frame: " << cam->instrumentRotation()->Frame() << endl << endl; cout.setf(std::ios::fixed); cout << setprecision(9); - + // Test kernel IDs cout << "Kernel IDs: " << endl; cout << "CK Frame ID = " << cam->CkFrameId() << endl; cout << "CK Reference ID = " << cam->CkReferenceId() << endl; cout << "SPK Target ID = " << cam->SpkTargetId() << endl; cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl; - + // Test all four corners to make sure the conversions are right cout << "For upper left corner ..." << endl; TestLineSamp(cam, 1.0, 1.0); - + cout << "For upper right corner ..." << endl; TestLineSamp(cam, cam->Samples(), 1.0); - + cout << "For lower left corner ..." << endl; TestLineSamp(cam, 1.0, cam->Lines()); - + cout << "For lower right corner ..." << endl; TestLineSamp(cam, cam->Samples(), cam->Lines()); - + double samp = cam->Samples() / 2; double line = cam->Lines() / 2; cout << "For center pixel position ..." << endl; - + if(!cam->SetImage(samp, line)) { cout << "ERROR" << endl; return 0; } - + if(abs(cam->UniversalLatitude() - knownLat) < 1E-10) { cout << "Latitude OK" << endl; } else { cout << setprecision(16) << "Latitude off by: " << cam->UniversalLatitude() - knownLat << endl; } - + if(abs(cam->UniversalLongitude() - knownLon) < 1E-10) { cout << "Longitude OK" << endl; } else { cout << setprecision(16) << "Longitude off by: " << cam->UniversalLongitude() - knownLon << endl; - } + } // Test name methods cout << endl << endl << "Testing name methods ..." << endl; QStringList files; files.append("$ISISTESTDATA/isis/src/lro/unitTestData/M111607830RE_crop.cub"); files.append("$ISISTESTDATA/isis/src/lro/unitTestData/M1153718003LE.reduced.cub"); - + for (int i = 0; i < files.size(); i++) { Cube n(files[i], "r"); Camera *nCam = CameraFactory::Create(n); @@ -112,7 +101,7 @@ int main(void) { cout << "Instrument Name Long: " << nCam->instrumentNameLong() << endl; cout << "Instrument Name Short: " << nCam->instrumentNameShort() << endl << endl; } - + // Test exception: camera is not a supported Kaguya camera cout << endl << "Testing exceptions:" << endl << endl; Cube test("$ISISTESTDATA/isis/src/hayabusa/unitTestData/st_2530292409_v.cub", "r"); @@ -143,4 +132,3 @@ void TestLineSamp(Camera *cam, double samp, double line) { cout << "DeltaLine = ERROR" << endl << endl; } } - diff --git a/isis/src/lro/objs/LroWideAngleCamera/LroWideAngleCamera.cpp b/isis/src/lro/objs/LroWideAngleCamera/LroWideAngleCamera.cpp index 7abac288b2..af580bf7ae 100644 --- a/isis/src/lro/objs/LroWideAngleCamera/LroWideAngleCamera.cpp +++ b/isis/src/lro/objs/LroWideAngleCamera/LroWideAngleCamera.cpp @@ -1,22 +1,10 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "LroWideAngleCamera.h" #include "LroWideAngleCameraFocalPlaneMap.h" @@ -54,10 +42,10 @@ namespace Isis { PushFrameCamera(cube) { NaifStatus::CheckErrors(); - + m_spacecraftNameLong = "Lunar Reconnaissance Orbiter"; m_spacecraftNameShort = "LRO"; - + // Set up the camera characteristics instrumentRotation()->SetFrame(naifIkCode()); SetFocalLength(); @@ -263,7 +251,7 @@ namespace Isis { LroWideAngleCameraFocalPlaneMap *fplane = (LroWideAngleCameraFocalPlaneMap *) FocalPlaneMap(); fplane->setBand(vband); - fplane->SetDetectorOrigin(p_boreSightSample[vband-1] + 1.0, + fplane->SetDetectorOrigin(p_boreSightSample[vband-1] + 1.0, p_boreSightLine[vband-1] + 1.0); LroWideAngleCameraDistortionMap *distort = (LroWideAngleCameraDistortionMap *) DistortionMap(); @@ -330,8 +318,8 @@ namespace Isis { /** * CK frame ID - - Instrument Code from spacit run on CK - * - * @return @b int The appropriate instrument code for the "Camera-matrix" + * + * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Frame ID */ int LroWideAngleCamera::CkFrameId() const { @@ -340,9 +328,9 @@ namespace Isis { - /** + /** * CK Reference ID - J2000 - * + * * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Reference ID */ @@ -352,10 +340,10 @@ namespace Isis { - /** + /** * SPK Reference ID - J2000 - * - * @return @b int The appropriate instrument code for the Spacecraft + * + * @return @b int The appropriate instrument code for the Spacecraft * Kernel Reference ID */ int LroWideAngleCamera::SpkReferenceId() const { diff --git a/isis/src/lro/objs/LroWideAngleCamera/LroWideAngleCamera.h b/isis/src/lro/objs/LroWideAngleCamera/LroWideAngleCamera.h index f25693940d..5253125e45 100644 --- a/isis/src/lro/objs/LroWideAngleCamera/LroWideAngleCamera.h +++ b/isis/src/lro/objs/LroWideAngleCamera/LroWideAngleCamera.h @@ -1,24 +1,13 @@ #ifndef LroWideAngleCamera_h #define LroWideAngleCamera_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "PushFrameCamera.h" diff --git a/isis/src/lro/objs/LroWideAngleCamera/LroWideAngleCameraDistortionMap.cpp b/isis/src/lro/objs/LroWideAngleCamera/LroWideAngleCameraDistortionMap.cpp index dcbf8061a7..ba1be82ce9 100644 --- a/isis/src/lro/objs/LroWideAngleCamera/LroWideAngleCameraDistortionMap.cpp +++ b/isis/src/lro/objs/LroWideAngleCamera/LroWideAngleCameraDistortionMap.cpp @@ -1,25 +1,11 @@ -/** - * @file - * $Revision: 1.5 $ - * $Date: 2010/05/12 23:28:12 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -44,32 +30,32 @@ namespace Isis { * (either 1 or -1) * */ - LroWideAngleCameraDistortionMap::LroWideAngleCameraDistortionMap(Camera *parent, - int naifIkCode) : + LroWideAngleCameraDistortionMap::LroWideAngleCameraDistortionMap(Camera *parent, + int naifIkCode) : CameraDistortionMap(parent) { SetDistortion(naifIkCode); } /** - * @brief Add an additional set of parameters for a given LROC/WAC filter - * - * This method will read the parameters for LROC/WAC filter as indicated by the - * IK code provided. It will create a vector of these parameters and append them - * to the band list. - * - * The filters added should correspond directly to the order in which the - * filters are physically stored in the ISIS cube (or the virtually selected - * bands). - * + * @brief Add an additional set of parameters for a given LROC/WAC filter + * + * This method will read the parameters for LROC/WAC filter as indicated by the + * IK code provided. It will create a vector of these parameters and append them + * to the band list. + * + * The filters added should correspond directly to the order in which the + * filters are physically stored in the ISIS cube (or the virtually selected + * bands). + * * @author 2013-03-07 Kris Becker - * + * * @param naifIkCode NAIF IK code for the desired filter to add. */ void LroWideAngleCameraDistortionMap::addFilter(int naifIkCode) { QString odkkey = "INS" + QString::number(naifIkCode) + "_OD_K"; - - std::vector v_odk; + + std::vector v_odk; for(int i = 0; i < 3; i++) { v_odk.push_back(p_camera->getDouble(odkkey, i)); } @@ -79,15 +65,15 @@ namespace Isis { /** - * @brief Implements band-dependant distortion parameters - * - * This method should be used to switch to another band's set of distortion - * parameters. See the addFilter() method to add additional band parameters to - * this object. Note that the band number should correspond with the same order - * as they were added in the addFilter() method. - * + * @brief Implements band-dependant distortion parameters + * + * This method should be used to switch to another band's set of distortion + * parameters. See the addFilter() method to add additional band parameters to + * this object. Note that the band number should correspond with the same order + * as they were added in the addFilter() method. + * * @author 2013-03-07 Kris Becker - * + * * @param vband Band number to select. Range is 1 to Bands. */ void LroWideAngleCameraDistortionMap::setBand(int vband) { @@ -96,10 +82,10 @@ namespace Isis { " Must be <= " + QString::number(m_odkFilters.size()); throw IException(IException::Programmer, mess, _FILEINFO_); } - + // Install new parameters p_odk = m_odkFilters[vband-1]; - + return; } @@ -127,7 +113,7 @@ namespace Isis { double rr = dx * dx + dy * dy; double dr = 1.0 + dk1 * rr + dk2 * rr * rr + dk3 * rr * rr * rr; - + // This was in here when the model used to be dx/dr so that the model // would never divide by zero. if ( dr == 0.0 ) return false; diff --git a/isis/src/lro/objs/LroWideAngleCamera/LroWideAngleCameraDistortionMap.h b/isis/src/lro/objs/LroWideAngleCamera/LroWideAngleCameraDistortionMap.h index 8d21dda5c2..e053b162c2 100644 --- a/isis/src/lro/objs/LroWideAngleCamera/LroWideAngleCameraDistortionMap.h +++ b/isis/src/lro/objs/LroWideAngleCamera/LroWideAngleCameraDistortionMap.h @@ -1,30 +1,19 @@ #ifndef LroWideAngleCameraDistortionMap_h #define LroWideAngleCameraDistortionMap_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include "CameraDistortionMap.h" namespace Isis { - /** + /** * Distort/undistort focal plane coordinates * * Creates a map for adding/removing optical distortions @@ -46,7 +35,7 @@ namespace Isis { * what is reported in the calibration document); removed the * GuessDx method as it was not used; updated the UV boresight in * the IK based upon analysis of the VIS and UV. - * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis + * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis * coding standards. References #972. * @history 2011-08-30 Kris Becker - Implemented new decentering distortion * model. This becomes version 3 of the camera model diff --git a/isis/src/lro/objs/LroWideAngleCamera/LroWideAngleCameraFocalPlaneMap.cpp b/isis/src/lro/objs/LroWideAngleCamera/LroWideAngleCameraFocalPlaneMap.cpp index ef9c300a43..15e9ed93f1 100644 --- a/isis/src/lro/objs/LroWideAngleCamera/LroWideAngleCameraFocalPlaneMap.cpp +++ b/isis/src/lro/objs/LroWideAngleCamera/LroWideAngleCameraFocalPlaneMap.cpp @@ -1,25 +1,11 @@ -/** - * @file - * $Revision: 1.5 $ - * $Date: 2010/05/12 23:28:12 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include @@ -44,26 +30,26 @@ namespace Isis { * (either 1 or -1) * */ - LroWideAngleCameraFocalPlaneMap::LroWideAngleCameraFocalPlaneMap(Camera *parent, - int naifIkCode) : + LroWideAngleCameraFocalPlaneMap::LroWideAngleCameraFocalPlaneMap(Camera *parent, + int naifIkCode) : CameraFocalPlaneMap(parent, naifIkCode) { } /** - * @brief Add an additional set of parameters for a given LROC/WAC filter - * - * This method will read the parameters for LROC/WAC filter as indicated by the - * IK code provided. It will create a vector of these parameters and append them - * to the band list. - * - * The filters added should correspond directly to the order in which the - * filters are physically stored in the ISIS cube (or the virtually selected - * bands). - * + * @brief Add an additional set of parameters for a given LROC/WAC filter + * + * This method will read the parameters for LROC/WAC filter as indicated by the + * IK code provided. It will create a vector of these parameters and append them + * to the band list. + * + * The filters added should correspond directly to the order in which the + * filters are physically stored in the ISIS cube (or the virtually selected + * bands). + * * @author 2013-03-07 Kris Becker - * + * * @param naifIkCode NAIF IK code for the desired filter to add. */ void LroWideAngleCameraFocalPlaneMap::addFilter(int naifIkCode) { @@ -86,15 +72,15 @@ namespace Isis { /** - * @brief Implements band-dependant focal plane parameters - * - * This method should be used to switch to another band's set of distortion - * parameters. See the addFilter() method to add additional band parameters to - * this object. Note that the band number should correspond with the same order - * as they were added in the addFilter() method. - * + * @brief Implements band-dependant focal plane parameters + * + * This method should be used to switch to another band's set of distortion + * parameters. See the addFilter() method to add additional band parameters to + * this object. Note that the band number should correspond with the same order + * as they were added in the addFilter() method. + * * @author 2013-03-07 Kris Becker - * + * * @param vband Band number to select. Range is 1 to Bands. */ void LroWideAngleCameraFocalPlaneMap::setBand(int vband) { @@ -103,7 +89,7 @@ namespace Isis { " Must be <= " + QString::number(m_transparms.size()); throw IException(IException::Programmer, mess, _FILEINFO_); } - + // Install new parameters int iband = vband - 1; for ( int i = 0 ; i < 3 ; i++) { diff --git a/isis/src/lro/objs/LroWideAngleCamera/LroWideAngleCameraFocalPlaneMap.h b/isis/src/lro/objs/LroWideAngleCamera/LroWideAngleCameraFocalPlaneMap.h index 00f43e46bd..e08f670cd4 100644 --- a/isis/src/lro/objs/LroWideAngleCamera/LroWideAngleCameraFocalPlaneMap.h +++ b/isis/src/lro/objs/LroWideAngleCamera/LroWideAngleCameraFocalPlaneMap.h @@ -1,30 +1,19 @@ #ifndef LroWideAngleCameraFocalPlaneMap_h #define LroWideAngleCameraFocalPlaneMap_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include "CameraFocalPlaneMap.h" namespace Isis { - /** + /** * Distort/undistort focal plane coordinates * * Creates a map for adding/removing optical distortions diff --git a/isis/src/lro/objs/LroWideAngleCamera/unitTest.cpp b/isis/src/lro/objs/LroWideAngleCamera/unitTest.cpp index 83c12fce37..056c4a2c46 100644 --- a/isis/src/lro/objs/LroWideAngleCamera/unitTest.cpp +++ b/isis/src/lro/objs/LroWideAngleCamera/unitTest.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -74,14 +63,14 @@ int main(void) { cout << "CK Frame: " << cam->instrumentRotation()->Frame() << endl << endl; cout.setf(std::ios::fixed); cout << setprecision(9); - + // Test kernel IDs cout << "Kernel IDs: " << endl; cout << "CK Frame ID = " << cam->CkFrameId() << endl; cout << "CK Reference ID = " << cam->CkReferenceId() << endl; cout << "SPK Target ID = " << cam->SpkTargetId() << endl; cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl; - + // Test name methods cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl; cout << "Spacecraft Name Short: " << cam->spacecraftNameShort() << endl; @@ -123,7 +112,7 @@ int main(void) { else { cout << setprecision(16) << "Longitude off by: " << cam->UniversalLongitude() - knownLon << endl; } - + Cube c2("$ISISTESTDATA/isis/src/lro/unitTestData/out.uv.even.cub", "r"); Camera *cam2 = CameraFactory::Create(c2); // Test name methods for WAC-UV @@ -132,7 +121,7 @@ int main(void) { cout << "Spacecraft Name Short: " << cam2->spacecraftNameShort() << endl; cout << "Instrument Name Long: " << cam2->instrumentNameLong() << endl; cout << "Instrument Name Short: " << cam2->instrumentNameShort() << endl << endl; - + // Test exceptions for determining names cout << endl << "Testing exceptions ..." << endl << endl; Cube test("$ISISTESTDATA/isis/src/hayabusa/unitTestData/st_2530292409_v.cub", "r"); @@ -163,4 +152,3 @@ void TestLineSamp(Camera *cam, double samp, double line) { cout << "DeltaLine = ERROR" << endl << endl; } } - diff --git a/isis/src/lro/objs/MiniRF/MiniRF.cpp b/isis/src/lro/objs/MiniRF/MiniRF.cpp index 7be25f1d12..6e408c080b 100644 --- a/isis/src/lro/objs/MiniRF/MiniRF.cpp +++ b/isis/src/lro/objs/MiniRF/MiniRF.cpp @@ -1,24 +1,11 @@ -/** - * @file - * $Revision: 1.7 $ - * $Date: 2010/03/27 06:46:58 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "MiniRF.h" #include @@ -50,7 +37,7 @@ namespace Isis { * value to pass into Spice::CreateCache() method. */ MiniRF::MiniRF(Isis::Cube &cube) : Isis::RadarCamera(cube) { - + // LRO MiniRF naif instrument code = -85700 if (naifIkCode() == -85700) { m_instrumentNameLong = "Miniature Radio Frequency"; diff --git a/isis/src/lro/objs/MiniRF/MiniRF.h b/isis/src/lro/objs/MiniRF/MiniRF.h index ad07a18ed0..b2b5015fff 100644 --- a/isis/src/lro/objs/MiniRF/MiniRF.h +++ b/isis/src/lro/objs/MiniRF/MiniRF.h @@ -1,26 +1,14 @@ #ifndef MiniRF_h #define MiniRF_h -/** - * @file - * $Revision: 1.5 $ - * $Date: 2010/03/27 06:46:58 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "RadarCamera.h" namespace Isis { @@ -46,24 +34,24 @@ namespace Isis { * @history 2009-08-05 Debbie A. Cook - corrected altitude in tolerance * calculation * @history 2009-10-16 Debbie A. Cook - fixed the rotation of the velocity vector - * @history 2009-11-03 Debbie A. Cook - added RadarGroundMap method calls to set radar + * @history 2009-11-03 Debbie A. Cook - added RadarGroundMap method calls to set radar * parameters - * @history 2010-03-19 Debbie A. Cook - removed unit change of rangeResolution so range_sigma + * @history 2010-03-19 Debbie A. Cook - removed unit change of rangeResolution so range_sigma * works on meters instead of km * @history 2011-05-03 Jeannie Walldren - Updated unitTest to test for new * methods. Updated documentation. Removed Lro namespace wrap * inside Isis namespace wrap. Added Isis Disclaimer to files. * Added NAIF error check to constructor. - * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis + * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis * coding standards. References #972. * @history 2015-08-12 Ian Humphrey and Makayla Shepherd - Added new data members and methods * to get spacecraft and instrument names. Extended unit test to test * these methods. - * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument + * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument * members and methods and removed implementation of these methods * since Camera now handles this. References #2335. * @history 2016-08-01 Kristin Berry - Added to unitTest to test camera model performance on - * level 2 cubes and to test RA/DEC values. References #2400. + * level 2 cubes and to test RA/DEC values. References #2400. */ class MiniRF : public RadarCamera { public: @@ -76,18 +64,18 @@ namespace Isis { virtual int CkReferenceId() const; - /** + /** * SPK Target Body ID - Lunar Reconnaissance Orbiter spacecraft - * - * @return @b int The appropriate instrument code for the Spacecraft + * + * @return @b int The appropriate instrument code for the Spacecraft * Kernel Target ID */ virtual int SpkTargetId() const { return (-85); } - /** + /** * SPK Reference ID - J2000 - * - * @return @b int The appropriate instrument code for the Spacecraft + * + * @return @b int The appropriate instrument code for the Spacecraft * Kernel Reference ID */ virtual int SpkReferenceId() const { return (1); } diff --git a/isis/src/lro/objs/MiniRF/unitTest.cpp b/isis/src/lro/objs/MiniRF/unitTest.cpp index a3b2072e49..4ced858c07 100644 --- a/isis/src/lro/objs/MiniRF/unitTest.cpp +++ b/isis/src/lro/objs/MiniRF/unitTest.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include diff --git a/isis/src/lro/objs/PhotometricFunction/PhotometricFunction.cpp b/isis/src/lro/objs/PhotometricFunction/PhotometricFunction.cpp index 87cdd9e97e..c90dd5c83e 100644 --- a/isis/src/lro/objs/PhotometricFunction/PhotometricFunction.cpp +++ b/isis/src/lro/objs/PhotometricFunction/PhotometricFunction.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include diff --git a/isis/src/lro/objs/PhotometricFunction/PhotometricFunction.h b/isis/src/lro/objs/PhotometricFunction/PhotometricFunction.h index bd071a74b3..68037bc5fe 100644 --- a/isis/src/lro/objs/PhotometricFunction/PhotometricFunction.h +++ b/isis/src/lro/objs/PhotometricFunction/PhotometricFunction.h @@ -1,6 +1,14 @@ #ifndef PhotometricFunction_h #define PhotometricFunction_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IString.h" #include "Camera.h" #include "DbProfile.h" @@ -13,14 +21,14 @@ namespace Isis { /** - * @brief Implement templatized MIN fumnction + * @brief Implement templatized MIN fumnction * * Returns mininum value of both inputs of a specific type * * @param A first constant value of a type for comparison * @param B second constant value of a type for comparison - * - * @return @b T type value + * + * @return @b T type value * */ template inline T MIN( const T &A, const T &B ) { @@ -32,15 +40,15 @@ namespace Isis { } } - /** - * @brief Implement templatized MAX fumnction + /** + * @brief Implement templatized MAX fumnction * * Returns maximum value of both inputs of a specifific type * * @param A first constant value of a type for comparison * @param B second constant value of a type for comparison * - * @return @b T type value + * @return @b T type value * */ template inline T MAX( const T &A, const T &B ) { diff --git a/isis/src/mariner/apps/mar102isis/main.cpp b/isis/src/mariner/apps/mar102isis/main.cpp index 531aa4e746..28fa3b415b 100644 --- a/isis/src/mariner/apps/mar102isis/main.cpp +++ b/isis/src/mariner/apps/mar102isis/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "Cube.h" diff --git a/isis/src/mariner/apps/mar10cal/main.cpp b/isis/src/mariner/apps/mar10cal/main.cpp index 2adcb8f258..9f7adbbe04 100644 --- a/isis/src/mariner/apps/mar10cal/main.cpp +++ b/isis/src/mariner/apps/mar10cal/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include diff --git a/isis/src/mariner/apps/mar10clean/main.cpp b/isis/src/mariner/apps/mar10clean/main.cpp index e06a2f5e7c..099e8993cb 100644 --- a/isis/src/mariner/apps/mar10clean/main.cpp +++ b/isis/src/mariner/apps/mar10clean/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "Chip.h" @@ -96,4 +104,3 @@ void IsisMain() { cout << p; p.Run(); } - diff --git a/isis/src/mariner/apps/mar10nonoise/main.cpp b/isis/src/mariner/apps/mar10nonoise/main.cpp index 9067a9233e..ef8b448d9d 100644 --- a/isis/src/mariner/apps/mar10nonoise/main.cpp +++ b/isis/src/mariner/apps/mar10nonoise/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "Cube.h" @@ -103,4 +111,3 @@ void IsisMain() { p.Run(); } - diff --git a/isis/src/mariner/apps/mar10restore/main.cpp b/isis/src/mariner/apps/mar10restore/main.cpp index 82299f8001..f5c87964fd 100644 --- a/isis/src/mariner/apps/mar10restore/main.cpp +++ b/isis/src/mariner/apps/mar10restore/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "Chip.h" @@ -136,5 +144,3 @@ void IsisMain() { p.Run(); } - - diff --git a/isis/src/mariner/objs/Mariner10Camera/Mariner10Camera.cpp b/isis/src/mariner/objs/Mariner10Camera/Mariner10Camera.cpp index f62675f9a1..5dbf4e458a 100644 --- a/isis/src/mariner/objs/Mariner10Camera/Mariner10Camera.cpp +++ b/isis/src/mariner/objs/Mariner10Camera/Mariner10Camera.cpp @@ -1,24 +1,10 @@ -/** - * @file - * $Revision: 1.6 $ - * $Date: 2010/06/29 18:16:39 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "Mariner10Camera.h" @@ -58,7 +44,7 @@ namespace Isis { */ Mariner10Camera::Mariner10Camera(Cube &cube) : FramingCamera(cube) { NaifStatus::CheckErrors(); - + m_spacecraftNameLong = "Mariner 10"; m_spacecraftNameShort = "Mariner10"; @@ -132,7 +118,7 @@ namespace Isis { NaifStatus::CheckErrors(); } - + /** * Returns the shutter open and close times. The user should pass in the * ExposureDuration keyword value, converted from milliseconds to seconds, and diff --git a/isis/src/mariner/objs/Mariner10Camera/Mariner10Camera.h b/isis/src/mariner/objs/Mariner10Camera/Mariner10Camera.h index ddc275a8b7..3322e6b4d1 100644 --- a/isis/src/mariner/objs/Mariner10Camera/Mariner10Camera.h +++ b/isis/src/mariner/objs/Mariner10Camera/Mariner10Camera.h @@ -1,26 +1,13 @@ #ifndef Mariner10Camera_h #define Mariner10Camera_h -/** - * @file - * $Revision: 1.5 $ - * $Date: 2010/06/29 18:16:39 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "FramingCamera.h" @@ -51,12 +38,12 @@ namespace Isis { * method. Updated unitTest to test for new methods. * Updated documentation. Added Isis Disclaimer to * files. Added NAIF error check to constructor. - * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis + * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis * coding standards. References #972. * @history 2015-08-25 Ian Humphrey and Makayla Shepherd - Added new data members and methods * to get spacecraft and instrument names. Extended unit test to test * these methods. - * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument + * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument * members and methods and removed implementation of these methods * since Camera now handles this. References #2335. */ @@ -65,29 +52,29 @@ namespace Isis { Mariner10Camera(Cube &cube); //! Destroys the Mariner10Camera Object ~Mariner10Camera() {}; - virtual std::pair ShutterOpenCloseTimes(double time, + virtual std::pair ShutterOpenCloseTimes(double time, double exposureDuration); /** * CK frame ID - - Instrument Code from spacit run on CK - * - * @return @b int The appropriate instrument code for the "Camera-matrix" + * + * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Frame ID */ virtual int CkFrameId() const { return (-76000); } - /** + /** * CK Reference ID - J2000 - * + * * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Reference ID */ virtual int CkReferenceId() const { return (1); } - /** + /** * SPK Reference ID - J2000 - * - * @return @b int The appropriate instrument code for the Spacecraft + * + * @return @b int The appropriate instrument code for the Spacecraft * Kernel Reference ID */ virtual int SpkReferenceId() const { return (1); } diff --git a/isis/src/mariner/objs/Mariner10Camera/unitTest.cpp b/isis/src/mariner/objs/Mariner10Camera/unitTest.cpp index 6f1618e008..7422c365cd 100644 --- a/isis/src/mariner/objs/Mariner10Camera/unitTest.cpp +++ b/isis/src/mariner/objs/Mariner10Camera/unitTest.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -82,16 +71,16 @@ int main(void) { cout << "CK Reference ID = " << cam->CkReferenceId() << endl; cout << "SPK Target ID = " << cam->SpkTargetId() << endl; cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl; - + // Test name methods cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl; cout << "Spacecraft Name Short: " << cam->spacecraftNameShort() << endl; cout << "Instrument Name Long: " << cam->instrumentNameLong() << endl; cout << "Instrument Name Short: " << cam->instrumentNameShort() << endl << endl; - // Test Shutter Open/Close + // Test Shutter Open/Close const PvlGroup &inst = c.label()->findGroup("Instrument", Pvl::Traverse); - double exposureDuration = ((double) inst["ExposureDuration"])/1000; + double exposureDuration = ((double) inst["ExposureDuration"])/1000; QString stime = inst["StartTime"]; double et; // StartTime keyword is the center exposure time str2et_c(stime.toLatin1().data(), &et); @@ -136,7 +125,7 @@ int main(void) { } cout << endl << "--------------------------------------------" << endl; } - + // Test exception: camera is not a supported Kaguya camera cout << endl << "Testing exceptions:" << endl << endl; Cube test("$ISISTESTDATA/isis/src/hayabusa/unitTestData/st_2530292409_v.cub", "r"); @@ -167,4 +156,3 @@ void TestLineSamp(Camera *cam, double samp, double line) { cout << "DeltaLine = ERROR" << endl << endl; } } - diff --git a/isis/src/mer/apps/mer2isis/main.cpp b/isis/src/mer/apps/mer2isis/main.cpp index 8088090312..cebebc7c72 100644 --- a/isis/src/mer/apps/mer2isis/main.cpp +++ b/isis/src/mer/apps/mer2isis/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "ProcessImportPds.h" diff --git a/isis/src/mer/apps/mical/MiCalibration.cpp b/isis/src/mer/apps/mical/MiCalibration.cpp index 22c28c27cb..30effa4765 100644 --- a/isis/src/mer/apps/mical/MiCalibration.cpp +++ b/isis/src/mer/apps/mical/MiCalibration.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include "MiCalibration.h" @@ -136,5 +144,3 @@ namespace Isis { } } - - diff --git a/isis/src/mer/apps/mical/MiCalibration.h b/isis/src/mer/apps/mical/MiCalibration.h index 86f9d89d06..c895684f2c 100644 --- a/isis/src/mer/apps/mical/MiCalibration.h +++ b/isis/src/mer/apps/mical/MiCalibration.h @@ -1,6 +1,14 @@ #ifndef MiCalibration_h #define MiCalibration_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Cube.h" #include "Pvl.h" #include "Statistics.h" diff --git a/isis/src/mer/apps/mical/main.cpp b/isis/src/mer/apps/mical/main.cpp index 80585a8fd0..ac085dc3c7 100644 --- a/isis/src/mer/apps/mical/main.cpp +++ b/isis/src/mer/apps/mical/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #define GUIHELPERS #include "Isis.h" diff --git a/isis/src/messenger/apps/mdis2isis/main.cpp b/isis/src/messenger/apps/mdis2isis/main.cpp index 30998a8688..5a8b1e769d 100644 --- a/isis/src/messenger/apps/mdis2isis/main.cpp +++ b/isis/src/messenger/apps/mdis2isis/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + // $Id: mdis2isis.cpp 5059 2013-03-11 16:37:00Z slambright@GS.DOI.NET $ #include "Isis.h" @@ -287,7 +295,7 @@ int CreateFilterSpecs(const QString &instId, int filter_code, } else if(instId == "MDIS-WAC") { // Set up WAC calibration file - FileName calibFile("$messenger/calibration/mdisCalibration????.trn"); + FileName calibFile("$messenger/calibration/mdisCalibration????.trn"); calibFile = calibFile.highestVersion(); Pvl config(calibFile.expanded()); diff --git a/isis/src/messenger/apps/mdis2pds/main.cpp b/isis/src/messenger/apps/mdis2pds/main.cpp index c6f4b2bdb3..b835412fd0 100644 --- a/isis/src/messenger/apps/mdis2pds/main.cpp +++ b/isis/src/messenger/apps/mdis2pds/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include diff --git a/isis/src/messenger/apps/mdiscal/DarkModelPixel.h b/isis/src/messenger/apps/mdiscal/DarkModelPixel.h index 0906c4ee3a..7f69b253f8 100644 --- a/isis/src/messenger/apps/mdiscal/DarkModelPixel.h +++ b/isis/src/messenger/apps/mdiscal/DarkModelPixel.h @@ -1,27 +1,14 @@ #ifndef DarkModelPixel_h #define DarkModelPixel_h -/** - * @file - * $Revision: 6403 $ - * $Date: 2015-10-23 12:32:20 -0700 (Fri, 23 Oct 2015) $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -37,7 +24,7 @@ namespace Isis { /** * @author ????-??-?? Unknown * - * @internal + * @internal * @history 2015-09-01 Jeannie Backer - Brought code closer to coding standards. */ class DarkModelPixel { @@ -158,4 +145,3 @@ namespace Isis { }; #endif - diff --git a/isis/src/messenger/apps/mdiscal/MdisCalUtils.h b/isis/src/messenger/apps/mdiscal/MdisCalUtils.h index b8a6e38ff7..04694ce267 100644 --- a/isis/src/messenger/apps/mdiscal/MdisCalUtils.h +++ b/isis/src/messenger/apps/mdiscal/MdisCalUtils.h @@ -1,27 +1,14 @@ #ifndef MdisCalUtils_h #define MdisCalUtils_h -/** - * @file - * $Revision: 6715 $ - * $Date: 2016-04-28 10:58:43 -0700 (Thu, 28 Apr 2016) $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include @@ -260,30 +247,30 @@ namespace Isis { } /** - * @brief Load and retrieve empirical correction factor - * - * This function determines the empirical correction factor for changes that - * that occured on the spacecraft after Mercury orbit insertion. The - * affected dates are May 24, 2011 to January 3, 2012. - * - * The table of correction factors is expected to be stored in - * $messenger/calibration/events/event_table_ratioed_v?.txt. However, the - * caller may provide a table that conforms to the expected format. The + * @brief Load and retrieve empirical correction factor + * + * This function determines the empirical correction factor for changes that + * that occured on the spacecraft after Mercury orbit insertion. The + * affected dates are May 24, 2011 to January 3, 2012. + * + * The table of correction factors is expected to be stored in + * $messenger/calibration/events/event_table_ratioed_v?.txt. However, the + * caller may provide a table that conforms to the expected format. The * expected format for the empirical correction file is a comma separated value - * (CSV) table that contains 13 columns of data per row. The first column is - * the UTC time during the event. The next 12 columns contain multiplicative - * correction factors for each WAC filter (NAC correction factors are not - * provided). These factors are expected to be around 1.0 (the default) as it - * is expected to directly scale DN values. - * - * Below is the expected mapping of column indexes to filter numbers as - * specfied in the BandBin/Number keyword from MDIS ISIS cube labels. Index is - * the column index from each row for a given filter, Number is the value of - * the BandBin/Number keyword from the label designating the filter number + * (CSV) table that contains 13 columns of data per row. The first column is + * the UTC time during the event. The next 12 columns contain multiplicative + * correction factors for each WAC filter (NAC correction factors are not + * provided). These factors are expected to be around 1.0 (the default) as it + * is expected to directly scale DN values. + * + * Below is the expected mapping of column indexes to filter numbers as + * specfied in the BandBin/Number keyword from MDIS ISIS cube labels. Index is + * the column index from each row for a given filter, Number is the value of + * the BandBin/Number keyword from the label designating the filter number * (corresponding to the filter parameter passed to this routine) and Letter is - * the filter letter designation used in the last alpha numeric character in - * MDIS filenames: - * + * the filter letter designation used in the last alpha numeric character in + * MDIS filenames: + * * Index Number Letter Wavelength * 1 6 F 430 nm * 2 3 C 480 nm @@ -297,41 +284,41 @@ namespace Isis { * 10 2 B Filter 2 (clear) * 11 8 H Filter 8 (950 nm) * 12 11 K Filter 11 (1010 nm) - * - * The UTC dates in the first column are assumed to be strictly increasing in - * time. The initial table (*_v2) contains dates that span the complete - * expected timeframe of the mission (launch at 2004-08-04T10:00:00.000000, - * termination at 2015-01-03T09:00:00.000000). - * - * The spacecraft clock time is provided as input (scStartTime) to this - * function. This value is converted to ET (SCET) and used to determine the - * corresponding event time in the first column of the table. The first table - * column time is represented in UTC time. This time is converted to ET and - * then compared with the start time in ET. - * - * The algorithm searches linearly through the table essentially storing the - * time slot prior to the SCET and the next occuring one. Ultimately, the - * factor returned by the algorithm is the one whose event time is closest to - * the SCET. - * + * + * The UTC dates in the first column are assumed to be strictly increasing in + * time. The initial table (*_v2) contains dates that span the complete + * expected timeframe of the mission (launch at 2004-08-04T10:00:00.000000, + * termination at 2015-01-03T09:00:00.000000). + * + * The spacecraft clock time is provided as input (scStartTime) to this + * function. This value is converted to ET (SCET) and used to determine the + * corresponding event time in the first column of the table. The first table + * column time is represented in UTC time. This time is converted to ET and + * then compared with the start time in ET. + * + * The algorithm searches linearly through the table essentially storing the + * time slot prior to the SCET and the next occuring one. Ultimately, the + * factor returned by the algorithm is the one whose event time is closest to + * the SCET. + * * The empirical correction model and algorithm was developed by * Mary Ruth Keller of JHA/APL. * * @author Kris Becker - 10/23/2012 - * + * * @param scStartTime - Start time of the image in SCLK format * @param filter - WAC filter number to return event correction factor for - * @param ename - Returns the name of the event table file if not + * @param ename - Returns the name of the event table file if not * provided by caller. If non-empty string is passed by * caller, it is assumed to be a fully qualified filename * of the event table. - * @param eDate - Returns the UTC date entry of the selected correction + * @param eDate - Returns the UTC date entry of the selected correction * event factor - * - * @return double - Event correction factor at the selected time to apply + * + * @return double - Event correction factor at the selected time to apply * to WAC filter data. */ - double loadEmpiricalCorrection(const QString &scStartTime, const int filter, + double loadEmpiricalCorrection(const QString &scStartTime, const int filter, QString &ename, QString &eDate) { // This table maps the filter number extracted from BandBin/Number keyword @@ -351,9 +338,9 @@ namespace Isis { // Ensure we have a valid filter number if (column <= 0) { std::ostringstream mess; - mess << "Invalid MDIS WAC filter number (" << filter + mess << "Invalid MDIS WAC filter number (" << filter << " - range:1-12) for determining index into empirical correction table."; - throw IException(IException::User, mess.str(), _FILEINFO_); + throw IException(IException::User, mess.str(), _FILEINFO_); } // File name not provided by caller. Determine the event table name @@ -369,7 +356,7 @@ namespace Isis { const int skip = 0; // No lines to skip to data const int nvalues = 13; // Expected columns in table CSVReader csv(csvfile.expanded(), header, skip); - if (csv.columns() < nvalues) { // All rows should have same # columns + if (csv.columns() < nvalues) { // All rows should have same # columns QString mess = "Number values (" + QString(csv.columns()) + ") in file " + ename + " less than number requested (" + QString(nvalues) + ")!"; @@ -410,7 +397,7 @@ namespace Isis { preEventTime = eTime; evalue = toDouble(eRow[column]); } - + // Return the factor return (evalue); } diff --git a/isis/src/messenger/apps/mdiscal/main.cpp b/isis/src/messenger/apps/mdiscal/main.cpp index a7f8eeb187..92e1193d42 100644 --- a/isis/src/messenger/apps/mdiscal/main.cpp +++ b/isis/src/messenger/apps/mdiscal/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + // $Id: mdiscal.cpp 6715 2016-04-28 17:58:43Z tsucharski@GS.DOI.NET $ #include "Isis.h" diff --git a/isis/src/messenger/apps/mdisddr/main.cpp b/isis/src/messenger/apps/mdisddr/main.cpp index 7e2460c7ad..6ee844ced4 100644 --- a/isis/src/messenger/apps/mdisddr/main.cpp +++ b/isis/src/messenger/apps/mdisddr/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include diff --git a/isis/src/messenger/apps/mdisedrinfo/MdisEdrKeys.h b/isis/src/messenger/apps/mdisedrinfo/MdisEdrKeys.h index 7ecc54b0a3..3c3d48a653 100644 --- a/isis/src/messenger/apps/mdisedrinfo/MdisEdrKeys.h +++ b/isis/src/messenger/apps/mdisedrinfo/MdisEdrKeys.h @@ -1,27 +1,13 @@ #ifndef MdisEdrKeys_h #define MdisEdrKeys_h -/** - * @file - * $Revision: 1.5 $ - * $Date: 2008/09/22 20:46:27 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include @@ -351,4 +337,3 @@ namespace Isis { } // namespace Isis #endif - diff --git a/isis/src/messenger/apps/mdisedrinfo/MdisGeometry.cpp b/isis/src/messenger/apps/mdisedrinfo/MdisGeometry.cpp index 9de3a2d225..22a58cac74 100644 --- a/isis/src/messenger/apps/mdisedrinfo/MdisGeometry.cpp +++ b/isis/src/messenger/apps/mdisedrinfo/MdisGeometry.cpp @@ -1,26 +1,11 @@ -/** - * @file - * $Revision: 1.9 $ - * $Date: 2009/12/29 23:03:50 $ - * $Id: MdisGeometry.cpp,v 1.9 2009/12/29 23:03:50 ehyer Exp $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "MdisGeometry.h" #include @@ -112,7 +97,7 @@ namespace Isis { // Get the target and check for validity PvlKeyword &target = label.findKeyword("TargetName", PvlObject::Traverse); - + try { Target::lookupNaifBodyCode(target); return (true); @@ -977,7 +962,7 @@ namespace Isis { SpiceDouble stateJ[6]; // Position and velocity vector in J2000 SpiceDouble lt; spkez_c(sc , rotate->EphemerisTime(), "J2000", "LT+S", sun, stateJ, <); - NaifStatus::CheckErrors(); + NaifStatus::CheckErrors(); // Stage result and negate as it needs to be relative to Messenger vector scvel; @@ -1201,5 +1186,3 @@ namespace Isis { return (QString::fromStdString(strcnv.str().c_str())); } } // namespace Isis - - diff --git a/isis/src/messenger/apps/mdisedrinfo/MdisGeometry.h b/isis/src/messenger/apps/mdisedrinfo/MdisGeometry.h index 825926958b..6bd29e3826 100644 --- a/isis/src/messenger/apps/mdisedrinfo/MdisGeometry.h +++ b/isis/src/messenger/apps/mdisedrinfo/MdisGeometry.h @@ -1,27 +1,13 @@ #ifndef MdisGeometry_h #define MdisGeometry_h -/** - * @file - * $Revision: 1.7 $ - * $Date: 2009/09/19 00:12:10 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include @@ -64,17 +50,17 @@ namespace Isis { * Sky (it was previously only computed when the * center reference pixel intersected the target). * @history 2009-09-18 Debbie A. Cook - corrected pxlscl and explen in MdisGeometry - * @history 2012-04-06 Kris Becker - Corrected TWIST_ANGLE computation to + * @history 2012-04-06 Kris Becker - Corrected TWIST_ANGLE computation to * ensure it is restricted to the 0-360 degree domain. - * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis + * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis * coding standards. References #972.. - * @history 2012-10-11 Debbie A. Cook, Updated to use new Target class. References + * @history 2012-10-11 Debbie A. Cook, Updated to use new Target class. References * #775 and #1114. * @history 2012-11-30 Debbie A. Cook - Changed to use TProjection instead of Projection. * References #775. * @history 2015-07-22 Kristin Berry - Added NaifStatus::CheckErrors() to see if any NAIF * errors were signaled. References #2248. - * @history 2016-05-10 Jeannie Backer - Replaced call to NAIF routine bodn2c with call to static + * @history 2016-05-10 Jeannie Backer - Replaced call to NAIF routine bodn2c with call to static * method Isis::Target::lookupNaifBodyCode. Reference #3934 */ class MdisGeometry { @@ -197,4 +183,3 @@ namespace Isis { } // namespace Isis #endif - diff --git a/isis/src/messenger/apps/mdisedrinfo/SpiceManager.cpp b/isis/src/messenger/apps/mdisedrinfo/SpiceManager.cpp index 2d5ffb45fc..b2e4446326 100644 --- a/isis/src/messenger/apps/mdisedrinfo/SpiceManager.cpp +++ b/isis/src/messenger/apps/mdisedrinfo/SpiceManager.cpp @@ -1,26 +1,11 @@ -/** - * @file - * $Revision: 1.9 $ - * $Date: 2009/12/29 23:03:50 $ - * $Id: SpiceManager.cpp,v 1.9 2009/12/29 23:03:50 ehyer Exp $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include @@ -219,7 +204,7 @@ namespace Isis { * @see loadKernelFromTable() */ void SpiceManager::loadKernel(PvlKeyword &key) { - NaifStatus::CheckErrors(); + NaifStatus::CheckErrors(); for(int i = 0; i < key.size(); i++) { if(key[i] == "") continue; if(IString(key[i]).UpCase() == "NULL") continue; @@ -234,7 +219,7 @@ namespace Isis { if(_furnish) furnsh_c(fileName.toLatin1().data()); addKernelName((QString)key[i]); } - NaifStatus::CheckErrors(); + NaifStatus::CheckErrors(); } /** @@ -286,5 +271,3 @@ namespace Isis { } } // namespace Isis - - diff --git a/isis/src/messenger/apps/mdisedrinfo/SpiceManager.h b/isis/src/messenger/apps/mdisedrinfo/SpiceManager.h index 9957ff10bf..9fa41b22ae 100644 --- a/isis/src/messenger/apps/mdisedrinfo/SpiceManager.h +++ b/isis/src/messenger/apps/mdisedrinfo/SpiceManager.h @@ -1,27 +1,13 @@ #ifndef SpiceManager_h #define SpiceManager_h -/** - * @file - * $Revision: 1.3 $ - * $Date: 2007/08/23 07:15:44 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include @@ -53,7 +39,7 @@ namespace Isis { * @author 2007-08-19 Kris Becker * * @internal - * @history 2015-07-22 Kristin Berry - Added NaifStatus::CheckErrors() to see if any NAIF errors + * @history 2015-07-22 Kristin Berry - Added NaifStatus::CheckErrors() to see if any NAIF errors * were signaled. References #2248. */ class SpiceManager { @@ -92,4 +78,3 @@ namespace Isis { } // namespace Isis #endif - diff --git a/isis/src/messenger/apps/mdisedrinfo/main.cpp b/isis/src/messenger/apps/mdisedrinfo/main.cpp index 3121445a45..7eeed96b73 100644 --- a/isis/src/messenger/apps/mdisedrinfo/main.cpp +++ b/isis/src/messenger/apps/mdisedrinfo/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + // $Id: mdisedrinfo.cpp,v 1.8 2008/07/11 22:38:41 nhilt Exp $ #include "Isis.h" @@ -170,4 +178,3 @@ void IsisMain() { QString fromName(from.expanded()); if(delete_from) remove(fromName.toLatin1().data()); } - diff --git a/isis/src/messenger/apps/mdisproc/main.cpp b/isis/src/messenger/apps/mdisproc/main.cpp index 62e4ba0b73..467f19bf42 100644 --- a/isis/src/messenger/apps/mdisproc/main.cpp +++ b/isis/src/messenger/apps/mdisproc/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include diff --git a/isis/src/messenger/objs/MdisCamera/MdisCamera.cpp b/isis/src/messenger/objs/MdisCamera/MdisCamera.cpp index c120a8c2b9..ab321222b7 100644 --- a/isis/src/messenger/objs/MdisCamera/MdisCamera.cpp +++ b/isis/src/messenger/objs/MdisCamera/MdisCamera.cpp @@ -1,24 +1,10 @@ -/** - * @file - * $Revision: 6403 $ - * $Date: 2015-10-23 12:32:20 -0700 (Fri, 23 Oct 2015) $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include @@ -64,15 +50,15 @@ namespace Isis { MdisCamera::MdisCamera(Cube &cube) : FramingCamera(cube) { m_spacecraftNameLong = "Messenger"; m_spacecraftNameShort = "Messenger"; - + NaifStatus::CheckErrors(); - + // Set up detector constants // Note that Wac has filters, -236800 through -236812 // http://naif.jpl.nasa.gov/pub/naif/pds/data/mess-e_v_h-spice-6-v1.0/messsp_1000/data/ik/msgr_mdis_v160.ti const int MdisWac(-236800); const int MdisNac(-236820); - + if (naifIkCode() == MdisNac) { m_instrumentNameLong = "Mercury Dual Imaging System Narrow Angle Camera"; m_instrumentNameShort = "MDIS-NAC"; @@ -86,7 +72,7 @@ namespace Isis { msg += " is not a supported instrument kernel code for Messenger."; throw IException(IException::Programmer, msg, _FILEINFO_); } - + Pvl &lab = *cube.label(); PvlGroup &inst = lab.findGroup("Instrument", Pvl::Traverse); @@ -250,15 +236,15 @@ namespace Isis { /** * Returns the shutter open and close times. The user should pass in the * ExposureDuration keyword value, converted from milliseconds to seconds, and - * the SpacecraftClockCount keyword value, converted to ephemeris time. The - * StartTime keyword value from the labels represents the shutter open time of - * the observation. This method uses the FramingCamera class implementation, - * returning the given time value as the shutter open and the sum of the time - * value and exposure duration as the shutter close. + * the SpacecraftClockCount keyword value, converted to ephemeris time. The + * StartTime keyword value from the labels represents the shutter open time of + * the observation. This method uses the FramingCamera class implementation, + * returning the given time value as the shutter open and the sum of the time + * value and exposure duration as the shutter close. * * @param exposureDuration Exposure duration value from the labels, converted * to seconds. - * @param time The SpacecraftClockCount value from the labels, converted to + * @param time The SpacecraftClockCount value from the labels, converted to * ephemeris time * @return @b pair < @b iTime, @b iTime > The first value is the shutter * open time and the second is the shutter close time. @@ -275,32 +261,32 @@ namespace Isis { /** - * @brief Computes temperature-dependent focal length - * - * This method computes temperature dependent focal lengths based upon a 5th + * @brief Computes temperature-dependent focal length + * + * This method computes temperature dependent focal lengths based upon a 5th * order polynomial using the FocalPlaneTemperature keyword value stored in the - * ISIS label (it is the FOCAL_PLANE_TEMPERATURE PDS keyword). At the time of - * this writing, only (the two) linear terms are used. - * - * In addition, this method is initially coded to be backword compatible but - * this feature is likely to be removed when the kernels become fully adopted. - * - * IMPORTANT: The computed temperature dependent focal length is stored in the + * ISIS label (it is the FOCAL_PLANE_TEMPERATURE PDS keyword). At the time of + * this writing, only (the two) linear terms are used. + * + * In addition, this method is initially coded to be backword compatible but + * this feature is likely to be removed when the kernels become fully adopted. + * + * IMPORTANT: The computed temperature dependent focal length is stored in the * label of the cube during spiceinit. This implementation uses the special - * recording of keywords as retrieved from kernels and stores them as a string - * value so (SOCET) folks can easily read and apply the focal lengths in their - * environments. String storage is preferred over storing as double since - * these values are stored in hexidecimal format. - * + * recording of keywords as retrieved from kernels and stores them as a string + * value so (SOCET) folks can easily read and apply the focal lengths in their + * environments. String storage is preferred over storing as double since + * these values are stored in hexidecimal format. + * * @author Kris Becker (8/13/2012) * @internal * @history 2012-10-22 Kris Becker - Store temperature dependant keyword in instrument * neutral keyword called TempDependentFocalLength. - * + * * @param filterCode Integer MDIS instrument/filter code - * @param label Pvl label from cube being initialized where temperature + * @param label Pvl label from cube being initialized where temperature * keywords are extracted from. - * + * * @return double Computed temperature dependant focal length */ double MdisCamera::computeFocalLength(const QString &filterCode, @@ -334,14 +320,14 @@ namespace Isis { tdfl_disabled = false; } #endif - + // Attempt to retrieve parameters necessary for temperature-dependent focal // length and computed it if ( !tdfl_disabled ) { // Wrap a try clause all around this so that if it fails, will return // default try { - PvlGroup &inst = label.findGroup("Instrument", Pvl::Traverse); + PvlGroup &inst = label.findGroup("Instrument", Pvl::Traverse); double fpTemp = inst["FocalPlaneTemperature"]; double fl(0.0); QString fptCoeffs = "INS" + filterCode + "_FL_TEMP_COEFFS"; diff --git a/isis/src/messenger/objs/MdisCamera/MdisCamera.h b/isis/src/messenger/objs/MdisCamera/MdisCamera.h index 102bed73e7..4cd8f59755 100644 --- a/isis/src/messenger/objs/MdisCamera/MdisCamera.h +++ b/isis/src/messenger/objs/MdisCamera/MdisCamera.h @@ -1,26 +1,14 @@ #ifndef MdisCamera_h #define MdisCamera_h -/** - * @file - * $Revision: 6403 $ - * $Date: 2015-10-23 12:32:20 -0700 (Fri, 23 Oct 2015) $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "FramingCamera.h" #include @@ -37,7 +25,7 @@ namespace Isis { * file $ISISDATA/messenger/kernels/iak/mdisAddendum???.ti for details. * * @ingroup SpiceInstrumentsAndCameras - * @ingroup Messenger + * @ingroup Messenger * @see http://pds-imaging.jpl.nasa.gov/documentation/MDISEDRSIS.PDF * @see http://pds-imaging.jpl.nasa.gov/documentation/MDIS_CDR_RDRSIS.PDF * @@ -83,7 +71,7 @@ namespace Isis { * documentation. Removed Messenger namespace wrap inside Isis * namespace wrap. Added Isis Disclaimer to files. Added NAIF error * check to constructor. - * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis + * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis * coding standards. References #972. * @history 2012-07-25 Kris Becker - Added temperature dependant focal * length computation from new IK content. Fixes #922. @@ -102,7 +90,7 @@ namespace Isis { * @history 2015-10-01 Ian Humphrey and Makayla Shepherd - Updated check for Wac instrument to * include instrument codes that correspond to its filters. References * #2335. - * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument + * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument * members and methods and removed implementation of these methods * since Camera now handles this. References #2335. */ @@ -111,19 +99,19 @@ namespace Isis { MdisCamera(Cube &cube); //! Destroys the MdisCamera Object ~MdisCamera() {}; - virtual std::pair ShutterOpenCloseTimes(double time, + virtual std::pair ShutterOpenCloseTimes(double time, double exposureDuration); /** * CK frame ID - - MESSENGER instrument code (MSGR_SPACECRAFT) - * - * @return @b int The appropriate instrument code for the "Camera-matrix" + * + * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Frame ID */ virtual int CkFrameId() const { return (-236000); } - /** + /** * CK Reference ID - J2000 - * + * * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Reference ID */ @@ -135,10 +123,10 @@ namespace Isis { * Kernel Target ID */ virtual int SpkTargetId() const { return (-236); } - /** + /** * SPK Reference ID - J2000 - * - * @return @b int The appropriate instrument code for the Spacecraft + * + * @return @b int The appropriate instrument code for the Spacecraft * Kernel Reference ID */ virtual int SpkReferenceId() const { return (1); } diff --git a/isis/src/messenger/objs/MdisCamera/TaylorCameraDistortionMap.cpp b/isis/src/messenger/objs/MdisCamera/TaylorCameraDistortionMap.cpp index 001945d424..99608c0ce4 100644 --- a/isis/src/messenger/objs/MdisCamera/TaylorCameraDistortionMap.cpp +++ b/isis/src/messenger/objs/MdisCamera/TaylorCameraDistortionMap.cpp @@ -1,22 +1,10 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include "IString.h" @@ -25,13 +13,13 @@ using namespace std; namespace Isis { - /** + /** * @brief Taylor series camera distortion map constructor. * - * Create a geometric distortion model which is approximated by a third-order + * Create a geometric distortion model which is approximated by a third-order * Taylor series expansion. This class maps between distorted and undistorted - * focal plane x/y's. The default mapping is the identity, that is, the focal - * plane x/y and undistorted focal plane x/y will be identical. + * focal plane x/y's. The default mapping is the identity, that is, the focal + * plane x/y and undistorted focal plane x/y will be identical. * * @param parent the parent camera that will use this distortion map * @param zDirection the direction of the focal plane Z-axis @@ -42,7 +30,7 @@ namespace Isis { CameraDistortionMap(parent, zDirection) { } - /** + /** * @brief Load distortion coefficients. * * This method loads the distortion coefficients from the instrument @@ -81,7 +69,7 @@ namespace Isis { } } - /** + /** * @brief Compute undistorted focal plane x/y. * * Compute undistorted focal plane x/y given a distorted focal plane x/y. @@ -171,7 +159,7 @@ namespace Isis { return true; } - /** + /** * @brief Compute distorted focal plane x/y. * * Compute distorted focal plane x/y given an undistorted focal plane x/y. @@ -291,4 +279,3 @@ namespace Isis { * Please direct questions to * Lillian Nguyen, JHUAPL, (443)778-5477, Lillian.Nguyen@jhuapl.edu */ - diff --git a/isis/src/messenger/objs/MdisCamera/TaylorCameraDistortionMap.h b/isis/src/messenger/objs/MdisCamera/TaylorCameraDistortionMap.h index d2d838ae1a..85f7adbf33 100644 --- a/isis/src/messenger/objs/MdisCamera/TaylorCameraDistortionMap.h +++ b/isis/src/messenger/objs/MdisCamera/TaylorCameraDistortionMap.h @@ -1,24 +1,13 @@ #ifndef TaylorCameraDistortionMap_h #define TaylorCameraDistortionMap_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #ifndef CameraDistortionMap_h #include "CameraDistortionMap.h" @@ -29,12 +18,12 @@ namespace Isis { /** Distort/undistort focal plane coordinates * * Creates a map for adding/removing optical distortions - * from the focal plane of a camera. This class describes a non-radial - * distortion map. The distortion map is a third-order Taylor series expansion - * of a generic function. + * from the focal plane of a camera. This class describes a non-radial + * distortion map. The distortion map is a third-order Taylor series expansion + * of a generic function. * * @ingroup SpiceInstrumentsAndCameras - * @ingroup Messenger + * @ingroup Messenger * * @see MdisCamera * @see CameraDistortionMap @@ -45,7 +34,7 @@ namespace Isis { * @history 2011-05-03 Jeannie Walldren - Added Isis disclaimer. * @history 2011-05-23 Janet Barrett and Steven Lambright - Spice::GetDouble * is no longer a static call. - * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis + * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis * coding standards. References #972 */ class TaylorCameraDistortionMap : public CameraDistortionMap { diff --git a/isis/src/messenger/objs/MdisCamera/unitTest.cpp b/isis/src/messenger/objs/MdisCamera/unitTest.cpp index e9563969f8..140552d7c4 100644 --- a/isis/src/messenger/objs/MdisCamera/unitTest.cpp +++ b/isis/src/messenger/objs/MdisCamera/unitTest.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -64,7 +53,7 @@ int main(void) { cout << "SPK Target ID = " << cam->SpkTargetId() << endl; cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl; - // Test Shutter Open/Close + // Test Shutter Open/Close const PvlGroup &inst = c.label()->findGroup("Instrument", Pvl::Traverse); double exposureDuration = ((double) inst["ExposureDuration"])/1000; QString stime = inst["StartTime"]; @@ -110,13 +99,13 @@ int main(void) { else { cout << setprecision(16) << "Longitude off by: " << cam->UniversalLongitude() - knownLon << endl; } - + // Testing name methods cout << endl << endl << "Testing name methods ..." << endl; QList files; files.append("$ISISTESTDATA/isis/src/messenger/unitTestData/EW0089570936I.cub"); files.append("$ISISTESTDATA/isis/src/messenger/unitTestData/DN0163645629M_DE_0.reduced.cub"); - + for (int i = 0; i < files.size(); i++) { Cube m(files[i], "r"); MdisCamera *mCam = (MdisCamera *) CameraFactory::Create(m); @@ -151,4 +140,3 @@ void TestLineSamp(Camera *cam, double samp, double line) { cout << "DeltaLine = ERROR" << endl << endl; } } - diff --git a/isis/src/mex/apps/hrsc2isis/hrsc2isis.cpp b/isis/src/mex/apps/hrsc2isis/hrsc2isis.cpp index 56f3e3c507..9ed5994b37 100644 --- a/isis/src/mex/apps/hrsc2isis/hrsc2isis.cpp +++ b/isis/src/mex/apps/hrsc2isis/hrsc2isis.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "ProcessImportPds.h" #include "hrsc2isis.h" #include "UserInterface.h" diff --git a/isis/src/mex/apps/hrsc2isis/hrsc2isis.h b/isis/src/mex/apps/hrsc2isis/hrsc2isis.h index 94938b146a..26edfe4441 100644 --- a/isis/src/mex/apps/hrsc2isis/hrsc2isis.h +++ b/isis/src/mex/apps/hrsc2isis/hrsc2isis.h @@ -1,6 +1,14 @@ #ifndef hrsc2isis_h #define hrsc2isis_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "UserInterface.h" namespace Isis { diff --git a/isis/src/mex/apps/hrsc2isis/main.cpp b/isis/src/mex/apps/hrsc2isis/main.cpp index bd2adda39e..9aec221a79 100644 --- a/isis/src/mex/apps/hrsc2isis/main.cpp +++ b/isis/src/mex/apps/hrsc2isis/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "UserInterface.h" #include "hrsc2isis.h" diff --git a/isis/src/mex/objs/HrscCamera/HrscCamera.cpp b/isis/src/mex/objs/HrscCamera/HrscCamera.cpp index cfce9fcc47..07c7140087 100644 --- a/isis/src/mex/objs/HrscCamera/HrscCamera.cpp +++ b/isis/src/mex/objs/HrscCamera/HrscCamera.cpp @@ -1,24 +1,10 @@ -/** - * @file - * $Revision: 1.3 $ - * $Date: 2009/08/31 15:12:30 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "HrscCamera.h" @@ -49,7 +35,7 @@ namespace Isis { m_instrumentNameShort = "HRSC"; m_spacecraftNameLong = "Mars Express"; m_spacecraftNameShort = "MEX"; - + NaifStatus::CheckErrors(); // Setup camera characteristics from instrument and frame kernel SetFocalLength(); @@ -101,34 +87,34 @@ namespace Isis { /** * CK frame ID - - Instrument Code from spacit run on CK - * - * @return @b int The appropriate instrument code for the "Camera-matrix" + * + * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Frame ID */ - int HrscCamera::CkFrameId() const { - return (-41001); + int HrscCamera::CkFrameId() const { + return (-41001); } - /** + /** * CK Reference ID - J2000 - * + * * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Reference ID */ - int HrscCamera::CkReferenceId() const { - return (1); + int HrscCamera::CkReferenceId() const { + return (1); } - /** + /** * SPK Reference ID - J2000 - * + * * @return @b int The appropriate instrument code for the Spacecraft * Kernel Reference ID */ - int HrscCamera::SpkReferenceId() const { - return (1); + int HrscCamera::SpkReferenceId() const { + return (1); } diff --git a/isis/src/mex/objs/HrscCamera/HrscCamera.h b/isis/src/mex/objs/HrscCamera/HrscCamera.h index 26c1c85990..4ae8794b58 100644 --- a/isis/src/mex/objs/HrscCamera/HrscCamera.h +++ b/isis/src/mex/objs/HrscCamera/HrscCamera.h @@ -1,26 +1,13 @@ #ifndef HrscCamera_h #define HrscCamera_h -/** - * @file - * $Revision: 1.3 $ - * $Date: 2009/08/31 15:12:31 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "LineScanCamera.h" @@ -33,8 +20,8 @@ namespace Isis { * @brief HRSC Camera Model * * This class is the implementation of the camera model - * for the Mars Express HRSC (High/Super Resolution Stereo Colour Imager) - * instrument. + * for the Mars Express HRSC (High/Super Resolution Stereo Colour Imager) + * instrument. * * @ingroup SpiceInstrumentsAndCameras * @ingroup MarsExpress @@ -52,12 +39,12 @@ namespace Isis { * for new methods. Updated documentation. Removed Mex * namespace wrap inside Isis namespace. Added Isis Disclaimer to * files. Added NAIF error check to constructor. - * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis + * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis * coding standards. References #972. * @history 2015-08-12 Ian Humphrey and Makayla Shepherd - Added new data members and methods * to get spacecraft and instrument names. Extended unit test to test * these methods. - * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument + * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument * members and methods and removed implementation of these methods * since Camera now handles this. References #2335. * @history 2016-10-21 Kristin Berry - Backward Compatibility Issue: Updates to improve @@ -83,7 +70,7 @@ namespace Isis { private: void ReadLineRates(QString filename); - std::vector p_lineRates; /**< Vector of the variable line rates for this + std::vector p_lineRates; /**< Vector of the variable line rates for this camera model.*/ }; }; diff --git a/isis/src/mex/objs/HrscCamera/unitTest.cpp b/isis/src/mex/objs/HrscCamera/unitTest.cpp index 6384f9237a..f5874cccc5 100644 --- a/isis/src/mex/objs/HrscCamera/unitTest.cpp +++ b/isis/src/mex/objs/HrscCamera/unitTest.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include @@ -35,10 +24,10 @@ void TestLineSamp(Camera *cam, double samp, double line); /** * @internal * @history 2009-08-03 Jeannie Walldren - Changed known lat and lon. - * @history 2009-08-06 Jeannie Walldren - Added cmath include and changed calls to abs() + * @history 2009-08-06 Jeannie Walldren - Added cmath include and changed calls to abs() * to fabs() since the abs() function takes integer values while the - * fabs() takes floats. Changed Center Lat tolerance - * from 4E-10 to 4.1E-10 since the difference on + * fabs() takes floats. Changed Center Lat tolerance + * from 4E-10 to 4.1E-10 since the difference on * Darwin powerpc was 4.07E-10. * @history 2011-05-03 Jeannie Walldren - Updated unitTest to test for new methods. * @history 2016-10-27 Kristin Berry - Updated known latitude and longitude. References #4476. @@ -70,7 +59,7 @@ int main(void) { cout << "CK Reference ID = " << cam->CkReferenceId() << endl; cout << "SPK Target ID = " << cam->SpkTargetId() << endl; cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl; - + // Test name methods cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl; cout << "Spacecraft Name Short: " << cam->spacecraftNameShort() << endl; @@ -138,4 +127,3 @@ void TestLineSamp(Camera *cam, double samp, double line) { cout << "DeltaLine = ERROR" << endl << endl; } } - diff --git a/isis/src/mex/objs/MexHrscSrcCamera/MexHrscSrcCamera.cpp b/isis/src/mex/objs/MexHrscSrcCamera/MexHrscSrcCamera.cpp index dbd8d86ec6..caa66712ef 100644 --- a/isis/src/mex/objs/MexHrscSrcCamera/MexHrscSrcCamera.cpp +++ b/isis/src/mex/objs/MexHrscSrcCamera/MexHrscSrcCamera.cpp @@ -1,22 +1,10 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "MexHrscSrcCamera.h" @@ -39,8 +27,8 @@ namespace Isis { * * @param lab Pvl label from a Mex HRSC SRC Framing Camera image. * - * @author Stuart Sides - * + * @author Stuart Sides + * * @internal */ @@ -49,7 +37,7 @@ namespace Isis { m_instrumentNameShort = "SRC"; m_spacecraftNameLong = "Mars Express"; m_spacecraftNameShort = "MEX"; - + NaifStatus::CheckErrors(); SetFocalLength(Spice::getDouble("INS" + toString(naifIkCode()) + "_FOCAL_LENGTH")); @@ -70,7 +58,7 @@ namespace Isis { // out the affine transforms from detector samp,line to focal plane x,y. CameraFocalPlaneMap *focalMap = new CameraFocalPlaneMap(this, naifIkCode()); - // The boresight position recorded in the IK is zero-based and therefore needs to be adjusted + // The boresight position recorded in the IK is zero-based and therefore needs to be adjusted // for ISIS double boresightSample = Spice::getDouble("INS" + toString(naifIkCode()) + "_CCD_CENTER",0) + 1.0; double boresightLine = Spice::getDouble("INS" + toString(naifIkCode()) + "_CCD_CENTER",1) + 1.0; @@ -101,7 +89,7 @@ namespace Isis { /** * Returns the shutter open and close times. - * + * * @param time The SpacecraftClockStartCount converted to ephemeris time. * @param exposureDuration ExposureDuration keyword value from the labels, converted to * seconds. diff --git a/isis/src/mex/objs/MexHrscSrcCamera/MexHrscSrcCamera.h b/isis/src/mex/objs/MexHrscSrcCamera/MexHrscSrcCamera.h index ea62aa707c..1237494c44 100644 --- a/isis/src/mex/objs/MexHrscSrcCamera/MexHrscSrcCamera.h +++ b/isis/src/mex/objs/MexHrscSrcCamera/MexHrscSrcCamera.h @@ -1,24 +1,13 @@ #ifndef MexHrscSrcCamera_h #define MexHrscSrcCamera_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "FramingCamera.h" @@ -26,14 +15,14 @@ namespace Isis { /** - * This is the camera model for the Mex HRSC SRC Framing Camera + * This is the camera model for the Mex HRSC SRC Framing Camera * * @ingroup SpiceInstrumentsAndCameras * @ingroup Mex * * @author 2020-04-02 Stuart Sides * - * @internal + * @internal * @history 2020-04-01 Stuart Sides - Initial version */ @@ -45,12 +34,12 @@ namespace Isis { //! Destroys the MexHrscSrcCamera object ~MexHrscSrcCamera() {}; - /** - * Reimplemented from FrameCamera - * + /** + * Reimplemented from FrameCamera + * * @param time Start time of the observation * @param exposureDuration The exposure duration of the observation - * + * * @return std::pair The start and end times of the observation */ virtual std::pair ShutterOpenCloseTimes(double time, @@ -58,25 +47,25 @@ namespace Isis { /** * CK frame ID - - Instrument Code from spacit run on CK - * - * @return @b int The appropriate instrument code for the "Camera-matrix" + * + * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Frame ID */ virtual int CkFrameId() const { return (-41001); } - /** + /** * CK Reference ID - J2000 - * + * * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Reference ID */ virtual int CkReferenceId() const { return (1); } - /** + /** * SPK Reference ID - J2000 - * + * * @return @b int The appropriate instrument code for the Spacecraft * Kernel Reference ID */ diff --git a/isis/src/mex/objs/MexHrscSrcCamera/unitTest.cpp b/isis/src/mex/objs/MexHrscSrcCamera/unitTest.cpp index aefc6e1f2e..c2be1189a6 100644 --- a/isis/src/mex/objs/MexHrscSrcCamera/unitTest.cpp +++ b/isis/src/mex/objs/MexHrscSrcCamera/unitTest.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include @@ -34,7 +23,7 @@ using namespace Isis; void TestLineSamp(Camera *cam, double samp, double line); /** * @internal - * + * * @history 2020-04-09 Stuart Sides - Original version. */ int main(void) { @@ -62,7 +51,7 @@ int main(void) { cout << "CK Reference ID = " << cam->CkReferenceId() << endl; cout << "SPK Target ID = " << cam->SpkTargetId() << endl; cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl; - + // Test name methods cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl; cout << "Spacecraft Name Short: " << cam->spacecraftNameShort() << endl; @@ -130,4 +119,3 @@ void TestLineSamp(Camera *cam, double samp, double line) { cout << "DeltaLine = ERROR" << endl << endl; } } - diff --git a/isis/src/mgs/apps/moc2isis/main.cpp b/isis/src/mgs/apps/moc2isis/main.cpp index e2fd38a21a..9472a087f3 100644 --- a/isis/src/mgs/apps/moc2isis/main.cpp +++ b/isis/src/mgs/apps/moc2isis/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include @@ -312,4 +320,3 @@ void TranslateMocEdrLabels(FileName &labelFile, Cube *ocube) { kerns += PvlKeyword("NaifFrameCode", frameCode); ocube->putGroup(kerns); } - diff --git a/isis/src/mgs/apps/moccal/main.cpp b/isis/src/mgs/apps/moccal/main.cpp index f1552b67fd..52b449d8cb 100644 --- a/isis/src/mgs/apps/moccal/main.cpp +++ b/isis/src/mgs/apps/moccal/main.cpp @@ -1,21 +1,11 @@ -/** - * @file - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "ProcessByLine.h" #include "SpecialPixel.h" diff --git a/isis/src/mgs/apps/mocevenodd/main.cpp b/isis/src/mgs/apps/mocevenodd/main.cpp index f5ae0e780c..73f97e4093 100644 --- a/isis/src/mgs/apps/mocevenodd/main.cpp +++ b/isis/src/mgs/apps/mocevenodd/main.cpp @@ -1,21 +1,11 @@ -/** - * @file - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + // // mocevenodd.cpp // @@ -139,4 +129,3 @@ void applyCorrectionOffset(Buffer &in, Buffer &out) { odd = !odd; } } - diff --git a/isis/src/mgs/apps/mocgap/main.cpp b/isis/src/mgs/apps/mocgap/main.cpp index c024e5d9a5..55d8099624 100644 --- a/isis/src/mgs/apps/mocgap/main.cpp +++ b/isis/src/mgs/apps/mocgap/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "ProcessByLine.h" #include "Statistics.h" diff --git a/isis/src/mgs/apps/mocnoise50/main.cpp b/isis/src/mgs/apps/mocnoise50/main.cpp index 8b01d1716f..15e93458e7 100644 --- a/isis/src/mgs/apps/mocnoise50/main.cpp +++ b/isis/src/mgs/apps/mocnoise50/main.cpp @@ -1,21 +1,11 @@ -/** - * @file - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "ProcessByLine.h" #include "SpecialPixel.h" diff --git a/isis/src/mgs/apps/mocproc/main.cpp b/isis/src/mgs/apps/mocproc/main.cpp index 6aca4d6282..3f9b3836dd 100644 --- a/isis/src/mgs/apps/mocproc/main.cpp +++ b/isis/src/mgs/apps/mocproc/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include diff --git a/isis/src/mgs/objs/MocLabels/MocLabels.cpp b/isis/src/mgs/objs/MocLabels/MocLabels.cpp index c6fcfe132a..b35efa4d38 100644 --- a/isis/src/mgs/objs/MocLabels/MocLabels.cpp +++ b/isis/src/mgs/objs/MocLabels/MocLabels.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "MocLabels.h" #include @@ -597,4 +605,3 @@ namespace Isis { unload_c(sclkKern.toLatin1().data()); } } - diff --git a/isis/src/mgs/objs/MocLabels/MocLabels.h b/isis/src/mgs/objs/MocLabels/MocLabels.h index eadc5c5c2d..43717e8e6e 100644 --- a/isis/src/mgs/objs/MocLabels/MocLabels.h +++ b/isis/src/mgs/objs/MocLabels/MocLabels.h @@ -1,26 +1,13 @@ #ifndef MocLabels_h #define MocLabels_h -/** - * @file - * $Revision: 1.8 $ - * $Date: 2010/01/05 20:56:07 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include @@ -39,8 +26,8 @@ namespace Isis { * * * @ingroup SpiceInstrumentsAndCameras - * @ingroup MarsGlobalSurveyor - * + * @ingroup MarsGlobalSurveyor + * * @author 2007-01-30 Author Unknown * * @internal diff --git a/isis/src/mgs/objs/MocLabels/mocxtrack.h b/isis/src/mgs/objs/MocLabels/mocxtrack.h index 33128a61e2..fd4228cebc 100644 --- a/isis/src/mgs/objs/MocLabels/mocxtrack.h +++ b/isis/src/mgs/objs/MocLabels/mocxtrack.h @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + /*********************************************************************** *_Title mocxtrack.h - MOC Cross Track Summing table maps *_Args NONE diff --git a/isis/src/mgs/objs/MocLabels/unitTest.cpp b/isis/src/mgs/objs/MocLabels/unitTest.cpp index 320a1eadf4..7b79d32f9e 100644 --- a/isis/src/mgs/objs/MocLabels/unitTest.cpp +++ b/isis/src/mgs/objs/MocLabels/unitTest.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Cube.h" #include "IException.h" #include "Pvl.h" @@ -63,4 +71,3 @@ int main() { e.print(); } } - diff --git a/isis/src/mgs/objs/MocNarrowAngleCamera/MocNarrowAngleCamera.cpp b/isis/src/mgs/objs/MocNarrowAngleCamera/MocNarrowAngleCamera.cpp index 18e481fe56..1b3abdeb57 100644 --- a/isis/src/mgs/objs/MocNarrowAngleCamera/MocNarrowAngleCamera.cpp +++ b/isis/src/mgs/objs/MocNarrowAngleCamera/MocNarrowAngleCamera.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "MocNarrowAngleCamera.h" #include @@ -36,7 +25,7 @@ namespace Isis { /** * Constructor for the Mgs MOC Narrow Angle Camera Model * - * @param lab Pvl label from an MOC NAC image. + * @param lab Pvl label from an MOC NAC image. * * @internal * @history 2011-05-03 Jeannie Walldren - Added NAIF error check. @@ -46,7 +35,7 @@ namespace Isis { m_instrumentNameShort = "MOC-NA"; m_spacecraftNameLong = "Mars Global Surveyor"; m_spacecraftNameShort = "MGS"; - + NaifStatus::CheckErrors(); // Set up the camera info from ik/iak kernels // LoadEulerMounting(); @@ -94,7 +83,7 @@ namespace Isis { /** - * This is the function that is called in order to instantiate a MocNarrowAngleCamera object. + * This is the function that is called in order to instantiate a MocNarrowAngleCamera object. * * @param lab Cube labels * diff --git a/isis/src/mgs/objs/MocNarrowAngleCamera/MocNarrowAngleCamera.h b/isis/src/mgs/objs/MocNarrowAngleCamera/MocNarrowAngleCamera.h index 9ccd812c5e..b22c111cf8 100644 --- a/isis/src/mgs/objs/MocNarrowAngleCamera/MocNarrowAngleCamera.h +++ b/isis/src/mgs/objs/MocNarrowAngleCamera/MocNarrowAngleCamera.h @@ -1,25 +1,13 @@ #ifndef MocNarrowAngleCamera_h #define MocNarrowAngleCamera_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "LineScanCamera.h" @@ -27,8 +15,8 @@ namespace Isis { /** * @brief MOC Narrow Angle Camera Model * - * This is the camera model for the Mars Global Surveyor MOC narrow angle - * camera. + * This is the camera model for the Mars Global Surveyor MOC narrow angle + * camera. * * @ingroup SpiceInstrumentsAndCameras * @ingroup MarsGlobalSurveyor @@ -46,12 +34,12 @@ namespace Isis { * for new methods. Updated documentation. Removed Mgs namespace * wrap inside Isis namespace. Added Isis Disclaimer to files. * Added NAIF error check to constructor. - * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis + * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis * coding standards. References #972. * @history 2015-08-12 Ian Humphrey and Makayla Shepherd - Added new data members and methods * to get spacecraft and instrument names. Extended unit test to test * these methods. - * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument + * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument * members and methods and removed implementation of these methods * since Camera now handles this. References #2335. */ @@ -64,23 +52,23 @@ namespace Isis { /** * CK frame ID - - Instrument Code from spacit run on CK - * - * @return @b int The appropriate instrument code for the "Camera-matrix" + * + * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Frame ID */ virtual int CkFrameId() const { return (-94000); } - /** + /** * CK Reference ID - J2000 - * + * * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Reference ID */ virtual int CkReferenceId() const { return (1); } - /** + /** * SPK Reference ID - J2000 - * + * * @return @b int The appropriate instrument code for the Spacecraft * Kernel Reference ID */ diff --git a/isis/src/mgs/objs/MocNarrowAngleCamera/unitTest.cpp b/isis/src/mgs/objs/MocNarrowAngleCamera/unitTest.cpp index 46d515208b..dce8f2d4d4 100644 --- a/isis/src/mgs/objs/MocNarrowAngleCamera/unitTest.cpp +++ b/isis/src/mgs/objs/MocNarrowAngleCamera/unitTest.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include @@ -48,7 +37,7 @@ void TestLineSamp(Camera *cam, double samp, double line); * in accordence with the system changes * @history 2011-05-03 Jeannie Walldren - Updated unitTest to test * for new methods. Added Isis Disclaimer to file. - * @history 2015-08-12 Ian Humphrey and Makayla Shepherd - Added tests for spacecraft and + * @history 2015-08-12 Ian Humphrey and Makayla Shepherd - Added tests for spacecraft and * instrument name methods. */ @@ -122,7 +111,7 @@ int main(void) { else { cout << setprecision(16) << "Longitude off by: " << cam->UniversalLongitude() - knownLon << endl; } - + // Test name methods cout << endl << endl << "Testing name methods ..." << endl; cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl; @@ -155,4 +144,3 @@ void TestLineSamp(Camera *cam, double samp, double line) { cout << "DeltaLine = ERROR" << endl << endl; } } - diff --git a/isis/src/mgs/objs/MocNarrowAngleSumming/MocNarrowAngleSumming.h b/isis/src/mgs/objs/MocNarrowAngleSumming/MocNarrowAngleSumming.h index 61d5c19630..deddf545bd 100644 --- a/isis/src/mgs/objs/MocNarrowAngleSumming/MocNarrowAngleSumming.h +++ b/isis/src/mgs/objs/MocNarrowAngleSumming/MocNarrowAngleSumming.h @@ -1,27 +1,17 @@ #ifndef MocNarrowAngleSumming_h #define MocNarrowAngleSumming_h -/** - * @file - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ namespace Isis { /** - * Mars Global Surveyor MOC narrow angle summing class. + * Mars Global Surveyor MOC narrow angle summing class. * * @ingroup SpiceInstrumentsAndCameras * @ingroup MarsGlobalSurveyor @@ -35,10 +25,10 @@ namespace Isis { */ class MocNarrowAngleSumming { public: - /** - * Constructs the MocNarrowAngleSumming object - * @param csum - * @param ss + /** + * Constructs the MocNarrowAngleSumming object + * @param csum + * @param ss */ MocNarrowAngleSumming(int csum, int ss) { p_csum = csum; @@ -49,19 +39,19 @@ namespace Isis { ~MocNarrowAngleSumming() {}; /** - * Given the sample value, this method computes the corresponding - * detector. - * @param sample + * Given the sample value, this method computes the corresponding + * detector. + * @param sample * @return @b double Detector */ inline double Detector(double sample) const { return (sample - 1.0) * (double) p_csum + p_ss; } - /** - * Given the detector value, this method computes the corresponding - * sample. - * @param detector + /** + * Given the detector value, this method computes the corresponding + * sample. + * @param detector * @return @b double Sample */ inline double Sample(double detector) const { diff --git a/isis/src/mgs/objs/MocNarrowAngleSumming/unitTest.cpp b/isis/src/mgs/objs/MocNarrowAngleSumming/unitTest.cpp index abcd3a631e..c37e0ca2bf 100644 --- a/isis/src/mgs/objs/MocNarrowAngleSumming/unitTest.cpp +++ b/isis/src/mgs/objs/MocNarrowAngleSumming/unitTest.cpp @@ -1,21 +1,11 @@ -/** - * @file - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -58,4 +48,3 @@ int main(int argc, char *argv[]) { cout << s3.Sample(s3.Detector(2.0)) << endl; cout << s3.Sample(s3.Detector(3.0)) << endl; } - diff --git a/isis/src/mgs/objs/MocWideAngleCamera/MocWideAngleCamera.cpp b/isis/src/mgs/objs/MocWideAngleCamera/MocWideAngleCamera.cpp index adba9d4509..2767625054 100644 --- a/isis/src/mgs/objs/MocWideAngleCamera/MocWideAngleCamera.cpp +++ b/isis/src/mgs/objs/MocWideAngleCamera/MocWideAngleCamera.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "MocWideAngleCamera.h" #include "MocWideAngleDetectorMap.h" #include "MocWideAngleDistortionMap.h" @@ -50,7 +39,7 @@ namespace Isis { m_instrumentNameShort = "MOC-WA"; m_spacecraftNameLong = "Mars Global Surveyor"; m_spacecraftNameShort = "MGS"; - + NaifStatus::CheckErrors(); // See if we have a moc camera Pvl &lab = *cube.label(); diff --git a/isis/src/mgs/objs/MocWideAngleCamera/MocWideAngleCamera.h b/isis/src/mgs/objs/MocWideAngleCamera/MocWideAngleCamera.h index 57cd8d3106..4076869046 100644 --- a/isis/src/mgs/objs/MocWideAngleCamera/MocWideAngleCamera.h +++ b/isis/src/mgs/objs/MocWideAngleCamera/MocWideAngleCamera.h @@ -1,25 +1,13 @@ #ifndef MocWideAngleCamera_h #define MocWideAngleCamera_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "LineScanCamera.h" @@ -27,7 +15,7 @@ namespace Isis { /** * @brief MOC Wide Angle Camera Model * - * This is the camera model for the Mars Global Surveyor MOC wide angle + * This is the camera model for the Mars Global Surveyor MOC wide angle * camera. * * @ingroup SpiceInstrumentsAndCameras @@ -50,12 +38,12 @@ namespace Isis { * for new methods. Updated documentation. Removed Mgs namespace * wrap inside Isis namespace. Added Isis Disclaimer to files. * Added NAIF error check to constructor. - * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis + * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis * coding standards. References #972. * @history 2015-08-12 Ian Humphrey and Makayla Shepherd - Added new data members and methods * to get spacecraft and instrument names. Extended unit test to test * these methods. - * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument + * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument * members and methods and removed implementation of these methods * since Camera now handles this. References #2335. */ @@ -69,23 +57,23 @@ namespace Isis { /** * CK frame ID - - Instrument Code from spacit run on CK - * - * @return @b int The appropriate instrument code for the "Camera-matrix" + * + * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Frame ID */ virtual int CkFrameId() const { return (-94000); } - /** + /** * CK Reference ID - J2000 - * + * * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Reference ID */ virtual int CkReferenceId() const { return (1); } - /** + /** * SPK Reference ID - J2000 - * + * * @return @b int The appropriate instrument code for the Spacecraft * Kernel Reference ID */ diff --git a/isis/src/mgs/objs/MocWideAngleCamera/MocWideAngleDetectorMap.cpp b/isis/src/mgs/objs/MocWideAngleCamera/MocWideAngleDetectorMap.cpp index aab474155b..65f2c1b08e 100644 --- a/isis/src/mgs/objs/MocWideAngleCamera/MocWideAngleDetectorMap.cpp +++ b/isis/src/mgs/objs/MocWideAngleCamera/MocWideAngleDetectorMap.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "MocWideAngleDetectorMap.h" using namespace std; @@ -49,10 +38,10 @@ namespace Isis { /** - * @param sample - * @param line - * - * @return @b bool + * @param sample + * @param line + * + * @return @b bool */ bool MocWideAngleDetectorMap::SetParent(const double sample, const double line) { @@ -86,4 +75,3 @@ namespace Isis { return true; } } - diff --git a/isis/src/mgs/objs/MocWideAngleCamera/MocWideAngleDetectorMap.h b/isis/src/mgs/objs/MocWideAngleCamera/MocWideAngleDetectorMap.h index c58b9ea9c8..16c54ec6b0 100644 --- a/isis/src/mgs/objs/MocWideAngleCamera/MocWideAngleDetectorMap.h +++ b/isis/src/mgs/objs/MocWideAngleCamera/MocWideAngleDetectorMap.h @@ -1,25 +1,13 @@ #ifndef MocWideAngleDetectorMap_h #define MocWideAngleDetectorMap_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "LineScanCameraDetectorMap.h" #include "MocLabels.h" @@ -36,7 +24,7 @@ namespace Isis { * * @see Camera * - * @author 2005-02-01 Jeff Anderson + * @author 2005-02-01 Jeff Anderson * @internal * @history 2005-02-01 Jeff Anderson - Original version * @history 2011-05-03 Jeannie Walldren - Removed Mgs namespace wrap. diff --git a/isis/src/mgs/objs/MocWideAngleCamera/MocWideAngleDistortionMap.cpp b/isis/src/mgs/objs/MocWideAngleCamera/MocWideAngleDistortionMap.cpp index 41a795453d..da51ace630 100644 --- a/isis/src/mgs/objs/MocWideAngleCamera/MocWideAngleDistortionMap.cpp +++ b/isis/src/mgs/objs/MocWideAngleCamera/MocWideAngleDistortionMap.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "MocWideAngleDistortionMap.h" using namespace std; diff --git a/isis/src/mgs/objs/MocWideAngleCamera/MocWideAngleDistortionMap.h b/isis/src/mgs/objs/MocWideAngleCamera/MocWideAngleDistortionMap.h index 966678b9de..0af249cd10 100644 --- a/isis/src/mgs/objs/MocWideAngleCamera/MocWideAngleDistortionMap.h +++ b/isis/src/mgs/objs/MocWideAngleCamera/MocWideAngleDistortionMap.h @@ -1,31 +1,19 @@ #ifndef MocWideAngleDistortionMap_h #define MocWideAngleDistortionMap_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include "CameraDistortionMap.h" namespace Isis { - /** + /** * Distort/undistort focal plane coordinates * * Creates a map for adding/removing optical distortions @@ -35,8 +23,8 @@ namespace Isis { * @ingroup MarsGlobalSurveyor * * @see Camera - * - * @author 2005-02-01 Jeff Anderson + * + * @author 2005-02-01 Jeff Anderson * @internal * @history 2005-02-01 Jeff Anderson - Original version * @history 2011-05-03 Jeannie Walldren - Removed Mgs namespace wrap. diff --git a/isis/src/mgs/objs/MocWideAngleCamera/unitTest.cpp b/isis/src/mgs/objs/MocWideAngleCamera/unitTest.cpp index e765748951..87f0deb7f3 100644 --- a/isis/src/mgs/objs/MocWideAngleCamera/unitTest.cpp +++ b/isis/src/mgs/objs/MocWideAngleCamera/unitTest.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include @@ -111,7 +100,7 @@ int main(void) { else { cout << setprecision(16) << "Longitude off by: " << cam->UniversalLongitude() - knownLon << endl; } - + // Test name methods cout << endl << endl << "Test name methods ..." << endl; cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl; @@ -144,4 +133,3 @@ void TestLineSamp(Camera *cam, double samp, double line) { cout << "DeltaLine = ERROR" << endl << endl; } } - diff --git a/isis/src/mro/apps/crism2isis/crism2isis.cpp b/isis/src/mro/apps/crism2isis/crism2isis.cpp index 89e17c7aae..d81a1ff1f1 100644 --- a/isis/src/mro/apps/crism2isis/crism2isis.cpp +++ b/isis/src/mro/apps/crism2isis/crism2isis.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "crism2isis.h" #include "ProcessImportPds.h" #include "UserInterface.h" diff --git a/isis/src/mro/apps/crism2isis/crism2isis.h b/isis/src/mro/apps/crism2isis/crism2isis.h index 670f284e9d..845f923fda 100644 --- a/isis/src/mro/apps/crism2isis/crism2isis.h +++ b/isis/src/mro/apps/crism2isis/crism2isis.h @@ -1,6 +1,14 @@ #ifndef crism2isis_h #define crism2isis_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Cube.h" #include "UserInterface.h" diff --git a/isis/src/mro/apps/crism2isis/main.cpp b/isis/src/mro/apps/crism2isis/main.cpp index 022ac7dc89..45d151f179 100644 --- a/isis/src/mro/apps/crism2isis/main.cpp +++ b/isis/src/mro/apps/crism2isis/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "Application.h" diff --git a/isis/src/mro/apps/ctxcal/main.cpp b/isis/src/mro/apps/ctxcal/main.cpp index c3a812282b..430cde041b 100644 --- a/isis/src/mro/apps/ctxcal/main.cpp +++ b/isis/src/mro/apps/ctxcal/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "ProcessByLine.h" #include "SpecialPixel.h" diff --git a/isis/src/mro/apps/ctxevenodd/main.cpp b/isis/src/mro/apps/ctxevenodd/main.cpp index d8745a03e3..66adce37b0 100644 --- a/isis/src/mro/apps/ctxevenodd/main.cpp +++ b/isis/src/mro/apps/ctxevenodd/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + // // ctxevenodd.cpp // @@ -132,4 +140,3 @@ void applyCorrectionOffset(Buffer &in, Buffer &out) { odd = !odd; } } - diff --git a/isis/src/mro/apps/hi2isis/main.cpp b/isis/src/mro/apps/hi2isis/main.cpp index 0f01773f4b..6eeddc97a4 100644 --- a/isis/src/mro/apps/hi2isis/main.cpp +++ b/isis/src/mro/apps/hi2isis/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include diff --git a/isis/src/mro/apps/hical/main.cpp b/isis/src/mro/apps/hical/main.cpp index 70eeb27e15..aba30d0c87 100644 --- a/isis/src/mro/apps/hical/main.cpp +++ b/isis/src/mro/apps/hical/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + // $Id: hical.cpp 6715 2016-04-28 17:58:43Z tsucharski@GS.DOI.NET $ #include "Isis.h" @@ -482,4 +490,3 @@ void IsisMain(){ delete calVars; calVars = 0; } - diff --git a/isis/src/mro/apps/hicalbeta/main.cpp b/isis/src/mro/apps/hicalbeta/main.cpp index 7ef97d1889..37a0fefd49 100644 --- a/isis/src/mro/apps/hicalbeta/main.cpp +++ b/isis/src/mro/apps/hicalbeta/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + // $Id: hicalbeta.cpp,v 1.14 2009/09/15 21:56:44 kbecker Exp $ #include "Isis.h" @@ -482,4 +490,3 @@ void IsisMain(){ delete calVars; calVars = 0; } - diff --git a/isis/src/mro/apps/hicalproc/main.cpp b/isis/src/mro/apps/hicalproc/main.cpp index 205c8ac032..161092d172 100644 --- a/isis/src/mro/apps/hicalproc/main.cpp +++ b/isis/src/mro/apps/hicalproc/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "IException.h" @@ -625,4 +633,3 @@ void AnalyzeCubenormStats(QString psStatsFile, int piSumming, double & pdMinDN, cerr << "MinDN=" << pdMinDN << " MaxDN=" << pdMaxDN << endl; #endif } - diff --git a/isis/src/mro/apps/hiccdstitch/main.cpp b/isis/src/mro/apps/hiccdstitch/main.cpp index 6ef430b79c..e94684f116 100644 --- a/isis/src/mro/apps/hiccdstitch/main.cpp +++ b/isis/src/mro/apps/hiccdstitch/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #define GUIHELPERS #include "Isis.h" @@ -524,4 +532,3 @@ void helperButtonLog() { Application::GuiLog(p); } //...........end of helper function ........ - diff --git a/isis/src/mro/apps/hicolormos/hicolormos.cpp b/isis/src/mro/apps/hicolormos/hicolormos.cpp index dd0b93a3e8..f0f9c583b4 100644 --- a/isis/src/mro/apps/hicolormos/hicolormos.cpp +++ b/isis/src/mro/apps/hicolormos/hicolormos.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Camera.h" #include "CameraFactory.h" #include "Cube.h" @@ -26,7 +34,7 @@ void hicolormos(UserInterface &ui) { if (ui.WasEntered("FROM2")) { Cube from2(ui.GetFileName("FROM2"), "r"); hicolormos(&from1, &from2, ui); - } + } else { hicolormos(&from1, nullptr, ui); } @@ -50,9 +58,9 @@ void hicolormos(Cube *from1, Cube* from2, UserInterface &ui) { // Prep for second image if we have one Pvl from2lab; PvlGroup from2Mosaic("Mosaic"); - + if (from2) { - from2lab = *from2->label(); + from2lab = *from2->label(); tf.PutLine(from2->fileName() + "\n"); // Test the observation ID between from1 and from2 @@ -64,12 +72,12 @@ void hicolormos(Cube *from1, Cube* from2, UserInterface &ui) { from2Mosaic = from2lab.findGroup("Mosaic", Pvl::Traverse); } - + tf.Close(); // Close list remember to delete // Make the source product ID (from1 mosaic group) PvlKeyword sourceProductId = from1Mosaic["SourceProductId"]; - + if(from2) { // Add source product Id for from2 PvlKeyword from2SPI = from2Mosaic["SourceProductId"]; @@ -277,4 +285,4 @@ void hicolormos(Cube *from1, Cube* from2, UserInterface &ui) { } // end of isis main -} \ No newline at end of file +} diff --git a/isis/src/mro/apps/hicolormos/hicolormos.h b/isis/src/mro/apps/hicolormos/hicolormos.h index 3ac2e95d83..8f8bfb572d 100644 --- a/isis/src/mro/apps/hicolormos/hicolormos.h +++ b/isis/src/mro/apps/hicolormos/hicolormos.h @@ -1,6 +1,14 @@ -#ifndef hicolormos_h +#ifndef hicolormos_h #define hicolormos_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Cube.h" #include "UserInterface.h" @@ -9,4 +17,4 @@ namespace Isis{ extern void hicolormos(UserInterface &ui); } -#endif \ No newline at end of file +#endif diff --git a/isis/src/mro/apps/hicolormos/main.cpp b/isis/src/mro/apps/hicolormos/main.cpp index 96184b34ab..124eedc5d1 100644 --- a/isis/src/mro/apps/hicolormos/main.cpp +++ b/isis/src/mro/apps/hicolormos/main.cpp @@ -1,11 +1,19 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "Application.h" -#include "hicolormos.h" +#include "hicolormos.h" using namespace Isis; void IsisMain() { UserInterface &ui = Application::GetUserInterface(); hicolormos(ui); -} \ No newline at end of file +} diff --git a/isis/src/mro/apps/hicrop/hicrop.cpp b/isis/src/mro/apps/hicrop/hicrop.cpp index 8e26c2d534..c3933b1b2b 100644 --- a/isis/src/mro/apps/hicrop/hicrop.cpp +++ b/isis/src/mro/apps/hicrop/hicrop.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + // Qt library includes #include #include @@ -29,10 +37,10 @@ namespace Isis { // start process by line method void crop(Buffer &out); - // methods for converting between label clock count times and actual times - iTime actualTime(iTime timeFromInputClockCount, double tdiMode, + // methods for converting between label clock count times and actual times + iTime actualTime(iTime timeFromInputClockCount, double tdiMode, double unbinnedRate, double binMode); - iTime labelClockCountTime(iTime actualCalculatedTime, double tdiMode, + iTime labelClockCountTime(iTime actualCalculatedTime, double tdiMode, double unbinnedRate, double binMode); pair ckBeginEndTimes(IString ckFileName); // methods for converting between lines/times/clock counts @@ -42,16 +50,16 @@ namespace Isis { iTime clock2time(QString spacecraftClockCount); // method to validate calculated or user-entered cropped line and time values void validateCropLines(); - void validateCropTimes(double cropStart, double cropStop, - double ckFirstTime, double ckLastTime); - + void validateCropTimes(double cropStart, double cropStop, + double ckFirstTime, double ckLastTime); + // declare and initialize global variables needed in crop method. LineManager *g_in = NULL; - Cube *g_cube = NULL; + Cube *g_cube = NULL; int g_cropStartLine = 0; int g_cropEndLine = 0; int g_cropLineCount = 0; - + void hicrop(UserInterface &ui, Pvl *log) { QString inputFileName = ui.GetFileName("FROM"); CubeAttributeInput inAtt(inputFileName); @@ -59,25 +67,25 @@ namespace Isis { g_cube->setVirtualBands(inAtt.bands()); inputFileName = ui.GetFileName("FROM"); g_cube->open(inputFileName); - + hicrop(g_cube, ui, log); - delete g_cube; + delete g_cube; g_cube = NULL; } - + void hicrop(Cube *cube, UserInterface &ui, Pvl *log) { // Isis::Preference::Preferences(true); // delete ??? cout << setprecision(25);// ??? - g_cube = cube; + g_cube = cube; QString inputFileName = g_cube->fileName(); // get user inputs for input cube and open try { - - // read kernel files and furnish these kernels for naif routines used in + + // read kernel files and furnish these kernels for naif routines used in // originalStartTime() and time2clock() IString ckFileName = ui.GetFileName("CK"); - + IString lskFileName = ""; if (ui.WasEntered("LSK")) { lskFileName = ui.GetFileName("LSK"); @@ -86,7 +94,7 @@ namespace Isis { FileName lskFile("$base/kernels/lsk/naif????.tls"); lskFileName = lskFile.highestVersion().expanded(); } - + IString sclkFileName = ""; if (ui.WasEntered("SCLK")) { sclkFileName = ui.GetFileName("SCLK"); @@ -95,7 +103,7 @@ namespace Isis { FileName sclkFile("$mro/kernels/sclk/MRO_SCLKSCET.?????.65536.tsc"); sclkFileName = sclkFile.highestVersion().expanded(); } - + // furnish these kernels NaifStatus::CheckErrors(); furnsh_c(ckFileName.c_str()); @@ -104,7 +112,7 @@ namespace Isis { NaifStatus::CheckErrors(); furnsh_c(lskFileName.c_str()); NaifStatus::CheckErrors(); - + // get values from the labels needed to compute the line rate and the // actual start time of the input cube Pvl &inLabels = *g_cube->label(); @@ -119,19 +127,19 @@ namespace Isis { QString labelStartClockCount = inputInst["SpacecraftClockStartCount"]; double binMode = inputInst["Summing"]; double deltaLineTimerCount = inputInst["DeltaLineTimerCount"]; - + // Compute the line rate using the product of the // unbinned line rate (converted to seconds) and the downtrack summing double unbinnedRate = (74.0 + (deltaLineTimerCount / 16.0)) / 1000000.0; double lineRate = unbinnedRate * binMode; - + // get the actual original start time by making adjustments to the // spacecraft clock start count in the labels iTime timeFromLabelClockCount = clock2time(labelStartClockCount); - iTime originalStart = actualTime(timeFromLabelClockCount, tdiMode, + iTime originalStart = actualTime(timeFromLabelClockCount, tdiMode, unbinnedRate, binMode); double originalStartEt = originalStart.Et(); - + pair ckCoverage = ckBeginEndTimes(ckFileName); // find the values of the first and last lines to be kept from user inputs if (ui.GetString("SOURCE") == "LINEVALUES") { @@ -180,37 +188,37 @@ namespace Isis { firstValidTime = ckCoverage.first; lastValidTime = ckCoverage.second; } - validateCropTimes(firstValidTime, lastValidTime, + validateCropTimes(firstValidTime, lastValidTime, ckCoverage.first, ckCoverage.second); - + // to get the integer value of the start line, we will always round up if (originalStartEt > firstValidTime) { g_cropStartLine = 1; } else { - // get the exact line number associated with this time and find its + // get the exact line number associated with this time and find its // decimal value. double startTime2Line = et2line(firstValidTime, lineRate, originalStartEt); double decimalValue = startTime2Line - qFloor(startTime2Line); - // notice that for each line, n, it covers times corresponding to the + // notice that for each line, n, it covers times corresponding to the // exact line values that are between (n-1)+0.5 and n+0.5 - // we need to be sure that the entire first line has coverage, + // we need to be sure that the entire first line has coverage, if (decimalValue <= 0.5) { // if the decimal value is between 0 and 0.5, the time corresponds to - // the second half of the nth line, from n to n+0.5. - // round up to the next line number since the first half of the - // nth line is not covered + // the second half of the nth line, from n to n+0.5. + // round up to the next line number since the first half of the + // nth line is not covered g_cropStartLine = qCeil(startTime2Line); } else { - // if the decimal value is above 0.5, the time corresponds to the - // first half of the nth line from (n-1)+0.5 to n. - // round up to get the nth line and add 1 since the nth line is not + // if the decimal value is above 0.5, the time corresponds to the + // first half of the nth line from (n-1)+0.5 to n. + // round up to get the nth line and add 1 since the nth line is not // entirely covered g_cropStartLine = qCeil(startTime2Line) + 1; } } - + // Now, to get the integer value of the end line, always round down. // Get the exact line number associated with this time and find its // decimal value. @@ -224,7 +232,7 @@ namespace Isis { if (decimalValue >= 0.5) { // if the decimal value is above 0.5, the time corresponds to the // first half of the nth line. Round down to the previous line - // since the second half of this line is not covered + // since the second half of this line is not covered g_cropEndLine = qFloor(stopTime2Line); } else { @@ -234,30 +242,30 @@ namespace Isis { g_cropEndLine = qFloor(stopTime2Line) - 1; } } - + } - + g_cropLineCount = (g_cropEndLine - g_cropStartLine + 1); - + // The following error check has been commented out since it is redundant. // Error should be caught when the validateCropTimes() method is called. // validateCropLines(); - - // update start and stop times of the cropped image based on the + + // update start and stop times of the cropped image based on the // the first and last line values that will be kept. // subtract 0.5 to get the time at the beginning of the first line - iTime cropStartTime = line2time((double) g_cropStartLine - 0.5, + iTime cropStartTime = line2time((double) g_cropStartLine - 0.5, lineRate, originalStartEt); // add 0.5 to get the time at the end of the last line - iTime cropStopTime = line2time((double) g_cropEndLine + 0.5, + iTime cropStopTime = line2time((double) g_cropEndLine + 0.5, lineRate, originalStartEt); - validateCropTimes(cropStartTime.Et(), cropStopTime.Et(), + validateCropTimes(cropStartTime.Et(), cropStopTime.Et(), ckCoverage.first, ckCoverage.second); - + // HiRise spacecraft clock format is P/SSSSSSSSSS:FFFFF IString actualCropStartClockCount = time2clock(cropStartTime);//??? IString actualCropStopClockCount = time2clock(cropStopTime); //??? - + //??? // UTC // cout << "labelStartClock2time = " << timeFromLabelClockCount.UTC() << endl; @@ -265,29 +273,29 @@ namespace Isis { // cout << "cropped starttime = " << cropStartTime.UTC() << endl; // cout << "cropped stoptime = " << cropStopTime.UTC() << endl; // cout << "time at 80000.5 = " << line2time(80000.5, lineRate, originalStartEt).UTC() << endl << endl; - // + // // // ET - // cout << "labelStartClockEt = " << timeFromLabelClockCount.Et() << endl;// should this be - // cout << "adjustedStartClockEt = " << originalStartEt << endl;// should this be + // cout << "labelStartClockEt = " << timeFromLabelClockCount.Et() << endl;// should this be + // cout << "adjustedStartClockEt = " << originalStartEt << endl;// should this be // cout << "cropped starttime = " << cropStartTime.Et() << endl;//??? 264289109.970381856 // cout << "cropped stoptime = " << cropStopTime.Et() << endl;//??? 264289117.285806835 // cout << "time at 80000.5 = " << line2time(80000.5, lineRate, originalStartEt).Et() << endl << endl; - - + + // readjust the time to get the appropriate label value for the // spacecraft clock start count for the labels of the cropped cube - iTime adjustedCropStartTime = labelClockCountTime(cropStartTime, tdiMode, + iTime adjustedCropStartTime = labelClockCountTime(cropStartTime, tdiMode, unbinnedRate, binMode); QString adjustedCropStartClockCount = time2clock(adjustedCropStartTime); - iTime adjustedCropStopTime = labelClockCountTime(cropStopTime, tdiMode, + iTime adjustedCropStopTime = labelClockCountTime(cropStopTime, tdiMode, unbinnedRate, binMode); QString adjustedCropStopClockCount = time2clock(adjustedCropStopTime); - - - + + + //??? string stopClockCount = inputInst["SpacecraftClockStopCount"]; //??? iTime labelStopTime = clock2time(stopClockCount); - //??? iTime origStop = actualTime(labelStopTime, tdiMode, + //??? iTime origStop = actualTime(labelStopTime, tdiMode, //??? unbinnedRate, binMode); //??? double endline = et2line(origStop.Et(), lineRate, originalStartEt); //??? cout << std::setprecision(20); @@ -302,8 +310,8 @@ namespace Isis { //??? cout << "Actual Stop Count = " << actualCropStopClockCount << endl; //??? cout << "Label Stop Time = " << adjustedCropStopTime.Et() << endl; //??? cout << "Label Stop Count = " << adjustedCropStopClockCount << endl; - - + + // Allocate the output file and make sure things get propogated nicely ProcessByLine p; p.SetInputCube(g_cube); @@ -311,25 +319,25 @@ namespace Isis { int numSamps = g_cube->sampleCount(); int numBands = g_cube->bandCount(); int inputLineCount = g_cube->lineCount(); - + Isis::CubeAttributeOutput atts = ui.GetOutputAttribute("TO"); FileName outFileName = ui.GetFileName("TO"); Cube *ocube = p.SetOutputCube(outFileName.expanded(), atts, numSamps, g_cropLineCount, numBands); - + p.ClearInputCubes(); // Loop through the labels looking for object = Table for (int labelObj = 0; labelObj < inLabels.objects(); labelObj++) { PvlObject &obj = inLabels.object(labelObj); - + if (obj.name() != "Table") continue; - + // Read the table into a table object Table table(obj["Name"], inputFileName); - + // Write the table ocube->write(table); } - + // test to see what happens if I don't have this code ??? Pvl &outLabels = *ocube->label(); // Change the start/end times and spacecraft start/stop counts in the labels @@ -338,12 +346,12 @@ namespace Isis { outputInst["StopTime"][0] = cropStopTime.UTC(); // adjustedCropStopTime ??? outputInst["SpacecraftClockStartCount"][0] = adjustedCropStartClockCount; outputInst["SpacecraftClockStopCount"][0] = adjustedCropStopClockCount; - + // Create a buffer for reading the input cube // Crop the input cube g_in = new LineManager(*g_cube); p.StartProcess(crop); - + // Construct a label with the results PvlGroup results("Results"); results += PvlKeyword("InputLines", toString(inputLineCount)); @@ -355,18 +363,18 @@ namespace Isis { results += PvlKeyword("OututStopTime", cropStopTime.UTC()); //??? adjustedCropStopTime results += PvlKeyword("OututStartClock", adjustedCropStartClockCount); results += PvlKeyword("OututStopClock", adjustedCropStopClockCount); - + // Cleanup p.EndProcess(); - + delete g_in; g_in = NULL; - + // Write the results to the log if(log) { log->addGroup(results); } - + // Unfurnishes kernel files to prevent file table overflow NaifStatus::CheckErrors(); unload_c(ckFileName.c_str()); @@ -375,7 +383,7 @@ namespace Isis { NaifStatus::CheckErrors(); } catch (IException &e) { - IString msg = "Unable to crop the given cube [" + inputFileName + IString msg = "Unable to crop the given cube [" + inputFileName + "] using the hicrop program."; // clean up before throwing exception delete g_in; @@ -383,8 +391,8 @@ namespace Isis { throw IException(e, IException::Unknown, msg, _FILEINFO_); } } - - /** + + /** * Line processing routine. */ void crop(Buffer &out) { @@ -393,29 +401,29 @@ namespace Isis { int band = 1; g_in->SetLine(iline, 1); g_cube->read(*g_in); - + // Loop and move appropriate samples for (int i = 0; i < out.size(); i++) { out[i] = (*g_in)[i]; } - + if (out.Line() == g_cropLineCount) band++; } - - /** - * This method is used to determine the actual start or stop time for the input - * image. This is found by using the time corresponding to clock count - * read from the label of the input cube. - * - * @param timeFromInputClockCount This value is passed in after converting the + + /** + * This method is used to determine the actual start or stop time for the input + * image. This is found by using the time corresponding to clock count + * read from the label of the input cube. + * + * @param timeFromInputClockCount This value is passed in after converting the * clock count value from the labels to time - * @param tdiMode The Tdi keyword value from the labels of the input cube. + * @param tdiMode The Tdi keyword value from the labels of the input cube. * @param unbinnedRate Calculated using values from the input label. - * @param binMode The Summing keyword value from the labels of the input cube. - * + * @param binMode The Summing keyword value from the labels of the input cube. + * * @see HiriseCamera::HiriseCamera(Pvl &lab) */ - iTime actualTime(iTime timeFromInputClockCount, double tdiMode, + iTime actualTime(iTime timeFromInputClockCount, double tdiMode, double unbinnedRate, double binMode) { SpiceDouble adjustedTime = timeFromInputClockCount.Et(); // Adjust the start time so that it is the effective time for @@ -429,7 +437,7 @@ namespace Isis { adjustedTime += unbinnedRate * (((double) binMode / 2.0) - 0.5); // Effective observation time of the first line // in the image file, which is possibly binned - + // Compute effective line number within the CCD (in pixels) for the // given TDI mode. // This is the "centered" 0-based line number, where line 0 is the @@ -439,35 +447,35 @@ namespace Isis { iTime actualStartTime = adjustedTime; return actualStartTime; } - - /** - * This method is used to determine the time value that corresponds to the + + /** + * This method is used to determine the time value that corresponds to the * start or stop clock count that will be written to the output cube. This - * is found by using the actual start/stop time of the output cube. This - * is done so that when a HiriseCamera object is created from this image, - * the correct values will be calculated for the start time. - * - * @param actualCalculatedTime This value is the actual start/stop time of + * is found by using the actual start/stop time of the output cube. This + * is done so that when a HiriseCamera object is created from this image, + * the correct values will be calculated for the start time. + * + * @param actualCalculatedTime This value is the actual start/stop time of * the output cube that will be adjusted for * the labels. - * @param tdiMode The Tdi keyword value from the labels of the input cube. + * @param tdiMode The Tdi keyword value from the labels of the input cube. * @param unbinnedRate Calculated using values from the input label. - * @param binMode The Summing keyword value from the labels of the input cube. - * + * @param binMode The Summing keyword value from the labels of the input cube. + * * @see HiriseCamera::HiriseCamera(Pvl &lab) */ - iTime labelClockCountTime(iTime actualCalculatedTime, double tdiMode, + iTime labelClockCountTime(iTime actualCalculatedTime, double tdiMode, double unbinnedRate, double binMode) { - iTime labelStartTime = actualCalculatedTime.Et() + iTime labelStartTime = actualCalculatedTime.Et() + unbinnedRate * ((tdiMode / 2.0) - 0.5) - unbinnedRate * ((binMode / 2.0) - 0.5); return labelStartTime; } - - /** + + /** * Returns the first and last times that are covered by the given CK file. The * SCLK and LSK files must be furnished before this method is called. - * + * * @param ckFileName String containing the name of the ck file provided by the * user. * @return A pair of doubles, the first is the earliest time covered by the CK @@ -493,7 +501,7 @@ namespace Isis { "single body CK files."; throw IException(IException::Unknown, msg, _FILEINFO_); } - + //get the NAIF body code int body = SPICE_CELL_ELEM_I(&currCell, numberOfBodies-1); NaifStatus::CheckErrors(); @@ -525,63 +533,63 @@ namespace Isis { pair< double, double > coverage(startTime.toDouble(), stopTime.toDouble()); return coverage; } - + /** - * Returns the corresponding time for the given line number. - * - * Notice that this method takes an exact double line value, not an int line - * value. For example, if the ET at the beginning of a starting line is - * desired, the value passed in should be the integer line number minus 0.5 and + * Returns the corresponding time for the given line number. + * + * Notice that this method takes an exact double line value, not an int line + * value. For example, if the ET at the beginning of a starting line is + * desired, the value passed in should be the integer line number minus 0.5 and * if the ET at the end of the last line is desired, the integer end line number - * plus 0.5 should be passed in. - * - * @param lineNumber The exact line number value for which the image time will + * plus 0.5 should be passed in. + * + * @param lineNumber The exact line number value for which the image time will * be found - * @param lineRate The line rate for this image, calculated by using label + * @param lineRate The line rate for this image, calculated by using label * values. - * @param originalStartEt The actual start time for the image, calculated by + * @param originalStartEt The actual start time for the image, calculated by * using label values. - * + * * @return The image time corresponding to the given exact line number value. - * - * @see LineScanDetectorMap::SetParent() - * + * + * @see LineScanDetectorMap::SetParent() + * */ iTime line2time(double lineNumber, double lineRate, double originalStartEt) { iTime et = (double) (originalStartEt + lineRate * (lineNumber - 0.5)); return et; } - + /** - * Returns the corresponding line number for the given ephemeris time. Note + * Returns the corresponding line number for the given ephemeris time. Note * that this return value is not an integer line, number, it is the exact double * line value associated with this time. - * - * @param et The ephemeris time of the image whose exact line value will be + * + * @param et The ephemeris time of the image whose exact line value will be * found. - * @param lineRate The line rate for this image, calculated by using label + * @param lineRate The line rate for this image, calculated by using label * values. - * @param originalStartEt The actual start time for the image, calculated by + * @param originalStartEt The actual start time for the image, calculated by * using label values. - * + * * @return The exact line number value corresponding to the given image time. - * - * @see LineScanDetectorMap::SetDetector() + * + * @see LineScanDetectorMap::SetDetector() */ double et2line(double et, double lineRate, double originalStartEt) { return (et - originalStartEt) / lineRate + 0.5; } - - /** - * Returns the corresponding clock count, in string format, for the given time. - * - * HiRise is high precision, so the spacecraft clock format is - * P/SSSSSSSSSS:FFFFF and the clock id = -74999. (See any mro sclk file + + /** + * Returns the corresponding clock count, in string format, for the given time. + * + * HiRise is high precision, so the spacecraft clock format is + * P/SSSSSSSSSS:FFFFF and the clock id = -74999. (See any mro sclk file * for documentation on these values.) - * + * * @param time The time of the image to be converted. - * - * @return A string containing the spacecraft clock count corresponding + * + * @return A string containing the spacecraft clock count corresponding * to the given time. */ QString time2clock(iTime time) { @@ -593,14 +601,14 @@ namespace Isis { NaifStatus::CheckErrors(); return stringOutput; } - - /** - * Returns the corresponding time for the given spacecraft clock count. - * + + /** + * Returns the corresponding time for the given spacecraft clock count. + * * @param spacecraftClockCount The clock count of the image to be converted. - * + * * @return The image time corresponding to the given spacecraft clock count. - * + * * @see Spice::getClockTime(clockCountString, sclkCode) */ iTime clock2time(QString spacecraftClockCount) { @@ -615,8 +623,8 @@ namespace Isis { iTime time = clockTime.toDouble(); return time; } - - + + /** * This method is used to verify that the values found for the start and end * lines is valid. @@ -629,7 +637,7 @@ namespace Isis { throw IException(IException::Unknown, msg, _FILEINFO_); } } - + /** * This method is used to verify that the values found for the start and end * lines is valid. @@ -637,22 +645,22 @@ namespace Isis { void validateCropTimes(double cropStart, double cropStop, double ckFirstTime, double ckLastTime) { if (cropStart < ckFirstTime || cropStop > ckLastTime) { - IString msg = "Invalid start/stop times [" + IString(cropStart) + ", " + IString msg = "Invalid start/stop times [" + IString(cropStart) + ", " + IString(cropStop) + "]. These times fall outside of the " "given CK file's time coverage [" + IString(ckFirstTime) + ", " + IString(ckLastTime) + "]."; throw IException(IException::Unknown, msg, _FILEINFO_); } - - // Now, for user inputs other than line/nlines, use the start and end + + // Now, for user inputs other than line/nlines, use the start and end // times we found to calculate the cropped start/end line numbers if (cropStart >= cropStop) { IString msg = "Invalid start/stop times. The start ET " "value [" + IString(cropStart) + "] is greater " - "than or equal to the stop ET value [" + "than or equal to the stop ET value [" + IString(cropStop) + "]."; throw IException(IException::Io, msg, _FILEINFO_); } - + } } diff --git a/isis/src/mro/apps/hicrop/hicrop.h b/isis/src/mro/apps/hicrop/hicrop.h index 58e93d38e8..c241d24cb7 100644 --- a/isis/src/mro/apps/hicrop/hicrop.h +++ b/isis/src/mro/apps/hicrop/hicrop.h @@ -1,6 +1,14 @@ -#ifndef hicrop_h +#ifndef hicrop_h #define hicrop_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Cube.h" #include "UserInterface.h" @@ -9,4 +17,4 @@ namespace Isis{ extern void hicrop(Cube *cube, UserInterface &ui, Pvl *log=nullptr); } -#endif \ No newline at end of file +#endif diff --git a/isis/src/mro/apps/hicrop/main.cpp b/isis/src/mro/apps/hicrop/main.cpp index 73fcdf0046..f1ab8780b8 100644 --- a/isis/src/mro/apps/hicrop/main.cpp +++ b/isis/src/mro/apps/hicrop/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "Application.h" @@ -19,8 +27,8 @@ void IsisMain() { } throw; } - + for (auto grpIt = appLog.beginGroup(); grpIt!= appLog.endGroup(); grpIt++) { Application::Log(*grpIt); } -} \ No newline at end of file +} diff --git a/isis/src/mro/apps/hicubeit/hicubeit.cpp b/isis/src/mro/apps/hicubeit/hicubeit.cpp index d4d0ef0691..b5b532e462 100644 --- a/isis/src/mro/apps/hicubeit/hicubeit.cpp +++ b/isis/src/mro/apps/hicubeit/hicubeit.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "hicubeit.h" #include "TextFile.h" diff --git a/isis/src/mro/apps/hicubeit/hicubeit.h b/isis/src/mro/apps/hicubeit/hicubeit.h index 37eac29bd6..9aa68df2da 100644 --- a/isis/src/mro/apps/hicubeit/hicubeit.h +++ b/isis/src/mro/apps/hicubeit/hicubeit.h @@ -1,6 +1,14 @@ #ifndef hicubeit_h #define hicubeit_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "UserInterface.h" namespace Isis{ diff --git a/isis/src/mro/apps/hicubeit/main.cpp b/isis/src/mro/apps/hicubeit/main.cpp index ad28f86428..065f4d8f9a 100644 --- a/isis/src/mro/apps/hicubeit/main.cpp +++ b/isis/src/mro/apps/hicubeit/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "hicubeit.h" diff --git a/isis/src/mro/apps/hicubenorm/hicubenorm.cpp b/isis/src/mro/apps/hicubenorm/hicubenorm.cpp index 9410b43a82..9b13885461 100644 --- a/isis/src/mro/apps/hicubenorm/hicubenorm.cpp +++ b/isis/src/mro/apps/hicubenorm/hicubenorm.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + // system include files go first #include #include @@ -74,9 +82,9 @@ namespace Isis { // We will be processing by tile. ProcessByTile p; - + p.SetInputCube(icube); - + // Setup the input cube; // Obtain information from the input file totalSamples = icube->sampleCount(); @@ -84,7 +92,7 @@ namespace Isis { totalBands = icube->bandCount(); channel = icube->group("Instrument")["ChannelNumber"]; - + // Cubenorm New Version Flag bool bNewVersion = ui.GetBoolean("NEW_VERSION"); @@ -160,10 +168,10 @@ namespace Isis { } } } - + Isis::CubeAttributeOutput atts = ui.GetOutputAttribute("TO"); FileName outFileName = ui.GetFileName("TO"); - + // Setup the output file and apply the coefficients by either // subtracting or multipling them p.SetOutputCube(outFileName.expanded(), atts, totalSamples, totalLines, totalBands); @@ -176,7 +184,7 @@ namespace Isis { keepSame(totalBands, rowcol, DIVIDE); } } - + // Process based on the mode if(ui.GetString("MODE") == "SUBTRACT") { p.StartProcess(subtract); diff --git a/isis/src/mro/apps/hicubenorm/hicubenorm.h b/isis/src/mro/apps/hicubenorm/hicubenorm.h index 1f680b1138..5df19942a3 100644 --- a/isis/src/mro/apps/hicubenorm/hicubenorm.h +++ b/isis/src/mro/apps/hicubenorm/hicubenorm.h @@ -1,6 +1,14 @@ -#ifndef hicubenorm_h +#ifndef hicubenorm_h #define hicubenorm_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Cube.h" #include "UserInterface.h" diff --git a/isis/src/mro/apps/hicubenorm/main.cpp b/isis/src/mro/apps/hicubenorm/main.cpp index ae179d3478..4413390101 100644 --- a/isis/src/mro/apps/hicubenorm/main.cpp +++ b/isis/src/mro/apps/hicubenorm/main.cpp @@ -1,7 +1,15 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "Application.h" -#include "hicubenorm.h" +#include "hicubenorm.h" using namespace Isis; diff --git a/isis/src/mro/apps/hideal2pds/main.cpp b/isis/src/mro/apps/hideal2pds/main.cpp index 2f25e47a42..4473cf4375 100644 --- a/isis/src/mro/apps/hideal2pds/main.cpp +++ b/isis/src/mro/apps/hideal2pds/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include diff --git a/isis/src/mro/apps/hidestripe/main.cpp b/isis/src/mro/apps/hidestripe/main.cpp index 2357d35749..64c7a42a2f 100644 --- a/isis/src/mro/apps/hidestripe/main.cpp +++ b/isis/src/mro/apps/hidestripe/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" // system include files go first diff --git a/isis/src/mro/apps/hidtmgen/hidtmgen.cpp b/isis/src/mro/apps/hidtmgen/hidtmgen.cpp index 5a8d145cb5..f1df2310bf 100644 --- a/isis/src/mro/apps/hidtmgen/hidtmgen.cpp +++ b/isis/src/mro/apps/hidtmgen/hidtmgen.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include diff --git a/isis/src/mro/apps/hidtmgen/hidtmgen.h b/isis/src/mro/apps/hidtmgen/hidtmgen.h index f3fde729d0..0fe8a460bd 100644 --- a/isis/src/mro/apps/hidtmgen/hidtmgen.h +++ b/isis/src/mro/apps/hidtmgen/hidtmgen.h @@ -1,6 +1,14 @@ -#ifndef hidtmgen_h // Change this to your app name in all lower case suffixed with _h (e.g. campt_h, cam2map_h etc.) +#ifndef hidtmgen_h #define hidtmgen_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Cube.h" #include "UserInterface.h" diff --git a/isis/src/mro/apps/hidtmgen/main.cpp b/isis/src/mro/apps/hidtmgen/main.cpp index 5b370cfb23..1867111f9b 100644 --- a/isis/src/mro/apps/hidtmgen/main.cpp +++ b/isis/src/mro/apps/hidtmgen/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "Application.h" diff --git a/isis/src/mro/apps/hiequal/main.cpp b/isis/src/mro/apps/hiequal/main.cpp index 92cb946d32..139e03a616 100644 --- a/isis/src/mro/apps/hiequal/main.cpp +++ b/isis/src/mro/apps/hiequal/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "HiEqualization.h" @@ -48,4 +56,3 @@ void IsisMain() { ui.GetFileName("TOLIST") : ""); } } - diff --git a/isis/src/mro/apps/hifringe/main.cpp b/isis/src/mro/apps/hifringe/main.cpp index 4ca8fc7e94..11b7dc98ff 100644 --- a/isis/src/mro/apps/hifringe/main.cpp +++ b/isis/src/mro/apps/hifringe/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + /* $Id: hifringe.cpp,v 1.6 2008/05/14 21:07:24 slambright Exp $ diff --git a/isis/src/mro/apps/hifurrows/main.cpp b/isis/src/mro/apps/hifurrows/main.cpp index d58744bbc4..ebc9ee64e5 100644 --- a/isis/src/mro/apps/hifurrows/main.cpp +++ b/isis/src/mro/apps/hifurrows/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "ProcessByLine.h" #include "ProcessBySample.h" @@ -459,4 +467,3 @@ void GetFurrowThresholdValues(int piCcdId, int piBin) #endif } - diff --git a/isis/src/mro/apps/higlob/main.cpp b/isis/src/mro/apps/higlob/main.cpp index 48cfab8d7e..93d45b12f0 100644 --- a/isis/src/mro/apps/higlob/main.cpp +++ b/isis/src/mro/apps/higlob/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "FileName.h" @@ -162,4 +170,3 @@ double int2ToDouble(int value) { else return value; } - diff --git a/isis/src/mro/apps/hijitreg/HiJitCube.cpp b/isis/src/mro/apps/hijitreg/HiJitCube.cpp index 9f431cc2e8..fbccb93949 100644 --- a/isis/src/mro/apps/hijitreg/HiJitCube.cpp +++ b/isis/src/mro/apps/hijitreg/HiJitCube.cpp @@ -1,24 +1,10 @@ -/** - * @file - * $Revision: 1.7 $ - * $Date: 2009/12/29 23:03:52 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include diff --git a/isis/src/mro/apps/hijitreg/HiJitCube.h b/isis/src/mro/apps/hijitreg/HiJitCube.h index 034eb5348d..3be9ab1eb5 100644 --- a/isis/src/mro/apps/hijitreg/HiJitCube.h +++ b/isis/src/mro/apps/hijitreg/HiJitCube.h @@ -1,25 +1,11 @@ -/** - * @file - * $Revision: 1.3 $ - * $Date: 2008/08/19 22:37:41 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #ifndef HiJitCube_h #define HiJitCube_h diff --git a/isis/src/mro/apps/hijitreg/main.cpp b/isis/src/mro/apps/hijitreg/main.cpp index 0ebff5a2af..6758741748 100644 --- a/isis/src/mro/apps/hijitreg/main.cpp +++ b/isis/src/mro/apps/hijitreg/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include diff --git a/isis/src/mro/apps/hijitter/main.cpp b/isis/src/mro/apps/hijitter/main.cpp index 3c67f8a225..8cb2efb38d 100644 --- a/isis/src/mro/apps/hijitter/main.cpp +++ b/isis/src/mro/apps/hijitter/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "Camera.h" @@ -56,7 +64,7 @@ double g_avgOffsets[11][2]; 7 | 7-8 | -576 8 | 8-9 | 607 9 | 10-11 | 606 - 10 | 12-13 | 606 */ + 10 | 12-13 | 606 */ const double g_lineOff[11] = { 574, @@ -73,7 +81,7 @@ const double g_lineOff[11] = { }; void IsisMain() { - // clear global vectors and intitialize global ints + // clear global vectors and intitialize global ints g_ccdFiles.clear(); g_tempFiles.clear(); g_ccdNumbers.clear(); @@ -92,7 +100,7 @@ void IsisMain() { init(inputList); // The first pipeline will create the match cube file - // + // // cubeatt FROM="masterCcdFileName.cub" TO="./matchMaster.cub" // spiceinit FROM="./matchMaster.cub" ATTACH="NO" // spicefit FROM="./matchMaster.cub" @@ -117,19 +125,19 @@ void IsisMain() { matchfilePipeline.Run(); - // The main hijitter pipeline - // + // The main hijitter pipeline + // // FIRST PASS: - // + // // for each file in file list // cubeatt FROM="originalFileName.cub" TO="./noproj.copy.FROM1.cub" - // + // // for i = 1 to i = numFiles // spiceinit FROM="./noproj.copy.FROM1.cub" ATTACH="NO" - // + // // echo ./noproj.copy.FROM1.cub ./noproj.copy.FROM2.cub ... ./noproj.copy.FROM(numFiles).cub > ./appjit.lis // appjit FROMLIST="./appjit.lis" JITTER="jitterFileName.txt" - // + // // for i = 1 to i = numFiles // noproj FROM="./noproj.copy.FROM1.cub" TO="./noproj.FROM1.cub" MATCH="./matchMaster.cub" Pipeline mainPipeline("Main hijitter Pipeline: cubeatt >> spiceinit >> appjit >> noproj"); @@ -148,8 +156,8 @@ void IsisMain() { mainPipeline.Application("spiceinit").AddConstParameter("ATTACH", "NO"); mainPipeline.AddToPipeline("appjit"); - mainPipeline.Application("appjit").SetInputParameter("FROMLIST", - PipelineApplication::LastAppOutputListNoMerge, + mainPipeline.Application("appjit").SetInputParameter("FROMLIST", + PipelineApplication::LastAppOutputListNoMerge, false); mainPipeline.Application("appjit").AddParameter("JITTER", "JITTER"); mainPipeline.Application("appjit").AddParameter("DEGREE", "DEGREE"); @@ -158,7 +166,7 @@ void IsisMain() { mainPipeline.AddToPipeline("noproj"); mainPipeline.Application("noproj").SetInputParameter("FROM", true); - mainPipeline.Application("noproj").AddConstParameter("MATCH", + mainPipeline.Application("noproj").AddConstParameter("MATCH", FileName("$TEMPORARY/matchMaster.cub").expanded()); mainPipeline.Application("noproj").SetOutputParameter("TO", FileName("$TEMPORARY/noproj").expanded()); @@ -172,16 +180,16 @@ void IsisMain() { if (ui.WasEntered("JITTERCK")) { // run main hijitter pipeline again with the same parameters - // + // // for each file in file list // cubeatt FROM="originalFileName.cub" TO="./noproj.copy.FROM1.cub" - // + // // for i = 1 to i = numFiles // spiceinit FROM="./noproj.copy.FROM1.cub" ATTACH="NO" - // + // // echo ./noproj.copy.FROM1.cub ./noproj.copy.FROM2.cub ... ./noproj.copy.FROM(numFiles).cub > ./appjit.lis // appjit FROMLIST="./appjit.lis" JITTER="jitterFileName.txt" - // + // // for i = 1 to i = numFiles // noproj FROM="./noproj.copy.FROM1.cub" TO="./noproj.FROM1.cub" MATCH="./matchMaster.cub" mainPipeline.Run(); @@ -189,7 +197,7 @@ void IsisMain() { // the outputs from this pipeline are temporary files created by cubeatt for (int i = 0; i < g_numFiles; i++) { - g_tempFiles.push_back(FileName("$TEMPORARY/noproj.FROM" + g_tempFiles.push_back(FileName("$TEMPORARY/noproj.FROM" + toString(i + 1) + ".cub").expanded()); } @@ -197,15 +205,15 @@ void IsisMain() { processNoprojFiles(mainPipeline); // run main hijitter pipeline with new parameters: - // + // // for each file in file list // cubeatt FROM="originalFileName.cub" TO="originalFileName.jitter.copy.FROM1.cub" // spiceinit FROM="originalFileName.jitter.copy.FROM1.cub" ATTACH="NO" - // + // // echo originalFileName.jitter.copy.FROM1.cub originalFileName.jitter.copy.FROM2.cub ... > ./appjit.lis // appjit FROMLIST="./appjit.lis" JITTER="jitterFileName.txt" MASTER="masterCcdFileName.jitter.copy.FROM1.cub" PITCHRATE="2.95810564663024e-05" // YAW="-9.06833084756325e-04" - // + // // for each file in file list // noproj FROM="originalFileName.jitter.copy.FROM1.cub" TO="originalFileName.jitter.cub" MATCH="./matchMaster.cub" // editlab FROM="originalFileName.jitter.cub" OPTIONS="SETKEY" GRPNAME="Instrument" KEYWORD="ImageJitterCorrected" VALUE="1" @@ -243,14 +251,14 @@ void IsisMain() { throw IException(IException::Programmer, msg, _FILEINFO_); } // run main hijitter pipeline with same parameters as last run: - // + // // for each file in file list // cubeatt FROM="originalFileName.cub" TO="originalFileName.jitter.copy.FROM1.cub" // spiceinit FROM="originalFileName.jitter.copy.FROM1.cub" ATTACH="NO" - // + // // echo originalFileName.jitter.copy.FROM1.cub originalFileName.jitter.copy.FROM2.cub ... > ./appjit.lis // appjit FROMLIST="./appjit.lis" JITTER="jitterFileName.txt" MASTER="masterFile.jitter.copy.FROM1.cub" PITCHRATE="2.95810564663024e-05" YAW="-9.06833084756325e-04" - // + // // for each file in file list // noproj FROM="originalFileName.jitter.copy.FROM1.cub" TO="originalFileName.jitter.cub" MATCH="./matchMaster.cub" // editlab FROM="originalFileName.jitter.cub" OPTIONS="SETKEY" GRPNAME="Instrument" KEYWORD="ImageJitterCorrected" VALUE="1" @@ -309,8 +317,8 @@ void IsisMain() { } /** - * This method will validate and return the file name corresponding to - * the given master ccd number. + * This method will validate and return the file name corresponding to + * the given master ccd number. * * @param inList Input file list * @param masterCcdNumber Number of the master CCD @@ -330,10 +338,10 @@ FileName masterCcdFileName(FileList &inList, int masterCcdNumber) { } /** - * This method will validate the input file list and set global - * variables: g_ccdFiles, g_ccdNumbers, g_numFiles, - * g_firstFilter - * + * This method will validate the input file list and set global + * variables: g_ccdFiles, g_ccdNumbers, g_numFiles, + * g_firstFilter + * * @param inList Input file list entered by the user */ void init(FileList &inList) { @@ -365,14 +373,14 @@ void init(FileList &inList) { ccdNumber = (int) toInt((QString)ccdKeywordValue.mid(2)); } else { - QString msg = "CcdId value of [" + ccdKeywordValue + "] found in [" + QString msg = "CcdId value of [" + ccdKeywordValue + "] found in [" + inList[i].toString() + "] not supported. Valid values " "include RED0-RED9, IR10-IR11, BG12-BG13"; throw IException(IException::Programmer, msg, _FILEINFO_); } if (ccdNumber < 0 || ccdNumber > 13) { - QString msg = "CcdId value of [" + ccdKeywordValue + "] found in [" + QString msg = "CcdId value of [" + ccdKeywordValue + "] found in [" + inList[i].toString() + "] not supported. Valid values " "include RED0-RED9, IR10-IR11, BG12-BG13"; throw IException(IException::Programmer, msg, _FILEINFO_); @@ -418,7 +426,7 @@ void init(FileList &inList) { // } // else if (foundFirstRedCcd && foundLastRedCcd && !g_ccdFiles[i].empty()) { // QString msg = "Invalid file list. All red CCDs listed must be consecutive. " -// "Input list has files containing [RED" + lastRedCcdFound +// "Input list has files containing [RED" + lastRedCcdFound // + "] and [RED" + toString((int)i) + "], but the CCDs between " // "are not represented in the given file list."; // throw IException(IException::User, msg, _FILEINFO_); @@ -463,7 +471,7 @@ void init(FileList &inList) { overlappingCcds = "CCD [" + color + toString((int) (i-1)) + "] is"; } else { - overlappingCcds = "CCDs [RED" + toString((int) (i-1)) + overlappingCcds = "CCDs [RED" + toString((int) (i-1)) + "] and [RED" + toString((int) (i+1)) + "] are"; } QString msg = "Invalid file list. A file containing the CCD [" + color @@ -481,12 +489,12 @@ void init(FileList &inList) { -/** - * +/** + * * @param p - * - */ -void processNoprojFiles(Pipeline &p) { + * + */ +void processNoprojFiles(Pipeline &p) { UserInterface &ui = Application::GetUserInterface(); // This will be decremented on error, it's easier this way @@ -494,7 +502,7 @@ void processNoprojFiles(Pipeline &p) { // numOffsets is an unnecesary variable. It should equal offsetIndeces.size() // int numOffsets = g_numFiles - 1; vector offsetIndices; - + Progress hijitregProg; hijitregProg.SetText("Running hijitreg"); hijitregProg.SetMaximumSteps(1); @@ -505,23 +513,23 @@ void processNoprojFiles(Pipeline &p) { // use the current cubes in the pipeline to create an output flat // file for this overlap from the hijireg program. This will // calculate avg offsets for the overlaps. - // + // // Note that the consecutive CCD pairs (9,10) and (11,12) do not // overlap since 0-9 are red, 10-11 are near-infrared, and 12-13 // are blue-green. For this reason, we don't run hijitreg for the // CCDs 9, 11, and 13. - if (g_ccdNumbers[i] != 9 && g_ccdNumbers[i] != 11 && g_ccdNumbers[i] != 13 + if (g_ccdNumbers[i] != 9 && g_ccdNumbers[i] != 11 && g_ccdNumbers[i] != 13 && g_ccdNumbers[i+1] == g_ccdNumbers[i] + 1) { QString tempDir = FileName("$TEMPORARY").expanded(); - QString flatFileName = tempDir + "/first" + toString(g_ccdNumbers[i]) + QString flatFileName = tempDir + "/first" + toString(g_ccdNumbers[i]) + "-" + toString(g_ccdNumbers[i+1]) + ".flat"; QString params = ""; params += "FROM=" + tempDir + "/noproj.FROM" + toString(i + 1) + ".cub"; params += " MATCH=" + tempDir + "/noproj.FROM" + toString(i + 2) + ".cub"; params += " REGDEF=" + ui.GetFileName("REGDEF"); params += " FLAT=" + flatFileName; - + try { // hijitreg FROM=$TEMPORARY/noproj.FROM1.cub MATCH= ProgramLauncher::RunIsisProgram("hijitreg", params); @@ -532,11 +540,11 @@ void processNoprojFiles(Pipeline &p) { } // Read offsets - + TextFile flatFile(flatFileName); g_tempFiles.push_back(flatFileName); - - // set the offset index value (0-10) + + // set the offset index value (0-10) // Note: we know that g_ccdNumbers is not 9, 11, 13 since these cases are // already excluded above int offsetIndex = 0; @@ -552,35 +560,35 @@ void processNoprojFiles(Pipeline &p) { g_avgOffsets[offsetIndex][0] = Isis::Null; g_avgOffsets[offsetIndex][1] = Isis::Null; - + QString line; try { while( flatFile.GetLine(line, false) && - (g_avgOffsets[offsetIndex][0] == Isis::Null + (g_avgOffsets[offsetIndex][0] == Isis::Null || g_avgOffsets[offsetIndex][1] == Isis::Null) ) { line = QString(line).simplified(); int pos = line.indexOf("Average Sample Offset: "); - + if (pos != -1) { // cut off text before our number (start pos + strlen + 1) line = line.mid(pos + strlen("Average Sample Offset: ")); - + // cut off text after our number line = line.mid(0, line.indexOf(" ")); - + g_avgOffsets[offsetIndex][0] = (double)toDouble((QString)line); pos = -1; } - + pos = line.indexOf("Average Line Offset: "); - + if (pos != -1) { // cut off text before our number (start pos + strlen + 1) line = line.mid(pos + strlen("Average Line Offset: ")); - + // cut off text after our number line = line.mid(0, line.indexOf(" ")); - + g_avgOffsets[offsetIndex][1] = (double)toDouble((QString)line); pos = -1; } @@ -709,4 +717,3 @@ void cropLines(QString inFile, double eTime1, double eTime2, int & line1, int & inCube->close(); delete(inCube); } - diff --git a/isis/src/mro/apps/himos/himos.cpp b/isis/src/mro/apps/himos/himos.cpp index d327c457be..aae9f68c4c 100644 --- a/isis/src/mro/apps/himos/himos.cpp +++ b/isis/src/mro/apps/himos/himos.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "himos.h" #include "Camera.h" diff --git a/isis/src/mro/apps/himos/himos.h b/isis/src/mro/apps/himos/himos.h index 349171e6bb..14d1682ead 100644 --- a/isis/src/mro/apps/himos/himos.h +++ b/isis/src/mro/apps/himos/himos.h @@ -1,6 +1,14 @@ #ifndef himos_h #define himos_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "UserInterface.h" namespace Isis{ diff --git a/isis/src/mro/apps/himos/main.cpp b/isis/src/mro/apps/himos/main.cpp index 2f9b18f41a..7f6e6d5795 100644 --- a/isis/src/mro/apps/himos/main.cpp +++ b/isis/src/mro/apps/himos/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "himos.h" diff --git a/isis/src/mro/apps/hinoise/main.cpp b/isis/src/mro/apps/hinoise/main.cpp index 4d84fff98c..97f7ac8078 100644 --- a/isis/src/mro/apps/hinoise/main.cpp +++ b/isis/src/mro/apps/hinoise/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include #include diff --git a/isis/src/mro/apps/hirdr2isis/main.cpp b/isis/src/mro/apps/hirdr2isis/main.cpp index a4d535fbf4..5165790e05 100644 --- a/isis/src/mro/apps/hirdr2isis/main.cpp +++ b/isis/src/mro/apps/hirdr2isis/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include diff --git a/isis/src/mro/apps/hirdrgen/main.cpp b/isis/src/mro/apps/hirdrgen/main.cpp index 655d1b2802..70e9c402de 100644 --- a/isis/src/mro/apps/hirdrgen/main.cpp +++ b/isis/src/mro/apps/hirdrgen/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include @@ -393,7 +401,7 @@ void IsisMain() { * the input(x axis) values are the unsigned Xbit values from the PDS file */ // ??? unneccessary calculation - this is done by ProcessExportPds class. - double slope = (maxmax - minmin) / (p.GetOutputMaximum() - p.GetOutputMinimum()); + double slope = (maxmax - minmin) / (p.GetOutputMaximum() - p.GetOutputMinimum()); double intercept = maxmax - slope * p.GetOutputMaximum(); image.addKeyword(PvlKeyword("SCALING_FACTOR", toString(slope)), Pvl::Replace); image.addKeyword(PvlKeyword("OFFSET", toString(intercept)), Pvl::Replace); diff --git a/isis/src/mro/apps/hisharpen/main.cpp b/isis/src/mro/apps/hisharpen/main.cpp index 40a7bdb00f..3ea4b3ba65 100644 --- a/isis/src/mro/apps/hisharpen/main.cpp +++ b/isis/src/mro/apps/hisharpen/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "Pipeline.h" #include "Cube.h" diff --git a/isis/src/mro/apps/histat/main.cpp b/isis/src/mro/apps/histat/main.cpp index 779acaa7aa..8592611d8b 100644 --- a/isis/src/mro/apps/histat/main.cpp +++ b/isis/src/mro/apps/histat/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include diff --git a/isis/src/mro/apps/histitch/main.cpp b/isis/src/mro/apps/histitch/main.cpp index 264faca7e8..2292266462 100644 --- a/isis/src/mro/apps/histitch/main.cpp +++ b/isis/src/mro/apps/histitch/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include "Isis.h" #include "QuickFilter.h" diff --git a/isis/src/mro/apps/marci2isis/main.cpp b/isis/src/mro/apps/marci2isis/main.cpp index 7ec0c8d2d1..5f966176ee 100644 --- a/isis/src/mro/apps/marci2isis/main.cpp +++ b/isis/src/mro/apps/marci2isis/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "marci2isis.h" @@ -20,7 +28,7 @@ void IsisMain() { } throw; } - + for (auto grpIt = appLog.beginGroup(); grpIt!= appLog.endGroup(); grpIt++) { Application::Log(*grpIt); } diff --git a/isis/src/mro/apps/marci2isis/marci2isis.cpp b/isis/src/mro/apps/marci2isis/marci2isis.cpp index 29848d5203..1b8406b260 100644 --- a/isis/src/mro/apps/marci2isis/marci2isis.cpp +++ b/isis/src/mro/apps/marci2isis/marci2isis.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "marci2isis.h" #include "ProcessImportPds.h" @@ -158,7 +166,7 @@ namespace Isis{ outputCubes[i]->write(origLabel); } - QString prodId = outputCubes[0]->label()->findGroup("Archive", Pvl::Traverse)["ProductId"][0]; + QString prodId = outputCubes[0]->label()->findGroup("Archive", Pvl::Traverse)["ProductId"][0]; prodId = prodId.toUpper(); vector frameseq; vector exptime; @@ -168,15 +176,15 @@ namespace Isis{ double exposure = instInitial["ExposureDuration"][0].toDouble() * 1000.0; frameseq.push_back(0); - exptime.push_back(exposure); + exptime.push_back(exposure); QString varExpFile = "$mro/calibration/marci/varexp.tab"; - + // Load the MARCI exposure duration calibration tables. bool header=false; int skip=0; FileName csvfile(varExpFile); - + CSVReader csv(csvfile.expanded(), header, skip); // There may be multiple entries in the file for this productID, // so we *must* loop through the entire file. @@ -191,7 +199,7 @@ namespace Isis{ // Now, compare product ids from the input image and from the calibration table. if(fileProdId == prodId ) { if((row.dim1() - 1) != 2) { - QString msg = "This appears to be a malformed calibration file."; + QString msg = "This appears to be a malformed calibration file."; msg += " There are not enough columns in the CSV"; msg += " file to perform the exposure time correction."; throw IException(IException::User, msg, _FILEINFO_); @@ -209,18 +217,18 @@ namespace Isis{ } // If exptime < 2, no additional exposure durations were found in the varexp file, so - // assume a single exposure duration and warn the user. - // Using single exposure duration is correct in many cases, but there is no way to check - // using only the information in the label. + // assume a single exposure duration and warn the user. + // Using single exposure duration is correct in many cases, but there is no way to check + // using only the information in the label. if (exptime.size() < 2) { PvlGroup missing("NoExposureTimeDataFound"); PvlKeyword message("Message", "No variable exposure information found in the varexp file." " Assuming exposure time is fixed for [" + inFile.toString() + "]" ); - missing.addKeyword(message); + missing.addKeyword(message); missing.addKeyword(PvlKeyword("FileNotFoundInVarexpFile", prodId), Pvl::Replace); log->addGroup(missing); } - + // Translate labels to every image and close output cubes before calling EndProcess // Add these values to the label diff --git a/isis/src/mro/apps/marci2isis/marci2isis.h b/isis/src/mro/apps/marci2isis/marci2isis.h index f0a8edcda2..486b0dd3af 100644 --- a/isis/src/mro/apps/marci2isis/marci2isis.h +++ b/isis/src/mro/apps/marci2isis/marci2isis.h @@ -1,6 +1,14 @@ #ifndef marci2isis_h #define marci2isis_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Pvl.h" #include "UserInterface.h" diff --git a/isis/src/mro/apps/marcical/main.cpp b/isis/src/mro/apps/marcical/main.cpp index ea5c939f7a..fdb99c2583 100644 --- a/isis/src/mro/apps/marcical/main.cpp +++ b/isis/src/mro/apps/marcical/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "SpecialPixel.h" #include "CubeAttribute.h" @@ -344,12 +352,12 @@ void IsisMain() { // find the filter num int filtNum = 0; int numKnownFilters = sizeof(knownFilters) / sizeof(QString); - + while (filtNum < numKnownFilters && (QString)icube.label()->findGroup("BandBin", Pvl::Traverse)["FilterName"][filter] != knownFilters[filtNum]) { filtNum ++; } - + padding[filter] = (colorOffset * filterHeight) * filtNum; } else { @@ -370,7 +378,7 @@ void IsisMain() { if (!inst.hasKeyword("VariableExposureDuration") || !inst.hasKeyword("FrameNumber")) { QString msg = "The instrument keywords VariableExposureDuration and FrameNumber" - "must exist to calibrate this MARCI file. Prior to isis3.10.0 these" + "must exist to calibrate this MARCI file. Prior to isis3.10.0 these" "keywords were not added by marci2isis; you may need to rerun isis3.10+" "marci2isis on your images."; throw IException(IException::User, msg, _FILEINFO_); @@ -379,8 +387,8 @@ void IsisMain() { // The previous version of marcical read the first exposure duration and frame number from // the label and the other durations/frames (if any) from the mission's varexp.tab file. // In order to minimize the changes to this code while modifying it to use the keywords instead of - // reading the varexp.tab file directly, the duration/frame where the frame is zero are dropped from - // the array when converting them from the keywords. This calibration code should be + // reading the varexp.tab file directly, the duration/frame where the frame is zero are dropped from + // the array when converting them from the keywords. This calibration code should be // able to be simplified significantly by not removing the frameNumber=0 exposure/frame and // removing the first frame ifs in the calibration code below. PvlKeyword expTimesKey = inst["VariableExposureDuration"]; @@ -433,7 +441,7 @@ void IsisMain() { // Seems like something might be wrong here. frame = 0; exposure = ((double)icube.label()->findGroup("Instrument", Pvl::Traverse)["ExposureDuration"]) * 1000.0; - } + } else { maxOffset = padding[band-1]; frame = (icube.lineCount() - maxOffset) / filterHeight - 1; @@ -466,7 +474,7 @@ void IsisMain() { else { exposure = ((double)icube.label()->findGroup("Instrument", Pvl::Traverse)["ExposureDuration"]) * 1000.0; } - // Exposure duration for the UV filters are calculated from the non-UV exposure duration + // Exposure duration for the UV filters are calculated from the non-UV exposure duration if ((QString)icube.label()->findGroup("BandBin", Pvl::Traverse)["FilterName"][band-1] == "LONG_UV" || (QString)icube.label()->findGroup("BandBin", Pvl::Traverse)["FilterName"][band-1] == "SHORT_UV") { exposure = ifdelay - 57.763 - exposure; @@ -571,7 +579,7 @@ void IsisMain() { } /* - From the MARCI calibration report, Bell et al., 2009, + From the MARCI calibration report, Bell et al., 2009, Mars Reconnaissance Orbiter Mars Color Imager (MARCI): Instrument description, calibration, and performance, JGR, 114 E08S92 doi:10.1029/2008JE003315 @@ -663,6 +671,6 @@ END_OBJECT = COLUMN END_OBJECT = TABLE -END - +END + */ diff --git a/isis/src/mro/apps/marciflip/main.cpp b/isis/src/mro/apps/marciflip/main.cpp index 394ccfed74..85743c9cdb 100644 --- a/isis/src/mro/apps/marciflip/main.cpp +++ b/isis/src/mro/apps/marciflip/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "ProcessImportPds.h" #include "FileName.h" diff --git a/isis/src/mro/apps/mroctx2isis/main.cpp b/isis/src/mro/apps/mroctx2isis/main.cpp index 1a0e7f3854..959db4e735 100644 --- a/isis/src/mro/apps/mroctx2isis/main.cpp +++ b/isis/src/mro/apps/mroctx2isis/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "ProcessImportPds.h" #include "ProcessByLine.h" diff --git a/isis/src/mro/apps/pds2hideal/main.cpp b/isis/src/mro/apps/pds2hideal/main.cpp index 1c6f5c8ee8..6d1ade2ee8 100644 --- a/isis/src/mro/apps/pds2hideal/main.cpp +++ b/isis/src/mro/apps/pds2hideal/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include @@ -37,7 +45,7 @@ void IsisMain() { Cube *outputCube = p.SetOutputCube("TO"); Pvl otherGroups; - // translate the band bin and archive groups to this pvl + // translate the band bin and archive groups to this pvl p.TranslatePdsLabels(otherGroups); p.ImportTable("INSTRUMENT_POINTING_TABLE"); @@ -65,10 +73,10 @@ void IsisMain() { Pvl *isisLabel = outputCube->label(); - PvlToPvlTranslationManager labelXlater(pdsLabelPvl, + PvlToPvlTranslationManager labelXlater(pdsLabelPvl, "$ISISROOT/appdata/translations/MroHiriseIdealPdsImportLabel.trn"); labelXlater.Auto(*isisLabel); - + PvlObject &naifKeywords = isisLabel->findObject("NaifKeywords"); PvlKeyword bodyRadii("BODY499_RADII"); bodyRadii.addValue(QString(pdsLabelPvl["A_AXIS_RADIUS"])); @@ -82,7 +90,7 @@ void IsisMain() { Application::GetUserInterface().ProgramName(); PvlGroup &archiveGroup = isisCubeObject.findGroup("Archive"); archiveGroup += PvlKeyword("SOFTWARE_NAME", sfname); - + PvlObject &pdsImageObj = pdsLabelPvl.findObject("IMAGE"); double samples = double(pdsImageObj["LINE_SAMPLES"]); double lines = double(pdsImageObj["LINES"]); @@ -189,4 +197,3 @@ void addTableKeywords(Pvl *isisLabel, Pvl pdsLabelPvl) { } } } - diff --git a/isis/src/mro/objs/CTXCamera/CTXCamera.cpp b/isis/src/mro/objs/CTXCamera/CTXCamera.cpp index a6a4388d9d..aac46aab67 100644 --- a/isis/src/mro/objs/CTXCamera/CTXCamera.cpp +++ b/isis/src/mro/objs/CTXCamera/CTXCamera.cpp @@ -1,22 +1,10 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "CTXCamera.h" @@ -47,7 +35,7 @@ namespace Isis { m_instrumentNameShort = "CTX"; m_spacecraftNameLong = "Mars Reconnaissance Orbiter"; m_spacecraftNameShort = "MRO"; - + NaifStatus::CheckErrors(); // Set up the camera info from ik/iak kernels SetFocalLength(); @@ -105,7 +93,7 @@ namespace Isis { * @param lab Cube labels * * @return Isis::Camera* CTXCamera - * @internal + * @internal * @history 2011-05-03 Jeannie Walldren - Added documentation. Removed Mro * namespace. */ diff --git a/isis/src/mro/objs/CTXCamera/CTXCamera.h b/isis/src/mro/objs/CTXCamera/CTXCamera.h index 3b163602e0..8589eee007 100644 --- a/isis/src/mro/objs/CTXCamera/CTXCamera.h +++ b/isis/src/mro/objs/CTXCamera/CTXCamera.h @@ -1,25 +1,13 @@ #ifndef CTXCamera_h #define CTXCamera_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "LineScanCamera.h" @@ -28,7 +16,7 @@ namespace Isis { * @brief MRO CTX Camera Model * * This is the camera model for the Mars Reconnaissance Orbiter Context Camera - * (CTX). + * (CTX). * * @ingroup SpiceInstrumentsAndCameras * @ingroup MarsReconnaissanceOrbiter @@ -55,19 +43,19 @@ namespace Isis { * methods. Updated documentation. Removed Mro namespace wrap * inside Isis namespace. Added Isis Disclaimer to files. Added * NAIF error check to constructor. - * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis + * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis * coding standards. References #972. * @history 2012-12-27 Tracie Sucharski, Fixed bug for images with a SpatialSumming=2. - * The images were compressed in the y-direction. There was a line of - * code commented out, "lineRate *= csum;". From the - * MRO_ctx_pds_sis.pdf, "Note that CTX implements downtrack summing by - * increasing the line time; for example, a 2X2 summed image has an - * actual line time twice that given by this field.". Uncommenting + * The images were compressed in the y-direction. There was a line of + * code commented out, "lineRate *= csum;". From the + * MRO_ctx_pds_sis.pdf, "Note that CTX implements downtrack summing by + * increasing the line time; for example, a 2X2 summed image has an + * actual line time twice that given by this field.". Uncommenting * the line fixed the y-direction scale problem. Fixes #826. * @history 2015-08-12 Ian Humphrey and Makayla Shepherd - Added new data members and methods * to get spacecraft and instrument names. Extended unit test to test * these methods. - * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument + * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument * members and methods and removed implementation of these methods * since Camera now handles this. References #2335. */ @@ -80,23 +68,23 @@ namespace Isis { /** * CK frame ID - - Instrument Code from spacit run on CK - * - * @return @b int The appropriate instrument code for the "Camera-matrix" + * + * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Frame ID */ virtual int CkFrameId() const { return (-74000); } - /** + /** * CK Reference ID - MRO_MME_OF_DATE - * + * * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Reference ID */ virtual int CkReferenceId() const { return (-74900); } - /** + /** * SPK Reference ID - J2000 - * + * * @return @b int The appropriate instrument code for the Spacecraft * Kernel Reference ID */ diff --git a/isis/src/mro/objs/CTXCamera/unitTest.cpp b/isis/src/mro/objs/CTXCamera/unitTest.cpp index 4c577cd577..70f0dd2715 100644 --- a/isis/src/mro/objs/CTXCamera/unitTest.cpp +++ b/isis/src/mro/objs/CTXCamera/unitTest.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include "Camera.h" @@ -32,7 +21,7 @@ using namespace Isis; /** * @brief unitTest for MRO CTX Camera Model * - * This is the unitTest for the Mars Reconnaissance Orbiter Context Camera (CTX) camera model. + * This is the unitTest for the Mars Reconnaissance Orbiter Context Camera (CTX) camera model. * * @author ????-??-?? Unknown * @@ -67,14 +56,14 @@ int main(int argc, char *argv[]) { cout << "CK Frame: " << cam->instrumentRotation()->Frame() << endl << endl; cout.setf(std::ios::fixed); cout << setprecision(9); - + // Test kernel IDs cout << "Kernel IDs: " << endl; cout << "CK Frame ID = " << cam->CkFrameId() << endl; cout << "CK Reference ID = " << cam->CkReferenceId() << endl; cout << "SPK Target ID = " << cam->SpkTargetId() << endl; cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl; - + // Test name methods cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl; cout << "Spacecraft Name Short: " << cam->spacecraftNameShort() << endl; diff --git a/isis/src/mro/objs/CrismCamera/CrismCamera.cpp b/isis/src/mro/objs/CrismCamera/CrismCamera.cpp index 671a546dc4..1b2c5d83fb 100644 --- a/isis/src/mro/objs/CrismCamera/CrismCamera.cpp +++ b/isis/src/mro/objs/CrismCamera/CrismCamera.cpp @@ -1,22 +1,10 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "CrismCamera.h" diff --git a/isis/src/mro/objs/CrismCamera/CrismCamera.h b/isis/src/mro/objs/CrismCamera/CrismCamera.h index fd67715f52..d69d805bec 100644 --- a/isis/src/mro/objs/CrismCamera/CrismCamera.h +++ b/isis/src/mro/objs/CrismCamera/CrismCamera.h @@ -1,25 +1,13 @@ #ifndef CrismCamera_h #define CrismCamera_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "LineScanCamera.h" @@ -52,7 +40,7 @@ namespace Isis { * since Camera now handles this. References #2335. * @history 2016-09-14 Kelvin Rodriguez - Enforced the order in which BORESIGHT_LINE and * BORESIGHT_SAMPLE are added to the PVL. Part of porting to - * OSX 10.11 + * OSX 10.11 */ class CrismCamera : public LineScanCamera { public: diff --git a/isis/src/mro/objs/CrismCamera/unitTest.cpp b/isis/src/mro/objs/CrismCamera/unitTest.cpp index e5b29aafd9..b2eb884cff 100644 --- a/isis/src/mro/objs/CrismCamera/unitTest.cpp +++ b/isis/src/mro/objs/CrismCamera/unitTest.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -100,7 +89,7 @@ int main(void) { else { cout << setprecision(16) << "Longitude off by: " << cam->UniversalLongitude() - knownLon << endl; } - + // Test name methods cout << endl << endl << "Testing name methods ..." << endl; cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl; @@ -137,4 +126,3 @@ void TestLineSamp(Camera *cam, double samp, double line) { cout << "DeltaLine = ERROR" << endl << endl; } } - diff --git a/isis/src/mro/objs/HiCal/GainChannelNormalize.h b/isis/src/mro/objs/HiCal/GainChannelNormalize.h index 7289173af3..3d79e099ed 100644 --- a/isis/src/mro/objs/HiCal/GainChannelNormalize.h +++ b/isis/src/mro/objs/HiCal/GainChannelNormalize.h @@ -1,28 +1,14 @@ #ifndef GainChannelNormalize_h #define GainChannelNormalize_h -/** - * @file - * $Revision: 1.2 $ - * $Date: 2008/05/14 21:07:22 $ - * $Id: GainChannelNormalize.h,v 1.2 2008/05/14 21:07:22 slambright Exp $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include diff --git a/isis/src/mro/objs/HiCal/GainFlatField.h b/isis/src/mro/objs/HiCal/GainFlatField.h index 084af4dbc9..ac53a0b6d5 100644 --- a/isis/src/mro/objs/HiCal/GainFlatField.h +++ b/isis/src/mro/objs/HiCal/GainFlatField.h @@ -1,28 +1,14 @@ #ifndef GainFlatField_h #define GainFlatField_h -/** - * @file - * $Revision: 1.4 $ - * $Date: 2009/09/15 21:56:44 $ - * $Id: GainFlatField.h,v 1.4 2009/09/15 21:56:44 kbecker Exp $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include diff --git a/isis/src/mro/objs/HiCal/GainLineDrift.h b/isis/src/mro/objs/HiCal/GainLineDrift.h index b0b3729d54..833d109836 100644 --- a/isis/src/mro/objs/HiCal/GainLineDrift.h +++ b/isis/src/mro/objs/HiCal/GainLineDrift.h @@ -1,28 +1,14 @@ #ifndef GainLineDrift_h #define GainLineDrift_h -/** - * @file - * $Revision: 1.2 $ - * $Date: 2008/05/14 21:07:22 $ - * $Id: GainLineDrift.h,v 1.2 2008/05/14 21:07:22 slambright Exp $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include diff --git a/isis/src/mro/objs/HiCal/GainNonLinearity.h b/isis/src/mro/objs/HiCal/GainNonLinearity.h index f3ee196b74..54a408e7d2 100644 --- a/isis/src/mro/objs/HiCal/GainNonLinearity.h +++ b/isis/src/mro/objs/HiCal/GainNonLinearity.h @@ -1,28 +1,14 @@ #ifndef GainNonLinearity_h #define GainNonLinearity_h -/** - * @file - * $Revision: 1.1 $ - * $Date: 2009/09/15 21:56:44 $ - * $Id: GainNonLinearity.h,v 1.1 2009/09/15 21:56:44 kbecker Exp $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include diff --git a/isis/src/mro/objs/HiCal/GainTemperature.h b/isis/src/mro/objs/HiCal/GainTemperature.h index abd54a2239..0ec003faf0 100644 --- a/isis/src/mro/objs/HiCal/GainTemperature.h +++ b/isis/src/mro/objs/HiCal/GainTemperature.h @@ -1,28 +1,14 @@ #ifndef GainTemperature_h #define GainTemperature_h -/** - * @file - * $Revision: 1.1 $ - * $Date: 2009/09/15 21:56:44 $ - * $Id: GainTemperature.h,v 1.1 2009/09/15 21:56:44 kbecker Exp $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include diff --git a/isis/src/mro/objs/HiCal/GainUnitConversion.h b/isis/src/mro/objs/HiCal/GainUnitConversion.h index 6de026f7f7..b40d2ff26b 100644 --- a/isis/src/mro/objs/HiCal/GainUnitConversion.h +++ b/isis/src/mro/objs/HiCal/GainUnitConversion.h @@ -1,28 +1,14 @@ #ifndef GainUnitConversion_h #define GainUnitConversion_h -/** - * @file - * $Revision: 1.2 $ - * $Date: 2008/05/14 21:07:22 $ - * $Id$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include diff --git a/isis/src/mro/objs/HiCal/HiBlob.h b/isis/src/mro/objs/HiCal/HiBlob.h index b4fabd5ad9..bf9f9c0945 100644 --- a/isis/src/mro/objs/HiCal/HiBlob.h +++ b/isis/src/mro/objs/HiCal/HiBlob.h @@ -1,27 +1,13 @@ #ifndef HiBlob_h #define HiBlob_h -/** - * @file - * $Revision: 1.2 $ - * $Date: 2008/05/12 18:17:33 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include "Blobber.h" diff --git a/isis/src/mro/objs/HiCal/HiCalConf.cpp b/isis/src/mro/objs/HiCal/HiCalConf.cpp index cdc55831d1..87383ef6b1 100644 --- a/isis/src/mro/objs/HiCal/HiCalConf.cpp +++ b/isis/src/mro/objs/HiCal/HiCalConf.cpp @@ -1,26 +1,10 @@ -/** - * @file - * $Revision: 1.5 $ - * $Date: 2009/12/29 23:03:52 $ - * $Id: HiCalConf.cpp,v 1.5 2009/12/29 23:03:52 ehyer Exp $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include diff --git a/isis/src/mro/objs/HiCal/HiCalConf.h b/isis/src/mro/objs/HiCal/HiCalConf.h index 1e05f5a2cd..43b218de7f 100644 --- a/isis/src/mro/objs/HiCal/HiCalConf.h +++ b/isis/src/mro/objs/HiCal/HiCalConf.h @@ -1,28 +1,13 @@ #ifndef HiCalConf_h #define HiCalConf_h -/** - * @file - * $Revision: 1.3 $ - * $Date: 2008/11/18 06:59:48 $ - * $Id: HiCalConf.h,v 1.3 2008/11/18 06:59:48 kbecker Exp $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include diff --git a/isis/src/mro/objs/HiCal/HiCalData.h b/isis/src/mro/objs/HiCal/HiCalData.h index 41f0e157c8..fb6443cf57 100644 --- a/isis/src/mro/objs/HiCal/HiCalData.h +++ b/isis/src/mro/objs/HiCal/HiCalData.h @@ -1,28 +1,13 @@ #ifndef HiCalData_h #define HiCalData_h -/** - * @file - * $Revision: 1.3 $ - * $Date: 2008/05/14 21:07:22 $ - * $Id: HiCalData.h,v 1.3 2008/05/14 21:07:22 slambright Exp $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include @@ -169,5 +154,3 @@ namespace Isis { } // namespace Isis #endif - - diff --git a/isis/src/mro/objs/HiCal/HiCalTypes.h b/isis/src/mro/objs/HiCal/HiCalTypes.h index 8d4c60fdf7..70e23feeed 100644 --- a/isis/src/mro/objs/HiCal/HiCalTypes.h +++ b/isis/src/mro/objs/HiCal/HiCalTypes.h @@ -1,27 +1,14 @@ #ifndef HiCalTypes_h #define HiCalTypes_h -/** - * @file - * $Revision: 1.1 $ - * $Date: 2008/01/13 08:12:58 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include @@ -46,7 +33,7 @@ class HiHistory { * @brief Output operator for history events * @param o Output stream * @param h History class to write contents of - * + * * @return std::ostream& Returns new state of stream */ friend std::ostream &operator<<(std::ostream &o, const HiHistory &h) { @@ -66,8 +53,8 @@ class HiHistory { inline int size() const { return (_events.size()); } void add(const QString &event) { _events.push_back(event); } - QString get(unsigned int index = 0) const { - if (index < _events.size()) { + QString get(unsigned int index = 0) const { + if (index < _events.size()) { return (_events[index]); } else { @@ -82,7 +69,7 @@ class HiHistory { for (unsigned int i = 0 ; i < _events.size() ; i++) { key.addValue(_events[i]); } - return (key); + return (key); } private: diff --git a/isis/src/mro/objs/HiCal/HiCalUtil.h b/isis/src/mro/objs/HiCal/HiCalUtil.h index 15c86545a7..c9e5f0d5b0 100644 --- a/isis/src/mro/objs/HiCal/HiCalUtil.h +++ b/isis/src/mro/objs/HiCal/HiCalUtil.h @@ -1,27 +1,13 @@ #ifndef HiCalUtil_h #define HiCalUtil_h -/** - * @file - * $Revision: 1.6 $ - * $Date: 2008/11/06 00:08:15 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include diff --git a/isis/src/mro/objs/HiCal/LoadCSV.cpp b/isis/src/mro/objs/HiCal/LoadCSV.cpp index 209279184f..f779cb8852 100644 --- a/isis/src/mro/objs/HiCal/LoadCSV.cpp +++ b/isis/src/mro/objs/HiCal/LoadCSV.cpp @@ -1,26 +1,11 @@ -/** - * @file - * $Revision$ - * $Date$ - * $Id$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include diff --git a/isis/src/mro/objs/HiCal/LoadCSV.h b/isis/src/mro/objs/HiCal/LoadCSV.h index 0d7a90a514..39c0f1987e 100644 --- a/isis/src/mro/objs/HiCal/LoadCSV.h +++ b/isis/src/mro/objs/HiCal/LoadCSV.h @@ -1,28 +1,14 @@ #ifndef LoadCSV_h #define LoadCSV_h -/** - * @file - * $Revision - * $Date$ - * $Id$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include @@ -114,4 +100,3 @@ namespace Isis { } // namespace Isis #endif - diff --git a/isis/src/mro/objs/HiCal/LowPassFilter.h b/isis/src/mro/objs/HiCal/LowPassFilter.h index 56e7d1aed3..3546717ade 100644 --- a/isis/src/mro/objs/HiCal/LowPassFilter.h +++ b/isis/src/mro/objs/HiCal/LowPassFilter.h @@ -1,28 +1,13 @@ #ifndef LowPassFilter_h #define LowPassFilter_h -/** - * @file - * $Revision: 1.1 $ - * $Date: 2008/01/13 08:12:59 $ - * $Id: LowPassFilter.h,v 1.1 2008/01/13 08:12:59 kbecker Exp $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include @@ -37,30 +22,30 @@ namespace Isis { /** * @brief Compute a low pass filter from a Module class content - * + * * @ingroup Utility - * + * * @author 2007-10-09 Kris Becker */ class LowPassFilter : public Module { - public: + public: // Constructors and Destructor - LowPassFilter() : Module("LowPassFilter"), _width(3), + LowPassFilter() : Module("LowPassFilter"), _width(3), _iterations(1) { } - LowPassFilter(int width, int iterations = 1) : + LowPassFilter(int width, int iterations = 1) : Module("LowPassFilter"), _width(width), _iterations(iterations) { } - LowPassFilter(const Module &c, int width = 3, int iterations = 1) : - Module("LowPassFilter", c), _width(width), + LowPassFilter(const Module &c, int width = 3, int iterations = 1) : + Module("LowPassFilter", c), _width(width), _iterations(iterations) { _data = filterIterator(c.ref(), _width, _iterations); _history.add(formHistory()); } LowPassFilter(const HiVector &v, const HiHistory &h, - int width = 3, int iterations = 1) : - Module("LowPassFilter", h), _width(width), + int width = 3, int iterations = 1) : + Module("LowPassFilter", h), _width(width), _iterations(iterations) { _data = filterIterator(v, _width, _iterations); _history.add(formHistory()); @@ -82,7 +67,7 @@ namespace Isis { int _iterations; // Number iterations to apply filter QString formHistory() { - return (QString("LowPassFilter(Width[" + ToString(_width) + + return (QString("LowPassFilter(Width[" + ToString(_width) + "],Iters["+ToString(_iterations)+"])")); } @@ -107,4 +92,3 @@ namespace Isis { } // namespace Isis #endif - diff --git a/isis/src/mro/objs/HiCal/Module.h b/isis/src/mro/objs/HiCal/Module.h index 9a8a44dee9..37c1ebea55 100644 --- a/isis/src/mro/objs/HiCal/Module.h +++ b/isis/src/mro/objs/HiCal/Module.h @@ -1,28 +1,13 @@ #ifndef Module_h #define Module_h -/** - * @file - * $Revision: 1.4 $ - * $Date: 2008/07/16 16:38:00 $ - * $Id: Module.h,v 1.4 2008/07/16 16:38:00 skoechle Exp $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include diff --git a/isis/src/mro/objs/HiCal/NonLinearLSQ.cpp b/isis/src/mro/objs/HiCal/NonLinearLSQ.cpp index 19ebf27e3e..d8fa31e9b3 100644 --- a/isis/src/mro/objs/HiCal/NonLinearLSQ.cpp +++ b/isis/src/mro/objs/HiCal/NonLinearLSQ.cpp @@ -1,26 +1,11 @@ -/** - * @file - * $Revision: 1.2 $ - * $Date: 2008/02/08 21:31:01 $ - * $Id: NonLinearLSQ.cpp,v 1.2 2008/02/08 21:31:01 kbecker Exp $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include diff --git a/isis/src/mro/objs/HiCal/NonLinearLSQ.h b/isis/src/mro/objs/HiCal/NonLinearLSQ.h index 2d173c7f80..0582416eef 100644 --- a/isis/src/mro/objs/HiCal/NonLinearLSQ.h +++ b/isis/src/mro/objs/HiCal/NonLinearLSQ.h @@ -1,28 +1,13 @@ #ifndef NonLinearLSQ_h #define NonLinearLSQ_h -/** - * @file - * $Revision: 1.2 $ - * $Date: 2008/02/08 21:31:01 $ - * $Id: NonLinearLSQ.h,v 1.2 2008/02/08 21:31:01 kbecker Exp $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include @@ -46,11 +31,11 @@ namespace Isis { /** * @brief NonLinearLSQ Computes a fit using a Levenberg-Marquardt algorithm - * - * This virtual base class uses the GSL toolkit to apply the - * Levenberg-Marquardt algorithm to fit data to a non-linear equation using - * least squares. - * + * + * This virtual base class uses the GSL toolkit to apply the + * Levenberg-Marquardt algorithm to fit data to a non-linear equation using + * least squares. + * * @ingroup Utility * @author 2007-11-15 Kris Becker */ @@ -69,17 +54,17 @@ namespace Isis { virtual int nSize() const = 0; virtual int nParms() const = 0; - /** + /** * @brief Sets the maximum number of iterations - * + * * @param m User provides the maximum number iterations */ void setMaxIters(int m) { _maxIters = m; } - /** + /** * @brief Maximum number iterations for valid solution - * - * + * + * * @return int Maximum resolutions */ int maxIters() const { return (_maxIters); } @@ -99,18 +84,18 @@ namespace Isis { /** Check status for success of the given condition */ inline bool success(int status) const { return (status == GSL_SUCCESS); } /** Return error message pertaining to last fit procesing */ - inline std::string statusstr() const { + inline std::string statusstr() const { return (std::string(gsl_strerror(_status))); } /** Return error message given status condition */ - inline std::string statusstr(int status) const { + inline std::string statusstr(int status) const { return (std::string(gsl_strerror(status))); } /** Default interation test simply returns input status */ - virtual int checkIteration(const int Iter, const NLVector &fitcoefs, + virtual int checkIteration(const int Iter, const NLVector &fitcoefs, const NLVector &uncerts, double cplxconj, - int Istatus) { + int Istatus) { return (Istatus); } @@ -142,7 +127,7 @@ namespace Isis { }; static int f(const gsl_vector *x, void *params, gsl_vector *fx); static int df(const gsl_vector *x, void *params, gsl_matrix *J); - static int fdf(const gsl_vector *x, void *params, gsl_vector *fx, + static int fdf(const gsl_vector *x, void *params, gsl_vector *fx, gsl_matrix *J); NLVector gslToNlsq(const gsl_vector *v) const; @@ -154,4 +139,3 @@ namespace Isis { } // namespace Isis #endif - diff --git a/isis/src/mro/objs/HiCal/SplineFill.h b/isis/src/mro/objs/HiCal/SplineFill.h index 992f9496ff..bc76400904 100644 --- a/isis/src/mro/objs/HiCal/SplineFill.h +++ b/isis/src/mro/objs/HiCal/SplineFill.h @@ -1,28 +1,13 @@ #ifndef SplineFill_h #define SplineFill_h -/** - * @file - * $Revision: 1.2 $ - * $Date: 2008/11/06 00:08:15 $ - * $Id: SplineFill.h,v 1.2 2008/11/06 00:08:15 jwalldren Exp $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include @@ -37,31 +22,31 @@ namespace Isis { /** * @brief Compute a low pass filter from a Module class content - * + * * @ingroup Utility - * - * @author 2007-10-09 Kris Becker - * @history 2008-11-05 Jeannie Walldren Replaced references to + * + * @author 2007-10-09 Kris Becker + * @history 2008-11-05 Jeannie Walldren Replaced references to * DataInterp class with NumericalApproximation. */ class SplineFill : public Module { - public: + public: // Constructors and Destructor SplineFill() : Module("SplineFill"), _filled(0) { } - SplineFill(const Module &c) : + SplineFill(const Module &c) : Module("SplineFill", c), _filled(0) { fill(c.ref()); _history.add(formHistory()); } - SplineFill(const HiVector &v) : + SplineFill(const HiVector &v) : Module("SplineFill"), _filled(0) { fill(v); _history.add(formHistory()); } - SplineFill(const HiVector &v, const HiHistory &h) : + SplineFill(const HiVector &v, const HiHistory &h) : Module("SplineFill", h), _filled(0) { fill(v); _history.add(formHistory()); @@ -90,7 +75,7 @@ namespace Isis { NumericalApproximation spline(NumericalApproximation::CubicNatural); for (int i = 0 ; i < v.dim() ; i++) { if (!IsSpecial(v[i])) { - spline.AddData(i, v[i]); + spline.AddData(i, v[i]); } } @@ -99,7 +84,7 @@ namespace Isis { _filled = 0; for (int j = 0 ; j < v.dim() ; j++) { if (IsSpecial(v[j])) { - vout[j] = spline.Evaluate(j,NumericalApproximation::NearestEndpoint); + vout[j] = spline.Evaluate(j,NumericalApproximation::NearestEndpoint); _filled++; } else { @@ -114,4 +99,3 @@ namespace Isis { } // namespace Isis #endif - diff --git a/isis/src/mro/objs/HiCal/ZeroBufferFit.cpp b/isis/src/mro/objs/HiCal/ZeroBufferFit.cpp index 1c9c25f3d4..8ec893a69d 100644 --- a/isis/src/mro/objs/HiCal/ZeroBufferFit.cpp +++ b/isis/src/mro/objs/HiCal/ZeroBufferFit.cpp @@ -1,26 +1,11 @@ -/** - * @file - * $Revision: 1.4 $ - * $Date: 2008/06/11 00:56:51 $ - * $Id: ZeroBufferFit.cpp,v 1.4 2008/06/11 00:56:51 kbecker Exp $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include @@ -43,15 +28,15 @@ using namespace std; namespace Isis { /** - * @brief Compute second level drift correction (Zf module) - * - * This class provides the second level drift correction that is - * - * - * @param conf + * @brief Compute second level drift correction (Zf module) + * + * This class provides the second level drift correction that is + * + * + * @param conf */ - ZeroBufferFit::ZeroBufferFit(const HiCalConf &conf) : - NonLinearLSQ(), Module("ZeroBufferFit") { + ZeroBufferFit::ZeroBufferFit(const HiCalConf &conf) : + NonLinearLSQ(), Module("ZeroBufferFit") { DbProfile prof = conf.getMatrixProfile(); _history.add("Profile["+ prof.Name()+"]"); _timet.setBin(ToInteger(prof("Summing"))); @@ -77,7 +62,7 @@ namespace Isis { QString histstr = "ZeroBufferFit(AbsErr[" + ToString(_absErr) + - "],RelErr[" + ToString(_relErr) + + "],RelErr[" + ToString(_relErr) + "],MaxIter[" + ToString(maxIters()) + "])"; _history.add(histstr); @@ -85,22 +70,22 @@ namespace Isis { /** * @brief Compute non-linear fit to (typically) ZeroBufferSmooth module - * - * This method computes a non-linear fit to the result of the - * ZeroBufferSmooth module. There are several things that can go wrong and - * some config conditions that dictate behavior of this process. - * - * Should the image be a short exposure (i.e., not many lines) the fit will - * not succeed so it simply skips this entire module providing the input - * result (d) as the solution. This wil also occur when the user has selected - * the skip option for the module. - * - * A fit is attempted on the ZeroBufferSmooth data. The non-linear solution - * must converge within the specifed number of iterations (MaximumIterations) - * or a polynomial fit will be used in leui of a valid solution. - * + * + * This method computes a non-linear fit to the result of the + * ZeroBufferSmooth module. There are several things that can go wrong and + * some config conditions that dictate behavior of this process. + * + * Should the image be a short exposure (i.e., not many lines) the fit will + * not succeed so it simply skips this entire module providing the input + * result (d) as the solution. This wil also occur when the user has selected + * the skip option for the module. + * + * A fit is attempted on the ZeroBufferSmooth data. The non-linear solution + * must converge within the specifed number of iterations (MaximumIterations) + * or a polynomial fit will be used in leui of a valid solution. + * * @param d ZeroBufferSmooth data solution as input to this method - * + * * @return HiVector Returns result of the processing */ HiVector ZeroBufferFit::Solve(const HiVector &d) { @@ -113,7 +98,7 @@ namespace Isis { _cc = HiVector(2, 0.0); _chisq = 0.0; if ( !gotGoodLines(d) ) { - hist << "NotEnoughLines(GoodLines[" << goodLines(d) + hist << "NotEnoughLines(GoodLines[" << goodLines(d) << "],MinimumLines[" << _minLines << "]);"; } @@ -133,7 +118,7 @@ namespace Isis { _history.add("a1("+ToString(_coefs[1])+"+-"+ToString(_uncert[1])+")"); _history.add("a2("+ToString(_coefs[2])+"+-"+ToString(_uncert[2])+")"); _history.add("a3("+ToString(_coefs[3])+"+-"+ToString(_uncert[3])+")"); - } + } else { // Punt, fit a straight line to the data _cc = poly_fit(d); @@ -143,8 +128,8 @@ namespace Isis { a[2] = 0.0; a[3] = 0.0; _coefs = a; - - hist << "Failed::Reason("<< statusstr() << "),#Iters[" + + hist << "Failed::Reason("<< statusstr() << "),#Iters[" << nIterations() << "])"; _history.add(hist.str().c_str()); _history.add("a0("+ToString(_coefs[0])+")"); @@ -154,7 +139,7 @@ namespace Isis { if ( _useLinFit ) { _history.add("OnFailureUse(LinearFit(Zf))"); } - else { + else { _skipFit = true; _history.add("OnFailureUse(ZfBuffer)"); } @@ -163,15 +148,15 @@ namespace Isis { return (Yfit()); } - /** + /** * @brief Compute the initial guess of the fit - * - * This method provides the non-linear fit with an initial guess of the - * solution. It involves a linear fit to the latter half of the data to - * provide the first two coefficents, the difference of the averages of the - * residuals at both ends of the data set and 5 times the last line time as - * the final (fourth) element...a bit involved really. - * + * + * This method provides the non-linear fit with an initial guess of the + * solution. It involves a linear fit to the latter half of the data to + * provide the first two coefficents, the difference of the averages of the + * residuals at both ends of the data set and 5 times the last line time as + * the final (fourth) element...a bit involved really. + * * @return NLVector 4-element vector of the initial guess coefficients */ NonLinearLSQ::NLVector ZeroBufferFit::guess() { @@ -217,27 +202,27 @@ namespace Isis { ToString(_guess[1])+ ","+ ToString(_guess[2])+ ","+ ToString(_guess[3])+ "]"); - return (g); + return (g); } /** * @brief Computes the interation check for convergence - * + * * @param Iter Current iteration * @param fitcoefs Vector of current fit coefficients * @param uncerts Uncertainties * @param cplxconj Complex conjugate of the current iteration * @param Istatus State of current iteration - * + * * @return int Simply passes on the Istatus value */ - int ZeroBufferFit::checkIteration(const int Iter, const NLVector &fitcoefs, + int ZeroBufferFit::checkIteration(const int Iter, const NLVector &fitcoefs, const NLVector &uncerts, double cplxconj, - int Istatus) { + int Istatus) { _chisq = pow(cplxconj, 2.0); return (Istatus); } - + /** Computes the function value at the current iteration */ NonLinearLSQ::NLVector ZeroBufferFit::f_x(const NLVector &a) { double a0 = a[0]; @@ -307,14 +292,14 @@ namespace Isis { /** * @brief Compute a polyonomial fit using multivariate statistics - * - * Used as a fallback solution, this method computes a linear statistical - * solution from the linear regression analysis of the multivariate statistics - * of the data. - * + * + * Used as a fallback solution, this method computes a linear statistical + * solution from the linear regression analysis of the multivariate statistics + * of the data. + * * @param d Data vector to fit * @param line0 Current line number in the image - * + * * @return HiVector Returns the fitted data */ HiVector ZeroBufferFit::poly_fit(const HiVector &d, const double line0) const { @@ -341,14 +326,12 @@ namespace Isis { HiVector fit = Yfit(); for (int i = 0 ; i < _data.dim() ; i++) { - o << formatDbl(i) << " " + o << formatDbl(i) << " " << formatDbl(_timet(i)) << " " - << formatDbl(_data[i]) << " " + << formatDbl(_data[i]) << " " << formatDbl(fit[i]) << endl; } return; } } // namespace Isis - - diff --git a/isis/src/mro/objs/HiCal/ZeroBufferFit.h b/isis/src/mro/objs/HiCal/ZeroBufferFit.h index 7ac9bb1a68..e2a7621365 100644 --- a/isis/src/mro/objs/HiCal/ZeroBufferFit.h +++ b/isis/src/mro/objs/HiCal/ZeroBufferFit.h @@ -1,28 +1,14 @@ #ifndef ZeroBufferFit_h #define ZeroBufferFit_h -/** - * @file - * $Revision: 1.4 $ - * $Date: 2008/05/23 19:15:17 $ - * $Id: ZeroBufferFit.h,v 1.4 2008/05/23 19:15:17 kbecker Exp $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -37,18 +23,18 @@ namespace Isis { /** * @brief Computes non-linear lsq fit of HiRISE Drift (Zd module) - * + * * This class is best used with individual HiRISE images as the number of * lines is critical to proper use. It is best applied by getting the buffer - * as a reference and applying it during systematic processing. - * - * This class models the drift correction using the Levenberg-Marquardt - * algorithm. - * + * as a reference and applying it during systematic processing. + * + * This class models the drift correction using the Levenberg-Marquardt + * algorithm. + * * @ingroup Utility - * - * @author 2007-11-07 Kris Becker - * @internal + * + * @author 2007-11-07 Kris Becker + * @internal * @history 2008-05-23 Kris Becker Added the ZdOnFailUseLinear option. * @history 2010-10-28 Kris Becker Updated parameter names removing "Zd" and * replacing with "ZeroBufferFit". @@ -60,49 +46,49 @@ namespace Isis { /** Destructor */ virtual ~ZeroBufferFit() { } - /** + /** * @brief Set binning/summing mode - * + * * @param bin Summing mode of observatio */ void setBin(int bin) { _timet.setBin(bin); } - /** + /** * @brief Set scan line time - * + * * @param ltime Scan line time */ void setLineTime(double ltime) { _timet.setLineTime(ltime); } - /** + /** * @brief Returns the size of the data buffer - * - * This is the size of the original data buffer. - * + * + * This is the size of the original data buffer. + * * @see nSize() * @return int Size of the input buffer */ inline int size() const { return (_data.dim()); } - /** - * @brief Returns the size of the fitted buffer - * - * \b Important: This returns the size of the buffer being + /** + * @brief Returns the size of the fitted buffer + * + * \b Important: This returns the size of the buffer being * fitted and not the size of original data buffer. This is * a requirement of the NonLinearLSQ class. USE WITH * CAUTION! - * - * + * + * * @return int Size of buffer being fitted */ int nSize() const { return (_b2.dim()); } - /** + /** * @brief Number of parameter to be fitted - * - * This is the number of parameters that ZeroBufferFit needs to - * fit. This method is a requirement of the NonLinearLSQ class. - * + * + * This is the number of parameters that ZeroBufferFit needs to + * fit. This method is a requirement of the NonLinearLSQ class. + * * @return int Number of parameter to fit */ int nParms() const { return (4); } @@ -118,7 +104,7 @@ namespace Isis { HiVector Solve(const HiVector &d); NLVector guess(); - int checkIteration(const int Iter, const NLVector &fitcoefs, + int checkIteration(const int Iter, const NLVector &fitcoefs, const NLVector &uncerts, double cplxconj, int Istatus); @@ -130,7 +116,7 @@ namespace Isis { /** Returns the Degrees of Freedom */ int DoF() const { return (nSize() - nParms()); } - HiVector Yfit() const; + HiVector Yfit() const; HiVector Normalize(const HiVector &v); private: @@ -157,12 +143,10 @@ namespace Isis { /** Returns the number of good lines in the image */ int goodLines(const HiVector &d) const { return (d.dim() - _badLines); } /** Determines if the vector contains any valid lines */ - bool gotGoodLines(const HiVector &d) const { + bool gotGoodLines(const HiVector &d) const { return (goodLines(d) >= _minLines); } - }; + }; } // namespace Isis #endif - - diff --git a/isis/src/mro/objs/HiCal/ZeroBufferSmooth.h b/isis/src/mro/objs/HiCal/ZeroBufferSmooth.h index 8b91ef8df1..3af411485f 100644 --- a/isis/src/mro/objs/HiCal/ZeroBufferSmooth.h +++ b/isis/src/mro/objs/HiCal/ZeroBufferSmooth.h @@ -1,28 +1,14 @@ #ifndef ZeroBufferSmooth_h #define ZeroBufferSmooth_h -/** - * @file - * $Revision: 1.2 $ - * $Date: 2008/06/13 22:28:55 $ - * $Id: ZeroBufferSmooth.h,v 1.2 2008/06/13 22:28:55 kbecker Exp $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include @@ -45,50 +31,50 @@ namespace Isis { /** * @brief Processes Buffer calibration data (ZeroBufferSmooth Module) - * - * This class loads and processes the Buffer data from a HiRISE image for - * drift correction purposes. The config file contains parameter - * (ZfFirstSample, ZfLastSample) that indicate which regions of the - * calibration buffer to extract/use. This region is averaged across the line - * axis for each line resulting in a single value for each line. The - * resulting vector is then filtered with a lowpass filter. The filter width - * (ZfFilterWidth) and number of interations (ZfFilterIterations) are - * contained within the config file. A spline fit is applied if any missing - * data remain after filtering. - * + * + * This class loads and processes the Buffer data from a HiRISE image for + * drift correction purposes. The config file contains parameter + * (ZfFirstSample, ZfLastSample) that indicate which regions of the + * calibration buffer to extract/use. This region is averaged across the line + * axis for each line resulting in a single value for each line. The + * resulting vector is then filtered with a lowpass filter. The filter width + * (ZfFilterWidth) and number of interations (ZfFilterIterations) are + * contained within the config file. A spline fit is applied if any missing + * data remain after filtering. + * * @ingroup Utility - * - * @author 2008-06-10 Kris Becker - * @internal + * + * @author 2008-06-10 Kris Becker + * @internal * @history 2010-04-16 Kris Becker Completed documentation * @history 2010-10-28 Kris Becker Renamed parameters removing the "Zf" * prefix and replacing with "ZeroBufferSmooth". */ class ZeroBufferSmooth : public Module { - public: + public: // Constructors and Destructor ZeroBufferSmooth() : Module("ZeroBufferSmooth") { } /** * @brief Construct with data parameters - * - * This constructor completely computes drift from data collected in a - * HiRISE image - * + * + * This constructor completely computes drift from data collected in a + * HiRISE image + * * @param cal Calibration data collection * @param conf All necessary parameters for computations */ - ZeroBufferSmooth(HiCalData &cal, const HiCalConf &conf) : - Module("ZeroBufferSmooth") { + ZeroBufferSmooth(HiCalData &cal, const HiCalConf &conf) : + Module("ZeroBufferSmooth") { init(cal, conf); } /** Destructor */ virtual ~ZeroBufferSmooth() { } - /** + /** * @brief Return statistics for filtered - raw Buffer - * + * * @return const Statistics& Statistics class with all stats */ const Statistics &Stats() const { return (_stats); } @@ -98,13 +84,13 @@ namespace Isis { Statistics _stats; /** - * @brief Workhorse of the zero buffer computation - * - * The default module, assumed to be the Zf module, is retrieved to - * provide parameter necessary to compute the drift correction for a - * HiRISE image. - * - * + * @brief Workhorse of the zero buffer computation + * + * The default module, assumed to be the Zf module, is retrieved to + * provide parameter necessary to compute the drift correction for a + * HiRISE image. + * + * * @param cal Calibration data container/provider * @param conf Configuration parameter provider */ @@ -136,15 +122,15 @@ namespace Isis { } } _history.add("Statistics(Average["+ToString(_stats.Average())+ - "],StdDev["+ToString(_stats.StandardDeviation())+"])"); + "],StdDev["+ToString(_stats.StandardDeviation())+"])"); return; } /** - * @brief Virtualized parameter reporting method - * - * This method is invoked when dumping the drift correction parameters. - * + * @brief Virtualized parameter reporting method + * + * This method is invoked when dumping the drift correction parameters. + * * @param o Output stream to write results to */ virtual void printOn(std::ostream &o) const { @@ -164,4 +150,3 @@ namespace Isis { } // namespace Isis #endif - diff --git a/isis/src/mro/objs/HiCal/ZeroDark.h b/isis/src/mro/objs/HiCal/ZeroDark.h index f0cd8bbe5a..fecec81cb1 100644 --- a/isis/src/mro/objs/HiCal/ZeroDark.h +++ b/isis/src/mro/objs/HiCal/ZeroDark.h @@ -1,28 +1,14 @@ #ifndef ZeroDark_h #define ZeroDark_h -/** - * @file - * $Revision: 1.5 $ - * $Date: 2008/06/13 22:28:55 $ - * $Id: ZeroDark.h,v 1.5 2008/06/13 22:28:55 kbecker Exp $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include diff --git a/isis/src/mro/objs/HiCal/ZeroReverse.h b/isis/src/mro/objs/HiCal/ZeroReverse.h index c317fa84c7..557c6cbb2a 100644 --- a/isis/src/mro/objs/HiCal/ZeroReverse.h +++ b/isis/src/mro/objs/HiCal/ZeroReverse.h @@ -1,28 +1,14 @@ #ifndef ZeroReverse_h #define ZeroReverse_h -/** - * @file - * $Revision: 1.3 $ - * $Date: 2008/11/18 07:29:12 $ - * $Id: ZeroReverse.h,v 1.3 2008/11/18 07:29:12 kbecker Exp $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include @@ -44,45 +30,45 @@ namespace Isis { /** * @brief Processes Reverse Clock calibration data (ZeroReverse Module) - * + * * This class loads and processes the Reverse Clock data from a HiRISE image - * for offset correction purposes. Additional processing may occur in - * subsequent modules. - * + * for offset correction purposes. Additional processing may occur in + * subsequent modules. + * * @ingroup Utility - * - * @author 2008-06-13 Kris Becker - * @internal + * + * @author 2008-06-13 Kris Becker + * @internal * @history 2010-04-16 Kris Becker Renamed from Zf to ZeroReverse * @history 2010-10-28 Kris Becker Renamed parameters replacing "Zz" with * "ZeroReverse". */ class ZeroReverse : public Module { - public: + public: // Constructors and Destructor ZeroReverse() : Module("ZeroReverse") { } - ZeroReverse(HiCalData &cal, const HiCalConf &conf) : - Module("ZeroReverse") { + ZeroReverse(HiCalData &cal, const HiCalConf &conf) : + Module("ZeroReverse") { init(cal, conf); } /** Destructor */ virtual ~ZeroReverse() { } - /** + /** * @brief Return statistics for raw Reverse Clock buffer - * + * * @return const Statistics& Statistics class with all stats */ const Statistics &Stats() const { return (_stats); } /** * @brief Specifies if the input trigger conditions were met - * - * If trigger conditions where met, the reverse clock correction becomes a - * constant as opposed to processed reverse clock pixels. - * + * + * If trigger conditions where met, the reverse clock correction becomes a + * constant as opposed to processed reverse clock pixels. + * * @return bool True if triggered, false otherwise */ bool wasTriggered() const { return (_triggered); } @@ -94,12 +80,12 @@ namespace Isis { /** - * @brief Initialize and compute data solution - * - * + * @brief Initialize and compute data solution + * + * * @author Kris Becker - 4/16/2010 - * - * @param cal HiRISE calibration data provided + * + * @param cal HiRISE calibration data provided * @param conf Configuration data provider */ void init(HiCalData &cal, const HiCalConf &conf) { @@ -117,14 +103,14 @@ namespace Isis { _revClock = averageLines(revclk); _history.add("RevClock(CropLines["+ToString(line0)+","+ToString(lineN) + - "],Mean["+ToString(_stats.Average()) + + "],Mean["+ToString(_stats.Average()) + "],StdDev["+ToString(_stats.StandardDeviation()) + "],LisPixels["+ToString(_stats.LisPixels())+ "],HisPixels["+ToString(_stats.HisPixels()) + "],NulPixels["+ToString(_stats.NullPixels())+ "])"); DbAccess triggers(Pvl(tfile).findObject("ReverseClockStatistics")); - QString tprofName = conf.resolve("{FILTER}{CCD}_{CHANNEL}_{BIN}",prof); + QString tprofName = conf.resolve("{FILTER}{CCD}_{CHANNEL}_{BIN}",prof); _history.add("ReverseClockStatistics(File["+tfile+ "],Profile["+tprofName+"])"); @@ -144,12 +130,12 @@ namespace Isis { "],RevNulTolerance["+ToString(nulTol)+ "])"); if ((_stats.LisPixels() > lisTol) || (_stats.HisPixels() > hisTol) || - (_stats.NullPixels() > nulTol) || - (_stats.StandardDeviation() > revstddev)) { + (_stats.NullPixels() > nulTol) || + (_stats.StandardDeviation() > revstddev)) { _triggered = true; _data = HiVector(_revClock.dim1(), revmean); _history.add("Trigger(True - Reverse Clock set to constant," - "ReverseClock["+ToString(revmean)+"])"); + "ReverseClock["+ToString(revmean)+"])"); } else { _history.add("Trigger(False - Reverse Clock processing invoked)"); @@ -188,4 +174,3 @@ namespace Isis { } // namespace Isis #endif - diff --git a/isis/src/mro/objs/HiEqualization/HiEqualization.cpp b/isis/src/mro/objs/HiEqualization/HiEqualization.cpp index 9f0474a4ff..3f77f4e6ca 100644 --- a/isis/src/mro/objs/HiEqualization/HiEqualization.cpp +++ b/isis/src/mro/objs/HiEqualization/HiEqualization.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "HiEqualization.h" #include diff --git a/isis/src/mro/objs/HiEqualization/HiEqualization.h b/isis/src/mro/objs/HiEqualization/HiEqualization.h index 11e6f2deaa..2caa8b74c2 100644 --- a/isis/src/mro/objs/HiEqualization/HiEqualization.h +++ b/isis/src/mro/objs/HiEqualization/HiEqualization.h @@ -1,27 +1,13 @@ #ifndef HiEqualization_h #define HiEqualization_h -/** - * @file - * $Revision: 1.4 $ - * $Date: 2009/11/25 22:09:21 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "Equalization.h" @@ -51,7 +37,7 @@ namespace Isis { * @author ????-??-?? Unknown * * @internal - * @history 2012-11-30 Tracie Sucharski - Removed unused include file Projection.h. This + * @history 2012-11-30 Tracie Sucharski - Removed unused include file Projection.h. This * change was made in reference to #775 * @histroy 2016-07-15 Ian Humphrey - Modified calculateStatisics() to set the solved state * to true to reflect changes to Equalization. References #2282. diff --git a/isis/src/mro/objs/HiEqualization/unitTest.cpp b/isis/src/mro/objs/HiEqualization/unitTest.cpp index 8b48299ecc..a4a453d726 100644 --- a/isis/src/mro/objs/HiEqualization/unitTest.cpp +++ b/isis/src/mro/objs/HiEqualization/unitTest.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include "Buffer.h" @@ -73,4 +81,3 @@ int main(int argc, char *argv[]) { e.print(); } } - diff --git a/isis/src/mro/objs/HiLab/HiLab.cpp b/isis/src/mro/objs/HiLab/HiLab.cpp index 84eb74a360..6b124dda82 100644 --- a/isis/src/mro/objs/HiLab/HiLab.cpp +++ b/isis/src/mro/objs/HiLab/HiLab.cpp @@ -1,21 +1,10 @@ -/** - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "HiLab.h" #include "IException.h" @@ -25,13 +14,13 @@ using namespace std; namespace Isis { /** * Constructs a HiLab Object - * @param cube The cube containing the HiRise labels to be processed. + * @param cube The cube containing the HiRise labels to be processed. */ HiLab::HiLab(Cube *cube) { PvlGroup group = cube->group("Instrument"); p_cpmmNumber = group["CpmmNumber"]; p_channel = group["ChannelNumber"]; - + if(group.hasKeyword("Summing")) { p_bin = group["Summing"]; } @@ -39,7 +28,7 @@ namespace Isis { std::string msg = "Cannot find required Summing keyword in label"; throw IException(IException::Io, msg, _FILEINFO_); } - + if(group.hasKeyword("Tdi")) { p_tdi = group["Tdi"]; } diff --git a/isis/src/mro/objs/HiLab/HiLab.h b/isis/src/mro/objs/HiLab/HiLab.h index aabff15814..8e50c992b7 100644 --- a/isis/src/mro/objs/HiLab/HiLab.h +++ b/isis/src/mro/objs/HiLab/HiLab.h @@ -1,26 +1,13 @@ #ifndef hiLab_h #define hiLab_h -/** - * @file - * $Revision: 1.3 $ - * $Date: 2008/05/14 21:07:26 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "Cube.h" #include "Pvl.h" diff --git a/isis/src/mro/objs/HiLab/unitTest.cpp b/isis/src/mro/objs/HiLab/unitTest.cpp index af49e4f016..e2406eaa3b 100644 --- a/isis/src/mro/objs/HiLab/unitTest.cpp +++ b/isis/src/mro/objs/HiLab/unitTest.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include "HiLab.h" diff --git a/isis/src/mro/objs/HiriseCamera/HiriseCamera.cpp b/isis/src/mro/objs/HiriseCamera/HiriseCamera.cpp index 24deec3495..2de6a3f92a 100644 --- a/isis/src/mro/objs/HiriseCamera/HiriseCamera.cpp +++ b/isis/src/mro/objs/HiriseCamera/HiriseCamera.cpp @@ -1,24 +1,10 @@ -/** - * @file - * $Revision: 1.5 $ - * $Date: 2009/08/31 15:12:31 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "HiriseCamera.h" @@ -41,7 +27,7 @@ namespace Isis { * Creates a Hirise Camera Model * * @param lab Pvl label from the iamge - * @internal + * @internal * @history 2011-05-03 Jeannie Walldren - Added NAIF error check. */ HiriseCamera::HiriseCamera(Cube &cube) : LineScanCamera(cube) { @@ -49,7 +35,7 @@ namespace Isis { m_instrumentNameShort = "HiRISE"; m_spacecraftNameLong = "Mars Reconnaissance Orbiter"; m_spacecraftNameShort = "MRO"; - + NaifStatus::CheckErrors(); // Setup camera characteristics from instrument and frame kernel SetFocalLength(); diff --git a/isis/src/mro/objs/HiriseCamera/HiriseCamera.h b/isis/src/mro/objs/HiriseCamera/HiriseCamera.h index db69f243d4..fe15e33a04 100644 --- a/isis/src/mro/objs/HiriseCamera/HiriseCamera.h +++ b/isis/src/mro/objs/HiriseCamera/HiriseCamera.h @@ -1,26 +1,13 @@ #ifndef HiriseCamera_h #define HiriseCamera_h -/** - * @file - * $Revision: 1.4 $ - * $Date: 2009/08/31 15:12:31 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "LineScanCamera.h" @@ -48,12 +35,12 @@ namespace Isis { * inherit directly from Camera * @history 2011-05-03 Jeannie Walldren - Updated unitTest to test for new * methods. Added NAIF error check. Removed Mro namespace. - * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis + * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis * coding standards. References #972. * @history 2015-08-12 Ian Humphrey and Makayla Shepherd - Added new data members and methods * to get spacecraft and instrument names. Extended unit test to test * these methods. - * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument + * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument * members and methods and removed implementation of these methods * since Camera now handles this. References #2335. */ @@ -67,24 +54,24 @@ namespace Isis { /** * CK frame ID - - Instrument Code from spacit run on CK - * - * @return @b int The appropriate instrument code for the "Camera-matrix" + * + * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Frame ID */ virtual int CkFrameId() const { return (-74000); } - /** + /** * CK Reference ID - MRO_MME_OF_DATE - * + * * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Reference ID */ virtual int CkReferenceId() const { return (-74900); } - /** + /** * SPK Reference ID - J2000 - * - * @return @b int The appropriate instrument code for the Spacecraft + * + * @return @b int The appropriate instrument code for the Spacecraft * Kernel Reference ID */ virtual int SpkReferenceId() const { return (1); } diff --git a/isis/src/mro/objs/HiriseCamera/unitTest.cpp b/isis/src/mro/objs/HiriseCamera/unitTest.cpp index d2e64e57f1..2d2dfd5666 100644 --- a/isis/src/mro/objs/HiriseCamera/unitTest.cpp +++ b/isis/src/mro/objs/HiriseCamera/unitTest.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -59,7 +48,7 @@ int main(void) { cout << "CK Reference ID = " << cam->CkReferenceId() << endl; cout << "SPK Target ID = " << cam->SpkTargetId() << endl; cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl; - + // Test name methods cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl; cout << "Spacecraft Name Short: " << cam->spacecraftNameShort() << endl; @@ -127,4 +116,3 @@ void TestLineSamp(Camera *cam, double samp, double line) { cout << "DeltaLine = ERROR" << endl << endl; } } - diff --git a/isis/src/mro/objs/MarciCamera/MarciCamera.cpp b/isis/src/mro/objs/MarciCamera/MarciCamera.cpp index d1de855f10..d73bedbe53 100644 --- a/isis/src/mro/objs/MarciCamera/MarciCamera.cpp +++ b/isis/src/mro/objs/MarciCamera/MarciCamera.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include "MarciCamera.h" @@ -214,8 +203,8 @@ namespace Isis { /** * CK frame ID - - Instrument Code from spacit run on CK - * - * @return @b int The appropriate instrument code for the "Camera-matrix" + * + * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Frame ID */ int MarciCamera::CkFrameId() const { @@ -224,9 +213,9 @@ namespace Isis { - /** + /** * CK Reference ID - MRO_MME_OF_DATE - * + * * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Reference ID */ @@ -236,10 +225,10 @@ namespace Isis { - /** + /** * SPK Reference ID - J2000 - * - * @return @b int The appropriate instrument code for the Spacecraft + * + * @return @b int The appropriate instrument code for the Spacecraft * Kernel Reference ID */ int MarciCamera::SpkReferenceId() const { diff --git a/isis/src/mro/objs/MarciCamera/MarciCamera.h b/isis/src/mro/objs/MarciCamera/MarciCamera.h index cd2e9e044c..7a0fdeb463 100644 --- a/isis/src/mro/objs/MarciCamera/MarciCamera.h +++ b/isis/src/mro/objs/MarciCamera/MarciCamera.h @@ -1,25 +1,13 @@ #ifndef MarciCamera_h #define MarciCamera_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "PushFrameCamera.h" @@ -48,7 +36,7 @@ namespace Isis { * documentation. Removed Mro namespace wrap inside Isis namespace. * Added Isis Disclaimer to files. Added NAIF error * check to constructor. - * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis + * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis * coding standards. References #972. * @history 2014-04-17 Jeannie Backer - Updated due to method name change in * PushFrameCameraDetectorMap. Moved method implementations to cpp file. @@ -56,7 +44,7 @@ namespace Isis { * @history 2015-08-12 Ian Humphrey and Makayla Shepherd - Added new data members and methods * to get spacecraft and instrument names. Extended unit test to test * these methods. - * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument + * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument * members and methods and removed implementation of these methods * since Camera now handles this. References #2335. */ @@ -89,4 +77,3 @@ namespace Isis { }; }; #endif - diff --git a/isis/src/mro/objs/MarciCamera/MarciDistortionMap.cpp b/isis/src/mro/objs/MarciCamera/MarciDistortionMap.cpp index 447fd9cf26..82e3ead4d6 100644 --- a/isis/src/mro/objs/MarciCamera/MarciDistortionMap.cpp +++ b/isis/src/mro/objs/MarciCamera/MarciDistortionMap.cpp @@ -1,25 +1,11 @@ -/** - * @file - * $Revision: 1.2 $ - * $Date: 2008/11/24 16:40:30 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include "IString.h" @@ -194,4 +180,3 @@ namespace Isis { return uX; } } - diff --git a/isis/src/mro/objs/MarciCamera/MarciDistortionMap.h b/isis/src/mro/objs/MarciCamera/MarciDistortionMap.h index 485df7583c..6c3fea11f8 100644 --- a/isis/src/mro/objs/MarciCamera/MarciDistortionMap.h +++ b/isis/src/mro/objs/MarciCamera/MarciDistortionMap.h @@ -1,33 +1,19 @@ #ifndef MarciDistortionMap_h #define MarciDistortionMap_h -/** - * @file - * $Revision: 1.2 $ - * $Date: 2008/11/24 16:40:31 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include "CameraDistortionMap.h" namespace Isis { - /** + /** * Distort/undistort focal plane coordinates * * Creates a map for adding/removing optical distortions @@ -42,7 +28,7 @@ namespace Isis { * * @internal * @history 2011-05-03 Jeannie Walldren - Updated documentation. - * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis + * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis * coding standards. References #972. */ class MarciDistortionMap : public CameraDistortionMap { diff --git a/isis/src/mro/objs/MarciCamera/unitTest.cpp b/isis/src/mro/objs/MarciCamera/unitTest.cpp index 225300fec2..d8a9e00f9d 100644 --- a/isis/src/mro/objs/MarciCamera/unitTest.cpp +++ b/isis/src/mro/objs/MarciCamera/unitTest.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -60,7 +49,7 @@ int main(void) { cout << "CK Reference ID = " << cam->CkReferenceId() << endl; cout << "SPK Target ID = " << cam->SpkTargetId() << endl; cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl; - + // Test name methods cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl; cout << "Spacecraft Name Short: " << cam->spacecraftNameShort() << endl; @@ -128,4 +117,3 @@ void TestLineSamp(Camera *cam, double samp, double line) { cout << "DeltaLine = ERROR" << endl << endl; } } - diff --git a/isis/src/near/apps/msi2isis/main.cpp b/isis/src/near/apps/msi2isis/main.cpp index b55a0631f5..7e328aca84 100644 --- a/isis/src/near/apps/msi2isis/main.cpp +++ b/isis/src/near/apps/msi2isis/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include diff --git a/isis/src/near/objs/MsiCamera/MsiCamera.cpp b/isis/src/near/objs/MsiCamera/MsiCamera.cpp index e0e2491649..cc2f2ebdba 100644 --- a/isis/src/near/objs/MsiCamera/MsiCamera.cpp +++ b/isis/src/near/objs/MsiCamera/MsiCamera.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "MsiCamera.h" #include @@ -75,7 +64,7 @@ namespace Isis { // Setup focal plane map CameraFocalPlaneMap *focalMap = new CameraFocalPlaneMap(this, naifIkCode()); - // Make sure to grab lines and samples in the correct order. + // Make sure to grab lines and samples in the correct order. double line = Spice::getDouble("INS" + toString(naifIkCode()) + "_BORESIGHT_LINE"); double sample = Spice::getDouble("INS" + toString(naifIkCode()) + "_BORESIGHT_SAMPLE"); focalMap->SetDetectorOrigin(sample, line); diff --git a/isis/src/near/objs/MsiCamera/MsiCamera.h b/isis/src/near/objs/MsiCamera/MsiCamera.h index 7b15d470ef..1892386736 100644 --- a/isis/src/near/objs/MsiCamera/MsiCamera.h +++ b/isis/src/near/objs/MsiCamera/MsiCamera.h @@ -1,23 +1,13 @@ #ifndef MsiCamera_h -#define MsiCamera_h -/** - * @file - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "FramingCamera.h" namespace Isis { @@ -47,7 +37,7 @@ namespace Isis { * since Camera now handles this. References #2335. * @history 2016-09-14 Kelvin Rodriguez - Enforced the order in which BORESIGHT_LINE and * BORESIGHT_SAMPLE are added to the PVL. Part of porting to - * OSX 10.11 + * OSX 10.11 */ class MsiCamera : public FramingCamera { public: diff --git a/isis/src/near/objs/MsiCamera/unitTest.cpp b/isis/src/near/objs/MsiCamera/unitTest.cpp index d544b95467..f58ec83a88 100644 --- a/isis/src/near/objs/MsiCamera/unitTest.cpp +++ b/isis/src/near/objs/MsiCamera/unitTest.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -59,16 +48,16 @@ int main(void) { cout << "CK Reference ID = " << cam->CkReferenceId() << endl; cout << "SPK Target ID = " << cam->SpkTargetId() << endl; cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl; - + // Test name methods cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl; cout << "Spacecraft Name Short: " << cam->spacecraftNameShort() << endl; cout << "Instrument Name Long: " << cam->instrumentNameLong() << endl; cout << "Instrument Name Short: " << cam->instrumentNameShort() << endl << endl; - // Test Shutter Open/Close + // Test Shutter Open/Close const PvlGroup &inst = c.label()->findGroup("Instrument", Pvl::Traverse); - double exposureDuration = ((double) inst["ExposureDuration"])/1000; + double exposureDuration = ((double) inst["ExposureDuration"])/1000; QString stime = inst["StartTime"]; double et; // StartTime keyword is the center exposure time str2et_c(stime.toLatin1().data(), &et); @@ -139,4 +128,3 @@ void TestLineSamp(Camera *cam, double samp, double line) { cout << "DeltaLine = ERROR" << endl << endl; } } - diff --git a/isis/src/newhorizons/apps/leisa2isis/leisa2isis.cpp b/isis/src/newhorizons/apps/leisa2isis/leisa2isis.cpp index 700981c832..0a3c76872e 100644 --- a/isis/src/newhorizons/apps/leisa2isis/leisa2isis.cpp +++ b/isis/src/newhorizons/apps/leisa2isis/leisa2isis.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "leisa2isis.h" #include "Cube.h" diff --git a/isis/src/newhorizons/apps/leisa2isis/leisa2isis.h b/isis/src/newhorizons/apps/leisa2isis/leisa2isis.h index af490c0c68..d596f16419 100644 --- a/isis/src/newhorizons/apps/leisa2isis/leisa2isis.h +++ b/isis/src/newhorizons/apps/leisa2isis/leisa2isis.h @@ -1,6 +1,14 @@ #ifndef leisa2isis_h #define leisa2isis_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Pvl.h" #include "UserInterface.h" diff --git a/isis/src/newhorizons/apps/leisa2isis/main.cpp b/isis/src/newhorizons/apps/leisa2isis/main.cpp index 3321f6c104..09d67f3df9 100644 --- a/isis/src/newhorizons/apps/leisa2isis/main.cpp +++ b/isis/src/newhorizons/apps/leisa2isis/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "leisa2isis.h" @@ -20,7 +28,7 @@ void IsisMain() { } throw; } - + for (auto grpIt = appLog.beginGroup(); grpIt!= appLog.endGroup(); grpIt++) { Application::Log(*grpIt); } diff --git a/isis/src/newhorizons/apps/lorri2isis/main.cpp b/isis/src/newhorizons/apps/lorri2isis/main.cpp index 567b0b5d64..3d4645b83d 100644 --- a/isis/src/newhorizons/apps/lorri2isis/main.cpp +++ b/isis/src/newhorizons/apps/lorri2isis/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "Cube.h" diff --git a/isis/src/newhorizons/apps/mvic2isis/main.cpp b/isis/src/newhorizons/apps/mvic2isis/main.cpp index 1a016dddd2..18521d4455 100644 --- a/isis/src/newhorizons/apps/mvic2isis/main.cpp +++ b/isis/src/newhorizons/apps/mvic2isis/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "mvic2isis.h" diff --git a/isis/src/newhorizons/apps/mvic2isis/mvic2isis.cpp b/isis/src/newhorizons/apps/mvic2isis/mvic2isis.cpp index b29d5592ac..4c5233748c 100644 --- a/isis/src/newhorizons/apps/mvic2isis/mvic2isis.cpp +++ b/isis/src/newhorizons/apps/mvic2isis/mvic2isis.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "mvic2isis.h" #include diff --git a/isis/src/newhorizons/apps/mvic2isis/mvic2isis.h b/isis/src/newhorizons/apps/mvic2isis/mvic2isis.h index f725788403..77d71d7e20 100644 --- a/isis/src/newhorizons/apps/mvic2isis/mvic2isis.h +++ b/isis/src/newhorizons/apps/mvic2isis/mvic2isis.h @@ -1,6 +1,14 @@ #ifndef mvic2isis_h #define mvic2isis_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Pvl.h" #include "UserInterface.h" diff --git a/isis/src/newhorizons/objs/NewHorizonsLeisaCamera/NewHorizonsLeisaCamera.cpp b/isis/src/newhorizons/objs/NewHorizonsLeisaCamera/NewHorizonsLeisaCamera.cpp index 6bd8d46552..52eafb7e19 100644 --- a/isis/src/newhorizons/objs/NewHorizonsLeisaCamera/NewHorizonsLeisaCamera.cpp +++ b/isis/src/newhorizons/objs/NewHorizonsLeisaCamera/NewHorizonsLeisaCamera.cpp @@ -1,22 +1,10 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "NewHorizonsLeisaCamera.h" @@ -38,11 +26,11 @@ namespace Isis { /** * Constructs a New Horizons LEISA LineScanCamera object. LEISA is technically a frame * type camera, but it has the etalon filer in front of it exposing each line of a frame to have a - * different wavelength, so we treat it like a linescan camera. Each band of the ISIS cube is made - * by combining all the corresponding frame line numbers into that band (i.e., All the line number - * 1s from each frame in an observatoin are combined into band 1, all line number 2s are put into - * band 2, and so on) - * + * different wavelength, so we treat it like a linescan camera. Each band of the ISIS cube is made + * by combining all the corresponding frame line numbers into that band (i.e., All the line number + * 1s from each frame in an observatoin are combined into band 1, all line number 2s are put into + * band 2, and so on) + * * @param something Description * * @author Kristin Berry @@ -53,9 +41,9 @@ namespace Isis { m_instrumentNameShort = "LEISA"; m_spacecraftNameLong = "New Horizons"; m_spacecraftNameShort = "NewHorizons"; - - // Override the SPICE error process for SPICE calls - NaifStatus::CheckErrors(); + + // Override the SPICE error process for SPICE calls + NaifStatus::CheckErrors(); SetFocalLength(); SetPixelPitch(); @@ -65,9 +53,9 @@ namespace Isis { QString expDuration = inst["ExposureDuration"]; QString stime = inst["SpacecraftClockStartCount"]; - double m_etStart = getClockTime(stime).Et(); - - // The line rate is set to the time between each frame since we are treating LEASA as a linescan + double m_etStart = getClockTime(stime).Et(); + + // The line rate is set to the time between each frame since we are treating LEASA as a linescan double m_lineRate = expDuration.toDouble(); // The detector map tells us how to convert from image coordinates to @@ -106,27 +94,27 @@ namespace Isis { m_originalBand.append(toInt(orgBand[i])); } - // Use the defualt no correction distortion map. + // Use the defualt no correction distortion map. new CameraDistortionMap(this); // Setup the ground and sky map new LineScanCameraGroundMap(this); new LineScanCameraSkyMap(this); - LoadCache(); + LoadCache(); // Check to see if there were any SPICE errors - NaifStatus::CheckErrors(); + NaifStatus::CheckErrors(); } /** - * Change the New Horizons camera parameters based on the band number + * Change the New Horizons camera parameters based on the band number * * @param vband The band number to set * - * @author 2014-09-24 Stuart Sides - * + * @author 2014-09-24 Stuart Sides + * */ void NewHorizonsLeisaCamera::SetBand(const int vband) { if ( (vband < 1) || (vband > m_originalBand.size())) { @@ -138,7 +126,7 @@ namespace Isis { int band; band = m_originalBand[vband-1]; Camera::SetBand(vband); - + // Get the affine coefficients from the focal plane map and adjust the constant terms to // provide the correct Y/Line offset for this band QVector temp; @@ -172,15 +160,14 @@ namespace Isis { /** - * This is the function that is called in order to instantiate a - * NewHorizonsLeisaCamera object. + * This is the function that is called in order to instantiate a + * NewHorizonsLeisaCamera object. * * @param lab Cube labels * * @return Isis::Camera* NewHorizonsLeisaCamera - * + * */ extern "C" Isis::Camera *NewHorizonsLeisaCameraPlugin(Isis::Cube &cube) { return new Isis::NewHorizonsLeisaCamera(cube); } - diff --git a/isis/src/newhorizons/objs/NewHorizonsLeisaCamera/NewHorizonsLeisaCamera.h b/isis/src/newhorizons/objs/NewHorizonsLeisaCamera/NewHorizonsLeisaCamera.h index b0e1c53c45..3d6e7d6198 100644 --- a/isis/src/newhorizons/objs/NewHorizonsLeisaCamera/NewHorizonsLeisaCamera.h +++ b/isis/src/newhorizons/objs/NewHorizonsLeisaCamera/NewHorizonsLeisaCamera.h @@ -1,24 +1,13 @@ #ifndef NewHorizonsLeisaCamera_h #define NewHorizonsLeisaCamera_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "LineScanCamera.h" @@ -26,8 +15,8 @@ namespace Isis { /** - * This is the camera model for LEISA, New Hoirzon's infrared - * Spectrometer. + * This is the camera model for LEISA, New Hoirzon's infrared + * Spectrometer. * * @ingroup SpiceInstrumentsAndCameras * @ingroup New Horizons @@ -40,7 +29,7 @@ namespace Isis { * name methods. * @history 2015-08-26 Kristin Berry - Updated error condition in SetBand and * Camera::SetBand call to set the virtual band. - * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument + * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument * members and methods and removed implementation of these methods * since Camera now handles this. References #2335. */ @@ -52,31 +41,31 @@ namespace Isis { //! Destroys the NewHorizonsLeisaCamera object ~NewHorizonsLeisaCamera() {}; - //! Flag that NewHorizonsLeisaCamera is band-dependent. + //! Flag that NewHorizonsLeisaCamera is band-dependent. bool IsBandIndependent() { return false; }; /** * CK frame ID - - Instrument Code from spacit run on CK - * - * @return @b int The appropriate instrument code for the "Camera-matrix" + * + * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Frame ID */ virtual int CkFrameId() const { return (-98000); }//from NAIF_INSTRUMENT_ID in /usgs/cpkgs/isis3/data/newhorizons/kernels/ck/*.lbl or spacit R or spacit S on ck - /** - * CK Reference ID - - * - * @return @b int The appropriate code for the "Camera-matrix" + /** + * CK Reference ID - + * + * @return @b int The appropriate code for the "Camera-matrix" * Kernel Reference ID */ virtual int CkReferenceId() const { return (1); } //can get from spacit S on ck - /** + /** * SPK Reference ID - J2000 - * - * @return @b int The appropriate instrument code for the Spacecraft + * + * @return @b int The appropriate instrument code for the Spacecraft * Kernel Reference ID */ virtual int SpkReferenceId() const { return (1); } //can get from spacit S on spk diff --git a/isis/src/newhorizons/objs/NewHorizonsLeisaCamera/unitTest.cpp b/isis/src/newhorizons/objs/NewHorizonsLeisaCamera/unitTest.cpp index 646fca8dcf..95a3f14bc7 100644 --- a/isis/src/newhorizons/objs/NewHorizonsLeisaCamera/unitTest.cpp +++ b/isis/src/newhorizons/objs/NewHorizonsLeisaCamera/unitTest.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -43,7 +32,7 @@ int main(void) { // set both the known lat and known lon to zero and copy the unit test output "Latitude off by: " // and "Longitude off by: " values directly into these variables. -- in progress double knownLat = 12.5782232447537528; - double knownLon = 23.5337593470257218; + double knownLon = 23.5337593470257218; Cube c("$ISISTESTDATA/isis/src/newhorizons/unitTestData/lsb_0034933739_0x53c_sci_1.cub", "r"); NewHorizonsLeisaCamera *cam = (NewHorizonsLeisaCamera *) CameraFactory::Create(c); @@ -58,7 +47,7 @@ int main(void) { cout << "CK Reference ID = " << cam->CkReferenceId() << endl; cout << "SPK Target ID = " << cam->SpkTargetId() << endl; cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl; - + // Test name methods cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl; cout << "Spacecraft Name Short: " << cam->spacecraftNameShort() << endl; @@ -107,12 +96,12 @@ int main(void) { cout << "Longitude OK" << endl << endl; } else { - cout << setprecision(16) << "Longitude off by: " << + cout << setprecision(16) << "Longitude off by: " << cam->UniversalLongitude() - knownLon << endl << endl; } // Test the band dependent flag getter - cout << "The bands of this camera have different gemometry for each band = " << + cout << "The bands of this camera have different gemometry for each band = " << !cam->IsBandIndependent() << endl << endl; @@ -151,5 +140,3 @@ void TestLineSamp(Camera *cam, double samp, double line) { cout << " Error in SetImage (" << samp << ", " << line << ")" << endl << endl; } } - - diff --git a/isis/src/newhorizons/objs/NewHorizonsLorriCamera/NewHorizonsLorriCamera.cpp b/isis/src/newhorizons/objs/NewHorizonsLorriCamera/NewHorizonsLorriCamera.cpp index 1736151f1f..b115e1e167 100644 --- a/isis/src/newhorizons/objs/NewHorizonsLorriCamera/NewHorizonsLorriCamera.cpp +++ b/isis/src/newhorizons/objs/NewHorizonsLorriCamera/NewHorizonsLorriCamera.cpp @@ -1,22 +1,10 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "NewHorizonsLorriCamera.h" @@ -36,16 +24,16 @@ using namespace std; namespace Isis { /** - * Constructs a New Horizons LORRI Framing Camera object. The LORRI camera has two summing modes, - * 1x1 and 4x4. The handeling of these two modes is done through two different Naif codes, - * -98301 and -98302 respectivly. This camera model code handles both cameras. The - * IK and IAK kernels must supply keyword values for both codes. The cube labels show a summing - * mode, but the value is not used + * Constructs a New Horizons LORRI Framing Camera object. The LORRI camera has two summing modes, + * 1x1 and 4x4. The handeling of these two modes is done through two different Naif codes, + * -98301 and -98302 respectivly. This camera model code handles both cameras. The + * IK and IAK kernels must supply keyword values for both codes. The cube labels show a summing + * mode, but the value is not used * * @param lab Pvl label from a New Horizons LORRI Framing Camera image. * - * @author Stuart Sides - * + * @author Stuart Sides + * * @internal */ @@ -54,19 +42,19 @@ namespace Isis { m_instrumentNameShort = "LORRI"; m_spacecraftNameLong = "New Horizons"; m_spacecraftNameShort = "NewHorizons"; - + NaifStatus::CheckErrors(); - // The LORRI focal length is fixed and is designed not to change throught the operational - // temperature. The NAIF code, set in the ISIS labels, will be used to read a single focal - // length from the SPICE kernels. Version 100 of the Lorri IK uses meters for focal length, + // The LORRI focal length is fixed and is designed not to change throught the operational + // temperature. The NAIF code, set in the ISIS labels, will be used to read a single focal + // length from the SPICE kernels. Version 100 of the Lorri IK uses meters for focal length, // units, version 200 uses mm, and has a units keyword. QString unitsKey = "INS" + toString(naifIkCode()) + "_FOCAL_LENGTH_UNITS"; QString focalLengthUnits = Spice::getString(unitsKey); if (focalLengthUnits != "mm") { QString msg = QObject::tr("SPICE keyword [%1] is expected to be mm. [%2] was found instead"). arg(unitsKey).arg(focalLengthUnits); - throw IException(IException::User, msg, _FILEINFO_); + throw IException(IException::User, msg, _FILEINFO_); } SetFocalLength(Spice::getDouble("INS" + toString(naifIkCode()) + "_FOCAL_LENGTH")); @@ -87,7 +75,7 @@ namespace Isis { // out the affine transforms from detector samp,line to focal plane x,y. CameraFocalPlaneMap *focalMap = new CameraFocalPlaneMap(this, naifIkCode()); - // The boresight position recorded in the IK is zero-based and therefore needs to be adjusted + // The boresight position recorded in the IK is zero-based and therefore needs to be adjusted // for ISIS double boresightSample = Spice::getDouble("INS" + toString(naifIkCode()) + "_CCD_CENTER",0) + 1.0; double boresightLine = Spice::getDouble("INS" + toString(naifIkCode()) + "_CCD_CENTER",1) + 1.0; @@ -103,7 +91,7 @@ namespace Isis { QString e2("INS" + toString(naifIkCode()) + "_OOC_EM"); QString e5("INS" + toString(naifIkCode()) + "_OOC_EM"); QString e6("INS" + toString(naifIkCode()) + "_OOC_EM"); - new NewHorizonsLorriDistortionMap(this, getDouble(e2, 0), getDouble(e5, 1), + new NewHorizonsLorriDistortionMap(this, getDouble(e2, 0), getDouble(e5, 1), getDouble(e6, 2), -1); // Setup the ground and sky map @@ -126,10 +114,10 @@ namespace Isis { } /** - * Returns the shutter open and close times. The LORRI camera doesn't use a shutter to start and + * Returns the shutter open and close times. The LORRI camera doesn't use a shutter to start and * end an observation, but this function is being used to get the observation start and end times, - * so we will simulate a shutter. - * + * so we will simulate a shutter. + * * @param exposureDuration ExposureDuration keyword value from the labels, * converted to seconds. * @param time The StartTime keyword value from the labels, converted to diff --git a/isis/src/newhorizons/objs/NewHorizonsLorriCamera/NewHorizonsLorriCamera.h b/isis/src/newhorizons/objs/NewHorizonsLorriCamera/NewHorizonsLorriCamera.h index bcbb3d7b97..7eb421aafd 100644 --- a/isis/src/newhorizons/objs/NewHorizonsLorriCamera/NewHorizonsLorriCamera.h +++ b/isis/src/newhorizons/objs/NewHorizonsLorriCamera/NewHorizonsLorriCamera.h @@ -1,24 +1,13 @@ #ifndef NewHorizonsLorriCamera_h #define NewHorizonsLorriCamera_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "FramingCamera.h" @@ -26,20 +15,20 @@ namespace Isis { /** - * This is the camera model for the LORRI Framing Camera + * This is the camera model for the LORRI Framing Camera * * @ingroup SpiceInstrumentsAndCameras * @ingroup New Horizons * * @author 2013-11-12 Stuart Sides * - * @internal + * @internal * @history 2015-08-11 Ian Humphrey and Makayla Shepherd - Added new data members and methods - * to get spacecraft and instrument names. Extended unit test to test + * to get spacecraft and instrument names. Extended unit test to test * added methods. * @history 2015-08-27 Stuart Sides - Modified to work with new Lorri IK with different unit * (mm) for the focal length. Incremented camera version to 2. - * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument + * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument * members and methods and removed implementation of these methods * since Camera now handles this. References #2335. * @history 2016-10-21 Kristin Berry - Updated unitTest. References #4476. @@ -53,14 +42,14 @@ namespace Isis { //! Destroys the NewHorizonsLorriCamera object ~NewHorizonsLorriCamera() {}; - /** - * Reimplemented from FrameCamera - * + /** + * Reimplemented from FrameCamera + * * @author Stuart Sides (2013/12/26) - * + * * @param time Start time of the observation * @param exposureDuration The exposure duration of the observation - * + * * @return std::pair The start and end times of the observation */ virtual std::pair ShutterOpenCloseTimes(double time, @@ -69,25 +58,25 @@ namespace Isis { /** * CK frame ID - - Instrument Code from spacit run on CK - * - * @return @b int The appropriate instrument code for the "Camera-matrix" + * + * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Frame ID */ virtual int CkFrameId() const { return (-98000); } - /** + /** * CK Reference ID - J2000 - * + * * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Reference ID */ virtual int CkReferenceId() const { return (1); } - /** + /** * SPK Reference ID - J2000 - * + * * @return @b int The appropriate instrument code for the Spacecraft * Kernel Reference ID */ diff --git a/isis/src/newhorizons/objs/NewHorizonsLorriCamera/NewHorizonsLorriDistortionMap.cpp b/isis/src/newhorizons/objs/NewHorizonsLorriCamera/NewHorizonsLorriDistortionMap.cpp index 85aae25f32..b77e7cc429 100644 --- a/isis/src/newhorizons/objs/NewHorizonsLorriCamera/NewHorizonsLorriDistortionMap.cpp +++ b/isis/src/newhorizons/objs/NewHorizonsLorriCamera/NewHorizonsLorriDistortionMap.cpp @@ -1,22 +1,10 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "NewHorizonsLorriDistortionMap.h" #include "CameraFocalPlaneMap.h" @@ -26,15 +14,15 @@ using namespace std; namespace Isis { /** - * - * Constructs a Distortion Map object for the New Horizons LORRI Camera. - * + * + * Constructs a Distortion Map object for the New Horizons LORRI Camera. + * * @param parent Pointer to parent Camera object * @param e2 * @param e2 * @param e2 * @param zDirection passed on to the parrent - * + * * @internal * @history 2014-06-15 Stuart Sides - Original version */ @@ -50,9 +38,9 @@ namespace Isis { /** * Compute undistorted focal plane x/y * - * Compute undistorted focal plane x/y given a distorted focal plane x/y. After calling this - * method, you can obtain the undistorted x/y via the UndistortedFocalPlaneX and - * UndistortedFocalPlaneY methods + * Compute undistorted focal plane x/y given a distorted focal plane x/y. After calling this + * method, you can obtain the undistorted x/y via the UndistortedFocalPlaneX and + * UndistortedFocalPlaneY methods * * @param dx Distorted focal plane x, in millimeters * @param dy Distorted focal plane y, in millimeters @@ -81,7 +69,7 @@ namespace Isis { // NOTE: The discussions showed the Ky and e5 values needed to be negated. The e5 value has // now been negated in the LORRI IK, and the y is now negated in the equation below. // NOTE: The Y and Line values can not be negated in the transY and transL affines because - // this would cause the p_xxxxx class member variables to be in a flipped (top to bottom) + // this would cause the p_xxxxx class member variables to be in a flipped (top to bottom) // coordinate system relative to the SPICE defined focal plane coordinate system. double dr = 1.0 - rr * p_e2 - y * p_e5 - x * p_e6; diff --git a/isis/src/newhorizons/objs/NewHorizonsLorriCamera/NewHorizonsLorriDistortionMap.h b/isis/src/newhorizons/objs/NewHorizonsLorriCamera/NewHorizonsLorriDistortionMap.h index ca701cbdf5..7691c97f06 100644 --- a/isis/src/newhorizons/objs/NewHorizonsLorriCamera/NewHorizonsLorriDistortionMap.h +++ b/isis/src/newhorizons/objs/NewHorizonsLorriCamera/NewHorizonsLorriDistortionMap.h @@ -1,46 +1,35 @@ #ifndef NewHorizonsLorriDistortionMap_h #define NewHorizonsLorriDistortionMap_h -/** - * @file - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "CameraDistortionMap.h" #include "Camera.h" namespace Isis { - /** - * New Horizons LORRI Distortion Map - * + /** + * New Horizons LORRI Distortion Map + * * @author 2014-06-14 Stuart Sides * - * @internal + * @internal * @history 2014-06-08 Staurt Sides - Original version. Equations and coefficients * taken from Jet Propulsion Laboratory Interoffice Memorandum 2011/06/08 "New Horizons * LORRI Geometric Calibration of August 2006" From: W. M. Owen Jr. and D. O'Coonnell - * + * * @history 2016-02-24 Staurt Sides - New Horizons LORRI distortion model changed to * subtract the distortion when going from distorted to undistorted instead of adding, and * adding the distortion when going from undistorted to destorted. */ class NewHorizonsLorriDistortionMap : public CameraDistortionMap { public: - NewHorizonsLorriDistortionMap(Camera *parent, double e2, double e5, double e6, + NewHorizonsLorriDistortionMap(Camera *parent, double e2, double e5, double e6, double zDirection = 1.0); ~NewHorizonsLorriDistortionMap() {}; diff --git a/isis/src/newhorizons/objs/NewHorizonsLorriCamera/unitTest.cpp b/isis/src/newhorizons/objs/NewHorizonsLorriCamera/unitTest.cpp index f585c2368a..8f9fe62815 100644 --- a/isis/src/newhorizons/objs/NewHorizonsLorriCamera/unitTest.cpp +++ b/isis/src/newhorizons/objs/NewHorizonsLorriCamera/unitTest.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -42,8 +31,8 @@ void TestLineSamp(Camera *cam, double samp, double line); * @author ????-??-?? Unknown * * @internal - * @history 2016-10-27 Kristin Berry - - */ + * @history 2016-10-27 Kristin Berry - + */ int main(void) { Preference::Preferences(true); @@ -70,14 +59,14 @@ int main(void) { cout << "CK Reference ID = " << cam->CkReferenceId() << endl; cout << "SPK Target ID = " << cam->SpkTargetId() << endl; cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl; - + // Test name methods cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl; cout << "Spacecraft Name Short: " << cam->spacecraftNameShort() << endl; cout << "Instrument Name Long: " << cam->instrumentNameLong() << endl; cout << "Instrument Name Short: " << cam->instrumentNameShort() << endl << endl; - // Test Shutter Open/Close + // Test Shutter Open/Close const PvlGroup &inst = c.label()->findGroup("Instrument", Pvl::Traverse); double exposureDuration = ((double) inst["ExposureDuration"])/1000; QString stime = inst["StartTime"]; @@ -102,22 +91,22 @@ int main(void) { double samp = 358.0; double line = 534.0; - double deltaT = 5000.0; + double deltaT = 5000.0; cout << "For center pixel position ..." << endl; - cout << "Testing SetImage without deltaT..." << endl; + cout << "Testing SetImage without deltaT..." << endl; if (!cam->SetImage(samp, line)) { cout << "ERROR" << endl; return 0; } else { - cout << "Sample: " << cam->Sample() << endl; - cout << "Line: " << cam->Line() << endl; - cout << "RightAscension: " << cam->RightAscension() << endl; - cout << "Declination: " << cam->Declination() << endl; - cout << "PlanetocentricLatitude: " << cam->UniversalLatitude() << endl; + cout << "Sample: " << cam->Sample() << endl; + cout << "Line: " << cam->Line() << endl; + cout << "RightAscension: " << cam->RightAscension() << endl; + cout << "Declination: " << cam->Declination() << endl; + cout << "PlanetocentricLatitude: " << cam->UniversalLatitude() << endl; cout << "PositiveEast360Longitude: " << cam->UniversalLongitude() << endl; - cout << "EphemerisTime: " << cam->time().Et() << endl; + cout << "EphemerisTime: " << cam->time().Et() << endl; cout << "NorthAzimuth: " << cam->NorthAzimuth() << endl; cout << "SunAzimuth: " << cam->SunAzimuth() << endl; cout << "SpacecraftAzimuth: " << cam->SpacecraftAzimuth() << endl; @@ -127,31 +116,31 @@ int main(void) { double pB[3]; cam->Coordinate(pB); - cout << "BodyFixedCoordinate: " << pB[0] << endl; - cout << "BodyFixedCoordinate: " << pB[1] << endl; - cout << "BodyFixedCoordinate: " << pB[2] << endl; - cout << "LocalRadius: " << cam->LocalRadius().meters() << endl; - cout << "SampleResolution: " << cam->SampleResolution() << endl; - cout << "LineResolution: " << cam->LineResolution() << endl; - cout << "ObliqueDetectorResolution: " << cam->ObliqueDetectorResolution() << endl; - cout << "ObliqueLineResolution: " << cam->ObliqueLineResolution() << endl; - cout << "ObliqueSampleResolution: " << cam->ObliqueSampleResolution() << endl; - cout << "ObliquePixelResolution: " << cam->ObliquePixelResolution() << endl; + cout << "BodyFixedCoordinate: " << pB[0] << endl; + cout << "BodyFixedCoordinate: " << pB[1] << endl; + cout << "BodyFixedCoordinate: " << pB[2] << endl; + cout << "LocalRadius: " << cam->LocalRadius().meters() << endl; + cout << "SampleResolution: " << cam->SampleResolution() << endl; + cout << "LineResolution: " << cam->LineResolution() << endl; + cout << "ObliqueDetectorResolution: " << cam->ObliqueDetectorResolution() << endl; + cout << "ObliqueLineResolution: " << cam->ObliqueLineResolution() << endl; + cout << "ObliqueSampleResolution: " << cam->ObliqueSampleResolution() << endl; + cout << "ObliquePixelResolution: " << cam->ObliquePixelResolution() << endl; } - cout << "Testing SetImage with deltaT..." << endl; + cout << "Testing SetImage with deltaT..." << endl; if(!cam->SetImage(samp, line, deltaT)) { cout << "ERROR" << endl; return 0; } else { - cout << "Sample: " << cam->Sample() << endl; - cout << "Line: " << cam->Line() << endl; - cout << "RightAscension: " << cam->RightAscension() << endl; - cout << "Declination: " << cam->Declination() << endl; - cout << "PlanetocentricLatitude: " << cam->UniversalLatitude() << endl; + cout << "Sample: " << cam->Sample() << endl; + cout << "Line: " << cam->Line() << endl; + cout << "RightAscension: " << cam->RightAscension() << endl; + cout << "Declination: " << cam->Declination() << endl; + cout << "PlanetocentricLatitude: " << cam->UniversalLatitude() << endl; cout << "PositiveEast360Longitude: " << cam->UniversalLongitude() << endl; - cout << "EphemerisTime: " << cam->time().Et() << endl; + cout << "EphemerisTime: " << cam->time().Et() << endl; cout << "NorthAzimuth: " << cam->NorthAzimuth() << endl; cout << "SunAzimuth: " << cam->SunAzimuth() << endl; cout << "SpacecraftAzimuth: " << cam->SpacecraftAzimuth() << endl; @@ -161,15 +150,15 @@ int main(void) { double pB[3]; cam->Coordinate(pB); - cout << "BodyFixedCoordinate: " << pB[0] << endl; - cout << "BodyFixedCoordinate: " << pB[1] << endl; - cout << "BodyFixedCoordinate: " << pB[2] << endl; - cout << "LocalRadius: " << cam->LocalRadius().meters() << endl; - cout << "SampleResolution: " << cam->SampleResolution() << endl; - cout << "LineResolution: " << cam->LineResolution() << endl; - cout << "ObliqueDetectorResolution: " << cam->ObliqueDetectorResolution() << endl; - cout << "ObliqueLineResolution: " << cam->ObliqueLineResolution() << endl; - cout << "ObliqueSampleResolution: " << cam->ObliqueSampleResolution() << endl; + cout << "BodyFixedCoordinate: " << pB[0] << endl; + cout << "BodyFixedCoordinate: " << pB[1] << endl; + cout << "BodyFixedCoordinate: " << pB[2] << endl; + cout << "LocalRadius: " << cam->LocalRadius().meters() << endl; + cout << "SampleResolution: " << cam->SampleResolution() << endl; + cout << "LineResolution: " << cam->LineResolution() << endl; + cout << "ObliqueDetectorResolution: " << cam->ObliqueDetectorResolution() << endl; + cout << "ObliqueLineResolution: " << cam->ObliqueLineResolution() << endl; + cout << "ObliqueSampleResolution: " << cam->ObliqueSampleResolution() << endl; cout << "ObliquePixelResolution: " << cam->ObliquePixelResolution() << endl; } @@ -213,4 +202,3 @@ void TestLineSamp(Camera *cam, double samp, double line) { cout << "DeltaLine = ERROR" << endl << endl; } } - diff --git a/isis/src/newhorizons/objs/NewHorizonsMvicFrameCamera/NewHorizonsMvicFrameCamera.cpp b/isis/src/newhorizons/objs/NewHorizonsMvicFrameCamera/NewHorizonsMvicFrameCamera.cpp index 1688934985..c0b2beeb85 100644 --- a/isis/src/newhorizons/objs/NewHorizonsMvicFrameCamera/NewHorizonsMvicFrameCamera.cpp +++ b/isis/src/newhorizons/objs/NewHorizonsMvicFrameCamera/NewHorizonsMvicFrameCamera.cpp @@ -1,22 +1,10 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "NewHorizonsMvicFrameCamera.h" @@ -39,11 +27,11 @@ using namespace std; namespace Isis { /** - * Constructs a New Horizons MVIC Framing Camera object. The MVIC push-frame camera operates + * Constructs a New Horizons MVIC Framing Camera object. The MVIC push-frame camera operates * in "staring" mode, so it has been implemented as a framing camera rather than a push-frame. - * The test images show the same part of the planet in each framelet, so the push-frame - * implementation will not work since the same lat/lon values are located in possibly every - * framelet. + * The test images show the same part of the planet in each framelet, so the push-frame + * implementation will not work since the same lat/lon values are located in possibly every + * framelet. * * @param lab Pvl label from a New Horizons MVIC Framing Camera image. * @@ -55,7 +43,7 @@ namespace Isis { m_instrumentNameShort = "MVIC FRAMING"; m_spacecraftNameLong = "New Horizons"; m_spacecraftNameShort = "NewHorizons"; - + NaifStatus::CheckErrors(); SetFocalLength(); @@ -66,7 +54,7 @@ namespace Isis { PvlGroup &inst = lab.findGroup("Instrument", Pvl::Traverse); m_exposure = inst["ExposureDuration"]; QString stime = inst["SpacecraftClockStartCount"]; - // ** TODO ** Need an offset time added to labels at ingestion?? The 0.125 value is + // ** TODO ** Need an offset time added to labels at ingestion?? The 0.125 value is // the value in DELTAT00. double offset = 0.125; m_etStart = getClockTime(stime).Et() + offset; @@ -137,7 +125,7 @@ namespace Isis { iTime time(m_utcTime[vband-1]); double et = time.Et(); - + SpiceChar utc[30]; et2utc_c(et, "ISOC", 3, 30, utc); Camera::setTime(et); @@ -145,7 +133,7 @@ namespace Isis { // Set up valid band access Camera::SetBand(vband); - + } diff --git a/isis/src/newhorizons/objs/NewHorizonsMvicFrameCamera/NewHorizonsMvicFrameCamera.h b/isis/src/newhorizons/objs/NewHorizonsMvicFrameCamera/NewHorizonsMvicFrameCamera.h index 650a56208a..d694128747 100644 --- a/isis/src/newhorizons/objs/NewHorizonsMvicFrameCamera/NewHorizonsMvicFrameCamera.h +++ b/isis/src/newhorizons/objs/NewHorizonsMvicFrameCamera/NewHorizonsMvicFrameCamera.h @@ -1,24 +1,13 @@ #ifndef NewHorizonsMvicFrameCamera_h #define NewHorizonsMvicFrameCamera_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "FramingCamera.h" @@ -26,18 +15,18 @@ namespace Isis { /** - * This is the camera model for the New Horizons MVIC Frame mode Camera + * This is the camera model for the New Horizons MVIC Frame mode Camera * * @ingroup SpiceInstrumentsAndCameras * @ingroup New Horizons * * @author 2014-03-31 Tracie Sucharski * - * @internal + * @internal * @history 2015-08-11 Ian Humphrey and Makayla Shepherd - Added new data members and methods * to get spacecraft and instrument names. Extended unit test to test * added methods. - * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument + * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument * members and methods and removed implementation of these methods * since Camera now handles this. References #2335. */ @@ -65,31 +54,31 @@ namespace Isis { //// }; - virtual std::pair ShutterOpenCloseTimes(double time, + virtual std::pair ShutterOpenCloseTimes(double time, double exposureDuration); /** * CK frame ID - - Instrument Code from spacit run on CK - * - * @return @b int The appropriate instrument code for the "Camera-matrix" + * + * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Frame ID */ virtual int CkFrameId() const { return (-98000); } - /** + /** * CK Reference ID - J2000 - * + * * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Reference ID */ virtual int CkReferenceId() const { return (1); } - /** + /** * SPK Reference ID - J2000 - * + * * @return @b int The appropriate instrument code for the Spacecraft * Kernel Reference ID */ diff --git a/isis/src/newhorizons/objs/NewHorizonsMvicFrameCamera/NewHorizonsMvicFrameCameraDistortionMap.cpp b/isis/src/newhorizons/objs/NewHorizonsMvicFrameCamera/NewHorizonsMvicFrameCameraDistortionMap.cpp index a6425148f6..2e63fbc27e 100644 --- a/isis/src/newhorizons/objs/NewHorizonsMvicFrameCamera/NewHorizonsMvicFrameCameraDistortionMap.cpp +++ b/isis/src/newhorizons/objs/NewHorizonsMvicFrameCamera/NewHorizonsMvicFrameCameraDistortionMap.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -345,7 +334,7 @@ namespace Isis { * @return if successful */ bool NewHorizonsMvicFrameCameraDistortionMap::computeDistortionCorrections(const double xscaled, - const double yscaled, + const double yscaled, double &deltax, double &deltay) { double lpx0, lpx1, lpx2, lpx3, lpx4, lpx5; diff --git a/isis/src/newhorizons/objs/NewHorizonsMvicFrameCamera/NewHorizonsMvicFrameCameraDistortionMap.h b/isis/src/newhorizons/objs/NewHorizonsMvicFrameCamera/NewHorizonsMvicFrameCameraDistortionMap.h index debd942f9a..ab3b26e1ac 100644 --- a/isis/src/newhorizons/objs/NewHorizonsMvicFrameCamera/NewHorizonsMvicFrameCameraDistortionMap.h +++ b/isis/src/newhorizons/objs/NewHorizonsMvicFrameCamera/NewHorizonsMvicFrameCameraDistortionMap.h @@ -1,24 +1,13 @@ #ifndef NewHorizonsMvicFrameCameraDistortionMap_h #define NewHorizonsMvicFrameCameraDistortionMap_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include "CameraDistortionMap.h" @@ -27,7 +16,7 @@ using namespace std; namespace Isis { - /** + /** * Distort/undistort focal plane coordinates for New Horizons/MVIC frame sensor * * Creates a map for adding/removing optical distortions diff --git a/isis/src/newhorizons/objs/NewHorizonsMvicFrameCamera/unitTest.cpp b/isis/src/newhorizons/objs/NewHorizonsMvicFrameCamera/unitTest.cpp index 1ac1729451..886a23a7d2 100644 --- a/isis/src/newhorizons/objs/NewHorizonsMvicFrameCamera/unitTest.cpp +++ b/isis/src/newhorizons/objs/NewHorizonsMvicFrameCamera/unitTest.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -60,14 +49,14 @@ int main(void) { cout << "CK Reference ID = " << cam->CkReferenceId() << endl; cout << "SPK Target ID = " << cam->SpkTargetId() << endl; cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl; - + // Test name methods cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl; cout << "Spacecraft Name Short: " << cam->spacecraftNameShort() << endl; cout << "Instrument Name Long: " << cam->instrumentNameLong() << endl; cout << "Instrument Name Short: " << cam->instrumentNameShort() << endl << endl; - // Test Shutter Open/Close + // Test Shutter Open/Close const PvlGroup &inst = c.label()->findGroup("Instrument", Pvl::Traverse); double exposureDuration = ((double) inst["ExposureDuration"])/1000; QString stime = inst["StartTime"]; @@ -149,4 +138,3 @@ void TestLineSamp(Camera *cam, double samp, double line) { cout << "DeltaLine = ERROR" << endl << endl; } } - diff --git a/isis/src/newhorizons/objs/NewHorizonsMvicTdiCamera/NewHorizonsMvicTdiCamera.cpp b/isis/src/newhorizons/objs/NewHorizonsMvicTdiCamera/NewHorizonsMvicTdiCamera.cpp index 05af2a3008..29c2d6040a 100644 --- a/isis/src/newhorizons/objs/NewHorizonsMvicTdiCamera/NewHorizonsMvicTdiCamera.cpp +++ b/isis/src/newhorizons/objs/NewHorizonsMvicTdiCamera/NewHorizonsMvicTdiCamera.cpp @@ -1,22 +1,10 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "NewHorizonsMvicTdiCamera.h" @@ -46,7 +34,7 @@ namespace Isis { m_instrumentNameShort = "MVIC TDI"; m_spacecraftNameLong = "New Horizons"; m_spacecraftNameShort = "NewHorizons"; - + NaifStatus::CheckErrors(); // Set the pixel pitch, focal length and row offset from Mvic frame transfer array diff --git a/isis/src/newhorizons/objs/NewHorizonsMvicTdiCamera/NewHorizonsMvicTdiCamera.h b/isis/src/newhorizons/objs/NewHorizonsMvicTdiCamera/NewHorizonsMvicTdiCamera.h index 8de919f6e3..2735be183a 100644 --- a/isis/src/newhorizons/objs/NewHorizonsMvicTdiCamera/NewHorizonsMvicTdiCamera.h +++ b/isis/src/newhorizons/objs/NewHorizonsMvicTdiCamera/NewHorizonsMvicTdiCamera.h @@ -1,25 +1,13 @@ #ifndef NewHorizonsMvicTdiCamera_h #define NewHorizonsMvicTdiCamera_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "LineScanCamera.h" @@ -39,7 +27,7 @@ namespace Isis { * @history 2015-08-11 Ian Humphrey and Makayla Shepherd - Added new data members and methods * to get spacecraft and instrument names. Extended unit test to test * added methods. - * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument + * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument * members and methods and removed implementation of these methods * since Camera now handles this. References #2335. * @history 2015-10-21 Stuart Sides - Changed the throw in the SetUndistortedFocalPlane @@ -58,24 +46,24 @@ namespace Isis { /** * CK frame ID - - Instrument Code from spacit run on CK - * - * @return @b int The appropriate instrument code for the "Camera-matrix" + * + * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Frame ID */ virtual int CkFrameId() const { return (-98000); } - /** + /** * CK Reference ID - J2000 - * + * * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Reference ID */ virtual int CkReferenceId() const { return (1); } - /** + /** * SPK Reference ID - J2000 - * - * @return @b int The appropriate instrument code for the Spacecraft + * + * @return @b int The appropriate instrument code for the Spacecraft * Kernel Reference ID */ virtual int SpkReferenceId() const { return (1); } diff --git a/isis/src/newhorizons/objs/NewHorizonsMvicTdiCamera/NewHorizonsMvicTdiCameraDistortionMap.cpp b/isis/src/newhorizons/objs/NewHorizonsMvicTdiCamera/NewHorizonsMvicTdiCameraDistortionMap.cpp index f549290852..ea22e78471 100644 --- a/isis/src/newhorizons/objs/NewHorizonsMvicTdiCamera/NewHorizonsMvicTdiCameraDistortionMap.cpp +++ b/isis/src/newhorizons/objs/NewHorizonsMvicTdiCamera/NewHorizonsMvicTdiCameraDistortionMap.cpp @@ -1,22 +1,11 @@ - /** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + /** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include diff --git a/isis/src/newhorizons/objs/NewHorizonsMvicTdiCamera/NewHorizonsMvicTdiCameraDistortionMap.h b/isis/src/newhorizons/objs/NewHorizonsMvicTdiCamera/NewHorizonsMvicTdiCameraDistortionMap.h index 92040cebf6..e29ae1168c 100644 --- a/isis/src/newhorizons/objs/NewHorizonsMvicTdiCamera/NewHorizonsMvicTdiCameraDistortionMap.h +++ b/isis/src/newhorizons/objs/NewHorizonsMvicTdiCamera/NewHorizonsMvicTdiCameraDistortionMap.h @@ -1,24 +1,13 @@ #ifndef NewHorizonsMvicTdiCameraDistortionMap_h #define NewHorizonsMvicTdiCameraDistortionMap_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include "CameraDistortionMap.h" @@ -27,7 +16,7 @@ using namespace std; namespace Isis { - /** + /** * Distort/undistort focal plane coordinates for New Horizons/MVIC * * Creates a map for adding/removing optical distortions diff --git a/isis/src/newhorizons/objs/NewHorizonsMvicTdiCamera/unitTest.cpp b/isis/src/newhorizons/objs/NewHorizonsMvicTdiCamera/unitTest.cpp index 6db63efd2f..01c4e99d08 100644 --- a/isis/src/newhorizons/objs/NewHorizonsMvicTdiCamera/unitTest.cpp +++ b/isis/src/newhorizons/objs/NewHorizonsMvicTdiCamera/unitTest.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -45,7 +34,7 @@ void TestLineSamp(Camera *cam, double samp, double line); * @internal * @history 2016-10-27 Kristin Berry - Added testing for new SetImage with time offset. * References #4476. - */ + */ int main(void) { Preference::Preferences(true); @@ -70,7 +59,7 @@ int main(void) { cout << "CK Reference ID = " << cam->CkReferenceId() << endl; cout << "SPK Target ID = " << cam->SpkTargetId() << endl; cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl; - + // Test name methods cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl; cout << "Spacecraft Name Short: " << cam->spacecraftNameShort() << endl; @@ -99,13 +88,13 @@ int main(void) { return 0; } else { - cout << "Sample: " << cam->Sample() << endl; - cout << "Line: " << cam->Line() << endl; - cout << "RightAscension: " << cam->RightAscension() << endl; - cout << "Declination: " << cam->Declination() << endl; - cout << "PlanetocentricLatitude: " << cam->UniversalLatitude() << endl; + cout << "Sample: " << cam->Sample() << endl; + cout << "Line: " << cam->Line() << endl; + cout << "RightAscension: " << cam->RightAscension() << endl; + cout << "Declination: " << cam->Declination() << endl; + cout << "PlanetocentricLatitude: " << cam->UniversalLatitude() << endl; cout << "PositiveEast360Longitude: " << cam->UniversalLongitude() << endl; - cout << "EphemerisTime: " << cam->time().Et() << endl; + cout << "EphemerisTime: " << cam->time().Et() << endl; cout << "NorthAzimuth: " << cam->NorthAzimuth() << endl; cout << "SunAzimuth: " << cam->SunAzimuth() << endl; cout << "SpacecraftAzimuth: " << cam->SpacecraftAzimuth() << endl; @@ -115,31 +104,31 @@ int main(void) { double pB[3]; cam->Coordinate(pB); - cout << "BodyFixedCoordinate: " << pB[0] << endl; - cout << "BodyFixedCoordinate: " << pB[1] << endl; - cout << "BodyFixedCoordinate: " << pB[2] << endl; - cout << "LocalRadius: " << cam->LocalRadius().meters() << endl; - cout << "SampleResolution: " << cam->SampleResolution() << endl; - cout << "LineResolution: " << cam->LineResolution() << endl; - cout << "ObliqueDetectorResolution: " << cam->ObliqueDetectorResolution() << endl; - cout << "ObliqueLineResolution: " << cam->ObliqueLineResolution() << endl; - cout << "ObliqueSampleResolution: " << cam->ObliqueSampleResolution() << endl; + cout << "BodyFixedCoordinate: " << pB[0] << endl; + cout << "BodyFixedCoordinate: " << pB[1] << endl; + cout << "BodyFixedCoordinate: " << pB[2] << endl; + cout << "LocalRadius: " << cam->LocalRadius().meters() << endl; + cout << "SampleResolution: " << cam->SampleResolution() << endl; + cout << "LineResolution: " << cam->LineResolution() << endl; + cout << "ObliqueDetectorResolution: " << cam->ObliqueDetectorResolution() << endl; + cout << "ObliqueLineResolution: " << cam->ObliqueLineResolution() << endl; + cout << "ObliqueSampleResolution: " << cam->ObliqueSampleResolution() << endl; } //testing SetImage with deltaT - double deltaT = 0.5; + double deltaT = 0.5; if (!cam->SetImage(samp, line, deltaT)) { cout << "ERROR" << endl; return 0; } else { - cout << "Sample: " << cam->Sample() << endl; - cout << "Line: " << cam->Line() << endl; - cout << "RightAscension: " << cam->RightAscension() << endl; - cout << "Declination: " << cam->Declination() << endl; - cout << "PlanetocentricLatitude: " << cam->UniversalLatitude() << endl; + cout << "Sample: " << cam->Sample() << endl; + cout << "Line: " << cam->Line() << endl; + cout << "RightAscension: " << cam->RightAscension() << endl; + cout << "Declination: " << cam->Declination() << endl; + cout << "PlanetocentricLatitude: " << cam->UniversalLatitude() << endl; cout << "PositiveEast360Longitude: " << cam->UniversalLongitude() << endl; - cout << "EphemerisTime: " << cam->time().Et() << endl; + cout << "EphemerisTime: " << cam->time().Et() << endl; cout << "NorthAzimuth: " << cam->NorthAzimuth() << endl; cout << "SunAzimuth: " << cam->SunAzimuth() << endl; cout << "SpacecraftAzimuth: " << cam->SpacecraftAzimuth() << endl; @@ -149,15 +138,15 @@ int main(void) { double pB[3]; cam->Coordinate(pB); - cout << "BodyFixedCoordinate: " << pB[0] << endl; - cout << "BodyFixedCoordinate: " << pB[1] << endl; - cout << "BodyFixedCoordinate: " << pB[2] << endl; - cout << "LocalRadius: " << cam->LocalRadius().meters() << endl; - cout << "SampleResolution: " << cam->SampleResolution() << endl; - cout << "LineResolution: " << cam->LineResolution() << endl; - cout << "ObliqueDetectorResolution: " << cam->ObliqueDetectorResolution() << endl; - cout << "ObliqueLineResolution: " << cam->ObliqueLineResolution() << endl; - cout << "ObliqueSampleResolution: " << cam->ObliqueSampleResolution() << endl; + cout << "BodyFixedCoordinate: " << pB[0] << endl; + cout << "BodyFixedCoordinate: " << pB[1] << endl; + cout << "BodyFixedCoordinate: " << pB[2] << endl; + cout << "LocalRadius: " << cam->LocalRadius().meters() << endl; + cout << "SampleResolution: " << cam->SampleResolution() << endl; + cout << "LineResolution: " << cam->LineResolution() << endl; + cout << "ObliqueDetectorResolution: " << cam->ObliqueDetectorResolution() << endl; + cout << "ObliqueLineResolution: " << cam->ObliqueLineResolution() << endl; + cout << "ObliqueSampleResolution: " << cam->ObliqueSampleResolution() << endl; } if (abs(cam->UniversalLatitude() - knownLat) < 7E-12) { @@ -199,4 +188,3 @@ void TestLineSamp(Camera *cam, double samp, double line) { cout << "DeltaLine = ERROR" << endl << endl; } } - diff --git a/isis/src/odyssey/apps/thm2isis/main.cpp b/isis/src/odyssey/apps/thm2isis/main.cpp index 5c38f7b10a..a38a4fa417 100644 --- a/isis/src/odyssey/apps/thm2isis/main.cpp +++ b/isis/src/odyssey/apps/thm2isis/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include @@ -227,7 +235,7 @@ void TranslateLabels(Pvl &pdsLab, Pvl &isis3, int numBands) { // For VIS, we have the following one to one correspondence of these keywords: // BandNumber {1, 2, 3, 4, 5} // FilterNumber {2, 5, 3, 4, 1} - // + // // Note that the BandNumber will match the OriginalBand only if the image // to be imported contains band number 1 and is not missing consecutive band numbers. bandBin += sqube.findGroup("BandBin")["BandBinBandNumber"]; diff --git a/isis/src/odyssey/apps/thmbasemap1/main.cpp b/isis/src/odyssey/apps/thmbasemap1/main.cpp index 4a9506ee80..8e8a12e8f9 100644 --- a/isis/src/odyssey/apps/thmbasemap1/main.cpp +++ b/isis/src/odyssey/apps/thmbasemap1/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "Application.h" #include "FileList.h" diff --git a/isis/src/odyssey/apps/thmdriftcor/main.cpp b/isis/src/odyssey/apps/thmdriftcor/main.cpp index 473622610a..37e4707832 100644 --- a/isis/src/odyssey/apps/thmdriftcor/main.cpp +++ b/isis/src/odyssey/apps/thmdriftcor/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include diff --git a/isis/src/odyssey/apps/thmnoseam/main.cpp b/isis/src/odyssey/apps/thmnoseam/main.cpp index 2ad6dd0b9c..41072bef03 100644 --- a/isis/src/odyssey/apps/thmnoseam/main.cpp +++ b/isis/src/odyssey/apps/thmnoseam/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include @@ -100,7 +108,7 @@ void IsisMain() { } } catch(IException &e) { - throw IException(e, IException::User, + throw IException(e, IException::User, "Unable to run thmnoseam with the given even input cube.", _FILEINFO_); } @@ -118,7 +126,7 @@ void IsisMain() { } } catch(IException &e) { - throw IException(e, IException::User, + throw IException(e, IException::User, "Unable to run thmnoseam with the given odd input cube.", _FILEINFO_); } diff --git a/isis/src/odyssey/apps/thmproc/main.cpp b/isis/src/odyssey/apps/thmproc/main.cpp index 43058fc5d9..5c34541b5f 100644 --- a/isis/src/odyssey/apps/thmproc/main.cpp +++ b/isis/src/odyssey/apps/thmproc/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "Pipeline.h" @@ -21,7 +29,7 @@ void IsisMain() { throw IException(IException::User, msg, _FILEINFO_); } } - + if(ui.WasEntered("CK")) { FileName ckPreference = ui.GetFileName("CK"); if(!ckPreference.fileExists()){ @@ -29,7 +37,7 @@ void IsisMain() { throw IException(IException::User, msg, _FILEINFO_); } } - + if(ui.WasEntered("SPK")) { FileName spkPreference = ui.GetFileName("SPK"); if(!spkPreference.fileExists()){ @@ -54,7 +62,7 @@ void IsisMain() { if(ui.GetBoolean("INGESTION")) { Pvl labels(ui.GetFileName("FROM")); - if((QString)labels["DETECTOR_ID"][0] == "VIS") { + if((QString)labels["DETECTOR_ID"][0] == "VIS") { if(((QString)labels["DATA_SET_ID"]).contains("RDR")) { ProcessVis(true); } diff --git a/isis/src/odyssey/apps/thmvisflat/main.cpp b/isis/src/odyssey/apps/thmvisflat/main.cpp index d2a3da5ebe..e68d7b6c4e 100644 --- a/isis/src/odyssey/apps/thmvisflat/main.cpp +++ b/isis/src/odyssey/apps/thmvisflat/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "Blob.h" #include "Cube.h" @@ -20,7 +28,7 @@ void IsisMain() { } icube.open(FileName(ui.GetFileName("FROM")).expanded()); - + // Make sure it is a Themis EDR/RDR FileName inFileName = ui.GetFileName("FROM"); try { @@ -35,7 +43,7 @@ void IsisMain() { msg += inFileName.expanded() + "] does not appear to be a THEMIS VIS image."; throw IException(e, IException::User, msg, _FILEINFO_); } - + vector flatcubes; vector fcubeMgrs; int summing = toInt(icube.group("Instrument")["SpatialSumming"][0]); @@ -146,4 +154,3 @@ void IsisMain() { fcubeMgrs.clear(); flatcubes.clear(); } - diff --git a/isis/src/odyssey/apps/thmvistrim/main.cpp b/isis/src/odyssey/apps/thmvistrim/main.cpp index 30559231c0..68ad45d9fd 100644 --- a/isis/src/odyssey/apps/thmvistrim/main.cpp +++ b/isis/src/odyssey/apps/thmvistrim/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include @@ -36,7 +44,7 @@ void IsisMain() { } } catch(IException &e) { - throw IException(e, IException::User, + throw IException(e, IException::User, "Unable to run thmvistrim with the given input cube.", _FILEINFO_); } diff --git a/isis/src/odyssey/objs/ThemisIrCamera/ThemisIrCamera.cpp b/isis/src/odyssey/objs/ThemisIrCamera/ThemisIrCamera.cpp index 166b32b57b..9ce6b033cd 100644 --- a/isis/src/odyssey/objs/ThemisIrCamera/ThemisIrCamera.cpp +++ b/isis/src/odyssey/objs/ThemisIrCamera/ThemisIrCamera.cpp @@ -1,22 +1,10 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "ThemisIrCamera.h" #include "ThemisIrDistortionMap.h" @@ -46,7 +34,7 @@ namespace Isis { m_instrumentNameShort = "Themis-IR"; m_spacecraftNameLong = "Mars Odyssey"; m_spacecraftNameShort = "Odyssey"; - + NaifStatus::CheckErrors(); // Set the detector size SetPixelPitch(0.05); diff --git a/isis/src/odyssey/objs/ThemisIrCamera/ThemisIrCamera.h b/isis/src/odyssey/objs/ThemisIrCamera/ThemisIrCamera.h index c63703bbb8..12bdddf9e3 100644 --- a/isis/src/odyssey/objs/ThemisIrCamera/ThemisIrCamera.h +++ b/isis/src/odyssey/objs/ThemisIrCamera/ThemisIrCamera.h @@ -1,25 +1,13 @@ #ifndef ThemisIrCamera_h #define ThemisIrCamera_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "LineScanCamera.h" @@ -31,8 +19,8 @@ namespace Isis { /** * @brief THEMIS IR Camera * - * This is the camera model for the Thermal Emission Imaging System - * Infrared (THEMIS IR) camera + * This is the camera model for the Thermal Emission Imaging System + * Infrared (THEMIS IR) camera * * @ingroup SpiceInstrumentsAndCameras * @ingroup MarsOdyssey @@ -54,12 +42,12 @@ namespace Isis { * Updated documentation. Removed Odyssey namespace * wrap inside Isis namespace. Added Isis Disclaimer * to files. Added NAIF error check to constructor. - * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis + * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis * coding standards. References #972. * @history 2015-08-12 Ian Humphrey and Makayla Shepherd - Added new data members and methods * to get spacecraft and instrument names. Extended unit test to test * these methods. - * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument + * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument * members and methods and removed implementation of these methods * since Camera now handles this. References #2335. */ @@ -79,24 +67,24 @@ namespace Isis { /** * CK frame ID - - Instrument Code from spacit run on CK - * - * @return @b int The appropriate instrument code for the "Camera-matrix" + * + * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Frame ID */ virtual int CkFrameId() const { return (-53000); } - /** + /** * CK Reference ID - J2000 - * + * * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Reference ID */ virtual int CkReferenceId() const { return (16); } - /** + /** * SPK Reference ID - J2000 - * - * @return @b int The appropriate instrument code for the Spacecraft + * + * @return @b int The appropriate instrument code for the Spacecraft * Kernel Reference ID */ virtual int SpkReferenceId() const { return (1); } @@ -108,6 +96,6 @@ namespace Isis { QString p_tdiMode; std::vector p_originalBand; }; - + }; #endif diff --git a/isis/src/odyssey/objs/ThemisIrCamera/ThemisIrDistortionMap.cpp b/isis/src/odyssey/objs/ThemisIrCamera/ThemisIrDistortionMap.cpp index 302f172c77..bae8484ca1 100644 --- a/isis/src/odyssey/objs/ThemisIrCamera/ThemisIrDistortionMap.cpp +++ b/isis/src/odyssey/objs/ThemisIrCamera/ThemisIrDistortionMap.cpp @@ -1,22 +1,10 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include "ThemisIrDistortionMap.h" @@ -78,4 +66,3 @@ namespace Isis { return true; } } - diff --git a/isis/src/odyssey/objs/ThemisIrCamera/ThemisIrDistortionMap.h b/isis/src/odyssey/objs/ThemisIrCamera/ThemisIrDistortionMap.h index 29933209fa..6ac2fe3728 100644 --- a/isis/src/odyssey/objs/ThemisIrCamera/ThemisIrDistortionMap.h +++ b/isis/src/odyssey/objs/ThemisIrCamera/ThemisIrDistortionMap.h @@ -1,25 +1,13 @@ #ifndef ThemisIrDistortionMap_h #define ThemisIrDistortionMap_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "CameraDistortionMap.h" @@ -33,12 +21,12 @@ namespace Isis { * @ingroup MarsOdyssey * * @see ThemisIrCamera - * - * @author 2005-02-01 Jeff Anderson - * + * + * @author 2005-02-01 Jeff Anderson + * * @internal * @history 2005-02-01 Jeff Anderson - Original version - * @history 2009-03-27 Jeff Anderson - Modified to use Duxbury's distortion + * @history 2009-03-27 Jeff Anderson - Modified to use Duxbury's distortion * model from Feb 2009 email with attached PDF * document * @history 2011-05-03 Jeannie Walldren - Removed Odyssey namespace wrap. diff --git a/isis/src/odyssey/objs/ThemisIrCamera/unitTest.cpp b/isis/src/odyssey/objs/ThemisIrCamera/unitTest.cpp index 0d8603accc..e9a0abf4ed 100644 --- a/isis/src/odyssey/objs/ThemisIrCamera/unitTest.cpp +++ b/isis/src/odyssey/objs/ThemisIrCamera/unitTest.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -60,7 +49,7 @@ int main(void) { cout << "CK Reference ID = " << cam->CkReferenceId() << endl; cout << "SPK Target ID = " << cam->SpkTargetId() << endl; cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl; - + // Test all four corners to make sure the conversions are right cout << "For upper left corner ..." << endl; TestLineSamp(cam, 1.0, 1.0); @@ -96,7 +85,7 @@ int main(void) { else { cout << setprecision(16) << "Longitude off by: " << cam->UniversalLongitude() - knownLon << endl; } - + // Test name methods cout << endl << endl << "Testing name methods ..." << endl; cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl; @@ -129,4 +118,3 @@ void TestLineSamp(Camera *cam, double samp, double line) { cout << "DeltaLine = ERROR" << endl << endl; } } - diff --git a/isis/src/odyssey/objs/ThemisVisCamera/ThemisVisCamera.cpp b/isis/src/odyssey/objs/ThemisVisCamera/ThemisVisCamera.cpp index 0a77b5c574..d3ec4b8508 100644 --- a/isis/src/odyssey/objs/ThemisVisCamera/ThemisVisCamera.cpp +++ b/isis/src/odyssey/objs/ThemisVisCamera/ThemisVisCamera.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "ThemisVisCamera.h" #include @@ -52,7 +41,7 @@ namespace Isis { m_instrumentNameShort = "Themis-VIS"; m_spacecraftNameLong = "Mars Odyssey"; m_spacecraftNameShort = "Odyssey"; - + NaifStatus::CheckErrors(); // Set up the camera characteristics // LoadFrameMounting("M01_SPACECRAFT","M01_THEMIS_VIS"); @@ -122,7 +111,7 @@ namespace Isis { LoadCache(); NaifStatus::CheckErrors(); } - + ThemisVisCamera::~ThemisVisCamera() { } @@ -170,16 +159,16 @@ namespace Isis { int wavelengthToTimeBand[] = { 2, 5, 3, 4, 1 }; timeBand = wavelengthToTimeBand[ReferenceBand() - 1]; } - + // Compute the time offset for this detector line. // Subtract 1 from the time band then multiply by the interframe delay then // subtract half the exposure duration, in seconds. - // + // // Subtracting 1 from the time band number calculates the appropriate // number of interframe delay multiples for this filter number (recall this // corresponds to a location on the ccd) p_bandTimeOffset = ((timeBand - 1) * p_interframeDelay) - ((p_exposureDur / 1000.0) / 2.0); - + // Set the detector first line for this band on the ccd. // The VIS band first row values are 1-based detector row numbers // used for the beginning (bottom) of the 192-row framelet for the various bands. @@ -197,7 +186,7 @@ namespace Isis { /** * The camera model is band dependent (i.e. not band independent), so this - * method returns false + * method returns false * * @return @b bool This will always return False. */ @@ -209,8 +198,8 @@ namespace Isis { /** * CK frame ID - - Instrument Code from spacit run on CK - * - * @return @b int The appropriate instrument code for the "Camera-matrix" + * + * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Frame ID */ int ThemisVisCamera::CkFrameId() const { @@ -219,9 +208,9 @@ namespace Isis { - /** + /** * CK Reference ID - MARSIAU - * + * * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Reference ID */ @@ -231,9 +220,9 @@ namespace Isis { - /** + /** * SPK Reference ID - J2000 - * + * * @return @b int The appropriate instrument code for the Spacecraft * Kernel Reference ID */ diff --git a/isis/src/odyssey/objs/ThemisVisCamera/ThemisVisCamera.h b/isis/src/odyssey/objs/ThemisVisCamera/ThemisVisCamera.h index 8d04b8b826..ec6bc8fa63 100644 --- a/isis/src/odyssey/objs/ThemisVisCamera/ThemisVisCamera.h +++ b/isis/src/odyssey/objs/ThemisVisCamera/ThemisVisCamera.h @@ -1,25 +1,13 @@ #ifndef ThemisVisCamera_h #define ThemisVisCamera_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "PushFrameCamera.h" @@ -27,8 +15,8 @@ namespace Isis { /** * @brief THEMIS VIS Camera Model * - * This is the camera model for the Thermal Emission Imaging System - * Visible-Imaging Subsystem (THEMIS VIS) Push Frame camera + * This is the camera model for the Thermal Emission Imaging System + * Visible-Imaging Subsystem (THEMIS VIS) Push Frame camera * * @ingroup SpiceInstrumentsAndCameras * @ingroup MarsOdyssey @@ -46,17 +34,17 @@ namespace Isis { * @history 2010-08-04 Jeannie Backer - Removed Isis namespace wrap around Odyssey namespace * and replaced with "using namespace Isis". Added NAIF error check to * constructor. - * @history 2010-09-14 Steven Lambright - Updated unitTest to not use a DEM. + * @history 2010-09-14 Steven Lambright - Updated unitTest to not use a DEM. * @history 2011-01-14 Travis Addair - Added new CK/SPK accessor methods, pure virtual in * Camera, implemented in mission specific cameras. - * @history 2011-02-09 Steven Lambright - Major changes to camera classes. + * @history 2011-02-09 Steven Lambright - Major changes to camera classes. * @history 2011-02-23 Mackenzie Boyd - Modified focal length from 203.9 to 202.059 per * request from Christopher Edwards at ASU, * (Christopher.Edwards@asu.edu). Updated unitTest. * @history 2011-05-03 Jeannie Backer - Fixed documentation. Replaced Odyssey namespace wrap - * with Isis namespace wrap. Added Isis Disclaimer to files. Updated + * with Isis namespace wrap. Added Isis Disclaimer to files. Updated * unitTest to test for new methods. - * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis + * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis * coding standards. References #972. * @history 2014-08-22 Jeannie Backer - Fixed bug in camera model to used the FilterNumber * rather than the OriginalBand to determine the appropriate filter @@ -68,13 +56,13 @@ namespace Isis { * @history 2015-08-12 Ian Humphrey and Makayla Shepherd - Added new data members and methods * to get spacecraft and instrument names. Extended unit test to * test these methods. - * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument + * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument * members and methods and removed implementation of these methods * since Camera now handles this. References #2335. - * - * - * - * + * + * + * + * * @todo 2014-08-22 Jeannie Backer - THEMIS cameras do not appear to import a ReferenceBand * keyword neither in the thm2isis source code nor in its translation * tables. In this camera model, BandEphemerisTimeOffset() does a check @@ -106,12 +94,11 @@ namespace Isis { double p_exposureDur; //!< Exposure Duration value from labels double p_interframeDelay; //!< Interframe Delay value from labels int p_nframes; //!< Number of frames in whole image - QList p_filterNumber; /**< List of filter number values from the Instrument BandBin - group that correspond to each band in the cube. Filter - numbers indicate the physical location of the band in the + QList p_filterNumber; /**< List of filter number values from the Instrument BandBin + group that correspond to each band in the cube. Filter + numbers indicate the physical location of the band in the detector array. They are numbered by ascending times.*/ }; }; #endif - diff --git a/isis/src/odyssey/objs/ThemisVisCamera/ThemisVisDistortionMap.cpp b/isis/src/odyssey/objs/ThemisVisCamera/ThemisVisDistortionMap.cpp index 9293f50eae..ba162cad9b 100644 --- a/isis/src/odyssey/objs/ThemisVisCamera/ThemisVisDistortionMap.cpp +++ b/isis/src/odyssey/objs/ThemisVisCamera/ThemisVisDistortionMap.cpp @@ -1,21 +1,10 @@ -/** - * @file - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include "ThemisVisDistortionMap.h" @@ -27,9 +16,9 @@ namespace Isis { /** * Constructs a Distortion Map for the Themis Vis Camera * - * @param parent Pointer to the parent Camera object - * - * @internal + * @param parent Pointer to the parent Camera object + * + * @internal * @history 2011-05-03 Jeannie Walldren - Added NAIF error check. Fixed * documentation. */ @@ -37,7 +26,7 @@ namespace Isis { CameraDistortionMap(parent, 1.0) { // Set necessary constant values - // The IR pixel pitch is used by VIS processing because optical distortion corrections are in + // The IR pixel pitch is used by VIS processing because optical distortion corrections are in // terms of IR pixels. Note that the pixel pitch for the instrument currently being processed // is stored in ISIS2's ccd.mmpp. // from IR_PIXEL_PITCH in ISIS2's thm_parameters.def.N @@ -129,7 +118,7 @@ namespace Isis { // between the boresight and the look vector for a given detector sample/line coordinate, // these factors are used to compute a detector sample coordinate that will give a look // vector corresponding to where the given look vector (detector sample/line) is - // really looking on the planet + // really looking on the planet // (values read from VIS_OD_CX and VIS_OD_CY[N] in thm_parameters.def.7.2, last updated 03/2003) double vis_od_cx[] = { -4.02919e-5, 0.0, 0.0 }; // VIS optical distortion coefficients for x double vis_od_cy[] = { -0.0178649, -0.00727843, 5.65278e-5 }; @@ -139,9 +128,9 @@ namespace Isis { // compute IR pixels(lines) relative to boresight double j = p_undistortedFocalPlaneY / p_irPixelPitch; - // IR distortion in Y (pixels) + // IR distortion in Y (pixels) // Note that (-j) is used here because the orientation of positive displacement from the boresight in the Y - // direction assumed for the correction parameters is opposite of the positive direction for j. + // direction assumed for the correction parameters is opposite of the positive direction for j. double deltaj = vis_od_cy[0] + ( vis_od_cy[1] * (-j)) + ( vis_od_cy[2] * (-j) * (-j)); // IR stretch factor in X direction @@ -188,24 +177,24 @@ namespace Isis { double ux_guess, uy_guess; // "solve" undistorted focal plane equations for ux and uy to get beginning offset - double xOffset = -dy / p_irPixelPitch * vis_od_cx[0] - + vis_od_cx[0] * p_irBoreLine + double xOffset = -dy / p_irPixelPitch * vis_od_cx[0] + + vis_od_cx[0] * p_irBoreLine - vis_od_cx[0] * p_ir_b5_effectiveDetectorLine; - double yOffset = p_irPixelPitch * vis_od_cy[0] / dy - - vis_od_cy[1] + double yOffset = p_irPixelPitch * vis_od_cy[0] / dy + - vis_od_cy[1] + dy / p_irPixelPitch * vis_od_cy[2]; - + while (!done) { // In this loop, we will use the current offset to make a guess at the // undistorted focal plane coordinate that corresponds to the known // distorted focal plane coordinate. - // + // // The offset is updated using the undistored guess. - // + // // Each undistorted guess will be tested by reversing the equation used to // compute the current undistorted guess to get a corresponding distorted // coordinate. - // + // // If this distorted coordinate that corresponds to the current undistorted // guess is close enough to the known distorted coordinate, then we will // accept the corresponding undistorted coordinate as our solution and end @@ -215,11 +204,11 @@ namespace Isis { uy_guess = dy / (1.0 + yOffset); // offset is updated with each undistored x and y guess - xOffset = -uy_guess / p_irPixelPitch * vis_od_cx[0] - + vis_od_cx[0] * p_irBoreLine + xOffset = -uy_guess / p_irPixelPitch * vis_od_cx[0] + + vis_od_cx[0] * p_irBoreLine - vis_od_cx[0] * p_ir_b5_effectiveDetectorLine; - yOffset = p_irPixelPitch * vis_od_cy[0] / uy_guess - - vis_od_cy[1] + yOffset = p_irPixelPitch * vis_od_cy[0] / uy_guess + - vis_od_cy[1] + uy_guess / p_irPixelPitch * vis_od_cy[2]; // find the distorted x/y corresponding to the undistorted x/y guess @@ -238,7 +227,7 @@ namespace Isis { return false; } } - + // use the undistorted x/y whose corresponding distorted x/y are both close enough to the known // distorted x/y p_undistortedFocalPlaneX = ux_guess; diff --git a/isis/src/odyssey/objs/ThemisVisCamera/ThemisVisDistortionMap.h b/isis/src/odyssey/objs/ThemisVisCamera/ThemisVisDistortionMap.h index 4a08ac475e..6affec84ac 100644 --- a/isis/src/odyssey/objs/ThemisVisCamera/ThemisVisDistortionMap.h +++ b/isis/src/odyssey/objs/ThemisVisCamera/ThemisVisDistortionMap.h @@ -1,24 +1,14 @@ #ifndef ThemisVisDistortionMap_h #define ThemisVisDistortionMap_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "CameraDistortionMap.h" namespace Isis { @@ -31,11 +21,11 @@ namespace Isis { * @ingroup SpiceInstrumentsAndCameras * @ingroup MarsOdyssey * - * @see ThemisVisCamera - * + * @see ThemisVisCamera + * * @author 2006-01-03 Elizabeth Miller * - * @internal + * @internal * @history 2011-05-03 Jeannie Walldren - Fixed documentation. Removed * Odyssey namespace wrap inside Isis wrap. * @history 2014-04-17 Jeannie Backer - Updated documentation for forward/reverse directions @@ -53,10 +43,10 @@ namespace Isis { virtual bool SetUndistortedFocalPlane(const double ux, const double uy); private: - double p_irPixelPitch; //!< Pixel Pitch for Themis Ir Camera (in meters per pixel). + double p_irPixelPitch; //!< Pixel Pitch for Themis Ir Camera (in meters per pixel). double p_visPixelPitch; //!< Pixel Pitch for Themis Vis Camera (in meters per pixel). - double p_ir_b5_effectiveDetectorLine; /**< Effective 1-based detector line number used for + double p_ir_b5_effectiveDetectorLine; /**< Effective 1-based detector line number used for observing the Band 5, i.e., average of the 16 detector lines used for the band. Detector line numbers increase upwards in the image. */ diff --git a/isis/src/odyssey/objs/ThemisVisCamera/unitTest.cpp b/isis/src/odyssey/objs/ThemisVisCamera/unitTest.cpp index 8bc4c7f6ff..81f98b3c7a 100644 --- a/isis/src/odyssey/objs/ThemisVisCamera/unitTest.cpp +++ b/isis/src/odyssey/objs/ThemisVisCamera/unitTest.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -47,7 +36,7 @@ int main(void) { // These should be lat/lon at center of image. To obtain these numbers for a new cube/camera, // set both the known lat and known lon to zero and copy the unit test output "Latitude off by: " // and "Longitude off by: " values directly into these variables. - //double knownCenterLat = 48.53477763371114; + //double knownCenterLat = 48.53477763371114; //double knownCenterLon = 332.0435632412456; // double knownCenterLat = 48.5338707313522; // double knownCenterLon = 332.0434591311045; @@ -84,7 +73,7 @@ int main(void) { qDebug() << "For lower right corner ..."; TestSampLine(evenCam, evenCam->Samples(), evenCam->Lines()); - + qDebug() << "For center framelet 14 pixel position ..."; double samp = evenCam->Samples() / 2; double line = evenCam->Lines() / 2 + 192.0 /2.0 / 2.0; // add half of summed framelet to get @@ -99,7 +88,7 @@ int main(void) { qDebug() << "Latitude: OK"; } else { - qDebug() << "Latitude: off by " + qDebug() << "Latitude: off by " << QString::number(evenCam->UniversalLatitude() - knownCenterLat, 'f', 16); } @@ -107,7 +96,7 @@ int main(void) { qDebug() << "Longitude: OK"; } else { - qDebug() << "Longitude: off by " + qDebug() << "Longitude: off by " << QString::number(evenCam->UniversalLongitude() - knownCenterLon, 'f', 16); } TestSampLine(evenCam, samp, line); @@ -141,7 +130,7 @@ int main(void) { qDebug()<< "For lower right corner ..."; TestSampLine(oddCam, oddCam->Samples(), oddCam->Lines() - 96.0); // omit framelet 26 for odd - + qDebug() << "For center framelet 13 pixel position ..."; knownCenterLat = 48.563958771636; knownCenterLon = 332.04676929446; @@ -171,7 +160,7 @@ int main(void) { TestSampLine(oddCam, samp, line); qDebug() << ""; - + // Test name methods qDebug() << "Testing name methods ..."; qDebug() << "Spacecraft Name Long: " << evenCam->spacecraftNameLong(); @@ -180,12 +169,12 @@ int main(void) { qDebug() << "Instrument Name Short: " << evenCam->instrumentNameShort(); qDebug() << ""; qDebug() << ""; - + qDebug() << "Testing errors"; try { Cube irCube("$ISISTESTDATA/isis/src/odyssey/unitTestData/I00831002RDR.cub", "r"); ThemisVisCamera irImage(irCube); - } + } catch (IException &e) { e.print(); } @@ -229,4 +218,3 @@ void TestSampLine(Camera *cam, double samp, double line) { qDebug() << ""; } - diff --git a/isis/src/osirisrex/apps/ocams2isis/main.cpp b/isis/src/osirisrex/apps/ocams2isis/main.cpp index 2c3c2413aa..bcb5f31fef 100644 --- a/isis/src/osirisrex/apps/ocams2isis/main.cpp +++ b/isis/src/osirisrex/apps/ocams2isis/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include diff --git a/isis/src/osirisrex/objs/OsirisRexOcamsCamera/OsirisRexDistortionMap.cpp b/isis/src/osirisrex/objs/OsirisRexOcamsCamera/OsirisRexDistortionMap.cpp index 5bbaaef472..8a5ec8e9c8 100644 --- a/isis/src/osirisrex/objs/OsirisRexOcamsCamera/OsirisRexDistortionMap.cpp +++ b/isis/src/osirisrex/objs/OsirisRexOcamsCamera/OsirisRexDistortionMap.cpp @@ -1,25 +1,10 @@ -/** - * @file - * $Revision: 1.4 $ - * $Date: 2008/02/21 16:04:33 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include @@ -30,22 +15,22 @@ #include "CameraFocalPlaneMap.h" namespace Isis { - /** + /** * OSIRIS REx Camera distortion map constructor * - * Create a camera distortion map for OSIRIS REx's. - * - * This class maps between distorted and undistorted - * focal plane x/y's. The default mapping is the identity, that is, - * the focal plane x/y and undistorted focal plane x/y will be - * identical. + * Create a camera distortion map for OSIRIS REx's. + * + * This class maps between distorted and undistorted + * focal plane x/y's. The default mapping is the identity, that is, + * the focal plane x/y and undistorted focal plane x/y will be + * identical. * * @param parent the parent camera that will use this distortion map * @param zDirection the direction of the focal plane Z-axis * (either 1 or -1) * */ - OsirisRexDistortionMap::OsirisRexDistortionMap(Camera *parent, double zDirection) + OsirisRexDistortionMap::OsirisRexDistortionMap(Camera *parent, double zDirection) : CameraDistortionMap(parent, zDirection) { m_detectorOriginSample = p_camera->FocalPlaneMap()->DetectorSampleOrigin(); @@ -61,7 +46,7 @@ namespace Isis { } - /** + /** * Load distortion coefficients and center-of-distortion for OCAMS * * This method loads the distortion coefficients from the instrument @@ -72,15 +57,15 @@ namespace Isis { * INS-64361_OD_K_FILTER = (2.21E-05, 1.71E-04, 5.96E-05, 0.00E+00, 0.00E+00) * INS-64361_OD_CENTER_FILTER = (486.2, 450.3) * @endcode - * + * * Or if the distortion is not filter-dependent: - * + * * @code * INS-64361_OD_K = (2.21E-05, 1.71E-04, 5.96E-05, 0.00E+00, 0.00E+00) * INS-64361_OD_CENTER = (486.2, 450.3) * @endcode - * - * + * + * * @param naifIkCode Code to search for in instrument kernel */ void OsirisRexDistortionMap::SetDistortion(int naifIkCode, QString filter="UNKNOWN") { @@ -98,29 +83,29 @@ namespace Isis { for (int i = 0; i < 5; ++i) { p_odk.push_back(p_camera->Spice::getDouble(odkkey, i)); } - } + } catch (IException &e) { // This means that this is an older image without a filter provided - // don't update p_odk, we will not apply the distortion in this case + // don't update p_odk, we will not apply the distortion in this case m_distortionOriginSample = -1; m_distortionOriginLine = -1; return; } // Load center-of-distortion coordinates, including filter if we have it - QString odcenterkey; + QString odcenterkey; if (filter.toUpper().compare("UNKNOWN") == 0) { odcenterkey = "INS" + toString(naifIkCode) + "_OD_CENTER"; } else { - odcenterkey = "INS" + toString(naifIkCode) + "_OD_CENTER_" + filter.trimmed().toUpper(); + odcenterkey = "INS" + toString(naifIkCode) + "_OD_CENTER_" + filter.trimmed().toUpper(); } m_distortionOriginSample = p_camera->Spice::getDouble(odcenterkey, 0); m_distortionOriginLine = p_camera->Spice::getDouble(odcenterkey, 1); } - /** + /** * Compute undistorted focal plane x/y * * Compute undistorted focal plane x/y given a distorted focal plane x/y. @@ -133,17 +118,17 @@ namespace Isis { * @return if the conversion was successful */ bool OsirisRexDistortionMap::SetFocalPlane(double dx, double dy) { - p_focalPlaneX = dx; + p_focalPlaneX = dx; p_focalPlaneY = dy; // Only apply the distortion if we have the correct number of coefficients if (p_odk.size() < 2) { p_undistortedFocalPlaneX = dx; p_undistortedFocalPlaneY = dy; - return true; + return true; } - double x0 = (m_distortionOriginLine - m_detectorOriginSample) * m_pixelPitch; + double x0 = (m_distortionOriginLine - m_detectorOriginSample) * m_pixelPitch; double y0 = (m_distortionOriginSample - m_detectorOriginLine) * m_pixelPitch; double xt = dx; @@ -169,7 +154,7 @@ namespace Isis { xx = (xt-x0) * (xt-x0); yy = (yt-y0) * (yt-y0); rr = xx + yy; - r = qSqrt(rr); + r = qSqrt(rr); rrr = rr * r; rrrr = rr * rr; @@ -204,11 +189,11 @@ namespace Isis { } - /** + /** * Compute distorted focal plane x/y * * Compute distorted focal plane x/y given an undistorted focal plane x/y. - * + * * After calling this method, you can obtain the distorted x/y via the * FocalPlaneX and FocalPlaneY methods * @@ -227,7 +212,7 @@ namespace Isis { if (p_odk.size() < 2) { p_focalPlaneX = ux; p_focalPlaneY = uy; - return true; + return true; } double x0 = (m_distortionOriginLine - m_detectorOriginSample) * m_pixelPitch; double y0 = (m_distortionOriginSample - m_detectorOriginLine) * m_pixelPitch; @@ -251,8 +236,7 @@ namespace Isis { double drOverR = p_odk[0] + p_odk[1]*r + p_odk[2]*r2 + p_odk[3]*r3 + p_odk[4]*r4; p_focalPlaneX = x + drOverR * (x-x0); - p_focalPlaneY = y + drOverR * (y-y0); + p_focalPlaneY = y + drOverR * (y-y0); return true; } } - diff --git a/isis/src/osirisrex/objs/OsirisRexOcamsCamera/OsirisRexDistortionMap.h b/isis/src/osirisrex/objs/OsirisRexOcamsCamera/OsirisRexDistortionMap.h index c8bdc0a1a1..613db94d8c 100644 --- a/isis/src/osirisrex/objs/OsirisRexOcamsCamera/OsirisRexDistortionMap.h +++ b/isis/src/osirisrex/objs/OsirisRexOcamsCamera/OsirisRexDistortionMap.h @@ -1,28 +1,14 @@ -/** - * @file - * $Revision: 1.3 $ - * $Date: 2008/02/21 16:04:33 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ #ifndef OsirisRexDistortionMap_h #define OsirisRexDistortionMap_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "CameraDistortionMap.h" namespace Isis { @@ -53,12 +39,12 @@ namespace Isis { virtual bool SetUndistortedFocalPlane(double ux, double uy); - protected: + protected: double m_pixelPitch; //!< The pixel pitch for OCAMS. double m_detectorOriginSample; //!< The origin of the detector's sample coordinate. double m_detectorOriginLine; //!< The origin of the detector's line coordinate. double m_distortionOriginSample; //!< The distortion's origin sample coordinate. - double m_distortionOriginLine; //!< The distortion's origin line coordinate. + double m_distortionOriginLine; //!< The distortion's origin line coordinate. }; }; #endif diff --git a/isis/src/osirisrex/objs/OsirisRexOcamsCamera/OsirisRexOcamsCamera.cpp b/isis/src/osirisrex/objs/OsirisRexOcamsCamera/OsirisRexOcamsCamera.cpp index 9e0c8001c8..cbfdd2c622 100644 --- a/isis/src/osirisrex/objs/OsirisRexOcamsCamera/OsirisRexOcamsCamera.cpp +++ b/isis/src/osirisrex/objs/OsirisRexOcamsCamera/OsirisRexOcamsCamera.cpp @@ -1,22 +1,10 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "OsirisRexOcamsCamera.h" diff --git a/isis/src/osirisrex/objs/OsirisRexOcamsCamera/OsirisRexOcamsCamera.h b/isis/src/osirisrex/objs/OsirisRexOcamsCamera/OsirisRexOcamsCamera.h index d006ab193f..0176134edc 100644 --- a/isis/src/osirisrex/objs/OsirisRexOcamsCamera/OsirisRexOcamsCamera.h +++ b/isis/src/osirisrex/objs/OsirisRexOcamsCamera/OsirisRexOcamsCamera.h @@ -1,24 +1,13 @@ #ifndef OsirisRexOcamsCamera_h #define OsirisRexOcamsCamera_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "FramingCamera.h" diff --git a/isis/src/osirisrex/objs/OsirisRexOcamsCamera/unitTest.cpp b/isis/src/osirisrex/objs/OsirisRexOcamsCamera/unitTest.cpp index 04ef4a3fe9..9eac678296 100644 --- a/isis/src/osirisrex/objs/OsirisRexOcamsCamera/unitTest.cpp +++ b/isis/src/osirisrex/objs/OsirisRexOcamsCamera/unitTest.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -192,4 +181,3 @@ void testLineSamp(Camera *cam, double samp, double line) { cout << "DeltaLine = NO INTERSECTION" << endl << endl; } } - diff --git a/isis/src/qisis/apps/cneteditor/CnetEditorWindow.cpp b/isis/src/qisis/apps/cneteditor/CnetEditorWindow.cpp index fec92f568a..0c1d478f01 100644 --- a/isis/src/qisis/apps/cneteditor/CnetEditorWindow.cpp +++ b/isis/src/qisis/apps/cneteditor/CnetEditorWindow.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "CnetEditorWindow.h" diff --git a/isis/src/qisis/apps/cneteditor/CnetEditorWindow.h b/isis/src/qisis/apps/cneteditor/CnetEditorWindow.h index dbd97a5e27..05c8fbbdf3 100644 --- a/isis/src/qisis/apps/cneteditor/CnetEditorWindow.h +++ b/isis/src/qisis/apps/cneteditor/CnetEditorWindow.h @@ -1,6 +1,14 @@ #ifndef CnetEditorWindow_H #define CnetEditorWindow_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include diff --git a/isis/src/qisis/apps/cneteditor/main.cpp b/isis/src/qisis/apps/cneteditor/main.cpp index 66ec01dbfb..ce2e3fc1e6 100644 --- a/isis/src/qisis/apps/cneteditor/main.cpp +++ b/isis/src/qisis/apps/cneteditor/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include @@ -19,4 +27,3 @@ int main(int argc, char ** argv) app.exec(); } - diff --git a/isis/src/qisis/apps/ipce/IpceMainWindow.cpp b/isis/src/qisis/apps/ipce/IpceMainWindow.cpp index c4ad55b7c4..cf1016d1d0 100644 --- a/isis/src/qisis/apps/ipce/IpceMainWindow.cpp +++ b/isis/src/qisis/apps/ipce/IpceMainWindow.cpp @@ -1,25 +1,11 @@ -/** - * @file - * $Revision: 1.19 $ - * $Date: 2010/03/22 19:44:53 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IpceMainWindow.h" #include @@ -188,7 +174,7 @@ namespace Isis { workorder->execute(); } } - + /** * This is connected from Directory's newWidgetAvailable signal diff --git a/isis/src/qisis/apps/ipce/IpceMainWindow.h b/isis/src/qisis/apps/ipce/IpceMainWindow.h index 4b74341aaf..48b953ff30 100644 --- a/isis/src/qisis/apps/ipce/IpceMainWindow.h +++ b/isis/src/qisis/apps/ipce/IpceMainWindow.h @@ -1,27 +1,13 @@ #ifndef IpceMainWindow_H #define IpceMainWindow_H -/** - * @file - * $Revision: 1.19 $ - * $Date: 2010/03/22 19:44:53 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "ViewSubWindow.h" #include diff --git a/isis/src/qisis/apps/ipce/ProgressWidget.cpp b/isis/src/qisis/apps/ipce/ProgressWidget.cpp index 08c264ae23..d9e8b74c97 100644 --- a/isis/src/qisis/apps/ipce/ProgressWidget.cpp +++ b/isis/src/qisis/apps/ipce/ProgressWidget.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "ProgressWidget.h" #include diff --git a/isis/src/qisis/apps/ipce/ProgressWidget.h b/isis/src/qisis/apps/ipce/ProgressWidget.h index 0e1ade1528..bc758f4f5a 100644 --- a/isis/src/qisis/apps/ipce/ProgressWidget.h +++ b/isis/src/qisis/apps/ipce/ProgressWidget.h @@ -1,6 +1,14 @@ #ifndef ProgressWidget_H #define ProgressWidget_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include namespace Isis { @@ -26,4 +34,3 @@ namespace Isis { } #endif - diff --git a/isis/src/qisis/apps/ipce/main.cpp b/isis/src/qisis/apps/ipce/main.cpp index 71d15134f7..7e5b780178 100644 --- a/isis/src/qisis/apps/ipce/main.cpp +++ b/isis/src/qisis/apps/ipce/main.cpp @@ -1,25 +1,11 @@ -/** - * @file - * $Revision: 1.19 $ - * $Date: 2010/03/22 19:44:53 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include diff --git a/isis/src/qisis/apps/qmos/main.cpp b/isis/src/qisis/apps/qmos/main.cpp index 2036d20443..f5804e4f44 100644 --- a/isis/src/qisis/apps/qmos/main.cpp +++ b/isis/src/qisis/apps/qmos/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include diff --git a/isis/src/qisis/apps/qnet/main.cpp b/isis/src/qisis/apps/qnet/main.cpp index 4340d02cd5..fbab28d22f 100644 --- a/isis/src/qisis/apps/qnet/main.cpp +++ b/isis/src/qisis/apps/qnet/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include diff --git a/isis/src/qisis/apps/qtie/QtieFileTool.cpp b/isis/src/qisis/apps/qtie/QtieFileTool.cpp index 82520d7687..0a756dd070 100644 --- a/isis/src/qisis/apps/qtie/QtieFileTool.cpp +++ b/isis/src/qisis/apps/qtie/QtieFileTool.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "QtieFileTool.h" #include @@ -42,7 +50,7 @@ namespace Isis { saveAction()->setEnabled(false); } - + /** * Open base image and image to be adjusted * @@ -56,7 +64,7 @@ namespace Isis { * network. * @history 2010-05-13 Tracie Sucharski - Use match cube directory to determine * default directory for cnet. - * @history 2012-05-10 Tracie Sucharski - The FileTool::closeAll method no longer + * @history 2012-05-10 Tracie Sucharski - The FileTool::closeAll method no longer * closes viewports, so re-implemented closing of old * cube viewports before opening new. * @@ -341,4 +349,4 @@ namespace Isis { } return true; } -} \ No newline at end of file +} diff --git a/isis/src/qisis/apps/qtie/QtieFileTool.h b/isis/src/qisis/apps/qtie/QtieFileTool.h index e0d7923f96..0022f8daf2 100644 --- a/isis/src/qisis/apps/qtie/QtieFileTool.h +++ b/isis/src/qisis/apps/qtie/QtieFileTool.h @@ -1,27 +1,14 @@ #ifndef QtieFileTool_h #define QtieFileTool_h -/** - * @file - * $Revision: 1.3 $ - * $Date: 2010/05/12 17:22:27 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "FileTool.h" @@ -40,15 +27,15 @@ namespace Isis { * @internal * @history 2009-06-10 Tracie Sucharski - Added new signal for opening new * files. - * @history 2012-05-10 Tracie Sucharski - The FileTool::closeAll method no longer + * @history 2012-05-10 Tracie Sucharski - The FileTool::closeAll method no longer * closes viewports, so re-implemented closing of old * cube viewports before opening new. - * @history 2012-05-15 Tracie Sucharski - Moved much of the error checking out of QtieTool into + * @history 2012-05-15 Tracie Sucharski - Moved much of the error checking out of QtieTool into * this class. Added new method, checkNet to perform error checking * of input control network. - * @history 2012-06-20 Debbie A. Cook, Updated Spice members to be more compliant with Isis + * @history 2012-06-20 Debbie A. Cook, Updated Spice members to be more compliant with Isis * coding standards. References #972. - * @history 2012-10-11 Debbie A. Cook, Updated to use new Target class. References Mantis tickets + * @history 2012-10-11 Debbie A. Cook, Updated to use new Target class. References Mantis tickets * #775 and #1114. * @history 2016-04-22 Jeannie Backer - Modified to use cube labels to set * ControlNet's target instead of the TargetName. @@ -73,7 +60,7 @@ namespace Isis { //virtual void exit(); private: - bool checkNet(Cube *baseCube, UniversalGroundMap *baseGM, + bool checkNet(Cube *baseCube, UniversalGroundMap *baseGM, Cube *matchCube, UniversalGroundMap *matchGM, ControlNet *cnet); }; diff --git a/isis/src/qisis/apps/qtie/QtieTool.cpp b/isis/src/qisis/apps/qtie/QtieTool.cpp index 239da5301b..adbbe4a75c 100644 --- a/isis/src/qisis/apps/qtie/QtieTool.cpp +++ b/isis/src/qisis/apps/qtie/QtieTool.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "QtieTool.h" #include @@ -250,9 +258,9 @@ namespace Isis { regMenu->addAction(templateFile); regMenu->addAction(viewTemplate); // registrationMenu->addAction(interestOp); - + p_whatsThis = new QAction(QIcon(FileName("$ISISROOT/appdata/images/icons/contexthelp.png").expanded()), - "&Whats's This", + "&Whats's This", p_tieTool); p_whatsThis->setShortcut(Qt::SHIFT | Qt::Key_F1); p_whatsThis->setToolTip("Activate What's This and click on items on " @@ -342,9 +350,9 @@ namespace Isis { * run on new files. * @history 2010-05-11 Tracie Sucharski - Moved the creation of control net * to the QtieFileTool::open. - * @history 2012-05-11 Tracie Sucharski - Delete cubes, A better solution- rewrite - * QtieFileTool::open , to pass in filenames only? - * + * @history 2012-05-11 Tracie Sucharski - Delete cubes, A better solution- rewrite + * QtieFileTool::open , to pass in filenames only? + * */ void QtieTool::clearFiles() { p_tieTool->setVisible(false); @@ -512,8 +520,8 @@ namespace Isis { * @history 2010-05-18 Jeannie Walldren - Modified Point ID * QInputDialog to return if "Cancel" * is clicked. - * @history 2012-05-10 Tracie Sucharski - If point doesn't exist on - * base map, return. + * @history 2012-05-10 Tracie Sucharski - If point doesn't exist on + * base map, return. */ void QtieTool::createPoint(double lat, double lon) { @@ -795,7 +803,7 @@ namespace Isis { // longitude sigma = 1000.0 // radius sigma = Null since we are not solving for radius // outlier rejection = false - settings->setSolveOptions(false, false, false, false, SurfacePoint::Latitudinal, + settings->setSolveOptions(false, false, false, false, SurfacePoint::Latitudinal, SurfacePoint::Latitudinal, 1000.0,1000.0, Isis::Null); //************************************************************************************************ QList observationSolveSettingsList; @@ -883,9 +891,9 @@ namespace Isis { message += errors; // message += "\n\nMaximum Error = " + QString::number(outNet.MaximumResiudal()); // message += "\nAverage Error = " + QString::number(outNet.AverageResidual()); - message += "\n\nMaximum Error = " + message += "\n\nMaximum Error = " + QString::number(outNet.GetMaximumResidual()); - message += "\nAverage Error = " + message += "\nAverage Error = " + QString::number(outNet.AverageResidual()); QMessageBox::warning((QWidget *)parent(), "Error", message); return; @@ -948,7 +956,7 @@ namespace Isis { */ void QtieTool::setTemplateFile() { - + QString filename = QFileDialog::getOpenFileName(p_tieTool, "Select a registration template", ".", "Registration template files (*.def *.pvl);;All files (*)"); diff --git a/isis/src/qisis/apps/qtie/QtieTool.h b/isis/src/qisis/apps/qtie/QtieTool.h index 7c03a1cf28..6c4b3ce5be 100644 --- a/isis/src/qisis/apps/qtie/QtieTool.h +++ b/isis/src/qisis/apps/qtie/QtieTool.h @@ -1,6 +1,14 @@ #ifndef QtieTool_h #define QtieTool_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include @@ -51,9 +59,9 @@ namespace Isis { * ControlPointEdit * @history 2012-05-10 Tracie Sucharski - Reset pointers to NULL, when creating * new control point, if doesn't exist on basemap, return. - * @history 2012-05-15 Tracie Sucharski - Moved much of the error checking out of this class + * @history 2012-05-15 Tracie Sucharski - Moved much of the error checking out of this class * and into the QtieFileTool class. - * @history 2012-06-20 Debbie A. Cook, Updated Spice members to be more compliant with Isis + * @history 2012-06-20 Debbie A. Cook, Updated Spice members to be more compliant with Isis * coding standards. References #972. * @history 2012-10-11 Debbie A. Cook, Updated to use new Target class. References Mantis * tickets #775 and #1114. diff --git a/isis/src/qisis/apps/qtie/main.cpp b/isis/src/qisis/apps/qtie/main.cpp index 004e928ad1..a6f6438a68 100644 --- a/isis/src/qisis/apps/qtie/main.cpp +++ b/isis/src/qisis/apps/qtie/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include diff --git a/isis/src/qisis/apps/qview/main.cpp b/isis/src/qisis/apps/qview/main.cpp index 5dcf578b49..b530acea1c 100644 --- a/isis/src/qisis/apps/qview/main.cpp +++ b/isis/src/qisis/apps/qview/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include diff --git a/isis/src/qisis/objs/AbstractPlotTool/AbstractPlotTool.cpp b/isis/src/qisis/objs/AbstractPlotTool/AbstractPlotTool.cpp index f853ca6970..662b21906e 100644 --- a/isis/src/qisis/objs/AbstractPlotTool/AbstractPlotTool.cpp +++ b/isis/src/qisis/objs/AbstractPlotTool/AbstractPlotTool.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "AbstractPlotTool.h" @@ -297,7 +305,7 @@ namespace Isis { connect(newPlotWindow, SIGNAL(closed()), newPlotWindow, SLOT(deleteLater())); - + QString originalTitle = newPlotWindow->windowTitle(); QString titleToTry = originalTitle; bool titleUsed = false; @@ -359,4 +367,3 @@ namespace Isis { } } } - diff --git a/isis/src/qisis/objs/AbstractPlotTool/AbstractPlotTool.h b/isis/src/qisis/objs/AbstractPlotTool/AbstractPlotTool.h index 9c445d81cd..b88b36a51f 100644 --- a/isis/src/qisis/objs/AbstractPlotTool/AbstractPlotTool.h +++ b/isis/src/qisis/objs/AbstractPlotTool/AbstractPlotTool.h @@ -1,6 +1,14 @@ #ifndef AbstractPlotTool_h #define AbstractPlotTool_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + // this should be the only include in this file! #include "Tool.h" @@ -20,7 +28,7 @@ namespace Isis { /** * @brief Parent class for plotting tools which provides common functionality * - * This qview tool is designed to be inherited from by tools which create + * This qview tool is designed to be inherited from by tools which create * plots. This class provides common functionality such as opening new * plot windows. * @@ -69,10 +77,10 @@ namespace Isis { QList plotWindows(); /** - * This will be called when the selected plot window changes. The - * existing curves need to be detached (forgotten, but not deleted). - * The curves are being detached between the previously selected window - * and the tool. + * This will be called when the selected plot window changes. The + * existing curves need to be detached (forgotten, but not deleted). + * The curves are being detached between the previously selected window + * and the tool. */ virtual void detachCurves() = 0; PlotWindow *selectedWindow(bool createIfNeeded = true); @@ -82,14 +90,13 @@ namespace Isis { private: /** - * This allows the user to select the active plot window. New curves - * will be drawn into this window. The items in the combo box store - * pointers to the windows themselves so we do not need an explicit list - * of plot windows. + * This allows the user to select the active plot window. New curves + * will be drawn into this window. The items in the combo box store + * pointers to the windows themselves so we do not need an explicit list + * of plot windows. */ QPointer m_selectWindowCombo; }; } #endif - diff --git a/isis/src/qisis/objs/AbstractProjectItemView/AbstractProjectItemView.cpp b/isis/src/qisis/objs/AbstractProjectItemView/AbstractProjectItemView.cpp index cf64f2908f..1d1e1d7c2d 100644 --- a/isis/src/qisis/objs/AbstractProjectItemView/AbstractProjectItemView.cpp +++ b/isis/src/qisis/objs/AbstractProjectItemView/AbstractProjectItemView.cpp @@ -1,25 +1,11 @@ -/** - * @file - * $Date$ - * $Revision$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "AbstractProjectItemView.h" #include diff --git a/isis/src/qisis/objs/AbstractProjectItemView/AbstractProjectItemView.h b/isis/src/qisis/objs/AbstractProjectItemView/AbstractProjectItemView.h index 99d0ead6aa..bf71be2638 100644 --- a/isis/src/qisis/objs/AbstractProjectItemView/AbstractProjectItemView.h +++ b/isis/src/qisis/objs/AbstractProjectItemView/AbstractProjectItemView.h @@ -1,27 +1,13 @@ #ifndef AbstractProjectItemView_h #define AbstractProjectItemView_h -/** - * @file - * $Date$ - * $Revision$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include diff --git a/isis/src/qisis/objs/AbstractProjectItemView/ProjectItemViewMenu.cpp b/isis/src/qisis/objs/AbstractProjectItemView/ProjectItemViewMenu.cpp index 73e7d5bcd8..4f0b707aa5 100644 --- a/isis/src/qisis/objs/AbstractProjectItemView/ProjectItemViewMenu.cpp +++ b/isis/src/qisis/objs/AbstractProjectItemView/ProjectItemViewMenu.cpp @@ -1,25 +1,11 @@ -/** - * @file - * $Date$ - * $Revision$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "ProjectItemViewMenu.h" namespace Isis { diff --git a/isis/src/qisis/objs/AbstractProjectItemView/ProjectItemViewMenu.h b/isis/src/qisis/objs/AbstractProjectItemView/ProjectItemViewMenu.h index 50b7979b8f..9e7a0a6aad 100644 --- a/isis/src/qisis/objs/AbstractProjectItemView/ProjectItemViewMenu.h +++ b/isis/src/qisis/objs/AbstractProjectItemView/ProjectItemViewMenu.h @@ -1,27 +1,13 @@ #ifndef ProjectItemViewMenu_h #define ProjectItemViewMenu_h -/** - * @file - * $Date$ - * $Revision$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include diff --git a/isis/src/qisis/objs/AdvancedTrackTool/AdvancedTrackTool.cpp b/isis/src/qisis/objs/AdvancedTrackTool/AdvancedTrackTool.cpp index 6f3c5baad2..1344583d72 100644 --- a/isis/src/qisis/objs/AdvancedTrackTool/AdvancedTrackTool.cpp +++ b/isis/src/qisis/objs/AdvancedTrackTool/AdvancedTrackTool.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "AdvancedTrackTool.h" #include diff --git a/isis/src/qisis/objs/AdvancedTrackTool/AdvancedTrackTool.h b/isis/src/qisis/objs/AdvancedTrackTool/AdvancedTrackTool.h index b0a1f41401..0d4a89f165 100644 --- a/isis/src/qisis/objs/AdvancedTrackTool/AdvancedTrackTool.h +++ b/isis/src/qisis/objs/AdvancedTrackTool/AdvancedTrackTool.h @@ -1,26 +1,13 @@ #ifndef Qisis_AdvancedTrackTool_h #define Qisis_AdvancedTrackTool_h -/** - * @file - * $Revision: 1.18 $ - * $Date: 2010/06/28 08:47:51 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ // The only includes allowed in this file are the direct parents of this class! #include "Tool.h" @@ -98,7 +85,7 @@ namespace Isis { * @history 2019-04-22 Kaitlyn Lee - Added column for oblique pixel resolution. Added * checkBoxItems and loop to add elments to the AdvancedTrackTool, * instead of hardcoded method calls. Instead of using the enum, - * added a method getIndex() that calculates what column the + * added a method getIndex() that calculates what column the * element should be added to. Fixes #2205. */ class AdvancedTrackTool : public Tool { diff --git a/isis/src/qisis/objs/BandSpinBox/BandSpinBox.cpp b/isis/src/qisis/objs/BandSpinBox/BandSpinBox.cpp index 4fff0158c1..1dc27b68d7 100644 --- a/isis/src/qisis/objs/BandSpinBox/BandSpinBox.cpp +++ b/isis/src/qisis/objs/BandSpinBox/BandSpinBox.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include "BandSpinBox.h" diff --git a/isis/src/qisis/objs/BandSpinBox/BandSpinBox.h b/isis/src/qisis/objs/BandSpinBox/BandSpinBox.h index 50464af65f..2262007a8f 100644 --- a/isis/src/qisis/objs/BandSpinBox/BandSpinBox.h +++ b/isis/src/qisis/objs/BandSpinBox/BandSpinBox.h @@ -1,6 +1,14 @@ #ifndef BandSpinBox_h #define BandSpinBox_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include diff --git a/isis/src/qisis/objs/BandTool/BandTool.cpp b/isis/src/qisis/objs/BandTool/BandTool.cpp index 52f4561823..0f1ac78b32 100644 --- a/isis/src/qisis/objs/BandTool/BandTool.cpp +++ b/isis/src/qisis/objs/BandTool/BandTool.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "BandTool.h" #include @@ -248,7 +256,7 @@ namespace Isis { * This method fills the p_comboBox with the keywords from the * band bin group of the currently selected cube. If the current * cube viewport doesn't have a currently chosen value for the - * p_comboBox, then 'Center' is chosen as the default. + * p_comboBox, then 'Center' is chosen as the default. * * @param pvl */ diff --git a/isis/src/qisis/objs/BandTool/BandTool.h b/isis/src/qisis/objs/BandTool/BandTool.h index 783caa712f..9e31b3f2a2 100644 --- a/isis/src/qisis/objs/BandTool/BandTool.h +++ b/isis/src/qisis/objs/BandTool/BandTool.h @@ -1,6 +1,14 @@ #ifndef BandTool_h #define BandTool_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Tool.h" // FIXME: remove this include diff --git a/isis/src/qisis/objs/BlinkTool/BlinkTool.cpp b/isis/src/qisis/objs/BlinkTool/BlinkTool.cpp index 745dac3ca5..068b562deb 100644 --- a/isis/src/qisis/objs/BlinkTool/BlinkTool.cpp +++ b/isis/src/qisis/objs/BlinkTool/BlinkTool.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "BlinkTool.h" #include "FileName.h" diff --git a/isis/src/qisis/objs/BlinkTool/BlinkTool.h b/isis/src/qisis/objs/BlinkTool/BlinkTool.h index 3688e388a7..6f92bcc6e6 100644 --- a/isis/src/qisis/objs/BlinkTool/BlinkTool.h +++ b/isis/src/qisis/objs/BlinkTool/BlinkTool.h @@ -1,6 +1,14 @@ #ifndef BlinkTool_h #define BlinkTool_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + // This is the only include allowed in this file! #include "Tool.h" @@ -42,7 +50,7 @@ namespace Isis { QString menuName() const { return "&Options"; }; - + protected: void updateTool(); bool eventFilter(QObject *o, QEvent *e); @@ -68,4 +76,3 @@ namespace Isis { }; #endif - diff --git a/isis/src/qisis/objs/BrowseDialog/BrowseDialog.cpp b/isis/src/qisis/objs/BrowseDialog/BrowseDialog.cpp index c41173b47a..0f97eaf372 100644 --- a/isis/src/qisis/objs/BrowseDialog/BrowseDialog.cpp +++ b/isis/src/qisis/objs/BrowseDialog/BrowseDialog.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "BrowseDialog.h" #include @@ -73,4 +81,3 @@ namespace Isis { } } - diff --git a/isis/src/qisis/objs/BrowseDialog/BrowseDialog.h b/isis/src/qisis/objs/BrowseDialog/BrowseDialog.h index 739a74b994..97e7287810 100644 --- a/isis/src/qisis/objs/BrowseDialog/BrowseDialog.h +++ b/isis/src/qisis/objs/BrowseDialog/BrowseDialog.h @@ -1,6 +1,14 @@ #ifndef BrowseDialog_h #define BrowseDialog_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "FileDialog.h" namespace Isis { diff --git a/isis/src/qisis/objs/BundleObservationView/BundleObservationView.cpp b/isis/src/qisis/objs/BundleObservationView/BundleObservationView.cpp index ebbd350b23..83ce7f21fd 100755 --- a/isis/src/qisis/objs/BundleObservationView/BundleObservationView.cpp +++ b/isis/src/qisis/objs/BundleObservationView/BundleObservationView.cpp @@ -1,23 +1,10 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "BundleObservationView.h" diff --git a/isis/src/qisis/objs/BundleObservationView/BundleObservationView.h b/isis/src/qisis/objs/BundleObservationView/BundleObservationView.h index 30cf4fd63e..56252f0887 100755 --- a/isis/src/qisis/objs/BundleObservationView/BundleObservationView.h +++ b/isis/src/qisis/objs/BundleObservationView/BundleObservationView.h @@ -1,25 +1,13 @@ #ifndef BundleObservationView_h #define BundleObservationView_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "AbstractProjectItemView.h" #include "FileItem.h" diff --git a/isis/src/qisis/objs/ChipViewport/ChipViewport.cpp b/isis/src/qisis/objs/ChipViewport/ChipViewport.cpp index 55bd64abc0..24e6b82cfc 100644 --- a/isis/src/qisis/objs/ChipViewport/ChipViewport.cpp +++ b/isis/src/qisis/objs/ChipViewport/ChipViewport.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "ChipViewport.h" @@ -136,7 +144,7 @@ namespace Isis { * * @param newStretch Pointer to the new stretch to apply * @param cvp Pointer to the cube viewport to apply the stretch to - */ + */ void ChipViewport::stretchFromCubeViewport(Stretch *newStretch, CubeViewport *cvp) { ASSERT(cvp != NULL); @@ -168,8 +176,8 @@ namespace Isis { /** * Locks or unlocks the stretch on the chip viewport during transformations (zoom, pan, etc.) - * - * @param newStatus Non-zero locks the stretch + * + * @param newStatus Non-zero locks the stretch */ void ChipViewport::changeStretchLock(int newStatus) { if (newStatus == 0) @@ -326,7 +334,7 @@ namespace Isis { } - /** + /** * Load with info from given ChipViewport * * @param newView The chip viewport to load from @@ -385,7 +393,7 @@ namespace Isis { } - /** + /** * Pan left */ void ChipViewport::panLeft() { @@ -604,8 +612,8 @@ namespace Isis { * Slot to geom chip (apply geometry transformation) * * @param matchChip The matching chip for the geometry - * @param matchChipCube The matching chip's cube for the geometry - * + * @param matchChipCube The matching chip's cube for the geometry + * * @internal * @history 2010-06-16 Jeannie Walldren - Catch possible iException from Chip's * Load() method and display in QMessageBox @@ -633,7 +641,7 @@ namespace Isis { /** * Slot to un-geom chip (revert geometry transformation) - * + * * @internal * @history 2010-06-16 Jeannie Walldren - Catch possible iException from Chip's * Load() method and display in QMessageBox diff --git a/isis/src/qisis/objs/ChipViewport/ChipViewport.h b/isis/src/qisis/objs/ChipViewport/ChipViewport.h index f68c8959cc..28bb765381 100644 --- a/isis/src/qisis/objs/ChipViewport/ChipViewport.h +++ b/isis/src/qisis/objs/ChipViewport/ChipViewport.h @@ -1,27 +1,13 @@ #ifndef ChipViewport_h #define ChipViewport_h -/** - * @file - * $Revision: 1.6 $ - * $Date: 2010/06/17 00:08:45 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include @@ -63,16 +49,16 @@ namespace Isis { * @history 2010-12-01 Eric Hyer - Added stretch locking * @history 2011-06-07 Debbie A. Cook and Tracie Sucharski - Changed point * type "Ground" to "Fixed". - * @history 2011-06-14 Tracie Sucharski - Added mouseClick signal. Qnet + * @history 2011-06-14 Tracie Sucharski - Added mouseClick signal. Qnet * needed to know if user moved the tackpoint vs. * simply loading a new chip, or geoming the chip. - * @history 2011-06-15 Tracie Sucharski - Changed signal mouseClick to + * @history 2011-06-15 Tracie Sucharski - Changed signal mouseClick to * userMovedTackPoint. * //TODO Could not use tackPointChanged signal * because that signal is emitted whenever the * measure is loaded not just when the user * initiates the move. This should be cleaned up. - * @history 2011-09-14 Tracie Sucharski - Added user option to determine + * @history 2011-09-14 Tracie Sucharski - Added user option to determine * whether control points are drawn. * @history 2012-07-26 Tracie Sucharski - Added method to return zoom factor and * slot to zoom to a specific zoom factor. @@ -250,7 +236,7 @@ namespace Isis { // that either NULL or a valid ControlNet is being pointed to). ControlNet *m_controlNet; - bool m_stretchLocked; //!< Whether or not to lock the stretch when transforming + bool m_stretchLocked; //!< Whether or not to lock the stretch when transforming Stretch *m_stretch; //!< Current stretch on the chip viewport }; }; diff --git a/isis/src/qisis/objs/ChipViewportsWidget/ChipViewportsWidget.cpp b/isis/src/qisis/objs/ChipViewportsWidget/ChipViewportsWidget.cpp index c5b35a7479..8b7a4fde09 100644 --- a/isis/src/qisis/objs/ChipViewportsWidget/ChipViewportsWidget.cpp +++ b/isis/src/qisis/objs/ChipViewportsWidget/ChipViewportsWidget.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "ChipViewportsWidget.h" @@ -151,11 +159,11 @@ namespace Isis { /** * New control network being edited * - * @param cnet ControlNet * - * @param filename Qstring, Need filename to write to widget label. ControlNet doesn't - * contain a filename. + * @param cnet ControlNet * + * @param filename Qstring, Need filename to write to widget label. ControlNet doesn't + * contain a filename. * @internal - */ + */ void ChipViewportsWidget::setControlNet(ControlNet *cnet, QString cnetFilename) { // qDebug()<<"ChipViewportsWidget::setControlNet cnet = "< @@ -30,7 +38,7 @@ namespace Isis { * * @author 2016-06-15 Tracie Sucharski * - * @internal + * @internal */ class ChipViewportsWidget : public QWidget { Q_OBJECT diff --git a/isis/src/qisis/objs/CnetEditorView/CnetEditorView.cpp b/isis/src/qisis/objs/CnetEditorView/CnetEditorView.cpp index 38e02045a5..f47aac6bdb 100644 --- a/isis/src/qisis/objs/CnetEditorView/CnetEditorView.cpp +++ b/isis/src/qisis/objs/CnetEditorView/CnetEditorView.cpp @@ -1,25 +1,11 @@ -/** - * @file - * $Date$ - * $Revision$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "CnetEditorView.h" diff --git a/isis/src/qisis/objs/CnetEditorView/CnetEditorView.h b/isis/src/qisis/objs/CnetEditorView/CnetEditorView.h index f7a2ba860e..73a67a98d9 100644 --- a/isis/src/qisis/objs/CnetEditorView/CnetEditorView.h +++ b/isis/src/qisis/objs/CnetEditorView/CnetEditorView.h @@ -1,27 +1,14 @@ #ifndef CnetEditorView_h #define CnetEditorView_h -/** - * @file - * $Date$ - * $Revision$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/APrioriLatitudeFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/APrioriLatitudeFilter.cpp index fc6e609932..d53301de92 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/APrioriLatitudeFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/APrioriLatitudeFilter.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "APrioriLatitudeFilter.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/APrioriLatitudeFilter.h b/isis/src/qisis/objs/CnetEditorWidget/APrioriLatitudeFilter.h index e091fd5fc5..225979ba61 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/APrioriLatitudeFilter.h +++ b/isis/src/qisis/objs/CnetEditorWidget/APrioriLatitudeFilter.h @@ -1,6 +1,14 @@ #ifndef APrioriLatitudeFilter_H #define APrioriLatitudeFilter_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "AbstractNumberFilter.h" template< typename U, typename V > struct QPair; diff --git a/isis/src/qisis/objs/CnetEditorWidget/APrioriLatitudeSigmaFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/APrioriLatitudeSigmaFilter.cpp index c11b94ddf6..90cb9e22a4 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/APrioriLatitudeSigmaFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/APrioriLatitudeSigmaFilter.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "APrioriLatitudeSigmaFilter.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/APrioriLatitudeSigmaFilter.h b/isis/src/qisis/objs/CnetEditorWidget/APrioriLatitudeSigmaFilter.h index f9e3487e79..6bfa846229 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/APrioriLatitudeSigmaFilter.h +++ b/isis/src/qisis/objs/CnetEditorWidget/APrioriLatitudeSigmaFilter.h @@ -1,6 +1,14 @@ #ifndef APrioriLatitudeSigmaFilter_H #define APrioriLatitudeSigmaFilter_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "AbstractNumberFilter.h" template< typename U, typename V > struct QPair; diff --git a/isis/src/qisis/objs/CnetEditorWidget/APrioriLongitudeFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/APrioriLongitudeFilter.cpp index e72c25104a..56ce1a1579 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/APrioriLongitudeFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/APrioriLongitudeFilter.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "APrioriLongitudeFilter.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/APrioriLongitudeFilter.h b/isis/src/qisis/objs/CnetEditorWidget/APrioriLongitudeFilter.h index c7fff3bedb..6b6f7b0c96 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/APrioriLongitudeFilter.h +++ b/isis/src/qisis/objs/CnetEditorWidget/APrioriLongitudeFilter.h @@ -1,6 +1,14 @@ #ifndef APrioriLongitudeFilter_H #define APrioriLongitudeFilter_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "AbstractNumberFilter.h" template< typename U, typename V > struct QPair; diff --git a/isis/src/qisis/objs/CnetEditorWidget/APrioriLongitudeSigmaFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/APrioriLongitudeSigmaFilter.cpp index d692e09916..57b62f73fa 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/APrioriLongitudeSigmaFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/APrioriLongitudeSigmaFilter.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "APrioriLongitudeSigmaFilter.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/APrioriLongitudeSigmaFilter.h b/isis/src/qisis/objs/CnetEditorWidget/APrioriLongitudeSigmaFilter.h index 66938c2f1a..a8a56e6b1f 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/APrioriLongitudeSigmaFilter.h +++ b/isis/src/qisis/objs/CnetEditorWidget/APrioriLongitudeSigmaFilter.h @@ -1,6 +1,14 @@ #ifndef APrioriLongitudeSigmaFilter_H #define APrioriLongitudeSigmaFilter_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "AbstractNumberFilter.h" template< typename U, typename V > struct QPair; diff --git a/isis/src/qisis/objs/CnetEditorWidget/APrioriRadiusFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/APrioriRadiusFilter.cpp index c98beea0b0..ae3cb0c96f 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/APrioriRadiusFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/APrioriRadiusFilter.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "APrioriRadiusFilter.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/APrioriRadiusFilter.h b/isis/src/qisis/objs/CnetEditorWidget/APrioriRadiusFilter.h index 246965d11f..5e0a6b0bfe 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/APrioriRadiusFilter.h +++ b/isis/src/qisis/objs/CnetEditorWidget/APrioriRadiusFilter.h @@ -1,6 +1,14 @@ #ifndef APrioriRadiusFilter_H #define APrioriRadiusFilter_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "AbstractNumberFilter.h" template< typename U, typename V > struct QPair; diff --git a/isis/src/qisis/objs/CnetEditorWidget/APrioriRadiusSigmaFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/APrioriRadiusSigmaFilter.cpp index 802c953f3b..fcb22dc153 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/APrioriRadiusSigmaFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/APrioriRadiusSigmaFilter.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "APrioriRadiusSigmaFilter.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/APrioriRadiusSigmaFilter.h b/isis/src/qisis/objs/CnetEditorWidget/APrioriRadiusSigmaFilter.h index 912d42bdcb..6e0ee58fa9 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/APrioriRadiusSigmaFilter.h +++ b/isis/src/qisis/objs/CnetEditorWidget/APrioriRadiusSigmaFilter.h @@ -1,6 +1,14 @@ #ifndef APrioriRadiusSigmaFilter_H #define APrioriRadiusSigmaFilter_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "AbstractNumberFilter.h" template< typename U, typename V > struct QPair; diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/AbstractFilter.cpp index 79d3f44aec..ede813b5dc 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AbstractFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractFilter.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractFilter.h b/isis/src/qisis/objs/CnetEditorWidget/AbstractFilter.h index f148d632c3..41aa0f150a 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AbstractFilter.h +++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractFilter.h @@ -1,6 +1,14 @@ #ifndef AbstractFilter_H #define AbstractFilter_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include class QBoxLayout; diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractFilterSelector.cpp b/isis/src/qisis/objs/CnetEditorWidget/AbstractFilterSelector.cpp index 13a28806b7..77fcd78cd9 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AbstractFilterSelector.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractFilterSelector.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "AbstractFilterSelector.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractFilterSelector.h b/isis/src/qisis/objs/CnetEditorWidget/AbstractFilterSelector.h index 9f7d468cd3..38ab4332fa 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AbstractFilterSelector.h +++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractFilterSelector.h @@ -1,6 +1,14 @@ #ifndef AbstractFilterSelector_H #define AbstractFilterSelector_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + // parent #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractImageItem.cpp b/isis/src/qisis/objs/CnetEditorWidget/AbstractImageItem.cpp index 2e12f4b25b..4b41f7f281 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AbstractImageItem.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractImageItem.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "AbstractImageItem.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractImageItem.h b/isis/src/qisis/objs/CnetEditorWidget/AbstractImageItem.h index d14fe1ecd5..50507583d2 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AbstractImageItem.h +++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractImageItem.h @@ -1,6 +1,13 @@ #ifndef AbstractImageItem_H #define AbstractImageItem_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "AbstractTreeItem.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractLeafItem.cpp b/isis/src/qisis/objs/CnetEditorWidget/AbstractLeafItem.cpp index 74c3a17f91..debe552b9b 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AbstractLeafItem.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractLeafItem.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "AbstractLeafItem.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractLeafItem.h b/isis/src/qisis/objs/CnetEditorWidget/AbstractLeafItem.h index dc6977bd95..3cc735bff2 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AbstractLeafItem.h +++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractLeafItem.h @@ -1,6 +1,13 @@ #ifndef AbstractLeafItem_H #define AbstractLeafItem_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "AbstractTreeItem.h" @@ -18,8 +25,8 @@ namespace Isis { * * @author ????-??-?? Eric Hyer * - * @internal - * @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054. + * @internal + * @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054. */ class AbstractLeafItem : public virtual AbstractTreeItem { public: diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractMeasureItem.cpp b/isis/src/qisis/objs/CnetEditorWidget/AbstractMeasureItem.cpp index 883d967fd4..941b33a0aa 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AbstractMeasureItem.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractMeasureItem.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "AbstractMeasureItem.h" @@ -416,4 +424,3 @@ namespace Isis { } } } - diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractMeasureItem.h b/isis/src/qisis/objs/CnetEditorWidget/AbstractMeasureItem.h index d18899855d..b08e919a49 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AbstractMeasureItem.h +++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractMeasureItem.h @@ -1,6 +1,14 @@ #ifndef AbstractMeasureItem_H #define AbstractMeasureItem_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "AbstractTreeItem.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractMultipleChoiceFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/AbstractMultipleChoiceFilter.cpp index 2c14883dd5..805e8740b8 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AbstractMultipleChoiceFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractMultipleChoiceFilter.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "AbstractMultipleChoiceFilter.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractMultipleChoiceFilter.h b/isis/src/qisis/objs/CnetEditorWidget/AbstractMultipleChoiceFilter.h index c5103cafcd..75a5007124 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AbstractMultipleChoiceFilter.h +++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractMultipleChoiceFilter.h @@ -1,6 +1,13 @@ #ifndef AbstractMultipleChoiceFilter_H #define AbstractMultipleChoiceFilter_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ // parent #include "AbstractFilter.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractNullDataItem.cpp b/isis/src/qisis/objs/CnetEditorWidget/AbstractNullDataItem.cpp index a1749e9fcb..a76ad39c86 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AbstractNullDataItem.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractNullDataItem.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "AbstractNullDataItem.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractNullDataItem.h b/isis/src/qisis/objs/CnetEditorWidget/AbstractNullDataItem.h index 57bc4869b8..bbaf666791 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AbstractNullDataItem.h +++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractNullDataItem.h @@ -1,6 +1,13 @@ #ifndef AbstractNullDataItem_H #define AbstractNullDataItem_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "AbstractTreeItem.h" @@ -19,8 +26,8 @@ namespace Isis { * * @author ????-??-?? Eric Hyer * - * @internal - * @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054. + * @internal + * @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054. */ class AbstractNullDataItem : public virtual AbstractTreeItem { Q_OBJECT diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractNumberFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/AbstractNumberFilter.cpp index c542028d2f..309f60dfde 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AbstractNumberFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractNumberFilter.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "AbstractNumberFilter.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractNumberFilter.h b/isis/src/qisis/objs/CnetEditorWidget/AbstractNumberFilter.h index 0b86eba5ed..85b0468808 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AbstractNumberFilter.h +++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractNumberFilter.h @@ -1,6 +1,13 @@ #ifndef AbstractNumberFilter_H #define AbstractNumberFilter_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ // parent #include "AbstractFilter.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractParentItem.cpp b/isis/src/qisis/objs/CnetEditorWidget/AbstractParentItem.cpp index fb71ff87a0..0f8b16a59c 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AbstractParentItem.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractParentItem.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "AbstractParentItem.h" @@ -110,4 +118,3 @@ namespace Isis { m_lastVisibleChild = child; } } - diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractParentItem.h b/isis/src/qisis/objs/CnetEditorWidget/AbstractParentItem.h index 8b1614765a..4742efd796 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AbstractParentItem.h +++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractParentItem.h @@ -1,6 +1,13 @@ #ifndef AbstractParentItem_H #define AbstractParentItem_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "AbstractTreeItem.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractPointItem.cpp b/isis/src/qisis/objs/CnetEditorWidget/AbstractPointItem.cpp index fee107c790..2c03482b21 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AbstractPointItem.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractPointItem.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "AbstractPointItem.h" @@ -559,4 +567,3 @@ namespace Isis { return surfacePoint; } } - diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractPointItem.h b/isis/src/qisis/objs/CnetEditorWidget/AbstractPointItem.h index e20fef0ffc..32dcfac499 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AbstractPointItem.h +++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractPointItem.h @@ -1,6 +1,14 @@ #ifndef AbstractPointItem_H #define AbstractPointItem_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "AbstractTreeItem.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractStringFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/AbstractStringFilter.cpp index bd11a847bd..fee54ba1e2 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AbstractStringFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractStringFilter.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "AbstractStringFilter.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractStringFilter.h b/isis/src/qisis/objs/CnetEditorWidget/AbstractStringFilter.h index e7f2f12c26..521a207818 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AbstractStringFilter.h +++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractStringFilter.h @@ -1,6 +1,14 @@ #ifndef AbstractStringFilter_H #define AbstractStringFilter_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "AbstractFilter.h" class QLineEdit; diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractTableDelegate.cpp b/isis/src/qisis/objs/CnetEditorWidget/AbstractTableDelegate.cpp index 5c8cb5a98f..f2e02ba42c 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AbstractTableDelegate.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractTableDelegate.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "AbstractTableDelegate.h" namespace Isis { @@ -8,4 +16,3 @@ namespace Isis { AbstractTableDelegate::~AbstractTableDelegate() { } } - diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractTableDelegate.h b/isis/src/qisis/objs/CnetEditorWidget/AbstractTableDelegate.h index 77a0301592..880045c694 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AbstractTableDelegate.h +++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractTableDelegate.h @@ -1,6 +1,14 @@ #ifndef AbstractTableDelegate_H #define AbstractTableDelegate_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include class QString; @@ -19,8 +27,8 @@ namespace Isis { * * @author ????-??-?? Eric Hyer * - * @internal - * @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054. + * @internal + * @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054. */ class AbstractTableDelegate : public QObject { Q_OBJECT @@ -46,4 +54,3 @@ namespace Isis { } #endif - diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractTableModel.cpp b/isis/src/qisis/objs/CnetEditorWidget/AbstractTableModel.cpp index 35a401a736..04c997ce08 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AbstractTableModel.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractTableModel.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include @@ -575,4 +583,3 @@ namespace Isis { return m_interruptFlag != 0; } } - diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractTableModel.h b/isis/src/qisis/objs/CnetEditorWidget/AbstractTableModel.h index 255c60fd11..d8cf1767e6 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AbstractTableModel.h +++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractTableModel.h @@ -1,6 +1,14 @@ #ifndef AbstractTableModel_H #define AbstractTableModel_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractTreeItem.cpp b/isis/src/qisis/objs/CnetEditorWidget/AbstractTreeItem.cpp index 02b48829c4..62e4c3bd1f 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AbstractTreeItem.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractTreeItem.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "AbstractTreeItem.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractTreeItem.h b/isis/src/qisis/objs/CnetEditorWidget/AbstractTreeItem.h index 0bf13463a5..ce438197cd 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AbstractTreeItem.h +++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractTreeItem.h @@ -1,6 +1,14 @@ #ifndef AbstractTreeItem_H #define AbstractTreeItem_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include class QFontMetrics; diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractTreeModel.cpp b/isis/src/qisis/objs/CnetEditorWidget/AbstractTreeModel.cpp index a199891bf3..b13be72e96 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AbstractTreeModel.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractTreeModel.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "AbstractTreeModel.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractTreeModel.h b/isis/src/qisis/objs/CnetEditorWidget/AbstractTreeModel.h index ffaed46290..191952fcf2 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AbstractTreeModel.h +++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractTreeModel.h @@ -1,6 +1,14 @@ #ifndef AbstractTreeModel_H #define AbstractTreeModel_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/AdjustedLatitudeFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/AdjustedLatitudeFilter.cpp index 79b2bcaec0..09fc929752 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AdjustedLatitudeFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/AdjustedLatitudeFilter.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "AdjustedLatitudeFilter.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/AdjustedLatitudeFilter.h b/isis/src/qisis/objs/CnetEditorWidget/AdjustedLatitudeFilter.h index ff593be852..2b1fa5c67c 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AdjustedLatitudeFilter.h +++ b/isis/src/qisis/objs/CnetEditorWidget/AdjustedLatitudeFilter.h @@ -1,6 +1,14 @@ #ifndef AdjustedLatitudeFilter_H #define AdjustedLatitudeFilter_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "AbstractNumberFilter.h" template< typename U, typename V > struct QPair; diff --git a/isis/src/qisis/objs/CnetEditorWidget/AdjustedLatitudeSigmaFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/AdjustedLatitudeSigmaFilter.cpp index 5d43155d3e..1d0288b5da 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AdjustedLatitudeSigmaFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/AdjustedLatitudeSigmaFilter.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "AdjustedLatitudeSigmaFilter.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/AdjustedLatitudeSigmaFilter.h b/isis/src/qisis/objs/CnetEditorWidget/AdjustedLatitudeSigmaFilter.h index 51b6e9a59a..b64afec72e 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AdjustedLatitudeSigmaFilter.h +++ b/isis/src/qisis/objs/CnetEditorWidget/AdjustedLatitudeSigmaFilter.h @@ -1,6 +1,14 @@ #ifndef AdjustedLatitudeSigmaFilter_H #define AdjustedLatitudeSigmaFilter_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "AbstractNumberFilter.h" template< typename U, typename V > struct QPair; diff --git a/isis/src/qisis/objs/CnetEditorWidget/AdjustedLongitudeFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/AdjustedLongitudeFilter.cpp index 0f330ac0b2..5053171352 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AdjustedLongitudeFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/AdjustedLongitudeFilter.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "AdjustedLongitudeFilter.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/AdjustedLongitudeFilter.h b/isis/src/qisis/objs/CnetEditorWidget/AdjustedLongitudeFilter.h index c5f3abf2b5..503e1c7de3 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AdjustedLongitudeFilter.h +++ b/isis/src/qisis/objs/CnetEditorWidget/AdjustedLongitudeFilter.h @@ -1,6 +1,14 @@ #ifndef AdjustedLongitudeFilter_H #define AdjustedLongitudeFilter_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "AbstractNumberFilter.h" template< typename U, typename V > struct QPair; diff --git a/isis/src/qisis/objs/CnetEditorWidget/AdjustedLongitudeSigmaFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/AdjustedLongitudeSigmaFilter.cpp index b8657441a5..b0b5e92dff 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AdjustedLongitudeSigmaFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/AdjustedLongitudeSigmaFilter.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "AdjustedLongitudeSigmaFilter.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/AdjustedLongitudeSigmaFilter.h b/isis/src/qisis/objs/CnetEditorWidget/AdjustedLongitudeSigmaFilter.h index 35d4b2748c..eb971cf026 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AdjustedLongitudeSigmaFilter.h +++ b/isis/src/qisis/objs/CnetEditorWidget/AdjustedLongitudeSigmaFilter.h @@ -1,6 +1,14 @@ #ifndef AdjustedLongitudeSigmaFilter_H #define AdjustedLongitudeSigmaFilter_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "AbstractNumberFilter.h" template< typename U, typename V > struct QPair; diff --git a/isis/src/qisis/objs/CnetEditorWidget/AdjustedRadiusFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/AdjustedRadiusFilter.cpp index b6c9d9c5bc..21df29e4b7 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AdjustedRadiusFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/AdjustedRadiusFilter.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "AdjustedRadiusFilter.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/AdjustedRadiusFilter.h b/isis/src/qisis/objs/CnetEditorWidget/AdjustedRadiusFilter.h index 06ec01d6c8..377ed3e171 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AdjustedRadiusFilter.h +++ b/isis/src/qisis/objs/CnetEditorWidget/AdjustedRadiusFilter.h @@ -1,6 +1,14 @@ #ifndef AdjustedRadiusFilter_H #define AdjustedRadiusFilter_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "AbstractNumberFilter.h" template< typename U, typename V > struct QPair; diff --git a/isis/src/qisis/objs/CnetEditorWidget/AdjustedRadiusSigmaFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/AdjustedRadiusSigmaFilter.cpp index 034991a404..d6721c4198 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AdjustedRadiusSigmaFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/AdjustedRadiusSigmaFilter.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "AdjustedRadiusSigmaFilter.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/AdjustedRadiusSigmaFilter.h b/isis/src/qisis/objs/CnetEditorWidget/AdjustedRadiusSigmaFilter.h index 563417aea3..0403a1b4c7 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AdjustedRadiusSigmaFilter.h +++ b/isis/src/qisis/objs/CnetEditorWidget/AdjustedRadiusSigmaFilter.h @@ -1,6 +1,14 @@ #ifndef AdjustedRadiusSigmaFilter_H #define AdjustedRadiusSigmaFilter_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "AbstractNumberFilter.h" template< typename U, typename V > struct QPair; diff --git a/isis/src/qisis/objs/CnetEditorWidget/BusyLeafItem.cpp b/isis/src/qisis/objs/CnetEditorWidget/BusyLeafItem.cpp index 4bf9838535..5394d8eb2f 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/BusyLeafItem.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/BusyLeafItem.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "BusyLeafItem.h" #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/BusyLeafItem.h b/isis/src/qisis/objs/CnetEditorWidget/BusyLeafItem.h index 20de6afbcd..89616a729a 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/BusyLeafItem.h +++ b/isis/src/qisis/objs/CnetEditorWidget/BusyLeafItem.h @@ -1,6 +1,14 @@ #ifndef BusyLeafItem_H #define BusyLeafItem_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "AbstractLeafItem.h" #include "AbstractNullDataItem.h" @@ -19,8 +27,8 @@ namespace Isis { * * @author ????-??-?? Eric Hyer * - * @internal - * @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054. + * @internal + * @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054. */ class BusyLeafItem : public AbstractNullDataItem, public AbstractLeafItem { Q_OBJECT diff --git a/isis/src/qisis/objs/CnetEditorWidget/ChooserNameFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/ChooserNameFilter.cpp index bd1b2b56e2..919474cd57 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/ChooserNameFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/ChooserNameFilter.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "ChooserNameFilter.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/ChooserNameFilter.h b/isis/src/qisis/objs/CnetEditorWidget/ChooserNameFilter.h index 02a3466a74..cf4a9fec4d 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/ChooserNameFilter.h +++ b/isis/src/qisis/objs/CnetEditorWidget/ChooserNameFilter.h @@ -1,6 +1,14 @@ #ifndef ChooserNameFilter_H #define ChooserNameFilter_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "AbstractStringFilter.h" template< typename U, typename V > struct QPair; diff --git a/isis/src/qisis/objs/CnetEditorWidget/CnetDisplayProperties.cpp b/isis/src/qisis/objs/CnetEditorWidget/CnetDisplayProperties.cpp index 77404b7b6c..911e5c9384 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/CnetDisplayProperties.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/CnetDisplayProperties.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "CnetDisplayProperties.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/CnetDisplayProperties.h b/isis/src/qisis/objs/CnetEditorWidget/CnetDisplayProperties.h index 485713f035..130bf5d95a 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/CnetDisplayProperties.h +++ b/isis/src/qisis/objs/CnetEditorWidget/CnetDisplayProperties.h @@ -1,6 +1,13 @@ #ifndef CnetDisplayProperties_H #define CnetDisplayProperties_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include @@ -96,4 +103,3 @@ namespace Isis { } #endif - diff --git a/isis/src/qisis/objs/CnetEditorWidget/CnetEditorSortConfigDialog.cpp b/isis/src/qisis/objs/CnetEditorWidget/CnetEditorSortConfigDialog.cpp index b328810050..037417456b 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/CnetEditorSortConfigDialog.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/CnetEditorSortConfigDialog.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "CnetEditorSortConfigDialog.h" #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/CnetEditorSortConfigDialog.h b/isis/src/qisis/objs/CnetEditorWidget/CnetEditorSortConfigDialog.h index 3223a6054d..d195c5c515 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/CnetEditorSortConfigDialog.h +++ b/isis/src/qisis/objs/CnetEditorWidget/CnetEditorSortConfigDialog.h @@ -1,6 +1,14 @@ #ifndef CnetEditorSortConfigDialog_h #define CnetEditorSortConfigDialog_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/CnetEditorWidget.cpp b/isis/src/qisis/objs/CnetEditorWidget/CnetEditorWidget.cpp index e3c3eebe4d..381011f6e3 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/CnetEditorWidget.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/CnetEditorWidget.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "CnetEditorWidget.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/CnetEditorWidget.h b/isis/src/qisis/objs/CnetEditorWidget/CnetEditorWidget.h index 80dab915de..07aa672c0f 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/CnetEditorWidget.h +++ b/isis/src/qisis/objs/CnetEditorWidget/CnetEditorWidget.h @@ -1,6 +1,14 @@ #ifndef CnetEditorWidget_H #define CnetEditorWidget_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/ConnectionParentItem.cpp b/isis/src/qisis/objs/CnetEditorWidget/ConnectionParentItem.cpp index 2824c1ede7..aefbb9f937 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/ConnectionParentItem.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/ConnectionParentItem.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "ConnectionParentItem.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/ConnectionParentItem.h b/isis/src/qisis/objs/CnetEditorWidget/ConnectionParentItem.h index 5f09abd8c8..a712678f63 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/ConnectionParentItem.h +++ b/isis/src/qisis/objs/CnetEditorWidget/ConnectionParentItem.h @@ -1,6 +1,13 @@ #ifndef ConnectionParentItem_H #define ConnectionParentItem_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "AbstractImageItem.h" #include "AbstractParentItem.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/FilterGroup.cpp b/isis/src/qisis/objs/CnetEditorWidget/FilterGroup.cpp index 442b268d9a..09b3ced541 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/FilterGroup.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/FilterGroup.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "FilterGroup.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/FilterGroup.h b/isis/src/qisis/objs/CnetEditorWidget/FilterGroup.h index d5889966af..a52b7a56df 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/FilterGroup.h +++ b/isis/src/qisis/objs/CnetEditorWidget/FilterGroup.h @@ -1,6 +1,13 @@ #ifndef FilterGroup_H #define FilterGroup_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ // parent #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/FilterWidget.cpp b/isis/src/qisis/objs/CnetEditorWidget/FilterWidget.cpp index 2fef8a559d..eb909029d8 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/FilterWidget.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/FilterWidget.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "FilterWidget.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/FilterWidget.h b/isis/src/qisis/objs/CnetEditorWidget/FilterWidget.h index bb10ec6dbe..6d70819e0a 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/FilterWidget.h +++ b/isis/src/qisis/objs/CnetEditorWidget/FilterWidget.h @@ -1,6 +1,13 @@ #ifndef FilterWidget_H #define FilterWidget_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ // parent #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/GoodnessOfFitFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/GoodnessOfFitFilter.cpp index 7dd671821d..a12739f2a9 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/GoodnessOfFitFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/GoodnessOfFitFilter.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "GoodnessOfFitFilter.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/GoodnessOfFitFilter.h b/isis/src/qisis/objs/CnetEditorWidget/GoodnessOfFitFilter.h index b75f86474a..341a599bd8 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/GoodnessOfFitFilter.h +++ b/isis/src/qisis/objs/CnetEditorWidget/GoodnessOfFitFilter.h @@ -1,6 +1,14 @@ #ifndef GoodnessOfFitFilter_H #define GoodnessOfFitFilter_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "AbstractNumberFilter.h" template< typename U, typename V > struct QPair; diff --git a/isis/src/qisis/objs/CnetEditorWidget/ImageIdFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/ImageIdFilter.cpp index 8f041b5b92..1411f52956 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/ImageIdFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/ImageIdFilter.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "ImageIdFilter.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/ImageIdFilter.h b/isis/src/qisis/objs/CnetEditorWidget/ImageIdFilter.h index e7ef1e6cf3..3e86a8f6b2 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/ImageIdFilter.h +++ b/isis/src/qisis/objs/CnetEditorWidget/ImageIdFilter.h @@ -1,6 +1,14 @@ #ifndef ImageIdFilter_H #define ImageIdFilter_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "AbstractStringFilter.h" template< typename U, typename V > struct QPair; diff --git a/isis/src/qisis/objs/CnetEditorWidget/ImageImageFilterSelector.cpp b/isis/src/qisis/objs/CnetEditorWidget/ImageImageFilterSelector.cpp index 9a7ebad600..606da610e3 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/ImageImageFilterSelector.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/ImageImageFilterSelector.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "ImageImageFilterSelector.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/ImageImageFilterSelector.h b/isis/src/qisis/objs/CnetEditorWidget/ImageImageFilterSelector.h index c0ecb6b263..d12931186e 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/ImageImageFilterSelector.h +++ b/isis/src/qisis/objs/CnetEditorWidget/ImageImageFilterSelector.h @@ -1,6 +1,13 @@ #ifndef ImageImageFilterSelector_H #define ImageImageFilterSelector_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "AbstractFilterSelector.h" @@ -16,8 +23,8 @@ namespace Isis { * * @author ????-??-?? Eric Hyer * - * @internal - * @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054. + * @internal + * @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054. */ class ImageImageFilterSelector : public AbstractFilterSelector { Q_OBJECT diff --git a/isis/src/qisis/objs/CnetEditorWidget/ImageImageTreeModel.cpp b/isis/src/qisis/objs/CnetEditorWidget/ImageImageTreeModel.cpp index 50ad807108..b1589790db 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/ImageImageTreeModel.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/ImageImageTreeModel.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "ImageImageTreeModel.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/ImageImageTreeModel.h b/isis/src/qisis/objs/CnetEditorWidget/ImageImageTreeModel.h index e595a25451..f845269468 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/ImageImageTreeModel.h +++ b/isis/src/qisis/objs/CnetEditorWidget/ImageImageTreeModel.h @@ -1,6 +1,13 @@ #ifndef ImageImageTreeModel_H #define ImageImageTreeModel_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ // parent #include "AbstractTreeModel.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/ImageLeafItem.cpp b/isis/src/qisis/objs/CnetEditorWidget/ImageLeafItem.cpp index bcdcac8f2d..cf37d9c444 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/ImageLeafItem.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/ImageLeafItem.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "ImageLeafItem.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/ImageLeafItem.h b/isis/src/qisis/objs/CnetEditorWidget/ImageLeafItem.h index c9cb9dd2a4..e3334fdafe 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/ImageLeafItem.h +++ b/isis/src/qisis/objs/CnetEditorWidget/ImageLeafItem.h @@ -1,6 +1,14 @@ #ifndef ImageLeafItem_H #define ImageLeafItem_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include "AbstractImageItem.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/ImageParentItem.cpp b/isis/src/qisis/objs/CnetEditorWidget/ImageParentItem.cpp index d99de2b36a..45a1e58ed4 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/ImageParentItem.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/ImageParentItem.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "ImageParentItem.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/ImageParentItem.h b/isis/src/qisis/objs/CnetEditorWidget/ImageParentItem.h index 82777e57c9..b1d340f864 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/ImageParentItem.h +++ b/isis/src/qisis/objs/CnetEditorWidget/ImageParentItem.h @@ -1,6 +1,14 @@ #ifndef ImageParentItem_H #define ImageParentItem_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include "AbstractImageItem.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/ImagePointFilterSelector.cpp b/isis/src/qisis/objs/CnetEditorWidget/ImagePointFilterSelector.cpp index dffafa3415..f2f5e55ea5 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/ImagePointFilterSelector.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/ImagePointFilterSelector.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/ImagePointFilterSelector.h b/isis/src/qisis/objs/CnetEditorWidget/ImagePointFilterSelector.h index a18ddb8302..7af778b8f5 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/ImagePointFilterSelector.h +++ b/isis/src/qisis/objs/CnetEditorWidget/ImagePointFilterSelector.h @@ -1,6 +1,14 @@ #ifndef ImagePointFilterSelector_H #define ImagePointFilterSelector_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "AbstractFilterSelector.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/ImagePointTreeModel.cpp b/isis/src/qisis/objs/CnetEditorWidget/ImagePointTreeModel.cpp index c22981e1ce..980af55f17 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/ImagePointTreeModel.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/ImagePointTreeModel.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "ImagePointTreeModel.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/ImagePointTreeModel.h b/isis/src/qisis/objs/CnetEditorWidget/ImagePointTreeModel.h index 02347d9c34..19d780ce26 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/ImagePointTreeModel.h +++ b/isis/src/qisis/objs/CnetEditorWidget/ImagePointTreeModel.h @@ -1,6 +1,14 @@ #ifndef ImagePointTreeModel_H #define ImagePointTreeModel_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + // parent #include "AbstractTreeModel.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/LineFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/LineFilter.cpp index 3a51b82c4b..bc8b5838e1 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/LineFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/LineFilter.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "LineFilter.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/LineFilter.h b/isis/src/qisis/objs/CnetEditorWidget/LineFilter.h index 7b7ae9ec89..6f39e69ac3 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/LineFilter.h +++ b/isis/src/qisis/objs/CnetEditorWidget/LineFilter.h @@ -1,6 +1,14 @@ #ifndef LineFilter_H #define LineFilter_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "AbstractNumberFilter.h" template< typename U, typename V > struct QPair; diff --git a/isis/src/qisis/objs/CnetEditorWidget/LineResidualFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/LineResidualFilter.cpp index 0091e3be20..1a58930804 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/LineResidualFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/LineResidualFilter.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "LineResidualFilter.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/LineResidualFilter.h b/isis/src/qisis/objs/CnetEditorWidget/LineResidualFilter.h index 95e56ed37d..77bc3082b3 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/LineResidualFilter.h +++ b/isis/src/qisis/objs/CnetEditorWidget/LineResidualFilter.h @@ -1,6 +1,14 @@ #ifndef LineResidualFilter_H #define LineResidualFilter_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "AbstractNumberFilter.h" template< typename U, typename V > struct QPair; diff --git a/isis/src/qisis/objs/CnetEditorWidget/LineShiftFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/LineShiftFilter.cpp index a4742086e0..f9b746409b 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/LineShiftFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/LineShiftFilter.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "LineShiftFilter.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/LineShiftFilter.h b/isis/src/qisis/objs/CnetEditorWidget/LineShiftFilter.h index 298dc1ea7a..d16b1828ee 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/LineShiftFilter.h +++ b/isis/src/qisis/objs/CnetEditorWidget/LineShiftFilter.h @@ -1,6 +1,14 @@ #ifndef LineShiftFilter_H #define LineShiftFilter_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "AbstractNumberFilter.h" template< typename U, typename V > struct QPair; diff --git a/isis/src/qisis/objs/CnetEditorWidget/MeasureCountFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/MeasureCountFilter.cpp index 8a78023184..2117833bdf 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/MeasureCountFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/MeasureCountFilter.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "MeasureCountFilter.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/MeasureCountFilter.h b/isis/src/qisis/objs/CnetEditorWidget/MeasureCountFilter.h index a3a66c6a13..2bb499e6c4 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/MeasureCountFilter.h +++ b/isis/src/qisis/objs/CnetEditorWidget/MeasureCountFilter.h @@ -1,6 +1,13 @@ #ifndef MeasureCountFilter_H #define MeasureCountFilter_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "AbstractFilter.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/MeasureIgnoredFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/MeasureIgnoredFilter.cpp index db1bc8fa7f..c6c96a06f7 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/MeasureIgnoredFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/MeasureIgnoredFilter.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "MeasureIgnoredFilter.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/MeasureIgnoredFilter.h b/isis/src/qisis/objs/CnetEditorWidget/MeasureIgnoredFilter.h index d09ef75312..8733f35ffb 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/MeasureIgnoredFilter.h +++ b/isis/src/qisis/objs/CnetEditorWidget/MeasureIgnoredFilter.h @@ -1,6 +1,14 @@ #ifndef MeasureIgnoredFilter_H #define MeasureIgnoredFilter_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "AbstractFilter.h" template< typename U, typename V > struct QPair; diff --git a/isis/src/qisis/objs/CnetEditorWidget/MeasureJigsawRejectedFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/MeasureJigsawRejectedFilter.cpp index 01a034cb66..09e83998a3 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/MeasureJigsawRejectedFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/MeasureJigsawRejectedFilter.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "MeasureJigsawRejectedFilter.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/MeasureJigsawRejectedFilter.h b/isis/src/qisis/objs/CnetEditorWidget/MeasureJigsawRejectedFilter.h index cfecbb11ae..1cdd2facdf 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/MeasureJigsawRejectedFilter.h +++ b/isis/src/qisis/objs/CnetEditorWidget/MeasureJigsawRejectedFilter.h @@ -1,6 +1,14 @@ #ifndef MeasureJigsawRejectedFilter_H #define MeasureJigsawRejectedFilter_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "AbstractFilter.h" template< typename U, typename V > struct QPair; diff --git a/isis/src/qisis/objs/CnetEditorWidget/MeasureLeafItem.cpp b/isis/src/qisis/objs/CnetEditorWidget/MeasureLeafItem.cpp index 7261b973ed..58da2e53ab 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/MeasureLeafItem.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/MeasureLeafItem.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "MeasureLeafItem.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/MeasureLeafItem.h b/isis/src/qisis/objs/CnetEditorWidget/MeasureLeafItem.h index 6c1959c376..a0e2bc53f5 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/MeasureLeafItem.h +++ b/isis/src/qisis/objs/CnetEditorWidget/MeasureLeafItem.h @@ -1,6 +1,14 @@ #ifndef MeasureLeafItem_H #define MeasureLeafItem_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "AbstractMeasureItem.h" #include "AbstractLeafItem.h" @@ -18,8 +26,8 @@ namespace Isis { * * @author ????-??-?? Eric Hyer * - * @internal - * @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054. + * @internal + * @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054. */ class MeasureLeafItem : public AbstractMeasureItem, public AbstractLeafItem { public: diff --git a/isis/src/qisis/objs/CnetEditorWidget/MeasureTableDelegate.cpp b/isis/src/qisis/objs/CnetEditorWidget/MeasureTableDelegate.cpp index e069b2c132..281d640b76 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/MeasureTableDelegate.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/MeasureTableDelegate.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "MeasureTableDelegate.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/MeasureTableDelegate.h b/isis/src/qisis/objs/CnetEditorWidget/MeasureTableDelegate.h index 993b2e0d09..7659fbdd8d 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/MeasureTableDelegate.h +++ b/isis/src/qisis/objs/CnetEditorWidget/MeasureTableDelegate.h @@ -1,6 +1,14 @@ #ifndef MeasureTableDelegate_H #define MeasureTableDelegate_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "AbstractTableDelegate.h" class QString; @@ -19,8 +27,8 @@ namespace Isis { * * @author ????-??-?? Eric Hyer * - * @internal - * @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054. + * @internal + * @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054. */ class MeasureTableDelegate : public AbstractTableDelegate { public: @@ -46,4 +54,3 @@ namespace Isis { } #endif - diff --git a/isis/src/qisis/objs/CnetEditorWidget/MeasureTableModel.cpp b/isis/src/qisis/objs/CnetEditorWidget/MeasureTableModel.cpp index cc9da3caac..601d86c912 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/MeasureTableModel.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/MeasureTableModel.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "MeasureTableModel.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/MeasureTableModel.h b/isis/src/qisis/objs/CnetEditorWidget/MeasureTableModel.h index 95173c307b..ffb14db901 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/MeasureTableModel.h +++ b/isis/src/qisis/objs/CnetEditorWidget/MeasureTableModel.h @@ -1,6 +1,13 @@ #ifndef MeasureTableModel_H #define MeasureTableModel_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "AbstractTableModel.h" @@ -29,8 +36,8 @@ namespace Isis { * * @author ????-??-?? Eric Hyer * - * @internal - * @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054. + * @internal + * @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054. */ class MeasureTableModel : public AbstractTableModel { Q_OBJECT diff --git a/isis/src/qisis/objs/CnetEditorWidget/MeasureTypeFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/MeasureTypeFilter.cpp index 4b2b9daaae..09801a2430 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/MeasureTypeFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/MeasureTypeFilter.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "MeasureTypeFilter.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/MeasureTypeFilter.h b/isis/src/qisis/objs/CnetEditorWidget/MeasureTypeFilter.h index 5b2fa0ba15..8ffaa71385 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/MeasureTypeFilter.h +++ b/isis/src/qisis/objs/CnetEditorWidget/MeasureTypeFilter.h @@ -1,6 +1,14 @@ #ifndef MeasureTypeFilter_H #define MeasureTypeFilter_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "AbstractMultipleChoiceFilter.h" template< typename U, typename V > struct QPair; diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointEditLockedFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/PointEditLockedFilter.cpp index c351b97ff3..c89db7e0d5 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/PointEditLockedFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/PointEditLockedFilter.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "PointEditLockedFilter.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointEditLockedFilter.h b/isis/src/qisis/objs/CnetEditorWidget/PointEditLockedFilter.h index 2f3048b690..8746d7deab 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/PointEditLockedFilter.h +++ b/isis/src/qisis/objs/CnetEditorWidget/PointEditLockedFilter.h @@ -1,6 +1,14 @@ #ifndef PointEditLockedFilter_H #define PointEditLockedFilter_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "AbstractFilter.h" template< typename U, typename V > struct QPair; diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointIdFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/PointIdFilter.cpp index 43e6810f10..0981418614 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/PointIdFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/PointIdFilter.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "PointIdFilter.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointIdFilter.h b/isis/src/qisis/objs/CnetEditorWidget/PointIdFilter.h index 34da4e35ef..de7677f85f 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/PointIdFilter.h +++ b/isis/src/qisis/objs/CnetEditorWidget/PointIdFilter.h @@ -1,6 +1,14 @@ #ifndef PointIdFilter_H #define PointIdFilter_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "AbstractStringFilter.h" template< typename U, typename V > struct QPair; diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointIgnoredFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/PointIgnoredFilter.cpp index 440fddb93b..f5b490ba20 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/PointIgnoredFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/PointIgnoredFilter.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "PointIgnoredFilter.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointIgnoredFilter.h b/isis/src/qisis/objs/CnetEditorWidget/PointIgnoredFilter.h index 7ef7d2e267..2f7b22ffa8 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/PointIgnoredFilter.h +++ b/isis/src/qisis/objs/CnetEditorWidget/PointIgnoredFilter.h @@ -1,6 +1,14 @@ #ifndef PointIgnoredFilter_H #define PointIgnoredFilter_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "AbstractFilter.h" template< typename U, typename V > struct QPair; diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointJigsawRejectedFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/PointJigsawRejectedFilter.cpp index 0d628de472..02cf4e5ddf 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/PointJigsawRejectedFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/PointJigsawRejectedFilter.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "PointJigsawRejectedFilter.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointJigsawRejectedFilter.h b/isis/src/qisis/objs/CnetEditorWidget/PointJigsawRejectedFilter.h index 928c1d99ab..bbc036a76b 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/PointJigsawRejectedFilter.h +++ b/isis/src/qisis/objs/CnetEditorWidget/PointJigsawRejectedFilter.h @@ -1,6 +1,14 @@ #ifndef PointJigsawRejectedFilter_H #define PointJigsawRejectedFilter_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "AbstractFilter.h" template< typename U, typename V > struct QPair; diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointLeafItem.cpp b/isis/src/qisis/objs/CnetEditorWidget/PointLeafItem.cpp index fb420f7a5b..8815299f58 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/PointLeafItem.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/PointLeafItem.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "PointLeafItem.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointLeafItem.h b/isis/src/qisis/objs/CnetEditorWidget/PointLeafItem.h index 9bd4cec325..15b2146aa5 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/PointLeafItem.h +++ b/isis/src/qisis/objs/CnetEditorWidget/PointLeafItem.h @@ -1,6 +1,13 @@ #ifndef PointLeafItem_H #define PointLeafItem_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "AbstractPointItem.h" #include "AbstractLeafItem.h" @@ -18,8 +25,8 @@ namespace Isis { * * @author ????-??-?? Eric Hyer * - * @internal - * @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054. + * @internal + * @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054. */ class PointLeafItem : public AbstractPointItem, public AbstractLeafItem { public: diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointMeasureFilterSelector.cpp b/isis/src/qisis/objs/CnetEditorWidget/PointMeasureFilterSelector.cpp index a201c53858..72ee6d6f99 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/PointMeasureFilterSelector.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/PointMeasureFilterSelector.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "PointMeasureFilterSelector.h" @@ -226,4 +234,3 @@ namespace Isis { emit filterChanged(); } } - diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointMeasureFilterSelector.h b/isis/src/qisis/objs/CnetEditorWidget/PointMeasureFilterSelector.h index d5b140885c..c2195fa161 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/PointMeasureFilterSelector.h +++ b/isis/src/qisis/objs/CnetEditorWidget/PointMeasureFilterSelector.h @@ -1,6 +1,13 @@ #ifndef PointMeasureFilterSelector_H #define PointMeasureFilterSelector_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "AbstractFilterSelector.h" @@ -16,8 +23,8 @@ namespace Isis { * * @author ????-??-?? Eric Hyer * - * @internal - * @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054. + * @internal + * @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054. */ class PointMeasureFilterSelector : public AbstractFilterSelector { Q_OBJECT diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointMeasureTreeModel.cpp b/isis/src/qisis/objs/CnetEditorWidget/PointMeasureTreeModel.cpp index 544b14cb6e..483489dda8 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/PointMeasureTreeModel.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/PointMeasureTreeModel.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "PointMeasureTreeModel.h" @@ -125,4 +133,3 @@ namespace Isis { } } } - diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointMeasureTreeModel.h b/isis/src/qisis/objs/CnetEditorWidget/PointMeasureTreeModel.h index 93d0d466b0..ed273ec96c 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/PointMeasureTreeModel.h +++ b/isis/src/qisis/objs/CnetEditorWidget/PointMeasureTreeModel.h @@ -1,6 +1,13 @@ #ifndef PointMeasureTreeModel_H #define PointMeasureTreeModel_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ // parent #include "AbstractTreeModel.h" @@ -19,7 +26,7 @@ namespace Isis { class PointParentItem; class RootItem; class TreeView; - + /** * @brief Tree model for control points and control measures diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointParentItem.cpp b/isis/src/qisis/objs/CnetEditorWidget/PointParentItem.cpp index a239508df9..1c91057c1a 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/PointParentItem.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/PointParentItem.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "PointParentItem.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointParentItem.h b/isis/src/qisis/objs/CnetEditorWidget/PointParentItem.h index 888cc710a3..fa647c8b9f 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/PointParentItem.h +++ b/isis/src/qisis/objs/CnetEditorWidget/PointParentItem.h @@ -1,6 +1,14 @@ #ifndef PointParentItem_H #define PointParentItem_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "AbstractParentItem.h" #include "AbstractPointItem.h" @@ -20,8 +28,8 @@ namespace Isis { * * @author ????-??-?? Eric Hyer * - * @internal - * @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054. + * @internal + * @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054. */ class PointParentItem : public AbstractPointItem, public AbstractParentItem { public: diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointTableDelegate.cpp b/isis/src/qisis/objs/CnetEditorWidget/PointTableDelegate.cpp index b97bce9566..8d3d102e38 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/PointTableDelegate.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/PointTableDelegate.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "PointTableDelegate.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointTableDelegate.h b/isis/src/qisis/objs/CnetEditorWidget/PointTableDelegate.h index 06e40edde9..2dc3f457ba 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/PointTableDelegate.h +++ b/isis/src/qisis/objs/CnetEditorWidget/PointTableDelegate.h @@ -1,6 +1,14 @@ #ifndef PointTableDelegate_H #define PointTableDelegate_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "AbstractTableDelegate.h" class QString; @@ -49,4 +57,3 @@ namespace Isis { } #endif - diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointTableModel.cpp b/isis/src/qisis/objs/CnetEditorWidget/PointTableModel.cpp index 6163deefa2..fd509cd477 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/PointTableModel.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/PointTableModel.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "PointTableModel.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointTableModel.h b/isis/src/qisis/objs/CnetEditorWidget/PointTableModel.h index c222bf15af..be97e442d5 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/PointTableModel.h +++ b/isis/src/qisis/objs/CnetEditorWidget/PointTableModel.h @@ -1,6 +1,13 @@ #ifndef PointTableModel_H #define PointTableModel_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "AbstractTableModel.h" @@ -26,8 +33,8 @@ namespace Isis { * * @author ????-??-?? Eric Hyer * - * @internal - * @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054. + * @internal + * @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054. */ class PointTableModel : public AbstractTableModel { Q_OBJECT diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointTypeFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/PointTypeFilter.cpp index dddae57201..3cbeeda213 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/PointTypeFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/PointTypeFilter.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "PointTypeFilter.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointTypeFilter.h b/isis/src/qisis/objs/CnetEditorWidget/PointTypeFilter.h index 5caf3f358f..25c826d92f 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/PointTypeFilter.h +++ b/isis/src/qisis/objs/CnetEditorWidget/PointTypeFilter.h @@ -1,6 +1,14 @@ #ifndef PointTypeFilter_H #define PointTypeFilter_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "AbstractMultipleChoiceFilter.h" template< typename U, typename V > struct QPair; diff --git a/isis/src/qisis/objs/CnetEditorWidget/ResidualMagnitudeFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/ResidualMagnitudeFilter.cpp index ac650360d5..def7cbf6a0 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/ResidualMagnitudeFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/ResidualMagnitudeFilter.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "ResidualMagnitudeFilter.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/ResidualMagnitudeFilter.h b/isis/src/qisis/objs/CnetEditorWidget/ResidualMagnitudeFilter.h index b17afc53b2..4ed423fd27 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/ResidualMagnitudeFilter.h +++ b/isis/src/qisis/objs/CnetEditorWidget/ResidualMagnitudeFilter.h @@ -1,6 +1,14 @@ #ifndef ResidualMagnitudeFilter_H #define ResidualMagnitudeFilter_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "AbstractNumberFilter.h" template< typename U, typename V > struct QPair; diff --git a/isis/src/qisis/objs/CnetEditorWidget/RootItem.cpp b/isis/src/qisis/objs/CnetEditorWidget/RootItem.cpp index 75115de16c..0dc65c210f 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/RootItem.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/RootItem.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "RootItem.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/RootItem.h b/isis/src/qisis/objs/CnetEditorWidget/RootItem.h index 9725f0e8b9..b09ef337e1 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/RootItem.h +++ b/isis/src/qisis/objs/CnetEditorWidget/RootItem.h @@ -1,6 +1,13 @@ #ifndef RootItem_H #define RootItem_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "AbstractNullDataItem.h" #include "AbstractParentItem.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/SampleFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/SampleFilter.cpp index 69cb67e8c3..ea6f79975c 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/SampleFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/SampleFilter.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "SampleFilter.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/SampleFilter.h b/isis/src/qisis/objs/CnetEditorWidget/SampleFilter.h index 8aa1cfa206..dacccf514b 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/SampleFilter.h +++ b/isis/src/qisis/objs/CnetEditorWidget/SampleFilter.h @@ -1,6 +1,14 @@ #ifndef SampleFilter_H #define SampleFilter_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "AbstractNumberFilter.h" template< typename U, typename V > struct QPair; diff --git a/isis/src/qisis/objs/CnetEditorWidget/SampleResidualFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/SampleResidualFilter.cpp index ddffe0302a..77a1a59c83 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/SampleResidualFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/SampleResidualFilter.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "SampleResidualFilter.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/SampleResidualFilter.h b/isis/src/qisis/objs/CnetEditorWidget/SampleResidualFilter.h index 6e1cf569d3..a0b35ce3b8 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/SampleResidualFilter.h +++ b/isis/src/qisis/objs/CnetEditorWidget/SampleResidualFilter.h @@ -1,6 +1,14 @@ #ifndef SampleResidualFilter_H #define SampleResidualFilter_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "AbstractNumberFilter.h" template< typename U, typename V > struct QPair; diff --git a/isis/src/qisis/objs/CnetEditorWidget/SampleShiftFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/SampleShiftFilter.cpp index 985303632d..5f8e796b34 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/SampleShiftFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/SampleShiftFilter.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "SampleShiftFilter.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/SampleShiftFilter.h b/isis/src/qisis/objs/CnetEditorWidget/SampleShiftFilter.h index 488096179a..8f5290fb8c 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/SampleShiftFilter.h +++ b/isis/src/qisis/objs/CnetEditorWidget/SampleShiftFilter.h @@ -1,6 +1,14 @@ #ifndef SampleShiftFilter_H #define SampleShiftFilter_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "AbstractNumberFilter.h" template< typename U, typename V > struct QPair; diff --git a/isis/src/qisis/objs/CnetEditorWidget/TableColumn.cpp b/isis/src/qisis/objs/CnetEditorWidget/TableColumn.cpp index b9461dcfc9..51d07fb071 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/TableColumn.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/TableColumn.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "TableColumn.h" #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/TableColumn.h b/isis/src/qisis/objs/CnetEditorWidget/TableColumn.h index f7e1a454c9..6b0796ca30 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/TableColumn.h +++ b/isis/src/qisis/objs/CnetEditorWidget/TableColumn.h @@ -1,6 +1,14 @@ #ifndef TableColumn_H #define TableColumn_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include class QString; diff --git a/isis/src/qisis/objs/CnetEditorWidget/TableColumnList.cpp b/isis/src/qisis/objs/CnetEditorWidget/TableColumnList.cpp index b9aa1f565e..5a7472f73d 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/TableColumnList.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/TableColumnList.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "TableColumnList.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/TableColumnList.h b/isis/src/qisis/objs/CnetEditorWidget/TableColumnList.h index d561eca574..454dcd024b 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/TableColumnList.h +++ b/isis/src/qisis/objs/CnetEditorWidget/TableColumnList.h @@ -1,6 +1,14 @@ #ifndef TableColumnList_H #define TableColumnList_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include template struct QPair; diff --git a/isis/src/qisis/objs/CnetEditorWidget/TableView.cpp b/isis/src/qisis/objs/CnetEditorWidget/TableView.cpp index 329f507a73..efb5279c40 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/TableView.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/TableView.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "TableView.h" @@ -17,10 +25,10 @@ #include "TableColumnList.h" -namespace Isis { +namespace Isis { /** * Constructor - * + * * @param someModel The abstract table model to view * @param pathForSettings The path to read/write settings to * @param objName The name of the object @@ -150,7 +158,7 @@ namespace Isis { /** * Returns the horizontal header - * + * * @return TableViewHeader The horizontal header */ TableViewHeader *TableView::getHorizontalHeader() { @@ -160,7 +168,7 @@ namespace Isis { /** * Sets the specified column visible or invisible - * + * * @param column The column to change the visibility of * @param visible The visibility setting */ @@ -175,17 +183,17 @@ namespace Isis { /** * Returns the model - * + * * @return AbstractTableModel The model */ AbstractTableModel *TableView::getModel() { return m_content->getModel(); } - - + + /** * Returns the content of the table - * + * * @return TableViewContent The content of the table */ TableViewContent *TableView::content() { @@ -239,11 +247,11 @@ namespace Isis { // m_header->update(); // } // } - + /** * Displays warnings for a table - * + * * @param warning The waarning that will be displayed */ void TableView::displayWarning(AbstractTableModel::Warning warning) { @@ -285,7 +293,7 @@ namespace Isis { /** * Sets all member variables to NULL - */ + */ void TableView::nullify() { m_header = NULL; m_content = NULL; diff --git a/isis/src/qisis/objs/CnetEditorWidget/TableView.h b/isis/src/qisis/objs/CnetEditorWidget/TableView.h index d1e23cd489..a050614ad9 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/TableView.h +++ b/isis/src/qisis/objs/CnetEditorWidget/TableView.h @@ -1,6 +1,14 @@ #ifndef TableView_H #define TableView_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include "AbstractTableModel.h" @@ -28,8 +36,8 @@ namespace Isis { * also passed. This was added for IPCE, for the interaction with * other views. * @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054. - * @history 2017-08-08 Makayla Shepherd - Fixed a seg fault in ipce that occurs when - * attempting to edit a control point when there is not an active + * @history 2017-08-08 Makayla Shepherd - Fixed a seg fault in ipce that occurs when + * attempting to edit a control point when there is not an active * control network. Fixes #5048. */ class TableView : public QWidget { @@ -71,14 +79,14 @@ namespace Isis { void editControlPoint(ControlPoint *, QString); - private: + private: // disable copying and assigning of this class TableView(const TableView &); TableView &operator=(const TableView &other); - + // methods void nullify(); - + // data TableViewHeader *m_header; //!< The table header TableViewContent *m_content; //!< The content of the header diff --git a/isis/src/qisis/objs/CnetEditorWidget/TableViewContent.cpp b/isis/src/qisis/objs/CnetEditorWidget/TableViewContent.cpp index 425c1d5bdd..c0a72043ab 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/TableViewContent.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/TableViewContent.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "TableViewContent.h" @@ -37,7 +45,7 @@ namespace Isis { /** * Constructor - * + * * @param someModel The abstract table model */ TableViewContent::TableViewContent(AbstractTableModel *someModel) { @@ -89,7 +97,7 @@ namespace Isis { setContextMenuPolicy(Qt::CustomContextMenu); connect(this, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(showContextMenu(QPoint))); - + m_activeControlNet = false; } @@ -131,7 +139,7 @@ namespace Isis { /** * Returns the minimum size hint - * + * * @return QSize Minimum size hint */ QSize TableViewContent::minimumSizeHint() const { @@ -141,9 +149,9 @@ namespace Isis { /** * Returns the minimum size hint - * + * * @see TableViewContent::minimumSizeHint() - * + * * @return QSize Minimum size hint */ QSize TableViewContent::sizeHint() const { @@ -153,7 +161,7 @@ namespace Isis { /** * Returns the model - * + * * @return AbstractTableModel The model of the table */ AbstractTableModel *TableViewContent::getModel() { @@ -199,16 +207,16 @@ namespace Isis { // refresh(); // } - + /** * Sets if there is an active control net - * + * * @param bool The bool if there is an active control net */ void TableViewContent::setActiveControlNet(bool activeNet) { m_activeControlNet = activeNet; } - + /** * Refreshes the table and viewport @@ -237,7 +245,7 @@ namespace Isis { /** * Updates the horizontal scroll bar - * + * * @param scrollRight True if the horizontal scroll bar has scrolled right */ void TableViewContent::updateHorizontalScrollBar(bool scrollRight) { @@ -259,8 +267,8 @@ namespace Isis { /** - * Scrolls to the selected items - * + * Scrolls to the selected items + * * @param newlySelectedItems Newly selected items to scroll to */ void TableViewContent::scrollTo( @@ -272,7 +280,7 @@ namespace Isis { /** * Scrolls to the selected item - * + * * @param newlySelectedItem Newly selected item to scroll to */ void TableViewContent::scrollTo(AbstractTreeItem *newlySelectedItem) { @@ -298,10 +306,10 @@ namespace Isis { /** * Overrides QObject::eventFilter - * - * @param target The object that was changed + * + * @param target The object that was changed * @param event The event that was triggered - * + * * @return bool True if the event is filtered out */ bool TableViewContent::eventFilter(QObject *target, QEvent *event) { @@ -310,8 +318,8 @@ namespace Isis { /** - * Overrides QWidget::mouseDoubleClickEvent. - * + * Overrides QWidget::mouseDoubleClickEvent. + * * @param event QMouseEvent */ void TableViewContent::mouseDoubleClickEvent(QMouseEvent *event) { @@ -338,7 +346,7 @@ namespace Isis { /** * Overrides QWidget::mousePressEvent. - * + * * @param event QMouseEvent */ void TableViewContent::mousePressEvent(QMouseEvent *event) { @@ -464,7 +472,7 @@ namespace Isis { /** * Overrides QWidget::mouseReleaseEvent. Empty function - * + * * @param event QMouseEvent */ void TableViewContent::mouseReleaseEvent(QMouseEvent *event) { @@ -473,7 +481,7 @@ namespace Isis { /** * Overrides QWidget::mouseMoveEvent. - * + * * @param event QMouseEvent */ void TableViewContent::mouseMoveEvent(QMouseEvent *event) { @@ -539,7 +547,7 @@ namespace Isis { /** * Overrides QWidget::leaveEvent - * + * * @param event QMouseEvent */ void TableViewContent::leaveEvent(QEvent *event) { @@ -549,7 +557,7 @@ namespace Isis { /** * Overrides QWidget::keyPressEvent - * + * * @param event QMouseEvent */ void TableViewContent::keyPressEvent(QKeyEvent *event) { @@ -848,7 +856,7 @@ namespace Isis { /** * Paints the table when there is a paint event. Overrides QWidget::paintEvent - * + * * @param event The paint event */ void TableViewContent::paintEvent(QPaintEvent *event) { @@ -970,8 +978,8 @@ namespace Isis { /** - * Updates the table when it is resized. - * + * Updates the table when it is resized. + * * @param event Resize event */ void TableViewContent::resizeEvent(QResizeEvent *event) { @@ -983,7 +991,7 @@ namespace Isis { /** * Updates the item list when the user scrolls - * + * * @param dx X scroll * @param dy Y scroll */ @@ -1016,7 +1024,7 @@ namespace Isis { /** * Rebuilds the models when the data is changed - * + * * @param col The table column that changed */ void TableViewContent::cellDataChanged(const TableColumn *col) { @@ -1048,7 +1056,7 @@ namespace Isis { /** * Copies the selected cells - * + * * @param allCells Determines if all of the visible rows should be copied */ void TableViewContent::copyCellSelection(bool allCells) { @@ -1135,8 +1143,8 @@ namespace Isis { /** * Calculates the visible range of a column and returns the index of the column * - * @param screenX X value of the screen size - * + * @param screenX X value of the screen size + * * @return int Column that fits the screen, or if there aren't any columns that fit -1 */ int TableViewContent::getColumnFromScreenX(int screenX) const { @@ -1158,8 +1166,8 @@ namespace Isis { /** * Calculates the visible range of a row and returns the index of the column * - * @param screenY Y value of the screen size - * + * @param screenY Y value of the screen size + * * @return int Row that fits the screen, or if there aren't any columns that fit -1 */ int TableViewContent::getRowFromScreenY(int screenY) const { @@ -1175,7 +1183,7 @@ namespace Isis { /** * Checks if there is an active cell - * + * * @return bool True if there is an active cell */ bool TableViewContent::hasActiveCell() const { @@ -1185,7 +1193,7 @@ namespace Isis { /** * Checks if there is a row selected - * + * * @return bool True if there is a row selected */ bool TableViewContent::hasRowSelection() const { @@ -1195,9 +1203,9 @@ namespace Isis { /** * Checks if the mouse is in the selected cells - * + * * @param mousePos Mouse position - * + * * @return bool True if the mouse is in the selected cells */ bool TableViewContent::mouseInCellSelection(QPoint mousePos) const { @@ -1211,9 +1219,9 @@ namespace Isis { /** * Checks if the mouse is in the selected row - * + * * @param mousePos Mouse position - * + * * @return bool True if the mouse is in the selected row */ bool TableViewContent::mouseInRowSelection(QPoint mousePos) const { @@ -1225,9 +1233,9 @@ namespace Isis { /** * Checks if the row number is valid - * + * * @param rowNum Row to check - * + * * @return bool True if the row is greater or equal to 0 and less than m_items->size() */ bool TableViewContent::rowIsValid(int rowNum) const { @@ -1242,9 +1250,9 @@ namespace Isis { /** * Checks if the column number is valid - * + * * @param colNum Column to check - * + * * @return bool True if the column is greater or equal to 0 and less than m_items->size() */ bool TableViewContent::columnIsValid(int colNum) const { @@ -1259,10 +1267,10 @@ namespace Isis { /** * Checks if the cell is editable - * + * * @param rowNum The cell's row * @param colNum The cell's column - * + * * @return bool True if the cell is selectable and editable */ bool TableViewContent::cellIsEditable(int rowNum, int colNum) const { @@ -1283,9 +1291,9 @@ namespace Isis { /** * Checks if the column has a non empty title - * + * * @param colNum The column to check - * + * * @return bool True if the column has a non-empty title */ bool TableViewContent::isDataColumn(int colNum) const { @@ -1296,11 +1304,11 @@ namespace Isis { /** * Repaints the row - * + * * @param painter The QPainter * @param rowNum The row to repaint * @param absolutePosition The row position - * @param relativePosition The row position in the visible area + * @param relativePosition The row position in the visible area */ void TableViewContent::paintRow(QPainter *painter, int rowNum, QPoint absolutePosition, QPoint relativePosition) { @@ -1446,7 +1454,7 @@ namespace Isis { /** * Updates which cell is active - * + * * @param screenPos The position of the active cell */ void TableViewContent::updateActiveCell(QPoint screenPos) { @@ -1499,7 +1507,7 @@ namespace Isis { /** * Updates which column is selected - * + * * @param item The new selected group */ void TableViewContent::updateColumnGroupSelection(AbstractTreeItem *item) { @@ -1527,9 +1535,9 @@ namespace Isis { /** * Updates which row is selected - * + * * @param lastRow The index of the last row - * + * * @return QList< AbstractTreeItem * > The newly selected row */ QList< AbstractTreeItem * > TableViewContent::updateRowGroupSelection(int lastRow) { @@ -1568,7 +1576,7 @@ namespace Isis { /** * Copies selected cells - * + * * @see copyCellSelection */ void TableViewContent::copySelection() { @@ -1578,7 +1586,7 @@ namespace Isis { /** * Copies all of the cells - * + * * @see copyCellSelection */ void TableViewContent::copyAll() { @@ -1663,7 +1671,7 @@ namespace Isis { /** * Populates the context menus based on where the user clicked - * + * * @param mouseLocation Location of the mouse */ void TableViewContent::showContextMenu(QPoint mouseLocation) { @@ -1673,11 +1681,11 @@ namespace Isis { // TODO: 2017-05-17 TLS // Always allow editing of point. Should we check for editLock?? QList selectedRows = m_model->getSelectedItems(); - + // If there is a row selection, show a context menu if the user clicked // anywhere on any of the selected row(s). - + if (QApplication::applicationName() != "cneteditor") { if (m_activeControlNet) { m_editControlPointAct->setEnabled(true); diff --git a/isis/src/qisis/objs/CnetEditorWidget/TableViewContent.h b/isis/src/qisis/objs/CnetEditorWidget/TableViewContent.h index f30cc3b553..eaf3a67768 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/TableViewContent.h +++ b/isis/src/qisis/objs/CnetEditorWidget/TableViewContent.h @@ -1,6 +1,14 @@ #ifndef TableViewContent_H #define TableViewContent_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -39,15 +47,15 @@ namespace Isis { * @history 2017-07-18 Christopher Combs - Fixed bug in which trying to edit a selected row * would cause a segfault from m_activeCell being null. Fixes #4958. * @history 2017-07-25 Summer Stapleton - Removed the CnetViz namespace. Fixes #5054. - * @history 2017-08-08 Makayla Shepherd - Fixed a seg fault in ipce that occurs when - * attempting to edit a control point when there is not an active + * @history 2017-08-08 Makayla Shepherd - Fixed a seg fault in ipce that occurs when + * attempting to edit a control point when there is not an active * control network. Fixes #5048. * @history 2017-09-20 Ian Humphrey - Modified showContextMenu so single line if statements * have braces. This prevents a misleading-indentation warning from * occuring during Fedora25 (c++14) builds. No functionality has been * changed. References #4809. - * @history 2018-07-17 Kaitlyn Lee - Modified showContextMenu() to enable - m_deleteSelectedRowsAct regardless if an active control is set. + * @history 2018-07-17 Kaitlyn Lee - Modified showContextMenu() to enable + m_deleteSelectedRowsAct regardless if an active control is set. */ class TableViewContent : public QAbstractScrollArea { Q_OBJECT @@ -184,7 +192,7 @@ namespace Isis { * This action edits selected control point or if measure selected, edit parent control pt */ QAction *m_editControlPointAct; - + bool m_activeControlNet; diff --git a/isis/src/qisis/objs/CnetEditorWidget/TableViewHeader.cpp b/isis/src/qisis/objs/CnetEditorWidget/TableViewHeader.cpp index 8cf1f11b03..0bae681b54 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/TableViewHeader.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/TableViewHeader.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "TableViewHeader.h" @@ -27,7 +35,7 @@ namespace Isis { /** * Constructor - * + * * @param someModel The table model */ TableViewHeader::TableViewHeader(AbstractTableModel *someModel) { @@ -68,7 +76,7 @@ namespace Isis { /** * Sets the column list - * + * * @param cols The column list */ void TableViewHeader::setColumns(TableColumnList *cols) { @@ -78,7 +86,7 @@ namespace Isis { /** * Returns the minimum size based on the font - * + * * @return QSize Minimum size allowed */ QSize TableViewHeader::minimumSizeHint() const { @@ -90,9 +98,9 @@ namespace Isis { /** * Returns the minimum size based on the font - * + * * @see minimumSizeHint - * + * * @return QSize Minimum size allowed */ QSize TableViewHeader::sizeHint() const { @@ -102,7 +110,7 @@ namespace Isis { /** * Connects the table model to the functions that handle changes - * + * * @param someModel The table model to connect */ void TableViewHeader::setModel(AbstractTableModel *someModel) { @@ -164,7 +172,7 @@ namespace Isis { /** * Updates the visible columns, and geometry when the filter count changes - * + * * @param visibleTopLevelItemCount Number of visible top level items * @param topLevelItemCount Number of top level items */ @@ -190,8 +198,8 @@ namespace Isis { /** - * Updates the header offset - * + * Updates the header offset + * * @param newOffset The new header offset */ void TableViewHeader::updateHeaderOffset(int newOffset) { @@ -202,7 +210,7 @@ namespace Isis { /** * Overrides QWidget::mousePressEvent - * + * * @param event The mouse press event */ void TableViewHeader::mousePressEvent(QMouseEvent *event) { @@ -235,7 +243,7 @@ namespace Isis { /** * Overrides QWidget::mouseMoveEvent - * + * * @param event The mouse move event */ void TableViewHeader::mouseMoveEvent(QMouseEvent *event) { @@ -271,7 +279,7 @@ namespace Isis { /** * Overrides QWidget::mouseReleaseEvent - * + * * @param event The mouse release event */ void TableViewHeader::mouseReleaseEvent(QMouseEvent *event) { @@ -311,7 +319,7 @@ namespace Isis { /** * Repaints the header - * + * * @param event The paint event */ void TableViewHeader::paintEvent(QPaintEvent *event) { @@ -340,9 +348,9 @@ namespace Isis { /** * Returns the visible column rectangle - * + * * @param column Column to check - * + * * @return QRect The visible column rectangle */ QRect TableViewHeader::getColumnRect(int column) const { @@ -366,9 +374,9 @@ namespace Isis { /** * Returns the column under the mouse - * + * * @param mousePos The mouse position - * + * * @return int Index of the column under the mouse */ int TableViewHeader::getMousedColumn(QPoint mousePos) { @@ -388,9 +396,9 @@ namespace Isis { /** * Returns the edge of the column under the mouse - * + * * @param mousePos The mouse position - * + * * @return int Index of the column edge under the mouse */ int TableViewHeader::getMousedColumnEdge(QPoint mousePos) { @@ -415,9 +423,9 @@ namespace Isis { /** * Returns if the mouse is at the edge of a resizeable column - * + * * @param mousePos The mouse position - * + * * @return bool True if the mouse is at the edge fo a resizable column */ bool TableViewHeader::mouseAtResizableColumnEdge(QPoint mousePos) { @@ -449,7 +457,7 @@ namespace Isis { /** * Repaints the header - * + * * @param painter The QPainter * @param rowHeight The new row height */ @@ -588,7 +596,7 @@ namespace Isis { /** * Updates the progress bar - * + * * @param painter The QPainter * @param rect The progress bar * @param min The minimum progress value @@ -616,7 +624,7 @@ namespace Isis { /** * Updates the current filter progress value - * + * * @param newProgress New progress value */ void TableViewHeader::updateFilterProgress(int newProgress) { @@ -627,7 +635,7 @@ namespace Isis { /** * Updates the range of the filter progress - * + * * @param min The minimum progress * @param max The maximum progress */ @@ -640,7 +648,7 @@ namespace Isis { /** * Updates the current rebuild progress value - * + * * @param newProgress New progress value */ void TableViewHeader::updateRebuildProgress(int newProgress) { @@ -651,7 +659,7 @@ namespace Isis { /** * Updates the range of the rebuild progress - * + * * @param min The minimum progress * @param max The maximum progress */ @@ -664,7 +672,7 @@ namespace Isis { /** * Updates the current sort progress value - * + * * @param newProgress New progress value */ void TableViewHeader::updateSortProgress(int newProgress) { @@ -675,7 +683,7 @@ namespace Isis { /** * Updates the range of the sort progress - * + * * @param min The minimum progress * @param max The maximum progress */ diff --git a/isis/src/qisis/objs/CnetEditorWidget/TableViewHeader.h b/isis/src/qisis/objs/CnetEditorWidget/TableViewHeader.h index a5668cbb8e..419ddc1fd7 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/TableViewHeader.h +++ b/isis/src/qisis/objs/CnetEditorWidget/TableViewHeader.h @@ -1,6 +1,14 @@ #ifndef TableViewHeader_H #define TableViewHeader_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include class QMouseEvent; diff --git a/isis/src/qisis/objs/CnetEditorWidget/TreeView.cpp b/isis/src/qisis/objs/CnetEditorWidget/TreeView.cpp index 540df1b477..996d0f5256 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/TreeView.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/TreeView.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "TreeView.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/TreeView.h b/isis/src/qisis/objs/CnetEditorWidget/TreeView.h index bd571c72a2..eb9b3a0beb 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/TreeView.h +++ b/isis/src/qisis/objs/CnetEditorWidget/TreeView.h @@ -1,6 +1,14 @@ #ifndef TreeView_H #define TreeView_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/TreeViewContent.cpp b/isis/src/qisis/objs/CnetEditorWidget/TreeViewContent.cpp index df1e6f7787..7d91866824 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/TreeViewContent.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/TreeViewContent.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "TreeViewContent.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/TreeViewContent.h b/isis/src/qisis/objs/CnetEditorWidget/TreeViewContent.h index 363cddf5bc..868746595a 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/TreeViewContent.h +++ b/isis/src/qisis/objs/CnetEditorWidget/TreeViewContent.h @@ -1,6 +1,13 @@ #ifndef TreeViewContent_H #define TreeViewContent_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ // parent #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/TreeViewHeader.cpp b/isis/src/qisis/objs/CnetEditorWidget/TreeViewHeader.cpp index 1c73edbf9e..574b7f3065 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/TreeViewHeader.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/TreeViewHeader.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "TreeViewHeader.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/TreeViewHeader.h b/isis/src/qisis/objs/CnetEditorWidget/TreeViewHeader.h index c7ee8ed79a..8fa76ceb98 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/TreeViewHeader.h +++ b/isis/src/qisis/objs/CnetEditorWidget/TreeViewHeader.h @@ -1,6 +1,14 @@ #ifndef TreeViewHeader_H #define TreeViewHeader_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include class QMouseEvent; diff --git a/isis/src/qisis/objs/ConcurrentControlNetReader/ConcurrentControlNetReader.cpp b/isis/src/qisis/objs/ConcurrentControlNetReader/ConcurrentControlNetReader.cpp index e55ed1c401..bf13194ecc 100644 --- a/isis/src/qisis/objs/ConcurrentControlNetReader/ConcurrentControlNetReader.cpp +++ b/isis/src/qisis/objs/ConcurrentControlNetReader/ConcurrentControlNetReader.cpp @@ -1,25 +1,10 @@ -/** - * @file - * $Revision: 1.9 $ - * $Date: 2009/07/15 17:33:52 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "ConcurrentControlNetReader.h" @@ -53,9 +38,9 @@ namespace Isis { */ ConcurrentControlNetReader::ConcurrentControlNetReader() { nullify(); - + m_mappedRunning = false; - + m_progressBar = new ProgressBar("Reading Control Nets"); m_watcher = new QFutureWatcher; @@ -92,13 +77,13 @@ namespace Isis { * @param filename The filename of the network to read */ void ConcurrentControlNetReader::read(QString filename) { - + m_backlog.append(filename); - + if (!m_progressBar.isNull()) { m_progressBar->setRange(0, m_progressBar->maximum() + 1); } - + start(); } @@ -109,11 +94,11 @@ namespace Isis { void ConcurrentControlNetReader::read(QStringList filenames) { m_backlog.append(filenames); - + if (!m_progressBar.isNull()) { m_progressBar->setRange(0, m_progressBar->maximum() + filenames.size()); } - + start(); } @@ -136,7 +121,7 @@ namespace Isis { void ConcurrentControlNetReader::start() { - + if (!m_backlog.isEmpty() && !m_mappedRunning) { QList< QPair > functorInput; @@ -147,27 +132,27 @@ namespace Isis { functorInput.append(qMakePair(FileName(backlogFileName), progress)); } - + QFuture networks = QtConcurrent::mapped(functorInput, FileNameToControlFunctor(QThread::currentThread())); - + try { networks.result(); } catch (IException &e) { throw e; } - + if (!m_progressBar.isNull()) { m_progressBar->setVisible(true); } - + delete m_progressUpdateTimer; - + m_watcher->setFuture(networks); m_mappedRunning = true; m_backlog.clear(); - + m_progressUpdateTimer = new QTimer; connect(m_progressUpdateTimer, SIGNAL(timeout()), this, SLOT(updateProgressValue())); @@ -175,7 +160,7 @@ namespace Isis { } } - + void ConcurrentControlNetReader::updateProgressValue() { if (!m_mappedRunning) { foreach (Progress *progress, m_progress) { @@ -273,4 +258,3 @@ namespace Isis { return *this; } } - diff --git a/isis/src/qisis/objs/ConcurrentControlNetReader/ConcurrentControlNetReader.h b/isis/src/qisis/objs/ConcurrentControlNetReader/ConcurrentControlNetReader.h index 74d6574bd3..7e64eeb53e 100644 --- a/isis/src/qisis/objs/ConcurrentControlNetReader/ConcurrentControlNetReader.h +++ b/isis/src/qisis/objs/ConcurrentControlNetReader/ConcurrentControlNetReader.h @@ -1,27 +1,13 @@ #ifndef ConcurrentControlNetReader_h #define ConcurrentControlNetReader_h -/** - * @file - * $Revision: 1.9 $ - * $Date: 2009/07/15 17:33:52 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include diff --git a/isis/src/qisis/objs/Control/Control.cpp b/isis/src/qisis/objs/Control/Control.cpp index 751cc3f83c..9380f0ea3e 100644 --- a/isis/src/qisis/objs/Control/Control.cpp +++ b/isis/src/qisis/objs/Control/Control.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Control.h" #include @@ -172,13 +180,13 @@ namespace Isis { /** - * @description Write control net to disk. This method is used instead of calling - * ControlNet::Write directly so that Control knows the modification state of the control net. + * @description Write control net to disk. This method is used instead of calling + * ControlNet::Write directly so that Control knows the modification state of the control net. * Note that if there is not a control net opened, there should no be any changes to write. - * - * @return @b bool Returns false if there is not a control net open to write - * - * @throws IException::Programmer "Cannot write control net to disk" + * + * @return @b bool Returns false if there is not a control net open to write + * + * @throws IException::Programmer "Cannot write control net to disk" */ bool Control::write() { @@ -213,10 +221,10 @@ namespace Isis { /** - * @description Has this control been modified? - * - * @return @b bool Has this control been modified? - * + * @description Has this control been modified? + * + * @return @b bool Has this control been modified? + * */ bool Control::isModified() { return m_modified; @@ -224,14 +232,14 @@ namespace Isis { /** - * @description Sets the modification state of this control. This is needed for now since many - * classes make changes to the control net contained in this object, but the control does not - * know the state of the control net. + * @description Sets the modification state of this control. This is needed for now since many + * classes make changes to the control net contained in this object, but the control does not + * know the state of the control net. * TODO: Change this class to always know the state of the control Net. - * + * */ void Control::setModified(bool modified) { - + m_modified = modified; } @@ -286,7 +294,7 @@ namespace Isis { void Control::copyToNewProjectRoot(const Project *project, FileName newProjectRoot) { if (FileName(newProjectRoot).toString() != FileName(project->projectRoot()).toString()) { - + QString newNetworkPath = project->cnetRoot(newProjectRoot.toString()) + "/" + FileName(m_fileName).dir().dirName() + "/" + FileName(m_fileName).name(); diff --git a/isis/src/qisis/objs/Control/Control.h b/isis/src/qisis/objs/Control/Control.h index a3d1011841..92242f6875 100644 --- a/isis/src/qisis/objs/Control/Control.h +++ b/isis/src/qisis/objs/Control/Control.h @@ -1,27 +1,14 @@ #ifndef Control_H #define Control_H -/** - * @file - * $Revision: 1.0 $ - * $Date: 2012/06/12 15:55:00 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include // parent #include @@ -97,7 +84,7 @@ namespace Isis { bool isModified(); void setModified(bool modified = true); - bool write(); + bool write(); void save(QXmlStreamWriter &stream, const Project *project, FileName newProjectRoot) const; void copyToNewProjectRoot(const Project *project, FileName newProjectRoot); diff --git a/isis/src/qisis/objs/ControlDisplayProperties/ControlDisplayProperties.cpp b/isis/src/qisis/objs/ControlDisplayProperties/ControlDisplayProperties.cpp index b89deb4840..a1eafa8bef 100644 --- a/isis/src/qisis/objs/ControlDisplayProperties/ControlDisplayProperties.cpp +++ b/isis/src/qisis/objs/ControlDisplayProperties/ControlDisplayProperties.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "ControlDisplayProperties.h" #include diff --git a/isis/src/qisis/objs/ControlDisplayProperties/ControlDisplayProperties.h b/isis/src/qisis/objs/ControlDisplayProperties/ControlDisplayProperties.h index 7542421271..cd6005a8a4 100644 --- a/isis/src/qisis/objs/ControlDisplayProperties/ControlDisplayProperties.h +++ b/isis/src/qisis/objs/ControlDisplayProperties/ControlDisplayProperties.h @@ -1,27 +1,13 @@ #ifndef ControlDisplayProperties_H #define ControlDisplayProperties_H -/** - * @file - * $Revision: 1.9 $ - * $Date: 2012/06/12 06:30:00 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include // required since we're adding to QVariant @@ -166,4 +152,3 @@ namespace Isis { Q_DECLARE_METATYPE(QList); #endif - diff --git a/isis/src/qisis/objs/ControlHealthMonitorView/ControlHealthMonitorView.cpp b/isis/src/qisis/objs/ControlHealthMonitorView/ControlHealthMonitorView.cpp index 83adadf4f2..4557405237 100644 --- a/isis/src/qisis/objs/ControlHealthMonitorView/ControlHealthMonitorView.cpp +++ b/isis/src/qisis/objs/ControlHealthMonitorView/ControlHealthMonitorView.cpp @@ -1,25 +1,11 @@ -/** - * @file - * $Date$ - * $Revision$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "ControlHealthMonitorView.h" diff --git a/isis/src/qisis/objs/ControlHealthMonitorView/ControlHealthMonitorView.h b/isis/src/qisis/objs/ControlHealthMonitorView/ControlHealthMonitorView.h index 7aa5b8951f..b00e80f760 100644 --- a/isis/src/qisis/objs/ControlHealthMonitorView/ControlHealthMonitorView.h +++ b/isis/src/qisis/objs/ControlHealthMonitorView/ControlHealthMonitorView.h @@ -1,27 +1,14 @@ #ifndef ControlHealthMonitorView_h #define ControlHealthMonitorView_h -/** - * @file - * $Date$ - * $Revision$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include diff --git a/isis/src/qisis/objs/ControlHealthMonitorWidget/ControlHealthMonitorWidget.cpp b/isis/src/qisis/objs/ControlHealthMonitorWidget/ControlHealthMonitorWidget.cpp index 4bed4c132b..bec695e946 100644 --- a/isis/src/qisis/objs/ControlHealthMonitorWidget/ControlHealthMonitorWidget.cpp +++ b/isis/src/qisis/objs/ControlHealthMonitorWidget/ControlHealthMonitorWidget.cpp @@ -1,25 +1,11 @@ -/** - * @file - * $Date$ - * $Revision$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "ControlHealthMonitorWidget.h" diff --git a/isis/src/qisis/objs/ControlHealthMonitorWidget/ControlHealthMonitorWidget.h b/isis/src/qisis/objs/ControlHealthMonitorWidget/ControlHealthMonitorWidget.h index cf0afd1091..bf4f2e2053 100644 --- a/isis/src/qisis/objs/ControlHealthMonitorWidget/ControlHealthMonitorWidget.h +++ b/isis/src/qisis/objs/ControlHealthMonitorWidget/ControlHealthMonitorWidget.h @@ -1,27 +1,13 @@ #ifndef ControlHealthMonitorWidget_h #define ControlHealthMonitorWidget_h -/** - * @file - * $Date$ - * $Revision$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include diff --git a/isis/src/qisis/objs/ControlList/ControlList.cpp b/isis/src/qisis/objs/ControlList/ControlList.cpp index b2eed5235d..8b5dbd3be6 100644 --- a/isis/src/qisis/objs/ControlList/ControlList.cpp +++ b/isis/src/qisis/objs/ControlList/ControlList.cpp @@ -1,25 +1,11 @@ -/** - * @file - * $Revision: 1.19 $ - * $Date: 2010/03/22 19:44:53 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "ControlList.h" #include @@ -655,7 +641,7 @@ namespace Isis { // Only copy controls if saving to new location if (project->newProjectRoot() != project->projectRoot()) { - QFuture future = QtConcurrent::mapped(*this, + QFuture future = QtConcurrent::mapped(*this, CopyControlDataFunctor(project, newProjectRoot)); for (int i = 0; i < count(); i++) { int newProgressValue = progressDialog.value() + 1; diff --git a/isis/src/qisis/objs/ControlList/ControlList.h b/isis/src/qisis/objs/ControlList/ControlList.h index 003ed2464f..49f34e6b08 100644 --- a/isis/src/qisis/objs/ControlList/ControlList.h +++ b/isis/src/qisis/objs/ControlList/ControlList.h @@ -1,6 +1,14 @@ #ifndef ControlList_H #define ControlList_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include diff --git a/isis/src/qisis/objs/ControlMeasureEditWidget/ControlMeasureEditWidget.cpp b/isis/src/qisis/objs/ControlMeasureEditWidget/ControlMeasureEditWidget.cpp index 34e0e404fc..c9329dfd8c 100644 --- a/isis/src/qisis/objs/ControlMeasureEditWidget/ControlMeasureEditWidget.cpp +++ b/isis/src/qisis/objs/ControlMeasureEditWidget/ControlMeasureEditWidget.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "ControlMeasureEditWidget.h" #include @@ -760,8 +768,8 @@ namespace Isis { * Set the tack position of the measure in the left ChipViewport * * @param sample[in] Sample of the tack position for the right ChipViewport - * @param line[in] Line of the tack position for the left ChipViewport - * + * @param line[in] Line of the tack position for the left ChipViewport + * */ void ControlMeasureEditWidget::setLeftPosition(double sample, double line) { @@ -774,8 +782,8 @@ namespace Isis { * Set the tack position of the measure in the right ChipViewport * * @param sample[in] Sample of the tack position for the right ChipViewport - * @param line[in] Line of the tack position for the left ChipViewport - * + * @param line[in] Line of the tack position for the left ChipViewport + * */ void ControlMeasureEditWidget::setRightPosition(double sample, double line) { @@ -1726,8 +1734,8 @@ namespace Isis { * Set the Control Point for this widget * * @param editPoint[in] ControlPoint for this widget - * @param snList[in] SerialNumberList associated with the control net containing the ControlPoint - * + * @param snList[in] SerialNumberList associated with the control net containing the ControlPoint + * */ void ControlMeasureEditWidget::setPoint(ControlPoint *editPoint, SerialNumberList *snList) { @@ -1790,7 +1798,7 @@ namespace Isis { else { blinkViewport->zoom(m_leftView->zoomFactor()); } - m_blinkChipViewportListRight.append(blinkViewport); + m_blinkChipViewportListRight.append(blinkViewport); } m_blinkIndexRight = 0; diff --git a/isis/src/qisis/objs/ControlMeasureEditWidget/ControlMeasureEditWidget.h b/isis/src/qisis/objs/ControlMeasureEditWidget/ControlMeasureEditWidget.h index ab1b0c32b2..a7e899dc18 100644 --- a/isis/src/qisis/objs/ControlMeasureEditWidget/ControlMeasureEditWidget.h +++ b/isis/src/qisis/objs/ControlMeasureEditWidget/ControlMeasureEditWidget.h @@ -1,6 +1,14 @@ #ifndef ControlMeasureEditWidget_h #define ControlMeasureEditWidget_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + // This is the only include allowed in this file! #include @@ -158,7 +166,7 @@ namespace Isis { * points. * @history 2018-10-10 Tracie Sucharski - Fixed blink extension to use geom if selected and * correct zoom factor. - * + * * @todo Re-think design of the change made on 2012-07-26. The linking was put into * ::updateLeftPositionLabel because it was the fastest solution, but * should this be put somewhere else. diff --git a/isis/src/qisis/objs/ControlNetTool/ControlNetTool.cpp b/isis/src/qisis/objs/ControlNetTool/ControlNetTool.cpp index 3c2e25bb00..6cee80cda7 100644 --- a/isis/src/qisis/objs/ControlNetTool/ControlNetTool.cpp +++ b/isis/src/qisis/objs/ControlNetTool/ControlNetTool.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "ControlNetTool.h" #include @@ -38,7 +46,7 @@ using namespace std; namespace Isis { /** * ControlNet tool - Handles mouse button actions and drawing control points on viewports in the - * CubeDnView for the ipce application. + * CubeDnView for the ipce application. * * @param parent Pointer to the parent widget for the ControlNet tool * @@ -373,10 +381,10 @@ namespace Isis { /** * Draw all Fixed or Constrained points on the ground source viewport - * + * * @param vp Viewport whose measurements will be drawn - * @param painter The QPainter used to draw crosshair - * @param groundMap The UniversalGroundMap for the Cube associated with this viewport + * @param painter The QPainter used to draw crosshair + * @param groundMap The UniversalGroundMap for the Cube associated with this viewport * */ void ControlNetTool::drawGroundMeasures(MdiCubeViewport *vp, QPainter *painter, diff --git a/isis/src/qisis/objs/ControlNetTool/ControlNetTool.h b/isis/src/qisis/objs/ControlNetTool/ControlNetTool.h index dfa1f4a5aa..49abbf404b 100644 --- a/isis/src/qisis/objs/ControlNetTool/ControlNetTool.h +++ b/isis/src/qisis/objs/ControlNetTool/ControlNetTool.h @@ -1,6 +1,14 @@ #ifndef ControlNetTool_h #define ControlNetTool_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Tool.h" #include "ControlPoint.h" @@ -29,7 +37,7 @@ namespace Isis { class UniversalGroundMap; /** - * @brief ControlNetTool Handles mouse events on CubeDnViews for control point editing for the + * @brief ControlNetTool Handles mouse events on CubeDnViews for control point editing for the * ipce app. * * @ingroup Visualization Tools @@ -49,7 +57,7 @@ namespace Isis { * @history 2017-08-02 Tracie Sucharski - Draw the current edit Control Point as a circle with * center crosshair in red. Removed refresh method; it was not being * used. Fixes #5007, #5008. - * @history 2017-08-08 Cole Neubauer - Renamed from IpceTool. Fixes #5090. + * @history 2017-08-08 Cole Neubauer - Renamed from IpceTool. Fixes #5090. * @history 2017-08-09 Cole Neubauer - Added loadNetwork() for changing inbetween active * networks Fixes #4567 * @history 2018-03-12 Tracie Sucharski - Fixed some documentation leftover from renaming from diff --git a/isis/src/qisis/objs/ControlPointEdit/ControlPointEdit.cpp b/isis/src/qisis/objs/ControlPointEdit/ControlPointEdit.cpp index 1fd315e9e1..c3c3758c1b 100644 --- a/isis/src/qisis/objs/ControlPointEdit/ControlPointEdit.cpp +++ b/isis/src/qisis/objs/ControlPointEdit/ControlPointEdit.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "ControlPointEdit.h" //TEST diff --git a/isis/src/qisis/objs/ControlPointEdit/ControlPointEdit.h b/isis/src/qisis/objs/ControlPointEdit/ControlPointEdit.h index 598b58485a..5f1957e73e 100644 --- a/isis/src/qisis/objs/ControlPointEdit/ControlPointEdit.h +++ b/isis/src/qisis/objs/ControlPointEdit/ControlPointEdit.h @@ -1,6 +1,14 @@ #ifndef ControlPointEdit_h #define ControlPointEdit_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + // This is the only include allowed in this file! #include @@ -130,16 +138,16 @@ namespace Isis { * @history 2013-12-30 Kimberly Oyama and Stuart Sides - In saveChips(), added single quotes * around the file names in case there are spaces or other special * characters in them. Fixes #1551. - * @history 2015-01-13 Ian Humphrey - Modified setTemplateFile() so opening a template file + * @history 2015-01-13 Ian Humphrey - Modified setTemplateFile() so opening a template file * will undo registration if a point is already registered. Modified * saveMeasure() to handle exception thrown by * ControlMeasure::SetLogData(). Fixes #2041. * @history 2015-10-29 Ian Humphrey - Added shortcuts for Register (R), Save Measure (M), * Undo Registration (U), and Find (F). Fixes #2324. * @history 2017-04-25 Marjorie Hahn - Moved AutoRegFactory creation from the constructor - * to ControlPointEdit::registerPoint() so that AutoRegFactory is + * to ControlPointEdit::registerPoint() so that AutoRegFactory is * not created until it is needed. Fixes #4590. - * + * * @todo Re-think design of the change made on 2012-07-26. The linking was put into * ::updateLeftPositionLabel because it was the fastest solution, but * should this be put somewhere else. diff --git a/isis/src/qisis/objs/ControlPointEditView/ControlPointEditView.cpp b/isis/src/qisis/objs/ControlPointEditView/ControlPointEditView.cpp index 15150ef07b..67a9d438d6 100644 --- a/isis/src/qisis/objs/ControlPointEditView/ControlPointEditView.cpp +++ b/isis/src/qisis/objs/ControlPointEditView/ControlPointEditView.cpp @@ -1,25 +1,11 @@ -/** - * @file - * $Date$ - * $Revision$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "ControlPointEditView.h" diff --git a/isis/src/qisis/objs/ControlPointEditView/ControlPointEditView.h b/isis/src/qisis/objs/ControlPointEditView/ControlPointEditView.h index 154bbf1d11..bc6548bdf8 100644 --- a/isis/src/qisis/objs/ControlPointEditView/ControlPointEditView.h +++ b/isis/src/qisis/objs/ControlPointEditView/ControlPointEditView.h @@ -1,27 +1,14 @@ #ifndef ControlPointEditView_h #define ControlPointEditView_h -/** - * @file - * $Date$ - * $Revision$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include diff --git a/isis/src/qisis/objs/ControlPointEditWidget/ControlPointEditWidget.cpp b/isis/src/qisis/objs/ControlPointEditWidget/ControlPointEditWidget.cpp index 38b90818a9..1945e03d39 100644 --- a/isis/src/qisis/objs/ControlPointEditWidget/ControlPointEditWidget.cpp +++ b/isis/src/qisis/objs/ControlPointEditWidget/ControlPointEditWidget.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "ControlPointEditWidget.h" @@ -560,14 +568,14 @@ namespace Isis { /** - * Fill m_projectShapeNames with ALL shapes currently in project. The first + * Fill m_projectShapeNames with ALL shapes currently in project. The first * m_numberProjectShapesWithPoint actually contain the location of m_editPoint. * - * @param latitude (double) Latitude for determining point location. Defaults to Null which + * @param latitude (double) Latitude for determining point location. Defaults to Null which * results in the m_editPoint location being used, AprioriCoordinates * if they exist, otherwise the reference measure's location will be * used. - * @param longitude (double) Longitude for determining point location. Defaults to Null which + * @param longitude (double) Longitude for determining point location. Defaults to Null which * results in the m_editPoint location being used, AprioriCoordinates * if they exist, otherwise the reference measure's location will be * used. @@ -831,7 +839,7 @@ namespace Isis { success = false; } else { - groundSourceType = m_editPoint->GetAprioriSurfacePointSource(); + groundSourceType = m_editPoint->GetAprioriSurfacePointSource(); success = true; } } @@ -867,12 +875,12 @@ namespace Isis { /** - * Ground source file from control net cannot be found, give user option to give new location. - * The option also exists to change for the rest of the ground points in the control net and to - * change the apriori xyz source file in the control net to the new location. - * + * Ground source file from control net cannot be found, give user option to give new location. + * The option also exists to change for the rest of the ground points in the control net and to + * change the apriori xyz source file in the control net to the new location. + * * @param groundFile FileName of ground source that has moved location - * + * * @return FileName Ground source with new location path * */ @@ -894,7 +902,7 @@ namespace Isis { // If can't find ground, re-prompt user for new location. Maybe it's a new ground source. if (!newGroundFile.fileExists()) { - // Give options for finding ground source file location. A new location + // Give options for finding ground source file location. A new location // for new location or new source, either a Shape in the project, or import a new shape, // or simplay choose file? QString message = "Ground Source file " + groundFile.expanded(); @@ -946,7 +954,7 @@ namespace Isis { for (int i = 0; i < m_controlNet->GetNumPoints(); i++ ) { ControlPoint *cp = m_controlNet->GetPoint(i); if (cp->HasAprioriSurfacePointSourceFile()) { - FileName groundFile(cp->GetAprioriSurfacePointSourceFile()); + FileName groundFile(cp->GetAprioriSurfacePointSourceFile()); QFileInfo oldFile(groundFile.expanded()); QFileInfo newFile(m_newGroundDir, oldFile.fileName()); groundFile = newFile.absoluteFilePath(); @@ -1002,9 +1010,9 @@ namespace Isis { /** - * Initialize the given Dem and appropriate member variables for later use editing Fixed or - * Constrained control points. - * + * Initialize the given Dem and appropriate member variables for later use editing Fixed or + * Constrained control points. + * * @param demFile QString The file name of the DEM * */ @@ -1095,8 +1103,8 @@ namespace Isis { /** * Slot called when user changes selection in m_groundSourceCombo - * - * @param index int + * + * @param index int * */ void ControlPointEditWidget::groundSourceFileSelectionChanged(int index) { @@ -1129,13 +1137,13 @@ namespace Isis { if (m_leftCombo->findText(QFileInfo(m_groundFilename).fileName()) >= 0) { m_leftCombo->removeItem(m_leftCombo->findText(QFileInfo(m_groundFilename).fileName())); if (m_leftMeasure->GetCubeSerialNumber() == m_groundSN) { - selectLeftMeasure(0); + selectLeftMeasure(0); } } if (m_rightCombo->findText(QFileInfo(m_groundFilename).fileName())) { m_rightCombo->removeItem(m_rightCombo->findText(QFileInfo(m_groundFilename).fileName())); if (m_rightMeasure->GetCubeSerialNumber() == m_groundSN) { - selectRightMeasure(0); + selectRightMeasure(0); } } m_pointFiles.removeAll(m_groundFilename); @@ -1206,7 +1214,7 @@ namespace Isis { /** * Load point into ControlPointEditWidget. * - * @param serialNumber (QString) The serial number of cube point was chosen from. + * @param serialNumber (QString) The serial number of cube point was chosen from. * * @internal * @history 2008-11-26 Jeannie Walldren - Added "Number of Measures" to @@ -1280,10 +1288,10 @@ namespace Isis { aprioriSurfacePointFile = checkGroundFileLocation(aprioriSurfacePointFile); } if (!aprioriSurfacePointFile.toString().isEmpty()) { - m_groundSourceCombo->addItem(aprioriSurfacePointFile.toString()); + m_groundSourceCombo->addItem(aprioriSurfacePointFile.toString()); m_groundSourceCombo->setCurrentText(aprioriSurfacePointFile.toString()); m_groundSourceCombo->setItemData(m_groundSourceCombo->currentIndex(), - QColor(Qt::darkGreen), Qt::ForegroundRole); + QColor(Qt::darkGreen), Qt::ForegroundRole); m_groundSourceCombo->setItemData(m_groundSourceCombo->currentIndex(), QFont("DejaVu Sans", 10, QFont::Bold), Qt::FontRole); } @@ -1299,11 +1307,11 @@ namespace Isis { QFont("DejaVu Sans", 10, QFont::Bold), Qt::FontRole); } if (m_editPoint->GetType() == ControlPoint::Free) { - m_groundSourceCombo->setEnabled(false); + m_groundSourceCombo->setEnabled(false); m_radiusSourceCombo->setEnabled(false); } else { - m_groundSourceCombo->setEnabled(true); + m_groundSourceCombo->setEnabled(true); m_radiusSourceCombo->setEnabled(true); } m_groundSourceCombo->blockSignals(false); @@ -1435,12 +1443,12 @@ namespace Isis { /** - * Create a new control point at the given latitude, longitude - * + * Create a new control point at the given latitude, longitude + * * @param latitude The latitude position for the new control point * @param longitude The longitude position for the new control point - * @param cube The cube that the user used to select position for new control point - * @param isGroundSource Boolean indicating whether the cube used to choose position is a ground source + * @param cube The cube that the user used to select position for new control point + * @param isGroundSource Boolean indicating whether the cube used to choose position is a ground source * */ @@ -1791,9 +1799,9 @@ namespace Isis { } // If this is a fixed or constrained point, and either the left or right measure is the ground - // source, update the lat,lon,radius. + // source, update the lat,lon,radius. // - if (m_editPoint->GetType() != ControlPoint::Free && + if (m_editPoint->GetType() != ControlPoint::Free && (m_leftMeasure->GetCubeSerialNumber() == m_groundSN || m_rightMeasure->GetCubeSerialNumber() == m_groundSN)) { // If point is locked and it is not a new point, print error @@ -2062,7 +2070,7 @@ namespace Isis { else { Shape *shape = m_nameToShapeMap[m_radiusSourceCombo->currentText()]; if (shape) { - m_radiusFilename = shape->cube()->externalCubeFileName().toString(); + m_radiusFilename = shape->cube()->externalCubeFileName().toString(); //m_radiusSourceType = shape->radiusSource(); } // Radius source comes from what is already saved in the cnet as AprioriRadiusSourceFile @@ -2087,11 +2095,11 @@ namespace Isis { QString msg = "Could not read radius from DEM, will default to " "local radius of reference measure."; QMessageBox::warning(this, "Warning", msg); - if (m_editPoint->GetRefMeasure()->Camera()->SetGround(Latitude(lat, Angle::Degrees), + if (m_editPoint->GetRefMeasure()->Camera()->SetGround(Latitude(lat, Angle::Degrees), Longitude(lon, Angle::Degrees))) { radius = m_editPoint->GetRefMeasure()->Camera()->LocalRadius().meters(); // TODO Should this be set here, this is probably not working as intended since it is - // overwritten below outside of if (radius == Null) + // overwritten below outside of if (radius == Null) m_editPoint->SetAprioriRadiusSource(ControlPoint::RadiusSource::None); } else { diff --git a/isis/src/qisis/objs/ControlPointEditWidget/ControlPointEditWidget.h b/isis/src/qisis/objs/ControlPointEditWidget/ControlPointEditWidget.h index 903cb44aa3..21c34b37be 100644 --- a/isis/src/qisis/objs/ControlPointEditWidget/ControlPointEditWidget.h +++ b/isis/src/qisis/objs/ControlPointEditWidget/ControlPointEditWidget.h @@ -1,6 +1,14 @@ #ifndef ControlPointEditWidget_h #define ControlPointEditWidget_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "ControlPoint.h" #include "FileName.h" @@ -315,7 +323,7 @@ namespace Isis { //! constrained points in the network bool m_changeGroundLocationInNet; //!< Change the ground source location QString m_newGroundDir; //!< Contains the ground source location - + // TODO: Combine the following m_groundSourceFile, m_radiusSourceFile // with m_groundFile and m_demFile. Is it just a matter of // full path vs filename only? diff --git a/isis/src/qisis/objs/ControlPointEditWidget/DeleteControlPointDialog.cpp b/isis/src/qisis/objs/ControlPointEditWidget/DeleteControlPointDialog.cpp index c68b8abc58..442d2c3834 100644 --- a/isis/src/qisis/objs/ControlPointEditWidget/DeleteControlPointDialog.cpp +++ b/isis/src/qisis/objs/ControlPointEditWidget/DeleteControlPointDialog.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include "DeleteControlPointDialog.h" diff --git a/isis/src/qisis/objs/ControlPointEditWidget/DeleteControlPointDialog.h b/isis/src/qisis/objs/ControlPointEditWidget/DeleteControlPointDialog.h index c896d5ca19..cd2860f977 100644 --- a/isis/src/qisis/objs/ControlPointEditWidget/DeleteControlPointDialog.h +++ b/isis/src/qisis/objs/ControlPointEditWidget/DeleteControlPointDialog.h @@ -1,6 +1,14 @@ #ifndef DeleteControlPointDialog_h #define DeleteControlPointDialog_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include "ui_DeleteControlPointDialog.h" diff --git a/isis/src/qisis/objs/ControlPointEditWidget/NewGroundSourceLocationDialog.cpp b/isis/src/qisis/objs/ControlPointEditWidget/NewGroundSourceLocationDialog.cpp index 287285627a..f2f128fafb 100644 --- a/isis/src/qisis/objs/ControlPointEditWidget/NewGroundSourceLocationDialog.cpp +++ b/isis/src/qisis/objs/ControlPointEditWidget/NewGroundSourceLocationDialog.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "NewGroundSourceLocationDialog.h" #include @@ -12,10 +20,10 @@ namespace Isis { /** * Dialog to determine new ground source location - * + * * @param title - Dialog Title - * @param filterList - Dialog Filter list - * @param dir - Current Directory + * @param filterList - Dialog Filter list + * @param dir - Current Directory * @param parent - Parent widget */ NewGroundSourceLocationDialog::NewGroundSourceLocationDialog(QString title, QString &directory, @@ -36,14 +44,14 @@ namespace Isis { // hBoxLayout->setAlignment(Qt::AlignLeft); // hBoxLayout->setSpacing(25); // hBoxLayout->setContentsMargins (25, 11, 25, 11 ); - + // Button Group // QButtonGroup *optionsButtonGroup = new QButtonGroup(); m_changeAllGround = new QCheckBox("Change location of all subsequent ground points loaded", this); // m_changeAllGround->setWhatsThis("Save the Image As Viewed with Full Resoultion"); - + m_changeControlNet = new QCheckBox("Change location of ground source in control net." " Note: If above box is checked, all locations will" " be changed.", this); @@ -53,7 +61,7 @@ namespace Isis { vertBoxLayout->addWidget(m_changeAllGround); vertBoxLayout->addWidget(m_changeControlNet); - + // Get parent's layout (FileDialog), then add new buttons QLayout *dialogLayout = layout(); dialogLayout->addItem(vertBoxLayout); @@ -62,22 +70,21 @@ namespace Isis { /** - * Indicates whether all subsequent ground source files should be found in new source directory. - * + * Indicates whether all subsequent ground source files should be found in new source directory. + * */ bool NewGroundSourceLocationDialog::changeAllGroundSourceLocation() { return m_changeAllGround->isChecked(); } - + /** * Indicates whether the control network should be changed to reflect new ground source location. - * + * */ bool NewGroundSourceLocationDialog::changeControlNet() { return m_changeControlNet->isChecked(); } } - diff --git a/isis/src/qisis/objs/ControlPointEditWidget/NewGroundSourceLocationDialog.h b/isis/src/qisis/objs/ControlPointEditWidget/NewGroundSourceLocationDialog.h index 955cf45791..8231783090 100644 --- a/isis/src/qisis/objs/ControlPointEditWidget/NewGroundSourceLocationDialog.h +++ b/isis/src/qisis/objs/ControlPointEditWidget/NewGroundSourceLocationDialog.h @@ -1,24 +1,14 @@ #ifndef NewGroundSourceLocationDialog_h #define NewGroundSourceLocationDialog_h -/** - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ - +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -30,8 +20,8 @@ namespace Isis { /** - * @brief Dialog used by ControlPointEditWidget to select a new location for ground source files. - * Gives option of using new location for all subsequent ground points and whether to update the + * @brief Dialog used by ControlPointEditWidget to select a new location for ground source files. + * Gives option of using new location for all subsequent ground points and whether to update the * control net to reflect the new location. * * @ingroup Visualization Tools @@ -45,11 +35,11 @@ namespace Isis { Q_OBJECT public: NewGroundSourceLocationDialog(QString title, QString &directory, QWidget *parent = 0); - + // QDir newGroundSourceLocation(); bool changeAllGroundSourceLocation(); bool changeControlNet(); - + private: QPointer m_changeAllGround; //!< Change location of all subsequent ground control points QPointer m_changeControlNet; //!< Change location of ground source in the control network @@ -57,4 +47,3 @@ namespace Isis { }; #endif - diff --git a/isis/src/qisis/objs/CubeDnView/CubeDnView.cpp b/isis/src/qisis/objs/CubeDnView/CubeDnView.cpp index 95a05cfdc2..ebfbc5a440 100644 --- a/isis/src/qisis/objs/CubeDnView/CubeDnView.cpp +++ b/isis/src/qisis/objs/CubeDnView/CubeDnView.cpp @@ -1,25 +1,11 @@ -/** - * @file - * $Date$ - * $Revision$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "CubeDnView.h" #include diff --git a/isis/src/qisis/objs/CubeDnView/CubeDnView.h b/isis/src/qisis/objs/CubeDnView/CubeDnView.h index e8c32d3a1b..94bb32ddaf 100644 --- a/isis/src/qisis/objs/CubeDnView/CubeDnView.h +++ b/isis/src/qisis/objs/CubeDnView/CubeDnView.h @@ -1,27 +1,13 @@ #ifndef CubeDnView_h #define CubeDnView_h -/** - * @file - * $Date$ - * $Revision$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include diff --git a/isis/src/qisis/objs/CubePlotCurve/CubePlotCurve.cpp b/isis/src/qisis/objs/CubePlotCurve/CubePlotCurve.cpp index 92c3d5112b..5d68344478 100644 --- a/isis/src/qisis/objs/CubePlotCurve/CubePlotCurve.cpp +++ b/isis/src/qisis/objs/CubePlotCurve/CubePlotCurve.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "CubePlotCurve.h" @@ -378,11 +386,11 @@ namespace Isis { size = m_sourceCube.size(); classData.append((char *)&size, sizeof(int)); - + for (int i = 0; i < size; i++) { int sourceCubeSize = m_sourceCube.at(i).toUtf8().size(); classData.append((char *)&sourceCubeSize, sizeof(int)); - classData.append(m_sourceCube.at(i).toUtf8()); + classData.append(m_sourceCube.at(i).toUtf8()); } size = m_pointList.size(); @@ -470,7 +478,7 @@ namespace Isis { deleteThisCurve = true; } } - // handle the configure action dialog + // handle the configure action dialog // opens the dialog with only the right-clicked CubePlotCurve else if (chosenAct == configureAct) { CubePlotCurveConfigureDialog configure(this); diff --git a/isis/src/qisis/objs/CubePlotCurve/CubePlotCurve.h b/isis/src/qisis/objs/CubePlotCurve/CubePlotCurve.h index 41703a466d..97718d1cfc 100644 --- a/isis/src/qisis/objs/CubePlotCurve/CubePlotCurve.h +++ b/isis/src/qisis/objs/CubePlotCurve/CubePlotCurve.h @@ -1,28 +1,13 @@ #ifndef CubePlotCurve_h #define CubePlotCurve_h -/** - * @file - * $Revision: 1.5 $ - * $Date: 2008/06/19 15:54:03 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include @@ -62,9 +47,9 @@ namespace Isis { * necessary. Fixes #688. * @history 2012-03-14 Tracie Sucharski - Added functionality for multiple * viewports as a source for plots. - * @history 2014-07-02 Ian Humphrey - Added comment for executing configure dialog. + * @history 2014-07-02 Ian Humphrey - Added comment for executing configure dialog. * References #2089. - */ + */ class CubePlotCurve : public QObject, public PlotCurve { Q_OBJECT @@ -106,7 +91,7 @@ namespace Isis { void mousePressEvent(QMouseEvent *e); void clearSource(); - void addSource(CubeViewport *cvp, QList screenPoints, + void addSource(CubeViewport *cvp, QList screenPoints, int band = -1); private: @@ -134,4 +119,3 @@ namespace Isis { Q_DECLARE_METATYPE(Isis::CubePlotCurve *); #endif - diff --git a/isis/src/qisis/objs/CubePlotCurve/CubePlotCurveConfigureDialog.cpp b/isis/src/qisis/objs/CubePlotCurve/CubePlotCurveConfigureDialog.cpp index 3060955f14..59b8790b53 100644 --- a/isis/src/qisis/objs/CubePlotCurve/CubePlotCurveConfigureDialog.cpp +++ b/isis/src/qisis/objs/CubePlotCurve/CubePlotCurveConfigureDialog.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "CubePlotCurveConfigureDialog.h" #include @@ -24,24 +32,24 @@ namespace Isis { */ CubePlotCurveConfigureDialog::CubePlotCurveConfigureDialog( CubePlotCurve *curve, QWidget *parent) : QDialog(parent) { - m_plotCurve = curve; + m_plotCurve = curve; m_parent = parent; // initially set selected curve index to 0 (first curve) m_selectedCurve = 0; - + // we can grab the CubePlotCurve QList from the parent widget (PlotWindow) if (parent) { connect( parent, SIGNAL( plotChanged() ), this, SLOT( updateCurvesList() ) ); m_plotCurvesList = qobject_cast(parent)->plotCurves(); - } + } else { m_plotCurvesList.append(curve); } QGridLayout *optionsLayout = new QGridLayout; - int row = 0; - + int row = 0; + // only create a combo box if instantiating this dialog with the configure tool button if (parent) { QLabel *curvesLabel = new QLabel("Curves: "); @@ -52,7 +60,7 @@ namespace Isis { optionsLayout->addWidget(m_curvesCombo, row, 1); row++; } - + QLabel *nameLabel = new QLabel("Curve Name: "); m_nameEdit = new QLineEdit( m_plotCurve->title().text() ); optionsLayout->addWidget(nameLabel, row, 0); @@ -154,8 +162,8 @@ namespace Isis { readSettingsFromCurve(); } - - + + /** * This destroys the configuration dialog, which happens when the user closes * it or clicks ok or cancel. @@ -216,9 +224,9 @@ namespace Isis { if (m_selectedCurve > m_plotCurvesList.size() - 1 || m_selectedCurve < 0) { throw IException(IException::Programmer, "Curves combobox index out of bounds", _FILEINFO_); } - + m_plotCurve = m_plotCurvesList[m_selectedCurve]; - + setWindowTitle( "Configure " + m_plotCurve->title().text() ); // see if the curves combo box exists in the dialog (right-clicking a curve will not create @@ -234,7 +242,7 @@ namespace Isis { // m_curvesCombo->setItemText( m_curvesCombo->currentIndex(), m_plotCurve->title().text() ); m_curvesCombo->blockSignals(false); } - + m_nameEdit->setText( m_plotCurve->title().text() ); QPalette colorPalette; @@ -267,13 +275,13 @@ namespace Isis { } } - + void CubePlotCurveConfigureDialog::updateComboIndex(int selected) { m_selectedCurve = selected; readSettingsFromCurve(); } - - + + void CubePlotCurveConfigureDialog::updateCurvesList() { QList newPlotCurveList = qobject_cast(m_parent)->plotCurves(); // if we deleted a plot curve, the new list will be smaller in size, reset m_selectedCurve diff --git a/isis/src/qisis/objs/CubePlotCurve/CubePlotCurveConfigureDialog.h b/isis/src/qisis/objs/CubePlotCurve/CubePlotCurveConfigureDialog.h index 8ab61cd297..448fa26c3b 100644 --- a/isis/src/qisis/objs/CubePlotCurve/CubePlotCurveConfigureDialog.h +++ b/isis/src/qisis/objs/CubePlotCurve/CubePlotCurveConfigureDialog.h @@ -1,6 +1,14 @@ #ifndef CubePlotCurveConfigureDialog_h #define CubePlotCurveConfigureDialog_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -25,8 +33,8 @@ namespace Isis { * @internal * @history 2012-01-20 Steven Lambright and Jai Rideout - Completed * documentation. - * @history 2014-07-25 Ian Humphrey - Added configure tool menu item. This allows user to - * right-click a curve (as previously) or select configure tool menu + * @history 2014-07-25 Ian Humphrey - Added configure tool menu item. This allows user to + * right-click a curve (as previously) or select configure tool menu * item to configure a plot curve's color, symbol, line style, etc. * Fixes #2089. */ diff --git a/isis/src/qisis/objs/CubeViewport/CubeViewport.cpp b/isis/src/qisis/objs/CubeViewport/CubeViewport.cpp index 00cb2a58ac..2bb966ed0d 100644 --- a/isis/src/qisis/objs/CubeViewport/CubeViewport.cpp +++ b/isis/src/qisis/objs/CubeViewport/CubeViewport.cpp @@ -1,22 +1,11 @@ -/** - * @file - * $Date: 2010/06/30 03:38:12 $ - * $Revision: 1.46 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public domain. See - * individual third-party library and package descriptions for intellectual property information, - * user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, is made by the - * USGS as to the accuracy and functioning of such software and related material nor shall the - * fact of distribution constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "CubeViewport.h" @@ -377,7 +366,7 @@ namespace Isis { } p_cube = NULL; - + delete p_trackingCube; p_trackingCube = NULL; diff --git a/isis/src/qisis/objs/CubeViewport/CubeViewport.h b/isis/src/qisis/objs/CubeViewport/CubeViewport.h index 4d88fd5c00..83ffc5b475 100644 --- a/isis/src/qisis/objs/CubeViewport/CubeViewport.h +++ b/isis/src/qisis/objs/CubeViewport/CubeViewport.h @@ -1,27 +1,13 @@ #ifndef CubeViewport_h #define CubeViewport_h -/** - * @file - * $Date: 2010/06/30 03:38:12 $ - * $Revision: 1.30 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ // parent of this class diff --git a/isis/src/qisis/objs/CubeViewport/ViewportBuffer.cpp b/isis/src/qisis/objs/CubeViewport/ViewportBuffer.cpp index 1c24f7876d..fe041225a7 100644 --- a/isis/src/qisis/objs/CubeViewport/ViewportBuffer.cpp +++ b/isis/src/qisis/objs/CubeViewport/ViewportBuffer.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "ViewportBuffer.h" diff --git a/isis/src/qisis/objs/CubeViewport/ViewportBuffer.h b/isis/src/qisis/objs/CubeViewport/ViewportBuffer.h index a9befe0a8f..747dbbe15b 100644 --- a/isis/src/qisis/objs/CubeViewport/ViewportBuffer.h +++ b/isis/src/qisis/objs/CubeViewport/ViewportBuffer.h @@ -1,28 +1,13 @@ #ifndef ViewportBuffer_h #define ViewportBuffer_h -/** - * @file - * $Date: 2010/06/03 18:36:14 $ - * $Revision: 1.14 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - * - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include @@ -73,7 +58,7 @@ namespace Isis { * @history 2011-04-25 Steven Lambright - Fixed bounding rect calculations * and fill action creation * @history 2011-06-20 Steven Lambright - Fixed panning issue where panning - * beyond a full screen was a problem. + * beyond a full screen was a problem. */ class ViewportBuffer : public QObject { Q_OBJECT @@ -213,7 +198,7 @@ namespace Isis { * give us cube data before we progress through the queue. */ QQueue< ViewportBufferAction * > * p_actions; - + bool p_bricksOrdered; }; } diff --git a/isis/src/qisis/objs/CubeViewport/ViewportBufferAction.cpp b/isis/src/qisis/objs/CubeViewport/ViewportBufferAction.cpp index f5c853caa7..055efd9021 100644 --- a/isis/src/qisis/objs/CubeViewport/ViewportBufferAction.cpp +++ b/isis/src/qisis/objs/CubeViewport/ViewportBufferAction.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "ViewportBufferAction.h" namespace Isis { diff --git a/isis/src/qisis/objs/CubeViewport/ViewportBufferAction.h b/isis/src/qisis/objs/CubeViewport/ViewportBufferAction.h index ce98ad68c4..e8effa82b5 100644 --- a/isis/src/qisis/objs/CubeViewport/ViewportBufferAction.h +++ b/isis/src/qisis/objs/CubeViewport/ViewportBufferAction.h @@ -1,6 +1,13 @@ #ifndef ViewportBufferAction_h #define ViewportBufferAction_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ namespace Isis { /** diff --git a/isis/src/qisis/objs/CubeViewport/ViewportBufferFill.cpp b/isis/src/qisis/objs/CubeViewport/ViewportBufferFill.cpp index 005de630b4..07b61857db 100644 --- a/isis/src/qisis/objs/CubeViewport/ViewportBufferFill.cpp +++ b/isis/src/qisis/objs/CubeViewport/ViewportBufferFill.cpp @@ -1,3 +1,10 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "ViewportBufferFill.h" diff --git a/isis/src/qisis/objs/CubeViewport/ViewportBufferFill.h b/isis/src/qisis/objs/CubeViewport/ViewportBufferFill.h index 65b789310e..55428fc197 100644 --- a/isis/src/qisis/objs/CubeViewport/ViewportBufferFill.h +++ b/isis/src/qisis/objs/CubeViewport/ViewportBufferFill.h @@ -1,6 +1,14 @@ #ifndef VieportBufferFill_h #define VieportBufferFill_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "ViewportBufferAction.h" class QRect; @@ -14,8 +22,8 @@ namespace Isis { * @history 2011-04-25 Steven Lambright - Fixed a problem where 1 too few * lines were being read * @history 2015-06-30 Makayla Shepherd and Ian Humphrey - Modified stop() to keep the viewport - * buffer object from reading an extra line at the bottom of the viewport - * rectangle. This could potentially cause a crash from reading outside of + * buffer object from reading an extra line at the bottom of the viewport + * rectangle. This could potentially cause a crash from reading outside of * the bounds. Fixes #2171. */ class ViewportBufferFill : public ViewportBufferAction { diff --git a/isis/src/qisis/objs/CubeViewport/ViewportBufferStretch.cpp b/isis/src/qisis/objs/CubeViewport/ViewportBufferStretch.cpp index b4991c0512..be75f2a4d1 100644 --- a/isis/src/qisis/objs/CubeViewport/ViewportBufferStretch.cpp +++ b/isis/src/qisis/objs/CubeViewport/ViewportBufferStretch.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "ViewportBufferStretch.h" diff --git a/isis/src/qisis/objs/CubeViewport/ViewportBufferStretch.h b/isis/src/qisis/objs/CubeViewport/ViewportBufferStretch.h index cd88ae16b3..a7ffc98f0c 100644 --- a/isis/src/qisis/objs/CubeViewport/ViewportBufferStretch.h +++ b/isis/src/qisis/objs/CubeViewport/ViewportBufferStretch.h @@ -1,6 +1,14 @@ #ifndef VieportBufferStretch_h #define VieportBufferStretch_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "ViewportBufferAction.h" class QRect; diff --git a/isis/src/qisis/objs/CubeViewport/ViewportBufferTransform.cpp b/isis/src/qisis/objs/CubeViewport/ViewportBufferTransform.cpp index 504b0e3177..1ea67eec3e 100644 --- a/isis/src/qisis/objs/CubeViewport/ViewportBufferTransform.cpp +++ b/isis/src/qisis/objs/CubeViewport/ViewportBufferTransform.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "ViewportBufferTransform.h" diff --git a/isis/src/qisis/objs/CubeViewport/ViewportBufferTransform.h b/isis/src/qisis/objs/CubeViewport/ViewportBufferTransform.h index 0d569ec3a0..20e67d6ebf 100644 --- a/isis/src/qisis/objs/CubeViewport/ViewportBufferTransform.h +++ b/isis/src/qisis/objs/CubeViewport/ViewportBufferTransform.h @@ -1,7 +1,14 @@ - #ifndef ViewportBufferTransform_h #define ViewportBufferTransform_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "ViewportBufferAction.h" diff --git a/isis/src/qisis/objs/Directory/BundleObservationViewWorkOrder.cpp b/isis/src/qisis/objs/Directory/BundleObservationViewWorkOrder.cpp index cd553f2ac9..9c84376185 100755 --- a/isis/src/qisis/objs/Directory/BundleObservationViewWorkOrder.cpp +++ b/isis/src/qisis/objs/Directory/BundleObservationViewWorkOrder.cpp @@ -1,23 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "BundleObservationViewWorkOrder.h" #include diff --git a/isis/src/qisis/objs/Directory/BundleObservationViewWorkOrder.h b/isis/src/qisis/objs/Directory/BundleObservationViewWorkOrder.h index ef999cf0c7..8d9dccd4f3 100755 --- a/isis/src/qisis/objs/Directory/BundleObservationViewWorkOrder.h +++ b/isis/src/qisis/objs/Directory/BundleObservationViewWorkOrder.h @@ -1,25 +1,14 @@ #ifndef BundleObservationViewWorkOrder_H #define BundleObservationViewWorkOrder_H -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "WorkOrder.h" #include "FileItem.h" diff --git a/isis/src/qisis/objs/Directory/CloseProjectWorkOrder.cpp b/isis/src/qisis/objs/Directory/CloseProjectWorkOrder.cpp index 64864740e7..979a688d91 100644 --- a/isis/src/qisis/objs/Directory/CloseProjectWorkOrder.cpp +++ b/isis/src/qisis/objs/Directory/CloseProjectWorkOrder.cpp @@ -1,25 +1,11 @@ -/** - * @file - * $Revision: 1.19 $ - * $Date: 2010/03/22 19:44:53 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "CloseProjectWorkOrder.h" #include diff --git a/isis/src/qisis/objs/Directory/CloseProjectWorkOrder.h b/isis/src/qisis/objs/Directory/CloseProjectWorkOrder.h index 79cafc3086..93f1b52004 100644 --- a/isis/src/qisis/objs/Directory/CloseProjectWorkOrder.h +++ b/isis/src/qisis/objs/Directory/CloseProjectWorkOrder.h @@ -1,27 +1,14 @@ #ifndef CloseProjectWorkOrder_H #define CloseProjectWorkOrder_H -/** - * @file - * $Revision: 1.19 $ - * $Date: 2010/03/22 19:44:53 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "WorkOrder.h" namespace Isis { diff --git a/isis/src/qisis/objs/Directory/CnetEditorViewWorkOrder.cpp b/isis/src/qisis/objs/Directory/CnetEditorViewWorkOrder.cpp index 9553e11e2d..df5f694a3b 100644 --- a/isis/src/qisis/objs/Directory/CnetEditorViewWorkOrder.cpp +++ b/isis/src/qisis/objs/Directory/CnetEditorViewWorkOrder.cpp @@ -1,25 +1,11 @@ -/** - * @file - * $Revision: 1.19 $ - * $Date: 2010/03/22 19:44:53 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "CnetEditorViewWorkOrder.h" #include diff --git a/isis/src/qisis/objs/Directory/CnetEditorViewWorkOrder.h b/isis/src/qisis/objs/Directory/CnetEditorViewWorkOrder.h index b069b97d5f..17b43777d0 100644 --- a/isis/src/qisis/objs/Directory/CnetEditorViewWorkOrder.h +++ b/isis/src/qisis/objs/Directory/CnetEditorViewWorkOrder.h @@ -1,27 +1,14 @@ #ifndef CnetEditorViewWorkOrder_H #define CnetEditorViewWorkOrder_H -/** - * @file - * $Revision: 1.19 $ - * $Date: 2010/03/22 19:44:53 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "WorkOrder.h" namespace Isis { diff --git a/isis/src/qisis/objs/Directory/ControlHealthMonitorWorkOrder.cpp b/isis/src/qisis/objs/Directory/ControlHealthMonitorWorkOrder.cpp index 9bce86c98a..90ecc8f21c 100644 --- a/isis/src/qisis/objs/Directory/ControlHealthMonitorWorkOrder.cpp +++ b/isis/src/qisis/objs/Directory/ControlHealthMonitorWorkOrder.cpp @@ -1,23 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "ControlHealthMonitorWorkOrder.h" #include diff --git a/isis/src/qisis/objs/Directory/ControlHealthMonitorWorkOrder.h b/isis/src/qisis/objs/Directory/ControlHealthMonitorWorkOrder.h index 92cc63b4f8..2aee26e272 100644 --- a/isis/src/qisis/objs/Directory/ControlHealthMonitorWorkOrder.h +++ b/isis/src/qisis/objs/Directory/ControlHealthMonitorWorkOrder.h @@ -1,25 +1,14 @@ #ifndef ControlHealthMonitorWorkOrder_H #define ControlHealthMonitorWorkOrder_H -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "WorkOrder.h" namespace Isis { diff --git a/isis/src/qisis/objs/Directory/CubeDnViewWorkOrder.cpp b/isis/src/qisis/objs/Directory/CubeDnViewWorkOrder.cpp index c2d1d2104b..d223298032 100644 --- a/isis/src/qisis/objs/Directory/CubeDnViewWorkOrder.cpp +++ b/isis/src/qisis/objs/Directory/CubeDnViewWorkOrder.cpp @@ -1,23 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "CubeDnViewWorkOrder.h" #include diff --git a/isis/src/qisis/objs/Directory/CubeDnViewWorkOrder.h b/isis/src/qisis/objs/Directory/CubeDnViewWorkOrder.h index b0b31193c8..0d63f82392 100644 --- a/isis/src/qisis/objs/Directory/CubeDnViewWorkOrder.h +++ b/isis/src/qisis/objs/Directory/CubeDnViewWorkOrder.h @@ -1,27 +1,14 @@ #ifndef CubeDnViewWorkOrder_H #define CubeDnViewWorkOrder_H -/** - * @file - * $Revision: 1.19 $ - * $Date: 2010/03/22 19:44:53 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "WorkOrder.h" namespace Isis { diff --git a/isis/src/qisis/objs/Directory/Directory.cpp b/isis/src/qisis/objs/Directory/Directory.cpp index 1dd2769bae..d5fc4b8241 100644 --- a/isis/src/qisis/objs/Directory/Directory.cpp +++ b/isis/src/qisis/objs/Directory/Directory.cpp @@ -1,25 +1,11 @@ -/** - * @File - * $Revision: 1.19 $ - * $Date: 2010/03/22 19:44:53 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Directory.h" diff --git a/isis/src/qisis/objs/Directory/Directory.h b/isis/src/qisis/objs/Directory/Directory.h index f5455e3728..995c27164f 100644 --- a/isis/src/qisis/objs/Directory/Directory.h +++ b/isis/src/qisis/objs/Directory/Directory.h @@ -1,27 +1,13 @@ #ifndef Directory_H #define Directory_H -/** - * @file - * $Revision: 1.19 $ - * $Date: 2010/03/22 19:44:53 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include diff --git a/isis/src/qisis/objs/DisplayProperties/DisplayProperties.cpp b/isis/src/qisis/objs/DisplayProperties/DisplayProperties.cpp index 07fbd02d33..ac764eec38 100644 --- a/isis/src/qisis/objs/DisplayProperties/DisplayProperties.cpp +++ b/isis/src/qisis/objs/DisplayProperties/DisplayProperties.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "DisplayProperties.h" #include @@ -206,4 +214,3 @@ namespace Isis { return XmlStackedHandler::endElement(namespaceURI, localName, qName); } } - diff --git a/isis/src/qisis/objs/DisplayProperties/DisplayProperties.h b/isis/src/qisis/objs/DisplayProperties/DisplayProperties.h index 3a02688891..9b06ff1d5f 100644 --- a/isis/src/qisis/objs/DisplayProperties/DisplayProperties.h +++ b/isis/src/qisis/objs/DisplayProperties/DisplayProperties.h @@ -1,6 +1,14 @@ #ifndef DisplayProperties_H #define DisplayProperties_H +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include // This is required since QColor is in a slot @@ -102,4 +110,3 @@ namespace Isis { } #endif - diff --git a/isis/src/qisis/objs/EditTool/EditTool.cpp b/isis/src/qisis/objs/EditTool/EditTool.cpp index 08938c2ba6..8679b44f6b 100644 --- a/isis/src/qisis/objs/EditTool/EditTool.cpp +++ b/isis/src/qisis/objs/EditTool/EditTool.cpp @@ -1,24 +1,10 @@ -/** - * @file - * $Revision: 1.11 $ - * $Date: 2010/06/28 09:00:39 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "EditTool.h" diff --git a/isis/src/qisis/objs/EditTool/EditTool.h b/isis/src/qisis/objs/EditTool/EditTool.h index 3d9727af15..4571c25afd 100644 --- a/isis/src/qisis/objs/EditTool/EditTool.h +++ b/isis/src/qisis/objs/EditTool/EditTool.h @@ -1,27 +1,13 @@ #ifndef EditTool_h #define EditTool_h -/** - * @file - * $Revision: 1.8 $ - * $Date: 2010/06/28 09:00:39 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "Tool.h" @@ -79,7 +65,7 @@ namespace Isis { * @history 2017-08-11 Adam Goins - Added a line of code to recreate a cube with "r" permissions * attempting to open it with "rw" permission failed. This fixes an issue * where the cube would segfault if it was being edited without "w" permission. - * Fixes # 2097 + * Fixes # 2097 */ class EditTool : public Tool { Q_OBJECT diff --git a/isis/src/qisis/objs/FileItem/FileItem.h b/isis/src/qisis/objs/FileItem/FileItem.h index 7b1c4f16fd..e904289f77 100644 --- a/isis/src/qisis/objs/FileItem/FileItem.h +++ b/isis/src/qisis/objs/FileItem/FileItem.h @@ -1,25 +1,13 @@ #ifndef FileItem_h #define FileItem_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include @@ -33,7 +21,7 @@ namespace Isis { * * @author 2017-05-04 J Bonn * - * @internal + * @internal * @history 2017-05-05 Tracie Sucharski - Renamed accessor method to match Isis standards. Moved * class to a Directory under qisis/objs. */ diff --git a/isis/src/qisis/objs/FindTool/FindTool.h b/isis/src/qisis/objs/FindTool/FindTool.h index f06d2b36e3..4da090b88a 100644 --- a/isis/src/qisis/objs/FindTool/FindTool.h +++ b/isis/src/qisis/objs/FindTool/FindTool.h @@ -1,26 +1,13 @@ #ifndef FindTool_h #define FindTool_h -/** - * @file - * $Revision: 1.13 $ - * $Date: 2010/06/28 09:06:59 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ // The only includes allowed in this file are parents of classes defined here. #include @@ -119,7 +106,7 @@ namespace Isis { * to work in more cases. Fixes #953. * @history 2014-05-19 Ian Humphrey - Fixed CTRL+F shortcut and menu option to open Find Tool's * Find Latitude/Longitude Coordinate dialog window. Added help text - * to Find Tool menu option. Minor coding standards fixes. + * to Find Tool menu option. Minor coding standards fixes. * Fixes #2087. * @history 2016-03-23 Makayla Shepherd - Added a check on the latitude * entered that caused an error message to pop up @@ -133,7 +120,7 @@ namespace Isis { ~FindTool(); void addTo(QMenu *menu); void paintViewport(MdiCubeViewport *vp, QPainter *painter); - + /** * This method returns the menu name associated with this tool. * diff --git a/isis/src/qisis/objs/Footprint2DView/Footprint2DView.cpp b/isis/src/qisis/objs/Footprint2DView/Footprint2DView.cpp index be208f6e6e..7a01f3c4a6 100644 --- a/isis/src/qisis/objs/Footprint2DView/Footprint2DView.cpp +++ b/isis/src/qisis/objs/Footprint2DView/Footprint2DView.cpp @@ -1,25 +1,11 @@ -/** - * @file - * $Date$ - * $Revision$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "Footprint2DView.h" @@ -208,10 +194,10 @@ namespace Isis { /** - * Slot to connect to the itemAdded signal from the model. If the item is an image or shape it is - * added to a list. When everything has been added, then the list is added to the scene through - * signal/slot connection from ProjectItemProxyModel signal, itemsAdded which is connected to - * this objects onItemsAdded slot. + * Slot to connect to the itemAdded signal from the model. If the item is an image or shape it is + * added to a list. When everything has been added, then the list is added to the scene through + * signal/slot connection from ProjectItemProxyModel signal, itemsAdded which is connected to + * this objects onItemsAdded slot. * * @param[in] item (ProjectItem *) The item */ @@ -237,9 +223,9 @@ namespace Isis { /** - * Slot called once all selected images have been added to the proxy model. This is much faster - * than adding a single image at a time to the MosaicSceneWidget. This is connected from the - * ProjectItemProxyModel::itemsAdded signal. + * Slot called once all selected images have been added to the proxy model. This is much faster + * than adding a single image at a time to the MosaicSceneWidget. This is connected from the + * ProjectItemProxyModel::itemsAdded signal. * */ void Footprint2DView::onItemsAdded() { diff --git a/isis/src/qisis/objs/Footprint2DView/Footprint2DView.h b/isis/src/qisis/objs/Footprint2DView/Footprint2DView.h index f73769cdbb..34a8414103 100644 --- a/isis/src/qisis/objs/Footprint2DView/Footprint2DView.h +++ b/isis/src/qisis/objs/Footprint2DView/Footprint2DView.h @@ -1,27 +1,14 @@ #ifndef Footprint2DView_h #define Footprint2DView_h -/** - * @file - * $Date$ - * $Revision$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include @@ -110,7 +97,7 @@ namespace Isis { * Image constructor which takes a footprint and id, so that the * MosaicSceneWidget can properly serialize Shapes that have been added. * Fixes #5495. - * + * */ class Footprint2DView : public AbstractProjectItemView { diff --git a/isis/src/qisis/objs/HelpTool/HelpTool.h b/isis/src/qisis/objs/HelpTool/HelpTool.h index 371ea48b8b..fc7ca7bcee 100644 --- a/isis/src/qisis/objs/HelpTool/HelpTool.h +++ b/isis/src/qisis/objs/HelpTool/HelpTool.h @@ -1,24 +1,13 @@ #ifndef HelpTool_h #define HelpTool_h -/** - * @file - * $Date: 2007/06/14 23:57:15 $ $Revision: 1.2 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public domain. See - * individual third-party library and package descriptions for intellectual property information, - * user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, is made by the - * USGS as to the accuracy and functioning of such software and related material nor shall the - * fact of distribution constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include "Tool.h" diff --git a/isis/src/qisis/objs/IndependentCubeViewport/IndependentCubeViewport.cpp b/isis/src/qisis/objs/IndependentCubeViewport/IndependentCubeViewport.cpp index dd11ae0ba8..cdbb0b5890 100644 --- a/isis/src/qisis/objs/IndependentCubeViewport/IndependentCubeViewport.cpp +++ b/isis/src/qisis/objs/IndependentCubeViewport/IndependentCubeViewport.cpp @@ -1,22 +1,10 @@ -/** - * @file - * $Date: 2010/06/28 08:42:54 $ - * $Revision: 1.1 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public domain. See - * individual third-party library and package descriptions for intellectual property information, - * user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, is made by the - * USGS as to the accuracy and functioning of such software and related material nor shall the - * fact of distribution constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "IndependentCubeViewport.h" @@ -85,7 +73,7 @@ namespace Isis } } - + bool IndependentCubeViewport::eventFilter(QObject * o, QEvent * e) { // Handle standard mouse tracking on the viewport @@ -107,7 +95,7 @@ namespace Isis { if (panning) emit synchronize(this); - + handleMouseMove(currentPosition); break; } @@ -167,8 +155,8 @@ namespace Isis globalStretch.CopyPairs(StretchTool::stretchBand(this, StretchTool::Gray)); stretchGray(globalStretch); } - - + + void IndependentCubeViewport::showEvent(QShowEvent * event) { QAbstractScrollArea::show(); @@ -176,20 +164,20 @@ namespace Isis CubeViewport::showEvent(event); restretch(grayBuffer()); } - + void IndependentCubeViewport::resetKnownGlobal() { - + p_globalStretches->clear(); for (int i = 0; i < cubeBands(); i++) p_globalStretches->append(NULL); - + if (isVisible()) grayBuffer()->addStretchAction(); } - - + + void IndependentCubeViewport::cubeDataChanged(int cubeId, const Isis::Brick * data) { @@ -203,44 +191,44 @@ namespace Isis { // reset the global stretch Stretch *& globalStretch = (*p_globalStretches)[data->Band() - 1]; - + if (globalStretch) { delete globalStretch; globalStretch = NULL; } - - + + Stretch newGlobal = grayStretch(); newGlobal.ClearPairs(); Statistics stats; stats.AddData(data->DoubleBuffer(), data->size()); - + if (stats.ValidPixels() > 1 && fabs(stats.Minimum() - stats.Maximum()) > DBL_EPSILON) { Histogram hist(stats.BestMinimum(), stats.BestMaximum(), 65536); hist.AddData(data->DoubleBuffer(), data->size()); - + if (fabs(hist.Percent(0.5) - hist.Percent(99.5)) > DBL_EPSILON) { newGlobal.AddPair(hist.Percent(0.5), 0.0); newGlobal.AddPair(hist.Percent(99.5), 255.0); } } - + if (newGlobal.Pairs() == 0) { newGlobal.AddPair(-DBL_MAX, 0.0); newGlobal.AddPair(DBL_MAX, 255.0); } - + globalStretch = new CubeStretch(newGlobal); - + if (isVisible()) stretchGray(newGlobal); } - + CubeViewport::cubeDataChanged(cubeId, data); } @@ -353,7 +341,7 @@ namespace Isis setScale(other->scale(), thisCenterSamp, thisCenterLine); } - + QRect IndependentCubeViewport::bandingRect() { QRect rect; @@ -397,7 +385,7 @@ namespace Isis << "line: " << line << "\n"; */ // if sample and line in range then do tracking - + double dn; if (sample >= 0.5 && sample <= cubeSamples() + 0.5 && line >= 0.5 && line <= cubeLines() + 0.5 && @@ -410,12 +398,12 @@ namespace Isis // Determine the projection type if we have a projection Projection::ProjectionType projType = Projection::Triaxial; if (projSucceeds) projType = projection()->projectionType(); - + if (camSucceeds || projSucceeds) { double lat = 0.0; double lon = 0.0; - + if (camSucceeds) { lat = camera()->UniversalLatitude(); @@ -435,7 +423,7 @@ namespace Isis lon = rproj->RingLongitude(); } } - + emit trackingChanged(sample, line, lat, lon, dn, this); } else @@ -461,7 +449,7 @@ namespace Isis const int bufY = p.y() - rect.top(); dn = buffer->getLine(bufY)[bufX]; } - + return success; } diff --git a/isis/src/qisis/objs/IndependentCubeViewport/IndependentCubeViewport.h b/isis/src/qisis/objs/IndependentCubeViewport/IndependentCubeViewport.h index c0395f4ae4..e1e7871c5d 100644 --- a/isis/src/qisis/objs/IndependentCubeViewport/IndependentCubeViewport.h +++ b/isis/src/qisis/objs/IndependentCubeViewport/IndependentCubeViewport.h @@ -1,27 +1,13 @@ #ifndef IndependentCubeViewport_h #define IndependentCubeViewport_h -/** - * @file - * $Date: 2010/06/28 08:42:54 $ - * $Revision: 1.1 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ // parent class #include "CubeViewport.h" @@ -64,21 +50,21 @@ namespace Isis IndependentCubeViewport(Cube * cube, CubeDataThread * cdt = 0, QWidget * parent = 0); ~IndependentCubeViewport(); - + bool eventFilter(QObject * o, QEvent * e); void paintEvent(QPaintEvent * e); void restretch(ViewportBuffer *); virtual void showEvent(QShowEvent * e); - - + + public slots: void resetKnownGlobal(); - - + + protected slots: virtual void cubeDataChanged(int cubeId, const Brick *); - - + + signals: void synchronize(IndependentCubeViewport *); void trackingChanged(double sample, double line, double lat, double lon, @@ -86,24 +72,24 @@ namespace Isis void trackingChanged(double samp, double line, double dn, IndependentCubeViewport *); void cantTrack(QString, IndependentCubeViewport *); - - - + + + private slots: void handleMouseMove(QPoint); void handleMousePress(QPoint, Qt::MouseButton b); void handleMouseRelease(QPoint); void handleSynchronization(IndependentCubeViewport *); - - + + private: // methods QRect bandingRect(); void stretch(); void track(const QPoint &); void zoom(); bool trackBuffer(ViewportBuffer *, const QPoint &, double &); - - + + private: bool banding; bool panning; diff --git a/isis/src/qisis/objs/MdiCubeViewport/MdiCubeViewport.cpp b/isis/src/qisis/objs/MdiCubeViewport/MdiCubeViewport.cpp index 9b1fe1ac0d..059ddfa533 100644 --- a/isis/src/qisis/objs/MdiCubeViewport/MdiCubeViewport.cpp +++ b/isis/src/qisis/objs/MdiCubeViewport/MdiCubeViewport.cpp @@ -1,22 +1,10 @@ -/** - * @file - * $Date: 2010/06/30 03:42:28 $ - * $Revision: 1.2 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public domain. See - * individual third-party library and package descriptions for intellectual property information, - * user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, is made by the - * USGS as to the accuracy and functioning of such software and related material nor shall the - * fact of distribution constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "MdiCubeViewport.h" diff --git a/isis/src/qisis/objs/MdiCubeViewport/MdiCubeViewport.h b/isis/src/qisis/objs/MdiCubeViewport/MdiCubeViewport.h index 71b661125d..da8a217f18 100644 --- a/isis/src/qisis/objs/MdiCubeViewport/MdiCubeViewport.h +++ b/isis/src/qisis/objs/MdiCubeViewport/MdiCubeViewport.h @@ -1,27 +1,13 @@ #ifndef MdiCubeViewport_h #define MdiCubeViewport_h -/** - * @file - * $Date: 2010/06/30 03:42:28 $ - * $Revision: 1.2 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "CubeViewport.h" diff --git a/isis/src/qisis/objs/ProjectItem/ProjectItem.h b/isis/src/qisis/objs/ProjectItem/ProjectItem.h index b2a5268eeb..51fba8fc5c 100644 --- a/isis/src/qisis/objs/ProjectItem/ProjectItem.h +++ b/isis/src/qisis/objs/ProjectItem/ProjectItem.h @@ -1,25 +1,13 @@ #ifndef ProjectItem_h #define ProjectItem_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include diff --git a/isis/src/qisis/objs/ProjectItemModel/ProjectItemModel.cpp b/isis/src/qisis/objs/ProjectItemModel/ProjectItemModel.cpp index 22db1ee595..b1d3c4ffa8 100644 --- a/isis/src/qisis/objs/ProjectItemModel/ProjectItemModel.cpp +++ b/isis/src/qisis/objs/ProjectItemModel/ProjectItemModel.cpp @@ -1,23 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "ProjectItemModel.h" diff --git a/isis/src/qisis/objs/ProjectItemModel/ProjectItemModel.h b/isis/src/qisis/objs/ProjectItemModel/ProjectItemModel.h index 0bcf772b71..dd33f87981 100644 --- a/isis/src/qisis/objs/ProjectItemModel/ProjectItemModel.h +++ b/isis/src/qisis/objs/ProjectItemModel/ProjectItemModel.h @@ -1,27 +1,13 @@ #ifndef ProjectItemModel_h #define ProjectItemModel_h -/** - * @file - * $Date$ - * $Revision$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include diff --git a/isis/src/qisis/objs/ProjectItemProxyModel/ProjectItemProxyModel.cpp b/isis/src/qisis/objs/ProjectItemProxyModel/ProjectItemProxyModel.cpp index 415594fb9c..22f6a46381 100644 --- a/isis/src/qisis/objs/ProjectItemProxyModel/ProjectItemProxyModel.cpp +++ b/isis/src/qisis/objs/ProjectItemProxyModel/ProjectItemProxyModel.cpp @@ -1,25 +1,11 @@ -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "ProjectItemProxyModel.h" @@ -58,7 +44,7 @@ namespace Isis { */ QModelIndex ProjectItemProxyModel::mapIndexFromSource(const QModelIndex &sourceIndex) { ProjectItem *proxyItem = mapItemFromSource( sourceModel()->itemFromIndex(sourceIndex) ); - + if (proxyItem) { return proxyItem->index(); } @@ -67,7 +53,7 @@ namespace Isis { } } - + /** * Returns the QModelIndex of an item in the souce model that corresponds with @@ -79,7 +65,7 @@ namespace Isis { */ QModelIndex ProjectItemProxyModel::mapIndexToSource(const QModelIndex &proxyIndex) { ProjectItem *sourceItem = mapItemToSource( itemFromIndex(proxyIndex) ); - + if (sourceItem) { return sourceItem->index(); } @@ -125,7 +111,7 @@ namespace Isis { */ QItemSelection ProjectItemProxyModel::mapSelectionToSource(const QItemSelection &proxySelection) { QItemSelection sourceSelection = QItemSelection(); - + foreach ( QModelIndex proxyIndex, proxySelection.indexes() ) { QModelIndex sourceIndex = mapIndexToSource(proxyIndex); if ( sourceIndex.isValid() ) { @@ -184,7 +170,7 @@ namespace Isis { } ProjectItem *proxyItem; - + if (ProjectItem *parentItem = mapItemFromSource( sourceItem->parent() ) ) { proxyItem = addChild(sourceItem, parentItem); } @@ -204,7 +190,7 @@ namespace Isis { * Adds a list of items to the proxy model. * * @param[in] sourceItem (QList) The list of items in the - * source model. + * source model. */ void ProjectItemProxyModel::addItems(QList sourceItems) { foreach (ProjectItem *item, sourceItems) { @@ -213,7 +199,7 @@ namespace Isis { emit itemsAdded(); } - + /** * Removes an item and its children from the proxy model. * @@ -226,8 +212,8 @@ namespace Isis { // qDebug()<<"ProjectItemProxyModel::removeItem item= "<selectionModel()->currentIndex() ); if ( newProxyCurrent != selectionModel()->currentIndex() ) { selectionModel()->setCurrentIndex(newProxyCurrent, QItemSelectionModel::Current); @@ -316,7 +302,7 @@ namespace Isis { void ProjectItemProxyModel::updateSourceCurrent() { QModelIndex newSourceCurrent = mapIndexToSource( selectionModel()->currentIndex() ); if ( newSourceCurrent != sourceModel()->selectionModel()->currentIndex() ) { - sourceModel()->selectionModel()->setCurrentIndex(newSourceCurrent, + sourceModel()->selectionModel()->setCurrentIndex(newSourceCurrent, QItemSelectionModel::Current); } } @@ -327,13 +313,13 @@ namespace Isis { * different than the corresponding selection in the source model. */ void ProjectItemProxyModel::updateProxySelection() { - QItemSelection newProxySelection = mapSelectionFromSource( + QItemSelection newProxySelection = mapSelectionFromSource( sourceModel()->selectionModel()->selection() ); if ( newProxySelection != selectionModel()->selection() ) { selectionModel()->select(newProxySelection, QItemSelectionModel::ClearAndSelect); } } - + /** * Slot that updates the selection in the source model only if it is @@ -341,9 +327,9 @@ namespace Isis { */ void ProjectItemProxyModel::updateSourceSelection() { QItemSelection newSourceSelection = mapSelectionToSource( selectionModel()->selection() ); - if ( mapSelectionFromSource(newSourceSelection) != + if ( mapSelectionFromSource(newSourceSelection) != mapSelectionFromSource( sourceModel()->selectionModel()->selection() ) ) { - sourceModel()->selectionModel()->select(newSourceSelection, + sourceModel()->selectionModel()->select(newSourceSelection, QItemSelectionModel::ClearAndSelect); } } @@ -378,9 +364,9 @@ namespace Isis { if ( parentItem && (parentItem->model() != this) ) { return 0; } - + ProjectItem *proxyItem = mapItemFromSource(sourceItem); - + if (!proxyItem) { proxyItem = new ProjectItem(); proxyItem->setProjectItem(sourceItem); @@ -436,7 +422,7 @@ namespace Isis { return true; } - + /** * Adds the data (selected items) from the source model to the proxy model. * @@ -444,7 +430,7 @@ namespace Isis { * @param action (Qt::DropAction) * @param row (int) * @param column(int) - * @param QModelIndex (const QModelIndex &) + * @param QModelIndex (const QModelIndex &) * * @return @b bool True if the data was successfully added to the proxy model. */ diff --git a/isis/src/qisis/objs/ProjectItemProxyModel/ProjectItemProxyModel.h b/isis/src/qisis/objs/ProjectItemProxyModel/ProjectItemProxyModel.h index e078445b32..879b16af13 100644 --- a/isis/src/qisis/objs/ProjectItemProxyModel/ProjectItemProxyModel.h +++ b/isis/src/qisis/objs/ProjectItemProxyModel/ProjectItemProxyModel.h @@ -1,27 +1,13 @@ #ifndef ProjectItemProxyModel_h #define ProjectItemProxyModel_h -/** - * @file - * $Revision$ - * $Date$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include @@ -74,7 +60,7 @@ namespace Isis { * @internal * @history 2015-10-21 Jeffrey Covington - Original version. * @history 2016-01-13 Jeffrey Covington - Added canDropMimeData() and dropMimeData() methods. - * @history 2016-06-27 Ian Humphrey - Added documentation to the canDropMimeData() and + * @history 2016-06-27 Ian Humphrey - Added documentation to the canDropMimeData() and * dropMimeData() methods. Checked coding standards. Fixes #4006. * @history 2016-08-11 Tracie Sucharski - Added itemRemoved signal. * @history 2016-08-25 Adam Paquette - Updated documentation. Fixes #4299. @@ -84,10 +70,10 @@ namespace Isis { class ProjectItemProxyModel : public ProjectItemModel { Q_OBJECT - + public: ProjectItemProxyModel(QObject *parent = 0); - + QModelIndex mapIndexFromSource(const QModelIndex &sourceIndex); QModelIndex mapIndexToSource(const QModelIndex &proxyIndex); @@ -96,7 +82,7 @@ namespace Isis { ProjectItem *mapItemFromSource(ProjectItem *sourceItem); ProjectItem *mapItemToSource(ProjectItem *proxyItem); - + void removeItem(ProjectItem *item); void setSourceModel(ProjectItemModel *sourceModel); @@ -111,11 +97,11 @@ namespace Isis { // This signal was added to speed up the Footprint2DView. Previously images were added one at a // time which was extremely slow. This not the ideal handling, but without re-writing // ProjectItemModel and ProjectItemProxyModel to add insertRows method so that beginInsertRows - // and endInsertRows are called which would automatically emit the signal rowsInserted after + // and endInsertRows are called which would automatically emit the signal rowsInserted after // alls items are inserted into the model rather than calling after each row that is inserted. void itemsAdded(); void itemRemoved(ProjectItem *); - + public slots: ProjectItem *addItem(ProjectItem *sourceItem); void addItems(QList sourceItems); @@ -132,7 +118,7 @@ namespace Isis { private slots: void onItemChanged(QStandardItem *item); - + private: ProjectItemModel *m_sourceModel; //!< The source model. //! Map of items from the source model to the proxy model. diff --git a/isis/src/qisis/objs/ProjectItemTreeView/ProjectItemTreeView.cpp b/isis/src/qisis/objs/ProjectItemTreeView/ProjectItemTreeView.cpp index 185a21a313..42a40f9769 100644 --- a/isis/src/qisis/objs/ProjectItemTreeView/ProjectItemTreeView.cpp +++ b/isis/src/qisis/objs/ProjectItemTreeView/ProjectItemTreeView.cpp @@ -1,25 +1,11 @@ -/** - * @file - * $Date$ - * $Revision$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "ProjectItemTreeView.h" #include diff --git a/isis/src/qisis/objs/ProjectItemTreeView/ProjectItemTreeView.h b/isis/src/qisis/objs/ProjectItemTreeView/ProjectItemTreeView.h index bafbf26af8..bbe3872ffb 100644 --- a/isis/src/qisis/objs/ProjectItemTreeView/ProjectItemTreeView.h +++ b/isis/src/qisis/objs/ProjectItemTreeView/ProjectItemTreeView.h @@ -1,27 +1,13 @@ #ifndef ProjectItemTreeView_h #define ProjectItemTreeView_h -/** - * @file - * $Date$ - * $Revision$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "AbstractProjectItemView.h" diff --git a/isis/src/qisis/objs/QHistogram/QHistogram.cpp b/isis/src/qisis/objs/QHistogram/QHistogram.cpp index 608cae8f4c..b53741499e 100644 --- a/isis/src/qisis/objs/QHistogram/QHistogram.cpp +++ b/isis/src/qisis/objs/QHistogram/QHistogram.cpp @@ -1,24 +1,10 @@ -/** - * @file - * $Revision: 1.3 $ - * $Date: 2008/07/15 16:52:37 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "QHistogram.h" #include "Histogram.h" @@ -237,4 +223,3 @@ namespace Isis { } } // end namespace isis - diff --git a/isis/src/qisis/objs/QHistogram/QHistogram.h b/isis/src/qisis/objs/QHistogram/QHistogram.h index bdbfc9b819..fd514d3c66 100644 --- a/isis/src/qisis/objs/QHistogram/QHistogram.h +++ b/isis/src/qisis/objs/QHistogram/QHistogram.h @@ -1,26 +1,13 @@ #ifndef QHistogram_h #define QHistogram_h -/** - * @file - * $Revision: 1.2 $ - * $Date: 2008/06/19 18:43:47 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "Histogram.h" #include diff --git a/isis/src/qisis/objs/QIsisApplication/QIsisApplication.h b/isis/src/qisis/objs/QIsisApplication/QIsisApplication.h index dc0b496c79..091b4b0990 100644 --- a/isis/src/qisis/objs/QIsisApplication/QIsisApplication.h +++ b/isis/src/qisis/objs/QIsisApplication/QIsisApplication.h @@ -1,27 +1,13 @@ #ifndef QIsisApplication_H #define QIsisApplication_H -/** - * @file - * $Revision: 1.3 $ - * $Date: 2010/06/29 23:46:35 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include diff --git a/isis/src/qisis/objs/QnetTools/QnetFileTool.h b/isis/src/qisis/objs/QnetTools/QnetFileTool.h index b7e5db5952..1ea58b5115 100644 --- a/isis/src/qisis/objs/QnetTools/QnetFileTool.h +++ b/isis/src/qisis/objs/QnetTools/QnetFileTool.h @@ -1,27 +1,13 @@ #ifndef QnetFileTool_h #define QnetFileTool_h -/** - * @file - * $Revision: 1.9 $ - * $Date: 2010/07/01 19:04:52 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "FileTool.h" #include diff --git a/isis/src/qisis/objs/QnetTools/QnetNavTool.h b/isis/src/qisis/objs/QnetTools/QnetNavTool.h index cbd7fffa8e..0d92366b36 100644 --- a/isis/src/qisis/objs/QnetTools/QnetNavTool.h +++ b/isis/src/qisis/objs/QnetTools/QnetNavTool.h @@ -1,24 +1,13 @@ #ifndef QnetNavTool_h #define QnetNavTool_h -/** - * @file - * $Date: 2010/07/01 19:04:52 $ $Revision: 1.20 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public domain. See - * individual third-party library and package descriptions for intellectual property information, - * user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, is made by the - * USGS as to the accuracy and functioning of such software and related material nor shall the - * fact of distribution constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "Tool.h" diff --git a/isis/src/qisis/objs/QnetTools/QnetPointCubeNameFilter.h b/isis/src/qisis/objs/QnetTools/QnetPointCubeNameFilter.h index 67750a4cd9..59b6fffee9 100644 --- a/isis/src/qisis/objs/QnetTools/QnetPointCubeNameFilter.h +++ b/isis/src/qisis/objs/QnetTools/QnetPointCubeNameFilter.h @@ -1,24 +1,13 @@ #ifndef QnetPointCubeNameFilter_h #define QnetPointCubeNameFilter_h -/** - * @file - * $Date: 2010/06/03 20:13:53 $ - * $Revision: 1.2 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public domain. See - * individual third-party library and package descriptions for intellectual property information, - * user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, is made by the - * USGS as to the accuracy and functioning of such software and related material nor shall the - * fact of distribution constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "QnetFilter.h" diff --git a/isis/src/qisis/objs/QnetTools/QnetPointJigsawErrorFilter.h b/isis/src/qisis/objs/QnetTools/QnetPointJigsawErrorFilter.h index 34b336fbd0..4d11aea86d 100644 --- a/isis/src/qisis/objs/QnetTools/QnetPointJigsawErrorFilter.h +++ b/isis/src/qisis/objs/QnetTools/QnetPointJigsawErrorFilter.h @@ -1,24 +1,13 @@ #ifndef QnetPointJigsawErrorFilter_h #define QnetPointJigsawErrorFilter_h -/** - * @file - * $Date: 2010/06/03 20:13:53 $ - * $Revision: 1.6 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public domain. See - * individual third-party library and package descriptions for intellectual property information, - * user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, is made by the - * USGS as to the accuracy and functioning of such software and related material nor shall the - * fact of distribution constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "QnetFilter.h" diff --git a/isis/src/qisis/objs/QnetTools/QnetPointRegistrationErrorFilter.h b/isis/src/qisis/objs/QnetTools/QnetPointRegistrationErrorFilter.h index 09fabb7755..9062ef64ed 100644 --- a/isis/src/qisis/objs/QnetTools/QnetPointRegistrationErrorFilter.h +++ b/isis/src/qisis/objs/QnetTools/QnetPointRegistrationErrorFilter.h @@ -1,24 +1,13 @@ #ifndef QnetPointRegistrationErrorFilter_h #define QnetPointRegistrationErrorFilter_h -/** - * @file - * $Date: 2010/06/03 20:13:53 $ - * $Revision: 1.6 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public domain. See - * individual third-party library and package descriptions for intellectual property information, - * user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, is made by the - * USGS as to the accuracy and functioning of such software and related material nor shall the - * fact of distribution constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "QnetFilter.h" @@ -30,8 +19,8 @@ namespace Isis { /** * Defines the Registration Error filter for the QnetNavTool's Points section. - * The user may enter values for Less Than and/or Greater Than. This class is - * designed to remove points from the current filtered list that lie outside + * The user may enter values for Less Than and/or Greater Than. This class is + * designed to remove points from the current filtered list that lie outside * of the given range. * * @author ????-??-?? Unknown diff --git a/isis/src/qisis/objs/SaveAsDialog/SaveAsDialog.h b/isis/src/qisis/objs/SaveAsDialog/SaveAsDialog.h index b7103f3b12..3f0340e20f 100644 --- a/isis/src/qisis/objs/SaveAsDialog/SaveAsDialog.h +++ b/isis/src/qisis/objs/SaveAsDialog/SaveAsDialog.h @@ -1,24 +1,14 @@ #ifndef SaveAsDialog_h #define SaveAsDialog_h -/** - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ - +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include "FileDialog.h" @@ -26,15 +16,15 @@ namespace Isis { /** - * @brief Widget to save(Save As) Isis cubes(used in qview) to display the - * FileDialog to select the output cube. This dialog additionally displays - * radio buttons for choices FullImage, ExportAsIs, ExportFullRes. These choices - * are located at the bottom of the dialog. - * - * FullImage - copies the entire image into the user specified output file - * ExportAsIs - copies the image as displayed in the qview app window - * ExportFullRes - copies the image as displayed in the qview app window but with - * full resolution + * @brief Widget to save(Save As) Isis cubes(used in qview) to display the + * FileDialog to select the output cube. This dialog additionally displays + * radio buttons for choices FullImage, ExportAsIs, ExportFullRes. These choices + * are located at the bottom of the dialog. + * + * FullImage - copies the entire image into the user specified output file + * ExportAsIs - copies the image as displayed in the qview app window + * ExportFullRes - copies the image as displayed in the qview app window but with + * full resolution * * @ingroup Visualization Tools * @@ -42,7 +32,7 @@ namespace Isis { * * @internal * @history 2011-05-11 Sharmila Prasad - Initial Version - * @history 2017-06-01 Kaj Williams - renamed "save as ..." radio buttons to reflect their actual usage. Updated the associated tooltips. + * @history 2017-06-01 Kaj Williams - renamed "save as ..." radio buttons to reflect their actual usage. Updated the associated tooltips. * Also updated the "enum saveAsType" documentation. */ class SaveAsDialog : public FileDialog { @@ -54,7 +44,7 @@ namespace Isis { **/ enum saveAsType {FullImage, ExportAsIs, ExportFullRes}; int getSaveAsType(); - + public slots: void setFullImage(bool); void setAsIs(bool); diff --git a/isis/src/qisis/objs/Shape/Shape.h b/isis/src/qisis/objs/Shape/Shape.h index e9add6d186..82a32b8221 100644 --- a/isis/src/qisis/objs/Shape/Shape.h +++ b/isis/src/qisis/objs/Shape/Shape.h @@ -1,24 +1,14 @@ - #ifndef Shape_H #define Shape_H -/** - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include diff --git a/isis/src/qisis/objs/ShapeDisplayProperties/ShapeDisplayProperties.h b/isis/src/qisis/objs/ShapeDisplayProperties/ShapeDisplayProperties.h index 1fa595349d..13cbf4f94c 100644 --- a/isis/src/qisis/objs/ShapeDisplayProperties/ShapeDisplayProperties.h +++ b/isis/src/qisis/objs/ShapeDisplayProperties/ShapeDisplayProperties.h @@ -1,27 +1,13 @@ #ifndef ShapeDisplayProperties_H #define ShapeDisplayProperties_H -/** - * @file - * $Revision: 1.9 $ - * $Date: 2012/06/12 06:30:00 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include // This is required since QColor is in a slot #include // required since we're adding to QVariant @@ -170,4 +156,3 @@ namespace Isis { Q_DECLARE_METATYPE(QList); #endif - diff --git a/isis/src/qisis/objs/ShapeList/ShapeList.cpp b/isis/src/qisis/objs/ShapeList/ShapeList.cpp index 09c48ce155..75d5127c34 100644 --- a/isis/src/qisis/objs/ShapeList/ShapeList.cpp +++ b/isis/src/qisis/objs/ShapeList/ShapeList.cpp @@ -1,25 +1,11 @@ -/** - * @file - * $Revision: 1.19 $ - * $Date: 2010/03/22 19:44:53 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "ShapeList.h" #include @@ -99,7 +85,7 @@ namespace Isis { /** * Creates an shape list from a list of cube file names. This is slow (serial) and not recommended. - * + * * @param fileNames The list of cube fileNames. */ ShapeList::ShapeList(QStringList &fileNames) { @@ -123,7 +109,7 @@ namespace Isis { /** * Creates a SerialNumberList from the shape list. - * + * * @return @b SerialNumberList The list of serial numbers for the cubes in the ShapeList. */ SerialNumberList ShapeList::serialNumberList() { @@ -139,9 +125,9 @@ namespace Isis { /** * Appends an shape to the shape list. - * + * * @param value The shape to be appended. - * + * * @see QList::append(). */ void ShapeList::append(Shape * const &value) { @@ -152,9 +138,9 @@ namespace Isis { /** * Appends a list of shapes to the shape list. - * + * * @param value the list of shapes to be appened. - * + * * @see QList::append(). */ void ShapeList::append(const QList &value) { @@ -165,7 +151,7 @@ namespace Isis { /** * Clears the shape list. - * + * * @see QList::clear(). */ void ShapeList::clear() { @@ -179,11 +165,11 @@ namespace Isis { /** * Erases a single shape from the shape list. - * + * * @param pos An iterator pointing to the shape to be erased. - * + * * @return @b QList::iterator An iterator pointing to the shape after the shape that was removed. - * + * * @see QList::erase() */ QList::iterator ShapeList::erase(iterator pos) { @@ -196,13 +182,13 @@ namespace Isis { /** * Erases a range of shapes from the shape list. * Erases all shapes from begin up to (but not including) end. - * + * * @param begin An iterator pointing to the first shape to be erased. * @param end An iterator pointing to the shape just after the last shape to be erased. * Will be invalid after the call. - * + * * @return @b QList::iterator An iterator pointing to the shape end refered to before the call. - * + * * @see QList::erase() */ QList::iterator ShapeList::erase(iterator begin, iterator end) { @@ -214,10 +200,10 @@ namespace Isis { /** * Inserts an shape into the shape list at an index - * + * * @param i The index at which to insert the shape. * @param value the shape to be inserted. - * + * * @see QList::insert() */ void ShapeList::insert(int i, Shape * const &value) { @@ -229,12 +215,12 @@ namespace Isis { /** * Inserts an shape into the shape list after an iterator. - * + * * @param before An iterator pointing to the shape that value will be inserted after * @param value The shape to be inserted. - * + * * @return @b QList::iterator An iterator pointing to the inserted shape. - * + * * @see QList::insert() */ QList::iterator ShapeList::insert(iterator before, Shape * const &value) { @@ -246,9 +232,9 @@ namespace Isis { /** * Inserts an shape at the beginning of the shape list. - * + * * @param value The shape to be inserted. - * + * * @see QList::prepend() */ void ShapeList::prepend(Shape * const &value) { @@ -260,9 +246,9 @@ namespace Isis { /** * Appends an shape to the end of the shape list. * Equivalent to append(). - * + * * @param value The shape to be appended. - * + * * @see QList::push_back() */ void ShapeList::push_back(Shape * const &value) { @@ -274,9 +260,9 @@ namespace Isis { /** * Prepends an shape to the beginning of the shape list. * Equivalent to prepend(). - * + * * @param value The shape to be appended. - * + * * @see QList::push_front() */ void ShapeList::push_front(Shape * const &value) { @@ -287,11 +273,11 @@ namespace Isis { /** * Removes all occurances of an shape. - * + * * @param value The shape to be removed. - * + * * @return @b int The number of occurances of the shape. - * + * * @see QList::removeAll() */ int ShapeList::removeAll(Shape * const &value) { @@ -307,9 +293,9 @@ namespace Isis { /** * Removes the shape at an index. - * + * * @param i The index of the shape to be removed. - * + * * @see QList::removeAt() */ void ShapeList::removeAt(int i) { @@ -320,7 +306,7 @@ namespace Isis { /** * Removes the shape at the front of the shape list. - * + * * @see QList::removeFirst() */ void ShapeList::removeFirst() { @@ -331,7 +317,7 @@ namespace Isis { /** * Removes the shape at the end of the shape list. - * + * * @see QList::removeLast() */ void ShapeList::removeLast() { @@ -342,11 +328,11 @@ namespace Isis { /** * Removes the first occurance of an shape. - * + * * @param value The shape to be removed. - * + * * @return @b bool True if successful, otherwise false. - * + * * @see QList::removeOne() */ bool ShapeList::removeOne(Shape * const &value) { @@ -362,9 +348,9 @@ namespace Isis { /** * Swaps the shape list with another list of shapes. - * + * * @param other The list of shapes to swapped with. - * + * * @see QList::swap() */ void ShapeList::swap(QList &other) { @@ -378,11 +364,11 @@ namespace Isis { /** * Removes the shape at an index and returns it. - * + * * @param i The index of the shape to be removed and returned. - * + * * @return @b Shape * The removed shape. - * + * * @see QList::takeAt() */ Shape *ShapeList::takeAt(int i) { @@ -394,9 +380,9 @@ namespace Isis { /** * Removes and returns the first shape. - * + * * @return @b Shape * The first shape. - * + * * @see QList::takeFirst() */ Shape *ShapeList::takeFirst() { @@ -408,9 +394,9 @@ namespace Isis { /** * Removes and returns the last shape. - * + * * @return @b Shape * The last shape. - * + * * @see QList::takeLast() */ Shape *ShapeList::takeLast() { @@ -422,11 +408,11 @@ namespace Isis { /** * Appends a list of shapes to the end of the shape list. - * + * * @param other The list of shapes to be appended. - * + * * @return @b ShapeList & A reference to the shapeList. - * + * * @see append() * @see QList::operator+=() */ @@ -443,11 +429,11 @@ namespace Isis { /** * Appends a single shape to the end of the shape list. - * + * * @param other The shape to be appended. - * + * * @return @b ShapeList & A reference to the shapeList. - * + * * @see append() * @see QList::operator+=() */ @@ -460,11 +446,11 @@ namespace Isis { /** * Appends a list of shapes to the end of the shape list. - * + * * @param other The list of shapes to be appended. - * + * * @return @b ShapeList & A reference to the shapeList. - * + * * @see append() * @see QList::operator<<() */ @@ -481,11 +467,11 @@ namespace Isis { /** * Appends a single shape to the end of the shape list. - * + * * @param other The shape to be appended. - * + * * @return @b ShapeList & A reference to the shapeList. - * + * * @see append() * @see QList::operator<<() */ @@ -498,11 +484,11 @@ namespace Isis { /** * Assigns another list of shapes to the shape list. - * + * * @param rhs The list of shapes that shapeList will become a copy of. - * + * * @return @b ShapeList & A reference to the shapeList. - * + * * @see QList::operator=() */ ShapeList &ShapeList::operator=(const QList &rhs) { @@ -521,7 +507,7 @@ namespace Isis { * Assignment operator * * @param rhs The right hand side of the '=' operator - * + * * @return @b ShapeList & This shape list. */ ShapeList &ShapeList::operator=(const ShapeList &rhs) { @@ -584,9 +570,9 @@ namespace Isis { /** * Delete all of the contained Shapes from disk. - * + * * @param project The project the shapes in the shape list belong to. - * + * * @see Shape::deleteFromDisk() */ void ShapeList::deleteFromDisk(Project *project) { @@ -618,11 +604,11 @@ namespace Isis { * ... * * - * + * * @param stream XmlStream to write out the document. * @param project The project the shape list will be saved to. * @param newProjectRoot The path to the root directory for the new project. - * + * * @throws iException::Io "Failed to create directory" * @throws iException::Io "Unable to save shape information because new file could not be opened for writing" */ @@ -700,7 +686,7 @@ namespace Isis { /** * Constructor for CopyShapeDataFunctor. - * + * * @param project The project that the shape data will be saved to when the functor is used * @param newProjectRoot The path to the project root */ @@ -713,7 +699,7 @@ namespace Isis { /** * Copy constructor for CopyShapeDataFunctor. - * + * * @param other The functor to copy from */ ShapeList::CopyShapeDataFunctor::CopyShapeDataFunctor(const CopyShapeDataFunctor &other) { @@ -732,9 +718,9 @@ namespace Isis { /** * Copies the cub/ecub files for an shape into m_project. * Used by save to copy the shapeList into a new project. - * + * * @param shapeToCopy The shape to copy into m_project. - * + * * @see save */ void *ShapeList::CopyShapeDataFunctor::operator()(Shape * const &shapeToCopy) { @@ -745,9 +731,9 @@ namespace Isis { /** * Assignment operator for CopyShapeDataFunctor. - * + * * @param rhs The functor to assign from - * + * * @return @b ShapeList::CopyShapeDataFunctor & A reference to a copy of the functor */ ShapeList::CopyShapeDataFunctor &ShapeList::CopyShapeDataFunctor::operator=( @@ -763,7 +749,7 @@ namespace Isis { * * @param shapeList The shape list we're going to be initializing * @param project The project that contains the shape list - * + * * @see ShapeList::save() */ ShapeList::XmlHandler::XmlHandler(ShapeList *shapeList, Project *project) { @@ -808,7 +794,7 @@ namespace Isis { * file. * * @return @b bool If we should continue reading the XML (usually true). - * + * * @throws IException::Io "Unable to open with read access" * @throws IException::Io "Failed to open shape list XML" */ diff --git a/isis/src/qisis/objs/SortFilterProxyModel/SortFilterProxyModel.h b/isis/src/qisis/objs/SortFilterProxyModel/SortFilterProxyModel.h index 9a697014f2..9d1405d0a8 100644 --- a/isis/src/qisis/objs/SortFilterProxyModel/SortFilterProxyModel.h +++ b/isis/src/qisis/objs/SortFilterProxyModel/SortFilterProxyModel.h @@ -1,25 +1,13 @@ - #ifndef SortFilterProxyModel_h #define SortFilterProxyModel_h -/** - * @file - * $Date: 2018/06/88 16:40:33 $ $Revision: 1.0 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public domain. See - * individual third-party library and package descriptions for intellectual property information, - * user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, is made by the - * USGS as to the accuracy and functioning of such software and related material nor shall the - * fact of distribution constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include @@ -38,7 +26,7 @@ namespace Isis { class ProjectItem; class ProjectItemModel; - /** + /** * * @author 2018-06-18 Tyler Wilson * @@ -46,7 +34,7 @@ class ProjectItemModel; * @history 2018-06-18 Tyler Wilson - Original version. A proxy class for filtering data * within the JigsawSetupDialog Bundle Observation Solve Settings (BOSS) tab. */ - + class SortFilterProxyModel : public QSortFilterProxyModel { Q_OBJECT diff --git a/isis/src/qisis/objs/SpectralPlotTool/SpectralPlotWindow.h b/isis/src/qisis/objs/SpectralPlotTool/SpectralPlotWindow.h index 1b3030d1f3..a44ea7131a 100644 --- a/isis/src/qisis/objs/SpectralPlotTool/SpectralPlotWindow.h +++ b/isis/src/qisis/objs/SpectralPlotTool/SpectralPlotWindow.h @@ -1,28 +1,13 @@ #ifndef SpectralPlotWindow_h #define SpectralPlotWindow_h -/** - * @file - * $Revision: 1.17 $ - * $Date: 2009/04/07 16:19:40 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "PlotWindow.h" diff --git a/isis/src/qisis/objs/StatisticsTool/StatisticsTool.h b/isis/src/qisis/objs/StatisticsTool/StatisticsTool.h index 32b1ba97de..c173521b0c 100644 --- a/isis/src/qisis/objs/StatisticsTool/StatisticsTool.h +++ b/isis/src/qisis/objs/StatisticsTool/StatisticsTool.h @@ -1,24 +1,13 @@ #ifndef StatisticsTool_h #define StatisticsTool_h -/** - * @file - * $Date: 2010/06/28 09:21:33 $ $Revision: 1.3 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public domain. See - * individual third-party library and package descriptions for intellectual property information, - * user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, is made by the - * USGS as to the accuracy and functioning of such software and related material nor shall the - * fact of distribution constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include diff --git a/isis/src/qisis/objs/StretchTool/StretchTool.h b/isis/src/qisis/objs/StretchTool/StretchTool.h index 13a5e938ec..8e38ffe472 100644 --- a/isis/src/qisis/objs/StretchTool/StretchTool.h +++ b/isis/src/qisis/objs/StretchTool/StretchTool.h @@ -1,6 +1,14 @@ #ifndef StretchTool_h #define StretchTool_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + // This is the only include allowed in this file! #include "Tool.h" @@ -10,28 +18,6 @@ class QLineEdit; class QRect; class QToolButton; -/** - * @file - * $Revision: 1.16 $ - * $Date: 2010/06/30 03:45:09 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ - namespace Isis { class AdvancedStretchDialog; class Cube; @@ -91,9 +77,9 @@ namespace Isis { * between viewports, and another that caused the stretch * to be copied the new viewport if the advanced stretch * dialog is active. Fixes #771. - * @history 2015-08-07 Makayla Shepherd - No longer crashes when the user attempts + * @history 2015-08-07 Makayla Shepherd - No longer crashes when the user attempts * to apply a stretch while the cube is still loading. This - * crash was caused by an unhandled exception being thrown + * crash was caused by an unhandled exception being thrown * in a connected slot. Fixes #2117. */ class StretchTool : public Tool { @@ -173,7 +159,7 @@ namespace Isis { void mouseButtonRelease(QPoint p, Qt::MouseButton s); void saveStretchToCube(); void deleteFromCube(); - void loadStretchFromCube(); + void loadStretchFromCube(); void enableRubberBandTool(); void screenPixelsChanged(); void updateHistograms(); @@ -220,4 +206,3 @@ namespace Isis { }; #endif - diff --git a/isis/src/qisis/objs/Tab/Tab.h b/isis/src/qisis/objs/Tab/Tab.h index b20733e96c..8cd490abfb 100644 --- a/isis/src/qisis/objs/Tab/Tab.h +++ b/isis/src/qisis/objs/Tab/Tab.h @@ -1,27 +1,13 @@ #ifndef Tab_H #define Tab_H -/** - * @file - * $Revision: 1.2 $ - * $Date: 2010/05/07 20:39:19 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ // QAction is the parent of this class, and should be the ONLY include // in this file. Do not add any other includes to this header file! @@ -71,12 +57,12 @@ namespace Isis signals: void clicked(const int &); - + private: Tab(const Tab & other); const Tab & operator=(Tab); - - + + private slots: void handleTriggered(); diff --git a/isis/src/qisis/objs/TabBar/TabBar.h b/isis/src/qisis/objs/TabBar/TabBar.h index 0ab16e4599..84d4ab4bcd 100644 --- a/isis/src/qisis/objs/TabBar/TabBar.h +++ b/isis/src/qisis/objs/TabBar/TabBar.h @@ -1,27 +1,13 @@ #ifndef TabBar_H #define TabBar_H -/** - * @file - * $Revision: 1.2 $ - * $Date: 2010/06/04 03:20:32 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ // QToolBar is the parent of this class, and should be the ONLY include // in this file. Do not add any other includes to this header file! diff --git a/isis/src/qisis/objs/TargetBody/TargetBody.h b/isis/src/qisis/objs/TargetBody/TargetBody.h index 94b2bef234..7c54351190 100644 --- a/isis/src/qisis/objs/TargetBody/TargetBody.h +++ b/isis/src/qisis/objs/TargetBody/TargetBody.h @@ -1,28 +1,13 @@ #ifndef TargetBody_h #define TargetBody_h -/** - * @file - * $Revision: 1.20 $ - * $Date: 2009/10/15 01:35:17 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include @@ -60,7 +45,7 @@ namespace Isis { * This class represents a target body in a project-based GUI interface. It encapsulates ideas * about a target such as it's display name, how it should be viewed, where it is on disk, etc. * - * + * * @ingroup qisis * * @author 2015-06-08 Ken Edmundson @@ -72,10 +57,10 @@ namespace Isis { * @history 2016-06-13 Tyler Wilson - Added new documentation and corrected * formatting to be consisten with ISIS3 coding standards. * Fixes #3997 and #4018. - * @hitsory 2018-07-12 Summer Stapleton - Added m_targetName and targetName() in order to - * collect the TargetName from the original cube label for + * @hitsory 2018-07-12 Summer Stapleton - Added m_targetName and targetName() in order to + * collect the TargetName from the original cube label for * comparisons related to image imports in ipce. References #5460. - * + * */ class TargetBody : public QObject { @@ -171,7 +156,7 @@ namespace Isis { * when saving to disk). */ QUuid *m_id; - + /** * The TargetName as it appears in the original cube. */ diff --git a/isis/src/qisis/objs/TargetBodyDisplayProperties/TargetBodyDisplayProperties.h b/isis/src/qisis/objs/TargetBodyDisplayProperties/TargetBodyDisplayProperties.h index fc83976bae..c31810d687 100644 --- a/isis/src/qisis/objs/TargetBodyDisplayProperties/TargetBodyDisplayProperties.h +++ b/isis/src/qisis/objs/TargetBodyDisplayProperties/TargetBodyDisplayProperties.h @@ -1,27 +1,13 @@ #ifndef TargetBodyDisplayProperties_H #define TargetBodyDisplayProperties_H -/** - * @file - * $Revision: 1.9 $ - * $Date: 2012/06/12 06:30:00 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include // This is required since QColor is in a slot #include // required since we're adding to QVariant diff --git a/isis/src/qisis/objs/TargetBodyList/TargetBodyList.cpp b/isis/src/qisis/objs/TargetBodyList/TargetBodyList.cpp index b113cd946a..925dcb794f 100644 --- a/isis/src/qisis/objs/TargetBodyList/TargetBodyList.cpp +++ b/isis/src/qisis/objs/TargetBodyList/TargetBodyList.cpp @@ -1,25 +1,11 @@ -/** - * @file - * $Revision: 1.19 $ - * $Date: 2010/03/22 19:44:53 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "TargetBodyList.h" //#include @@ -125,9 +111,9 @@ namespace Isis { /** * Appends a TargetBody to the list. - * + * * @param value The TargetBody to append - * + * * @see QList::append() */ void TargetBodyList::append(TargetBodyQsp const &value) { @@ -138,9 +124,9 @@ namespace Isis { /** * Appends a TargetBodyList to the list. - * + * * @param value the TargetBodyList to append - * + * * @see QList::append() */ void TargetBodyList::append(const QList &value) { @@ -151,7 +137,7 @@ namespace Isis { /** * clears the list. - * + * * @see QList::clear() */ void TargetBodyList::clear() { @@ -165,9 +151,9 @@ namespace Isis { /** * Erases the TargetBody associated with an iterator. - * + * * @param pos An iterator associated with the TaretBody to be erased - * + * * @see QList::erase() */ QList::iterator TargetBodyList::erase(iterator pos) { @@ -180,13 +166,13 @@ namespace Isis { /** * Erases all TargetBodies starting with the TargetBody associated with begin up to, * but not including, the TargetBody associated with end. - * + * * @param begin An iterator associated with the first TargetBody to be erased. * @param end An iterator associated with the TargetBody after the last TargetBody to be erased - * + * * @return @b QList::iterator An iterator associated with the TargetBody * end was associated with before erasing. - * + * * @see QList::erase() */ QList::iterator TargetBodyList::erase(iterator begin, iterator end) { @@ -198,10 +184,10 @@ namespace Isis { /** * Inserts a TargetBody at a specific index. - * + * * @param i The index at which to insert the TargetBody * @param value The TargetBody to insert - * + * * @see QList::insert() */ void TargetBodyList::insert(int i, TargetBodyQsp const &value) { @@ -213,13 +199,13 @@ namespace Isis { /** * Inserts a TargetBody after the TargetBody associated with an iterator. - * + * * @param before An iterator associated with the TargetBody that will be before * the inserted TargetBody * @param value The TargetBody to be inserted - * + * * @return @b QList::iterator An iterator associated with the inserted TargetBody - * + * * @see QList::insert() */ QList::iterator TargetBodyList::insert(iterator before, TargetBodyQsp const &value) { @@ -231,9 +217,9 @@ namespace Isis { /** * Inserts a TargetBody at the front of the list - * + * * @param value the TargetBody to be inserted - * + * * @see QList::prepend() */ void TargetBodyList::prepend(TargetBodyQsp const &value) { @@ -244,9 +230,9 @@ namespace Isis { /** * Appends a TargetBody to the end of the list - * + * * @param value The TargetBody to be append - * + * * @see QList::push_back() */ void TargetBodyList::push_back(TargetBodyQsp const &value) { @@ -257,9 +243,9 @@ namespace Isis { /** * Insertes a TargetBody at the front of the list - * + * * @param value The TargetBody to be prepend - * + * * @see QList::push_front() */ void TargetBodyList::push_front(TargetBodyQsp const &value) { @@ -270,11 +256,11 @@ namespace Isis { /** * Removes all occurrences of a TargetBody and returns the number removed. - * + * * @param value The TargetBody to be removed. - * + * * @return @b int The Number of TargetBodies removed. - * + * * @see QList::removeAll() */ int TargetBodyList::removeAll(TargetBodyQsp const &value) { @@ -290,9 +276,9 @@ namespace Isis { /** * Removes the TargetBody at a specific index. - * + * * @param i The index of the TargetBody to be removed - * + * * @see QList::removeAt() */ void TargetBodyList::removeAt(int i) { @@ -303,7 +289,7 @@ namespace Isis { /** * Removes the first TargetBody from the list. - * + * * @see QList::removeFirst() */ void TargetBodyList::removeFirst() { @@ -314,7 +300,7 @@ namespace Isis { /** * Removes the last TargetBody from the list. - * + * * @see QList::removeLast() */ void TargetBodyList::removeLast() { @@ -325,11 +311,11 @@ namespace Isis { /** * Removes the first occurrence of a TargetBody from the list. - * + * * @param value the TargetBody to be removed - * + * * @return @b bool If the removal was successful - * + * * @see QList::removeOne() */ bool TargetBodyList::removeOne(TargetBodyQsp const &value) { @@ -345,9 +331,9 @@ namespace Isis { /** * Swaps the list with another TargetBodyList. - * + * * @param other The TargetBodyList to swap with - * + * * @see QList::swap() */ void TargetBodyList::swap(QList &other) { @@ -361,11 +347,11 @@ namespace Isis { /** * Removes and returns the TargetBody at a specific index. - * + * * @param i The index of the TargetBody to takeAt - * + * * @return @b TargetBodyQsp The removed TargetBody - * + * * @see QList::takeAt() */ TargetBodyQsp TargetBodyList::takeAt(int i) { @@ -377,9 +363,9 @@ namespace Isis { /** * Removes and returns the first TargetBody in the list. - * + * * @return @b TargetBodyQsp The first TargetBody in the list - * + * * @see QList::takeFirst() */ TargetBodyQsp TargetBodyList::takeFirst() { @@ -391,9 +377,9 @@ namespace Isis { /** * Removes and returns the last TargetBody in the list. - * + * * @return @b TargetBodyQsp The last TargetBody in the list. - * + * * @see QList::takeLast() */ TargetBodyQsp TargetBodyList::takeLast() { @@ -405,11 +391,11 @@ namespace Isis { /** * Appends another TargetBodyList to the list. - * + * * @param other The TargetBodyList to be appended - * + * * @return @b TargetBodyList & A reference to this list. - * + * * @see QList::operator+=() */ TargetBodyList &TargetBodyList::operator+=(const QList &other) { @@ -425,11 +411,11 @@ namespace Isis { /** * Appends a TargetBody to the list. - * + * * @param other The TargetBody to be appended - * + * * @return @b TargetBodyList & A reference to this list. - * + * * @see QList::operator+=() */ TargetBodyList &TargetBodyList::operator+=(TargetBodyQsp const &other) { @@ -441,11 +427,11 @@ namespace Isis { /** * Appends another TargetBodyList to the list. - * + * * @param other The TargetBodyList to be appended - * + * * @return @b TargetBodyList & A reference to this list. - * + * * @see QList::operator<<() */ TargetBodyList &TargetBodyList::operator<<(const QList &other) { @@ -461,11 +447,11 @@ namespace Isis { /** * Appends a TargetBody to the list. - * + * * @param other The TargetBody to be appended - * + * * @return @b TargetBodyList & A reference to this list. - * + * * @see QList::operator<<() */ TargetBodyList &TargetBodyList::operator<<(TargetBodyQsp const &other) { @@ -477,11 +463,11 @@ namespace Isis { /** * Assignment operator for a QList of TargetBodyQsp - * + * * @param rhs The right hand side of the '=' operator - * + * * @return @b TargetBodyList & A reference to this list - * + * * @see QList::operator=() */ TargetBodyList &TargetBodyList::operator=(const QList &rhs) { @@ -500,7 +486,7 @@ namespace Isis { * Assignment operator * * @param rhs The right hand side of the '=' operator - * + * * @return @b TargetBodyList & A reference to this list */ TargetBodyList &TargetBodyList::operator=(const TargetBodyList &rhs) { @@ -732,7 +718,7 @@ namespace Isis { * ... * * - * + * * @param stream The QXmlStreamWriter that will be used to convert the TargetBodyList * @param project The Project the TargetBodyList belongs to * @param newProjectRoot The root of the project folder where the TargetBodyList will be saved @@ -882,7 +868,7 @@ namespace Isis { /** * Handle an XML start element. This expects and elements * (it reads both the project XML and the targets.xml file). - * + * * @param namespaceURI ??? * @param localName The name of the element the XmlReader is at * @param qName ??? @@ -921,13 +907,13 @@ namespace Isis { /** * Handle an XML end element. This handles by opening and reading the * images.xml file. - * + * * @param namespaceURI ??? * @param localName The name of the element the XmlReader is at * @param qName ??? * * @return @b bool If we should continue reading the XML (usually true). - * + * * @throws IException::Io "Unable to open with read access" * @throws IException::Io "Failed to open target body list XML" */ @@ -941,7 +927,7 @@ namespace Isis { reader.pushContentHandler(&handler); reader.setErrorHandler(&handler); - QString TargetBodyListXmlPath = m_project->targetBodyRoot() + "/" + + QString TargetBodyListXmlPath = m_project->targetBodyRoot() + "/" + m_TargetBodyList->path() + "/targets.xml"; QFile file(TargetBodyListXmlPath); diff --git a/isis/src/qisis/objs/Template/Template.h b/isis/src/qisis/objs/Template/Template.h index cebd8946b6..c2cf11ce4d 100755 --- a/isis/src/qisis/objs/Template/Template.h +++ b/isis/src/qisis/objs/Template/Template.h @@ -1,27 +1,13 @@ #ifndef Template_H #define Template_H -/** - * @file - * $Revision: 1.19 $ - * $Date: 2010/03/22 19:44:53 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include @@ -34,7 +20,7 @@ class FileName; class Project; - /** + /** * @author 2017-11-01 Christopher Combs * @internal * @history 2017-11-01 Christopher Combs - This represents an ISIS template in a @@ -60,7 +46,7 @@ void updateFileName(Project * project); private: - /** + /** * @author ????-??-?? Steven Lambright * * @internal diff --git a/isis/src/qisis/objs/TemplateList/TemplateList.cpp b/isis/src/qisis/objs/TemplateList/TemplateList.cpp index c0f9b41946..1ab10e3f47 100755 --- a/isis/src/qisis/objs/TemplateList/TemplateList.cpp +++ b/isis/src/qisis/objs/TemplateList/TemplateList.cpp @@ -1,25 +1,10 @@ -/** - * @file - * $Revision: 1.19 $ - * $Date: 2010/03/22 19:44:53 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "TemplateList.h" #include @@ -43,8 +28,8 @@ namespace Isis { m_path = path; m_type = type; } - - + + /** * Creates a blank template list. * @@ -194,7 +179,7 @@ namespace Isis { */ void TemplateList::save(QXmlStreamWriter &stream, const Project *project, FileName newProjectRoot) const { - + if (m_type == "maps") { stream.writeStartElement("mapTemplateList"); } @@ -210,7 +195,7 @@ namespace Isis { stream.writeAttribute("type", m_type); stream.writeAttribute("path", m_path); - FileName settingsFileName(Project::templateRoot(newProjectRoot.toString()) + FileName settingsFileName(Project::templateRoot(newProjectRoot.toString()) + "/" + m_type + "/" + m_name + "/templates.xml"); if (!settingsFileName.dir().mkpath(settingsFileName.path())) { @@ -292,7 +277,7 @@ namespace Isis { if (!type.isEmpty()) { m_templateList->setType(type); } - + if (!path.isEmpty()) { m_templateList->setPath(path); } @@ -328,10 +313,10 @@ namespace Isis { reader.pushContentHandler(&handler); reader.setErrorHandler(&handler); - QString templateListXmlPath = m_project->templateRoot() + "/" + m_templateList->type() + "/" + QString templateListXmlPath = m_project->templateRoot() + "/" + m_templateList->type() + "/" + m_templateList->name() + "/templates.xml"; templateListXmlPath = QDir::cleanPath(templateListXmlPath); - + QFile file(templateListXmlPath); if (!file.open(QFile::ReadOnly)) { diff --git a/isis/src/qisis/objs/TemplateList/TemplateList.h b/isis/src/qisis/objs/TemplateList/TemplateList.h index 71bd34927d..1f7cdafe35 100755 --- a/isis/src/qisis/objs/TemplateList/TemplateList.h +++ b/isis/src/qisis/objs/TemplateList/TemplateList.h @@ -1,27 +1,13 @@ #ifndef TemplateList_H #define TemplateList_H -/** - * @file - * $Revision: 1.19 $ - * $Date: 2010/03/22 19:44:53 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include #include @@ -34,7 +20,7 @@ namespace Isis { - /** + /** * * @author 2017-11-01 Christopher Combs * @@ -42,7 +28,7 @@ * @history 2017-11-01 Christopher Combs - Maintains a list of Templates so that templates * can easily be copied from one Project to another, saved to disk, or * deleted from disk. Adapted from ControlList. - * @history 2018-07-07 Summer Stapleton - Fixed a few errors in how the xmlhandling was + * @history 2018-07-07 Summer Stapleton - Fixed a few errors in how the xmlhandling was * occuring and added additional handling of separating map templates * from registration templates to reflect chagnes in Project.cpp. */ diff --git a/isis/src/qisis/objs/Tool/Tool.h b/isis/src/qisis/objs/Tool/Tool.h index a56fcc4b57..9433d509b8 100644 --- a/isis/src/qisis/objs/Tool/Tool.h +++ b/isis/src/qisis/objs/Tool/Tool.h @@ -1,27 +1,13 @@ #ifndef Tool_h #define Tool_h -/** - * @file - * $Date: 2010/07/01 22:52:23 $ - * $Revision: 1.21 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include diff --git a/isis/src/qisis/objs/ToolList/ToolList.h b/isis/src/qisis/objs/ToolList/ToolList.h index 43aebb1baa..0c82f24387 100644 --- a/isis/src/qisis/objs/ToolList/ToolList.h +++ b/isis/src/qisis/objs/ToolList/ToolList.h @@ -1,27 +1,13 @@ #ifndef ToolList_h #define ToolList_h -/** - * @file - * $Date: 2010/07/01 22:52:23 $ - * $Revision: 1.21 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include diff --git a/isis/src/qisis/objs/ViewSubWindow/ViewSubWindow.cpp b/isis/src/qisis/objs/ViewSubWindow/ViewSubWindow.cpp index a361743839..53f952ebca 100644 --- a/isis/src/qisis/objs/ViewSubWindow/ViewSubWindow.cpp +++ b/isis/src/qisis/objs/ViewSubWindow/ViewSubWindow.cpp @@ -1,34 +1,20 @@ -/** - * @file - * $Date$ - * $Revision$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "ViewSubWindow.h" namespace Isis { - + /** * Constructs a ViewSubWindow object */ ViewSubWindow::ViewSubWindow(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, flags) { - + } @@ -36,7 +22,7 @@ namespace Isis { * Destructor */ ViewSubWindow::~ViewSubWindow() { - + } @@ -51,4 +37,3 @@ namespace Isis { QMainWindow::closeEvent(event); } } - diff --git a/isis/src/qisis/objs/ViewSubWindow/ViewSubWindow.h b/isis/src/qisis/objs/ViewSubWindow/ViewSubWindow.h index 6ab67388f7..a63a207a12 100644 --- a/isis/src/qisis/objs/ViewSubWindow/ViewSubWindow.h +++ b/isis/src/qisis/objs/ViewSubWindow/ViewSubWindow.h @@ -1,27 +1,14 @@ #ifndef ViewSubWindow_h #define ViewSubWindow_h -/** - * @file - * $Date$ - * $Revision$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include namespace Isis { @@ -29,7 +16,7 @@ namespace Isis { /** * @brief This class exists to contain detached views from ipce. * the purpose is for it to emit the closeWindow() signal - * so that we can track when detached windows are closed. + * so that we can track when detached windows are closed. * * @ingroup Visualization Tools * @@ -37,7 +24,7 @@ namespace Isis { * * @internal * - * @history 2017-10-25 Adam Goins - This class created. + * @history 2017-10-25 Adam Goins - This class created. */ class ViewSubWindow : public QMainWindow { Q_OBJECT diff --git a/isis/src/qisis/objs/WarningWidget/WarningWidget.h b/isis/src/qisis/objs/WarningWidget/WarningWidget.h index bf01bdaf04..af7cd6df1e 100644 --- a/isis/src/qisis/objs/WarningWidget/WarningWidget.h +++ b/isis/src/qisis/objs/WarningWidget/WarningWidget.h @@ -1,6 +1,14 @@ #ifndef _WarningWidget_h_ #define _WarningWidget_h_ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include @@ -9,27 +17,6 @@ #include #include "CubeViewport.h" -/** - * @file - * $Revision: 1.3 $ - * $Date: 2010/06/24 17:17:49 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ namespace Isis { /** diff --git a/isis/src/qisis/objs/WorkOrder/WorkOrder.cpp b/isis/src/qisis/objs/WorkOrder/WorkOrder.cpp index 8050613fc8..58bc203a7a 100644 --- a/isis/src/qisis/objs/WorkOrder/WorkOrder.cpp +++ b/isis/src/qisis/objs/WorkOrder/WorkOrder.cpp @@ -1,25 +1,11 @@ -/** - * @file - * $Revision: 1.19 $ - * $Date: 2010/03/22 19:44:53 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "IsisDebug.h" #include "WorkOrder.h" diff --git a/isis/src/qisis/objs/WorkOrder/WorkOrder.h b/isis/src/qisis/objs/WorkOrder/WorkOrder.h index 1e391fa658..97d40b395e 100644 --- a/isis/src/qisis/objs/WorkOrder/WorkOrder.h +++ b/isis/src/qisis/objs/WorkOrder/WorkOrder.h @@ -1,25 +1,14 @@ #ifndef WorkOrder_H #define WorkOrder_H -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -314,8 +303,8 @@ namespace Isis { * a private QString object called m_data. References #4492. * @history 2017-12-05 Christopher Combs - Added support for TemplateEditorWidget and * TemplateEditViewWorkOrder. Fixes #5168. - * @history 2018-06-28 Makayla Shepherd - Removed the ProgressBar cleanup because it was - * causing a seg fault when the ProgressBar was added to the + * @history 2018-06-28 Makayla Shepherd - Removed the ProgressBar cleanup because it was + * causing a seg fault when the ProgressBar was added to the * HistoryTreeWidget. The HistoryTreeWidget will now clean up the * ProgressBar. Fixes #5228. */ diff --git a/isis/src/qisis/objs/WorkOrder/WorkOrderFactory.h b/isis/src/qisis/objs/WorkOrder/WorkOrderFactory.h index 06745a7665..6b3570c0f8 100644 --- a/isis/src/qisis/objs/WorkOrder/WorkOrderFactory.h +++ b/isis/src/qisis/objs/WorkOrder/WorkOrderFactory.h @@ -1,27 +1,14 @@ #ifndef WorkOrderFactory_H #define WorkOrderFactory_H -/** - * @file - * $Revision: 1.19 $ - * $Date: 2010/03/22 19:44:53 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include @@ -59,7 +46,7 @@ namespace Isis { * class. Fixes #5220. * @history 2018-06-18 Adam Goins - Added ControlHealthMonitorWorkOrder to WorkOrderFactory. * Fixes #5435. - * @history 2018-07-07 Summer Stapleton - Removed importTemplateWorkOrder and replaced it with + * @history 2018-07-07 Summer Stapleton - Removed importTemplateWorkOrder and replaced it with * the new map and registration import work orders to reflect changes * in Project.cpp for handling these differently. */ diff --git a/isis/src/qisis/objs/Workspace/Workspace.h b/isis/src/qisis/objs/Workspace/Workspace.h index 054fdddbc9..1332508485 100644 --- a/isis/src/qisis/objs/Workspace/Workspace.h +++ b/isis/src/qisis/objs/Workspace/Workspace.h @@ -1,26 +1,14 @@ #ifndef Workspace_h #define Workspace_h -/** - * @file - * $Revision: 1.9 $ - * $Date: 2010/06/28 08:36:36 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include diff --git a/isis/src/qisis/objs/ZoomTool/ZoomTool.cpp b/isis/src/qisis/objs/ZoomTool/ZoomTool.cpp index 255915bd7b..cc0cb17c42 100644 --- a/isis/src/qisis/objs/ZoomTool/ZoomTool.cpp +++ b/isis/src/qisis/objs/ZoomTool/ZoomTool.cpp @@ -1,22 +1,11 @@ -/** - * @file - * $Date: 2010/06/28 09:24:10 $ - * $Revision: 1.9 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public domain. See - * individual third-party library and package descriptions for intellectual property information, - * user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, is made by the - * USGS as to the accuracy and functioning of such software and related material nor shall the - * fact of distribution constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include diff --git a/isis/src/qisis/objs/ZoomTool/ZoomTool.h b/isis/src/qisis/objs/ZoomTool/ZoomTool.h index d81bbdcdc9..e87b17feaa 100644 --- a/isis/src/qisis/objs/ZoomTool/ZoomTool.h +++ b/isis/src/qisis/objs/ZoomTool/ZoomTool.h @@ -1,25 +1,14 @@ #ifndef ZoomTool_h #define ZoomTool_h -/** - * @file - * $Date: 2010/06/28 09:24:10 $ - * $Revision: 1.7 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public domain. See - * individual third-party library and package descriptions for intellectual property information, - * user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, is made by the - * USGS as to the accuracy and functioning of such software and related material nor shall the - * fact of distribution constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + // This should be the only include in this file! @@ -62,7 +51,7 @@ namespace Isis { * method did nothing so I removed that too. Zooming * happens on the rubberBandComplete slot. * @history 2017-05-10 Ian Humphrey - Modified zoomFit() so that when doing a "Fit in viewport" - * zoom, the image is centered properly in the viewport. Fixes #4756. + * zoom, the image is centered properly in the viewport. Fixes #4756. */ class ZoomTool : public Tool { Q_OBJECT diff --git a/isis/src/rolo/apps/rolo2isis/main.cpp b/isis/src/rolo/apps/rolo2isis/main.cpp index 3ab213af6c..4943b003cb 100644 --- a/isis/src/rolo/apps/rolo2isis/main.cpp +++ b/isis/src/rolo/apps/rolo2isis/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "ProcessImportPds.h" #include "UserInterface.h" diff --git a/isis/src/rosetta/apps/rososiris2isis/main.cpp b/isis/src/rosetta/apps/rososiris2isis/main.cpp index 2b61426c84..380a10da7f 100644 --- a/isis/src/rosetta/apps/rososiris2isis/main.cpp +++ b/isis/src/rosetta/apps/rososiris2isis/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include @@ -41,8 +49,8 @@ void IsisMain() { instId = instId.simplified().trimmed(); missionId = missionId.simplified().trimmed(); - if (missionId.compare("ROSETTA", Qt::CaseInsensitive) != 0 - && instId.compare("OSINAC", Qt::CaseInsensitive) != 0 + if (missionId.compare("ROSETTA", Qt::CaseInsensitive) != 0 + && instId.compare("OSINAC", Qt::CaseInsensitive) != 0 && instId.compare("OSIWAC", Qt::CaseInsensitive) != 0) { QString msg = "Input file [" + inFile.expanded() + "] does not appear to be " + "a Rosetta OSIRIS Wide Angle Camera (WAC) or Narrow Angle Camera (NAC) file."; @@ -96,7 +104,7 @@ void IsisMain() { // Set the BandBin filter name, center, and width values based on the // FilterNumber. Note OSIRIS has 2 filter wheels, so information - // must be looked up and stored for both. + // must be looked up and stored for both. PvlGroup &bbGrp(outLabel.findGroup("BandBin", Pvl::Traverse)); PvlGroup groupWithFilterInfo=pdsLabel.findGroup("SR_MECHANISM_STATUS"); QString combFilterName = groupWithFilterInfo["FILTER_NAME"]; @@ -107,24 +115,24 @@ void IsisMain() { vector filterWidths(2,0.0); vector filterCenters(2,0.0); - // OSIRIS NAC and WAC have different filters + // OSIRIS NAC and WAC have different filters for (int i = 0; i < filterNames.size(); i++) { // Translate the Instrument group try { transFile = transDir + "RosettaOsirisFilters.trn"; PvlTranslationTable filterTable(transFile.expanded()); - filterCenters[i] = toDouble(filterTable.Translate("FilterCenter_" + instId, + filterCenters[i] = toDouble(filterTable.Translate("FilterCenter_" + instId, filterNames[i])); - filterWidths[i] = toDouble(filterTable.Translate("FilterWidth_" + instId, + filterWidths[i] = toDouble(filterTable.Translate("FilterWidth_" + instId, filterNames[i])); } catch (IException &e) { - QString msg = "Input file [" + inFile.expanded() + QString msg = "Input file [" + inFile.expanded() + "] appears invalid. " - + "FilterName [" - + filterNames[i] + + "FilterName [" + + filterNames[i] + "] for instrument [" - + instId + + instId + "] not found in [" + transFile.expanded() + "]."; throw IException(e, IException::Io, msg, _FILEINFO_); diff --git a/isis/src/rosetta/apps/rosvirtis2isis/VirtisHK.cpp b/isis/src/rosetta/apps/rosvirtis2isis/VirtisHK.cpp index 4164d8f87b..b3aeb34bd7 100644 --- a/isis/src/rosetta/apps/rosvirtis2isis/VirtisHK.cpp +++ b/isis/src/rosetta/apps/rosvirtis2isis/VirtisHK.cpp @@ -1,22 +1,10 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ #include "VirtisHK.h" @@ -25,7 +13,7 @@ namespace Isis { /** * Constructs a VIRTIS HK object. - * + * * @param hkName Name to be used for the housekeeping data * @param tableType The type the data is (double, int) * @param one first conversion coefficient @@ -33,7 +21,7 @@ namespace Isis { * @param three third conversion coefficient */ VirtisHK::VirtisHK(QString hkName, QString tableType, QString one, QString two, QString three) { - m_name = hkName; + m_name = hkName; if (QString::compare(tableType.trimmed(), "double") == 0) { m_tableType = TableField::Double; @@ -42,7 +30,7 @@ namespace Isis { m_tableType = TableField::Integer; } - // Initialize equation + // Initialize equation one = one.remove("{").trimmed(); three = three.remove("}").trimmed(); @@ -54,14 +42,14 @@ namespace Isis { /** * Default destructor - * + * */ VirtisHK::~VirtisHK() {} /** * The name of the HK. - * + * * @return QString The name of the HK. */ QString VirtisHK::name(){ @@ -71,7 +59,7 @@ namespace Isis { /** * Returns the TableField Type for this HK. - * + * * @return TableField::Type The field type for this HK. */ TableField::Type VirtisHK::tableType(){ @@ -81,7 +69,7 @@ namespace Isis { /** * Creates and returns the appropriate TableField for this HK. - * + * * @return TableField The entire appropriate TableField for this HK */ TableField VirtisHK::tableField(){ @@ -90,8 +78,8 @@ namespace Isis { /** - * Returns the coefficients used to convert the HK to physical units. - * + * Returns the coefficients used to convert the HK to physical units. + * * @return std::vector A vector of coefficients used to convert this HK to physical units */ std::vector VirtisHK::coefficients(){ diff --git a/isis/src/rosetta/apps/rosvirtis2isis/VirtisHK.h b/isis/src/rosetta/apps/rosvirtis2isis/VirtisHK.h index b8d548ae30..2218219ce4 100644 --- a/isis/src/rosetta/apps/rosvirtis2isis/VirtisHK.h +++ b/isis/src/rosetta/apps/rosvirtis2isis/VirtisHK.h @@ -1,24 +1,14 @@ #ifndef VirtisHK_h #define VirtisHK_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include @@ -27,17 +17,17 @@ namespace Isis { /** * Represents a Rosetta Virtis Housekeeping (HK) entry. - * - * @author 2017-05-27 Kristin Berry - * - * @internal + * + * @author 2017-05-27 Kristin Berry + * + * @internal * @history 2017-05-27 Kristin Berry - Original Version */ class VirtisHK { public: VirtisHK(QString hkName, QString tableType, QString one, QString two, QString three); - ~VirtisHK(); + ~VirtisHK(); QString name(); TableField::Type tableType(); diff --git a/isis/src/rosetta/apps/rosvirtis2isis/main.cpp b/isis/src/rosetta/apps/rosvirtis2isis/main.cpp index 1d0e9cddce..8c9c2c24ee 100644 --- a/isis/src/rosetta/apps/rosvirtis2isis/main.cpp +++ b/isis/src/rosetta/apps/rosvirtis2isis/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include @@ -30,7 +38,7 @@ int word(const char byte1, const char byte2); int swapb(const unsigned short int word); double translateScet(int word1, int word2, int word3); bool isValid(int word); -QString convertSCET(int word1, int word2, int word3); +QString convertSCET(int word1, int word2, int word3); void IsisMain () { @@ -68,7 +76,7 @@ void IsisMain () // only save data suffix if proclevel = 3 if (procLevel == 3) { - p.SaveDataSuffix(); + p.SaveDataSuffix(); } // NULL pixels are set to 65535 in the input QUB @@ -112,7 +120,7 @@ void IsisMain () } QString startScet; - QString stopScet; + QString stopScet; p.StartProcess(); @@ -352,26 +360,26 @@ void IsisMain () for (unsigned int i=0; i < dataSuffix.size(); i++) { std::vector dataSuffixRecord = dataSuffix[i]; - // The SCET for each line is stored as three 2-byte words. The three words are stored in the - // second byte of each of the first 3 lines of the suffix record. - std::vector scetBytes; - std::vector scetWords; + // The SCET for each line is stored as three 2-byte words. The three words are stored in the + // second byte of each of the first 3 lines of the suffix record. + std::vector scetBytes; + std::vector scetWords; for (int j=0; j < 3; j++) { scetBytes.push_back(reinterpret_cast(dataSuffixRecord.at(j))); - scetWords.push_back(swapb(scetBytes[j][1])); + scetWords.push_back(swapb(scetBytes[j][1])); } - + // Calculate the SCET and add it to the table - QString translatedScet = convertSCET(scetWords[0], scetWords[1], scetWords[2]); - rec[0] = translatedScet; - table += rec; + QString translatedScet = convertSCET(scetWords[0], scetWords[1], scetWords[2]); + rec[0] = translatedScet; + table += rec; - // Save off first and last scet values. + // Save off first and last scet values. if (i==0) { - startScet = translatedScet; + startScet = translatedScet; } else if (i == dataSuffix.size() - 1) { - stopScet = translatedScet; + stopScet = translatedScet; } } outcube->write(table); @@ -394,18 +402,18 @@ void IsisMain () // Fix the StartTime and SpacecraftStartClockCount in the ISIS label PvlGroup &inst = outLabel.findGroup("Instrument", Pvl::Traverse); - // Pass the Start/Stop SCET values to naif to get the utc time. - QString sclk = "$ISISDATA/rosetta/kernels/sclk/ROS_??????_STEP.TSC"; - QString lsk = "$ISISDATA/base/kernels/lsk/naif????.tls"; + // Pass the Start/Stop SCET values to naif to get the utc time. + QString sclk = "$ISISDATA/rosetta/kernels/sclk/ROS_??????_STEP.TSC"; + QString lsk = "$ISISDATA/base/kernels/lsk/naif????.tls"; FileName sclkName(sclk); - FileName lskName(lsk); + FileName lskName(lsk); - sclkName = sclkName.highestVersion(); - lskName = lskName.highestVersion(); + sclkName = sclkName.highestVersion(); + lskName = lskName.highestVersion(); furnsh_c(lskName.expanded().toLatin1().data()); furnsh_c(sclkName.expanded().toLatin1().data()); - + SpiceDouble etStart; SpiceDouble etEnd; scs2e_c( (SpiceInt) -226, startScet.toLatin1().data(), &etStart); @@ -414,19 +422,19 @@ void IsisMain () PvlKeyword &frameParam = inst["FrameParameter"]; double exposureTime = toDouble(frameParam[0]); - QString startTime = iTime(etStart-exposureTime).UTC(); - QString stopTime = iTime(etEnd-exposureTime).UTC(); + QString startTime = iTime(etStart-exposureTime).UTC(); + QString stopTime = iTime(etEnd-exposureTime).UTC(); - SpiceChar startSclkString[50]; - SpiceChar endSclkString[50]; + SpiceChar startSclkString[50]; + SpiceChar endSclkString[50]; sce2s_c( (SpiceInt) -226, etStart-exposureTime, (SpiceInt) 50, startSclkString); sce2s_c( (SpiceInt) -226, etEnd-exposureTime, (SpiceInt) 50, endSclkString); - + inst.findKeyword("StartTime").setValue(startTime); - inst.findKeyword("StopTime").setValue(stopTime); + inst.findKeyword("StopTime").setValue(stopTime); - inst.findKeyword("SpacecraftClockStartCount").setValue(startSclkString); - inst.findKeyword("SpacecraftClockStopCount").setValue(endSclkString); + inst.findKeyword("SpacecraftClockStartCount").setValue(startSclkString); + inst.findKeyword("SpacecraftClockStopCount").setValue(endSclkString); outcube->putGroup(inst); @@ -434,7 +442,7 @@ void IsisMain () unload_c(lsk.toLatin1().data()); unload_c(sclk.toLatin1().data()); } - + // Write the Archive and Instrument groups to the output cube label outcube->putGroup(outLabel.findGroup("Archive", Pvl::Traverse)); outcube->putGroup(outLabel.findGroup("Instrument", Pvl::Traverse)); @@ -485,14 +493,14 @@ void IsisMain () QString convertSCET(int word1, int word2, int word3) { double seconds = (double ((double) word1 * pow(2.0,16.0))) + (double) word2; - double fractionalSeconds = (double) word3; + double fractionalSeconds = (double) word3; QString scetString = QString::number(seconds, 'f'); QStringList scetStringList = scetString.split("."); // The integer portion scetString = scetStringList[0]; scetString.append(":"); scetString.append(QString::number(fractionalSeconds)); - return scetString; + return scetString; } diff --git a/isis/src/rosetta/objs/RosettaOsirisCamera/RosettaOsirisCamera.cpp b/isis/src/rosetta/objs/RosettaOsirisCamera/RosettaOsirisCamera.cpp index 31d9119f1c..9677faf89f 100644 --- a/isis/src/rosetta/objs/RosettaOsirisCamera/RosettaOsirisCamera.cpp +++ b/isis/src/rosetta/objs/RosettaOsirisCamera/RosettaOsirisCamera.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "RosettaOsirisCamera.h" @@ -45,8 +34,8 @@ namespace Isis { * @author ????-??-?? Stuart Sides * * @internal - * @history ????-??-?? Stuart Sides - Original version. - * @history ????-??-?? Sasha Brownsberger + * @history ????-??-?? Stuart Sides - Original version. + * @history ????-??-?? Sasha Brownsberger * @history 2018-09-24 Kaj Williams - Added binning support. */ diff --git a/isis/src/rosetta/objs/RosettaOsirisCamera/RosettaOsirisCamera.h b/isis/src/rosetta/objs/RosettaOsirisCamera/RosettaOsirisCamera.h index a0e87569bd..ebbbc50700 100644 --- a/isis/src/rosetta/objs/RosettaOsirisCamera/RosettaOsirisCamera.h +++ b/isis/src/rosetta/objs/RosettaOsirisCamera/RosettaOsirisCamera.h @@ -1,24 +1,14 @@ #ifndef RosettaOsirisCamera_h #define RosettaOsirisCamera_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "FramingCamera.h" diff --git a/isis/src/rosetta/objs/RosettaOsirisCamera/RosettaOsirisCameraDistortionMap.cpp b/isis/src/rosetta/objs/RosettaOsirisCamera/RosettaOsirisCameraDistortionMap.cpp index c8021cf8d7..55cc62b248 100644 --- a/isis/src/rosetta/objs/RosettaOsirisCamera/RosettaOsirisCameraDistortionMap.cpp +++ b/isis/src/rosetta/objs/RosettaOsirisCamera/RosettaOsirisCameraDistortionMap.cpp @@ -1,25 +1,11 @@ -/** - * @file - * $Revision: 1.5 $ - * $Date: 2010/05/12 23:28:12 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "RosettaOsirisCameraDistortionMap.h" @@ -35,7 +21,7 @@ namespace Isis { * @param parent the parent camera that will use this distortion map * */ - RosettaOsirisCameraDistortionMap::RosettaOsirisCameraDistortionMap(Camera *parent) : + RosettaOsirisCameraDistortionMap::RosettaOsirisCameraDistortionMap(Camera *parent) : CameraDistortionMap(parent) { // Initialize to the identity transform m_toUnDistortedX = LinearAlgebra::zeroMatrix(4, 4); @@ -50,23 +36,23 @@ namespace Isis { /** * Compute undistorted focal plane x/y given a distorted focal plane x/y. - * + * * The distortion is modeled by pixelspace polynomials. The polynomials use * zero-based pixel space with the origin at the top left corner of the * image, so the input focal plane coordinates are converted to pixel * coordinates using the boresight location and pixel pitch. After * computation, they are converted back into focal plane coordinates by the * inverse process. - * + * * Given a set of distorted pixel coordinates (dx, dy), the undistorted pixel * coordinates (ux, uy) are computed as: * @f[ (ux, uy) = F(dx, dy) = ( \sum_{i=0}^3 \sum_{j=0}^3 C_{i,j}^x dx^i dy^j, * \sum_{i=0}^3 \sum_{j=0}^3 C_{i,j}^y dx^i dy^j) @f] where @f$ C_{i,j}^y @f$ * and @f$ C_{i,j}^y @f$ are the @f$ (i,j)^{\text{th}} @f$ coefficients of * the @f$ x @f$ and @f$ y @f$ polynomials respectively. - * + * * This calculation is actually performed as follows: - * @f[ (ux, uy) = + * @f[ (ux, uy) = * \left( C^x \begin{bmatrix} 1 \\ dx \\ dx^2 \\ dx^3 \end{bmatrix} * \cdot \begin{bmatrix} 1 \\ dy \\ dy^2 \\ dy^3 \end{bmatrix}, * C^y \begin{bmatrix} 1 \\ dx \\ dx^2 \\ dx^3 \end{bmatrix} @@ -115,12 +101,12 @@ namespace Isis { /** * Compute distorted focal plane x/y given an undistorted focal plane x/y. - * + * * The conversion is performed using Newton's method to find distorted * coordinates whose undistorted coordinates are within @f$ 10^{-7} @f$ * pixels of the input undistorted coordinates. The input undistorted * coordinates are used as an initial guess for the distorted coordinates. - * + * * Given a set of undistorted pixel coordinates (ux, uy), the object function * is: * @f[ @@ -128,7 +114,7 @@ namespace Isis { * @f] * where @f$ F @f$ is the transformation from distorted to undistorted pixel * coordinates. - * + * * Then, the negative jacobian is: * @f[ * -J_G(dx, dy) = \begin{bmatrix} @@ -283,7 +269,7 @@ namespace Isis { /** * Set the matrix for converting from distorted to undistorted samples. - * + * * @param xMat The conversion matrix */ void RosettaOsirisCameraDistortionMap::setUnDistortedXMatrix(LinearAlgebra::Matrix xMat) { @@ -293,7 +279,7 @@ namespace Isis { /** * Set the matrix for converting from distorted to undistorted lines. - * + * * @param yMat The conversion matrix */ void RosettaOsirisCameraDistortionMap::setUnDistortedYMatrix(LinearAlgebra::Matrix yMat) { @@ -304,7 +290,7 @@ namespace Isis { /** * Set the boresight location for converting from focal plane coordinates to * pixel coordinates. - * + * * @param sample The sample location of the boresight * @param line The line location of the boresight */ @@ -317,7 +303,7 @@ namespace Isis { /** * Set the pixel pitch for converting from focal plane coordinates to * pixel coordinates. - * + * * @param pitch The pixel pitch in mm per pixel. */ void RosettaOsirisCameraDistortionMap::setPixelPitch(double pitch) { @@ -327,9 +313,9 @@ namespace Isis { /** * Convert a focal plane x coordinate to a pixel space line coordinate. - * + * * @param x The focal plane x coordinate in mm - * + * * @return @b double The pixel space line coordinate */ double RosettaOsirisCameraDistortionMap::focalXToLine(double x) { @@ -339,9 +325,9 @@ namespace Isis { /** * Convert a focal plane y coordinate to a pixel space sample coordinate. - * + * * @param y The focal plane y coordinate in mm - * + * * @return @b double The pixel space sample coordinate */ double RosettaOsirisCameraDistortionMap::focalYToSample(double y) { @@ -351,7 +337,7 @@ namespace Isis { /** * Convert pixel space line coordinate to a focal plane x coordinate. - * + * * @param line The pixel space line coordinate * * @return @b double The focal plane x coordinate in mm @@ -363,7 +349,7 @@ namespace Isis { /** * Convert pixel space sample coordinate to a focal plane y coordinate. - * + * * @param sample The pixel space sample coordinate * * @return @b double The focal plane y coordinate in mm diff --git a/isis/src/rosetta/objs/RosettaOsirisCamera/RosettaOsirisCameraDistortionMap.h b/isis/src/rosetta/objs/RosettaOsirisCamera/RosettaOsirisCameraDistortionMap.h index 4e1cac523d..823268eb98 100644 --- a/isis/src/rosetta/objs/RosettaOsirisCamera/RosettaOsirisCameraDistortionMap.h +++ b/isis/src/rosetta/objs/RosettaOsirisCamera/RosettaOsirisCameraDistortionMap.h @@ -1,48 +1,38 @@ #ifndef RosettaOsirisCameraDistortionMap_h #define RosettaOsirisCameraDistortionMap_h -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "CameraDistortionMap.h" #include "LinearAlgebra.h" namespace Isis { - /** + /** * Distortion map for converting between undistorted focal plane and * distorted focal plane coordinates for the Rosetta OSIRIS NAC and WAC. - * + * * The distortion models are defined by pixelspace polynomials. The * polynomials use zero-based pixel space with the origin at the top left * corner of the image, so the input focal plane coordinates are converted to * pixel coordinates using the boresight location and pixel pitch. After * computation, they are converted back into focal plane coordinates by the * inverse process. - * + * * Given a set of distorted pixel coordinates (dx, dy), the undistorted pixel * coordinates (ux, uy) are computed as: * @f[ (ux, uy) = F(dx, dy) = ( \sum_{i=0}^3 \sum_{j=0}^3 C_{i,j}^x dx^i dy^j, * \sum_{i=0}^3 \sum_{j=0}^3 C_{i,j}^y dx^i dy^j) @f] where @f$ C_{i,j}^y @f$ * and @f$ C_{i,j}^y @f$ are the @f$ (i,j)^{\text{th}} @f$ coefficients of * the @f$ x @f$ and @f$ y @f$ polynomials respectively. - * + * * Given a set of undistorted pixel coordinates (ux, uy), Newton's method is * used to find the distorted coordinates (dx, dy) within a tolerance of * @f$ 10^{-7} @f$ pixels. @@ -100,4 +90,3 @@ namespace Isis { }; }; #endif - diff --git a/isis/src/rosetta/objs/RosettaOsirisCamera/unitTest.cpp b/isis/src/rosetta/objs/RosettaOsirisCamera/unitTest.cpp index bd8c33b6d8..964c211226 100644 --- a/isis/src/rosetta/objs/RosettaOsirisCamera/unitTest.cpp +++ b/isis/src/rosetta/objs/RosettaOsirisCamera/unitTest.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include diff --git a/isis/src/rosetta/objs/RosettaVirtisCamera/RosettaVirtisCamera.cpp b/isis/src/rosetta/objs/RosettaVirtisCamera/RosettaVirtisCamera.cpp index 8cf4634dae..85601ae208 100644 --- a/isis/src/rosetta/objs/RosettaVirtisCamera/RosettaVirtisCamera.cpp +++ b/isis/src/rosetta/objs/RosettaVirtisCamera/RosettaVirtisCamera.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "RosettaVirtisCamera.h" #include @@ -30,12 +38,12 @@ namespace Isis { // constructors /** * Creates a camera for a Rosetta VIRTIS-M cube - * + * * @param cube The cube to make a camera for - * + * */ RosettaVirtisCamera::RosettaVirtisCamera(Cube &cube) : LineScanCamera(cube) { - + m_instrumentNameLong = "Visual and Infrared Thermal Imaging Spectrometer"; m_instrumentNameShort = "VIRTIS"; m_spacecraftNameLong = "Rosetta"; @@ -53,7 +61,7 @@ namespace Isis { + instrumentId; throw IException(IException::User, mess, _FILEINFO_); } - + int procLevel = inst["ProcessingLevelId"]; m_is1BCalibrated = (procLevel > 2) ? true : false; @@ -104,7 +112,7 @@ namespace Isis { // Get the line scan rates/times if (!m_is1BCalibrated) { - readHouseKeeping(lab.fileName(), m_scanRate); + readHouseKeeping(lab.fileName(), m_scanRate); } else { readSCET(lab.fileName()); @@ -131,7 +139,7 @@ namespace Isis { // Set initial start time always (label start time is inaccurate) if (!m_is1BCalibrated){ - setTime(iTime(startTime())); + setTime(iTime(startTime())); } // Now check to determine if we have a cache already. If we have a cache @@ -171,39 +179,39 @@ namespace Isis { RosettaVirtisCamera::~RosettaVirtisCamera() { } - /** + /** * Returns CK frame identifier - * + * * @return @b int The CK frame identifier. */ - int RosettaVirtisCamera::CkFrameId() const { - return (-226000); + int RosettaVirtisCamera::CkFrameId() const { + return (-226000); } - /** + /** * Returns CK reference frame identifier - * + * * @return @b int The CK reference frame identifier. */ - int RosettaVirtisCamera::CkReferenceId() const { - return (1); + int RosettaVirtisCamera::CkReferenceId() const { + return (1); } - /** + /** * Return PK reference frame identifier - * + * * @return @b int The SPK reference frame identifier */ - int RosettaVirtisCamera::SpkReferenceId() const { - return (1); + int RosettaVirtisCamera::SpkReferenceId() const { + return (1); } - /** + /** * Return the pixel summing rate - * + * * @return @b int The pixel summing rate. */ int RosettaVirtisCamera::pixelSumming() const { @@ -211,9 +219,9 @@ namespace Isis { } - /** + /** * Return the exposure time - * + * * @return @b double The exposure time for a pixel. */ double RosettaVirtisCamera::exposureTime() const { @@ -221,9 +229,9 @@ namespace Isis { } - /** + /** * Return the line scan rate - * + * * @return @b double The time between lines in the cube. */ double RosettaVirtisCamera::scanLineTime() const { @@ -231,19 +239,19 @@ namespace Isis { } - /** + /** * Return the start time for a given line exposure time - * + * * @return @b double The et time at the start of the line's exposure. */ double RosettaVirtisCamera::lineStartTime(const double midExpTime) const { - return (midExpTime - (exposureTime() / 2.0)); + return (midExpTime - (exposureTime() / 2.0)); } - /** + /** * Return the end time for a given line exposure time - * + * * @return @b double The et time at the end of the line's exposure. */ double RosettaVirtisCamera::lineEndTime(const double midExpTime) const { @@ -251,9 +259,9 @@ namespace Isis { } - /** + /** * Return start time for the entire cube. - * + * * @return @b double The et time at the start of the cube. */ double RosettaVirtisCamera::startTime() const { @@ -261,9 +269,9 @@ namespace Isis { } - /** + /** * Return end time for the entire cube. - * + * * @return @b double The et time at the end of the cube. */ double RosettaVirtisCamera::endTime() const { @@ -271,9 +279,9 @@ namespace Isis { } - /** + /** * Returns number of housekeeping records found in the cube Table - * + * * @return @b int The number of housekeeping records. */ int RosettaVirtisCamera::hkLineCount() const { @@ -284,7 +292,7 @@ namespace Isis { /** * @brief For calibrated VIRTIS-M images, read the SCET values from the cube * - * + * * @param filename The filename of the cube with the house keeping table. * @param linerate The linerate for the cube. * @@ -292,7 +300,7 @@ namespace Isis { */ void RosettaVirtisCamera::readSCET(const QString &filename) { // Open the ISIS table object - std::vector cacheTime; + std::vector cacheTime; Table hktable("VIRTISHouseKeeping", filename); m_lineRates.clear(); int lineno(1); @@ -339,7 +347,7 @@ namespace Isis { * MirrorSin, and MirrorCos. These fields contain the scan line time in * SCLK, status of shutter - open, closed (dark), sine and cosine of the * scan mirror, respectively. - * + * * @param filename The filename of the cube with the house keeping table. * @param linerate The linerate for the cube. * @@ -443,9 +451,9 @@ namespace Isis { * From the VIR housekeeping data, compute the pointing table for each line * in the image. This table is for instrumentRotation(Table &) to establish * line/sample pointing information. - * + * * @internal - * @history 2011-07-22 Kris Becker + * @history 2011-07-22 Kris Becker */ Table RosettaVirtisCamera::getPointingTable(const QString &virChannel, const int zeroFrame) { @@ -566,7 +574,7 @@ namespace Isis { * acceleration vectors are then set to 0. * * @internal - * @history 2011-07-22 Kris Becker + * @history 2011-07-22 Kris Becker */ RosettaVirtisCamera::SMatrix RosettaVirtisCamera::getStateRotation(const QString &frame1, @@ -609,12 +617,12 @@ namespace Isis { * the labels. If a kernel with the file pattern * "ROS_VIRTIS_M_????_????_V?.BC" is present as a CK kernel, then that kernel * contains mirror scan angles for each line. - * + * * If the kernel does not exist, this camera model will provide these angles * from the VIR housekeeping data. * * @internal - * @history 2011-07-22 Kris Becker + * @history 2011-07-22 Kris Becker */ bool RosettaVirtisCamera::hasArticulationKernel(Pvl &label) const { Kernels kerns(label); @@ -629,7 +637,7 @@ namespace Isis { } -/** +/** * Instantiate a new RosettaVirtisCamera model for the given label content */ extern "C" Isis::Camera *RosettaVirtisCameraPlugin(Isis::Cube &cube) { diff --git a/isis/src/rosetta/objs/RosettaVirtisCamera/RosettaVirtisCamera.h b/isis/src/rosetta/objs/RosettaVirtisCamera/RosettaVirtisCamera.h index e530b90565..19626605f3 100644 --- a/isis/src/rosetta/objs/RosettaVirtisCamera/RosettaVirtisCamera.h +++ b/isis/src/rosetta/objs/RosettaVirtisCamera/RosettaVirtisCamera.h @@ -1,6 +1,14 @@ #ifndef RosettaVirtisCamera_h #define RosettaVirtisCamera_h +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "LineScanCamera.h" #include @@ -10,11 +18,11 @@ #include "VariableLineScanCameraDetectorMap.h" namespace Isis { - /** - * @brief Camera model for both Rosetta VIRTIS-M instruments - * - * @ingroup SpiceInstrumentsAndCameras - * @ingroup Rosetta + /** + * @brief Camera model for both Rosetta VIRTIS-M instruments + * + * @ingroup SpiceInstrumentsAndCameras + * @ingroup Rosetta * * @author 2017-08-23 Kris Becker * @@ -54,16 +62,16 @@ namespace Isis { double startTime() const; double endTime() const; - Table getPointingTable(const QString &channelId, + Table getPointingTable(const QString &channelId, const int zeroFrame); - SMatrix getStateRotation(const QString &frame1, - const QString &frame2, + SMatrix getStateRotation(const QString &frame1, + const QString &frame2, const double &et) const; bool hasArticulationKernel(Pvl &label) const; - /** - * + /** + * * @author ????-??-?? Unknown * @internal * @history ????-??-?? Unknown - Original version. diff --git a/isis/src/rosetta/objs/RosettaVirtisCamera/unitTest.cpp b/isis/src/rosetta/objs/RosettaVirtisCamera/unitTest.cpp index 3ef39928ef..8bca23dfc3 100644 --- a/isis/src/rosetta/objs/RosettaVirtisCamera/unitTest.cpp +++ b/isis/src/rosetta/objs/RosettaVirtisCamera/unitTest.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include @@ -34,7 +23,7 @@ using namespace std; using namespace Isis; void TestLineSamp(Camera *cam, double samp, double line); -int TestCamera(Camera *cam, Cube c, double lines, double knownLat, double knownLon); +int TestCamera(Camera *cam, Cube c, double lines, double knownLat, double knownLon); /** * @@ -46,8 +35,8 @@ int TestCamera(Camera *cam, Cube c, double lines, double knownLat, double knownL * @history 2018-08-28 Kris Becker - Initial unit test for Rosetta VIRTIS * instrument * @history 2019-07-02 Krisitn Berry - Update to test only level 3 (calibrated) images, as only - * calibrated images are currently supported by the camera model. - */ + * calibrated images are currently supported by the camera model. + */ int main(void) { Preference::Preferences(true); @@ -68,7 +57,7 @@ int main(void) { cout << endl << "Teting Level 3 (Calibrated) VIRTIS-M-IR Cube ..." << endl; knownLat = 29.1974649731145028; knownLon = 346.8749209987247468; - lines = 67; + lines = 67; Cube irCube("$ISISTESTDATA/isis/src/rosetta/unitTestData/I1_00382172310.cub", "r"); RosettaVirtisCamera *cam2 = (RosettaVirtisCamera *) CameraFactory::Create(irCube); TestCamera(cam2, irCube, lines, knownLat, knownLon); @@ -83,60 +72,60 @@ int TestCamera(Camera *cam, Cube c, double lines, double knownLat, double knownL cout << "CK Frame: " << cam->instrumentRotation()->Frame() << endl << endl; cout.setf(std::ios::fixed); cout << setprecision(9); - + // Test kernel IDs cout << "Kernel IDs: " << endl; cout << "CK Frame ID = " << cam->CkFrameId() << endl; cout << "CK Reference ID = " << cam->CkReferenceId() << endl; cout << "SPK Target ID = " << cam->SpkTargetId() << endl; cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl; - + // Test name methods cout << "Spacecraft Name Long: " << cam->spacecraftNameLong() << endl; cout << "Spacecraft Name Short: " << cam->spacecraftNameShort() << endl; cout << "Instrument Name Long: " << cam->instrumentNameLong() << endl; cout << "Instrument Name Short: " << cam->instrumentNameShort() << endl << endl; - - // Test Shutter Open/Close + + // Test Shutter Open/Close std::pair< double, double > imgTimes = cam->StartEndEphemerisTimes(); cout << "Start Time: " << imgTimes.first << "\n"; cout << "End Time: " << imgTimes.second << "\n"; - + // Test all four corners to make sure the conversions are right - // For Rosetta, could not find images with the comet at all 4 corners, so these are + // For Rosetta, could not find images with the comet at all 4 corners, so these are // actually corners of the comet, not the image. Values were chosen to approximate - // the corners on two different images (VIS and IR). - + // the corners on two different images (VIS and IR). + // good. cout << "For upper left corner ..." << endl; TestLineSamp(cam, 138.0, 10.0); - + cout << "For upper right corner ..." << endl; TestLineSamp(cam, 165.0, 19.0); - - // fixme? + + // fixme? cout << "For lower left corner ..." << endl; TestLineSamp(cam, 138.0, 55.0); - + cout << "For lower right corner ..." << endl; TestLineSamp(cam, 130.0, 55.0); double samp = 128.0; double line = lines/2.0; cout << "For center pixel position ..." << endl; - + if(!cam->SetImage(samp, line)) { cout << "ERROR" << endl; return 0; } - + if(abs(cam->UniversalLatitude() - knownLat) < 6E-12) { cout << "Latitude OK" << endl; } else { cout << setprecision(16) << "Latitude off by: " << cam->UniversalLatitude() - knownLat << endl; } - + if(abs(cam->UniversalLongitude() - knownLon) < 6E-12) { cout << "Longitude OK" << endl; } @@ -166,4 +155,3 @@ void TestLineSamp(Camera *cam, double samp, double line) { cout << "DeltaLine = ERROR" << endl << endl; } } - diff --git a/isis/src/socet/apps/socetframesettings/main.cpp b/isis/src/socet/apps/socetframesettings/main.cpp index bd11c2bb87..86e3f90e86 100644 --- a/isis/src/socet/apps/socetframesettings/main.cpp +++ b/isis/src/socet/apps/socetframesettings/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include diff --git a/isis/src/system/apps/blobdump/main.cpp b/isis/src/system/apps/blobdump/main.cpp index 8b152ee091..3e8b88edc1 100644 --- a/isis/src/system/apps/blobdump/main.cpp +++ b/isis/src/system/apps/blobdump/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #define GUIHELPERS #include "Isis.h" diff --git a/isis/src/system/apps/csspckgen/main.cpp b/isis/src/system/apps/csspckgen/main.cpp index f829efeeed..695453d44e 100644 --- a/isis/src/system/apps/csspckgen/main.cpp +++ b/isis/src/system/apps/csspckgen/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "FileName.h" @@ -100,4 +108,3 @@ void IsisMain() { latestDb.addObject(latestMain); latestDb.write(outputName.expanded()); } - diff --git a/isis/src/system/apps/dempack/main.cpp b/isis/src/system/apps/dempack/main.cpp index e73186e773..e299d3a969 100644 --- a/isis/src/system/apps/dempack/main.cpp +++ b/isis/src/system/apps/dempack/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include @@ -102,4 +110,3 @@ void IsisMain() { } os << "" << endl; } - diff --git a/isis/src/system/apps/isiscomplete/main.cpp b/isis/src/system/apps/isiscomplete/main.cpp index 6433d6836f..a4477e048f 100644 --- a/isis/src/system/apps/isiscomplete/main.cpp +++ b/isis/src/system/apps/isiscomplete/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Application.h" #include "UserInterface.h" #include "FileList.h" diff --git a/isis/src/system/apps/kerneldbgen/SpiceDbGen.cpp b/isis/src/system/apps/kerneldbgen/SpiceDbGen.cpp index 3decd908c9..71104fc263 100644 --- a/isis/src/system/apps/kerneldbgen/SpiceDbGen.cpp +++ b/isis/src/system/apps/kerneldbgen/SpiceDbGen.cpp @@ -1,24 +1,11 @@ -/** - * @file - * $Revision: 1.6 $ - * $Date: 2010/05/02 18:39:28 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include diff --git a/isis/src/system/apps/kerneldbgen/SpiceDbGen.h b/isis/src/system/apps/kerneldbgen/SpiceDbGen.h index 57d84256f8..3a325303ac 100644 --- a/isis/src/system/apps/kerneldbgen/SpiceDbGen.h +++ b/isis/src/system/apps/kerneldbgen/SpiceDbGen.h @@ -1,28 +1,14 @@ #ifndef SpiceDbGen_h #define SpiceDbGen_h -/** - * @file - * $Revision: 1.4 $ - * $Date: 2010/05/02 18:39:28 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include diff --git a/isis/src/system/apps/kerneldbgen/main.cpp b/isis/src/system/apps/kerneldbgen/main.cpp index f084493bf6..075e3bf66e 100644 --- a/isis/src/system/apps/kerneldbgen/main.cpp +++ b/isis/src/system/apps/kerneldbgen/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "SpiceDbGen.h" #include "FileList.h" diff --git a/isis/src/system/apps/messckgen/main.cpp b/isis/src/system/apps/messckgen/main.cpp index 76013eeb98..d18148a582 100644 --- a/isis/src/system/apps/messckgen/main.cpp +++ b/isis/src/system/apps/messckgen/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include @@ -323,4 +331,3 @@ PvlGroup* insertGroup(PvlObject &object, PvlGroup &group, int index) { // Return the location of the new group return ¤tGroup; } - diff --git a/isis/src/system/apps/messspkgen/main.cpp b/isis/src/system/apps/messspkgen/main.cpp index d9dc4ac511..38ee973838 100644 --- a/isis/src/system/apps/messspkgen/main.cpp +++ b/isis/src/system/apps/messspkgen/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include diff --git a/isis/src/system/apps/prtloganalyzer/ProgramAnalyzer.cpp b/isis/src/system/apps/prtloganalyzer/ProgramAnalyzer.cpp index 426f073720..e2a7836c2f 100644 --- a/isis/src/system/apps/prtloganalyzer/ProgramAnalyzer.cpp +++ b/isis/src/system/apps/prtloganalyzer/ProgramAnalyzer.cpp @@ -1,25 +1,11 @@ -/** - * @file - * $Revision: 1.3 $ - * $Date: 2010/02/25 18:39:05 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include #include diff --git a/isis/src/system/apps/prtloganalyzer/ProgramAnalyzer.h b/isis/src/system/apps/prtloganalyzer/ProgramAnalyzer.h index e3d2303991..827577054f 100644 --- a/isis/src/system/apps/prtloganalyzer/ProgramAnalyzer.h +++ b/isis/src/system/apps/prtloganalyzer/ProgramAnalyzer.h @@ -1,27 +1,14 @@ #ifndef ProgramAnalyzer_h #define ProgramAnalyzer_h -/** - * @file - * $Revision: 1.7 $ - * $Date: 2008/09/06 06:47:48 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include diff --git a/isis/src/system/apps/prtloganalyzer/main.cpp b/isis/src/system/apps/prtloganalyzer/main.cpp index 2e51354ff0..92615580f0 100644 --- a/isis/src/system/apps/prtloganalyzer/main.cpp +++ b/isis/src/system/apps/prtloganalyzer/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + // $Id$ #include "Isis.h" #include "FileList.h" diff --git a/isis/src/system/objs/Kernel/Kernel.cpp b/isis/src/system/objs/Kernel/Kernel.cpp index f201e7485f..3227fef359 100644 --- a/isis/src/system/objs/Kernel/Kernel.cpp +++ b/isis/src/system/objs/Kernel/Kernel.cpp @@ -1,24 +1,11 @@ -/** - * @file - * $Revision: 1.7 $ - * $Date: 2009/07/28 21:01:18 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Kernel.h" #include diff --git a/isis/src/system/objs/Kernel/Kernel.h b/isis/src/system/objs/Kernel/Kernel.h index 5aca65e5cd..034ed90092 100644 --- a/isis/src/system/objs/Kernel/Kernel.h +++ b/isis/src/system/objs/Kernel/Kernel.h @@ -1,27 +1,14 @@ #ifndef Kernel_h #define Kernel_h -/** - * @file - * $Revision: 1.7 $ - * $Date: 2009/07/28 21:01:18 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include diff --git a/isis/src/system/objs/KernelDb/KernelDb.cpp b/isis/src/system/objs/KernelDb/KernelDb.cpp index b3ee72f6e9..38b305b120 100644 --- a/isis/src/system/objs/KernelDb/KernelDb.cpp +++ b/isis/src/system/objs/KernelDb/KernelDb.cpp @@ -1,24 +1,11 @@ -/** - * @file - * $Revision: 1.5 $ - * $Date: 2009/05/12 20:11:20 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "KernelDb.h" #include diff --git a/isis/src/system/objs/KernelDb/KernelDb.h b/isis/src/system/objs/KernelDb/KernelDb.h index a2b1b0876c..d8147a3909 100644 --- a/isis/src/system/objs/KernelDb/KernelDb.h +++ b/isis/src/system/objs/KernelDb/KernelDb.h @@ -1,27 +1,14 @@ #ifndef KernelDb_h #define KernelDb_h -/** - * @file - * $Revision: 1.7 $ - * $Date: 2009/07/28 21:01:18 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include diff --git a/isis/src/tgo/apps/tgocassis2isis/main.cpp b/isis/src/tgo/apps/tgocassis2isis/main.cpp index 32381e105a..b266987926 100644 --- a/isis/src/tgo/apps/tgocassis2isis/main.cpp +++ b/isis/src/tgo/apps/tgocassis2isis/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include diff --git a/isis/src/tgo/apps/tgocassismos/main.cpp b/isis/src/tgo/apps/tgocassismos/main.cpp index d93ece6a20..72448c563a 100644 --- a/isis/src/tgo/apps/tgocassismos/main.cpp +++ b/isis/src/tgo/apps/tgocassismos/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "Application.h" @@ -187,8 +195,8 @@ void IsisMain() { observationId = archiveGroup["ObservationId"][0]; firstStartTime = instGroup["StartTime"][0]; startClock = instGroup["SpacecraftClockStartCount"][0]; - lastStartTime = instGroup["StartTime"][0]; - exposureDuration = instGroup["ExposureDuration"][0]; + lastStartTime = instGroup["StartTime"][0]; + exposureDuration = instGroup["ExposureDuration"][0]; } else { // current cube's StartTime/StopTime values @@ -203,10 +211,10 @@ void IsisMain() { } } } - + // After selecting the last StartTime, calculate the StopTime iTime lastStartTimeValue = iTime(lastStartTime); - iTime stopTimeValue = lastStartTimeValue + exposureDuration.toDouble(); + iTime stopTimeValue = lastStartTimeValue + exposureDuration.toDouble(); stopTime = stopTimeValue.UTC(3); // Get the archiveGroup from the first cube in the list @@ -224,7 +232,7 @@ void IsisMain() { QString toMosaic = ui.GetFileName("TO"); QString mosaicPriority = ui.GetString("PRIORITY"); - QString parameters = "FROMLIST=" + list + " MOSAIC=" + toMosaic + " PRIORITY=" + mosaicPriority + QString parameters = "FROMLIST=" + list + " MOSAIC=" + toMosaic + " PRIORITY=" + mosaicPriority + " TRACK=TRUE"; if (QString::compare(ui.GetString("GRANGE"), "USER", Qt::CaseInsensitive) == 0) { @@ -248,7 +256,7 @@ void IsisMain() { mos += PvlKeyword("IncidenceAngle ", toString(incidenceAngle), "degrees"); mos += PvlKeyword("EmissionAngle ", toString(emissionAngle), "degrees"); mos += PvlKeyword("PhaseAngle ", toString(phaseAngle), "degrees"); - mos += PvlKeyword("LocalTime ", toString(localSolarTime)); + mos += PvlKeyword("LocalTime ", toString(localSolarTime)); mos += PvlKeyword("SolarLongitude ", toString(solarLongitude), "degrees"); mos += PvlKeyword("SubSolarAzimuth ", toString(sunAzimuth), "degrees"); mos += PvlKeyword("NorthAzimuth ", toString(northAzimuth), "degrees"); diff --git a/isis/src/tgo/apps/tgocassisrdrgen/main.cpp b/isis/src/tgo/apps/tgocassisrdrgen/main.cpp index 894c953c80..1cf5599fed 100644 --- a/isis/src/tgo/apps/tgocassisrdrgen/main.cpp +++ b/isis/src/tgo/apps/tgocassisrdrgen/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include @@ -83,15 +91,15 @@ void IsisMain() { productId.setValue(observationId); } - targetGroup.addKeyword(productId); + targetGroup.addKeyword(productId); logicalId += productId[0]; process.setLogicalId(logicalId); - // For a mosaic, calculate stitched browse LID (lidvid) - // This is as follows: + // For a mosaic, calculate stitched browse LID (lidvid) + // This is as follows: // StartTime of the first framelet, rounded down to the nearest second if (label->findObject("IsisCube").hasGroup("Mosaic")) { - QString startTime = label->findObject("IsisCube").findGroup("Mosaic").findKeyword("StartTime"); + QString startTime = label->findObject("IsisCube").findGroup("Mosaic").findKeyword("StartTime"); startTime = iTime(startTime).UTC(0).toLower().remove("-").remove(":"); // StopTime of the last framelet, rounded down to the nearest second + 4 seconds @@ -137,10 +145,10 @@ void IsisMain() { process.addSchema("PDS4_PSA_EM16_CAS_1000.xsd", "xmlns:cas", "http://psa.esa.int/psa/em16/cas/v1"); - + // Add geometry schema for mosaics if (label->findObject("IsisCube").hasGroup("Mosaic")) { - process.addSchema("PDS4_GEOM_1B00_1610.sch", + process.addSchema("PDS4_GEOM_1B00_1610.sch", "PDS4_GEOM_1B00_1610.xsd", "xmlns:geom", "http://pds.nasa.gov/pds4/geom/v1"); @@ -152,7 +160,7 @@ void IsisMain() { QDomDocument &pdsLabel = process.GetLabel(); // The default translation for for non-mosaicked output - QString exportTranslationFile = "$ISISROOT/appdata/translations/TgoCassisExport.trn"; + QString exportTranslationFile = "$ISISROOT/appdata/translations/TgoCassisExport.trn"; if (label->findObject("IsisCube").hasGroup("Mosaic")) { exportTranslationFile = "$ISISROOT/appdata/translations/TgoCassisExportMosaic.trn"; @@ -164,11 +172,11 @@ void IsisMain() { cubeLab.Auto(pdsLabel); ProcessExportPds4::translateUnits(pdsLabel); - process.reorder(); - + process.reorder(); + // Units are automatically translated for the focal length, and there is no way at this time to // turn it off, but the cas:CASSIS_Data standard specifies that the focal-length output may not - // have units, so remove the units from cas:focal length. + // have units, so remove the units from cas:focal length. QDomDocument &pdsLabelNext = process.GetLabel(); QDomElement observationNode = pdsLabelNext.documentElement().firstChildElement("Observation_Area"); QStringList xmlPath; @@ -180,7 +188,7 @@ void IsisMain() { QDomElement focalLengthNode = process.getElement(xmlPath, observationNode); if (focalLengthNode.hasAttribute("unit")) { - focalLengthNode.removeAttribute("unit"); + focalLengthNode.removeAttribute("unit"); } QString outFile = ui.GetFileName("TO"); diff --git a/isis/src/tgo/apps/tgocassisstitch/main.cpp b/isis/src/tgo/apps/tgocassisstitch/main.cpp index 72255c4ebe..87dab73609 100644 --- a/isis/src/tgo/apps/tgocassisstitch/main.cpp +++ b/isis/src/tgo/apps/tgocassisstitch/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include diff --git a/isis/src/tgo/apps/tgocassisunstitch/main.cpp b/isis/src/tgo/apps/tgocassisunstitch/main.cpp index 445e38ebf7..0475e79764 100644 --- a/isis/src/tgo/apps/tgocassisunstitch/main.cpp +++ b/isis/src/tgo/apps/tgocassisunstitch/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include diff --git a/isis/src/tgo/objs/TgoCassisCamera/TgoCassisCamera.cpp b/isis/src/tgo/objs/TgoCassisCamera/TgoCassisCamera.cpp index a5388e62cb..3ef9d76f28 100644 --- a/isis/src/tgo/objs/TgoCassisCamera/TgoCassisCamera.cpp +++ b/isis/src/tgo/objs/TgoCassisCamera/TgoCassisCamera.cpp @@ -1,24 +1,11 @@ -/** - * @file - * $Revision:$ - * $Date:$ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "TgoCassisCamera.h" #include @@ -54,7 +41,7 @@ namespace Isis { m_spacecraftNameLong = "Trace Gas Orbiter"; m_spacecraftNameShort = "TGO"; - + NaifStatus::CheckErrors(); // CaSSIS codes @@ -91,7 +78,7 @@ namespace Isis { detMap->SetDetectorSampleSumming(summing); detMap->SetDetectorLineSumming(summing); } - + // Setup focal plane map CameraFocalPlaneMap *focalMap = new CameraFocalPlaneMap(this, cassisCode); @@ -135,15 +122,15 @@ namespace Isis { /** * Returns the shutter open and close times. The user should pass in the * ExposureDuration keyword value, converted from milliseconds to seconds, and - * the SpacecraftClockCount keyword value, converted to ephemeris time. The - * StartTime keyword value from the labels represents the shutter open time of - * the observation. This method uses the FramingCamera class implementation, - * returning the given time value as the shutter open and the sum of the time - * value and exposure duration as the shutter close. + * the SpacecraftClockCount keyword value, converted to ephemeris time. The + * StartTime keyword value from the labels represents the shutter open time of + * the observation. This method uses the FramingCamera class implementation, + * returning the given time value as the shutter open and the sum of the time + * value and exposure duration as the shutter close. * * @param exposureDuration Exposure duration value from the labels, converted * to seconds. - * @param time The SpacecraftClockCount value from the labels, converted to + * @param time The SpacecraftClockCount value from the labels, converted to * ephemeris time * @return @b pair < @b iTime, @b iTime > The first value is the shutter * open time and the second is the shutter close time. @@ -160,8 +147,8 @@ namespace Isis { /** * CK frame ID - TGO CaSSIS instrument code (TGO_CASSIS_FSA) - * - * @return @b int The appropriate instrument code for the "Camera-matrix" + * + * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Frame ID. */ int TgoCassisCamera::CkFrameId() const { @@ -169,9 +156,9 @@ namespace Isis { } - /** + /** * CK Reference ID - J2000 - * + * * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Reference ID. */ @@ -191,10 +178,10 @@ namespace Isis { } - /** + /** * SPK Reference ID - J2000 - * - * @return @b int The appropriate instrument code for the Spacecraft + * + * @return @b int The appropriate instrument code for the Spacecraft * Kernel Reference ID. */ int TgoCassisCamera::SpkReferenceId() const { diff --git a/isis/src/tgo/objs/TgoCassisCamera/TgoCassisCamera.h b/isis/src/tgo/objs/TgoCassisCamera/TgoCassisCamera.h index b77f1b82d7..f8ca11f86b 100644 --- a/isis/src/tgo/objs/TgoCassisCamera/TgoCassisCamera.h +++ b/isis/src/tgo/objs/TgoCassisCamera/TgoCassisCamera.h @@ -1,26 +1,14 @@ #ifndef TgoCassisCamera_h #define TgoCassisCamera_h -/** - * @file - * $Revision: $ - * $Date: $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "FramingCamera.h" #include @@ -34,7 +22,7 @@ namespace Isis { * framing instrument because the framelet size is 256 lines or more. This is * also a more flexible camera model since it will make controlling the * individual framelets alot easier. - * + * * The CaSSIS frame hierarchy is as follows: * 
    *         J2000
@@ -59,7 +47,7 @@ namespace Isis {
    *           V
    *     TGO_CASSIS_FSA
    *
- * + * * @ingroup SpiceInstrumentsAndCameras * @ingroup Tgo * @author 2017-01-26 Kris Becker @@ -72,7 +60,7 @@ namespace Isis { * because it is now being handled by the alpha * cube group. Fixes #5156. * @history 2018-01-11 Christopher Combs - Added try/catch around creation of - * cameras distortion map to prevent segfault when + * cameras distortion map to prevent segfault when * destructing. Fixes #5163. */ class TgoCassisCamera : public FramingCamera { @@ -80,7 +68,7 @@ namespace Isis { TgoCassisCamera(Cube &cube); ~TgoCassisCamera(); - virtual std::pair ShutterOpenCloseTimes(double time, + virtual std::pair ShutterOpenCloseTimes(double time, double exposureDuration); virtual int CkFrameId() const; virtual int CkReferenceId() const; diff --git a/isis/src/tgo/objs/TgoCassisCamera/TgoCassisDistortionMap.cpp b/isis/src/tgo/objs/TgoCassisCamera/TgoCassisDistortionMap.cpp index 400ec34555..d2f133d1c7 100644 --- a/isis/src/tgo/objs/TgoCassisCamera/TgoCassisDistortionMap.cpp +++ b/isis/src/tgo/objs/TgoCassisCamera/TgoCassisDistortionMap.cpp @@ -1,25 +1,11 @@ -/** - * @file - * $Revision: 1.2 $ - * $Date: 2008/11/24 16:40:30 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -28,7 +14,7 @@ #include "TgoCassisDistortionMap.h" namespace Isis { - /** + /** * Exomars TGO CaSSIS distortion map constructor. * * Create a camera distortion map. This class maps between distorted @@ -40,8 +26,8 @@ namespace Isis { * @param naifIkCode NAIF IK code. * */ - TgoCassisDistortionMap::TgoCassisDistortionMap(Camera *parent, - int naifIkCode) + TgoCassisDistortionMap::TgoCassisDistortionMap(Camera *parent, + int naifIkCode) : CameraDistortionMap(parent) { QString od = "INS" + toString(naifIkCode) + "_OD_"; @@ -60,43 +46,43 @@ namespace Isis { } - /** + /** * Exomars TGO CaSSIS distortion map destructor. */ TgoCassisDistortionMap::~TgoCassisDistortionMap() { } - /** - * Compute undistorted focal plane (x,y) coordinate given the distorted - * (x,y). - * - * Model derived by Stepan Tulyakov and Anoton Ivanov, EPFL (Ecole - * Polytechnique Federale de Lausanne). - * - * Given distorted focal plane coordinates, in millimeters, and parameters of - * rational CORRECTION model A1_corr, A2_corr, A3_corr, this function returns undistorted - * focal plane coordinates, in millimeters. - * - * The rational optical distortion correction model is described by following - * equations: - * + /** + * Compute undistorted focal plane (x,y) coordinate given the distorted + * (x,y). + * + * Model derived by Stepan Tulyakov and Anoton Ivanov, EPFL (Ecole + * Polytechnique Federale de Lausanne). + * + * Given distorted focal plane coordinates, in millimeters, and parameters of + * rational CORRECTION model A1_corr, A2_corr, A3_corr, this function returns undistorted + * focal plane coordinates, in millimeters. + * + * The rational optical distortion correction model is described by following + * equations: + * * chi = [ dx^2, dx*dy, dy^2, dx, dy, 1] - * + * * A1_corr * chi' * x = --------------- * A3_corr * chi' - * + * * A2_corr * chi' * y = ---------------- - * A3_corr * chi' + * A3_corr * chi' * * @param dx distorted focal plane x, in millimeters * @param dy distorted focal plane y, in millimeters * * @return @b bool Indicates whether the conversion was successful. */ - bool TgoCassisDistortionMap::SetFocalPlane(const double dx, + bool TgoCassisDistortionMap::SetFocalPlane(const double dx, const double dy) { p_focalPlaneX = dx; @@ -107,13 +93,13 @@ namespace Isis { // This distortion model is only valid for values on the CCD: // -1/2 * pixel pitch * CCD width = -10.24 < x < 10.24 = 1/2 * pixel pitch * CCD width // -1/2 * pixel pitch * CCD height = -10.24 < y < 10.24 = 1/2 * pixel pitch * CCD height - // + // // Also, the zeros for the divider variable fall well outside the boundary // of the CCD. (See $ISISDATA/tgo/assets/distortion/DistortionModelA3CorrRoots.jpg). - // + // // So, whenever x or y are too far from center or divider is near zero, // return the given inputs - + if ( dx < -0.5*m_pixelPitch*m_width - 0.2 || dx > 0.5*m_pixelPitch*m_width + 0.2 || dy < -0.5*m_pixelPitch*m_height - 0.2 || @@ -135,28 +121,28 @@ namespace Isis { } - /** + /** * Compute distorted focal plane (x,y) given an undistorted focal plane (x,y). - * - * Model derived by Stepan Tulyakov and Anoton Ivanov, EPFL (Ecole - * Polytechnique Federale de Lausanne). - * + * + * Model derived by Stepan Tulyakov and Anoton Ivanov, EPFL (Ecole + * Polytechnique Federale de Lausanne). + * * Given ideal focal plane coordinates, in millimeters, and parameters - * of rational CORRECTION model A1_dist, A2_dist, A3_dist, this function - * returns distorted focal plane coordinates, in millimeters. - * - * The rational optical distortion correction model is described by following - * equations: - * + * of rational CORRECTION model A1_dist, A2_dist, A3_dist, this function + * returns distorted focal plane coordinates, in millimeters. + * + * The rational optical distortion correction model is described by following + * equations: + * * chi = [ dx^2, dx*dy, dy^2, dx, dy, 1] - * + * * A1_dist * chi' * x = --------------- * A3_dist * chi' - * + * * A2_dist * chi' * y = ---------------- - * A3_dist * chi' + * A3_dist * chi' * * * @param ux undistorted focal plane x, in millimeters @@ -174,10 +160,10 @@ namespace Isis { // This distortion model is only valid for values on the CCD: // -1/2 * pixel pitch * CCD width = -10.24 < x < 10.24 = 1/2 * pixel pitch * CCD width // -1/2 * pixel pitch * CCD height = -10.24 < y < 10.24 = 1/2 * pixel pitch * CCD height - // + // // Also, the zeros for the divider variable fall well outside the boundary // of the CCD. (See $ISISDATA/tgo/assets/distortion/DistortionModelA3DistRoots.jpg). - // + // // So, whenever x or y are too far from center or divider is near zero, // return the given inputs @@ -202,36 +188,35 @@ namespace Isis { /** - * Evaluate the value for the multi-variate polynomial, given the list of - * 6 coefficients. - * - * We define + * Evaluate the value for the multi-variate polynomial, given the list of + * 6 coefficients. + * + * We define * @f[ chi = [x^2, xy, y^2, x, y, 1 @f] * and * @f[ A = [A_0, A_1, A_2, A_3, A_4, A_5 @f] - * + * * And we return * @f[ \chi \cdot A = c_0 x^2 + c_1 xy + c_2 y^2 + c_3 x + c_4 y + c_5 @f] - * + * * @param x The input x value. * @param y The input y value. * @param A The list of coeffients. - * + * * @return @b double The value of chi dot A. */ double TgoCassisDistortionMap::chiDotA(double x, double y, - QList A) { + QList A) { double x2 = x*x; double y2 = y*y; double xy = x*y; return A[0] * x2 - + A[1] * xy - + A[2] * y2 - + A[3] * x - + A[4] * y + + A[1] * xy + + A[2] * y2 + + A[3] * x + + A[4] * y + A[5]; } } - diff --git a/isis/src/tgo/objs/TgoCassisCamera/TgoCassisDistortionMap.h b/isis/src/tgo/objs/TgoCassisCamera/TgoCassisDistortionMap.h index a9cacd4f95..b6608ef1e6 100644 --- a/isis/src/tgo/objs/TgoCassisCamera/TgoCassisDistortionMap.h +++ b/isis/src/tgo/objs/TgoCassisCamera/TgoCassisDistortionMap.h @@ -1,40 +1,27 @@ #ifndef TgoCassisDistortionMap_h #define TgoCassisDistortionMap_h -/** - * @file - * $Revision: 1.2 $ - * $Date: 2008/11/24 16:40:31 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are - * public domain. See individual third-party library and package descriptions - * for intellectual property information, user agreements, and related - * information. - * - * Although Isis has been used by the USGS, no warranty, expressed or - * implied, is made by the USGS as to the accuracy and functioning of such - * software and related material nor shall the fact of distribution - * constitute any such warranty, and no responsibility is assumed by the - * USGS in connection therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html - * in a browser or see the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include "CameraDistortionMap.h" namespace Isis { - /** + /** * Distort/undistort focal plane coordinates. * * Creates a map for adding/removing optical distortions from the focal plane of a camera. * - * Model derived by Stepan Tulyakov and Anoton Ivanov, - * EPFL (Ecole Polytechnique Federale de Lausanne). - * + * Model derived by Stepan Tulyakov and Anoton Ivanov, + * EPFL (Ecole Polytechnique Federale de Lausanne). + * * @ingroup SpiceInstrumentsAndCameras * @ingroup Tgo * @@ -53,7 +40,7 @@ namespace Isis { * passed into SetFocalPlane and SetUndistortedFocalPlane * are within valid range. References #5155 * @history 2018-06-15 Kristin Berry - Removed qFuzzyCompare comparison to fix "distortion - * model not being applied" error. + * model not being applied" error. */ class TgoCassisDistortionMap : public CameraDistortionMap { public: @@ -68,15 +55,15 @@ namespace Isis { private: double chiDotA(double x, double y, QList A); - QList m_A1_corr; /**< Coefficients for rational distortion model used to compute + QList m_A1_corr; /**< Coefficients for rational distortion model used to compute ideal x from distorted x. */ - QList m_A2_corr; /**< Coefficients for rational distortion model used to compute + QList m_A2_corr; /**< Coefficients for rational distortion model used to compute ideal y from distorted y. */ QList m_A3_corr; /**< Coefficients for rational distortion model used to find scaling factor used when computing ideal coordinates from distorted. */ - QList m_A1_dist; /**< Coefficients for rational distortion model used to compute + QList m_A1_dist; /**< Coefficients for rational distortion model used to compute distorted x from ideal x. */ - QList m_A2_dist; /**< Coefficients for rational distortion model used to compute + QList m_A2_dist; /**< Coefficients for rational distortion model used to compute distorted y from ideal y. */ QList m_A3_dist; /**< Coefficients for rational distortion model used to find scaling factor used when computing distorted coordinates from ideal. */ diff --git a/isis/src/tgo/objs/TgoCassisCamera/unitTest.cpp b/isis/src/tgo/objs/TgoCassisCamera/unitTest.cpp index 93951d7bbe..6ffbdb925c 100644 --- a/isis/src/tgo/objs/TgoCassisCamera/unitTest.cpp +++ b/isis/src/tgo/objs/TgoCassisCamera/unitTest.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -38,10 +27,10 @@ using namespace Isis; void TestLineSamp(Camera *cam, double samp, double line); /** - * Unit test for TGO CaSSIS camera. + * Unit test for TGO CaSSIS camera. * * @internal - * @history 2018-08-15 Jeannie Backer - Updated lat/lon changes due to + * @history 2018-08-15 Jeannie Backer - Updated lat/lon changes due to * changes in focal length. */ int main(void) { @@ -69,7 +58,7 @@ int main(void) { qDebug() << "SPK Reference ID = " << cam->SpkReferenceId(); qDebug() << ""; - // Test Shutter Open/Close + // Test Shutter Open/Close const PvlGroup &inst = c.label()->findGroup("Instrument", Pvl::Traverse); double exposureDuration = toDouble( inst["ExposureDuration"][0] ); QString stime = inst["StartTime"]; @@ -107,7 +96,7 @@ int main(void) { qDebug() << "Latitude OK"; } else { - qDebug() << qSetRealNumberPrecision(18) + qDebug() << qSetRealNumberPrecision(18) << "Latitude off by: " << cam->UniversalLatitude() - knownLat; } @@ -115,7 +104,7 @@ int main(void) { qDebug() << "Longitude OK"; } else { - qDebug() << qSetRealNumberPrecision(18) + qDebug() << qSetRealNumberPrecision(18) << "Longitude off by: " << cam->UniversalLongitude() - knownLon; } } @@ -146,4 +135,3 @@ void TestLineSamp(Camera *cam, double samp, double line) { qDebug() << ""; } } - diff --git a/isis/src/viking/apps/vik2isis/main.cpp b/isis/src/viking/apps/vik2isis/main.cpp index c1eb241c30..eaa369ca11 100644 --- a/isis/src/viking/apps/vik2isis/main.cpp +++ b/isis/src/viking/apps/vik2isis/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include @@ -250,4 +258,3 @@ void TranslateVikingLabels(Pvl &pdsLabel, Cube *ocube) { res += PvlKeyword("Status", "Nominal"); ocube->putGroup(res); } - diff --git a/isis/src/viking/apps/vikcal/CalParameters.cpp b/isis/src/viking/apps/vikcal/CalParameters.cpp index 403ed73dd4..55d0182f58 100644 --- a/isis/src/viking/apps/vikcal/CalParameters.cpp +++ b/isis/src/viking/apps/vikcal/CalParameters.cpp @@ -1,24 +1,11 @@ -/** - * @file - * $Revision: 1.4 $ - * $Date: 2009/12/29 23:03:54 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include diff --git a/isis/src/viking/apps/vikcal/CalParameters.h b/isis/src/viking/apps/vikcal/CalParameters.h index d14ba908e8..8b327a4912 100644 --- a/isis/src/viking/apps/vikcal/CalParameters.h +++ b/isis/src/viking/apps/vikcal/CalParameters.h @@ -1,26 +1,14 @@ #ifndef CalParameters_h #define CalParameters_h -/** - * @file - * $Revision: 1.2 $ - * $Date: 2007/01/30 22:12:24 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include diff --git a/isis/src/viking/apps/vikcal/main.cpp b/isis/src/viking/apps/vikcal/main.cpp index dbe1fd49e3..56d23d6e41 100644 --- a/isis/src/viking/apps/vikcal/main.cpp +++ b/isis/src/viking/apps/vikcal/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "SpecialPixel.h" #include "ProcessByLine.h" @@ -127,6 +135,3 @@ void cal(vector &in, } } - - - diff --git a/isis/src/viking/apps/vikclean/main.cpp b/isis/src/viking/apps/vikclean/main.cpp index e584359e11..a9b50e47dd 100644 --- a/isis/src/viking/apps/vikclean/main.cpp +++ b/isis/src/viking/apps/vikclean/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "Pipeline.h" @@ -46,4 +54,3 @@ void IsisMain() { p.Run(); } - diff --git a/isis/src/viking/apps/vikfixtrx/main.cpp b/isis/src/viking/apps/vikfixtrx/main.cpp index 45c17e30d0..c62f009249 100644 --- a/isis/src/viking/apps/vikfixtrx/main.cpp +++ b/isis/src/viking/apps/vikfixtrx/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "ProcessByLine.h" #include "SpecialPixel.h" @@ -98,4 +106,3 @@ void fixtrx(Buffer &in, Buffer &out) { } } } - diff --git a/isis/src/viking/apps/viknobutter/main.cpp b/isis/src/viking/apps/viknobutter/main.cpp index dafabf4460..fa83d4a329 100644 --- a/isis/src/viking/apps/viknobutter/main.cpp +++ b/isis/src/viking/apps/viknobutter/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "Pipeline.h" @@ -107,4 +115,3 @@ void IsisMain() { pipeline.Run(); } - diff --git a/isis/src/viking/apps/viknonoodle/main.cpp b/isis/src/viking/apps/viknonoodle/main.cpp index 547868ef20..3ea1ffcc91 100644 --- a/isis/src/viking/apps/viknonoodle/main.cpp +++ b/isis/src/viking/apps/viknonoodle/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include #include "FourierTransform.h" diff --git a/isis/src/viking/apps/viknopepper/main.cpp b/isis/src/viking/apps/viknopepper/main.cpp index bc94e85188..3818be929d 100644 --- a/isis/src/viking/apps/viknopepper/main.cpp +++ b/isis/src/viking/apps/viknopepper/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "Pipeline.h" @@ -77,4 +85,3 @@ void IsisMain() { pipeline.Run(); } - diff --git a/isis/src/viking/apps/viknosalt/main.cpp b/isis/src/viking/apps/viknosalt/main.cpp index ce3634496f..a4e79c51b0 100644 --- a/isis/src/viking/apps/viknosalt/main.cpp +++ b/isis/src/viking/apps/viknosalt/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "Pipeline.h" @@ -97,4 +105,3 @@ void IsisMain() { pipeline.Run(); } - diff --git a/isis/src/viking/objs/VikingCamera/VikingCamera.cpp b/isis/src/viking/objs/VikingCamera/VikingCamera.cpp index 6bd7d19f2d..60523741bc 100644 --- a/isis/src/viking/objs/VikingCamera/VikingCamera.cpp +++ b/isis/src/viking/objs/VikingCamera/VikingCamera.cpp @@ -1,24 +1,11 @@ -/** - * @file - * $Revision: 1.6 $ - * $Date: 2009/12/28 21:37:00 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "VikingCamera.h" @@ -201,7 +188,7 @@ namespace Isis { NaifStatus::CheckErrors(); } - + /** * Returns the shutter open and close times. The user should pass in the * ExposureDuration keyword value and the SpacecraftClockCount keyword value, diff --git a/isis/src/viking/objs/VikingCamera/VikingCamera.h b/isis/src/viking/objs/VikingCamera/VikingCamera.h index cc42bd0035..cdfb0e34ba 100644 --- a/isis/src/viking/objs/VikingCamera/VikingCamera.h +++ b/isis/src/viking/objs/VikingCamera/VikingCamera.h @@ -1,26 +1,14 @@ #ifndef VikingCamera_h #define VikingCamera_h -/** - * @file - * $Revision: 1.3 $ - * $Date: 2009/08/31 15:12:32 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "FramingCamera.h" @@ -33,10 +21,10 @@ namespace Isis { * * @ingroup SpiceInstrumentsAndCameras * @ingroup Viking - * - * @see http://nssdc.gsfc.nasa.gov/nmc/masterCatalog.do?sc=1975-075A - * @see http://nssdc.gsfc.nasa.gov/nmc/masterCatalog.do?sc=1975-083A - * + * + * @see http://nssdc.gsfc.nasa.gov/nmc/masterCatalog.do?sc=1975-075A + * @see http://nssdc.gsfc.nasa.gov/nmc/masterCatalog.do?sc=1975-083A + * * @author 2005-06-09 Elizabeth Ribelin * * @internal @@ -58,13 +46,13 @@ namespace Isis { * method. Updated unitTest to test for new methods. * Updated documentation. Added Isis Disclaimer to * files. Added NAIF error check to constructor. - * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis + * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis * coding standards. References #972. * @history 2015-08-14 Ian Humphrey and Makayla Shepherd - Added new data members and methods * to get spacecraft and instrument names. Extended unit test to test * these methods and added data for Viking1 VISA, Viking1 VISB, and * Viking2 VISA. - * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument + * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument * members and methods and removed implementation of these methods * since Camera now handles this. References #2335. */ @@ -73,45 +61,45 @@ namespace Isis { VikingCamera(Cube &cube); //! Destroys the VikingCamera Object ~VikingCamera() {}; - virtual std::pair ShutterOpenCloseTimes(double time, + virtual std::pair ShutterOpenCloseTimes(double time, double exposureDuration); - /** + /** * CK frame ID - * Viking1 instrument code (VO1_PLATFORM) = -27000 * Viking2 instrument code (VO2_PLATFORM) = -30000 - * - * @return @b int The appropriate instrument code for the "Camera-matrix" + * + * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Frame ID - * + * */ virtual int CkFrameId() const { return p_ckFrameId; } - /** + /** * CK Reference ID - * B1950 or J2000 depending on the ck used. The mdim2.0_rand ck is in * J2000. Here we use B1950 (code = 2) because it was the reference * frame for the original spice - * + * * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Reference ID - * + * */ virtual int CkReferenceId() const { return (2); } - /** + /** * SPK Target Body ID - * VIKING 1 ORBITER = -27 * VIKING 2 ORBITER = -30 - * - * @return @b int The appropriate instrument code for the Spacecraft + * + * @return @b int The appropriate instrument code for the Spacecraft * Kernel Target ID */ virtual int SpkTargetId() const { return p_spkTargetId; } - /** + /** * SPK Reference ID - B1950 - * + * * @return @b int The appropriate instrument code for the Spacecraft * Kernel Reference ID */ diff --git a/isis/src/viking/objs/VikingCamera/unitTest.cpp b/isis/src/viking/objs/VikingCamera/unitTest.cpp index 6f595becf9..6d47628a98 100644 --- a/isis/src/viking/objs/VikingCamera/unitTest.cpp +++ b/isis/src/viking/objs/VikingCamera/unitTest.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -64,47 +53,47 @@ int main(void) { cout << "CK Frame: " << cam->instrumentRotation()->Frame() << endl << endl; cout.setf(std::ios::fixed); cout << setprecision(9); - + // Test kernel IDs cout << "Kernel IDs: " << endl; cout << "CK Frame ID = " << cam->CkFrameId() << endl; cout << "CK Reference ID = " << cam->CkReferenceId() << endl; cout << "SPK Target ID = " << cam->SpkTargetId() << endl; cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl; - - - // Test Shutter Open/Close + + + // Test Shutter Open/Close const PvlGroup &inst = c.label()->findGroup("Instrument", Pvl::Traverse); - double exposureDuration = ((double) inst["ExposureDuration"])/1000; + double exposureDuration = ((double) inst["ExposureDuration"])/1000; QString stime = inst["StartTime"]; double et; // StartTime keyword is the center exposure time str2et_c(stime.toLatin1().data(), &et); pair shuttertimes = cam->ShutterOpenCloseTimes(et, exposureDuration); cout << "Shutter open = " << shuttertimes.first.Et() << endl; cout << "Shutter close = " << shuttertimes.second.Et() << endl << endl; - + // Test all four corners to make sure the conversions are right cout << "For upper left corner ..." << endl; TestLineSamp(cam, 1.0, 1.0); - + cout << "For upper right corner ..." << endl; TestLineSamp(cam, cam->Samples(), 1.0); - + cout << "For lower left corner ..." << endl; TestLineSamp(cam, 1.0, cam->Lines()); - + cout << "For lower right corner ..." << endl; TestLineSamp(cam, cam->Samples(), cam->Lines()); - + double samp = cam->Samples() / 2; double line = cam->Lines() / 2; cout << "For center pixel position ..." << endl; - + if(!cam->SetImage(samp, line)) { cout << "ERROR" << endl; return 0; } - + // changed tolerance to allow hiclops to pass if(abs(cam->UniversalLatitude() - knownLat[i]) < 1.18E-05) { cout << "Latitude OK" << endl; @@ -112,7 +101,7 @@ int main(void) { else { cout << setprecision(16) << "Latitude off by: " << cam->UniversalLatitude() - knownLat[i] << endl; } - + // changed tolerance to allow hiclops to pass if(abs(cam->UniversalLongitude() - knownLon[i]) < 4.47E-6) { cout << "Longitude OK" << endl; @@ -122,7 +111,7 @@ int main(void) { } cout << endl << "--------------------------------------------" << endl; } - + // Test the name methods cout << endl << "Testing name methods:" << endl << endl; files.append("$ISISTESTDATA/isis/src/viking/unitTestData/f006a03.cropped.cub"); // Viking1 VISA @@ -136,7 +125,7 @@ int main(void) { cout << "Instrument Name Long: " << cam->instrumentNameLong() << endl; cout << "Instrument Name Short: " << cam->instrumentNameShort() << endl << endl; } - + // Test exception: camera is not a supported Kaguya camera cout << endl << "Testing exceptions:" << endl << endl; Cube test("$ISISTESTDATA/isis/src/hayabusa/unitTestData/st_2530292409_v.cub", "r"); @@ -167,4 +156,3 @@ void TestLineSamp(Camera *cam, double samp, double line) { cout << "DeltaLine = ERROR" << endl << endl; } } - diff --git a/isis/src/voyager/apps/voy2isis/main.cpp b/isis/src/voyager/apps/voy2isis/main.cpp index 254dfb2df7..eba505707d 100644 --- a/isis/src/voyager/apps/voy2isis/main.cpp +++ b/isis/src/voyager/apps/voy2isis/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include @@ -475,16 +483,16 @@ QByteArray fixLabels(QString fileName, History *hist){ // Check if the instrument name is valid if (labels.contains(QByteArray("INSTRUMENT_NAME\n"))) { - - // Only set name to Unknown and warn the user about a missing INSTRUMENT_NAME + + // Only set name to Unknown and warn the user about a missing INSTRUMENT_NAME // if it wasn't specified by the user. UserInterface &ui = Application::GetUserInterface(); if (ui.GetString("INSTRUMENT") == "AUTOMATIC") { labels.replace("INSTRUMENT_NAME", "INSTRUMENT_NAME = Unknown"); - PvlGroup insNameWarning("Warning"); + PvlGroup insNameWarning("Warning"); PvlKeyword insNameMsg("Message", "The INSTRUMENT_NAME for [" + fileName + "] is empty." + "The InstrumentId in the output cube will instead be set to " - + "[Unknown] and the labels will not translate. To create a cube " + + "[Unknown] and the labels will not translate. To create a cube " + "with translated labels, re-run this " + "application with INSTRUMENT set to NAC or WAC."); diff --git a/isis/src/voyager/apps/voycal/main.cpp b/isis/src/voyager/apps/voycal/main.cpp index 2c92ace9ac..f48402b9c7 100644 --- a/isis/src/voyager/apps/voycal/main.cpp +++ b/isis/src/voyager/apps/voycal/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include diff --git a/isis/src/voyager/apps/voyramp/main.cpp b/isis/src/voyager/apps/voyramp/main.cpp index 97caac8020..df32c24d46 100644 --- a/isis/src/voyager/apps/voyramp/main.cpp +++ b/isis/src/voyager/apps/voyramp/main.cpp @@ -1,3 +1,11 @@ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "Isis.h" #include "Buffer.h" diff --git a/isis/src/voyager/objs/VoyagerCamera/VoyagerCamera.cpp b/isis/src/voyager/objs/VoyagerCamera/VoyagerCamera.cpp index 21a90ec85f..8cf15adfc4 100644 --- a/isis/src/voyager/objs/VoyagerCamera/VoyagerCamera.cpp +++ b/isis/src/voyager/objs/VoyagerCamera/VoyagerCamera.cpp @@ -1,24 +1,11 @@ -/** - * @file - * $Revision: 1.0 $ - * $Date: 2009/05/27 12:08:01 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "VoyagerCamera.h" @@ -176,7 +163,7 @@ namespace Isis { NaifStatus::CheckErrors(); } - + /** * Returns the shutter open and close times. The user should pass in the * ExposureDuration keyword value and the StartTime keyword value, converted @@ -214,7 +201,7 @@ namespace Isis { * This is the function that is called in order to instantiate a VoyagerCamera * object. * - * @param cube The image Cube + * @param cube The image Cube * * @return Isis::Camera* VoyagerCamera * @author 2010-07-19 Mackenzie Boyd diff --git a/isis/src/voyager/objs/VoyagerCamera/VoyagerCamera.h b/isis/src/voyager/objs/VoyagerCamera/VoyagerCamera.h index 739381e038..c124612366 100644 --- a/isis/src/voyager/objs/VoyagerCamera/VoyagerCamera.h +++ b/isis/src/voyager/objs/VoyagerCamera/VoyagerCamera.h @@ -1,49 +1,37 @@ #ifndef VoyagerCamera_h #define VoyagerCamera_h -/** - * @file - * $Revision: 1.0 $ - * $Date: 2009/05/27 12:08:01 $ - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ + +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include "FramingCamera.h" namespace Isis { - /** - * @brief Voyager Camera Model - * - * This is the camera model for Voyager 1 and 2 wide and narrow - * angle cameras. - * - * @ingroup SpiceInstrumentsAndCameras + /** + * @brief Voyager Camera Model + * + * This is the camera model for Voyager 1 and 2 wide and narrow + * angle cameras. + * + * @ingroup SpiceInstrumentsAndCameras * @ingroup Voyager - * - * - * @see + * + * + * @see * http://pds-imaging.jpl.nasa.gov/data/vg2-n-iss-2-edr-v1.0/vg_0009/document/volinfo.txt - * @see http://voyager.jpl.nasa.gov - * @see http://pds-imaging.jpl.nasa.gov/portal/voyager_mission.html - * @see http://astrogeology.usgs.gov/Missions/Voyager - * + * @see http://voyager.jpl.nasa.gov + * @see http://pds-imaging.jpl.nasa.gov/portal/voyager_mission.html + * @see http://astrogeology.usgs.gov/Missions/Voyager + * * @author 2010-07-19 Mackenzie Boyd - * - * @internal + * + * @internal * @history 2010-07-19 Mackenzie Boyd - Original Version * @history 2011-01-14 Travis Addair - Added new CK/SPK accessor methods, * pure virtual in Camera, implemented in mission @@ -53,54 +41,54 @@ namespace Isis { * method. Updated unitTest to test for new methods. * Updated documentation. Added Isis Disclaimer to * files. Added NAIF error check to constructor. - * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis + * @history 2012-07-06 Debbie A. Cook, Updated Spice members to be more compliant with Isis * coding standards. References #972. * @history 2015-08-14 Ian Humphrey and Makayla Shepherd - Added new data members and methods * to get spacecraft and instrument names. Extended unit test for * name methods and added new data for Voyager1 WAC, Voyager2 NAC and * and WAC. - * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument + * @history 2015-10-16 Ian Humphrey - Removed declarations of spacecraft and instrument * members and methods and removed implementation of these methods * since Camera now handles this. References #2335. - */ + */ class VoyagerCamera : public FramingCamera { public: VoyagerCamera (Cube &cube); //! Destroys the VoyagerCamera object. ~VoyagerCamera () {}; - virtual std::pair ShutterOpenCloseTimes(double time, + virtual std::pair ShutterOpenCloseTimes(double time, double exposureDuration); - /** + /** * CK frame ID - * Voyager 1 instrument code (VG1_SCAN_PLATFORM) = -31100 * Voyager 2 instrument code (VG1_SCAN_PLATFORM) [sic] = -32100 - * - * @return @b int The appropriate instrument code for the "Camera-matrix" + * + * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Frame ID */ virtual int CkFrameId() const { return p_ckFrameId; } - /** + /** * CK Reference ID - B1950 - * + * * @return @b int The appropriate instrument code for the "Camera-matrix" * Kernel Reference ID */ virtual int CkReferenceId() const { return (2); } - /** + /** * SPK Target Body ID - * VOYAGER 1 = -31 * VOYAGER 2 = -32 - * - * @return @b int The appropriate instrument code for the Spacecraft + * + * @return @b int The appropriate instrument code for the Spacecraft * Kernel Target ID */ virtual int SpkTargetId() const { return p_spkTargetId; } - /** + /** * SPK Reference ID - J2000 - * + * * @return @b int The appropriate instrument code for the Spacecraft * Kernel Reference ID */ diff --git a/isis/src/voyager/objs/VoyagerCamera/unitTest.cpp b/isis/src/voyager/objs/VoyagerCamera/unitTest.cpp index d99f4f4650..0c35afbc2b 100644 --- a/isis/src/voyager/objs/VoyagerCamera/unitTest.cpp +++ b/isis/src/voyager/objs/VoyagerCamera/unitTest.cpp @@ -1,22 +1,11 @@ -/** - * @file - * - * Unless noted otherwise, the portions of Isis written by the USGS are public - * domain. See individual third-party library and package descriptions for - * intellectual property information,user agreements, and related information. - * - * Although Isis has been used by the USGS, no warranty, expressed or implied, - * is made by the USGS as to the accuracy and functioning of such software - * and related material nor shall the fact of distribution constitute any such - * warranty, and no responsibility is assumed by the USGS in connection - * therewith. - * - * For additional information, launch - * $ISISROOT/doc//documents/Disclaimers/Disclaimers.html in a browser or see - * the Privacy & Disclaimers page on the Isis website, - * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on - * http://www.usgs.gov/privacy.html. - */ +/** This is free and unencumbered software released into the public domain. + +The authors of ISIS do not claim copyright on the contents of this file. +For more details about the LICENSE terms and the AUTHORS, you will +find files of those names at the top level of this repository. **/ + +/* SPDX-License-Identifier: CC0-1.0 */ + #include #include @@ -53,61 +42,61 @@ int main(void) { // and "Longitude off by: " values directly into these variables. double knownLat = -1.03098148697020941; double knownLon = 82.0423364316989279; - + Cube c("$ISISTESTDATA/isis/src/voyager/unitTestData/c1639118.imq.cub", "r"); VoyagerCamera *cam = (VoyagerCamera *) CameraFactory::Create(c); cout << "FileName: " << FileName(c.fileName()).name() << endl; cout << "CK Frame: " << cam->instrumentRotation()->Frame() << endl << endl; cout.setf(std::ios::fixed); cout << setprecision(9); - + // Test kernel IDs cout << "Kernel IDs: " << endl; cout << "CK Frame ID = " << cam->CkFrameId() << endl; cout << "CK Reference ID = " << cam->CkReferenceId() << endl; cout << "SPK Target ID = " << cam->SpkTargetId() << endl; cout << "SPK Reference ID = " << cam->SpkReferenceId() << endl << endl; - - // Test Shutter Open/Close + + // Test Shutter Open/Close const PvlGroup &inst = c.label()->findGroup("Instrument", Pvl::Traverse); - double exposureDuration = ((double) inst["ExposureDuration"])/1000; + double exposureDuration = ((double) inst["ExposureDuration"])/1000; QString stime = inst["StartTime"]; double et; // StartTime keyword is the center exposure time str2et_c(stime.toLatin1().data(), &et); pair shuttertimes = cam->ShutterOpenCloseTimes(et, exposureDuration); cout << "Shutter open = " << shuttertimes.first.Et() << endl; cout << "Shutter close = " << shuttertimes.second.Et() << endl << endl; - + // Test all four corners to make sure the conversions are right cout << "For upper left corner ..." << endl; TestLineSamp(cam, 1.0, 1.0); - + cout << "For upper right corner ..." << endl; TestLineSamp(cam, cam->Samples() - 5.0, 16.0); - + cout << "For lower left corner ..." << endl; TestLineSamp(cam, 12.0, cam->Lines() - 12.0); - + cout << "For lower right corner ..." << endl; TestLineSamp(cam, cam->Samples() - 4.0, cam->Lines()); - + double samp = cam->Samples() / 2; double line = cam->Lines() / 2; cout << "For center pixel position ..." << endl; - + if(!cam->SetImage(samp, line)) { cout << "ERROR" << endl; return 0; } - + if(abs(cam->UniversalLatitude() - knownLat) < 1E-10) { cout << "Latitude OK" << endl; } else { - cout << setprecision(16) << "Latitude off by: " << cam->UniversalLatitude() - knownLat + cout << setprecision(16) << "Latitude off by: " << cam->UniversalLatitude() - knownLat << endl; } - + if(abs(cam->UniversalLongitude() - knownLon) < 1E-10) { cout << "Longitude OK" << endl; } @@ -115,7 +104,7 @@ int main(void) { cout << setprecision(16) << "Longitude off by: " << cam->UniversalLongitude() - knownLon << endl; } - + // Test name methods cout << endl << "Testing name methods" << endl << endl; QList files; @@ -123,7 +112,7 @@ int main(void) { files.append("$ISISTESTDATA/isis/src/voyager/unitTestData/c1639241.cropped.cub"); // Voyager1 WAC files.append("$ISISTESTDATA/isis/src/voyager/unitTestData/c2065022.cropped.cub"); // Voyager2 NAC files.append("$ISISTESTDATA/isis/src/voyager/unitTestData/c4397840.cropped.cub"); // Voyager2 WAC - + for (int i = 0; i < files.size(); i++) { Cube cu(files[i], "r"); VoyagerCamera *vCam = (VoyagerCamera *) CameraFactory::Create(cu); @@ -132,13 +121,13 @@ int main(void) { cout << "Instrument Name Long: " << vCam->instrumentNameLong() << endl; cout << "Instrument Name Short: " << vCam->instrumentNameShort() << endl << endl; } - + // Test exception: camera is not a supported Kaguya camera cout << endl << "Testing exceptions:" << endl << endl; Cube test("$ISISTESTDATA/isis/src/hayabusa/unitTestData/st_2530292409_v.cub", "r"); VoyagerCamera testCam(test); } - + catch(IException &e) { e.print(); } @@ -164,4 +153,3 @@ void TestLineSamp(Camera *cam, double samp, double line) { cout << "DeltaLine = ERROR" << endl << endl; } } - -- GitLab