From bd9cb8aeb2593b9532336fa1f474d9be264181c8 Mon Sep 17 00:00:00 2001 From: Steven Lambright Date: Thu, 3 Jan 2013 20:02:20 +0000 Subject: [PATCH] Updated our Cube class to be closer to the current coding standards. This change will not change how Isis behaves, any file formats, or any other output from Isis. Fixes #1356. git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/trunk@4941 41f8697f-d340-4b68-9986-7bafba869bb8 --- isis/src/apollo/apps/apollocal/apollocal.cpp | 8 +- .../apollo/apps/apollofindrx/apollofindrx.cpp | 6 +- .../apps/apollopaninit/apollopaninit.cpp | 34 ++-- .../apollopanstitcher/apollopanstitcher.cpp | 30 ++-- .../apollo/apps/apolloremrx/apolloremrx.cpp | 10 +- .../src/apollo/apps/apollowarp/apollowarp.cpp | 8 +- isis/src/base/apps/appjit/appjit.cpp | 20 +-- isis/src/base/apps/automos/automos.cpp | 4 +- isis/src/base/apps/bandnorm/bandnorm.cpp | 6 +- isis/src/base/apps/bandtrim/bandtrim.cpp | 2 +- isis/src/base/apps/bit2bit/bit2bit.cpp | 8 +- .../src/base/apps/butterworth/butterworth.cpp | 4 +- isis/src/base/apps/cam2cam/cam2cam.cpp | 18 +- isis/src/base/apps/cam2map/cam2map.cpp | 52 +++--- isis/src/base/apps/caminfo/CamTools.cpp | 8 +- isis/src/base/apps/caminfo/caminfo.cpp | 16 +- isis/src/base/apps/camrange/camrange.cpp | 2 +- isis/src/base/apps/camstats/camstats.cpp | 2 +- isis/src/base/apps/camtrim/camtrim.cpp | 4 +- isis/src/base/apps/circle/circle.cpp | 4 +- isis/src/base/apps/ckwriter/SpiceSegment.cpp | 8 +- isis/src/base/apps/copylabel/copylabel.cpp | 14 +- isis/src/base/apps/cosi/cosi.cpp | 2 +- isis/src/base/apps/crop/crop.cpp | 26 +-- .../src/base/apps/cropspecial/cropspecial.cpp | 16 +- isis/src/base/apps/cubeavg/cubeavg.cpp | 12 +- isis/src/base/apps/cubeit/cubeit.cpp | 14 +- isis/src/base/apps/cubenorm/cubenorm.cpp | 6 +- .../base/apps/decorstretch/decorstretch.cpp | 6 +- isis/src/base/apps/demprep/demprep.cpp | 10 +- isis/src/base/apps/desmear/desmear.cpp | 6 +- isis/src/base/apps/dstripe/dstripe.cpp | 8 +- isis/src/base/apps/editlab/editlab.cpp | 2 +- isis/src/base/apps/enlarge/enlarge.cpp | 6 +- isis/src/base/apps/explode/explode.cpp | 10 +- isis/src/base/apps/fft/fft.cpp | 12 +- isis/src/base/apps/findgaps/findgaps.cpp | 2 +- isis/src/base/apps/findrx/findrx.cpp | 2 +- isis/src/base/apps/fits2isis/fits2isis.cpp | 2 +- .../base/apps/footprintinit/footprintinit.cpp | 2 +- .../apps/footprintmerge/footprintmerge.cpp | 2 +- .../base/apps/gaussstretch/gaussstretch.cpp | 6 +- isis/src/base/apps/getsn/getsn.cpp | 2 +- isis/src/base/apps/grid/grid.cpp | 10 +- isis/src/base/apps/hist/hist.cpp | 6 +- isis/src/base/apps/histeq/histeq.cpp | 4 +- isis/src/base/apps/histmatch/histmatch.cpp | 4 +- isis/src/base/apps/ifft/ifft.cpp | 10 +- isis/src/base/apps/isis2ascii/isis2ascii.cpp | 6 +- isis/src/base/apps/isis2fits/isis2fits.cpp | 16 +- isis/src/base/apps/lineeq/lineeq.cpp | 28 +-- isis/src/base/apps/makeflat/makeflat.cpp | 28 +-- isis/src/base/apps/map2cam/map2cam.cpp | 16 +- isis/src/base/apps/map2map/map2map.cpp | 12 +- isis/src/base/apps/maplab/maplab.cpp | 2 +- isis/src/base/apps/mapmos/mapmos.cpp | 2 +- isis/src/base/apps/mappt/mappt.cpp | 4 +- .../src/base/apps/maptemplate/maptemplate.cpp | 4 +- isis/src/base/apps/mosrange/mosrange.cpp | 6 +- isis/src/base/apps/mvstats/mvstats.cpp | 6 +- isis/src/base/apps/nocam2map/nocam2map.cpp | 60 +++---- .../src/base/apps/noisefilter/noisefilter.cpp | 2 +- isis/src/base/apps/noproj/noproj.cpp | 26 +-- isis/src/base/apps/outline/outline.cpp | 4 +- isis/src/base/apps/pad/pad.cpp | 6 +- isis/src/base/apps/pca/pca.cpp | 12 +- isis/src/base/apps/percent/percent.cpp | 2 +- isis/src/base/apps/phocube/phocube.cpp | 12 +- isis/src/base/apps/phohillier/Hillier.cpp | 6 +- isis/src/base/apps/photomet/photomet.cpp | 2 +- isis/src/base/apps/photrim/photrim.cpp | 4 +- isis/src/base/apps/reduce/reduce.cpp | 6 +- isis/src/base/apps/remrx/remrx.cpp | 6 +- isis/src/base/apps/rgb2hsv/rgb2hsv.cpp | 6 +- isis/src/base/apps/rotate/rotate.cpp | 4 +- isis/src/base/apps/segment/segment.cpp | 6 +- isis/src/base/apps/shade/shade.cpp | 4 +- .../base/apps/sigmastretch/sigmastretch.cpp | 4 +- isis/src/base/apps/skymap/skymap.cpp | 26 +-- isis/src/base/apps/skypt/skypt.cpp | 4 +- isis/src/base/apps/skyrange/skyrange.cpp | 12 +- isis/src/base/apps/smtk/smtk.cpp | 24 +-- .../base/apps/specdivfilter/specdivfilter.cpp | 4 +- .../base/apps/spechighpass/spechighpass.cpp | 4 +- .../src/base/apps/speclowpass/speclowpass.cpp | 4 +- isis/src/base/apps/spicefit/spicefit.cpp | 8 +- isis/src/base/apps/spiceinit/spiceinit.cpp | 26 +-- isis/src/base/apps/spkwriter/SpiceSegment.cpp | 6 +- isis/src/base/apps/spkwriter/SpkSegment.cpp | 2 +- isis/src/base/apps/stats/stats.cpp | 8 +- isis/src/base/apps/stretch/stretch.cpp | 2 +- isis/src/base/apps/translate/translate.cpp | 4 +- isis/src/base/apps/trim/trim.cpp | 4 +- .../src/base/objs/BandManager/BandManager.cpp | 6 +- .../BoxcarCachingAlgorithm.cpp | 2 +- .../base/objs/BoxcarManager/BoxcarManager.cpp | 6 +- isis/src/base/objs/Brick/Brick.h | 6 +- isis/src/base/objs/Camera/unitTest.cpp | 26 +-- .../objs/CameraPointInfo/CameraPointInfo.cpp | 14 +- .../CameraStatistics/CameraStatistics.cpp | 2 +- .../base/objs/CameraStatistics/unitTest.cpp | 2 +- isis/src/base/objs/Chip/Chip.cpp | 32 ++-- isis/src/base/objs/Cube/Cube.cpp | 150 ++++++++-------- isis/src/base/objs/Cube/Cube.h | 167 +++++++++--------- isis/src/base/objs/Cube/CubeBsqHandler.cpp | 8 +- isis/src/base/objs/Cube/CubeIoHandler.cpp | 50 +++--- isis/src/base/objs/Cube/CubeIoHandler.h | 8 +- isis/src/base/objs/Cube/CubeTileHandler.cpp | 4 +- isis/src/base/objs/Cube/RawCubeChunk.h | 6 +- .../objs/Cube/RegionalCachingAlgorithm.cpp | 6 +- isis/src/base/objs/Cube/unitTest.cpp | 70 ++++---- .../objs/CubeCalculator/CubeCalculator.cpp | 10 +- isis/src/base/objs/CubeManager/unitTest.cpp | 4 +- isis/src/base/objs/DemShape/DemShape.cpp | 6 +- isis/src/base/objs/DemShape/unitTest.cpp | 8 +- .../src/base/objs/EllipsoidShape/unitTest.cpp | 4 +- isis/src/base/objs/Enlarge/Enlarge.cpp | 18 +- isis/src/base/objs/Enlarge/unitTest.cpp | 8 +- .../base/objs/Equalization/Equalization.cpp | 12 +- isis/src/base/objs/Equalization/unitTest.cpp | 2 +- .../EquatorialCylindricalShape.cpp | 4 +- .../EquatorialCylindricalShape/unitTest.cpp | 4 +- isis/src/base/objs/GroundGrid/unitTest.cpp | 16 +- isis/src/base/objs/Gui/GuiCubeParameter.cpp | 2 +- isis/src/base/objs/Histogram/Histogram.cpp | 28 +-- .../base/objs/ImageExporter/ImageExporter.cpp | 4 +- .../base/objs/ImageImporter/ImageImporter.cpp | 2 +- .../base/objs/ImagePolygon/ImagePolygon.cpp | 24 +-- isis/src/base/objs/ImagePolygon/unitTest.cpp | 6 +- isis/src/base/objs/Kernels/Kernels.cpp | 2 +- .../src/base/objs/LineManager/LineManager.cpp | 6 +- .../ObservationNumber/ObservationNumber.cpp | 2 +- .../objs/OverlapNormalization/unitTest.cpp | 6 +- .../OverlapStatistics/OverlapStatistics.cpp | 24 +-- isis/src/base/objs/Portal/unitTest.cpp | 2 +- isis/src/base/objs/Process/Process.cpp | 82 ++++----- isis/src/base/objs/Process/unitTest.cpp | 12 +- .../objs/ProcessByBoxcar/ProcessByBoxcar.cpp | 8 +- .../objs/ProcessByBrick/ProcessByBrick.cpp | 16 +- .../base/objs/ProcessByBrick/ProcessByBrick.h | 2 +- .../src/base/objs/ProcessByBrick/unitTest.cpp | 24 +-- .../base/objs/ProcessByLine/ProcessByLine.cpp | 20 +-- .../ProcessByQuickFilter.cpp | 14 +- .../objs/ProcessBySample/ProcessBySample.cpp | 20 +-- .../ProcessBySpectra/ProcessBySpectra.cpp | 52 +++--- .../base/objs/ProcessByTile/ProcessByTile.cpp | 8 +- isis/src/base/objs/ProcessByTile/unitTest.cpp | 4 +- .../base/objs/ProcessExport/ProcessExport.cpp | 34 ++-- .../base/objs/ProcessExport/ProcessExport.h | 4 +- .../ProcessExportPds/ProcessExportPds.cpp | 32 ++-- .../ProcessGroundPolygons.cpp | 8 +- isis/src/base/objs/ProcessImport/unitTest.cpp | 2 +- .../base/objs/ProcessImportPds/unitTest.cpp | 8 +- .../base/objs/ProcessImportVicar/unitTest.cpp | 2 +- .../ProcessMapMosaic/ProcessMapMosaic.cpp | 28 +-- .../base/objs/ProcessMosaic/ProcessMosaic.cpp | 124 ++++++------- isis/src/base/objs/ProcessMosaic/unitTest.cpp | 14 +- .../objs/ProcessPolygons/ProcessPolygons.cpp | 8 +- .../ProcessRubberSheet/ProcessRubberSheet.cpp | 54 +++--- .../ProjectionFactory/ProjectionFactory.cpp | 2 +- isis/src/base/objs/QtExporter/QtExporter.cpp | 12 +- isis/src/base/objs/Reduce/Reduce.cpp | 14 +- isis/src/base/objs/Reduce/unitTest.cpp | 8 +- .../base/objs/SampleManager/SampleManager.cpp | 6 +- .../base/objs/SerialNumber/SerialNumber.cpp | 2 +- isis/src/base/objs/ShapeModel/unitTest.cpp | 4 +- .../ShapeModelFactory/ShapeModelFactory.cpp | 2 +- .../base/objs/ShapeModelFactory/unitTest.cpp | 12 +- isis/src/base/objs/SmtkMatcher/SmtkMatcher.h | 4 +- isis/src/base/objs/Spice/Spice.cpp | 12 +- isis/src/base/objs/Stereo/unitTest.cpp | 6 +- isis/src/base/objs/SubArea/SubArea.cpp | 8 +- isis/src/base/objs/SubArea/unitTest.cpp | 30 ++-- .../src/base/objs/TileManager/TileManager.cpp | 8 +- .../UniversalGroundMap/UniversalGroundMap.cpp | 6 +- isis/src/cassini/apps/ciss2isis/ciss2isis.cpp | 6 +- isis/src/cassini/apps/cisscal/DarkCurrent.cpp | 2 +- isis/src/cassini/apps/cisscal/cisscal.cpp | 16 +- isis/src/cassini/apps/vims2isis/vims2isis.cpp | 2 +- isis/src/cassini/apps/vims2map/vims2map.cpp | 6 +- isis/src/cassini/apps/vimscal/vimscal.cpp | 70 ++++---- .../clementine/apps/clem2isis/clem2isis.cpp | 2 +- .../apps/clemhirescal/clemhirescal.cpp | 2 +- .../clementine/apps/clemnircal/clemnircal.cpp | 26 +-- .../apps/clemnirnoise/clemnirnoise.cpp | 2 +- .../apps/clemuvviscal/clemuvviscal.cpp | 28 +-- isis/src/control/apps/autoseed/autoseed.cpp | 4 +- isis/src/control/apps/cnetadd/cnetadd.cpp | 12 +- isis/src/control/apps/cnetcheck/cnetcheck.cpp | 4 +- isis/src/control/apps/cnetedit/cnetedit.cpp | 4 +- .../control/apps/cnetextract/cnetextract.cpp | 4 +- .../apps/cnetnewradii/cnetnewradii.cpp | 2 +- isis/src/control/apps/coreg/coreg.cpp | 20 +-- isis/src/control/apps/deltack/deltack.cpp | 8 +- isis/src/control/apps/fplanemap/fplanemap.cpp | 2 +- isis/src/control/apps/jigsaw/jigsaw.cpp | 10 +- isis/src/control/apps/pointreg/pointreg.cpp | 10 +- .../control/apps/slither/SlitherTransform.cpp | 4 +- isis/src/control/apps/slither/slither.cpp | 4 +- isis/src/control/apps/warp/warp.cpp | 8 +- .../ControlNetStatistics.cpp | 4 +- .../ControlNetValidMeasure.cpp | 18 +- .../InterestOperator/InterestOperator.cpp | 10 +- .../galileo/apps/gllssi2isis/gllssi2isis.cpp | 2 +- isis/src/galileo/apps/gllssical/gllssical.cpp | 60 +++---- isis/src/lo/apps/lo2isis/lo2isis.cpp | 2 +- isis/src/lo/apps/lopdsgen/lopdsgen.cpp | 10 +- isis/src/local/apps/camtest/camtest.cpp | 2 +- .../local/apps/cissua2isis/cissua2isis.cpp | 4 +- .../apps/kaguyami2isis/kaguyami2isis.cpp | 6 +- isis/src/lro/apps/lronac2isis/lronac2isis.cpp | 2 +- isis/src/lro/apps/lronac2pds/lronac2pds.cpp | 18 +- isis/src/lro/apps/lronaccal/lronaccal.cpp | 8 +- isis/src/lro/apps/lrowac2isis/lrowac2isis.cpp | 14 +- isis/src/lro/apps/lrowac2pds/lrowac2pds.cpp | 8 +- isis/src/lro/apps/lrowaccal/lrowaccal.cpp | 18 +- isis/src/lro/apps/lrowacpho/Exponential.cpp | 4 +- .../lro/apps/lrowacpho/HapkeExponential.cpp | 4 +- isis/src/lro/apps/lrowacpho/Hillier.cpp | 4 +- .../apps/lrowacpho/PhotometricFunction.cpp | 2 +- isis/src/lro/apps/lrowacpho/lrowacpho.cpp | 2 +- isis/src/lro/apps/mrf2pds/mrf2pds.cpp | 8 +- .../mariner/apps/mar102isis/mar102isis.cpp | 4 +- isis/src/mariner/apps/mar10cal/mar10cal.cpp | 18 +- .../mariner/apps/mar10clean/mar10clean.cpp | 2 +- .../apps/mar10nonoise/mar10nonoise.cpp | 2 +- .../apps/mar10restore/mar10restore.cpp | 2 +- isis/src/mer/apps/mer2isis/mer2isis.cpp | 2 +- isis/src/mer/apps/mical/MiCalibration.cpp | 2 +- isis/src/mer/apps/mical/mical.cpp | 4 +- .../messenger/apps/mdis2isis/mdis2isis.cpp | 8 +- isis/src/messenger/apps/mdis2pds/mdis2pds.cpp | 4 +- isis/src/messenger/apps/mdiscal/mdiscal.cpp | 22 +-- isis/src/messenger/apps/mdisddr/mdisddr.cpp | 2 +- .../messenger/apps/mdisedrinfo/MdisEdrKeys.h | 2 +- .../apps/mdisedrinfo/MdisGeometry.cpp | 4 +- .../apps/mdisedrinfo/SpiceManager.cpp | 2 +- .../apps/mdisedrinfo/mdisedrinfo.cpp | 2 +- isis/src/mgs/apps/moccal/moccal.cpp | 6 +- isis/src/mgs/apps/mocnoise50/mocnoise50.cpp | 2 +- isis/src/mro/apps/ctxcal/ctxcal.cpp | 8 +- isis/src/mro/apps/hi2isis/hi2isis.cpp | 2 +- isis/src/mro/apps/hi2isis/hiCalibration.cpp | 6 +- isis/src/mro/apps/hical/HiCalConf.cpp | 10 +- isis/src/mro/apps/hical/HiCalData.h | 2 +- isis/src/mro/apps/hical/hical.cpp | 16 +- isis/src/mro/apps/hicalbeta/HiCalConf.cpp | 10 +- isis/src/mro/apps/hicalbeta/HiCalData.h | 2 +- isis/src/mro/apps/hicalbeta/hicalbeta.cpp | 16 +- isis/src/mro/apps/hiccdstitch/hiccdstitch.cpp | 14 +- isis/src/mro/apps/hicolormos/hicolormos.cpp | 2 +- isis/src/mro/apps/hicrop/hicrop.cpp | 14 +- isis/src/mro/apps/hicubeit/hicubeit.cpp | 2 +- isis/src/mro/apps/hicubenorm/hicubenorm.cpp | 8 +- isis/src/mro/apps/hideal2pds/hideal2pds.cpp | 10 +- isis/src/mro/apps/hidestripe/hidestripe.cpp | 6 +- isis/src/mro/apps/hidtmgen/hidtmgen.cpp | 6 +- isis/src/mro/apps/hifringe/hifringe.cpp | 8 +- isis/src/mro/apps/hifurrows/hifurrows.cpp | 4 +- isis/src/mro/apps/higlob/higlob.cpp | 8 +- isis/src/mro/apps/hijitreg/HiJitCube.cpp | 38 ++-- isis/src/mro/apps/hijitreg/hijitreg.cpp | 4 +- isis/src/mro/apps/hijitter/hijitter.cpp | 4 +- isis/src/mro/apps/himos/himos.cpp | 20 +-- isis/src/mro/apps/hirdrgen/hirdrgen.cpp | 50 +++--- isis/src/mro/apps/hisharpen/hisharpen.cpp | 36 ++-- isis/src/mro/apps/histat/histat.cpp | 6 +- isis/src/mro/apps/histitch/histitch.cpp | 42 ++--- isis/src/mro/apps/marci2isis/marci2isis.cpp | 12 +- isis/src/mro/apps/marcical/marcical.cpp | 32 ++-- isis/src/mro/apps/marciflip/marciflip.cpp | 18 +- isis/src/mro/apps/pds2hideal/pds2hideal.cpp | 2 +- .../objs/HiEqualization/HiEqualization.cpp | 2 +- isis/src/mro/objs/HiEqualization/unitTest.cpp | 2 +- isis/src/mro/objs/HiLab/HiLab.cpp | 2 +- isis/src/odyssey/apps/thmnoseam/thmnoseam.cpp | 26 +-- .../odyssey/apps/thmvisflat/thmvisflat.cpp | 22 +-- .../odyssey/apps/thmvistrim/thmvistrim.cpp | 8 +- isis/src/qisis/apps/qnet/QnetFileTool.cpp | 2 +- isis/src/qisis/apps/qnet/QnetTool.cpp | 20 +-- isis/src/qisis/apps/qtie/QtieFileTool.cpp | 12 +- isis/src/qisis/apps/qtie/QtieTool.cpp | 20 +-- .../AbstractPlotTool/AbstractPlotTool.cpp | 2 +- .../AdvancedTrackTool/AdvancedTrackTool.cpp | 12 +- isis/src/qisis/objs/BandTool/BandTool.cpp | 2 +- .../qisis/objs/ChipViewport/ChipViewport.cpp | 2 +- .../CubeDisplayProperties.cpp | 4 +- .../objs/CubePlotCurve/CubePlotCurve.cpp | 6 +- .../qisis/objs/CubeViewport/CubeViewport.cpp | 76 ++++---- isis/src/qisis/objs/EditTool/EditTool.cpp | 14 +- .../FeatureNomenclatureTool.cpp | 4 +- isis/src/qisis/objs/FileTool/FileTool.cpp | 60 +++---- isis/src/qisis/objs/MatchTool/MatchTool.cpp | 22 +-- .../qisis/objs/MeasureTool/MeasureTool.cpp | 2 +- .../MosaicSceneWidget/MosaicSceneItem.cpp | 2 +- .../MosaicSceneWidget/MosaicSceneWidget.cpp | 4 +- .../ScatterPlotConfigDialog.cpp | 20 +-- .../objs/ScatterPlotTool/ScatterPlotData.cpp | 8 +- .../ScatterPlotTool/ScatterPlotWindow.cpp | 12 +- .../objs/SpatialPlotTool/SpatialPlotTool.cpp | 2 +- .../SpectralPlotTool/SpectralPlotTool.cpp | 8 +- .../SpectralPlotTool/SpectralPlotWindow.cpp | 2 +- .../objs/StatisticsTool/StatisticsTool.cpp | 2 +- isis/src/qisis/objs/StereoTool/StereoTool.cpp | 72 ++++---- .../qisis/objs/StretchTool/StretchTool.cpp | 12 +- .../objs/SunShadowTool/SunShadowTool.cpp | 10 +- isis/src/qisis/objs/Workspace/Workspace.cpp | 2 +- isis/src/viking/apps/vikcal/vikcal.cpp | 2 +- isis/src/voyager/apps/voy2isis/voy2isis.cpp | 2 +- isis/src/voyager/apps/voycal/voycal.cpp | 4 +- isis/src/voyager/apps/voyramp/voyramp.cpp | 2 +- 311 files changed, 1922 insertions(+), 1923 deletions(-) diff --git a/isis/src/apollo/apps/apollocal/apollocal.cpp b/isis/src/apollo/apps/apollocal/apollocal.cpp index ac8f674d29..23a9caa942 100644 --- a/isis/src/apollo/apps/apollocal/apollocal.cpp +++ b/isis/src/apollo/apps/apollocal/apollocal.cpp @@ -23,9 +23,9 @@ void IsisMain() { PvlTranslationTable tTable( (QString)p.MissionData("base", "translations/MissionName2DataDir.trn")); QString missionDir = dataDir[tTable.Translate("MissionName", - (inCube->getGroup("Instrument")).FindKeyword("SpacecraftName")[0])][0]; + (inCube->group("Instrument")).FindKeyword("SpacecraftName")[0])][0]; QString camera = - (inCube->getGroup("Instrument")).FindKeyword("InstrumentId")[0]; + (inCube->group("Instrument")).FindKeyword("InstrumentId")[0]; CubeAttributeInput cai; p.SetInputCube(missionDir + "/calibration/" + camera + "_flatfield.cub", cai); @@ -34,8 +34,8 @@ void IsisMain() { cao.setPixelType(Real); p.SetOutputCube( FileName(Application::GetUserInterface().GetAsString("TO")).expanded(), - cao, inCube->getSampleCount(), inCube->getLineCount(), - inCube->getBandCount()); + cao, inCube->sampleCount(), inCube->lineCount(), + inCube->bandCount()); p.StartProcess(cal); p.EndProcess(); diff --git a/isis/src/apollo/apps/apollofindrx/apollofindrx.cpp b/isis/src/apollo/apps/apollofindrx/apollofindrx.cpp index 26fa7b9819..2dd88c9072 100644 --- a/isis/src/apollo/apps/apollofindrx/apollofindrx.cpp +++ b/isis/src/apollo/apps/apollofindrx/apollofindrx.cpp @@ -40,9 +40,9 @@ void IsisMain () MAX_DISPY = ui.GetInteger("DELTAY"); cube.open(ui.GetFileName("FROM"),"rw"); - PvlGroup &reseaus = cube.getLabel()->FindGroup("Reseaus",Pvl::Traverse); - QString mission = (cube.getLabel()->FindGroup("Instrument",Pvl::Traverse))["SpacecraftName"]; - QString instrument = (cube.getLabel()->FindGroup("Instrument",Pvl::Traverse))["InstrumentId"]; + PvlGroup &reseaus = cube.label()->FindGroup("Reseaus",Pvl::Traverse); + QString mission = (cube.label()->FindGroup("Instrument",Pvl::Traverse))["SpacecraftName"]; + QString instrument = (cube.label()->FindGroup("Instrument",Pvl::Traverse))["InstrumentId"]; Apollo apollo(mission, instrument); if (mission.mid(0,6) != "APOLLO") { QString msg = "This application is for use with Apollo spacecrafts only."; diff --git a/isis/src/apollo/apps/apollopaninit/apollopaninit.cpp b/isis/src/apollo/apps/apollopaninit/apollopaninit.cpp index 954202862c..6e01089bcf 100644 --- a/isis/src/apollo/apps/apollopaninit/apollopaninit.cpp +++ b/isis/src/apollo/apps/apollopaninit/apollopaninit.cpp @@ -292,22 +292,24 @@ void IsisMain() { posJ20.resize(3); double temp, - vel[3], //the total velocity vector (combined Horizonatal and normal components) + vel[3] = { 0.0, 0.0, 0.0 }, //the total velocity vector (combined Horizonatal and normal components) // in km/sec - M[3][3], //rotation matrix - zDir[] = {0,0,1}, //selenographic Z axis - northPN[3], //normal to the plane containing all the north/south directions, + M[3][3] = { { 0.0, 0.0, 0.0 }, + { 0.0, 0.0, 0.0 }, + { 0.0, 0.0, 0.0 } }, //rotation matrix + zDir[] = { 0.0, 0.0, 1.0 }, //selenographic Z axis + northPN[3] = { 0.0, 0.0, 0.0 }, //normal to the plane containing all the north/south directions, // that is plane containing // the origin, the z axis, and the primary point of intersection - northL[3], //north direction vector in local horizontal plane - azm[3], //azm direction of the veclocity vector in selenographic coordinates - azmP[3], //azm rotated (partially) and projected into the image plane - norm[3], //normal to the local horizontal plane - look[3]; //unit direction vector in the pincipal cameral look direction, + northL[3] = { 0.0, 0.0, 0.0 }, //north direction vector in local horizontal plane + azm[3] = { 0.0, 0.0, 0.0 }, //azm direction of the veclocity vector in selenographic coordinates + azmP[3] = { 0.0, 0.0, 0.0 }, //azm rotated (partially) and projected into the image plane + norm[3] = { 0.0, 0.0, 0.0 }, //normal to the local horizontal plane + look[3] = { 0.0, 0.0, 0.0 }; //unit direction vector in the pincipal cameral look direction, // parallel to the vector from the center of the moon through the spacecraft - double pos0[3], //coordinate of the camera position - pInt[3]; //coordinate of the principle intersection point + double pos0[3] = { 0.0, 0.0, 0.0 }, //coordinate of the camera position + pInt[3] = { 0.0, 0.0, 0.0 }; //coordinate of the principle intersection point /////////////////calculating the camera position for the center (principal scan line) pos0[1] = ui.GetDouble("LON_NADIR")*deg2rad; @@ -599,7 +601,7 @@ void IsisMain() { QString fileName; - panS = panCube.getSampleCount(); + panS = panCube.sampleCount(); //Table definition TableRecord recordFid; @@ -631,8 +633,8 @@ void IsisMain() { QString msg = "Unable to open the fiducial patternS cube: ApolloPanFiducialMark.cub\n"; throw IException(IException::User, msg, _FILEINFO_); } - refL = fidC.getLineCount(); - refS = fidC.getSampleCount(); + refL = fidC.lineCount(); + refS = fidC.sampleCount(); //scaled pattern chip for fast matching patternS.SetSize(int((refS-2)/SCALE), int((refL-2)/SCALE)); patternS.TackCube((refS-1)/2, (refL-1)/2); @@ -651,7 +653,7 @@ void IsisMain() { Chip inputChip,selectionChip; inputChip.SetSize(int(ceil(200*5.0/resolution)), int(ceil(200*5.0/resolution))); fileName = ui.GetFileName("FROM"); - if( panCube.getPixelType() == 1) //UnsignedByte + if( panCube.pixelType() == 1) //UnsignedByte centroid.setDNRange(12, 1e99); //8 bit bright target else centroid.setDNRange(3500, 1e99); //16 bit bright target @@ -785,7 +787,7 @@ void IsisMain() { delete spRot; //now instantiate a camera to make sure all of this is working - ApolloPanoramicCamera* cam = (ApolloPanoramicCamera*)(panCube.getCamera()); + ApolloPanoramicCamera* cam = (ApolloPanoramicCamera*)(panCube.camera()); //log the residual report from interior orientation PvlGroup residualStats("InteriorOrientationStats"); residualStats += PvlKeyword("FiducialsFound", toString(tableFid.Records())); diff --git a/isis/src/apollo/apps/apollopanstitcher/apollopanstitcher.cpp b/isis/src/apollo/apps/apollopanstitcher/apollopanstitcher.cpp index b77a11d5f9..316323c0ac 100644 --- a/isis/src/apollo/apps/apollopanstitcher/apollopanstitcher.cpp +++ b/isis/src/apollo/apps/apollopanstitcher/apollopanstitcher.cpp @@ -138,8 +138,8 @@ void IsisMain() { string msg = "Unable to open the fiducial patternS cube: ApolloPanFiducialMark.cub\n"; throw IException(IException::User, msg, _FILEINFO_); } - refL = fidC.getLineCount(); - refS = fidC.getSampleCount(); + refL = fidC.lineCount(); + refS = fidC.sampleCount(); //scaled pattern chip for fast matching patternS.SetSize((int)floor((refS-2)/SCALE), (int)floor((refL-2)/SCALE)); patternS.TackCube((refS-1)/2, (refL-1)/2); @@ -169,7 +169,7 @@ void IsisMain() { //Centroid centroid; CentroidApolloPan centroid(resolution); Chip inputChip,selectionChip; - if( panC[0]->getPixelType() == 1) //UnsignedByte + if( panC[0]->pixelType() == 1) //UnsignedByte centroid.setDNRange(12, 1e99); //8 bit bright target else centroid.setDNRange(3500, 1e99); //16 bit bright target @@ -184,7 +184,7 @@ void IsisMain() { // measurements) //Step 1: find the probable conjugate fiducials (those with the smallest sample coordinates) - scanS = panC[i+1]->getSampleCount(); + scanS = panC[i+1]->sampleCount(); scanFid.clear(); @@ -223,7 +223,7 @@ void IsisMain() { } } if(s>=averageLines+searchCellSize/2.0) { - QString msg = "Unable to locate a fiducial mark in the input cube [" + panC[i]->getFileName() + QString msg = "Unable to locate a fiducial mark in the input cube [" + panC[i]->fileName() + "]. Check FROM and MICRONS parameters."; throw IException(IException::Io, msg, _FILEINFO_); return; @@ -588,13 +588,13 @@ void IsisMain() { //now lets find the extents of the stiched image double minS=1, - maxS=panC[7]->getSampleCount(), + maxS=panC[7]->sampleCount(), minL =1, - maxL = panC[7]->getLineCount(); + maxL = panC[7]->lineCount(); for (i=0;i<7;i++) { - scanS = panC[i]->getSampleCount(); - scanL = panC[i]->getLineCount(); + scanS = panC[i]->sampleCount(); + scanL = panC[i]->lineCount(); //convert the four corner points to the scan 8 domain and determine the greatest extents temp = cos(trans[i].theta) - sin(trans[i].theta) + trans[i].dx; @@ -680,9 +680,9 @@ void IsisMain() { attI.setAttributes("some.cub+1"); //will only be processing one band from the input //make output attributes match the input - att.setFileFormat( panC[0]->getFormat() ); - att.setByteOrder( panC[0]->getByteOrder() ); - att.setPixelType( panC[0]->getPixelType() ); + att.setFileFormat( panC[0]->format() ); + att.setByteOrder( panC[0]->byteOrder() ); + att.setPixelType( panC[0]->pixelType() ); if (panC[0]->labelsAttached()) att.setLabelAttachment(AttachedLabel); else @@ -690,7 +690,7 @@ void IsisMain() { //define an output cube outputC.setDimensions(int(maxS),int(maxL),1); - outputC.setPixelType(panC[0]->getPixelType()); //set pixel type + outputC.setPixelType(panC[0]->pixelType()); //set pixel type tempString = ui.GetFileName("TO"); outputC.create(tempString); outputC.close(); //closing the output cube so that it can be opened by the mosaic process @@ -703,8 +703,8 @@ void IsisMain() { for (i=0; i<8; i++) { //for each scan FileName tempFile = FileName::createTempFile("$temporary/tempscan.cub"); - scanS = panC[i]->getSampleCount(); - scanL = panC[i]->getLineCount(); + scanS = panC[i]->sampleCount(); + scanL = panC[i]->lineCount(); //define the sample range if (i==0) sampleTo = maxS; diff --git a/isis/src/apollo/apps/apolloremrx/apolloremrx.cpp b/isis/src/apollo/apps/apolloremrx/apolloremrx.cpp index 4c809468ef..feac63f1e8 100644 --- a/isis/src/apollo/apps/apolloremrx/apolloremrx.cpp +++ b/isis/src/apollo/apps/apolloremrx/apolloremrx.cpp @@ -23,12 +23,12 @@ void IsisMain() { // Setup the input and output cubes Cube* info = p.SetInputCube("FROM"); - PvlKeyword &status = info ->getGroup("RESEAUS")["STATUS"]; + PvlKeyword &status = info ->group("RESEAUS")["STATUS"]; UserInterface &ui = Application::GetUserInterface(); QString in = ui.GetFileName("FROM"); - QString spacecraft = (info->getGroup("Instrument")["SpacecraftName"]); - QString instrument = (info->getGroup("Instrument")["InstrumentId"]); + QString spacecraft = (info->group("Instrument")["SpacecraftName"]); + QString instrument = (info->group("Instrument")["InstrumentId"]); Apollo apollo(spacecraft, instrument); if (spacecraft.mid(0,6) != "APOLLO") { QString msg = "This application is for use with Apollo spacecrafts only. "; @@ -66,7 +66,7 @@ void IsisMain() { Cube cube; cube.open(out, "rw"); - PvlGroup &res = cube.getLabel()->FindGroup("RESEAUS",Pvl::Traverse); + PvlGroup &res = cube.label()->FindGroup("RESEAUS",Pvl::Traverse); // Get reseau line, sample, type, and valid Keywords PvlKeyword lines = res.FindKeyword("LINE"); @@ -75,7 +75,7 @@ void IsisMain() { PvlKeyword valid = res.FindKeyword("VALID"); int numres = lines.Size(); - Brick brick(dim,dim,1,cube.getPixelType()); + Brick brick(dim,dim,1,cube.pixelType()); int width = ui.GetInteger("WIDTH"); for (int res=0; resgetGroup("Reseaus"); - QString mission = (ipacket->getGroup("Instrument"))["SpacecraftName"]; + PvlGroup &reseaus = ipacket->group("Reseaus"); + QString mission = (ipacket->group("Instrument"))["SpacecraftName"]; if (mission.mid(0,6) != "APOLLO") { QString msg = "This application is for use with Apollo spacecrafts only. "; throw IException(IException::Unknown, msg, _FILEINFO_); @@ -57,10 +57,10 @@ void IsisMain() { bool weighted = ui.GetBoolean("WEIGHTED"); // Set up the transform object - WarpTransform *transform = new WarpTransform(*basisLine,*basisSamp,weighted,inputLine,inputSample,outputLine,outputSample,ipacket->getLineCount(),ipacket->getSampleCount(),onl,ons); + WarpTransform *transform = new WarpTransform(*basisLine,*basisSamp,weighted,inputLine,inputSample,outputLine,outputSample,ipacket->lineCount(),ipacket->sampleCount(),onl,ons); // Allocate the output file, same size as input - p.SetOutputCube ("TO",transform->OutputSamples(),transform->OutputLines(),ipacket->getBandCount()); + p.SetOutputCube ("TO",transform->OutputSamples(),transform->OutputLines(),ipacket->bandCount()); // Set up the interpolator Interpolator *interp; diff --git a/isis/src/base/apps/appjit/appjit.cpp b/isis/src/base/apps/appjit/appjit.cpp index 643b1118f3..a6e4d66360 100644 --- a/isis/src/base/apps/appjit/appjit.cpp +++ b/isis/src/base/apps/appjit/appjit.cpp @@ -58,12 +58,12 @@ void IsisMain() { cube.open(ui.GetFileName("MASTER"), "rw"); //check for existing polygon, if exists delete it - if(cube.getLabel()->HasObject("Polygon")) { - cube.getLabel()->DeleteObject("Polygon"); + if(cube.label()->HasObject("Polygon")) { + cube.label()->DeleteObject("Polygon"); } // Get the camera - Camera *cam = cube.getCamera(); + Camera *cam = cube.camera(); if(cam->DetectorMap()->LineRate() == 0.0) { QString msg = "[" + ui.GetFileName("MASTER") + "] is not a line scan camera image"; throw IException(IException::User, msg, _FILEINFO_); @@ -71,14 +71,14 @@ void IsisMain() { // Create the master rotation to be corrected int frameCode = cam->instrumentRotation()->Frame(); - cam->SetImage(int(cube.getSampleCount() / 2), int(cube.getLineCount() / 2)); + cam->SetImage(int(cube.sampleCount() / 2), int(cube.lineCount() / 2)); double tol = cam->PixelResolution(); if(tol < 0.) { // Alternative calculation of .01*ground resolution of a pixel tol = cam->PixelPitch() * cam->SpacecraftAltitude() * 1000. / cam->FocalLength() / 100.; } - LineScanCameraRotation crot(frameCode, *(cube.getLabel()), cam->instrumentRotation()->GetFullCacheTime(), tol); + LineScanCameraRotation crot(frameCode, *(cube.label()), cam->instrumentRotation()->GetFullCacheTime(), tol); crot.SetPolynomialDegree(ui.GetInteger("DEGREE")); crot.SetAxes(1, 2, 3); if(ui.WasEntered("PITCHRATE")) crot.ResetPitchRate(ui.GetDouble("PITCHRATE")); @@ -113,7 +113,7 @@ void IsisMain() { cube.write(cmatrix); // Write out the instrument position table - Isis::PvlGroup kernels = cube.getLabel()->FindGroup("Kernels", Isis::Pvl::Traverse); + Isis::PvlGroup kernels = cube.label()->FindGroup("Kernels", Isis::Pvl::Traverse); // Save original kernels in keyword before changing to "Table" in the kernels group PvlKeyword origCk = kernels["InstrumentPointing"]; @@ -134,11 +134,11 @@ void IsisMain() { // Open the cube cube.open(list[ifile].toString(), "rw"); //check for existing polygon, if exists delete it - if(cube.getLabel()->HasObject("Polygon")) { - cube.getLabel()->DeleteObject("Polygon"); + if(cube.label()->HasObject("Polygon")) { + cube.label()->DeleteObject("Polygon"); } // Get the camera and make sure it is a line scan camera - Camera *cam = cube.getCamera(); + Camera *cam = cube.camera(); if(cam->DetectorMap()->LineRate() == 0.0) { QString msg = "[" + ui.GetFileName("FROM") + "] is not a line scan camera"; throw IException(IException::User, msg, _FILEINFO_); @@ -147,7 +147,7 @@ void IsisMain() { cube.write(cmatrix); // Write out the new instrument pointing table - Isis::PvlGroup kernels = cube.getLabel()->FindGroup("Kernels", Isis::Pvl::Traverse); + Isis::PvlGroup kernels = cube.label()->FindGroup("Kernels", Isis::Pvl::Traverse); // Save original kernels in keyword before changing to "Table" in the kernels group PvlKeyword origCk = kernels["InstrumentPointing"]; diff --git a/isis/src/base/apps/automos/automos.cpp b/isis/src/base/apps/automos/automos.cpp index 1a72868ca3..d13164600e 100644 --- a/isis/src/base/apps/automos/automos.cpp +++ b/isis/src/base/apps/automos/automos.cpp @@ -135,11 +135,11 @@ void calcRange(double &minLat, double &maxLat, double &minLon, double &maxLon) { // Open the cube and get the maximum number of band in all cubes Cube cube; cube.open(list[i].toString()); - if(cube.getBandCount() > nbands) nbands = cube.getBandCount(); + if(cube.bandCount() > nbands) nbands = cube.bandCount(); // See if the cube has a projection and make sure it matches // previous input cubes - Projection *proj = Isis::ProjectionFactory::CreateFromCube(*(cube.getLabel())); + Projection *proj = Isis::ProjectionFactory::CreateFromCube(*(cube.label())); if(firstProj == NULL) { firstProj = proj; } diff --git a/isis/src/base/apps/bandnorm/bandnorm.cpp b/isis/src/base/apps/bandnorm/bandnorm.cpp index 19d9a1d7e2..90932001af 100644 --- a/isis/src/base/apps/bandnorm/bandnorm.cpp +++ b/isis/src/base/apps/bandnorm/bandnorm.cpp @@ -58,7 +58,7 @@ void IsisMain() { else if(avg == "PENCIL") { TextFile pencil; pencil.Open(ui.GetFileName("SPECTRUM")); - if(pencil.LineCount() - 1 < icube->getBandCount()) { + if(pencil.LineCount() - 1 < icube->bandCount()) { QString msg = "The spectral pencil file [" + ui.GetAsString("SPECTRUM") + "] does not contain enough data for all bands."; throw IException(IException::User, msg, _FILEINFO_); @@ -85,7 +85,7 @@ void IsisMain() { throw IException(IException::User, msg, _FILEINFO_); } // Add the correct column of data to normalizer - for(int i = 0; i < icube->getBandCount(); i++) { + for(int i = 0; i < icube->bandCount(); i++) { tokens.clear(); pencil.GetLine(st); Tokenize(st, tokens, ", \""); @@ -97,7 +97,7 @@ void IsisMain() { for(int i = 0; i < (int)average.size(); i++) { stats.AddData(&average[i], (unsigned int)1); } - for(int b = 0; b < icube->getBandCount(); b++) { + for(int b = 0; b < icube->bandCount(); b++) { normalizer.push_back(stats.Average()); } } diff --git a/isis/src/base/apps/bandtrim/bandtrim.cpp b/isis/src/base/apps/bandtrim/bandtrim.cpp index de17d7a455..d577d27cfe 100644 --- a/isis/src/base/apps/bandtrim/bandtrim.cpp +++ b/isis/src/base/apps/bandtrim/bandtrim.cpp @@ -10,7 +10,7 @@ void BandTrim(Buffer &in, Buffer &out); void IsisMain() { ProcessByBrick p; Cube *icube = p.SetInputCube("FROM"); - p.SetBrickSize(1, 1, icube->getBandCount()); + p.SetBrickSize(1, 1, icube->bandCount()); p.SetOutputCube("TO"); p.StartProcess(BandTrim); p.EndProcess(); diff --git a/isis/src/base/apps/bit2bit/bit2bit.cpp b/isis/src/base/apps/bit2bit/bit2bit.cpp index 99cf8a7ba9..f0077d04b5 100644 --- a/isis/src/base/apps/bit2bit/bit2bit.cpp +++ b/isis/src/base/apps/bit2bit/bit2bit.cpp @@ -29,7 +29,7 @@ void IsisMain(){ A histogram is made from the input cube, as the default min of the bit2bit output is at .5% of the data range, and the default max is at 99.5% */ - Histogram* histptr = cubeptr -> getHistogram(); + Histogram* histptr = cubeptr -> histogram(); double maxper = histptr -> Percent(ui.GetDouble("MAXPER")); double minper = histptr -> Percent(ui.GetDouble("MINPER")); @@ -65,12 +65,12 @@ void IsisMain(){ if(ui.GetBoolean("STATS")) { //! Run extended statistics Cube* ocubeptr = p.SetOutputCube (ui.GetFileName("TO"),outputProperties, - cubeptr->getSampleCount(),cubeptr->getLineCount(), - cubeptr->getBandCount()); + cubeptr->sampleCount(),cubeptr->lineCount(), + cubeptr->bandCount()); p.StartProcess(populate); - Histogram* ohistptr = (ocubeptr -> getHistogram(1,validMin,validMax)); + Histogram* ohistptr = (ocubeptr -> histogram(1,validMin,validMax)); int iLrs = histptr -> LrsPixels(); int iHrs = histptr -> HrsPixels(); int iNull = histptr -> NullPixels(); diff --git a/isis/src/base/apps/butterworth/butterworth.cpp b/isis/src/base/apps/butterworth/butterworth.cpp index 9833ee8639..d33bec9d4e 100644 --- a/isis/src/base/apps/butterworth/butterworth.cpp +++ b/isis/src/base/apps/butterworth/butterworth.cpp @@ -27,8 +27,8 @@ void IsisMain() { Isis::Cube *icube = p.SetInputCube("FROM"); // get the center pixels coordinates - x = (icube->getSampleCount() + 1) / 2; - y = (icube->getLineCount() + 1) / 2; + x = (icube->sampleCount() + 1) / 2; + y = (icube->lineCount() + 1) / 2; p.SetOutputCube("TO"); diff --git a/isis/src/base/apps/cam2cam/cam2cam.cpp b/isis/src/base/apps/cam2cam/cam2cam.cpp index 9a70687ca3..4cec087801 100644 --- a/isis/src/base/apps/cam2cam/cam2cam.cpp +++ b/isis/src/base/apps/cam2cam/cam2cam.cpp @@ -20,7 +20,7 @@ void IsisMain() { // Set up the default reference band to the middle of the cube // If we have even bands it will be close to the middle - int referenceBand = ocube->getBandCount(); + int referenceBand = ocube->bandCount(); referenceBand += (referenceBand % 2); referenceBand /= 2; @@ -34,10 +34,10 @@ void IsisMain() { // filename required by the Camera is not passed by the process class in this // case. Use the CameraFactory to create the Camera instead to get around this // problem. - Camera *outcam = CameraFactory::Create(*(mcube->getLabel())); + Camera *outcam = CameraFactory::Create(*(mcube->label())); // Set the reference band we want to match - PvlGroup instgrp = mcube->getGroup("Instrument"); + PvlGroup instgrp = mcube->group("Instrument"); if(!outcam->IsBandIndependent()) { PvlKeyword rBand("ReferenceBand", toString(referenceBand)); rBand.AddComment("# All bands are aligned to reference band"); @@ -48,22 +48,22 @@ void IsisMain() { } // Only recreate the output camera if it was band dependent - if(outcam == NULL) outcam = CameraFactory::Create(*(mcube->getLabel())); + if(outcam == NULL) outcam = CameraFactory::Create(*(mcube->label())); // We might need the instrument group later, so get a copy before clearing the input // cubes. m.ClearInputCubes(); Cube *icube = m.SetInputCube("FROM"); - incam = icube->getCamera(); + incam = icube->camera(); // Set up the transform object which will simply map // output line/samps -> output lat/lons -> input line/samps - Transform *transform = new cam2cam(icube->getSampleCount(), - icube->getLineCount(), + Transform *transform = new cam2cam(icube->sampleCount(), + icube->lineCount(), incam, - ocube->getSampleCount(), - ocube->getLineCount(), + ocube->sampleCount(), + ocube->lineCount(), outcam); diff --git a/isis/src/base/apps/cam2map/cam2map.cpp b/isis/src/base/apps/cam2map/cam2map.cpp index 6a2d608b79..e07de49e4e 100644 --- a/isis/src/base/apps/cam2map/cam2map.cpp +++ b/isis/src/base/apps/cam2map/cam2map.cpp @@ -49,7 +49,7 @@ void IsisMain() { // Open the input cube and get the camera icube = p.SetInputCube("FROM"); - incam = icube->getCamera(); + incam = icube->camera(); // Make sure it is not the sky if(incam->target()->isSky()) { @@ -236,7 +236,7 @@ void IsisMain() { Application::GuiLog(cleanMapping); // Allocate the output cube and add the mapping labels - Cube *ocube = p.SetOutputCube("TO", samples, lines, icube->getBandCount()); + Cube *ocube = p.SetOutputCube("TO", samples, lines, icube->bandCount()); ocube->putGroup(cleanMapping); @@ -260,8 +260,8 @@ void IsisMain() { // See if center of input image projects. If it does, force tile // containing this center to be processed in ProcessRubberSheet. // TODO: WEIRD ... why is this needed ... Talk to Tracie ... JAA?? - double centerSamp = icube->getSampleCount() / 2.; - double centerLine = icube->getLineCount() / 2.; + double centerSamp = icube->sampleCount() / 2.; + double centerLine = icube->lineCount() / 2.; if(incam->SetImage(centerSamp, centerLine)) { if(outmap->SetUniversalGround(incam->UniversalLatitude(), incam->UniversalLongitude())) { @@ -271,14 +271,14 @@ void IsisMain() { // Create an alpha cube group for the output cube if(!ocube->hasGroup("AlphaCube")) { PvlGroup alpha("AlphaCube"); - alpha += PvlKeyword("AlphaSamples", toString(icube->getSampleCount())); - alpha += PvlKeyword("AlphaLines", toString(icube->getLineCount())); + alpha += PvlKeyword("AlphaSamples", toString(icube->sampleCount())); + alpha += PvlKeyword("AlphaLines", toString(icube->lineCount())); alpha += PvlKeyword("AlphaStartingSample", toString(0.5)); alpha += PvlKeyword("AlphaStartingLine", toString(0.5)); - alpha += PvlKeyword("AlphaEndingSample", toString(icube->getSampleCount() + 0.5)); - alpha += PvlKeyword("AlphaEndingLine", toString(icube->getLineCount() + 0.5)); - alpha += PvlKeyword("BetaSamples", toString(icube->getSampleCount())); - alpha += PvlKeyword("BetaLines", toString(icube->getLineCount())); + alpha += PvlKeyword("AlphaEndingSample", toString(icube->sampleCount() + 0.5)); + alpha += PvlKeyword("AlphaEndingLine", toString(icube->lineCount() + 0.5)); + alpha += PvlKeyword("BetaSamples", toString(icube->sampleCount())); + alpha += PvlKeyword("BetaLines", toString(icube->lineCount())); ocube->putGroup(alpha); } @@ -288,8 +288,8 @@ void IsisMain() { // Okay we need to decide how to apply the rubbersheeting for the transform // Does the user want to define how it is done? if (ui.GetString("WARPALGORITHM") == "FORWARDPATCH") { - transform = new cam2mapForward(icube->getSampleCount(), - icube->getLineCount(), incam, samples,lines, + transform = new cam2mapForward(icube->sampleCount(), + icube->lineCount(), incam, samples,lines, outmap, trim); if (ui.WasEntered("PATCHSIZE")) { @@ -303,8 +303,8 @@ void IsisMain() { } else if (ui.GetString("WARPALGORITHM") == "REVERSEPATCH") { - transform = new cam2mapReverse(icube->getSampleCount(), - icube->getLineCount(), incam, samples,lines, + transform = new cam2mapReverse(icube->sampleCount(), + icube->lineCount(), incam, samples,lines, outmap, trim); if (ui.WasEntered("PATCHSIZE")) { @@ -321,8 +321,8 @@ void IsisMain() { // Handle framing cameras. Always process using the backward // driven system (tfile). else if (incam->GetCameraType() == Camera::Framing) { - transform = new cam2mapReverse(icube->getSampleCount(), - icube->getLineCount(), incam, samples,lines, + transform = new cam2mapReverse(icube->sampleCount(), + icube->lineCount(), incam, samples,lines, outmap, trim); p.SetTiling(4, 4); p.StartProcess(*transform, *interp); @@ -336,8 +336,8 @@ void IsisMain() { // to determine patch size based on 1) if the limb is in the file // or 2) if the DTM is much coarser than the image else if (incam->GetCameraType() == Camera::LineScan) { - transform = new cam2mapForward(icube->getSampleCount(), - icube->getLineCount(), incam, samples,lines, + transform = new cam2mapForward(icube->sampleCount(), + icube->lineCount(), incam, samples,lines, outmap, trim); p.processPatchTransform(*transform, *interp); @@ -353,8 +353,8 @@ void IsisMain() { // TODO: What about the THEMIS VIS Camera. Will tall narrow (128x4) patches // work okay? else if (incam->GetCameraType() == Camera::PushFrame) { - transform = new cam2mapForward(icube->getSampleCount(), - icube->getLineCount(), incam, samples,lines, + transform = new cam2mapForward(icube->sampleCount(), + icube->lineCount(), incam, samples,lines, outmap, trim); // Get the frame height @@ -362,11 +362,11 @@ void IsisMain() { int frameSize = dmap->frameletHeight() / dmap->LineScaleFactor(); // Check for even/odd cube to determine starting line - PvlGroup &instGrp = icube->getLabel()->FindGroup("Instrument", Pvl::Traverse); + PvlGroup &instGrp = icube->label()->FindGroup("Instrument", Pvl::Traverse); int startLine = 1; // Get the alpha cube group in case they cropped the image - AlphaCube acube(*icube->getLabel()); + AlphaCube acube(*icube->label()); double betaLine = acube.AlphaLine(1.0); if (fabs(betaLine - 1.0) > 0.0000000001) { if (fabs(betaLine - (int) betaLine) > 0.00001) { @@ -392,8 +392,8 @@ void IsisMain() { // types have not be analyized. This includes Radar and Point. Continue to // use the reverse geom option with the default tiling hints else { - transform = new cam2mapReverse(icube->getSampleCount(), - icube->getLineCount(), incam, samples,lines, + transform = new cam2mapReverse(icube->sampleCount(), + icube->lineCount(), incam, samples,lines, outmap, trim); int tileStart, tileEnd; @@ -583,7 +583,7 @@ void LoadCameraRes() { // Open the input cube, get the camera object, and the cam map projection Cube c; c.open(file); - Camera *cam = c.getCamera(); + Camera *cam = c.camera(); Pvl camMap; cam->BasicMapping(camMap); PvlGroup &camGrp = camMap.FindGroup("Mapping"); @@ -650,7 +650,7 @@ void LoadCameraRange() { // Open the input cube, get the camera object, and the cam map projection Cube c; c.open(file); - Camera *cam = c.getCamera(); + Camera *cam = c.camera(); // Make the target info match the user mapfile double minlat, maxlat, minlon, maxlon; diff --git a/isis/src/base/apps/caminfo/CamTools.cpp b/isis/src/base/apps/caminfo/CamTools.cpp index 6e48ff9560..555a27989e 100644 --- a/isis/src/base/apps/caminfo/CamTools.cpp +++ b/isis/src/base/apps/caminfo/CamTools.cpp @@ -161,9 +161,9 @@ namespace Isis { bool doPolygon, bool increasePrecision) { destruct(); - _nLines = cube.getLineCount(); - _nSamps = cube.getSampleCount(); - _nBands = cube.getBandCount(); + _nLines = cube.lineCount(); + _nSamps = cube.sampleCount(); + _nBands = cube.bandCount(); // Compute average planetary radius in meters. This is used as a fallback // to compute surface area if no geoemetry has a center intersect point. @@ -188,7 +188,7 @@ namespace Isis { g.bands = _nBands; g.band = band + 1; camera.SetBand(band + 1); - g.realBand = cube.getPhysicalBand(band + 1); + g.realBand = cube.physicalBand(band + 1); g.target = camera.target()->name(); diff --git a/isis/src/base/apps/caminfo/caminfo.cpp b/isis/src/base/apps/caminfo/caminfo.cpp index 6a2cf26c07..9b5e78bada 100644 --- a/isis/src/base/apps/caminfo/caminfo.cpp +++ b/isis/src/base/apps/caminfo/caminfo.cpp @@ -69,9 +69,9 @@ void IsisMain() { general->append(MakePair("RunDate", iTime::CurrentGMT())); general->append(MakePair("IsisId", SerialNumber::Compose(*incube))); general->append(MakePair("From", in.baseName() + ".cub")); - general->append(MakePair("Lines", toString(incube->getLineCount()))); - general->append(MakePair("Samples", toString(incube->getSampleCount()))); - general->append(MakePair("Bands", toString(incube->getBandCount()))); + general->append(MakePair("Lines", toString(incube->lineCount()))); + general->append(MakePair("Samples", toString(incube->sampleCount()))); + general->append(MakePair("Bands", toString(incube->bandCount()))); // Run camstats on the entire image (all bands) // another camstats will be run for each band and output @@ -122,7 +122,7 @@ void IsisMain() { Statistics stats; Progress progress; progress.SetText("Statistics..."); - progress.SetMaximumSteps(incube->getLineCount()*incube->getBandCount()); + progress.SetMaximumSteps(incube->lineCount()*incube->bandCount()); progress.CheckStatus(); iline.SetLine(1); for(; !iline.end() ; iline.next()) { @@ -155,7 +155,7 @@ void IsisMain() { bool doGeometry = ui.GetBoolean("GEOMETRY"); bool doPolygon = ui.GetBoolean("POLYGON"); if(doGeometry || doPolygon) { - Camera *cam = incube->getCamera(); + Camera *cam = incube->camera(); QString incType = ui.GetString("INCTYPE"); int polySinc, polyLinc; @@ -171,14 +171,14 @@ void IsisMain() { polySinc = ui.GetInteger("POLYSINC"); } else { - polySinc = (int)(0.5 + 0.10 * incube->getSampleCount()); + polySinc = (int)(0.5 + 0.10 * incube->sampleCount()); if(polySinc == 0) polySinc = 1; } if(ui.WasEntered("POLYLINC")) { polyLinc = ui.GetInteger("POLYLINC"); } else { - polyLinc = (int)(0.5 + 0.10 * incube->getLineCount()); + polyLinc = (int)(0.5 + 0.10 * incube->lineCount()); if(polyLinc == 0) polyLinc = 1; } } @@ -262,7 +262,7 @@ void GeneratePVLOutput(Cube *incube, // Add the input ISIS label if requested if(ui.GetBoolean("ISISLABEL")) { - Pvl label = *(incube->getLabel()); + Pvl label = *(incube->label()); label.SetName("IsisLabel"); params.AddObject(label); } diff --git a/isis/src/base/apps/camrange/camrange.cpp b/isis/src/base/apps/camrange/camrange.cpp index 271137551d..ed1ba2de4a 100644 --- a/isis/src/base/apps/camrange/camrange.cpp +++ b/isis/src/base/apps/camrange/camrange.cpp @@ -15,7 +15,7 @@ void IsisMain() { // Set the input image, get the camera model, and a basic mapping // group Cube *icube = p.SetInputCube("FROM"); - Camera *cam = icube->getCamera(); + Camera *cam = icube->camera(); Pvl mapping; cam->BasicMapping(mapping); PvlGroup &mapgrp = mapping.FindGroup("Mapping"); diff --git a/isis/src/base/apps/camstats/camstats.cpp b/isis/src/base/apps/camstats/camstats.cpp index 632c325d1d..4d04339fd5 100644 --- a/isis/src/base/apps/camstats/camstats.cpp +++ b/isis/src/base/apps/camstats/camstats.cpp @@ -23,7 +23,7 @@ string valueToString(const double &value); void IsisMain() { Process p; Cube *icube = p.SetInputCube("FROM"); - Camera *cam = icube->getCamera(); + Camera *cam = icube->camera(); UserInterface &ui = Application::GetUserInterface(); diff --git a/isis/src/base/apps/camtrim/camtrim.cpp b/isis/src/base/apps/camtrim/camtrim.cpp index 8de639b480..56e8860606 100644 --- a/isis/src/base/apps/camtrim/camtrim.cpp +++ b/isis/src/base/apps/camtrim/camtrim.cpp @@ -26,7 +26,7 @@ void IsisMain() { // Setup the input and get the camera model icube = p.SetInputCube("FROM"); - cam = icube->getCamera(); + cam = icube->camera(); UserInterface &ui = Application::GetUserInterface(); @@ -74,7 +74,7 @@ void camtrim(Buffer &in, Buffer &out) { // See if there is a change in band which would change the camera model if(in.Band() != lastBand) { lastBand = in.Band(); - cam->SetBand(icube->getPhysicalBand(lastBand)); + cam->SetBand(icube->physicalBand(lastBand)); } // Loop for each pixel in the line. diff --git a/isis/src/base/apps/circle/circle.cpp b/isis/src/base/apps/circle/circle.cpp index 38e4b3dd80..3d05347dd7 100644 --- a/isis/src/base/apps/circle/circle.cpp +++ b/isis/src/base/apps/circle/circle.cpp @@ -18,8 +18,8 @@ void IsisMain() { p.SetOutputCube("TO"); // Compute the defaults for user parameters - cline = icube->getLineCount() / 2; - csamp = icube->getSampleCount() / 2; + cline = icube->lineCount() / 2; + csamp = icube->sampleCount() / 2; radius = (cline < csamp) ? cline : csamp; // Override the defaults if the user entered a value diff --git a/isis/src/base/apps/ckwriter/SpiceSegment.cpp b/isis/src/base/apps/ckwriter/SpiceSegment.cpp index d6f500be7f..9f21100205 100644 --- a/isis/src/base/apps/ckwriter/SpiceSegment.cpp +++ b/isis/src/base/apps/ckwriter/SpiceSegment.cpp @@ -162,7 +162,7 @@ QString SpiceSegment::getKeyValue(PvlObject &label, void SpiceSegment::import(Cube &cube, const QString &tblname) { - _fname = cube.getFileName(); + _fname = cube.fileName(); // Extract ISIS CK blob and transform to CK 3 content NaifStatus::CheckErrors(); @@ -171,7 +171,7 @@ void SpiceSegment::import(Cube &cube, const QString &tblname) { // Order is somewhat important here. The call to initialize Kernels // object checks the NAIF pool for existance. It logs their NAIF // status as loaded which may cause trouble from here on... - Pvl *label = cube.getLabel(); + Pvl *label = cube.label(); _kernels.Init(*label); Camera *camera; @@ -189,7 +189,7 @@ void SpiceSegment::import(Cube &cube, const QString &tblname) { camera = CameraFactory::Create(*label); } else { - camera = cube.getCamera(); + camera = cube.camera(); } // Determine segment ID from product ID if it exists, otherwise basename @@ -433,7 +433,7 @@ void SpiceSegment::getRotationMatrices(Cube &cube, Camera &camera, Table &table, _instCode = toId; // Load SPICE and extract necessary contents - Spice mySpice(*cube.getLabel(), true); // load w/out tables + Spice mySpice(*cube.label(), true); // load w/out tables QString CLtoId = getFrameName(LtoId); QString CtoId = getFrameName(toId); diff --git a/isis/src/base/apps/copylabel/copylabel.cpp b/isis/src/base/apps/copylabel/copylabel.cpp index d599a49b6b..83d523af79 100644 --- a/isis/src/base/apps/copylabel/copylabel.cpp +++ b/isis/src/base/apps/copylabel/copylabel.cpp @@ -28,7 +28,7 @@ void IsisMain() { Pvl * mergeTo = NULL; Pvl * source = NULL; QString sourceFileName = ui.GetFileName("Source"); - mergeTo = inOut.getLabel(); + mergeTo = inOut.label(); source = new Pvl(sourceFileName); // We have 3 possible running options, those are @@ -52,7 +52,7 @@ void IsisMain() { delete source; source = NULL; } - source = sourceCube.getLabel(); + source = sourceCube.label(); } // Check if we need an alpha cube group. @@ -67,10 +67,10 @@ void IsisMain() { // Check, do we have the same size cubes? how about same sample line scale? if (isACube) { - sourceSamps = sourceCube.getSampleCount(); - sourceLines = sourceCube.getLineCount(); - outSamps = inOut.getSampleCount(); - outLines = inOut.getLineCount(); + sourceSamps = sourceCube.sampleCount(); + sourceLines = sourceCube.lineCount(); + outSamps = inOut.sampleCount(); + outLines = inOut.lineCount(); sampScale = (double)outSamps/(double)sourceSamps; lineScale = (double)outLines/(double)sourceLines; if (isACube) { @@ -104,7 +104,7 @@ void IsisMain() { if (ui.GetBoolean("Bandbin")) { if (isACube) { // If the number of bands doesn't match, we can't continue - if (inOut.getBandCount() != sourceCube.getBandCount()) { + if (inOut.bandCount() != sourceCube.bandCount()) { string msg = "Cannot copy BandBin group when the number of bands does" " not match"; throw IException(IException::User, msg, _FILEINFO_); diff --git a/isis/src/base/apps/cosi/cosi.cpp b/isis/src/base/apps/cosi/cosi.cpp index 7c6223c97a..dbacd0943e 100644 --- a/isis/src/base/apps/cosi/cosi.cpp +++ b/isis/src/base/apps/cosi/cosi.cpp @@ -16,7 +16,7 @@ void IsisMain() { ProcessByLine p; Cube *icube = p.SetInputCube("FROM"); - cam = icube->getCamera(); + cam = icube->camera(); maxinc = Application::GetUserInterface().GetDouble("MAXINC"); p.SetOutputCube("TO"); p.StartProcess(divide); diff --git a/isis/src/base/apps/crop/crop.cpp b/isis/src/base/apps/crop/crop.cpp index 0990c87a4a..eab3bcc0b4 100644 --- a/isis/src/base/apps/crop/crop.cpp +++ b/isis/src/base/apps/crop/crop.cpp @@ -38,39 +38,39 @@ void IsisMain() { sl = ui.GetInteger("LINE"); sb = 1; - int origns = cube.getSampleCount(); - int orignl = cube.getLineCount(); - int es = cube.getSampleCount(); + int origns = cube.sampleCount(); + int orignl = cube.lineCount(); + int es = cube.sampleCount(); if(ui.WasEntered("NSAMPLES")) es = ui.GetInteger("NSAMPLES") + ss - 1; - int el = cube.getLineCount(); + int el = cube.lineCount(); if(ui.WasEntered("NLINES")) el = ui.GetInteger("NLINES") + sl - 1; - int eb = cube.getBandCount(); + int eb = cube.bandCount(); sinc = ui.GetInteger("SINC"); linc = ui.GetInteger("LINC"); // Make sure starting positions fall within the cube - if(ss > cube.getSampleCount()) { + if(ss > cube.sampleCount()) { cube.close(); QString msg = "[SAMPLE] exceeds number of samples in the [FROM] cube"; throw IException(IException::User, msg, _FILEINFO_); } - if(sl > cube.getLineCount()) { + if(sl > cube.lineCount()) { cube.close(); QString msg = "[LINE] exceeds number of lines in the [FROM] cube"; throw IException(IException::User, msg, _FILEINFO_); } // Make sure the number of elements do not fall outside the cube - if(es > cube.getSampleCount()) { + if(es > cube.sampleCount()) { cube.close(); QString msg = "[SAMPLE+NSAMPLES-1] exceeds number of "; msg += "samples in the [FROM] cube"; throw IException(IException::User, msg, _FILEINFO_); } - if(el > cube.getLineCount()) { + if(el > cube.lineCount()) { cube.close(); QString msg = "[LINE+NLINES-1] exceeds number of "; msg += "lines in the [FROM] cube"; @@ -93,7 +93,7 @@ void IsisMain() { p.ClearInputCubes(); // propagate tables manually - Pvl &inLabels = *cube.getLabel(); + Pvl &inLabels = *cube.label(); // Loop through the labels looking for object = Table for(int labelObj = 0; labelObj < inLabels.Objects(); labelObj++) { @@ -119,7 +119,7 @@ void IsisMain() { /* Deal with associations, sample first if(table.IsSampleAssociated()) { int numDeleted = 0; - for(int samp = 0; samp < cube.getSampleCount(); samp++) { + for(int samp = 0; samp < cube.sampleCount(); samp++) { // This tests checks to see if we would include this sample. // samp - (ss-1)) / sinc must be a whole number less than ns. if((samp - (ss-1)) % sinc != 0 || (samp - (ss-1)) / sinc >= ns || (samp - (ss-1)) < 0) { @@ -132,7 +132,7 @@ void IsisMain() { // Deal with line association if(table.IsLineAssociated()) { int numDeleted = 0; - for(int line = 0; line < cube.getLineCount(); line++) { + for(int line = 0; line < cube.lineCount(); line++) { // This tests checks to see if we would include this line. // line - (sl-1)) / linc must be a whole number less than nl. if((line - (sl-1)) % linc != 0 || (line - (sl-1)) / linc >= nl || (line - (sl-1)) < 0) { @@ -146,7 +146,7 @@ void IsisMain() { ocube->write(table); } - Pvl &outLabels = *ocube->getLabel(); + Pvl &outLabels = *ocube->label(); if(!ui.GetBoolean("PROPSPICE") && outLabels.FindObject("IsisCube").HasGroup("Kernels")) { PvlGroup &kerns = outLabels.FindObject("IsisCube").FindGroup("Kernels"); diff --git a/isis/src/base/apps/cropspecial/cropspecial.cpp b/isis/src/base/apps/cropspecial/cropspecial.cpp index 06f16a3110..1c3a7dc2d4 100644 --- a/isis/src/base/apps/cropspecial/cropspecial.cpp +++ b/isis/src/base/apps/cropspecial/cropspecial.cpp @@ -42,9 +42,9 @@ void IsisMain() { cropHis = ui.GetBoolean("HIS"); cropLis = ui.GetBoolean("LIS"); - minSample = cube.getSampleCount() + 1; - minLine = cube.getLineCount() + 1; - numBands = cube.getBandCount(); + minSample = cube.sampleCount() + 1; + minLine = cube.lineCount() + 1; + numBands = cube.bandCount(); // Setup the input cube ProcessByLine p1; @@ -55,7 +55,7 @@ void IsisMain() { p1.StartProcess(FindPerimeter); p1.EndProcess(); - if(minSample == cube.getSampleCount() + 1) { + if(minSample == cube.sampleCount() + 1) { cube.close(); QString msg = "There are no valid pixels in the [FROM] cube"; throw IException(IException::User, msg, _FILEINFO_); @@ -73,7 +73,7 @@ void IsisMain() { p2.ClearInputCubes(); // propagate tables manually - Pvl &inLabels = *cube.getLabel(); + Pvl &inLabels = *cube.label(); // Loop through the labels looking for object = Table for(int labelObj = 0; labelObj < inLabels.Objects(); labelObj++) { @@ -89,8 +89,8 @@ void IsisMain() { // Construct a label with the results PvlGroup results("Results"); - results += PvlKeyword("InputLines", toString(cube.getLineCount())); - results += PvlKeyword("InputSamples", toString(cube.getSampleCount())); + results += PvlKeyword("InputLines", toString(cube.lineCount())); + results += PvlKeyword("InputSamples", toString(cube.sampleCount())); results += PvlKeyword("StartingLine", toString(minLine)); results += PvlKeyword("StartingSample", toString(minSample)); results += PvlKeyword("EndingLine", toString(maxLine)); @@ -107,7 +107,7 @@ void IsisMain() { // Update the Mapping, Instrument, and AlphaCube groups in the output // cube label SubArea s; - s.SetSubArea(cube.getLineCount(), cube.getSampleCount(), minLine, minSample, minLine + numLines - 1, + s.SetSubArea(cube.lineCount(), cube.sampleCount(), minLine, minSample, minLine + numLines - 1, minSample + numSamples - 1, 1.0, 1.0); s.UpdateLabel(&cube, ocube, results); diff --git a/isis/src/base/apps/cubeavg/cubeavg.cpp b/isis/src/base/apps/cubeavg/cubeavg.cpp index 9dc25c0b1b..5298a557a8 100644 --- a/isis/src/base/apps/cubeavg/cubeavg.cpp +++ b/isis/src/base/apps/cubeavg/cubeavg.cpp @@ -21,13 +21,13 @@ void IsisMain() { ProcessBySpectra p; p.SetType(ProcessBySpectra::PerPixel); Cube *icube = p.SetInputCube("FROM"); - Cube *ocube = p.SetOutputCube("TO", icube->getSampleCount(), icube->getLineCount(), 1); + Cube *ocube = p.SetOutputCube("TO", icube->sampleCount(), icube->lineCount(), 1); //Get user parameters and sets outputcube's BandBin UserInterface &ui = Application::GetUserInterface(); if(ui.GetString("BANDBIN") == "COMPUTE") { if(icube->hasGroup("BandBin")) { - PvlGroup &pvlg = icube->getGroup("BandBin"); + PvlGroup &pvlg = icube->group("BandBin"); removekeywords(pvlg); if(pvlg.HasKeyword("Center")) { bool hasWidth = pvlg.HasKeyword("Width"); @@ -37,9 +37,9 @@ void IsisMain() { pvlWidth = & pvlg.FindKeyword("Width"); } std::vector centers; - centers.resize(icube->getBandCount()); + centers.resize(icube->bandCount()); std::vector widths; - widths.resize(icube->getBandCount()); + widths.resize(icube->bandCount()); for(int i = 0; i < pvlCenter.Size(); i++) { centers[i] = toDouble(pvlCenter[i]); if(hasWidth) @@ -67,7 +67,7 @@ void IsisMain() { icube->putGroup(pvlg); } else { - pvlg = ocube->getGroup("BandBin"); + pvlg = ocube->group("BandBin"); removekeywords(pvlg); } QString Units = ""; @@ -132,7 +132,7 @@ void removekeywords(PvlGroup &pvlg) { //BandBin Computeing void compute(vector centers, vector widths, Cube *ocube) { - PvlGroup &pvlg = ocube->getGroup("BandBin"); + PvlGroup &pvlg = ocube->group("BandBin"); PvlKeyword &pvlCenter = pvlg.FindKeyword("Center"); QString centerUnit = pvlCenter.Unit(); bool hasWidth = pvlg.HasKeyword("Width"); diff --git a/isis/src/base/apps/cubeit/cubeit.cpp b/isis/src/base/apps/cubeit/cubeit.cpp index 8fb836566f..542978a3ef 100644 --- a/isis/src/base/apps/cubeit/cubeit.cpp +++ b/isis/src/base/apps/cubeit/cubeit.cpp @@ -39,23 +39,23 @@ void IsisMain() { cube.setVirtualBands(bands); cube.open(cubeList[i].toString()); if(i == 0) { - nsamps = cube.getSampleCount(); - nlines = cube.getLineCount(); - nbands = cube.getBandCount(); + nsamps = cube.sampleCount(); + nlines = cube.lineCount(); + nbands = cube.bandCount(); } else { // Make sure they are all the same size - if((nsamps != cube.getSampleCount()) || (nlines != cube.getLineCount())) { + if((nsamps != cube.sampleCount()) || (nlines != cube.lineCount())) { QString msg = "Spatial dimensions of cube [" + cubeList[i].toString() + "] does not match other cubes in list"; throw IException(IException::User, msg, _FILEINFO_); } // Get the total number of bands - nbands += cube.getBandCount(); + nbands += cube.bandCount(); } // Build up the band bin group - PvlObject &isiscube = cube.getLabel()->FindObject("IsisCube"); + PvlObject &isiscube = cube.label()->FindObject("IsisCube"); if(isiscube.HasGroup("BandBin")) { PvlGroup &inBandBin = isiscube.FindGroup("BandBin"); for(int key = 0; key < inBandBin.Keywords(); key++) { @@ -131,7 +131,7 @@ void IsisMain() { Cube *icube = m.SetInputCube(cubeList[i].toString(), attrib); m.SetImageOverlay(ProcessMosaic::PlaceImagesOnTop); m.StartProcess(1, 1, sband); - sband += icube->getBandCount(); + sband += icube->bandCount(); m.EndProcess(); } } diff --git a/isis/src/base/apps/cubenorm/cubenorm.cpp b/isis/src/base/apps/cubenorm/cubenorm.cpp index 44303b6a68..0c2fadfb2d 100644 --- a/isis/src/base/apps/cubenorm/cubenorm.cpp +++ b/isis/src/base/apps/cubenorm/cubenorm.cpp @@ -71,9 +71,9 @@ void IsisMain() { // Setup the input cube; // Obtain information from the input file Cube *icube = p.SetInputCube("FROM"); - totalSamples = icube->getSampleCount(); - totalLines = icube->getLineCount(); - totalBands = icube->getBandCount(); + totalSamples = icube->sampleCount(); + totalLines = icube->lineCount(); + totalBands = icube->bandCount(); // Setup the tile size based on the direction of normalization direction = ui.GetString("DIRECTION"); diff --git a/isis/src/base/apps/decorstretch/decorstretch.cpp b/isis/src/base/apps/decorstretch/decorstretch.cpp index a426f2aed8..00ea1185a8 100644 --- a/isis/src/base/apps/decorstretch/decorstretch.cpp +++ b/isis/src/base/apps/decorstretch/decorstretch.cpp @@ -21,14 +21,14 @@ QString tmpFileName = "Temporary_DecorrelationStretch_Transform.cub"; void IsisMain() { ProcessByBrick p; Cube *icube = p.SetInputCube("FROM"); - int numDimensions = icube->getBandCount(); + int numDimensions = icube->bandCount(); p.SetBrickSize(128, 128, numDimensions); // The output cube with no attributes and real pixel type Isis::CubeAttributeOutput cao; cao.setPixelType(Isis::Real); - p.SetOutputCube(tmpFileName, cao, icube->getSampleCount(), icube->getLineCount(), icube->getBandCount()); + p.SetOutputCube(tmpFileName, cao, icube->sampleCount(), icube->lineCount(), icube->bandCount()); // Get the data for the transform matrix pca = Isis::PrincipalComponentAnalysis(numDimensions); @@ -48,7 +48,7 @@ void IsisMain() { Cube *icube2 = p.SetInputCube(tmpFileName, cai); for(int i = 0; i < numDimensions; i++) { - stretches.push_back(new GaussianStretch(*(icube2->getHistogram(i + 1)))); + stretches.push_back(new GaussianStretch(*(icube2->histogram(i + 1)))); } p.SetOutputCube("TO"); diff --git a/isis/src/base/apps/demprep/demprep.cpp b/isis/src/base/apps/demprep/demprep.cpp index 511f912701..e85fb88aaf 100644 --- a/isis/src/base/apps/demprep/demprep.cpp +++ b/isis/src/base/apps/demprep/demprep.cpp @@ -32,12 +32,12 @@ void IsisMain() { ProcessByLine p; UserInterface &ui = Application::GetUserInterface(); Cube *icube = p.SetInputCube("FROM"); - int ins = icube->getSampleCount(); - inl = icube->getLineCount(); - int inb = icube->getBandCount(); + int ins = icube->sampleCount(); + inl = icube->lineCount(); + int inb = icube->bandCount(); outCubeStats.Reset(); - PvlGroup mapgrp = icube->getLabel()->FindGroup("Mapping", Pvl::Traverse); + PvlGroup mapgrp = icube->label()->FindGroup("Mapping", Pvl::Traverse); bool hasExtents = false; bool isGlobal = false; double minLat,maxLat,minLon,maxLon; @@ -51,7 +51,7 @@ void IsisMain() { if ((maxLat - minLat) >= 180.0 && (maxLon - minLon) >= 360.0) isGlobal = true; } - Projection *proj = icube->getProjection(); + Projection *proj = icube->projection(); if(proj == NULL) { IString message = "The input cube must be a DEM file, which means it must be projected. "; message += "This file is not map projected."; diff --git a/isis/src/base/apps/desmear/desmear.cpp b/isis/src/base/apps/desmear/desmear.cpp index 7e57b390dc..4d5d364f22 100644 --- a/isis/src/base/apps/desmear/desmear.cpp +++ b/isis/src/base/apps/desmear/desmear.cpp @@ -25,7 +25,7 @@ void IsisMain() { expTime = ui.GetDouble("DURATION"); } else { - PvlGroup grp = icube->getGroup("ISIS_INSTRUMENT"); + PvlGroup grp = icube->group("ISIS_INSTRUMENT"); expTime = grp["EXPOSURE_DURATION"]; } @@ -33,12 +33,12 @@ void IsisMain() { xferTime = ui.GetDouble("TRANSFER"); } else { - PvlGroup grp = icube->getGroup("ISIS_INSTRUMENT"); + PvlGroup grp = icube->group("ISIS_INSTRUMENT"); xferTime = grp["TRANSFER_TIME"]; } // Calculate the smear scale - smearScale = xferTime / expTime / icube->getLineCount(); + smearScale = xferTime / expTime / icube->lineCount(); // Start the processing p.StartProcess(desmear); diff --git a/isis/src/base/apps/dstripe/dstripe.cpp b/isis/src/base/apps/dstripe/dstripe.cpp index aab6150382..f3e776d8f4 100644 --- a/isis/src/base/apps/dstripe/dstripe.cpp +++ b/isis/src/base/apps/dstripe/dstripe.cpp @@ -26,7 +26,7 @@ void IsisMain() { highSamples = ui.GetInteger("VHNS"); } else { - highSamples = icube->getSampleCount(); + highSamples = icube->sampleCount(); if(highSamples % 2 == 0) highSamples -= 1; } @@ -34,7 +34,7 @@ void IsisMain() { lowLines = ui.GetInteger("VLNL"); } else { - lowLines = icube->getLineCount(); + lowLines = icube->lineCount(); if(lowLines % 2 == 0) lowLines -= 1; } @@ -46,7 +46,7 @@ void IsisMain() { highLines = ui.GetInteger("HHNL"); } else { - highLines = icube->getLineCount(); + highLines = icube->lineCount(); if(highLines % 2 == 0) highLines -= 1; } @@ -54,7 +54,7 @@ void IsisMain() { lowSamples = ui.GetInteger("HLNS"); } else { - lowSamples = icube->getSampleCount(); + lowSamples = icube->sampleCount(); if(lowSamples % 2 == 0) lowSamples -= 1; } diff --git a/isis/src/base/apps/editlab/editlab.cpp b/isis/src/base/apps/editlab/editlab.cpp index 1bc648893e..d137012e11 100644 --- a/isis/src/base/apps/editlab/editlab.cpp +++ b/isis/src/base/apps/editlab/editlab.cpp @@ -26,7 +26,7 @@ void IsisMain() { if(label->HasObject("IsisCube")) { cube = new Cube(); cube->open(ui.GetFileName("FROM"), "rw"); - pvl = &(cube->getLabel()->FindObject("IsisCube")); + pvl = &(cube->label()->FindObject("IsisCube")); } // Add Template File diff --git a/isis/src/base/apps/enlarge/enlarge.cpp b/isis/src/base/apps/enlarge/enlarge.cpp index 7f7bc7b5b2..7e005121b8 100644 --- a/isis/src/base/apps/enlarge/enlarge.cpp +++ b/isis/src/base/apps/enlarge/enlarge.cpp @@ -14,9 +14,9 @@ void IsisMain() { Cube *icube = p.SetInputCube("FROM"); // Input number of samples, lines, and bands - int ins = icube->getSampleCount(); - int inl = icube->getLineCount(); - int inb = icube->getBandCount(); + int ins = icube->sampleCount(); + int inl = icube->lineCount(); + int inb = icube->bandCount(); // Output samples and lines int ons, onl; diff --git a/isis/src/base/apps/explode/explode.cpp b/isis/src/base/apps/explode/explode.cpp index fed035509a..48aa331564 100644 --- a/isis/src/base/apps/explode/explode.cpp +++ b/isis/src/base/apps/explode/explode.cpp @@ -12,10 +12,10 @@ void IsisMain() { // Get the cube to explode Process p; Cube *icube = p.SetInputCube("FROM"); - int samps = icube->getSampleCount(); - int lines = icube->getLineCount(); - int bands = icube->getBandCount(); - QString infile = icube->getFileName(); + int samps = icube->sampleCount(); + int lines = icube->lineCount(); + int bands = icube->bandCount(); + QString infile = icube->fileName(); // We the output filename so we can add attributes and extensions UserInterface &ui = Application::GetUserInterface(); @@ -24,7 +24,7 @@ void IsisMain() { // Loop and extract each band for(int band = 1; band <= bands; band++) { - int pband = icube->getPhysicalBand(band); + int pband = icube->physicalBand(band); QString sband(toString(pband)); ProcessByLine p2; diff --git a/isis/src/base/apps/fft/fft.cpp b/isis/src/base/apps/fft/fft.cpp index 56a575e855..c6e3c33bda 100644 --- a/isis/src/base/apps/fft/fft.cpp +++ b/isis/src/base/apps/fft/fft.cpp @@ -29,16 +29,16 @@ void IsisMain() { // Setup the input and output cubes Cube *icube = sProc.SetInputCube("FROM"); - int numSamples = fft.NextPowerOfTwo(icube->getSampleCount()); - int numLines = fft.NextPowerOfTwo(icube->getLineCount()); - int numBands = icube->getBandCount(); + int numSamples = fft.NextPowerOfTwo(icube->sampleCount()); + int numLines = fft.NextPowerOfTwo(icube->lineCount()); + int numBands = icube->bandCount(); sProc.SetTileSize(1, numLines); // create an AlphaCube containing the resizing information // which will be used during the inverse - AlphaCube aCube(icube->getSampleCount(), icube->getLineCount(), - icube->getSampleCount(), icube->getLineCount()); + AlphaCube aCube(icube->sampleCount(), icube->lineCount(), + icube->sampleCount(), icube->lineCount()); UserInterface &ui = Application::GetUserInterface(); @@ -87,7 +87,7 @@ void IsisMain() { lProc.ProcessCubes(&FFT2); // Add or update the AlphaCube group - aCube.UpdateGroup(*ocube->getLabel()); + aCube.UpdateGroup(*ocube->label()); // Stop the process and remove the temporary files lProc.Finalize(); diff --git a/isis/src/base/apps/findgaps/findgaps.cpp b/isis/src/base/apps/findgaps/findgaps.cpp index 5ab070315b..d3ae6932f1 100644 --- a/isis/src/base/apps/findgaps/findgaps.cpp +++ b/isis/src/base/apps/findgaps/findgaps.cpp @@ -50,7 +50,7 @@ void IsisMain() { ProcessByLine p; Cube *iCube = p.SetInputCube("FROM"); - FindGapsFunctor gapsFunctor(iCube->getLineCount(), corTol, bufferSizeBeforeGap, + FindGapsFunctor gapsFunctor(iCube->lineCount(), corTol, bufferSizeBeforeGap, bufferSizeAfterGap); p.ProcessCubeInPlace(gapsFunctor, false); diff --git a/isis/src/base/apps/findrx/findrx.cpp b/isis/src/base/apps/findrx/findrx.cpp index 151a296327..03116671c7 100644 --- a/isis/src/base/apps/findrx/findrx.cpp +++ b/isis/src/base/apps/findrx/findrx.cpp @@ -25,7 +25,7 @@ void IsisMain() { else { regdef = new Pvl("$base/templates/autoreg/findrx.def"); } - PvlGroup &reseaus = cube.getLabel()->FindGroup("Reseaus", Pvl::Traverse); + PvlGroup &reseaus = cube.label()->FindGroup("Reseaus", Pvl::Traverse); // If the Keyword sizes don't match up, throw errors. int nres = reseaus["Line"].Size(); diff --git a/isis/src/base/apps/fits2isis/fits2isis.cpp b/isis/src/base/apps/fits2isis/fits2isis.cpp index e006432125..8da27f3b44 100644 --- a/isis/src/base/apps/fits2isis/fits2isis.cpp +++ b/isis/src/base/apps/fits2isis/fits2isis.cpp @@ -182,7 +182,7 @@ void IsisMain() { Cube *output = pfits.SetOutputCube("TO"); // Add instrument group if any relevant data exists - Pvl *lbls = output->getLabel(); + Pvl *lbls = output->label(); if(instGrp) { lbls->FindObject("IsisCube") += inst; } diff --git a/isis/src/base/apps/footprintinit/footprintinit.cpp b/isis/src/base/apps/footprintinit/footprintinit.cpp index 7665725e8b..759b5d319f 100644 --- a/isis/src/base/apps/footprintinit/footprintinit.cpp +++ b/isis/src/base/apps/footprintinit/footprintinit.cpp @@ -19,7 +19,7 @@ void IsisMain() { // Make sure cube has been run through spiceinit try { - cube.getCamera(); + cube.camera(); } catch(IException &e) { string msg = "Spiceinit must be run before initializing the polygon"; diff --git a/isis/src/base/apps/footprintmerge/footprintmerge.cpp b/isis/src/base/apps/footprintmerge/footprintmerge.cpp index 2643cdf90c..de055cac4f 100644 --- a/isis/src/base/apps/footprintmerge/footprintmerge.cpp +++ b/isis/src/base/apps/footprintmerge/footprintmerge.cpp @@ -44,7 +44,7 @@ void IsisMain() { // Make sure cube has been run through spiceinit try { - cube.getCamera(); + cube.camera(); } catch(IException &e) { QString msg = "Spiceinit must be run prior to running footprintmerge"; diff --git a/isis/src/base/apps/gaussstretch/gaussstretch.cpp b/isis/src/base/apps/gaussstretch/gaussstretch.cpp index f5fccd985e..eed8bf3a72 100644 --- a/isis/src/base/apps/gaussstretch/gaussstretch.cpp +++ b/isis/src/base/apps/gaussstretch/gaussstretch.cpp @@ -16,15 +16,15 @@ void IsisMain() { p.SetOutputCube("TO"); double gsigma = Isis::Application::GetUserInterface().GetDouble("GSIGMA"); - for(int i = 0; i < icube->getBandCount(); i++) { - Histogram hist = *(icube->getHistogram(i + 1)); + for(int i = 0; i < icube->bandCount(); i++) { + Histogram hist = *(icube->histogram(i + 1)); double mean = (hist.Maximum() + hist.Minimum()) / 2.0; double stdev = (hist.Maximum() - hist.Minimum()) / (2.0 * gsigma); stretch.push_back(new GaussianStretch(hist, mean, stdev)); } p.StartProcess(gauss); - for(int i = 0; i < icube->getBandCount(); i++) delete stretch[i]; + for(int i = 0; i < icube->bandCount(); i++) delete stretch[i]; stretch.clear(); p.EndProcess(); } diff --git a/isis/src/base/apps/getsn/getsn.cpp b/isis/src/base/apps/getsn/getsn.cpp index c4ef2681d1..c41f6bb2e3 100644 --- a/isis/src/base/apps/getsn/getsn.cpp +++ b/isis/src/base/apps/getsn/getsn.cpp @@ -47,7 +47,7 @@ void IsisMain() { } // Extract label from cube file - Pvl *label = cube.getLabel(); + Pvl *label = cube.label(); PvlGroup sn("Results"); diff --git a/isis/src/base/apps/grid/grid.cpp b/isis/src/base/apps/grid/grid.cpp index d5aba087f1..c2da387481 100644 --- a/isis/src/base/apps/grid/grid.cpp +++ b/isis/src/base/apps/grid/grid.cpp @@ -76,8 +76,8 @@ void IsisMain() { throw IException(IException::User, msg, _FILEINFO_); } - inputSamples = icube->getSampleCount(); - inputLines = icube->getLineCount(); + inputSamples = icube->sampleCount(); + inputLines = icube->lineCount(); // Line & sample based grid if(mode == "IMAGE") { @@ -92,12 +92,12 @@ void IsisMain() { // Lat/Lon based grid else { CubeAttributeOutput oatt("+32bit"); - p.SetOutputCube(ui.GetFileName("TO"), oatt, icube->getSampleCount(), - icube->getLineCount(), icube->getBandCount()); + p.SetOutputCube(ui.GetFileName("TO"), oatt, icube->sampleCount(), + icube->lineCount(), icube->bandCount()); UniversalGroundMap *gmap = new UniversalGroundMap(*icube, UniversalGroundMap::ProjectionFirst); - latLonGrid = new GroundGrid(gmap, ticks, icube->getSampleCount(), icube->getLineCount()); + latLonGrid = new GroundGrid(gmap, ticks, icube->sampleCount(), icube->lineCount()); baseLat = Latitude(ui.GetDouble("BASELAT"), *latLonGrid->GetMappingGroup(), Angle::Degrees); diff --git a/isis/src/base/apps/hist/hist.cpp b/isis/src/base/apps/hist/hist.cpp index 2745121e6b..3655e08bc1 100644 --- a/isis/src/base/apps/hist/hist.cpp +++ b/isis/src/base/apps/hist/hist.cpp @@ -32,10 +32,10 @@ void IsisMain() { // Loop and accumulate histogram p.Progress()->SetText("Gathering Histogram"); - p.Progress()->SetMaximumSteps(icube->getLineCount()); + p.Progress()->SetMaximumSteps(icube->lineCount()); p.Progress()->CheckStatus(); LineManager line(*icube); - for(int i = 1; i <= icube->getLineCount(); i++) { + for(int i = 1; i <= icube->lineCount(); i++) { line.SetLine(i); icube->read(line); hist.AddData(line.DoubleBuffer(), line.size()); @@ -54,7 +54,7 @@ void IsisMain() { fout.open(outfile.toAscii().data()); fout << "Cube: " << ui.GetFileName("FROM") << endl; - fout << "Band: " << icube->getBandCount() << endl; + fout << "Band: " << icube->bandCount() << endl; fout << "Average: " << hist.Average() << endl; fout << "Std Deviation: " << hist.StandardDeviation() << endl; fout << "Variance: " << hist.Variance() << endl; diff --git a/isis/src/base/apps/histeq/histeq.cpp b/isis/src/base/apps/histeq/histeq.cpp index 19c8081a48..6988cf6780 100644 --- a/isis/src/base/apps/histeq/histeq.cpp +++ b/isis/src/base/apps/histeq/histeq.cpp @@ -25,8 +25,8 @@ void IsisMain() { int increment = ui.GetInteger("INCREMENT"); // Histograms from input cubes - Histogram *from = icube->getHistogram(); - Histogram *match = icube->getHistogram(); + Histogram *from = icube->histogram(); + Histogram *match = icube->histogram(); double fromMin = from->Percent(minimum); double fromMax = from->Percent(maximum); diff --git a/isis/src/base/apps/histmatch/histmatch.cpp b/isis/src/base/apps/histmatch/histmatch.cpp index a4a6da054c..66e1978bd7 100644 --- a/isis/src/base/apps/histmatch/histmatch.cpp +++ b/isis/src/base/apps/histmatch/histmatch.cpp @@ -16,10 +16,10 @@ void IsisMain() { // Setup the input and output cubes along with histograms ProcessByLine p; Cube *mcube = p.SetInputCube("MATCH", Isis::OneBand); - Histogram *match = mcube->getHistogram(); + Histogram *match = mcube->histogram(); p.ClearInputCubes(); Cube *icube = p.SetInputCube("FROM", Isis::OneBand); - Histogram *from = icube->getHistogram(); + Histogram *from = icube->histogram(); p.SetOutputCube("TO"); // Histogram specifications diff --git a/isis/src/base/apps/ifft/ifft.cpp b/isis/src/base/apps/ifft/ifft.cpp index 4f74ad9b66..183858800c 100644 --- a/isis/src/base/apps/ifft/ifft.cpp +++ b/isis/src/base/apps/ifft/ifft.cpp @@ -31,16 +31,16 @@ void IsisMain() { Cube *magCube = lProc.SetInputCube("MAGNITUDE"); Cube *phaseCube = lProc.SetInputCube("PHASE"); - int numSamples = magCube->getSampleCount(); - int numLines = magCube->getLineCount(); - int numBands = magCube->getBandCount(); + int numSamples = magCube->sampleCount(); + int numLines = magCube->lineCount(); + int numBands = magCube->bandCount(); // error checking for valid input cubes // i.e. the dimensions of the magnitude and phase cubes // are the same and are powers of two if(!fft.IsPowerOfTwo(numSamples) || !fft.IsPowerOfTwo(numLines) - || magCube->getSampleCount() != phaseCube->getSampleCount() - || magCube->getLineCount() != phaseCube->getLineCount()) { + || magCube->sampleCount() != phaseCube->sampleCount() + || magCube->lineCount() != phaseCube->lineCount()) { cerr << "Invalid Cubes: the dimensions of both cubes must be equal" " powers of 2." << endl; return; diff --git a/isis/src/base/apps/isis2ascii/isis2ascii.cpp b/isis/src/base/apps/isis2ascii/isis2ascii.cpp index 190b83cb73..431ec10636 100644 --- a/isis/src/base/apps/isis2ascii/isis2ascii.cpp +++ b/isis/src/base/apps/isis2ascii/isis2ascii.cpp @@ -24,9 +24,9 @@ void IsisMain() { // Print header if needed if(ui.GetBoolean("HEADER")) { - fout << "Input Cube: " << icube->getFileName() << endl; - fout << "Samples:Lines:Bands: " << icube->getSampleCount() << ":" << - icube->getLineCount() << ":" << icube->getBandCount() << endl; + fout << "Input Cube: " << icube->fileName() << endl; + fout << "Samples:Lines:Bands: " << icube->sampleCount() << ":" << + icube->lineCount() << ":" << icube->bandCount() << endl; } // List the cube diff --git a/isis/src/base/apps/isis2fits/isis2fits.cpp b/isis/src/base/apps/isis2fits/isis2fits.cpp index 1732df591f..54ba391704 100644 --- a/isis/src/base/apps/isis2fits/isis2fits.cpp +++ b/isis/src/base/apps/isis2fits/isis2fits.cpp @@ -56,7 +56,7 @@ void IsisMain() { if(bitpix == "-32") p.SetOutputType(Isis::Real); // determine core base and multiplier, set up the stretch - PvlGroup pix = icube->getLabel()->FindObject("IsisCube").FindObject("Core").FindGroup("Pixels"); + PvlGroup pix = icube->label()->FindObject("IsisCube").FindObject("Core").FindGroup("Pixels"); double scale = toDouble(pix["Multiplier"][0]); double base = toDouble(pix["Base"][0]); @@ -96,20 +96,20 @@ void IsisMain() { // specify the number of data axes (2: samples by lines) int axes = 2; - if(icube->getBandCount() > 1) { + if(icube->bandCount() > 1) { axes = 3; } header += FitsKeyword("NAXIS", true, toString(axes)); // specify the limit on data axis 1 (number of samples) - header += FitsKeyword("NAXIS1", true, toString(icube->getSampleCount())); + header += FitsKeyword("NAXIS1", true, toString(icube->sampleCount())); // specify the limit on data axis 2 (number of lines) - header += FitsKeyword("NAXIS2", true, toString(icube->getLineCount())); + header += FitsKeyword("NAXIS2", true, toString(icube->lineCount())); if(axes == 3) { - header += FitsKeyword("NAXIS3", true, toString(icube->getBandCount())); + header += FitsKeyword("NAXIS3", true, toString(icube->bandCount())); } header += FitsKeyword("BZERO", true, toString(base)); @@ -122,7 +122,7 @@ void IsisMain() { PvlGroup map; if(icube->hasGroup("mapping")) { - map = icube->getGroup("mapping"); + map = icube->group("mapping"); msg = (QString)map["targetname"]; } // If we have sky we want it @@ -151,7 +151,7 @@ void IsisMain() { header += WritePvl("DATE-OBS", "Instrument", "StartTime", icube, true); // Some cameras don't have StopTime if(icube->hasGroup("Instrument")) { - PvlGroup inst = icube->getGroup("Instrument"); + PvlGroup inst = icube->group("Instrument"); if(inst.HasKeyword("StopTime")) { header += WritePvl("TIME_END", "Instrument", "StopTime", icube, true); } @@ -236,7 +236,7 @@ QString FitsKeyword(QString key, bool isValue, QString value, QString unit) { QString WritePvl(QString fitsKey, QString group, IString key, Cube *icube, bool isString) { if(icube->hasGroup(group)) { - PvlGroup theGroup = icube->getGroup(group); + PvlGroup theGroup = icube->group(group); QString name = (QString)theGroup[key]; if(isString) { name = "'" + name + "'"; diff --git a/isis/src/base/apps/lineeq/lineeq.cpp b/isis/src/base/apps/lineeq/lineeq.cpp index 7cd9d6b034..9a8be382f5 100644 --- a/isis/src/base/apps/lineeq/lineeq.cpp +++ b/isis/src/base/apps/lineeq/lineeq.cpp @@ -19,10 +19,10 @@ void IsisMain() { Cube *icube = p.SetInputCube("FROM"); numIgnoredLines = 0; - cubeAverage.resize(icube->getBandCount()); - lineAverages.resize(icube->getBandCount()); + cubeAverage.resize(icube->bandCount()); + lineAverages.resize(icube->bandCount()); - for(int i = 0; i < icube->getBandCount(); i++) { + for(int i = 0; i < icube->bandCount(); i++) { cubeAverage[i] = 0; lineAverages[i] = NULL; } @@ -30,13 +30,13 @@ void IsisMain() { int boxcarSize; if(ui.GetString("BOXTYPE").compare("NONE") == 0) { - boxcarSize = (int)(icube->getLineCount() * 0.10); + boxcarSize = (int)(icube->lineCount() * 0.10); } else if(ui.GetString("BOXTYPE").compare("ABSOLUTE") == 0) { boxcarSize = ui.GetInteger("BOXSIZE"); } else if(ui.GetString("BOXTYPE").compare("PERCENTAGE") == 0) { - boxcarSize = (int)(((double)ui.GetInteger("BOXSIZE") / 100.0) * icube->getLineCount()); + boxcarSize = (int)(((double)ui.GetInteger("BOXSIZE") / 100.0) * icube->lineCount()); } // Boxcar must be odd size @@ -57,8 +57,8 @@ void IsisMain() { Application::Log(data); - for(int band = 0; band < icube->getBandCount(); band ++) { - lineAverages[band] = new double[icube->getLineCount()]; + for(int band = 0; band < icube->bandCount(); band ++) { + lineAverages[band] = new double[icube->lineCount()]; } p.Progress()->SetText("Gathering line averages"); @@ -66,19 +66,19 @@ void IsisMain() { // Now filter the bands p.Progress()->SetText("Smoothing line averages"); - p.Progress()->SetMaximumSteps((icube->getBandCount() + 1) * icube->getLineCount()); + p.Progress()->SetMaximumSteps((icube->bandCount() + 1) * icube->lineCount()); p.Progress()->CheckStatus(); - QuickFilter filter(icube->getLineCount(), boxcarSize, 1); + QuickFilter filter(icube->lineCount(), boxcarSize, 1); - if(icube->getLineCount() <= numIgnoredLines) { + if(icube->lineCount() <= numIgnoredLines) { throw IException(IException::User, "Image does not contain any valid data.", _FILEINFO_); } - for(int band = 0; band < icube->getBandCount(); band ++) { - cubeAverage[band] /= (icube->getLineCount() - numIgnoredLines); + for(int band = 0; band < icube->bandCount(); band ++) { + cubeAverage[band] /= (icube->lineCount() - numIgnoredLines); filter.AddLine(lineAverages[band]); - for(int line = 0; line < icube->getLineCount(); line ++) { + for(int line = 0; line < icube->lineCount(); line ++) { p.Progress()->CheckStatus(); double filteredLine = filter.Average(line); @@ -102,7 +102,7 @@ void IsisMain() { p.Progress()->SetText("Applying Equalization"); p.StartProcess(apply); - for(int band = 0; band < icube->getBandCount(); band ++) { + for(int band = 0; band < icube->bandCount(); band ++) { delete [] lineAverages[band]; lineAverages[band] = NULL; } diff --git a/isis/src/base/apps/makeflat/makeflat.cpp b/isis/src/base/apps/makeflat/makeflat.cpp index 634585778b..146d4e2dd9 100644 --- a/isis/src/base/apps/makeflat/makeflat.cpp +++ b/isis/src/base/apps/makeflat/makeflat.cpp @@ -262,8 +262,8 @@ void IsisMain() { * If we haven't determined how many samples the output * should have, we can do so now */ - if(numOutputSamples == 0 && tmp.getBandCount() == 1) { - numOutputSamples = tmp.getSampleCount(); + if(numOutputSamples == 0 && tmp.bandCount() == 1) { + numOutputSamples = tmp.sampleCount(); } /** @@ -274,14 +274,14 @@ void IsisMain() { bool imageValid = true; // Only single band images are acceptable - imageValid &= (tmp.getBandCount() == 1); + imageValid &= (tmp.bandCount() == 1); // Sample sizes must always match - imageValid &= (numOutputSamples == tmp.getSampleCount()); + imageValid &= (numOutputSamples == tmp.sampleCount()); // For push frame cameras, there must be valid all framelets if(cameraType == PushFrame) { - imageValid &= (tmp.getLineCount() % numFrameLines == 0); + imageValid &= (tmp.lineCount() % numFrameLines == 0); } // For framing cameras, we need to figure out the size... @@ -290,12 +290,12 @@ void IsisMain() { bool setTempFileLength = false; if(cameraType == Framing) { if(tempFileLength == 0 && imageValid) { - tempFileLength = tmp.getLineCount(); + tempFileLength = tmp.lineCount(); numFrameLines = tempFileLength; setTempFileLength = true; } - imageValid &= (tempFileLength == tmp.getLineCount()); + imageValid &= (tempFileLength == tmp.lineCount()); } // Statistics are necessary at this point for push frame and framing cameras @@ -307,7 +307,7 @@ void IsisMain() { prog += toString((int)inList.size()) + " (" + inList[currImage].name() + ")"; if(cameraType == Framing) { - Statistics *stats = tmp.getStatistics(1, prog); + Statistics *stats = tmp.statistics(1, prog); imageValid &= !IsSpecial(stats->StandardDeviation()); imageValid &= !IsSpecial(stats->Average()); imageValid &= stats->StandardDeviation() <= maxStdev; @@ -330,10 +330,10 @@ void IsisMain() { // The line scan camera needs to actually count the number of lines in each image to know // how many total frames there are before beginning pass 2. if(imageValid && (cameraType == LineScan)) { - int lines = (tmp.getLineCount() / numFrameLines); + int lines = (tmp.lineCount() / numFrameLines); // partial frame? - if(tmp.getLineCount() % numFrameLines != 0) { + if(tmp.lineCount() % numFrameLines != 0) { lines ++; } @@ -570,7 +570,7 @@ bool CheckFramelets(QString progress, Cube &theCube) { LineManager mgr(theCube); Progress prog; prog.SetText(progress); - prog.SetMaximumSteps(theCube.getLineCount()); + prog.SetMaximumSteps(theCube.lineCount()); prog.CheckStatus(); vector frameletAvgs; @@ -580,7 +580,7 @@ bool CheckFramelets(QString progress, Cube &theCube) { vector< pair > excludedFrameletsTmp; Statistics frameletStats; - for(int line = 1; line <= theCube.getLineCount(); line++) { + for(int line = 1; line <= theCube.lineCount(); line++) { if((line - 1) % numFrameLines == 0) { frameletStats.Reset(); } @@ -777,7 +777,7 @@ void CreateTemporaryData(Buffer &in) { (*oLineMgr)[i] = Isis::Null; } - if(ocube->getLineCount() == oLineMgr->Line()) + if(ocube->lineCount() == oLineMgr->Line()) cubeInitialized = true; } @@ -843,7 +843,7 @@ void ProcessTemporaryData(Buffer &in) { ocube->write(*oLineMgr); - if(ocube->getLineCount() == oLineMgr->Line()) + if(ocube->lineCount() == oLineMgr->Line()) cubeInitialized = true; } } diff --git a/isis/src/base/apps/map2cam/map2cam.cpp b/isis/src/base/apps/map2cam/map2cam.cpp index cc76a4eaef..f504b3525b 100644 --- a/isis/src/base/apps/map2cam/map2cam.cpp +++ b/isis/src/base/apps/map2cam/map2cam.cpp @@ -22,19 +22,19 @@ void IsisMain() { Process p; mcube = p.SetInputCube("MATCH"); - outcam = mcube->getCamera(); + outcam = mcube->camera(); // Open the input projection cube and get the projection information ProcessRubberSheet rub; Cube *icube = rub.SetInputCube("FROM"); - Projection *inmap = icube->getProjection(); + Projection *inmap = icube->projection(); // Set up for rubbersheeting - Transform *transform = new map2cam(icube->getSampleCount(), - icube->getLineCount(), + Transform *transform = new map2cam(icube->sampleCount(), + icube->lineCount(), inmap, - mcube->getSampleCount(), - mcube->getLineCount(), + mcube->sampleCount(), + mcube->lineCount(), outcam); // Allocate the output cube but don't propogate any labels from the map @@ -42,7 +42,7 @@ void IsisMain() { rub.PropagateLabels(false); rub.SetOutputCube("TO", transform->OutputSamples(), transform->OutputLines(), - icube->getBandCount()); + icube->bandCount()); rub.PropagateLabels(match.expanded()); rub.PropagateTables(match.expanded()); @@ -118,5 +118,5 @@ int map2cam::OutputLines() const { } void BandChange(const int band) { - outcam->SetBand(mcube->getPhysicalBand(band)); + outcam->SetBand(mcube->physicalBand(band)); } diff --git a/isis/src/base/apps/map2map/map2map.cpp b/isis/src/base/apps/map2map/map2map.cpp index 237b95ca5b..172d7162c7 100644 --- a/isis/src/base/apps/map2map/map2map.cpp +++ b/isis/src/base/apps/map2map/map2map.cpp @@ -32,8 +32,8 @@ void IsisMain() { Cube *icube = p.SetInputCube("FROM"); // Get the mapping group - PvlGroup fromMappingGrp = icube->getGroup("Mapping"); - Projection *inproj = icube->getProjection(); + PvlGroup fromMappingGrp = icube->group("Mapping"); + Projection *inproj = icube->projection(); PvlGroup outMappingGrp = fromMappingGrp; // If the default range is FROM, then wipe out any range data in user mapping file @@ -324,9 +324,9 @@ void IsisMain() { // Set up the transform object which will simply map // output line/samps -> output lat/lons -> input line/samps - Transform *transform = new map2map(icube->getSampleCount(), - icube->getLineCount(), - icube->getProjection(), + Transform *transform = new map2map(icube->sampleCount(), + icube->lineCount(), + icube->projection(), samples, lines, outproj, @@ -335,7 +335,7 @@ void IsisMain() { // Allocate the output cube and add the mapping labels Cube *ocube = p.SetOutputCube("TO", transform->OutputSamples(), transform->OutputLines(), - icube->getBandCount()); + icube->bandCount()); PvlGroup cleanOutGrp = outproj->Mapping(); diff --git a/isis/src/base/apps/maplab/maplab.cpp b/isis/src/base/apps/maplab/maplab.cpp index a1592d074f..9706826f62 100644 --- a/isis/src/base/apps/maplab/maplab.cpp +++ b/isis/src/base/apps/maplab/maplab.cpp @@ -104,7 +104,7 @@ void IsisMain() { // Output the mapping group used to the Gui session log Application::GuiLog(userMap); // Extract label from cube file - Pvl *label = cube.getLabel(); + Pvl *label = cube.label(); PvlObject &o = label->FindObject("IsisCube"); // Add Mapping Group to input cube if(o.HasGroup("Mapping")) { diff --git a/isis/src/base/apps/mapmos/mapmos.cpp b/isis/src/base/apps/mapmos/mapmos.cpp index cbdfacf12b..719c008e86 100644 --- a/isis/src/base/apps/mapmos/mapmos.cpp +++ b/isis/src/base/apps/mapmos/mapmos.cpp @@ -51,7 +51,7 @@ void IsisMain() { m.SetCreateFlag(true); // Use the input projection as a starting point for the mosaic - PvlGroup mapGroup = inCube.getLabel()->FindGroup("Mapping", Pvl::Traverse); + PvlGroup mapGroup = inCube.label()->FindGroup("Mapping", Pvl::Traverse); inCube.close(); mapGroup.AddKeyword(PvlKeyword("MinimumLatitude", toString(ui.GetDouble("MINLAT"))), Pvl::Replace); diff --git a/isis/src/base/apps/mappt/mappt.cpp b/isis/src/base/apps/mappt/mappt.cpp index a014d2656b..248844b53d 100644 --- a/isis/src/base/apps/mappt/mappt.cpp +++ b/isis/src/base/apps/mappt/mappt.cpp @@ -31,7 +31,7 @@ void IsisMain() { // Open the input cube and initialize the projection Cube *icube = p.SetInputCube("FROM"); - Projection *proj = icube->getProjection(); + Projection *proj = icube->projection(); // Get the coordinate UserInterface &ui = Application::GetUserInterface(); @@ -133,7 +133,7 @@ void IsisMain() { } // Create Brick on samp, line to get the dn value of the pixel - Brick b(1, 1, 1, icube->getPixelType()); + Brick b(1, 1, 1, icube->pixelType()); int intSamp = (int)(proj->WorldX() + 0.5); int intLine = (int)(proj->WorldY() + 0.5); b.SetBasePosition(intSamp, intLine, 1); diff --git a/isis/src/base/apps/maptemplate/maptemplate.cpp b/isis/src/base/apps/maptemplate/maptemplate.cpp index 6df7a7047f..ce8ccad9cc 100644 --- a/isis/src/base/apps/maptemplate/maptemplate.cpp +++ b/isis/src/base/apps/maptemplate/maptemplate.cpp @@ -574,7 +574,7 @@ void calcRange(double &minLat, double &maxLat, double camMaxLon; Cube c; c.open(flist[i].toString()); - Camera *cam = c.getCamera(); + Camera *cam = c.camera(); Pvl defaultMap; cam->BasicMapping(defaultMap); PvlGroup &defaultGrp = defaultMap.FindGroup("Mapping"); @@ -614,7 +614,7 @@ double calcResolution() { for(int i = 0; i < flist.size(); i++) { Cube c; c.open(flist[i].toString()); - Camera *cam = c.getCamera(); + Camera *cam = c.camera(); double camLowRes = cam->LowestImageResolution(); double camHighRes = cam->HighestImageResolution(); if(camLowRes > lowRes) lowRes = camLowRes; diff --git a/isis/src/base/apps/mosrange/mosrange.cpp b/isis/src/base/apps/mosrange/mosrange.cpp index b70cb3f5c8..c8ec8e2450 100644 --- a/isis/src/base/apps/mosrange/mosrange.cpp +++ b/isis/src/base/apps/mosrange/mosrange.cpp @@ -115,8 +115,8 @@ void IsisMain() { Cube cube; cube.open(flist[i].toString()); - int lines = cube.getLineCount(); - int samples = cube.getSampleCount(); + int lines = cube.lineCount(); + int samples = cube.sampleCount(); PvlObject fmap("File"); @@ -124,7 +124,7 @@ void IsisMain() { fmap += PvlKeyword("Lines", toString(lines)); fmap += PvlKeyword("Samples", toString(samples)); - Camera *cam = cube.getCamera(); + Camera *cam = cube.camera(); Pvl mapping; cam->BasicMapping(mapping); PvlGroup &mapgrp = mapping.FindGroup("Mapping"); diff --git a/isis/src/base/apps/mvstats/mvstats.cpp b/isis/src/base/apps/mvstats/mvstats.cpp index 6d9a815291..94353e5db7 100644 --- a/isis/src/base/apps/mvstats/mvstats.cpp +++ b/isis/src/base/apps/mvstats/mvstats.cpp @@ -33,7 +33,7 @@ void IsisMain() { //Use a Process to get the number of bands in the input cube Process q; Cube *icube = q.SetInputCube("FROM"); - int bands = icube->getBandCount(); + int bands = icube->bandCount(); //Check to see if the input cube has enough bands if(bands < 2) { @@ -64,8 +64,8 @@ void IsisMain() { //Set CubeAttributeInputs to tell the ProcessByLine which //bands to compare - CubeAttributeInput band_a("d+" + toString(icube->getPhysicalBand(i))); - CubeAttributeInput band_b("d+" + toString(icube->getPhysicalBand(j))); + CubeAttributeInput band_a("d+" + toString(icube->physicalBand(i))); + CubeAttributeInput band_b("d+" + toString(icube->physicalBand(j))); //Set Input files and process, to accumulate the statistics p.SetInputCube(file, band_a); diff --git a/isis/src/base/apps/nocam2map/nocam2map.cpp b/isis/src/base/apps/nocam2map/nocam2map.cpp index aa04b93996..bd3e227404 100644 --- a/isis/src/base/apps/nocam2map/nocam2map.cpp +++ b/isis/src/base/apps/nocam2map/nocam2map.cpp @@ -44,18 +44,18 @@ void IsisMain() { //A 1x1 brick to read in the latitude and longitude DN values from //the specified cubes - Brick latBrick(1, 1, 1, latCube->getPixelType()); - Brick lonBrick(1, 1, 1, lonCube->getPixelType()); + Brick latBrick(1, 1, 1, latCube->pixelType()); + Brick lonBrick(1, 1, 1, lonCube->pixelType()); UserInterface &ui = Application::GetUserInterface(); //Set the sample and line increments - int sinc = (int)(inCube->getSampleCount() * 0.10); + int sinc = (int)(inCube->sampleCount() * 0.10); if(ui.WasEntered("SINC")) { sinc = ui.GetInteger("SINC"); } - int linc = (int)(inCube->getLineCount() * 0.10); + int linc = (int)(inCube->lineCount() * 0.10); if(ui.WasEntered("LINC")) { linc = ui.GetInteger("LINC"); } @@ -76,8 +76,8 @@ void IsisMain() { //y = cos(lat_center) * sin(latitude) - sin(lat_center) * cos(latitude) * cos(longitude - lon_center) //Get the center lat and long from the input cubes - double lat_center = latCube->getStatistics()->Average() * PI / 180.0; - double lon_center = lonCube->getStatistics()->Average() * PI / 180.0; + double lat_center = latCube->statistics()->Average() * PI / 180.0; + double lon_center = lonCube->statistics()->Average() * PI / 180.0; /** @@ -85,8 +85,8 @@ void IsisMain() { * points to stereographic x and y and adding these points to the LeastSquares * matrix. */ - for(int i = 1; i <= inCube->getLineCount(); i += linc) { - for(int j = 1; j <= inCube->getSampleCount(); j += sinc) { + for(int i = 1; i <= inCube->lineCount(); i += linc) { + for(int j = 1; j <= inCube->sampleCount(); j += sinc) { latBrick.SetBasePosition(j, i, 1); latCube->read(latBrick); if(IsSpecial(latBrick.at(0))) continue; @@ -110,14 +110,14 @@ void IsisMain() { //If the sample increment goes past the last sample in the line, we want to //always read the last sample.. - if(j != inCube->getSampleCount() && j + sinc > inCube->getSampleCount()) { - j = inCube->getSampleCount() - sinc; + if(j != inCube->sampleCount() && j + sinc > inCube->sampleCount()) { + j = inCube->sampleCount() - sinc; } } //If the line increment goes past the last line in the cube, we want to //always read the last line.. - if(i != inCube->getLineCount() && i + linc > inCube->getLineCount()) { - i = inCube->getLineCount() - linc; + if(i != inCube->lineCount() && i + linc > inCube->lineCount()) { + i = inCube->lineCount() - linc; } } @@ -287,8 +287,8 @@ void IsisMain() { //the input longitude cube and then converted to the mapping group's domain they may be //invalid for cubes containing the longitude seam. - Statistics *latStats = latCube->getStatistics(); - Statistics *lonStats = lonCube->getStatistics(); + Statistics *latStats = latCube->statistics(); + Statistics *lonStats = lonCube->statistics(); double minLat = latStats->Minimum(); double maxLat = latStats->Maximum(); @@ -372,10 +372,10 @@ void IsisMain() { double a = latBrick.at(0) * PI / 180.0; double c = lonBrick.at(0) * PI / 180.0; - latBrick.SetBasePosition(latCube->getSampleCount(), latCube->getLineCount(), 1); + latBrick.SetBasePosition(latCube->sampleCount(), latCube->lineCount(), 1); latCube->read(latBrick); - lonBrick.SetBasePosition(lonCube->getSampleCount(), lonCube->getLineCount(), 1); + lonBrick.SetBasePosition(lonCube->sampleCount(), lonCube->lineCount(), 1); lonCube->read(lonBrick); //Read the lat and long at the lower right corner @@ -388,7 +388,7 @@ void IsisMain() { angle *= 180 / PI; //Determine the number of pixels between the two points - double pixels = sqrt(pow(latCube->getSampleCount() - 1.0, 2.0) + pow(latCube->getLineCount() - 1.0, 2.0)); + double pixels = sqrt(pow(latCube->sampleCount() - 1.0, 2.0) + pow(latCube->lineCount() - 1.0, 2.0)); //Add the scale in pixels/degree to the mapping group mapGrp.AddKeyword(PvlKeyword("Scale", @@ -439,13 +439,13 @@ void IsisMain() { ui.GetString("LATTYPE") == "PLANETOCENTRIC", ui.GetString("LONDIR") == "POSITIVEEAST", tolerance, ui.GetInteger("ITERATIONS"), - inCube->getSampleCount(), inCube->getLineCount(), + inCube->sampleCount(), inCube->lineCount(), samples, lines); //Allocate the output cube and add the mapping labels Cube *oCube = r.SetOutputCube("TO", transform->OutputSamples(), transform->OutputLines(), - inCube->getBandCount()); + inCube->bandCount()); oCube->putGroup(mapGrp); //Determine which interpolation to use @@ -500,8 +500,8 @@ nocam2map::nocam2map(LeastSquares sample, LeastSquares line, Projection *outmap, p_isPosEast = isPosEast; p_tolerance = tolerance; p_iterations = iterations; - p_latCenter = p_latCube->getStatistics()->Average() * PI / 180.0; - p_lonCenter = p_lonCube->getStatistics()->Average() * PI / 180.0; + p_latCenter = p_latCube->statistics()->Average() * PI / 180.0; + p_lonCenter = p_lonCube->statistics()->Average() * PI / 180.0; p_radius = p_outmap->LocalRadius(p_latCenter); } @@ -569,11 +569,11 @@ bool nocam2map::Xform(double &inSample, double &inLine, //Create a 2x2 buffer to read the lat and long cubes Portal latPortal(interp.Samples(), interp.Lines(), - p_latCube->getPixelType() , + p_latCube->pixelType() , interp.HotSample(), interp.HotLine()); Portal lonPortal(interp.Samples(), interp.Lines(), - p_lonCube->getPixelType() , + p_lonCube->pixelType() , interp.HotSample(), interp.HotLine()); //Set the buffers positions to the sample/line guess and read from the lat/long cubes @@ -717,8 +717,8 @@ void ComputePixRes() { UserInterface &ui = Application::GetUserInterface(); Cube *latCube = p.SetInputCube("LATCUB"); Cube *lonCube = p.SetInputCube("LONCUB"); - Brick latBrick(1, 1, 1, latCube->getPixelType()); - Brick lonBrick(1, 1, 1, lonCube->getPixelType()); + Brick latBrick(1, 1, 1, latCube->pixelType()); + Brick lonBrick(1, 1, 1, lonCube->pixelType()); latBrick.SetBasePosition(1, 1, 1); latCube->read(latBrick); @@ -728,10 +728,10 @@ void ComputePixRes() { double a = latBrick.at(0) * PI / 180.0; double c = lonBrick.at(0) * PI / 180.0; - latBrick.SetBasePosition(latCube->getSampleCount(), latCube->getLineCount(), 1); + latBrick.SetBasePosition(latCube->sampleCount(), latCube->lineCount(), 1); latCube->read(latBrick); - lonBrick.SetBasePosition(lonCube->getSampleCount(), lonCube->getLineCount(), 1); + lonBrick.SetBasePosition(lonCube->sampleCount(), lonCube->lineCount(), 1); lonCube->read(lonBrick); double b = latBrick.at(0) * PI / 180.0; @@ -740,7 +740,7 @@ void ComputePixRes() { double angle = acos(cos(a) * cos(b) * cos(c - d) + sin(a) * sin(b)); angle *= 180 / PI; - double pixels = sqrt(pow(latCube->getSampleCount() - 1.0, 2.0) + pow(latCube->getLineCount() - 1.0, 2.0)); + double pixels = sqrt(pow(latCube->sampleCount() - 1.0, 2.0) + pow(latCube->lineCount() - 1.0, 2.0)); p.EndProcess(); @@ -790,8 +790,8 @@ void ComputeInputRange() { userMap.Read(ui.GetFileName("MAP")); PvlGroup &userGrp = userMap.FindGroup("Mapping", Pvl::Traverse); - Statistics *latStats = latCub->getStatistics(); - Statistics *lonStats = lonCub->getStatistics(); + Statistics *latStats = latCub->statistics(); + Statistics *lonStats = lonCub->statistics(); double minLat = latStats->Minimum(); double maxLat = latStats->Maximum(); diff --git a/isis/src/base/apps/noisefilter/noisefilter.cpp b/isis/src/base/apps/noisefilter/noisefilter.cpp index 8c847c1f15..bd722e41d4 100644 --- a/isis/src/base/apps/noisefilter/noisefilter.cpp +++ b/isis/src/base/apps/noisefilter/noisefilter.cpp @@ -69,7 +69,7 @@ void IsisMain() { int pixelsReplaced = darkPixelsReplaced + brightPixelsReplaced + specialPixelsReplaced; results += PvlKeyword("TotalPixelsReplaced", toString(pixelsReplaced)); double pct = ((double)pixelsReplaced / - ((double)icube->getSampleCount() * (double)icube->getLineCount())) * 100.; + ((double)icube->sampleCount() * (double)icube->lineCount())) * 100.; pct = (int)(pct * 10.0) / 10.0; results += PvlKeyword("PercentChanged", toString(pct)); Application::Log(results); diff --git a/isis/src/base/apps/noproj/noproj.cpp b/isis/src/base/apps/noproj/noproj.cpp index 76acf9c13c..43f4432fb3 100644 --- a/isis/src/base/apps/noproj/noproj.cpp +++ b/isis/src/base/apps/noproj/noproj.cpp @@ -58,11 +58,11 @@ void IsisMain() { mcube = icube = p.SetInputCube("FROM"); } - Camera *incam = mcube->getCamera(); + Camera *incam = mcube->camera(); // Extract Instrument groups from input labels for the output match and noproj'd cubes - PvlGroup inst = mcube->getGroup("Instrument"); - PvlGroup fromInst = icube->getGroup("Instrument"); + PvlGroup inst = mcube->group("Instrument"); + PvlGroup fromInst = icube->group("Instrument"); QString groupName = (QString) inst["SpacecraftName"] + "/"; groupName += (QString) inst.FindKeyword("InstrumentId"); @@ -85,10 +85,10 @@ void IsisMain() { if(idealGp.HasKeyword("TransY")) transy = idealGp["TransY"]; if(idealGp.HasKeyword("ItransL")) transl = idealGp["ItransL"]; if(idealGp.HasKeyword("ItransS")) transs = idealGp["ItransS"]; - int detectorSamples = mcube->getSampleCount(); + int detectorSamples = mcube->sampleCount(); if(idealGp.HasKeyword("DetectorSamples")) detectorSamples = idealGp["DetectorSamples"]; - int numberLines = mcube->getLineCount(); - int numberBands = mcube->getBandCount(); + int numberLines = mcube->lineCount(); + int numberBands = mcube->bandCount(); if(idealGp.HasKeyword("DetectorLines")) numberLines = idealGp["DetectorLines"]; @@ -149,7 +149,7 @@ void IsisMain() { } // Get the start time for parent line 1 - AlphaCube alpha(*(icube->getLabel())); + AlphaCube alpha(*(icube->label())); double sample = alpha.BetaSample(.5); double line = alpha.BetaLine(.5); incam->SetImage(sample, line); @@ -211,7 +211,7 @@ void IsisMain() { key.SetValue(instType); inst.AddKeyword(key); - Pvl &ocubeLabel = *ocube->getLabel(); + Pvl &ocubeLabel = *ocube->label(); PvlObject *naifKeywordsObject = NULL; if (ocubeLabel.HasObject("NaifKeywords")) { @@ -228,7 +228,7 @@ void IsisMain() { // Clean up the kernels group... delete everything that isn't internalized or the orig frame // code - PvlGroup &kernelsGroup = ocube->getGroup("Kernels"); + PvlGroup &kernelsGroup = ocube->group("Kernels"); for (int keyIndex = kernelsGroup.Keywords() - 1; keyIndex >= 0; keyIndex--) { PvlKeyword &kernelsKeyword = kernelsGroup[keyIndex]; @@ -317,7 +317,7 @@ void IsisMain() { } key.SetName("MatchedCube"); - key.SetValue(mcube->getFileName()); + key.SetValue(mcube->fileName()); inst.AddKeyword(key); ocube->putGroup(inst); @@ -359,7 +359,7 @@ void IsisMain() { Cube toCube; toCube.open(ui.GetFileName("TO"), "rw"); // Extract label and create cube object - Pvl *toLabel = toCube.getLabel(); + Pvl *toLabel = toCube.label(); PvlObject &o = toLabel->FindObject("IsisCube"); o.DeleteGroup("OriginalInstrument"); o.AddGroup(fromInst); @@ -382,7 +382,7 @@ void LoadMatchSummingMode() { // Open the input cube and get the camera object Cube c; c.open(file); - Camera *cam = c.getCamera(); + Camera *cam = c.camera(); ui.Clear("SUMMINGMODE"); ui.PutDouble("SUMMINGMODE", cam->DetectorMap()->SampleScaleFactor()); @@ -425,7 +425,7 @@ void LoadInputSummingMode() { // Open the input cube and get the camera object Cube c; c.open(file); - Camera *cam = c.getCamera(); + Camera *cam = c.camera(); ui.Clear("SUMMINGMODE"); ui.PutDouble("SUMMINGMODE", cam->DetectorMap()->SampleScaleFactor()); diff --git a/isis/src/base/apps/outline/outline.cpp b/isis/src/base/apps/outline/outline.cpp index 26767df7dd..e4d1362769 100644 --- a/isis/src/base/apps/outline/outline.cpp +++ b/isis/src/base/apps/outline/outline.cpp @@ -29,8 +29,8 @@ void IsisMain() { bclear = ui.GetBoolean("CLEAR"); // Allocate space for a work buffer - lastLine = new double[icube->getSampleCount()]; - nl = icube->getLineCount(); + lastLine = new double[icube->sampleCount()]; + nl = icube->lineCount(); // Start the processing p.StartProcess(outline); diff --git a/isis/src/base/apps/pad/pad.cpp b/isis/src/base/apps/pad/pad.cpp index c51639f2c3..535a0e478a 100644 --- a/isis/src/base/apps/pad/pad.cpp +++ b/isis/src/base/apps/pad/pad.cpp @@ -15,9 +15,9 @@ void IsisMain() { // We will be use a mosaic technique so get the size of the input file ProcessMosaic p; Cube *icube = p.SetInputCube("FROM"); - int ins = icube->getSampleCount(); - int inl = icube->getLineCount(); - int inb = icube->getBandCount(); + int ins = icube->sampleCount(); + int inl = icube->lineCount(); + int inb = icube->bandCount(); // Retrieve the padding parameters UserInterface &ui = Application::GetUserInterface(); diff --git a/isis/src/base/apps/pca/pca.cpp b/isis/src/base/apps/pca/pca.cpp index 77efb0a17c..4076af5303 100644 --- a/isis/src/base/apps/pca/pca.cpp +++ b/isis/src/base/apps/pca/pca.cpp @@ -23,7 +23,7 @@ void IsisMain() { ProcessByBrick p; Cube *icube = p.SetInputCube("FROM"); - p.SetBrickSize(128, 128, icube->getBandCount()); + p.SetBrickSize(128, 128, icube->bandCount()); // The output cube with no attributes and real pixel type Isis::CubeAttributeOutput cao; @@ -31,11 +31,11 @@ void IsisMain() { // Start the sample processing if(ui.GetString("MODE") == "TRANSFORM") { - Cube *ocube = p.SetOutputCube(ui.GetAsString("TO"), cao, icube->getSampleCount(), icube->getLineCount(), icube->getBandCount()); - numDimensions = icube->getBandCount(); + Cube *ocube = p.SetOutputCube(ui.GetAsString("TO"), cao, icube->sampleCount(), icube->lineCount(), icube->bandCount()); + numDimensions = icube->bandCount(); pca = Isis::PrincipalComponentAnalysis(numDimensions); ProcessByBrick p2; - p2.SetBrickSize(128, 128, icube->getBandCount()); + p2.SetBrickSize(128, 128, icube->bandCount()); p2.SetInputCube("FROM"); p2.Progress()->SetText("Computing Transform"); p2.StartProcess(PCA); @@ -80,8 +80,8 @@ void IsisMain() { } pca = Isis::PrincipalComponentAnalysis(transform); - Cube *ocube = p.SetOutputCube(ui.GetAsString("TO"), cao, icube->getSampleCount(), icube->getLineCount(), numDimensions); - Pvl *label = ocube->getLabel(); + Cube *ocube = p.SetOutputCube(ui.GetAsString("TO"), cao, icube->sampleCount(), icube->lineCount(), numDimensions); + Pvl *label = ocube->label(); // remove the transform matrix table from the cube for(int i = 0; i < label->Objects(); i++) { if(label->Object(i).HasKeyword("Name") diff --git a/isis/src/base/apps/percent/percent.cpp b/isis/src/base/apps/percent/percent.cpp index 905891d878..cab3c08dac 100644 --- a/isis/src/base/apps/percent/percent.cpp +++ b/isis/src/base/apps/percent/percent.cpp @@ -32,7 +32,7 @@ void IsisMain() { for(int i = 0; i < tokens.size(); i++) { double percentage = toDouble(tokens[i]); // Obtain the Histogram and the value at the percentage - Histogram *hist = icube->getHistogram(); + Histogram *hist = icube->histogram(); double value = hist->Percent(percentage); kwPercent += toString(percentage); kwValue += toString(value); diff --git a/isis/src/base/apps/phocube/phocube.cpp b/isis/src/base/apps/phocube/phocube.cpp index d06522ad04..9de4683d93 100644 --- a/isis/src/base/apps/phocube/phocube.cpp +++ b/isis/src/base/apps/phocube/phocube.cpp @@ -81,7 +81,7 @@ void IsisMain() { if(noCamera) { try { - proj = icube->getProjection(); + proj = icube->projection(); } catch(IException &e) { QString msg = "Mosaic files must contain mapping labels"; @@ -90,7 +90,7 @@ void IsisMain() { } else { try { - cam = icube->getCamera(); + cam = icube->camera(); } catch(IException &e) { QString msg = "Input file needs to have spiceinit run on it - if this file "; @@ -150,7 +150,7 @@ void IsisMain() { } // Retrieve the orignal values from the input cube band - PvlGroup &mybb = icube->getGroup("BandBin"); + PvlGroup &mybb = icube->group("BandBin"); QString bname("DN"); if ( mybb.HasKeyword("Name") ) { bname = mybb["Name"][0]; @@ -186,8 +186,8 @@ void IsisMain() { // 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->getSampleCount(), - icube->getLineCount(), nbands); + Cube *ocube = p.SetOutputCube("TO", icube->sampleCount(), + icube->lineCount(), nbands); p.SetBrickSize(64, 64, nbands); if (dn) { @@ -205,7 +205,7 @@ void IsisMain() { // Add the bandbin group to the output label. If a BandBin group already // exists, remove all existing keywords and add the keywords for this app. // Otherwise, just put the group in. - PvlObject &cobj = ocube->getLabel()->FindObject("IsisCube"); + PvlObject &cobj = ocube->label()->FindObject("IsisCube"); if(!cobj.HasGroup("BandBin")) { cobj.AddGroup(PvlGroup("BandBin")); } diff --git a/isis/src/base/apps/phohillier/Hillier.cpp b/isis/src/base/apps/phohillier/Hillier.cpp index f2713c870a..70b9ef0358 100644 --- a/isis/src/base/apps/phohillier/Hillier.cpp +++ b/isis/src/base/apps/phohillier/Hillier.cpp @@ -49,7 +49,7 @@ namespace Isis { * @param cube Input cube file */ Hillier::Hillier(PvlObject &pvl, Cube &cube) { - _camera = cube.getCamera(); + _camera = cube.camera(); init(pvl, cube); } /** @@ -331,10 +331,10 @@ namespace Isis { ++algo; } - Pvl *label = cube.getLabel(); + Pvl *label = cube.label(); PvlKeyword center = label->FindGroup("BandBin", Pvl::Traverse)["Center"]; QString errs(""); - for(int i = 0; i < cube.getBandCount() ; i++) { + for(int i = 0; i < cube.bandCount() ; i++) { Parameters parms = findParameters(toDouble(center[i])); if(parms.IsValid()) { parms.band = i + 1; diff --git a/isis/src/base/apps/photomet/photomet.cpp b/isis/src/base/apps/photomet/photomet.cpp index 55383928cb..7f4673aa41 100644 --- a/isis/src/base/apps/photomet/photomet.cpp +++ b/isis/src/base/apps/photomet/photomet.cpp @@ -1763,7 +1763,7 @@ void IsisMain() { angleSource == "CENTER_FROM_IMAGE") { // Set up the input cube icube = p.SetInputCube("FROM"); - cam = icube->getCamera(); + cam = icube->camera(); } else { p.SetInputCube("FROM"); diff --git a/isis/src/base/apps/photrim/photrim.cpp b/isis/src/base/apps/photrim/photrim.cpp index b413041897..e86d8b1e51 100644 --- a/isis/src/base/apps/photrim/photrim.cpp +++ b/isis/src/base/apps/photrim/photrim.cpp @@ -25,7 +25,7 @@ void IsisMain() { // Setup the input and get the camera model icube = p.SetInputCube("FROM"); - cam = icube->getCamera(); + cam = icube->camera(); // Create the output cube p.SetOutputCube("TO"); @@ -52,7 +52,7 @@ void photrim(Buffer &in, Buffer &out) { // See if there is a change in band which would change the camera model if(in.Band() != lastBand) { lastBand = in.Band(); - cam->SetBand(icube->getPhysicalBand(lastBand)); + cam->SetBand(icube->physicalBand(lastBand)); } // Loop for each pixel in the line. diff --git a/isis/src/base/apps/reduce/reduce.cpp b/isis/src/base/apps/reduce/reduce.cpp index a8a41e41b9..abc70451a2 100644 --- a/isis/src/base/apps/reduce/reduce.cpp +++ b/isis/src/base/apps/reduce/reduce.cpp @@ -34,9 +34,9 @@ void IsisMain() { QString from = ui.GetFileName("FROM"); inCube.open(from); - ins = inCube.getSampleCount(); - inl = inCube.getLineCount(); - inb = inCube.getBandCount(); + ins = inCube.sampleCount(); + inl = inCube.lineCount(); + inb = inCube.bandCount(); QString alg = ui.GetString("ALGORITHM"); double vper = ui.GetDouble("VALIDPER") / 100.; diff --git a/isis/src/base/apps/remrx/remrx.cpp b/isis/src/base/apps/remrx/remrx.cpp index b1d21697fc..8a78544a36 100644 --- a/isis/src/base/apps/remrx/remrx.cpp +++ b/isis/src/base/apps/remrx/remrx.cpp @@ -25,7 +25,7 @@ void IsisMain() { // Setup the input and output cubes Cube *icube = p.SetInputCube("FROM"); - PvlKeyword &status = icube->getGroup("RESEAUS")["STATUS"]; + PvlKeyword &status = icube->group("RESEAUS")["STATUS"]; UserInterface &ui = Application::GetUserInterface(); QString in = ui.GetFileName("FROM"); @@ -62,7 +62,7 @@ void IsisMain() { Cube cube; cube.open(out, "rw"); - PvlGroup &res = cube.getLabel()->FindGroup("RESEAUS", Pvl::Traverse); + PvlGroup &res = cube.label()->FindGroup("RESEAUS", Pvl::Traverse); // Get reseau line, sample, type, and valid Keywords PvlKeyword lines = res.FindKeyword("LINE"); @@ -71,7 +71,7 @@ void IsisMain() { PvlKeyword valid = res.FindKeyword("VALID"); int numres = lines.Size(); - Brick brick(sdim, ldim, 1, cube.getPixelType()); + Brick brick(sdim, ldim, 1, cube.pixelType()); for(int res = 0; res < numres; res++) { if((resvalid == 0 || toInt(valid[res]) == 1) && toInt(type[res]) != 0) { int baseSamp = (int)(toDouble(samps[res]) + 0.5) - (sdim / 2); diff --git a/isis/src/base/apps/rgb2hsv/rgb2hsv.cpp b/isis/src/base/apps/rgb2hsv/rgb2hsv.cpp index a9f8dfeedb..c2b3c45316 100644 --- a/isis/src/base/apps/rgb2hsv/rgb2hsv.cpp +++ b/isis/src/base/apps/rgb2hsv/rgb2hsv.cpp @@ -34,9 +34,9 @@ void IsisMain() { // Automatic is selected if(ui.GetString("MODE") == "AUTOMATIC") { - Histogram *redHist = redCube->getHistogram(); - Histogram *greenHist = greenCube->getHistogram(); - Histogram *blueHist = blueCube->getHistogram(); + Histogram *redHist = redCube->histogram(); + Histogram *greenHist = greenCube->histogram(); + Histogram *blueHist = blueCube->histogram(); rMin = redHist->Percent(ui.GetDouble("RMINPER")); rMax = redHist->Percent(ui.GetDouble("RMAXPER")); diff --git a/isis/src/base/apps/rotate/rotate.cpp b/isis/src/base/apps/rotate/rotate.cpp index 0520f06878..d94846c79e 100644 --- a/isis/src/base/apps/rotate/rotate.cpp +++ b/isis/src/base/apps/rotate/rotate.cpp @@ -14,7 +14,7 @@ void IsisMain() { // Set up the transform object UserInterface &ui = Application::GetUserInterface(); - Transform *transform = new Rotate(icube->getSampleCount(), icube->getLineCount(), + Transform *transform = new Rotate(icube->sampleCount(), icube->lineCount(), ui.GetDouble("DEGREES")); // Determine the output size @@ -22,7 +22,7 @@ void IsisMain() { int lines = transform->OutputLines(); // Allocate the output file - p.SetOutputCube("TO", samples, lines, icube->getBandCount()); + p.SetOutputCube("TO", samples, lines, icube->bandCount()); // Set up the interpolator Interpolator *interp; diff --git a/isis/src/base/apps/segment/segment.cpp b/isis/src/base/apps/segment/segment.cpp index 736d326f68..0cbf83648b 100644 --- a/isis/src/base/apps/segment/segment.cpp +++ b/isis/src/base/apps/segment/segment.cpp @@ -28,14 +28,14 @@ void IsisMain() { int cropNum = 1; int startLine = 1; bool hasReachedEndOfCube = false; - while(startLine <= cube.getLineCount() && not hasReachedEndOfCube) { + while(startLine <= cube.lineCount() && not hasReachedEndOfCube) { //! Sets up the proper paramaters for running the crop program QString parameters = "FROM=" + inFile.expanded() + " TO=" + inFile.path() + "/" + inFile.baseName() + ".segment" + toString(cropNum) + ".cub" + " LINE=" + toString(startLine) + " NLINES="; - if(startLine + numberOfLines > cube.getLineCount()) { - parameters += toString(cube.getLineCount() - (startLine - 1)); + if(startLine + numberOfLines > cube.lineCount()) { + parameters += toString(cube.lineCount() - (startLine - 1)); hasReachedEndOfCube = true; } else { diff --git a/isis/src/base/apps/shade/shade.cpp b/isis/src/base/apps/shade/shade.cpp index d9abb7c12f..141137deae 100644 --- a/isis/src/base/apps/shade/shade.cpp +++ b/isis/src/base/apps/shade/shade.cpp @@ -47,8 +47,8 @@ void IsisMain() { pixelResolution = ui.GetDouble("PIXELRESOL"); } else { - if(inCube->getLabel()->FindObject("IsisCube").HasGroup("Mapping")) { - pixelResolution = inCube->getLabel()->FindObject("IsisCube").FindGroup("Mapping")["PixelResolution"]; + if(inCube->label()->FindObject("IsisCube").HasGroup("Mapping")) { + pixelResolution = inCube->label()->FindObject("IsisCube").FindGroup("Mapping")["PixelResolution"]; } else { QString msg = "The file [" + ui.GetFileName("FROM") + "] does not have a mapping group," diff --git a/isis/src/base/apps/sigmastretch/sigmastretch.cpp b/isis/src/base/apps/sigmastretch/sigmastretch.cpp index f42be0d2a8..14013e34ab 100644 --- a/isis/src/base/apps/sigmastretch/sigmastretch.cpp +++ b/isis/src/base/apps/sigmastretch/sigmastretch.cpp @@ -18,7 +18,7 @@ class BandStretch { BandStretch(Cube *cube, int band, double variance) { m_variance = variance; - Statistics *stats = cube->getStatistics(band); + Statistics *stats = cube->statistics(band); m_average = stats->Average(); m_standardDeviation = stats->StandardDeviation(); delete stats; @@ -73,7 +73,7 @@ void IsisMain() { SigmaStretcher stretcher; double variance = Application::GetUserInterface().GetDouble("VARIANCE"); - for (int i = 1; i <= cube->getBandCount(); i++) + for (int i = 1; i <= cube->bandCount(); i++) stretcher.addStretch(new BandStretch(cube, i, variance)); p.ProcessCube(stretcher); diff --git a/isis/src/base/apps/skymap/skymap.cpp b/isis/src/base/apps/skymap/skymap.cpp index d1065d4f74..63de2161dc 100644 --- a/isis/src/base/apps/skymap/skymap.cpp +++ b/isis/src/base/apps/skymap/skymap.cpp @@ -77,7 +77,7 @@ void IsisMain() { // Open the input cube, get the camera object, and the cam map projection // Note: The default target info is positive west, planetocentric, 360 icube = p.SetInputCube("FROM"); - incam = icube->getCamera(); + incam = icube->camera(); // Pvl lab(ui.GetFileName("FROM")); // PvlGroup &inst = lab.FindGroup("Instrument",Pvl::Traverse); @@ -136,14 +136,14 @@ void IsisMain() { // Create the transform object which maps // output line/samp -> output lat/lon (dec/ra) -> input line/samp - Transform *xform = new sky2map(icube->getSampleCount(), icube->getLineCount(), incam, + Transform *xform = new sky2map(icube->sampleCount(), icube->lineCount(), incam, samples, lines, proj, ui.GetBoolean("Trim")); // Create the output cube and add the projection group Cube *ocube = p.SetOutputCube("TO", xform->OutputSamples(), xform->OutputLines(), - icube->getBandCount()); + icube->bandCount()); ocube->putGroup(userGrp); // Set up the interpolator @@ -167,8 +167,8 @@ void IsisMain() { // See if center of input image projects. If it does, force tile // containing this center to be processed in ProcessRubberSheet. - double centerSamp = icube->getSampleCount() / 2.; - double centerLine = icube->getLineCount() / 2.; + double centerSamp = icube->sampleCount() / 2.; + double centerLine = icube->lineCount() / 2.; incam->SetImage(centerSamp, centerLine); if(proj->SetGround(incam->Declination(), incam->RightAscension())) { @@ -178,14 +178,14 @@ void IsisMain() { // Create an alpha cube group for the output cube if(!ocube->hasGroup("AlphaCube")) { PvlGroup alpha("AlphaCube"); - alpha += PvlKeyword("AlphaSamples", toString(icube->getSampleCount())); - alpha += PvlKeyword("AlphaLines", toString(icube->getLineCount())); + alpha += PvlKeyword("AlphaSamples", toString(icube->sampleCount())); + alpha += PvlKeyword("AlphaLines", toString(icube->lineCount())); alpha += PvlKeyword("AlphaStartingSample", toString(0.5)); alpha += PvlKeyword("AlphaStartingLine", toString(0.5)); - alpha += PvlKeyword("AlphaEndingSample", toString(icube->getSampleCount() + 0.5)); - alpha += PvlKeyword("AlphaEndingLine", toString(icube->getLineCount() + 0.5)); - alpha += PvlKeyword("BetaSamples", toString(icube->getSampleCount())); - alpha += PvlKeyword("BetaLines", toString(icube->getLineCount())); + alpha += PvlKeyword("AlphaEndingSample", toString(icube->sampleCount() + 0.5)); + alpha += PvlKeyword("AlphaEndingLine", toString(icube->lineCount() + 0.5)); + alpha += PvlKeyword("BetaSamples", toString(icube->sampleCount())); + alpha += PvlKeyword("BetaLines", toString(icube->lineCount())); ocube->putGroup(alpha); } @@ -302,7 +302,7 @@ void LoadCameraRes() { // Open the input cube, get the camera object, and the cam map projection Cube c; c.open(ui.GetFileName("FROM")); - Camera *cam = c.getCamera(); + Camera *cam = c.camera(); double res = cam->RaDecResolution(); ui.Clear("SCALE"); @@ -360,7 +360,7 @@ void LoadCameraRange() { // Open the input cube, get the camera object, and the cam map projection Cube c; c.open(ui.GetFileName("FROM")); - Camera *cam = c.getCamera(); + Camera *cam = c.camera(); // Make the target info match the user mapfile double minra, maxra, mindec, maxdec; diff --git a/isis/src/base/apps/skypt/skypt.cpp b/isis/src/base/apps/skypt/skypt.cpp index 4164608597..7767e052fb 100644 --- a/isis/src/base/apps/skypt/skypt.cpp +++ b/isis/src/base/apps/skypt/skypt.cpp @@ -16,7 +16,7 @@ void IsisMain() { QString channel = ui.GetFileName("FROM"); Cube cube; cube.open(channel); - Camera *cam = cube.getCamera(); + Camera *cam = cube.camera(); // Get the type of conversion that we are doing QString type = ui.GetString("TYPE"); @@ -42,7 +42,7 @@ void IsisMain() { } // Create Brick on samp, line to get the dn value of the pixel - Brick b(3, 3, 1, cube.getPixelType()); + Brick b(3, 3, 1, cube.pixelType()); int intSamp = (int)(samp + 0.5); int intLine = (int)(line + 0.5); b.SetBasePosition(intSamp, intLine, 1); diff --git a/isis/src/base/apps/skyrange/skyrange.cpp b/isis/src/base/apps/skyrange/skyrange.cpp index cfd048c7e2..4186d36922 100644 --- a/isis/src/base/apps/skyrange/skyrange.cpp +++ b/isis/src/base/apps/skyrange/skyrange.cpp @@ -12,7 +12,7 @@ void IsisMain() { // Set the input image, get the camera model Process p; Cube *icube = p.SetInputCube("FROM"); - Camera *cam = icube->getCamera(); + Camera *cam = icube->camera(); // Get the ra/dec range and resolution double minRa, maxRa, minDec, maxDec; @@ -20,14 +20,14 @@ void IsisMain() { double res = cam->RaDecResolution(); // Get the center ra/dec - cam->SetImage(icube->getSampleCount() / 2.0, icube->getLineCount() / 2.0); + cam->SetImage(icube->sampleCount() / 2.0, icube->lineCount() / 2.0); double centerRa = cam->RightAscension(); double centerDec = cam->Declination(); // Compute the rotation cam->SetRightAscensionDeclination(centerRa, centerDec + 2.0 * res); - double x = cam->Sample() - icube->getSampleCount() / 2.0; - double y = cam->Line() - icube->getLineCount() / 2.0; + double x = cam->Sample() - icube->sampleCount() / 2.0; + double y = cam->Line() - icube->lineCount() / 2.0; double rot = atan2(-y, x) * 180.0 / Isis::PI; rot = 90.0 - rot; if(rot < 0.0) rot += 360.0; @@ -47,8 +47,8 @@ void IsisMain() { // Setup and log orientation PvlGroup orient("Orientation"); - orient += PvlKeyword("CenterSample", toString(icube->getSampleCount() / 2.0)); - orient += PvlKeyword("CenterLine", toString(icube->getLineCount() / 2.0)); + orient += PvlKeyword("CenterSample", toString(icube->sampleCount() / 2.0)); + orient += PvlKeyword("CenterLine", toString(icube->lineCount() / 2.0)); orient += PvlKeyword("CenterRightAscension", toString(centerRa), "degrees"); orient += PvlKeyword("CenterDeclination", toString(centerDec), "degrees"); orient += PvlKeyword("CelestialNorthClockAngle", toString(rot), "degrees"); diff --git a/isis/src/base/apps/smtk/smtk.cpp b/isis/src/base/apps/smtk/smtk.cpp index 0565a2548c..05a6d4bd87 100644 --- a/isis/src/base/apps/smtk/smtk.cpp +++ b/isis/src/base/apps/smtk/smtk.cpp @@ -111,7 +111,7 @@ void IsisMain() { rhImage.open(ui.GetFileName("MATCH"),"r"); // Ensure only single bands - if (lhImage.getBandCount() != 1 || rhImage.getBandCount() != 1) { + if (lhImage.bandCount() != 1 || rhImage.bandCount() != 1) { QString msg = "Input Cubes must have only one band!"; throw IException(IException::User,msg,_FILEINFO_); } @@ -122,8 +122,8 @@ void IsisMain() { Camera *lhCamera = NULL; Camera *rhCamera = NULL; try { - lhCamera = lhImage.getCamera(); - rhCamera = rhImage.getCamera(); + lhCamera = lhImage.camera(); + rhCamera = rhImage.camera(); } catch (IException &ie) { QString msg = "Both input images must have a camera"; @@ -141,8 +141,8 @@ void IsisMain() { // This still precludes band to band registrations. if (serialLeft == serialRight) { - QString sLeft = FileName(lhImage.getFileName()).name(); - QString sRight = FileName(rhImage.getFileName()).name(); + QString sLeft = FileName(lhImage.fileName()).name(); + QString sRight = FileName(rhImage.fileName()).name(); if (sLeft == sRight) { QString msg = "Cube Serial Numbers must be unique - FROM=" + serialLeft + ", MATCH=" + serialRight; @@ -155,8 +155,8 @@ void IsisMain() { Progress prog; prog.SetText("Finding Initial Seeds"); - int nl = lhImage.getLineCount(); - int ns = lhImage.getSampleCount(); + int nl = lhImage.lineCount(); + int ns = lhImage.sampleCount(); BigInt numAttemptedInitialPoints = 0; // Declare Gruen matcher @@ -217,8 +217,8 @@ void IsisMain() { else { // We want to create a grid of control points that is N rows by M columns. - int rows = (lhImage.getLineCount() + linc - 1)/linc; - int cols = (lhImage.getSampleCount() + sinc - 1)/sinc; + int rows = (lhImage.lineCount() + linc - 1)/linc; + int cols = (lhImage.sampleCount() + sinc - 1)/sinc; prog.SetMaximumSteps(rows * cols); prog.CheckStatus(); @@ -413,8 +413,8 @@ void IsisMain() { cout << "\nCreating output DEM from " << bmf.size() << " points.\n"; Process p; Cube *icube = p.SetInputCube("FROM"); - Cube *ocube = p.SetOutputCube("TO", icube->getSampleCount(), - icube->getLineCount(), 3); + Cube *ocube = p.SetOutputCube("TO", icube->sampleCount(), + icube->lineCount(), 3); p.ClearInputCubes(); int boxsize = ui.GetInteger("BOXSIZE"); @@ -463,7 +463,7 @@ void IsisMain() { center.AddValue("1.0"); center.AddValue("1.0"); - PvlGroup &bandbin = ocube->getLabel()->FindGroup("BandBin", PvlObject::Traverse); + PvlGroup &bandbin = ocube->label()->FindGroup("BandBin", PvlObject::Traverse); bandbin.AddKeyword(filter, PvlContainer::Replace); bandbin.AddKeyword(center, PvlContainer::Replace); center.SetName("Width"); diff --git a/isis/src/base/apps/specdivfilter/specdivfilter.cpp b/isis/src/base/apps/specdivfilter/specdivfilter.cpp index d8887f00db..ea0aa67dfa 100644 --- a/isis/src/base/apps/specdivfilter/specdivfilter.cpp +++ b/isis/src/base/apps/specdivfilter/specdivfilter.cpp @@ -21,14 +21,14 @@ void IsisMain() { //Obtain input cube, get bands dimension from input cube and user input number bands Cube *icube = p.SetInputCube("FROM"); - int maxBands = (2 * icube->getBandCount()) - 1; + int maxBands = (2 * icube->bandCount()) - 1; UserInterface &ui = Application::GetUserInterface(); bands = ui.GetInteger("BANDS"); //Check for cases of too many bands if(bands > maxBands) { QString msg = "Parameter bands [" + toString(bands) + "] exceeds maximum allowable size " - + "of [" + toString(maxBands) + "] for cube [" + icube->getFileName() + "]"; + + "of [" + toString(maxBands) + "] for cube [" + icube->fileName() + "]"; throw IException(IException::User, msg, _FILEINFO_); } diff --git a/isis/src/base/apps/spechighpass/spechighpass.cpp b/isis/src/base/apps/spechighpass/spechighpass.cpp index 14a71b2bac..91185ffa4e 100644 --- a/isis/src/base/apps/spechighpass/spechighpass.cpp +++ b/isis/src/base/apps/spechighpass/spechighpass.cpp @@ -22,7 +22,7 @@ void IsisMain() { //Obtain input cube, get bands dimension from input cube and user input number bands Cube *icube = p.SetInputCube("FROM"); - int cubeBands = icube->getBandCount(); + int cubeBands = icube->bandCount(); UserInterface &ui = Application::GetUserInterface(); bands = ui.GetInteger("BANDS"); @@ -31,7 +31,7 @@ void IsisMain() { QString msg = "Parameter bands [" + QString(bands) + "] " "exceeds maximum allowable size of [" + QString((cubeBands * 2) - 1) + "] for cube [" - + icube->getFileName() + "]"; + + icube->fileName() + "]"; throw IException(IException::User, msg, _FILEINFO_); } diff --git a/isis/src/base/apps/speclowpass/speclowpass.cpp b/isis/src/base/apps/speclowpass/speclowpass.cpp index 8ebde9ce7c..ab475f1284 100644 --- a/isis/src/base/apps/speclowpass/speclowpass.cpp +++ b/isis/src/base/apps/speclowpass/speclowpass.cpp @@ -20,14 +20,14 @@ void IsisMain() { // Obtain input cube, get bands dimension from input cube and user input number bands Cube *icube = p.SetInputCube("FROM"); - int maxBands = (2 * icube->getBandCount()) - 1; + int maxBands = (2 * icube->bandCount()) - 1; UserInterface &ui = Application::GetUserInterface(); bands = ui.GetInteger("BANDS"); // Check for cases of too many bands if(bands > maxBands) { QString msg = "Parameter bands [" + toString(bands) + "] exceeds maximum allowable size " - + "of [" + toString(maxBands) + "] for cube [" + icube->getFileName() + "]"; + + "of [" + toString(maxBands) + "] for cube [" + icube->fileName() + "]"; throw IException(IException::User, msg, _FILEINFO_); } diff --git a/isis/src/base/apps/spicefit/spicefit.cpp b/isis/src/base/apps/spicefit/spicefit.cpp index 9c017be2af..b09f111100 100644 --- a/isis/src/base/apps/spicefit/spicefit.cpp +++ b/isis/src/base/apps/spicefit/spicefit.cpp @@ -16,12 +16,12 @@ void IsisMain() { cube.open(ui.GetFileName("FROM"), "rw"); //check for existing polygon, if exists delete it - if(cube.getLabel()->HasObject("Polygon")) { - cube.getLabel()->DeleteObject("Polygon"); + if(cube.label()->HasObject("Polygon")) { + cube.label()->DeleteObject("Polygon"); } // Get the camera, interpolate to a parabola - Camera *cam = cube.getCamera(); + Camera *cam = cube.camera(); if(cam->DetectorMap()->LineRate() == 0.0) { QString msg = "[" + ui.GetFileName("FROM") + "] is not a line scan camera"; throw IException(IException::User, msg, _FILEINFO_); @@ -31,7 +31,7 @@ void IsisMain() { // Get the instrument pointing keyword from the kernels group and update // its value to table. Isis::PvlGroup kernels = - cube.getLabel()->FindGroup("Kernels", Isis::Pvl::Traverse); + cube.label()->FindGroup("Kernels", Isis::Pvl::Traverse); // Save original kernels in keyword before changing to "Table" in the kernels group PvlKeyword origCk = kernels["InstrumentPointing"]; diff --git a/isis/src/base/apps/spiceinit/spiceinit.cpp b/isis/src/base/apps/spiceinit/spiceinit.cpp index 5603f302de..7c3125410c 100644 --- a/isis/src/base/apps/spiceinit/spiceinit.cpp +++ b/isis/src/base/apps/spiceinit/spiceinit.cpp @@ -50,7 +50,7 @@ void IsisMain() { // Make sure it is not projected Projection *proj = NULL; try { - proj = icube->getProjection(); + proj = icube->projection(); } catch(IException &) { proj = NULL; @@ -61,11 +61,11 @@ void IsisMain() { throw IException(IException::User, msg, _FILEINFO_); } - Pvl lab = *icube->getLabel(); + Pvl lab = *icube->label(); // if cube has existing polygon delete it - if (icube->getLabel()->HasObject("Polygon")) { - icube->getLabel()->DeleteObject("Polygon"); + if (icube->label()->HasObject("Polygon")) { + icube->label()->DeleteObject("Polygon"); } // Set up for getting the mission name @@ -80,7 +80,7 @@ void IsisMain() { QString mission = missionXlater.Translate("MissionName"); if (ui.GetBoolean("WEB")) { - RequestSpice(icube, *icube->getLabel(), mission); + RequestSpice(icube, *icube->label(), mission); } else { // Get system base kernels @@ -209,7 +209,7 @@ bool TryKernels(Cube *icube, Process &p, Kernel fk, Kernel ik, Kernel sclk, Kernel spk, Kernel iak, Kernel dem, Kernel exk) { - Pvl lab = *icube->getLabel(); + Pvl lab = *icube->label(); // Add the new kernel files to the existing kernels group PvlKeyword lkKeyword("LeapSecond"); @@ -254,7 +254,7 @@ bool TryKernels(Cube *icube, Process &p, exkKeyword.AddValue(exk[i]); } - PvlGroup originalKernels = icube->getGroup("Kernels"); + PvlGroup originalKernels = icube->group("Kernels"); PvlGroup currentKernels = originalKernels; currentKernels.AddKeyword(lkKeyword, Pvl::Replace); currentKernels.AddKeyword(pckKeyword, Pvl::Replace); @@ -324,7 +324,7 @@ bool TryKernels(Cube *icube, Process &p, try { Camera *cam; try { - cam = icube->getCamera(); + cam = icube->camera(); Application::Log(currentKernels); } catch(IException &e) { @@ -397,7 +397,7 @@ bool TryKernels(Cube *icube, Process &p, icube->putGroup(currentKernels); - Pvl *label = icube->getLabel(); + Pvl *label = icube->label(); int i = 0; while (i < label->Objects()) { PvlObject currObj = label->Object(i); @@ -409,11 +409,11 @@ bool TryKernels(Cube *icube, Process &p, } } - *icube->getLabel() += cam->getStoredNaifKeywords(); + *icube->label() += cam->getStoredNaifKeywords(); } //modify Kernels group only else { - Pvl *label = icube->getLabel(); + Pvl *label = icube->label(); int i = 0; while (i < label->Objects()) { PvlObject currObj = label->Object(i); @@ -536,7 +536,7 @@ void RequestSpice(Cube *icube, Pvl &labels, QString missionName) { Application::Log(logGrp); icube->putGroup(kernelsGroup); - icube->getLabel()->AddObject(naifKeywords); + icube->label()->AddObject(naifKeywords); icube->write(*pointingTable); icube->write(*positionTable); @@ -544,7 +544,7 @@ void RequestSpice(Cube *icube, Pvl &labels, QString missionName) { icube->write(*sunPosTable); try { - icube->getCamera(); + icube->camera(); } catch (IException &e) { throw IException(e, IException::Unknown, diff --git a/isis/src/base/apps/spkwriter/SpiceSegment.cpp b/isis/src/base/apps/spkwriter/SpiceSegment.cpp index 2d7ce93f55..50e4b5b6c2 100644 --- a/isis/src/base/apps/spkwriter/SpiceSegment.cpp +++ b/isis/src/base/apps/spkwriter/SpiceSegment.cpp @@ -109,7 +109,7 @@ void SpiceSegment::init(Cube &cube) { _kernels.UnLoad(); // Unload all active, owned kernels init(); // Init local variables - _fname = cube.getFileName(); + _fname = cube.fileName(); // Extract ISIS CK blob and transform to CK 3 content NaifStatus::CheckErrors(); @@ -118,9 +118,9 @@ void SpiceSegment::init(Cube &cube) { // Order is somewhat important here. The call to initialize Kernels // object checks the NAIF pool for existance. It logs their NAIF // status as loaded which may cause trouble from here on... - Pvl *label = cube.getLabel(); + Pvl *label = cube.label(); _kernels.Init(*label); - Camera *camera = cube.getCamera(); + Camera *camera = cube.camera(); // Determine segment ID from product ID if it exists, otherwise basename if ( _name.isEmpty() ) { diff --git a/isis/src/base/apps/spkwriter/SpkSegment.cpp b/isis/src/base/apps/spkwriter/SpkSegment.cpp index a579e0bd31..4667c1fbe2 100644 --- a/isis/src/base/apps/spkwriter/SpkSegment.cpp +++ b/isis/src/base/apps/spkwriter/SpkSegment.cpp @@ -95,7 +95,7 @@ void SpkSegment::import(Cube &cube) { NaifStatus::CheckErrors(); try { - Camera *camera(cube.getCamera()); + Camera *camera(cube.camera()); Kernels kernels = getKernels(); // Load necessary kernels and id frames diff --git a/isis/src/base/apps/stats/stats.cpp b/isis/src/base/apps/stats/stats.cpp index d50059a21a..1f96ddfe24 100644 --- a/isis/src/base/apps/stats/stats.cpp +++ b/isis/src/base/apps/stats/stats.cpp @@ -34,15 +34,15 @@ void IsisMain() { Pvl mainpvl; // Get the number of bands to process - int bandcount = icube->getBandCount(); + int bandcount = icube->bandCount(); for (int i = 1; i <= bandcount; i++) { - Histogram *stats = icube->getHistogram(i, validMin, validMax); + Histogram *stats = icube->histogram(i, validMin, validMax); // Construct a label with the results PvlGroup results("Results"); - results += PvlKeyword("From", icube->getFileName()); - results += PvlKeyword("Band", toString(icube->getPhysicalBand(i))); + results += PvlKeyword("From", icube->fileName()); + results += PvlKeyword("Band", toString(icube->physicalBand(i))); if(stats->ValidPixels() != 0) { results += PvlKeyword("Average", toString(stats->Average())); results += PvlKeyword("StandardDeviation", toString(stats->StandardDeviation())); diff --git a/isis/src/base/apps/stretch/stretch.cpp b/isis/src/base/apps/stretch/stretch.cpp index 6f9bd4d240..b22219f6bd 100644 --- a/isis/src/base/apps/stretch/stretch.cpp +++ b/isis/src/base/apps/stretch/stretch.cpp @@ -43,7 +43,7 @@ void IsisMain() { } if(ui.GetBoolean("USEPERCENTAGES")) - str.Parse(pairs, inCube->getHistogram()); + str.Parse(pairs, inCube->histogram()); else str.Parse(pairs); diff --git a/isis/src/base/apps/translate/translate.cpp b/isis/src/base/apps/translate/translate.cpp index afeb35bf84..8c861a224b 100644 --- a/isis/src/base/apps/translate/translate.cpp +++ b/isis/src/base/apps/translate/translate.cpp @@ -14,12 +14,12 @@ void IsisMain() { // Set up the transform object UserInterface &ui = Application::GetUserInterface(); - Transform *transform = new Translate(icube->getSampleCount(), icube->getLineCount(), + Transform *transform = new Translate(icube->sampleCount(), icube->lineCount(), ui.GetDouble("STRANS"), ui.GetDouble("LTRANS")); // Allocate the output file, same size as input - p.SetOutputCube("TO", icube->getSampleCount(), icube->getLineCount(), icube->getBandCount()); + p.SetOutputCube("TO", icube->sampleCount(), icube->lineCount(), icube->bandCount()); // Set up the interpolator Interpolator *interp; diff --git a/isis/src/base/apps/trim/trim.cpp b/isis/src/base/apps/trim/trim.cpp index 2edb2443e7..e7ebba166f 100644 --- a/isis/src/base/apps/trim/trim.cpp +++ b/isis/src/base/apps/trim/trim.cpp @@ -33,8 +33,8 @@ void IsisMain() { } // Adjust bottom and right - bottom = icube->getLineCount() - bottom; - rright = icube->getSampleCount() - rright; + bottom = icube->lineCount() - bottom; + rright = icube->sampleCount() - rright; // Start the processing p.StartProcess(trim); diff --git a/isis/src/base/objs/BandManager/BandManager.cpp b/isis/src/base/objs/BandManager/BandManager.cpp index 871c2d853f..0d2afa9cf0 100644 --- a/isis/src/base/objs/BandManager/BandManager.cpp +++ b/isis/src/base/objs/BandManager/BandManager.cpp @@ -40,9 +40,9 @@ namespace Isis { */ BandManager::BandManager(const Isis::Cube &cube, const bool reverse) : - Isis::BufferManager(cube.getSampleCount(), cube.getLineCount(), - cube.getBandCount(), 1, 1, cube.getBandCount(), - cube.getPixelType(), reverse) { + Isis::BufferManager(cube.sampleCount(), cube.lineCount(), + cube.bandCount(), 1, 1, cube.bandCount(), + cube.pixelType(), reverse) { } /** diff --git a/isis/src/base/objs/BoxcarCachingAlgorithm/BoxcarCachingAlgorithm.cpp b/isis/src/base/objs/BoxcarCachingAlgorithm/BoxcarCachingAlgorithm.cpp index 2e2cd176b6..e4b737d9e7 100644 --- a/isis/src/base/objs/BoxcarCachingAlgorithm/BoxcarCachingAlgorithm.cpp +++ b/isis/src/base/objs/BoxcarCachingAlgorithm/BoxcarCachingAlgorithm.cpp @@ -85,7 +85,7 @@ namespace Isis { QListIterator allocatedIterator(allocated); while (allocatedIterator.hasNext()) { RawCubeChunk *chunk = allocatedIterator.next(); - int currentEnd = chunk->getStartLine() + chunk->getLineCount() - 1; + int currentEnd = chunk->getStartLine() + chunk->lineCount() - 1; if (currentEnd < minLine) { //std::cerr << "minLine = " << minLine << " | maxLine = " << maxLine << std::endl; diff --git a/isis/src/base/objs/BoxcarManager/BoxcarManager.cpp b/isis/src/base/objs/BoxcarManager/BoxcarManager.cpp index ebdba935d2..0832780a74 100644 --- a/isis/src/base/objs/BoxcarManager/BoxcarManager.cpp +++ b/isis/src/base/objs/BoxcarManager/BoxcarManager.cpp @@ -36,9 +36,9 @@ namespace Isis { */ BoxcarManager::BoxcarManager(const Isis::Cube &cube, const int &boxSamples, const int &boxLines) : - Isis::BufferManager(cube.getSampleCount(), cube.getLineCount(), - cube.getBandCount(), boxSamples, boxLines, 1, - cube.getPixelType()) { + Isis::BufferManager(cube.sampleCount(), cube.lineCount(), + cube.bandCount(), boxSamples, boxLines, 1, + cube.pixelType()) { Isis::BufferManager::SetIncrements(1, 1, 1); int soff, loff, boff; diff --git a/isis/src/base/objs/Brick/Brick.h b/isis/src/base/objs/Brick/Brick.h index eb4642003d..8a4ec307e5 100644 --- a/isis/src/base/objs/Brick/Brick.h +++ b/isis/src/base/objs/Brick/Brick.h @@ -76,9 +76,9 @@ namespace Isis { Brick(const Isis::Cube &cube, const int &bufNumSamples, const int &bufNumLines, const int &bufNumBands, bool reverse=false) : - Isis::BufferManager(cube.getSampleCount(), cube.getLineCount(), - cube.getBandCount(), bufNumSamples, bufNumLines, - bufNumBands, cube.getPixelType(), reverse) { + Isis::BufferManager(cube.sampleCount(), cube.lineCount(), + cube.bandCount(), bufNumSamples, bufNumLines, + bufNumBands, cube.pixelType(), reverse) { }; /** diff --git a/isis/src/base/objs/Camera/unitTest.cpp b/isis/src/base/objs/Camera/unitTest.cpp index bbda428169..f484a43a89 100644 --- a/isis/src/base/objs/Camera/unitTest.cpp +++ b/isis/src/base/objs/Camera/unitTest.cpp @@ -62,8 +62,8 @@ int main() { Cube cube; cube.open(inputFile); Camera *c = NULL; - c = cube.getCamera(); - Pvl pvl = *cube.getLabel(); + c = cube.camera(); + Pvl pvl = *cube.label(); MyCamera cam(pvl); double line = 453.0; double sample = 534.0; @@ -213,7 +213,7 @@ int main() { inputFile = "$clementine1/testData/lub5992r.292.lev1.phot.cub"; cube.close(); cube.open(inputFile); - pvl = *cube.getLabel(); + pvl = *cube.label(); Camera *cam2 = CameraFactory::Create(pvl); cube.close(); @@ -280,7 +280,7 @@ int main() { cout << "Flat DEM Surface..." << endl; inputFile = "$base/testData/f319b18_ideal_flat.cub"; cube.open(inputFile); - pvl = *cube.getLabel(); + pvl = *cube.label(); Camera *cam3 = CameraFactory::Create(pvl); cube.close(); @@ -311,7 +311,7 @@ int main() { cout << endl << "45 Degree DEM Surface Facing Left..." << endl; inputFile = "$base/testData/f319b18_ideal_45left.cub"; cube.open(inputFile); - pvl = *cube.getLabel(); + pvl = *cube.label(); Camera *cam4 = CameraFactory::Create(pvl); cube.close(); @@ -337,7 +337,7 @@ int main() { cout << endl << "45 Degree DEM Surface Facing Top..." << endl; inputFile = "$base/testData/f319b18_ideal_45top.cub"; cube.open(inputFile); - pvl = *cube.getLabel(); + pvl = *cube.label(); Camera *cam5 = CameraFactory::Create(pvl); cube.close(); @@ -363,7 +363,7 @@ int main() { cout << endl << "45 Degree DEM Surface Facing Right..." << endl; inputFile = "$base/testData/f319b18_ideal_45right.cub"; cube.open(inputFile); - pvl = *cube.getLabel(); + pvl = *cube.label(); Camera *cam6 = CameraFactory::Create(pvl); cube.close(); @@ -389,7 +389,7 @@ int main() { cout << endl << "45 Degree DEM Surface Facing Bottom..." << endl; inputFile = "$base/testData/f319b18_ideal_45bottom.cub"; cube.open(inputFile); - pvl = *cube.getLabel(); + pvl = *cube.label(); Camera *cam7 = CameraFactory::Create(pvl); cube.close(); @@ -415,7 +415,7 @@ int main() { cout << endl << "80 Degree DEM Surface Facing Left..." << endl; inputFile = "$base/testData/f319b18_ideal_80left.cub"; cube.open(inputFile); - pvl = *cube.getLabel(); + pvl = *cube.label(); Camera *cam8 = CameraFactory::Create(pvl); cube.close(); @@ -441,7 +441,7 @@ int main() { cout << endl << "80 Degree DEM Surface Facing Top..." << endl; inputFile = "$base/testData/f319b18_ideal_80top.cub"; cube.open(inputFile); - pvl = *cube.getLabel(); + pvl = *cube.label(); Camera *cam9 = CameraFactory::Create(pvl); cube.close(); @@ -467,7 +467,7 @@ int main() { cout << endl << "80 Degree DEM Surface Facing Right..." << endl; inputFile = "$base/testData/f319b18_ideal_80right.cub"; cube.open(inputFile); - pvl = *cube.getLabel(); + pvl = *cube.label(); Camera *cam10 = CameraFactory::Create(pvl); cube.close(); @@ -493,7 +493,7 @@ int main() { cout << endl << "80 Degree DEM Surface Facing Bottom..." << endl; inputFile = "$base/testData/f319b18_ideal_80bottom.cub"; cube.open(inputFile); - pvl = *cube.getLabel(); + pvl = *cube.label(); Camera *cam11 = CameraFactory::Create(pvl); cube.close(); @@ -519,7 +519,7 @@ int main() { cout << endl << "Point Does Not Intersect DEM..." << endl; inputFile = "$base/testData/f319b18_ideal_flat.cub"; cube.open(inputFile); - pvl = *cube.getLabel(); + pvl = *cube.label(); Camera *cam12 = CameraFactory::Create(pvl); cube.close(); diff --git a/isis/src/base/objs/CameraPointInfo/CameraPointInfo.cpp b/isis/src/base/objs/CameraPointInfo/CameraPointInfo.cpp index 18a9ad9fbf..4f3bfc02fa 100644 --- a/isis/src/base/objs/CameraPointInfo/CameraPointInfo.cpp +++ b/isis/src/base/objs/CameraPointInfo/CameraPointInfo.cpp @@ -71,7 +71,7 @@ namespace Isis { */ void CameraPointInfo::SetCube(const QString &cubeFileName) { currentCube = usedCubes->OpenCube(cubeFileName); - camera = currentCube->getCamera(); + camera = currentCube->camera(); } @@ -103,7 +103,7 @@ namespace Isis { */ PvlGroup *CameraPointInfo::SetCenter(const bool outside, const bool errors) { if(CheckCube()) { - bool passed = camera->SetImage(currentCube->getSampleCount() / 2.0, currentCube->getLineCount() / 2.0); + bool passed = camera->SetImage(currentCube->sampleCount() / 2.0, currentCube->lineCount() / 2.0); return GetPointInfo(passed, outside, errors); } // Should never get here, error will be thrown in CheckCube() @@ -121,7 +121,7 @@ namespace Isis { PvlGroup *CameraPointInfo::SetSample(const double sample, const bool outside, const bool errors) { if(CheckCube()) { - bool passed = camera->SetImage(sample, currentCube->getLineCount() / 2.0); + bool passed = camera->SetImage(sample, currentCube->lineCount() / 2.0); return GetPointInfo(passed, outside, errors); } // Should never get here, error will be thrown in CheckCube() @@ -139,7 +139,7 @@ namespace Isis { PvlGroup *CameraPointInfo::SetLine(const double line, const bool outside, const bool errors) { if(CheckCube()) { - bool passed = camera->SetImage(currentCube->getSampleCount() / 2.0, line); + bool passed = camera->SetImage(currentCube->sampleCount() / 2.0, line); return GetPointInfo(passed, outside, errors); } // Should never get here, error will be thrown in CheckCube() @@ -266,7 +266,7 @@ namespace Isis { } // Set all keywords that still have valid information gp->FindKeyword("Error").SetValue(error); - gp->FindKeyword("FileName").SetValue(currentCube->getFileName()); + gp->FindKeyword("FileName").SetValue(currentCube->fileName()); gp->FindKeyword("Sample").SetValue(toString(camera->Sample())); gp->FindKeyword("Line").SetValue(toString(camera->Line())); gp->FindKeyword("EphemerisTime").SetValue(toString(camera->time().Et()), "seconds"); @@ -280,7 +280,7 @@ namespace Isis { else { - Brick b(3, 3, 1, currentCube->getPixelType()); + Brick b(3, 3, 1, currentCube->pixelType()); int intSamp = (int)(camera->Sample() + 0.5); int intLine = (int)(camera->Line() + 0.5); @@ -292,7 +292,7 @@ namespace Isis { double ssplat, ssplon, sslat, sslon, pwlon, oglat; { - gp->FindKeyword("FileName").SetValue(currentCube->getFileName()); + gp->FindKeyword("FileName").SetValue(currentCube->fileName()); gp->FindKeyword("Sample").SetValue(toString(camera->Sample())); gp->FindKeyword("Line").SetValue(toString(camera->Line())); gp->FindKeyword("PixelValue").SetValue(PixelToString(b[0])); diff --git a/isis/src/base/objs/CameraStatistics/CameraStatistics.cpp b/isis/src/base/objs/CameraStatistics/CameraStatistics.cpp index af48aabc88..d3cb663388 100644 --- a/isis/src/base/objs/CameraStatistics/CameraStatistics.cpp +++ b/isis/src/base/objs/CameraStatistics/CameraStatistics.cpp @@ -27,7 +27,7 @@ namespace Isis { CameraStatistics::CameraStatistics(QString filename, int sinc, int linc) { Cube cube; cube.open(filename); - Camera *cam = cube.getCamera(); + Camera *cam = cube.camera(); init(cam, sinc, linc, filename); } diff --git a/isis/src/base/objs/CameraStatistics/unitTest.cpp b/isis/src/base/objs/CameraStatistics/unitTest.cpp index 8f7d762179..70775c0758 100644 --- a/isis/src/base/objs/CameraStatistics/unitTest.cpp +++ b/isis/src/base/objs/CameraStatistics/unitTest.cpp @@ -18,7 +18,7 @@ int main(int argc, char *argv[]) { cout << "UnitTest for Camera Statistics" << endl; Cube cube; cube.open("$Clementine1/testData/lna1391h.cub"); - Camera *cam = cube.getCamera(); + Camera *cam = cube.camera(); cout << setprecision(6); CameraStatistics camStats(cam, 1, 1); diff --git a/isis/src/base/objs/Chip/Chip.cpp b/isis/src/base/objs/Chip/Chip.cpp index 81fddba5a4..923832ffc1 100644 --- a/isis/src/base/objs/Chip/Chip.cpp +++ b/isis/src/base/objs/Chip/Chip.cpp @@ -226,7 +226,7 @@ namespace Isis { // Store off the cube address in case someone wants to match // this chip - p_filename = cube.getFileName(); + p_filename = cube.fileName(); } /** @@ -272,7 +272,7 @@ namespace Isis { // Store off the cube address in case someone wants to match // this chip - p_filename = cube.getFileName(); + p_filename = cube.fileName(); } @@ -321,15 +321,15 @@ namespace Isis { Camera *matchCam = NULL; Projection *matchProj = NULL; try { - matchCam = matchChipCube.getCamera(); + matchCam = matchChipCube.camera(); } catch(IException &error1) { try { - matchProj = matchChipCube.getProjection(); + matchProj = matchChipCube.projection(); } catch(IException &error2) { QString msg = "Can not geom chip. "; - msg += "Match chip cube [" + matchChipCube.getFileName(); + msg += "Match chip cube [" + matchChipCube.fileName(); msg += "] is not a camera or map projection"; IException fullError(IException::User, msg, _FILEINFO_); @@ -344,15 +344,15 @@ namespace Isis { Camera *cam = NULL; Projection *proj = NULL; try { - cam = cube.getCamera(); + cam = cube.camera(); } catch(IException &error1) { try { - proj = cube.getProjection(); + proj = cube.projection(); } catch(IException &error2) { QString msg = "Can not geom chip. "; - msg += "Chip cube [" + cube.getFileName(); + msg += "Chip cube [" + cube.fileName(); msg += "] is not a camera or map projection"; IException fullError(IException::User, msg, _FILEINFO_); @@ -482,8 +482,8 @@ namespace Isis { line = proj->WorldY(); } - // if (line < 1 || line > cube.getLineCount()) continue; - // if (samp < 1 || samp > cube.getSampleCount()) continue; + // if (line < 1 || line > cube.lineCount()) continue; + // if (samp < 1 || samp > cube.sampleCount()) continue; // Ok save this control point pointfound = true; @@ -516,8 +516,8 @@ namespace Isis { if(xp.size() < 3) { QString msg = "Cannot find enough points to perform Affine transformation. "; - msg += "Unable to load chip from [" + cube.getFileName(); - msg += "] to match chip from [" + matchChipCube.getFileName() + "]."; + msg += "Unable to load chip from [" + cube.fileName(); + msg += "] to match chip from [" + matchChipCube.fileName() + "]."; throw IException(IException::User, msg, _FILEINFO_); } @@ -539,7 +539,7 @@ namespace Isis { // Store off the cube address in case someone wants to match // this chip - p_filename = cube.getFileName(); + p_filename = cube.fileName(); } @@ -992,15 +992,15 @@ namespace Isis { void Chip::Read(Cube &cube, const int band) { // Create an interpolator and portal for geoming Interpolator interp(p_readInterpolator); - Portal port(interp.Samples(), interp.Lines(), cube.getPixelType(), + Portal port(interp.Samples(), interp.Lines(), cube.pixelType(), interp.HotSample(), interp.HotLine()); // Loop through the pixels in the chip and geom them for(int line = 1; line <= Lines(); line++) { for(int samp = 1; samp <= Samples(); samp++) { SetChipPosition((double)samp, (double)line); if((CubeSample() < 0.5) || (CubeLine() < 0.5) || - (CubeSample() > cube.getSampleCount() + 0.5) || - (CubeLine() > cube.getLineCount() + 0.5)) { + (CubeSample() > cube.sampleCount() + 0.5) || + (CubeLine() > cube.lineCount() + 0.5)) { p_buf[line-1][samp-1] = Isis::NULL8; } else if(p_clipPolygon == NULL) { diff --git a/isis/src/base/objs/Cube/Cube.cpp b/isis/src/base/objs/Cube/Cube.cpp index 585cd82aba..494e08ae5e 100644 --- a/isis/src/base/objs/Cube/Cube.cpp +++ b/isis/src/base/objs/Cube/Cube.cpp @@ -121,7 +121,7 @@ namespace Isis { * @return bool True if the file should have a valid projection */ bool Cube::isProjected() const { - return getLabel()->FindObject("IsisCube").HasGroup("Mapping"); + return label()->FindObject("IsisCube").HasGroup("Mapping"); } @@ -197,7 +197,7 @@ namespace Isis { Cube *result = new Cube; if (newFileAttributes.labelAttachment() != ExternalLabel) { - result->setDimensions(getSampleCount(), getLineCount(), getBandCount()); + result->setDimensions(sampleCount(), lineCount(), bandCount()); result->setByteOrder(newFileAttributes.byteOrder()); result->setFormat(newFileAttributes.fileFormat()); @@ -206,23 +206,23 @@ namespace Isis { } if (newFileAttributes.propagatePixelType()) { - result->setPixelType(getPixelType()); + result->setPixelType(pixelType()); } else { result->setPixelType(newFileAttributes.pixelType()); } if (newFileAttributes.propagateMinimumMaximum()) { - if(result->getPixelType() == Isis::Real) { + if(result->pixelType() == Isis::Real) { result->setBaseMultiplier(0.0, 1.0); } - else if(result->getPixelType() >= getPixelType()) { - result->setBaseMultiplier(getBase(), getMultiplier()); + else if(result->pixelType() >= pixelType()) { + result->setBaseMultiplier(base(), multiplier()); } else { QString msg = QObject::tr("Cannot reduce the output PixelType for [%1] from [%2] without output " - "pixel range").arg(newFile.original()).arg(getFileName()); + "pixel range").arg(newFile.original()).arg(fileName()); throw IException(IException::User, msg, _FILEINFO_); } } @@ -231,24 +231,24 @@ namespace Isis { result->setMinMax(newFileAttributes.minimum(), newFileAttributes.maximum()); } - result->setLabelSize(getLabelSize(true) + (1024 * 6)); + result->setLabelSize(labelSize(true) + (1024 * 6)); } else { - result->setExternalDnData(getFileName()); + result->setExternalDnData(fileName()); } // Allocate the cube result->create(newFile.expanded()); - PvlObject &isisCube = getLabel()->FindObject("IsisCube"); - PvlObject &outIsisCube = result->getLabel()->FindObject("IsisCube"); + PvlObject &isisCube = label()->FindObject("IsisCube"); + PvlObject &outIsisCube = result->label()->FindObject("IsisCube"); for(int i = 0; i < isisCube.Groups(); i++) { outIsisCube.AddGroup(isisCube.Group(i)); } - if (getLabel()->HasObject("NaifKeywords")) { - result->getLabel()->AddObject( - getLabel()->FindObject("NaifKeywords")); + if (label()->HasObject("NaifKeywords")) { + result->label()->AddObject( + label()->FindObject("NaifKeywords")); } for (int i = 0; i < m_label->Objects(); i++) { @@ -262,12 +262,12 @@ namespace Isis { } if (newFileAttributes.labelAttachment() != ExternalLabel) { - BufferManager input(getSampleCount(), getLineCount(), getBandCount(), - getSampleCount(), 1, 1, - getPixelType()); - BufferManager output(getSampleCount(), getLineCount(), getBandCount(), - getSampleCount(), 1, 1, - result->getPixelType()); + BufferManager input(sampleCount(), lineCount(), bandCount(), + sampleCount(), 1, 1, + pixelType()); + BufferManager output(sampleCount(), lineCount(), bandCount(), + sampleCount(), 1, 1, + result->pixelType()); input.begin(); output.begin(); @@ -285,7 +285,7 @@ namespace Isis { // Just in case the orig label doesn't work... here's original code: // if((p_propagateOriginalLabel) && (InputCubes.size() > 0)) { -// Isis::Pvl &inlab = *InputCubes[0]->getLabel(); +// Isis::Pvl &inlab = *InputCubes[0]->label(); // for(int i = 0; i < inlab.Objects(); i++) { // if(inlab.Object(i).IsNamed("OriginalLabel")) { // Isis::OriginalLabel ol; @@ -389,7 +389,7 @@ namespace Isis { core += PvlKeyword("StartByte", toString(1)); core += PvlKeyword("^Core", cubFile.name()); m_dataFileName = new FileName(cubFile); - m_dataFile = new QFile(getRealDataFileName().expanded()); + m_dataFile = new QFile(realDataFileName().expanded()); FileName labelFileName(cubFile); labelFileName = labelFileName.setExtension("lbl"); @@ -421,7 +421,7 @@ namespace Isis { core += PvlKeyword("^DnFile", m_dataFileName->original()); // m_dataFileName = new FileName(cubFile); - m_dataFile = new QFile(getRealDataFileName().expanded()); + m_dataFile = new QFile(realDataFileName().expanded()); m_labelFileName = new FileName(cubFile); m_labelFile = new QFile(cubFile.expanded()); @@ -468,11 +468,11 @@ namespace Isis { bool dataAlreadyOnDisk = m_storesDnData ? false : true; if (m_format == Bsq) { - m_ioHandler = new CubeBsqHandler(getDataFile(), m_virtualBandList, realDataFileLabel(), + m_ioHandler = new CubeBsqHandler(dataFile(), m_virtualBandList, realDataFileLabel(), dataAlreadyOnDisk); } else { - m_ioHandler = new CubeTileHandler(getDataFile(), m_virtualBandList, realDataFileLabel(), + m_ioHandler = new CubeTileHandler(dataFile(), m_virtualBandList, realDataFileLabel(), dataAlreadyOnDisk); } @@ -532,7 +532,7 @@ namespace Isis { m_attached = false; m_storesDnData = true; - m_dataFile = new QFile(getRealDataFileName().expanded()); + m_dataFile = new QFile(realDataFileName().expanded()); } else if (core.HasKeyword("^DnFile")) { FileName dataFileName(core["^DnFile"][0]); @@ -547,7 +547,7 @@ namespace Isis { m_attached = true; m_storesDnData = false; - m_dataFile = new QFile(getRealDataFileName().expanded()); + m_dataFile = new QFile(realDataFileName().expanded()); } else { m_dataFileName = new FileName(*m_labelFileName); @@ -614,7 +614,7 @@ namespace Isis { m_labelBytes = m_label->FindObject("Label")["Bytes"]; } else { - m_labelBytes = getLabelSize(true); + m_labelBytes = labelSize(true); } QPair dataLabel = qMakePair(false, m_label); @@ -624,11 +624,11 @@ namespace Isis { // Now examine the format to see which type of handler to create if (m_format == Bsq) { - m_ioHandler = new CubeBsqHandler(getDataFile(), m_virtualBandList, + m_ioHandler = new CubeBsqHandler(dataFile(), m_virtualBandList, realDataFileLabel(), true); } else { - m_ioHandler = new CubeTileHandler(getDataFile(), m_virtualBandList, + m_ioHandler = new CubeTileHandler(dataFile(), m_virtualBandList, realDataFileLabel(), true); } @@ -694,7 +694,7 @@ namespace Isis { QMutexLocker locker(m_mutex); QMutexLocker locker2(m_ioHandler->dataFileMutex()); - blob.Read(cubeFile.toString(), *getLabel()); + blob.Read(cubeFile.toString(), *label()); } @@ -751,7 +751,7 @@ namespace Isis { // Write a detached blob else { - FileName blobFileName = getFileName(); + FileName blobFileName = fileName(); blobFileName = blobFileName.removeExtension(); blobFileName = blobFileName.addExtension(blob.Type()); blobFileName = blobFileName.addExtension(blob.Name()); @@ -787,13 +787,13 @@ namespace Isis { } if (isReadOnly()) { - QString msg = "Cannot write to the cube [" + (QString)QFileInfo(getFileName()).fileName() + + QString msg = "Cannot write to the cube [" + (QString)QFileInfo(fileName()).fileName() + "] because it is opened read-only"; throw IException(IException::Programmer, msg, _FILEINFO_); } if (!m_storesDnData) { - QString msg = "The cube [" + QFileInfo(getFileName()).fileName() + + QString msg = "The cube [" + QFileInfo(fileName()).fileName() + "] does not support storing DN data because it is using an external file for DNs"; throw IException(IException::Unknown, msg, _FILEINFO_); } @@ -1011,7 +1011,7 @@ namespace Isis { * * @return int The number of bands in the cube. */ - int Cube::getBandCount() const { + int Cube::bandCount() const { int numBands = m_bands; if (m_virtualBandList) numBands = m_virtualBandList->size(); @@ -1028,7 +1028,7 @@ namespace Isis { * @return double The base value for converting 8-bit/16-bit pixels to * 32-bit. */ - double Cube::getBase() const { + double Cube::base() const { return m_base; } @@ -1040,7 +1040,7 @@ namespace Isis { * * @returns The byte order/endian-ness of the cube file */ - ByteOrder Cube::getByteOrder() const { + ByteOrder Cube::byteOrder() const { return m_byteOrder; } @@ -1052,9 +1052,9 @@ namespace Isis { * * @returns A camera based on the open cube */ - Camera *Cube::getCamera() { + Camera *Cube::camera() { if (m_camera == NULL && isOpen()) { - m_camera = CameraFactory::Create(*getLabel()); + m_camera = CameraFactory::Create(*label()); } return m_camera; } @@ -1066,7 +1066,7 @@ namespace Isis { * * @returns The opened cube's filename */ - QString Cube::getFileName() const { + QString Cube::fileName() const { if (isOpen()) return m_labelFileName->expanded(); else @@ -1078,7 +1078,7 @@ namespace Isis { * @returns the cube's storage format. If no cube is opened yet, then this is * the storage format that will be used if create(...) is called. */ - Cube::Format Cube::getFormat() const { + Cube::Format Cube::format() const { return m_format; } @@ -1102,8 +1102,8 @@ namespace Isis { * @throws IsisProgrammerError Band was less than zero or more than the number * of bands in the cube. */ - Histogram *Cube::getHistogram(const int &band, QString msg) { - return getHistogram(band, ValidMinimum, ValidMaximum, msg); + Histogram *Cube::histogram(const int &band, QString msg) { + return histogram(band, ValidMinimum, ValidMaximum, msg); } @@ -1132,21 +1132,21 @@ namespace Isis { * @throws ProgrammerError Band was less than zero or more than the number * of bands in the cube. */ - Histogram *Cube::getHistogram(const int &band, const double &validMin, + Histogram *Cube::histogram(const int &band, const double &validMin, const double &validMax, QString msg) { // Make sure band is valid - if ((band < 0) || (band > getBandCount())) { + if ((band < 0) || (band > bandCount())) { QString msg = "Invalid band in [CubeInfo::Histogram]"; throw IException(IException::Programmer, msg, _FILEINFO_); } int bandStart = band; int bandStop = band; - int maxSteps = getLineCount(); + int maxSteps = lineCount(); if (band == 0) { bandStart = 1; - bandStop = getBandCount(); - maxSteps = getLineCount() * getBandCount(); + bandStop = bandCount(); + maxSteps = lineCount() * bandCount(); } Progress progress; @@ -1176,7 +1176,7 @@ namespace Isis { progress.CheckStatus(); for(int useBand = bandStart ; useBand <= bandStop ; useBand++) { - for(int i = 1; i <= getLineCount(); i++) { + for(int i = 1; i <= lineCount(); i++) { line.SetLine(i, useBand); read(line); hist->AddData(line.DoubleBuffer(), line.size()); @@ -1197,7 +1197,7 @@ namespace Isis { * * @return Pvl Pointer to the Label object associated with the cube. */ - Pvl *Cube::getLabel() const { + Pvl *Cube::label() const { return m_label; } @@ -1209,7 +1209,7 @@ namespace Isis { * number of bytes in the cube set aside for the label). * @return int the number of bytes used by the label. */ - int Cube::getLabelSize(bool actual) const { + int Cube::labelSize(bool actual) const { int labelSize = m_labelBytes; if (actual && m_label) { @@ -1230,7 +1230,7 @@ namespace Isis { * open yet, this is the number of lines that will be written if create(...) * is called. */ - int Cube::getLineCount() const { + int Cube::lineCount() const { return m_lines; } @@ -1244,7 +1244,7 @@ namespace Isis { * @return double The multiplier value for converting 8-bit/16-bit pixels * to 32-bit. */ - double Cube::getMultiplier() const { + double Cube::multiplier() const { return m_multiplier; } @@ -1254,7 +1254,7 @@ namespace Isis { * this is the accuracy/number of bytes per pixel that will be used if * create(...) is called. */ - PixelType Cube::getPixelType() const { + PixelType Cube::pixelType() const { return m_pixelType; } @@ -1269,7 +1269,7 @@ namespace Isis { * * @return int The physical band number. */ - int Cube::getPhysicalBand(const int &virtualBand) const { + int Cube::physicalBand(const int &virtualBand) const { int physicalBand = virtualBand; if (m_virtualBandList) { @@ -1290,9 +1290,9 @@ namespace Isis { * the projection can throw an exception, so you might want to catch errors * if that interests you. */ - Projection *Cube::getProjection() { + Projection *Cube::projection() { if (m_projection == NULL && isOpen()) { - m_projection = ProjectionFactory::CreateFromCube(*getLabel()); + m_projection = ProjectionFactory::CreateFromCube(*label()); } return m_projection; } @@ -1303,7 +1303,7 @@ namespace Isis { * open yet, this is the number of samples that will be written if * create(...) is called. */ - int Cube::getSampleCount() const { + int Cube::sampleCount() const { return m_samples; } @@ -1326,8 +1326,8 @@ namespace Isis { * such as the minimum and maximum pixel values for the input cube on the * band specified, or all bands as the case may be. */ - Statistics *Cube::getStatistics(const int &band, QString msg) { - return getStatistics(band, ValidMinimum, ValidMaximum, msg); + Statistics *Cube::statistics(const int &band, QString msg) { + return statistics(band, ValidMinimum, ValidMaximum, msg); } @@ -1347,10 +1347,10 @@ namespace Isis { * * @return Statistics* */ - Statistics *Cube::getStatistics(const int &band, const double &validMin, + Statistics *Cube::statistics(const int &band, const double &validMin, const double &validMax, QString msg) { // Make sure band is valid - if ((band < 0) || (band > getBandCount())) { + if ((band < 0) || (band > bandCount())) { string msg = "Invalid band in [CubeInfo::Statistics]"; throw IException(IException::Programmer, msg, _FILEINFO_); } @@ -1363,11 +1363,11 @@ namespace Isis { int bandStart = band; int bandStop = band; - int maxSteps = getLineCount(); + int maxSteps = lineCount(); if (band == 0) { bandStart = 1; - bandStop = getBandCount(); - maxSteps = getLineCount() * getBandCount(); + bandStop = bandCount(); + maxSteps = lineCount() * bandCount(); } Progress progress; @@ -1377,7 +1377,7 @@ namespace Isis { // Loop and get the statistics for a good minimum/maximum for(int useBand = bandStart ; useBand <= bandStop ; useBand++) { - for(int i = 1; i <= getLineCount(); i++) { + for(int i = 1; i <= lineCount(); i++) { line.SetLine(i, useBand); read(line); stats->AddData(line.DoubleBuffer(), line.size()); @@ -1458,7 +1458,7 @@ namespace Isis { * @param[out] group Name of the group to delete. */ void Cube::deleteGroup(const QString &group) { - PvlObject &isiscube = getLabel()->FindObject("IsisCube"); + PvlObject &isiscube = label()->FindObject("IsisCube"); if (!isiscube.HasGroup(group)) return; isiscube.DeleteGroup(group); } @@ -1471,8 +1471,8 @@ namespace Isis { * @param[out] group Name of the group to get * @return (PvlGroup) Label which will contain the requested group. */ - PvlGroup &Cube::getGroup(const QString &group) const { - PvlObject &isiscube = getLabel()->FindObject("IsisCube"); + PvlGroup &Cube::group(const QString &group) const { + PvlObject &isiscube = label()->FindObject("IsisCube"); return isiscube.FindGroup(group); } @@ -1485,7 +1485,7 @@ namespace Isis { * @return (bool) True if the cube has the specified group, false if not. */ bool Cube::hasGroup(const QString &group) const { - const PvlObject &isiscube = getLabel()->FindObject("IsisCube"); + const PvlObject &isiscube = label()->FindObject("IsisCube"); if (isiscube.HasGroup(group)) return true; return false; } @@ -1499,8 +1499,8 @@ namespace Isis { * @return bool True if the pvl table was found */ bool Cube::hasTable(const QString &name) { - for(int o = 0; o < getLabel()->Objects(); o++) { - PvlObject &obj = getLabel()->Object(o); + for(int o = 0; o < label()->Objects(); o++) { + PvlObject &obj = label()->Object(o); if (obj.IsNamed("Table")) { if (obj.HasKeyword("Name")) { QString temp = (QString) obj["Name"]; @@ -1524,7 +1524,7 @@ namespace Isis { * @param[in] group Label containing the group to put. */ void Cube::putGroup(const PvlGroup &group) { - PvlObject &isiscube = getLabel()->FindObject("IsisCube"); + PvlObject &isiscube = label()->FindObject("IsisCube"); if (isiscube.HasGroup(group.Name())) { isiscube.FindGroup(group.Name()) = group; } @@ -1613,7 +1613,7 @@ namespace Isis { * * @returns A file for cube pixel data I/O */ - QFile *Cube::getDataFile() const { + QFile *Cube::dataFile() const { if (m_dataFile) return m_dataFile; else @@ -1626,7 +1626,7 @@ namespace Isis { * data file name could be another ecub or a detached label, so using m_dataFileName is * unreasonable. */ - FileName Cube::getRealDataFileName() const { + FileName Cube::realDataFileName() const { FileName result; ASSERT(m_labelFileName); diff --git a/isis/src/base/objs/Cube/Cube.h b/isis/src/base/objs/Cube/Cube.h index 615750c405..f2b05b7fd5 100644 --- a/isis/src/base/objs/Cube/Cube.h +++ b/isis/src/base/objs/Cube/Cube.h @@ -64,76 +64,66 @@ namespace Isis { * class. Also, it needs an example. * @history 2003-03-31 Jeff Anderson - updated unitTest truth file. * @history 2003-05-16 Stuart Sides - modified schema from - * astrogeology...isis.astrogeology + * astrogeology...isis.astrogeology * @history 2003-05-21 Jeff Anderson - added read/write methods to improve - * speed for IsisLine buffer managers. - * Also added error checks on reads, - * writes, and seeks. - * @history 2003-05-30 Jeff Anderson - added PhysicalBand method and updated - * unitTest. - * @history 2003-10-06 Jeff Anderson - added PVL to create method to allow for - * propagation of Pixel specifications. - * @history 2003-10-15 Jeff Anderson - fixed bad error check in PhysicalBand - * method. - * @history 2004-01-30 Jeff Anderson - added many Set methods. Major refractor - * of the class. - * @history 2004-02-12 Jeff Anderson - added pruning of the band bin group - * given the virtual band list. - * @history 2004-02-17 Jeff Anderson - modified the number of bands in the - * label if a virtual band list was given. - * @history 2004-03-01 Jeff Anderson - added ability to read Isis 2.1 cube - * format. - * @history 2004-04-01 Jeff Anderson - fixed bug swapping NULL cache tile for - * non-native cubes in move method. - * @history 2005-03-24 Jeff Anderson - Added methods to return a camera or - * projection associated with the cube. - * @history 2005-07-18 Elizabeth Ribelin - Fixed bug in method that returns a - * projection associated with the cube + * speed for IsisLine buffer managers. Also added error checks on reads, + * writes, and seeks. + * @history 2003-05-30 Jeff Anderson - added PhysicalBand method and updated unitTest. + * @history 2003-10-06 Jeff Anderson - added PVL to create method to allow for propagation of + * Pixel specifications. + * @history 2003-10-15 Jeff Anderson - fixed bad error check in PhysicalBand method. + * @history 2004-01-30 Jeff Anderson - added many Set methods. Major refractor of the class. + * @history 2004-02-12 Jeff Anderson - added pruning of the band bin group given the virtual + * band list. + * @history 2004-02-17 Jeff Anderson - modified the number of bands in the label if a virtual + * band list was given. + * @history 2004-03-01 Jeff Anderson - added ability to read Isis 2.1 cube format. + * @history 2004-04-01 Jeff Anderson - fixed bug swapping NULL cache tile for non-native cubes + * in move method. + * @history 2005-03-24 Jeff Anderson - Added methods to return a camera or projection associated + * with the cube. + * @history 2005-07-18 Elizabeth Ribelin - Fixed bug in method that returns a projection + * associated with the cube * @history 2005-10-03 Elizabeth Miller - Added error check to Write(blob) - * @history 2006-02-24 Kris Becker - Made the destructor virtual to properly - * allow the class to be inherited. - * @history 2006-04-21 Jacob Danton - Modified the WriteLabel method to use - * the Pvl's format template abilities. - * @history 2006-05-17 Elizabeth Miller - Depricated CameraManger to - * CameraFactory + * @history 2006-02-24 Kris Becker - Made the destructor virtual to properly allow the class to + * be inherited. + * @history 2006-04-21 Jacob Danton - Modified the WriteLabel method to use the Pvl's format + * template abilities. + * @history 2006-05-17 Elizabeth Miller - Depricated CameraManger to CameraFactory * @history 2006-07-10 Elizabeth Miller - Added max size preference * @history 2006-11-28 Jeff Anderson - Fixed detached blob bug * @history 2007-01-05 Jeff Anderson - Fixed bug when reading/writing outside - * cube + * cube * @history 2007-02-07 Tracie Sucharski - Added ReOpen method - * @history 2008-05-09 Steven Lambright - Added Statistics, Histogram, PutGroup, - * GetGroup, DeleteGroup, HasGroup conveinience methods. Removed excess - * references to CubeInfo. - * @history 2008-05-27 Jeff Anderson - Fixed bug in open method where - * virtual bands were not handled correctly if a - * BandBin group did not exist - * @history 2008-06-09 Christopher Austin - Improved maximum cube size error - * message. + * @history 2008-05-09 Steven Lambright - Added Statistics, Histogram, PutGroup, GetGroup, + * DeleteGroup, HasGroup conveinience methods. Removed excess references + * to CubeInfo. + * @history 2008-05-27 Jeff Anderson - Fixed bug in open method where virtual bands were not + * handled correctly if a BandBin group did not exist + * @history 2008-06-09 Christopher Austin - Improved maximum cube size error message. * @history 2008-06-11 Steven Lambright - Changed prototype for SetVirtualBands * @history 2008-06-18 Christopher Austin - Fixed documentation errors - * @history 2008-08-11 Steven Lambright - Added another Statistics method - * which accepts a valid range -- also added another Histogram - * method which accepts a bin/valid range (applies both). - * @history 2008-08-11 Steven Lambright - Fixed definition of IsisCubeDef, - * problem pointed out by "novas0x2a" (Support Board Member) - * @history 2008-12-15 Steven Koechle - Added a method to delete blobs from a - * cube + * @history 2008-08-11 Steven Lambright - Added another Statistics method which accepts a valid + * range -- also added another Histogram method which accepts a + * bin/valid range (applies both). + * @history 2008-08-11 Steven Lambright - Fixed definition of IsisCubeDef, problem pointed out + * by "novas0x2a" (Support Board Member) + * @history 2008-12-15 Steven Koechle - Added a method to delete blobs from a cube * @history 2008-12-17 Steven Koechle - BlobDelete method was broken, fixed * @history 2009-06-30 Steven Lambright - Added "HasProjection" for uniform - * projection existance test + * projection existance test * @history 2010-03-22 Steven Lambright - Added a mutex for reading and writing, - * which makes these methods thread safe. + * which makes these methods thread safe. * @history 2011-03-23 Steven Lambright - Added ClearCache method. - * @history 2011-06-01 Jai Rideout and Steven Lambright - Updated API to - * conform to new Isis standards, re-implemented IO handler and - * implemented new caching algorithms that can automatically apply - * themselves when the behavior of the caller changes. + * @history 2011-06-01 Jai Rideout and Steven Lambright - Updated API to conform to new Isis + * standards, re-implemented IO handler and implemented new caching + * algorithms that can automatically apply themselves when the behavior + * of the caller changes. * @history 2011-06-27 Steven Lambright - Added addCachingAlgorithm - * @history 2011-07-08 Steven Lambright - getProjection() and getCamera() - * will now return NULL if the cube is not open, instead of - * crashing, references #161 - * @history 2012-02-17 Steven Lambright - Made the read() method const. - * Added mutex lock calls around data file accesses. + * @history 2011-07-08 Steven Lambright - projection() and camera() will now return NULL if the + * cube is not open, instead of crashing, references #161 + * @history 2012-02-17 Steven Lambright - Made the read() method const. Added mutex lock calls + * around data file accesses. * @history 2012-07-02 Steven Lambright and Stuart Sides - Added copy() and added support for * external cube label files (.ecub). This was done so that cubes can * be imported into projects without copying the DN data. Also, multiple @@ -141,6 +131,7 @@ namespace Isis { * again, not copying DN data). Fixes #961. * @history 2012-11-06 Steven Lambright and Mathew Eis - Fixed (the lack of) deletion of * temporary files in the unit test. Fixes #1009. + * @history 2012-12-31 Steven Lambright - Removed 'get' prefix from accessors. Fixes #1356. * */ class Cube { @@ -239,37 +230,37 @@ namespace Isis { void setVirtualBands(const QList &vbands); void setVirtualBands(const std::vector &vbands); - int getBandCount() const; - double getBase() const; - ByteOrder getByteOrder() const; - Camera *getCamera(); - QString getFileName() const; - Format getFormat() const; - Histogram *getHistogram(const int &band = 1, - QString msg = "Gathering histogram"); - Histogram *getHistogram(const int &band, const double &validMin, - const double &validMax, - QString msg = "Gathering histogram"); - Pvl *getLabel() const; - int getLabelSize(bool actual = false) const; - int getLineCount() const; - double getMultiplier() const; - PixelType getPixelType() const; - int getPhysicalBand(const int &virtualBand) const; - Projection *getProjection(); - int getSampleCount() const; - Statistics *getStatistics(const int &band = 1, - QString msg = "Gathering statistics"); - Statistics *getStatistics(const int &band, const double &validMin, - const double &validMax, - QString msg = "Gathering statistics"); - bool getStoresDnData() const; + int bandCount() const; + double base() const; + ByteOrder byteOrder() const; + Camera *camera(); + QString fileName() const; + Format format() const; + Histogram *histogram(const int &band = 1, + QString msg = "Gathering histogram"); + Histogram *histogram(const int &band, const double &validMin, + const double &validMax, + QString msg = "Gathering histogram"); + Pvl *label() const; + int labelSize(bool actual = false) const; + int lineCount() const; + double multiplier() const; + PixelType pixelType() const; + int physicalBand(const int &virtualBand) const; + Projection *projection(); + int sampleCount() const; + Statistics *statistics(const int &band = 1, + QString msg = "Gathering statistics"); + Statistics *statistics(const int &band, const double &validMin, + const double &validMax, + QString msg = "Gathering statistics"); + bool storesDnData() const; void addCachingAlgorithm(CubeCachingAlgorithm *); void clearIoCache(); bool deleteBlob(QString BlobType, QString BlobName); void deleteGroup(const QString &group); - PvlGroup &getGroup(const QString &group) const; + PvlGroup &group(const QString &group) const; bool hasGroup(const QString &group) const; bool hasTable(const QString &name); void putGroup(const PvlGroup &group); @@ -277,8 +268,8 @@ namespace Isis { private: void applyVirtualBandsToLabel(); void cleanUp(bool remove); - QFile *getDataFile() const; - FileName getRealDataFileName() const; + QFile *dataFile() const; + FileName realDataFileName() const; void initialize(); void initCoreFromLabel(const Pvl &label); void initLabelFromFile(FileName labelFileName, bool readWrite); @@ -291,7 +282,7 @@ namespace Isis { /** * This is the file that contains the labels always; if labels are * attached then this contains the file data also. The method - * getDataFile() will always give you the appropriate QFile member for + * dataFile() will always give you the appropriate QFile member for * reading cube data; this should always be used for the labels. * * If isOpen() is true, then this is allocated. @@ -334,10 +325,10 @@ namespace Isis { //! Basic thread-safety mutex; this class is not optimized for threads. QMutex *m_mutex; - //! Camera allocated from the getCamera() method. + //! Camera allocated from the camera() method. Camera *m_camera; - //! Projection allocated from the getProjection() method. + //! Projection allocated from the projection() method. Projection *m_projection; //! The full filename of the label file (.lbl or .cub) diff --git a/isis/src/base/objs/Cube/CubeBsqHandler.cpp b/isis/src/base/objs/Cube/CubeBsqHandler.cpp index 1635a7078b..0ba3c4f8d7 100644 --- a/isis/src/base/objs/Cube/CubeBsqHandler.cpp +++ b/isis/src/base/objs/Cube/CubeBsqHandler.cpp @@ -50,17 +50,17 @@ namespace Isis { CubeBsqHandler::CubeBsqHandler(QFile * dataFile, const QList *virtualBandList, const Pvl &labels, bool alreadyOnDisk) : CubeIoHandler(dataFile, virtualBandList, labels, alreadyOnDisk) { - int numSamplesInChunk = getSampleCount(); + int numSamplesInChunk = sampleCount(); int numLinesInChunk = 1; // The chunk size must evenly divide into the cube size... - if(getLineCount() < 1024) - numLinesInChunk = getLineCount(); + if(lineCount() < 1024) + numLinesInChunk = lineCount(); else { int attemptedSize = 1024; while(numLinesInChunk == 1 && attemptedSize > 1) { - if(getLineCount() % attemptedSize == 0) + if(lineCount() % attemptedSize == 0) numLinesInChunk = attemptedSize; else attemptedSize /= 2; diff --git a/isis/src/base/objs/Cube/CubeIoHandler.cpp b/isis/src/base/objs/Cube/CubeIoHandler.cpp index f190e9e89f..0018642261 100644 --- a/isis/src/base/objs/Cube/CubeIoHandler.cpp +++ b/isis/src/base/objs/Cube/CubeIoHandler.cpp @@ -481,7 +481,7 @@ namespace Isis { /** * @return the number of physical bands in the cube. */ - int CubeIoHandler::getBandCount() const { + int CubeIoHandler::bandCount() const { return m_numBands; } @@ -546,9 +546,9 @@ namespace Isis { * @return The chunk's index into the file */ int CubeIoHandler::getChunkIndex(const RawCubeChunk &chunk) const { -// ASSERT(chunk.getStartSample() <= getSampleCount()); -// ASSERT(chunk.getStartLine() <= getLineCount()); -// ASSERT(chunk.getStartBand() <= getBandCount()); +// ASSERT(chunk.getStartSample() <= sampleCount()); +// ASSERT(chunk.getStartLine() <= lineCount()); +// ASSERT(chunk.getStartBand() <= bandCount()); int sampleIndex = (chunk.getStartSample() - 1) / getSampleCountInChunk(); int lineIndex = (chunk.getStartLine() - 1) / getLineCountInChunk(); @@ -586,7 +586,7 @@ namespace Isis { * @return the number of lines in the cube. This does not include lines created * by the chunk overflowing the line dimension. */ - int CubeIoHandler::getLineCount() const { + int CubeIoHandler::lineCount() const { return m_numLines; } @@ -602,7 +602,7 @@ namespace Isis { /** * @return the physical cube DN format. */ - PixelType CubeIoHandler::getPixelType() const { + PixelType CubeIoHandler::pixelType() const { return m_pixelType; } @@ -611,7 +611,7 @@ namespace Isis { * @return the number of samples in the cube. This does not include samples * created by the chunk overflowing the sample dimension. */ - int CubeIoHandler::getSampleCount() const { + int CubeIoHandler::sampleCount() const { return m_numSamples; } @@ -758,15 +758,15 @@ namespace Isis { QList results; int lastBand = min(startBand + numBands - 1, - getBandCount()); + bandCount()); QRect areaInBand( QPoint(max(startSample, 1), max(startLine, 1)), QPoint(min(startSample + numSamples - 1, - getSampleCount()), + sampleCount()), min(startLine + numLines - 1, - getLineCount()))); + lineCount()))); // We are considering only 1 band at a time.. we can't use m_bandsInChunk // because of virtual bands, but every extra loop should not need extra @@ -850,7 +850,7 @@ namespace Isis { // current band, and the chunk's initial band must be between 1 and the // number of physical bands in the cube (inclusive). while(chunkRect.intersects(areaLeftInBand) && - (initialChunkBand >= 1 && initialChunkBand <= getBandCount())) { + (initialChunkBand >= 1 && initialChunkBand <= bandCount())) { int chunkXPos = (chunkRect.left() - 1) / m_samplesInChunk; int chunkYPos = (chunkRect.top() - 1) / m_linesInChunk; int chunkZPos = initialChunkZPos; @@ -941,11 +941,11 @@ namespace Isis { startX = max(cube1.getStartSample(), cube2.Sample()); startY = max(cube1.getStartLine(), cube2.Line()); startZ = max(cube1.getStartBand(), startPhysicalBand); - endX = min(cube1.getStartSample() + cube1.getSampleCount() - 1, + endX = min(cube1.getStartSample() + cube1.sampleCount() - 1, cube2.Sample() + cube2.SampleDimension() - 1); - endY = min(cube1.getStartLine() + cube1.getLineCount() - 1, + endY = min(cube1.getStartLine() + cube1.lineCount() - 1, cube2.Line() + cube2.LineDimension() - 1); - endZ = min(cube1.getStartBand() + cube1.getBandCount() - 1, + endZ = min(cube1.getStartBand() + cube1.bandCount() - 1, endPhysicalBand); } @@ -1176,9 +1176,9 @@ namespace Isis { if(!m_nullChunkData) { // the pixel type doesn't really matter, so pick something small - Brick nullBuffer(result->getSampleCount(), - result->getLineCount(), - result->getBandCount(), + Brick nullBuffer(result->sampleCount(), + result->lineCount(), + result->bandCount(), UnsignedByte); nullBuffer.SetBasePosition(result->getStartSample(), @@ -1270,7 +1270,7 @@ namespace Isis { m_lastProcessByLineChunks->size()) { // Not optimized yet, let's see if we can optimize if(bufferToWrite.Sample() == 1 && - bufferSampleCount == getSampleCount() && + bufferSampleCount == sampleCount() && bufferLineCount == 1 && bufferBandCount == 1) { // We look like a process by line, are we using the same chunks as @@ -1279,12 +1279,12 @@ namespace Isis { int chunkStartLine = (*m_lastProcessByLineChunks)[0]->getStartLine(); int chunkLines = - (*m_lastProcessByLineChunks)[0]->getLineCount(); + (*m_lastProcessByLineChunks)[0]->lineCount(); int bufferBand = bufferToWrite.Band(); int chunkStartBand = (*m_lastProcessByLineChunks)[0]->getStartBand(); int chunkBands = - (*m_lastProcessByLineChunks)[0]->getBandCount(); + (*m_lastProcessByLineChunks)[0]->bandCount(); if(bufferLine >= chunkStartLine && bufferLine <= chunkStartLine + chunkLines - 1 && @@ -1340,7 +1340,7 @@ namespace Isis { // process by line optimization if(bufferToWrite.Sample() == 1 && - bufferSampleCount == getSampleCount() && + bufferSampleCount == sampleCount() && bufferLineCount == 1 && bufferBandCount == 1) { if(!m_lastProcessByLineChunks) @@ -1387,8 +1387,8 @@ namespace Isis { int chunkStartSample = chunk.getStartSample(); int chunkStartLine = chunk.getStartLine(); int chunkStartBand = chunk.getStartBand(); - int chunkLineSize = chunk.getSampleCount(); - int chunkBandSize = chunkLineSize * chunk.getLineCount(); + int chunkLineSize = chunk.sampleCount(); + int chunkBandSize = chunkLineSize * chunk.lineCount(); //double *buffersDoubleBuf = output.p_buf; double *buffersDoubleBuf = output.DoubleBuffer(); const char *chunkBuf = chunk.getRawData().data(); @@ -1522,8 +1522,8 @@ namespace Isis { int outputStartSample = output.getStartSample(); int outputStartLine = output.getStartLine(); int outputStartBand = output.getStartBand(); - int lineSize = output.getSampleCount(); - int bandSize = lineSize * output.getLineCount(); + int lineSize = output.sampleCount(); + int bandSize = lineSize * output.lineCount(); double *buffersDoubleBuf = buffer.DoubleBuffer(); char *chunkBuf = output.getRawData().data(); diff --git a/isis/src/base/objs/Cube/CubeIoHandler.h b/isis/src/base/objs/Cube/CubeIoHandler.h index e585dfa05c..3278844a87 100644 --- a/isis/src/base/objs/Cube/CubeIoHandler.h +++ b/isis/src/base/objs/Cube/CubeIoHandler.h @@ -123,7 +123,7 @@ namespace Isis { QMutex *dataFileMutex(); protected: - int getBandCount() const; + int bandCount() const; int getBandCountInChunk() const; BigInt getBytesPerChunk() const; int getChunkCountInBandDimension() const; @@ -132,10 +132,10 @@ namespace Isis { int getChunkIndex(const RawCubeChunk &) const; BigInt getDataStartByte() const; QFile * getDataFile(); - int getLineCount() const; + int lineCount() const; int getLineCountInChunk() const; - PixelType getPixelType() const; - int getSampleCount() const; + PixelType pixelType() const; + int sampleCount() const; int getSampleCountInChunk() const; void setChunkSizes(int numSamples, int numLines, int numBands); diff --git a/isis/src/base/objs/Cube/CubeTileHandler.cpp b/isis/src/base/objs/Cube/CubeTileHandler.cpp index 0f3029383c..5174784355 100644 --- a/isis/src/base/objs/Cube/CubeTileHandler.cpp +++ b/isis/src/base/objs/Cube/CubeTileHandler.cpp @@ -57,9 +57,9 @@ namespace Isis { else { // up to 1MB chunks int sampleChunkSize = - findGoodSize(512 * 4 / SizeOf(getPixelType()), getSampleCount()); + findGoodSize(512 * 4 / SizeOf(pixelType()), sampleCount()); int lineChunkSize = - findGoodSize(512 * 4 / SizeOf(getPixelType()), getLineCount()); + findGoodSize(512 * 4 / SizeOf(pixelType()), lineCount()); setChunkSizes(sampleChunkSize, lineChunkSize, 1); } diff --git a/isis/src/base/objs/Cube/RawCubeChunk.h b/isis/src/base/objs/Cube/RawCubeChunk.h index ceec812fde..972b204f40 100644 --- a/isis/src/base/objs/Cube/RawCubeChunk.h +++ b/isis/src/base/objs/Cube/RawCubeChunk.h @@ -86,21 +86,21 @@ namespace Isis { /** * @returns the number of samples in the cube chunk. */ - int getSampleCount() const { + int sampleCount() const { return m_sampleCount; } /** * @returns the number of lines in the cube chunk. */ - int getLineCount() const { + int lineCount() const { return m_lineCount; } /** * @returns the number of bands in the cube chunk. */ - int getBandCount() const { + int bandCount() const { return m_bandCount; } diff --git a/isis/src/base/objs/Cube/RegionalCachingAlgorithm.cpp b/isis/src/base/objs/Cube/RegionalCachingAlgorithm.cpp index 0ed9d71aeb..185bd1ae6e 100644 --- a/isis/src/base/objs/Cube/RegionalCachingAlgorithm.cpp +++ b/isis/src/base/objs/Cube/RegionalCachingAlgorithm.cpp @@ -44,9 +44,9 @@ namespace Isis { justRequested.BandDimension()); // They'll all be roughly the same size, so the first one is good enough - int largestChunkDim = max( max( allocated[0]->getSampleCount(), - allocated[0]->getLineCount()), - allocated[0]->getBandCount()); + int largestChunkDim = max( max( allocated[0]->sampleCount(), + allocated[0]->lineCount()), + allocated[0]->bandCount()); // The average needed per request ought to be // avgLargestDim / largestChunkDim. Let's keep an extra few around // since it's cheap, and because we are uncertain of request patterns. diff --git a/isis/src/base/objs/Cube/unitTest.cpp b/isis/src/base/objs/Cube/unitTest.cpp index 87558ff439..ec3eb8c3b2 100644 --- a/isis/src/base/objs/Cube/unitTest.cpp +++ b/isis/src/base/objs/Cube/unitTest.cpp @@ -177,7 +177,7 @@ int main(int argc, char *argv[]) { // Test Histogram object on a single band, 1 by default cerr << "Testing histogram method, band 1 ... " << endl; - Histogram *bandOneHist = in.getHistogram(); + Histogram *bandOneHist = in.histogram(); cerr << "Average: " << bandOneHist->Average() << endl; cerr << "Standard Dev: " << bandOneHist->StandardDeviation() << endl; cerr << "Mode: " << bandOneHist->Mode() << endl; @@ -189,7 +189,7 @@ int main(int argc, char *argv[]) { // Test histogram object on all bands cerr << "Testing histogram method, all bands ... " << endl; - Histogram *allBandsHistogram = in.getHistogram(0); + Histogram *allBandsHistogram = in.histogram(0); cerr << "Average: " << allBandsHistogram->Average() << endl; cerr << "Standard Dev: " << allBandsHistogram->StandardDeviation() << endl; cerr << "Mode: " << allBandsHistogram->Mode() << endl; @@ -201,7 +201,7 @@ int main(int argc, char *argv[]) { // Check error for too few (negative) bands try { - in.getHistogram(-1); + in.histogram(-1); } catch (IException &e) { e.print(); @@ -209,7 +209,7 @@ int main(int argc, char *argv[]) { // Test statistics object on a single band, 1 by default cerr << "Testing statistics method, band 1 ... " << endl; - Statistics *bandOneStats = in.getStatistics(); + Statistics *bandOneStats = in.statistics(); cerr << "Average: " << bandOneStats->Average() << endl; cerr << "Standard Dev: " << bandOneStats->StandardDeviation() << endl; cerr << "Total Pixels: " << bandOneStats->TotalPixels() << endl; @@ -220,7 +220,7 @@ int main(int argc, char *argv[]) { // Test statistics object on all bands cerr << "Testing statistics method, all bands ... " << endl; - Statistics *allBandsStats = in.getStatistics(0); + Statistics *allBandsStats = in.statistics(0); cerr << "Average: " << allBandsStats->Average() << endl; cerr << "Standard Dev: " << allBandsStats->StandardDeviation() << endl; cerr << "Total Pixels: " << allBandsStats->TotalPixels() << endl; @@ -231,7 +231,7 @@ int main(int argc, char *argv[]) { // Check error for too few (negative) bands try { - in.getStatistics(-1); + in.statistics(-1); } catch (IException &e) { e.print(); @@ -241,9 +241,9 @@ int main(int argc, char *argv[]) { cerr << "Virtual band tests" << endl; // Virtual Band tests - cerr << "Nbands = " << in.getBandCount() << endl; - cerr << "Band 1 = " << in.getPhysicalBand(1) << endl; - cerr << "Band 2 = " << in.getPhysicalBand(2) << endl; + cerr << "Nbands = " << in.bandCount() << endl; + cerr << "Band 1 = " << in.physicalBand(1) << endl; + cerr << "Band 2 = " << in.physicalBand(2) << endl; in.close(); cerr << endl; @@ -251,8 +251,8 @@ int main(int argc, char *argv[]) { vbands.push_back("2"); in.setVirtualBands(vbands); in.open("IsisCube_01"); - cerr << "Nbands = " << in.getBandCount() << endl; - cerr << "Band 1 = " << in.getPhysicalBand(1) << endl; + cerr << "Nbands = " << in.bandCount() << endl; + cerr << "Band 1 = " << in.physicalBand(1) << endl; cerr << endl; @@ -289,7 +289,7 @@ int main(int argc, char *argv[]) { // our cube is entirely filled with ones, and any parts that fall outside of // the cube should be nulls. cerr << "Reading completely within cube boundaries ... " << endl; - Brick readBrick(1, 1, 2, boundaryTestCube.getPixelType()); + Brick readBrick(1, 1, 2, boundaryTestCube.pixelType()); readBrick.SetBasePosition(1, 1, 1); boundaryTestCube.read(readBrick); @@ -462,14 +462,14 @@ int main(int argc, char *argv[]) { } try { - in.getPhysicalBand(2); + in.physicalBand(2); } catch (IException &e) { e.print(); } try { - in.getPhysicalBand(0); + in.physicalBand(0); } catch (IException &e) { e.print(); @@ -585,9 +585,9 @@ int main(int argc, char *argv[]) { externalData.setExternalDnData("$base/testData/isisTruth.cub"); externalData.create("isisTruth_external.ecub"); externalData.putGroup(PvlGroup("TestGroup")); - cerr << *externalData.getLabel() << endl; + cerr << *externalData.label() << endl; - Brick readBrick(3, 3, 2, externalData.getPixelType()); + Brick readBrick(3, 3, 2, externalData.pixelType()); readBrick.SetBasePosition(1, 1, 1); externalData.read(readBrick); for (int index = 0; index < readBrick.size(); index++) { @@ -613,9 +613,9 @@ int main(int argc, char *argv[]) { Cube externalData; externalData.setExternalDnData("isisTruth_external.ecub"); externalData.create("isisTruth_external2.ecub"); - cerr << *externalData.getLabel() << endl; + cerr << *externalData.label() << endl; - Brick readBrick(3, 3, 2, externalData.getPixelType()); + Brick readBrick(3, 3, 2, externalData.pixelType()); readBrick.SetBasePosition(1, 1, 1); externalData.read(readBrick); for (int index = 0; index < readBrick.size(); index++) { @@ -641,9 +641,9 @@ int main(int argc, char *argv[]) { Cube externalData; externalData.open("isisTruth_external"); externalData.putGroup(PvlGroup("TestGroup2")); - cerr << *externalData.getLabel() << endl; + cerr << *externalData.label() << endl; - Brick readBrick(3, 3, 2, externalData.getPixelType()); + Brick readBrick(3, 3, 2, externalData.pixelType()); readBrick.SetBasePosition(1, 1, 1); externalData.read(readBrick); for (int index = 0; index < readBrick.size(); index++) { @@ -668,9 +668,9 @@ int main(int argc, char *argv[]) { { Cube externalData; externalData.open("isisTruth_external2"); - cerr << *externalData.getLabel() << endl; + cerr << *externalData.label() << endl; - Brick readBrick(3, 3, 2, externalData.getPixelType()); + Brick readBrick(3, 3, 2, externalData.pixelType()); readBrick.SetBasePosition(1, 1, 1); externalData.read(readBrick); for (int index = 0; index < readBrick.size(); index++) { @@ -696,9 +696,9 @@ int main(int argc, char *argv[]) { Cube externalData; externalData.setExternalDnData("IsisCube_02.lbl"); externalData.create("isisTruth_external3.ecub"); - cerr << *externalData.getLabel() << endl; + cerr << *externalData.label() << endl; - Brick readBrick(3, 3, 2, externalData.getPixelType()); + Brick readBrick(3, 3, 2, externalData.pixelType()); readBrick.SetBasePosition(1, 1, 1); externalData.read(readBrick); for (int index = 0; index < readBrick.size(); index++) { @@ -725,9 +725,9 @@ int main(int argc, char *argv[]) { externalData.open("isisTruth_external3.ecub"); Cube *copiedCube = externalData.copy("isisTruth_external3.copy.ecub", CubeAttributeOutput("+External")); - cerr << *copiedCube->getLabel() << endl; + cerr << *copiedCube->label() << endl; - Brick readBrick(3, 3, 2, copiedCube->getPixelType()); + Brick readBrick(3, 3, 2, copiedCube->pixelType()); readBrick.SetBasePosition(1, 1, 1); copiedCube->read(readBrick); for (int index = 0; index < readBrick.size(); index++) { @@ -766,16 +766,16 @@ int main(int argc, char *argv[]) { void Report(Cube &c) { - cerr << "File = " << IString(QFileInfo(c.getFileName()).fileName()) << endl; - cerr << "Samps = " << c.getSampleCount() << endl; - cerr << "Lines = " << c.getLineCount() << endl; - cerr << "Bands = " << c.getBandCount() << endl; - cerr << "Base = " << c.getBase() << endl; - cerr << "Mult = " << c.getMultiplier() << endl; - cerr << "Type = " << c.getPixelType() << endl; + cerr << "File = " << IString(QFileInfo(c.fileName()).fileName()) << endl; + cerr << "Samps = " << c.sampleCount() << endl; + cerr << "Lines = " << c.lineCount() << endl; + cerr << "Bands = " << c.bandCount() << endl; + cerr << "Base = " << c.base() << endl; + cerr << "Mult = " << c.multiplier() << endl; + cerr << "Type = " << c.pixelType() << endl; // cerr << "Order = " << c.ByteOrder() << endl; // Needs to be system independent cerr << "Atchd = " << c.labelsAttached() << endl; - cerr << "Format = " << c.getFormat() << endl; + cerr << "Format = " << c.format() << endl; cerr << "Open = " << c.isOpen() << endl; try { cerr << "R/O = "; @@ -798,6 +798,6 @@ void Report(Cube &c) { } cerr << endl; - cerr << "Lbytes = " << c.getLabelSize() << endl; + cerr << "Lbytes = " << c.labelSize() << endl; cerr << endl; } diff --git a/isis/src/base/objs/CubeCalculator/CubeCalculator.cpp b/isis/src/base/objs/CubeCalculator/CubeCalculator.cpp index 1165830b98..4df5b4b880 100644 --- a/isis/src/base/objs/CubeCalculator/CubeCalculator.cpp +++ b/isis/src/base/objs/CubeCalculator/CubeCalculator.cpp @@ -196,7 +196,7 @@ namespace Isis { Cube *outCube) { Clear(); - m_outputSamples = outCube->getSampleCount(); + m_outputSamples = outCube->sampleCount(); IString eq = equation; while (eq != "") { @@ -503,8 +503,8 @@ namespace Isis { else if ((token == "phac") || (token == "inac") || (token == "emac")) { int cubeIndex = lastPushToCubeCameras(inCubes); - double centerLine = inCubes[cubeIndex]->getLineCount() / 2.0 + 0.5; - double centerSamp = inCubes[cubeIndex]->getSampleCount() / 2.0 + 0.5; + double centerLine = inCubes[cubeIndex]->lineCount() / 2.0 + 0.5; + double centerSamp = inCubes[cubeIndex]->sampleCount() / 2.0 + 0.5; Camera *cam = (*m_cubeCameras)[cubeIndex]; if (cam->SetImage(centerSamp, centerLine)) { @@ -664,7 +664,7 @@ namespace Isis { // Now we can for sure put the stats object in the right place... put it // there if ((*m_cubeStats)[cubeStatsIndex] == NULL) { - (*m_cubeStats)[cubeStatsIndex] = inCubes[cubeStatsIndex]->getStatistics(); + (*m_cubeStats)[cubeStatsIndex] = inCubes[cubeStatsIndex]->statistics(); } return cubeStatsIndex; @@ -713,7 +713,7 @@ namespace Isis { if ((*m_cubeCameras)[cubeIndex] == NULL) { Camera *cam; try { - cam = inCubes[cubeIndex]->getCamera(); + cam = inCubes[cubeIndex]->camera(); if (cam == NULL) { string msg = "This function requires a camera and the input cube does"; msg += " not have one. You may need to run spiceinit"; diff --git a/isis/src/base/objs/CubeManager/unitTest.cpp b/isis/src/base/objs/CubeManager/unitTest.cpp index 6b91fe9bec..0f7315c2f7 100644 --- a/isis/src/base/objs/CubeManager/unitTest.cpp +++ b/isis/src/base/objs/CubeManager/unitTest.cpp @@ -29,7 +29,7 @@ int main(int argc, char *argv[]) { std::cout << "Cube FileNames: " << std::endl; for(int i = 0; i < (int)cubes.size(); i++) { - std::cout << " " << i + 1 << " : " << FileName(cubes[i]->getFileName()).baseName() << std::endl; + std::cout << " " << i + 1 << " : " << FileName(cubes[i]->fileName()).baseName() << std::endl; } std::cout << std::endl; @@ -61,6 +61,6 @@ int main(int argc, char *argv[]) { std::cout << "Verify cube attributes have been taken into account" << std::endl; std::cout << " Cube # | # of Bands" << std::endl; for(int i = 0; i < (int)cubes.size(); i++) { - std::cout << " Cube " << i + 1 << " | " << cubes[i]->getBandCount() << std::endl; + std::cout << " Cube " << i + 1 << " | " << cubes[i]->bandCount() << std::endl; } } diff --git a/isis/src/base/objs/DemShape/DemShape.cpp b/isis/src/base/objs/DemShape/DemShape.cpp index d73f52dad6..f01a64fae8 100644 --- a/isis/src/base/objs/DemShape/DemShape.cpp +++ b/isis/src/base/objs/DemShape/DemShape.cpp @@ -66,14 +66,14 @@ namespace Isis { // from iteration 1 of setlookdirection (first algorithm) at iteration // 4 and the next setimage has to re-read the data. m_demCube->addCachingAlgorithm(new UniqueIOCachingAlgorithm(5)); - m_demProj = m_demCube->getProjection(); + m_demProj = m_demCube->projection(); m_interp = new Interpolator(Interpolator::BiLinearType); m_portal = new Portal(m_interp->Samples(), m_interp->Lines(), - m_demCube->getPixelType(), + m_demCube->pixelType(), m_interp->HotSample(), m_interp->HotLine()); // Read in the Scale of the DEM file in pixels/degree - const PvlGroup &mapgrp = m_demCube->getLabel()->FindGroup("Mapping", Pvl::Traverse); + const PvlGroup &mapgrp = m_demCube->label()->FindGroup("Mapping", Pvl::Traverse); // Save map scale in pixels per degree m_pixPerDegree = (double) mapgrp["Scale"]; diff --git a/isis/src/base/objs/DemShape/unitTest.cpp b/isis/src/base/objs/DemShape/unitTest.cpp index 5f1df2df9b..e907df0360 100644 --- a/isis/src/base/objs/DemShape/unitTest.cpp +++ b/isis/src/base/objs/DemShape/unitTest.cpp @@ -57,8 +57,8 @@ class MyShape : public DemShape { void testDemCube() { // Cube *demCube(); - IString fileName = demCube()->getFileName(); - cout << " Using dem cube file = " << demCube()->getFileName() << endl; + IString fileName = demCube()->fileName(); + cout << " Using dem cube file = " << demCube()->fileName() << endl; } }; @@ -68,9 +68,9 @@ int main() { QString inputFile = "$mgs/testData/ab102401.cub"; Cube cube; cube.open(inputFile); - Camera *c = cube.getCamera(); + Camera *c = cube.camera(); std::vector radii = c->target()->radii(); - Pvl pvl = *cube.getLabel(); + Pvl pvl = *cube.label(); Spice spi(pvl); Target targ(&spi, pvl); targ.setRadii(radii); diff --git a/isis/src/base/objs/EllipsoidShape/unitTest.cpp b/isis/src/base/objs/EllipsoidShape/unitTest.cpp index f5628a605c..959cbd6f1d 100644 --- a/isis/src/base/objs/EllipsoidShape/unitTest.cpp +++ b/isis/src/base/objs/EllipsoidShape/unitTest.cpp @@ -45,9 +45,9 @@ int main() { QString inputFile = "$mgs/testData/ab102401.cub"; Cube cube; cube.open(inputFile); - Camera *c = cube.getCamera(); + Camera *c = cube.camera(); std::vector radii = c->target()->radii(); - Pvl pvl = *cube.getLabel(); + Pvl pvl = *cube.label(); Spice spi(pvl); Target targ(&spi, pvl); targ.setRadii(radii); diff --git a/isis/src/base/objs/Enlarge/Enlarge.cpp b/isis/src/base/objs/Enlarge/Enlarge.cpp index b3e911872e..f39ffab1fe 100644 --- a/isis/src/base/objs/Enlarge/Enlarge.cpp +++ b/isis/src/base/objs/Enlarge/Enlarge.cpp @@ -44,16 +44,16 @@ namespace Isis { // Set input image area to defaults mdStartSample = 1; - mdEndSample = mInCube->getSampleCount(); + mdEndSample = mInCube->sampleCount(); mdStartLine = 1; - mdEndLine = mInCube->getLineCount(); + mdEndLine = mInCube->lineCount(); // Save off the sample and line magnification mdSampleScale = sampleScale; mdLineScale = lineScale; - miOutputSamples = (int)ceil(mInCube->getSampleCount() * mdSampleScale); - miOutputLines = (int)ceil(mInCube->getLineCount() * mdLineScale); + miOutputSamples = (int)ceil(mInCube->sampleCount() * mdSampleScale); + miOutputLines = (int)ceil(mInCube->lineCount() * mdLineScale); } /** @@ -97,13 +97,13 @@ namespace Isis { if (pdStartSample >= 1) { mdStartSample = pdStartSample; } - if (pdEndSample <= mInCube->getSampleCount()) { + if (pdEndSample <= mInCube->sampleCount()) { mdEndSample = pdEndSample; } if (pdStartLine >= 1) { mdStartLine = pdStartLine; } - if (pdEndLine <= mInCube->getLineCount()) { + if (pdEndLine <= mInCube->lineCount()) { mdEndLine = pdEndLine; } @@ -125,8 +125,8 @@ namespace Isis { * image label */ PvlGroup Enlarge::UpdateOutputLabel(Cube *pOutCube) { - int iNumSamples= mInCube->getSampleCount(); - int iNumLines = mInCube->getLineCount(); + int iNumSamples= mInCube->sampleCount(); + int iNumLines = mInCube->lineCount(); // Construct a label with the results // This is the Results group that will go into the application // log file. This group must be created by the calling application. @@ -145,7 +145,7 @@ namespace Isis { resultsGrp += PvlKeyword("OutputSamples", toString(miOutputLines)); SubArea subArea; - subArea.SetSubArea(mInCube->getLineCount(), mInCube->getSampleCount(), (int)mdStartLine, (int)mdStartSample, + subArea.SetSubArea(mInCube->lineCount(), mInCube->sampleCount(), (int)mdStartLine, (int)mdStartSample, (int)mdEndLine, (int)mdEndSample, 1.0 / mdLineScale, 1.0 / mdSampleScale); subArea.UpdateLabel(mInCube, pOutCube, resultsGrp); diff --git a/isis/src/base/objs/Enlarge/unitTest.cpp b/isis/src/base/objs/Enlarge/unitTest.cpp index 2acc6aaba7..4847bd2b9b 100644 --- a/isis/src/base/objs/Enlarge/unitTest.cpp +++ b/isis/src/base/objs/Enlarge/unitTest.cpp @@ -25,14 +25,14 @@ void IsisMain() { Interpolator *interp = new Interpolator(Interpolator::NearestNeighborType); // Calculate the output size. If there is a fractional pixel, round up - int ons = (int)ceil(inCube->getSampleCount() * sampleScale); - int onl = (int)ceil(inCube->getLineCount() * lineScale); - Cube *outCube = p.SetOutputCube("TO", ons, onl, inCube->getBandCount()); + int ons = (int)ceil(inCube->sampleCount() * sampleScale); + int onl = (int)ceil(inCube->lineCount() * lineScale); + Cube *outCube = p.SetOutputCube("TO", ons, onl, inCube->bandCount()); cerr << "Testing Enlarge Class ... " << endl; p.StartProcess(*trans, *interp); trans->UpdateOutputLabel(outCube); - Pvl *outLabel = outCube->getLabel(); + Pvl *outLabel = outCube->label(); outLabel->DeleteObject("History"); cerr << *outLabel; p.EndProcess(); diff --git a/isis/src/base/objs/Equalization/Equalization.cpp b/isis/src/base/objs/Equalization/Equalization.cpp index e26d8f36fe..c4859a38d6 100644 --- a/isis/src/base/objs/Equalization/Equalization.cpp +++ b/isis/src/base/objs/Equalization/Equalization.cpp @@ -300,8 +300,8 @@ namespace Isis { // Allocate output cube QString out = outList[img].toString(); CubeAttributeOutput outAtt; - p.SetOutputCube(out, outAtt, icube->getSampleCount(), - icube->getLineCount(), icube->getBandCount()); + p.SetOutputCube(out, outAtt, icube->sampleCount(), + icube->lineCount(), icube->bandCount()); // Apply gain/offset to the image ApplyFunctor func(m_adjustments[img]); @@ -368,7 +368,7 @@ namespace Isis { Cube tempCube; tempCube.open(m_imageList[0].toString()); - m_maxBand = tempCube.getBandCount(); + m_maxBand = tempCube.bandCount(); errorCheck(fromListName); } @@ -404,15 +404,15 @@ namespace Isis { cube2.open(m_imageList[j].toString()); // Make sure number of bands match - if (m_maxBand != cube2.getBandCount()) { + if (m_maxBand != cube2.bandCount()) { QString msg = "Number of bands do not match between cubes [" + m_imageList[i].toString() + "] and [" + m_imageList[j].toString() + "]"; throw IException(IException::User, msg, _FILEINFO_); } //Create projection from each cube - Projection *proj1 = cube1.getProjection(); - Projection *proj2 = cube2.getProjection(); + Projection *proj1 = cube1.projection(); + Projection *proj2 = cube2.projection(); // Test to make sure projection parameters match if (*proj1 != *proj2) { diff --git a/isis/src/base/objs/Equalization/unitTest.cpp b/isis/src/base/objs/Equalization/unitTest.cpp index ece3b96164..6ff47e2fe4 100644 --- a/isis/src/base/objs/Equalization/unitTest.cpp +++ b/isis/src/base/objs/Equalization/unitTest.cpp @@ -70,7 +70,7 @@ int main(int argc, char *argv[]) { CubeAttributeInput att; const QString inp = imageList[i].toString(); Cube *inputCube = p.SetInputCube(inp, att); - TestFunctor func(&equalizer, inputCube->getLineCount(), i); + TestFunctor func(&equalizer, inputCube->lineCount(), i); p.ProcessCubeInPlace(func, false); } } diff --git a/isis/src/base/objs/EquatorialCylindricalShape/EquatorialCylindricalShape.cpp b/isis/src/base/objs/EquatorialCylindricalShape/EquatorialCylindricalShape.cpp index b285777970..0d9612bf2f 100644 --- a/isis/src/base/objs/EquatorialCylindricalShape/EquatorialCylindricalShape.cpp +++ b/isis/src/base/objs/EquatorialCylindricalShape/EquatorialCylindricalShape.cpp @@ -48,8 +48,8 @@ namespace Isis { throw IException(IException::User, msg, _FILEINFO_); } - // Table table("ShapeModelStatistics", demCubeFile(), *demCube()->getLabel())); - Table table("ShapeModelStatistics", demCube()->getFileName(), *demCube()->getLabel()); + // Table table("ShapeModelStatistics", demCubeFile(), *demCube()->label())); + Table table("ShapeModelStatistics", demCube()->fileName(), *demCube()->label()); // Find minimum and maximum radius m_minRadius = new Distance(table[0]["MinimumRadius"], Distance::Kilometers); diff --git a/isis/src/base/objs/EquatorialCylindricalShape/unitTest.cpp b/isis/src/base/objs/EquatorialCylindricalShape/unitTest.cpp index d995bafcec..d5d7e5480b 100644 --- a/isis/src/base/objs/EquatorialCylindricalShape/unitTest.cpp +++ b/isis/src/base/objs/EquatorialCylindricalShape/unitTest.cpp @@ -45,9 +45,9 @@ int main() { // string inputFile = "/work/projects/isis/latest/m00775/test/M123149061RE.lev1.cub"; Cube cube; cube.open(inputFile); - Camera *c = cube.getCamera(); + Camera *c = cube.camera(); std::vector radii = c->target()->radii(); - Pvl pvl = *cube.getLabel(); + Pvl pvl = *cube.label(); Spice spi(pvl); Target targ(&spi, pvl); targ.setRadii(radii); diff --git a/isis/src/base/objs/GroundGrid/unitTest.cpp b/isis/src/base/objs/GroundGrid/unitTest.cpp index 33ef6ad7b1..4bb659627d 100644 --- a/isis/src/base/objs/GroundGrid/unitTest.cpp +++ b/isis/src/base/objs/GroundGrid/unitTest.cpp @@ -31,7 +31,7 @@ void IsisMain() { cout << "Create grid..." << endl; Progress progress; - GroundGrid grid(&gmap, false, someCube.getSampleCount(), someCube.getLineCount()); + GroundGrid grid(&gmap, false, someCube.sampleCount(), someCube.lineCount()); grid.SetGroundLimits(Latitude(28.572438078395002, Angle::Degrees), Longitude(-133.284402721991682, Angle::Degrees), Latitude(34.340453944831125, Angle::Degrees), @@ -43,10 +43,10 @@ void IsisMain() { cout << "\n\nGrid cutout: \n" << endl; - for(int line = 0; line < someCube.getLineCount() / 4; line++) { + for(int line = 0; line < someCube.lineCount() / 4; line++) { - for(int i = (int)(someCube.getSampleCount() * 3.0 / 7.0); - i < (someCube.getSampleCount() * 3.5 / 7.0); i++) { + for(int i = (int)(someCube.sampleCount() * 3.0 / 7.0); + i < (someCube.sampleCount() * 3.5 / 7.0); i++) { cout << grid.PixelOnGrid(i, line); } @@ -59,10 +59,10 @@ void IsisMain() { cout << "\n\nGrid cutout with boundary walk: \n" << endl; - for(int line = 0; line < someCube.getLineCount() / 4; line++) { + for(int line = 0; line < someCube.lineCount() / 4; line++) { - for(int i = (int)(someCube.getSampleCount() * 3.0 / 7.0); - i < (someCube.getSampleCount() * 3.5 / 7.0); i++) { + for(int i = (int)(someCube.sampleCount() * 3.0 / 7.0); + i < (someCube.sampleCount() * 3.5 / 7.0); i++) { cout << grid.PixelOnGrid(i, line); } @@ -78,7 +78,7 @@ void IsisMain() { incompleteLabelsCube.open("./unitTest.cub"); UniversalGroundMap gmap(incompleteLabelsCube, UniversalGroundMap::ProjectionFirst); - GroundGrid tmp(&gmap, false, someCube.getSampleCount(), someCube.getLineCount()); + GroundGrid tmp(&gmap, false, someCube.sampleCount(), someCube.lineCount()); Longitude invalidLon; Latitude invalidLat; tmp.SetGroundLimits(Latitude(28.572438078395002, Angle::Degrees), diff --git a/isis/src/base/objs/Gui/GuiCubeParameter.cpp b/isis/src/base/objs/Gui/GuiCubeParameter.cpp index 2935071d0d..34eca24fad 100644 --- a/isis/src/base/objs/Gui/GuiCubeParameter.cpp +++ b/isis/src/base/objs/Gui/GuiCubeParameter.cpp @@ -181,7 +181,7 @@ namespace Isis { temp.open(cubeName); // Get the label and write it out to the log - Isis::Pvl *label = temp.getLabel(); + Isis::Pvl *label = temp.label(); Isis::Application::GuiLog(*label); // Close the cube diff --git a/isis/src/base/objs/Histogram/Histogram.cpp b/isis/src/base/objs/Histogram/Histogram.cpp index d1528e95ab..912f1e3efd 100644 --- a/isis/src/base/objs/Histogram/Histogram.cpp +++ b/isis/src/base/objs/Histogram/Histogram.cpp @@ -82,7 +82,7 @@ namespace Isis { if (addCubeData) { Brick cubeDataBrick((int)(endSample - startSample + 1), - 1, 1, cube.getPixelType()); + 1, 1, cube.pixelType()); // if band == 0, then we're gathering data for all bands. int startBand = statsBand; @@ -90,7 +90,7 @@ namespace Isis { if (statsBand == 0) { startBand = 1; - endBand = cube.getBandCount(); + endBand = cube.bandCount(); } if (progress != NULL) { @@ -248,7 +248,7 @@ namespace Isis { Progress *progress, int nbins, double startSample, double startLine, double endSample, double endLine) { // Make sure band is valid, 0 is valid (means all bands) - if ((statsBand < 0) || (statsBand > cube.getBandCount())) { + if ((statsBand < 0) || (statsBand > cube.bandCount())) { string msg = "Cannot gather histogram for band [" + IString(statsBand) + "]"; throw IException(IException::Programmer, msg, _FILEINFO_); @@ -259,23 +259,23 @@ namespace Isis { double minDnValue = Null; double maxDnValue = Null; - if (cube.getPixelType() == UnsignedByte) { + if (cube.pixelType() == UnsignedByte) { // If we can discretely store every data point, then we can use the // possible extent of the data range as our min/max dn values. if (nbins == 0) { - minDnValue = 0.0 * cube.getMultiplier() + cube.getBase(); - maxDnValue = 255.0 * cube.getMultiplier() + cube.getBase(); + minDnValue = 0.0 * cube.multiplier() + cube.base(); + maxDnValue = 255.0 * cube.multiplier() + cube.base(); nbins = 256; } } - else if (cube.getPixelType() == SignedWord) { + else if (cube.pixelType() == SignedWord) { if (nbins == 0) { - minDnValue = -32768.0 * cube.getMultiplier() + cube.getBase(); - maxDnValue = 32767.0 * cube.getMultiplier() + cube.getBase(); + minDnValue = -32768.0 * cube.multiplier() + cube.base(); + maxDnValue = 32767.0 * cube.multiplier() + cube.base(); nbins = 65536; } } - else if (cube.getPixelType() == Real) { + else if (cube.pixelType() == Real) { // We can't account for all the possibilities of a double inside of any // data range, so don't guess min/max DN values. if (nbins == 0) { @@ -291,19 +291,19 @@ namespace Isis { startSample = 1.0; if (endSample == Null) - endSample = cube.getSampleCount(); + endSample = cube.sampleCount(); if (startLine == Null) startLine = 1.0; if (endLine == Null) - endLine = cube.getLineCount(); + endLine = cube.lineCount(); // If we still need our min/max DN values, find them. if (minDnValue == Null || maxDnValue == Null) { Brick cubeDataBrick((int)(endSample - startSample + 1), - 1, 1, cube.getPixelType()); + 1, 1, cube.pixelType()); Statistics stats; // if band == 0, then we're gathering stats for all bands. I'm really @@ -314,7 +314,7 @@ namespace Isis { if (statsBand == 0) { startBand = 1; - endBand = cube.getBandCount(); + endBand = cube.bandCount(); } if (progress != NULL) { diff --git a/isis/src/base/objs/ImageExporter/ImageExporter.cpp b/isis/src/base/objs/ImageExporter/ImageExporter.cpp index 09135165aa..9b837e4444 100644 --- a/isis/src/base/objs/ImageExporter/ImageExporter.cpp +++ b/isis/src/base/objs/ImageExporter/ImageExporter.cpp @@ -194,8 +194,8 @@ namespace Isis { ProcessExport &p = getProcess(); Cube *cube = addChannel(desc, 0); - m_samples = cube->getSampleCount(); - m_lines = cube->getLineCount(); + m_samples = cube->sampleCount(); + m_lines = cube->lineCount(); m_bands = desc.channelCount(); for (int i = 1; i < desc.channelCount(); i++) addChannel(desc, i); diff --git a/isis/src/base/objs/ImageImporter/ImageImporter.cpp b/isis/src/base/objs/ImageImporter/ImageImporter.cpp index 76221cce28..545b7e51ef 100644 --- a/isis/src/base/objs/ImageImporter/ImageImporter.cpp +++ b/isis/src/base/objs/ImageImporter/ImageImporter.cpp @@ -110,7 +110,7 @@ namespace Isis { ProcessByLine p; Cube *cube = createOutput(outputName, att); - Pvl *label = cube->getLabel(); + Pvl *label = cube->label(); PvlGroup bandBin("BandBin"); PvlKeyword name("Name"); diff --git a/isis/src/base/objs/ImagePolygon/ImagePolygon.cpp b/isis/src/base/objs/ImagePolygon/ImagePolygon.cpp index dfbd22c296..11595a7031 100644 --- a/isis/src/base/objs/ImagePolygon/ImagePolygon.cpp +++ b/isis/src/base/objs/ImagePolygon/ImagePolygon.cpp @@ -122,16 +122,16 @@ namespace Isis { p_isProjected = false; try { - cam = cube.getCamera(); + cam = cube.camera(); } catch(IException &camError) { try { - cube.getProjection(); + cube.projection(); p_isProjected = true; } catch(IException &projError) { QString msg = "Can not create polygon, "; - msg += "cube [" + cube.getFileName(); + msg += "cube [" + cube.fileName(); msg += "] is not a camera or map projection"; IException polyError(IException::User, msg, _FILEINFO_); @@ -145,13 +145,13 @@ namespace Isis { if (cam != NULL) p_isProjected = cam->HasProjection(); // Create brick for use in SetImage - p_brick = new Brick(1, 1, 1, cube.getPixelType()); + p_brick = new Brick(1, 1, 1, cube.pixelType()); //------------------------------------------------------------------------ // Save cube number of samples and lines for later use. //------------------------------------------------------------------------ - p_cubeSamps = cube.getSampleCount(); - p_cubeLines = cube.getLineCount(); + p_cubeSamps = cube.sampleCount(); + p_cubeLines = cube.lineCount(); if (ns != 0) { p_cubeSamps = std::min(p_cubeSamps, ss + ns); @@ -245,7 +245,7 @@ namespace Isis { else { e.print(); // This should be a NAIF error QString msg = "Cannot find polygon for image " - "[" + cube.getFileName() + "]: "; + "[" + cube.fileName() + "]: "; msg += increasePrecision ? "Cannot increase precision any further" : "The increment/step size might be too large"; throw IException(IException::User, msg, _FILEINFO_); @@ -593,7 +593,7 @@ namespace Isis { if (m_leftCoord && m_rightCoord && m_topCoord) { for (int sample = (int)m_leftCoord->x; !m_botCoord && sample <= m_rightCoord->x; sample++) { - for (int line = p_cube->getLineCount(); !m_botCoord && line >= m_topCoord->y; line--) { + for (int line = p_cube->lineCount(); !m_botCoord && line >= m_topCoord->y; line--) { if (SetImage(sample, line)) { m_botCoord = new geos::geom::Coordinate(sample, line); } @@ -826,8 +826,8 @@ namespace Isis { } if (nPoleSample >= 0.5 && nPoleLine >= 0.5 && - nPoleSample <= p_cube->getSampleCount() + 0.5 && - nPoleLine <= p_cube->getLineCount() + 0.5) { + nPoleSample <= p_cube->sampleCount() + 0.5 && + nPoleLine <= p_cube->lineCount() + 0.5) { hasNorthPole = true; } } @@ -846,8 +846,8 @@ namespace Isis { } if (sPoleSample >= 0.5 && sPoleLine >= 0.5 && - sPoleSample <= p_cube->getSampleCount() + 0.5 && - sPoleLine <= p_cube->getLineCount() + 0.5) { + sPoleSample <= p_cube->sampleCount() + 0.5 && + sPoleLine <= p_cube->lineCount() + 0.5) { hasSouthPole = true; } } diff --git a/isis/src/base/objs/ImagePolygon/unitTest.cpp b/isis/src/base/objs/ImagePolygon/unitTest.cpp index 2533511188..709493e4e1 100644 --- a/isis/src/base/objs/ImagePolygon/unitTest.cpp +++ b/isis/src/base/objs/ImagePolygon/unitTest.cpp @@ -38,7 +38,7 @@ int main() { poly.Create(cube); } catch(IException &e) { - QString msg = "Cannot create polygon for [" + cube.getFileName() + "]"; + QString msg = "Cannot create polygon for [" + cube.fileName() + "]"; throw IException(IException::Programmer, msg, _FILEINFO_); } @@ -54,7 +54,7 @@ int main() { poly.Create(cube, 12, 1, 384, 640, 385); } catch(IException &e) { - QString msg = "Cannot create sub-polygon for [" + cube.getFileName() + "]"; + QString msg = "Cannot create sub-polygon for [" + cube.fileName() + "]"; throw IException(IException::Programmer, msg, _FILEINFO_); } @@ -71,7 +71,7 @@ int main() { } catch(IException &e) { QString msg = "Cannot create lower quality polygon for [" + - cube.getFileName() + "]"; + cube.fileName() + "]"; throw IException(IException::Programmer, msg, _FILEINFO_); } // write poly as WKT diff --git a/isis/src/base/objs/Kernels/Kernels.cpp b/isis/src/base/objs/Kernels/Kernels.cpp index f9fdb9389d..29be9bcd76 100644 --- a/isis/src/base/objs/Kernels/Kernels.cpp +++ b/isis/src/base/objs/Kernels/Kernels.cpp @@ -115,7 +115,7 @@ namespace Isis { * @param cube Cube object of ISIS file */ Kernels::Kernels(Cube &cube) { - Init(*cube.getLabel()); + Init(*cube.label()); } /** diff --git a/isis/src/base/objs/LineManager/LineManager.cpp b/isis/src/base/objs/LineManager/LineManager.cpp index e4a4d93185..5aa4073c56 100644 --- a/isis/src/base/objs/LineManager/LineManager.cpp +++ b/isis/src/base/objs/LineManager/LineManager.cpp @@ -41,9 +41,9 @@ namespace Isis { */ LineManager::LineManager(const Isis::Cube &cube, const bool reverse) : - Isis::BufferManager(cube.getSampleCount(), cube.getLineCount(), - cube.getBandCount(), cube.getSampleCount(), 1, 1, - cube.getPixelType(), reverse) { + Isis::BufferManager(cube.sampleCount(), cube.lineCount(), + cube.bandCount(), cube.sampleCount(), 1, 1, + cube.pixelType(), reverse) { } /** diff --git a/isis/src/base/objs/ObservationNumber/ObservationNumber.cpp b/isis/src/base/objs/ObservationNumber/ObservationNumber.cpp index e248922dfd..3b5c4ae818 100644 --- a/isis/src/base/objs/ObservationNumber/ObservationNumber.cpp +++ b/isis/src/base/objs/ObservationNumber/ObservationNumber.cpp @@ -54,7 +54,7 @@ namespace Isis { * @param cube An opened Isis cube */ QString ObservationNumber::Compose(Cube &cube, bool def2filename) { - return Compose(*cube.getLabel(), def2filename); + return Compose(*cube.label(), def2filename); } /** diff --git a/isis/src/base/objs/OverlapNormalization/unitTest.cpp b/isis/src/base/objs/OverlapNormalization/unitTest.cpp index abc8ab7c43..012ece3bfd 100644 --- a/isis/src/base/objs/OverlapNormalization/unitTest.cpp +++ b/isis/src/base/objs/OverlapNormalization/unitTest.cpp @@ -19,9 +19,9 @@ int main(int argc, char *argv[]) { cube1.open("$odyssey/testData/I00824006RDR.lev2.cub"); cube2.open("$odyssey/testData/I01523019RDR.lev2.cub"); cube3.open("$odyssey/testData/I02609002RDR.lev2.cub"); - Isis::Statistics *stats1 = cube1.getStatistics(); - Isis::Statistics *stats2 = cube2.getStatistics(); - Isis::Statistics *stats3 = cube3.getStatistics(); + Isis::Statistics *stats1 = cube1.statistics(); + Isis::Statistics *stats2 = cube2.statistics(); + Isis::Statistics *stats3 = cube3.statistics(); vector statsList; statsList.push_back(stats1); diff --git a/isis/src/base/objs/OverlapStatistics/OverlapStatistics.cpp b/isis/src/base/objs/OverlapStatistics/OverlapStatistics.cpp index e3b7ff6aa2..4264e12b42 100644 --- a/isis/src/base/objs/OverlapStatistics/OverlapStatistics.cpp +++ b/isis/src/base/objs/OverlapStatistics/OverlapStatistics.cpp @@ -63,21 +63,21 @@ namespace Isis { p_sampPercent = sampPercent; // Extract filenames and band number from cubes - p_xFile = x.getFileName(); - p_yFile = y.getFileName(); + p_xFile = x.fileName(); + p_yFile = y.fileName(); // Make sure number of bands match - if (x.getBandCount() != y.getBandCount()) { + if (x.bandCount() != y.bandCount()) { QString msg = "Number of bands do not match between cubes [" + p_xFile.name() + "] and [" + p_yFile.name() + "]"; throw IException(IException::User, msg, _FILEINFO_); } - p_bands = x.getBandCount(); + p_bands = x.bandCount(); p_stats.resize(p_bands); //Create projection from each cube - Projection *projX = x.getProjection(); - Projection *projY = y.getProjection(); + Projection *projX = x.projection(); + Projection *projY = y.projection(); // Test to make sure projection parameters match if (*projX != *projY) { @@ -89,13 +89,13 @@ namespace Isis { // Figure out the x/y range for both images to find the overlap double Xmin1 = projX->ToProjectionX(0.5); double Ymax1 = projX->ToProjectionY(0.5); - double Xmax1 = projX->ToProjectionX(x.getSampleCount() + 0.5); - double Ymin1 = projX->ToProjectionY(x.getLineCount() + 0.5); + double Xmax1 = projX->ToProjectionX(x.sampleCount() + 0.5); + double Ymin1 = projX->ToProjectionY(x.lineCount() + 0.5); double Xmin2 = projY->ToProjectionX(0.5); double Ymax2 = projY->ToProjectionY(0.5); - double Xmax2 = projY->ToProjectionX(y.getSampleCount() + 0.5); - double Ymin2 = projY->ToProjectionY(y.getLineCount() + 0.5); + double Xmax2 = projY->ToProjectionX(y.sampleCount() + 0.5); + double Ymin2 = projY->ToProjectionY(y.lineCount() + 0.5); // Find overlap if ((Xmin1 < Xmax2) && (Xmax1 > Xmin2) && (Ymin1 < Ymax2) && (Ymax1 > Ymin2)) { @@ -141,8 +141,8 @@ namespace Isis { // Collect and store off the overlap statistics for (int band = 1; band <= p_bands; band++) { - Brick b1(p_sampRange, 1, 1, x.getPixelType()); - Brick b2(p_sampRange, 1, 1, y.getPixelType()); + Brick b1(p_sampRange, 1, 1, x.pixelType()); + Brick b2(p_sampRange, 1, 1, y.pixelType()); int i = 0; while(i < p_lineRange) { diff --git a/isis/src/base/objs/Portal/unitTest.cpp b/isis/src/base/objs/Portal/unitTest.cpp index 281154d1f1..1622886027 100644 --- a/isis/src/base/objs/Portal/unitTest.cpp +++ b/isis/src/base/objs/Portal/unitTest.cpp @@ -25,7 +25,7 @@ int main(int argc, char *argv[]) { } // Create a portal buffer for the cube with a size of 1x1 - Isis::Portal portal(1, 1, cube->getPixelType()); + Isis::Portal portal(1, 1, cube->pixelType()); // Get some portals and output the sample, line and band of the upper left corner cout << "Coordinates and value of upper left pixel in several portals:" << endl; diff --git a/isis/src/base/objs/Process/Process.cpp b/isis/src/base/objs/Process/Process.cpp index 5592771493..4e31f6b7e9 100644 --- a/isis/src/base/objs/Process/Process.cpp +++ b/isis/src/base/objs/Process/Process.cpp @@ -104,23 +104,23 @@ namespace Isis { // Test for same size or one in all dimensions if(requirements & Isis::AllMatchOrOne) { if(InputCubes.size() > 0) { - if(cube->getLineCount() != 1) { - if(cube->getLineCount() != InputCubes[0]->getLineCount()) { + if(cube->lineCount() != 1) { + if(cube->lineCount() != InputCubes[0]->lineCount()) { QString message = "The number of lines in the secondary input cubes must match"; message += " the primary input cube or be exactly one"; throw IException(IException::User, message, _FILEINFO_); } } - if(cube->getSampleCount() != 1) { - if(cube->getSampleCount() != InputCubes[0]->getSampleCount()) { + if(cube->sampleCount() != 1) { + if(cube->sampleCount() != InputCubes[0]->sampleCount()) { QString message = "The number of samples in the secondary input cubes must match"; message += " the primary input cube or be exactly one"; throw IException(IException::User, message, _FILEINFO_); } } - if(cube->getBandCount() != 1) { - if(cube->getBandCount() != InputCubes[0]->getBandCount()) { + if(cube->bandCount() != 1) { + if(cube->bandCount() != InputCubes[0]->bandCount()) { QString message = "The number of bands in the secondary input cubes must match"; message += " the primary input cube or be exactly one"; throw IException(IException::User, message, _FILEINFO_); @@ -135,15 +135,15 @@ namespace Isis { // Test for size match if requested if(requirements & Isis::SizeMatch) { if(InputCubes.size() > 0) { - if(cube->getLineCount() != InputCubes[0]->getLineCount()) { + if(cube->lineCount() != InputCubes[0]->lineCount()) { QString message = "The number of lines in the input cubes must match"; throw IException(IException::User, message, _FILEINFO_); } - if(cube->getSampleCount() != InputCubes[0]->getSampleCount()) { + if(cube->sampleCount() != InputCubes[0]->sampleCount()) { QString message = "The number of samples in the input cubes must match"; throw IException(IException::User, message, _FILEINFO_); } - if(cube->getBandCount() != InputCubes[0]->getBandCount()) { + if(cube->bandCount() != InputCubes[0]->bandCount()) { QString message = "The number of bands in the input cubes must match"; throw IException(IException::User, message, _FILEINFO_); } @@ -153,11 +153,11 @@ namespace Isis { // Test for spatial match if requested if(requirements & Isis::SpatialMatch) { if(InputCubes.size() > 0) { - if(cube->getLineCount() != InputCubes[0]->getLineCount()) { + if(cube->lineCount() != InputCubes[0]->lineCount()) { QString message = "The number of lines in the input cubes must match"; throw IException(IException::User, message, _FILEINFO_); } - if(cube->getSampleCount() != InputCubes[0]->getSampleCount()) { + if(cube->sampleCount() != InputCubes[0]->sampleCount()) { QString message = "The number of samples in the input cubes must match"; throw IException(IException::User, message, _FILEINFO_); } @@ -166,7 +166,7 @@ namespace Isis { // Test for one band if(requirements & Isis::OneBand) { - if(cube->getBandCount() != 1) { + if(cube->bandCount() != 1) { QString message = "Input cube [" + fname + "] must have one band"; throw IException(IException::User, message, _FILEINFO_); } @@ -174,9 +174,9 @@ namespace Isis { // Test for same bands or one band if(requirements & Isis::BandMatchOrOne) { - if(cube->getBandCount() != 1) { + if(cube->bandCount() != 1) { if(InputCubes.size() > 0) { - if(cube->getBandCount() != InputCubes[0]->getBandCount()) { + if(cube->bandCount() != InputCubes[0]->bandCount()) { QString message = "The number of bands in the secondary input cubes must match"; message += " the primary input cube or be exactly one"; throw IException(IException::User, message, _FILEINFO_); @@ -271,9 +271,9 @@ namespace Isis { throw IException(IException::Programmer, message, _FILEINFO_); } - int nl = InputCubes[0]->getLineCount(); - int ns = InputCubes[0]->getSampleCount(); - int nb = InputCubes[0]->getBandCount(); + int nl = InputCubes[0]->lineCount(); + int ns = InputCubes[0]->sampleCount(); + int nb = InputCubes[0]->bandCount(); return SetOutputCube(parameter, ns, nl, nb); } @@ -353,7 +353,7 @@ namespace Isis { if(att.propagatePixelType()) { if(InputCubes.size() > 0) { - cube->setPixelType(InputCubes[0]->getPixelType()); + cube->setPixelType(InputCubes[0]->pixelType()); } else { QString msg = "You told me to propagate PixelType from input to output"; @@ -366,7 +366,7 @@ namespace Isis { } if(att.propagateMinimumMaximum()) { - if(cube->getPixelType() == Isis::Real) { + if(cube->pixelType() == Isis::Real) { cube->setBaseMultiplier(0.0, 1.0); } else if(InputCubes.size() == 0) { @@ -374,14 +374,14 @@ namespace Isis { msg += " cube but there are no input cubes loaded"; throw IException(IException::Programmer, msg, _FILEINFO_); } - else if(cube->getPixelType() >= InputCubes[0]->getPixelType()) { - double base = InputCubes[0]->getBase(); - double mult = InputCubes[0]->getMultiplier(); + else if(cube->pixelType() >= InputCubes[0]->pixelType()) { + double base = InputCubes[0]->base(); + double mult = InputCubes[0]->multiplier(); cube->setBaseMultiplier(base, mult); } - else if((cube->getPixelType() != Isis::Real) && - (cube->getPixelType() != Isis::UnsignedByte) && - (cube->getPixelType() != Isis::SignedWord)) { + else if((cube->pixelType() != Isis::Real) && + (cube->pixelType() != Isis::UnsignedByte) && + (cube->pixelType() != Isis::SignedWord)) { QString msg = "Looks like your refactoring to add different pixel types"; msg += " you'll need to make changes here"; throw IException(IException::Programmer, msg, _FILEINFO_); @@ -398,8 +398,8 @@ namespace Isis { } if(InputCubes.size() > 0) { - int needLabBytes = InputCubes[0]->getLabelSize(true) + (1024 * 6); - if(needLabBytes > cube->getLabelSize()) { + int needLabBytes = InputCubes[0]->labelSize(true) + (1024 * 6); + if(needLabBytes > cube->labelSize()) { cube->setLabelSize(needLabBytes); } } @@ -410,21 +410,21 @@ namespace Isis { // Transfer labels from the first input cube if((p_propagateLabels) && (InputCubes.size() > 0)) { Isis::PvlObject &incube = - InputCubes[0]->getLabel()->FindObject("IsisCube"); - Isis::PvlObject &outcube = cube->getLabel()->FindObject("IsisCube"); + InputCubes[0]->label()->FindObject("IsisCube"); + Isis::PvlObject &outcube = cube->label()->FindObject("IsisCube"); for(int i = 0; i < incube.Groups(); i++) { outcube.AddGroup(incube.Group(i)); } - if (InputCubes[0]->getLabel()->HasObject("NaifKeywords")) { - cube->getLabel()->AddObject( - InputCubes[0]->getLabel()->FindObject("NaifKeywords")); + if (InputCubes[0]->label()->HasObject("NaifKeywords")) { + cube->label()->AddObject( + InputCubes[0]->label()->FindObject("NaifKeywords")); } } // Transfer tables from the first input cube if((p_propagateTables) && (InputCubes.size() > 0)) { - Isis::Pvl &inlab = *InputCubes[0]->getLabel(); + Isis::Pvl &inlab = *InputCubes[0]->label(); for(int i = 0; i < inlab.Objects(); i++) { if(inlab.Object(i).IsNamed("Table")) { Isis::Blob t((QString)inlab.Object(i)["Name"], inlab.Object(i).Name()); @@ -436,7 +436,7 @@ namespace Isis { // Transfer blobs from the first input cube if((p_propagatePolygons) && (InputCubes.size() > 0)) { - Isis::Pvl &inlab = *InputCubes[0]->getLabel(); + Isis::Pvl &inlab = *InputCubes[0]->label(); for(int i = 0; i < inlab.Objects(); i++) { if(inlab.Object(i).IsNamed("Polygon")) { Isis::Blob t((QString)inlab.Object(i)["Name"], inlab.Object(i).Name()); @@ -448,7 +448,7 @@ namespace Isis { // Transfer tables from the first input cube if((p_propagateOriginalLabel) && (InputCubes.size() > 0)) { - Isis::Pvl &inlab = *InputCubes[0]->getLabel(); + Isis::Pvl &inlab = *InputCubes[0]->label(); for(int i = 0; i < inlab.Objects(); i++) { if(inlab.Object(i).IsNamed("OriginalLabel")) { Isis::OriginalLabel ol; @@ -568,7 +568,7 @@ namespace Isis { for(int i = 0; i < (int)OutputCubes.size(); i++) { Isis::PvlObject &inCubeLabels = inLabels.FindObject("IsisCube"); - Isis::Pvl &outLabels(*OutputCubes[i]->getLabel()); + Isis::Pvl &outLabels(*OutputCubes[i]->label()); Isis::PvlObject &outCubeLabels = outLabels.FindObject("IsisCube"); for(int g = 0; g < inCubeLabels.Groups(); g++) { @@ -600,7 +600,7 @@ namespace Isis { void Process::PropagateTables(const QString &fromName) { Cube *fromCube = new Isis::Cube; fromCube->open(fromName); - const Pvl *fromLabels = fromCube->getLabel(); + const Pvl *fromLabels = fromCube->label(); for (unsigned int i = 0; i < OutputCubes.size(); i++) { for (int j = 0; j < fromLabels->Objects(); j++) { @@ -688,7 +688,7 @@ namespace Isis { if(p_propagateHistory) { bool addedHist = false; if(InputCubes.size() > 0) { - Isis::Pvl & inlab = *InputCubes[0]->getLabel(); + Isis::Pvl & inlab = *InputCubes[0]->label(); for(int i = 0; i < inlab.Objects(); i++) { if(inlab.Object(i).IsNamed("History") && Isis::iApp != NULL) { Isis::History h((QString)inlab.Object(i)["Name"]); @@ -727,8 +727,8 @@ namespace Isis { Isis::Statistics *cubeStats = new Isis::Statistics(); int bandStart = 1; - int bandStop = cube->getBandCount(); - int maxSteps = cube->getLineCount() * cube->getBandCount(); + int bandStop = cube->bandCount(); + int maxSteps = cube->lineCount() * cube->bandCount(); QString cubeNumStr = toString(cubeNum + 1); QString totalCubes = toString((int)InputCubes.size()); @@ -744,7 +744,7 @@ namespace Isis { for(int useBand = bandStart; useBand <= bandStop; useBand++) { Isis::Statistics *bandStats = new Isis::Statistics(); - for(int i = 1; i <= cube->getLineCount(); i++) { + for(int i = 1; i <= cube->lineCount(); i++) { line.SetLine(i, useBand); cube->read(line); bandStats->AddData(line.DoubleBuffer(), line.size()); diff --git a/isis/src/base/objs/Process/unitTest.cpp b/isis/src/base/objs/Process/unitTest.cpp index 0bfe2254f7..3887b97b4b 100644 --- a/isis/src/base/objs/Process/unitTest.cpp +++ b/isis/src/base/objs/Process/unitTest.cpp @@ -63,9 +63,9 @@ void IsisMain() { cout << "Testing SetInputCube/SetInputWorkCube ... " << endl; Isis::Cube *icube = p.SetInputCube("FROM"); - cout << "Samples: " << icube->getSampleCount() << endl; - cout << "Lines: " << icube->getLineCount() << endl; - cout << "Bands: " << icube->getBandCount() << endl; + cout << "Samples: " << icube->sampleCount() << endl; + cout << "Lines: " << icube->lineCount() << endl; + cout << "Bands: " << icube->bandCount() << endl; cout << endl; cout << "Testing SetInputWorkCube OneBand Error ..." << endl; @@ -190,7 +190,7 @@ void IsisMain() { Isis::Process p3; p3.SetInputCube("FROM"); Isis::Cube *ocube = p3.SetOutputCube("TO"); - Isis::PvlGroup lab = ocube->getGroup("Test"); + Isis::PvlGroup lab = ocube->group("Test"); cout << lab["Keyword"] << endl; cout << endl; @@ -245,7 +245,7 @@ void IsisMain() { p6.SetInputCube("FROM"); Isis::Cube *ocube8 = p6.SetOutputCube("TO"); - Isis::Pvl *inlab1 = ocube8->getLabel(); + Isis::Pvl *inlab1 = ocube8->label(); for(int i = 0; i < inlab1->Objects(); i++) { if(inlab1->Object(i).IsNamed("Polygon")) { cout << "Image Polygon does exist" << endl; @@ -258,7 +258,7 @@ void IsisMain() { p6.PropagatePolygons(false); bool exists = false; Isis::Cube *ocube9 = p6.SetOutputCube("TO4", 126, 126, 1); - Isis::Pvl *inlab2 = ocube9->getLabel(); + Isis::Pvl *inlab2 = ocube9->label(); for(int i = 0; i < inlab2->Objects(); i++) { if(inlab2->Object(i).IsNamed("Polygon")) { cout << "Image Polygon does exist" << endl; diff --git a/isis/src/base/objs/ProcessByBoxcar/ProcessByBoxcar.cpp b/isis/src/base/objs/ProcessByBoxcar/ProcessByBoxcar.cpp index 01e4da260a..b36f8cb015 100644 --- a/isis/src/base/objs/ProcessByBoxcar/ProcessByBoxcar.cpp +++ b/isis/src/base/objs/ProcessByBoxcar/ProcessByBoxcar.cpp @@ -67,21 +67,21 @@ namespace Isis { } // The lines in the input and output must match - if(InputCubes[0]->getLineCount() != OutputCubes[0]->getLineCount()) { + if(InputCubes[0]->lineCount() != OutputCubes[0]->lineCount()) { string m = "The number of lines in the input and output cubes "; m += "must match"; throw IException(IException::Programmer, m, _FILEINFO_); } // The samples in the input and output must match - if(InputCubes[0]->getSampleCount() != OutputCubes[0]->getSampleCount()) { + if(InputCubes[0]->sampleCount() != OutputCubes[0]->sampleCount()) { string m = "The number of samples in the input and output cubes "; m += "must match"; throw IException(IException::Programmer, m, _FILEINFO_); } // The bands in the input and output must match - if(InputCubes[0]->getBandCount() != OutputCubes[0]->getBandCount()) { + if(InputCubes[0]->bandCount() != OutputCubes[0]->bandCount()) { string m = "The number of bands in the input and output cubes "; m += "must match"; throw IException(IException::Programmer, m, _FILEINFO_); @@ -102,7 +102,7 @@ namespace Isis { OutputCubes[0]->addCachingAlgorithm(new BoxcarCachingAlgorithm()); // Loop and let the app programmer use the boxcar to change output pixel - p_progress->SetMaximumSteps(InputCubes[0]->getLineCount()*InputCubes[0]->getBandCount()); + p_progress->SetMaximumSteps(InputCubes[0]->lineCount()*InputCubes[0]->bandCount()); p_progress->CheckStatus(); box.begin(); diff --git a/isis/src/base/objs/ProcessByBrick/ProcessByBrick.cpp b/isis/src/base/objs/ProcessByBrick/ProcessByBrick.cpp index d2ee7d5392..bc1b5c71c2 100644 --- a/isis/src/base/objs/ProcessByBrick/ProcessByBrick.cpp +++ b/isis/src/base/objs/ProcessByBrick/ProcessByBrick.cpp @@ -440,7 +440,7 @@ namespace Isis { // Enforce same band if(imgrs[i]->Band() != imgrs[0]->Band() && - InputCubes[i]->getBandCount() != 1) { + InputCubes[i]->bandCount() != 1) { imgrs[i]->SetBaseBand(imgrs[0]->Band()); } } @@ -537,9 +537,9 @@ namespace Isis { int maxBands = 0; for (unsigned int i = 0; i < cubes.size(); i++) { - int sampleCount = cubes[i]->getSampleCount(); - int lineCount = cubes[i]->getLineCount(); - int bandCount = cubes[i]->getBandCount(); + int sampleCount = cubes[i]->sampleCount(); + int lineCount = cubes[i]->lineCount(); + int bandCount = cubes[i]->bandCount(); if (sampleCount > maxSamples) maxSamples = sampleCount; @@ -690,13 +690,13 @@ namespace Isis { p_inputBrickSamples[1], p_inputBrickLines[1], p_inputBrickBands[1], - InputCubes[0]->getPixelType(), + InputCubes[0]->pixelType(), p_reverse); *obrick = new Brick(maxSamples, maxLines, maxBands, p_outputBrickSamples[1], p_outputBrickLines[1], p_outputBrickBands[1], - OutputCubes[0]->getPixelType(), + OutputCubes[0]->pixelType(), p_reverse); } @@ -796,7 +796,7 @@ namespace Isis { p_inputBrickSamples[i], p_inputBrickLines[i], p_inputBrickBands[i], - InputCubes[i - 1]->getPixelType(), + InputCubes[i - 1]->pixelType(), p_reverse); } ibrick->begin(); @@ -821,7 +821,7 @@ namespace Isis { p_outputBrickSamples[i], p_outputBrickLines[i], p_outputBrickBands[i], - OutputCubes[i - 1]->getPixelType(), + OutputCubes[i - 1]->pixelType(), p_reverse); } obrick->begin(); diff --git a/isis/src/base/objs/ProcessByBrick/ProcessByBrick.h b/isis/src/base/objs/ProcessByBrick/ProcessByBrick.h index 0891a37e4c..07e91f3fda 100644 --- a/isis/src/base/objs/ProcessByBrick/ProcessByBrick.h +++ b/isis/src/base/objs/ProcessByBrick/ProcessByBrick.h @@ -636,7 +636,7 @@ namespace Isis { if (i != 0 && functorBricks.first.size() && inputBrick->Band() != functorBricks.first[0]->Band() && - m_inputCubes[i]->getBandCount() != 1) { + m_inputCubes[i]->bandCount() != 1) { inputBrick->SetBaseBand(functorBricks.first[0]->Band()); } diff --git a/isis/src/base/objs/ProcessByBrick/unitTest.cpp b/isis/src/base/objs/ProcessByBrick/unitTest.cpp index 5ec79fa418..60b7b2c3fc 100644 --- a/isis/src/base/objs/ProcessByBrick/unitTest.cpp +++ b/isis/src/base/objs/ProcessByBrick/unitTest.cpp @@ -51,8 +51,8 @@ void IsisMain() { cout << "Functor2 - ProcessCube One Thread\n"; Cube *icube = p.SetInputCube("FROM"); p.SetBrickSize(10, 10, 2); - p.SetOutputCube("TO", icube->getSampleCount(), icube->getLineCount(), - icube->getBandCount()); + p.SetOutputCube("TO", icube->sampleCount(), icube->lineCount(), + icube->bandCount()); Functor2 functor; p.ProcessCube(functor, false); p.EndProcess(); @@ -64,8 +64,8 @@ void IsisMain() { Cube *icube = p.SetInputCube("FROM"); p.SetInputCube("FROM2"); p.SetBrickSize(10, 10, 2); - p.SetOutputCube("TO", icube->getSampleCount(), icube->getLineCount(), icube->getBandCount()); - p.SetOutputCube("TO2", icube->getSampleCount(), icube->getLineCount(), icube->getBandCount()); + p.SetOutputCube("TO", icube->sampleCount(), icube->lineCount(), icube->bandCount()); + p.SetOutputCube("TO2", icube->sampleCount(), icube->lineCount(), icube->bandCount()); Functor3 functor; p.ProcessCubes(functor, false); @@ -77,15 +77,15 @@ void IsisMain() { cout << "Functor4 - ProcessCube Threaded\n"; Cube *icube = p.SetInputCube("FROM"); p.SetBrickSize(10, 10, 2); - p.SetOutputCube("TO", icube->getSampleCount(), icube->getLineCount(), - icube->getBandCount()); + p.SetOutputCube("TO", icube->sampleCount(), icube->lineCount(), + icube->bandCount()); Functor4 functor; p.ProcessCube(functor); p.EndProcess(); Cube cube; cube.open(Application::GetUserInterface().GetFileName("TO")); - Statistics *statsBand1 = cube.getStatistics(1); - Statistics *statsBand2 = cube.getStatistics(2); + Statistics *statsBand1 = cube.statistics(1); + Statistics *statsBand2 = cube.statistics(2); std::cerr << "Averages: " << statsBand1->Average() << ", " << statsBand2->Average() << "\n"; cout << "\n"; @@ -103,8 +103,8 @@ void IsisMain() { cube->close(); cube = new Cube; cube->open(Application::GetUserInterface().GetFileName("TO"), "rw"); - Statistics *statsBand1 = cube->getStatistics(1); - Statistics *statsBand2 = cube->getStatistics(2); + Statistics *statsBand1 = cube->statistics(1); + Statistics *statsBand2 = cube->statistics(2); delete cube; std::cerr << "Averages: " << statsBand1->Average() << ", " << statsBand2->Average() << "\n"; @@ -118,8 +118,8 @@ void IsisMain() { Cube *icube = p.SetInputCube("FROM"); p.SetInputCube("FROM2"); p.SetBrickSize(10, 10, 2); - p.SetOutputCube("TO", icube->getSampleCount(), icube->getLineCount(), icube->getBandCount()); - p.SetOutputCube("TO2", icube->getSampleCount(), icube->getLineCount(), icube->getBandCount()); + p.SetOutputCube("TO", icube->sampleCount(), icube->lineCount(), icube->bandCount()); + p.SetOutputCube("TO2", icube->sampleCount(), icube->lineCount(), icube->bandCount()); p.StartProcess(twoInAndOut); p.EndProcess(); } diff --git a/isis/src/base/objs/ProcessByLine/ProcessByLine.cpp b/isis/src/base/objs/ProcessByLine/ProcessByLine.cpp index bede166023..b4a0e53098 100644 --- a/isis/src/base/objs/ProcessByLine/ProcessByLine.cpp +++ b/isis/src/base/objs/ProcessByLine/ProcessByLine.cpp @@ -117,10 +117,10 @@ namespace Isis { // Determine if we have an input or output if(InputCubes.size() == 1) { - SetBrickSize(InputCubes[0]->getSampleCount(), 1, 1); + SetBrickSize(InputCubes[0]->sampleCount(), 1, 1); } else { - SetBrickSize(OutputCubes[0]->getSampleCount(), 1, 1); + SetBrickSize(OutputCubes[0]->sampleCount(), 1, 1); } } @@ -168,21 +168,21 @@ namespace Isis { } // The lines in the input and output must match - if(InputCubes[0]->getLineCount() != OutputCubes[0]->getLineCount()) { + if(InputCubes[0]->lineCount() != OutputCubes[0]->lineCount()) { string m = "The number of lines in the input and output cubes "; m += "must match"; throw IException(IException::Programmer, m, _FILEINFO_); } // The bands in the input and output must match - if(InputCubes[0]->getBandCount() != OutputCubes[0]->getBandCount()) { + if(InputCubes[0]->bandCount() != OutputCubes[0]->bandCount()) { string m = "The number of bands in the input and output cubes "; m += "must match"; throw IException(IException::Programmer, m, _FILEINFO_); } - SetInputBrickSize(InputCubes[0]->getSampleCount(), 1, 1); - SetOutputBrickSize(OutputCubes[0]->getSampleCount(), 1, 1); + SetInputBrickSize(InputCubes[0]->sampleCount(), 1, 1); + SetOutputBrickSize(OutputCubes[0]->sampleCount(), 1, 1); } /** @@ -224,12 +224,12 @@ namespace Isis { // Make sure all the output images have the same number of bands as // the first input/output cube for(unsigned int i = 0; i < OutputCubes.size(); i++) { - if(OutputCubes[i]->getLineCount() != OutputCubes[0]->getLineCount()) { + if(OutputCubes[i]->lineCount() != OutputCubes[0]->lineCount()) { string m = "All output cubes must have the same number of lines "; m += "as the first input cube or output cube"; throw IException(IException::Programmer, m, _FILEINFO_); } - if(OutputCubes[i]->getBandCount() != OutputCubes[0]->getBandCount()) { + if(OutputCubes[i]->bandCount() != OutputCubes[0]->bandCount()) { string m = "All output cubes must have the same number of bands "; m += "as the first input cube or output cube"; throw IException(IException::Programmer, m, _FILEINFO_); @@ -237,10 +237,10 @@ namespace Isis { } for(unsigned int i = 0; i < InputCubes.size(); i++) { - SetInputBrickSize(InputCubes[i]->getSampleCount(), 1, 1, i + 1); + SetInputBrickSize(InputCubes[i]->sampleCount(), 1, 1, i + 1); } for(unsigned int i = 0; i < OutputCubes.size(); i++) { - SetOutputBrickSize(OutputCubes[i]->getSampleCount(), 1, 1, i + 1); + SetOutputBrickSize(OutputCubes[i]->sampleCount(), 1, 1, i + 1); } } /** diff --git a/isis/src/base/objs/ProcessByQuickFilter/ProcessByQuickFilter.cpp b/isis/src/base/objs/ProcessByQuickFilter/ProcessByQuickFilter.cpp index be1dfb5f17..6cb50894da 100644 --- a/isis/src/base/objs/ProcessByQuickFilter/ProcessByQuickFilter.cpp +++ b/isis/src/base/objs/ProcessByQuickFilter/ProcessByQuickFilter.cpp @@ -60,19 +60,19 @@ namespace Isis { } // The lines in the input and output must match - if(InputCubes[0]->getLineCount() != OutputCubes[0]->getLineCount()) { + if(InputCubes[0]->lineCount() != OutputCubes[0]->lineCount()) { string m = "The lines in the input and output cube must match"; throw IException(IException::Programmer, m, _FILEINFO_); } // The samples in the input and output must match - if(InputCubes[0]->getSampleCount() != OutputCubes[0]->getSampleCount()) { + if(InputCubes[0]->sampleCount() != OutputCubes[0]->sampleCount()) { string m = "The samples in the input and output cube must match"; throw IException(IException::Programmer, m, _FILEINFO_); } // The bands in the input and output must match - if(InputCubes[0]->getBandCount() != OutputCubes[0]->getBandCount()) { + if(InputCubes[0]->bandCount() != OutputCubes[0]->bandCount()) { string m = "The bands in the input and output cube must match"; throw IException(IException::Programmer, m, _FILEINFO_); } @@ -83,9 +83,9 @@ namespace Isis { Isis::LineManager *botline = new Isis::LineManager(*InputCubes[0]); Isis::LineManager *oline = new Isis::LineManager(*OutputCubes[0]); - int lines = InputCubes[0]->getLineCount(); - int samples = InputCubes[0]->getSampleCount(); - int bands = InputCubes[0]->getBandCount(); + int lines = InputCubes[0]->lineCount(); + int samples = InputCubes[0]->sampleCount(); + int bands = InputCubes[0]->bandCount(); // See if we need to get parameters from the user if(p_getParametersFromUser) GetFilterParameters(); @@ -151,7 +151,7 @@ namespace Isis { p_progress->CheckStatus(); if(line == lines) continue; - if(bot <= InputCubes[0]->getLineCount()) { + if(bot <= InputCubes[0]->lineCount()) { botline->SetLine(bot, band); } else { diff --git a/isis/src/base/objs/ProcessBySample/ProcessBySample.cpp b/isis/src/base/objs/ProcessBySample/ProcessBySample.cpp index db574f56fd..bfb14c28f4 100644 --- a/isis/src/base/objs/ProcessBySample/ProcessBySample.cpp +++ b/isis/src/base/objs/ProcessBySample/ProcessBySample.cpp @@ -154,8 +154,8 @@ namespace Isis { } // Determine if we have an input or output - if(InputCubes.size() == 1) SetBrickSize(1, InputCubes[0]->getLineCount(), 1); - else SetBrickSize(1, OutputCubes[0]->getLineCount(), 1); + if(InputCubes.size() == 1) SetBrickSize(1, InputCubes[0]->lineCount(), 1); + else SetBrickSize(1, OutputCubes[0]->lineCount(), 1); } @@ -174,21 +174,21 @@ namespace Isis { } // The samples in the input and output must match - if(InputCubes[0]->getSampleCount() != OutputCubes[0]->getSampleCount()) { + if(InputCubes[0]->sampleCount() != OutputCubes[0]->sampleCount()) { string m = "The number of samples in the input and output cubes "; m += "must match"; throw IException(IException::Programmer, m, _FILEINFO_); } // The bands in the input and output must match - if(InputCubes[0]->getBandCount() != OutputCubes[0]->getBandCount()) { + if(InputCubes[0]->bandCount() != OutputCubes[0]->bandCount()) { string m = "The number of bands in the input and output cubes "; m += "must match"; throw IException(IException::Programmer, m, _FILEINFO_); } - SetInputBrickSize(1, InputCubes[0]->getLineCount(), 1); - SetOutputBrickSize(1, OutputCubes[0]->getLineCount(), 1); + SetInputBrickSize(1, InputCubes[0]->lineCount(), 1); + SetOutputBrickSize(1, OutputCubes[0]->lineCount(), 1); } @@ -205,12 +205,12 @@ namespace Isis { // Make sure all the output images have the same number of bands as // the first input/output cube for(unsigned int i = 0; i < OutputCubes.size(); i++) { - if(OutputCubes[i]->getSampleCount() != OutputCubes[0]->getSampleCount()) { + if(OutputCubes[i]->sampleCount() != OutputCubes[0]->sampleCount()) { string m = "All output cubes must have the same number of samples "; m += "as the first input cube or output cube"; throw IException(IException::Programmer, m, _FILEINFO_); } - if(OutputCubes[i]->getBandCount() != OutputCubes[0]->getBandCount()) { + if(OutputCubes[i]->bandCount() != OutputCubes[0]->bandCount()) { string m = "All output cubes must have the same number of bands "; m += "as the first input cube or output cube"; throw IException(IException::Programmer, m, _FILEINFO_); @@ -218,10 +218,10 @@ namespace Isis { } for(unsigned int i = 0; i < InputCubes.size(); i++) { - SetInputBrickSize(1, InputCubes[i]->getLineCount(), 1, i + 1); + SetInputBrickSize(1, InputCubes[i]->lineCount(), 1, i + 1); } for(unsigned int i = 0; i < OutputCubes.size(); i++) { - SetOutputBrickSize(1, OutputCubes[i]->getLineCount(), 1, i + 1); + SetOutputBrickSize(1, OutputCubes[i]->lineCount(), 1, i + 1); } } } diff --git a/isis/src/base/objs/ProcessBySpectra/ProcessBySpectra.cpp b/isis/src/base/objs/ProcessBySpectra/ProcessBySpectra.cpp index 8c353172a6..5f15358f7c 100644 --- a/isis/src/base/objs/ProcessBySpectra/ProcessBySpectra.cpp +++ b/isis/src/base/objs/ProcessBySpectra/ProcessBySpectra.cpp @@ -166,14 +166,14 @@ namespace Isis { int ns, nl, nb; if(InputCubes.size() == 1) { - ns = InputCubes[0]->getSampleCount(); - nl = InputCubes[0]->getLineCount(); - nb = InputCubes[0]->getBandCount(); + ns = InputCubes[0]->sampleCount(); + nl = InputCubes[0]->lineCount(); + nb = InputCubes[0]->bandCount(); } else { - ns = OutputCubes[0]->getSampleCount(); - nl = OutputCubes[0]->getLineCount(); - nb = OutputCubes[0]->getBandCount(); + ns = OutputCubes[0]->sampleCount(); + nl = OutputCubes[0]->lineCount(); + nb = OutputCubes[0]->bandCount(); } if(Type() == PerPixel) SetBrickSize(1, 1, nb); else if(Type() == ByLine) SetBrickSize(ns, 1, nb); @@ -196,20 +196,20 @@ namespace Isis { } if(Type() == PerPixel) { - SetInputBrickSize(1, 1, InputCubes[0]->getBandCount()); - SetOutputBrickSize(1, 1, OutputCubes[0]->getBandCount()); + SetInputBrickSize(1, 1, InputCubes[0]->bandCount()); + SetOutputBrickSize(1, 1, OutputCubes[0]->bandCount()); } else if(Type() == ByLine) { - SetInputBrickSize(InputCubes[0]->getSampleCount(), 1, - InputCubes[0]->getBandCount()); - SetOutputBrickSize(OutputCubes[0]->getSampleCount(), 1, - OutputCubes[0]->getBandCount()); + SetInputBrickSize(InputCubes[0]->sampleCount(), 1, + InputCubes[0]->bandCount()); + SetOutputBrickSize(OutputCubes[0]->sampleCount(), 1, + OutputCubes[0]->bandCount()); } else { - SetInputBrickSize(1, InputCubes[0]->getLineCount(), - InputCubes[0]->getBandCount()); - SetOutputBrickSize(1, OutputCubes[0]->getLineCount(), - OutputCubes[0]->getBandCount()); + SetInputBrickSize(1, InputCubes[0]->lineCount(), + InputCubes[0]->bandCount()); + SetOutputBrickSize(1, OutputCubes[0]->lineCount(), + OutputCubes[0]->bandCount()); } } @@ -220,30 +220,30 @@ namespace Isis { void ProcessBySpectra::SetBrickSizesForProcessCubes() { if(Type() == PerPixel) { for(unsigned int i = 0; i < InputCubes.size(); i++) { - SetInputBrickSize(1, 1, InputCubes[i]->getBandCount(), i + 1); + SetInputBrickSize(1, 1, InputCubes[i]->bandCount(), i + 1); } for(unsigned int i = 0; i < OutputCubes.size(); i++) { - SetOutputBrickSize(1, 1, OutputCubes[i]->getBandCount(), i + 1); + SetOutputBrickSize(1, 1, OutputCubes[i]->bandCount(), i + 1); } } else if(Type() == ByLine) { for(unsigned int i = 0; i < InputCubes.size(); i++) { - SetInputBrickSize(InputCubes[i]->getSampleCount(), 1, - InputCubes[i]->getBandCount(), i + 1); + SetInputBrickSize(InputCubes[i]->sampleCount(), 1, + InputCubes[i]->bandCount(), i + 1); } for(unsigned int i = 0; i < OutputCubes.size(); i++) { - SetOutputBrickSize(OutputCubes[i]->getSampleCount(), 1, - OutputCubes[i]->getBandCount(), i + 1); + SetOutputBrickSize(OutputCubes[i]->sampleCount(), 1, + OutputCubes[i]->bandCount(), i + 1); } } else { for(unsigned int i = 0; i < InputCubes.size(); i++) { - SetInputBrickSize(1, InputCubes[i]->getLineCount(), - InputCubes[i]->getBandCount(), i + 1); + SetInputBrickSize(1, InputCubes[i]->lineCount(), + InputCubes[i]->bandCount(), i + 1); } for(unsigned int i = 0; i < OutputCubes.size(); i++) { - SetOutputBrickSize(1, OutputCubes[i]->getLineCount(), - OutputCubes[i]->getBandCount(), i + 1); + SetOutputBrickSize(1, OutputCubes[i]->lineCount(), + OutputCubes[i]->bandCount(), i + 1); } } } diff --git a/isis/src/base/objs/ProcessByTile/ProcessByTile.cpp b/isis/src/base/objs/ProcessByTile/ProcessByTile.cpp index b9a7742a85..42b02e33bb 100644 --- a/isis/src/base/objs/ProcessByTile/ProcessByTile.cpp +++ b/isis/src/base/objs/ProcessByTile/ProcessByTile.cpp @@ -146,21 +146,21 @@ namespace Isis { */ void ProcessByTile::SetBrickSizesForProcessCube() { // The lines in the input and output must match - if(InputCubes[0]->getLineCount() != OutputCubes[0]->getLineCount()) { + if(InputCubes[0]->lineCount() != OutputCubes[0]->lineCount()) { string m = "The number of lines in the input and output cubes "; m += "must match"; throw IException(IException::Programmer, m, _FILEINFO_); } // The samples in the input and output must match - if(InputCubes[0]->getSampleCount() != OutputCubes[0]->getSampleCount()) { + if(InputCubes[0]->sampleCount() != OutputCubes[0]->sampleCount()) { string m = "The number of samples in the input and output cubes "; m += "must match"; throw IException(IException::Programmer, m, _FILEINFO_); } // The bands in the input and output must match - if(InputCubes[0]->getBandCount() != OutputCubes[0]->getBandCount()) { + if(InputCubes[0]->bandCount() != OutputCubes[0]->bandCount()) { string m = "The number of bands in the input and output cubes "; m += "must match"; throw IException(IException::Programmer, m, _FILEINFO_); @@ -189,7 +189,7 @@ namespace Isis { // Make sure all the output images have the same number of bands as // the first input/output cube for(unsigned int i = 0; i < OutputCubes.size(); i++) { - if(OutputCubes[i]->getBandCount() != InputCubes[0]->getBandCount()) { + if(OutputCubes[i]->bandCount() != InputCubes[0]->bandCount()) { string m = "All output cubes must have the same number of bands "; m += "as the first input cube or output cube"; throw IException(IException::Programmer, m, _FILEINFO_); diff --git a/isis/src/base/objs/ProcessByTile/unitTest.cpp b/isis/src/base/objs/ProcessByTile/unitTest.cpp index d819020900..ae8738c9b4 100644 --- a/isis/src/base/objs/ProcessByTile/unitTest.cpp +++ b/isis/src/base/objs/ProcessByTile/unitTest.cpp @@ -13,8 +13,8 @@ void IsisMain() { Isis::Cube *icube = p.SetInputCube("FROM"); p.SetInputCube("FROM2"); p.SetTileSize(10, 10); - p.SetOutputCube("TO", icube->getSampleCount() + 10, icube->getLineCount(), icube->getBandCount()); - p.SetOutputCube("TO2", icube->getSampleCount() + 10, icube->getLineCount(), icube->getBandCount()); + p.SetOutputCube("TO", icube->sampleCount() + 10, icube->lineCount(), icube->bandCount()); + p.SetOutputCube("TO2", icube->sampleCount() + 10, icube->lineCount(), icube->bandCount()); p.StartProcess(twoInAndOut); p.EndProcess(); diff --git a/isis/src/base/objs/ProcessExport/ProcessExport.cpp b/isis/src/base/objs/ProcessExport/ProcessExport.cpp index 20d6651c5d..eb98aef562 100644 --- a/isis/src/base/objs/ProcessExport/ProcessExport.cpp +++ b/isis/src/base/objs/ProcessExport/ProcessExport.cpp @@ -380,7 +380,7 @@ namespace Isis { // Or get the automatic parameters else if(strType != "NONE") { - Isis::Histogram *hist = InputCubes[i]->getHistogram(0); + Isis::Histogram *hist = InputCubes[i]->histogram(0); p_inputMinimum.push_back(hist->Percent( Application::GetUserInterface().GetDouble("MINPERCENT"))); p_inputMaximum.push_back(hist->Percent( @@ -688,10 +688,10 @@ namespace Isis { // Construct a line buffer manager if(p_format == BIP) { - p_progress->SetMaximumSteps((InputCubes[0]->getSampleCount()) * (InputCubes[0]->getLineCount())); + p_progress->SetMaximumSteps((InputCubes[0]->sampleCount()) * (InputCubes[0]->lineCount())); } else { - p_progress->SetMaximumSteps((InputCubes[0]->getLineCount()) * (InputCubes[0]->getBandCount())); + p_progress->SetMaximumSteps((InputCubes[0]->lineCount()) * (InputCubes[0]->bandCount())); } @@ -792,7 +792,7 @@ namespace Isis { */ void ProcessExport::StartProcess(void funct(vector &in)) { int length = (p_format == BIP) ? - InputCubes[0]->getBandCount() : InputCubes[0]->getLineCount(); + InputCubes[0]->bandCount() : InputCubes[0]->lineCount(); // Loop and let the app programmer fiddle with the lines vector imgrs = GetBuffers(); @@ -804,7 +804,7 @@ namespace Isis { InputCubes[j]->read(*imgrs[j]); // Stretch the pixels into the desired range - for (int i = 0; i < InputCubes[0]->getSampleCount(); i++) + for (int i = 0; i < InputCubes[0]->sampleCount(); i++) (*imgrs[j])[i] = p_str[j]->Map((*imgrs[j])[i]); ibufs.push_back(imgrs[j]); @@ -855,13 +855,13 @@ namespace Isis { * */ vector ProcessExport::GetBuffersBSQ() { - int samples = InputCubes[0]->getSampleCount(); - int lines = InputCubes[0]->getLineCount(); + int samples = InputCubes[0]->sampleCount(); + int lines = InputCubes[0]->lineCount(); vector imgrs; for (unsigned int i = 0; i < InputCubes.size(); i++) { - if((InputCubes[i]->getSampleCount() == samples) && - (InputCubes[i]->getLineCount() == lines)) { + if((InputCubes[i]->sampleCount() == samples) && + (InputCubes[i]->lineCount() == lines)) { Isis::LineManager *iline = new Isis::LineManager(*InputCubes[i]); iline->begin(); @@ -894,13 +894,13 @@ namespace Isis { * */ vector ProcessExport::GetBuffersBIL() { - int samples = InputCubes[0]->getSampleCount(); - int lines = InputCubes[0]->getLineCount(); + int samples = InputCubes[0]->sampleCount(); + int lines = InputCubes[0]->lineCount(); vector imgrs; for (unsigned int i = 0; i < InputCubes.size(); i++) { - if ((InputCubes[i]->getSampleCount() == samples) && - (InputCubes[i]->getLineCount() == lines)) { + if ((InputCubes[i]->sampleCount() == samples) && + (InputCubes[i]->lineCount() == lines)) { Isis::LineManager *iline = new Isis::LineManager(*InputCubes[i], true); iline->begin(); @@ -932,12 +932,12 @@ namespace Isis { * */ vector ProcessExport::GetBuffersBIP() { - int bands = InputCubes[0]->getBandCount(); - int samples = InputCubes[0]->getSampleCount(); + int bands = InputCubes[0]->bandCount(); + int samples = InputCubes[0]->sampleCount(); vector imgrs; for(unsigned int i = 0; i < InputCubes.size(); i++) { - if((InputCubes[i]->getBandCount() == bands) && (InputCubes[i]->getSampleCount() == samples)) { + if((InputCubes[i]->bandCount() == bands) && (InputCubes[i]->sampleCount() == samples)) { Isis::BandManager *iband = new Isis::BandManager(*InputCubes[i]); iband->begin(); imgrs.push_back(iband); @@ -1181,7 +1181,7 @@ namespace Isis { */ void ProcessExport::CreateWorldFile(const QString &worldFile) { try { - Projection *proj = InputCubes[0]->getProjection(); + Projection *proj = InputCubes[0]->projection(); proj->SetWorld(1.0, 1.0); ofstream os; os.open(worldFile.toAscii().data(), ios::out); diff --git a/isis/src/base/objs/ProcessExport/ProcessExport.h b/isis/src/base/objs/ProcessExport/ProcessExport.h index 4f90b78bec..5b8d40cdf6 100644 --- a/isis/src/base/objs/ProcessExport/ProcessExport.h +++ b/isis/src/base/objs/ProcessExport/ProcessExport.h @@ -164,9 +164,9 @@ namespace Isis { template void ProcessCubes(const Functor & functor) { int length = (p_format == BIP) ? - InputCubes[0]->getBandCount() : InputCubes[0]->getLineCount(); + InputCubes[0]->bandCount() : InputCubes[0]->lineCount(); - int samples = InputCubes[0]->getSampleCount(); + int samples = InputCubes[0]->sampleCount(); // Loop and let the app programmer fiddle with the lines std::vector imgrs = GetBuffers(); diff --git a/isis/src/base/objs/ProcessExportPds/ProcessExportPds.cpp b/isis/src/base/objs/ProcessExportPds/ProcessExportPds.cpp index 83d6762387..53a7e4701b 100644 --- a/isis/src/base/objs/ProcessExportPds/ProcessExportPds.cpp +++ b/isis/src/base/objs/ProcessExportPds/ProcessExportPds.cpp @@ -269,9 +269,9 @@ namespace Isis { cmpObj += PvlKeyword("ENCODING_TYPE", "JP2"); cmpObj += PvlKeyword("ENCODING_TYPE_VERSION_NAME", "ISO/IEC15444-1:2004"); cmpObj += PvlKeyword("INTERCHANGE_FORMAT", "BINARY"); - FileName infilename(InputCubes[0]->getFileName()); + FileName infilename(InputCubes[0]->fileName()); cmpObj += PvlKeyword("UNCOMPRESSED_FILE_NAME", infilename.name()); - int storagebytes = InputCubes[0]->getSampleCount() * InputCubes[0]->getLineCount(); + int storagebytes = InputCubes[0]->sampleCount() * InputCubes[0]->lineCount(); if(p_pixelType == Isis::Real) { QString msg = "JPEG2000 does not support floating point data"; throw IException(IException::Programmer, msg, _FILEINFO_); @@ -284,12 +284,12 @@ namespace Isis { PvlObject ucmpObj("UNCOMPRESSED_FILE"); ucmpObj += PvlKeyword("FILE_NAME", infilename.name()); ucmpObj += PvlKeyword("RECORD_TYPE", "FIXED_LENGTH"); - int recordbytes = InputCubes[0]->getSampleCount(); + int recordbytes = InputCubes[0]->sampleCount(); if(p_pixelType == Isis::UnsignedWord || p_pixelType == Isis::SignedWord) { recordbytes = recordbytes * 2; } ucmpObj += PvlKeyword("RECORD_BYTES", toString(recordbytes)); - ucmpObj += PvlKeyword("FILE_RECORDS", toString(InputCubes[0]->getLineCount())); + ucmpObj += PvlKeyword("FILE_RECORDS", toString(InputCubes[0]->lineCount())); ucmpObj += PvlKeyword("^IMAGE", infilename.name()); mainPvl.AddObject(ucmpObj); } @@ -357,9 +357,9 @@ namespace Isis { cmpObj += PvlKeyword("ENCODING_TYPE", "JP2"); cmpObj += PvlKeyword("ENCODING_TYPE_VERSION_NAME", "ISO/IEC15444-1:2004"); cmpObj += PvlKeyword("INTERCHANGE_FORMAT", "BINARY"); - FileName infilename(InputCubes[0]->getFileName()); + FileName infilename(InputCubes[0]->fileName()); cmpObj += PvlKeyword("UNCOMPRESSED_FILE_NAME", infilename.name()); - int storagebytes = InputCubes[0]->getSampleCount() * InputCubes[0]->getLineCount(); + int storagebytes = InputCubes[0]->sampleCount() * InputCubes[0]->lineCount(); if(p_pixelType == Isis::Real) { QString msg = "JPEG2000 does not support floating point data"; throw IException(IException::Programmer, msg, _FILEINFO_); @@ -372,12 +372,12 @@ namespace Isis { PvlObject ucmpObj("UNCOMPRESSED_FILE"); ucmpObj += PvlKeyword("FILE_NAME", infilename.name()); ucmpObj += PvlKeyword("RECORD_TYPE", "FIXED_LENGTH"); - int recordbytes = InputCubes[0]->getSampleCount(); + int recordbytes = InputCubes[0]->sampleCount(); if(p_pixelType == Isis::UnsignedWord || p_pixelType == Isis::SignedWord) { recordbytes = recordbytes * 2; } ucmpObj += PvlKeyword("RECORD_BYTES", toString(recordbytes)); - ucmpObj += PvlKeyword("FILE_RECORDS", toString(InputCubes[0]->getLineCount())); + ucmpObj += PvlKeyword("FILE_RECORDS", toString(InputCubes[0]->lineCount())); ucmpObj += PvlKeyword("^IMAGE", infilename.name()); mainPvl.AddObject(ucmpObj); } @@ -396,7 +396,7 @@ namespace Isis { mainPvl.GetFormat()->Add("$base/translations/pdsExportImageImage.typ"); // Build up an IMAGE object: // Auto translate standard keywords for the IMAGE object - Pvl *inputLabel = InputCubes[0]->getLabel(); + Pvl *inputLabel = InputCubes[0]->label(); FileName transfile; transfile = "$base/translations/pdsExportImageImage.trn"; PvlTranslationManager Xlator(*inputLabel, transfile.expanded()); @@ -540,7 +540,7 @@ namespace Isis { } // Build up a JP2 IMAGE object: // Auto translate standard keywords for the IMAGE object - Pvl *inputLabel = InputCubes[0]->getLabel(); + Pvl *inputLabel = InputCubes[0]->label(); FileName transfile; transfile = "$base/translations/pdsExportImageJP2.trn"; PvlTranslationManager Xlator(*inputLabel, transfile.expanded()); @@ -679,7 +679,7 @@ namespace Isis { void ProcessExportPds::StandardAllMapping(Pvl &outputPvl) { // Get the input Isis cube label and find the Mapping group if it has one - Pvl *inputLabel = InputCubes[0]->getLabel(); + Pvl *inputLabel = InputCubes[0]->label(); if(inputLabel->HasObject("IsisCube") && !(inputLabel->FindObject("IsisCube").HasGroup("Mapping"))) return; PvlGroup &inputMapping = inputLabel->FindGroup("Mapping", Pvl::Traverse); @@ -845,7 +845,7 @@ namespace Isis { int ProcessExportPds::LineBytes() { Cube *cube = InputCubes[0]; int a = SizeOf(p_pixelType); - int b = cube->getSampleCount(); + int b = cube->sampleCount(); return b * a ; } @@ -929,8 +929,8 @@ namespace Isis { for (unsigned int i = 0; i < m_tableRecords.size(); i++) { totalTableRecords += m_tableRecords[i]; } - int imageRecords = InputCubes[0]->getLineCount() - * InputCubes[0]->getBandCount(); + int imageRecords = InputCubes[0]->lineCount() + * InputCubes[0]->bandCount(); int fileRecords = labelRecords + imageRecords + totalTableRecords; (*m_label)["FILE_RECORDS"].SetValue(toString(fileRecords)); @@ -1015,8 +1015,8 @@ namespace Isis { m_tableBuffers.push_back(tableBuffer); int labSize = LabelSize(); // labSize will be the old label size with "?" int labelRecords = (int)ceil((double)labSize / (double)fileRecordBytes); - int imageRecords = InputCubes[0]->getLineCount() - * InputCubes[0]->getBandCount(); + int imageRecords = InputCubes[0]->lineCount() + * InputCubes[0]->bandCount(); int totalTableRecords = 0; for (unsigned int i = 0; i < m_tableRecords.size(); i++) { totalTableRecords += m_tableRecords[i]; diff --git a/isis/src/base/objs/ProcessGroundPolygons/ProcessGroundPolygons.cpp b/isis/src/base/objs/ProcessGroundPolygons/ProcessGroundPolygons.cpp index dd29091cf5..b468fcb825 100644 --- a/isis/src/base/objs/ProcessGroundPolygons/ProcessGroundPolygons.cpp +++ b/isis/src/base/objs/ProcessGroundPolygons/ProcessGroundPolygons.cpp @@ -197,9 +197,9 @@ namespace Isis { /*setup input cube to transfer projection or camera labels*/ CubeAttributeInput inAtts; Isis::Process::SetInputCube(cube, inAtts, 0); - int nBands = this->InputCubes[0]->getBandCount(); - int nLines = this->InputCubes[0]->getLineCount(); - int nSamples = this->InputCubes[0]->getSampleCount(); + int nBands = this->InputCubes[0]->bandCount(); + int nLines = this->InputCubes[0]->lineCount(); + int nSamples = this->InputCubes[0]->sampleCount(); this->Process::SetOutputCube(avgFileName, outAtts, nSamples, nLines, nBands); this->Process::SetOutputCube(countFileName, outAtts, nSamples, nLines, nBands); @@ -289,7 +289,7 @@ namespace Isis { OutputCubes[1]->putGroup(group); /*We need a ground map for converting lat/long to line/sample see Convert()*/ - p_groundMap = new UniversalGroundMap(*OutputCubes[0]->getLabel()); + p_groundMap = new UniversalGroundMap(*OutputCubes[0]->label()); delete proj; } diff --git a/isis/src/base/objs/ProcessImport/unitTest.cpp b/isis/src/base/objs/ProcessImport/unitTest.cpp index 3a2338dc61..1abfbd9ed6 100644 --- a/isis/src/base/objs/ProcessImport/unitTest.cpp +++ b/isis/src/base/objs/ProcessImport/unitTest.cpp @@ -40,7 +40,7 @@ void IsisMain() { CubeAttributeInput att; QString file = Application::GetUserInterface().GetFileName("TO"); Cube *icube = p2.SetInputCube(file, att); - Statistics *stat = icube->getStatistics(); + Statistics *stat = icube->statistics(); cout << endl << "Average: " << stat->Average() << endl; cout << endl << "Variance: " << stat->Variance() << endl; p2.EndProcess(); diff --git a/isis/src/base/objs/ProcessImportPds/unitTest.cpp b/isis/src/base/objs/ProcessImportPds/unitTest.cpp index 28b3f52aa8..dc1fc8e735 100644 --- a/isis/src/base/objs/ProcessImportPds/unitTest.cpp +++ b/isis/src/base/objs/ProcessImportPds/unitTest.cpp @@ -35,7 +35,7 @@ void IsisMain() { Isis::CubeAttributeInput att; QString file = Isis::Application::GetUserInterface().GetFileName("TO"); Isis::Cube *cube = p2.SetInputCube(file, att); - Isis::Statistics *stat = cube->getStatistics(); + Isis::Statistics *stat = cube->statistics(); cout << stat->Average() << endl; cout << stat->Variance() << endl; p2.EndProcess(); @@ -65,7 +65,7 @@ void IsisMain() { Isis::CubeAttributeInput att; QString file = Isis::Application::GetUserInterface().GetFileName("TO"); Isis::Cube *cube = p2.SetInputCube(file, att); - Isis::Statistics *stat = cube->getStatistics(); + Isis::Statistics *stat = cube->statistics(); cout << stat->Average() << endl; cout << stat->Variance() << endl; p2.EndProcess(); @@ -121,7 +121,7 @@ void IsisMain() { Isis::CubeAttributeInput att; QString file = Isis::Application::GetUserInterface().GetFileName("TO"); Isis::Cube *cube = p2.SetInputCube(file, att); - Pvl isisCubeLab = *(cube->getLabel()); + Pvl isisCubeLab = *(cube->label()); (isisCubeLab.FindObject("IsisCube").FindObject("Core")["StartByte"]).SetValue(""); (isisCubeLab.FindObject("Table")["StartByte"]).SetValue(""); (isisCubeLab.FindObject("Table")["Bytes"]).SetValue(""); @@ -130,7 +130,7 @@ void IsisMain() { (isisCubeLab.FindObject("OriginalLabel")["StartByte"]).SetValue(""); (isisCubeLab.FindObject("OriginalLabel")["Bytes"]).SetValue(""); cout << isisCubeLab << endl; - Isis::Statistics *stat = cube->getStatistics(); + Isis::Statistics *stat = cube->statistics(); cout << stat->Average() << endl; cout << stat->Variance() << endl; p2.EndProcess(); diff --git a/isis/src/base/objs/ProcessImportVicar/unitTest.cpp b/isis/src/base/objs/ProcessImportVicar/unitTest.cpp index 0a52520459..816b6919a8 100644 --- a/isis/src/base/objs/ProcessImportVicar/unitTest.cpp +++ b/isis/src/base/objs/ProcessImportVicar/unitTest.cpp @@ -26,7 +26,7 @@ void IsisMain() { CubeAttributeInput att; QString file = Application::GetUserInterface().GetFileName("TO"); Cube *icube = p2.SetInputCube(file, att); - Statistics *stat = icube->getStatistics(); + Statistics *stat = icube->statistics(); cout << stat->Average() << endl; cout << stat->Variance() << endl; p2.EndProcess(); diff --git a/isis/src/base/objs/ProcessMapMosaic/ProcessMapMosaic.cpp b/isis/src/base/objs/ProcessMapMosaic/ProcessMapMosaic.cpp index 02dc14fe2e..5fef39b000 100644 --- a/isis/src/base/objs/ProcessMapMosaic/ProcessMapMosaic.cpp +++ b/isis/src/base/objs/ProcessMapMosaic/ProcessMapMosaic.cpp @@ -72,10 +72,10 @@ namespace Isis { Cube *inCube = ProcessMosaic::SetInputCube(inputFile, inAtt); Cube *mosaicCube = OutputCubes[0]; - Projection *iproj = inCube->getProjection(); - Projection *oproj = mosaicCube->getProjection(); - int nsMosaic = mosaicCube->getSampleCount(); - int nlMosaic = mosaicCube->getLineCount(); + Projection *iproj = inCube->projection(); + Projection *oproj = mosaicCube->projection(); + int nsMosaic = mosaicCube->sampleCount(); + int nlMosaic = mosaicCube->lineCount(); if (*iproj != *oproj) { QString msg = "Mapping groups do not match between cube [" + inputFile + "] and mosaic"; @@ -86,8 +86,8 @@ namespace Isis { outSample = (int)(oproj->ToWorldX(iproj->ToProjectionX(1.0)) + 0.5); outLine = (int)(oproj->ToWorldY(iproj->ToProjectionY(1.0)) + 0.5); - int ins = InputCubes[0]->getSampleCount(); - int inl = InputCubes[0]->getLineCount(); + int ins = InputCubes[0]->sampleCount(); + int inl = InputCubes[0]->lineCount(); outSampleEnd = outSample + ins; outLineEnd = outLine + inl; @@ -202,12 +202,12 @@ namespace Isis { // Open the cube and get the maximum number of band in all cubes Cube cube; cube.open(propagationCubes[i].toString()); - bands = max(bands, cube.getBandCount()); + bands = max(bands, cube.bandCount()); // See if the cube has a projection and make sure it matches // previous input cubes Projection *projNew = - Isis::ProjectionFactory::CreateFromCube(*(cube.getLabel())); + Isis::ProjectionFactory::CreateFromCube(*(cube.label())); if ((proj != NULL) && (*proj != *projNew)) { QString msg = "Mapping groups do not match between cubes [" + propagationCubes[0].toString() + "] and [" + propagationCubes[i].toString() + "]"; @@ -222,8 +222,8 @@ namespace Isis { if (x > xmax) xmax = x; if (y > ymax) ymax = y; - x = projNew->ToProjectionX(cube.getSampleCount() + 0.5); - y = projNew->ToProjectionY(cube.getLineCount() + 0.5); + x = projNew->ToProjectionX(cube.sampleCount() + 0.5); + y = projNew->ToProjectionY(cube.lineCount() + 0.5); if (x < xmin) xmin = x; if (y < ymin) ymin = y; if (x > xmax) xmax = x; @@ -290,12 +290,12 @@ namespace Isis { for (int i = 0; i < propagationCubes.size(); i++) { Cube cube; cube.open(propagationCubes[i].toString()); - bands = max(cube.getBandCount(), bands); + bands = max(cube.bandCount(), bands); // See if the cube has a projection and make sure it matches // previous input cubes Projection *projNew = - Isis::ProjectionFactory::CreateFromCube(*(cube.getLabel())); + Isis::ProjectionFactory::CreateFromCube(*(cube.label())); if (proj == NULL) { } @@ -411,7 +411,7 @@ namespace Isis { ProcessByLine p; CubeAttributeInput inAtt(inputFile); Cube *propCube = p.SetInputCube(inputFile, inAtt); - bands = propCube->getBandCount(); + bands = propCube->bandCount(); // If track set, create the origin band if (GetTrackFlag()) { @@ -453,7 +453,7 @@ namespace Isis { Cube mosaic; mosaic.open(mosaicFile); - PvlGroup &mapping = mosaic.getLabel()->FindGroup("Mapping", Pvl::Traverse); + PvlGroup &mapping = mosaic.label()->FindGroup("Mapping", Pvl::Traverse); CubeAttributeOutput oAtt; // The other SetOutput will not use the attribute or filename Cube *ocube = SetOutputCube("", mapping, oAtt, mosaicFile); diff --git a/isis/src/base/objs/ProcessMosaic/ProcessMosaic.cpp b/isis/src/base/objs/ProcessMosaic/ProcessMosaic.cpp index 5dfc93e08c..0ecf56721f 100644 --- a/isis/src/base/objs/ProcessMosaic/ProcessMosaic.cpp +++ b/isis/src/base/objs/ProcessMosaic/ProcessMosaic.cpp @@ -132,13 +132,13 @@ namespace Isis { int isb = m_isb; if (ins == -1) - ins = (int)InputCubes[0]->getSampleCount(); + ins = (int)InputCubes[0]->sampleCount(); if (inl == -1) - inl = (int)InputCubes[0]->getLineCount(); + inl = (int)InputCubes[0]->lineCount(); if (inb == -1) - inb = (int)InputCubes[0]->getBandCount(); + inb = (int)InputCubes[0]->bandCount(); // Adjust the input sub-area if it overlaps any edge of the output cube m_oss = os; @@ -158,16 +158,16 @@ namespace Isis { m_osl = 1; } // Right edge - if ((m_oss + ins - 1) > OutputCubes[0]->getSampleCount()) { - ins = OutputCubes[0]->getSampleCount() - m_oss + 1; + if ((m_oss + ins - 1) > OutputCubes[0]->sampleCount()) { + ins = OutputCubes[0]->sampleCount() - m_oss + 1; } // Bottom edge - if ((m_osl + inl - 1) > OutputCubes[0]->getLineCount()) { - inl = OutputCubes[0]->getLineCount() - m_osl + 1; + if ((m_osl + inl - 1) > OutputCubes[0]->lineCount()) { + inl = OutputCubes[0]->lineCount() - m_osl + 1; } PvlGroup imgPosition("ImageLocation"); - imgPosition += PvlKeyword("File", InputCubes[0]->getFileName()); + imgPosition += PvlKeyword("File", InputCubes[0]->fileName()); imgPosition += PvlKeyword("StartSample", toString(m_oss)); imgPosition += PvlKeyword("StartLine", toString(m_osl)); m_imagePositions += imgPosition; @@ -186,7 +186,7 @@ namespace Isis { } p_progress->SetMaximumSteps( - (int)InputCubes[0]->getLineCount() * (int)InputCubes[0]->getBandCount()); + (int)InputCubes[0]->lineCount() * (int)InputCubes[0]->bandCount()); p_progress->CheckStatus(); // Tracking is done for: @@ -197,7 +197,7 @@ namespace Isis { if (!(m_imageOverlay == UseBandPlacementCriteria || ((m_imageOverlay == PlaceImagesOnTop || m_imageOverlay == PlaceImagesBeneath) && // tracking band was already created for Tracking=true - (OutputCubes[0]->getBandCount()-1) == 1) || + (OutputCubes[0]->bandCount()-1) == 1) || (m_imageOverlay == PlaceImagesOnTop && m_placeHighSatPixels && m_placeLowSatPixels && m_placeNullPixels)) ){ QString m = "Tracking cannot be True for multi-band Mosaic with ontop or beneath priority"; @@ -207,7 +207,7 @@ namespace Isis { // ******************************************************************************* - Pvl *inLab = InputCubes[0]->getLabel(); + Pvl *inLab = InputCubes[0]->label(); // Create / Match DEM Shape Model if bMatchDEM Flag is enabled if (m_enforceMatchDEM){ MatchDEMShapeModel(); @@ -215,7 +215,7 @@ namespace Isis { // Check to make sure the bandbins match if necessary if (m_enforceBandBinMatch) { - Pvl *outLab = OutputCubes[0]->getLabel(); + Pvl *outLab = OutputCubes[0]->label(); if (inLab->FindObject("IsisCube").HasGroup("BandBin")) { // Check to make sure the output cube has a bandbin group & make sure it @@ -273,11 +273,11 @@ namespace Isis { ResetCountBands(); } - m_onb = OutputCubes[0]->getBandCount(); + m_onb = OutputCubes[0]->bandCount(); if (m_trackingEnabled) { //Get the last band set aside for "Origin" 1 based - iOriginBand = OutputCubes[0]->getBandCount(); + iOriginBand = OutputCubes[0]->bandCount(); m_onb--; iChanged = 0; @@ -298,9 +298,9 @@ namespace Isis { } else { // Create portal buffers for the input and output files - Portal iPortal(ins, 1, InputCubes[0]->getPixelType()); - Portal oPortal(ins, 1, OutputCubes[0]->getPixelType()); - Portal origPortal(ins, 1, OutputCubes[0]->getPixelType()); + Portal iPortal(ins, 1, InputCubes[0]->pixelType()); + Portal oPortal(ins, 1, OutputCubes[0]->pixelType()); + Portal origPortal(ins, 1, OutputCubes[0]->pixelType()); for (int ib = isb, ob = m_osb; ib < (isb + inb) && ob <= m_onb; ib++, ob++) { for (int il = isl, ol = m_osl; il < isl + inl; il++, ol++) { @@ -461,7 +461,7 @@ namespace Isis { Cube *cInCube = Process::SetInputCube(parameter); //get the output label - Pvl *cInPvl = InputCubes[0]->getLabel(); + Pvl *cInPvl = InputCubes[0]->label(); if (cInPvl->FindGroup("Dimensions", Pvl::Traverse).HasKeyword("Bands")) { PvlKeyword &cBandKey = cInPvl->FindGroup("Dimensions", Pvl::Traverse).FindKeyword("Bands"); QString sStr(cBandKey[0]); @@ -532,7 +532,7 @@ namespace Isis { Cube *cInCube = Process::SetInputCube(fname, att); //check if the number of bands specified is not greater than the actual number of bands in the input - Pvl *cInPvl = InputCubes[0]->getLabel(); + Pvl *cInPvl = InputCubes[0]->label(); if (cInPvl->FindGroup("Dimensions", Pvl::Traverse).HasKeyword("Bands")) { PvlKeyword &cBandKey = cInPvl->FindGroup("Dimensions", Pvl::Traverse).FindKeyword("Bands"); QString sStr(cBandKey[0]); @@ -580,7 +580,7 @@ namespace Isis { } if (m_createOutputMosaic) { - Pvl *outLab = cube->getLabel(); + Pvl *outLab = cube->label(); if (outLab->FindObject("IsisCube").HasGroup("BandBin")) { outLab->FindObject("IsisCube").DeleteGroup("BandBin"); } @@ -619,7 +619,7 @@ namespace Isis { */ void ProcessMosaic::SetMosaicOrigin(int &index) { // Get only the file name - QString sInputFile = FileName(InputCubes[0]->getFileName()).name(); + QString sInputFile = FileName(InputCubes[0]->fileName()).name(); QString sTableName = TRACKING_TABLE_NAME; // Get the serial number @@ -632,9 +632,9 @@ namespace Isis { } // Get output file name - QString sOutputFile = FileName(OutputCubes[0]->getFileName()).name(); + QString sOutputFile = FileName(OutputCubes[0]->fileName()).name(); - Pvl *cPvlOut = OutputCubes[0]->getLabel(); + Pvl *cPvlOut = OutputCubes[0]->label(); // Create a table record with the new image file name and serial number info TableRecord cFileRecord; @@ -676,7 +676,7 @@ namespace Isis { // Check if the image index can be accomadated in the pixel size bool bFull = false; - switch (sizeof(OutputCubes[0]->getPixelType())) { + switch (sizeof(OutputCubes[0]->pixelType())) { case 1: // Index is 1 based as 0=Null invalid value if (iRecs >= (VALID_MAX1 - 1)) @@ -970,8 +970,8 @@ namespace Isis { * @author Sharmila Prasad (1/24/2011) */ void ProcessMosaic::MatchDEMShapeModel() { - Pvl* inLabel = InputCubes[0]->getLabel(); - Pvl* outLabel = OutputCubes[0]->getLabel(); + Pvl* inLabel = InputCubes[0]->label(); + Pvl* outLabel = OutputCubes[0]->label(); if (outLabel->FindObject("IsisCube").HasGroup("Mosaic")) { PvlGroup outMosaicGrp = outLabel->FindObject("IsisCube").FindGroup("Mosaic"); @@ -1022,11 +1022,11 @@ namespace Isis { */ void ProcessMosaic::ResetCountBands() { - int iBand = OutputCubes[0]->getBandCount(); - int iLines = OutputCubes[0]->getLineCount(); - int iSample = OutputCubes[0]->getSampleCount(); + int iBand = OutputCubes[0]->bandCount(); + int iLines = OutputCubes[0]->lineCount(); + int iSample = OutputCubes[0]->sampleCount(); - Portal origPortal(iSample, 1, OutputCubes[0]->getPixelType()); + Portal origPortal(iSample, 1, OutputCubes[0]->pixelType()); int iStartCountBand = iBand/2 + 1; for (int band=iStartCountBand; band<=iBand; band++) { @@ -1098,8 +1098,8 @@ namespace Isis { * @author Sharmila Prasad (9/25/2009) */ void ProcessMosaic::MatchBandBinGroup(int origIsb, int &inb) { - Pvl *inLab = InputCubes[0]->getLabel(); - Pvl *outLab = OutputCubes[0]->getLabel(); + Pvl *inLab = InputCubes[0]->label(); + Pvl *outLab = OutputCubes[0]->label(); PvlGroup &inBin = inLab->FindGroup("BandBin", Pvl::Traverse); PvlGroup &outBin = outLab->FindGroup("BandBin", Pvl::Traverse); @@ -1111,7 +1111,7 @@ namespace Isis { //pvl - zero based int isb = (origIsb - 1); int osb = (m_osb - 1); - int iOutBandsHalf = OutputCubes[0]->getBandCount()/2; + int iOutBandsHalf = OutputCubes[0]->bandCount()/2; for (int i = 0; i < outBin.Keywords(); i++) { PvlKeyword &outKey = outBin[i]; @@ -1145,8 +1145,8 @@ namespace Isis { } } - int inputRange = InputCubes[0]->getBandCount() - isb; - int outputRange = OutputCubes[0]->getBandCount() - osb; + int inputRange = InputCubes[0]->bandCount() - isb; + int outputRange = OutputCubes[0]->bandCount() - osb; inb = min(inputRange, outputRange); } @@ -1163,10 +1163,10 @@ namespace Isis { * AverageImageWithMosaic Priority */ void ProcessMosaic::AddBandBinGroup(int origIsb) { - Pvl *inLab = InputCubes[0]->getLabel(); - Pvl *outLab = OutputCubes[0]->getLabel(); + Pvl *inLab = InputCubes[0]->label(); + Pvl *outLab = OutputCubes[0]->label(); - int iOutBands = OutputCubes[0]->getBandCount(); + int iOutBands = OutputCubes[0]->bandCount(); if (m_trackingEnabled) { iOutBands -= 1; // leave tracking band @@ -1181,7 +1181,7 @@ namespace Isis { PvlGroup &cInBin = inLab->FindGroup("BandBin", Pvl::Traverse); PvlGroup cOutBin("BandBin"); - int iInBands = InputCubes[0]->getBandCount(); + int iInBands = InputCubes[0]->bandCount(); for (int i = 0; i < cInBin.Keywords(); i++) { PvlKeyword &cInKey = cInBin[i]; @@ -1208,7 +1208,7 @@ namespace Isis { // Tag the Count Bands if priority is AverageImageWithMosaic. else if (m_imageOverlay == AverageImageWithMosaic) { - int iTotalOutBands = OutputCubes[0]->getBandCount(); + int iTotalOutBands = OutputCubes[0]->bandCount(); isb = origIsb - 1; // reset the input starting band int iOutStartBand = iOutBands + osb; QString sKeyName = cInKey.Name(); @@ -1257,11 +1257,11 @@ namespace Isis { * Return void */ void ProcessMosaic::AddDefaultBandBinGroup() { - Pvl *outLab = OutputCubes[0]->getLabel(); + Pvl *outLab = OutputCubes[0]->label(); PvlGroup cOutBin("BandBin"); - int iOutBands = OutputCubes[0]->getBandCount(); + int iOutBands = OutputCubes[0]->bandCount(); int iOutBandsTotal = iOutBands; if (m_trackingEnabled) { @@ -1300,9 +1300,9 @@ namespace Isis { Pvl cPvlLabel; if (inputFile) - cPvlLabel = *(InputCubes[0]->getLabel()); + cPvlLabel = *(InputCubes[0]->label()); else - cPvlLabel = *(OutputCubes[0]->getLabel()); + cPvlLabel = *(OutputCubes[0]->label()); //if non-zero integer, must be original band #, 1 based if (m_bandPriorityBandNumber) { @@ -1362,12 +1362,12 @@ namespace Isis { int bandPriorityInputBandNumber, int bandPriorityOutputBandNumber, int index) { // // Create portal buffers for the input and output files - Portal cIportal(ins, 1, InputCubes[0]->getPixelType()); - Portal cOportal(ins, 1, OutputCubes[0]->getPixelType()); - Portal origPortal(ins, 1, OutputCubes[0]->getPixelType()); + Portal cIportal(ins, 1, InputCubes[0]->pixelType()); + Portal cOportal(ins, 1, OutputCubes[0]->pixelType()); + Portal origPortal(ins, 1, OutputCubes[0]->pixelType()); //Get the last band set aside for "Origin" - int iOriginBand = OutputCubes[0]->getBandCount(); + int iOriginBand = OutputCubes[0]->bandCount(); for (int iIL = isl, iOL = m_osl; iIL < isl + inl; iIL++, iOL++) { // Set the position of the portals in the input and output cubes @@ -1413,14 +1413,14 @@ namespace Isis { int bandPriorityInputBandNumber, int bandPriorityOutputBandNumber) { // Create portal buffers for the input and output files pointing to the // specified band for comparison - Portal iComparePortal(ins, 1, InputCubes[0]->getPixelType()); - Portal oComparePortal(ins, 1, OutputCubes[0]->getPixelType()); + Portal iComparePortal(ins, 1, InputCubes[0]->pixelType()); + Portal oComparePortal(ins, 1, OutputCubes[0]->pixelType()); - Portal resultsPortal (ins, 1, OutputCubes[0]->getPixelType()); + Portal resultsPortal (ins, 1, OutputCubes[0]->pixelType()); // Create portal buffers for the input and output files - Portal iPortal(ins, 1, InputCubes[0]->getPixelType()); - Portal oPortal(ins, 1, OutputCubes[0]->getPixelType()); + Portal iPortal(ins, 1, InputCubes[0]->pixelType()); + Portal oPortal(ins, 1, OutputCubes[0]->pixelType()); for (int inLine = isl, outLine = m_osl; inLine < isl + inl; inLine++, outLine++) { // Set the position of the portals in the input and output cubes @@ -1430,8 +1430,8 @@ namespace Isis { oComparePortal.SetPosition(m_oss, outLine, bandPriorityOutputBandNumber); OutputCubes[0]->read(oComparePortal); - Portal iPortal(ins, 1, InputCubes[0]->getPixelType()); - Portal oPortal(ins, 1, OutputCubes[0]->getPixelType()); + Portal iPortal(ins, 1, InputCubes[0]->pixelType()); + Portal oPortal(ins, 1, OutputCubes[0]->pixelType()); bool inCopy = false; @@ -1496,7 +1496,7 @@ namespace Isis { int ProcessMosaic::GetIndexOffsetByPixelType() { int iOffset = 0; - switch (SizeOf(OutputCubes[0]->getPixelType())) { + switch (SizeOf(OutputCubes[0]->pixelType())) { case 1: iOffset = VALID_MIN1; break; @@ -1528,7 +1528,7 @@ namespace Isis { int ProcessMosaic::GetOriginDefaultByPixelType() { int iDefault; - switch (SizeOf(OutputCubes[0]->getPixelType())) { + switch (SizeOf(OutputCubes[0]->pixelType())) { case 1: iDefault = NULL1; break; @@ -1559,13 +1559,13 @@ namespace Isis { * @author Sharmila Prasad (8/28/2009) */ void ProcessMosaic::ResetOriginBand() { - int iBand = OutputCubes[0]->getBandCount(); - int iLines = OutputCubes[0]->getLineCount(); - int iSample = OutputCubes[0]->getSampleCount(); + int iBand = OutputCubes[0]->bandCount(); + int iLines = OutputCubes[0]->lineCount(); + int iSample = OutputCubes[0]->sampleCount(); int iDefault = GetOriginDefaultByPixelType(); - Portal origPortal(iSample, 1, OutputCubes[0]->getPixelType()); + Portal origPortal(iSample, 1, OutputCubes[0]->pixelType()); for (int i = 1; i <= iLines; i++) { origPortal.SetPosition(1, i, iBand); //sample, line, band position @@ -1590,7 +1590,7 @@ namespace Isis { */ bool ProcessMosaic::GetTrackStatus() { //get the output label - Pvl *cPvlOut = OutputCubes[0]->getLabel(); + Pvl *cPvlOut = OutputCubes[0]->label(); bool bTableExists = false; int iNumObjs = cPvlOut->Objects(); diff --git a/isis/src/base/objs/ProcessMosaic/unitTest.cpp b/isis/src/base/objs/ProcessMosaic/unitTest.cpp index 337d242b33..b3f8008cd0 100644 --- a/isis/src/base/objs/ProcessMosaic/unitTest.cpp +++ b/isis/src/base/objs/ProcessMosaic/unitTest.cpp @@ -484,14 +484,14 @@ void TestIn(int iss, int isl, int isb, int ins, int inl, int inb) { cInCube.open(sFrom); cout << "\n*** Input Image *** "; - if (ins == 0) ins = cInCube.getSampleCount() - iss + 1; - if (inl == 0) inl = cInCube.getLineCount() - isl + 1; - if (inb == 0) inb = cInCube.getBandCount() - isb + 1; + if (ins == 0) ins = cInCube.sampleCount() - iss + 1; + if (inl == 0) inl = cInCube.lineCount() - isl + 1; + if (inb == 0) inb = cInCube.bandCount() - isb + 1; printf("Stats %d, %d, %d, %d, %d, %d\n", isl, iss, isb, inl, ins, inb); int iS; - Portal ciPortal(ins, 1, cInCube.getPixelType()); + Portal ciPortal(ins, 1, cInCube.pixelType()); for (int band = isb; band <= (isb + inb - 1); band++) { for (int line = isl; line <= (isl + inl - 1); line++) { iS = iss; @@ -531,11 +531,11 @@ void TestOut(int piSamples, int piLines, sTo = ui.GetFileName("TO"); cOutCube.open(sTo); - int iBands = cOutCube.getBandCount(); + int iBands = cOutCube.bandCount(); cout << "\n*** Mosaic Image *** "; printf("Start Stats %d, %d, %d\nTotal Bands=%d\n", piLines, piSamples, piBands, iBands); - Portal coPortal(5, 1, cOutCube.getPixelType()); + Portal coPortal(5, 1, cOutCube.pixelType()); int band = piBands; while (band <= iBands) { for (int line = 1; line <= 5; line++) { @@ -545,7 +545,7 @@ void TestOut(int piSamples, int piLines, int iDefault = 0; int iFileIndexOffset = 0; - switch (SizeOf(cOutCube.getPixelType())) { + switch (SizeOf(cOutCube.pixelType())) { case 1: iDefault = NULL1; iFileIndexOffset = -VALID_MIN1; diff --git a/isis/src/base/objs/ProcessPolygons/ProcessPolygons.cpp b/isis/src/base/objs/ProcessPolygons/ProcessPolygons.cpp index 85e220131b..3f47ebf7db 100644 --- a/isis/src/base/objs/ProcessPolygons/ProcessPolygons.cpp +++ b/isis/src/base/objs/ProcessPolygons/ProcessPolygons.cpp @@ -403,10 +403,10 @@ namespace Isis { geos::geom::CoordinateArraySequence imagePts; imagePts.add(geos::geom::Coordinate(0.0, 0.0)); - imagePts.add(geos::geom::Coordinate(0.0, this->OutputCubes[0]->getLineCount())); - imagePts.add(geos::geom::Coordinate(this->OutputCubes[0]->getSampleCount(), - this->OutputCubes[0]->getLineCount())); - imagePts.add(geos::geom::Coordinate(this->OutputCubes[0]->getSampleCount(), 0.0)); + imagePts.add(geos::geom::Coordinate(0.0, this->OutputCubes[0]->lineCount())); + imagePts.add(geos::geom::Coordinate(this->OutputCubes[0]->sampleCount(), + this->OutputCubes[0]->lineCount())); + imagePts.add(geos::geom::Coordinate(this->OutputCubes[0]->sampleCount(), 0.0)); imagePts.add(geos::geom::Coordinate(0.0, 0.0)); p_imagePoly = Isis::globalFactory.createPolygon( diff --git a/isis/src/base/objs/ProcessRubberSheet/ProcessRubberSheet.cpp b/isis/src/base/objs/ProcessRubberSheet/ProcessRubberSheet.cpp index 730b1f67b3..4eb8b3c1f3 100644 --- a/isis/src/base/objs/ProcessRubberSheet/ProcessRubberSheet.cpp +++ b/isis/src/base/objs/ProcessRubberSheet/ProcessRubberSheet.cpp @@ -164,7 +164,7 @@ namespace Isis { // Create a portal buffer for the input file Portal iportal(interp.Samples(), interp.Lines(), - InputCubes[0]->getPixelType() , + InputCubes[0]->pixelType() , interp.HotSample(), interp.HotLine()); // Start the progress meter @@ -174,14 +174,14 @@ namespace Isis { if(p_bandChangeFunct == NULL) { // A portal could read up to four chunks so we need to cache four times the number of bands to // minimize I/O thrashing - InputCubes[0]->addCachingAlgorithm(new UniqueIOCachingAlgorithm(2 * InputCubes[0]->getBandCount())); + InputCubes[0]->addCachingAlgorithm(new UniqueIOCachingAlgorithm(2 * InputCubes[0]->bandCount())); OutputCubes[0]->addCachingAlgorithm(new BoxcarCachingAlgorithm()); - int tilesPerBand = otile.Tiles() / OutputCubes[0]->getBandCount(); + int tilesPerBand = otile.Tiles() / OutputCubes[0]->bandCount(); for(int tile = 1; tile <= tilesPerBand; tile++) { bool useLastTileMap = false; - for(int band = 1; band <= OutputCubes[0]->getBandCount(); band++) { + for(int band = 1; band <= OutputCubes[0]->bandCount(); band++) { otile.SetTile(tile, band); if(p_startQuadSize <= 2) { @@ -251,8 +251,8 @@ namespace Isis { // pixel came from if(trans.Xform(inputSamp, inputLine, outputSamp, outputLine)) { if((inputSamp < 0.5) || (inputLine < 0.5) || - (inputLine > InputCubes[0]->getLineCount() + 0.5) || - (inputSamp > InputCubes[0]->getSampleCount() + 0.5)) { + (inputLine > InputCubes[0]->lineCount() + 0.5) || + (inputSamp > InputCubes[0]->sampleCount() + 0.5)) { otile[i] = NULL8; } else { @@ -677,8 +677,8 @@ namespace Isis { if(trans.Xform(isamp, iline, (double) osamp, (double) oline)) { if((isamp >= 0.5) || (iline >= 0.5) || - (iline <= InputCubes[0]->getLineCount() + 0.5) || - (isamp <= InputCubes[0]->getSampleCount() + 0.5)) { + (iline <= InputCubes[0]->lineCount() + 0.5) || + (isamp <= InputCubes[0]->sampleCount() + 0.5)) { lineMap[lineIndex][sampIndex] = iline; sampMap[lineIndex][sampIndex] = isamp; } @@ -789,7 +789,7 @@ namespace Isis { // Create a portal buffer for reading from the input file Portal iportal(interp.Samples(), interp.Lines(), - InputCubes[0]->getPixelType() , + InputCubes[0]->pixelType() , interp.HotSample(), interp.HotLine()); // Create a buffer for writing to the output file @@ -797,16 +797,16 @@ namespace Isis { // Setup the progress meter int patchesPerBand = 0; - for (int line = m_patchStartLine; line <= InputCubes[0]->getLineCount(); + for (int line = m_patchStartLine; line <= InputCubes[0]->lineCount(); line += m_patchLineIncrement) { for (int samp = m_patchStartSample; - samp <= InputCubes[0]->getSampleCount(); + samp <= InputCubes[0]->sampleCount(); samp += m_patchSampleIncrement) { patchesPerBand++; } } - int patchCount = InputCubes[0]->getBandCount() * patchesPerBand; + int patchCount = InputCubes[0]->bandCount() * patchesPerBand; p_progress->SetMaximumSteps(patchCount); p_progress->CheckStatus(); @@ -830,14 +830,14 @@ namespace Isis { // expection would be for PushFrameCameras which should increment lines by // twice the framelet height. - for (int band=1; band <= InputCubes[0]->getBandCount(); band++) { + for (int band=1; band <= InputCubes[0]->bandCount(); band++) { if(p_bandChangeFunct != NULL) p_bandChangeFunct(band); iportal.SetPosition(1,1,band); - for (int line = m_patchStartLine; line <= InputCubes[0]->getLineCount(); + for (int line = m_patchStartLine; line <= InputCubes[0]->lineCount(); line += m_patchLineIncrement) { for (int samp = m_patchStartSample; - samp <= InputCubes[0]->getSampleCount(); + samp <= InputCubes[0]->sampleCount(); samp += m_patchSampleIncrement, p_progress->CheckStatus()) { transformPatch((double)samp, (double)(samp + m_patchSamples - 1), (double)line, (double)(line + m_patchLines - 1), @@ -856,12 +856,12 @@ namespace Isis { Interpolator &interp) { // Let's make sure our patch is contained in the input file // TODO: Think about the image edges should I be adding 0.5 - if (esamp > InputCubes[0]->getSampleCount()) { - esamp = InputCubes[0]->getSampleCount(); + if (esamp > InputCubes[0]->sampleCount()) { + esamp = InputCubes[0]->sampleCount(); if (ssamp == esamp) ssamp = esamp - 1; } - if (eline > InputCubes[0]->getLineCount()) { - eline = InputCubes[0]->getLineCount(); + if (eline > InputCubes[0]->lineCount()) { + eline = InputCubes[0]->lineCount(); if (sline == eline) sline = eline - 1; } @@ -931,17 +931,17 @@ namespace Isis { // sense in computing the affine if we don't have to. if (osampMax < 1) return; if (olineMax < 1) return; - if (osampMin > OutputCubes[0]->getSampleCount()) return; - if (olineMin > OutputCubes[0]->getLineCount()) return; + if (osampMin > OutputCubes[0]->sampleCount()) return; + if (olineMin > OutputCubes[0]->lineCount()) return; // Adjust our output patch if it extends outside the output cube if (osampMin < 1) osampMin = 1; if (olineMin < 1) olineMin = 1; - if (osampMax > OutputCubes[0]->getSampleCount()) { - osampMax = OutputCubes[0]->getSampleCount(); + if (osampMax > OutputCubes[0]->sampleCount()) { + osampMax = OutputCubes[0]->sampleCount(); } - if (olineMax > OutputCubes[0]->getLineCount()) { - olineMax = OutputCubes[0]->getLineCount(); + if (olineMax > OutputCubes[0]->lineCount()) { + olineMax = OutputCubes[0]->lineCount(); } /* A small input patch should create a small output patch. If we had @@ -953,11 +953,11 @@ namespace Isis { * rounding error on different machines) of the image it is split. */ - if (osampMax - osampMin + 1.0 > OutputCubes[0]->getSampleCount() * 0.50) { + if (osampMax - osampMin + 1.0 > OutputCubes[0]->sampleCount() * 0.50) { splitPatch(ssamp, esamp, sline, eline, obrick, iportal, trans, interp); return; } - if (olineMax - olineMin + 1.0 > OutputCubes[0]->getLineCount() * 0.50) { + if (olineMax - olineMin + 1.0 > OutputCubes[0]->lineCount() * 0.50) { splitPatch(ssamp, esamp, sline, eline, obrick, iportal, trans, interp); return; } diff --git a/isis/src/base/objs/ProjectionFactory/ProjectionFactory.cpp b/isis/src/base/objs/ProjectionFactory/ProjectionFactory.cpp index b181efdae7..d587d72ad0 100644 --- a/isis/src/base/objs/ProjectionFactory/ProjectionFactory.cpp +++ b/isis/src/base/objs/ProjectionFactory/ProjectionFactory.cpp @@ -534,7 +534,7 @@ namespace Isis { * @return A pointer to a Projection object */ Isis::Projection *ProjectionFactory::CreateFromCube(Isis::Cube &cube) { - return CreateFromCube(*cube.getLabel()); + return CreateFromCube(*cube.label()); } /** diff --git a/isis/src/base/objs/QtExporter/QtExporter.cpp b/isis/src/base/objs/QtExporter/QtExporter.cpp index 0e900c3e4d..c51ddc5a46 100644 --- a/isis/src/base/objs/QtExporter/QtExporter.cpp +++ b/isis/src/base/objs/QtExporter/QtExporter.cpp @@ -54,9 +54,9 @@ namespace Isis { */ void QtExporter::setGrayscale(ExportDescription &desc) { Cube *cube = setInput(desc); - checkDataSize(cube->getSampleCount(), cube->getLineCount(), 1); + checkDataSize(cube->sampleCount(), cube->lineCount(), 1); m_qimage = new QImage( - cube->getSampleCount(), cube->getLineCount(), QImage::Format_Indexed8); + cube->sampleCount(), cube->lineCount(), QImage::Format_Indexed8); m_qimage->setNumColors(256); // Create the color table (black = 0 to white = 255) @@ -75,9 +75,9 @@ namespace Isis { */ void QtExporter::setRgb(ExportDescription &desc) { Cube *cube = setInput(desc); - checkDataSize(cube->getSampleCount(), cube->getLineCount(), 3); + checkDataSize(cube->sampleCount(), cube->lineCount(), 3); m_qimage = new QImage( - cube->getSampleCount(), cube->getLineCount(), QImage::Format_RGB32); + cube->sampleCount(), cube->lineCount(), QImage::Format_RGB32); } @@ -90,9 +90,9 @@ namespace Isis { */ void QtExporter::setRgba(ExportDescription &desc) { Cube *cube = setInput(desc); - checkDataSize(cube->getSampleCount(), cube->getLineCount(), 4); + checkDataSize(cube->sampleCount(), cube->lineCount(), 4); m_qimage = new QImage( - cube->getSampleCount(), cube->getLineCount(), QImage::Format_ARGB32); + cube->sampleCount(), cube->lineCount(), QImage::Format_ARGB32); } diff --git a/isis/src/base/objs/Reduce/Reduce.cpp b/isis/src/base/objs/Reduce/Reduce.cpp index 006f68902f..3602f3c92a 100644 --- a/isis/src/base/objs/Reduce/Reduce.cpp +++ b/isis/src/base/objs/Reduce/Reduce.cpp @@ -25,13 +25,13 @@ namespace Isis { miBandIndex = 1; // Set input image area to defaults miStartSample = 1; - miEndSample = mInCube->getSampleCount(); + miEndSample = mInCube->sampleCount(); miStartLine = 1; - miEndLine = mInCube->getLineCount(); + miEndLine = mInCube->lineCount(); - miInputSamples= mInCube->getSampleCount(); - miInputLines = mInCube->getLineCount(); - miInputBands = mInCube->getBandCount(); + miInputSamples= mInCube->sampleCount(); + miInputLines = mInCube->lineCount(); + miInputBands = mInCube->bandCount(); // Save off the sample and mdLine magnification mdSampleScale = sampleScale; @@ -42,7 +42,7 @@ namespace Isis { miOutputLines = (int)ceil((double)(miInputLines) / mdLineScale); // Initialize the input portal - m_iPortal = new Isis::Portal(miInputSamples, 1, mInCube->getPixelType()); + m_iPortal = new Isis::Portal(miInputSamples, 1, mInCube->pixelType()); } /** @@ -109,7 +109,7 @@ namespace Isis { resultsGrp += PvlKeyword("OutputSamples", toString(miOutputLines)); Isis::SubArea subArea; - subArea.SetSubArea(mInCube->getLineCount(), mInCube->getSampleCount(), miStartLine, miStartSample, + subArea.SetSubArea(mInCube->lineCount(), mInCube->sampleCount(), miStartLine, miStartSample, miEndLine, miEndSample, mdLineScale, mdSampleScale); subArea.UpdateLabel(mInCube, pOutCube, resultsGrp); diff --git a/isis/src/base/objs/Reduce/unitTest.cpp b/isis/src/base/objs/Reduce/unitTest.cpp index 9c0bbb9405..c82ae869a4 100644 --- a/isis/src/base/objs/Reduce/unitTest.cpp +++ b/isis/src/base/objs/Reduce/unitTest.cpp @@ -34,11 +34,11 @@ void IsisMain() { double sscale = 3; double lscale = 4; - int ons = (int)ceil((double)icube.getSampleCount() / sscale); - int onl = (int)ceil((double)icube.getLineCount() / lscale); + int ons = (int)ceil((double)icube.sampleCount() / sscale); + int onl = (int)ceil((double)icube.lineCount() / lscale); // Reduce by "Near" - Cube *ocube = p.SetOutputCube("TO", ons, onl, icube.getBandCount()); + Cube *ocube = p.SetOutputCube("TO", ons, onl, icube.bandCount()); Nearest near(&icube, sscale, lscale); p.ClearInputCubes(); cout << "Reduce by Near\n"; @@ -49,7 +49,7 @@ void IsisMain() { // Reduce by "Average" p.SetInputCube("FROM"); - ocube=p.SetOutputCube("TO2", ons, onl, icube.getBandCount()); + ocube=p.SetOutputCube("TO2", ons, onl, icube.bandCount()); p.ClearInputCubes(); Average avg(&icube, sscale, lscale, 0.5, "scale"); cout << "\nReduce by Average\n"; diff --git a/isis/src/base/objs/SampleManager/SampleManager.cpp b/isis/src/base/objs/SampleManager/SampleManager.cpp index 310aafcafd..b0d830c9bc 100644 --- a/isis/src/base/objs/SampleManager/SampleManager.cpp +++ b/isis/src/base/objs/SampleManager/SampleManager.cpp @@ -42,9 +42,9 @@ namespace Isis { */ SampleManager::SampleManager(const Isis::Cube &cube, const bool reverse) : - Isis::BufferManager(cube.getSampleCount(), cube.getLineCount(), - cube.getBandCount(), 1, cube.getLineCount(), 1, - cube.getPixelType(), reverse) { + Isis::BufferManager(cube.sampleCount(), cube.lineCount(), + cube.bandCount(), 1, cube.lineCount(), 1, + cube.pixelType(), reverse) { } /** diff --git a/isis/src/base/objs/SerialNumber/SerialNumber.cpp b/isis/src/base/objs/SerialNumber/SerialNumber.cpp index 3e125b2d8b..ccf4558b74 100644 --- a/isis/src/base/objs/SerialNumber/SerialNumber.cpp +++ b/isis/src/base/objs/SerialNumber/SerialNumber.cpp @@ -65,7 +65,7 @@ namespace Isis { * @return Calculated SerialNumber or FileName */ QString SerialNumber::Compose(Cube &cube, bool def2filename) { - return Compose(*cube.getLabel(), def2filename); + return Compose(*cube.label(), def2filename); } /** diff --git a/isis/src/base/objs/ShapeModel/unitTest.cpp b/isis/src/base/objs/ShapeModel/unitTest.cpp index ebc036086d..621b38b903 100644 --- a/isis/src/base/objs/ShapeModel/unitTest.cpp +++ b/isis/src/base/objs/ShapeModel/unitTest.cpp @@ -200,9 +200,9 @@ int main() { QString inputFile = "$mgs/testData/ab102401.cub"; Cube cube; cube.open(inputFile); - Camera *c = cube.getCamera(); + Camera *c = cube.camera(); std::vector radii = c->target()->radii(); - Pvl pvl = *cube.getLabel(); + Pvl pvl = *cube.label(); Spice spi(pvl); Target targ(&spi, pvl); targ.setRadii(radii); diff --git a/isis/src/base/objs/ShapeModelFactory/ShapeModelFactory.cpp b/isis/src/base/objs/ShapeModelFactory/ShapeModelFactory.cpp index 38cc994bbc..9ec9b2fb06 100644 --- a/isis/src/base/objs/ShapeModelFactory/ShapeModelFactory.cpp +++ b/isis/src/base/objs/ShapeModelFactory/ShapeModelFactory.cpp @@ -98,7 +98,7 @@ namespace Isis { try { // get projection of shape model cube - Projection *projection = shapeModelCube.getProjection(); + Projection *projection = shapeModelCube.projection(); // Next, check if ISIS DEM cube is an equatorial cylindrical projection if (projection->IsEquatorialCylindrical()) diff --git a/isis/src/base/objs/ShapeModelFactory/unitTest.cpp b/isis/src/base/objs/ShapeModelFactory/unitTest.cpp index c06f025770..d1ae950012 100644 --- a/isis/src/base/objs/ShapeModelFactory/unitTest.cpp +++ b/isis/src/base/objs/ShapeModelFactory/unitTest.cpp @@ -165,10 +165,10 @@ int main() { QString inputFile = "$ISIS3DATA/mgs/testData/ab102401.cub"; Cube cube; cube.open(inputFile); - Camera *c = cube.getCamera(); + Camera *c = cube.camera(); vector radii(3,Distance()); radii = c->target()->radii(); - Pvl pvl = *cube.getLabel(); + Pvl pvl = *cube.label(); Spice spi(pvl); Target targ(&spi, pvl); targ.setRadii(radii); @@ -181,9 +181,9 @@ int main() { cout << endl << " Testing ellipsoid shape..." << endl; inputFile = "$ISIS3DATA/galileo/testData/1213r.cub"; cube.open(inputFile); - c = cube.getCamera(); + c = cube.camera(); radii = c->target()->radii(); - pvl = *cube.getLabel(); + pvl = *cube.label(); Spice spi2(pvl); Target targ2(&spi2, pvl); targ2.setRadii(radii); @@ -195,9 +195,9 @@ int main() { // Test plane shape TBD // inputFile = "$ISIS3DATA/; // cube.open(inputFile); - // c = cube.getCamera(); + // c = cube.camera(); // radii = c->target()->radii(); - // pvl = *cube.getLabel(); + // pvl = *cube.label(); // Target targ2(pvl); // targ3.setRadii(radii); // sm = ShapeModelFactory::Create(&targ3, pvl); diff --git a/isis/src/base/objs/SmtkMatcher/SmtkMatcher.h b/isis/src/base/objs/SmtkMatcher/SmtkMatcher.h index 006a750935..b967ded60a 100644 --- a/isis/src/base/objs/SmtkMatcher/SmtkMatcher.h +++ b/isis/src/base/objs/SmtkMatcher/SmtkMatcher.h @@ -125,8 +125,8 @@ class SmtkMatcher { void randomNumberSetup(); bool validate(const bool &throwError = true) const; - inline Camera &lhCamera() { return (*m_lhCube->getCamera()); } - inline Camera &rhCamera() { return (*m_rhCube->getCamera()); } + inline Camera &lhCamera() { return (*m_lhCube->camera()); } + inline Camera &rhCamera() { return (*m_rhCube->camera()); } Coordinate getLineSample(Camera &camera, const Coordinate &geom); Coordinate getLatLon(Camera &camera, const Coordinate &pnt); diff --git a/isis/src/base/objs/Spice/Spice.cpp b/isis/src/base/objs/Spice/Spice.cpp index 7a859ff216..78648c7454 100644 --- a/isis/src/base/objs/Spice/Spice.cpp +++ b/isis/src/base/objs/Spice/Spice.cpp @@ -943,19 +943,25 @@ namespace Isis { SpiceDouble kernelValue; gdpool_c(key.toAscii().data(), (SpiceInt)index, 1, &numValuesRead, &kernelValue, &found); - result = kernelValue; + + if (found) + result = kernelValue; } else if (type == SpiceStringType) { char kernelValue[512]; gcpool_c(key.toAscii().data(), (SpiceInt)index, 1, sizeof(kernelValue), &numValuesRead, kernelValue, &found); - result = kernelValue; + + if (found) + result = kernelValue; } else if (type == SpiceIntType) { SpiceInt kernelValue; gipool_c(key.toAscii().data(), (SpiceInt)index, 1, &numValuesRead, &kernelValue, &found); - result = (int)kernelValue; + + if (found) + result = (int)kernelValue; } if (!found) { diff --git a/isis/src/base/objs/Stereo/unitTest.cpp b/isis/src/base/objs/Stereo/unitTest.cpp index d5f3215d94..5314afa2b3 100644 --- a/isis/src/base/objs/Stereo/unitTest.cpp +++ b/isis/src/base/objs/Stereo/unitTest.cpp @@ -32,11 +32,11 @@ int main(int argc, char *argv[]) { Cube rightCube; rightCube.open("$mariner10/testData/0166613_clean_equi.cub"); - leftCube.getCamera()->SetImage(1054.19, 624.194); - rightCube.getCamera()->SetImage(1052.19, 624.194); + leftCube.camera()->SetImage(1054.19, 624.194); + rightCube.camera()->SetImage(1052.19, 624.194); double radius, lat, lon, sepang, error; - Stereo::elevation(*(leftCube.getCamera()), *(rightCube.getCamera()), + Stereo::elevation(*(leftCube.camera()), *(rightCube.camera()), radius, lat, lon, sepang, error); cout << "Radius = " << radius << endl; diff --git a/isis/src/base/objs/SubArea/SubArea.cpp b/isis/src/base/objs/SubArea/SubArea.cpp index c4e8868cff..074ff115e6 100644 --- a/isis/src/base/objs/SubArea/SubArea.cpp +++ b/isis/src/base/objs/SubArea/SubArea.cpp @@ -140,7 +140,7 @@ namespace Isis { */ void SubArea::UpdateLabel(Cube *icube, Cube *ocube, PvlGroup &results) { - Pvl inlabel = *icube->getLabel(); + Pvl inlabel = *icube->label(); // If the linc and sinc are not equal, then the Instrument and // Mapping groups are no longer valid. @@ -163,7 +163,7 @@ namespace Isis { // Update the upper left corner X,Y values if the starting line or // starting sample are changed. if(p_sl != 1 || p_ss != 1) { - Projection &proj = *icube->getProjection(); + Projection &proj = *icube->projection(); proj.SetWorld(p_ss - 0.5, p_sl - 0.5); PvlGroup &mapgroup = inlabel.FindObject("IsisCube").FindGroup("Mapping", Pvl::Traverse); mapgroup.AddKeyword(PvlKeyword("UpperLeftCornerX", toString(proj.XCoord())), @@ -226,8 +226,8 @@ namespace Isis { // Update the AlphaCube group - this group will only be updated if // a Mapping group does not exist in the labels. - AlphaCube aCube(p_ns, p_nl, ocube->getSampleCount(), ocube->getLineCount(), + AlphaCube aCube(p_ns, p_nl, ocube->sampleCount(), ocube->lineCount(), p_ss - 0.5, p_sl - 0.5, p_es + 0.5, p_el + 0.5); - aCube.UpdateGroup(*ocube->getLabel()); + aCube.UpdateGroup(*ocube->label()); } } diff --git a/isis/src/base/objs/SubArea/unitTest.cpp b/isis/src/base/objs/SubArea/unitTest.cpp index f0bcb1a4ff..4604df2408 100644 --- a/isis/src/base/objs/SubArea/unitTest.cpp +++ b/isis/src/base/objs/SubArea/unitTest.cpp @@ -28,8 +28,8 @@ void IsisMain() { QString from1 = ui.GetFileName("FROM1"); Cube inomapcube; inomapcube.open(from1); - inl = inomapcube.getLineCount(); - ins = inomapcube.getSampleCount(); + inl = inomapcube.lineCount(); + ins = inomapcube.sampleCount(); sl = 1; ss = 1; el = inl; @@ -57,7 +57,7 @@ void IsisMain() { s.UpdateLabel(&inomapcube, onomapcube, results); cout << "Input unprojected cube label: " << endl << endl; - inlabel = *inomapcube.getLabel(); + inlabel = *inomapcube.label(); cout << inlabel.FindObject("IsisCube").FindObject("Core").FindGroup("Dimensions") << endl << endl; if(inlabel.FindObject("IsisCube").HasGroup("Instrument")) { cout << inlabel.FindObject("IsisCube").FindGroup("Instrument") << endl << endl; @@ -124,7 +124,7 @@ void IsisMain() { cout << "Output cube label: " << endl << endl; cube.open(file); - label = *cube.getLabel(); + label = *cube.label(); cube.close(true); cout << label.FindObject("IsisCube").FindObject("Core").FindGroup("Dimensions") << endl << endl; if(label.FindObject("IsisCube").HasGroup("Instrument")) { @@ -170,7 +170,7 @@ void IsisMain() { cout << "Output cube label: " << endl << endl; cube.open(file); - label = *cube.getLabel(); + label = *cube.label(); cube.close(true); cout << label.FindObject("IsisCube").FindObject("Core").FindGroup("Dimensions") << endl << endl; if(label.FindObject("IsisCube").HasGroup("Instrument")) { @@ -220,7 +220,7 @@ void IsisMain() { cout << "Output cube label: " << endl << endl; cube.open(file); - label = *cube.getLabel(); + label = *cube.label(); cube.close(true); cout << label.FindObject("IsisCube").FindObject("Core").FindGroup("Dimensions") << endl << endl; if(label.FindObject("IsisCube").HasGroup("Instrument")) { @@ -266,7 +266,7 @@ void IsisMain() { cout << "Output cube label: " << endl << endl; cube.open(file); - label = *cube.getLabel(); + label = *cube.label(); cube.close(true); cout << label.FindObject("IsisCube").FindObject("Core").FindGroup("Dimensions") << endl << endl; if(label.FindObject("IsisCube").HasGroup("Instrument")) { @@ -288,8 +288,8 @@ void IsisMain() { QString from2 = ui.GetFileName("FROM2"); Cube imapcube; imapcube.open(from2); - inl = imapcube.getLineCount(); - ins = imapcube.getSampleCount(); + inl = imapcube.lineCount(); + ins = imapcube.sampleCount(); sl = 1; ss = 1; el = inl; @@ -315,7 +315,7 @@ void IsisMain() { s.UpdateLabel(&imapcube, omapcube, results); cout << "Input projected cube label: " << endl << endl; - inlabel = *imapcube.getLabel(); + inlabel = *imapcube.label(); cout << inlabel.FindObject("IsisCube").FindObject("Core").FindGroup("Dimensions") << endl << endl; if(inlabel.FindObject("IsisCube").HasGroup("Instrument")) { cout << inlabel.FindObject("IsisCube").FindGroup("Instrument") << endl << endl; @@ -334,7 +334,7 @@ void IsisMain() { cout << "Output cube label: " << endl << endl; cube.open(file); - label = *cube.getLabel(); + label = *cube.label(); cube.close(true); cout << label.FindObject("IsisCube").FindObject("Core").FindGroup("Dimensions") << endl << endl; if(label.FindObject("IsisCube").HasGroup("Instrument")) { @@ -380,7 +380,7 @@ void IsisMain() { cout << "Output cube label: " << endl << endl; cube.open(file); - label = *cube.getLabel(); + label = *cube.label(); cube.close(true); cout << label.FindObject("IsisCube").FindObject("Core").FindGroup("Dimensions") << endl << endl; if(label.FindObject("IsisCube").HasGroup("Instrument")) { @@ -426,7 +426,7 @@ void IsisMain() { cout << "Output cube label: " << endl << endl; cube.open(file); - label = *cube.getLabel(); + label = *cube.label(); cube.close(true); cout << label.FindObject("IsisCube").FindObject("Core").FindGroup("Dimensions") << endl << endl; if(label.FindObject("IsisCube").HasGroup("Instrument")) { @@ -476,7 +476,7 @@ void IsisMain() { cout << "Output cube label: " << endl << endl; cube.open(file); - label = *cube.getLabel(); + label = *cube.label(); cube.close(true); cout << label.FindObject("IsisCube").FindObject("Core").FindGroup("Dimensions") << endl << endl; if(label.FindObject("IsisCube").HasGroup("Instrument")) { @@ -522,7 +522,7 @@ void IsisMain() { cout << "Output cube label: " << endl << endl; cube.open(file); - label = *cube.getLabel(); + label = *cube.label(); cube.close(true); cout << label.FindObject("IsisCube").FindObject("Core").FindGroup("Dimensions") << endl << endl; if(label.FindObject("IsisCube").HasGroup("Instrument")) { diff --git a/isis/src/base/objs/TileManager/TileManager.cpp b/isis/src/base/objs/TileManager/TileManager.cpp index 87541141cd..401df2891c 100644 --- a/isis/src/base/objs/TileManager/TileManager.cpp +++ b/isis/src/base/objs/TileManager/TileManager.cpp @@ -40,12 +40,12 @@ namespace Isis { */ TileManager::TileManager(const Isis::Cube &cube, const int &bufNumSamples, const int &bufNumLines) : - Isis::BufferManager(cube.getSampleCount(), cube.getLineCount(), cube.getBandCount(), + Isis::BufferManager(cube.sampleCount(), cube.lineCount(), cube.bandCount(), bufNumSamples, bufNumLines, 1, - cube.getPixelType()) { + cube.pixelType()) { - p_numSampTiles = (cube.getSampleCount() - 1) / bufNumSamples + 1; - p_numLineTiles = (cube.getLineCount() - 1) / bufNumLines + 1; + p_numSampTiles = (cube.sampleCount() - 1) / bufNumSamples + 1; + p_numLineTiles = (cube.lineCount() - 1) / bufNumLines + 1; } /** diff --git a/isis/src/base/objs/UniversalGroundMap/UniversalGroundMap.cpp b/isis/src/base/objs/UniversalGroundMap/UniversalGroundMap.cpp index c45b3f5396..700e232630 100644 --- a/isis/src/base/objs/UniversalGroundMap/UniversalGroundMap.cpp +++ b/isis/src/base/objs/UniversalGroundMap/UniversalGroundMap.cpp @@ -32,7 +32,7 @@ namespace Isis { * @param priority Try to make a camera or projection first */ UniversalGroundMap::UniversalGroundMap(Cube &cube, CameraPriority priority) { - Init(*(cube.getLabel()), priority); + Init(*(cube.label()), priority); } /** @@ -392,8 +392,8 @@ namespace Isis { * We'll test at the edges, a plus (+) and an (X) to help DEMs work. */ - int sampleCount = cube->getSampleCount(); - int lineCount = cube->getLineCount(); + int sampleCount = cube->sampleCount(); + int lineCount = cube->lineCount(); int stepsPerLength = 20; //number of steps per length double aspectRatio = (double)lineCount / (double)sampleCount; diff --git a/isis/src/cassini/apps/ciss2isis/ciss2isis.cpp b/isis/src/cassini/apps/ciss2isis/ciss2isis.cpp index 13dc47cf07..e2215baa1c 100644 --- a/isis/src/cassini/apps/ciss2isis/ciss2isis.cpp +++ b/isis/src/cassini/apps/ciss2isis/ciss2isis.cpp @@ -97,7 +97,7 @@ void IsisMain() { validMax = 4095; CreateStretchPairs(); // Pvl outputLabels; - Pvl *outputLabel = ocube->getLabel(); + Pvl *outputLabel = ocube->label(); //Adjust Table-encoded values from 8 bit back to 12 bit. PvlGroup &inst = outputLabel->FindGroup("Instrument", Pvl::Traverse); double biasStripMean = inst.FindKeyword("BiasStripMean"); @@ -118,7 +118,7 @@ void IsisMain() { unsigned char *header = (unsigned char *) p.FileHeader(); int roo = *(header + 50 + vicarLabelBytes) / 32 % 2; //**** THIS MAY NEED TO BE CHANGED, // SEE BOTTOM OF THIS FILE FOR IN DEPTH COMMENTS ON READOUTORDER - PvlGroup &inst = ocube->getLabel()->FindGroup("Instrument", Pvl::Traverse); + PvlGroup &inst = ocube->label()->FindGroup("Instrument", Pvl::Traverse); inst.AddKeyword(PvlKeyword("ReadoutOrder", toString(roo))); p.EndProcess(); @@ -278,7 +278,7 @@ void TranslateCassIssLabels(FileName &labelFile, Cube *ocube) { PvlTranslationManager labelXlater(inputLabel, transFile.expanded()); // Pvl outputLabels; - Pvl *outputLabel = ocube->getLabel(); + Pvl *outputLabel = ocube->label(); labelXlater.Auto(*(outputLabel)); //Add needed keywords that are not in translation table to cube's instrument group diff --git a/isis/src/cassini/apps/cisscal/DarkCurrent.cpp b/isis/src/cassini/apps/cisscal/DarkCurrent.cpp index 547612c81e..9c87861037 100644 --- a/isis/src/cassini/apps/cisscal/DarkCurrent.cpp +++ b/isis/src/cassini/apps/cisscal/DarkCurrent.cpp @@ -1153,7 +1153,7 @@ namespace Isis { Brick *darkCoefficients; Cube dparamCube; dparamCube.open(p_dparamfile.expanded()); - darkCoefficients = new Brick(p_samples, p_lines, 8, dparamCube.getPixelType()); + darkCoefficients = new Brick(p_samples, p_lines, 8, dparamCube.pixelType()); darkCoefficients->SetBasePosition(1, 1, 1); dparamCube.read(*darkCoefficients); dparamCube.close(); diff --git a/isis/src/cassini/apps/cisscal/cisscal.cpp b/isis/src/cassini/apps/cisscal/cisscal.cpp index edce84c402..19347af9a9 100644 --- a/isis/src/cassini/apps/cisscal/cisscal.cpp +++ b/isis/src/cassini/apps/cisscal/cisscal.cpp @@ -120,11 +120,11 @@ void IsisMain() { Cube *outcube = secondpass.SetOutputCube("TO"); // Calibrate() parameter out[0] // resize 2dimensional vectors - gbl::bitweightCorrected.resize(gbl::incube->getSampleCount()); - gbl::dark_DN.resize(gbl::incube->getSampleCount()); + gbl::bitweightCorrected.resize(gbl::incube->sampleCount()); + gbl::dark_DN.resize(gbl::incube->sampleCount()); for(unsigned int i = 0; i < gbl::bitweightCorrected.size(); i++) { - gbl::bitweightCorrected[i].resize(gbl::incube->getLineCount()); - gbl::dark_DN[i].resize(gbl::incube->getLineCount()); + gbl::bitweightCorrected[i].resize(gbl::incube->lineCount()); + gbl::dark_DN[i].resize(gbl::incube->lineCount()); } // Add the radiometry group @@ -1190,7 +1190,7 @@ void gbl::FindShutterOffset() { gbl::calgrp += PvlKeyword("ShutterOffsetFile", shutterOffsetFile.expanded()); Cube offsetCube; offsetCube.open(shutterOffsetFile.expanded()); - gbl::offset = new Brick(gbl::incube->getSampleCount(), 1, 1, offsetCube.getPixelType()); + gbl::offset = new Brick(gbl::incube->sampleCount(), 1, 1, offsetCube.pixelType()); gbl::offset->SetBasePosition(1, 1, 1); offsetCube.read(*gbl::offset); offsetCube.close(); @@ -1227,7 +1227,7 @@ void gbl::DivideByAreaPixel() { // sumFactor is the inverse of the square of the summing mode, // it was expressed in IDL as the following: - // [gbl::sumFactor = (gbl::incube->getSampleCount()/1024.0)*(gbl::incube->getLineCount()/1024.0);] + // [gbl::sumFactor = (gbl::incube->sampleCount()/1024.0)*(gbl::incube->lineCount()/1024.0);] gbl::sumFactor = 1 / pow(gbl::cissLab->SummingMode(), 2.0); gbl::calgrp += PvlKeyword("SolidAngle", toString(gbl::solidAngle)); gbl::calgrp += PvlKeyword("OpticsArea", toString(gbl::opticsArea)); @@ -1422,8 +1422,8 @@ void gbl::FindEfficiencyFactor(QString fluxunits) { double angstromsToNm = 10.0; double distFromSun = 0; try { - Camera *cam = gbl::incube->getCamera(); - bool camSuccess = cam->SetImage(gbl::incube->getSampleCount() / 2, gbl::incube->getLineCount() / 2); + Camera *cam = gbl::incube->camera(); + bool camSuccess = cam->SetImage(gbl::incube->sampleCount() / 2, gbl::incube->lineCount() / 2); if(!camSuccess) {// the camera was unable to find the planet at the center of the image double lat, lon; // find values for lat/lon directly below spacecraft diff --git a/isis/src/cassini/apps/vims2isis/vims2isis.cpp b/isis/src/cassini/apps/vims2isis/vims2isis.cpp index b2225d6960..88bb26753d 100644 --- a/isis/src/cassini/apps/vims2isis/vims2isis.cpp +++ b/isis/src/cassini/apps/vims2isis/vims2isis.cpp @@ -431,7 +431,7 @@ void ProcessBands(Pvl &pdsLab, Cube *vimsCube, VimsType vtype) { //input band specific information if(vtype == VIS) { vims.mi32OrigBandStart = 1; - vims.mi32OrigBinEnd = vimsCube->getBandCount(); + vims.mi32OrigBinEnd = vimsCube->bandCount(); vims.mi32BandCenterStart = 0; vims.mi32BandCenterEnd = 96; vims.mi32NaifFrameCode = -82370; diff --git a/isis/src/cassini/apps/vims2map/vims2map.cpp b/isis/src/cassini/apps/vims2map/vims2map.cpp index b6505fa2e1..2b19d7b6bd 100644 --- a/isis/src/cassini/apps/vims2map/vims2map.cpp +++ b/isis/src/cassini/apps/vims2map/vims2map.cpp @@ -64,8 +64,8 @@ void IsisMain() { // Open the input cube and get the camera CubeAttributeInput atts0(list[i]); icube = p.SetInputCube(list[i].toString(), atts0); - g_bands = icube->getBandCount(); - incam = icube->getCamera(); + g_bands = icube->bandCount(); + incam = icube->camera(); // Make sure it is not the sky if (incam->target()->isSky()) { @@ -88,7 +88,7 @@ void IsisMain() { incam->BasicMapping(camMap); camGrp = camMap.FindGroup("Mapping"); if(icube->hasGroup("BandBin")) { - bandBinGrp = icube->getGroup("BandBin"); + bandBinGrp = icube->group("BandBin"); } diff --git a/isis/src/cassini/apps/vimscal/vimscal.cpp b/isis/src/cassini/apps/vimscal/vimscal.cpp index 422b41d040..b6bcca77e9 100644 --- a/isis/src/cassini/apps/vimscal/vimscal.cpp +++ b/isis/src/cassini/apps/vimscal/vimscal.cpp @@ -74,7 +74,7 @@ void IsisMain() { bool isVims = true; try { - isVims = (icube->getLabel()->FindGroup("Instrument", + isVims = (icube->label()->FindGroup("Instrument", Pvl::Traverse)["InstrumentId"][0] == "VIMS"); } catch(IException &e) { @@ -86,7 +86,7 @@ void IsisMain() { throw IException(IException::User, msg, _FILEINFO_); } - if(icube->getLabel()->FindObject("IsisCube").HasGroup("AlphaCube")) { + if(icube->label()->FindObject("IsisCube").HasGroup("AlphaCube")) { QString msg = "The input cube [" + QString(ui.GetAsString("FROM")) + "] has had its dimensions modified and can not be calibrated"; throw IException(IException::User, msg, _FILEINFO_); } @@ -186,11 +186,11 @@ void calculateSolarRemove(Cube *icube, ProcessByLine *p) { Camera *cam = NULL; try { - cam = icube->getCamera(); + cam = icube->camera(); } catch(IException &e) { QString msg = "Unable to create a camera model from [" + - icube->getFileName() + "]. Please run " + icube->fileName() + "]. Please run " "spiceinit on this file"; throw IException(e, IException::Unknown, msg, _FILEINFO_); } @@ -199,7 +199,7 @@ void calculateSolarRemove(Cube *icube, ProcessByLine *p) { solarRemoveCoefficient = -1; // try center first - if(cam->SetImage(icube->getSampleCount() / 2, icube->getLineCount() / 2)) { + if(cam->SetImage(icube->sampleCount() / 2, icube->lineCount() / 2)) { solarRemoveCoefficient = cam->SolarDistance() * cam->SolarDistance(); } @@ -208,35 +208,35 @@ void calculateSolarRemove(Cube *icube, ProcessByLine *p) { solarRemoveCoefficient = cam->SolarDistance() * cam->SolarDistance(); } - if(solarRemoveCoefficient < 0 && cam->SetImage(icube->getSampleCount(), 1.0)) { + if(solarRemoveCoefficient < 0 && cam->SetImage(icube->sampleCount(), 1.0)) { solarRemoveCoefficient = cam->SolarDistance() * cam->SolarDistance(); } - if(solarRemoveCoefficient < 0 && cam->SetImage(icube->getSampleCount(), - icube->getLineCount())) { + if(solarRemoveCoefficient < 0 && cam->SetImage(icube->sampleCount(), + icube->lineCount())) { solarRemoveCoefficient = cam->SolarDistance() * cam->SolarDistance(); } - if(solarRemoveCoefficient < 0 && cam->SetImage(1.0, icube->getLineCount())) { + if(solarRemoveCoefficient < 0 && cam->SetImage(1.0, icube->lineCount())) { solarRemoveCoefficient = cam->SolarDistance() * cam->SolarDistance(); } // try center of 4 edges - if(solarRemoveCoefficient < 0 && cam->SetImage(icube->getSampleCount() / 2, 1.0)) { + if(solarRemoveCoefficient < 0 && cam->SetImage(icube->sampleCount() / 2, 1.0)) { solarRemoveCoefficient = cam->SolarDistance() * cam->SolarDistance(); } - if(solarRemoveCoefficient < 0 && cam->SetImage(icube->getSampleCount(), - icube->getLineCount() / 2)) { + if(solarRemoveCoefficient < 0 && cam->SetImage(icube->sampleCount(), + icube->lineCount() / 2)) { solarRemoveCoefficient = cam->SolarDistance() * cam->SolarDistance(); } - if(solarRemoveCoefficient < 0 && cam->SetImage(icube->getSampleCount() / 2, - icube->getLineCount())) { + if(solarRemoveCoefficient < 0 && cam->SetImage(icube->sampleCount() / 2, + icube->lineCount())) { solarRemoveCoefficient = cam->SolarDistance() * cam->SolarDistance(); } - if(solarRemoveCoefficient < 0 && cam->SetImage(1.0, icube->getLineCount() / 2)) { + if(solarRemoveCoefficient < 0 && cam->SetImage(1.0, icube->lineCount() / 2)) { solarRemoveCoefficient = cam->SolarDistance() * cam->SolarDistance(); } @@ -252,7 +252,7 @@ void calculateSolarRemove(Cube *icube, ProcessByLine *p) { */ } - bool vis = (icube->getLabel()-> + bool vis = (icube->label()-> FindGroup("Instrument", Pvl::Traverse)["Channel"][0] != "IR"); QString attributes; @@ -278,7 +278,7 @@ void calculateSolarRemove(Cube *icube, ProcessByLine *p) { * This calculates the coefficients for specific energy corrections */ void calculateSpecificEnergy(Cube *icube) { - PvlGroup &inst = icube->getLabel()->FindGroup("Instrument", Pvl::Traverse); + PvlGroup &inst = icube->label()->FindGroup("Instrument", Pvl::Traverse); bool vis = (inst["Channel"][0] != "IR"); double coefficient = 1.0; @@ -324,7 +324,7 @@ void calculateSpecificEnergy(Cube *icube) { LineManager specEnergyMgr(specEnergyCube); LineManager waveCalMgr(waveCalCube); - for(int i = 0; i < icube->getBandCount(); i++) { + for(int i = 0; i < icube->bandCount(); i++) { Statistics specEnergyStats; Statistics waveCalStats; @@ -357,7 +357,7 @@ void calculateSpecificEnergy(Cube *icube) { * @param currCube */ void calculateDarkCurrent(Cube *icube) { - PvlGroup &inst = icube->getLabel()->FindGroup("Instrument", Pvl::Traverse); + PvlGroup &inst = icube->label()->FindGroup("Instrument", Pvl::Traverse); bool vis = (inst["Channel"][0] != "IR"); calibInfo += PvlKeyword("Vis", ((vis) ? "true" : "false")); @@ -379,7 +379,7 @@ void calculateDarkCurrent(Cube *icube) { * @param icube */ void calculateVisDarkCurrent(Cube *icube) { - PvlGroup &inst = icube->getLabel()->FindGroup("Instrument", Pvl::Traverse); + PvlGroup &inst = icube->label()->FindGroup("Instrument", Pvl::Traverse); // This is the dark current corrections for VIS bool hires = ((inst["SamplingMode"][0] == "HIGH") || (inst["SamplingMode"][0] == "HI-RES")); @@ -408,7 +408,7 @@ void calculateVisDarkCurrent(Cube *icube) { double visExposure = toDouble(inst["ExposureDuration"][1]); int sampleOffset, lineOffset; - GetOffsets(*icube->getLabel(), sampleOffset, lineOffset); + GetOffsets(*icube->label(), sampleOffset, lineOffset); /** * Reading in one parameter at a time: @@ -490,8 +490,8 @@ void calculateIrDarkCurrent(Cube *icube) { bool found = false; // verify if IR we have sideplane data - for(int obj = 0; !found && obj < icube->getLabel()->Objects(); obj++) { - PvlObject &object = icube->getLabel()->Object(obj); + for(int obj = 0; !found && obj < icube->label()->Objects(); obj++) { + PvlObject &object = icube->label()->Object(obj); if(object.Name() != "Table") continue; @@ -507,7 +507,7 @@ void calculateIrDarkCurrent(Cube *icube) { // If spectal summing is on OR compressor_id isnt N/A then // just return. - PvlGroup &archive = icube->getLabel()->FindGroup("Archive", Pvl::Traverse); + PvlGroup &archive = icube->label()->FindGroup("Archive", Pvl::Traverse); // If dark subtracted (compressorid is valid) and cant do linear // correction (spectral editing flag on) then do not do dark @@ -526,10 +526,10 @@ void calculateIrDarkCurrent(Cube *icube) { if(archive["SpectralSummingFlag"][0] == "ON") return; // Insert the sideplane data into our lineBasedDarkCorrections map (line,band to correction) - for(int line = 1; line <= icube->getLineCount(); line++) { - for(int band = 1; band <= icube->getBandCount(); band++) { + for(int line = 1; line <= icube->lineCount(); line++) { + for(int band = 1; band <= icube->bandCount(); band++) { pair index = pair(line, band); - int value = (int)sideplane[(line-1)*icube->getBandCount() + (band-1)][2]; + int value = (int)sideplane[(line-1)*icube->bandCount() + (band-1)][2]; if(value != 57344) lineBasedDarkCorrections.insert(pair< pair, double>(index, value)); @@ -544,11 +544,11 @@ void calculateIrDarkCurrent(Cube *icube) { } // do linear fits - for(int band = 1; band <= icube->getBandCount(); band++) { + for(int band = 1; band <= icube->bandCount(); band++) { PolynomialUnivariate basis(1); LeastSquares lsq(basis); - for(int line = 1; line <= icube->getLineCount(); line++) { + for(int line = 1; line <= icube->lineCount(); line++) { pair index = pair(line, band); map< pair, double>::iterator val = lineBasedDarkCorrections.find(index); @@ -570,7 +570,7 @@ void calculateIrDarkCurrent(Cube *icube) { basis.Coefficient(1) }; - for(int line = 1; line <= icube->getLineCount(); line++) { + for(int line = 1; line <= icube->lineCount(); line++) { pair index = pair(line, band); map< pair, double>::iterator val = lineBasedDarkCorrections.find(index); @@ -609,7 +609,7 @@ void calculateIrDarkCurrent(Cube *icube) { * @param p */ void chooseFlatFile(Cube *icube, ProcessByLine *p) { - PvlGroup &inst = icube->getLabel()->FindGroup("Instrument", Pvl::Traverse); + PvlGroup &inst = icube->label()->FindGroup("Instrument", Pvl::Traverse); bool vis = (inst["Channel"][0] != "IR"); bool hires = ((inst["SamplingMode"][0] == "HIGH") || (inst["SamplingMode"][0] == "HI-RES")); @@ -652,18 +652,18 @@ QString createCroppedFile(Cube *icube, QString cubeFileName, bool flatFile) { int lineOffset = 1; if(flatFile) { - GetOffsets(*icube->getLabel(), sampOffset, lineOffset); + GetOffsets(*icube->label(), sampOffset, lineOffset); } QString appArgs = "from=" + cubeFileName + " "; appArgs += "sample=" + toString(sampOffset) + " "; appArgs += "line=" + toString(lineOffset) + " "; - appArgs += "nsamples=" + toString(icube->getSampleCount()) + " "; - appArgs += "nlines=" + toString(icube->getLineCount()) + " "; + appArgs += "nsamples=" + toString(icube->sampleCount()) + " "; + appArgs += "nlines=" + toString(icube->lineCount()) + " "; FileName tempFile("$TEMPORARY/tmp_" + FileName(cubeFileName).baseName() + - "_" + FileName(icube->getFileName()).name()); + "_" + FileName(icube->fileName()).name()); appArgs += "to=" + tempFile.expanded(); diff --git a/isis/src/clementine/apps/clem2isis/clem2isis.cpp b/isis/src/clementine/apps/clem2isis/clem2isis.cpp index e2b71c4026..c484ae48ee 100644 --- a/isis/src/clementine/apps/clem2isis/clem2isis.cpp +++ b/isis/src/clementine/apps/clem2isis/clem2isis.cpp @@ -107,7 +107,7 @@ void TranslateLabels(FileName in, Cube *ocube) { PvlTranslationManager labelXlater(pdsLab, transFile.expanded()); // Pvl outputLabels; - Pvl *outputLabel = ocube->getLabel(); + Pvl *outputLabel = ocube->label(); labelXlater.Auto(*(outputLabel)); //Instrument group diff --git a/isis/src/clementine/apps/clemhirescal/clemhirescal.cpp b/isis/src/clementine/apps/clemhirescal/clemhirescal.cpp index 2d65607247..01b2f5a6a6 100644 --- a/isis/src/clementine/apps/clemhirescal/clemhirescal.cpp +++ b/isis/src/clementine/apps/clemhirescal/clemhirescal.cpp @@ -24,7 +24,7 @@ void IsisMain() { Cube *input = p.SetInputCube("FROM"); // Check for filter type of A-D - Pvl *label = input->getLabel(); + Pvl *label = input->label(); QString wave = (QString)label->FindGroup("BandBin", Pvl::Traverse)["FilterName"]; if((wave != "A") && (wave != "B") && (wave != "C") && (wave != "D")) { QString message = "Invalid FilterName [" + wave + "], can only handle A-D filters"; diff --git a/isis/src/clementine/apps/clemnircal/clemnircal.cpp b/isis/src/clementine/apps/clemnircal/clemnircal.cpp index fda90ff903..d9066908af 100644 --- a/isis/src/clementine/apps/clemnircal/clemnircal.cpp +++ b/isis/src/clementine/apps/clemnircal/clemnircal.cpp @@ -47,20 +47,20 @@ void IsisMain() { Cube *ocube = p.SetOutputCube("TO"); Cube *ffcube, *ofcube, *afcube, *dccube, *biascube, *bpcube; - QString filter = (QString)(icube->getGroup("BandBin"))["FilterName"]; + QString filter = (QString)(icube->group("BandBin"))["FilterName"]; filter = filter.toLower(); - QString productID = (QString)(icube->getGroup("Archive"))["ProductID"]; + QString productID = (QString)(icube->group("Archive"))["ProductID"]; QString orbit = productID.mid(productID.indexOf('.') + 1, productID.length() - 1); // If hemisphere code greater than 'I' set to 'n' else set to 's' char hemisphereCode = (productID[productID.indexOf('.')-1] > 'I') ? 'n' : 's'; - QString compressionType = (QString)(icube->getGroup("Instrument"))["EncodingFormat"]; - offsetModeID = (icube->getGroup("Instrument"))["OffsetModeID"]; - int gainModeID = (icube->getGroup("Instrument"))["GainModeID"]; + QString compressionType = (QString)(icube->group("Instrument"))["EncodingFormat"]; + offsetModeID = (icube->group("Instrument"))["OffsetModeID"]; + int gainModeID = (icube->group("Instrument"))["GainModeID"]; QString gainModeIDStr = toString(gainModeID); - double exposureDuration = (double)(icube->getGroup("Instrument"))["ExposureDuration"]; + double exposureDuration = (double)(icube->group("Instrument"))["ExposureDuration"]; optimalExposureDuration = (exposureDuration * 0.984675) + 0.233398; - cryocoolerDuration = (icube->getGroup("Instrument"))["CryocoolerDuration"]; + cryocoolerDuration = (icube->group("Instrument"))["CryocoolerDuration"]; if(ui.WasEntered("FFFILE")) { ffcube = p.SetInputCube("FFFILE"); @@ -231,12 +231,12 @@ void IsisMain() { // Add the radiometry group PvlGroup calgrp("Radiometry"); - calgrp += PvlKeyword("FlatFieldFile", ffcube->getFileName()); - calgrp += PvlKeyword("OrbitFlatFieldFile", ofcube->getFileName()); - calgrp += PvlKeyword("AdditiveFile", afcube->getFileName()); - calgrp += PvlKeyword("DarkCurrentFile", dccube->getFileName()); - calgrp += PvlKeyword("BiasFile", biascube->getFileName()); - calgrp += PvlKeyword("BadPixelFile", bpcube->getFileName()); + calgrp += PvlKeyword("FlatFieldFile", ffcube->fileName()); + calgrp += PvlKeyword("OrbitFlatFieldFile", ofcube->fileName()); + calgrp += PvlKeyword("AdditiveFile", afcube->fileName()); + calgrp += PvlKeyword("DarkCurrentFile", dccube->fileName()); + calgrp += PvlKeyword("BiasFile", biascube->fileName()); + calgrp += PvlKeyword("BadPixelFile", bpcube->fileName()); //Table files calgrp += PvlKeyword("ThermalCorrectionTable", thermTbl); diff --git a/isis/src/clementine/apps/clemnirnoise/clemnirnoise.cpp b/isis/src/clementine/apps/clemnirnoise/clemnirnoise.cpp index 51322bcd1d..8ecdee6079 100644 --- a/isis/src/clementine/apps/clemnirnoise/clemnirnoise.cpp +++ b/isis/src/clementine/apps/clemnirnoise/clemnirnoise.cpp @@ -21,7 +21,7 @@ void IsisMain() { p.SetOutputCube("TO"); // Start the processing - p.SetBrickSize(icube->getSampleCount(), icube->getLineCount(), 1); + p.SetBrickSize(icube->sampleCount(), icube->lineCount(), 1); p.StartProcess(NoiseFilter); p.EndProcess(); } diff --git a/isis/src/clementine/apps/clemuvviscal/clemuvviscal.cpp b/isis/src/clementine/apps/clemuvviscal/clemuvviscal.cpp index aa4809ad3f..94e5028cd8 100644 --- a/isis/src/clementine/apps/clemuvviscal/clemuvviscal.cpp +++ b/isis/src/clementine/apps/clemuvviscal/clemuvviscal.cpp @@ -58,7 +58,7 @@ void IsisMain() { dccube = p.SetInputCube(dcfileloc, cubeAtt); } - QString filter = (QString)(icube->getGroup("BandBin"))["FilterName"]; + QString filter = (QString)(icube->group("BandBin"))["FilterName"]; filter = filter.toLower(); Cube *ffcube; @@ -67,7 +67,7 @@ void IsisMain() { } else { // compute default fffile - double compressRatio = (icube->getGroup("Instrument"))["EncodingCompressionRatio"]; + double compressRatio = (icube->group("Instrument"))["EncodingCompressionRatio"]; // check to see if cube is compressed or uncompressed if(compressRatio == 1.0) { @@ -88,7 +88,7 @@ void IsisMain() { avgFF = uvvisDef.FindGroup("Filter" + filter.toUpper())["AVGFF"]; cr = uvvisDef.FindGroup("Filter" + filter.toUpper())["CO"]; - gain = uvvisDef.FindGroup(QString("GainModeID") + QString(icube->getGroup("Instrument")["GainModeID"][0]))["GAIN"]; + gain = uvvisDef.FindGroup(QString("GainModeID") + QString(icube->group("Instrument")["GainModeID"][0]))["GAIN"]; useDcconst = ui.WasEntered("DCCONST"); if(useDcconst) { @@ -99,19 +99,19 @@ void IsisMain() { } conv = ui.GetBoolean("CONV"); - exposureDuration = icube->getGroup("Instrument")["ExposureDuration"]; - offsetModeID = icube->getGroup("Instrument")["OffsetModeID"]; + exposureDuration = icube->group("Instrument")["ExposureDuration"]; + offsetModeID = icube->group("Instrument")["OffsetModeID"]; - if(((QString)icube->getGroup("Instrument")["FocalPlaneTemperature"]).compare("UNK") == 0) { + if(((QString)icube->group("Instrument")["FocalPlaneTemperature"]).compare("UNK") == 0) { //if FocalPlaneTemp is unknown set it to zero focalPlaneTemp = 0.0; } else { - focalPlaneTemp = icube->getGroup("Instrument")["FocalPlaneTemperature"]; + focalPlaneTemp = icube->group("Instrument")["FocalPlaneTemperature"]; } - Camera *cam = icube->getCamera(); - bool camSuccess = cam->SetImage(icube->getSampleCount() / 2, icube->getLineCount() / 2); + Camera *cam = icube->camera(); + bool camSuccess = cam->SetImage(icube->sampleCount() / 2, icube->lineCount() / 2); if(!camSuccess) { throw IException(IException::Unknown, "Unable to calculate the Solar Distance for this cube.", _FILEINFO_); @@ -123,8 +123,8 @@ void IsisMain() { if(ui.GetBoolean("TCOR") || abs(focalPlaneTemp) <= DBL_EPSILON) { // Temperature correction requires the use of the mission phase // (PRELAUNCH, EARTH, LUNAR) and the product ID. - QString productID = (QString)(icube->getGroup("Archive")["ProductID"]); - QChar missionPhase = ((QString)((icube->getGroup("Archive"))["MissionPhase"])).at(0); + QString productID = (QString)(icube->group("Archive")["ProductID"]); + QChar missionPhase = ((QString)((icube->group("Archive"))["MissionPhase"])).at(0); QString n1subQString(productID.mid(productID.indexOf('.') + 1, productID.length() - 1)); QString n2subQString(productID.mid(4, productID.indexOf('.') - 5)); int n1 = toInt(n1subQString); @@ -156,15 +156,15 @@ void IsisMain() { } // Start the processing - p.SetBrickSize(icube->getSampleCount(), icube->getLineCount(), 1); + p.SetBrickSize(icube->sampleCount(), icube->lineCount(), 1); p.StartProcess(UvVisCal); // Add the radiometry group PvlGroup calgrp("Radiometry"); - calgrp += PvlKeyword("FlatFieldFile", ffcube->getFileName()); + calgrp += PvlKeyword("FlatFieldFile", ffcube->fileName()); if(ui.GetString("DARKCURRENT").compare("DCFILE") == 0) { - calgrp += PvlKeyword("DarkCurrentFile", dccube->getFileName()); + calgrp += PvlKeyword("DarkCurrentFile", dccube->fileName()); } else { calgrp += PvlKeyword("DarkCurrentConstant", toString(dcconst)); diff --git a/isis/src/control/apps/autoseed/autoseed.cpp b/isis/src/control/apps/autoseed/autoseed.cpp index 62a05ad258..51efac034b 100644 --- a/isis/src/control/apps/autoseed/autoseed.cpp +++ b/isis/src/control/apps/autoseed/autoseed.cpp @@ -168,7 +168,7 @@ void IsisMain() { else if(seedDomain == SampleLine) { Cube cube; cube.open(serialNumbers.FileName(0)); - ugmap = new UniversalGroundMap(*cube.getLabel()); + ugmap = new UniversalGroundMap(*cube.label()); } // Create the control net to store the points in. @@ -394,7 +394,7 @@ void IsisMain() { Cube cube; QString c = serialNumbers.FileName((*overlaps[ov])[sn]); cube.open(c); - Isis::Brick brick(1, 1, 1, cube.getPixelType()); + Isis::Brick brick(1, 1, 1, cube.pixelType()); brick.SetBasePosition((int)gmap->Camera()->Sample(), (int)gmap->Camera()->Line(), (int)gmap->Camera()->Band()); cube.read(brick); if(Isis::IsSpecial(brick[0]) || brick[0] > maxDN || brick[0] < minDN) { diff --git a/isis/src/control/apps/cnetadd/cnetadd.cpp b/isis/src/control/apps/cnetadd/cnetadd.cpp index 54c8887d77..da77f0f5d9 100644 --- a/isis/src/control/apps/cnetadd/cnetadd.cpp +++ b/isis/src/control/apps/cnetadd/cnetadd.cpp @@ -161,9 +161,9 @@ void IsisMain() { for (int img = 0; img < addList.size(); img++) { Cube cube; cube.open(addList[img].toString()); - Pvl *cubepvl = cube.getLabel(); + Pvl *cubepvl = cube.label(); QString sn = SerialNumber::Compose(*cubepvl); - Camera *cam = cube.getCamera(); + Camera *cam = cube.camera(); // Loop through all the control points QList validPoints = usePolygon ? @@ -221,7 +221,7 @@ void IsisMain() { newCm->SetIgnored(true); } else { - Portal portal(1, 1, cube.getPixelType()); + Portal portal(1, 1, cube.pixelType()); portal.SetPosition(cam->Sample(), cam->Line(), 1); cube.read(portal); if (!validator.ValidDnValue(portal[0])) { @@ -370,8 +370,8 @@ void setControlPointLatLon(SerialNumberList &snl, ControlNet &cnet) { Cube *cube = manager.OpenCube(snl.FileName(cm->GetCubeSerialNumber())); try { - cube->getCamera()->SetImage(cm->GetSample(), cm->GetLine()); - g_surfacePoints[point->GetId()] = cube->getCamera()->GetSurfacePoint(); + cube->camera()->SetImage(cm->GetSample(), cm->GetLine()); + g_surfacePoints[point->GetId()] = cube->camera()->GetSurfacePoint(); } catch (IException &e) { QString msg = "Unable to create camera for cube file ["; @@ -394,7 +394,7 @@ QList getValidPoints(Cube &cube, STRtree &coordTree) { } catch (IException &e) { QString msg = "Footprintinit must be run prior to running cnetadd"; - msg += " with POLYGON=TRUE for cube [" + cube.getFileName() + "]"; + msg += " with POLYGON=TRUE for cube [" + cube.fileName() + "]"; throw IException(e, IException::User, msg, _FILEINFO_); } diff --git a/isis/src/control/apps/cnetcheck/cnetcheck.cpp b/isis/src/control/apps/cnetcheck/cnetcheck.cpp index e31f065e51..c6fa7c277f 100644 --- a/isis/src/control/apps/cnetcheck/cnetcheck.cpp +++ b/isis/src/control/apps/cnetcheck/cnetcheck.cpp @@ -573,7 +573,7 @@ double getControlFitness(const ControlCubeGraphNode * node, double tolerance, Cu // Calculate the area of the convex hull double convexArea = convexHull->getArea(); QString sn = node->getSerialNumber(); - double cubeArea = cube->getSampleCount() * cube->getLineCount(); + double cubeArea = cube->sampleCount() * cube->lineCount(); controlFitness = convexArea / cubeArea; @@ -612,7 +612,7 @@ void noLatLonCheck(ControlNet &cnet, CubeManager &manager, Progress &progress, Camera *cam = NULL; bool createdCamera = true; try { - cam = cube->getCamera(); + cam = cube->camera(); } catch (IException &) { createdCamera = false; diff --git a/isis/src/control/apps/cnetedit/cnetedit.cpp b/isis/src/control/apps/cnetedit/cnetedit.cpp index 12e732cde2..11725d282f 100644 --- a/isis/src/control/apps/cnetedit/cnetedit.cpp +++ b/isis/src/control/apps/cnetedit/cnetedit.cpp @@ -857,10 +857,10 @@ void checkAllMeasureValidity(ControlNet &cnet, QString cubeList) { if (validator->IsCameraRequired()) { try { - camera = cube->getCamera(); + camera = cube->camera(); } catch (IException &e) { - QString msg = "Cannot Create Camera for Image:" + cube->getFileName(); + QString msg = "Cannot Create Camera for Image:" + cube->fileName(); throw IException(e, IException::User, msg, _FILEINFO_); } } diff --git a/isis/src/control/apps/cnetextract/cnetextract.cpp b/isis/src/control/apps/cnetextract/cnetextract.cpp index 7283fde328..d7251b97f3 100644 --- a/isis/src/control/apps/cnetextract/cnetextract.cpp +++ b/isis/src/control/apps/cnetextract/cnetextract.cpp @@ -634,12 +634,12 @@ void ExtractLatLonRange(ControlNet &outNet, QVector nonLatLonPoints, bool remove = false; Cube *cube = manager.OpenCube(sn2filename[sn]); - Camera *camera = cube->getCamera(); + Camera *camera = cube->camera(); if(camera == NULL) { try { Projection *projection = - ProjectionFactory::Create((*(cube->getLabel()))); + ProjectionFactory::Create((*(cube->label()))); if(!projection->SetCoordinate(controlPt->GetMeasure(cm)->GetSample(), controlPt->GetMeasure(cm)->GetLine())) { diff --git a/isis/src/control/apps/cnetnewradii/cnetnewradii.cpp b/isis/src/control/apps/cnetnewradii/cnetnewradii.cpp index 076d5acc20..b92fd13d72 100644 --- a/isis/src/control/apps/cnetnewradii/cnetnewradii.cpp +++ b/isis/src/control/apps/cnetnewradii/cnetnewradii.cpp @@ -45,7 +45,7 @@ void IsisMain() { // Buffer used to read from the model Portal *portal = new Portal(interp->Samples(), interp->Lines(), - demCube.getPixelType(), + demCube.pixelType(), interp->HotSample(), interp->HotLine());; diff --git a/isis/src/control/apps/coreg/coreg.cpp b/isis/src/control/apps/coreg/coreg.cpp index 12d212b5f0..affe7af17b 100644 --- a/isis/src/control/apps/coreg/coreg.cpp +++ b/isis/src/control/apps/coreg/coreg.cpp @@ -65,13 +65,13 @@ void IsisMain() { // Input cube Lines and Samples must be the same and each must have only // one band - if((trans.getLineCount() != match.getLineCount()) || - (trans.getSampleCount() != match.getSampleCount())) { + if((trans.lineCount() != match.lineCount()) || + (trans.sampleCount() != match.sampleCount())) { QString msg = "Input Cube Lines and Samples must be equal!"; throw IException(IException::User, msg, _FILEINFO_); } - if(trans.getBandCount() != 1 || match.getBandCount() != 1) { + if(trans.bandCount() != 1 || match.bandCount() != 1) { QString msg = "Input Cubes must have only one band!"; throw IException(IException::User, msg, _FILEINFO_); } @@ -82,8 +82,8 @@ void IsisMain() { // This still precludes band to band registrations. if(serialTrans == serialMatch) { - QString sTrans = FileName(trans.getFileName()).name(); - QString sMatch = FileName(match.getFileName()).name(); + QString sTrans = FileName(trans.fileName()).name(); + QString sMatch = FileName(match.fileName()).name(); if(sTrans == sMatch) { QString msg = "Cube Serial Numbers must be unique - FROM=" + serialTrans + ", MATCH=" + serialMatch; @@ -108,13 +108,13 @@ void IsisMain() { rows = ui.GetInteger("ROWS"); } else { - rows = (int)((trans.getLineCount() - 1) / ar->SearchChip()->Lines() + 1); + rows = (int)((trans.lineCount() - 1) / ar->SearchChip()->Lines() + 1); } if(ui.WasEntered("COLUMNS")) { cols = ui.GetInteger("COLUMNS"); } else { - cols = (int)((trans.getSampleCount() - 1) + cols = (int)((trans.sampleCount() - 1) / ar->SearchChip()->Samples() + 1); } @@ -124,15 +124,15 @@ void IsisMain() { prog.CheckStatus(); // Calculate spacing for the grid of points - double lSpacing = (double)trans.getLineCount() / rows; - double sSpacing = (double)trans.getSampleCount() / cols; + double lSpacing = (double)trans.lineCount() / rows; + double sSpacing = (double)trans.sampleCount() / cols; // Initialize control point network and set target name (only required // field) ControlNet cn; cn.SetNetworkId("Coreg"); if (match.hasGroup("Instrument")) { - PvlGroup inst = match.getGroup("Instrument"); + PvlGroup inst = match.group("Instrument"); PvlKeyword &targname = inst.FindKeyword("TargetName"); QString targetname = targname; cn.SetTarget(targetname); diff --git a/isis/src/control/apps/deltack/deltack.cpp b/isis/src/control/apps/deltack/deltack.cpp index d822e91ad4..5f43824fe3 100644 --- a/isis/src/control/apps/deltack/deltack.cpp +++ b/isis/src/control/apps/deltack/deltack.cpp @@ -64,9 +64,9 @@ void IsisMain() { Cube c; c.open(filename, "rw"); //check for target name - if(c.getLabel()->HasKeyword("TargetName", PvlObject::Traverse)) { + if(c.label()->HasKeyword("TargetName", PvlObject::Traverse)) { // c.Label()->FindKeyword("TargetName"); - PvlGroup inst = c.getLabel()->FindGroup("Instrument", PvlObject::Traverse); + PvlGroup inst = c.label()->FindGroup("Instrument", PvlObject::Traverse); QString targetName = inst["TargetName"]; cnet.SetTarget(targetName); } @@ -125,8 +125,8 @@ void IsisMain() { c.open(filename, "rw"); //check for existing polygon, if exists delete it - if(c.getLabel()->HasObject("Polygon")) { - c.getLabel()->DeleteObject("Polygon"); + if(c.label()->HasObject("Polygon")) { + c.label()->DeleteObject("Polygon"); } Table cmatrix = b.Cmatrix(0); diff --git a/isis/src/control/apps/fplanemap/fplanemap.cpp b/isis/src/control/apps/fplanemap/fplanemap.cpp index 1487283044..3caefd529e 100644 --- a/isis/src/control/apps/fplanemap/fplanemap.cpp +++ b/isis/src/control/apps/fplanemap/fplanemap.cpp @@ -46,7 +46,7 @@ void IsisMain() { vector bandFrom = attFrom.bands(); from.setVirtualBands(bandFrom); from.open(ui.GetFileName("FROM"), "r"); - Camera *fcamera = from.getCamera(); + Camera *fcamera = from.camera(); CameraDistortionMap *dmap = fcamera->DistortionMap(); diff --git a/isis/src/control/apps/jigsaw/jigsaw.cpp b/isis/src/control/apps/jigsaw/jigsaw.cpp index e125f07354..a121f7ac6e 100644 --- a/isis/src/control/apps/jigsaw/jigsaw.cpp +++ b/isis/src/control/apps/jigsaw/jigsaw.cpp @@ -201,16 +201,16 @@ void IsisMain() { CubeAttributeInput inAtt; Cube *c = p.SetInputCube(b->FileName(i), inAtt, ReadWrite); //check for existing polygon, if exists delete it - if (c->getLabel()->HasObject("Polygon")) { - c->getLabel()->DeleteObject("Polygon"); + if (c->label()->HasObject("Polygon")) { + c->label()->DeleteObject("Polygon"); } // check for CameraStatistics Table, if exists, delete - for (int iobj = 0; iobj < c->getLabel()->Objects(); iobj++) { - PvlObject obj = c->getLabel()->Object(iobj); + for (int iobj = 0; iobj < c->label()->Objects(); iobj++) { + PvlObject obj = c->label()->Object(iobj); if (obj.Name() != "Table") continue; if (obj["Name"][0] != QString("CameraStatistics")) continue; - c->getLabel()->DeleteObject(iobj); + c->label()->DeleteObject(iobj); break; } diff --git a/isis/src/control/apps/pointreg/pointreg.cpp b/isis/src/control/apps/pointreg/pointreg.cpp index f540607d5e..b73724e185 100644 --- a/isis/src/control/apps/pointreg/pointreg.cpp +++ b/isis/src/control/apps/pointreg/pointreg.cpp @@ -574,7 +574,7 @@ void registerPoint(ControlPoint *outPoint, ControlMeasure *patternCM, if (ar->Success()) { // Check to make sure the newly calculated measure position is on // the surface of the planet - Camera *cam = searchCube.getCamera(); + Camera *cam = searchCube.camera(); bool foundLatLon = cam->SetImage(ar->CubeSample(), ar->CubeLine()); if (foundLatLon) { @@ -747,7 +747,7 @@ Validation backRegister(ControlMeasure *reference, ControlMeasure *measure, if (validator->Success()) { // Check to make sure the newly calculated measure position is on // the surface of the planet - Camera *cam = searchCube.getCamera(); + Camera *cam = searchCube.camera(); bool foundLatLon = cam->SetImage( validator->CubeSample(), validator->CubeLine()); @@ -766,7 +766,7 @@ Validation backRegister(ControlMeasure *reference, ControlMeasure *measure, double getResolution(Cube &cube, ControlMeasure &measure) { // TODO retrieve for projection - Camera *camera = cube.getCamera(); + Camera *camera = cube.camera(); camera->SetImage(measure.GetSample(), measure.GetLine()); return camera->PixelResolution(); } @@ -775,11 +775,11 @@ double getResolution(Cube &cube, ControlMeasure &measure) { // Verify a cube has either a Camera or a Projection, throw an exception if not void verifyCube(Cube & cube) { try { - cube.getCamera(); + cube.camera(); } catch (IException &camError) { try { - cube.getProjection(); + cube.projection(); } catch (IException &projError) { projError.append(camError); diff --git a/isis/src/control/apps/slither/SlitherTransform.cpp b/isis/src/control/apps/slither/SlitherTransform.cpp index 32872072c8..7a81b58b4e 100644 --- a/isis/src/control/apps/slither/SlitherTransform.cpp +++ b/isis/src/control/apps/slither/SlitherTransform.cpp @@ -39,8 +39,8 @@ namespace Isis { _rows(), _badRows(), _pntsTotal(0), _pntsUsed(0), _pntsTossed(0), _iDir(1.0), - _outputLines(cube.getLineCount()), - _outputSamples(cube.getSampleCount()), + _outputLines(cube.lineCount()), + _outputSamples(cube.sampleCount()), _lineOffset(0.0), _sampOffset(0.0) { // Collect the points from the control file diff --git a/isis/src/control/apps/slither/slither.cpp b/isis/src/control/apps/slither/slither.cpp index 819800335a..61955cc286 100644 --- a/isis/src/control/apps/slither/slither.cpp +++ b/isis/src/control/apps/slither/slither.cpp @@ -60,7 +60,7 @@ void IsisMain() { os.open(rFile.toAscii().data(), ios::out); os << "# Slither Transform Results\n" << "# RunDate: " << iTime::CurrentLocalTime() << endl - << "# FROM: " << icube->getFileName() << endl + << "# FROM: " << icube->fileName() << endl << "# CNETFILE: " << cfile << endl << endl; transform.dumpState(os); @@ -69,7 +69,7 @@ void IsisMain() { // Allocate the output file, same size as input p.SetOutputCube("TO", transform.OutputSamples(), transform.OutputLines(), - icube->getBandCount()); + icube->bandCount()); // Set up the interpolator Interpolator *interp; diff --git a/isis/src/control/apps/warp/warp.cpp b/isis/src/control/apps/warp/warp.cpp index a37d0ebb92..f456a88f5c 100644 --- a/isis/src/control/apps/warp/warp.cpp +++ b/isis/src/control/apps/warp/warp.cpp @@ -53,8 +53,8 @@ void IsisMain() { if (ui.GetString("OSIZE") == "MATCH") { Cube c; c.open(ui.GetFileName("CUBE"), "r"); - onl = c.getLineCount(); - ons = c.getSampleCount(); + onl = c.lineCount(); + ons = c.sampleCount(); c.close(); } else if (ui.GetString("OSIZE") == "COMPUTE") { @@ -76,13 +76,13 @@ void IsisMain() { WarpTransform *transform = new WarpTransform(*basisLine, *basisSamp, weighted, inputLine, inputSample, outputLine, outputSample, - icube->getLineCount(), icube->getSampleCount(), + icube->lineCount(), icube->sampleCount(), onl, ons); // Allocate the output file, same size as input p.SetOutputCube("TO", transform->OutputSamples(), transform->OutputLines(), - icube->getBandCount()); + icube->bandCount()); // Set up the interpolator Interpolator *interp; diff --git a/isis/src/control/objs/ControlNetStatistics/ControlNetStatistics.cpp b/isis/src/control/objs/ControlNetStatistics/ControlNetStatistics.cpp index d759760033..379b3e50bf 100644 --- a/isis/src/control/objs/ControlNetStatistics/ControlNetStatistics.cpp +++ b/isis/src/control/objs/ControlNetStatistics/ControlNetStatistics.cpp @@ -241,8 +241,8 @@ namespace Isis { mSerialNumMap[sn] = true; numCNetImages++; - imgStats[imgSamples] = cube->getSampleCount(); - imgStats[imgLines] = cube->getLineCount(); + imgStats[imgSamples] = cube->sampleCount(); + imgStats[imgLines] = cube->lineCount(); double cubeArea = imgStats[imgSamples] * imgStats[imgLines]; QList< ControlMeasure * > measures = node->getMeasures(); diff --git a/isis/src/control/objs/ControlNetValidMeasure/ControlNetValidMeasure.cpp b/isis/src/control/objs/ControlNetValidMeasure/ControlNetValidMeasure.cpp index 305718c82d..521511ae41 100644 --- a/isis/src/control/objs/ControlNetValidMeasure/ControlNetValidMeasure.cpp +++ b/isis/src/control/objs/ControlNetValidMeasure/ControlNetValidMeasure.cpp @@ -178,10 +178,10 @@ namespace Isis { Camera *measureCamera = NULL; if(mbCameraRequired) { try { - measureCamera = pCube->getCamera(); + measureCamera = pCube->camera(); } catch(IException &e) { - QString msg = "Cannot Create Camera for Image:" + pCube->getFileName(); + QString msg = "Cannot Create Camera for Image:" + pCube->fileName(); throw IException(IException::User, msg, _FILEINFO_); } } @@ -246,7 +246,7 @@ namespace Isis { } if(mbValidateDN) { - Isis::Portal inPortal(1, 1, pCube->getPixelType()); + Isis::Portal inPortal(1, 1, pCube->pixelType()); inPortal.SetPosition(pSample, pLine, 1); pCube->read(inPortal); mdDnValue = inPortal[0]; @@ -813,8 +813,8 @@ namespace Isis { return true; } - int iNumSamples = pCube->getSampleCount(); - int iNumLines = pCube->getLineCount(); + int iNumSamples = pCube->sampleCount(); + int iNumLines = pCube->lineCount(); // test right if((iNumSamples - piSample) < miPixelsFromEdge) { @@ -855,12 +855,12 @@ namespace Isis { return true; } - int iNumSamples = pCube->getSampleCount(); - int iNumLines = pCube->getLineCount(); + int iNumSamples = pCube->sampleCount(); + int iNumLines = pCube->lineCount(); try { // Get the image's camera to get pixel resolution - Camera *camera = pCube->getCamera(); + Camera *camera = pCube->camera(); double resMetersTotal = 0; bool bMinDistance = false; @@ -925,7 +925,7 @@ namespace Isis { } catch(IException &e) { QString msg = "Cannot Create Camera for Image [" + - pCube->getFileName() + "]"; + pCube->fileName() + "]"; throw IException(IException::User, msg, _FILEINFO_); } } diff --git a/isis/src/control/objs/InterestOperator/InterestOperator.cpp b/isis/src/control/objs/InterestOperator/InterestOperator.cpp index 8d6010cd9c..76686e5462 100644 --- a/isis/src/control/objs/InterestOperator/InterestOperator.cpp +++ b/isis/src/control/objs/InterestOperator/InterestOperator.cpp @@ -156,7 +156,7 @@ namespace Isis { // Level 3 images/mosaic or bad image { QString msg = "Cannot run interest on images with no camera. Image " + - pCube.getFileName() + " has no Camera"; + pCube.fileName() + " has no Camera"; throw IException(IException::Programmer, msg, _FILEINFO_); } @@ -422,7 +422,7 @@ namespace Isis { // Get the Camera for the reference image and get the lat/lon from that measurment Camera *bestCamera; try { - bestCamera = bestCube->getCamera(); + bestCamera = bestCube->camera(); } catch (IException &e) { QString msg = "Cannot Create Camera for Image:" + mSerialNumbers.FileName(sn); @@ -467,7 +467,7 @@ namespace Isis { // Get the Camera Camera *measureCamera; try { - measureCamera = measureCube->getCamera(); + measureCamera = measureCube->camera(); } catch (IException &e) { QString msg = "Cannot Create Camera for Image:" + mSerialNumbers.FileName(sn); @@ -784,7 +784,7 @@ namespace Isis { // Get the Camera Camera *camera; try { - camera = pCube.getCamera(); + camera = pCube.camera(); } catch (IException &e) { QString msg = "Cannot Create Camera for Image:" + mSerialNumbers.FileName(serialNum); @@ -792,7 +792,7 @@ namespace Isis { } if (camera->SetImage(iOrigSample, iOrigLine)) { - Portal inPortal(1, 1, pCube.getPixelType()); + Portal inPortal(1, 1, pCube.pixelType()); inPortal.SetPosition(iOrigSample, iOrigLine, 1); pCube.read(inPortal); diff --git a/isis/src/galileo/apps/gllssi2isis/gllssi2isis.cpp b/isis/src/galileo/apps/gllssi2isis/gllssi2isis.cpp index bdba0f1c30..876967e05e 100644 --- a/isis/src/galileo/apps/gllssi2isis/gllssi2isis.cpp +++ b/isis/src/galileo/apps/gllssi2isis/gllssi2isis.cpp @@ -129,7 +129,7 @@ void TranslateLabels(Pvl &pdsLabel, Cube *ocube) { // Get the translation manager ready PvlTranslationManager labelXlater(pdsLabel, transFile.expanded()); // Pvl outputLabels; - Pvl *outputLabel = ocube->getLabel(); + Pvl *outputLabel = ocube->label(); labelXlater.Auto(*(outputLabel)); //Add to the Archive Group diff --git a/isis/src/galileo/apps/gllssical/gllssical.cpp b/isis/src/galileo/apps/gllssical/gllssical.cpp index 77f6b36cc9..4c48855b10 100644 --- a/isis/src/galileo/apps/gllssical/gllssical.cpp +++ b/isis/src/galileo/apps/gllssical/gllssical.cpp @@ -58,7 +58,7 @@ void IsisMain() { Isis::CubeAttributeInput inAtt1; FileName darkFileName = FindDarkFile(icube); Cube *darkcube = p.SetInputCube(darkFileName.expanded(), inAtt1); - dcScaleFactor = toDouble(darkcube->getGroup("Instrument")["PicScale"][0]); + dcScaleFactor = toDouble(darkcube->group("Instrument")["PicScale"][0]); Isis::CubeAttributeInput inAtt2; FileName gainFileName = FindGainFile(icube); @@ -83,9 +83,9 @@ void IsisMain() { calculateScaleFactor0(icube, gaincube); - exposureDuration = toDouble(icube->getGroup("Instrument")["ExposureDuration"][0]) * 1000; + exposureDuration = toDouble(icube->group("Instrument")["ExposureDuration"][0]) * 1000; - if(darkcube->getPixelType() == Isis::UnsignedByte) { + if(darkcube->pixelType() == Isis::UnsignedByte) { eightBitDarkCube = true; } else { @@ -210,13 +210,13 @@ FileName FindDarkFile(Cube *icube) { * 4 = 60 2/3 * 5 = 15 1/6 */ - if((int)(toDouble(icube->getGroup("Instrument")["FrameDuration"][0])) == 2) frameRateId = 1; - if((int)(toDouble(icube->getGroup("Instrument")["FrameDuration"][0])) == 8) frameRateId = 2; - if((int)(toDouble(icube->getGroup("Instrument")["FrameDuration"][0])) == 30) frameRateId = 3; - if((int)(toDouble(icube->getGroup("Instrument")["FrameDuration"][0])) == 60) frameRateId = 4; - if((int)(toDouble(icube->getGroup("Instrument")["FrameDuration"][0])) == 15) frameRateId = 5; + if((int)(toDouble(icube->group("Instrument")["FrameDuration"][0])) == 2) frameRateId = 1; + if((int)(toDouble(icube->group("Instrument")["FrameDuration"][0])) == 8) frameRateId = 2; + if((int)(toDouble(icube->group("Instrument")["FrameDuration"][0])) == 30) frameRateId = 3; + if((int)(toDouble(icube->group("Instrument")["FrameDuration"][0])) == 60) frameRateId = 4; + if((int)(toDouble(icube->group("Instrument")["FrameDuration"][0])) == 15) frameRateId = 5; - int exposureTypeId = (icube->getGroup("Instrument")["ExposureType"][0] == "NORMAL") ? 0 : 1; + int exposureTypeId = (icube->group("Instrument")["ExposureType"][0] == "NORMAL") ? 0 : 1; // We have what we need from the image label, now go through the text file that is our table line by line // looking for a match. @@ -230,7 +230,7 @@ FileName FindDarkFile(Cube *icube) { } QString frameMode = (tokens.count()? tokens.takeFirst() : ""); - if(frameMode.at(0) != icube->getGroup("Instrument")["FrameModeId"][0].at(0)) { + if(frameMode.at(0) != icube->group("Instrument")["FrameModeId"][0].at(0)) { continue; } @@ -250,15 +250,15 @@ FileName FindDarkFile(Cube *icube) { } QString readout = (tokens.count()? tokens.takeFirst() : ""); - if(readout.at(0) != icube->getGroup("Instrument")["ReadoutMode"][0].at(0)) { + if(readout.at(0) != icube->group("Instrument")["ReadoutMode"][0].at(0)) { continue; } int minImageNum = toInt(tokens.takeFirst()); int maxImageNum = toInt(tokens.takeFirst()); - int imageNumber = (int)(toDouble(icube->getGroup("Instrument")["SpacecraftClockStartCount"]) * 100 + 0.5); - QString telemetry = icube->getGroup("Instrument")["TelemetryFormat"][0]; + int imageNumber = (int)(toDouble(icube->group("Instrument")["SpacecraftClockStartCount"]) * 100 + 0.5); + QString telemetry = icube->group("Instrument")["TelemetryFormat"][0]; if(imageNumber > 99757701 && imageNumber < 159999999) { if((telemetry == "AI8" && (gainState == "1" || gainState == "2")) || (telemetry == "IM4" && (gainState == "3" || gainState == "4"))) { @@ -287,7 +287,7 @@ FileName FindGainFile(Cube *icube) { gainFile.SetComment("C"); QString data; - int imageNumber = (int)((double)icube->getGroup("Instrument")["SpacecraftClockStartCount"] * 100 + 0.5); + int imageNumber = (int)((double)icube->group("Instrument")["SpacecraftClockStartCount"] * 100 + 0.5); while(gainFile.GetLine(data)) { data = data.simplified().trimmed(); @@ -303,13 +303,13 @@ FileName FindGainFile(Cube *icube) { * Filter codes * 0=clear,1=green,2=red,3=violet,4=7560,5=9680,6=7270,7=8890 */ - QString filter = icube->getGroup("BandBin")["FilterNumber"][0]; + QString filter = icube->group("BandBin")["FilterNumber"][0]; if(filter != tokens.takeFirst()) { continue; } QString frameMode = tokens.count()? tokens.takeFirst() : ""; - if(frameMode.at(0) != icube->getGroup("Instrument")["FrameModeId"][0].at(0)) { + if(frameMode.at(0) != icube->group("Instrument")["FrameModeId"][0].at(0)) { continue; } @@ -331,7 +331,7 @@ FileName ReadWeightTable(Cube *icube) { FileName weightFile(file); weightFile = weightFile.highestVersion(); Pvl weightTables(weightFile.expanded()); - QString group = QString("FrameMode") + icube->getGroup("Instrument")["FrameModeId"][0].at(0); + QString group = QString("FrameMode") + icube->group("Instrument")["FrameModeId"][0].at(0); PvlGroup &frameGrp = weightTables.FindGroup(group); QString keyword = QString("GainState") + ((getGainModeID(icube) < 3) ? QString("12") : QString("34")); @@ -351,22 +351,22 @@ int getGainModeID(Cube *icube) { * 3 = 40,000 * 4 = 10,000 */ - if((int)toDouble(icube->getGroup("Instrument")["GainModeId"][0]) == 4E5) { + if((int)toDouble(icube->group("Instrument")["GainModeId"][0]) == 4E5) { gainModeId = 1; } - else if((int)toDouble(icube->getGroup("Instrument")["GainModeId"][0]) == 1E5) { + else if((int)toDouble(icube->group("Instrument")["GainModeId"][0]) == 1E5) { gainModeId = 2; } - else if((int)toDouble(icube->getGroup("Instrument")["GainModeId"][0]) == 4E4) { + else if((int)toDouble(icube->group("Instrument")["GainModeId"][0]) == 4E4) { gainModeId = 3; } - else if((int)toDouble(icube->getGroup("Instrument")["GainModeId"][0]) == 1E4) { + else if((int)toDouble(icube->group("Instrument")["GainModeId"][0]) == 1E4) { gainModeId = 4; } else { throw IException(IException::Unknown, "Invalid value for Gain Mode ID [" + - icube->getGroup("Instrument")["GainModeId"][0] + + icube->group("Instrument")["GainModeId"][0] + "].", _FILEINFO_); } @@ -397,7 +397,7 @@ void calculateScaleFactor0(Cube *icube, Cube *gaincube) { // Match target name if(currGrp.HasKeyword("TargetName")) { - if(!icube->getGroup("Archive")["CalTargetCode"][0].startsWith(currGrp["TargetName"][0])) { + if(!icube->group("Archive")["CalTargetCode"][0].startsWith(currGrp["TargetName"][0])) { continue; } } @@ -406,7 +406,7 @@ void calculateScaleFactor0(Cube *icube, Cube *gaincube) { if(currGrp.HasKeyword("MinimumTargetName")) { try { if((int)currGrp["MinimumTargetName"] > - (int)toInt(icube->getGroup("Archive")["CalTargetCode"][0].mid(0, 2))) { + (int)toInt(icube->group("Archive")["CalTargetCode"][0].mid(0, 2))) { continue; } } @@ -419,12 +419,12 @@ void calculateScaleFactor0(Cube *icube, Cube *gaincube) { fltToRad = currGrp["FloatToRad"]; } - int filterNumber = toInt(icube->getGroup("BandBin")["FilterNumber"][0]); + int filterNumber = toInt(icube->group("BandBin")["FilterNumber"][0]); if(fltToRef.Size() == 0) { throw IException(IException::Unknown, "Unable to find matching reflectance and radiance values for target [" + - icube->getGroup("Instrument")["TargetName"][0] + "] in [" + + icube->group("Instrument")["TargetName"][0] + "] in [" + GetScaleFactorFile().expanded() + "]", _FILEINFO_); } @@ -435,13 +435,13 @@ void calculateScaleFactor0(Cube *icube, Cube *gaincube) { gainConversion = toDouble(conversionFactors["GainRatios"][getGainModeID(gaincube)-1]); if (iof) { - Camera *cam = icube->getCamera(); - bool camSuccess = cam->SetImage(icube->getSampleCount() / 2, icube->getLineCount() / 2); + Camera *cam = icube->camera(); + bool camSuccess = cam->SetImage(icube->sampleCount() / 2, icube->lineCount() / 2); if(!camSuccess) { throw IException(IException::Unknown, "Unable to calculate the Solar Distance on [" + - icube->getFileName() + "]", _FILEINFO_); + icube->fileName() + "]", _FILEINFO_); } @@ -476,7 +476,7 @@ FileName GetScaleFactorFile() { FileName FindShutterFile(Cube *icube) { QString file = "$galileo/calibration/shutter/calibration.so02"; - file += icube->getGroup("Instrument")["FrameModeId"][0].at(0); + file += icube->group("Instrument")["FrameModeId"][0].at(0); file += ".cub"; FileName shutterFile(file); return shutterFile; diff --git a/isis/src/lo/apps/lo2isis/lo2isis.cpp b/isis/src/lo/apps/lo2isis/lo2isis.cpp index 6b0a905322..212f035804 100644 --- a/isis/src/lo/apps/lo2isis/lo2isis.cpp +++ b/isis/src/lo/apps/lo2isis/lo2isis.cpp @@ -89,7 +89,7 @@ void TranslateLunarLabels(FileName &labelFile, Cube *ocube) { // Get the translation manager ready PvlTranslationManager commonlabelXlater(inputLabel, transFile.expanded()); // Pvl outputLabels; - Pvl *outputLabel = ocube->getLabel(); + Pvl *outputLabel = ocube->label(); commonlabelXlater.Auto(*(outputLabel)); PvlTranslationManager labelXlater(inputLabel, bandBinTransFile.expanded()); diff --git a/isis/src/lo/apps/lopdsgen/lopdsgen.cpp b/isis/src/lo/apps/lopdsgen/lopdsgen.cpp index e1458a9ef9..7e82cad136 100644 --- a/isis/src/lo/apps/lopdsgen/lopdsgen.cpp +++ b/isis/src/lo/apps/lopdsgen/lopdsgen.cpp @@ -176,13 +176,13 @@ void IsisMain() { // Add to labels boresight or fiducial data QString bandBinTransFile; - if(iCube->getLabel()->HasKeyword("FiducialId", Pvl::Traverse)) { + if(iCube->label()->HasKeyword("FiducialId", Pvl::Traverse)) { bandBinTransFile = transDir + "LoFiducialExport.trn"; - PvlTranslationManager bandLab(*(iCube->getLabel()), bandBinTransFile); + PvlTranslationManager bandLab(*(iCube->label()), bandBinTransFile); bandLab.Auto(pdsLabel); // Change the units of FIDCUAIL_COORDINATE_MICRON from "um" to "" - PvlKeyword &coordMicron = iCube->getLabel()->FindKeyword( + PvlKeyword &coordMicron = iCube->label()->FindKeyword( "FiducialCoordinateMicron", Pvl::Traverse); QString coordMicronStr = coordMicron[0]; int umPos = coordMicronStr.indexOf("um"); @@ -193,9 +193,9 @@ void IsisMain() { pdsLabel.AddKeyword(coordMicron, PvlContainer::Replace); } - else if(iCube->getLabel()->HasKeyword("BoresightSample", Pvl::Traverse)) { + else if(iCube->label()->HasKeyword("BoresightSample", Pvl::Traverse)) { bandBinTransFile = transDir + "LoBoresightExport.trn"; - PvlTranslationManager bandLab(*(iCube->getLabel()), bandBinTransFile); + PvlTranslationManager bandLab(*(iCube->label()), bandBinTransFile); bandLab.Auto(pdsLabel); } else { diff --git a/isis/src/local/apps/camtest/camtest.cpp b/isis/src/local/apps/camtest/camtest.cpp index 7bd63aac01..94c1b275dd 100644 --- a/isis/src/local/apps/camtest/camtest.cpp +++ b/isis/src/local/apps/camtest/camtest.cpp @@ -26,7 +26,7 @@ void IsisMain() { // Open the input cube Cube *icube = p.SetInputCube("FROM"); - cam = icube->getCamera(); + cam = icube->camera(); p.SetOutputCube("TO"); IString format = ui.GetString("FORMAT"); diff --git a/isis/src/local/apps/cissua2isis/cissua2isis.cpp b/isis/src/local/apps/cissua2isis/cissua2isis.cpp index 259551843a..ba8dcf35ed 100644 --- a/isis/src/local/apps/cissua2isis/cissua2isis.cpp +++ b/isis/src/local/apps/cissua2isis/cissua2isis.cpp @@ -38,7 +38,7 @@ void IsisMain() { TranslateUoACassiniLabels(pdsLabel, ocube); // Fix the StartTime and StopTime keywords from having the 'Z' value at the end - Pvl *outLabel = ocube->getLabel(); + Pvl *outLabel = ocube->label(); PvlGroup &inst = outLabel->FindGroup("Instrument", Isis::PvlObject::Traverse); PvlKeyword &start = inst.FindKeyword("StartTime"); PvlKeyword &stop = inst.FindKeyword("StopTime"); @@ -117,7 +117,7 @@ void CreateStretchPairs() { void TranslateUoACassiniLabels(Pvl &labelPvl, Cube *ocube) { //Create a PVL to store the translated labels - Pvl *outLabel = ocube->getLabel(); + Pvl *outLabel = ocube->label(); // Get the directory where the CISS translation tables are. PvlGroup dataDir(Preference::Preferences().FindGroup("DataDirectory")); diff --git a/isis/src/local/apps/kaguyami2isis/kaguyami2isis.cpp b/isis/src/local/apps/kaguyami2isis/kaguyami2isis.cpp index 18a61d0550..381141a8d9 100644 --- a/isis/src/local/apps/kaguyami2isis/kaguyami2isis.cpp +++ b/isis/src/local/apps/kaguyami2isis/kaguyami2isis.cpp @@ -47,7 +47,7 @@ void IsisMain() { PvlGroup dataDir(Preference::Preferences().FindGroup("DataDirectory")); QString transDir = (QString) dataDir["Kaguya"] + "/translations/"; Pvl inputLabel(inFile.expanded()); - Pvl *outputLabel = outcube->getLabel(); + Pvl *outputLabel = outcube->label(); FileName transFile; // Translate the Archive group @@ -98,12 +98,12 @@ void IsisMain() { //At the time of this writing there was no expectation that Kaguya ever did any binning // so this is check to make sure an error is thrown if an image was binned - if (lab.FindKeyword("INSTRUMENT_ID")[0] == "MI-VIS" && outcube->getSampleCount() != 962 ) { + if (lab.FindKeyword("INSTRUMENT_ID")[0] == "MI-VIS" && outcube->sampleCount() != 962 ) { QString msg = "Input file [" + inFile.expanded() + "]" + " appears to be binned. Binning was " "unexpected, and is unsupported by the camera model"; throw IException(IException::Unknown, msg, _FILEINFO_); } - if (lab.FindKeyword("INSTRUMENT_ID")[0] == "MI-NIR" && outcube->getSampleCount() != 320 ) { + if (lab.FindKeyword("INSTRUMENT_ID")[0] == "MI-NIR" && outcube->sampleCount() != 320 ) { QString msg = "Input file [" + inFile.expanded() + "]" + " appears to be binned. Binning was " "unexpected, and is unsupported by the camera model"; throw IException(IException::Unknown, msg, _FILEINFO_); diff --git a/isis/src/lro/apps/lronac2isis/lronac2isis.cpp b/isis/src/lro/apps/lronac2isis/lronac2isis.cpp index 39379b44b7..020e4ceefb 100644 --- a/isis/src/lro/apps/lronac2isis/lronac2isis.cpp +++ b/isis/src/lro/apps/lronac2isis/lronac2isis.cpp @@ -130,7 +130,7 @@ void Import(Buffer &in) { LineManager outLines(*g_ocube); outLines.SetLine(in.Line(), in.Band()); Buffer buf(in.SampleDimension(), in.LineDimension(), in.BandDimension(), - g_ocube->getPixelType()); + g_ocube->pixelType()); // Do the decompanding for(int pixin = 0; pixin < in.size(); pixin++) { diff --git a/isis/src/lro/apps/lronac2pds/lronac2pds.cpp b/isis/src/lro/apps/lronac2pds/lronac2pds.cpp index 45ddc82d35..2cf8999b03 100644 --- a/isis/src/lro/apps/lronac2pds/lronac2pds.cpp +++ b/isis/src/lro/apps/lronac2pds/lronac2pds.cpp @@ -42,7 +42,7 @@ void IsisMain () { ProcessByLine p; Cube *inCube = p.SetInputCube("FROM"); - g_isIof = inCube->getLabel()->FindGroup("Radiometry", Pvl::Traverse).FindKeyword("RadiometricType")[0].toUpper() == "IOF"; + g_isIof = inCube->label()->FindGroup("Radiometry", Pvl::Traverse).FindKeyword("RadiometricType")[0].toUpper() == "IOF"; FileName scaledCube("$TEMPORARY/" + FileName(ui.GetFileName("FROM")).name()); scaledCube.addExtension("cub"); @@ -50,8 +50,8 @@ void IsisMain () { scaledCube = FileName::createTempFile(scaledCube); p.SetOutputCube( scaledCube.expanded(), CubeAttributeOutput(), - inCube->getSampleCount(), inCube->getLineCount(), - inCube->getBandCount()); + inCube->sampleCount(), inCube->lineCount(), + inCube->bandCount()); // Scale image and calculate max and min values p.StartProcess(ProcessImage); @@ -141,7 +141,7 @@ QString MD5Checksum ( QString filename ) { } void OutputLabel ( std::ofstream &fout, Cube* cube ) { - OriginalLabel origLab(cube->getFileName()); + OriginalLabel origLab(cube->fileName()); Pvl labelPvl = origLab.ReturnLabels(); //Pvl to store the labels @@ -196,8 +196,8 @@ void OutputLabel ( std::ofstream &fout, Cube* cube ) { // Update the "IMAGE" Object PvlObject &imageObject = labelPvl.FindObject("IMAGE"); imageObject.Clear(); - imageObject += PvlKeyword("LINES", toString(cube->getLineCount())); - imageObject += PvlKeyword("LINE_SAMPLES", toString(cube->getSampleCount())); + imageObject += PvlKeyword("LINES", toString(cube->lineCount())); + imageObject += PvlKeyword("LINE_SAMPLES", toString(cube->sampleCount())); if (g_isIof) { imageObject += PvlKeyword("SAMPLE_BITS", toString(16)); imageObject += PvlKeyword("SAMPLE_TYPE", "LSB_INTEGER"); @@ -225,14 +225,14 @@ void OutputLabel ( std::ofstream &fout, Cube* cube ) { stream << labelPvl; - int recordBytes = cube->getSampleCount(); + int recordBytes = cube->sampleCount(); int labelRecords = (int) ((stream.str().length()) / recordBytes) + 1; labelPvl["RECORD_BYTES"] = toString(recordBytes); if (g_isIof) - labelPvl["FILE_RECORDS"] = toString((int) (cube->getLineCount() * 2 + labelRecords)); + labelPvl["FILE_RECORDS"] = toString((int) (cube->lineCount() * 2 + labelRecords)); else - labelPvl["FILE_RECORDS"] = toString((int) (cube->getLineCount() * 4 + labelRecords)); + labelPvl["FILE_RECORDS"] = toString((int) (cube->lineCount() * 4 + labelRecords)); labelPvl["LABEL_RECORDS"] = toString(labelRecords); labelPvl["^IMAGE"] = toString((int) (labelRecords + 1)); diff --git a/isis/src/lro/apps/lronaccal/lronaccal.cpp b/isis/src/lro/apps/lronaccal/lronaccal.cpp index c6473c2621..fd6a884f4c 100644 --- a/isis/src/lro/apps/lronaccal/lronaccal.cpp +++ b/isis/src/lro/apps/lronaccal/lronaccal.cpp @@ -98,7 +98,7 @@ void IsisMain() { // If there is any pixel in the image with a DN > 1000 // then the "left" masked pixels are likely wiped out and useless - if(iCube->getStatistics()->Maximum() > 1000) + if(iCube->statistics()->Maximum() > 1000) g_maskedLeftOnly = true; QString darkFile, flatFile, offsetFile, coefficientFile; @@ -335,12 +335,12 @@ void CopyCubeIntoArray(QString &fileString, vector &data) { throw IException(IException::User, msg, _FILEINFO_); } cube.open(filename.expanded()); - Brick brick(cube.getSampleCount(), cube.getLineCount(), cube.getBandCount(), - cube.getPixelType()); + Brick brick(cube.sampleCount(), cube.lineCount(), cube.bandCount(), + cube.pixelType()); brick.SetBasePosition(1, 1, 1); cube.read(brick); data.clear(); - for(int i = 0; i < cube.getSampleCount(); i++) + for(int i = 0; i < cube.sampleCount(); i++) data.push_back(brick[i]); fileString = filename.expanded(); diff --git a/isis/src/lro/apps/lrowac2isis/lrowac2isis.cpp b/isis/src/lro/apps/lrowac2isis/lrowac2isis.cpp index e387f4ea02..bac44dda63 100644 --- a/isis/src/lro/apps/lrowac2isis/lrowac2isis.cpp +++ b/isis/src/lro/apps/lrowac2isis/lrowac2isis.cpp @@ -402,7 +402,7 @@ void separateFramelets(Buffer &in) { } if(flip) { - outLine = outfile->getLineCount() - (outLine - 1); + outLine = outfile->lineCount() - (outLine - 1); } outLine += frameletLineOffset; @@ -484,7 +484,7 @@ void TranslateLabels(Pvl &pdsLab, Pvl &isis3VisEven, Pvl &isis3VisOdd, genericInstrument.push_back(PvlKeyword("DataFlipped", "No"));//(ui.GetBoolean("FLIP")? "Yes" : "No"))); // color offset doesn't apply to BW mode (single band cubes) - if(colorOffset && viseven && viseven->getBandCount() == 1) { + if(colorOffset && viseven && viseven->bandCount() == 1) { genericInstrument.push_back(PvlKeyword("ColorOffset", 0)); } else { @@ -510,14 +510,14 @@ void TranslateLabels(Pvl &pdsLab, Pvl &isis3VisEven, Pvl &isis3VisOdd, // add labels unique to particular files if(viseven) { visEvenInst.AddKeyword(PvlKeyword("Framelets", "Even")); - visEvenInst.AddKeyword(PvlKeyword("NumFramelets", toString(viseven->getLineCount() / 14))); + visEvenInst.AddKeyword(PvlKeyword("NumFramelets", toString(viseven->lineCount() / 14))); visEvenInst.AddKeyword(PvlKeyword("InstrumentId", "WAC-VIS"), Pvl::Replace); visEvenInst.AddKeyword(PvlKeyword("InstrumentModeId", (QString) pdsLab["INSTRUMENT_MODE_ID"])); } if(visodd) { visOddInst.AddKeyword(PvlKeyword("Framelets", "Odd")); - visOddInst.AddKeyword(PvlKeyword("NumFramelets", toString(visodd->getLineCount() / 14))); + visOddInst.AddKeyword(PvlKeyword("NumFramelets", toString(visodd->lineCount() / 14))); visOddInst.AddKeyword(PvlKeyword("InstrumentId", "WAC-VIS"), Pvl::Replace); visOddInst.AddKeyword(PvlKeyword("InstrumentModeId", (QString) pdsLab["INSTRUMENT_MODE_ID"])); } @@ -529,7 +529,7 @@ void TranslateLabels(Pvl &pdsLab, Pvl &isis3VisEven, Pvl &isis3VisOdd, PvlKeyword visFilterNum("FilterNumber"); PvlKeyword visBandwidth("Width"); - if(viseven && viseven->getBandCount() == 1) { + if(viseven && viseven->bandCount() == 1) { visWavelength = pdsLab["CENTER_FILTER_WAVELENGTH"][0]; visFilterNum = pdsLab["FILTER_NUMBER"][0]; @@ -567,14 +567,14 @@ void TranslateLabels(Pvl &pdsLab, Pvl &isis3VisEven, Pvl &isis3VisOdd, if(uveven) { uvEvenInst.AddKeyword(PvlKeyword("Framelets", "Even")); - uvEvenInst.AddKeyword(PvlKeyword("NumFramelets", toString(uveven->getLineCount() / 4))); + uvEvenInst.AddKeyword(PvlKeyword("NumFramelets", toString(uveven->lineCount() / 4))); uvEvenInst.AddKeyword(PvlKeyword("InstrumentId", "WAC-UV"), Pvl::Replace); uvEvenInst.AddKeyword(PvlKeyword("InstrumentModeId", (QString) pdsLab["INSTRUMENT_MODE_ID"])); } if(uvodd) { uvOddInst.AddKeyword(PvlKeyword("Framelets", "Odd")); - uvOddInst.AddKeyword(PvlKeyword("NumFramelets", toString(uvodd->getLineCount() / 4))); + uvOddInst.AddKeyword(PvlKeyword("NumFramelets", toString(uvodd->lineCount() / 4))); uvOddInst.AddKeyword(PvlKeyword("InstrumentId", "WAC-UV"), Pvl::Replace); uvOddInst.AddKeyword(PvlKeyword("InstrumentModeId", (QString) pdsLab["INSTRUMENT_MODE_ID"])); } diff --git a/isis/src/lro/apps/lrowac2pds/lrowac2pds.cpp b/isis/src/lro/apps/lrowac2pds/lrowac2pds.cpp index d104e5b387..5059ab6bf4 100644 --- a/isis/src/lro/apps/lrowac2pds/lrowac2pds.cpp +++ b/isis/src/lro/apps/lrowac2pds/lrowac2pds.cpp @@ -413,8 +413,8 @@ void OutputLabel ( std::ofstream &fout, Cube* cube, Pvl &labelPvl ) { // Update the "IMAGE" Object PvlObject &imageObject = labelPvl.FindObject("IMAGE"); imageObject.Clear(); - imageObject += PvlKeyword("LINES", toString(cube->getLineCount())); - imageObject += PvlKeyword("LINE_SAMPLES", toString(cube->getSampleCount())); + imageObject += PvlKeyword("LINES", toString(cube->lineCount())); + imageObject += PvlKeyword("LINE_SAMPLES", toString(cube->sampleCount())); imageObject += PvlKeyword("SAMPLE_BITS", toString(32)); imageObject += PvlKeyword("SAMPLE_TYPE", "PC_REAL"); imageObject += PvlKeyword("VALID_MINIMUM", "16#FF7FFFFA#"); @@ -431,11 +431,11 @@ void OutputLabel ( std::ofstream &fout, Cube* cube, Pvl &labelPvl ) { stream << labelPvl; - int recordBytes = cube->getSampleCount(); + int recordBytes = cube->sampleCount(); int labelRecords = (int) ((stream.str().length()) / recordBytes) + 1; labelPvl["RECORD_BYTES"] = toString(recordBytes); - labelPvl["FILE_RECORDS"] = toString((int) (cube->getLineCount() * 4 + labelRecords)); + labelPvl["FILE_RECORDS"] = toString((int) (cube->lineCount() * 4 + labelRecords)); labelPvl["LABEL_RECORDS"] = toString(labelRecords); labelPvl["^IMAGE"] = toString((int) (labelRecords + 1)); diff --git a/isis/src/lro/apps/lrowaccal/lrowaccal.cpp b/isis/src/lro/apps/lrowaccal/lrowaccal.cpp index 383bc0ee9f..dfc6b7dd4b 100644 --- a/isis/src/lro/apps/lrowaccal/lrowaccal.cpp +++ b/isis/src/lro/apps/lrowaccal/lrowaccal.cpp @@ -62,22 +62,22 @@ void IsisMain () { Cube *icube = p.SetInputCube("FROM"); // Make sure it is a WAC cube - Isis::PvlGroup &inst = icube->getLabel()->FindGroup("Instrument", Pvl::Traverse); + Isis::PvlGroup &inst = icube->label()->FindGroup("Instrument", Pvl::Traverse); QString instId = (QString) inst["InstrumentId"]; instId = instId.toUpper(); if (instId != "WAC-VIS" && instId != "WAC-UV") { QString msg = "This program is intended for use on LROC WAC images only. ["; - msg += icube->getFileName() + "] does not appear to be a WAC image."; + msg += icube->fileName() + "] does not appear to be a WAC image."; throw IException(IException::User, msg, _FILEINFO_); } // And check if it has already run through calibration - if (icube->getLabel()->FindObject("IsisCube").HasGroup("Radiometry")) { + if (icube->label()->FindObject("IsisCube").HasGroup("Radiometry")) { QString msg = "This image has already been calibrated"; throw IException(IException::User, msg, _FILEINFO_); } - if (icube->getLabel()->FindObject("IsisCube").HasGroup("AlphaCube")) { + if (icube->label()->FindObject("IsisCube").HasGroup("AlphaCube")) { QString msg = "This application can not be run on any image that has been geometrically transformed (i.e. scaled, rotated, sheared, or reflected) or cropped."; throw IException(IException::User, msg, _FILEINFO_); } @@ -111,11 +111,11 @@ void IsisMain () { QString specpixFile = ui.GetAsString("SPECIALPIXELSFILE"); // Figure out which bands are input - for (int i = 1; i <= icube->getBandCount(); i++) { - g_bands.push_back(icube->getPhysicalBand(i)); + for (int i = 1; i <= icube->bandCount(); i++) { + g_bands.push_back(icube->physicalBand(i)); } - Isis::PvlGroup &bandBin = icube->getLabel()->FindGroup("BandBin", Pvl::Traverse); + 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 @@ -171,7 +171,7 @@ void IsisMain () { if (g_radiometric) { - Isis::PvlKeyword &bands = icube->getLabel()->FindGroup("BandBin", Pvl::Traverse).FindKeyword("FilterNumber"); + Isis::PvlKeyword &bands = icube->label()->FindGroup("BandBin", Pvl::Traverse).FindKeyword("FilterNumber"); if (radFile.toLower() == "default" || radFile.length() == 0) radFile = "$lro/calibration/WAC_RadiometricResponsivity.????.pvl"; @@ -463,7 +463,7 @@ void CopyCubeIntoBuffer ( QString &fileString, Buffer* &data) { throw IException(IException::User, msg, _FILEINFO_); } cube.open(filename.expanded()); - Brick brick(cube.getSampleCount(), cube.getLineCount(), cube.getBandCount(), cube.getPixelType()); + Brick brick(cube.sampleCount(), cube.lineCount(), cube.bandCount(), cube.pixelType()); brick.SetBasePosition(1, 1, 1); cube.read(brick); diff --git a/isis/src/lro/apps/lrowacpho/Exponential.cpp b/isis/src/lro/apps/lrowacpho/Exponential.cpp index c168bbda74..e7d1ed7442 100644 --- a/isis/src/lro/apps/lrowacpho/Exponential.cpp +++ b/isis/src/lro/apps/lrowacpho/Exponential.cpp @@ -277,10 +277,10 @@ namespace Isis { ++algo; } - Pvl *label = cube.getLabel(); + Pvl *label = cube.label(); PvlKeyword center = label->FindGroup("BandBin", Pvl::Traverse)["Center"]; QString errs(""); - for (int i = 0; i < cube.getBandCount(); i++) { + for (int i = 0; i < cube.bandCount(); i++) { Parameters parms = findParameters(toDouble(center[i])); if (parms.IsValid()) { parms.band = i + 1; diff --git a/isis/src/lro/apps/lrowacpho/HapkeExponential.cpp b/isis/src/lro/apps/lrowacpho/HapkeExponential.cpp index 4a54b48bb0..2e6b06dee6 100644 --- a/isis/src/lro/apps/lrowacpho/HapkeExponential.cpp +++ b/isis/src/lro/apps/lrowacpho/HapkeExponential.cpp @@ -280,10 +280,10 @@ namespace Isis { ++algo; } - Pvl *label = cube.getLabel(); + Pvl *label = cube.label(); PvlKeyword center = label->FindGroup("BandBin", Pvl::Traverse)["Center"]; QString errs(""); - for (int i = 0; i < cube.getBandCount(); i++) { + for (int i = 0; i < cube.bandCount(); i++) { Parameters parms = findParameters(toDouble(center[i])); if (parms.IsValid()) { parms.band = i + 1; diff --git a/isis/src/lro/apps/lrowacpho/Hillier.cpp b/isis/src/lro/apps/lrowacpho/Hillier.cpp index 9d5320a6d0..16378bbff1 100644 --- a/isis/src/lro/apps/lrowacpho/Hillier.cpp +++ b/isis/src/lro/apps/lrowacpho/Hillier.cpp @@ -276,10 +276,10 @@ namespace Isis { ++algo; } - Pvl *label = cube.getLabel(); + Pvl *label = cube.label(); PvlKeyword center = label->FindGroup("BandBin", Pvl::Traverse)["Center"]; QString errs(""); - for (int i = 0; i < cube.getBandCount(); i++) { + for (int i = 0; i < cube.bandCount(); i++) { Parameters parms = findParameters(toDouble(center[i])); if (parms.IsValid()) { parms.band = i + 1; diff --git a/isis/src/lro/apps/lrowacpho/PhotometricFunction.cpp b/isis/src/lro/apps/lrowacpho/PhotometricFunction.cpp index c0b183667d..36fb93b46e 100644 --- a/isis/src/lro/apps/lrowacpho/PhotometricFunction.cpp +++ b/isis/src/lro/apps/lrowacpho/PhotometricFunction.cpp @@ -50,7 +50,7 @@ namespace Isis { */ PhotometricFunction::PhotometricFunction ( PvlObject &pvl, Cube &cube , bool useCamera) { if (useCamera) - _camera = cube.getCamera(); + _camera = cube.camera(); } /** * @brief Compute photometric DN at given line/sample/band diff --git a/isis/src/lro/apps/lrowacpho/lrowacpho.cpp b/isis/src/lro/apps/lrowacpho/lrowacpho.cpp index 5b858254d4..ed9de39085 100644 --- a/isis/src/lro/apps/lrowacpho/lrowacpho.cpp +++ b/isis/src/lro/apps/lrowacpho/lrowacpho.cpp @@ -48,7 +48,7 @@ void IsisMain () { throw IException(IException::User, msg, _FILEINFO_); } - if (icube->getBandCount() != 1) { + if (icube->bandCount() != 1) { string msg = "Invalid Image: The backplane option can only be used with a single image band at a time."; throw IException(IException::User, msg, _FILEINFO_); } diff --git a/isis/src/lro/apps/mrf2pds/mrf2pds.cpp b/isis/src/lro/apps/mrf2pds/mrf2pds.cpp index 0b4d84cf60..01669232ca 100644 --- a/isis/src/lro/apps/mrf2pds/mrf2pds.cpp +++ b/isis/src/lro/apps/mrf2pds/mrf2pds.cpp @@ -34,7 +34,7 @@ void IsisMain() { // Setup the input cube Cube *cInCube = cProcess.SetInputCube("FROM"); - Pvl *cInLabel = cInCube->getLabel(); + Pvl *cInLabel = cInCube->label(); // Get the output label file FileName outFile(ui.GetFileName("TO", "lbl")); @@ -84,7 +84,7 @@ void IsisMain() { cOrigLabel.AddObject(cOrigLabelObj); // Translates the ISIS labels along with the original EDR labels - cOrigLabel.AddObject(*(cInCube->getLabel())); + cOrigLabel.AddObject(*(cInCube->label())); PvlTranslationManager cCubeLabel2(cOrigLabel, "$lro/translations/mrfExportOrigLabel.trn"); cCubeLabel2.Auto(pdsLabel); @@ -103,7 +103,7 @@ void IsisMain() { } } else { //Level3 - add Band_Name keyword - PvlGroup &cBandBinGrp = cInCube->getGroup("BandBin"); + PvlGroup &cBandBinGrp = cInCube->group("BandBin"); PvlKeyword cKeyBandBin = PvlKeyword("BAND_NAME"); PvlKeyword cKeyInBandBin; if(cBandBinGrp.HasKeyword("OriginalBand")) { @@ -133,7 +133,7 @@ void IsisMain() { } // Calculate CheckSum - Statistics *cStats = cInCube->getStatistics(); + Statistics *cStats = cInCube->statistics(); iCheckSum = (unsigned int)cStats->Sum(); FixLabel(pdsLabel, bLevel2); diff --git a/isis/src/mariner/apps/mar102isis/mar102isis.cpp b/isis/src/mariner/apps/mar102isis/mar102isis.cpp index a3a6fcb8c5..949e1071c8 100644 --- a/isis/src/mariner/apps/mar102isis/mar102isis.cpp +++ b/isis/src/mariner/apps/mar102isis/mar102isis.cpp @@ -306,7 +306,7 @@ void UpdateLabels(Cube *cube, const QString &labels) { rx += status; // Get the labels and add the updated labels to them - Pvl *cubeLabels = cube->getLabel(); + Pvl *cubeLabels = cube->label(); cubeLabels->FindObject("IsisCube").AddGroup(inst); cubeLabels->FindObject("IsisCube").AddGroup(archive); cubeLabels->FindObject("IsisCube").AddGroup(bandBin); @@ -335,7 +335,7 @@ void TranslateIsis2Labels(FileName &labelFile, Cube *oCube) { // Get the translation manager ready PvlTranslationManager translation(inputLabel, transFile.expanded()); - Pvl *outputLabel = oCube->getLabel(); + Pvl *outputLabel = oCube->label(); translation.Auto(*(outputLabel)); //Instrument group diff --git a/isis/src/mariner/apps/mar10cal/mar10cal.cpp b/isis/src/mariner/apps/mar10cal/mar10cal.cpp index af94ae2f22..6fb8d520a4 100644 --- a/isis/src/mariner/apps/mar10cal/mar10cal.cpp +++ b/isis/src/mariner/apps/mar10cal/mar10cal.cpp @@ -47,7 +47,7 @@ void IsisMain() { // If it is already calibrated then complain if (icube->hasGroup("Radiometry")) { - QString msg = "This Mariner 10 image [" + icube->getFileName() + "] has " + QString msg = "This Mariner 10 image [" + icube->fileName() + "] has " "already been radiometrically calibrated"; throw IException(IException::User, msg, _FILEINFO_); } @@ -56,7 +56,7 @@ void IsisMain() { QString instId = inst["InstrumentId"]; QString camera = instId.mid(instId.size()-1); - QString filter = (QString)(icube->getGroup("BandBin"))["FilterName"]; + QString filter = (QString)(icube->group("BandBin"))["FilterName"]; filter = filter.toUpper().mid(0,3); QString target = inst["TargetName"]; @@ -118,7 +118,7 @@ void IsisMain() { camera + "_coef.cub"); coCube.open(coFile.expanded()); } - coef = new Brick(icube->getSampleCount(), 1, 6, coCube.getPixelType()); + coef = new Brick(icube->sampleCount(), 1, 6, coCube.pixelType()); if (ui.WasEntered("ABSCOEF")) { absCoef = ui.GetDouble("ABSCOEF"); @@ -141,12 +141,12 @@ void IsisMain() { // Get the distance between Mars and the Sun at the given time in // Astronomical Units (AU) - Camera * cam = icube->getCamera(); - bool camSuccess = cam->SetImage(icube->getSampleCount()/2,icube->getLineCount()/2); + Camera * cam = icube->camera(); + bool camSuccess = cam->SetImage(icube->sampleCount()/2,icube->lineCount()/2); if (!camSuccess) { throw IException(IException::Unknown, "Unable to calculate the Solar Distance on [" + - icube->getFileName() + "]", _FILEINFO_); + icube->fileName() + "]", _FILEINFO_); } sunDist = cam->SolarDistance(); @@ -156,11 +156,11 @@ void IsisMain() { // Add the radiometry group PvlGroup calgrp("Radiometry"); - calgrp += PvlKeyword("DarkCurrentCube", dcCube->getFileName()); + calgrp += PvlKeyword("DarkCurrentCube", dcCube->fileName()); if (useBlem) { - calgrp += PvlKeyword("BlemishRemovalCube", blemCube->getFileName()); + calgrp += PvlKeyword("BlemishRemovalCube", blemCube->fileName()); } - calgrp += PvlKeyword("CoefficientCube", coCube.getFileName()); + calgrp += PvlKeyword("CoefficientCube", coCube.fileName()); calgrp += PvlKeyword("AbsoluteCoefficient", toString(absCoef)); ocube->putGroup(calgrp); diff --git a/isis/src/mariner/apps/mar10clean/mar10clean.cpp b/isis/src/mariner/apps/mar10clean/mar10clean.cpp index ed8d416a7a..4edc750971 100644 --- a/isis/src/mariner/apps/mar10clean/mar10clean.cpp +++ b/isis/src/mariner/apps/mar10clean/mar10clean.cpp @@ -15,7 +15,7 @@ void IsisMain() { // Check that it is a Mariner10 cube. Cube iCube; iCube.open(ui.GetFileName("FROM")); - Pvl * labels = iCube.getLabel(); + Pvl * labels = iCube.label(); if ("Mariner_10" != (QString)labels->FindKeyword("SpacecraftName", Pvl::Traverse)) { QString msg = "The cube [" + ui.GetFileName("FROM") + "] does not appear" + " to be a Mariner10 cube"; diff --git a/isis/src/mariner/apps/mar10nonoise/mar10nonoise.cpp b/isis/src/mariner/apps/mar10nonoise/mar10nonoise.cpp index d47570c10d..88c2c98312 100644 --- a/isis/src/mariner/apps/mar10nonoise/mar10nonoise.cpp +++ b/isis/src/mariner/apps/mar10nonoise/mar10nonoise.cpp @@ -14,7 +14,7 @@ void IsisMain() { // Check that it is a Mariner10 cube. Cube iCube; iCube.open(ui.GetFileName("FROM")); - Pvl * labels = iCube.getLabel(); + Pvl * labels = iCube.label(); if ("Mariner_10" != (QString)labels->FindKeyword("SpacecraftName", Pvl::Traverse)) { QString msg = "The cube [" + ui.GetFileName("FROM") + "] does not appear" + " to be a Mariner10 cube"; diff --git a/isis/src/mariner/apps/mar10restore/mar10restore.cpp b/isis/src/mariner/apps/mar10restore/mar10restore.cpp index 891a7c2e92..6e02fb93e2 100644 --- a/isis/src/mariner/apps/mar10restore/mar10restore.cpp +++ b/isis/src/mariner/apps/mar10restore/mar10restore.cpp @@ -18,7 +18,7 @@ void IsisMain() { cube.open(ui.GetFileName("FROM")); // Check that it is a Mariner10 cube. - Pvl * labels = cube.getLabel(); + Pvl * labels = cube.label(); if ("Mariner_10" != (QString)labels->FindKeyword("SpacecraftName", Pvl::Traverse)) { QString msg = "The cube [" + ui.GetFileName("FROM") + "] does not appear" + " to be a Mariner10 cube"; diff --git a/isis/src/mer/apps/mer2isis/mer2isis.cpp b/isis/src/mer/apps/mer2isis/mer2isis.cpp index c2c92f1b71..7eaaa5355f 100644 --- a/isis/src/mer/apps/mer2isis/mer2isis.cpp +++ b/isis/src/mer/apps/mer2isis/mer2isis.cpp @@ -75,7 +75,7 @@ void TranslateMerEdrLabels(FileName &labelFile, Cube *ocube) { // Pull out MiCCD and MiElectronic from the TemperatureName in the instrument group void MiFixLab(PvlGroup & instGroup); - PvlGroup instGroup = ocube->getGroup("INSTRUMENT"); + PvlGroup instGroup = ocube->group("INSTRUMENT"); MiFixLab(instGroup); ocube->putGroup(instGroup); diff --git a/isis/src/mer/apps/mical/MiCalibration.cpp b/isis/src/mer/apps/mical/MiCalibration.cpp index 58f4c96127..f533f8058f 100644 --- a/isis/src/mer/apps/mical/MiCalibration.cpp +++ b/isis/src/mer/apps/mical/MiCalibration.cpp @@ -25,7 +25,7 @@ namespace Isis { void MiCalibration::ReadLabels(Cube &image) { PvlGroup labelgrp = - image.getLabel()->FindGroup("Instrument", Pvl::Traverse); + image.label()->FindGroup("Instrument", Pvl::Traverse); p_exposureDuration = labelgrp["ExposureDuration"]; p_instrumentSerialNumber = labelgrp["InstrumentSerialNumber"]; p_CCDTemperature = toDouble(labelgrp["InstrumentTemperature"][6]); diff --git a/isis/src/mer/apps/mical/mical.cpp b/isis/src/mer/apps/mical/mical.cpp index 86cc834360..012777a2f9 100644 --- a/isis/src/mer/apps/mical/mical.cpp +++ b/isis/src/mer/apps/mical/mical.cpp @@ -54,7 +54,7 @@ void IsisMain() { //check if the image is calibrated if(pack->hasGroup("Radiometry")) { - QString msg = "The MI image [" + pack->getFileName() + "] has already " + QString msg = "The MI image [" + pack->fileName() + "] has already " "been radiometrically calibrated"; throw IException(IException::User, msg, _FILEINFO_); } @@ -121,7 +121,7 @@ void IsisMain() { Brick *b; Cube ERPfile; ERPfile.open(ui.GetFileName("REFPIXIMAGE")); - b = new Brick(11, 201, 1, ERPfile.getPixelType()); + b = new Brick(11, 201, 1, ERPfile.pixelType()); b->SetBasePosition(4, 412, 1); ERPfile.read(*b); diff --git a/isis/src/messenger/apps/mdis2isis/mdis2isis.cpp b/isis/src/messenger/apps/mdis2isis/mdis2isis.cpp index 591246ece5..eaa3fdb288 100644 --- a/isis/src/messenger/apps/mdis2isis/mdis2isis.cpp +++ b/isis/src/messenger/apps/mdis2isis/mdis2isis.cpp @@ -156,15 +156,15 @@ void IsisMain() { PvlGroup &group = outLabel.FindGroup("Instrument", Pvl::Traverse); group.AddKeyword(PvlKeyword("Unlutted", toString((int)true))); group.AddKeyword(PvlKeyword("LutInversionTable", lutfile)); - outCube->getLabel()->FindObject("IsisCube").AddGroup(group); + outCube->label()->FindObject("IsisCube").AddGroup(group); group = outLabel.FindGroup("Archive", Pvl::Traverse); sourceId.AddValue('"' + lutid + '"'); group.AddKeyword(sourceId); - outCube->getLabel()->FindObject("IsisCube").AddGroup(group); + outCube->label()->FindObject("IsisCube").AddGroup(group); - outCube->getLabel()->FindObject("IsisCube").AddGroup(outLabel.FindGroup("BandBin", Pvl::Traverse)); - outCube->getLabel()->FindObject("IsisCube").AddGroup(outLabel.FindGroup("Kernels", Pvl::Traverse)); + outCube->label()->FindObject("IsisCube").AddGroup(outLabel.FindGroup("BandBin", Pvl::Traverse)); + outCube->label()->FindObject("IsisCube").AddGroup(outLabel.FindGroup("Kernels", Pvl::Traverse)); p.StartProcess(UnlutData); diff --git a/isis/src/messenger/apps/mdis2pds/mdis2pds.cpp b/isis/src/messenger/apps/mdis2pds/mdis2pds.cpp index 3a7e71467b..a37d283c16 100644 --- a/isis/src/messenger/apps/mdis2pds/mdis2pds.cpp +++ b/isis/src/messenger/apps/mdis2pds/mdis2pds.cpp @@ -101,7 +101,7 @@ void IsisMain() { ProcessExportPds processPds; Cube *incube = processPds.SetInputCube("FROM"); - Histogram *hist = incube->getHistogram(0); + Histogram *hist = incube->histogram(0); double minmin = 0.0; double maxmax = 0.0; if(ui.GetString("TYPE").compare("AUTOMATIC") == 0) { @@ -191,7 +191,7 @@ void IsisMain() { p.CheckStatus(); // Translates the ISIS labels along with the original EDR labels - origLabel.AddObject(*(incube->getLabel())); + origLabel.AddObject(*(incube->label())); PvlTranslationManager labels(origLabel, "$messenger/translations/mdisCdrLabel.trn"); labels.Auto(pdsLabel); diff --git a/isis/src/messenger/apps/mdiscal/mdiscal.cpp b/isis/src/messenger/apps/mdiscal/mdiscal.cpp index 8e484f96c0..c4aec06e97 100644 --- a/isis/src/messenger/apps/mdiscal/mdiscal.cpp +++ b/isis/src/messenger/apps/mdiscal/mdiscal.cpp @@ -95,7 +95,7 @@ void IsisMain() { eventCorrection = 1.0; Cube *icube = p.SetInputCube("FROM"); - PvlGroup& inst = icube->getGroup("Instrument"); + PvlGroup& inst = icube->group("Instrument"); isNarrowAngleCamera = ((QString)inst["InstrumentId"] == "MDIS-NAC"); exposureDuration = inst["ExposureDuration"]; exposureDuration /= 1000.0; // Convert ms to sec @@ -124,7 +124,7 @@ void IsisMain() { nSampsToNull = MIN(MAX(nDarkColumns + 1, nSampsToNull), 4); // No more than 4! darkStrip.Reset(); - ccdTemperature = icube->getGroup("Archive")["CCDTemperature"]; + ccdTemperature = icube->group("Archive")["CCDTemperature"]; // Binned data only applies to FPUBIN mode. Pixel binning must be dealt // with specially in other calibration support components @@ -132,7 +132,7 @@ void IsisMain() { // Get the trusted filter number if (!isNarrowAngleCamera) { - filterNumber = ((int)(icube->getGroup("BandBin")["Number"])) - 1; + filterNumber = ((int)(icube->group("BandBin")["Number"])) - 1; } else { filterNumber = 1; // For the NAC } @@ -146,17 +146,17 @@ void IsisMain() { g_flatfield = ui.GetBoolean("FLATFIELD"); g_radiometric = ui.GetBoolean("RADIOMETRIC"); - if (icube->getBandCount() != 1) { + if (icube->bandCount() != 1) { throw IException(IException::User, "MDIS images may only contain one band", _FILEINFO_); } - if (icube->getSampleCount() < 3) { + if (icube->sampleCount() < 3) { throw IException(IException::User, "Unable to obtain dark current data. Expected a sample dimension of at least 3", _FILEINFO_); } - if ((int)icube->getGroup("Instrument")["Unlutted"] == false) { + if ((int)icube->group("Instrument")["Unlutted"] == false) { throw IException(IException::User, "Calibration may not be performed on unlutted data.", _FILEINFO_); } @@ -192,10 +192,10 @@ void IsisMain() { darkCurrentMode = DarkCurrentNone; } else if (darkCurr == "STANDARD") { darkCurrentMode = DarkCurrentStandard; - calibrationValues.resize(icube->getLineCount()); + calibrationValues.resize(icube->lineCount()); } else if (darkCurr == "LINEAR") { darkCurrentMode = DarkCurrentLinear; - calibrationValues.resize(icube->getLineCount()); + calibrationValues.resize(icube->lineCount()); } else if (darkCurr == "MODEL") { if (exposureDuration > 1.0) { QString mess = "Dark model correction can not be used when the " @@ -205,7 +205,7 @@ void IsisMain() { // set processing to standard darkCurrentMode = DarkCurrentLinear; - calibrationValues.resize(icube->getLineCount()); + calibrationValues.resize(icube->lineCount()); darkCurr = "STANDARD"; } else { darkCurrentMode = DarkCurrentModel; @@ -298,7 +298,7 @@ void IsisMain() { bool iof_is_good = false; QString solirrfile(""); if (do_iof) { - PvlGroup& inst = icube->getGroup("Instrument"); + PvlGroup& inst = icube->group("Instrument"); QString target = inst["TargetName"]; QString startTime = inst["SpacecraftClockCount"]; if (sunDistanceAU(startTime, target, solarDist)) { @@ -430,7 +430,7 @@ void IsisMain() { calibrationLog.AddKeyword(PvlKeyword("LeftSamplesNulled", toString(nSampsToNull))); // Handle updates of ProductId and SourceProduct Id keywords - PvlGroup& archive = ocube->getGroup("Archive"); + PvlGroup& archive = ocube->group("Archive"); PvlKeyword key = archive["ProductId"]; QString orgProdId = key[0]; QString newProdId = orgProdId + "_" + calibType + "_" + toString(cdr_version); diff --git a/isis/src/messenger/apps/mdisddr/mdisddr.cpp b/isis/src/messenger/apps/mdisddr/mdisddr.cpp index ce9d038445..9a3c90ea66 100644 --- a/isis/src/messenger/apps/mdisddr/mdisddr.cpp +++ b/isis/src/messenger/apps/mdisddr/mdisddr.cpp @@ -197,7 +197,7 @@ void IsisMain() { p.CheckStatus(); // Translates the ISIS labels along with the original EDR labels - origLabel.AddObject(*from.getLabel()); + origLabel.AddObject(*from.label()); PvlTranslationManager labels(origLabel, "$messenger/translations/mdisDDRLabel.trn"); labels.Auto(pdsLabel); diff --git a/isis/src/messenger/apps/mdisedrinfo/MdisEdrKeys.h b/isis/src/messenger/apps/mdisedrinfo/MdisEdrKeys.h index 55539bede9..b647d70fcd 100644 --- a/isis/src/messenger/apps/mdisedrinfo/MdisEdrKeys.h +++ b/isis/src/messenger/apps/mdisedrinfo/MdisEdrKeys.h @@ -95,7 +95,7 @@ namespace Isis { * @param cube A valid ISIS Cube object with a label */ MdisEdrKeys(Cube &cube) { - _edrLabel = OriginalLabel(cube.getFileName()).ReturnLabels(); + _edrLabel = OriginalLabel(cube.fileName()).ReturnLabels(); LoadKeys(_edrLabel, _keys); } diff --git a/isis/src/messenger/apps/mdisedrinfo/MdisGeometry.cpp b/isis/src/messenger/apps/mdisedrinfo/MdisGeometry.cpp index ce6ed1ca04..95bd6a1e2f 100644 --- a/isis/src/messenger/apps/mdisedrinfo/MdisGeometry.cpp +++ b/isis/src/messenger/apps/mdisedrinfo/MdisGeometry.cpp @@ -281,8 +281,8 @@ namespace Isis { * @param cube ISIS Cube to initialize */ void MdisGeometry::init(Cube &cube) { - _label = *cube.getLabel(); - _orglabel = OriginalLabel(cube.getFileName()).ReturnLabels(); + _label = *cube.label(); + _orglabel = OriginalLabel(cube.fileName()).ReturnLabels(); _nSubframes = (int) _orglabel.FindKeyword("MESS:SUBFRAME", PvlObject::Traverse); _camera = CameraFactory::Create(_label); diff --git a/isis/src/messenger/apps/mdisedrinfo/SpiceManager.cpp b/isis/src/messenger/apps/mdisedrinfo/SpiceManager.cpp index 04bc48f67f..fde7b8fc11 100644 --- a/isis/src/messenger/apps/mdisedrinfo/SpiceManager.cpp +++ b/isis/src/messenger/apps/mdisedrinfo/SpiceManager.cpp @@ -57,7 +57,7 @@ namespace Isis { * @param furnish Do we load the kernels we find? */ SpiceManager::SpiceManager(Cube &cube, bool furnish) { - Load(*cube.getLabel(), furnish); + Load(*cube.label(), furnish); } /** diff --git a/isis/src/messenger/apps/mdisedrinfo/mdisedrinfo.cpp b/isis/src/messenger/apps/mdisedrinfo/mdisedrinfo.cpp index c66b99b1c5..ceea92cc57 100644 --- a/isis/src/messenger/apps/mdisedrinfo/mdisedrinfo.cpp +++ b/isis/src/messenger/apps/mdisedrinfo/mdisedrinfo.cpp @@ -56,7 +56,7 @@ void IsisMain() { // Ensure a proper target before initialization Cube cube; cube.open(temp.expanded(), "rw"); - Pvl *label = cube.getLabel(); + Pvl *label = cube.label(); MdisGeometry::validateTarget(*label, true); cube.close(); diff --git a/isis/src/mgs/apps/moccal/moccal.cpp b/isis/src/mgs/apps/moccal/moccal.cpp index 5278646a2a..4fd4e72dcc 100644 --- a/isis/src/mgs/apps/moccal/moccal.cpp +++ b/isis/src/mgs/apps/moccal/moccal.cpp @@ -66,7 +66,7 @@ void IsisMain() { // If it is already calibrated then complain if(icube->hasGroup("Radiometry")) { - QString msg = "The MOC image [" + icube->getFileName() + "] has already " + QString msg = "The MOC image [" + icube->fileName() + "] has already " "been radiometrically calibrated"; throw IException(IException::User, msg, _FILEINFO_); } @@ -118,7 +118,7 @@ void IsisMain() { gbl::g = calCamera["G"]; gbl::w0 = calCamera["W0"]; QString coefFile = calCamera["CoefFile"]; - gbl::LoadCoefficients(coefFile, icube->getSampleCount()); + gbl::LoadCoefficients(coefFile, icube->sampleCount()); #if 0 // Override with these with any user selected parameters @@ -310,7 +310,7 @@ void gbl::FixWagoLines(QString file) { // Open the cube to repair Cube fix; fix.open(file, "rw"); - const int nl = fix.getLineCount(); + const int nl = fix.lineCount(); // Create a line manager on the cube for I/O LineManager lbuf(fix); diff --git a/isis/src/mgs/apps/mocnoise50/mocnoise50.cpp b/isis/src/mgs/apps/mocnoise50/mocnoise50.cpp index a490426778..8b01d1716f 100644 --- a/isis/src/mgs/apps/mocnoise50/mocnoise50.cpp +++ b/isis/src/mgs/apps/mocnoise50/mocnoise50.cpp @@ -49,7 +49,7 @@ void IsisMain() { ProcessByLine p; Cube *icube = p.SetInputCube("FROM", OneBand); MocLabels moc(Application::GetUserInterface().GetFileName("FROM")); - int nlines = icube->getLineCount(); + int nlines = icube->lineCount(); // Must be narrow angle if(moc.WideAngle()) { diff --git a/isis/src/mro/apps/ctxcal/ctxcal.cpp b/isis/src/mro/apps/ctxcal/ctxcal.cpp index 06d5b61ac6..9bef4c27d1 100644 --- a/isis/src/mro/apps/ctxcal/ctxcal.cpp +++ b/isis/src/mro/apps/ctxcal/ctxcal.cpp @@ -54,13 +54,13 @@ void IsisMain() { FileName flat = FileName("$mro/calibration/ctxFlat_????.cub").highestVersion(); flatFile.open(flat.expanded()); } - flat = new Brick(5000, 1, 1, flatFile.getPixelType()); + flat = new Brick(5000, 1, 1, flatFile.pixelType()); flat->SetBasePosition(1, 1, 1); flatFile.read(*flat); // If it is already calibrated then complain if(icube->hasGroup("Radiometry")) { - QString msg = "The CTX image [" + icube->getFileName() + "] has already " + QString msg = "The CTX image [" + icube->fileName() + "] has already " "been radiometrically calibrated"; throw IException(IException::User, msg, _FILEINFO_); } @@ -147,7 +147,7 @@ void IsisMain() { double w0 = 3660.5; double w1 = w0 * ((dist * dist) / (dist1 * dist1)); if(exposure *w1 == 0.0) { - QString msg = icube->getFileName() + ": exposure or w1 has value of 0.0 "; + QString msg = icube->fileName() + ": exposure or w1 has value of 0.0 "; throw IException(IException::User, msg, _FILEINFO_); } iof = 1.0 / (exposure * w1); @@ -162,7 +162,7 @@ void IsisMain() { // Add the radiometry group PvlGroup calgrp("Radiometry"); - calgrp += PvlKeyword("FlatFile", flatFile.getFileName()); + calgrp += PvlKeyword("FlatFile", flatFile.fileName()); calgrp += PvlKeyword("iof", toString(iof)); diff --git a/isis/src/mro/apps/hi2isis/hi2isis.cpp b/isis/src/mro/apps/hi2isis/hi2isis.cpp index f938ea0c36..6d4ecdfbc5 100644 --- a/isis/src/mro/apps/hi2isis/hi2isis.cpp +++ b/isis/src/mro/apps/hi2isis/hi2isis.cpp @@ -116,7 +116,7 @@ void IsisMain() { // and remove it from the labels. // Add the UNLUTTED keyword to the instrument group so we know // if the lut has been used to convert back to 14 bit data - PvlGroup &instgrp = ocube->getGroup("Instrument"); + PvlGroup &instgrp = ocube->group("Instrument"); PvlKeyword lutKey = instgrp["LookupTable"]; PvlSequence lutSeq; lutSeq = lutKey; diff --git a/isis/src/mro/apps/hi2isis/hiCalibration.cpp b/isis/src/mro/apps/hi2isis/hiCalibration.cpp index 02907ab247..d5766fb9d8 100644 --- a/isis/src/mro/apps/hi2isis/hiCalibration.cpp +++ b/isis/src/mro/apps/hi2isis/hiCalibration.cpp @@ -41,7 +41,7 @@ void SaveHiriseCalibrationData(ProcessImportPds &process, Cube *ocube, Table calAncillaryTable("HiRISE Calibration Ancillary", calAncillaryRecord); // Create the Table to hold the calibration lines - TableField image("Calibration", TableField::Integer, ocube->getSampleCount()); + TableField image("Calibration", TableField::Integer, ocube->sampleCount()); TableRecord calImageRecord; calImageRecord += image; @@ -85,9 +85,9 @@ void SaveHiriseCalibrationData(ProcessImportPds &process, Cube *ocube, // Pull the calibration pixels out (same type as image data) section = 1; - calImageRecord[0] = ConvertCalibrationPixels(ocube->getSampleCount(), + calImageRecord[0] = ConvertCalibrationPixels(ocube->sampleCount(), process.PixelType(), header); - header += ocube->getSampleCount() * SizeOf(process.PixelType()); + header += ocube->sampleCount() * SizeOf(process.PixelType()); calImageTable += calImageRecord; diff --git a/isis/src/mro/apps/hical/HiCalConf.cpp b/isis/src/mro/apps/hical/HiCalConf.cpp index dbe6120c02..1d73c5e51a 100644 --- a/isis/src/mro/apps/hical/HiCalConf.cpp +++ b/isis/src/mro/apps/hical/HiCalConf.cpp @@ -239,25 +239,25 @@ bool HiCalConf::_naifLoaded = false; // Check for proper size if specifeid if (expected_size != 0) { - if (cube.getSampleCount() != expected_size) { + if (cube.sampleCount() != expected_size) { ostringstream mess; mess << "Specifed matrix (" << name << ") from file \"" << mfile << "\" does not have expected samples (" << expected_size - << ") but has " << cube.getSampleCount(); + << ") but has " << cube.sampleCount(); cube.close(); throw IException(IException::User, mess.str(), _FILEINFO_); } } // Read the specifed region - Brick bandio(cube.getSampleCount(), 1, 1, Real); + Brick bandio(cube.sampleCount(), 1, 1, Real); bandio.SetBasePosition(1,1,getMatrixBand(profile)); cube.read(bandio); // Now create the output buffer with some TNT funny business - HiVector temp(cube.getSampleCount(), bandio.DoubleBuffer()); - HiVector out(cube.getSampleCount()); + HiVector temp(cube.sampleCount(), bandio.DoubleBuffer()); + HiVector out(cube.sampleCount()); out.inject(temp); cube.close(); return (out); diff --git a/isis/src/mro/apps/hical/HiCalData.h b/isis/src/mro/apps/hical/HiCalData.h index 0192fec00b..b59b5316fa 100644 --- a/isis/src/mro/apps/hical/HiCalData.h +++ b/isis/src/mro/apps/hical/HiCalData.h @@ -73,7 +73,7 @@ namespace Isis { _buffer = HiBlob(cube, "HiRISE Ancillary", "BufferPixels").buffer(); _dark = HiBlob(cube, "HiRISE Ancillary", "DarkPixels").buffer(); - PvlGroup &instrument = cube.getGroup("Instrument"); + PvlGroup &instrument = cube.group("Instrument"); // Extract what is needed _binning = instrument["Summing"]; diff --git a/isis/src/mro/apps/hical/hical.cpp b/isis/src/mro/apps/hical/hical.cpp index f750eb039a..6efa4f81e4 100644 --- a/isis/src/mro/apps/hical/hical.cpp +++ b/isis/src/mro/apps/hical/hical.cpp @@ -120,18 +120,18 @@ void IsisMain(){ ProcessByLine p; Cube *hifrom = p.SetInputCube("FROM"); - int nsamps = hifrom->getSampleCount(); - int nlines = hifrom->getLineCount(); + int nsamps = hifrom->sampleCount(); + int nlines = hifrom->lineCount(); // Initialize the configuration file QString conf(ui.GetAsString("CONF")); - HiCalConf hiconf(*(hifrom->getLabel()), conf); + HiCalConf hiconf(*(hifrom->label()), conf); DbProfile hiprof = hiconf.getMatrixProfile(); // Check for label propagation and set the output cube Cube *ocube = p.SetOutputCube("TO"); if ( !IsTrueValue(hiprof,"PropagateTables", "TRUE") ) { - RemoveHiBlobs(*(ocube->getLabel())); + RemoveHiBlobs(*(ocube->label())); } // Set specified profile if entered by user @@ -146,7 +146,7 @@ void IsisMain(){ } else { // Set default to output directory - hiconf.add("OPATH", FileName(ocube->getFileName()).path()); + hiconf.add("OPATH", FileName(ocube->fileName()).path()); } // Do I/F output DN conversions @@ -406,8 +406,8 @@ void IsisMain(){ ofile << "Version: " << hical_version << endl; ofile << "Revision: " << hical_revision << endl << endl; - ofile << "FROM: " << hifrom->getFileName() << endl; - ofile << "TO: " << ocube->getFileName() << endl; + ofile << "FROM: " << hifrom->fileName() << endl; + ofile << "TO: " << ocube->fileName() << endl; ofile << "CONF: " << conf_file << endl << endl; ofile << "/* " << hical_program << " application equation */\n" @@ -438,7 +438,7 @@ void IsisMain(){ ocube->putGroup(temp); } - PvlGroup &rcal = ocube->getGroup(rcalGroup); + PvlGroup &rcal = ocube->group(rcalGroup); rcal += PvlKeyword("Program", hical_program); rcal += PvlKeyword("RunTime", hical_runtime); rcal += PvlKeyword("Version",hical_version); diff --git a/isis/src/mro/apps/hicalbeta/HiCalConf.cpp b/isis/src/mro/apps/hicalbeta/HiCalConf.cpp index d092bc3324..a22816dcf7 100644 --- a/isis/src/mro/apps/hicalbeta/HiCalConf.cpp +++ b/isis/src/mro/apps/hicalbeta/HiCalConf.cpp @@ -239,25 +239,25 @@ bool HiCalConf::_naifLoaded = false; // Check for proper size if specifeid if (expected_size != 0) { - if (cube.getSampleCount() != expected_size) { + if (cube.sampleCount() != expected_size) { ostringstream mess; mess << "Specifed matrix (" << name << ") from file \"" << mfile << "\" does not have expected samples (" << expected_size - << ") but has " << cube.getSampleCount(); + << ") but has " << cube.sampleCount(); cube.close(); throw IException(IException::User, mess.str(), _FILEINFO_); } } // Read the specifed region - Brick bandio(cube.getSampleCount(), 1, 1, Real); + Brick bandio(cube.sampleCount(), 1, 1, Real); bandio.SetBasePosition(1,1,getMatrixBand(profile)); cube.read(bandio); // Now create the output buffer with some TNT funny business - HiVector temp(cube.getSampleCount(), bandio.DoubleBuffer()); - HiVector out(cube.getSampleCount()); + HiVector temp(cube.sampleCount(), bandio.DoubleBuffer()); + HiVector out(cube.sampleCount()); out.inject(temp); cube.close(); return (out); diff --git a/isis/src/mro/apps/hicalbeta/HiCalData.h b/isis/src/mro/apps/hicalbeta/HiCalData.h index 9f797d097e..41f0e157c8 100644 --- a/isis/src/mro/apps/hicalbeta/HiCalData.h +++ b/isis/src/mro/apps/hicalbeta/HiCalData.h @@ -73,7 +73,7 @@ namespace Isis { _buffer = HiBlob(cube, "HiRISE Ancillary", "BufferPixels").buffer(); _dark = HiBlob(cube, "HiRISE Ancillary", "DarkPixels").buffer(); - PvlGroup &instrument = cube.getGroup("Instrument"); + PvlGroup &instrument = cube.group("Instrument"); // Extract what is needed _binning = instrument["Summing"]; diff --git a/isis/src/mro/apps/hicalbeta/hicalbeta.cpp b/isis/src/mro/apps/hicalbeta/hicalbeta.cpp index 5cbb5202b1..9f6640d3eb 100644 --- a/isis/src/mro/apps/hicalbeta/hicalbeta.cpp +++ b/isis/src/mro/apps/hicalbeta/hicalbeta.cpp @@ -120,18 +120,18 @@ void IsisMain(){ ProcessByLine p; Cube *hifrom = p.SetInputCube("FROM"); - int nsamps = hifrom->getSampleCount(); - int nlines = hifrom->getLineCount(); + int nsamps = hifrom->sampleCount(); + int nlines = hifrom->lineCount(); // Initialize the configuration file QString conf(ui.GetAsString("CONF")); - HiCalConf hiconf(*(hifrom->getLabel()), conf); + HiCalConf hiconf(*(hifrom->label()), conf); DbProfile hiprof = hiconf.getMatrixProfile(); // Check for label propagation and set the output cube Cube *ocube = p.SetOutputCube("TO"); if ( !IsTrueValue(hiprof,"PropagateTables", "TRUE") ) { - RemoveHiBlobs(*(ocube->getLabel())); + RemoveHiBlobs(*(ocube->label())); } // Set specified profile if entered by user @@ -146,7 +146,7 @@ void IsisMain(){ } else { // Set default to output directory - hiconf.add("OPATH", FileName(ocube->getFileName()).path()); + hiconf.add("OPATH", FileName(ocube->fileName()).path()); } // Do I/F output DN conversions @@ -406,8 +406,8 @@ void IsisMain(){ ofile << "Version: " << hical_version << endl; ofile << "Revision: " << hical_revision << endl << endl; - ofile << "FROM: " << hifrom->getFileName() << endl; - ofile << "TO: " << ocube->getFileName() << endl; + ofile << "FROM: " << hifrom->fileName() << endl; + ofile << "TO: " << ocube->fileName() << endl; ofile << "CONF: " << conf_file << endl << endl; ofile << "/* " << hical_program << " application equation */\n" @@ -438,7 +438,7 @@ void IsisMain(){ ocube->putGroup(temp); } - PvlGroup &rcal = ocube->getGroup(rcalGroup); + PvlGroup &rcal = ocube->group(rcalGroup); rcal += PvlKeyword("Program", hical_program); rcal += PvlKeyword("RunTime", hical_runtime); rcal += PvlKeyword("Version",hical_version); diff --git a/isis/src/mro/apps/hiccdstitch/hiccdstitch.cpp b/isis/src/mro/apps/hiccdstitch/hiccdstitch.cpp index 4bb292c9cf..ce6ea16120 100644 --- a/isis/src/mro/apps/hiccdstitch/hiccdstitch.cpp +++ b/isis/src/mro/apps/hiccdstitch/hiccdstitch.cpp @@ -157,7 +157,7 @@ void IsisMain() { Cube *cube = new Cube(); cube->open(list[i].toString()); - PvlGroup arch = cube->getLabel()->FindGroup("Archive", Pvl::Traverse); + PvlGroup arch = cube->label()->FindGroup("Archive", Pvl::Traverse); if(first) { obsId = (QString) arch["ObservationId"]; first = false; @@ -170,7 +170,7 @@ void IsisMain() { } } - PvlGroup inst = cube->getLabel()->FindGroup("Instrument", Pvl::Traverse); + PvlGroup inst = cube->label()->FindGroup("Instrument", Pvl::Traverse); int chan = inst["ChannelNumber"]; if(chan != 2) { QString msg = "Input file " + list[i].toString() + " contains a single channel"; @@ -198,9 +198,9 @@ void IsisMain() { CCDinfo.trimLines = arch["TrimLines"]; CCDinfo.fpsamp = xoffset[ccd]; CCDinfo.fpline = yoffset[ccd]; - CCDinfo.ns = cube->getSampleCount(); - CCDinfo.nl = cube->getLineCount(); - CCDinfo.nb = cube->getBandCount(); + CCDinfo.ns = cube->sampleCount(); + CCDinfo.nl = cube->lineCount(); + CCDinfo.nb = cube->bandCount(); if(CCDinfo.nb > maxBands) maxBands = CCDinfo.nb; CCDinfo.outss = 1; CCDinfo.outsl = 1; @@ -251,7 +251,7 @@ void IsisMain() { // Set up portal CCDinfo.portal = new Portal(interp->Samples(), interp->Lines(), - cube->getPixelType(), + cube->pixelType(), interp->HotSample(), interp->HotLine()); CCDlist.push_back(CCDinfo); @@ -348,7 +348,7 @@ void IsisMain() { Cube *ocube = placing.SetOutputCube("TO", outns, outnl, maxBands); // Delete ChannelNumber and CpmmNumber so that the output cannot be projected. - PvlGroup oinst = ocube->getGroup("Instrument"); + PvlGroup oinst = ocube->group("Instrument"); oinst.DeleteKeyword("ChannelNumber"); oinst.DeleteKeyword("CpmmNumber"); ocube->putGroup(oinst); diff --git a/isis/src/mro/apps/hicolormos/hicolormos.cpp b/isis/src/mro/apps/hicolormos/hicolormos.cpp index 8b94595afc..0d5d7b215d 100644 --- a/isis/src/mro/apps/hicolormos/hicolormos.cpp +++ b/isis/src/mro/apps/hicolormos/hicolormos.cpp @@ -260,7 +260,7 @@ void IsisMain() { Cube c; c.open(ui.GetFileName("TO"), "rw"); - c.getLabel()->FindObject("IsisCube", Pvl::Traverse).AddGroup(mos); + c.label()->FindObject("IsisCube", Pvl::Traverse).AddGroup(mos); c.write(from1OrgLab); c.close(); diff --git a/isis/src/mro/apps/hicrop/hicrop.cpp b/isis/src/mro/apps/hicrop/hicrop.cpp index 59f7f80a58..ffce8cff9f 100644 --- a/isis/src/mro/apps/hicrop/hicrop.cpp +++ b/isis/src/mro/apps/hicrop/hicrop.cpp @@ -104,7 +104,7 @@ void IsisMain() { // get values from the labels needed to compute the line rate and the // actual start time of the input cube - Pvl &inLabels = *g_cube.getLabel(); + Pvl &inLabels = *g_cube.label(); PvlGroup &inputInst = inLabels.FindObject("IsisCube").FindGroup("Instrument"); QString instId = (inputInst["InstrumentId"]); if (instId.toUpper() != "HIRISE") { @@ -214,8 +214,8 @@ void IsisMain() { // decimal value. double stopTime2Line = et2line(lastValidTime, lineRate, originalStartEt); double decimalValue = stopTime2Line - qFloor(stopTime2Line); - if (stopTime2Line > (double) g_cube.getLineCount()) { - g_cropEndLine = g_cube.getLineCount(); + if (stopTime2Line > (double) g_cube.lineCount()) { + g_cropEndLine = g_cube.lineCount(); } else { // we need to be sure that the entire last ilne has coverage. @@ -306,9 +306,9 @@ void IsisMain() { ProcessByLine p; p.SetInputCube("FROM"); p.PropagateTables(false); - int numSamps = g_cube.getSampleCount(); - int numBands = g_cube.getBandCount(); - int inputLineCount = g_cube.getLineCount(); + int numSamps = g_cube.sampleCount(); + int numBands = g_cube.bandCount(); + int inputLineCount = g_cube.lineCount(); Cube *ocube = p.SetOutputCube("TO", numSamps, g_cropLineCount, numBands); p.ClearInputCubes(); @@ -326,7 +326,7 @@ void IsisMain() { } // test to see what happens if I don't have this code ??? - Pvl &outLabels = *ocube->getLabel(); + Pvl &outLabels = *ocube->label(); // Change the start/end times and spacecraft start/stop counts in the labels PvlGroup &outputInst = outLabels.FindObject("IsisCube").FindGroup("Instrument"); outputInst["StartTime"][0] = cropStartTime.UTC(); //??? use actual or adjusted like clock counts ??? diff --git a/isis/src/mro/apps/hicubeit/hicubeit.cpp b/isis/src/mro/apps/hicubeit/hicubeit.cpp index aae636c599..63e7ae3751 100644 --- a/isis/src/mro/apps/hicubeit/hicubeit.cpp +++ b/isis/src/mro/apps/hicubeit/hicubeit.cpp @@ -176,6 +176,6 @@ void IsisMain() { // Add the group to the output cube Cube c; c.open(ui.GetFileName("TO"), "rw"); - c.getLabel()->FindObject("IsisCube", Pvl::Traverse).AddGroup(mos); + c.label()->FindObject("IsisCube", Pvl::Traverse).AddGroup(mos); c.close(); } diff --git a/isis/src/mro/apps/hicubenorm/hicubenorm.cpp b/isis/src/mro/apps/hicubenorm/hicubenorm.cpp index 85dfbc633b..af1b5d6450 100644 --- a/isis/src/mro/apps/hicubenorm/hicubenorm.cpp +++ b/isis/src/mro/apps/hicubenorm/hicubenorm.cpp @@ -74,10 +74,10 @@ void IsisMain() { // Setup the input cube; // Obtain information from the input file Cube *icube = p.SetInputCube("FROM"); - totalSamples = icube->getSampleCount(); - totalLines = icube->getLineCount(); - totalBands = icube->getBandCount(); - channel = icube->getGroup("Instrument")["ChannelNumber"]; + totalSamples = icube->sampleCount(); + totalLines = icube->lineCount(); + totalBands = icube->bandCount(); + channel = icube->group("Instrument")["ChannelNumber"]; // Cubenorm New Version Flag bool bNewVersion = ui.GetBoolean("NEW_VERSION"); diff --git a/isis/src/mro/apps/hideal2pds/hideal2pds.cpp b/isis/src/mro/apps/hideal2pds/hideal2pds.cpp index c33752415f..a43969640f 100644 --- a/isis/src/mro/apps/hideal2pds/hideal2pds.cpp +++ b/isis/src/mro/apps/hideal2pds/hideal2pds.cpp @@ -39,7 +39,7 @@ void IsisMain() { UserInterface &ui = Application::GetUserInterface(); ProcessExportPds p; Cube *inputCube = p.SetInputCube("FROM"); - PvlObject *isisCubeLab = inputCube->getLabel(); + PvlObject *isisCubeLab = inputCube->label(); // Error check to make sure this is a valid cube for this program QString origInstrument = isisCubeLab->FindObject("IsisCube") @@ -94,7 +94,7 @@ void IsisMain() { QString isisLabelFile = ui.GetFileName("FROM"); // Translate the keywords from the input cube label that go in the PDS label - PvlTranslationManager cubeLab(*(inputCube->getLabel()), + PvlTranslationManager cubeLab(*(inputCube->label()), "$mro/translations/hiriseIdealPdsExportCubeLabel.trn"); cubeLab.Auto(pdsLabel); @@ -110,7 +110,7 @@ void IsisMain() { updatePdsLabelTimeParametersGroup(pdsLabel); updatePdsLabelImageObject(isisCubeLab, pdsLabel); - Camera *cam = inputCube->getCamera(); + Camera *cam = inputCube->camera(); updatePdsLabelRootObject(isisCubeLab, pdsLabel, ui, cam); // Export each of the spice tables and update table keywords in PDS file @@ -246,10 +246,10 @@ pair inputRange(Cube *inputCube) { // Loop and accumulate histogram histProcess.Progress()->SetText("Gathering Histogram to Find Input Range"); - histProcess.Progress()->SetMaximumSteps(inputCube->getLineCount()); + histProcess.Progress()->SetMaximumSteps(inputCube->lineCount()); histProcess.Progress()->CheckStatus(); LineManager line(*inputCube); - for(int i = 1; i <= inputCube->getLineCount(); i++) { + for(int i = 1; i <= inputCube->lineCount(); i++) { line.SetLine(i, band); inputCube->read(line); hist.AddData(line.DoubleBuffer(), line.size()); diff --git a/isis/src/mro/apps/hidestripe/hidestripe.cpp b/isis/src/mro/apps/hidestripe/hidestripe.cpp index 0cef74fa7a..ddc3d3bcfa 100644 --- a/isis/src/mro/apps/hidestripe/hidestripe.cpp +++ b/isis/src/mro/apps/hidestripe/hidestripe.cpp @@ -60,7 +60,7 @@ void IsisMain() { ProcessByLine processByLine; Cube *icube = processByLine.SetInputCube("FROM"); - int totalSamples = icube->getSampleCount(); + int totalSamples = icube->sampleCount(); //We'll be going through the cube by line, manually differentiating // between phases @@ -69,7 +69,7 @@ void IsisMain() { Table hifix("HiRISE Ancillary"); - int channel = icube->getGroup("Instrument")["ChannelNumber"]; + int channel = icube->group("Instrument")["ChannelNumber"]; if(channel == 0) { phases = channel0Phases; @@ -77,7 +77,7 @@ void IsisMain() { else { phases = channel1Phases; } - int binning_mode = icube->getGroup("Instrument")["Summing"]; + int binning_mode = icube->group("Instrument")["Summing"]; if(binning_mode != 1 && binning_mode != 2) { /*IString msg = "You may only use input with binning mode 1 or 2, not"; msg += binning_mode; diff --git a/isis/src/mro/apps/hidtmgen/hidtmgen.cpp b/isis/src/mro/apps/hidtmgen/hidtmgen.cpp index 3e66d5d855..aca7470f97 100644 --- a/isis/src/mro/apps/hidtmgen/hidtmgen.cpp +++ b/isis/src/mro/apps/hidtmgen/hidtmgen.cpp @@ -34,8 +34,8 @@ void IsisMain() { Cube * inCube = p.SetInputCube("DTM"); // Verify HiRISE - if (inCube->getBandCount() > 1 || - inCube->getLabel()->HasObject("Instrument")) { + if (inCube->bandCount() > 1 || + inCube->label()->HasObject("Instrument")) { QString msg = "Input cube [" + ui.GetFileName("FROM") + "] does not appear" + "to be a DTM"; throw IException(IException::User, msg, _FILEINFO_); @@ -317,7 +317,7 @@ void IsisMain() { image.DeleteKeyword("CORE_HIGH_INSTR_SATURATION"); // Create statistics and add to image group - Statistics * stat = inCube->getStatistics(); + Statistics * stat = inCube->statistics(); image.AddKeyword(PvlKeyword("VALID_MINIMUM",toString(stat->Minimum()))); image.AddKeyword(PvlKeyword("VALID_MAXIMUM",toString(stat->Maximum()))); diff --git a/isis/src/mro/apps/hifringe/hifringe.cpp b/isis/src/mro/apps/hifringe/hifringe.cpp index cef174c006..e9e806f163 100644 --- a/isis/src/mro/apps/hifringe/hifringe.cpp +++ b/isis/src/mro/apps/hifringe/hifringe.cpp @@ -54,14 +54,14 @@ void IsisMain() { Process p; Cube *icube = p.SetInputCube("FROM"); - int totalSamples = icube->getSampleCount(); - int totalLines = icube->getLineCount(); + int totalSamples = icube->sampleCount(); + int totalLines = icube->lineCount(); Isis::LineManager lineManager(inputCube); lineManager.begin(); int leftFringe, rightFringe; - int binningMode = icube->getGroup("Instrument")["Summing"]; + int binningMode = icube->group("Instrument")["Summing"]; //determine the edges between which no statistics should be gathered leftFringe = 48 / binningMode; @@ -171,7 +171,7 @@ void IsisMain() { PvlGroup sourceInfo("SourceInfo"); sourceInfo += PvlKeyword("From", fromFile.expanded()); - sourceInfo += icube->getGroup("Archive")["ProductId"]; + sourceInfo += icube->group("Archive")["ProductId"]; outputPvl.AddGroup(sourceInfo); if(numSections > 0) { outputPvl.AddObject(leftSide); diff --git a/isis/src/mro/apps/hifurrows/hifurrows.cpp b/isis/src/mro/apps/hifurrows/hifurrows.cpp index 4d1c4aa2c9..13d9e16440 100644 --- a/isis/src/mro/apps/hifurrows/hifurrows.cpp +++ b/isis/src/mro/apps/hifurrows/hifurrows.cpp @@ -85,8 +85,8 @@ void IsisMain() { furrows[0].increment = -1; } else if(channel == 1) { - furrows[0].startSample = icube->getSampleCount() - 5 + 1; - furrows[0].endSample = icube->getSampleCount(); + furrows[0].startSample = icube->sampleCount() - 5 + 1; + furrows[0].endSample = icube->sampleCount(); furrows[0].increment = 1; } else { diff --git a/isis/src/mro/apps/higlob/higlob.cpp b/isis/src/mro/apps/higlob/higlob.cpp index 3daf8b382a..48cfab8d7e 100644 --- a/isis/src/mro/apps/higlob/higlob.cpp +++ b/isis/src/mro/apps/higlob/higlob.cpp @@ -34,9 +34,9 @@ void IsisMain() { QString from = ui.GetFileName("FROM"); g_cube.open(from); - samples = g_cube.getSampleCount(); - lines = g_cube.getLineCount(); - bands = g_cube.getBandCount(); + samples = g_cube.sampleCount(); + lines = g_cube.lineCount(); + bands = g_cube.bandCount(); // Get a cube packet to the input file Cube *icube = p.SetInputCube("FROM"); @@ -58,7 +58,7 @@ void IsisMain() { // Decide if the calibration and observation data should be flipped. g_flip = false; - PvlGroup &ins = icube->getGroup("Instrument"); + PvlGroup &ins = icube->group("Instrument"); int chan = ins["ChannelNumber"]; IString flipChan = ui.GetString("FLIP"); diff --git a/isis/src/mro/apps/hijitreg/HiJitCube.cpp b/isis/src/mro/apps/hijitreg/HiJitCube.cpp index 66a9083399..9fde32530d 100644 --- a/isis/src/mro/apps/hijitreg/HiJitCube.cpp +++ b/isis/src/mro/apps/hijitreg/HiJitCube.cpp @@ -127,8 +127,8 @@ namespace Isis { if(jdata.summing != other.summing) { ostringstream msg; msg << "Summing mode (" << jdata.summing - << ") in file " << getFileName() << " is not equal to summing mode (" - << other.summing << ") in file " << cube.getFileName() << endl; + << ") in file " << fileName() << " is not equal to summing mode (" + << other.summing << ") in file " << cube.fileName() << endl; throw IException(IException::User, msg.str(), _FILEINFO_); } return; @@ -221,31 +221,31 @@ namespace Isis { void HiJitCube::Init() { // Get required keywords from instrument group - Pvl *label(getLabel()); + Pvl *labelPvl(label()); Isis::PvlGroup inst; Isis::PvlGroup idinst; - jdata.filename = getFileName(); - Isis::PvlGroup &archive = label->FindGroup("Archive", Isis::Pvl::Traverse); + jdata.filename = fileName(); + Isis::PvlGroup &archive = labelPvl->FindGroup("Archive", Isis::Pvl::Traverse); jdata.productId = (QString) archive["ProductId"]; - jdata.lines = getLineCount(); - if(label->FindObject("IsisCube").HasGroup("OriginalInstrument")) { - inst = label->FindGroup("OriginalInstrument", Isis::Pvl::Traverse); + jdata.lines = lineCount(); + if(labelPvl->FindObject("IsisCube").HasGroup("OriginalInstrument")) { + inst = labelPvl->FindGroup("OriginalInstrument", Isis::Pvl::Traverse); originst = true; } else { - inst = label->FindGroup("Instrument", Isis::Pvl::Traverse); + inst = labelPvl->FindGroup("Instrument", Isis::Pvl::Traverse); originst = false; } jdata.tdiMode = inst["Tdi"]; jdata.summing = inst["Summing"]; - if(label->FindObject("IsisCube").HasGroup("Instrument") && originst) { - idinst = label->FindGroup("Instrument", Isis::Pvl::Traverse); + if(labelPvl->FindObject("IsisCube").HasGroup("Instrument") && originst) { + idinst = labelPvl->FindGroup("Instrument", Isis::Pvl::Traverse); if (idinst.HasKeyword("PixelPitch")) { jdata.pixpitch = idinst["PixelPitch"]; } else { - jdata.pixpitch = label->FindObject("NaifKeywords")["IDEAL_PIXEL_PITCH"]; + jdata.pixpitch = labelPvl->FindObject("NaifKeywords")["IDEAL_PIXEL_PITCH"]; } jdata.summing = (int)(jdata.pixpitch / .012); } @@ -262,7 +262,7 @@ namespace Isis { jdata.samples = npSamps[jdata.cpmmNumber]; } else { - jdata.samples = getSampleCount(); + jdata.samples = sampleCount(); } jdata.ccdName = Instrument::CCD_NAMES[jdata.cpmmNumber]; jdata.dltCount = inst["DeltaLineTimerCount"]; @@ -282,7 +282,7 @@ namespace Isis { ostringstream msg; msg << "Summing mode (" << jdata.summing << ") is illegal (must be > 0) or CPMM number (" << jdata.cpmmNumber - << ") is invalid in file " << getFileName() << endl; + << ") is invalid in file " << fileName() << endl; throw IException(IException::User, msg.str(), _FILEINFO_); } @@ -293,7 +293,7 @@ namespace Isis { if((jdata.channelNumber > 2) || (jdata.channelNumber < 0)) { ostringstream msg; msg << "Channel number (" << jdata.channelNumber - << ") is invalid (must be 0, 1 or 2) in file " << getFileName() + << ") is invalid (must be 0, 1 or 2) in file " << fileName() << endl; throw IException(IException::User, msg.str(), _FILEINFO_); } @@ -302,7 +302,7 @@ namespace Isis { if(jdata.channelNumber == 0) jdata.fpSamp0 += npSamps[jdata.cpmmNumber]; } else { - if(jdata.channelNumber == 0) jdata.fpSamp0 += getSampleCount(); + if(jdata.channelNumber == 0) jdata.fpSamp0 += sampleCount(); } } @@ -323,7 +323,7 @@ namespace Isis { ostringstream msg; msg << "Invalid summing mode (" << summing << ") for file " << - getFileName() << std::endl; + fileName() << std::endl; throw IException(IException::User, msg.str(), _FILEINFO_); } @@ -338,9 +338,9 @@ namespace Isis { } else { samp0 = jdata.fpSamp0 + jdata.sampOffset; - sampN = samp0 + getSampleCount() - 1; + sampN = samp0 + sampleCount() - 1; } - int line0(jdata.fpLine0 + jdata.lineOffset), lineN(line0 + getLineCount() - 1); + int line0(jdata.fpLine0 + jdata.lineOffset), lineN(line0 + lineCount() - 1); // Allocate a new coordinate sequence and define it geos::geom::CoordinateSequence *pts = new geos::geom::CoordinateArraySequence(); diff --git a/isis/src/mro/apps/hijitreg/hijitreg.cpp b/isis/src/mro/apps/hijitreg/hijitreg.cpp index 1d56596649..d26719996b 100644 --- a/isis/src/mro/apps/hijitreg/hijitreg.cpp +++ b/isis/src/mro/apps/hijitreg/hijitreg.cpp @@ -99,7 +99,7 @@ void IsisMain() { match.OpenCube(ui.GetFileName("MATCH"), stitch); // Ensure only one band - if((trans.getBandCount() != 1) || (match.getBandCount() != 1)) { + if((trans.bandCount() != 1) || (match.bandCount() != 1)) { QString msg = "Input Cubes must have only one band!"; throw IException(IException::User, msg, _FILEINFO_); } @@ -186,7 +186,7 @@ void IsisMain() { QString transSN = SerialNumber::Compose(trans, true); QString matchSN = SerialNumber::Compose(match, true); - PvlGroup &instrument = trans.getLabel()->FindGroup("Instrument", Pvl::Traverse); + PvlGroup &instrument = trans.label()->FindGroup("Instrument", Pvl::Traverse); cn.SetTarget(instrument["TargetName"][0]); cn.SetDescription("Records s/c jitter between two adjacent HiRISE images"); diff --git a/isis/src/mro/apps/hijitter/hijitter.cpp b/isis/src/mro/apps/hijitter/hijitter.cpp index 436aac6adf..4010995c37 100644 --- a/isis/src/mro/apps/hijitter/hijitter.cpp +++ b/isis/src/mro/apps/hijitter/hijitter.cpp @@ -691,13 +691,13 @@ void cropLines(QString inFile, double eTime1, double eTime2, int & line1, int & Cube *inCube = new Cube; inCube->open(inFile); - Camera *cam = inCube->getCamera(); + Camera *cam = inCube->camera(); iTime etTime = cam->Spice::cacheStartTime(); double etStart = etTime.Et(); double lineRate = ((LineScanCameraDetectorMap*) cam->DetectorMap())->LineRate(); - int imgLines = inCube->getLineCount(); + int imgLines = inCube->lineCount(); line1 = int ((eTime1 - etStart) / lineRate + 0.5 ); line2 = int ((eTime2 - etStart) / lineRate + 0.5 ); diff --git a/isis/src/mro/apps/himos/himos.cpp b/isis/src/mro/apps/himos/himos.cpp index 4fb2c61a13..677cd0cfe7 100644 --- a/isis/src/mro/apps/himos/himos.cpp +++ b/isis/src/mro/apps/himos/himos.cpp @@ -55,8 +55,8 @@ void IsisMain() { PvlKeyword sourceProductId("SourceProductId"); QString ProdId; for(int i = 0; i < (int)clist.size(); i++) { - Pvl *pmatch = clist[0]->getLabel(); - Pvl *pcomp = clist[i]->getLabel(); + Pvl *pmatch = clist[0]->label(); + Pvl *pcomp = clist[i]->label(); CompareLabels(*pmatch, *pcomp); PvlGroup g = pcomp->FindGroup("Instrument", Pvl::Traverse); if(g.HasKeyword("StitchedProductIds")) { @@ -80,7 +80,7 @@ void IsisMain() { double avgLat; double avgLon; for(int i = 0; i < (int)clist.size(); i++) { - Projection *proj = clist[i]->getProjection(); + Projection *proj = clist[i]->projection(); if(proj->MinimumLatitude() < minLat) minLat = proj->MinimumLatitude(); if(proj->MaximumLatitude() > maxLat) maxLat = proj->MaximumLatitude(); if(proj->MinimumLongitude() < minLon) minLon = proj->MinimumLongitude(); @@ -88,7 +88,7 @@ void IsisMain() { } avgLat = (minLat + maxLat) / 2; avgLon = (minLon + maxLon) / 2; - Projection *proj = clist[0]->getProjection(); + Projection *proj = clist[0]->projection(); proj->SetGround(avgLat, avgLon); avgLat = proj->UniversalLatitude(); avgLon = proj->UniversalLongitude(); @@ -102,7 +102,7 @@ void IsisMain() { double CsunAzimuth; double CnorthAzimuth; for(int i = 0; i < (int)clist.size(); i++) { - Camera *cam = clist[i]->getCamera(); + Camera *cam = clist[i]->camera(); if(cam->SetUniversalGround(avgLat, avgLon)) { Cemiss = cam->EmissionAngle(); Cphase = cam->PhaseAngle(); @@ -126,7 +126,7 @@ void IsisMain() { double startY = DBL_MAX; double endY = DBL_MIN; for(int i = 0; i < (int)clist.size(); i++) { - Projection *proj = clist[i]->getProjection(); + Projection *proj = clist[i]->projection(); proj->SetWorld(0.5, 0.5); if(i == 0) { startX = proj->XCoord(); @@ -136,7 +136,7 @@ void IsisMain() { if(proj->XCoord() < startX) startX = proj->XCoord(); if(proj->YCoord() > endY) endY = proj->YCoord(); } - Pvl *p = clist[i]->getLabel(); + Pvl *p = clist[i]->label(); double nlines = p->FindGroup("Dimensions", Pvl::Traverse)["Lines"]; double nsamps = p->FindGroup("Dimensions", Pvl::Traverse)["Samples"]; @@ -157,7 +157,7 @@ void IsisMain() { double line = proj->ToWorldY(avgY); for(int i = 0; i < (int)clist.size(); i++) { - Camera *cam = clist[i]->getCamera(); + Camera *cam = clist[i]->camera(); if(cam->SetImage(sample, line)) { Cemiss = cam->EmissionAngle(); Cphase = cam->PhaseAngle(); @@ -217,7 +217,7 @@ void IsisMain() { } for(int i = 0; i < (int)clist.size(); i++) { - Pvl *clab = clist[i]->getLabel(); + Pvl *clab = clist[i]->label(); PvlGroup cInst = clab->FindGroup("Instrument", Pvl::Traverse); OriginalLabel cOrgLab; clist[i]->read(cOrgLab); @@ -277,7 +277,7 @@ void IsisMain() { Cube mosCube; mosCube.open(ui.GetFileName("TO"), "rw"); - PvlObject &lab = mosCube.getLabel()->FindObject("IsisCube"); + PvlObject &lab = mosCube.label()->FindObject("IsisCube"); lab.AddGroup(mos); //add orginal label blob to the output cube mosCube.write(org); diff --git a/isis/src/mro/apps/hirdrgen/hirdrgen.cpp b/isis/src/mro/apps/hirdrgen/hirdrgen.cpp index 4c9b6f76e0..e6d3a0d24b 100644 --- a/isis/src/mro/apps/hirdrgen/hirdrgen.cpp +++ b/isis/src/mro/apps/hirdrgen/hirdrgen.cpp @@ -38,7 +38,7 @@ void IsisMain() { Cube *icube = pHist.SetInputCube("FROM"); // Check to see if the input cube looks like a HiRISE RDR - if (icube->getBandCount() > 3) { + if (icube->bandCount() > 3) { QString msg = "Input file [" + Application::GetUserInterface().GetFileName("FROM") + "] does not appear to be a HiRISE RDR product. Number of " + @@ -47,8 +47,8 @@ void IsisMain() { } // Setup to get a histogram for each band - g_min = new double[icube->getBandCount()]; - g_max = new double[icube->getBandCount()]; + g_min = new double[icube->bandCount()]; + g_max = new double[icube->bandCount()]; UserInterface &ui = Application::GetUserInterface(); @@ -56,7 +56,7 @@ void IsisMain() { IString enctype = ui.GetString("ENCODING_TYPE"); enctype.DownCase(); - for (int band = 1; band <= icube->getBandCount(); ++band) { + for (int band = 1; band <= icube->bandCount(); ++band) { if (ui.GetString("TYPE").compare("AUTOMATIC") == 0) { // Set up a histogram for this band. This call sets the input range @@ -65,10 +65,10 @@ void IsisMain() { // Loop and accumulate histogram pHist.Progress()->SetText("Gathering Histogram"); - pHist.Progress()->SetMaximumSteps(icube->getLineCount()); + pHist.Progress()->SetMaximumSteps(icube->lineCount()); pHist.Progress()->CheckStatus(); LineManager line(*icube); - for (int i = 1; i <= icube->getLineCount(); i++) { + for (int i = 1; i <= icube->lineCount(); i++) { line.SetLine(i, band); icube->read(line); hist.AddData(line.DoubleBuffer(), line.size()); @@ -88,7 +88,7 @@ void IsisMain() { // Find the minimum min and maximum max for all bands double minmin = g_min[0]; double maxmax = g_max[0]; - for (int band = 1; band < icube->getBandCount(); ++band) { + for (int band = 1; band < icube->bandCount(); ++band) { if (g_min[band] < minmin) minmin = g_min[band]; if (g_max[band] > maxmax) maxmax = g_max[band]; } @@ -100,7 +100,7 @@ void IsisMain() { Cube *icube2 = p.SetInputCube("FROM"); if (enctype.Equal("jp2")) { - g_jp2buf = new char* [icube2->getBandCount()]; + g_jp2buf = new char* [icube2->bandCount()]; FileName lblFile(ui.GetFileName("TO")); QString lblFileName = lblFile.path() + "/" + lblFile.baseName() + ".lbl"; p.SetDetached(lblFileName); @@ -111,8 +111,8 @@ void IsisMain() { int nbits = ui.GetInteger("BITS"); if (nbits == 8) { if (enctype.Equal("jp2")) { - for (int i = 0; i < icube2->getBandCount(); i++) { - g_jp2buf[i] = new char[icube2->getSampleCount()]; + for (int i = 0; i < icube2->bandCount(); i++) { + g_jp2buf[i] = new char[icube2->sampleCount()]; } } g_oType = Isis::UnsignedByte; @@ -126,8 +126,8 @@ void IsisMain() { } else if (nbits == 16) { if (enctype.Equal("jp2")) { - for (int i = 0; i < icube2->getBandCount(); i++) { - g_jp2buf[i] = new char[icube2->getSampleCount()*2]; + for (int i = 0; i < icube2->bandCount(); i++) { + g_jp2buf[i] = new char[icube2->sampleCount()*2]; } } g_oType = UnsignedWord; @@ -141,8 +141,8 @@ void IsisMain() { } else { if (enctype.Equal("jp2")) { - for (int i = 0; i < icube2->getBandCount(); i++) { - g_jp2buf[i] = new char[icube2->getSampleCount()*2]; + for (int i = 0; i < icube2->bandCount(); i++) { + g_jp2buf[i] = new char[icube2->sampleCount()*2]; } } g_oType = UnsignedWord; @@ -168,7 +168,7 @@ void IsisMain() { Pvl &pdsLabel = p.StandardPdsLabel(type); // Translate the keywords from the input cube label that go in the PDS label - PvlTranslationManager cubeLab(*(icube2->getLabel()), + PvlTranslationManager cubeLab(*(icube2->label()), "$mro/translations/hirisePdsRdrCubeLabel.trn"); cubeLab.Auto(pdsLabel); @@ -223,13 +223,13 @@ void IsisMain() { FindGroup("INSTRUMENT_SETTING_PARAMETERS"). FindKeyword("MRO:POWERED_CPMM_FLAG"); PvlKeyword ccdBin("MRO:BINNING"); - PvlKeyword &cpmmBin = icube2->getLabel()->FindObject("IsisCube"). + PvlKeyword &cpmmBin = icube2->label()->FindObject("IsisCube"). FindGroup("Mosaic")["cpmmSummingFlag"]; PvlKeyword ccdTdi("MRO:TDI"); - PvlKeyword &cpmmTdi = icube2->getLabel()->FindObject("IsisCube"). + PvlKeyword &cpmmTdi = icube2->label()->FindObject("IsisCube"). FindGroup("Mosaic")["cpmmTdiFlag"]; PvlKeyword ccdSpecial("MRO:SPECIAL_PROCESSING_FLAG"); - PvlKeyword &cpmmSpecial = icube2->getLabel()->FindObject("IsisCube"). + PvlKeyword &cpmmSpecial = icube2->label()->FindObject("IsisCube"). FindGroup("Mosaic")["SpecialProcessingFlag"]; for (int ccd = 0; ccd < 14; ++ccd) { const unsigned int cpmmByCcd[] = {0, 1, 2, 3, 5, 8, 10, @@ -297,7 +297,7 @@ void IsisMain() { // instead of the target radii from NAIF if (mapObject["MAP_PROJECTION_TYPE"][0] == "EQUIRECTANGULAR") { Projection *proj = ProjectionFactory::CreateFromCube(*icube2); - PvlGroup &mapping = icube2->getLabel()->FindGroup("MAPPING", Pvl::Traverse); + PvlGroup &mapping = icube2->label()->FindGroup("MAPPING", Pvl::Traverse); double radius = proj->LocalRadius((double)mapping["CenterLatitude"]) / 1000.0; mapObject["A_AXIS_RADIUS"].SetValue(toString(radius), "KM"); mapObject["B_AXIS_RADIUS"].SetValue(toString(radius), "KM"); @@ -314,7 +314,7 @@ void IsisMain() { double intercept = p.GetOutputMaximum() - slope * maxmax; PvlKeyword minimum("MRO:MINIMUM_STRETCH", toString(slope * g_min[0] + intercept)); PvlKeyword maximum("MRO:MAXIMUM_STRETCH", toString(slope * g_max[0] + intercept)); - for (int band = 1; band < icube2->getBandCount(); ++band) { + for (int band = 1; band < icube2->bandCount(); ++band) { minimum += toString(slope * g_min[band] + intercept); maximum += toString(slope * g_max[band] + intercept); } @@ -498,16 +498,16 @@ void IsisMain() { // Open the output PDS file and dump the label and cube data if (enctype.Equal("jp2")) { p.OutputDetachedLabel(); - g_jp2Encoder = new JP2Encoder(ui.GetFileName("TO"), icube2->getSampleCount(), - icube2->getLineCount(), icube2->getBandCount(), g_oType); + g_jp2Encoder = new JP2Encoder(ui.GetFileName("TO"), icube2->sampleCount(), + icube2->lineCount(), icube2->bandCount(), g_oType); g_jp2Encoder->OpenFile(); - g_jp2ns = icube2->getSampleCount(); - g_jp2nb = icube2->getBandCount(); + g_jp2ns = icube2->sampleCount(); + g_jp2nb = icube2->bandCount(); g_jp2band = 0; p.StartProcess(writeJP2Image); p.EndProcess(); delete g_jp2Encoder; - for (int i = 0; i < icube2->getBandCount(); i++) { + for (int i = 0; i < icube2->bandCount(); i++) { delete [] g_jp2buf[i]; } } diff --git a/isis/src/mro/apps/hisharpen/hisharpen.cpp b/isis/src/mro/apps/hisharpen/hisharpen.cpp index 3b88d1587b..4e44cf4819 100644 --- a/isis/src/mro/apps/hisharpen/hisharpen.cpp +++ b/isis/src/mro/apps/hisharpen/hisharpen.cpp @@ -134,7 +134,7 @@ void CreatePsf(Pipeline &p) { // Verify the image looks like a hirise image try { - const PvlGroup &instGrp = fromCube.getLabel()->FindGroup("Instrument", Pvl::Traverse); + const PvlGroup &instGrp = fromCube.label()->FindGroup("Instrument", Pvl::Traverse); QString instrument = (QString)instGrp["InstrumentId"]; if(instrument != "HIRISE") { @@ -149,16 +149,16 @@ void CreatePsf(Pipeline &p) { throw IException(IException::User, message, _FILEINFO_); } - if(fromCube.getLineCount() != fromCube.getSampleCount()) { + if(fromCube.lineCount() != fromCube.sampleCount()) { QString message = "This program only works on square cubes, the number of samples [" + - QString(fromCube.getSampleCount()) + "] must match the number of lines [" + - QString(fromCube.getLineCount()) + "]"; + QString(fromCube.sampleCount()) + "] must match the number of lines [" + + QString(fromCube.lineCount()) + "]"; throw IException(IException::User, message, _FILEINFO_); } // Let's figure out which point spread function we're supposed to be using QString psfFile = "$mro/calibration/psf/PSF_"; - QString filter = (QString)fromCube.getLabel()->FindGroup("Instrument", Pvl::Traverse)["CcdId"]; + QString filter = (QString)fromCube.label()->FindGroup("Instrument", Pvl::Traverse)["CcdId"]; if(filter.contains("RED")) { psfFile += "RED"; @@ -179,15 +179,15 @@ void CreatePsf(Pipeline &p) { Cube psfCube; psfCube.open(psfFile); - if(psfCube.getLineCount() > fromCube.getLineCount()) { - QString message = "The input cube dimensions must be at least [" + QString(psfCube.getLineCount()); + if(psfCube.lineCount() > fromCube.lineCount()) { + QString message = "The input cube dimensions must be at least [" + QString(psfCube.lineCount()); message += "] pixels in the line and sample dimensions"; throw IException(IException::User, message, _FILEINFO_); } - if(!IsPowerOf2(fromCube.getLineCount())) { + if(!IsPowerOf2(fromCube.lineCount())) { QString message = "The input cube dimensions must be a power of 2 (found [" + - QString(fromCube.getLineCount()) + "])"; + QString(fromCube.lineCount()) + "])"; throw IException(IException::User, message, _FILEINFO_); } @@ -196,7 +196,7 @@ void CreatePsf(Pipeline &p) { // We also need the output temp psf cube Cube outPsfCube; - outPsfCube.setDimensions(fromCube.getSampleCount(), fromCube.getLineCount(), 1); + outPsfCube.setDimensions(fromCube.sampleCount(), fromCube.lineCount(), 1); outPsfCube.create(tmpFile); LineManager outMgr(outPsfCube); @@ -204,19 +204,19 @@ void CreatePsf(Pipeline &p) { Progress progress; progress.SetText("Creating PSF File"); - progress.SetMaximumSteps(fromCube.getLineCount()); + progress.SetMaximumSteps(fromCube.lineCount()); progress.CheckStatus(); - const int halfInSamples = psfCube.getSampleCount() / 2; - for(int line = 0; line < outPsfCube.getLineCount(); line++) { + const int halfInSamples = psfCube.sampleCount() / 2; + for(int line = 0; line < outPsfCube.lineCount(); line++) { psfCube.read(psfMgr); - for(int sample = 0; sample < outPsfCube.getSampleCount(); sample++) { + for(int sample = 0; sample < outPsfCube.sampleCount(); sample++) { if(sample < halfInSamples) { outMgr[sample] = psfMgr[sample]; } - else if(sample >= outPsfCube.getSampleCount() - halfInSamples) { - outMgr[sample] = psfMgr[psfCube.getSampleCount() - (outPsfCube.getSampleCount() - sample)]; + else if(sample >= outPsfCube.sampleCount() - halfInSamples) { + outMgr[sample] = psfMgr[psfCube.sampleCount() - (outPsfCube.sampleCount() - sample)]; } else { outMgr[sample] = 0.0; @@ -225,10 +225,10 @@ void CreatePsf(Pipeline &p) { outPsfCube.write(outMgr); - if(line < psfCube.getLineCount() / 2) { + if(line < psfCube.lineCount() / 2) { psfMgr ++; } - else if(line >= outPsfCube.getLineCount() - psfCube.getLineCount() / 2) { + else if(line >= outPsfCube.lineCount() - psfCube.lineCount() / 2) { psfMgr ++; } diff --git a/isis/src/mro/apps/histat/histat.cpp b/isis/src/mro/apps/histat/histat.cpp index c8404a5fb8..7af48c6170 100644 --- a/isis/src/mro/apps/histat/histat.cpp +++ b/isis/src/mro/apps/histat/histat.cpp @@ -68,8 +68,8 @@ void IsisMain() { Table hifix("HiRISE Ancillary"); icube->read(hifix); Statistics darkStats, bufStats, rampDarkStats; - int tdi = icube->getGroup("Instrument")["Tdi"]; - int binning_mode = icube->getGroup("Instrument")["Summing"]; + int tdi = icube->group("Instrument")["Tdi"]; + int binning_mode = icube->group("Instrument")["Summing"]; //This gets us the statistics for the dark and buffer pixels // alongside of the image itself @@ -264,7 +264,7 @@ void IsisMain() { imageBuffer++; } - for(int imageLine = LINES_POSTRAMP; imageLine < inputCube.getLineCount(); imageLine++) { + for(int imageLine = LINES_POSTRAMP; imageLine < inputCube.lineCount(); imageLine++) { inputCube.read(imageBuffer); for(int imageSample = 0 ; imageSample < out.SampleDimension(); imageSample++) { out[imageSample] = imageBuffer[imageSample + imageLeft]; diff --git a/isis/src/mro/apps/histitch/histitch.cpp b/isis/src/mro/apps/histitch/histitch.cpp index f9fd54a0df..3d83b01d2d 100644 --- a/isis/src/mro/apps/histitch/histitch.cpp +++ b/isis/src/mro/apps/histitch/histitch.cpp @@ -134,20 +134,20 @@ void IsisMain() { // are obtained from the first input file only unless provided from a // second file Cube *icube1 = p.SetInputCube("FROM1"); - fromData[0].nLines = fromData[1].nLines = icube1->getLineCount(); - fromData[0].nSamples = fromData[1].nSamples = icube1->getSampleCount(); - fromData[0].mult = HiVector(icube1->getLineCount(), 1.0); - fromData[0].add = HiVector(icube1->getLineCount(), 0.0); + fromData[0].nLines = fromData[1].nLines = icube1->lineCount(); + fromData[0].nSamples = fromData[1].nSamples = icube1->sampleCount(); + fromData[0].mult = HiVector(icube1->lineCount(), 1.0); + fromData[0].add = HiVector(icube1->lineCount(), 0.0); - if(seamSize + skipSize > icube1->getSampleCount()) { + if(seamSize + skipSize > icube1->sampleCount()) { QString msg = "SEAMSIZE [" + toString(seamSize) + "] + SKIP [" + toString(skipSize) + "] must "; - msg += " be less than the number of samples [" + toString(icube1->getSampleCount()) + "] in "; + msg += " be less than the number of samples [" + toString(icube1->sampleCount()) + "] in "; msg += "[" + ui.GetAsString("FROM1") + "]"; throw IException(IException::User, msg, _FILEINFO_); } - PvlGroup &from1Archive = icube1->getGroup("ARCHIVE"); - PvlGroup &from1Instrument = icube1->getGroup("INSTRUMENT"); + PvlGroup &from1Archive = icube1->group("ARCHIVE"); + PvlGroup &from1Instrument = icube1->group("INSTRUMENT"); fromData[0].ChnNumber = from1Instrument["ChannelNumber"]; stitchedProductIds = (QString)from1Archive["ProductId"][0]; @@ -167,20 +167,20 @@ void IsisMain() { // Only get the second input file if entered by the user if(ui.WasEntered("FROM2")) { Cube *icube2 = p.SetInputCube("FROM2"); - fromData[1].nLines = icube2->getLineCount(); - fromData[1].nSamples = icube2->getSampleCount(); - fromData[1].mult = HiVector(icube2->getLineCount(), 1.0); - fromData[1].add = HiVector(icube2->getLineCount(), 0.0); + fromData[1].nLines = icube2->lineCount(); + fromData[1].nSamples = icube2->sampleCount(); + fromData[1].mult = HiVector(icube2->lineCount(), 1.0); + fromData[1].add = HiVector(icube2->lineCount(), 0.0); - if(seamSize + skipSize > icube2->getSampleCount()) { + if(seamSize + skipSize > icube2->sampleCount()) { QString msg = "SEAMSIZE [" + toString(seamSize) + "] + SKIP [" + toString(skipSize) + "] must "; - msg += " be less than the number of samples [" + toString(icube2->getSampleCount()) + " in "; + msg += " be less than the number of samples [" + toString(icube2->sampleCount()) + " in "; msg += "[" + ui.GetAsString("FROM2") + "]"; throw IException(IException::User, msg, _FILEINFO_); } //Test to make sure input files are compatable - PvlGroup &from2Archive = icube2->getGroup("ARCHIVE"); + PvlGroup &from2Archive = icube2->group("ARCHIVE"); //Make sure observation id's are the same QString from1ObsId = from1Archive["ObservationId"]; @@ -192,7 +192,7 @@ void IsisMain() { stitchedProductIds = "(" + stitchedProductIds + ", " + (QString)from2Archive["ProductId"][0] + ")"; - PvlGroup &from2Instrument = icube2->getGroup("INSTRUMENT"); + PvlGroup &from2Instrument = icube2->group("INSTRUMENT"); //Make sure CCD Id's are the same QString from1CcdId = from1Instrument["CCDId"]; @@ -228,7 +228,7 @@ void IsisMain() { Cube *ocube = p.SetOutputCube("TO", SampsOut, LinesOut, BandsOut); // Change Channel Number on output cube to 2 - PvlGroup &InstrumentOut = ocube->getGroup("INSTRUMENT"); + PvlGroup &InstrumentOut = ocube->group("INSTRUMENT"); InstrumentOut["ChannelNumber"] = "2"; // Set StitchedChannels and Stitched ProductIds keywords @@ -265,8 +265,8 @@ void IsisMain() { } stats.Reset(); - f0LineAvg = HiVector(icube1->getLineCount()); - f1LineAvg = HiVector(icube1->getLineCount()); + f0LineAvg = HiVector(icube1->lineCount()); + f1LineAvg = HiVector(icube1->lineCount()); pAvg.StartProcess(getStats); pAvg.EndProcess(); @@ -311,8 +311,8 @@ void IsisMain() { results += PvlKeyword("TruthChannel", toString(hiChannel)); results += PvlKeyword("Operator", fixop); int nunfilled(0); - HiVector ch0_fixed(icube1->getLineCount(), 1.0); - HiVector ch1_fixed(icube1->getLineCount(), 1.0); + HiVector ch0_fixed(icube1->lineCount(), 1.0); + HiVector ch1_fixed(icube1->lineCount(), 1.0); if(fixop == "MULTIPLY") { if(hiChannel == 0) { fromData[ch1Index].mult = compRatio(f0LineAvg, f1LineAvg, nunfilled); diff --git a/isis/src/mro/apps/marci2isis/marci2isis.cpp b/isis/src/mro/apps/marci2isis/marci2isis.cpp index c3af54ca9d..b16e393641 100644 --- a/isis/src/mro/apps/marci2isis/marci2isis.cpp +++ b/isis/src/mro/apps/marci2isis/marci2isis.cpp @@ -147,9 +147,9 @@ void IsisMain() { // Translate labels to every image and close output cubes before calling EndProcess for(unsigned int i = 0; i < outputCubes.size(); i++) { - translateMarciLabels(pdsLab, *outputCubes[i]->getLabel()); + translateMarciLabels(pdsLab, *outputCubes[i]->label()); - PvlObject &isisCube = outputCubes[i]->getLabel()->FindObject("IsisCube"); + PvlObject &isisCube = outputCubes[i]->label()->FindObject("IsisCube"); isisCube.FindGroup("Instrument").AddKeyword(PvlKeyword("Framelets", framelets[i])); outputCubes[i]->write(origLabel); @@ -244,7 +244,7 @@ void writeCubeOutput(Isis::Buffer &data) { output.SetBasePosition(1, currentLine[band] + padding[band], band + 1); } else if(flip == 1) { - int outLine = outputCubes[cube]->getLineCount() - filterHeight - + int outLine = outputCubes[cube]->lineCount() - filterHeight - ((currentLine[band] - 1) / filterHeight) * filterHeight + (currentLine[band] - 1) % filterHeight; output.SetBasePosition(1, outLine + 1 - padding[band], band + 1); @@ -382,7 +382,7 @@ void writeFlipBricks() { } } else { - int outLine = outputCubes[cube]->getLineCount() - (filterHeight * (framelet + 1)) - padding[band]; + int outLine = outputCubes[cube]->lineCount() - (filterHeight * (framelet + 1)) - padding[band]; outBrick.SetBasePosition(1, outLine + 1, band + 1); } @@ -403,7 +403,7 @@ void writeOutputPadding() { if(paddingHeight == 0) return; // no padding for(unsigned int cube = 0; cube < outputCubes.size(); cube++) { - Isis::Brick nullBrick(outputCubes[cube]->getSampleCount(), paddingHeight, outputCubes[cube]->getBandCount(), Isis::Real); + Isis::Brick nullBrick(outputCubes[cube]->sampleCount(), paddingHeight, outputCubes[cube]->bandCount(), Isis::Real); for(int i = 0; i < nullBrick.size(); i++) { nullBrick[i] = Isis::Null; @@ -413,7 +413,7 @@ void writeOutputPadding() { nullBrick.SetBasePosition(1, 1, 1); outputCubes[cube]->write(nullBrick); - nullBrick.SetBasePosition(1, outputCubes[cube]->getLineCount() - paddingHeight, 1); + nullBrick.SetBasePosition(1, outputCubes[cube]->lineCount() - paddingHeight, 1); outputCubes[cube]->write(nullBrick); } } diff --git a/isis/src/mro/apps/marcical/marcical.cpp b/isis/src/mro/apps/marcical/marcical.cpp index 60c8c7d990..bf6f057a8b 100644 --- a/isis/src/mro/apps/marcical/marcical.cpp +++ b/isis/src/mro/apps/marcical/marcical.cpp @@ -31,11 +31,11 @@ void IsisMain() { // Make sure it is a Marci cube FileName inFileName = ui.GetFileName("FROM"); try { - if(icube.getGroup("Instrument")["InstrumentID"][0] != "Marci") { + if(icube.group("Instrument")["InstrumentID"][0] != "Marci") { throw IException(); } - if(!icube.getGroup("Archive").HasKeyword("SampleBitModeId")) { + if(!icube.group("Archive").HasKeyword("SampleBitModeId")) { throw IException(); } } @@ -45,8 +45,8 @@ void IsisMain() { throw IException(IException::User, msg, _FILEINFO_); } - if(icube.getGroup("Archive")["SampleBitModeId"][0] != "SQROOT") { - QString msg = "Sample bit mode [" + icube.getGroup("Archive")["SampleBitModeId"][0] + "] is not supported."; + if(icube.group("Archive")["SampleBitModeId"][0] != "SQROOT") { + QString msg = "Sample bit mode [" + icube.group("Archive")["SampleBitModeId"][0] + "] is not supported."; throw IException(IException::User, msg, _FILEINFO_); } @@ -62,7 +62,7 @@ void IsisMain() { decimation.push_back(1.0); } - QString startTime = icube.getLabel()->FindGroup("Instrument", Pvl::Traverse)["StartTime"][0]; + QString startTime = icube.label()->FindGroup("Instrument", Pvl::Traverse)["StartTime"][0]; iTime start(startTime); iTime changeTime("November 6, 2006 21:30:00 UTC"); @@ -120,7 +120,7 @@ void IsisMain() { vector flatcubes; vector fcubeMgrs; - int summing = toInt(icube.getGroup("Instrument")["SummingMode"][0]); + int summing = toInt(icube.group("Instrument")["SummingMode"][0]); // Read in the flat files for(int band = 0; band < 7; band++) { @@ -156,7 +156,7 @@ void IsisMain() { Cube ocube; CubeAttributeOutput outAtt = ui.GetOutputAttribute("TO"); - ocube.setDimensions(icube.getSampleCount(), icube.getLineCount(), icube.getBandCount()); + ocube.setDimensions(icube.sampleCount(), icube.lineCount(), icube.bandCount()); ocube.setByteOrder(outAtt.byteOrder()); ocube.setFormat(outAtt.fileFormat()); ocube.setLabelsAttached(outAtt.labelAttachment() == AttachedLabel); @@ -179,7 +179,7 @@ void IsisMain() { filterNameToFilterIndex.insert(pair("SHORT_UV", 6)); filterNameToFilterIndex.insert(pair("LONG_UV", 7)); - PvlKeyword &filtNames = icube.getLabel()->FindGroup("BandBin", Pvl::Traverse)["FilterName"];; + PvlKeyword &filtNames = icube.label()->FindGroup("BandBin", Pvl::Traverse)["FilterName"];; for(int i = 0; i < filtNames.Size(); i++) { if(filterNameToFilterIndex.find(filtNames[i]) != filterNameToFilterIndex.end()) { filter.push_back(filterNameToFilterIndex.find(filtNames[i])->second); @@ -191,12 +191,12 @@ void IsisMain() { } bool iof = ui.GetBoolean("IOF"); - double exposure = ((double)icube.getLabel()->FindGroup("Instrument", Pvl::Traverse)["ExposureDuration"]) * 1000.0; + double exposure = ((double)icube.label()->FindGroup("Instrument", Pvl::Traverse)["ExposureDuration"]) * 1000.0; Camera *cam = NULL; double solarDist = Isis::Null; if(iof) { - cam = icube.getCamera(); + cam = icube.camera(); cam->SetImage(icubeMgr.size() / 2.0, 0.5 + (16 / 2) / summing); solarDist = cam->SolarDistance(); } @@ -206,7 +206,7 @@ void IsisMain() { Progress prog; prog.SetText("Calibrating Image"); - prog.SetMaximumSteps(ocube.getLineCount() * ocube.getBandCount()); + prog.SetMaximumSteps(ocube.lineCount() * ocube.bandCount()); prog.CheckStatus(); Statistics stats; @@ -265,16 +265,16 @@ void IsisMain() { while(!ocubeMgr.end()); // Propagate labels and objects (in case of spice data) - PvlObject &inCubeObj = icube.getLabel()->FindObject("IsisCube"); - PvlObject &outCubeObj = ocube.getLabel()->FindObject("IsisCube"); + PvlObject &inCubeObj = icube.label()->FindObject("IsisCube"); + PvlObject &outCubeObj = ocube.label()->FindObject("IsisCube"); for(int g = 0; g < inCubeObj.Groups(); g++) { outCubeObj.AddGroup(inCubeObj.Group(g)); } - for(int o = 0; o < icube.getLabel()->Objects(); o++) { - if(icube.getLabel()->Object(o).IsNamed("Table")) { - Blob t(icube.getLabel()->Object(o)["Name"], icube.getLabel()->Object(o).Name()); + for(int o = 0; o < icube.label()->Objects(); o++) { + if(icube.label()->Object(o).IsNamed("Table")) { + Blob t(icube.label()->Object(o)["Name"], icube.label()->Object(o).Name()); icube.read(t); ocube.write(t); } diff --git a/isis/src/mro/apps/marciflip/marciflip.cpp b/isis/src/mro/apps/marciflip/marciflip.cpp index 41e7d5ba8f..eaec2457f5 100644 --- a/isis/src/mro/apps/marciflip/marciflip.cpp +++ b/isis/src/mro/apps/marciflip/marciflip.cpp @@ -20,30 +20,30 @@ void IsisMain() { Cube *icube = p.SetInputCube("FROM"); - filterHeight = 16 / (int)icube->getGroup("Instrument")["SummingMode"]; - p.SetBrickSize(icube->getSampleCount(), filterHeight, icube->getBandCount()); - currentLine = icube->getLineCount(); + filterHeight = 16 / (int)icube->group("Instrument")["SummingMode"]; + p.SetBrickSize(icube->sampleCount(), filterHeight, icube->bandCount()); + currentLine = icube->lineCount(); UserInterface &ui = Application::GetUserInterface(); outputCube = new Isis::Cube(); - outputCube->setDimensions(icube->getSampleCount(), icube->getLineCount(), icube->getBandCount()); + outputCube->setDimensions(icube->sampleCount(), icube->lineCount(), icube->bandCount()); outputCube->create(ui.GetFileName("TO")); if(icube->hasGroup("Instrument")) { - PvlGroup inst = icube->getGroup("Instrument"); + PvlGroup inst = icube->group("Instrument"); // change flipped keyword inst["DataFlipped"] = toString(((int)inst["DataFlipped"] + 1) % 2); - outputCube->getLabel()->FindObject("IsisCube").AddGroup(inst); + outputCube->label()->FindObject("IsisCube").AddGroup(inst); } if(icube->hasGroup("BandBin")) { - outputCube->getLabel()->FindObject("IsisCube").AddGroup( - icube->getGroup("BandBin")); + outputCube->label()->FindObject("IsisCube").AddGroup( + icube->group("BandBin")); } - if(icube->getLabel()->HasObject("OriginalLabel")) { + if(icube->label()->HasObject("OriginalLabel")) { OriginalLabel origLabel; icube->read(origLabel); outputCube->write(origLabel); diff --git a/isis/src/mro/apps/pds2hideal/pds2hideal.cpp b/isis/src/mro/apps/pds2hideal/pds2hideal.cpp index 09f7ebeac2..54e0dadd77 100644 --- a/isis/src/mro/apps/pds2hideal/pds2hideal.cpp +++ b/isis/src/mro/apps/pds2hideal/pds2hideal.cpp @@ -64,7 +64,7 @@ void IsisMain() { outputCube->putGroup(kernelGroup); - Pvl *isisLabel = outputCube->getLabel(); + Pvl *isisLabel = outputCube->label(); PvlTranslationManager labelXlater(pdsLabelPvl, "$mro/translations/hiriseIdealPdsImportLabel.trn"); labelXlater.Auto(*isisLabel); diff --git a/isis/src/mro/objs/HiEqualization/HiEqualization.cpp b/isis/src/mro/objs/HiEqualization/HiEqualization.cpp index e6e6f2cb39..a763d33e01 100644 --- a/isis/src/mro/objs/HiEqualization/HiEqualization.cpp +++ b/isis/src/mro/objs/HiEqualization/HiEqualization.cpp @@ -123,7 +123,7 @@ namespace Isis { try { Cube cube1; cube1.open(imageList[i].toString()); - PvlGroup &from1Instrument = cube1.getGroup("INSTRUMENT"); + PvlGroup &from1Instrument = cube1.group("INSTRUMENT"); int cpmmNumber = from1Instrument["CpmmNumber"]; ccds.push_back(cpmm2ccd[cpmmNumber]); diff --git a/isis/src/mro/objs/HiEqualization/unitTest.cpp b/isis/src/mro/objs/HiEqualization/unitTest.cpp index 806ea3d469..8b48299ecc 100644 --- a/isis/src/mro/objs/HiEqualization/unitTest.cpp +++ b/isis/src/mro/objs/HiEqualization/unitTest.cpp @@ -64,7 +64,7 @@ int main(int argc, char *argv[]) { CubeAttributeInput att; QString inp = imageList[i].toString(); Cube *inputCube = p.SetInputCube(inp, att); - TestFunctor func(&equalizer, inputCube->getLineCount(), i); + TestFunctor func(&equalizer, inputCube->lineCount(), i); p.ProcessCubeInPlace(func, false); p.EndProcess(); } diff --git a/isis/src/mro/objs/HiLab/HiLab.cpp b/isis/src/mro/objs/HiLab/HiLab.cpp index 093e94b9a1..45b009a09e 100644 --- a/isis/src/mro/objs/HiLab/HiLab.cpp +++ b/isis/src/mro/objs/HiLab/HiLab.cpp @@ -28,7 +28,7 @@ namespace Isis { * @param cube The cube containing the HiRise labels to be processed. */ HiLab::HiLab(Cube *cube) { - PvlGroup group = cube->getGroup("Instrument"); + PvlGroup group = cube->group("Instrument"); p_cpmmNumber = group["CpmmNumber"]; p_channel = group["ChannelNumber"]; diff --git a/isis/src/odyssey/apps/thmnoseam/thmnoseam.cpp b/isis/src/odyssey/apps/thmnoseam/thmnoseam.cpp index d89f8fbeb2..b02d899ddd 100644 --- a/isis/src/odyssey/apps/thmnoseam/thmnoseam.cpp +++ b/isis/src/odyssey/apps/thmnoseam/thmnoseam.cpp @@ -87,7 +87,7 @@ void IsisMain() { UserInterface &ui = Application::GetUserInterface(); // Make sure it is a Themis EDR/RDR try { - if(evenCube->getGroup("Instrument")["InstrumentID"][0] != "THEMIS_VIS") { + if(evenCube->group("Instrument")["InstrumentID"][0] != "THEMIS_VIS") { throw IException(IException::User, "", _FILEINFO_); } } @@ -99,7 +99,7 @@ void IsisMain() { } try { - if(oddCube->getGroup("Instrument")["InstrumentID"][0] != "THEMIS_VIS") { + if(oddCube->group("Instrument")["InstrumentID"][0] != "THEMIS_VIS") { throw IException(IException::User, "", _FILEINFO_); } } @@ -110,19 +110,19 @@ void IsisMain() { throw IException(IException::User, msg, _FILEINFO_); } - if (evenCube->getGroup("Instrument")["Framelets"][0] != "Even") { + if (evenCube->group("Instrument")["Framelets"][0] != "Even") { QString msg = "The image [" + ui.GetFileName("INEVEN") + "] does not appear " "to contain the EVEN framelets of a Themis VIS cube"; throw IException(IException::User, msg, _FILEINFO_); } - if (oddCube->getGroup("Instrument")["Framelets"][0] != "Odd") { + if (oddCube->group("Instrument")["Framelets"][0] != "Odd") { QString msg = "The image [" + ui.GetFileName("ODDEVEN") + "] does not appear " "to contain the ODD framelets of a Themis VIS cube"; throw IException(IException::User, msg, _FILEINFO_); } - PvlGroup &inputInstrumentGrp = evenCube->getGroup("Instrument"); + PvlGroup &inputInstrumentGrp = evenCube->group("Instrument"); PvlKeyword &spatialSumming = inputInstrumentGrp["SpatialSumming"]; frameletSize = 192 / toInt(spatialSumming[0]); overlapSize = FrameletOverlapSize(); @@ -132,14 +132,14 @@ void IsisMain() { throw IException(IException::Unknown, msg, _FILEINFO_); } - p.SetBrickSize(evenCube->getSampleCount(), frameletSize, 1); + p.SetBrickSize(evenCube->sampleCount(), frameletSize, 1); p.StartProcess(FixSeams); - PvlGroup &evenInst = outEven->getGroup("Instrument"); + PvlGroup &evenInst = outEven->group("Instrument"); evenInst["Framelets"] = "Even"; - PvlGroup &oddInst = outOdd->getGroup("Instrument"); + PvlGroup &oddInst = outOdd->group("Instrument"); oddInst["Framelets"] = "Odd"; p.EndProcess(); @@ -174,8 +174,8 @@ void RemoveSeam(Buffer &out, int framelet, int band, // "badData" is the bottom of the current framelet, what we were given. Cube *badDataCube = (matchIsEven) ? oddCube : evenCube; - Camera *goodCam = goodDataCube->getCamera(); - Camera *badCam = badDataCube->getCamera(); + Camera *goodCam = goodDataCube->camera(); + Camera *badCam = badDataCube->camera(); // Verify we're at the correct band goodCam->SetBand(band); @@ -255,7 +255,7 @@ void RemoveSeam(Buffer &out, int framelet, int band, double goodLine = offsetLine + badLine; // Get the pixel we're missing (good) - Portal p(1, 1, goodDataCube->getPixelType()); + Portal p(1, 1, goodDataCube->pixelType()); p.SetPosition(goodSample, goodLine, band); goodDataCube->read(p); @@ -318,8 +318,8 @@ void FixSeams(vector &inBuffers, vector &outBuffers) { * This calculates the number of lines of overlap between framelets. */ int FrameletOverlapSize() { - Camera *camEven = evenCube->getCamera(); - Camera *camOdd = oddCube->getCamera(); + Camera *camEven = evenCube->camera(); + Camera *camOdd = oddCube->camera(); if(camEven == NULL || camOdd == NULL) { QString msg = "A camera is required to automatically calculate the overlap " diff --git a/isis/src/odyssey/apps/thmvisflat/thmvisflat.cpp b/isis/src/odyssey/apps/thmvisflat/thmvisflat.cpp index 92af8dfc0f..5451b1d447 100644 --- a/isis/src/odyssey/apps/thmvisflat/thmvisflat.cpp +++ b/isis/src/odyssey/apps/thmvisflat/thmvisflat.cpp @@ -24,7 +24,7 @@ void IsisMain() { // Make sure it is a Themis EDR/RDR FileName inFileName = ui.GetFileName("FROM"); try { - if(icube.getGroup("Instrument")["InstrumentID"][0] != "THEMIS_VIS") { + if(icube.group("Instrument")["InstrumentID"][0] != "THEMIS_VIS") { QString msg = "This program is intended for use on THEMIS VIS images only. ["; msg += inFileName.expanded() + "] does not appear to be a THEMIS VIS image."; throw IException(IException::User, msg, _FILEINFO_); @@ -38,7 +38,7 @@ void IsisMain() { vector flatcubes; vector fcubeMgrs; - int summing = toInt(icube.getGroup("Instrument")["SpatialSumming"][0]); + int summing = toInt(icube.group("Instrument")["SpatialSumming"][0]); for(int filt = 0; filt < 5; filt++) { QString filePattern = "$odyssey/calibration/flat_filter_"; @@ -57,7 +57,7 @@ void IsisMain() { Cube ocube; CubeAttributeOutput outAtt = ui.GetOutputAttribute("TO"); - ocube.setDimensions(icube.getSampleCount(), icube.getLineCount(), icube.getBandCount()); + ocube.setDimensions(icube.sampleCount(), icube.lineCount(), icube.bandCount()); ocube.setByteOrder(outAtt.byteOrder()); ocube.setFormat(outAtt.fileFormat()); ocube.setLabelsAttached(outAtt.labelAttachment() == AttachedLabel); @@ -69,7 +69,7 @@ void IsisMain() { vector filter; PvlKeyword &filtNums = - icube.getLabel()->FindGroup("BandBin", Pvl::Traverse)["FilterNumber"]; + icube.label()->FindGroup("BandBin", Pvl::Traverse)["FilterNumber"]; for(int i = 0; i < filtNums.Size(); i++) { filter.push_back(toInt(filtNums[i])); } @@ -79,7 +79,7 @@ void IsisMain() { Progress prog; prog.SetText("Applying Flat-Field Correction"); - prog.SetMaximumSteps(ocube.getLineCount() * ocube.getBandCount()); + prog.SetMaximumSteps(ocube.lineCount() * ocube.bandCount()); prog.CheckStatus(); do { @@ -119,17 +119,17 @@ void IsisMain() { while(!ocubeMgr.end()); // Propagate labels and objects (in case of spice data) - PvlObject &inCubeObj = icube.getLabel()->FindObject("IsisCube"); - PvlObject &outCubeObj = ocube.getLabel()->FindObject("IsisCube"); + PvlObject &inCubeObj = icube.label()->FindObject("IsisCube"); + PvlObject &outCubeObj = ocube.label()->FindObject("IsisCube"); for(int g = 0; g < inCubeObj.Groups(); g++) { outCubeObj.AddGroup(inCubeObj.Group(g)); } - for(int o = 0; o < icube.getLabel()->Objects(); o++) { - if(icube.getLabel()->Object(o).IsNamed("Table")) { - Blob t(icube.getLabel()->Object(o)["Name"], - icube.getLabel()->Object(o).Name()); + for(int o = 0; o < icube.label()->Objects(); o++) { + if(icube.label()->Object(o).IsNamed("Table")) { + Blob t(icube.label()->Object(o)["Name"], + icube.label()->Object(o).Name()); icube.read(t); ocube.write(t); } diff --git a/isis/src/odyssey/apps/thmvistrim/thmvistrim.cpp b/isis/src/odyssey/apps/thmvistrim/thmvistrim.cpp index afcdebab71..43f1f49891 100644 --- a/isis/src/odyssey/apps/thmvistrim/thmvistrim.cpp +++ b/isis/src/odyssey/apps/thmvistrim/thmvistrim.cpp @@ -29,7 +29,7 @@ void IsisMain() { // Make sure it is a Themis EDR/RDR FileName inFileName = ui.GetFileName("FROM"); try { - if(icube->getGroup("Instrument")["InstrumentID"][0] != "THEMIS_VIS") { + if(icube->group("Instrument")["InstrumentID"][0] != "THEMIS_VIS") { QString msg = "This program is intended for use on THEMIS VIS images only. ["; msg += inFileName.expanded() + "] does not appear to be a THEMIS VIS image."; throw IException(IException::User, msg, _FILEINFO_); @@ -41,7 +41,7 @@ void IsisMain() { throw IException(e, IException::User, msg, _FILEINFO_); } - frameletSize = 192 / toInt(icube->getGroup("Instrument")["SpatialSumming"][0]); + frameletSize = 192 / toInt(icube->group("Instrument")["SpatialSumming"][0]); frameletTopTrimSize = ui.GetInteger("TOPTRIM"); frameletLeftTrimSize = ui.GetInteger("LEFTTRIM"); frameletRightTrimSize = ui.GetInteger("RIGHTTRIM"); @@ -94,7 +94,7 @@ bool NeedsTrimmed(int line) { void CalculateBottomTrim(Cube *icube) { frameletBottomTrimSize = 0; - if(icube->getCamera() == NULL) { + if(icube->camera() == NULL) { string msg = "A camera is required to automatically calculate the bottom " "trim of a cube. Please run spiceinit on the input cube"; throw IException(IException::Unknown, msg, _FILEINFO_); @@ -104,7 +104,7 @@ void CalculateBottomTrim(Cube *icube) { // a known even-framelet camera and a known odd-framelet camera. In order // to get these, we change the cube labels in a local copy and create an // odd framelet and an even framelet camera. - Pvl cubeLabels = *icube->getLabel(); + Pvl cubeLabels = *icube->label(); PvlKeyword &framelets = cubeLabels.FindGroup("Instrument", Pvl::Traverse)["Framelets"]; framelets = "Even"; Camera *camEven = CameraFactory::Create(cubeLabels); diff --git a/isis/src/qisis/apps/qnet/QnetFileTool.cpp b/isis/src/qisis/apps/qnet/QnetFileTool.cpp index 9f4c500e19..b727f8a353 100644 --- a/isis/src/qisis/apps/qnet/QnetFileTool.cpp +++ b/isis/src/qisis/apps/qnet/QnetFileTool.cpp @@ -179,7 +179,7 @@ namespace Isis { // Determine target from first file in cube list Cube *cube = new Cube; cube->open(g_serialNumberList->FileName(0)); - g_controlNetwork->SetTarget(cube->getCamera()->target()->name()); + g_controlNetwork->SetTarget(cube->camera()->target()->name()); delete cube; cube = NULL; } diff --git a/isis/src/qisis/apps/qnet/QnetTool.cpp b/isis/src/qisis/apps/qnet/QnetTool.cpp index 720c1bb830..e33cee7011 100644 --- a/isis/src/qisis/apps/qnet/QnetTool.cpp +++ b/isis/src/qisis/apps/qnet/QnetTool.cpp @@ -1445,7 +1445,7 @@ namespace Isis { MdiCubeViewport *cvp = cubeViewport(); if (cvp == NULL) return; - QString file = cvp->cube()->getFileName(); + QString file = cvp->cube()->fileName(); QString sn = g_serialNumberList->SerialNumber(file); double samp,line; @@ -1475,7 +1475,7 @@ namespace Isis { modifyPoint(point); } else if (s == Qt::MidButton) { - if (p_groundOpen && file == p_groundCube->getFileName()) { + if (p_groundOpen && file == p_groundCube->fileName()) { QString message = "Cannot select point for deleting on ground source. Select "; message += "point using un-projected images or the Navigator Window."; QMessageBox::critical(p_qnetTool, "Error", message); @@ -1503,7 +1503,7 @@ namespace Isis { } double lat = gmap->UniversalLatitude(); double lon = gmap->UniversalLongitude(); - if (p_groundOpen && file == p_groundCube->getFileName()) { + if (p_groundOpen && file == p_groundCube->fileName()) { createFixedPoint (lat,lon); } else { @@ -3435,7 +3435,7 @@ namespace Isis { MdiCubeViewport *vp; for (int i=0; i<(int)cubeViewportList()->size(); i++) { vp = (*(cubeViewportList()))[i]; - if (vp->cube()->getFileName() == ground) { + if (vp->cube()->fileName() == ground) { g_vpMainWindow->workspace()->setActiveSubWindow( (QMdiSubWindow *)vp->parentWidget()->parent()); return; @@ -3479,7 +3479,7 @@ namespace Isis { try { p_groundCube->open(ground); p_groundGmap = new UniversalGroundMap(*p_groundCube); - p_groundFile = FileName(p_groundCube->getFileName()).name(); + p_groundFile = FileName(p_groundCube->fileName()).name(); g_serialNumberList->Add(ground, true); } catch (IException &e) { @@ -3524,7 +3524,7 @@ namespace Isis { if (!p_demOpen) { // TODO p_groundRadiusSource = ControlPoint::RadiusSource::Basemap; p_groundRadiusSource = ControlPoint::RadiusSource::Ellipsoid; - PvlGroup mapping = p_groundCube->getGroup("Mapping"); + PvlGroup mapping = p_groundCube->group("Mapping"); p_demFile = (mapping ["EquatorialRadius"][0]) + ", " + (mapping ["PolarRadius"][0]); // @@ -3533,11 +3533,11 @@ namespace Isis { } catch (IException &) { try { - CameraFactory::Create(*(p_groundCube->getLabel())); + CameraFactory::Create(*(p_groundCube->label())); p_groundSurfacePointSource = ControlPoint::SurfacePointSource::Reference; if (!p_demOpen) { // If level 1, determine the shape model - PvlGroup kernels = p_groundCube->getGroup("Kernels"); + PvlGroup kernels = p_groundCube->group("Kernels"); QString shapeFile = (kernels ["ShapeModel"]); if (shapeFile.contains("dem")) { p_groundRadiusSource = ControlPoint::RadiusSource::DEM; @@ -3630,7 +3630,7 @@ namespace Isis { try { p_demCube->open(demFile); - p_demFile = FileName(p_demCube->getFileName()).name(); + p_demFile = FileName(p_demCube->fileName()).name(); } catch (IException &e) { QString message = e.toString(); QMessageBox::critical(p_qnetTool, "Error", message); @@ -3732,7 +3732,7 @@ namespace Isis { // Buffer used to read from the model Portal *portal = new Portal(interp->Samples(), interp->Lines(), - p_demCube->getPixelType(), + p_demCube->pixelType(), interp->HotSample(), interp->HotLine()); portal->SetPosition(demMap->Sample(), demMap->Line(), 1); p_demCube->read(*portal); diff --git a/isis/src/qisis/apps/qtie/QtieFileTool.cpp b/isis/src/qisis/apps/qtie/QtieFileTool.cpp index 9c5175b586..bccc13e648 100644 --- a/isis/src/qisis/apps/qtie/QtieFileTool.cpp +++ b/isis/src/qisis/apps/qtie/QtieFileTool.cpp @@ -105,7 +105,7 @@ namespace Isis { try { baseCube->open(baseFile); try { - baseCube->getProjection(); + baseCube->projection(); } catch (IException &) { QString message = "Base must be projected"; @@ -190,7 +190,7 @@ namespace Isis { } // Find target - QString target = matchCube->getCamera()->target()->name(); + QString target = matchCube->camera()->target()->name(); // Find directory and save for use in file dialog for control net FileName fname(matchFile); @@ -271,10 +271,10 @@ namespace Isis { } // Make sure targets match - if (cnet->GetTarget() != matchCube->getCamera()->target()->name()) { + if (cnet->GetTarget() != matchCube->camera()->target()->name()) { QString message = tr("Control Net target, [%1], is not the same as the cube target, [%2].") .arg(QString(cnet->GetTarget())) - .arg(QString(matchCube->getCamera()->target()->name())); + .arg(QString(matchCube->camera()->target()->name())); QMessageBox::critical((QWidget *)parent(), "Invalid Control Network", message); return false; } @@ -302,8 +302,8 @@ namespace Isis { if (baseGM->SetGround(p.GetBestSurfacePoint())) { baseSamp = baseGM->Sample(); baseLine = baseGM->Line(); - if (baseSamp < 1 || baseSamp > baseCube->getSampleCount() || - baseLine < 1 || baseLine > baseCube->getLineCount()) { + if (baseSamp < 1 || baseSamp > baseCube->sampleCount() || + baseLine < 1 || baseLine > baseCube->lineCount()) { // throw error? point not on base QString message = "Error parsing input control net. Lat/Lon for Point Id: " + (p.GetId()) + " computes to a sample/line off " + diff --git a/isis/src/qisis/apps/qtie/QtieTool.cpp b/isis/src/qisis/apps/qtie/QtieTool.cpp index d490ace012..fe6b621c04 100644 --- a/isis/src/qisis/apps/qtie/QtieTool.cpp +++ b/isis/src/qisis/apps/qtie/QtieTool.cpp @@ -308,7 +308,7 @@ namespace Isis { p_baseSN = SerialNumber::Compose(*p_baseCube, true); p_matchSN = SerialNumber::Compose(*p_matchCube); - p_serialNumberList->Add(matchCube->getFileName()); + p_serialNumberList->Add(matchCube->fileName()); // Save off universal ground maps try { @@ -444,7 +444,7 @@ namespace Isis { // ??? do we only allow mouse clicks on level1??? // If we allow on both, need to find samp,line on level1 if // they clicked on basemap. - QString file = cvp->cube()->getFileName(); + QString file = cvp->cube()->fileName(); QString sn = p_serialNumberList->SerialNumber(file); double samp, line; @@ -525,8 +525,8 @@ namespace Isis { // Make sure point on base cube baseSamp = p_baseGM->Sample(); baseLine = p_baseGM->Line(); - if (baseSamp < 1 || baseSamp > p_baseCube->getSampleCount() || - baseLine < 1 || baseLine > p_baseCube->getLineCount()) { + if (baseSamp < 1 || baseSamp > p_baseCube->sampleCount() || + baseLine < 1 || baseLine > p_baseCube->lineCount()) { // throw error? point not on base QString message = "Point does not exist on base map."; QMessageBox::warning((QWidget *)parent(), "Warning", message); @@ -719,7 +719,7 @@ namespace Isis { } double samp, line; - if (vp->cube()->getFileName() == p_baseCube->getFileName()) { + if (vp->cube()->fileName() == p_baseCube->fileName()) { // Draw on left viewport (base) samp = p[Base]->GetSample(); line = p[Base]->GetLine(); @@ -761,7 +761,7 @@ namespace Isis { // Create temporary network for solution which will not contain measures for // the basemap. ControlNet net; - net.SetTarget(p_matchCube->getCamera()->target()->name()); + net.SetTarget(p_matchCube->camera()->target()->name()); // Bundle adjust to solve for new pointing try { @@ -850,8 +850,8 @@ namespace Isis { void QtieTool::writeNewCmatrix(Table *cmatrix) { //check for existing polygon, if exists delete it - if (p_matchCube->getLabel()->HasObject("Polygon")) { - p_matchCube->getLabel()->DeleteObject("Polygon"); + if (p_matchCube->label()->HasObject("Polygon")) { + p_matchCube->label()->DeleteObject("Polygon"); } // Update the cube history @@ -878,7 +878,7 @@ namespace Isis { history += PvlKeyword("UserName", Application::UserName()); PvlGroup results("Results"); results += PvlKeyword("CameraAnglesUpdated", "True"); - results += PvlKeyword("BaseMap", p_baseCube->getFileName()); + results += PvlKeyword("BaseMap", p_baseCube->fileName()); history += results; h.AddEntry(history); @@ -962,7 +962,7 @@ namespace Isis { if (pt->GetMeasure(m)->IsIgnored()) pt->Delete(m); } - net.SetTarget(p_matchCube->getCamera()->target()->name()); + net.SetTarget(p_matchCube->camera()->target()->name()); net.SetNetworkId("Qtie"); net.SetUserName(Application::UserName()); net.SetCreatedDate(Application::DateTime()); diff --git a/isis/src/qisis/objs/AbstractPlotTool/AbstractPlotTool.cpp b/isis/src/qisis/objs/AbstractPlotTool/AbstractPlotTool.cpp index b58261c4fe..7566190911 100644 --- a/isis/src/qisis/objs/AbstractPlotTool/AbstractPlotTool.cpp +++ b/isis/src/qisis/objs/AbstractPlotTool/AbstractPlotTool.cpp @@ -271,7 +271,7 @@ namespace Isis { QVector allViewports = *cubeViewportList(); foreach (MdiCubeViewport * viewport, allViewports) { - if (pc->sourceCube().contains(viewport->cube()->getFileName())) { + if (pc->sourceCube().contains(viewport->cube()->fileName())) { viewport->repaint(); } } diff --git a/isis/src/qisis/objs/AdvancedTrackTool/AdvancedTrackTool.cpp b/isis/src/qisis/objs/AdvancedTrackTool/AdvancedTrackTool.cpp index c4d8b5cb46..2bc6b79d74 100644 --- a/isis/src/qisis/objs/AdvancedTrackTool/AdvancedTrackTool.cpp +++ b/isis/src/qisis/objs/AdvancedTrackTool/AdvancedTrackTool.cpp @@ -283,7 +283,7 @@ namespace Isis { } // Write out the path, filename, and serial number - FileName fname = FileName(cvp->cube()->getFileName()).expanded(); + FileName fname = FileName(cvp->cube()->fileName()).expanded(); QString fnamePath = fname.path(); QString fnameName = fname.name(); p_tableWin->table()->item(row, PATH)->setText(fnamePath); @@ -488,7 +488,7 @@ namespace Isis { int iTrackBand = -1; if(cCube->hasTable(TABLE_MOSAIC_SRC)) { - Pvl *cPvl = cCube->getLabel(); + Pvl *cPvl = cCube->label(); PvlObject cObjIsisCube = cPvl->FindObject("IsisCube"); PvlGroup cGrpBandBin = cObjIsisCube.FindGroup("BandBin"); for(int i = 0; i < cGrpBandBin.Keywords(); i++) { @@ -501,14 +501,14 @@ namespace Isis { } } - if(iTrackBand > 0 && iTrackBand <= cCube->getBandCount()) { - Portal cOrgPortal(cCube->getSampleCount(), 1, - cCube->getPixelType()); + if(iTrackBand > 0 && iTrackBand <= cCube->bandCount()) { + Portal cOrgPortal(cCube->sampleCount(), 1, + cCube->pixelType()); cOrgPortal.SetPosition(piSample, piLine, iTrackBand + 1); // 1 based cCube->read(cOrgPortal); piOrigin = (int)cOrgPortal[0]; - switch(SizeOf(cCube->getPixelType())) { + switch(SizeOf(cCube->pixelType())) { case 1: piOrigin -= VALID_MIN1; break; diff --git a/isis/src/qisis/objs/BandTool/BandTool.cpp b/isis/src/qisis/objs/BandTool/BandTool.cpp index 27ee5d7d38..cb50577dea 100644 --- a/isis/src/qisis/objs/BandTool/BandTool.cpp +++ b/isis/src/qisis/objs/BandTool/BandTool.cpp @@ -464,7 +464,7 @@ namespace Isis { MdiCubeViewport *cvp = cubeViewport(); if(cvp != NULL) { if(p_bandBinViewport != cvp) { - setBandBin(*cvp->cube()->getLabel()); + setBandBin(*cvp->cube()->label()); } if(cvp->isGray()) { diff --git a/isis/src/qisis/objs/ChipViewport/ChipViewport.cpp b/isis/src/qisis/objs/ChipViewport/ChipViewport.cpp index 07bbe9aadd..6010d7be97 100644 --- a/isis/src/qisis/objs/ChipViewport/ChipViewport.cpp +++ b/isis/src/qisis/objs/ChipViewport/ChipViewport.cpp @@ -128,7 +128,7 @@ namespace Isis { // only stretch if the CubeViewport is opened to the same cube as we are, // otherwise the signal was meant for a different ChipViewport! - if (cvp->cube()->getFileName() == p_chipCube->getFileName()) { + if (cvp->cube()->fileName() == p_chipCube->fileName()) { // if user right clicked in the CubeViewport then we get a SIGNAL with a // NULL Stretch. This is used to signify that we need to restretch on our diff --git a/isis/src/qisis/objs/CubeDisplayProperties/CubeDisplayProperties.cpp b/isis/src/qisis/objs/CubeDisplayProperties/CubeDisplayProperties.cpp index 3e2436519d..1acbd6b55d 100644 --- a/isis/src/qisis/objs/CubeDisplayProperties/CubeDisplayProperties.cpp +++ b/isis/src/qisis/objs/CubeDisplayProperties/CubeDisplayProperties.cpp @@ -739,10 +739,10 @@ namespace Isis { // We need to walk the polygon... ImagePolygon imgPoly; - int sampleStepSize = cube()->getSampleCount() / 10; + int sampleStepSize = cube()->sampleCount() / 10; if (sampleStepSize <= 0) sampleStepSize = 1; - int lineStepSize = cube()->getLineCount() / 10; + int lineStepSize = cube()->lineCount() / 10; if (lineStepSize <= 0) lineStepSize = 1; imgPoly.Create(*cube(), sampleStepSize, lineStepSize); diff --git a/isis/src/qisis/objs/CubePlotCurve/CubePlotCurve.cpp b/isis/src/qisis/objs/CubePlotCurve/CubePlotCurve.cpp index 14fb88e71d..6c912aeebb 100644 --- a/isis/src/qisis/objs/CubePlotCurve/CubePlotCurve.cpp +++ b/isis/src/qisis/objs/CubePlotCurve/CubePlotCurve.cpp @@ -160,8 +160,8 @@ namespace Isis { * @param painter The painter to use for painting onto the viewport */ void CubePlotCurve::paint(CubeViewport *vp, QPainter *painter) { - if (m_sourceCube.contains(vp->cube()->getFileName())) { - int i = m_sourceCube.indexOf(vp->cube()->getFileName()); + if (m_sourceCube.contains(vp->cube()->fileName())) { + int i = m_sourceCube.indexOf(vp->cube()->fileName()); QPen customPen; customPen.setColor(pen().color()); customPen.setWidth(pen().width()); @@ -272,7 +272,7 @@ namespace Isis { int band) { if (cvp) { - m_sourceCube << cvp->cube()->getFileName(); + m_sourceCube << cvp->cube()->fileName(); if (m_renameAutomatically) { setTitle(title().text() + " - " + diff --git a/isis/src/qisis/objs/CubeViewport/CubeViewport.cpp b/isis/src/qisis/objs/CubeViewport/CubeViewport.cpp index 5e4d4f89ea..274b132001 100644 --- a/isis/src/qisis/objs/CubeViewport/CubeViewport.cpp +++ b/isis/src/qisis/objs/CubeViewport/CubeViewport.cpp @@ -131,11 +131,11 @@ namespace Isis { setCaption(); - p_redBrick = new Brick(4, 1, 1, cube->getPixelType()); - p_grnBrick = new Brick(4, 1, 1, cube->getPixelType()); - p_bluBrick = new Brick(4, 1, 1, cube->getPixelType()); - p_gryBrick = new Brick(4, 1, 1, cube->getPixelType()); - p_pntBrick = new Brick(4, 1, 1, cube->getPixelType()); + p_redBrick = new Brick(4, 1, 1, cube->pixelType()); + p_grnBrick = new Brick(4, 1, 1, cube->pixelType()); + p_bluBrick = new Brick(4, 1, 1, cube->pixelType()); + p_gryBrick = new Brick(4, 1, 1, cube->pixelType()); + p_pntBrick = new Brick(4, 1, 1, cube->pixelType()); p_paintPixmap = false; p_image = NULL; @@ -161,7 +161,7 @@ namespace Isis { p_camera = p_groundMap->Camera(); if(p_camera->HasProjection()) { try { - p_projection = cube->getProjection(); + p_projection = cube->projection(); } catch(IException &) { } @@ -174,20 +174,20 @@ namespace Isis { // Setup context sensitive help - QString cubeFileName = p_cube->getFileName(); + QString cubeFileName = p_cube->fileName(); p_whatsThisText = QString("Function: Viewport to ") + cubeFileName; p_cubeWhatsThisText = "

Cube Dimensions: \

Samples = " + - QString::number(cube->getSampleCount()) + "
" + + QString::number(cube->sampleCount()) + "
" + "Lines = " + - QString::number(cube->getLineCount()) + "
" + + QString::number(cube->lineCount()) + "
" + "Bands = " + - QString::number(cube->getBandCount()) + "

"; + QString::number(cube->bandCount()) + "

"; /*setting up the qlist of CubeBandsStretch objs. - for( int b = 0; b < p_cube->getBandCount(); b++) { + for( int b = 0; b < p_cube->bandCount(); b++) { CubeBandsStretch *stretch = new CubeBandsStretch(); p_bandsStretchList.push_back(stretch); }*/ @@ -208,7 +208,7 @@ namespace Isis { p_knownStretches = new QVector< Stretch * >(); p_globalStretches = new QVector< Stretch * >(); - while(p_cube->getBandCount() > p_knownStretches->size()) { + while(p_cube->bandCount() > p_knownStretches->size()) { p_knownStretches->push_back(NULL); p_globalStretches->push_back(NULL); } @@ -421,19 +421,19 @@ namespace Isis { //! Return the number of samples in the cube int CubeViewport::cubeSamples() const { - return p_cube->getSampleCount(); + return p_cube->sampleCount(); } //! Return the number of lines in the cube int CubeViewport::cubeLines() const { - return p_cube->getLineCount(); + return p_cube->lineCount(); } //! Return the number of bands in the cube int CubeViewport::cubeBands() const { - return p_cube->getBandCount(); + return p_cube->bandCount(); } @@ -457,11 +457,11 @@ namespace Isis { if(sl < 0.5){ sl = 0.5; } - if(es > cube()->getSampleCount() + 0.5){ - es = cube()->getSampleCount() + 0.5; + if(es > cube()->sampleCount() + 0.5){ + es = cube()->sampleCount() + 0.5; } - if(el > cube()->getLineCount() + 0.5){ - el = cube()->getLineCount() + 0.5; + if(el > cube()->lineCount() + 0.5){ + el = cube()->lineCount() + 0.5; } int sx, sy, ex, ey; @@ -518,7 +518,7 @@ namespace Isis { // Enter == button 0, Escape == button 2 switch(QMessageBox::information(this, tr("Confirm Save"), tr("The cube [%1] contains unsaved changes. " - "Do you want to save the changes before exiting?").arg(cube()->getFileName()), + "Do you want to save the changes before exiting?").arg(cube()->fileName()), QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel)) { //Save changes and close viewport case QMessageBox::Save: @@ -978,7 +978,7 @@ namespace Isis { * */ void CubeViewport::setCaption() { - QString cubeFileName = p_cube->getFileName(); + QString cubeFileName = p_cube->fileName(); QString str = QFileInfo(cubeFileName).fileName(); str += QString(" @ "); str += QString::number(p_scale * 100.0); @@ -1360,12 +1360,12 @@ namespace Isis { { // Get Cube Info PvlObject whatsThisObj = PvlObject("WhatsThis"); - whatsThisObj += PvlKeyword("Cube", p_cube->getFileName()); + whatsThisObj += PvlKeyword("Cube", p_cube->fileName()); PvlGroup cubeGrp("CubeDimensions"); - cubeGrp += PvlKeyword("Samples", toString(p_cube->getSampleCount())); - cubeGrp += PvlKeyword("Lines", toString(p_cube->getLineCount())); - cubeGrp += PvlKeyword("Bands", toString(p_cube->getBandCount())); + cubeGrp += PvlKeyword("Samples", toString(p_cube->sampleCount())); + cubeGrp += PvlKeyword("Lines", toString(p_cube->lineCount())); + cubeGrp += PvlKeyword("Bands", toString(p_cube->bandCount())); whatsThisObj += cubeGrp; // Get Viewport Info @@ -1396,9 +1396,9 @@ namespace Isis { virtualKey += toString(iBlueBand); bandGrp += virtualKey; - physicalKey = toString(p_cube->getPhysicalBand(iRedBand)); - physicalKey += toString(p_cube->getPhysicalBand(iGreenBand)); - physicalKey += toString(p_cube->getPhysicalBand(iBlueBand)); + physicalKey = toString(p_cube->physicalBand(iRedBand)); + physicalKey += toString(p_cube->physicalBand(iGreenBand)); + physicalKey += toString(p_cube->physicalBand(iBlueBand)); bandGrp += physicalKey; if(iFilterSize) { @@ -1431,7 +1431,7 @@ namespace Isis { bandGrp += PvlKeyword("Color", "Gray"); bandGrp += PvlKeyword("Virtual", toString(iGrayBand)); - bandGrp += PvlKeyword("Physical", toString(p_cube->getPhysicalBand(iGrayBand))); + bandGrp += PvlKeyword("Physical", toString(p_cube->physicalBand(iGrayBand))); if(iFilterSize && iGrayBand <= iFilterSize) { bandGrp += PvlKeyword("FilterName", filterName[iGrayBand-1]); @@ -1461,7 +1461,7 @@ namespace Isis { void CubeViewport::getBandFilterName(PvlKeyword & pFilterNameKey) { // get the band info - Pvl* cubeLbl = p_cube->getLabel(); + Pvl* cubeLbl = p_cube->label(); PvlObject isisObj = cubeLbl->FindObject("IsisCube"); if (isisObj.HasGroup("BandBin")) { PvlGroup bandBinGrp = isisObj.FindGroup("BandBin"); @@ -1526,9 +1526,9 @@ namespace Isis { sBandInfo += QString::number(iBlueBand) + " "; sBandInfo += "Physical = " + - QString::number(p_cube->getPhysicalBand(iRedBand)) + ", "; - sBandInfo += QString::number(p_cube->getPhysicalBand(iGreenBand)) + ", "; - sBandInfo += QString::number(p_cube->getPhysicalBand(iBlueBand)); + QString::number(p_cube->physicalBand(iRedBand)) + ", "; + sBandInfo += QString::number(p_cube->physicalBand(iGreenBand)) + ", "; + sBandInfo += QString::number(p_cube->physicalBand(iBlueBand)); if(iFilterSize) { sBandInfo += "
FilterName = "; @@ -1561,7 +1561,7 @@ namespace Isis { sBandInfo = "Band(Gray) Virtual = " + QString::number(iGrayBand) + " "; - sBandInfo += "Physical = " + QString::number(p_cube->getPhysicalBand(iGrayBand)); + sBandInfo += "Physical = " + QString::number(p_cube->physicalBand(iGrayBand)); if(iFilterSize && iGrayBand <= iFilterSize) { sBandInfo += "
FilterName = " + QString(filterNameKey[iGrayBand-1]); @@ -2293,11 +2293,11 @@ namespace Isis { if(sl < 1){ sl = 0.5; } - if(es > cube()->getSampleCount()){ - es = cube()->getSampleCount() + 0.5; + if(es > cube()->sampleCount()){ + es = cube()->sampleCount() + 0.5; } - if(el > cube()->getLineCount()){ - el = cube()->getLineCount() + 0.5; + if(el > cube()->lineCount()){ + el = cube()->lineCount() + 0.5; } //start x/y and end x/y diff --git a/isis/src/qisis/objs/EditTool/EditTool.cpp b/isis/src/qisis/objs/EditTool/EditTool.cpp index 74dee3c227..e48b794211 100644 --- a/isis/src/qisis/objs/EditTool/EditTool.cpp +++ b/isis/src/qisis/objs/EditTool/EditTool.cpp @@ -438,7 +438,7 @@ m_container = container; issamp = (int)(ssamp + 0.5); isline = (int)(sline + 0.5); Brick *pntBrick = new Brick(1, 1, 1, - vp->cube()->getPixelType()); + vp->cube()->pixelType()); pntBrick->SetBasePosition(issamp, isline, vp->grayBand()); vp->cube()->read(*pntBrick); p_dn = (*pntBrick)[0]; @@ -462,11 +462,11 @@ m_container = container; ieline = isline; if (p_shapeComboBox->currentIndex() == HorizLine) { issamp = 1; - iesamp = vp->cube()->getSampleCount(); + iesamp = vp->cube()->sampleCount(); } if (p_shapeComboBox->currentIndex() == VertLine) { isline = 1; - ieline = vp->cube()->getLineCount(); + ieline = vp->cube()->lineCount(); } // Write the changes to the cube. writeToCube(iesamp, issamp, ieline, isline, NULL); @@ -492,7 +492,7 @@ m_container = container; int nsamps = iesamp - issamp + 1; int nlines = ieline - isline + 1; - brick = new Brick(nsamps, nlines, 1, vp->cube()->getPixelType()); + brick = new Brick(nsamps, nlines, 1, vp->cube()->pixelType()); brick->SetBasePosition(issamp, isline, vp->grayBand()); vp->cube()->read(*brick); @@ -520,7 +520,7 @@ m_container = container; } // no deep copy constructor so re-read brick for editing.... - brick = new Brick(nsamps, nlines, 1, vp->cube()->getPixelType()); + brick = new Brick(nsamps, nlines, 1, vp->cube()->pixelType()); brick->SetBasePosition(issamp, isline, vp->grayBand()); vp->cube()->read(*brick); @@ -590,7 +590,7 @@ m_container = container; Brick *brick = s->top(); //Write the current cube to the a brick and add it to the redo stack - redoBrick = new Brick(brick->SampleDimension(), brick->LineDimension(), 1, vp->cube()->getPixelType()); + redoBrick = new Brick(brick->SampleDimension(), brick->LineDimension(), 1, vp->cube()->pixelType()); redoBrick->SetBasePosition(brick->Sample(), brick->Line(), vp->grayBand()); vp->cube()->read(*(redoBrick)); @@ -726,7 +726,7 @@ m_container = container; //Write the current cube to the a brick and add it to the undo stack undoBrick = new Brick(brick->SampleDimension(), brick->LineDimension(), 1, - vp->cube()->getPixelType()); + vp->cube()->pixelType()); undoBrick->SetBasePosition(brick->Sample(), brick->Line(), vp->grayBand()); vp->cube()->read(*(undoBrick)); diff --git a/isis/src/qisis/objs/FeatureNomenclatureTool/FeatureNomenclatureTool.cpp b/isis/src/qisis/objs/FeatureNomenclatureTool/FeatureNomenclatureTool.cpp index 27f9521c59..33ba9a3ce7 100644 --- a/isis/src/qisis/objs/FeatureNomenclatureTool/FeatureNomenclatureTool.cpp +++ b/isis/src/qisis/objs/FeatureNomenclatureTool/FeatureNomenclatureTool.cpp @@ -582,7 +582,7 @@ namespace Isis { features = viewportFeatureDisplay(vp)->features(); QProgressDialog updatingFeaturesProgress( - tr("Projecting Features for [%1]").arg(vp->cube()->getFileName().section('/',-1)), + tr("Projecting Features for [%1]").arg(vp->cube()->fileName().section('/',-1)), QString(), 0, 100); updatingFeaturesProgress.setWindowModality(Qt::WindowModal); @@ -609,7 +609,7 @@ namespace Isis { (m_showApprovedOnly && feature.status() == FeatureNomenclature::Approved) ) { QString displayName = feature.cleanName() + - " (" + FileName(vp->cube()->getFileName()).name() + ")"; + " (" + FileName(vp->cube()->fileName()).name() + ")"; QString targetName = feature.target().toUpper(); diff --git a/isis/src/qisis/objs/FileTool/FileTool.cpp b/isis/src/qisis/objs/FileTool/FileTool.cpp index 0a96321626..813810aa7c 100644 --- a/isis/src/qisis/objs/FileTool/FileTool.cpp +++ b/isis/src/qisis/objs/FileTool/FileTool.cpp @@ -309,7 +309,7 @@ namespace Isis { QVector< MdiCubeViewport *> *vwportList = p_workSpace->cubeViewportList(); QVector::iterator it; for (it = vwportList->begin(); it != vwportList->end(); ++it){ - if(QString((*it)->cube()->getFileName()) == psOutFile) { + if(QString((*it)->cube()->fileName()) == psOutFile) { QMessageBox::information((QWidget *)parent(), "Error", "Output File is already open\n\""+ psOutFile + "\""); return; @@ -318,7 +318,7 @@ namespace Isis { //If the filename is the same as the current cube's filename, just save it if(p_saveAsDialog->getSaveAsType() == SaveAsDialog::FullImage && - psOutFile == cubeViewport()->cube()->getFileName()) { + psOutFile == cubeViewport()->cube()->fileName()) { save(); return; } @@ -326,7 +326,7 @@ namespace Isis { //Save the current cube's changes by reopening it, and open an input cube //from the current cube's location Cube *icube = new Cube(); - icube->open(cubeViewport()->cube()->getFileName(), "rw"); + icube->open(cubeViewport()->cube()->fileName(), "rw"); Cube *ocube = NULL; if(p_saveAsDialog->getSaveAsType() != SaveAsDialog::ExportAsIs) { @@ -335,8 +335,8 @@ namespace Isis { } if(p_saveAsDialog->getSaveAsType() == SaveAsDialog::FullImage) { - copyCubeDetails(psOutFile, icube, ocube, icube->getSampleCount(), - icube->getLineCount(), icube->getBandCount()); + copyCubeDetails(psOutFile, icube, ocube, icube->sampleCount(), + icube->lineCount(), icube->bandCount()); saveAsFullImage(icube, ocube); ocube->close(); } @@ -348,7 +348,7 @@ namespace Isis { if(p_saveAsDialog->getSaveAsType() == SaveAsDialog::ExportFullRes || p_lastViewport->scale() == 1) { int numSamples = (int)ceil(dEndSample-dStartSample); int numLines = (int)ceil(dEndLine-dStartLine); - copyCubeDetails(psOutFile, icube, ocube, numSamples, numLines, icube->getBandCount()); + copyCubeDetails(psOutFile, icube, ocube, numSamples, numLines, icube->bandCount()); saveAs_FullResolution(icube, ocube, numSamples, numLines); ocube->close(); } @@ -390,7 +390,7 @@ namespace Isis { ProcessRubberSheet p; p.SetInputCube (icube); Cube *ocube = p.SetOutputCube(psOutFile, CubeAttributeOutput(" "), - ons , onl, icube->getBandCount()); + ons , onl, icube->bandCount()); Interpolator *interp = new Interpolator(Interpolator::NearestNeighborType); @@ -435,12 +435,12 @@ namespace Isis { ons = (int)ceil(ins * dScale); onl = (int)ceil(inl * dScale); - CubeAttributeInput cai(icube->getFileName()); + CubeAttributeInput cai(icube->fileName()); std::vector bands = cai.bands(); int inb = bands.size(); if(inb == 0) { - inb = cubeViewport()->cube()->getBandCount(); + inb = cubeViewport()->cube()->bandCount(); for(int i = 1; i <= inb; i++) { bands.push_back(toString(i)); } @@ -462,7 +462,7 @@ namespace Isis { } Cube *tempcube=new Cube; - tempcube->open(cubeViewport()->cube()->getFileName(), "r"); + tempcube->open(cubeViewport()->cube()->fileName(), "r"); Nearest *near = new Nearest(tempcube, ins/ons, inl/onl); near->setInputBoundary((int)dStartSample, (int)dEndSample, (int)dStartLine, (int)dEndLine); @@ -522,24 +522,24 @@ namespace Isis { ocube->setLabelsAttached(outAtt.labelAttachment() == AttachedLabel); if(outAtt.propagatePixelType()) { - ocube->setPixelType(icube->getPixelType()); + ocube->setPixelType(icube->pixelType()); } else { ocube->setPixelType(outAtt.pixelType()); } if(outAtt.propagateMinimumMaximum()) { - if(ocube->getPixelType() == Real) { + if(ocube->pixelType() == Real) { ocube->setBaseMultiplier(0.0, 1.0); } - else if(ocube->getPixelType() >= icube->getPixelType()) { - double base = icube->getBase(); - double mult = icube->getMultiplier(); + else if(ocube->pixelType() >= icube->pixelType()) { + double base = icube->base(); + double mult = icube->multiplier(); ocube->setBaseMultiplier(base, mult); } - else if((ocube->getPixelType() != Real) && - (ocube->getPixelType() != UnsignedByte) && - (ocube->getPixelType() != SignedWord)) { + else if((ocube->pixelType() != Real) && + (ocube->pixelType() != UnsignedByte) && + (ocube->pixelType() != SignedWord)) { QString msg = "Looks like your refactoring to add different pixel types"; msg += " you'll need to make changes here"; throw IException(IException::Programmer, msg, _FILEINFO_); @@ -555,8 +555,8 @@ namespace Isis { ocube->setMinMax(outAtt.minimum(), outAtt.maximum()); } - int needLabBytes = icube->getLabelSize(true) + (1024 * 6); - if(needLabBytes > ocube->getLabelSize()) { + int needLabBytes = icube->labelSize(true) + (1024 * 6); + if(needLabBytes > ocube->labelSize()) { ocube->setLabelSize(needLabBytes); } @@ -564,14 +564,14 @@ namespace Isis { ocube->create(psOutFile); // Transfer labels from the first input cube - PvlObject &incube = icube->getLabel()->FindObject("IsisCube"); - PvlObject &outcube = ocube->getLabel()->FindObject("IsisCube"); + PvlObject &incube = icube->label()->FindObject("IsisCube"); + PvlObject &outcube = ocube->label()->FindObject("IsisCube"); for(int i = 0; i < incube.Groups(); i++) { outcube.AddGroup(incube.Group(i)); } // Transfer tables from the first input cube - Pvl &inlab = *icube->getLabel(); + Pvl &inlab = *icube->label(); for(int i = 0; i < inlab.Objects(); i++) { if(inlab.Object(i).IsNamed("Table")) { Blob t((QString)inlab.Object(i)["Name"], inlab.Object(i).Name()); @@ -581,7 +581,7 @@ namespace Isis { } // Transfer blobs from the first input cube - inlab = *icube->getLabel(); + inlab = *icube->label(); for(int i = 0; i < inlab.Objects(); i++) { if(inlab.Object(i).IsNamed("Polygon")) { Blob t((QString)inlab.Object(i)["Name"], inlab.Object(i).Name()); @@ -591,7 +591,7 @@ namespace Isis { } // Transfer tables from the first input cube - inlab = *icube->getLabel(); + inlab = *icube->label(); for(int i = 0; i < inlab.Objects(); i++) { if(inlab.Object(i).IsNamed("OriginalLabel")) { OriginalLabel ol; @@ -618,8 +618,8 @@ namespace Isis { */ void FileTool::saveAsFullImage(Cube *icube, Cube *ocube) { //Start the copy process line by line - Brick ibrick(*icube, icube->getSampleCount(), 1, 1); - Brick obrick(*ocube, ocube->getSampleCount(), 1, 1); + Brick ibrick(*icube, icube->sampleCount(), 1, 1); + Brick obrick(*ocube, ocube->sampleCount(), 1, 1); int numBricks; if(ibrick.Bricks() > obrick.Bricks()) numBricks = ibrick.Bricks(); @@ -654,10 +654,10 @@ namespace Isis { // start and end Samples and Lines double dStartSample=0, dEndSample=0, dStartLine=0, dEndLine=0; p_lastViewport->getCubeArea(dStartSample, dEndSample, dStartLine, dEndLine); - int iNumBands = pInCube->getBandCount(); + int iNumBands = pInCube->bandCount(); - Portal iPortal (pNumSamples, 1, pInCube->getPixelType()); - Portal oPortal (pNumSamples, 1, pOutCube->getPixelType()); + Portal iPortal (pNumSamples, 1, pInCube->pixelType()); + Portal oPortal (pNumSamples, 1, pOutCube->pixelType()); for(int iBand=1; iBand<=iNumBands; iBand++) { int ol=1; diff --git a/isis/src/qisis/objs/MatchTool/MatchTool.cpp b/isis/src/qisis/objs/MatchTool/MatchTool.cpp index 6c0aac4f3f..781ca0c0cb 100644 --- a/isis/src/qisis/objs/MatchTool/MatchTool.cpp +++ b/isis/src/qisis/objs/MatchTool/MatchTool.cpp @@ -642,7 +642,7 @@ namespace Isis { // Attempt to Compose Serial number and see if list already has duplicate. If so, // use filenames as serial numbers for both cubes. This needs to be checked because // coreg networks will often have 2 cubes with the same serial number.make cl - QString sn = SerialNumber::Compose(mvp->cube()->getFileName(), true); + QString sn = SerialNumber::Compose(mvp->cube()->fileName(), true); if (list.HasSerialNumber(sn)) { // TODO Before removing serial number, make sure current network does not have // measures with old serial number. If it does, now what? Print error? @@ -652,11 +652,11 @@ namespace Isis { list.Delete(sn); list.Add(fileName.name(),fileName.expanded()); // Add new serial number as filename - list.Add(Isis::FileName(mvp->cube()->getFileName()).name(), - mvp->cube()->getFileName()); + list.Add(Isis::FileName(mvp->cube()->fileName()).name(), + mvp->cube()->fileName()); } else { - list.Add(mvp->cube()->getFileName(), true); + list.Add(mvp->cube()->fileName(), true); } } catch (...) { @@ -672,8 +672,8 @@ namespace Isis { QString serialNumber; try { SerialNumberList list = serialNumberList(); - serialNumber = list.SerialNumber(mvp->cube()->getFileName()); -// serialNumber = serialNumberList().SerialNumber(mvp->cube()->getFileName()); + serialNumber = list.SerialNumber(mvp->cube()->fileName()); +// serialNumber = serialNumberList().SerialNumber(mvp->cube()->fileName()); } catch (IException &e) { serialNumber = "Unknown"; @@ -1409,7 +1409,7 @@ namespace Isis { MdiCubeViewport *mvp = cubeViewport(); if (mvp == NULL) return; - QString file = mvp->cube()->getFileName(); + QString file = mvp->cube()->fileName(); QString sn = serialNumberList().SerialNumber(file); double samp,line; @@ -1466,7 +1466,7 @@ namespace Isis { else { try { createPoint(mvp, samp, line); - m_leftFile = mvp->cube()->getFileName(); + m_leftFile = mvp->cube()->fileName(); } catch (IException &e) { QString message = "Cannot create control point.\n\n"; @@ -1509,14 +1509,14 @@ namespace Isis { QStringList images; for (int i = 0; i < (int)cubeViewportList()->size(); i++) { - FileName cubeFile = (*(cubeViewportList()))[i]->cube()->getFileName(); + FileName cubeFile = (*(cubeViewportList()))[i]->cube()->fileName(); images<setFiles(images); m_newPointDialog->show(); // Highlight the current cubeViewport - QString current = FileName(cvp->cube()->getFileName()).name(); + QString current = FileName(cvp->cube()->fileName()).name(); m_newPointDialog->highlightFile(current); m_newPoint = new ControlPoint(); @@ -1539,7 +1539,7 @@ namespace Isis { void MatchTool::addMeasure(MdiCubeViewport *cvp, double sample, double line) { // Highlight the current cubeViewport - QString current = FileName(cvp->cube()->getFileName()).name(); + QString current = FileName(cvp->cube()->fileName()).name(); m_newPointDialog->highlightFile(current); m_newPointDialog->raise(); diff --git a/isis/src/qisis/objs/MeasureTool/MeasureTool.cpp b/isis/src/qisis/objs/MeasureTool/MeasureTool.cpp index b85edeab6b..ae42d38aaf 100644 --- a/isis/src/qisis/objs/MeasureTool/MeasureTool.cpp +++ b/isis/src/qisis/objs/MeasureTool/MeasureTool.cpp @@ -555,7 +555,7 @@ namespace Isis { // Write out col 8 (the file name) Isis::FileName fname = Isis::FileName( - cvp->cube()->getFileName()).expanded(); + cvp->cube()->fileName()).expanded(); m_path = fname.path(); m_fname = fname.name(); diff --git a/isis/src/qisis/objs/MosaicSceneWidget/MosaicSceneItem.cpp b/isis/src/qisis/objs/MosaicSceneWidget/MosaicSceneItem.cpp index a927b2e7b7..009c5e792e 100644 --- a/isis/src/qisis/objs/MosaicSceneWidget/MosaicSceneItem.cpp +++ b/isis/src/qisis/objs/MosaicSceneWidget/MosaicSceneItem.cpp @@ -250,7 +250,7 @@ namespace Isis { double pixelValue = 0; if(m_cubeDisplay) { - Brick gryBrick(1, 1, 1, m_cubeDisplay->cube()->getPixelType()); + Brick gryBrick(1, 1, 1, m_cubeDisplay->cube()->pixelType()); gryBrick.SetBasePosition((int)(sample + 0.5), (int)(line + 0.5), 1); m_cubeDisplay->cube()->read(gryBrick); diff --git a/isis/src/qisis/objs/MosaicSceneWidget/MosaicSceneWidget.cpp b/isis/src/qisis/objs/MosaicSceneWidget/MosaicSceneWidget.cpp index f72819201c..9973c87116 100644 --- a/isis/src/qisis/objs/MosaicSceneWidget/MosaicSceneWidget.cpp +++ b/isis/src/qisis/objs/MosaicSceneWidget/MosaicSceneWidget.cpp @@ -203,7 +203,7 @@ namespace Isis { CubeDisplayProperties * cubeDisplay) { Projection *proj = NULL; Cube *cube = cubeDisplay->cube(); - Pvl *label = cube->getLabel(); + Pvl *label = cube->label(); try { proj = ProjectionFactory::CreateFromCube(*label); @@ -223,7 +223,7 @@ namespace Isis { mappingGrp += PvlKeyword("MaximumLongitude", "360"); try { - Camera * cam = cube->getCamera(); + Camera * cam = cube->camera(); Distance radii[3]; cam->radii(radii); diff --git a/isis/src/qisis/objs/ScatterPlotTool/ScatterPlotConfigDialog.cpp b/isis/src/qisis/objs/ScatterPlotTool/ScatterPlotConfigDialog.cpp index 7716fa9a98..c24ab920b9 100644 --- a/isis/src/qisis/objs/ScatterPlotTool/ScatterPlotConfigDialog.cpp +++ b/isis/src/qisis/objs/ScatterPlotTool/ScatterPlotConfigDialog.cpp @@ -364,7 +364,7 @@ namespace Isis { QList missingXCubes = removeFromList(allXCubes, listedXCubes); foreach (Cube *cubeToAdd, missingXCubes) { if (m_xAxisCubeCombo->findData(qVariantFromValue(cubeToAdd)) == -1) { - QString cubeName = QFileInfo(cubeToAdd->getFileName()).baseName(); + QString cubeName = QFileInfo(cubeToAdd->fileName()).baseName(); m_xAxisCubeCombo->addItem(cubeName, qVariantFromValue(cubeToAdd)); } } @@ -377,7 +377,7 @@ namespace Isis { m_useViewportRangesCheckBox->setEnabled(true); m_yAxisCubeCombo->setEnabled(true); - m_xAxisCubeBandSpinBox->setMaximum(xAxisCube()->getBandCount()); + m_xAxisCubeBandSpinBox->setMaximum(xAxisCube()->bandCount()); QList listedYCubes; for (int i = 0; i < m_yAxisCubeCombo->count(); i++) { @@ -388,8 +388,8 @@ namespace Isis { foreach (MdiCubeViewport *viewport, *m_workspace->cubeViewportList()) { Cube *cube = viewport->cube(); - if (cube->getSampleCount() == xAxisCube()->getSampleCount() && - cube->getLineCount() == xAxisCube()->getLineCount()) { + if (cube->sampleCount() == xAxisCube()->sampleCount() && + cube->lineCount() == xAxisCube()->lineCount()) { allYCubes.append(cube); } } @@ -405,7 +405,7 @@ namespace Isis { QList missingYCubes = removeFromList(allYCubes, listedYCubes); foreach (Cube *cubeToAdd, missingYCubes) { if (m_yAxisCubeCombo->findData(qVariantFromValue(cubeToAdd)) == -1) { - QString cubeName = QFileInfo(cubeToAdd->getFileName()).baseName(); + QString cubeName = QFileInfo(cubeToAdd->fileName()).baseName(); m_yAxisCubeCombo->addItem(cubeName, qVariantFromValue(cubeToAdd)); } } @@ -426,7 +426,7 @@ namespace Isis { m_yAxisBinCountSpinBox->setEnabled(yAxisCube() != NULL); if (yAxisCube()) { - m_yAxisCubeBandSpinBox->setMaximum(yAxisCube()->getBandCount()); + m_yAxisCubeBandSpinBox->setMaximum(yAxisCube()->bandCount()); } } else { @@ -496,8 +496,8 @@ namespace Isis { MdiCubeViewport * container = xAxisCubeViewport(); if (!container && xAxisCube()) { ASSERT(0); - sampleRange.setInterval(1.0, xAxisCube()->getSampleCount()); - lineRange.setInterval(1.0, xAxisCube()->getLineCount()); + sampleRange.setInterval(1.0, xAxisCube()->sampleCount()); + lineRange.setInterval(1.0, xAxisCube()->lineCount()); } else if (container && xAxisCube()) { double startSample = Null; @@ -514,8 +514,8 @@ namespace Isis { } } else { - sampleRange.setInterval(1.0, xAxisCube()->getSampleCount()); - lineRange.setInterval(1.0, xAxisCube()->getLineCount()); + sampleRange.setInterval(1.0, xAxisCube()->sampleCount()); + lineRange.setInterval(1.0, xAxisCube()->lineCount()); } if (rangeType == SampleRange) diff --git a/isis/src/qisis/objs/ScatterPlotTool/ScatterPlotData.cpp b/isis/src/qisis/objs/ScatterPlotTool/ScatterPlotData.cpp index e5032204ff..d2c10a3760 100644 --- a/isis/src/qisis/objs/ScatterPlotTool/ScatterPlotData.cpp +++ b/isis/src/qisis/objs/ScatterPlotTool/ScatterPlotData.cpp @@ -35,7 +35,7 @@ namespace Isis { m_alarmedBins(new QMap) { int startLine = qRound(lineRange.minValue()); int endLine = qRound(lineRange.maxValue()); - ASSERT(xCube->getLineCount() == yCube->getLineCount()); + ASSERT(xCube->lineCount() == yCube->lineCount()); Histogram *xCubeHist = new Histogram(*xCube, xCubeBand, NULL, sampleRange.minValue(), lineRange.minValue(), @@ -62,10 +62,10 @@ namespace Isis { m_maxCount = 0; Brick brick1((int)(sampleRange.maxValue() - sampleRange.minValue() + 1), - 1, 1, xCube->getPixelType()); + 1, 1, xCube->pixelType()); Brick brick2((int)(sampleRange.maxValue() - sampleRange.minValue() + 1), - 1, 1, yCube->getPixelType()); - ASSERT(xCube->getSampleCount() == yCube->getSampleCount()); + 1, 1, yCube->pixelType()); + ASSERT(xCube->sampleCount() == yCube->sampleCount()); ASSERT(brick1.size() == brick2.size()); for (int line = startLine; line <= endLine; line++) { diff --git a/isis/src/qisis/objs/ScatterPlotTool/ScatterPlotWindow.cpp b/isis/src/qisis/objs/ScatterPlotTool/ScatterPlotWindow.cpp index 7f33229077..9086ef6d40 100644 --- a/isis/src/qisis/objs/ScatterPlotTool/ScatterPlotWindow.cpp +++ b/isis/src/qisis/objs/ScatterPlotTool/ScatterPlotWindow.cpp @@ -97,11 +97,11 @@ namespace Isis { plot()->enableAxis(QwtPlot::yRight); plot()->setAxisTitle(QwtPlot::xBottom, - QFileInfo(xAxisCube->getFileName()).baseName() + " Band " + + QFileInfo(xAxisCube->fileName()).baseName() + " Band " + QString::number(xAxisBand) + " " + plot()->axisTitle(QwtPlot::xBottom).text()); plot()->setAxisTitle(QwtPlot::yLeft, - QFileInfo(yAxisCube->getFileName()).baseName() + " Band " + + QFileInfo(yAxisCube->fileName()).baseName() + " Band " + QString::number(yAxisBand) + " " + plot()->axisTitle(QwtPlot::yLeft).text()); @@ -334,9 +334,9 @@ namespace Isis { // viewport. For example, if we're painting X, we're missing the // corresponding Y DN values. if (isXCube(vp)) - portal.reset(new Portal(1, 1, m_yAxisCube->getPixelType())); + portal.reset(new Portal(1, 1, m_yAxisCube->pixelType())); else - portal.reset(new Portal(1, 1, m_xAxisCube->getPixelType())); + portal.reset(new Portal(1, 1, m_xAxisCube->pixelType())); // Iterate through the in-memory DN values for the passed in viewport for (int yIndex = 0; yIndex < numLines; yIndex++) { @@ -412,10 +412,10 @@ namespace Isis { if (alarmingPlot() && (isXCube(vp) || isYCube(vp))) { QScopedPointer xCubePortal( new Portal(m_alarmPlotSamples, m_alarmPlotLines, - m_xAxisCube->getPixelType())); + m_xAxisCube->pixelType())); QScopedPointer yCubePortal( new Portal(m_alarmPlotSamples, m_alarmPlotLines, - m_yAxisCube->getPixelType())); + m_yAxisCube->pixelType())); double cubeSample = Null; double cubeLine = Null; diff --git a/isis/src/qisis/objs/SpatialPlotTool/SpatialPlotTool.cpp b/isis/src/qisis/objs/SpatialPlotTool/SpatialPlotTool.cpp index 4d418d0adf..773a0ddb08 100644 --- a/isis/src/qisis/objs/SpatialPlotTool/SpatialPlotTool.cpp +++ b/isis/src/qisis/objs/SpatialPlotTool/SpatialPlotTool.cpp @@ -322,7 +322,7 @@ namespace Isis { m_interpolationCombo->currentIndex()).toInt()); Portal dataReader(interp.Samples(), interp.Lines(), - cvp->cube()->getPixelType()); + cvp->cube()->pixelType()); int band = ((cvp->isGray()) ? cvp->grayBand() : cvp->redBand()); diff --git a/isis/src/qisis/objs/SpectralPlotTool/SpectralPlotTool.cpp b/isis/src/qisis/objs/SpectralPlotTool/SpectralPlotTool.cpp index 8d1c3b2b8d..1676a40b6d 100644 --- a/isis/src/qisis/objs/SpectralPlotTool/SpectralPlotTool.cpp +++ b/isis/src/qisis/objs/SpectralPlotTool/SpectralPlotTool.cpp @@ -251,10 +251,10 @@ namespace Isis { bool supportsWavelength = true; foreach (MdiCubeViewport *cvp, viewportsToPlot()) { - int bandCount = cvp->cube()->getBandCount(); + int bandCount = cvp->cube()->bandCount(); // if single band then disable spectral plot - Pvl &pvl = *cvp->cube()->getLabel(); + Pvl &pvl = *cvp->cube()->label(); supportsWavelength = supportsWavelength && pvl.FindObject("IsisCube").HasGroup("BandBin"); @@ -573,7 +573,7 @@ namespace Isis { if (samps < 1) samps = 1; Cube *cube = viewport->cube(); Brick *brick = new Brick(*cube, samps, 1, 1); - Pvl &pvl = *viewport->cube()->getLabel(); + Pvl &pvl = *viewport->cube()->label(); if (RubberBandTool::getMode() == RubberBandTool::Polygon) { samps = 1; @@ -616,7 +616,7 @@ namespace Isis { } - for (int band = 1; band <= cube->getBandCount(); band++) { + for (int band = 1; band <= cube->bandCount(); band++) { Statistics stats; /*Rectangle*/ diff --git a/isis/src/qisis/objs/SpectralPlotTool/SpectralPlotWindow.cpp b/isis/src/qisis/objs/SpectralPlotTool/SpectralPlotWindow.cpp index 9f1bc14428..a8c60bdd23 100644 --- a/isis/src/qisis/objs/SpectralPlotTool/SpectralPlotWindow.cpp +++ b/isis/src/qisis/objs/SpectralPlotTool/SpectralPlotWindow.cpp @@ -98,7 +98,7 @@ namespace Isis { int redBand = 0, greenBand = 0, blueBand = 0, grayBand = 0; Cube *cube = m_cvp->cube(); - Pvl &pvl = *cube->getLabel(); + Pvl &pvl = *cube->label(); PvlKeyword wavelengths; if (pvl.FindObject("IsisCube").HasGroup("BandBin")) { diff --git a/isis/src/qisis/objs/StatisticsTool/StatisticsTool.cpp b/isis/src/qisis/objs/StatisticsTool/StatisticsTool.cpp index c5d421c0aa..2d24abfe9b 100644 --- a/isis/src/qisis/objs/StatisticsTool/StatisticsTool.cpp +++ b/isis/src/qisis/objs/StatisticsTool/StatisticsTool.cpp @@ -306,7 +306,7 @@ namespace Isis { int iline = (int)(line + 0.5); Statistics stats; - Brick *brick = new Brick(1, 1, 1, cvp->cube()->getPixelType()); + Brick *brick = new Brick(1, 1, 1, cvp->cube()->pixelType()); QVector > pixelData(p_boxLines, QVector(p_boxSamps, Null)); diff --git a/isis/src/qisis/objs/StereoTool/StereoTool.cpp b/isis/src/qisis/objs/StereoTool/StereoTool.cpp index 560d24eed6..9dc4c3310a 100644 --- a/isis/src/qisis/objs/StereoTool/StereoTool.cpp +++ b/isis/src/qisis/objs/StereoTool/StereoTool.cpp @@ -633,8 +633,8 @@ namespace Isis { else if (m_radiusBox->currentText() == "DEM Radius") { // If cubes set, make sure they have an elevation model if (m_leftCube) { - m_leftCube->getCamera()->IgnoreElevationModel(false); - if (m_leftCube->getCamera()->target()->shape()->name() == "Ellipsoid") { + m_leftCube->camera()->IgnoreElevationModel(false); + if (m_leftCube->camera()->target()->shape()->name() == "Ellipsoid") { QString message = "No valid Dem on cube. Run spicinit using a " "dem shape model. The local radius will default back to the ellipsoid."; QMessageBox::warning(m_stereoTool, "Warning", message); @@ -704,7 +704,7 @@ namespace Isis { // as the current control net. if (m_controlNet) { if (m_controlNet->GetTarget() != - m_linkedViewports.at(0)->cube()->getCamera()->target()->name()) { + m_linkedViewports.at(0)->cube()->camera()->target()->name()) { // Allow opportunity to save current data before clearing for new // target. QString message = "You have changed targets. All data must be re-set"; @@ -721,14 +721,14 @@ namespace Isis { clearNetData(); m_controlNet = new ControlNet(); m_controlNet->SetTarget( - m_linkedViewports.at(0)->cube()->getCamera()->target()->name()); + m_linkedViewports.at(0)->cube()->camera()->target()->name()); m_serialNumberList = new SerialNumberList(false); } } else { m_controlNet = new ControlNet(); m_controlNet->SetTarget( - m_linkedViewports.at(0)->cube()->getCamera()->target()->name()); + m_linkedViewports.at(0)->cube()->camera()->target()->name()); m_serialNumberList = new SerialNumberList(false); } @@ -780,8 +780,8 @@ namespace Isis { m_leftCube = leftCube; m_rightCube = rightCube; - QString leftName = FileName(m_leftCube->getFileName()).name(); - QString rightName = FileName(m_rightCube->getFileName()).name(); + QString leftName = FileName(m_leftCube->fileName()).name(); + QString rightName = FileName(m_rightCube->fileName()).name(); // Update cube name labels m_leftCubeLabel->setText(leftName); m_rightCubeLabel->setText(rightName); @@ -791,10 +791,10 @@ namespace Isis { // TODO Do I need list? if (!m_serialNumberList->HasSerialNumber(m_leftSN)) { - m_serialNumberList->Add(m_leftCube->getFileName()); + m_serialNumberList->Add(m_leftCube->fileName()); } if (!m_serialNumberList->HasSerialNumber(m_rightSN)) { - m_serialNumberList->Add(m_rightCube->getFileName()); + m_serialNumberList->Add(m_rightCube->fileName()); } vector targetRadius = m_controlNet->GetTargetRadii(); @@ -815,7 +815,7 @@ namespace Isis { } catch (IException &e) { QString message = "Cannot initialize universal ground map for " + - m_leftCube->getFileName() + ".\n"; + m_leftCube->fileName() + ".\n"; message += e.toString(); QMessageBox::critical(m_stereoTool, "Error", message); return; @@ -825,7 +825,7 @@ namespace Isis { } catch (IException &e) { QString message = "Cannot initialize universal ground map for" + - m_rightCube->getFileName() + ".\n"; + m_rightCube->fileName() + ".\n"; message += e.toString(); QMessageBox::critical(m_stereoTool, "Error", message); return; @@ -903,7 +903,7 @@ namespace Isis { if (cvp == NULL) return; - QString file = cvp->cube()->getFileName(); + QString file = cvp->cube()->fileName(); QString sn; try { sn = m_serialNumberList->SerialNumber(file); @@ -1163,33 +1163,33 @@ namespace Isis { // Make sure point on Right cube rightSamp = m_rightGM->Sample(); rightLine = m_rightGM->Line(); - if (rightSamp < 1 || rightSamp > m_rightCube->getSampleCount() || - rightLine < 1 || rightLine > m_rightCube->getLineCount()) { + if (rightSamp < 1 || rightSamp > m_rightCube->sampleCount() || + rightLine < 1 || rightLine > m_rightCube->lineCount()) { IString message = "Point does not exist on cube, " + - m_rightCube->getFileName() + "."; + m_rightCube->fileName() + "."; throw IException(IException::User, message, _FILEINFO_); // QString message = "Point does not exist on cube, " + -// QString(m_rightCube->getFileName().c_str()) + "."; +// QString(m_rightCube->fileName().c_str()) + "."; // QMessageBox::critical(m_stereoTool, "Error", message); // return; } } else { IString message = "Point does not exist on cube, " + - m_rightCube->getFileName() + "."; + m_rightCube->fileName() + "."; throw IException(IException::User, message, _FILEINFO_); // QString message = "Point does not exist on cube, " + -// QString(m_rightCube->getFileName().c_str()) + "."; +// QString(m_rightCube->fileName().c_str()) + "."; // QMessageBox::critical(m_stereoTool, "Error", message); // return; } } else { IString message = "Point does not exist on cube, " + - m_leftCube->getFileName() + "."; + m_leftCube->fileName() + "."; throw IException(IException::User, message, _FILEINFO_); // QString message = "Point does not exist on cube, " + -// QString(m_leftCube->getFileName().c_str()) + "."; +// QString(m_leftCube->fileName().c_str()) + "."; // QMessageBox::critical(m_stereoTool, "Error", message); // return; } @@ -1463,7 +1463,7 @@ namespace Isis { void StereoTool::calculateElevation(ControlPoint *point) { double elevation=0., elevationError=0.; - Camera *leftCamera = m_leftCube->getCamera(); + Camera *leftCamera = m_leftCube->camera(); // If the local radius combo box is set to DEM, get the dem radius // First, SetImage using the Elevation model, before turning off @@ -1484,7 +1484,7 @@ namespace Isis { leftCamera->IgnoreElevationModel(true); leftCamera->SetImage((*point)[Left]->GetSample(), (*point)[Left]->GetLine()); - Camera *rightCamera = m_rightCube->getCamera(); + Camera *rightCamera = m_rightCube->camera(); rightCamera->IgnoreElevationModel(true); rightCamera->SetImage((*point)[Right]->GetSample(), (*point)[Right]->GetLine()); @@ -1614,8 +1614,8 @@ namespace Isis { header += "Image 1, Sample, Line, Image 2, Sample, Line"; text << header << endl; - QString leftFile = FileName(m_leftCube->getFileName()).name(); - QString rightFile = FileName(m_rightCube->getFileName()).name(); + QString leftFile = FileName(m_leftCube->fileName()).name(); + QString rightFile = FileName(m_rightCube->fileName()).name(); QString data; for (int i = 0; i < m_controlNet->GetNumPoints(); i++) { ControlPoint &p = *((*m_controlNet)[i]); @@ -1757,11 +1757,11 @@ namespace Isis { // First, SetImage using the Elevation model, before turning off // to get camera angles. if (m_radiusBox->currentText() == "DEM Radius") { - shortCube->getCamera()->IgnoreElevationModel(false); - shortCube->getCamera()->SetImage(shortSamp, shortLine); - m_baseRadius = shortCube->getCamera()->LocalRadius( - shortCube->getCamera()->GetLatitude(), - shortCube->getCamera()->GetLongitude()); + shortCube->camera()->IgnoreElevationModel(false); + shortCube->camera()->SetImage(shortSamp, shortLine); + m_baseRadius = shortCube->camera()->LocalRadius( + shortCube->camera()->GetLatitude(), + shortCube->camera()->GetLongitude()); if (!m_baseRadius.isValid()) { QString message = "Invalid Dem radius, defaulting to ellipsoidal."; QMessageBox::warning(m_stereoTool, "Invalid Dem radius", message); @@ -1769,13 +1769,13 @@ namespace Isis { } } - shortCube->getCamera()->IgnoreElevationModel(true); - longCube->getCamera()->IgnoreElevationModel(true); + shortCube->camera()->IgnoreElevationModel(true); + longCube->camera()->IgnoreElevationModel(true); - shortCube->getCamera()->SetImage(shortSamp, shortLine); - longCube->getCamera()->SetImage(longSamp,longLine); + shortCube->camera()->SetImage(shortSamp, shortLine); + longCube->camera()->SetImage(longSamp,longLine); double radius, lat, lon, sepang; - if (Stereo::elevation(*shortCube->getCamera(), *longCube->getCamera(), + if (Stereo::elevation(*shortCube->camera(), *longCube->camera(), radius, lat, lon, sepang, elevationError)) elevation = radius - m_baseRadius.meters(); profileData.append(QPointF(i, elevation)); @@ -1861,7 +1861,7 @@ namespace Isis { baseRadiiLabel = "Local Radii: " + QString::number( m_baseRadius.meters(), 'f', 6); - Camera *leftCamera = m_leftCube->getCamera(); + Camera *leftCamera = m_leftCube->camera(); leftCamera->SetImage((*m_editPoint)[Left]->GetSample(), (*m_editPoint)[Left]->GetLine()); double leftDemRadii = @@ -1869,7 +1869,7 @@ namespace Isis { leftDemRadiiLabel = "Left DEM Radii: " + QString::number(leftDemRadii, 'f', 6); - Camera *rightCamera = m_rightCube->getCamera(); + Camera *rightCamera = m_rightCube->camera(); rightCamera->SetImage((*m_editPoint)[Right]->GetSample(), (*m_editPoint)[Right]->GetLine()); double rightDemRadii = diff --git a/isis/src/qisis/objs/StretchTool/StretchTool.cpp b/isis/src/qisis/objs/StretchTool/StretchTool.cpp index 3059a61c39..1f006ce7fd 100644 --- a/isis/src/qisis/objs/StretchTool/StretchTool.cpp +++ b/isis/src/qisis/objs/StretchTool/StretchTool.cpp @@ -1073,12 +1073,12 @@ namespace Isis { */ Statistics StretchTool::statsFromCube(Cube *cube, int band) { Statistics stats; - Brick brick(cube->getSampleCount(), 1, 1, cube->getPixelType()); + Brick brick(cube->sampleCount(), 1, 1, cube->pixelType()); - for(int line = 0; line < cube->getLineCount(); line++) { + for(int line = 0; line < cube->lineCount(); line++) { brick.SetBasePosition(0, line, band); cube->read(brick); - stats.AddData(brick.DoubleBuffer(), cube->getSampleCount()); + stats.AddData(brick.DoubleBuffer(), cube->sampleCount()); } return stats; @@ -1132,12 +1132,12 @@ namespace Isis { Histogram StretchTool::histFromCube(Cube *cube, int band, double min, double max) { Histogram hist(min, max); - Brick brick(cube->getSampleCount(), 1, 1, cube->getPixelType()); + Brick brick(cube->sampleCount(), 1, 1, cube->pixelType()); - for(int line = 0; line < cube->getLineCount(); line++) { + for(int line = 0; line < cube->lineCount(); line++) { brick.SetBasePosition(0, line, band); cube->read(brick); - hist.AddData(brick.DoubleBuffer(), cube->getSampleCount()); + hist.AddData(brick.DoubleBuffer(), cube->sampleCount()); } return hist; diff --git a/isis/src/qisis/objs/SunShadowTool/SunShadowTool.cpp b/isis/src/qisis/objs/SunShadowTool/SunShadowTool.cpp index 6f2c976c45..ec8a08689c 100644 --- a/isis/src/qisis/objs/SunShadowTool/SunShadowTool.cpp +++ b/isis/src/qisis/objs/SunShadowTool/SunShadowTool.cpp @@ -271,7 +271,7 @@ namespace Isis { cubeViewport()->viewportToCube(p.x(), p.y(), m_startSamp, m_startLine); - Camera *cam = cubeViewport()->cube()->getCamera(); + Camera *cam = cubeViewport()->cube()->camera(); if (cam->SetImage(m_startSamp, m_startLine)) { m_tracking = true; @@ -448,8 +448,8 @@ namespace Isis { try { if (m_startSamp != Null && m_startLine != Null && m_endSamp != Null && m_endLine != Null) { - m_path = FileName(cubeViewport()->cube()->getFileName()).path(); - m_fileName = FileName(cubeViewport()->cube()->getFileName()).name(); + m_path = FileName(cubeViewport()->cube()->fileName()).path(); + m_fileName = FileName(cubeViewport()->cube()->fileName()).name(); // // \ | / @@ -483,7 +483,7 @@ namespace Isis { // P2: m_endSurfacePoint bool success = true; - Camera *cam = cubeViewport()->cube()->getCamera(); + Camera *cam = cubeViewport()->cube()->camera(); success = cam->SetImage(m_startSamp, m_startLine); // Vector is in meters @@ -593,7 +593,7 @@ namespace Isis { bool hasCamera = true; try { hasCamera = activeViewport && - (activeViewport->cube()->getCamera() != NULL); + (activeViewport->cube()->camera() != NULL); } catch (IException &) { hasCamera = false; diff --git a/isis/src/qisis/objs/Workspace/Workspace.cpp b/isis/src/qisis/objs/Workspace/Workspace.cpp index bf66a62cf0..6183cc025d 100644 --- a/isis/src/qisis/objs/Workspace/Workspace.cpp +++ b/isis/src/qisis/objs/Workspace/Workspace.cpp @@ -173,7 +173,7 @@ namespace Isis { throw IException(e, IException::Programmer, tr("Error when attempting to show cube [%1]") - .arg(cube->getFileName()), + .arg(cube->fileName()), _FILEINFO_); } diff --git a/isis/src/viking/apps/vikcal/vikcal.cpp b/isis/src/viking/apps/vikcal/vikcal.cpp index a04cccf5c0..c0f2d36f1f 100644 --- a/isis/src/viking/apps/vikcal/vikcal.cpp +++ b/isis/src/viking/apps/vikcal/vikcal.cpp @@ -39,7 +39,7 @@ void IsisMain() { // If the file has already been calibrated, throw an error if(icube.hasGroup("Radiometry")) { - QString msg = "The Viking image [" + icube.getFileName() + "] has already " + QString msg = "The Viking image [" + icube.fileName() + "] has already " "been radiometrically calibrated"; throw IException(IException::User, msg, _FILEINFO_); } diff --git a/isis/src/voyager/apps/voy2isis/voy2isis.cpp b/isis/src/voyager/apps/voy2isis/voy2isis.cpp index 415a06b7a9..04edd3dc49 100644 --- a/isis/src/voyager/apps/voy2isis/voy2isis.cpp +++ b/isis/src/voyager/apps/voy2isis/voy2isis.cpp @@ -137,7 +137,7 @@ void TranslateVoyagerLabels(Pvl &inputLabel, Cube *ocube) { PvlTranslationManager labelXlater(inputLabel, transFile.expanded()); // Pvl output label - Pvl *outputLabel = ocube->getLabel(); + Pvl *outputLabel = ocube->label(); labelXlater.Auto(*(outputLabel)); // Add needed keywords that are not in the translation table diff --git a/isis/src/voyager/apps/voycal/voycal.cpp b/isis/src/voyager/apps/voycal/voycal.cpp index 562300dd97..db47c91db9 100644 --- a/isis/src/voyager/apps/voycal/voycal.cpp +++ b/isis/src/voyager/apps/voycal/voycal.cpp @@ -63,7 +63,7 @@ void IsisMain() { } // access important label objects, will be used later. - PvlObject isiscube = incube->getLabel()->FindObject("IsisCube"); + PvlObject isiscube = incube->label()->FindObject("IsisCube"); PvlGroup instrument = isiscube.FindGroup("Instrument"); PvlGroup archive = isiscube.FindGroup("Archive"); PvlGroup bandbin = isiscube.FindGroup("BandBin"); @@ -167,7 +167,7 @@ void IsisMain() { newExpo = ((double)instrument["ExposureDuration"] * 1000) + (double)calib["DeltaExposureTime"]; // Camera for sun position/distance, so we have to have spice data - Camera * cam = incube->getCamera(); + Camera * cam = incube->camera(); double sunPos[3]; cam->sunPosition(sunPos); // Magnitude of sun vector ||s|| diff --git a/isis/src/voyager/apps/voyramp/voyramp.cpp b/isis/src/voyager/apps/voyramp/voyramp.cpp index bcbd8ed3ca..a483d226a1 100644 --- a/isis/src/voyager/apps/voyramp/voyramp.cpp +++ b/isis/src/voyager/apps/voyramp/voyramp.cpp @@ -59,7 +59,7 @@ void IsisMain() { Cube * outCube = p.SetOutputCube("TO"); // FYI, labels are copied on SetOutputCube call, so In and Out labels match - PvlObject & isiscube = outCube->getLabel()->FindObject("IsisCube"); + PvlObject & isiscube = outCube->label()->FindObject("IsisCube"); PvlGroup & inst = isiscube.FindGroup("Instrument"); // Verify Voyager1 spacecraft -- GitLab