From cb6c01bc288e6d9bae2d8952b786d842fb0f8c45 Mon Sep 17 00:00:00 2001 From: Amy Stamile <74275278+amystamile-usgs@users.noreply.github.com> Date: Sun, 11 Sep 2022 16:18:25 -0700 Subject: [PATCH] removed CWDEBUG and IsisDebug.h (#5048) * removed IsisDebug * small fix --- isis/src/apollo/apps/apollopaninit/main.cpp | 1 - .../CentroidApolloPan/CentroidApolloPan.cpp | 2 - isis/src/base/apps/shadow/ShadowFunctor.cpp | 2 - .../src/base/objs/Application/Application.cpp | 1 - .../base/objs/BufferManager/BufferManager.cpp | 1 - .../CameraStatistics/CameraStatistics.cpp | 1 - isis/src/base/objs/Cube/Cube.cpp | 11 -- isis/src/base/objs/Cube/CubeIoHandler.cpp | 9 -- isis/src/base/objs/Cube/RawCubeChunk.cpp | 4 - .../objs/CubeDataThread/CubeDataThread.cpp | 6 - isis/src/base/objs/IException/IException.cpp | 26 ---- .../base/objs/ImagePolygon/ImagePolygon.cpp | 5 +- isis/src/base/objs/Isis/Isis.h | 79 ---------- isis/src/base/objs/Isis/Isis.truth | 1 - isis/src/base/objs/Isis/IsisDebug.h | 137 ------------------ isis/src/base/objs/Isis/unitTest.cpp | 46 ------ isis/src/base/objs/Isis/unitTest.xml | 41 ------ isis/src/base/objs/PvlKeyword/PvlKeyword.cpp | 3 - isis/src/base/objs/Selection/Selection.cpp | 2 - .../XmlStackedHandler/XmlStackedHandler.cpp | 2 - isis/src/control/apps/cnetsplit/main.cpp | 1 - isis/src/control/apps/cnetstats/cnetstats.cpp | 2 - .../control/objs/ControlNet/ControlNet.cpp | 4 - .../objs/ControlNetDiff/ControlNetDiff.cpp | 2 - .../objs/ControlNetFilter/unitTest.cpp | 1 - .../objs/ControlNetStatistics/unitTest.cpp | 1 - .../objs/ControlPoint/ControlPoint.cpp | 6 - isis/src/odyssey/apps/thmnoseam/main.cpp | 2 - .../apps/cneteditor/CnetEditorWindow.cpp | 12 -- isis/src/qisis/apps/cneteditor/main.cpp | 2 - isis/src/qisis/apps/ipce/main.cpp | 2 - isis/src/qisis/apps/qmos/main.cpp | 2 - isis/src/qisis/apps/qnet/main.cpp | 1 - isis/src/qisis/apps/qview/main.cpp | 2 - .../AbstractPlotTool/AbstractPlotTool.cpp | 4 - .../qisis/objs/ChipViewport/ChipViewport.cpp | 4 - .../ChipViewportsWidget.cpp | 2 - .../objs/CnetEditorView/CnetEditorView.cpp | 2 - .../APrioriLatitudeFilter.cpp | 2 - .../APrioriLatitudeSigmaFilter.cpp | 2 - .../APrioriLongitudeFilter.cpp | 2 - .../APrioriLongitudeSigmaFilter.cpp | 2 - .../CnetEditorWidget/APrioriRadiusFilter.cpp | 2 - .../APrioriRadiusSigmaFilter.cpp | 2 - .../objs/CnetEditorWidget/AbstractFilter.cpp | 13 +- .../AbstractFilterSelector.cpp | 2 - .../CnetEditorWidget/AbstractImageItem.cpp | 2 - .../CnetEditorWidget/AbstractLeafItem.cpp | 2 - .../CnetEditorWidget/AbstractMeasureItem.cpp | 6 +- .../AbstractMultipleChoiceFilter.cpp | 4 - .../CnetEditorWidget/AbstractNullDataItem.cpp | 2 - .../CnetEditorWidget/AbstractNumberFilter.cpp | 2 - .../CnetEditorWidget/AbstractParentItem.cpp | 11 -- .../CnetEditorWidget/AbstractPointItem.cpp | 6 +- .../CnetEditorWidget/AbstractStringFilter.cpp | 2 - .../CnetEditorWidget/AbstractTableModel.cpp | 7 - .../CnetEditorWidget/AbstractTreeItem.cpp | 2 - .../CnetEditorWidget/AbstractTreeModel.cpp | 8 - .../AdjustedLatitudeFilter.cpp | 2 - .../AdjustedLatitudeSigmaFilter.cpp | 2 - .../AdjustedLongitudeFilter.cpp | 2 - .../AdjustedLongitudeSigmaFilter.cpp | 2 - .../CnetEditorWidget/AdjustedRadiusFilter.cpp | 2 - .../AdjustedRadiusSigmaFilter.cpp | 2 - .../CnetEditorWidget/ChooserNameFilter.cpp | 2 - .../CnetDisplayProperties.cpp | 5 - .../CnetEditorWidget/CnetEditorWidget.cpp | 15 -- .../CnetEditorWidget/ConnectionParentItem.cpp | 5 - .../objs/CnetEditorWidget/FilterGroup.cpp | 8 - .../objs/CnetEditorWidget/FilterWidget.cpp | 9 -- .../CnetEditorWidget/GoodnessOfFitFilter.cpp | 2 - .../objs/CnetEditorWidget/ImageIdFilter.cpp | 2 - .../ImageImageFilterSelector.cpp | 2 - .../CnetEditorWidget/ImageImageTreeModel.cpp | 2 - .../objs/CnetEditorWidget/ImageLeafItem.cpp | 2 - .../objs/CnetEditorWidget/ImageParentItem.cpp | 2 - .../ImagePointFilterSelector.cpp | 2 - .../CnetEditorWidget/ImagePointTreeModel.cpp | 4 - .../objs/CnetEditorWidget/LineFilter.cpp | 2 - .../CnetEditorWidget/LineResidualFilter.cpp | 2 - .../objs/CnetEditorWidget/LineShiftFilter.cpp | 2 - .../CnetEditorWidget/MeasureCountFilter.cpp | 2 - .../CnetEditorWidget/MeasureIgnoredFilter.cpp | 2 - .../MeasureJigsawRejectedFilter.cpp | 2 - .../objs/CnetEditorWidget/MeasureLeafItem.cpp | 2 - .../CnetEditorWidget/MeasureTableDelegate.cpp | 6 +- .../CnetEditorWidget/MeasureTableModel.cpp | 2 - .../CnetEditorWidget/MeasureTypeFilter.cpp | 2 - .../PointEditLockedFilter.cpp | 2 - .../objs/CnetEditorWidget/PointIdFilter.cpp | 2 - .../CnetEditorWidget/PointIgnoredFilter.cpp | 2 - .../PointJigsawRejectedFilter.cpp | 2 - .../objs/CnetEditorWidget/PointLeafItem.cpp | 2 - .../PointMeasureFilterSelector.cpp | 2 - .../PointMeasureTreeModel.cpp | 4 - .../objs/CnetEditorWidget/PointParentItem.cpp | 5 - .../CnetEditorWidget/PointTableDelegate.cpp | 6 +- .../objs/CnetEditorWidget/PointTableModel.cpp | 4 - .../objs/CnetEditorWidget/PointTypeFilter.cpp | 2 - .../ResidualMagnitudeFilter.cpp | 2 - .../qisis/objs/CnetEditorWidget/RootItem.cpp | 2 - .../objs/CnetEditorWidget/SampleFilter.cpp | 2 - .../CnetEditorWidget/SampleResidualFilter.cpp | 2 - .../CnetEditorWidget/SampleShiftFilter.cpp | 2 - .../objs/CnetEditorWidget/TableColumnList.cpp | 5 - .../qisis/objs/CnetEditorWidget/TableView.cpp | 5 - .../CnetEditorWidget/TableViewContent.cpp | 23 --- .../objs/CnetEditorWidget/TableViewHeader.cpp | 12 +- .../qisis/objs/CnetEditorWidget/TreeView.cpp | 5 - .../objs/CnetEditorWidget/TreeViewContent.cpp | 10 +- .../objs/CnetEditorWidget/TreeViewHeader.cpp | 6 - .../ControlHealthMonitorView.cpp | 2 - .../ControlPointEditView.cpp | 2 - .../ControlPointEditWidget.cpp | 2 - .../objs/CubePlotCurve/CubePlotCurve.cpp | 3 - .../qisis/objs/CubeViewport/CubeViewport.cpp | 4 - .../objs/CubeViewport/ViewportBuffer.cpp | 2 - .../FeatureNomenclature.cpp | 2 - .../FeatureNomenclatureTool.cpp | 1 - .../objs/Footprint2DView/Footprint2DView.cpp | 2 - .../MatrixSceneWidget/MatrixSceneWidget.cpp | 2 - .../qisis/objs/MeasureTool/MeasureTool.cpp | 2 - .../MosaicSceneWidget/MosaicSceneWidget.cpp | 4 - .../MosaicSceneWorkOrder.cpp | 3 - .../MoveDownOneSceneWorkOrder.cpp | 1 - .../MoveToBottomSceneWorkOrder.cpp | 1 - .../MoveToTopSceneWorkOrder.cpp | 1 - .../MoveUpOneSceneWorkOrder.cpp | 1 - isis/src/qisis/objs/PlotCurve/PlotCurve.cpp | 3 - isis/src/qisis/objs/PlotWindow/PlotWindow.cpp | 2 - .../PlotWindow/PlotWindowBestFitDialog.cpp | 2 - isis/src/qisis/objs/Project/Project.cpp | 2 - .../ProjectItemModel/ProjectItemModel.cpp | 2 - .../ProjectItemProxyModel.cpp | 2 - .../ScatterPlotConfigDialog.cpp | 2 - .../objs/ScatterPlotTool/ScatterPlotData.cpp | 4 - .../ScatterPlotTool/ScatterPlotWindow.cpp | 2 - .../objs/SpatialPlotTool/SpatialPlotTool.cpp | 2 - .../SpectralPlotTool/SpectralPlotTool.cpp | 3 - .../SpectralPlotTool/SpectralPlotWindow.cpp | 2 - .../objs/SunShadowTool/SunShadowTool.cpp | 2 - isis/src/qisis/objs/Tab/Tab.cpp | 4 - isis/src/qisis/objs/WorkOrder/WorkOrder.cpp | 2 - isis/src/system/apps/isiscomplete/main.cpp | 7 - 144 files changed, 12 insertions(+), 786 deletions(-) delete mode 100644 isis/src/base/objs/Isis/Isis.truth delete mode 100644 isis/src/base/objs/Isis/IsisDebug.h delete mode 100644 isis/src/base/objs/Isis/unitTest.cpp delete mode 100644 isis/src/base/objs/Isis/unitTest.xml diff --git a/isis/src/apollo/apps/apollopaninit/main.cpp b/isis/src/apollo/apps/apollopaninit/main.cpp index 269b1b2263..8ad6483e45 100644 --- a/isis/src/apollo/apps/apollopaninit/main.cpp +++ b/isis/src/apollo/apps/apollopaninit/main.cpp @@ -7,7 +7,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -//Isis.h and IsisDebug.h if needed #include "Isis.h" //C++ standard libraries if needed diff --git a/isis/src/apollo/objs/CentroidApolloPan/CentroidApolloPan.cpp b/isis/src/apollo/objs/CentroidApolloPan/CentroidApolloPan.cpp index c0eeb2808c..9e204b2aed 100644 --- a/isis/src/apollo/objs/CentroidApolloPan/CentroidApolloPan.cpp +++ b/isis/src/apollo/objs/CentroidApolloPan/CentroidApolloPan.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -//Isis.h and IsisDebug.h if needed - //C++ standard libraries if needed #include diff --git a/isis/src/base/apps/shadow/ShadowFunctor.cpp b/isis/src/base/apps/shadow/ShadowFunctor.cpp index b06db8b76c..ad484c8bfb 100644 --- a/isis/src/base/apps/shadow/ShadowFunctor.cpp +++ b/isis/src/base/apps/shadow/ShadowFunctor.cpp @@ -1,4 +1,3 @@ -#include "IsisDebug.h" #include "ShadowFunctor.h" #include @@ -884,7 +883,6 @@ namespace Isis { portal.SetPosition(*demSampleAlongRay, *demLineAlongRay, 1); - ASSERT(quickCache); if (!portal.CopyOverlapFrom(*quickCache)) { m_inputDem->read(portal); } diff --git a/isis/src/base/objs/Application/Application.cpp b/isis/src/base/objs/Application/Application.cpp index a276ac6ce3..5c438ea67d 100644 --- a/isis/src/base/objs/Application/Application.cpp +++ b/isis/src/base/objs/Application/Application.cpp @@ -4,7 +4,6 @@ For more details about the LICENSE terms and the AUTHORS, you will find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" #include #include diff --git a/isis/src/base/objs/BufferManager/BufferManager.cpp b/isis/src/base/objs/BufferManager/BufferManager.cpp index 705702a88d..7b2ff2fb24 100644 --- a/isis/src/base/objs/BufferManager/BufferManager.cpp +++ b/isis/src/base/objs/BufferManager/BufferManager.cpp @@ -4,7 +4,6 @@ For more details about the LICENSE terms and the AUTHORS, you will find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" #include "BufferManager.h" #include diff --git a/isis/src/base/objs/CameraStatistics/CameraStatistics.cpp b/isis/src/base/objs/CameraStatistics/CameraStatistics.cpp index e06cb53a87..802b090890 100644 --- a/isis/src/base/objs/CameraStatistics/CameraStatistics.cpp +++ b/isis/src/base/objs/CameraStatistics/CameraStatistics.cpp @@ -4,7 +4,6 @@ For more details about the LICENSE terms and the AUTHORS, you will find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" #include "CameraStatistics.h" #include "Camera.h" diff --git a/isis/src/base/objs/Cube/Cube.cpp b/isis/src/base/objs/Cube/Cube.cpp index 2fb3d5838f..4cd3594f75 100644 --- a/isis/src/base/objs/Cube/Cube.cpp +++ b/isis/src/base/objs/Cube/Cube.cpp @@ -4,7 +4,6 @@ For more details about the LICENSE terms and the AUTHORS, you will find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" #include "Cube.h" #include @@ -183,10 +182,6 @@ namespace Isis { bool Cube::isOpen() const { bool open = (m_ioHandler != NULL); - ASSERT(open == (bool)m_labelFile); - ASSERT(open == (bool)m_labelFileName); - ASSERT(open == (bool)m_label); - return open; } @@ -510,8 +505,6 @@ namespace Isis { else { cubFile = cubFile.addExtension("ecub"); - ASSERT(m_dataFileName); - core += PvlKeyword("^DnFile", m_dataFileName->original()); // m_dataFileName = new FileName(cubFile); m_dataFile = new QFile(realDataFileName().expanded()); @@ -2210,17 +2203,14 @@ namespace Isis { // Attached, stores DN data - normal cube if (m_attached && m_storesDnData) { - ASSERT(m_labelFileName); result = *m_labelFileName; } // Detached, stores DN data - standard detached cube else if (!m_attached && m_storesDnData) { - ASSERT(m_dataFileName); result = *m_dataFileName; } // External cube - go look at our external file else if (!m_storesDnData) { - ASSERT(m_dataFileName); FileName guess = *m_dataFileName; QDir dir(guess.toString()); @@ -2340,7 +2330,6 @@ namespace Isis { * reformatted */ void Cube::initLabelFromFile(FileName labelFileName, bool readWrite) { - ASSERT(!m_labelFileName); try { if (labelFileName.fileExists()) { diff --git a/isis/src/base/objs/Cube/CubeIoHandler.cpp b/isis/src/base/objs/Cube/CubeIoHandler.cpp index 7cb7c1d486..8ac1b1b1a3 100644 --- a/isis/src/base/objs/Cube/CubeIoHandler.cpp +++ b/isis/src/base/objs/Cube/CubeIoHandler.cpp @@ -4,8 +4,6 @@ For more details about the LICENSE terms and the AUTHORS, you will find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ - -#include "IsisDebug.h" #include "CubeIoHandler.h" #include @@ -155,7 +153,6 @@ namespace Isis { * because we can no longer do IO by the time this destructor is called. */ CubeIoHandler::~CubeIoHandler() { - ASSERT( m_rawData ? m_rawData->size() == 0 : 1 ); if (m_ioThreadPool) m_ioThreadPool->waitForDone(); @@ -179,7 +176,6 @@ namespace Isis { QMapIterator it(*m_rawData); while (it.hasNext()) { // Unwritten data here means it cannot be written :( - ASSERT(0); it.next(); if(it.value()) @@ -528,9 +524,6 @@ namespace Isis { * @return The chunk's index into the file */ int CubeIoHandler::getChunkIndex(const RawCubeChunk &chunk) const { -// ASSERT(chunk.getStartSample() <= sampleCount()); -// ASSERT(chunk.getStartLine() <= lineCount()); -// ASSERT(chunk.getStartBand() <= bandCount()); int sampleIndex = (chunk.getStartSample() - 1) / getSampleCountInChunk(); int lineIndex = (chunk.getStartLine() - 1) / getLineCountInChunk(); @@ -1142,7 +1135,6 @@ namespace Isis { */ RawCubeChunk *CubeIoHandler::getNullChunk(int chunkIndex) const { // Shouldn't ask for null chunks when the area has already been allocated -// ASSERT(getChunk(chunkIndex) == NULL); int startSample = 0; int startLine = 0; @@ -1915,7 +1907,6 @@ namespace Isis { m_ioHandler->m_writeThreadMutex->unlock(); m_ioHandler = NULL; - ASSERT(m_buffersToWrite->isEmpty()); delete m_buffersToWrite; m_buffersToWrite = NULL; } diff --git a/isis/src/base/objs/Cube/RawCubeChunk.cpp b/isis/src/base/objs/Cube/RawCubeChunk.cpp index b29cba2042..049cca7ea7 100644 --- a/isis/src/base/objs/Cube/RawCubeChunk.cpp +++ b/isis/src/base/objs/Cube/RawCubeChunk.cpp @@ -4,7 +4,6 @@ For more details about the LICENSE terms and the AUTHORS, you will find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" #include "RawCubeChunk.h" #include @@ -167,7 +166,6 @@ namespace Isis { * @param offset the position to place the new value at */ void RawCubeChunk::setData(unsigned char value, int offset) { - ASSERT(offset < getByteCount()); m_dirty = true; m_rawBufferInternalPtr[offset] = value; @@ -182,7 +180,6 @@ namespace Isis { * @param offset the position to place the new value at */ void RawCubeChunk::setData(short value, int offset) { - ASSERT((int)(offset * sizeof(short)) < getByteCount()); m_dirty = true; ((short *)m_rawBufferInternalPtr)[offset] = value; @@ -197,7 +194,6 @@ namespace Isis { * @param offset the position to place the new value at */ void RawCubeChunk::setData(const float &value, const int &offset) { - ASSERT((int)(offset * sizeof(float)) < getByteCount()); m_dirty = true; ((float *)m_rawBufferInternalPtr)[offset] = value; diff --git a/isis/src/base/objs/CubeDataThread/CubeDataThread.cpp b/isis/src/base/objs/CubeDataThread/CubeDataThread.cpp index 0ffb396ee4..d566ea8a4a 100644 --- a/isis/src/base/objs/CubeDataThread/CubeDataThread.cpp +++ b/isis/src/base/objs/CubeDataThread/CubeDataThread.cpp @@ -4,7 +4,6 @@ For more details about the LICENSE terms and the AUTHORS, you will find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" #include "CubeDataThread.h" #include @@ -499,7 +498,6 @@ namespace Isis { int endBand = overlapping->Band(overlapping->size() - 1); // Now let's search for overlaps - ASSERT(p_managedData->size() == p_managedDataSources->size()); for (int knownBrick = 0; knownBrick < p_managedData->size(); knownBrick++) { int sourceCube = (*p_managedDataSources)[knownBrick]; @@ -585,13 +583,11 @@ namespace Isis { * (exact same range, but not same pointer). */ void CubeDataThread::DoneWithData(int cubeId, const Isis::Brick *brickDone) { - ASSERT(brickDone != NULL); int instance = 0; bool exactMatch = false; bool writeLock = false; int index = OverlapIndex(brickDone, cubeId, instance, exactMatch); - ASSERT(p_managedData->size() == p_managedDataSources->size()); while (index != -1) { // If this isn't the data they're finished with, we don't care about it if (!exactMatch) { @@ -671,7 +667,6 @@ namespace Isis { index = OverlapIndex(brickDone, cubeId, instance, exactMatch); } - ASSERT(p_managedData->size() == p_managedDataSources->size()); } /** @@ -682,7 +677,6 @@ namespace Isis { * @return bool True if deletion actually happened */ bool CubeDataThread::FreeBrick(int brickIndex) { - ASSERT(p_managedData->size() == p_managedDataSources->size()); // make sure brick is not still being used! if (!(*p_managedData)[brickIndex].first->tryLockForWrite()) { diff --git a/isis/src/base/objs/IException/IException.cpp b/isis/src/base/objs/IException/IException.cpp index 4ddf0a93f6..223c5ce153 100644 --- a/isis/src/base/objs/IException/IException.cpp +++ b/isis/src/base/objs/IException/IException.cpp @@ -4,8 +4,6 @@ For more details about the LICENSE terms and the AUTHORS, you will find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ - -#include "IsisDebug.h" #include "IException.h" #include @@ -664,30 +662,6 @@ namespace Isis { } - /** - * Returns an IException representing the current stack, excluding this - * method. - * - * @return an IException representing a current stack trace - */ - IException IException::createStackTrace() { - vector theStack; - StackTrace::GetStackTrace(&theStack); - QString message; - - for(unsigned int i = 1; i < theStack.size(); i++) { - message += (theStack[i] + "\n").c_str(); - } - - IException result; - if (theStack.size() != 0) { - result = IException(Unknown, message, NULL, -1); - } - - return result; - } - - /** * Returns the source of the error in string format for the given ErrorType. * diff --git a/isis/src/base/objs/ImagePolygon/ImagePolygon.cpp b/isis/src/base/objs/ImagePolygon/ImagePolygon.cpp index 95fcf87553..63eb3d4069 100644 --- a/isis/src/base/objs/ImagePolygon/ImagePolygon.cpp +++ b/isis/src/base/objs/ImagePolygon/ImagePolygon.cpp @@ -5,8 +5,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include #include #include @@ -587,8 +585,7 @@ namespace Isis { * p_cubeSamps in ASSERT. */ void ImagePolygon::calcImageBorderCoordinates() { - ASSERT(p_cube); - + for (int line = p_cubeStartLine; !m_leftCoord && line <= p_cubeLines; line++) { for (int sample = p_cubeStartSamp; !m_leftCoord && sample <= p_cubeSamps; sample++) { if (SetImage(sample, line)) { diff --git a/isis/src/base/objs/Isis/Isis.h b/isis/src/base/objs/Isis/Isis.h index 9ce3650cdb..a9c8709c2c 100644 --- a/isis/src/base/objs/Isis/Isis.h +++ b/isis/src/base/objs/Isis/Isis.h @@ -9,8 +9,6 @@ find files of those names at the top level of this repository. **/ #error *****Isis.h MUST be included before any other files!***** #endif -#include "IsisDebug.h" - #include #include @@ -99,13 +97,6 @@ int main(int argc, char *argv[]) { exit(1); } -#ifdef CWDEBUG - startMonitoringMemory(); - signal(SIGSEGV, SegmentationFault); - signal(SIGABRT, Abort); - signal(SIGINT, InterruptSignal); -#endif - Isis::Application::p_applicationForceGuiApp = false; #ifdef USE_GUI_QAPP @@ -119,73 +110,3 @@ int main(int argc, char *argv[]) { delete QCoreApplication::instance(); return status; } - -#ifdef CWDEBUG -void startMonitoringMemory() { -#ifndef NOMEMCHECK - MyMutex *mutex = new MyMutex(); - std::fstream *alloc_output = new std::fstream("/dev/null"); - Debug(make_all_allocations_invisible_except(NULL)); - ForAllDebugChannels(if(debugChannel.is_on()) debugChannel.off()); - Debug(dc::malloc.on()); - Debug(libcw_do.on()); - Debug(libcw_do.set_ostream(alloc_output)); - Debug(libcw_do.set_ostream(alloc_output, mutex)); - atexit(stopMonitoringMemory); -#endif -} - - -void stopMonitoringMemory() { -#ifndef NOMEMCHECK - Debug( - alloc_filter_ct alloc_filter; - std::vector objmasks; - objmasks.push_back("libc.so*"); - objmasks.push_back("libstdc++*"); - std::vector srcmasks; - srcmasks.push_back("*new_allocator.h*"); - srcmasks.push_back("*set_ostream.inl*"); - alloc_filter.hide_objectfiles_matching(objmasks); - alloc_filter.hide_sourcefiles_matching(srcmasks); - alloc_filter.hide_unknown_locations(); - delete libcw_do.get_ostream(); - libcw_do.set_ostream(&std::cout); - list_allocations_on(libcw_do, alloc_filter); - dc::malloc.off(); - libcw_do.off() - ); -#endif -} - - -void SegmentationFault(int) { - std::vector currentStack; - StackTrace::GetStackTrace(¤tStack); - - std::cerr << "Segmentation Fault" << std::endl; - for(unsigned int i = 1; i < currentStack.size(); i++) { - std::cerr << currentStack[i] << std::endl; - } - - exit(1); -} - -void Abort(int) { - std::vector currentStack; - StackTrace::GetStackTrace(¤tStack); - - std::cerr << "Abort" << std::endl; - for(unsigned int i = 1; i < currentStack.size(); i++) { - std::cerr << currentStack[i] << std::endl; - } - - exit(1); -} - - -void InterruptSignal(int) { - exit(1); -} - -#endif diff --git a/isis/src/base/objs/Isis/Isis.truth b/isis/src/base/objs/Isis/Isis.truth deleted file mode 100644 index f688f11cde..0000000000 --- a/isis/src/base/objs/Isis/Isis.truth +++ /dev/null @@ -1 +0,0 @@ -That's all folks diff --git a/isis/src/base/objs/Isis/IsisDebug.h b/isis/src/base/objs/Isis/IsisDebug.h deleted file mode 100644 index 0b3e845f44..0000000000 --- a/isis/src/base/objs/Isis/IsisDebug.h +++ /dev/null @@ -1,137 +0,0 @@ -#ifndef IsisDebug_h -#define IsisDebug_h -/** This is free and unencumbered software released into the public domain. -The authors of ISIS do not claim copyright on the contents of this file. -For more details about the LICENSE terms and the AUTHORS, you will -find files of those names at the top level of this repository. **/ - -/* SPDX-License-Identifier: CC0-1.0 */ - -#ifdef __GTHREADS -#error *****IsisDebug.h MUST be included before any system header files!***** -#endif - -void startMonitoringMemory(); -void stopMonitoringMemory(); -void SegmentationFault(int); -void Abort(int); -void InterruptSignal(int); - -#ifdef CWDEBUG -/** - * These includes may seem out of order but are necessary to be in this order - * for our debugging library libcwd - */ -#include -#include -#include -#include - -#include -#include - -/** - * The next two includes are bad, but are necessary without complicating code to - * an extreme. These shouldn't cause an issue because they are not included in - * release mode, or ever on systems without libcwd. QString is necessary for - * string conversions and Constants.h for the definition of BigInt. - */ -#include "QString.h" -#include "Constants.h" - -/** - * This asserts the pointer is delete-able - */ -#define ASSERT_PTR(x) \ - if (libcwd::test_delete(x)) \ - { \ - std::cerr << ">> " << __FILE__ << ":" << __LINE__ << \ - " error: ASSERT POINTER " << #x << " FAILED\n"; \ - } - -class MyMutex : public QMutex { - public: - bool trylock() { - return tryLock(); - } -}; - -/** - * @author ????-??-?? Steven Lambright - * - * @internal - */ -class StackTrace { - public: - /** - * This returns the current stack trace. This must be - * done avoiding extra includes and inside this header - * file to accomplish stack traces with only the application - * in debug mode and not adding extra includes. - * - * Caller takes ownership of the return value. - * - * @return char* String containing stack trace - */ - static void GetStackTrace(std::vector *stackTraceResult) { - stackTraceResult->clear(); - const int MAX_STACK_DEPTH = 1024; - - void *stackTrace[MAX_STACK_DEPTH]; - int stackSize = backtrace(stackTrace, MAX_STACK_DEPTH); - - for(int stackEl = 2; stackEl < stackSize; stackEl ++) { - std::string currElement; - void *addr = stackTrace[stackEl]; - - libcwd::location_ct addrInfo(addr); - std::string demangled_name; - libcwd::demangle_symbol(addrInfo.mangled_function_name(), demangled_name); - - currElement = ">> "; - - if(addrInfo.is_known()) { - currElement += - std::string(addrInfo.file()) + - std::string(":") + - QString((Isis::BigInt)addrInfo.line()) + - std::string(" --- ") + - demangled_name; - } - else { - currElement += "?????:0 --- " + demangled_name; - } - - stackTraceResult->push_back(currElement); - } - } -}; - -#else -#define ASSERT_PTR(x) - - -/** - * @author ????-??-?? Steven Lambright - * - * @internal - */ -class StackTrace { - public: - static void GetStackTrace(const void *) {} -}; -#endif - -#ifdef DEBUG -#include -#define ASSERT(x) \ - if (!(x)) \ - { \ - std::cerr << ">> " << __FILE__ << ":" << __LINE__ << \ - " error: ASSERT " << #x << " FAILED\n"; \ - } -#else -#define ASSERT(x) -#endif - -#endif diff --git a/isis/src/base/objs/Isis/unitTest.cpp b/isis/src/base/objs/Isis/unitTest.cpp deleted file mode 100644 index d6af910b00..0000000000 --- a/isis/src/base/objs/Isis/unitTest.cpp +++ /dev/null @@ -1,46 +0,0 @@ -/** This is free and unencumbered software released into the public domain. -The authors of ISIS do not claim copyright on the contents of this file. -For more details about the LICENSE terms and the AUTHORS, you will -find files of those names at the top level of this repository. **/ - -/* SPDX-License-Identifier: CC0-1.0 */ -#include "Isis.h" -#include "Preference.h" - -#include - -using namespace std; -void IsisMain() { - Isis::Preference::Preferences(true); - cout << "That's all folks" << endl; - - vector stackTrace; - StackTrace::GetStackTrace(&stackTrace); - - if(stackTrace.size()) { - cout << endl; - cout << "----- Stack Trace -----" << endl; - for(unsigned int i = 0; i < stackTrace.size(); i++) { - cout << stackTrace[i] << endl; - } - - cout << endl; - cout << "----- ASSERTS -----" << endl; - ASSERT(0); - ASSERT(1); - - cout << endl; - cout << "----- POINTER ASSERTS -----" << endl; - int *test = new int[5]; - cout << "VALID:" << endl; - ASSERT_PTR(test); - cout << "INVALID:" << endl; - ASSERT_PTR(test + 1); - cout << "NULL:" << endl; - ASSERT_PTR(0); - - test[0] = 5; - - } - -} diff --git a/isis/src/base/objs/Isis/unitTest.xml b/isis/src/base/objs/Isis/unitTest.xml deleted file mode 100644 index 844e112f6b..0000000000 --- a/isis/src/base/objs/Isis/unitTest.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - Unit test for IsisProcess class - - - - Just a test only a test - - - - Scripting - - - - - Original Version - - - Modified schema from astrogeology... isis.astrogeology... - - - - - - - filename - - Test cube - - - Test cube - - - *.cub - - $ISISTESTDATA/isis/src/base/unitTestData/isisTruth.cub - - - - diff --git a/isis/src/base/objs/PvlKeyword/PvlKeyword.cpp b/isis/src/base/objs/PvlKeyword/PvlKeyword.cpp index 15eac2ddc1..e92a50ccfd 100644 --- a/isis/src/base/objs/PvlKeyword/PvlKeyword.cpp +++ b/isis/src/base/objs/PvlKeyword/PvlKeyword.cpp @@ -4,7 +4,6 @@ For more details about the LICENSE terms and the AUTHORS, you will find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" #include #include @@ -221,8 +220,6 @@ namespace Isis { m_units->resize(m_values.size()); } - ASSERT(i < (int) m_units->size()); - (*m_units)[i] = units; } else { diff --git a/isis/src/base/objs/Selection/Selection.cpp b/isis/src/base/objs/Selection/Selection.cpp index d0ef52b93d..e0b0c3d3e8 100644 --- a/isis/src/base/objs/Selection/Selection.cpp +++ b/isis/src/base/objs/Selection/Selection.cpp @@ -5,8 +5,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -//Isis.h and IsisDebug.h if needed - //C++ standard libraries if needed #include #include diff --git a/isis/src/base/objs/XmlStackedHandler/XmlStackedHandler.cpp b/isis/src/base/objs/XmlStackedHandler/XmlStackedHandler.cpp index 52e44faf1a..b5c3e20e61 100644 --- a/isis/src/base/objs/XmlStackedHandler/XmlStackedHandler.cpp +++ b/isis/src/base/objs/XmlStackedHandler/XmlStackedHandler.cpp @@ -4,7 +4,6 @@ For more details about the LICENSE terms and the AUTHORS, you will find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" #include "XmlStackedHandler.h" #include @@ -56,7 +55,6 @@ namespace Isis { const QString &qName) { m_depth--; - ASSERT(m_depth >= 0); if (m_depth == 0 && reader()) { reader()->popContentHandler(); diff --git a/isis/src/control/apps/cnetsplit/main.cpp b/isis/src/control/apps/cnetsplit/main.cpp index 25fcb352b1..405ff33199 100644 --- a/isis/src/control/apps/cnetsplit/main.cpp +++ b/isis/src/control/apps/cnetsplit/main.cpp @@ -7,7 +7,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ #include "Isis.h" -#include "IsisDebug.h" #include diff --git a/isis/src/control/apps/cnetstats/cnetstats.cpp b/isis/src/control/apps/cnetstats/cnetstats.cpp index 5e441a43d8..77ccf007da 100644 --- a/isis/src/control/apps/cnetstats/cnetstats.cpp +++ b/isis/src/control/apps/cnetstats/cnetstats.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "cnetstats.h" #include "ControlNetFilter.h" #include "ControlNetStatistics.h" diff --git a/isis/src/control/objs/ControlNet/ControlNet.cpp b/isis/src/control/objs/ControlNet/ControlNet.cpp index fcfb8feb3b..432fde99b1 100644 --- a/isis/src/control/objs/ControlNet/ControlNet.cpp +++ b/isis/src/control/objs/ControlNet/ControlNet.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "ControlNet.h" #include @@ -752,9 +750,7 @@ namespace Isis { * @param measure The measure removed from the network. */ void ControlNet::measureDeleted(ControlMeasure *measure) { - ASSERT(measure); QString serial = measure->GetCubeSerialNumber(); - ASSERT(m_vertexMap.contains(serial)); emit measureRemoved(measure); diff --git a/isis/src/control/objs/ControlNetDiff/ControlNetDiff.cpp b/isis/src/control/objs/ControlNetDiff/ControlNetDiff.cpp index 1ea671f943..eaed9a9e8c 100644 --- a/isis/src/control/objs/ControlNetDiff/ControlNetDiff.cpp +++ b/isis/src/control/objs/ControlNetDiff/ControlNetDiff.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "ControlNetDiff.h" #include diff --git a/isis/src/control/objs/ControlNetFilter/unitTest.cpp b/isis/src/control/objs/ControlNetFilter/unitTest.cpp index 3bb077f67d..9440fac2fd 100644 --- a/isis/src/control/objs/ControlNetFilter/unitTest.cpp +++ b/isis/src/control/objs/ControlNetFilter/unitTest.cpp @@ -7,7 +7,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ #include "Isis.h" -#include "IsisDebug.h" #include "Application.h" #include "ControlNet.h" #include "ControlPoint.h" diff --git a/isis/src/control/objs/ControlNetStatistics/unitTest.cpp b/isis/src/control/objs/ControlNetStatistics/unitTest.cpp index dfaf6fbde8..8428870b40 100644 --- a/isis/src/control/objs/ControlNetStatistics/unitTest.cpp +++ b/isis/src/control/objs/ControlNetStatistics/unitTest.cpp @@ -7,7 +7,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ #include "Isis.h" -#include "IsisDebug.h" #include "Application.h" #include "ControlNet.h" #include "ControlPoint.h" diff --git a/isis/src/control/objs/ControlPoint/ControlPoint.cpp b/isis/src/control/objs/ControlPoint/ControlPoint.cpp index cfa9164acc..66cf986a19 100644 --- a/isis/src/control/objs/ControlPoint/ControlPoint.cpp +++ b/isis/src/control/objs/ControlPoint/ControlPoint.cpp @@ -6,7 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" #include "ControlPoint.h" #include @@ -242,7 +241,6 @@ namespace Isis { } if (!measures->size()) { - ASSERT(!HasRefMeasure()); referenceMeasure = measure; } else if (referenceMeasure->IsIgnored() && !measure->IsIgnored() && @@ -352,7 +350,6 @@ namespace Isis { * @param measure The measure to delete */ int ControlPoint::Delete(ControlMeasure *measure) { - ASSERT(measure); return Delete(measure->GetCubeSerialNumber()); } @@ -572,7 +569,6 @@ namespace Isis { return PointLocked; } - ASSERT(cm); SetExplicitReference(cm); return Success; } @@ -1780,7 +1776,6 @@ namespace Isis { * is false. */ int ControlPoint::IndexOf(ControlMeasure *cm, bool throws) const { - ASSERT(cm); return IndexOf(cm->GetCubeSerialNumber(), throws); } @@ -1822,7 +1817,6 @@ namespace Isis { } int index = cubeSerials->indexOf(referenceMeasure->GetCubeSerialNumber()); - ASSERT(index != -1) return index; } diff --git a/isis/src/odyssey/apps/thmnoseam/main.cpp b/isis/src/odyssey/apps/thmnoseam/main.cpp index 4fc7614055..0efbabef29 100644 --- a/isis/src/odyssey/apps/thmnoseam/main.cpp +++ b/isis/src/odyssey/apps/thmnoseam/main.cpp @@ -231,8 +231,6 @@ void RemoveSeam(Buffer &out, int framelet, int band, // Use optimization! offsetSample = frameletOffsetsForBand[optimizeIndex].SampleOffset(); offsetLine = frameletOffsetsForBand[optimizeIndex].LineOffset(); - - ASSERT(frameletOffsetsForBand[optimizeIndex].Sample() == sample); } // There is no pre-calculated translation, calculate it else if(badCam->SetImage(sample, badLine)) { diff --git a/isis/src/qisis/apps/cneteditor/CnetEditorWindow.cpp b/isis/src/qisis/apps/cneteditor/CnetEditorWindow.cpp index 0c1d478f01..7281832446 100644 --- a/isis/src/qisis/apps/cneteditor/CnetEditorWindow.cpp +++ b/isis/src/qisis/apps/cneteditor/CnetEditorWindow.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "CnetEditorWindow.h" #include @@ -54,7 +52,6 @@ namespace Isis { setAcceptMode(AcceptSave); setNameFilter("Control Network files (*.net *.bin);;All files (*)"); QGridLayout *mainLayout = qobject_cast< QGridLayout * >(layout()); - ASSERT(mainLayout); if (mainLayout) mainLayout->addLayout(l, mainLayout->rowCount(), 0, 1, -1); @@ -538,8 +535,6 @@ namespace Isis { try { - ASSERT(displayProperties); - connect(displayProperties, SIGNAL(composeProgressRangeChanged(int, int)), cubeListProgressBar, SLOT(setRange(int, int))); connect(displayProperties, SIGNAL(composeProgressChanged(int)), @@ -563,7 +558,6 @@ namespace Isis { void CnetEditorWindow::save() { - ASSERT(!curFile->isEmpty()); if (saveFilteredNetwork) { QString newCubeListFileName; @@ -590,7 +584,6 @@ namespace Isis { throw IException(IException::Programmer, msg, _FILEINFO_); } - ASSERT(displayProperties); QStringList cubeFileNames = displayProperties->getCubeList(filteredCnet); @@ -736,13 +729,11 @@ namespace Isis { void CnetEditorWindow::networkLoaded(QList nets) { - ASSERT(nets.count() == 1); networkLoaded(nets.first()->controlNet(), nets.first()->fileName()); } void CnetEditorWindow::cubeListLoaded() { - ASSERT(cubeListProgressBar); cubeListProgressBar->setVisible(false); } @@ -772,7 +763,6 @@ namespace Isis { if (actListIndex == -1) { QMenuBar *mb = qobject_cast< QMenuBar * >(widget); QMenu *m = qobject_cast< QMenu * >(widget); - ASSERT((mb != NULL) ^(m != NULL)); if (mb) { mb->addMenu(menuName); @@ -845,8 +835,6 @@ namespace Isis { int CnetEditorWindow::indexOfToolBar(QString objName) { - ASSERT(toolBars); - int index = -1; for (int i = 0; index == -1 && i < toolBars->size(); i++) diff --git a/isis/src/qisis/apps/cneteditor/main.cpp b/isis/src/qisis/apps/cneteditor/main.cpp index ce2e3fc1e6..f14760bc93 100644 --- a/isis/src/qisis/apps/cneteditor/main.cpp +++ b/isis/src/qisis/apps/cneteditor/main.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include #include "CnetEditorWindow.h" diff --git a/isis/src/qisis/apps/ipce/main.cpp b/isis/src/qisis/apps/ipce/main.cpp index 7e5b780178..652463a02b 100644 --- a/isis/src/qisis/apps/ipce/main.cpp +++ b/isis/src/qisis/apps/ipce/main.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include #include #include diff --git a/isis/src/qisis/apps/qmos/main.cpp b/isis/src/qisis/apps/qmos/main.cpp index f5804e4f44..0c93c67a64 100644 --- a/isis/src/qisis/apps/qmos/main.cpp +++ b/isis/src/qisis/apps/qmos/main.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include #include "Gui.h" diff --git a/isis/src/qisis/apps/qnet/main.cpp b/isis/src/qisis/apps/qnet/main.cpp index fbab28d22f..7fd9c541d8 100644 --- a/isis/src/qisis/apps/qnet/main.cpp +++ b/isis/src/qisis/apps/qnet/main.cpp @@ -6,7 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" #include #include diff --git a/isis/src/qisis/apps/qview/main.cpp b/isis/src/qisis/apps/qview/main.cpp index b530acea1c..d5ae89c77f 100644 --- a/isis/src/qisis/apps/qview/main.cpp +++ b/isis/src/qisis/apps/qview/main.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include #include #include diff --git a/isis/src/qisis/objs/AbstractPlotTool/AbstractPlotTool.cpp b/isis/src/qisis/objs/AbstractPlotTool/AbstractPlotTool.cpp index 662b21906e..c7b505885b 100644 --- a/isis/src/qisis/objs/AbstractPlotTool/AbstractPlotTool.cpp +++ b/isis/src/qisis/objs/AbstractPlotTool/AbstractPlotTool.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "AbstractPlotTool.h" #include @@ -181,8 +179,6 @@ namespace Isis { // Selected an item in the list that isn't a window if (m_selectWindowCombo->itemData(currentIndex).isNull()) { addWindow(); - ASSERT(m_selectWindowCombo->itemData( - m_selectWindowCombo->currentIndex()).canConvert()); } else if (selectedWindow(false)) { selectedWindow(false)->showWindow(); diff --git a/isis/src/qisis/objs/ChipViewport/ChipViewport.cpp b/isis/src/qisis/objs/ChipViewport/ChipViewport.cpp index 24e6b82cfc..b48b57960b 100644 --- a/isis/src/qisis/objs/ChipViewport/ChipViewport.cpp +++ b/isis/src/qisis/objs/ChipViewport/ChipViewport.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "ChipViewport.h" #include @@ -147,8 +145,6 @@ namespace Isis { */ void ChipViewport::stretchFromCubeViewport(Stretch *newStretch, CubeViewport *cvp) { - ASSERT(cvp != NULL); - if (!cvp || !m_chipCube) return; diff --git a/isis/src/qisis/objs/ChipViewportsWidget/ChipViewportsWidget.cpp b/isis/src/qisis/objs/ChipViewportsWidget/ChipViewportsWidget.cpp index 8b7a4fde09..4d60e6664d 100644 --- a/isis/src/qisis/objs/ChipViewportsWidget/ChipViewportsWidget.cpp +++ b/isis/src/qisis/objs/ChipViewportsWidget/ChipViewportsWidget.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "ChipViewportsWidget.h" #include diff --git a/isis/src/qisis/objs/CnetEditorView/CnetEditorView.cpp b/isis/src/qisis/objs/CnetEditorView/CnetEditorView.cpp index f47aac6bdb..118fb16b2c 100644 --- a/isis/src/qisis/objs/CnetEditorView/CnetEditorView.cpp +++ b/isis/src/qisis/objs/CnetEditorView/CnetEditorView.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "CnetEditorView.h" #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/APrioriLatitudeFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/APrioriLatitudeFilter.cpp index d53301de92..74aea93ffe 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/APrioriLatitudeFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/APrioriLatitudeFilter.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "APrioriLatitudeFilter.h" #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/APrioriLatitudeSigmaFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/APrioriLatitudeSigmaFilter.cpp index 90cb9e22a4..c09744dffc 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/APrioriLatitudeSigmaFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/APrioriLatitudeSigmaFilter.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "APrioriLatitudeSigmaFilter.h" #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/APrioriLongitudeFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/APrioriLongitudeFilter.cpp index 56ce1a1579..5741097b7d 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/APrioriLongitudeFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/APrioriLongitudeFilter.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "APrioriLongitudeFilter.h" #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/APrioriLongitudeSigmaFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/APrioriLongitudeSigmaFilter.cpp index 57b62f73fa..da4b0a4744 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/APrioriLongitudeSigmaFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/APrioriLongitudeSigmaFilter.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "APrioriLongitudeSigmaFilter.h" #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/APrioriRadiusFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/APrioriRadiusFilter.cpp index ae3cb0c96f..811f702b26 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/APrioriRadiusFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/APrioriRadiusFilter.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "APrioriRadiusFilter.h" #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/APrioriRadiusSigmaFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/APrioriRadiusSigmaFilter.cpp index fcb22dc153..0c01b94c67 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/APrioriRadiusSigmaFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/APrioriRadiusSigmaFilter.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "APrioriRadiusSigmaFilter.h" #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/AbstractFilter.cpp index ede813b5dc..49b1b4d8ed 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AbstractFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractFilter.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include #include @@ -165,7 +163,7 @@ namespace Isis { createEffectivenessCheckBox("&Measures"), 2); QString firstGroupEntry; - ASSERT(m_effectivenessGroup->buttons().size()); + if (m_effectivenessGroup->buttons().size()) { firstGroupEntry = m_effectivenessGroup->buttons()[0]->text(); firstGroupEntry.remove(0, 1); @@ -256,14 +254,12 @@ namespace Isis { QBoxLayout *AbstractFilter::getMainLayout() const { - ASSERT(m_mainLayout); return m_mainLayout; } QBoxLayout *AbstractFilter::getInclusiveExclusiveLayout() const { - ASSERT(m_inclusiveExclusiveLayout); return m_inclusiveExclusiveLayout; } @@ -274,11 +270,10 @@ namespace Isis { int passedCount = 0; foreach (ControlMeasure * measure, measures) { - ASSERT(measure); if (usePoints) { ControlPoint *point = measure->Parent(); - ASSERT(point); + if (point && evaluate(point)) passedCount++; } @@ -320,7 +315,6 @@ namespace Isis { bool AbstractFilter::evaluatePointFromMeasureFilter( const ControlPoint *point) const { - ASSERT(point); bool evaluation = true; @@ -333,7 +327,6 @@ namespace Isis { bool AbstractFilter::evaluate(const ControlPoint *point, bool (ControlPoint::*meth)() const) const { - ASSERT(point); return !((point->*meth)() ^ inclusive()); } @@ -341,14 +334,12 @@ namespace Isis { bool AbstractFilter::evaluate(const ControlMeasure *measure, bool (ControlMeasure::*meth)() const) const { - ASSERT(measure); return !((measure->*meth)() ^ inclusive()); } void AbstractFilter::updateEffectiveness() { - ASSERT(m_effectivenessGroup); if (m_effectivenessGroup) { FilterEffectivenessFlag newFlags; diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractFilterSelector.cpp b/isis/src/qisis/objs/CnetEditorWidget/AbstractFilterSelector.cpp index 77fcd78cd9..854c48aedc 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AbstractFilterSelector.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractFilterSelector.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "AbstractFilterSelector.h" #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractImageItem.cpp b/isis/src/qisis/objs/CnetEditorWidget/AbstractImageItem.cpp index 4b41f7f281..3910c7d330 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AbstractImageItem.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractImageItem.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "AbstractImageItem.h" #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractLeafItem.cpp b/isis/src/qisis/objs/CnetEditorWidget/AbstractLeafItem.cpp index debe552b9b..00c8492ae9 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AbstractLeafItem.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractLeafItem.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "AbstractLeafItem.h" #include "IException.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractMeasureItem.cpp b/isis/src/qisis/objs/CnetEditorWidget/AbstractMeasureItem.cpp index 941b33a0aa..5016480bc7 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AbstractMeasureItem.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractMeasureItem.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "AbstractMeasureItem.h" #include @@ -76,7 +74,6 @@ namespace Isis { return "Residual Magnitude"; } - ASSERT(0); return QString(); } @@ -144,7 +141,7 @@ namespace Isis { AbstractMeasureItem::AbstractMeasureItem(ControlMeasure *cm, int avgCharWidth, AbstractTreeItem *parent) : AbstractTreeItem(parent) { - ASSERT(cm); + m_measure = cm; calcDataWidth(avgCharWidth); @@ -409,7 +406,6 @@ namespace Isis { void AbstractMeasureItem::setLogData(ControlMeasure *m_measure, int m_measureLogDataEnum, const QString &value) { - ASSERT(m_measure); QString newDataStr = value.toLower(); ControlMeasureLogData::NumericLogDataType type = diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractMultipleChoiceFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/AbstractMultipleChoiceFilter.cpp index 805e8740b8..94c32fcdec 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AbstractMultipleChoiceFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractMultipleChoiceFilter.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "AbstractMultipleChoiceFilter.h" #include @@ -82,13 +80,11 @@ namespace Isis { QString const &AbstractMultipleChoiceFilter::getCurrentChoice() const { - ASSERT(m_curChoice); return *m_curChoice; } void AbstractMultipleChoiceFilter::updateCurChoice(QString newChoice) { - ASSERT(m_curChoice); *m_curChoice = newChoice; diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractNullDataItem.cpp b/isis/src/qisis/objs/CnetEditorWidget/AbstractNullDataItem.cpp index a76ad39c86..b69da637db 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AbstractNullDataItem.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractNullDataItem.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "AbstractNullDataItem.h" #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractNumberFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/AbstractNumberFilter.cpp index 309f60dfde..ff75983316 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AbstractNumberFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractNumberFilter.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "AbstractNumberFilter.h" #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractParentItem.cpp b/isis/src/qisis/objs/CnetEditorWidget/AbstractParentItem.cpp index 0f8b16a59c..0e6db3bc04 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AbstractParentItem.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractParentItem.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "AbstractParentItem.h" #include @@ -46,14 +44,11 @@ namespace Isis { AbstractTreeItem *AbstractParentItem::childAt(int row) const { - ASSERT(m_children); - ASSERT(row >= 0 && row < m_children->size()); return m_children->value(row); } QList< AbstractTreeItem * > AbstractParentItem::getChildren() const { - ASSERT(m_children); return *m_children; } @@ -69,22 +64,16 @@ namespace Isis { int AbstractParentItem::indexOf(AbstractTreeItem *child) const { - ASSERT(child); - ASSERT(m_children); return m_children->indexOf(child); } int AbstractParentItem::childCount() const { - ASSERT(m_children); return m_children->size(); } void AbstractParentItem::addChild(AbstractTreeItem *child) { - ASSERT(child); - ASSERT(m_children); - ASSERT(!dynamic_cast< RootItem * >(child)); // if (!m_firstVisibleChild && child->isVisible()) // { diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractPointItem.cpp b/isis/src/qisis/objs/CnetEditorWidget/AbstractPointItem.cpp index 2c03482b21..8cc4040fb8 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AbstractPointItem.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractPointItem.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "AbstractPointItem.h" #include @@ -79,7 +77,6 @@ namespace Isis { return "Jigsaw Rejected"; } - ASSERT(0); return QString(); } @@ -154,7 +151,7 @@ namespace Isis { AbstractPointItem::AbstractPointItem(ControlPoint *cp, int avgCharWidth, AbstractTreeItem *parent) : AbstractTreeItem(parent) { - ASSERT(cp); + m_point = cp; calcDataWidth(avgCharWidth); @@ -295,7 +292,6 @@ namespace Isis { m_point->SetIgnored(newData == "Yes"); break; case Reference: - ASSERT(m_point->HasSerialNumber(newData)); m_point->SetRefMeasure(newData); break; case AdjustedSPLat: diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractStringFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/AbstractStringFilter.cpp index fee54ba1e2..cc40a1d910 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AbstractStringFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractStringFilter.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "AbstractStringFilter.h" #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractTableModel.cpp b/isis/src/qisis/objs/CnetEditorWidget/AbstractTableModel.cpp index 04c997ce08..cda1231755 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AbstractTableModel.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractTableModel.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include #include @@ -205,13 +203,11 @@ namespace Isis { AbstractTreeModel *AbstractTableModel::getDataModel() { - ASSERT(m_dataModel); return m_dataModel; } const AbstractTreeModel *AbstractTableModel::getDataModel() const { - ASSERT(m_dataModel); return m_dataModel; } @@ -356,7 +352,6 @@ namespace Isis { QList< AbstractTreeItem * > AbstractTableModel::doSort( QList< AbstractTreeItem * > itemsToSort) { - ASSERT(!isSorting()); if (!isSorting()) { setSorting(true); @@ -422,8 +417,6 @@ namespace Isis { void AbstractTableModel::rebuildSort() { - ASSERT(m_dataModel); - ASSERT(m_sortedItems); m_sortedItems->clear(); cancelSort(); diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractTreeItem.cpp b/isis/src/qisis/objs/CnetEditorWidget/AbstractTreeItem.cpp index 62e4c3bd1f..a8872359fe 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AbstractTreeItem.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractTreeItem.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "AbstractTreeItem.h" #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/AbstractTreeModel.cpp b/isis/src/qisis/objs/CnetEditorWidget/AbstractTreeModel.cpp index b13be72e96..63b12b89ee 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AbstractTreeModel.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/AbstractTreeModel.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "AbstractTreeModel.h" #include @@ -43,7 +41,6 @@ find files of those names at the top level of this repository. **/ namespace Isis { AbstractTreeModel::AbstractTreeModel(ControlNet *controlNet, TreeView *v, QObject *parent) : QObject(parent), m_view(v), m_cNet(controlNet) { - ASSERT(m_cNet); m_filterWatcher = NULL; m_rebuildWatcher = NULL; @@ -148,7 +145,6 @@ namespace Isis { } while ((row < end || grabToEnd) && listStillValid && currentItem) { - ASSERT(currentItem); foundItems.append(currentItem); listStillValid = (currentItem != lastVisibleFilteredItem || currentItem == currentItem->parent()->getLastVisibleChild()); @@ -233,8 +229,6 @@ namespace Isis { InterestingItemsFlag flags, bool ignoreExpansion) { QList< AbstractTreeItem * > selectedItems; - ASSERT(rootItem); - if (!isFiltering()) { AbstractTreeItem *currentItem = rootItem->getFirstVisibleChild(); @@ -373,7 +367,6 @@ namespace Isis { void AbstractTreeModel::clear() { - ASSERT(rootItem); delete rootItem; rootItem = NULL; @@ -577,7 +570,6 @@ namespace Isis { RootItem *newRoot = newRootPtr.loadAcquire(); if (newRoot && newRoot->childCount()) { - ASSERT(rootItem); delete rootItem; rootItem = NULL; rootItem = newRoot; diff --git a/isis/src/qisis/objs/CnetEditorWidget/AdjustedLatitudeFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/AdjustedLatitudeFilter.cpp index 09fc929752..00ee455f12 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AdjustedLatitudeFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/AdjustedLatitudeFilter.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "AdjustedLatitudeFilter.h" #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/AdjustedLatitudeSigmaFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/AdjustedLatitudeSigmaFilter.cpp index 1d0288b5da..175983b9a6 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AdjustedLatitudeSigmaFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/AdjustedLatitudeSigmaFilter.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "AdjustedLatitudeSigmaFilter.h" #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/AdjustedLongitudeFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/AdjustedLongitudeFilter.cpp index 5053171352..efcd93f19b 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AdjustedLongitudeFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/AdjustedLongitudeFilter.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "AdjustedLongitudeFilter.h" #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/AdjustedLongitudeSigmaFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/AdjustedLongitudeSigmaFilter.cpp index b0b5e92dff..cc04ddc480 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AdjustedLongitudeSigmaFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/AdjustedLongitudeSigmaFilter.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "AdjustedLongitudeSigmaFilter.h" #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/AdjustedRadiusFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/AdjustedRadiusFilter.cpp index 21df29e4b7..fa7a17a26c 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AdjustedRadiusFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/AdjustedRadiusFilter.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "AdjustedRadiusFilter.h" #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/AdjustedRadiusSigmaFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/AdjustedRadiusSigmaFilter.cpp index d6721c4198..668f057754 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/AdjustedRadiusSigmaFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/AdjustedRadiusSigmaFilter.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "AdjustedRadiusSigmaFilter.h" #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/ChooserNameFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/ChooserNameFilter.cpp index 919474cd57..a87134666c 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/ChooserNameFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/ChooserNameFilter.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "ChooserNameFilter.h" #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/CnetDisplayProperties.cpp b/isis/src/qisis/objs/CnetEditorWidget/CnetDisplayProperties.cpp index 911e5c9384..43419b5120 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/CnetDisplayProperties.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/CnetDisplayProperties.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "CnetDisplayProperties.h" #include @@ -153,7 +151,6 @@ namespace Isis { */ QString CnetDisplayProperties::getImageName(QString cubeSerialNumber, bool forceFullPaths) const { - ASSERT(m_serialNumberToFileNameMap); QString imageName = cubeSerialNumber; @@ -176,8 +173,6 @@ namespace Isis { QString CnetDisplayProperties::getSerialNumber(QString imageId) { - ASSERT(m_serialNumberToFileNameMap); - QString sn = imageId; if (m_serialNumberToFileNameMap && useFileNames) { diff --git a/isis/src/qisis/objs/CnetEditorWidget/CnetEditorWidget.cpp b/isis/src/qisis/objs/CnetEditorWidget/CnetEditorWidget.cpp index 381011f6e3..2ebc1ebab8 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/CnetEditorWidget.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/CnetEditorWidget.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "CnetEditorWidget.h" #include @@ -305,7 +303,6 @@ namespace Isis { * Creates the menus, and options for the widget */ void CnetEditorWidget::createActions() { - ASSERT(m_menuActions); QAction *freezeTablesAct = new QAction(QIcon( FileName("$ISISROOT/appdata/images/icons/ice.png").expanded()), @@ -387,9 +384,6 @@ namespace Isis { * Creates filter widgets */ void CnetEditorWidget::createFilterArea() { - ASSERT(m_pointModel); - ASSERT(m_imageModel); - ASSERT(m_connectionModel); FilterWidget *pointFilter = new FilterWidget("Points and Measures"); if (m_pointModel) { @@ -488,7 +482,6 @@ namespace Isis { "measure. Each column in the table is an attribute of a control " "measure.

Rows with bold text are reference measures. " "Cells that are gray are not editable."); - ASSERT(m_pointTableView); connect(m_pointTableView, SIGNAL(tableSelectionChanged(QList< AbstractTreeItem * >)), m_measureTableModel, @@ -637,9 +630,6 @@ namespace Isis { * Reads the working version settings stored at the settings path */ void CnetEditorWidget::readSettings() { - ASSERT(m_workingVersion); - ASSERT(m_settingsPath); - ASSERT(m_measureTableView); QSettings settings(*m_settingsPath, QSettings::NativeFormat); *m_workingVersion = settings.value("version", "").toString(); @@ -681,9 +671,6 @@ namespace Isis { * Writes the configuration settings used */ void CnetEditorWidget::writeSettings() { - ASSERT(m_mainSplitter); - ASSERT(m_settingsPath); - ASSERT(m_measureTableView); QSettings settings(*m_settingsPath, QSettings::NativeFormat); settings.setValue("version", VERSION); @@ -836,7 +823,6 @@ namespace Isis { * @return QMap< QAction *, QList< QString > > QMap of menu actions */ QMap< QAction *, QList< QString > > CnetEditorWidget::menuActions() { - ASSERT(m_menuActions); return *m_menuActions; } @@ -847,7 +833,6 @@ namespace Isis { * @return QMap< QAction *, QList< QString > > QMap of tool bar actions */ QMap< QString, QList< QAction * > > CnetEditorWidget::toolBarActions() { - ASSERT(m_toolBarActions); return *m_toolBarActions; } diff --git a/isis/src/qisis/objs/CnetEditorWidget/ConnectionParentItem.cpp b/isis/src/qisis/objs/CnetEditorWidget/ConnectionParentItem.cpp index aefbb9f937..b13013a6ab 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/ConnectionParentItem.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/ConnectionParentItem.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "ConnectionParentItem.h" #include "ImageParentItem.h" @@ -25,9 +23,6 @@ namespace Isis { void ConnectionParentItem::addChild(AbstractTreeItem *child) { - // Only ImageParentItems should be children of ConnectionParentItems - ASSERT(dynamic_cast< ImageParentItem * >(child)); - AbstractParentItem::addChild(child); } } diff --git a/isis/src/qisis/objs/CnetEditorWidget/FilterGroup.cpp b/isis/src/qisis/objs/CnetEditorWidget/FilterGroup.cpp index 09b3ced541..818d8cf44d 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/FilterGroup.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/FilterGroup.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "FilterGroup.h" #include @@ -192,7 +190,6 @@ namespace Isis { void FilterGroup::addSelector(AbstractFilterSelector *newSelector) { - ASSERT(newSelector); if (newSelector) { connect(newSelector, SIGNAL(close(AbstractFilterSelector *)), @@ -246,9 +243,6 @@ namespace Isis { FilterGroup &FilterGroup::operator=(FilterGroup other) { - ASSERT(m_filterType); - ASSERT(m_selectors); - ASSERT(m_buttonGroup); // create temporary list of new selectors QList< AbstractFilterSelector * > newSelectors; @@ -312,8 +306,6 @@ namespace Isis { QString(AbstractFilter::*descriptionMeth)() const) const { QString description; - ASSERT(m_selectors); - QList< AbstractFilterSelector * > selectorsWithFilters; for (int i = 0; i < m_selectors->size(); i++) if (m_selectors->at(i)->hasFilter(hasFilterMeth)) diff --git a/isis/src/qisis/objs/CnetEditorWidget/FilterWidget.cpp b/isis/src/qisis/objs/CnetEditorWidget/FilterWidget.cpp index eb909029d8..202242b8ed 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/FilterWidget.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/FilterWidget.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "FilterWidget.h" #include @@ -106,9 +104,6 @@ namespace Isis { FilterWidget &FilterWidget::operator=(FilterWidget other) { - ASSERT(m_filterType); - ASSERT(m_filterGroups); - ASSERT(m_buttonGroup); // create temporary list of new groups QList< FilterGroup * > newGroups; @@ -176,7 +171,6 @@ namespace Isis { "the group. There is also a green plus (+) button outside any group " "for adding a new group."; - ASSERT(m_filterType); QString title = "Filter " + *m_filterType; QLabel *titleLabel = new QLabel(title); @@ -275,7 +269,6 @@ namespace Isis { bool (AbstractFilter::*hasFilterMeth)() const, QString(AbstractFilter::*descriptionMeth)() const, QString title) { - ASSERT(label); if (label) { label->clear(); @@ -329,8 +322,6 @@ namespace Isis { void FilterWidget::maybeScroll(FilterGroup *group) { - ASSERT(m_filterGroups); - ASSERT(m_filterGroups->size()); if (m_filterGroups && m_filterGroups->size() && m_filterGroups->at(m_filterGroups->size() - 1) == group) diff --git a/isis/src/qisis/objs/CnetEditorWidget/GoodnessOfFitFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/GoodnessOfFitFilter.cpp index a12739f2a9..ddd8c0739d 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/GoodnessOfFitFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/GoodnessOfFitFilter.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "GoodnessOfFitFilter.h" #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/ImageIdFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/ImageIdFilter.cpp index 1411f52956..6fceb35717 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/ImageIdFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/ImageIdFilter.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "ImageIdFilter.h" #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/ImageImageFilterSelector.cpp b/isis/src/qisis/objs/CnetEditorWidget/ImageImageFilterSelector.cpp index 606da610e3..da802b0eb0 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/ImageImageFilterSelector.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/ImageImageFilterSelector.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "ImageImageFilterSelector.h" #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/ImageImageTreeModel.cpp b/isis/src/qisis/objs/CnetEditorWidget/ImageImageTreeModel.cpp index b1589790db..a886d92ee0 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/ImageImageTreeModel.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/ImageImageTreeModel.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "ImageImageTreeModel.h" #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/ImageLeafItem.cpp b/isis/src/qisis/objs/CnetEditorWidget/ImageLeafItem.cpp index cf37d9c444..8c97c5dec4 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/ImageLeafItem.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/ImageLeafItem.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "ImageLeafItem.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/ImageParentItem.cpp b/isis/src/qisis/objs/CnetEditorWidget/ImageParentItem.cpp index 45a1e58ed4..1f9779e5a7 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/ImageParentItem.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/ImageParentItem.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "ImageParentItem.h" #include "ControlNet.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/ImagePointFilterSelector.cpp b/isis/src/qisis/objs/CnetEditorWidget/ImagePointFilterSelector.cpp index f2f5e55ea5..fcd3ac6c01 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/ImagePointFilterSelector.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/ImagePointFilterSelector.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include #include "ImagePointFilterSelector.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/ImagePointTreeModel.cpp b/isis/src/qisis/objs/CnetEditorWidget/ImagePointTreeModel.cpp index 980af55f17..a8b39351a6 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/ImagePointTreeModel.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/ImagePointTreeModel.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "ImagePointTreeModel.h" #include @@ -84,10 +82,8 @@ namespace Isis { imageItem->moveToThread(m_targetThread); QList< ControlMeasure * > measures = m_controlNet->GetMeasuresInCube(imageSerial); for (int j = 0; j < measures.size(); j++) { - ASSERT(measures[j]); ControlPoint *point = measures[j]->Parent(); - ASSERT(point); PointLeafItem *pointItem = new PointLeafItem( point, m_avgCharWidth, imageItem); pointItem->setSelectable(false); diff --git a/isis/src/qisis/objs/CnetEditorWidget/LineFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/LineFilter.cpp index bc8b5838e1..f981cd29ad 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/LineFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/LineFilter.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "LineFilter.h" #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/LineResidualFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/LineResidualFilter.cpp index 1a58930804..932106524a 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/LineResidualFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/LineResidualFilter.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "LineResidualFilter.h" #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/LineShiftFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/LineShiftFilter.cpp index f9b746409b..54bfda845b 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/LineShiftFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/LineShiftFilter.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "LineShiftFilter.h" #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/MeasureCountFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/MeasureCountFilter.cpp index 2117833bdf..a91f9581bc 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/MeasureCountFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/MeasureCountFilter.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "MeasureCountFilter.h" #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/MeasureIgnoredFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/MeasureIgnoredFilter.cpp index c6c96a06f7..58e85498eb 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/MeasureIgnoredFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/MeasureIgnoredFilter.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "MeasureIgnoredFilter.h" #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/MeasureJigsawRejectedFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/MeasureJigsawRejectedFilter.cpp index 09e83998a3..07b8230cfb 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/MeasureJigsawRejectedFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/MeasureJigsawRejectedFilter.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "MeasureJigsawRejectedFilter.h" #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/MeasureLeafItem.cpp b/isis/src/qisis/objs/CnetEditorWidget/MeasureLeafItem.cpp index 58da2e53ab..610651ee5c 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/MeasureLeafItem.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/MeasureLeafItem.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "MeasureLeafItem.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/MeasureTableDelegate.cpp b/isis/src/qisis/objs/CnetEditorWidget/MeasureTableDelegate.cpp index 281d640b76..908bd6e6b2 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/MeasureTableDelegate.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/MeasureTableDelegate.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "MeasureTableDelegate.h" #include @@ -79,7 +77,7 @@ namespace Isis { AbstractMeasureItem::getColumn(col->getTitle()); QString data = row->getFormattedData(col->getTitle()); - ASSERT(row->getPointerType() == AbstractTreeItem::Measure); + ControlMeasure *measure = (ControlMeasure *)row->getPointer(); switch (column) { @@ -119,7 +117,7 @@ namespace Isis { AbstractMeasureItem::getColumn(col->getTitle()); QString data = row->getFormattedData(col->getTitle()); - ASSERT(row->getPointerType() == AbstractTreeItem::Measure); + ControlMeasure *measure = (ControlMeasure *) row->getPointer(); switch (column) { diff --git a/isis/src/qisis/objs/CnetEditorWidget/MeasureTableModel.cpp b/isis/src/qisis/objs/CnetEditorWidget/MeasureTableModel.cpp index 601d86c912..758ba9f7c0 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/MeasureTableModel.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/MeasureTableModel.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "MeasureTableModel.h" #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/MeasureTypeFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/MeasureTypeFilter.cpp index 09801a2430..9a9471f6aa 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/MeasureTypeFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/MeasureTypeFilter.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "MeasureTypeFilter.h" #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointEditLockedFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/PointEditLockedFilter.cpp index c89db7e0d5..731d4c2b74 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/PointEditLockedFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/PointEditLockedFilter.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "PointEditLockedFilter.h" #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointIdFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/PointIdFilter.cpp index 0981418614..26fc5747de 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/PointIdFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/PointIdFilter.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "PointIdFilter.h" #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointIgnoredFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/PointIgnoredFilter.cpp index f5b490ba20..5b19e17e86 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/PointIgnoredFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/PointIgnoredFilter.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "PointIgnoredFilter.h" #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointJigsawRejectedFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/PointJigsawRejectedFilter.cpp index 02cf4e5ddf..474e9373ee 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/PointJigsawRejectedFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/PointJigsawRejectedFilter.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "PointJigsawRejectedFilter.h" #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointLeafItem.cpp b/isis/src/qisis/objs/CnetEditorWidget/PointLeafItem.cpp index 8815299f58..0346d5dfaf 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/PointLeafItem.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/PointLeafItem.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "PointLeafItem.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointMeasureFilterSelector.cpp b/isis/src/qisis/objs/CnetEditorWidget/PointMeasureFilterSelector.cpp index 72ee6d6f99..a2ed3c787c 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/PointMeasureFilterSelector.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/PointMeasureFilterSelector.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "PointMeasureFilterSelector.h" #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointMeasureTreeModel.cpp b/isis/src/qisis/objs/CnetEditorWidget/PointMeasureTreeModel.cpp index 483489dda8..a875336f8f 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/PointMeasureTreeModel.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/PointMeasureTreeModel.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "PointMeasureTreeModel.h" #include @@ -71,7 +69,6 @@ namespace Isis { for (int j = 0; j < point->GetNumMeasures(); j++) { const ControlMeasure *measure = point->GetMeasure(j); - ASSERT(measure); MeasureLeafItem *measureItem = new MeasureLeafItem( const_cast< ControlMeasure * >(measure), m_avgCharWidth, pointItem); @@ -119,7 +116,6 @@ namespace Isis { futureRoot.cancel(); } - ASSERT(getControlNetwork()); futureRoot = QtConcurrent::mappedReduced( getControlNetwork()->GetPoints(), CreateRootItemFunctor(this, QThread::currentThread()), diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointParentItem.cpp b/isis/src/qisis/objs/CnetEditorWidget/PointParentItem.cpp index 1c91057c1a..70e23c7bf9 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/PointParentItem.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/PointParentItem.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "PointParentItem.h" #include "MeasureLeafItem.h" @@ -25,9 +23,6 @@ namespace Isis { void PointParentItem::addChild(AbstractTreeItem *child) { - // Only MeasureLeafItems should be children of PointParentItems - ASSERT(dynamic_cast< MeasureLeafItem * >(child)); - AbstractParentItem::addChild(child); } } diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointTableDelegate.cpp b/isis/src/qisis/objs/CnetEditorWidget/PointTableDelegate.cpp index 8d3d102e38..f8c45bdfa0 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/PointTableDelegate.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/PointTableDelegate.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "PointTableDelegate.h" #include @@ -110,7 +108,7 @@ namespace Isis { AbstractPointItem::getColumn(columnTitle); QString data = row->getFormattedData(columnTitle); - ASSERT(row->getPointerType() == AbstractTreeItem::Point); + ControlPoint *point = (ControlPoint *)row->getPointer(); switch (column) { @@ -170,7 +168,7 @@ namespace Isis { AbstractPointItem::getColumn(columnTitle); QString data = row->getFormattedData(columnTitle); - ASSERT(row->getPointerType() == AbstractTreeItem::Point); + ControlPoint *point = (ControlPoint *)row->getPointer(); switch (column) { diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointTableModel.cpp b/isis/src/qisis/objs/CnetEditorWidget/PointTableModel.cpp index fd509cd477..60812f434c 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/PointTableModel.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/PointTableModel.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "PointTableModel.h" #include @@ -115,7 +113,6 @@ namespace Isis { case AbstractPointItem::APrioriSPLatSigma: case AbstractPointItem::APrioriSPLonSigma: case AbstractPointItem::APrioriSPRadiusSigma: { - ASSERT(row->getPointerType() == AbstractTreeItem::Point); ControlPoint *point = (ControlPoint *) row->getPointer(); // Check to see if any of the sigma values are null. @@ -137,7 +134,6 @@ namespace Isis { case AbstractPointItem::APrioriSPLat: case AbstractPointItem::APrioriSPLon: case AbstractPointItem::APrioriSPRadius: { - ASSERT(row->getPointerType() == AbstractTreeItem::Point); ControlPoint *point = (ControlPoint *) row->getPointer(); // Check to see if any of the surface point values are null. diff --git a/isis/src/qisis/objs/CnetEditorWidget/PointTypeFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/PointTypeFilter.cpp index 3cbeeda213..f7dbda0cc2 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/PointTypeFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/PointTypeFilter.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "PointTypeFilter.h" #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/ResidualMagnitudeFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/ResidualMagnitudeFilter.cpp index def7cbf6a0..91aee2a6b2 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/ResidualMagnitudeFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/ResidualMagnitudeFilter.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "ResidualMagnitudeFilter.h" #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/RootItem.cpp b/isis/src/qisis/objs/CnetEditorWidget/RootItem.cpp index 0dc65c210f..7f0ef50702 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/RootItem.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/RootItem.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "RootItem.h" diff --git a/isis/src/qisis/objs/CnetEditorWidget/SampleFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/SampleFilter.cpp index ea6f79975c..4c58c6c721 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/SampleFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/SampleFilter.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "SampleFilter.h" #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/SampleResidualFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/SampleResidualFilter.cpp index 77a1a59c83..78e79d116d 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/SampleResidualFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/SampleResidualFilter.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "SampleResidualFilter.h" #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/SampleShiftFilter.cpp b/isis/src/qisis/objs/CnetEditorWidget/SampleShiftFilter.cpp index 5f8e796b34..e254fc4c64 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/SampleShiftFilter.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/SampleShiftFilter.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "SampleShiftFilter.h" #include diff --git a/isis/src/qisis/objs/CnetEditorWidget/TableColumnList.cpp b/isis/src/qisis/objs/CnetEditorWidget/TableColumnList.cpp index 5a7472f73d..138667aaa9 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/TableColumnList.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/TableColumnList.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "TableColumnList.h" #include @@ -164,7 +162,6 @@ namespace Isis { int TableColumnList::size() const { - ASSERT(m_cols); return m_cols->size(); } @@ -239,7 +236,6 @@ namespace Isis { QList< TableColumn * > TableColumnList::getSortingOrder() { - ASSERT(m_sortingOrder); QList< TableColumn * > validSortingOrder; for (int i = 0; i < m_sortingOrder->size(); i++) @@ -268,7 +264,6 @@ namespace Isis { void TableColumnList::checkIndexRange(int index) { - ASSERT(m_cols); if (index < 0 || index >= m_cols->size()) { QString msg = "index ["; diff --git a/isis/src/qisis/objs/CnetEditorWidget/TableView.cpp b/isis/src/qisis/objs/CnetEditorWidget/TableView.cpp index efb5279c40..0daa72f73b 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/TableView.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/TableView.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "TableView.h" #include @@ -126,7 +124,6 @@ namespace Isis { */ TableView::~TableView() { // save column widths - ASSERT(objectName().size()); if (m_settingsPath->size() && objectName().size()) { QSettings settings(*m_settingsPath, QSettings::NativeFormat); QString key; @@ -203,11 +200,9 @@ namespace Isis { // void TableView::setModel(AbstractTableModel * newModel) // { - // ASSERT(m_content); // // if (newModel) // { - // ASSERT(m_header); // connect(newModel, SIGNAL(filterProgressChanged(int)), // m_header, SLOT(updateFilterProgress(int))); // connect(newModel, SIGNAL(rebuildProgressChanged(int)), diff --git a/isis/src/qisis/objs/CnetEditorWidget/TableViewContent.cpp b/isis/src/qisis/objs/CnetEditorWidget/TableViewContent.cpp index c0a72043ab..2e2710eafe 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/TableViewContent.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/TableViewContent.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "TableViewContent.h" #include @@ -84,7 +82,6 @@ namespace Isis { verticalScrollBar()->setSingleStep(1); m_rowHeight = QFontMetrics(font()).height() + ITEM_PADDING; - ASSERT(m_rowHeight > 0); connect(horizontalScrollBar(), SIGNAL(valueChanged(int)), this, SIGNAL(horizontalScrollBarValueChanged(int))); @@ -165,7 +162,6 @@ namespace Isis { * @return AbstractTableModel The model of the table */ AbstractTableModel *TableViewContent::getModel() { - ASSERT(m_model); return m_model; } @@ -605,7 +601,6 @@ namespace Isis { else if (key == Qt::Key_Up || key == Qt::Key_Down || key == Qt::Key_Left || key == Qt::Key_Right) { if (!hasActiveCell()) { - ASSERT(m_items); if (m_items && m_items->size()) { m_activeCell->first = (*m_items)[0]; m_activeCell->second = 1; @@ -613,12 +608,9 @@ namespace Isis { } if (hasActiveCell() && !m_editWidget) { - // should have m_items if we have an active cell - ASSERT(m_items->size()); // Handle up arrow with shift pressed if (key == Qt::Key_Up && event->modifiers() == Qt::ShiftModifier) { - ASSERT(m_lastShiftArrowSelectedCell); AbstractTreeItem *prevCell = m_lastShiftArrowSelectedCell->first ? m_lastShiftArrowSelectedCell->first : m_activeCell->first; @@ -653,7 +645,6 @@ namespace Isis { } else { //int m_itemsLastIndex = m_items->size() - 1; - //ASSERT(m_itemsPrevIndex == m_items->at(m_items->size() - 1)); //verticalScrollBar()->setValue(qMin(prevCell + 1, )); } } @@ -702,7 +693,6 @@ namespace Isis { } else { //int m_itemsLastIndex = m_items->size() - 1; - //ASSERT(m_itemsPrevIndex == m_items->at(m_items->size() - 1)); //verticalScrollBar()->setValue(qMin(prevCell + 1, )); } } @@ -739,8 +729,6 @@ namespace Isis { if (!m_items->contains(m_activeCell->first)) scrollTo(m_activeCell->first); - ASSERT(m_items->contains(m_activeCell->first)); - if (m_items->contains(m_activeCell->first) && cellIsEditable(m_items->indexOf(m_activeCell->first), m_activeCell->second)) { @@ -860,8 +848,6 @@ namespace Isis { * @param event The paint event */ void TableViewContent::paintEvent(QPaintEvent *event) { - ASSERT(m_model); - ASSERT(m_columns); if (m_model && m_columns) { // int startRow = verticalScrollBar()->value(); int rowCount = (int) ceil(viewport()->height() / (double) m_rowHeight); @@ -1048,7 +1034,6 @@ namespace Isis { * Clears the selected column */ void TableViewContent::clearColumnSelection() { - ASSERT(m_lastShiftArrowSelectedCell); m_lastShiftArrowSelectedCell->first = NULL; rowsWithActiveColumnSelected->clear(); } @@ -1064,7 +1049,6 @@ namespace Isis { TableColumn *col = m_columns->getVisibleColumns()[m_activeCell->second]; QString colTitle = col->getTitle(); - ASSERT(colTitle.size()); // Grab the active cell's data and copy it to the selected cells that are // in the same column as the active cell. @@ -1072,7 +1056,6 @@ namespace Isis { QList< AbstractTreeItem * > selection = allCells ? m_model->getItems( 0, m_model->getVisibleRowCount()) : *rowsWithActiveColumnSelected; - ASSERT(selection.size()); bool needsDialog = true; bool done = false; @@ -1274,8 +1257,6 @@ namespace Isis { * @return bool True if the cell is selectable and editable */ bool TableViewContent::cellIsEditable(int rowNum, int colNum) const { - ASSERT(rowNum >= 0 && rowNum < m_items->size()); - ASSERT(colNum >= 0 && colNum < m_columns->getVisibleColumns().size()); bool editable = false; @@ -1312,8 +1293,6 @@ namespace Isis { */ void TableViewContent::paintRow(QPainter *painter, int rowNum, QPoint absolutePosition, QPoint relativePosition) { - ASSERT(m_items); - ASSERT(rowNum >= 0 && rowNum < m_items->size()); QPoint point(-absolutePosition.x(), relativePosition.y()); @@ -1333,7 +1312,6 @@ namespace Isis { QPen gridPen(Qt::gray); - ASSERT(m_columns); TableColumnList visibleCols = m_columns->getVisibleColumns(); for (int i = 0; i < visibleCols.size(); i++) { // draw text @@ -1653,7 +1631,6 @@ namespace Isis { * Updates the item list */ void TableViewContent::updateItemList() { - ASSERT(m_items); if (m_model) { int startRow = verticalScrollBar()->value(); diff --git a/isis/src/qisis/objs/CnetEditorWidget/TableViewHeader.cpp b/isis/src/qisis/objs/CnetEditorWidget/TableViewHeader.cpp index 0bae681b54..2a2842076c 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/TableViewHeader.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/TableViewHeader.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "TableViewHeader.h" #include @@ -328,7 +326,7 @@ namespace Isis { QPainter::TextAntialiasing); ARROW_HEIGHT = qMax(height() / 5, 3); - ASSERT(height() > 8); + ARROW_WIDTH = ARROW_HEIGHT * 2 - 1; paintHeader(&painter, height()); @@ -548,17 +546,12 @@ namespace Isis { if (visibleCol == visibleCols.getSortingOrder()[0] && visibleCol->getWidth() >= SORT_ARROW_MARGIN * 2 + ARROW_WIDTH) { - ASSERT(SORT_ARROW_MARGIN > 0); QRect arrowRect(textRect.right() + 1, textRect.y(), SORT_ARROW_MARGIN * 2 + ARROW_WIDTH, textRect.height()); - ASSERT(arrowRect.width() + textRect.width() == columnRect.width()); - ASSERT(arrowRect.right() == columnRect.right()); - - // assume ascending order (arrow looks like v) QPoint left(arrowRect.left() + SORT_ARROW_MARGIN, arrowRect.center().y() - ((ARROW_HEIGHT - 1) / 2)); @@ -572,9 +565,6 @@ namespace Isis { QPoint right(center.x() + ((ARROW_WIDTH - 1) / 2), arrowRect.center().y() - ((ARROW_HEIGHT - 1) / 2)); - ASSERT(right.x() == arrowRect.right() - SORT_ARROW_MARGIN); - ASSERT(right.x() - center.x() == center.x() - left.x()); - if (!visibleCol->sortAscending()) { // flip arrow (to look like ^) left.setY(center.y()); diff --git a/isis/src/qisis/objs/CnetEditorWidget/TreeView.cpp b/isis/src/qisis/objs/CnetEditorWidget/TreeView.cpp index 996d0f5256..56c6b63f20 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/TreeView.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/TreeView.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "TreeView.h" #include @@ -60,7 +58,6 @@ namespace Isis { void TreeView::setModel(AbstractTreeModel *someModel) { - ASSERT(m_content); m_content->setModel(someModel); connect(someModel, SIGNAL(filterProgressChanged(int)), @@ -102,7 +99,6 @@ namespace Isis { void TreeView::deactivate() { m_active = false; - ASSERT(m_header); if (m_header) m_header->setActive(false); update(); @@ -112,7 +108,6 @@ namespace Isis { void TreeView::activate() { m_active = true; - ASSERT(m_header); if (m_header) m_header->setActive(true); update(); diff --git a/isis/src/qisis/objs/CnetEditorWidget/TreeViewContent.cpp b/isis/src/qisis/objs/CnetEditorWidget/TreeViewContent.cpp index 7d91866824..7e25861f8d 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/TreeViewContent.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/TreeViewContent.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "TreeViewContent.h" #include @@ -49,7 +47,6 @@ namespace Isis { horizontalScrollBar()->setSingleStep(10); m_rowHeight = QFontMetrics(font()).height() + ITEM_PADDING; m_contentWidth = 0; - ASSERT(m_rowHeight > 0); setMouseTracking(true); setContextMenuPolicy(Qt::ActionsContextMenu); @@ -127,7 +124,7 @@ namespace Isis { void TreeViewContent::refresh() { - ASSERT(m_model); + if (m_model) { if (!m_model->isFiltering()) { QSize modelVisibleSize = @@ -337,7 +334,6 @@ namespace Isis { if (m_alternatingRowColors && (startRow + i) % 2 == 1) backgroundColor = palette().alternateBase().color(); - ASSERT(m_items->at(i)); if (m_items->at(i)->isSelected()) backgroundColor = palette().highlight().color(); } @@ -410,9 +406,7 @@ namespace Isis { void TreeViewContent::paintItemText(QPainter *painter, int index, QPoint absolutePosition, QPoint relativePosition) { - ASSERT(m_items); - ASSERT(index >= 0 && index < m_items->size()); - + QPoint point(-absolutePosition.x(), relativePosition.y()); AbstractTreeItem *item = (*m_items)[index]; diff --git a/isis/src/qisis/objs/CnetEditorWidget/TreeViewHeader.cpp b/isis/src/qisis/objs/CnetEditorWidget/TreeViewHeader.cpp index 574b7f3065..bac333bce8 100644 --- a/isis/src/qisis/objs/CnetEditorWidget/TreeViewHeader.cpp +++ b/isis/src/qisis/objs/CnetEditorWidget/TreeViewHeader.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "TreeViewHeader.h" #include @@ -33,8 +31,6 @@ namespace Isis { QWidget *parent) : QWidget(parent), m_content(someContent) { nullify(); - ASSERT(m_content); - m_headerText = new QString("Header text"); m_filterProgress = 0; m_filterProgressMin = 0; @@ -69,13 +65,11 @@ namespace Isis { } QString TreeViewHeader::getText() { - ASSERT(m_headerText); return *m_headerText; } void TreeViewHeader::setText(QString text) { - ASSERT(m_headerText); *m_headerText = text; updateGeometry(); update(); diff --git a/isis/src/qisis/objs/ControlHealthMonitorView/ControlHealthMonitorView.cpp b/isis/src/qisis/objs/ControlHealthMonitorView/ControlHealthMonitorView.cpp index 4557405237..007303a458 100644 --- a/isis/src/qisis/objs/ControlHealthMonitorView/ControlHealthMonitorView.cpp +++ b/isis/src/qisis/objs/ControlHealthMonitorView/ControlHealthMonitorView.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "ControlHealthMonitorView.h" #include diff --git a/isis/src/qisis/objs/ControlPointEditView/ControlPointEditView.cpp b/isis/src/qisis/objs/ControlPointEditView/ControlPointEditView.cpp index 67a9d438d6..3f42c09d7f 100644 --- a/isis/src/qisis/objs/ControlPointEditView/ControlPointEditView.cpp +++ b/isis/src/qisis/objs/ControlPointEditView/ControlPointEditView.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "ControlPointEditView.h" #include diff --git a/isis/src/qisis/objs/ControlPointEditWidget/ControlPointEditWidget.cpp b/isis/src/qisis/objs/ControlPointEditWidget/ControlPointEditWidget.cpp index 1945e03d39..e1461c0ec4 100644 --- a/isis/src/qisis/objs/ControlPointEditWidget/ControlPointEditWidget.cpp +++ b/isis/src/qisis/objs/ControlPointEditWidget/ControlPointEditWidget.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "ControlPointEditWidget.h" #include diff --git a/isis/src/qisis/objs/CubePlotCurve/CubePlotCurve.cpp b/isis/src/qisis/objs/CubePlotCurve/CubePlotCurve.cpp index 9cd28aa698..b8991e62eb 100644 --- a/isis/src/qisis/objs/CubePlotCurve/CubePlotCurve.cpp +++ b/isis/src/qisis/objs/CubePlotCurve/CubePlotCurve.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "CubePlotCurve.h" #include @@ -117,7 +115,6 @@ namespace Isis { m_pointList.append(points); } - ASSERT(dataPos == classData.size()); } else { IString msg = "The given byte array is not large enough to contain the " diff --git a/isis/src/qisis/objs/CubeViewport/CubeViewport.cpp b/isis/src/qisis/objs/CubeViewport/CubeViewport.cpp index 2bb966ed0d..c3c9fa3ad4 100644 --- a/isis/src/qisis/objs/CubeViewport/CubeViewport.cpp +++ b/isis/src/qisis/objs/CubeViewport/CubeViewport.cpp @@ -6,7 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" #include "CubeViewport.h" #include @@ -2422,8 +2421,6 @@ namespace Isis { CubeStretch CubeViewport::BandInfo::getStretch() const { - ASSERT_PTR(stretch); - return *stretch; } @@ -2435,7 +2432,6 @@ namespace Isis { const CubeViewport::BandInfo &CubeViewport::BandInfo::operator=( CubeViewport::BandInfo other) { - ASSERT_PTR(other.stretch); stretch = NULL; stretch = new CubeStretch; diff --git a/isis/src/qisis/objs/CubeViewport/ViewportBuffer.cpp b/isis/src/qisis/objs/CubeViewport/ViewportBuffer.cpp index fe041225a7..b776321780 100644 --- a/isis/src/qisis/objs/CubeViewport/ViewportBuffer.cpp +++ b/isis/src/qisis/objs/CubeViewport/ViewportBuffer.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "ViewportBuffer.h" #include "ViewportBufferAction.h" #include "ViewportBufferStretch.h" diff --git a/isis/src/qisis/objs/FeatureNomenclature/FeatureNomenclature.cpp b/isis/src/qisis/objs/FeatureNomenclature/FeatureNomenclature.cpp index bdd96ad6d4..e397a43a72 100644 --- a/isis/src/qisis/objs/FeatureNomenclature/FeatureNomenclature.cpp +++ b/isis/src/qisis/objs/FeatureNomenclature/FeatureNomenclature.cpp @@ -1,4 +1,3 @@ -#include "IsisDebug.h" #include "FeatureNomenclature.h" #include @@ -858,7 +857,6 @@ namespace Isis { * @param xmlSearchResults The searchresults XML from the nomenclature server. */ void FeatureNomenclature::readSearchResults(QDomElement xmlSearchResults) { - ASSERT(xmlSearchResults.tagName() == "searchresults"); if (!m_features) m_features = new QList; diff --git a/isis/src/qisis/objs/FeatureNomenclatureTool/FeatureNomenclatureTool.cpp b/isis/src/qisis/objs/FeatureNomenclatureTool/FeatureNomenclatureTool.cpp index c203488876..e8f6cb5fdf 100644 --- a/isis/src/qisis/objs/FeatureNomenclatureTool/FeatureNomenclatureTool.cpp +++ b/isis/src/qisis/objs/FeatureNomenclatureTool/FeatureNomenclatureTool.cpp @@ -1,4 +1,3 @@ -#include "IsisDebug.h" #include "FeatureNomenclatureTool.h" #include diff --git a/isis/src/qisis/objs/Footprint2DView/Footprint2DView.cpp b/isis/src/qisis/objs/Footprint2DView/Footprint2DView.cpp index 7a01f3c4a6..09e50befbe 100644 --- a/isis/src/qisis/objs/Footprint2DView/Footprint2DView.cpp +++ b/isis/src/qisis/objs/Footprint2DView/Footprint2DView.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "Footprint2DView.h" #include diff --git a/isis/src/qisis/objs/MatrixSceneWidget/MatrixSceneWidget.cpp b/isis/src/qisis/objs/MatrixSceneWidget/MatrixSceneWidget.cpp index 84c88f9353..36a71054cb 100644 --- a/isis/src/qisis/objs/MatrixSceneWidget/MatrixSceneWidget.cpp +++ b/isis/src/qisis/objs/MatrixSceneWidget/MatrixSceneWidget.cpp @@ -1,5 +1,3 @@ -#include "IsisDebug.h" - #include "MatrixSceneWidget.h" #include diff --git a/isis/src/qisis/objs/MeasureTool/MeasureTool.cpp b/isis/src/qisis/objs/MeasureTool/MeasureTool.cpp index c79081b2a0..eee562305a 100644 --- a/isis/src/qisis/objs/MeasureTool/MeasureTool.cpp +++ b/isis/src/qisis/objs/MeasureTool/MeasureTool.cpp @@ -1,4 +1,3 @@ -#include "IsisDebug.h" #include "MeasureTool.h" #include @@ -339,7 +338,6 @@ namespace Isis { * @param row */ void MeasureTool::updateRow(int row) { - ASSERT(row < m_tableWin->table()->rowCount()); if (row >= m_tableWin->table()->rowCount()) { return; diff --git a/isis/src/qisis/objs/MosaicSceneWidget/MosaicSceneWidget.cpp b/isis/src/qisis/objs/MosaicSceneWidget/MosaicSceneWidget.cpp index 9b67f72f1d..03920067e1 100644 --- a/isis/src/qisis/objs/MosaicSceneWidget/MosaicSceneWidget.cpp +++ b/isis/src/qisis/objs/MosaicSceneWidget/MosaicSceneWidget.cpp @@ -1,5 +1,3 @@ -#include "IsisDebug.h" - #include "MosaicSceneWidget.h" #include @@ -2019,7 +2017,6 @@ namespace Isis { ImageList *images = action->data().value(); foreach (Image *image, *images) { - ASSERT(cubeToMosaic(image)); boundingBox = boundingBox.united(cubeToMosaic(image)->boundingRect()); } } @@ -2205,7 +2202,6 @@ namespace Isis { } } else if (localName == "images" && m_imagesToAdd->count()) { - ASSERT(m_imagesToAdd->count() == m_imageZValues.count()); m_scene->addImages(*m_imagesToAdd); for (int i = 0; i < m_imageZValues.count(); i++) { diff --git a/isis/src/qisis/objs/MosaicSceneWidget/MosaicSceneWorkOrder.cpp b/isis/src/qisis/objs/MosaicSceneWidget/MosaicSceneWorkOrder.cpp index a1d771ed51..6c013a67b8 100644 --- a/isis/src/qisis/objs/MosaicSceneWidget/MosaicSceneWorkOrder.cpp +++ b/isis/src/qisis/objs/MosaicSceneWidget/MosaicSceneWorkOrder.cpp @@ -1,4 +1,3 @@ -#include "IsisDebug.h" #include "MosaicSceneWorkOrder.h" #include @@ -67,8 +66,6 @@ namespace Isis { void MosaicSceneWorkOrder::restoreZPositions(bool zValuesMightBeInUse) { QStringList zPositions = internalData().mid(1); - ASSERT(zPositions.count() == imageList()->count()); - MosaicSceneWidget *sceneWidget = scene(); QProgressDialog progress(tr("Restoring Z Values"), "", 0, imageList()->count()); diff --git a/isis/src/qisis/objs/MosaicSceneWidget/MoveDownOneSceneWorkOrder.cpp b/isis/src/qisis/objs/MosaicSceneWidget/MoveDownOneSceneWorkOrder.cpp index 9131368c7a..6434237ad2 100644 --- a/isis/src/qisis/objs/MosaicSceneWidget/MoveDownOneSceneWorkOrder.cpp +++ b/isis/src/qisis/objs/MosaicSceneWidget/MoveDownOneSceneWorkOrder.cpp @@ -1,4 +1,3 @@ -#include "IsisDebug.h" #include "MoveDownOneSceneWorkOrder.h" #include "MosaicSceneWidget.h" diff --git a/isis/src/qisis/objs/MosaicSceneWidget/MoveToBottomSceneWorkOrder.cpp b/isis/src/qisis/objs/MosaicSceneWidget/MoveToBottomSceneWorkOrder.cpp index a021d6646c..a28a1da75f 100644 --- a/isis/src/qisis/objs/MosaicSceneWidget/MoveToBottomSceneWorkOrder.cpp +++ b/isis/src/qisis/objs/MosaicSceneWidget/MoveToBottomSceneWorkOrder.cpp @@ -1,4 +1,3 @@ -#include "IsisDebug.h" #include "MoveToBottomSceneWorkOrder.h" #include "MosaicSceneWidget.h" diff --git a/isis/src/qisis/objs/MosaicSceneWidget/MoveToTopSceneWorkOrder.cpp b/isis/src/qisis/objs/MosaicSceneWidget/MoveToTopSceneWorkOrder.cpp index 75c59af134..c0d0a949d1 100644 --- a/isis/src/qisis/objs/MosaicSceneWidget/MoveToTopSceneWorkOrder.cpp +++ b/isis/src/qisis/objs/MosaicSceneWidget/MoveToTopSceneWorkOrder.cpp @@ -1,4 +1,3 @@ -#include "IsisDebug.h" #include "MoveToTopSceneWorkOrder.h" #include "MosaicSceneWidget.h" diff --git a/isis/src/qisis/objs/MosaicSceneWidget/MoveUpOneSceneWorkOrder.cpp b/isis/src/qisis/objs/MosaicSceneWidget/MoveUpOneSceneWorkOrder.cpp index 06621a1089..658c0b6379 100644 --- a/isis/src/qisis/objs/MosaicSceneWidget/MoveUpOneSceneWorkOrder.cpp +++ b/isis/src/qisis/objs/MosaicSceneWidget/MoveUpOneSceneWorkOrder.cpp @@ -1,4 +1,3 @@ -#include "IsisDebug.h" #include "MoveUpOneSceneWorkOrder.h" #include "MosaicSceneWidget.h" diff --git a/isis/src/qisis/objs/PlotCurve/PlotCurve.cpp b/isis/src/qisis/objs/PlotCurve/PlotCurve.cpp index abd090befb..e1047f9c2e 100644 --- a/isis/src/qisis/objs/PlotCurve/PlotCurve.cpp +++ b/isis/src/qisis/objs/PlotCurve/PlotCurve.cpp @@ -1,5 +1,3 @@ -#include "IsisDebug.h" - #include "PlotCurve.h" #include @@ -248,7 +246,6 @@ namespace Isis { } setData(new QwtPointSeriesData(plotDataValues)); - ASSERT(dataPos <= classData.size()); return classData.right(classData.size() - dataPos); } diff --git a/isis/src/qisis/objs/PlotWindow/PlotWindow.cpp b/isis/src/qisis/objs/PlotWindow/PlotWindow.cpp index a86cb0b943..2bb6902199 100644 --- a/isis/src/qisis/objs/PlotWindow/PlotWindow.cpp +++ b/isis/src/qisis/objs/PlotWindow/PlotWindow.cpp @@ -1,5 +1,3 @@ -#include "IsisDebug.h" - #include "PlotWindow.h" #include diff --git a/isis/src/qisis/objs/PlotWindow/PlotWindowBestFitDialog.cpp b/isis/src/qisis/objs/PlotWindow/PlotWindowBestFitDialog.cpp index 4c8086fd5c..9d5a2325b5 100644 --- a/isis/src/qisis/objs/PlotWindow/PlotWindowBestFitDialog.cpp +++ b/isis/src/qisis/objs/PlotWindow/PlotWindowBestFitDialog.cpp @@ -1,5 +1,3 @@ -#include "IsisDebug.h" - #include "PlotWindowBestFitDialog.h" #include diff --git a/isis/src/qisis/objs/Project/Project.cpp b/isis/src/qisis/objs/Project/Project.cpp index a84abc6183..601da42ec5 100644 --- a/isis/src/qisis/objs/Project/Project.cpp +++ b/isis/src/qisis/objs/Project/Project.cpp @@ -20,7 +20,6 @@ * http://isis.astrogeology.usgs.gov, and the USGS privacy and disclaimers on * http://www.usgs.gov/privacy.html. */ -#include "IsisDebug.h" #include "Project.h" #include @@ -3018,7 +3017,6 @@ namespace Isis { QString type = atts.value("type"); m_workOrder = WorkOrderFactory::create(m_project, type); - ASSERT(m_workOrder->metaObject()->className() == type); m_workOrder->read(reader()); } diff --git a/isis/src/qisis/objs/ProjectItemModel/ProjectItemModel.cpp b/isis/src/qisis/objs/ProjectItemModel/ProjectItemModel.cpp index b1d3c4ffa8..c69b5dbc2f 100644 --- a/isis/src/qisis/objs/ProjectItemModel/ProjectItemModel.cpp +++ b/isis/src/qisis/objs/ProjectItemModel/ProjectItemModel.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "ProjectItemModel.h" #include #include diff --git a/isis/src/qisis/objs/ProjectItemProxyModel/ProjectItemProxyModel.cpp b/isis/src/qisis/objs/ProjectItemProxyModel/ProjectItemProxyModel.cpp index 22f6a46381..cba07d2d08 100644 --- a/isis/src/qisis/objs/ProjectItemProxyModel/ProjectItemProxyModel.cpp +++ b/isis/src/qisis/objs/ProjectItemProxyModel/ProjectItemProxyModel.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "ProjectItemProxyModel.h" #include diff --git a/isis/src/qisis/objs/ScatterPlotTool/ScatterPlotConfigDialog.cpp b/isis/src/qisis/objs/ScatterPlotTool/ScatterPlotConfigDialog.cpp index c24ab920b9..d1d964b528 100644 --- a/isis/src/qisis/objs/ScatterPlotTool/ScatterPlotConfigDialog.cpp +++ b/isis/src/qisis/objs/ScatterPlotTool/ScatterPlotConfigDialog.cpp @@ -1,4 +1,3 @@ -#include "IsisDebug.h" #include "ScatterPlotConfigDialog.h" #include @@ -495,7 +494,6 @@ namespace Isis { if (m_useViewportRangesCheckBox->isChecked()) { MdiCubeViewport * container = xAxisCubeViewport(); if (!container && xAxisCube()) { - ASSERT(0); sampleRange.setInterval(1.0, xAxisCube()->sampleCount()); lineRange.setInterval(1.0, xAxisCube()->lineCount()); } diff --git a/isis/src/qisis/objs/ScatterPlotTool/ScatterPlotData.cpp b/isis/src/qisis/objs/ScatterPlotTool/ScatterPlotData.cpp index d2a686bcc3..3dd430fcd8 100644 --- a/isis/src/qisis/objs/ScatterPlotTool/ScatterPlotData.cpp +++ b/isis/src/qisis/objs/ScatterPlotTool/ScatterPlotData.cpp @@ -1,4 +1,3 @@ -#include "IsisDebug.h" #include "ScatterPlotData.h" #include @@ -36,7 +35,6 @@ namespace Isis { m_alarmedBins(new QMap) { int startLine = qRound(lineRange.minValue()); int endLine = qRound(lineRange.maxValue()); - ASSERT(xCube->lineCount() == yCube->lineCount()); ImageHistogram *xCubeHist = new ImageHistogram(*xCube, xCubeBand, NULL, sampleRange.minValue(), lineRange.minValue(), @@ -66,8 +64,6 @@ namespace Isis { 1, 1, xCube->pixelType()); Brick brick2((int)(sampleRange.maxValue() - sampleRange.minValue() + 1), 1, 1, yCube->pixelType()); - ASSERT(xCube->sampleCount() == yCube->sampleCount()); - ASSERT(brick1.size() == brick2.size()); for (int line = startLine; line <= endLine; line++) { brick1.SetBasePosition(qRound(sampleRange.minValue()), line, xCubeBand); diff --git a/isis/src/qisis/objs/ScatterPlotTool/ScatterPlotWindow.cpp b/isis/src/qisis/objs/ScatterPlotTool/ScatterPlotWindow.cpp index 8506b7ba5d..19a8ed3573 100644 --- a/isis/src/qisis/objs/ScatterPlotTool/ScatterPlotWindow.cpp +++ b/isis/src/qisis/objs/ScatterPlotTool/ScatterPlotWindow.cpp @@ -1,4 +1,3 @@ -#include "IsisDebug.h" #include "ScatterPlotWindow.h" #include @@ -436,7 +435,6 @@ namespace Isis { yCubePortal->SetPosition(cubeSample, cubeLine, m_yAxisCubeBand); m_yAxisCube->read(*yCubePortal); - ASSERT(xCubePortal->size() == yCubePortal->size()); for (int i = 0; i < xCubePortal->size(); i++) { double x = (*xCubePortal)[i]; double y = (*yCubePortal)[i]; diff --git a/isis/src/qisis/objs/SpatialPlotTool/SpatialPlotTool.cpp b/isis/src/qisis/objs/SpatialPlotTool/SpatialPlotTool.cpp index 263d07480c..c65ad97645 100644 --- a/isis/src/qisis/objs/SpatialPlotTool/SpatialPlotTool.cpp +++ b/isis/src/qisis/objs/SpatialPlotTool/SpatialPlotTool.cpp @@ -1,5 +1,3 @@ -#include "IsisDebug.h" - #include "SpatialPlotTool.h" #include diff --git a/isis/src/qisis/objs/SpectralPlotTool/SpectralPlotTool.cpp b/isis/src/qisis/objs/SpectralPlotTool/SpectralPlotTool.cpp index 88d8d5f2ca..c9d09a8500 100644 --- a/isis/src/qisis/objs/SpectralPlotTool/SpectralPlotTool.cpp +++ b/isis/src/qisis/objs/SpectralPlotTool/SpectralPlotTool.cpp @@ -1,5 +1,3 @@ -#include "IsisDebug.h" - #include "SpectralPlotTool.h" #include @@ -73,7 +71,6 @@ namespace Isis { */ QComboBox *SpectralPlotTool::spectralDisplayCombo() const { - ASSERT(m_displayCombo); return m_displayCombo; } diff --git a/isis/src/qisis/objs/SpectralPlotTool/SpectralPlotWindow.cpp b/isis/src/qisis/objs/SpectralPlotTool/SpectralPlotWindow.cpp index 35414b0bd8..51a191e396 100644 --- a/isis/src/qisis/objs/SpectralPlotTool/SpectralPlotWindow.cpp +++ b/isis/src/qisis/objs/SpectralPlotTool/SpectralPlotWindow.cpp @@ -1,5 +1,3 @@ -#include "IsisDebug.h" - #include "SpectralPlotWindow.h" #include diff --git a/isis/src/qisis/objs/SunShadowTool/SunShadowTool.cpp b/isis/src/qisis/objs/SunShadowTool/SunShadowTool.cpp index ae0b2004de..f9b7fad9fa 100644 --- a/isis/src/qisis/objs/SunShadowTool/SunShadowTool.cpp +++ b/isis/src/qisis/objs/SunShadowTool/SunShadowTool.cpp @@ -1,4 +1,3 @@ -#include "IsisDebug.h" #include "SunShadowTool.h" #include @@ -316,7 +315,6 @@ namespace Isis { * @param row */ void SunShadowTool::updateRow(int row) { - ASSERT(row < m_tableWin->table()->rowCount()); if (row >= m_tableWin->table()->rowCount() || ! m_tableWin->isVisible()) { diff --git a/isis/src/qisis/objs/Tab/Tab.cpp b/isis/src/qisis/objs/Tab/Tab.cpp index 34ebeb8135..6c0b32e572 100644 --- a/isis/src/qisis/objs/Tab/Tab.cpp +++ b/isis/src/qisis/objs/Tab/Tab.cpp @@ -1,5 +1,3 @@ -#include "IsisDebug.h" - #include "Tab.h" //#include @@ -26,8 +24,6 @@ namespace Isis setCheckable(true); connect(this, SIGNAL(triggered()), this, SLOT(handleTriggered())); - - ASSERT_PTR(associatedWidget); } diff --git a/isis/src/qisis/objs/WorkOrder/WorkOrder.cpp b/isis/src/qisis/objs/WorkOrder/WorkOrder.cpp index 58bc203a7a..a1460b4192 100644 --- a/isis/src/qisis/objs/WorkOrder/WorkOrder.cpp +++ b/isis/src/qisis/objs/WorkOrder/WorkOrder.cpp @@ -6,8 +6,6 @@ find files of those names at the top level of this repository. **/ /* SPDX-License-Identifier: CC0-1.0 */ -#include "IsisDebug.h" - #include "WorkOrder.h" #include diff --git a/isis/src/system/apps/isiscomplete/main.cpp b/isis/src/system/apps/isiscomplete/main.cpp index a4477e048f..2ec8d0f735 100644 --- a/isis/src/system/apps/isiscomplete/main.cpp +++ b/isis/src/system/apps/isiscomplete/main.cpp @@ -25,13 +25,6 @@ int main(int argc, char *argv[]) { return 0; } - // Too slow if in debug mode -#ifndef CWDEBUG - for(int i = 1; i < argc; i++) { - MakeCompletion(argv[i]); - } -#endif - return 0; } -- GitLab