From 84f9dd2d4585c9b3821b5fa1b3806694bc30e946 Mon Sep 17 00:00:00 2001 From: Michael Jackson Date: Wed, 2 Feb 2022 11:13:37 -0500 Subject: [PATCH] Remove EMTime functionality. Update Release notes for 6.5.163 Update codes to compile on Apple M1 ARM64 arch. Remove Qt Keywords signals/slots/emit as they clash with oneTBB API Signed-off-by: Michael Jackson --- CMakeLists.txt | 1 + .../5_ReleaseNotes/ReleaseNotes_6_5_0.md | 6 +- .../6_Developer/WritingAFilter.md | 6 +- Documentation/Tools/GenerateHTMLDocs.cpp | 4 +- Resources/CPack/PackageProject.cmake | 2 +- Source/EbsdLib/CMakeLists.txt | 1 + Source/EbsdLib/TSL/H5OIMReader.cpp | 2 +- Source/OrientationLib/LaueOps/CubicLowOps.cpp | 7 +- Source/OrientationLib/LaueOps/CubicOps.cpp | 7 +- .../LaueOps/HexagonalLowOps.cpp | 7 +- .../OrientationLib/LaueOps/HexagonalOps.cpp | 7 +- .../OrientationLib/LaueOps/MonoclinicOps.cpp | 7 +- .../LaueOps/OrthoRhombicOps.cpp | 7 +- .../LaueOps/TetragonalLowOps.cpp | 7 +- .../OrientationLib/LaueOps/TetragonalOps.cpp | 7 +- .../OrientationLib/LaueOps/TriclinicOps.cpp | 7 +- .../OrientationLib/LaueOps/TrigonalLowOps.cpp | 7 +- Source/OrientationLib/LaueOps/TrigonalOps.cpp | 7 +- .../OrientationMath/OrientationConverter.hpp | 23 ++--- .../EMMPM/EMMPMFilters/EMMPMFilter.cpp | 7 +- .../Plugins/EMMPM/EMMPMFilters/EMMPMFilter.h | 2 +- .../EMMPM/EMMPMFilters/MultiEmmpmFilter.cpp | 7 +- .../Plugins/EMMPM/EMMPMLib/Common/EMTime.cpp | 85 ------------------- Source/Plugins/EMMPM/EMMPMLib/Common/EMTime.h | 57 ------------- .../EMMPM/EMMPMLib/Common/SourceList.cmake | 2 - .../EMMPM/EMMPMLib/Core/EMCalculation.cpp | 4 +- Source/Plugins/EMMPM/EMMPMLib/Core/EMMPM.cpp | 1 - .../EMMPMLib/Core/InitializationFunctions.cpp | 1 - .../EMMPM/EMMPMLib/Core/MPMCalculation.cpp | 6 +- .../FilterParameterWidgets/EMMPMWidget.cpp | 2 +- .../Gui/FilterParameterWidgets/EMMPMWidget.h | 2 +- Source/Plugins/EMMPM/Tools/main.cpp | 5 +- .../GenericFilters/FindBoundaryCells.cpp | 6 +- .../GenericFilters/FindBoundaryCells.h | 2 +- .../FindBoundingBoxFeatures.cpp | 6 +- .../GenericFilters/FindBoundingBoxFeatures.h | 2 +- .../GenericFilters/FindFeatureCentroids.cpp | 6 +- .../GenericFilters/FindFeatureCentroids.h | 2 +- .../GenericFilters/FindFeaturePhases.cpp | 6 +- .../GenericFilters/FindFeaturePhases.h | 2 +- .../FindFeaturePhasesBinary.cpp | 6 +- .../GenericFilters/FindFeaturePhasesBinary.h | 2 +- .../GenericFilters/FindSurfaceFeatures.cpp | 6 +- .../GenericFilters/FindSurfaceFeatures.h | 2 +- .../GenericFilters/GenerateVectorColors.cpp | 6 +- .../GenericFilters/GenerateVectorColors.h | 2 +- .../AbaqusHexahedronWriter.cpp | 6 +- .../AbaqusHexahedronWriter.h | 2 +- .../AbaqusSurfaceMeshWriter.cpp | 6 +- .../AbaqusSurfaceMeshWriter.h | 2 +- .../AvizoRectilinearCoordinateWriter.cpp | 6 +- .../AvizoRectilinearCoordinateWriter.h | 2 +- .../AvizoUniformCoordinateWriter.cpp | 6 +- .../AvizoUniformCoordinateWriter.h | 2 +- .../ImportExportFilters/DxReader.cpp | 6 +- .../ImportExportFilters/DxReader.h | 2 +- .../ImportExportFilters/DxWriter.cpp | 6 +- .../ImportExportFilters/FeatureInfoReader.cpp | 6 +- .../GBCDTriangleDumper.cpp | 6 +- .../ImportExportFilters/GBCDTriangleDumper.h | 2 +- .../ImportExportFilters/GoldfeatherReader.cpp | 6 +- .../ImportExportFilters/GoldfeatherReader.h | 2 +- .../ImportExportFilters/ImportAvxmMDSim.cpp | 6 +- .../ImportExportFilters/ImportAvxmMDSim.h | 2 +- .../ImportExportFilters/LammpsFileWriter.cpp | 6 +- .../ImportExportFilters/LammpsFileWriter.h | 2 +- .../LosAlamosFFTWriter.cpp | 6 +- .../NodesTrianglesToStl.cpp | 6 +- .../ImportExportFilters/NodesTrianglesToStl.h | 2 +- .../NodesTrianglesToVtk.cpp | 6 +- .../ImportExportFilters/NodesTrianglesToVtk.h | 2 +- .../ImportExportFilters/PhReader.cpp | 6 +- .../ImportExportFilters/PhReader.h | 2 +- .../ImportExportFilters/PhWriter.cpp | 6 +- .../ImportExportFilters/ReadStlFile.cpp | 10 +-- .../ImportExportFilters/ReadStlFile.h | 2 +- .../ImportExportFilters/SPParksDumpReader.cpp | 6 +- .../SPParksSitesWriter.cpp | 6 +- .../SurfaceMeshToNonconformalVtk.cpp | 6 +- .../SurfaceMeshToNonconformalVtk.h | 2 +- .../ImportExportFilters/SurfaceMeshToVtk.cpp | 10 +-- .../ImportExportFilters/SurfaceMeshToVtk.h | 2 +- .../ImportExportFilters/VASPReader.cpp | 6 +- .../ImportExportFilters/VisualizeGBCDGMT.cpp | 6 +- .../ImportExportFilters/VisualizeGBCDGMT.h | 2 +- .../VisualizeGBCDPoleFigure.cpp | 6 +- .../VisualizeGBCDPoleFigure.h | 2 +- .../VtkRectilinearGridWriter.cpp | 8 +- .../VtkRectilinearGridWriter.h | 2 +- .../VtkStructuredPointsReader.cpp | 6 +- .../VtkStructuredPointsReader.h | 2 +- .../ImportExportFilters/WriteStlFile.cpp | 6 +- .../ImportExportFilters/WriteStlFile.h | 2 +- .../EbsdMontageImportFilterParameter.h | 2 +- .../ConvertHexGridToSquareGridWidget.cpp | 30 +++---- .../ConvertHexGridToSquareGridWidget.h | 4 +- .../EbsdMontageImportWidget.cpp | 12 +-- .../EbsdMontageImportWidget.h | 4 +- .../EbsdToH5EbsdWidget.cpp | 36 ++++---- .../EbsdToH5EbsdWidget.h | 4 +- .../EnsembleInfoCreationWidget.cpp | 6 +- .../EnsembleInfoCreationWidget.h | 4 +- .../EnsembleInfoItemDelegate.h | 2 +- .../EnsembleInfoTableModel.cpp | 14 +-- .../OEMEbsdScanSelectionWidget.cpp | 4 +- .../OEMEbsdScanSelectionWidget.h | 2 +- .../OrientationUtilityWidget.h | 4 +- .../ReadH5EbsdWidget.cpp | 24 +++--- .../FilterParameterWidgets/ReadH5EbsdWidget.h | 4 +- .../Gui/Widgets/AxisAngleWidget.cpp | 10 +-- .../Gui/Widgets/AxisAngleWidget.h | 2 +- .../Gui/Widgets/CubochoricWidget.cpp | 8 +- .../Gui/Widgets/CubochoricWidget.h | 2 +- .../Gui/Widgets/EulerWidget.cpp | 8 +- .../Gui/Widgets/EulerWidget.h | 2 +- .../Gui/Widgets/HomochoricWidget.cpp | 8 +- .../Gui/Widgets/HomochoricWidget.h | 2 +- .../Gui/Widgets/OmWidget.cpp | 8 +- .../Gui/Widgets/OmWidget.h | 2 +- .../Widgets/OrientationUtilityCalculator.cpp | 2 +- .../Widgets/OrientationUtilityCalculator.h | 4 +- .../Gui/Widgets/OrientationWidget.h | 4 +- .../Gui/Widgets/QEbsdReferenceFrameDialog.h | 2 +- .../Gui/Widgets/QuatWidget.cpp | 8 +- .../Gui/Widgets/QuatWidget.h | 2 +- .../Gui/Widgets/RodriguesWidget.cpp | 10 +-- .../Gui/Widgets/RodriguesWidget.h | 2 +- .../BadDataNeighborOrientationCheck.cpp | 6 +- .../BadDataNeighborOrientationCheck.h | 2 +- .../ChangeAngleRepresentation.cpp | 10 +-- .../ChangeAngleRepresentation.h | 2 +- .../ConvertHexGridToSquareGrid.cpp | 6 +- .../ConvertHexGridToSquareGrid.h | 2 +- .../ConvertOrientations.cpp | 6 +- .../ConvertOrientations.h | 2 +- .../ConvertQuaternion.cpp | 10 +-- .../ConvertQuaternion.h | 2 +- .../CreateEnsembleInfo.cpp | 6 +- .../CreateEnsembleInfo.h | 2 +- .../CreateLambertSphere.cpp | 6 +- .../CreateLambertSphere.h | 2 +- .../EMsoftSO3Sampler.cpp | 6 +- .../EMsoftSO3Sampler.h | 2 +- .../EbsdToH5Ebsd.cpp | 6 +- .../OrientationAnalysisFilters/EbsdToH5Ebsd.h | 2 +- .../EnsembleInfoReader.cpp | 6 +- .../FindAvgCAxes.cpp | 6 +- .../OrientationAnalysisFilters/FindAvgCAxes.h | 2 +- .../FindAvgOrientations.cpp | 6 +- .../FindAvgOrientations.h | 2 +- .../FindBasalLoadingFactor.cpp | 6 +- .../FindBasalLoadingFactor.h | 2 +- .../FindBoundaryStrengths.cpp | 6 +- .../FindBoundaryStrengths.h | 2 +- .../FindCAxisLocations.cpp | 6 +- .../FindCAxisLocations.h | 2 +- .../FindDistsToCharactGBs.cpp | 10 +-- .../FindDistsToCharactGBs.h | 2 +- .../FindFeatureNeighborCAxisMisalignments.cpp | 6 +- .../FindFeatureNeighborCAxisMisalignments.h | 2 +- ...ndFeatureReferenceCAxisMisorientations.cpp | 6 +- ...FindFeatureReferenceCAxisMisorientations.h | 2 +- .../FindFeatureReferenceMisorientations.cpp | 6 +- .../FindFeatureReferenceMisorientations.h | 2 +- .../OrientationAnalysisFilters/FindGBCD.cpp | 10 +-- .../OrientationAnalysisFilters/FindGBCD.h | 2 +- .../FindGBCDMetricBased.cpp | 10 +-- .../FindGBCDMetricBased.h | 2 +- .../FindGBPDMetricBased.cpp | 10 +-- .../FindGBPDMetricBased.h | 2 +- .../FindKernelAvgMisorientations.cpp | 6 +- .../FindKernelAvgMisorientations.h | 2 +- .../FindLocalAverageCAxisMisalignments.cpp | 6 +- .../FindLocalAverageCAxisMisalignments.h | 2 +- .../FindMicroTextureRegions.cpp | 6 +- .../FindMicroTextureRegions.h | 2 +- .../FindMisorientations.cpp | 6 +- .../FindMisorientations.h | 2 +- .../FindOrientationFieldCurl.cpp | 11 +-- .../FindOrientationFieldCurl.h | 2 +- .../FindSchmids.cpp | 6 +- .../OrientationAnalysisFilters/FindSchmids.h | 2 +- .../FindSlipTransmissionMetrics.cpp | 6 +- .../FindSlipTransmissionMetrics.h | 2 +- .../FindTwinBoundaries.cpp | 10 +-- .../FindTwinBoundaries.h | 2 +- .../FindTwinBoundarySchmidFactors.cpp | 10 +-- .../FindTwinBoundarySchmidFactors.h | 2 +- .../GenerateEulerColors.cpp | 6 +- .../GenerateEulerColors.h | 2 +- .../GenerateFZQuaternions.cpp | 10 +-- .../GenerateFZQuaternions.h | 2 +- .../GenerateFaceIPFColoring.cpp | 6 +- .../GenerateFaceIPFColoring.h | 2 +- .../GenerateFaceMisorientationColoring.cpp | 6 +- .../GenerateFaceMisorientationColoring.h | 2 +- ...enerateFaceSchuhMisorientationColoring.cpp | 6 +- .../GenerateFaceSchuhMisorientationColoring.h | 2 +- .../GenerateIPFColors.cpp | 10 +-- .../GenerateIPFColors.h | 2 +- .../GenerateOrientationMatrixTranspose.cpp | 10 +-- .../GenerateOrientationMatrixTranspose.h | 2 +- .../GenerateQuaternionConjugate.cpp | 11 +-- .../GenerateQuaternionConjugate.h | 2 +- .../GenerateRodriguesColors.cpp | 6 +- .../GenerateRodriguesColors.h | 2 +- .../OrientationAnalysisFilters/INLWriter.cpp | 6 +- .../ImportEbsdMontage.cpp | 6 +- .../ImportEbsdMontage.h | 2 +- .../ImportH5EspritData.cpp | 6 +- .../ImportH5OimData.cpp | 6 +- .../ImportH5OimData.h | 4 +- .../NeighborOrientationCorrelation.cpp | 11 +-- .../NeighborOrientationCorrelation.h | 2 +- .../OrientationUtility.cpp | 6 +- .../OrientationUtility.h | 2 +- .../ReadAngData.cpp | 6 +- .../OrientationAnalysisFilters/ReadAngData.h | 4 +- .../ReadCtfData.cpp | 6 +- .../OrientationAnalysisFilters/ReadCtfData.h | 4 +- .../OrientationAnalysisFilters/ReadH5Ebsd.cpp | 6 +- .../OrientationAnalysisFilters/ReadH5Ebsd.h | 2 +- ...aceElementAttributesWithNeighborValues.cpp | 6 +- ...placeElementAttributesWithNeighborValues.h | 2 +- .../RodriguesConvertor.cpp | 10 +-- .../RodriguesConvertor.h | 2 +- .../RotateEulerRefFrame.cpp | 10 +-- .../RotateEulerRefFrame.h | 2 +- .../Stereographic3D.cpp | 10 +-- .../Stereographic3D.h | 2 +- .../WriteIPFStandardTriangle.cpp | 6 +- .../WriteIPFStandardTriangle.h | 2 +- .../WritePoleFigure.cpp | 6 +- .../WritePoleFigure.h | 2 +- .../WriteStatsGenOdfAngleFile.cpp | 6 +- .../WriteStatsGenOdfAngleFile.h | 2 +- .../YSChoiAbaqusReader.cpp | 6 +- .../Test/CreateLambertSphereTest.cpp | 2 +- .../ProcessingFilters/DetectEllipsoids.cpp | 28 +++--- .../ProcessingFilters/DetectEllipsoids.h | 2 +- .../ProcessingFilters/ErodeDilateBadData.cpp | 6 +- .../ProcessingFilters/ErodeDilateBadData.h | 2 +- .../ErodeDilateCoordinationNumber.cpp | 6 +- .../ErodeDilateCoordinationNumber.h | 2 +- .../ProcessingFilters/ErodeDilateMask.cpp | 6 +- .../ProcessingFilters/ErodeDilateMask.h | 2 +- .../ProcessingFilters/FillBadData.cpp | 6 +- .../ProcessingFilters/FillBadData.h | 2 +- .../FindProjectedImageStatistics.cpp | 10 +-- .../FindProjectedImageStatistics.h | 2 +- .../FindRelativeMotionBetweenSlices.cpp | 10 +-- .../FindRelativeMotionBetweenSlices.h | 2 +- .../FixNonmanifoldVoxels.cpp | 6 +- .../ProcessingFilters/FixNonmanifoldVoxels.h | 2 +- .../ProcessingFilters/IdentifySample.cpp | 6 +- .../ProcessingFilters/IdentifySample.h | 2 +- .../ProcessingFilters/MinNeighbors.cpp | 6 +- .../ProcessingFilters/MinNeighbors.h | 2 +- .../Processing/ProcessingFilters/MinSize.cpp | 6 +- .../Processing/ProcessingFilters/MinSize.h | 2 +- .../RemoveFlaggedFeatures.cpp | 6 +- .../ProcessingFilters/RemoveFlaggedFeatures.h | 2 +- .../ReconstructionFilters/AlignSections.cpp | 11 +-- .../ReconstructionFilters/AlignSections.h | 2 +- .../AlignSectionsFeature.cpp | 6 +- .../AlignSectionsFeatureCentroid.cpp | 6 +- .../AlignSectionsList.cpp | 6 +- .../AlignSectionsMisorientation.cpp | 6 +- .../AlignSectionsMutualInformation.cpp | 6 +- .../CAxisSegmentFeatures.cpp | 6 +- .../ComputeFeatureRect.cpp | 6 +- .../ComputeFeatureRect.h | 2 +- .../EBSDSegmentFeatures.cpp | 6 +- .../ReconstructionFilters/GroupFeatures.cpp | 6 +- .../ReconstructionFilters/GroupFeatures.h | 2 +- .../GroupMicroTextureRegions.cpp | 6 +- .../IdentifyMicroTextureRegions.cpp | 11 +-- .../IdentifyMicroTextureRegions.h | 2 +- .../ReconstructionFilters/MergeColonies.cpp | 6 +- .../ReconstructionFilters/MergeTwins.cpp | 6 +- .../ScalarSegmentFeatures.cpp | 6 +- .../ReconstructionFilters/SegmentFeatures.cpp | 6 +- .../ReconstructionFilters/SegmentFeatures.h | 2 +- .../SineParamsSegmentFeatures.cpp | 6 +- .../VectorSegmentFeatures.cpp | 6 +- .../AppendImageGeometryZSlice.cpp | 6 +- .../AppendImageGeometryZSlice.h | 2 +- .../SamplingFilters/ChangeResolution.cpp | 8 +- .../SamplingFilters/ChangeResolution.h | 2 +- .../SamplingFilters/CropImageGeometry.cpp | 6 +- .../SamplingFilters/CropImageGeometry.h | 2 +- .../ExtractFlaggedFeatures.cpp | 6 +- .../SamplingFilters/ExtractFlaggedFeatures.h | 2 +- .../NearestPointFuseRegularGrids.cpp | 6 +- .../NearestPointFuseRegularGrids.h | 2 +- .../RegularGridSampleSurfaceMesh.cpp | 6 +- .../SamplingFilters/RegularizeZSpacing.cpp | 6 +- .../SamplingFilters/RegularizeZSpacing.h | 2 +- .../SamplingFilters/RotateSampleRefFrame.cpp | 10 +-- .../SamplingFilters/RotateSampleRefFrame.h | 2 +- .../SamplingFilters/SampleSurfaceMesh.cpp | 11 +-- .../SamplingFilters/SampleSurfaceMesh.h | 2 +- .../SampleSurfaceMeshSpecifiedPoints.cpp | 6 +- .../UncertainRegularGridSampleSurfaceMesh.cpp | 6 +- .../SamplingFilters/WarpRegularGrid.cpp | 6 +- .../SamplingFilters/WarpRegularGrid.h | 2 +- .../Plugins/Sampling/Test/CropVolumeTest.cpp | 2 +- .../CalculateArrayHistogram.cpp | 6 +- .../CalculateArrayHistogram.h | 2 +- .../ComputeMomentInvariants2D.cpp | 6 +- .../ComputeMomentInvariants2D.h | 2 +- .../CorrelateValuesWithVectorDirection.cpp | 6 +- .../CorrelateValuesWithVectorDirection.h | 2 +- .../FindAvgScalarValueForFeatures.cpp | 6 +- .../FindAvgScalarValueForFeatures.h | 2 +- .../FindBoundaryElementFractions.cpp | 6 +- .../FindBoundaryElementFractions.h | 2 +- .../StatisticsFilters/FindDifferenceMap.cpp | 10 +-- .../StatisticsFilters/FindDifferenceMap.h | 2 +- .../StatisticsFilters/FindEllipsoidError.cpp | 6 +- .../StatisticsFilters/FindEllipsoidError.h | 2 +- .../FindEuclideanDistMap.cpp | 13 ++- .../StatisticsFilters/FindEuclideanDistMap.h | 2 +- .../FindFeatureClustering.cpp | 6 +- .../StatisticsFilters/FindFeatureClustering.h | 2 +- .../FindFeatureHistogram.cpp | 6 +- .../StatisticsFilters/FindFeatureHistogram.h | 2 +- .../FindLargestCrossSections.cpp | 6 +- .../FindLargestCrossSections.h | 2 +- .../StatisticsFilters/FindNeighborhoods.cpp | 10 +-- .../StatisticsFilters/FindNeighborhoods.h | 2 +- .../StatisticsFilters/FindNeighbors.cpp | 6 +- .../StatisticsFilters/FindNeighbors.h | 2 +- .../StatisticsFilters/FindNumFeatures.cpp | 6 +- .../StatisticsFilters/FindNumFeatures.h | 2 +- .../StatisticsFilters/FindSaltykovSizes.cpp | 6 +- .../StatisticsFilters/FindSaltykovSizes.h | 2 +- .../StatisticsFilters/FindShapes.cpp | 6 +- .../Statistics/StatisticsFilters/FindShapes.h | 2 +- .../StatisticsFilters/FindSizes.cpp | 6 +- .../Statistics/StatisticsFilters/FindSizes.h | 2 +- .../FindSurfaceAreaToVolume.cpp | 6 +- .../FindSurfaceAreaToVolume.h | 2 +- .../StatisticsFilters/FindVolFractions.cpp | 6 +- .../StatisticsFilters/FindVolFractions.h | 2 +- .../FitCorrelatedFeatureData.cpp | 6 +- .../FitCorrelatedFeatureData.h | 2 +- .../StatisticsFilters/FitFeatureData.cpp | 6 +- .../StatisticsFilters/FitFeatureData.h | 2 +- .../GenerateEnsembleStatistics.cpp | 15 ++-- .../GenerateEnsembleStatistics.h | 2 +- .../StatisticsFilters/QuiltCellData.cpp | 6 +- .../StatisticsFilters/QuiltCellData.h | 2 +- .../BinaryNodesTrianglesReader.cpp | 6 +- .../CalculateTriangleGroupCurvatures.cpp | 1 - .../FeatureFaceCurvatureFilter.cpp | 10 +-- .../FindTriangleGeomCentroids.cpp | 6 +- .../FindTriangleGeomCentroids.h | 2 +- .../FindTriangleGeomNeighbors.cpp | 6 +- .../FindTriangleGeomNeighbors.h | 2 +- .../FindTriangleGeomShapes.cpp | 6 +- .../FindTriangleGeomShapes.h | 2 +- .../FindTriangleGeomSizes.cpp | 6 +- .../FindTriangleGeomSizes.h | 2 +- .../GenerateGeometryConnectivity.cpp | 6 +- .../LaplacianSmoothing.cpp | 6 +- .../SurfaceMeshingFilters/M3CSliceBySlice.cpp | 6 +- .../SurfaceMeshingFilters/M3CSliceBySlice.h | 2 +- .../MovingFiniteElementSmoothing.cpp | 6 +- .../MovingFiniteElementSmoothing.h | 2 +- .../QuickSurfaceMesh.cpp | 6 +- .../SurfaceMeshingFilters/QuickSurfaceMesh.h | 2 +- .../ReverseTriangleWinding.cpp | 6 +- .../SharedFeatureFaceFilter.cpp | 6 +- .../SurfaceMeshingFilters/SurfaceMeshFilter.h | 2 +- .../TriangleAreaFilter.cpp | 10 +-- .../TriangleCentroidFilter.cpp | 10 +-- .../TriangleDihedralAngleFilter.cpp | 10 +-- .../TriangleNormalFilter.cpp | 6 +- .../VerifyTriangleWinding.cpp | 6 +- .../VerifyTriangleWinding.h | 2 +- .../InitializeSyntheticVolumeWidget.cpp | 20 ++--- .../InitializeSyntheticVolumeWidget.h | 4 +- .../StatsGeneratorWidget.cpp | 16 ++-- .../StatsGeneratorWidget.h | 2 +- .../Utilities/PoleFigureImageUtilities.cpp | 1 + .../Gui/Widgets/BoundaryPhaseWidget.h | 4 +- .../Gui/Widgets/EditPhaseDialog.cpp | 2 +- .../Gui/Widgets/EditPhaseDialog.h | 2 +- .../Gui/Widgets/MatrixPhaseWidget.h | 4 +- .../Gui/Widgets/PrecipitatePhaseWidget.cpp | 18 ++-- .../Gui/Widgets/PrecipitatePhaseWidget.h | 4 +- .../Presets/Dialogs/RolledPresetDialog.h | 2 +- .../Gui/Widgets/PrimaryPhaseWidget.cpp | 26 +++--- .../Gui/Widgets/PrimaryPhaseWidget.h | 4 +- .../Gui/Widgets/StatsGenAxisODFWidget.cpp | 6 +- .../Gui/Widgets/StatsGenAxisODFWidget.h | 4 +- .../Gui/Widgets/StatsGenFeatureSizeWidget.cpp | 24 +++--- .../Gui/Widgets/StatsGenFeatureSizeWidget.h | 4 +- .../Gui/Widgets/StatsGenMDFWidget.cpp | 2 +- .../Gui/Widgets/StatsGenMDFWidget.h | 6 +- .../Gui/Widgets/StatsGenODFWidget.cpp | 28 +++--- .../Gui/Widgets/StatsGenODFWidget.h | 4 +- .../Gui/Widgets/StatsGenPlotWidget.cpp | 2 +- .../Gui/Widgets/StatsGenPlotWidget.h | 4 +- .../Gui/Widgets/StatsGenRDFWidget.cpp | 2 +- .../Gui/Widgets/StatsGenRDFWidget.h | 4 +- .../Gui/Widgets/StatsGenWidget.h | 6 +- .../Gui/Widgets/StatsProgressWidget.h | 2 +- .../Widgets/TableModels/SGBetaTableModel.cpp | 10 +-- .../TableModels/SGLogNormalTableModel.cpp | 10 +-- .../Widgets/TableModels/SGMDFTableModel.cpp | 10 +-- .../Widgets/TableModels/SGODFTableModel.cpp | 10 +-- .../TableModels/SGPowerLawTableModel.cpp | 10 +-- .../Widgets/TableModels/SGRDFTableModel.cpp | 10 +-- .../Gui/Widgets/TextureDialog.h | 2 +- .../Gui/Widgets/TransformationPhaseWidget.cpp | 26 +++--- .../Gui/Widgets/TransformationPhaseWidget.h | 4 +- .../SyntheticBuilding/Source/SGApplication.h | 2 +- .../SyntheticBuildingFilters/AddBadData.cpp | 6 +- .../SyntheticBuildingFilters/AddBadData.h | 2 +- .../AddOrientationNoise.cpp | 6 +- .../AddOrientationNoise.h | 2 +- .../EstablishMatrixPhase.cpp | 6 +- .../EstablishMatrixPhase.h | 2 +- .../EstablishShapeTypes.cpp | 6 +- .../EstablishShapeTypes.h | 2 +- .../GeneratePrecipitateStatsData.cpp | 6 +- .../GeneratePrecipitateStatsData.h | 2 +- .../GeneratePrimaryStatsData.cpp | 6 +- .../GeneratePrimaryStatsData.h | 2 +- .../InitializeSyntheticVolume.cpp | 6 +- .../InitializeSyntheticVolume.h | 2 +- .../SyntheticBuildingFilters/InsertAtoms.cpp | 10 +-- .../SyntheticBuildingFilters/InsertAtoms.h | 2 +- .../InsertPrecipitatePhases.cpp | 12 +-- .../InsertPrecipitatePhases.h | 2 +- .../JumbleOrientations.cpp | 6 +- .../JumbleOrientations.h | 2 +- .../MatchCrystallography.cpp | 6 +- .../MatchCrystallography.h | 2 +- .../PackPrimaryPhases.cpp | 16 ++-- .../PackPrimaryPhases.h | 2 +- .../StatsGeneratorFilter.cpp | 6 +- .../StatsGeneratorFilter.h | 2 +- Test/PreFlightTest.cpp | 8 +- Test/PreflightVerify.h | 2 +- Tools/SandboxTool.cpp | 4 +- Tools/Unused/ExamplePipelineCoverage.cpp | 4 +- 449 files changed, 1112 insertions(+), 1379 deletions(-) delete mode 100644 Source/Plugins/EMMPM/EMMPMLib/Common/EMTime.cpp delete mode 100644 Source/Plugins/EMMPM/EMMPMLib/Common/EMTime.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 9c7ad21b11..a256300f2e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -87,6 +87,7 @@ if(NOT DEFINED CMAKE_ARCHIVE_OUTPUT_DIRECTORY) ) endif() +add_compile_definitions(QT_NO_KEYWORDS) #------------------------------------------------------------------------------ # Find the Git Package for Versioning. It should be ok if Git is NOT found diff --git a/Documentation/ReferenceManual/5_ReleaseNotes/ReleaseNotes_6_5_0.md b/Documentation/ReferenceManual/5_ReleaseNotes/ReleaseNotes_6_5_0.md index fee5fa65fa..33e36dda55 100644 --- a/Documentation/ReferenceManual/5_ReleaseNotes/ReleaseNotes_6_5_0.md +++ b/Documentation/ReferenceManual/5_ReleaseNotes/ReleaseNotes_6_5_0.md @@ -11,12 +11,14 @@ The developers of DREAM.3D maintain a pair of Google Groups for discussions on t [DREAM.3D Developers List](https://groups.google.com/forum/?hl=en#!forum/dream3d-developers) -## Version 6.5.xxx ## +## Version 6.5.163 ## -### 6.5.xxx Fixed DREAM3D Issues ### +### 6.5.163 Fixed DREAM3D Issues ### + Add sanity check to Generate Ensemble Statistics to ensure that when Calculate Crystallographic Statistics is TRUE only Cubic and Hexagonal phases are present in the data. #984 + Fix issue in FindBoundingBoxFeatures where the XY coordinates were locked into the XY plane even if the '2D' was on another plane. #985 +* Fixed on issue where adding the Import Image Montage would crash DREAM.3D due to nullptr. (ITKImageProcessing Plugin fix) +* fixed issue with linking on Ubuntu 20.04 and above involving rpaths ### SIMPL Changes ### diff --git a/Documentation/ReferenceManual/6_Developer/WritingAFilter.md b/Documentation/ReferenceManual/6_Developer/WritingAFilter.md index 913d1fdb86..0475c34568 100644 --- a/Documentation/ReferenceManual/6_Developer/WritingAFilter.md +++ b/Documentation/ReferenceManual/6_Developer/WritingAFilter.md @@ -91,10 +91,10 @@ Example **preflight()** function: void ExampleFilter::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } ``` diff --git a/Documentation/Tools/GenerateHTMLDocs.cpp b/Documentation/Tools/GenerateHTMLDocs.cpp index 0728ce74e0..dafe91a11e 100644 --- a/Documentation/Tools/GenerateHTMLDocs.cpp +++ b/Documentation/Tools/GenerateHTMLDocs.cpp @@ -482,7 +482,7 @@ void ReplaceGrepSearchesRecursively(QDir currentDir) bool parentWritten = false; QFileInfoList itemList = currentDir.entryInfoList(filters); - foreach(QFileInfo itemInfo, itemList) + Q_FOREACH(QFileInfo itemInfo, itemList) { QString itemFilePath = itemInfo.absoluteFilePath(); @@ -520,7 +520,7 @@ void ReplaceGrepSearchesRecursively(QDir currentDir) QFileInfoList dirList = currentDir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot); if(dirList.size() > 0) { - foreach(QFileInfo fi, dirList) + Q_FOREACH(QFileInfo fi, dirList) { ReplaceGrepSearchesRecursively(QDir(fi.absoluteFilePath())); // Recursive call diff --git a/Resources/CPack/PackageProject.cmake b/Resources/CPack/PackageProject.cmake index dbc7bd6774..d6a317e043 100644 --- a/Resources/CPack/PackageProject.cmake +++ b/Resources/CPack/PackageProject.cmake @@ -78,7 +78,7 @@ set(CPACK_PACKAGE_EXECUTABLES set(UPLOAD_FILE_NAME "") if(APPLE) - set(CPACK_PACKAGE_FILE_NAME "DREAM3D-${DREAM3D_VERSION_SHORT}-OSX") + set(CPACK_PACKAGE_FILE_NAME "DREAM3D-${DREAM3D_VERSION_SHORT}-OSX-${CMAKE_HOST_SYSTEM_PROCESSOR}") # This ASSUMES we are creating a tar.gz package. If you change that below to # anything else then you need to update this. set(UPLOAD_FILE_NAME ${CPACK_PACKAGE_FILE_NAME}.dmg) diff --git a/Source/EbsdLib/CMakeLists.txt b/Source/EbsdLib/CMakeLists.txt index 677edb22e7..e41b874348 100644 --- a/Source/EbsdLib/CMakeLists.txt +++ b/Source/EbsdLib/CMakeLists.txt @@ -80,6 +80,7 @@ if(BUILD_SHARED_LIBS) set(EbsdLib_BUILT_AS_DYNAMIC_LIB 1) endif(BUILD_SHARED_LIBS) +add_compile_definitions(QT_NO_KEYWORDS) # Look for our Prerequisite Libraries if(NOT DEFINED DREAM3DProj_BINARY_DIR) diff --git a/Source/EbsdLib/TSL/H5OIMReader.cpp b/Source/EbsdLib/TSL/H5OIMReader.cpp index 54061ff220..f5c6dd3a33 100644 --- a/Source/EbsdLib/TSL/H5OIMReader.cpp +++ b/Source/EbsdLib/TSL/H5OIMReader.cpp @@ -450,7 +450,7 @@ int H5OIMReader::readHeader(hid_t parId) // m_Phases.clear(); QVector phaseVector; - foreach(QString phaseGroupName, names) + Q_FOREACH(QString phaseGroupName, names) { hid_t pid = H5Gopen(phasesGid, phaseGroupName.toLatin1().data(), H5P_DEFAULT); diff --git a/Source/OrientationLib/LaueOps/CubicLowOps.cpp b/Source/OrientationLib/LaueOps/CubicLowOps.cpp index b2d6a83b74..fbc810653c 100644 --- a/Source/OrientationLib/LaueOps/CubicLowOps.cpp +++ b/Source/OrientationLib/LaueOps/CubicLowOps.cpp @@ -39,7 +39,6 @@ #include #include #include -#include #include #include #endif @@ -785,8 +784,7 @@ void CubicLowOps::generateSphereCoordsFromEulers(FloatArrayType* eulers, FloatAr } #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; #endif #ifdef SIMPL_USE_PARALLEL_ALGORITHMS @@ -1102,8 +1100,7 @@ QVector CubicLowOps::generatePoleFigure(PoleFigureConfi DoubleArrayType::Pointer intensity011 = DoubleArrayType::CreateArray(config.imageDim * config.imageDim, label1 + "_Intensity_Image"); DoubleArrayType::Pointer intensity111 = DoubleArrayType::CreateArray(config.imageDim * config.imageDim, label2 + "_Intensity_Image"); #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; if(doParallel) { diff --git a/Source/OrientationLib/LaueOps/CubicOps.cpp b/Source/OrientationLib/LaueOps/CubicOps.cpp index 044b7b6ad5..c200d26e28 100644 --- a/Source/OrientationLib/LaueOps/CubicOps.cpp +++ b/Source/OrientationLib/LaueOps/CubicOps.cpp @@ -39,7 +39,6 @@ #include #include #include -#include #include #include #endif @@ -1508,8 +1507,7 @@ void CubicOps::generateSphereCoordsFromEulers(FloatArrayType* eulers, FloatArray } #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; #endif #ifdef SIMPL_USE_PARALLEL_ALGORITHMS @@ -1831,8 +1829,7 @@ QVector CubicOps::generatePoleFigure(PoleFigureConfigur DoubleArrayType::Pointer intensity111 = DoubleArrayType::CreateArray(config.imageDim * config.imageDim, label2 + "_Intensity_Image"); #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; if(doParallel) { diff --git a/Source/OrientationLib/LaueOps/HexagonalLowOps.cpp b/Source/OrientationLib/LaueOps/HexagonalLowOps.cpp index 7af641a8db..416aa82b14 100644 --- a/Source/OrientationLib/LaueOps/HexagonalLowOps.cpp +++ b/Source/OrientationLib/LaueOps/HexagonalLowOps.cpp @@ -39,7 +39,6 @@ #include #include #include -#include #include #include #endif @@ -1205,8 +1204,7 @@ void HexagonalLowOps::generateSphereCoordsFromEulers(FloatArrayType* eulers, Flo } #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; #endif #ifdef SIMPL_USE_PARALLEL_ALGORITHMS @@ -1391,8 +1389,7 @@ QVector HexagonalLowOps::generatePoleFigure(PoleFigureC DoubleArrayType::Pointer intensity011 = DoubleArrayType::CreateArray(config.imageDim * config.imageDim, label1 + "_Intensity_Image"); DoubleArrayType::Pointer intensity111 = DoubleArrayType::CreateArray(config.imageDim * config.imageDim, label2 + "_Intensity_Image"); #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; if(doParallel) { diff --git a/Source/OrientationLib/LaueOps/HexagonalOps.cpp b/Source/OrientationLib/LaueOps/HexagonalOps.cpp index f7c59b9585..b4acc0bb71 100644 --- a/Source/OrientationLib/LaueOps/HexagonalOps.cpp +++ b/Source/OrientationLib/LaueOps/HexagonalOps.cpp @@ -39,7 +39,6 @@ #include #include #include -#include #include #include #endif @@ -1285,8 +1284,7 @@ void HexagonalOps::generateSphereCoordsFromEulers(FloatArrayType* eulers, FloatA } #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; #endif #ifdef SIMPL_USE_PARALLEL_ALGORITHMS @@ -1474,8 +1472,7 @@ QVector HexagonalOps::generatePoleFigure(PoleFigureConf DoubleArrayType::Pointer intensity011 = DoubleArrayType::CreateArray(config.imageDim * config.imageDim, label1 + "_Intensity_Image"); DoubleArrayType::Pointer intensity111 = DoubleArrayType::CreateArray(config.imageDim * config.imageDim, label2 + "_Intensity_Image"); #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; if(doParallel) { diff --git a/Source/OrientationLib/LaueOps/MonoclinicOps.cpp b/Source/OrientationLib/LaueOps/MonoclinicOps.cpp index 97bbe04ff9..940aa185cd 100644 --- a/Source/OrientationLib/LaueOps/MonoclinicOps.cpp +++ b/Source/OrientationLib/LaueOps/MonoclinicOps.cpp @@ -39,7 +39,6 @@ #include #include #include -#include #include #include #endif @@ -593,8 +592,7 @@ void MonoclinicOps::generateSphereCoordsFromEulers(FloatArrayType* eulers, Float } #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; #endif #ifdef SIMPL_USE_PARALLEL_ALGORITHMS @@ -779,8 +777,7 @@ QVector MonoclinicOps::generatePoleFigure(PoleFigureCon DoubleArrayType::Pointer intensity011 = DoubleArrayType::CreateArray(config.imageDim * config.imageDim, label1 + "_Intensity_Image"); DoubleArrayType::Pointer intensity111 = DoubleArrayType::CreateArray(config.imageDim * config.imageDim, label2 + "_Intensity_Image"); #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; if(doParallel) { diff --git a/Source/OrientationLib/LaueOps/OrthoRhombicOps.cpp b/Source/OrientationLib/LaueOps/OrthoRhombicOps.cpp index 11fb1be674..76e8565f5a 100644 --- a/Source/OrientationLib/LaueOps/OrthoRhombicOps.cpp +++ b/Source/OrientationLib/LaueOps/OrthoRhombicOps.cpp @@ -40,7 +40,6 @@ #include #include #include -#include #include #include #endif @@ -611,8 +610,7 @@ void OrthoRhombicOps::generateSphereCoordsFromEulers(FloatArrayType* eulers, Flo } #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; #endif #ifdef SIMPL_USE_PARALLEL_ALGORITHMS @@ -799,8 +797,7 @@ QVector OrthoRhombicOps::generatePoleFigure(PoleFigureC DoubleArrayType::Pointer intensity100 = DoubleArrayType::CreateArray(config.imageDim * config.imageDim, label1 + "_Intensity_Image"); DoubleArrayType::Pointer intensity010 = DoubleArrayType::CreateArray(config.imageDim * config.imageDim, label2 + "_Intensity_Image"); #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; if(doParallel) { diff --git a/Source/OrientationLib/LaueOps/TetragonalLowOps.cpp b/Source/OrientationLib/LaueOps/TetragonalLowOps.cpp index 6761b94266..b03c76caf9 100644 --- a/Source/OrientationLib/LaueOps/TetragonalLowOps.cpp +++ b/Source/OrientationLib/LaueOps/TetragonalLowOps.cpp @@ -40,7 +40,6 @@ #include #include #include -#include #include #include #endif @@ -604,8 +603,7 @@ void TetragonalLowOps::generateSphereCoordsFromEulers(FloatArrayType* eulers, Fl } #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; #endif #ifdef SIMPL_USE_PARALLEL_ALGORITHMS @@ -795,8 +793,7 @@ QVector TetragonalLowOps::generatePoleFigure(PoleFigure DoubleArrayType::Pointer intensity011 = DoubleArrayType::CreateArray(config.imageDim * config.imageDim, label1 + "_Intensity_Image"); DoubleArrayType::Pointer intensity111 = DoubleArrayType::CreateArray(config.imageDim * config.imageDim, label2 + "_Intensity_Image"); #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; if(doParallel) { diff --git a/Source/OrientationLib/LaueOps/TetragonalOps.cpp b/Source/OrientationLib/LaueOps/TetragonalOps.cpp index 1584d05284..73234f93e4 100644 --- a/Source/OrientationLib/LaueOps/TetragonalOps.cpp +++ b/Source/OrientationLib/LaueOps/TetragonalOps.cpp @@ -40,7 +40,6 @@ #include #include #include -#include #include #include #endif @@ -646,8 +645,7 @@ void TetragonalOps::generateSphereCoordsFromEulers(FloatArrayType* eulers, Float } #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; #endif #ifdef SIMPL_USE_PARALLEL_ALGORITHMS @@ -835,8 +833,7 @@ QVector TetragonalOps::generatePoleFigure(PoleFigureCon DoubleArrayType::Pointer intensity011 = DoubleArrayType::CreateArray(config.imageDim * config.imageDim, label1 + "_Intensity_Image"); DoubleArrayType::Pointer intensity111 = DoubleArrayType::CreateArray(config.imageDim * config.imageDim, label2 + "_Intensity_Image"); #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; if(doParallel) { diff --git a/Source/OrientationLib/LaueOps/TriclinicOps.cpp b/Source/OrientationLib/LaueOps/TriclinicOps.cpp index 62938526e3..2941b389b3 100644 --- a/Source/OrientationLib/LaueOps/TriclinicOps.cpp +++ b/Source/OrientationLib/LaueOps/TriclinicOps.cpp @@ -39,7 +39,6 @@ #include #include #include -#include #include #include #endif @@ -587,8 +586,7 @@ void TriclinicOps::generateSphereCoordsFromEulers(FloatArrayType* eulers, FloatA } #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; #endif #ifdef SIMPL_USE_PARALLEL_ALGORITHMS @@ -776,8 +774,7 @@ QVector TriclinicOps::generatePoleFigure(PoleFigureConf DoubleArrayType::Pointer intensity011 = DoubleArrayType::CreateArray(config.imageDim * config.imageDim, label1 + "_Intensity_Image"); DoubleArrayType::Pointer intensity111 = DoubleArrayType::CreateArray(config.imageDim * config.imageDim, label2 + "_Intensity_Image"); #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; if(doParallel) { diff --git a/Source/OrientationLib/LaueOps/TrigonalLowOps.cpp b/Source/OrientationLib/LaueOps/TrigonalLowOps.cpp index 55c7bac9ba..878cd7e873 100644 --- a/Source/OrientationLib/LaueOps/TrigonalLowOps.cpp +++ b/Source/OrientationLib/LaueOps/TrigonalLowOps.cpp @@ -39,7 +39,6 @@ #include #include #include -#include #include #include #endif @@ -626,8 +625,7 @@ void TrigonalLowOps::generateSphereCoordsFromEulers(FloatArrayType* eulers, Floa } #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; #endif #ifdef SIMPL_USE_PARALLEL_ALGORITHMS @@ -813,8 +811,7 @@ QVector TrigonalLowOps::generatePoleFigure(PoleFigureCo DoubleArrayType::Pointer intensity011 = DoubleArrayType::CreateArray(config.imageDim * config.imageDim, label1 + "_Intensity_Image"); DoubleArrayType::Pointer intensity111 = DoubleArrayType::CreateArray(config.imageDim * config.imageDim, label2 + "_Intensity_Image"); #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; if(doParallel) { diff --git a/Source/OrientationLib/LaueOps/TrigonalOps.cpp b/Source/OrientationLib/LaueOps/TrigonalOps.cpp index 175ee8c78d..d77e4294d3 100644 --- a/Source/OrientationLib/LaueOps/TrigonalOps.cpp +++ b/Source/OrientationLib/LaueOps/TrigonalOps.cpp @@ -39,7 +39,6 @@ #include #include #include -#include #include #include #endif @@ -650,8 +649,7 @@ void TrigonalOps::generateSphereCoordsFromEulers(FloatArrayType* eulers, FloatAr } #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; #endif #ifdef SIMPL_USE_PARALLEL_ALGORITHMS @@ -832,8 +830,7 @@ QVector TrigonalOps::generatePoleFigure(PoleFigureConfi DoubleArrayType::Pointer intensity011 = DoubleArrayType::CreateArray(config.imageDim * config.imageDim, label1 + "_Intensity_Image"); DoubleArrayType::Pointer intensity111 = DoubleArrayType::CreateArray(config.imageDim * config.imageDim, label2 + "_Intensity_Image"); #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; if(doParallel) { diff --git a/Source/OrientationLib/OrientationMath/OrientationConverter.hpp b/Source/OrientationLib/OrientationMath/OrientationConverter.hpp index e9af6133eb..2fbc49efb2 100644 --- a/Source/OrientationLib/OrientationMath/OrientationConverter.hpp +++ b/Source/OrientationLib/OrientationMath/OrientationConverter.hpp @@ -54,7 +54,6 @@ #include #include #include -#include #endif /** @@ -394,7 +393,6 @@ class ConvertRepresentation typename DataArray::Pointer output = DataArray::CreateArray(nTuples, cDims, #OUT_ARRAY_NAME);\ output->initializeWithZeros(); /* Intialize the array with Zeros */\ T* outPtr = output->getPointer(0);\ - tbb::task_scheduler_init init;\ tbb::parallel_for(tbb::blocked_range(0, nTuples),\ ConvertRepresentation>(inPtr, outPtr, inStride, outStride), tbb::auto_partitioner());\ this->setOutputData(output); @@ -527,8 +525,7 @@ class EulerConverter : public OrientationConverter int inStride = input->getNumberOfComponents(); #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; #endif #ifdef SIMPL_USE_PARALLEL_ALGORITHMS if(doParallel == true) @@ -716,8 +713,7 @@ class OrientationMatrixConverter : public OrientationConverter size_t nTuples = input->getNumberOfTuples(); int inStride = input->getNumberOfComponents(); #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; #endif #ifdef SIMPL_USE_PARALLEL_ALGORITHMS if(doParallel == true) @@ -883,8 +879,7 @@ class QuaternionConverter : public OrientationConverter size_t nTuples = input->getNumberOfTuples(); int inStride = input->getNumberOfComponents(); #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; #endif #ifdef SIMPL_USE_PARALLEL_ALGORITHMS if(doParallel == true) @@ -1044,8 +1039,7 @@ class AxisAngleConverter : public OrientationConverter size_t nTuples = input->getNumberOfTuples(); int inStride = input->getNumberOfComponents(); #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; #endif #ifdef SIMPL_USE_PARALLEL_ALGORITHMS if(doParallel == true) @@ -1209,8 +1203,7 @@ class RodriguesConverter : public OrientationConverter size_t nTuples = input->getNumberOfTuples(); int inStride = input->getNumberOfComponents(); #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; #endif #ifdef SIMPL_USE_PARALLEL_ALGORITHMS if(doParallel == true) @@ -1375,8 +1368,7 @@ class HomochoricConverter : public OrientationConverter size_t nTuples = input->getNumberOfTuples(); int inStride = input->getNumberOfComponents(); #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; #endif #ifdef SIMPL_USE_PARALLEL_ALGORITHMS if(doParallel == true) @@ -1542,8 +1534,7 @@ class CubochoricConverter : public OrientationConverter size_t nTuples = input->getNumberOfTuples(); int inStride = input->getNumberOfComponents(); #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; #endif #ifdef SIMPL_USE_PARALLEL_ALGORITHMS if(doParallel == true) diff --git a/Source/Plugins/EMMPM/EMMPMFilters/EMMPMFilter.cpp b/Source/Plugins/EMMPM/EMMPMFilters/EMMPMFilter.cpp index 4f53a27604..4c213a46cf 100644 --- a/Source/Plugins/EMMPM/EMMPMFilters/EMMPMFilter.cpp +++ b/Source/Plugins/EMMPM/EMMPMFilters/EMMPMFilter.cpp @@ -37,7 +37,6 @@ #include "EMMPM/EMMPMConstants.h" #include "EMMPM/EMMPMLib/Common/EMMPM_Math.h" -#include "EMMPM/EMMPMLib/Common/EMTime.h" #include "EMMPM/EMMPMLib/Common/StatsDelegate.h" #include "EMMPM/EMMPMLib/Core/EMMPM.h" #include "EMMPM/EMMPMLib/Core/EMMPMUtilities.h" @@ -245,10 +244,10 @@ void EMMPMFilter::preflight() { // These are the REQUIRED lines of CODE to make sure the filter behaves correctly setInPreflight(true); // Set the fact that we are preflighting. - emit preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update - emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter + Q_EMIT preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update + Q_EMIT updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter dataCheck(); // Run our DataCheck to make sure everthing is setup correctly - emit preflightExecuted(); // We are done preflighting this filter + Q_EMIT preflightExecuted(); // We are done preflighting this filter setInPreflight(false); // Inform the system this filter is NOT in preflight mode anymore. } diff --git a/Source/Plugins/EMMPM/EMMPMFilters/EMMPMFilter.h b/Source/Plugins/EMMPM/EMMPMFilters/EMMPMFilter.h index e80bcff1bf..7477d9c87f 100644 --- a/Source/Plugins/EMMPM/EMMPMFilters/EMMPMFilter.h +++ b/Source/Plugins/EMMPM/EMMPMFilters/EMMPMFilter.h @@ -187,7 +187,7 @@ class EMMPM_EXPORT EMMPMFilter : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/EMMPM/EMMPMFilters/MultiEmmpmFilter.cpp b/Source/Plugins/EMMPM/EMMPMFilters/MultiEmmpmFilter.cpp index 7cf3c21727..ff48e03615 100644 --- a/Source/Plugins/EMMPM/EMMPMFilters/MultiEmmpmFilter.cpp +++ b/Source/Plugins/EMMPM/EMMPMFilters/MultiEmmpmFilter.cpp @@ -36,7 +36,6 @@ #include "EMMPM/EMMPMConstants.h" #include "EMMPM/EMMPMLib/Common/EMMPM_Math.h" -#include "EMMPM/EMMPMLib/Common/EMTime.h" #include "EMMPM/EMMPMLib/Common/StatsDelegate.h" #include "EMMPM/EMMPMLib/Core/EMMPM.h" #include "EMMPM/EMMPMLib/Core/EMMPMUtilities.h" @@ -248,10 +247,10 @@ void MultiEmmpmFilter::preflight() { // These are the REQUIRED lines of CODE to make sure the filter behaves correctly setInPreflight(true); // Set the fact that we are preflighting. - emit preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update - emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter + Q_EMIT preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update + Q_EMIT updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter dataCheck(); // Run our DataCheck to make sure everthing is setup correctly - emit preflightExecuted(); // We are done preflighting this filter + Q_EMIT preflightExecuted(); // We are done preflighting this filter setInPreflight(false); // Inform the system this filter is NOT in preflight mode anymore. } diff --git a/Source/Plugins/EMMPM/EMMPMLib/Common/EMTime.cpp b/Source/Plugins/EMMPM/EMMPMLib/Common/EMTime.cpp deleted file mode 100644 index e7b2cf9249..0000000000 --- a/Source/Plugins/EMMPM/EMMPMLib/Common/EMTime.cpp +++ /dev/null @@ -1,85 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// -// Copyright (c) 2010, Michael A. Jackson. BlueQuartz Software -// All rights reserved. -// BSD License: http://www.opensource.org/licenses/bsd-license.html -// -/////////////////////////////////////////////////////////////////////////////// - -#include -#include - -#include - -#include "EMMPMLib/Common/EMTime.h" -#include "EMMPMLib/Common/MSVCDefines.h" - -static char em_log_time[128]; -static char em_tif_time[128]; - -// ----------------------------------------------------------------------------- -// -// ----------------------------------------------------------------------------- -char* formattedTime(const char* formatting, char* output) -{ - struct tm* t; -#ifdef _MSC_VER -#if _MSC_VER >= 1400 - struct tm time; - errno_t tError; -#endif -#endif - TimeType long_time; - TimeFunc(&long_time); - t = nullptr; -#ifdef _MSC_VER -#if _MSC_VER < 1400 - t = _localtime64(&long_time); -#else - t = &time; - tError = _localtime64_s(&time, &long_time); -#endif -#else // Non windows platforms - t = localtime(&long_time); -#endif - memset(output, 0, 128); - snprintf(output, 128, formatting, t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec); - return output; -} - -// ----------------------------------------------------------------------------- -// -// ----------------------------------------------------------------------------- -char* EMMPM_LogTime() -{ - std::string formatString("[%04d:%02d:%02d:%02d:%02d:%02d]"); - return formattedTime(formatString.c_str(), em_log_time); -} - -// ----------------------------------------------------------------------------- -// -// ----------------------------------------------------------------------------- -char* EMMPM_TiffDateTime() -{ - std::string formatString("%04d:%02d:%02d %02d:%02d:%02d"); - - return formattedTime(formatString.c_str(), em_tif_time); -} - -// ----------------------------------------------------------------------------- -// -// ----------------------------------------------------------------------------- -unsigned long long int EMMPM_getMilliSeconds() -{ -#ifdef _MSC_VER - return (unsigned long long int)(clock()); -#else - struct timeval t1; - CMP_GET_TIME_OF_DAY(&t1, nullptr); - unsigned long long int seconds = t1.tv_sec; - unsigned long long int microSec = t1.tv_usec; - seconds *= 1000; - microSec /= 1000; - return seconds + microSec; // Both in milliseconds at this point. -#endif -} diff --git a/Source/Plugins/EMMPM/EMMPMLib/Common/EMTime.h b/Source/Plugins/EMMPM/EMMPMLib/Common/EMTime.h deleted file mode 100644 index 17f1d46796..0000000000 --- a/Source/Plugins/EMMPM/EMMPMLib/Common/EMTime.h +++ /dev/null @@ -1,57 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// -// Copyright (c) 2010, Michael A. Jackson. BlueQuartz Software -// All rights reserved. -// BSD License: http://www.opensource.org/licenses/bsd-license.html -// -/////////////////////////////////////////////////////////////////////////////// - -#pragma once - -#include "EMMPMLib/EMMPMLib.h" - -#include - - -#ifdef _MSC_VER -#if _MSC_VER < 1400 -#define TimeType __time64_t -#define TimeFunc _time64 -#else -#define TimeType __time64_t -#define TimeFunc _time64 -#endif -#else -#define TimeType time_t -#define TimeFunc time -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -/** -* @brief Returns a Formatted String of the current Date/Time for logging -* purpose. -* @return A string of the current date/time -*/ -EMMPMLib_EXPORT char* EMMPM_LogTime(); - -/** - * Returns a date/time string suitable for tiff tags. - * @return - */ -EMMPMLib_EXPORT char* EMMPM_TiffDateTime() ; - -/** - * @brief returns the number of milliseconds from a platform specified time. - */ -EMMPMLib_EXPORT unsigned long long int EMMPM_getMilliSeconds(); - - -#ifdef __cplusplus -} -#endif - - - diff --git a/Source/Plugins/EMMPM/EMMPMLib/Common/SourceList.cmake b/Source/Plugins/EMMPM/EMMPMLib/Common/SourceList.cmake index b779088f04..6865e5e09e 100644 --- a/Source/Plugins/EMMPM/EMMPMLib/Common/SourceList.cmake +++ b/Source/Plugins/EMMPM/EMMPMLib/Common/SourceList.cmake @@ -5,14 +5,12 @@ #-- This code was partly written under US Air Force Contract FA8650-07-D-5800 #--//////////////////////////////////////////////////////////////////////////// set (EMMPMLib_Common_SRCS - ${EMMPMLib_SOURCE_DIR}/Common/EMTime.cpp ${EMMPMLib_SOURCE_DIR}/Common/StatsDelegate.cpp ) set (EMMPMLib_Common_HDRS ${EMMPMLib_SOURCE_DIR}/Common/EMMPM_Math.h ${EMMPMLib_SOURCE_DIR}/Common/EMMPMLibDLLExport.h - ${EMMPMLib_SOURCE_DIR}/Common/EMTime.h ${EMMPMLib_SOURCE_DIR}/Common/StatsDelegate.h ${EMMPMLib_SOURCE_DIR}/Common/MSVCDefines.h ) diff --git a/Source/Plugins/EMMPM/EMMPMLib/Core/EMCalculation.cpp b/Source/Plugins/EMMPM/EMMPMLib/Core/EMCalculation.cpp index 98ba3adb97..1e97c8874c 100644 --- a/Source/Plugins/EMMPM/EMMPMLib/Core/EMCalculation.cpp +++ b/Source/Plugins/EMMPM/EMMPMLib/Core/EMCalculation.cpp @@ -54,7 +54,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "EMMPMLib/Core/MorphFilt.h" #if EMMPM_USE_PARALLEL_ALGORITHMS -#include #endif // ----------------------------------------------------------------------------- @@ -76,8 +75,7 @@ EMCalculation::~EMCalculation() = default; void EMCalculation::execute() { #if EMMPM_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; -// int threads = init.default_num_threads(); + // int threads = init.default_num_threads(); // std::cout << "TBB Thread Count: " << threads << std::endl; #endif EMMPM_Data* data = m_Data.get(); diff --git a/Source/Plugins/EMMPM/EMMPMLib/Core/EMMPM.cpp b/Source/Plugins/EMMPM/EMMPMLib/Core/EMMPM.cpp index 47dc36848c..8fb85f979e 100644 --- a/Source/Plugins/EMMPM/EMMPMLib/Core/EMMPM.cpp +++ b/Source/Plugins/EMMPM/EMMPMLib/Core/EMMPM.cpp @@ -38,7 +38,6 @@ #include #include "EMMPMLib/Common/EMMPM_Math.h" -#include "EMMPMLib/Common/EMTime.h" #include "EMMPMLib/Common/MSVCDefines.h" #include "EMMPMLib/Core/EMCalculation.h" #include "EMMPMLib/Core/EMMPMUtilities.h" diff --git a/Source/Plugins/EMMPM/EMMPMLib/Core/InitializationFunctions.cpp b/Source/Plugins/EMMPM/EMMPMLib/Core/InitializationFunctions.cpp index 13cc5943d7..0b5d7fcc7d 100644 --- a/Source/Plugins/EMMPM/EMMPMLib/Core/InitializationFunctions.cpp +++ b/Source/Plugins/EMMPM/EMMPMLib/Core/InitializationFunctions.cpp @@ -45,7 +45,6 @@ //-- EMMMPM Lib Includes #include "EMMPMLib/Common/EMMPM_Math.h" -#include "EMMPMLib/Common/EMTime.h" #include "EMMPMLib/Common/MSVCDefines.h" #include "EMMPMLib/Core/EMMPM.h" diff --git a/Source/Plugins/EMMPM/EMMPMLib/Core/MPMCalculation.cpp b/Source/Plugins/EMMPM/EMMPMLib/Core/MPMCalculation.cpp index c1faec40da..5046eaf43c 100644 --- a/Source/Plugins/EMMPM/EMMPMLib/Core/MPMCalculation.cpp +++ b/Source/Plugins/EMMPM/EMMPMLib/Core/MPMCalculation.cpp @@ -52,9 +52,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. //-- C++ includes #include #include +#include #include "EMMPMLib/Common/EMMPM_Math.h" -#include "EMMPMLib/Common/EMTime.h" #include "EMMPMLib/Common/MSVCDefines.h" #include "EMMPMLib/Core/EMMPM.h" #include "EMMPMLib/Core/EMMPMUtilities.h" @@ -65,7 +65,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include #include -#include #endif @@ -436,8 +435,7 @@ void MPMCalculation::execute() data->inside_mpm_loop = 1; #if EMMPM_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - int threads = tbb::task_scheduler_init::default_num_threads(); + int threads = std::thread::hardware_concurrency(); #if USE_TBB_TASK_GROUP std::shared_ptr g(new tbb::task_group); unsigned int rowIncrement = rows / threads; diff --git a/Source/Plugins/EMMPM/Gui/FilterParameterWidgets/EMMPMWidget.cpp b/Source/Plugins/EMMPM/Gui/FilterParameterWidgets/EMMPMWidget.cpp index 5590bc9af0..1503c32ec5 100644 --- a/Source/Plugins/EMMPM/Gui/FilterParameterWidgets/EMMPMWidget.cpp +++ b/Source/Plugins/EMMPM/Gui/FilterParameterWidgets/EMMPMWidget.cpp @@ -252,7 +252,7 @@ void EMMPMWidget::on_tableWidget_cellChanged(int row, int column) m_Filter->setEMMPMTableData(newData); m_DidCausePreflight = true; - emit parametersChanged(); + Q_EMIT parametersChanged(); m_DidCausePreflight = false; } diff --git a/Source/Plugins/EMMPM/Gui/FilterParameterWidgets/EMMPMWidget.h b/Source/Plugins/EMMPM/Gui/FilterParameterWidgets/EMMPMWidget.h index 20ab8ae96b..7a5ce33b79 100644 --- a/Source/Plugins/EMMPM/Gui/FilterParameterWidgets/EMMPMWidget.h +++ b/Source/Plugins/EMMPM/Gui/FilterParameterWidgets/EMMPMWidget.h @@ -92,7 +92,7 @@ class EMMPMWidget : public FilterParameterWidget, private Ui::EMMPMWidget void setFilterParameter(FilterParameter* value); FilterParameter* getFilterParameter() const; -public slots: +public Q_SLOTS: void beforePreflight(); void afterPreflight(); void filterNeedsInputParameters(AbstractFilter* filter); diff --git a/Source/Plugins/EMMPM/Tools/main.cpp b/Source/Plugins/EMMPM/Tools/main.cpp index 0863451cc9..6ddb1143ac 100644 --- a/Source/Plugins/EMMPM/Tools/main.cpp +++ b/Source/Plugins/EMMPM/Tools/main.cpp @@ -45,7 +45,6 @@ #include "EMMPMLib/Common/EMMPMInputParser.h" #include "EMMPMLib/Common/EMMPM_Math.h" -#include "EMMPMLib/Common/EMTime.h" #include "EMMPMLib/Common/MSVCDefines.h" #include "EMMPMLib/Common/Observer.h" #include "EMMPMLib/Common/StatsDelegate.h" @@ -56,7 +55,6 @@ #include "EMMPMLib/EMMPMLib.h" #if defined(EMMPM_USE_PARALLEL_ALGORITHMS) -#include #endif class CLIStatsDelegate : public StatsDelegate @@ -145,8 +143,7 @@ int main(int argc, char* argv[]) // unsigned long long int millis = EMMPM_getMilliSeconds(); #if defined(EMMPM_USE_PARALLEL_ALGORITHMS) - tbb::task_scheduler_init init; - std::cout << "Default Number of Threads: " << init.default_num_threads() << std::endl; + std::cout << "Default Number of Threads: " << init.default_num_threads() << std::endl; #endif int err = 0; diff --git a/Source/Plugins/Generic/GenericFilters/FindBoundaryCells.cpp b/Source/Plugins/Generic/GenericFilters/FindBoundaryCells.cpp index f138108550..5ffb117c58 100644 --- a/Source/Plugins/Generic/GenericFilters/FindBoundaryCells.cpp +++ b/Source/Plugins/Generic/GenericFilters/FindBoundaryCells.cpp @@ -139,10 +139,10 @@ void FindBoundaryCells::dataCheck() void FindBoundaryCells::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Generic/GenericFilters/FindBoundaryCells.h b/Source/Plugins/Generic/GenericFilters/FindBoundaryCells.h index a0de3f57f3..fa43cc6b86 100644 --- a/Source/Plugins/Generic/GenericFilters/FindBoundaryCells.h +++ b/Source/Plugins/Generic/GenericFilters/FindBoundaryCells.h @@ -136,7 +136,7 @@ class Generic_EXPORT FindBoundaryCells : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Generic/GenericFilters/FindBoundingBoxFeatures.cpp b/Source/Plugins/Generic/GenericFilters/FindBoundingBoxFeatures.cpp index 50decfea5f..a1c83644bd 100644 --- a/Source/Plugins/Generic/GenericFilters/FindBoundingBoxFeatures.cpp +++ b/Source/Plugins/Generic/GenericFilters/FindBoundingBoxFeatures.cpp @@ -183,10 +183,10 @@ void FindBoundingBoxFeatures::dataCheck() void FindBoundingBoxFeatures::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Generic/GenericFilters/FindBoundingBoxFeatures.h b/Source/Plugins/Generic/GenericFilters/FindBoundingBoxFeatures.h index 5d5c391c25..5295fbbf40 100644 --- a/Source/Plugins/Generic/GenericFilters/FindBoundingBoxFeatures.h +++ b/Source/Plugins/Generic/GenericFilters/FindBoundingBoxFeatures.h @@ -140,7 +140,7 @@ class Generic_EXPORT FindBoundingBoxFeatures : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Generic/GenericFilters/FindFeatureCentroids.cpp b/Source/Plugins/Generic/GenericFilters/FindFeatureCentroids.cpp index d29ca59804..013369593d 100644 --- a/Source/Plugins/Generic/GenericFilters/FindFeatureCentroids.cpp +++ b/Source/Plugins/Generic/GenericFilters/FindFeatureCentroids.cpp @@ -131,10 +131,10 @@ void FindFeatureCentroids::dataCheck() void FindFeatureCentroids::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Generic/GenericFilters/FindFeatureCentroids.h b/Source/Plugins/Generic/GenericFilters/FindFeatureCentroids.h index e0eadae2a2..b981353934 100644 --- a/Source/Plugins/Generic/GenericFilters/FindFeatureCentroids.h +++ b/Source/Plugins/Generic/GenericFilters/FindFeatureCentroids.h @@ -128,7 +128,7 @@ class Generic_EXPORT FindFeatureCentroids : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Generic/GenericFilters/FindFeaturePhases.cpp b/Source/Plugins/Generic/GenericFilters/FindFeaturePhases.cpp index 7c3d1e61b5..b1fd282eda 100644 --- a/Source/Plugins/Generic/GenericFilters/FindFeaturePhases.cpp +++ b/Source/Plugins/Generic/GenericFilters/FindFeaturePhases.cpp @@ -152,10 +152,10 @@ void FindFeaturePhases::dataCheck() void FindFeaturePhases::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Generic/GenericFilters/FindFeaturePhases.h b/Source/Plugins/Generic/GenericFilters/FindFeaturePhases.h index 36f29ee522..60b58fefcc 100644 --- a/Source/Plugins/Generic/GenericFilters/FindFeaturePhases.h +++ b/Source/Plugins/Generic/GenericFilters/FindFeaturePhases.h @@ -132,7 +132,7 @@ class Generic_EXPORT FindFeaturePhases : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Generic/GenericFilters/FindFeaturePhasesBinary.cpp b/Source/Plugins/Generic/GenericFilters/FindFeaturePhasesBinary.cpp index bb5cc5ef50..ccd2fd6561 100644 --- a/Source/Plugins/Generic/GenericFilters/FindFeaturePhasesBinary.cpp +++ b/Source/Plugins/Generic/GenericFilters/FindFeaturePhasesBinary.cpp @@ -172,10 +172,10 @@ void FindFeaturePhasesBinary::dataCheck() void FindFeaturePhasesBinary::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Generic/GenericFilters/FindFeaturePhasesBinary.h b/Source/Plugins/Generic/GenericFilters/FindFeaturePhasesBinary.h index 924b4dc0a9..792f96f2d8 100644 --- a/Source/Plugins/Generic/GenericFilters/FindFeaturePhasesBinary.h +++ b/Source/Plugins/Generic/GenericFilters/FindFeaturePhasesBinary.h @@ -136,7 +136,7 @@ class Generic_EXPORT FindFeaturePhasesBinary : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Generic/GenericFilters/FindSurfaceFeatures.cpp b/Source/Plugins/Generic/GenericFilters/FindSurfaceFeatures.cpp index 7888662644..54a3fc2b9b 100644 --- a/Source/Plugins/Generic/GenericFilters/FindSurfaceFeatures.cpp +++ b/Source/Plugins/Generic/GenericFilters/FindSurfaceFeatures.cpp @@ -131,10 +131,10 @@ void FindSurfaceFeatures::dataCheck() void FindSurfaceFeatures::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Generic/GenericFilters/FindSurfaceFeatures.h b/Source/Plugins/Generic/GenericFilters/FindSurfaceFeatures.h index d1c8dac249..5c5c803d98 100644 --- a/Source/Plugins/Generic/GenericFilters/FindSurfaceFeatures.h +++ b/Source/Plugins/Generic/GenericFilters/FindSurfaceFeatures.h @@ -128,7 +128,7 @@ class Generic_EXPORT FindSurfaceFeatures : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Generic/GenericFilters/GenerateVectorColors.cpp b/Source/Plugins/Generic/GenericFilters/GenerateVectorColors.cpp index e9bb64fc6d..821759c306 100644 --- a/Source/Plugins/Generic/GenericFilters/GenerateVectorColors.cpp +++ b/Source/Plugins/Generic/GenericFilters/GenerateVectorColors.cpp @@ -172,10 +172,10 @@ void GenerateVectorColors::dataCheck() void GenerateVectorColors::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Generic/GenericFilters/GenerateVectorColors.h b/Source/Plugins/Generic/GenericFilters/GenerateVectorColors.h index d780ddb57b..1e3f9a3930 100644 --- a/Source/Plugins/Generic/GenericFilters/GenerateVectorColors.h +++ b/Source/Plugins/Generic/GenericFilters/GenerateVectorColors.h @@ -136,7 +136,7 @@ class Generic_EXPORT GenerateVectorColors : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/ImportExport/ImportExportFilters/AbaqusHexahedronWriter.cpp b/Source/Plugins/ImportExport/ImportExportFilters/AbaqusHexahedronWriter.cpp index e5434de341..29662e265f 100644 --- a/Source/Plugins/ImportExport/ImportExportFilters/AbaqusHexahedronWriter.cpp +++ b/Source/Plugins/ImportExport/ImportExportFilters/AbaqusHexahedronWriter.cpp @@ -165,10 +165,10 @@ void AbaqusHexahedronWriter::preflight() { // These are the REQUIRED lines of CODE to make sure the filter behaves correctly setInPreflight(true); // Set the fact that we are preflighting. - emit preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update - emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter + Q_EMIT preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update + Q_EMIT updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter dataCheck(); // Run our DataCheck to make sure everthing is setup correctly - emit preflightExecuted(); // We are done preflighting this filter + Q_EMIT preflightExecuted(); // We are done preflighting this filter setInPreflight(false); // Inform the system this filter is NOT in preflight mode anymore. } diff --git a/Source/Plugins/ImportExport/ImportExportFilters/AbaqusHexahedronWriter.h b/Source/Plugins/ImportExport/ImportExportFilters/AbaqusHexahedronWriter.h index 9f085a3024..168cd39947 100644 --- a/Source/Plugins/ImportExport/ImportExportFilters/AbaqusHexahedronWriter.h +++ b/Source/Plugins/ImportExport/ImportExportFilters/AbaqusHexahedronWriter.h @@ -142,7 +142,7 @@ class ImportExport_EXPORT AbaqusHexahedronWriter : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/ImportExport/ImportExportFilters/AbaqusSurfaceMeshWriter.cpp b/Source/Plugins/ImportExport/ImportExportFilters/AbaqusSurfaceMeshWriter.cpp index 4182a33014..ce7f47ef35 100644 --- a/Source/Plugins/ImportExport/ImportExportFilters/AbaqusSurfaceMeshWriter.cpp +++ b/Source/Plugins/ImportExport/ImportExportFilters/AbaqusSurfaceMeshWriter.cpp @@ -137,10 +137,10 @@ void AbaqusSurfaceMeshWriter::dataCheck() void AbaqusSurfaceMeshWriter::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/ImportExport/ImportExportFilters/AbaqusSurfaceMeshWriter.h b/Source/Plugins/ImportExport/ImportExportFilters/AbaqusSurfaceMeshWriter.h index 8ab7b2f2cb..ad40bd2438 100644 --- a/Source/Plugins/ImportExport/ImportExportFilters/AbaqusSurfaceMeshWriter.h +++ b/Source/Plugins/ImportExport/ImportExportFilters/AbaqusSurfaceMeshWriter.h @@ -128,7 +128,7 @@ class ImportExport_EXPORT AbaqusSurfaceMeshWriter : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/ImportExport/ImportExportFilters/AvizoRectilinearCoordinateWriter.cpp b/Source/Plugins/ImportExport/ImportExportFilters/AvizoRectilinearCoordinateWriter.cpp index 18d96d26f6..7a46f1cfe9 100644 --- a/Source/Plugins/ImportExport/ImportExportFilters/AvizoRectilinearCoordinateWriter.cpp +++ b/Source/Plugins/ImportExport/ImportExportFilters/AvizoRectilinearCoordinateWriter.cpp @@ -146,10 +146,10 @@ void AvizoRectilinearCoordinateWriter::dataCheck() void AvizoRectilinearCoordinateWriter::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/ImportExport/ImportExportFilters/AvizoRectilinearCoordinateWriter.h b/Source/Plugins/ImportExport/ImportExportFilters/AvizoRectilinearCoordinateWriter.h index cb63d40779..6139a4ba37 100644 --- a/Source/Plugins/ImportExport/ImportExportFilters/AvizoRectilinearCoordinateWriter.h +++ b/Source/Plugins/ImportExport/ImportExportFilters/AvizoRectilinearCoordinateWriter.h @@ -154,7 +154,7 @@ class ImportExport_EXPORT AvizoRectilinearCoordinateWriter : public AbstractFilt */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/ImportExport/ImportExportFilters/AvizoUniformCoordinateWriter.cpp b/Source/Plugins/ImportExport/ImportExportFilters/AvizoUniformCoordinateWriter.cpp index 9b5368b796..f6da939a8d 100644 --- a/Source/Plugins/ImportExport/ImportExportFilters/AvizoUniformCoordinateWriter.cpp +++ b/Source/Plugins/ImportExport/ImportExportFilters/AvizoUniformCoordinateWriter.cpp @@ -144,10 +144,10 @@ void AvizoUniformCoordinateWriter::dataCheck() void AvizoUniformCoordinateWriter::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/ImportExport/ImportExportFilters/AvizoUniformCoordinateWriter.h b/Source/Plugins/ImportExport/ImportExportFilters/AvizoUniformCoordinateWriter.h index ddb757858e..85a0e86a2a 100644 --- a/Source/Plugins/ImportExport/ImportExportFilters/AvizoUniformCoordinateWriter.h +++ b/Source/Plugins/ImportExport/ImportExportFilters/AvizoUniformCoordinateWriter.h @@ -154,7 +154,7 @@ class ImportExport_EXPORT AvizoUniformCoordinateWriter : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/ImportExport/ImportExportFilters/DxReader.cpp b/Source/Plugins/ImportExport/ImportExportFilters/DxReader.cpp index f16bc0bb50..f44414cc12 100644 --- a/Source/Plugins/ImportExport/ImportExportFilters/DxReader.cpp +++ b/Source/Plugins/ImportExport/ImportExportFilters/DxReader.cpp @@ -288,10 +288,10 @@ void DxReader::dataCheck() void DxReader::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/ImportExport/ImportExportFilters/DxReader.h b/Source/Plugins/ImportExport/ImportExportFilters/DxReader.h index 4eb078525b..ef6ae5e521 100644 --- a/Source/Plugins/ImportExport/ImportExportFilters/DxReader.h +++ b/Source/Plugins/ImportExport/ImportExportFilters/DxReader.h @@ -160,7 +160,7 @@ class ImportExport_EXPORT DxReader : public FileReader */ void preflight() override; -public slots: +public Q_SLOTS: /** * @brief flushCache Clears the input file cache */ diff --git a/Source/Plugins/ImportExport/ImportExportFilters/DxWriter.cpp b/Source/Plugins/ImportExport/ImportExportFilters/DxWriter.cpp index 8f74705a89..91aba68b32 100644 --- a/Source/Plugins/ImportExport/ImportExportFilters/DxWriter.cpp +++ b/Source/Plugins/ImportExport/ImportExportFilters/DxWriter.cpp @@ -147,10 +147,10 @@ void DxWriter::dataCheck() void DxWriter::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/ImportExport/ImportExportFilters/FeatureInfoReader.cpp b/Source/Plugins/ImportExport/ImportExportFilters/FeatureInfoReader.cpp index 9af413064d..15eca6b76e 100644 --- a/Source/Plugins/ImportExport/ImportExportFilters/FeatureInfoReader.cpp +++ b/Source/Plugins/ImportExport/ImportExportFilters/FeatureInfoReader.cpp @@ -267,10 +267,10 @@ void FeatureInfoReader::dataCheck() void FeatureInfoReader::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/ImportExport/ImportExportFilters/GBCDTriangleDumper.cpp b/Source/Plugins/ImportExport/ImportExportFilters/GBCDTriangleDumper.cpp index d506c4ec9e..1d3c4b0091 100644 --- a/Source/Plugins/ImportExport/ImportExportFilters/GBCDTriangleDumper.cpp +++ b/Source/Plugins/ImportExport/ImportExportFilters/GBCDTriangleDumper.cpp @@ -190,11 +190,11 @@ void GBCDTriangleDumper::dataCheckVoxel() void GBCDTriangleDumper::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheckSurfaceMesh(); dataCheckVoxel(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/ImportExport/ImportExportFilters/GBCDTriangleDumper.h b/Source/Plugins/ImportExport/ImportExportFilters/GBCDTriangleDumper.h index 0ee0f1585a..6aa9d3bee3 100644 --- a/Source/Plugins/ImportExport/ImportExportFilters/GBCDTriangleDumper.h +++ b/Source/Plugins/ImportExport/ImportExportFilters/GBCDTriangleDumper.h @@ -140,7 +140,7 @@ class ImportExport_EXPORT GBCDTriangleDumper : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/ImportExport/ImportExportFilters/GoldfeatherReader.cpp b/Source/Plugins/ImportExport/ImportExportFilters/GoldfeatherReader.cpp index 5e85b863ad..79cb8763c2 100644 --- a/Source/Plugins/ImportExport/ImportExportFilters/GoldfeatherReader.cpp +++ b/Source/Plugins/ImportExport/ImportExportFilters/GoldfeatherReader.cpp @@ -307,10 +307,10 @@ void GoldfeatherReader::dataCheck() void GoldfeatherReader::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/ImportExport/ImportExportFilters/GoldfeatherReader.h b/Source/Plugins/ImportExport/ImportExportFilters/GoldfeatherReader.h index c1404f201d..097aefbdd7 100644 --- a/Source/Plugins/ImportExport/ImportExportFilters/GoldfeatherReader.h +++ b/Source/Plugins/ImportExport/ImportExportFilters/GoldfeatherReader.h @@ -164,7 +164,7 @@ class ImportExport_EXPORT GoldfeatherReader : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/ImportExport/ImportExportFilters/ImportAvxmMDSim.cpp b/Source/Plugins/ImportExport/ImportExportFilters/ImportAvxmMDSim.cpp index be84053310..fcb51909f9 100644 --- a/Source/Plugins/ImportExport/ImportExportFilters/ImportAvxmMDSim.cpp +++ b/Source/Plugins/ImportExport/ImportExportFilters/ImportAvxmMDSim.cpp @@ -132,10 +132,10 @@ void ImportAvxmMDSim::preflight() { // These are the REQUIRED lines of CODE to make sure the filter behaves correctly setInPreflight(true); // Set the fact that we are preflighting. - emit preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update - emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter + Q_EMIT preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update + Q_EMIT updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter dataCheck(); // Run our DataCheck to make sure everthing is setup correctly - emit preflightExecuted(); // We are done preflighting this filter + Q_EMIT preflightExecuted(); // We are done preflighting this filter setInPreflight(false); // Inform the system this filter is NOT in preflight mode anymore. } diff --git a/Source/Plugins/ImportExport/ImportExportFilters/ImportAvxmMDSim.h b/Source/Plugins/ImportExport/ImportExportFilters/ImportAvxmMDSim.h index 191fb6f169..3c7fed26fd 100644 --- a/Source/Plugins/ImportExport/ImportExportFilters/ImportAvxmMDSim.h +++ b/Source/Plugins/ImportExport/ImportExportFilters/ImportAvxmMDSim.h @@ -97,7 +97,7 @@ class ImportExport_EXPORT ImportAvxmMDSim : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/ImportExport/ImportExportFilters/LammpsFileWriter.cpp b/Source/Plugins/ImportExport/ImportExportFilters/LammpsFileWriter.cpp index 06e853a55f..cc0eb581ca 100644 --- a/Source/Plugins/ImportExport/ImportExportFilters/LammpsFileWriter.cpp +++ b/Source/Plugins/ImportExport/ImportExportFilters/LammpsFileWriter.cpp @@ -134,10 +134,10 @@ void LammpsFileWriter::dataCheck() void LammpsFileWriter::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/ImportExport/ImportExportFilters/LammpsFileWriter.h b/Source/Plugins/ImportExport/ImportExportFilters/LammpsFileWriter.h index d1faaa7e0c..d9b5b62e95 100644 --- a/Source/Plugins/ImportExport/ImportExportFilters/LammpsFileWriter.h +++ b/Source/Plugins/ImportExport/ImportExportFilters/LammpsFileWriter.h @@ -138,7 +138,7 @@ class ImportExport_EXPORT LammpsFileWriter : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/ImportExport/ImportExportFilters/LosAlamosFFTWriter.cpp b/Source/Plugins/ImportExport/ImportExportFilters/LosAlamosFFTWriter.cpp index 9a1a369daa..9b205bcb8e 100644 --- a/Source/Plugins/ImportExport/ImportExportFilters/LosAlamosFFTWriter.cpp +++ b/Source/Plugins/ImportExport/ImportExportFilters/LosAlamosFFTWriter.cpp @@ -168,10 +168,10 @@ void LosAlamosFFTWriter::dataCheck() void LosAlamosFFTWriter::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/ImportExport/ImportExportFilters/NodesTrianglesToStl.cpp b/Source/Plugins/ImportExport/ImportExportFilters/NodesTrianglesToStl.cpp index ebeb4e32f6..848068baff 100644 --- a/Source/Plugins/ImportExport/ImportExportFilters/NodesTrianglesToStl.cpp +++ b/Source/Plugins/ImportExport/ImportExportFilters/NodesTrianglesToStl.cpp @@ -167,10 +167,10 @@ void NodesTrianglesToStl::dataCheck() void NodesTrianglesToStl::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/ImportExport/ImportExportFilters/NodesTrianglesToStl.h b/Source/Plugins/ImportExport/ImportExportFilters/NodesTrianglesToStl.h index 159089c2cf..ff256b78ea 100644 --- a/Source/Plugins/ImportExport/ImportExportFilters/NodesTrianglesToStl.h +++ b/Source/Plugins/ImportExport/ImportExportFilters/NodesTrianglesToStl.h @@ -145,7 +145,7 @@ class ImportExport_EXPORT NodesTrianglesToStl : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/ImportExport/ImportExportFilters/NodesTrianglesToVtk.cpp b/Source/Plugins/ImportExport/ImportExportFilters/NodesTrianglesToVtk.cpp index a51dcbd09b..af03c161b5 100644 --- a/Source/Plugins/ImportExport/ImportExportFilters/NodesTrianglesToVtk.cpp +++ b/Source/Plugins/ImportExport/ImportExportFilters/NodesTrianglesToVtk.cpp @@ -165,10 +165,10 @@ void NodesTrianglesToVtk::dataCheck() void NodesTrianglesToVtk::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/ImportExport/ImportExportFilters/NodesTrianglesToVtk.h b/Source/Plugins/ImportExport/ImportExportFilters/NodesTrianglesToVtk.h index 2b87a3814f..aeb3bfe2dd 100644 --- a/Source/Plugins/ImportExport/ImportExportFilters/NodesTrianglesToVtk.h +++ b/Source/Plugins/ImportExport/ImportExportFilters/NodesTrianglesToVtk.h @@ -150,7 +150,7 @@ class ImportExport_EXPORT NodesTrianglesToVtk : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/ImportExport/ImportExportFilters/PhReader.cpp b/Source/Plugins/ImportExport/ImportExportFilters/PhReader.cpp index 7674fe9c5d..04873bbbce 100644 --- a/Source/Plugins/ImportExport/ImportExportFilters/PhReader.cpp +++ b/Source/Plugins/ImportExport/ImportExportFilters/PhReader.cpp @@ -282,10 +282,10 @@ void PhReader::dataCheck() void PhReader::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/ImportExport/ImportExportFilters/PhReader.h b/Source/Plugins/ImportExport/ImportExportFilters/PhReader.h index 9bae3c0916..20d9d349e6 100644 --- a/Source/Plugins/ImportExport/ImportExportFilters/PhReader.h +++ b/Source/Plugins/ImportExport/ImportExportFilters/PhReader.h @@ -158,7 +158,7 @@ class ImportExport_EXPORT PhReader : public FileReader */ void preflight() override; -public slots: +public Q_SLOTS: /** * @brief flushCache Clears the input file cache diff --git a/Source/Plugins/ImportExport/ImportExportFilters/PhWriter.cpp b/Source/Plugins/ImportExport/ImportExportFilters/PhWriter.cpp index 72126c3cff..2d78670543 100644 --- a/Source/Plugins/ImportExport/ImportExportFilters/PhWriter.cpp +++ b/Source/Plugins/ImportExport/ImportExportFilters/PhWriter.cpp @@ -136,10 +136,10 @@ void PhWriter::dataCheck() void PhWriter::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/ImportExport/ImportExportFilters/ReadStlFile.cpp b/Source/Plugins/ImportExport/ImportExportFilters/ReadStlFile.cpp index 0247cde9d0..5107f96301 100644 --- a/Source/Plugins/ImportExport/ImportExportFilters/ReadStlFile.cpp +++ b/Source/Plugins/ImportExport/ImportExportFilters/ReadStlFile.cpp @@ -51,7 +51,6 @@ #include #include #include -#include #endif #define STL_HEADER_LENGTH 80 @@ -316,10 +315,10 @@ void ReadStlFile::dataCheck() void ReadStlFile::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } @@ -556,8 +555,7 @@ void ReadStlFile::eliminate_duplicate_nodes() } #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; #endif // Parallel algorithm to find duplicate nodes diff --git a/Source/Plugins/ImportExport/ImportExportFilters/ReadStlFile.h b/Source/Plugins/ImportExport/ImportExportFilters/ReadStlFile.h index a9d71f9aad..6f509e5033 100644 --- a/Source/Plugins/ImportExport/ImportExportFilters/ReadStlFile.h +++ b/Source/Plugins/ImportExport/ImportExportFilters/ReadStlFile.h @@ -136,7 +136,7 @@ class ImportExport_EXPORT ReadStlFile : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/ImportExport/ImportExportFilters/SPParksDumpReader.cpp b/Source/Plugins/ImportExport/ImportExportFilters/SPParksDumpReader.cpp index 26606416ae..da63ac9c96 100644 --- a/Source/Plugins/ImportExport/ImportExportFilters/SPParksDumpReader.cpp +++ b/Source/Plugins/ImportExport/ImportExportFilters/SPParksDumpReader.cpp @@ -196,10 +196,10 @@ void SPParksDumpReader::preflight() { // These are the REQUIRED lines of CODE to make sure the filter behaves correctly setInPreflight(true); // Set the fact that we are preflighting. - emit preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update - emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter + Q_EMIT preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update + Q_EMIT updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter dataCheck(); // Run our DataCheck to make sure everthing is setup correctly - emit preflightExecuted(); // We are done preflighting this filter + Q_EMIT preflightExecuted(); // We are done preflighting this filter setInPreflight(false); // Inform the system this filter is NOT in preflight mode anymore. } diff --git a/Source/Plugins/ImportExport/ImportExportFilters/SPParksSitesWriter.cpp b/Source/Plugins/ImportExport/ImportExportFilters/SPParksSitesWriter.cpp index 0669215455..50fe997a6e 100644 --- a/Source/Plugins/ImportExport/ImportExportFilters/SPParksSitesWriter.cpp +++ b/Source/Plugins/ImportExport/ImportExportFilters/SPParksSitesWriter.cpp @@ -125,10 +125,10 @@ void SPParksSitesWriter::dataCheck() void SPParksSitesWriter::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/ImportExport/ImportExportFilters/SurfaceMeshToNonconformalVtk.cpp b/Source/Plugins/ImportExport/ImportExportFilters/SurfaceMeshToNonconformalVtk.cpp index aec9d039b5..a6f0ec33ef 100644 --- a/Source/Plugins/ImportExport/ImportExportFilters/SurfaceMeshToNonconformalVtk.cpp +++ b/Source/Plugins/ImportExport/ImportExportFilters/SurfaceMeshToNonconformalVtk.cpp @@ -166,10 +166,10 @@ void SurfaceMeshToNonconformalVtk::dataCheck() void SurfaceMeshToNonconformalVtk::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/ImportExport/ImportExportFilters/SurfaceMeshToNonconformalVtk.h b/Source/Plugins/ImportExport/ImportExportFilters/SurfaceMeshToNonconformalVtk.h index c6eec852e5..adb24534f0 100644 --- a/Source/Plugins/ImportExport/ImportExportFilters/SurfaceMeshToNonconformalVtk.h +++ b/Source/Plugins/ImportExport/ImportExportFilters/SurfaceMeshToNonconformalVtk.h @@ -144,7 +144,7 @@ class ImportExport_EXPORT SurfaceMeshToNonconformalVtk : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/ImportExport/ImportExportFilters/SurfaceMeshToVtk.cpp b/Source/Plugins/ImportExport/ImportExportFilters/SurfaceMeshToVtk.cpp index 971bc36ed2..c604765264 100644 --- a/Source/Plugins/ImportExport/ImportExportFilters/SurfaceMeshToVtk.cpp +++ b/Source/Plugins/ImportExport/ImportExportFilters/SurfaceMeshToVtk.cpp @@ -146,7 +146,7 @@ void SurfaceMeshToVtk::dataCheck() dcName = m_SelectedVertexArrays[0].getDataContainerName(); } - foreach(DataArrayPath dap, m_SelectedFaceArrays) + Q_FOREACH(DataArrayPath dap, m_SelectedFaceArrays) { if(dap.getDataContainerName().compare(dcName) != 0) { @@ -155,7 +155,7 @@ void SurfaceMeshToVtk::dataCheck() return; } } - foreach(DataArrayPath dap, m_SelectedVertexArrays) + Q_FOREACH(DataArrayPath dap, m_SelectedVertexArrays) { if(dap.getDataContainerName().compare(dcName) != 0) { @@ -212,10 +212,10 @@ void SurfaceMeshToVtk::dataCheck() void SurfaceMeshToVtk::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/ImportExport/ImportExportFilters/SurfaceMeshToVtk.h b/Source/Plugins/ImportExport/ImportExportFilters/SurfaceMeshToVtk.h index 8ecdb3f078..ee4d386527 100644 --- a/Source/Plugins/ImportExport/ImportExportFilters/SurfaceMeshToVtk.h +++ b/Source/Plugins/ImportExport/ImportExportFilters/SurfaceMeshToVtk.h @@ -156,7 +156,7 @@ class ImportExport_EXPORT SurfaceMeshToVtk : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/ImportExport/ImportExportFilters/VASPReader.cpp b/Source/Plugins/ImportExport/ImportExportFilters/VASPReader.cpp index a0cb574876..25ef612c00 100644 --- a/Source/Plugins/ImportExport/ImportExportFilters/VASPReader.cpp +++ b/Source/Plugins/ImportExport/ImportExportFilters/VASPReader.cpp @@ -221,10 +221,10 @@ void VASPReader::dataCheck() void VASPReader::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/ImportExport/ImportExportFilters/VisualizeGBCDGMT.cpp b/Source/Plugins/ImportExport/ImportExportFilters/VisualizeGBCDGMT.cpp index 48c7ff00f2..35f1cc7bac 100644 --- a/Source/Plugins/ImportExport/ImportExportFilters/VisualizeGBCDGMT.cpp +++ b/Source/Plugins/ImportExport/ImportExportFilters/VisualizeGBCDGMT.cpp @@ -185,10 +185,10 @@ void VisualizeGBCDGMT::dataCheck() void VisualizeGBCDGMT::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/ImportExport/ImportExportFilters/VisualizeGBCDGMT.h b/Source/Plugins/ImportExport/ImportExportFilters/VisualizeGBCDGMT.h index 61de9a5aaf..a515a25c48 100644 --- a/Source/Plugins/ImportExport/ImportExportFilters/VisualizeGBCDGMT.h +++ b/Source/Plugins/ImportExport/ImportExportFilters/VisualizeGBCDGMT.h @@ -143,7 +143,7 @@ class ImportExport_EXPORT VisualizeGBCDGMT : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/ImportExport/ImportExportFilters/VisualizeGBCDPoleFigure.cpp b/Source/Plugins/ImportExport/ImportExportFilters/VisualizeGBCDPoleFigure.cpp index b9432f2246..eba5439bd5 100644 --- a/Source/Plugins/ImportExport/ImportExportFilters/VisualizeGBCDPoleFigure.cpp +++ b/Source/Plugins/ImportExport/ImportExportFilters/VisualizeGBCDPoleFigure.cpp @@ -174,10 +174,10 @@ void VisualizeGBCDPoleFigure::dataCheck() void VisualizeGBCDPoleFigure::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/ImportExport/ImportExportFilters/VisualizeGBCDPoleFigure.h b/Source/Plugins/ImportExport/ImportExportFilters/VisualizeGBCDPoleFigure.h index 59ce9a228d..ce69a6925e 100644 --- a/Source/Plugins/ImportExport/ImportExportFilters/VisualizeGBCDPoleFigure.h +++ b/Source/Plugins/ImportExport/ImportExportFilters/VisualizeGBCDPoleFigure.h @@ -146,7 +146,7 @@ class ImportExport_EXPORT VisualizeGBCDPoleFigure : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/ImportExport/ImportExportFilters/VtkRectilinearGridWriter.cpp b/Source/Plugins/ImportExport/ImportExportFilters/VtkRectilinearGridWriter.cpp index ceb2bf790f..a6044030cd 100644 --- a/Source/Plugins/ImportExport/ImportExportFilters/VtkRectilinearGridWriter.cpp +++ b/Source/Plugins/ImportExport/ImportExportFilters/VtkRectilinearGridWriter.cpp @@ -327,10 +327,10 @@ void VtkRectilinearGridWriter::dataCheck() void VtkRectilinearGridWriter::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } @@ -418,7 +418,7 @@ void VtkRectilinearGridWriter::execute() fprintf(f, "CELL_DATA %d\n", (int)totalCells); QVector dataPaths = getSelectedDataArrayPaths(); - foreach(const DataArrayPath arrayPath, dataPaths) + Q_FOREACH(const DataArrayPath arrayPath, dataPaths) { IDataArray::Pointer iDataPtr = getDataContainerArray()->getPrereqIDataArrayFromPath(this, arrayPath); diff --git a/Source/Plugins/ImportExport/ImportExportFilters/VtkRectilinearGridWriter.h b/Source/Plugins/ImportExport/ImportExportFilters/VtkRectilinearGridWriter.h index 7066cb41d4..724c5b0906 100644 --- a/Source/Plugins/ImportExport/ImportExportFilters/VtkRectilinearGridWriter.h +++ b/Source/Plugins/ImportExport/ImportExportFilters/VtkRectilinearGridWriter.h @@ -212,7 +212,7 @@ class ImportExport_EXPORT VtkRectilinearGridWriter : public AbstractFilter } #endif -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/ImportExport/ImportExportFilters/VtkStructuredPointsReader.cpp b/Source/Plugins/ImportExport/ImportExportFilters/VtkStructuredPointsReader.cpp index 702ade859f..3ad066043e 100644 --- a/Source/Plugins/ImportExport/ImportExportFilters/VtkStructuredPointsReader.cpp +++ b/Source/Plugins/ImportExport/ImportExportFilters/VtkStructuredPointsReader.cpp @@ -231,10 +231,10 @@ void VtkStructuredPointsReader::dataCheck() void VtkStructuredPointsReader::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/ImportExport/ImportExportFilters/VtkStructuredPointsReader.h b/Source/Plugins/ImportExport/ImportExportFilters/VtkStructuredPointsReader.h index e4f7306ca8..44dac65a79 100644 --- a/Source/Plugins/ImportExport/ImportExportFilters/VtkStructuredPointsReader.h +++ b/Source/Plugins/ImportExport/ImportExportFilters/VtkStructuredPointsReader.h @@ -152,7 +152,7 @@ class ImportExport_EXPORT VtkStructuredPointsReader : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/ImportExport/ImportExportFilters/WriteStlFile.cpp b/Source/Plugins/ImportExport/ImportExportFilters/WriteStlFile.cpp index 1504570bf5..23c5c8b8e0 100644 --- a/Source/Plugins/ImportExport/ImportExportFilters/WriteStlFile.cpp +++ b/Source/Plugins/ImportExport/ImportExportFilters/WriteStlFile.cpp @@ -192,10 +192,10 @@ void WriteStlFile::dataCheck() void WriteStlFile::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/ImportExport/ImportExportFilters/WriteStlFile.h b/Source/Plugins/ImportExport/ImportExportFilters/WriteStlFile.h index 2fb58ab202..4b1f60d1f6 100644 --- a/Source/Plugins/ImportExport/ImportExportFilters/WriteStlFile.h +++ b/Source/Plugins/ImportExport/ImportExportFilters/WriteStlFile.h @@ -153,7 +153,7 @@ class ImportExport_EXPORT WriteStlFile : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/OrientationAnalysis/FilterParameters/EbsdMontageImportFilterParameter.h b/Source/Plugins/OrientationAnalysis/FilterParameters/EbsdMontageImportFilterParameter.h index c56e78ec60..f0eb28ab6c 100755 --- a/Source/Plugins/OrientationAnalysis/FilterParameters/EbsdMontageImportFilterParameter.h +++ b/Source/Plugins/OrientationAnalysis/FilterParameters/EbsdMontageImportFilterParameter.h @@ -43,7 +43,7 @@ #include "SIMPLib/FilterParameters/FilterParameter.h" #include "SIMPLib/SIMPLib.h" -using EbsdMontageListInfo_t = struct + struct EbsdMontageListInfo_t { qint32 PaddingDigits = 3; quint32 Ordering = 0; /* Ordering=0 = RowColumn, Ordering=1 = ColumnRow */ diff --git a/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/ConvertHexGridToSquareGridWidget.cpp b/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/ConvertHexGridToSquareGridWidget.cpp index bcab3724ff..67046aa146 100644 --- a/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/ConvertHexGridToSquareGridWidget.cpp +++ b/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/ConvertHexGridToSquareGridWidget.cpp @@ -117,7 +117,7 @@ FilterParameter* ConvertHexGridToSquareGridWidget::getFilterParameter() const // ----------------------------------------------------------------------------- void ConvertHexGridToSquareGridWidget::setWidgetListEnabled(bool b) { - foreach(QWidget* w, m_WidgetList) + Q_FOREACH(QWidget* w, m_WidgetList) { w->setEnabled(b); } @@ -178,7 +178,7 @@ void ConvertHexGridToSquareGridWidget::getGuiParametersFromFilter() m_InputDir->setText(m_Filter->getInputPath()); QObjectList obs = children(); - foreach(QObject* ob, obs) + Q_FOREACH(QObject* ob, obs) { ob->blockSignals(true); } @@ -201,7 +201,7 @@ void ConvertHexGridToSquareGridWidget::getGuiParametersFromFilter() m_OutputDir->setText(m_Filter->getOutputPath()); m_OutputPrefix->setText(m_Filter->getOutputPrefix()); - foreach(QObject* ob, obs) + Q_FOREACH(QObject* ob, obs) { ob->blockSignals(false); } @@ -243,7 +243,7 @@ void ConvertHexGridToSquareGridWidget::validateInputFile() // ----------------------------------------------------------------------------- void ConvertHexGridToSquareGridWidget::resolutionChanged(const QString& string) { - emit parametersChanged(); + Q_EMIT parametersChanged(); } // ----------------------------------------------------------------------------- @@ -331,7 +331,7 @@ void ConvertHexGridToSquareGridWidget::on_m_OutputDir_textChanged(const QString& // QFileInfo fi(text); // setOpenDialogLastFilePath(fi.path()); //} - emit parametersChanged(); + Q_EMIT parametersChanged(); } // ----------------------------------------------------------------------------- @@ -339,7 +339,7 @@ void ConvertHexGridToSquareGridWidget::on_m_OutputDir_textChanged(const QString& // ----------------------------------------------------------------------------- void ConvertHexGridToSquareGridWidget::on_m_OutputPrefix_textChanged(const QString& text) { - emit parametersChanged(); + Q_EMIT parametersChanged(); } // ----------------------------------------------------------------------------- @@ -348,7 +348,7 @@ void ConvertHexGridToSquareGridWidget::on_m_OutputPrefix_textChanged(const QStri void ConvertHexGridToSquareGridWidget::on_m_ZEndIndex_valueChanged(int value) { generateExampleInputFile(); - emit parametersChanged(); + Q_EMIT parametersChanged(); } // ----------------------------------------------------------------------------- @@ -357,7 +357,7 @@ void ConvertHexGridToSquareGridWidget::on_m_ZEndIndex_valueChanged(int value) void ConvertHexGridToSquareGridWidget::on_m_ZStartIndex_valueChanged(int value) { generateExampleInputFile(); - emit parametersChanged(); + Q_EMIT parametersChanged(); } // ----------------------------------------------------------------------------- @@ -366,7 +366,7 @@ void ConvertHexGridToSquareGridWidget::on_m_ZStartIndex_valueChanged(int value) void ConvertHexGridToSquareGridWidget::on_m_TotalDigits_valueChanged(int value) { generateExampleInputFile(); - emit parametersChanged(); + Q_EMIT parametersChanged(); } // ----------------------------------------------------------------------------- @@ -375,7 +375,7 @@ void ConvertHexGridToSquareGridWidget::on_m_TotalDigits_valueChanged(int value) void ConvertHexGridToSquareGridWidget::on_m_FileExt_textChanged(const QString& string) { generateExampleInputFile(); - emit parametersChanged(); + Q_EMIT parametersChanged(); } // ----------------------------------------------------------------------------- @@ -384,7 +384,7 @@ void ConvertHexGridToSquareGridWidget::on_m_FileExt_textChanged(const QString& s void ConvertHexGridToSquareGridWidget::on_m_FileSuffix_textChanged(const QString& string) { generateExampleInputFile(); - emit parametersChanged(); + Q_EMIT parametersChanged(); } // ----------------------------------------------------------------------------- @@ -393,7 +393,7 @@ void ConvertHexGridToSquareGridWidget::on_m_FileSuffix_textChanged(const QString void ConvertHexGridToSquareGridWidget::on_m_FilePrefix_textChanged(const QString& string) { generateExampleInputFile(); - emit parametersChanged(); + Q_EMIT parametersChanged(); } // ----------------------------------------------------------------------------- @@ -507,7 +507,7 @@ void ConvertHexGridToSquareGridWidget::findMaxSliceAndPrefix() int digitEnd = 0; int totalOimFilesFound = 0; int minTotalDigits = 1000; - foreach(QFileInfo fi, angList) + Q_FOREACH(QFileInfo fi, angList) { if((fi.suffix().compare(ext) != 0) && fi.isFile()) { @@ -572,7 +572,7 @@ void ConvertHexGridToSquareGridWidget::findMaxSliceAndPrefix() // ----------------------------------------------------------------------------- void ConvertHexGridToSquareGridWidget::widgetChanged(const QString& text) { - emit parametersChanged(); + Q_EMIT parametersChanged(); } // ----------------------------------------------------------------------------- @@ -583,7 +583,7 @@ void ConvertHexGridToSquareGridWidget::filterNeedsInputParameters(AbstractFilter if(nullptr == filter) { QString ss = QObject::tr("Error Setting ConvertHexGridToSquareGrid Gui values to Filter instance. Filter instance was nullptr.").arg(m_FilterParameter->getPropertyName()); - emit errorSettingFilterParameter(ss); + Q_EMIT errorSettingFilterParameter(ss); } ConvertHexGridToSquareGrid* f = qobject_cast(filter); diff --git a/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/ConvertHexGridToSquareGridWidget.h b/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/ConvertHexGridToSquareGridWidget.h index e20cdaf5df..8ecae95f4e 100644 --- a/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/ConvertHexGridToSquareGridWidget.h +++ b/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/ConvertHexGridToSquareGridWidget.h @@ -97,13 +97,13 @@ class ConvertHexGridToSquareGridWidget : public FilterParameterWidget, private U FilterParameter* getFilterParameter() const; - public slots: + public Q_SLOTS: void widgetChanged(const QString& msg); void beforePreflight(); void afterPreflight(); void filterNeedsInputParameters(AbstractFilter* filter); - protected slots: + protected Q_SLOTS: void on_m_InputDirBtn_clicked(); void on_m_InputDir_textChanged(const QString& text); diff --git a/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/EbsdMontageImportWidget.cpp b/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/EbsdMontageImportWidget.cpp index c10a4dcce2..f142eb5ce4 100644 --- a/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/EbsdMontageImportWidget.cpp +++ b/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/EbsdMontageImportWidget.cpp @@ -129,7 +129,7 @@ QString EbsdMontageImportWidget::GetOpenDialogLastFilePath() // ----------------------------------------------------------------------------- void EbsdMontageImportWidget::setWidgetListEnabled(bool b) { - foreach(QWidget* w, m_WidgetList) + Q_FOREACH(QWidget* w, m_WidgetList) { w->setEnabled(b); } @@ -159,7 +159,7 @@ void EbsdMontageImportWidget::setupGui() // inputDir_textChanged(m_Ui->inputDir->text()); // blockSignals(false); -// emit parametersChanged(); +// Q_EMIT parametersChanged(); // }); getGuiParametersFromFilter(); @@ -207,7 +207,7 @@ void EbsdMontageImportWidget::connectSignalsSlots() void EbsdMontageImportWidget::spinnerChanged(int value) { updateFileListView(); - emit parametersChanged(); + Q_EMIT parametersChanged(); } // ----------------------------------------------------------------------------- @@ -353,7 +353,7 @@ void EbsdMontageImportWidget::inputDir_textChanged(const QString& text) m_Ui->fileListView->clear(); } - emit parametersChanged(); + Q_EMIT parametersChanged(); } // ----------------------------------------------------------------------------- @@ -415,7 +415,7 @@ void EbsdMontageImportWidget::updateFileListView() void EbsdMontageImportWidget::widgetChanged(const QString& text) { updateFileListView(); - emit parametersChanged(); + Q_EMIT parametersChanged(); } // ----------------------------------------------------------------------------- @@ -426,7 +426,7 @@ void EbsdMontageImportWidget::filterNeedsInputParameters(AbstractFilter* filter) if(nullptr == filter) { QString ss = QObject::tr("Error Setting FileListStack Gui values to Filter instance. Filter instance was nullptr.").arg(getFilterParameter()->getPropertyName()); - emit errorSettingFilterParameter(ss); + Q_EMIT errorSettingFilterParameter(ss); return; } bool ok = false; diff --git a/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/EbsdMontageImportWidget.h b/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/EbsdMontageImportWidget.h index ae061c51ce..f00b54836b 100644 --- a/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/EbsdMontageImportWidget.h +++ b/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/EbsdMontageImportWidget.h @@ -90,14 +90,14 @@ class EbsdMontageImportWidget : public FilterParameterWidget */ void setupGui() override; -public slots: +public Q_SLOTS: void widgetChanged(const QString& msg); void beforePreflight(); void afterPreflight(); void filterNeedsInputParameters(AbstractFilter* filter); void spinnerChanged(int value); -protected slots: +protected Q_SLOTS: // Slots to catch signals emitted by the various ui widgets void inputDirBtn_clicked(); diff --git a/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/EbsdToH5EbsdWidget.cpp b/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/EbsdToH5EbsdWidget.cpp index 62c2c5e25c..3452f63875 100644 --- a/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/EbsdToH5EbsdWidget.cpp +++ b/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/EbsdToH5EbsdWidget.cpp @@ -130,7 +130,7 @@ AbstractFilter* EbsdToH5EbsdWidget::getFilter() const // ----------------------------------------------------------------------------- void EbsdToH5EbsdWidget::setWidgetListEnabled(bool b) { - foreach(QWidget* w, m_WidgetList) + Q_FOREACH(QWidget* w, m_WidgetList) { w->setEnabled(b); } @@ -172,7 +172,7 @@ void EbsdToH5EbsdWidget::setupGui() on_m_OutputFile_textChanged(m_OutputFile->text()); blockSignals(false); - emit parametersChanged(); + Q_EMIT parametersChanged(); }); m_WidgetList << m_LineEdit << m_InputDirBtn << m_OutputFile << m_OutputFileBtn; @@ -271,7 +271,7 @@ void EbsdToH5EbsdWidget::getGuiParametersFromFilter() m_OutputFile->setText(m_Filter->getOutputFile()); QObjectList obs = children(); - foreach(QObject* ob, obs) + Q_FOREACH(QObject* ob, obs) { ob->blockSignals(true); } @@ -289,7 +289,7 @@ void EbsdToH5EbsdWidget::getGuiParametersFromFilter() m_SampleTransformation = m_Filter->getSampleTransformation(); m_EulerTransformation = m_Filter->getEulerTransformation(); - foreach(QObject* ob, obs) + Q_FOREACH(QObject* ob, obs) { ob->blockSignals(false); } @@ -346,7 +346,7 @@ void EbsdToH5EbsdWidget::on_m_OutputFile_textChanged(const QString& text) outputAbsPathLabel->hide(); } - emit parametersChanged(); + Q_EMIT parametersChanged(); } // ----------------------------------------------------------------------------- @@ -436,7 +436,7 @@ void EbsdToH5EbsdWidget::on_m_LineEdit_textChanged(const QString& text) } m_fileExtUsedForTransformInit = false; - emit parametersChanged(); + Q_EMIT parametersChanged(); } // ----------------------------------------------------------------------------- @@ -475,7 +475,7 @@ void EbsdToH5EbsdWidget::setRefFrameZDir(uint32_t ref) // ----------------------------------------------------------------------------- void EbsdToH5EbsdWidget::on_m_zSpacing_textChanged(const QString& string) { - emit parametersChanged(); + Q_EMIT parametersChanged(); } // ----------------------------------------------------------------------------- @@ -483,7 +483,7 @@ void EbsdToH5EbsdWidget::on_m_zSpacing_textChanged(const QString& string) // ----------------------------------------------------------------------------- void EbsdToH5EbsdWidget::stackingOrderChanged(bool checked) { - emit parametersChanged(); + Q_EMIT parametersChanged(); } // ----------------------------------------------------------------------------- @@ -492,7 +492,7 @@ void EbsdToH5EbsdWidget::stackingOrderChanged(bool checked) void EbsdToH5EbsdWidget::on_m_ZEndIndex_valueChanged(int value) { generateExampleEbsdInputFile(); - emit parametersChanged(); + Q_EMIT parametersChanged(); } // ----------------------------------------------------------------------------- @@ -501,7 +501,7 @@ void EbsdToH5EbsdWidget::on_m_ZEndIndex_valueChanged(int value) void EbsdToH5EbsdWidget::on_m_ZStartIndex_valueChanged(int value) { generateExampleEbsdInputFile(); - emit parametersChanged(); + Q_EMIT parametersChanged(); } // ----------------------------------------------------------------------------- @@ -510,7 +510,7 @@ void EbsdToH5EbsdWidget::on_m_ZStartIndex_valueChanged(int value) void EbsdToH5EbsdWidget::on_m_TotalDigits_valueChanged(int value) { generateExampleEbsdInputFile(); - emit parametersChanged(); + Q_EMIT parametersChanged(); } // ----------------------------------------------------------------------------- @@ -519,7 +519,7 @@ void EbsdToH5EbsdWidget::on_m_TotalDigits_valueChanged(int value) void EbsdToH5EbsdWidget::on_m_FileExt_textChanged(const QString& string) { generateExampleEbsdInputFile(); - emit parametersChanged(); + Q_EMIT parametersChanged(); } // ----------------------------------------------------------------------------- @@ -528,7 +528,7 @@ void EbsdToH5EbsdWidget::on_m_FileExt_textChanged(const QString& string) void EbsdToH5EbsdWidget::on_m_FileSuffix_textChanged(const QString& string) { generateExampleEbsdInputFile(); - emit parametersChanged(); + Q_EMIT parametersChanged(); } // ----------------------------------------------------------------------------- @@ -537,7 +537,7 @@ void EbsdToH5EbsdWidget::on_m_FileSuffix_textChanged(const QString& string) void EbsdToH5EbsdWidget::on_m_FilePrefix_textChanged(const QString& string) { generateExampleEbsdInputFile(); - emit parametersChanged(); + Q_EMIT parametersChanged(); } // ----------------------------------------------------------------------------- @@ -658,7 +658,7 @@ void EbsdToH5EbsdWidget::on_m_RefFrameOptionsBtn_clicked() m_NoTranschecked = d.getNoTranschecked(); d.getSampleTranformation(m_SampleTransformation); d.getEulerTranformation(m_EulerTransformation); - emit parametersChanged(); // emit to let the system know to preflight + Q_EMIT parametersChanged(); // Q_EMIT to let the system know to preflight } } @@ -766,7 +766,7 @@ void EbsdToH5EbsdWidget::findEbsdMaxSliceAndPrefix() int digitEnd = 0; int totalOimFilesFound = 0; int minTotalDigits = 1000; - foreach(QFileInfo fi, angList) + Q_FOREACH(QFileInfo fi, angList) { if((fi.suffix().compare(ext) != 0) && fi.isFile()) { @@ -830,7 +830,7 @@ void EbsdToH5EbsdWidget::findEbsdMaxSliceAndPrefix() // ----------------------------------------------------------------------------- void EbsdToH5EbsdWidget::widgetChanged(const QString& text) { - emit parametersChanged(); + Q_EMIT parametersChanged(); } // ----------------------------------------------------------------------------- @@ -841,7 +841,7 @@ void EbsdToH5EbsdWidget::filterNeedsInputParameters(AbstractFilter* filter) if(nullptr == filter) { QString ss = QObject::tr("Error Setting EbsdToH5Ebsd Gui values to Filter instance. Filter instance was nullptr.").arg(getFilterParameter()->getPropertyName()); - emit errorSettingFilterParameter(ss); + Q_EMIT errorSettingFilterParameter(ss); } EbsdToH5Ebsd* ebsdConverter = qobject_cast(filter); diff --git a/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/EbsdToH5EbsdWidget.h b/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/EbsdToH5EbsdWidget.h index 542379eecf..42d0dd8b16 100644 --- a/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/EbsdToH5EbsdWidget.h +++ b/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/EbsdToH5EbsdWidget.h @@ -94,7 +94,7 @@ class EbsdToH5EbsdWidget : public FilterParameterWidget, private Ui::EbsdToH5Ebs void setFilter(AbstractFilter* value); AbstractFilter* getFilter() const; - public slots: + public Q_SLOTS: void widgetChanged(const QString& msg); void beforePreflight(); void afterPreflight(); @@ -105,7 +105,7 @@ class EbsdToH5EbsdWidget : public FilterParameterWidget, private Ui::EbsdToH5Ebs */ void showFileInFileSystem() override; - protected slots: + protected Q_SLOTS: /* OIM Data Import Slots */ void on_m_InputDirBtn_clicked(); void on_m_OutputFileBtn_clicked(); diff --git a/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/EnsembleInfoCreationWidget.cpp b/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/EnsembleInfoCreationWidget.cpp index ffba22df79..a243c40dab 100644 --- a/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/EnsembleInfoCreationWidget.cpp +++ b/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/EnsembleInfoCreationWidget.cpp @@ -168,7 +168,7 @@ void EnsembleInfoCreationWidget::on_conditionalCB_stateChanged(int state) linkLeft->setVisible(boolProp); linkRight->setVisible(boolProp); m_DidCausePreflight = true; - emit parametersChanged(); + Q_EMIT parametersChanged(); m_DidCausePreflight = false; } @@ -236,7 +236,7 @@ void EnsembleInfoCreationWidget::tableDataWasChanged(const QModelIndex& topLeft, Q_UNUSED(topLeft) Q_UNUSED(bottomRight) m_DidCausePreflight = true; - emit parametersChanged(); + Q_EMIT parametersChanged(); m_DidCausePreflight = false; } @@ -247,7 +247,7 @@ void EnsembleInfoCreationWidget::widgetChanged(const QString& text) { Q_UNUSED(text) m_DidCausePreflight = true; - emit parametersChanged(); + Q_EMIT parametersChanged(); m_DidCausePreflight = false; } diff --git a/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/EnsembleInfoCreationWidget.h b/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/EnsembleInfoCreationWidget.h index fb5df726ec..737f4a8170 100644 --- a/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/EnsembleInfoCreationWidget.h +++ b/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/EnsembleInfoCreationWidget.h @@ -91,7 +91,7 @@ class EnsembleInfoCreationWidget : public FilterParameterWidget, private Ui::Ens */ virtual void setupGui(); -public slots: +public Q_SLOTS: /** * @brief beforePreflight */ @@ -137,7 +137,7 @@ public slots: */ QString checkStringValues(QString curDcName, QString filtDcName); -protected slots: +protected Q_SLOTS: /** * @brief on_addComparison_clicked */ diff --git a/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/EnsembleInfoItemDelegate.h b/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/EnsembleInfoItemDelegate.h index 58d2c64bc9..41c2bfedb3 100644 --- a/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/EnsembleInfoItemDelegate.h +++ b/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/EnsembleInfoItemDelegate.h @@ -73,7 +73,7 @@ class EnsembleInfoItemDelegate : public QStyledItemDelegate void setModelData(QWidget* editor, QAbstractItemModel* model, const QModelIndex& index) const; -public slots: +public Q_SLOTS: void crystalStructureChangedData(int i); void phaseTypeChangedData(int i); void phaseNameChangedData(const QString& text); diff --git a/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/EnsembleInfoTableModel.cpp b/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/EnsembleInfoTableModel.cpp index 8cfbb9c3fe..ef68c2bede 100644 --- a/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/EnsembleInfoTableModel.cpp +++ b/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/EnsembleInfoTableModel.cpp @@ -279,7 +279,7 @@ bool EnsembleInfoTableModel::setData(const QModelIndex& index, const QVariant& v Q_ASSERT(false); } - emit dataChanged(index, index); + Q_EMIT dataChanged(index, index); return true; } @@ -299,7 +299,7 @@ bool EnsembleInfoTableModel::insertRows(int row, int count, const QModelIndex& i m_RowCount = m_EnsembleInfo.size(); } endInsertRows(); - emit dataChanged(index, index); + Q_EMIT dataChanged(index, index); return true; } @@ -319,7 +319,7 @@ bool EnsembleInfoTableModel::removeRows(int row, int count, const QModelIndex& i m_RowCount = m_EnsembleInfo.size(); } endRemoveRows(); - emit dataChanged(index, index); + Q_EMIT dataChanged(index, index); return true; } @@ -337,7 +337,7 @@ void EnsembleInfoTableModel::setTableData(QVector crystalStructures, QVecto { return; } - // Now mass insert the data to the table then emit that the data has changed + // Now mass insert the data to the table then Q_EMIT that the data has changed beginInsertRows(QModelIndex(), row, row + count - 1); for(int i = 0; i < count; i++) @@ -352,7 +352,7 @@ void EnsembleInfoTableModel::setTableData(QVector crystalStructures, QVecto endInsertRows(); QModelIndex topLeft = createIndex(0, 0); QModelIndex botRight = createIndex(count - 1, ColumnCount); - emit dataChanged(topLeft, botRight); + Q_EMIT dataChanged(topLeft, botRight); } // ----------------------------------------------------------------------------- @@ -369,7 +369,7 @@ void EnsembleInfoTableModel::setTableData(EnsembleInfo& ensemble) { return; } - // Now mass insert the data to the table then emit that the data has changed + // Now mass insert the data to the table then Q_EMIT that the data has changed beginInsertRows(QModelIndex(), row, row + count - 1); m_EnsembleInfo.clear(); @@ -378,7 +378,7 @@ void EnsembleInfoTableModel::setTableData(EnsembleInfo& ensemble) endInsertRows(); QModelIndex topLeft = createIndex(0, 0); QModelIndex botRight = createIndex(count - 1, ColumnCount); - emit dataChanged(topLeft, botRight); + Q_EMIT dataChanged(topLeft, botRight); } // ----------------------------------------------------------------------------- diff --git a/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/OEMEbsdScanSelectionWidget.cpp b/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/OEMEbsdScanSelectionWidget.cpp index 956ca28761..8c2047ec59 100644 --- a/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/OEMEbsdScanSelectionWidget.cpp +++ b/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/OEMEbsdScanSelectionWidget.cpp @@ -131,7 +131,7 @@ void OEMEbsdScanSelectionWidget::filterNeedsInputParameters(AbstractFilter* filt if(nullptr == filter) { QString ss = QObject::tr("Error Setting ReadH5Ebsd Gui values to Filter instance. Filter instance was nullptr.").arg(m_FilterParameter->getPropertyName()); - emit errorSettingFilterParameter(ss); + Q_EMIT errorSettingFilterParameter(ss); } ImportH5OimData* readEdax = qobject_cast(filter); @@ -257,7 +257,7 @@ void OEMEbsdScanSelectionWidget::on_stackLowToHighBtn_toggled(bool checked) sortList(selectedScanNames, Qt::DescendingOrder); } - emit parametersChanged(); + Q_EMIT parametersChanged(); } // ----------------------------------------------------------------------------- diff --git a/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/OEMEbsdScanSelectionWidget.h b/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/OEMEbsdScanSelectionWidget.h index eaf382c2c8..d46e5d1888 100644 --- a/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/OEMEbsdScanSelectionWidget.h +++ b/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/OEMEbsdScanSelectionWidget.h @@ -76,7 +76,7 @@ class OEMEbsdScanSelectionWidget : public FilterParameterWidget, private Ui::OEM void setFilterParameter(FilterParameter* value); FilterParameter* getFilterParameter() const; -public slots: +public Q_SLOTS: void beforePreflight(); void afterPreflight(); void filterNeedsInputParameters(AbstractFilter* filter); diff --git a/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/OrientationUtilityWidget.h b/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/OrientationUtilityWidget.h index 450d7fc5b8..fe5c510ce1 100644 --- a/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/OrientationUtilityWidget.h +++ b/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/OrientationUtilityWidget.h @@ -67,12 +67,12 @@ class OrientationUtilityWidget : public FilterParameterWidget, private Ui::Orien */ virtual void setupGui(); -protected slots: +protected Q_SLOTS: void setErrorEntry(int errorCode, QString errorMsg); void clearErrorTable(); -signals: +Q_SIGNALS: void newValuesCalculated(); private: diff --git a/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/ReadH5EbsdWidget.cpp b/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/ReadH5EbsdWidget.cpp index e4d04709ac..34b91f5b4e 100644 --- a/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/ReadH5EbsdWidget.cpp +++ b/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/ReadH5EbsdWidget.cpp @@ -137,7 +137,7 @@ FilterParameter* ReadH5EbsdWidget::getFilterParameter() const // ----------------------------------------------------------------------------- void ReadH5EbsdWidget::setWidgetListEnabled(bool b) { - foreach(QWidget* w, m_WidgetList) + Q_FOREACH(QWidget* w, m_WidgetList) { w->setEnabled(b); } @@ -185,7 +185,7 @@ void ReadH5EbsdWidget::setupGui() on_m_LineEdit_textChanged(m_LineEdit->text()); blockSignals(false); - emit parametersChanged(); + Q_EMIT parametersChanged(); }); // Set the initial range based on the z min & z max. This will get adjusted later @@ -360,13 +360,13 @@ void ReadH5EbsdWidget::on_m_LineEdit_textChanged(const QString& text) m_Filter->setInputFile(inputPath); // Once the input file is changed then kick off the prefligth by emitting the parametersChanged() signal - emit parametersChanged(); + Q_EMIT parametersChanged(); m_DidCausePreflight = false; m_NewFileLoaded = false; } // ----------------------------------------------------------------------------- -// Any time something gets clicked, emit the preflight +// Any time something gets clicked, Q_EMIT the preflight // ----------------------------------------------------------------------------- void ReadH5EbsdWidget::on_m_CellList_itemClicked(QListWidgetItem* item) { @@ -394,7 +394,7 @@ void ReadH5EbsdWidget::on_m_CellList_itemClicked(QListWidgetItem* item) m_DataArraysCheckBox->setCheckState(Qt::Unchecked); } m_DataArraysCheckBox->blockSignals(false); - emit parametersChanged(); + Q_EMIT parametersChanged(); m_DidCausePreflight = false; } @@ -421,7 +421,7 @@ void ReadH5EbsdWidget::on_m_DataArraysCheckBox_stateChanged(int state) { m_CellList->item(i)->setCheckState(Qt::CheckState(state)); } - emit parametersChanged(); + Q_EMIT parametersChanged(); m_DidCausePreflight = false; } @@ -432,7 +432,7 @@ void ReadH5EbsdWidget::on_m_DataArraysCheckBox_stateChanged(int state) void ReadH5EbsdWidget::on_m_ZStartIndex_valueChanged(int value) { m_DidCausePreflight = true; - emit parametersChanged(); + Q_EMIT parametersChanged(); m_DidCausePreflight = false; } @@ -442,7 +442,7 @@ void ReadH5EbsdWidget::on_m_ZStartIndex_valueChanged(int value) void ReadH5EbsdWidget::on_m_ZEndIndex_valueChanged(int value) { m_DidCausePreflight = true; - emit parametersChanged(); + Q_EMIT parametersChanged(); m_DidCausePreflight = false; } @@ -453,7 +453,7 @@ void ReadH5EbsdWidget::on_m_UseTransformations_stateChanged(int state) { m_DidCausePreflight = true; m_AngleRepresentationCB->setEnabled(m_UseTransformations->isChecked()); - emit parametersChanged(); + Q_EMIT parametersChanged(); m_DidCausePreflight = false; } @@ -463,7 +463,7 @@ void ReadH5EbsdWidget::on_m_UseTransformations_stateChanged(int state) void ReadH5EbsdWidget::on_m_AngleRepresentationCB_currentIndexChanged(int index) { m_DidCausePreflight = true; - emit parametersChanged(); + Q_EMIT parametersChanged(); m_DidCausePreflight = false; } @@ -475,7 +475,7 @@ void ReadH5EbsdWidget::filterNeedsInputParameters(AbstractFilter* filter) if(nullptr == filter) { QString ss = QObject::tr("Error Setting ReadH5Ebsd Gui values to Filter instance. Filter instance was nullptr.").arg(m_FilterParameter->getPropertyName()); - emit errorSettingFilterParameter(ss); + Q_EMIT errorSettingFilterParameter(ss); } ReadH5Ebsd* readEbsd = qobject_cast(filter); @@ -572,7 +572,7 @@ void ReadH5EbsdWidget::updateModelFromFilter(QSet& arrayNames, bool set // Clear the list and put in those from the incoming list and also check any items that were already selected by the user m_CellList->clear(); - foreach(QString item, arrayNames) + Q_FOREACH(QString item, arrayNames) { QListWidgetItem* listItem = new QListWidgetItem(item, m_CellList); if((selections.find(item) != selections.end()) || (setChecked)) diff --git a/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/ReadH5EbsdWidget.h b/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/ReadH5EbsdWidget.h index 14dbc72b43..a9c7db2fd6 100644 --- a/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/ReadH5EbsdWidget.h +++ b/Source/Plugins/OrientationAnalysis/Gui/FilterParameterWidgets/ReadH5EbsdWidget.h @@ -86,13 +86,13 @@ class ReadH5EbsdWidget : public FilterParameterWidget, private Ui::ReadH5EbsdWid FilterParameter* getFilterParameter() const; - public slots: + public Q_SLOTS: //void widgetChanged(const QString& msg); void beforePreflight(); void afterPreflight(); void filterNeedsInputParameters(AbstractFilter* filter); - protected slots: + protected Q_SLOTS: void on_m_LineEditBtn_clicked(); void on_m_LineEdit_textChanged(const QString& text); void on_m_CellList_itemClicked(QListWidgetItem* item); diff --git a/Source/Plugins/OrientationAnalysis/Gui/Widgets/AxisAngleWidget.cpp b/Source/Plugins/OrientationAnalysis/Gui/Widgets/AxisAngleWidget.cpp index b6e8baee4d..d3301cc29a 100644 --- a/Source/Plugins/OrientationAnalysis/Gui/Widgets/AxisAngleWidget.cpp +++ b/Source/Plugins/OrientationAnalysis/Gui/Widgets/AxisAngleWidget.cpp @@ -141,13 +141,13 @@ void AxisAngleWidget::valuesUpdated(const QString& text) values[1] = axis[1]; values[2] = axis[2]; - emit clearErrorTable(); + Q_EMIT clearErrorTable(); int errorCode = 0; std::stringstream ss; ss << "Axis Angle values were normalized. Actual values used for the calculation are: "; ss << "<" << values[0] << ", " << values[1] << ", " << values[2] << "> " << values[3]; - emit invalidValues(errorCode, QString::fromStdString(ss.str())); + Q_EMIT invalidValues(errorCode, QString::fromStdString(ss.str())); OrientationTransforms, double>::ResultType result = OrientationTransforms, double>::ax_check(values); errorCode = result.result; @@ -155,12 +155,12 @@ void AxisAngleWidget::valuesUpdated(const QString& text) if(errorCode >= 0) { - emit valuesChanged(values, OrientationConverter::AxisAngle, false); + Q_EMIT valuesChanged(values, OrientationConverter::AxisAngle, false); } else { - emit valuesChanged(QVector(), OrientationConverter::AxisAngle, true); - emit invalidValues(errorCode, errorMsg); + Q_EMIT valuesChanged(QVector(), OrientationConverter::AxisAngle, true); + Q_EMIT invalidValues(errorCode, errorMsg); } } diff --git a/Source/Plugins/OrientationAnalysis/Gui/Widgets/AxisAngleWidget.h b/Source/Plugins/OrientationAnalysis/Gui/Widgets/AxisAngleWidget.h index 6125faf641..070ecd3bb7 100644 --- a/Source/Plugins/OrientationAnalysis/Gui/Widgets/AxisAngleWidget.h +++ b/Source/Plugins/OrientationAnalysis/Gui/Widgets/AxisAngleWidget.h @@ -47,7 +47,7 @@ class AxisAngleWidget : public OrientationWidget, private Ui::AxisAngleWidget AxisAngleWidget(QWidget* parent = nullptr); virtual ~AxisAngleWidget(); -protected slots: +protected Q_SLOTS: void convertData(bool isDegrees); void valuesUpdated(const QString& text); diff --git a/Source/Plugins/OrientationAnalysis/Gui/Widgets/CubochoricWidget.cpp b/Source/Plugins/OrientationAnalysis/Gui/Widgets/CubochoricWidget.cpp index d04e058eff..26935979c1 100644 --- a/Source/Plugins/OrientationAnalysis/Gui/Widgets/CubochoricWidget.cpp +++ b/Source/Plugins/OrientationAnalysis/Gui/Widgets/CubochoricWidget.cpp @@ -111,16 +111,16 @@ void CubochoricWidget::valuesUpdated(const QString& text) int errorCode = result.result; QString errorMsg = QString::fromStdString(result.msg); - emit clearErrorTable(); + Q_EMIT clearErrorTable(); if(errorCode >= 0) { - emit valuesChanged(values, OrientationConverter::Cubochoric, false); + Q_EMIT valuesChanged(values, OrientationConverter::Cubochoric, false); } else { - emit valuesChanged(QVector(), OrientationConverter::Cubochoric, true); - emit invalidValues(errorCode, errorMsg); + Q_EMIT valuesChanged(QVector(), OrientationConverter::Cubochoric, true); + Q_EMIT invalidValues(errorCode, errorMsg); } } diff --git a/Source/Plugins/OrientationAnalysis/Gui/Widgets/CubochoricWidget.h b/Source/Plugins/OrientationAnalysis/Gui/Widgets/CubochoricWidget.h index 34161f0e35..89fc0af8af 100644 --- a/Source/Plugins/OrientationAnalysis/Gui/Widgets/CubochoricWidget.h +++ b/Source/Plugins/OrientationAnalysis/Gui/Widgets/CubochoricWidget.h @@ -47,7 +47,7 @@ class CubochoricWidget : public OrientationWidget, private Ui::CubochoricWidget CubochoricWidget(QWidget* parent = nullptr); virtual ~CubochoricWidget(); -protected slots: +protected Q_SLOTS: void valuesUpdated(const QString& text); virtual void updateData(OrientationUtilityCalculator* calculator); diff --git a/Source/Plugins/OrientationAnalysis/Gui/Widgets/EulerWidget.cpp b/Source/Plugins/OrientationAnalysis/Gui/Widgets/EulerWidget.cpp index 60d3473942..01a465d1e2 100644 --- a/Source/Plugins/OrientationAnalysis/Gui/Widgets/EulerWidget.cpp +++ b/Source/Plugins/OrientationAnalysis/Gui/Widgets/EulerWidget.cpp @@ -125,16 +125,16 @@ void EulerWidget::valuesUpdated(const QString& text) int errorCode = result.result; QString errorMsg = QString::fromStdString(result.msg); - emit clearErrorTable(); + Q_EMIT clearErrorTable(); if(errorCode >= 0) { - emit valuesChanged(values, OrientationConverter::Euler, false); + Q_EMIT valuesChanged(values, OrientationConverter::Euler, false); } else { - emit valuesChanged(QVector(), OrientationConverter::Euler, true); - emit invalidValues(errorCode, errorMsg); + Q_EMIT valuesChanged(QVector(), OrientationConverter::Euler, true); + Q_EMIT invalidValues(errorCode, errorMsg); } } diff --git a/Source/Plugins/OrientationAnalysis/Gui/Widgets/EulerWidget.h b/Source/Plugins/OrientationAnalysis/Gui/Widgets/EulerWidget.h index 039419489c..e4e0913c3c 100644 --- a/Source/Plugins/OrientationAnalysis/Gui/Widgets/EulerWidget.h +++ b/Source/Plugins/OrientationAnalysis/Gui/Widgets/EulerWidget.h @@ -47,7 +47,7 @@ class EulerWidget : public OrientationWidget, private Ui::EulerWidget EulerWidget(QWidget* parent = nullptr); virtual ~EulerWidget(); -protected slots: +protected Q_SLOTS: void valuesUpdated(const QString& text); void convertData(bool isDegrees); diff --git a/Source/Plugins/OrientationAnalysis/Gui/Widgets/HomochoricWidget.cpp b/Source/Plugins/OrientationAnalysis/Gui/Widgets/HomochoricWidget.cpp index f3b5072e07..a77a09349e 100644 --- a/Source/Plugins/OrientationAnalysis/Gui/Widgets/HomochoricWidget.cpp +++ b/Source/Plugins/OrientationAnalysis/Gui/Widgets/HomochoricWidget.cpp @@ -112,16 +112,16 @@ void HomochoricWidget::valuesUpdated(const QString& text) int errorCode = result.result; QString errorMsg = QString::fromStdString(result.msg); - emit clearErrorTable(); + Q_EMIT clearErrorTable(); if(errorCode >= 0) { - emit valuesChanged(values, OrientationConverter::Homochoric, false); + Q_EMIT valuesChanged(values, OrientationConverter::Homochoric, false); } else { - emit valuesChanged(QVector(), OrientationConverter::Homochoric, true); - emit invalidValues(errorCode, errorMsg); + Q_EMIT valuesChanged(QVector(), OrientationConverter::Homochoric, true); + Q_EMIT invalidValues(errorCode, errorMsg); } } diff --git a/Source/Plugins/OrientationAnalysis/Gui/Widgets/HomochoricWidget.h b/Source/Plugins/OrientationAnalysis/Gui/Widgets/HomochoricWidget.h index 67fd880986..98fd6d937a 100644 --- a/Source/Plugins/OrientationAnalysis/Gui/Widgets/HomochoricWidget.h +++ b/Source/Plugins/OrientationAnalysis/Gui/Widgets/HomochoricWidget.h @@ -47,7 +47,7 @@ class HomochoricWidget : public OrientationWidget, private Ui::HomochoricWidget HomochoricWidget(QWidget* parent = nullptr); virtual ~HomochoricWidget(); -protected slots: +protected Q_SLOTS: void valuesUpdated(const QString& text); virtual void updateData(OrientationUtilityCalculator* calculator); diff --git a/Source/Plugins/OrientationAnalysis/Gui/Widgets/OmWidget.cpp b/Source/Plugins/OrientationAnalysis/Gui/Widgets/OmWidget.cpp index 78875916b7..b4f9f46ed0 100644 --- a/Source/Plugins/OrientationAnalysis/Gui/Widgets/OmWidget.cpp +++ b/Source/Plugins/OrientationAnalysis/Gui/Widgets/OmWidget.cpp @@ -136,16 +136,16 @@ void OmWidget::valuesUpdated(const QString& text) int errorCode = result.result; QString errorMsg = QString::fromStdString(result.msg); - emit clearErrorTable(); + Q_EMIT clearErrorTable(); if(errorCode >= 0) { - emit valuesChanged(values, OrientationConverter::OrientationMatrix, false); + Q_EMIT valuesChanged(values, OrientationConverter::OrientationMatrix, false); } else { - emit valuesChanged(QVector(), OrientationConverter::OrientationMatrix, true); - emit invalidValues(errorCode, errorMsg); + Q_EMIT valuesChanged(QVector(), OrientationConverter::OrientationMatrix, true); + Q_EMIT invalidValues(errorCode, errorMsg); } } diff --git a/Source/Plugins/OrientationAnalysis/Gui/Widgets/OmWidget.h b/Source/Plugins/OrientationAnalysis/Gui/Widgets/OmWidget.h index e502654df7..d606d1faca 100644 --- a/Source/Plugins/OrientationAnalysis/Gui/Widgets/OmWidget.h +++ b/Source/Plugins/OrientationAnalysis/Gui/Widgets/OmWidget.h @@ -47,7 +47,7 @@ class OmWidget : public OrientationWidget, private Ui::OmWidget OmWidget(QWidget* parent = nullptr); virtual ~OmWidget(); -protected slots: +protected Q_SLOTS: void valuesUpdated(const QString& text); virtual void updateData(OrientationUtilityCalculator* calculator); diff --git a/Source/Plugins/OrientationAnalysis/Gui/Widgets/OrientationUtilityCalculator.cpp b/Source/Plugins/OrientationAnalysis/Gui/Widgets/OrientationUtilityCalculator.cpp index 60b3a55967..7126cbc469 100644 --- a/Source/Plugins/OrientationAnalysis/Gui/Widgets/OrientationUtilityCalculator.cpp +++ b/Source/Plugins/OrientationAnalysis/Gui/Widgets/OrientationUtilityCalculator.cpp @@ -71,7 +71,7 @@ void OrientationUtilityCalculator::setDataAndInputType(QVector values, i m_InputData = values; m_InputType =inputType; m_HasErrors = hasErrors; - emit calculatorReady(this); + Q_EMIT calculatorReady(this); } // ----------------------------------------------------------------------------- diff --git a/Source/Plugins/OrientationAnalysis/Gui/Widgets/OrientationUtilityCalculator.h b/Source/Plugins/OrientationAnalysis/Gui/Widgets/OrientationUtilityCalculator.h index 483467e7b7..1a46385e8b 100644 --- a/Source/Plugins/OrientationAnalysis/Gui/Widgets/OrientationUtilityCalculator.h +++ b/Source/Plugins/OrientationAnalysis/Gui/Widgets/OrientationUtilityCalculator.h @@ -52,10 +52,10 @@ class OrientationUtilityCalculator : public QWidget QVector getValues(int32_t outputType); -protected slots: +protected Q_SLOTS: void setDataAndInputType(QVector values, int32_t inputType, bool hasErrors); -signals: +Q_SIGNALS: void calculatorReady(OrientationUtilityCalculator* calculator); private: diff --git a/Source/Plugins/OrientationAnalysis/Gui/Widgets/OrientationWidget.h b/Source/Plugins/OrientationAnalysis/Gui/Widgets/OrientationWidget.h index 9193dd5c72..00004324cc 100644 --- a/Source/Plugins/OrientationAnalysis/Gui/Widgets/OrientationWidget.h +++ b/Source/Plugins/OrientationAnalysis/Gui/Widgets/OrientationWidget.h @@ -48,7 +48,7 @@ class OrientationWidget : public QWidget OrientationWidget(QWidget* parent = nullptr); virtual ~OrientationWidget(); -signals: +Q_SIGNALS: void valuesChanged(QVector values, int32_t type, bool hasErrors); void invalidValues(int errorCode, QString errorMsg); void clearErrorTable(); @@ -62,7 +62,7 @@ class OrientationWidget : public QWidget AngleMeasurement m_AngleMeasurement; -protected slots: +protected Q_SLOTS: virtual void updateData(OrientationUtilityCalculator* calculator); void updateAngleMeasurement(bool isRadians); diff --git a/Source/Plugins/OrientationAnalysis/Gui/Widgets/QEbsdReferenceFrameDialog.h b/Source/Plugins/OrientationAnalysis/Gui/Widgets/QEbsdReferenceFrameDialog.h index e8cd716238..cf6f633221 100644 --- a/Source/Plugins/OrientationAnalysis/Gui/Widgets/QEbsdReferenceFrameDialog.h +++ b/Source/Plugins/OrientationAnalysis/Gui/Widgets/QEbsdReferenceFrameDialog.h @@ -87,7 +87,7 @@ class QEbsdReferenceFrameDialog : public SVDialog, private Ui::QEbsdReferenceFra void getSampleTranformation(AxisAngleInput_t& input); void getEulerTranformation(AxisAngleInput_t& input); -protected slots: +protected Q_SLOTS: void originChanged(bool checked); void degToRagsChanged(int state); diff --git a/Source/Plugins/OrientationAnalysis/Gui/Widgets/QuatWidget.cpp b/Source/Plugins/OrientationAnalysis/Gui/Widgets/QuatWidget.cpp index 963d511ff6..623af07a32 100644 --- a/Source/Plugins/OrientationAnalysis/Gui/Widgets/QuatWidget.cpp +++ b/Source/Plugins/OrientationAnalysis/Gui/Widgets/QuatWidget.cpp @@ -126,16 +126,16 @@ void QuatWidget::valuesUpdated(const QString& text) int errorCode = result.result; QString errorMsg = QString::fromStdString(result.msg); - emit clearErrorTable(); + Q_EMIT clearErrorTable(); if(errorCode >= 0) { - emit valuesChanged(values, OrientationConverter::Quaternion, false); + Q_EMIT valuesChanged(values, OrientationConverter::Quaternion, false); } else { - emit valuesChanged(QVector(), OrientationConverter::Quaternion, true); - emit invalidValues(errorCode, errorMsg); + Q_EMIT valuesChanged(QVector(), OrientationConverter::Quaternion, true); + Q_EMIT invalidValues(errorCode, errorMsg); } } diff --git a/Source/Plugins/OrientationAnalysis/Gui/Widgets/QuatWidget.h b/Source/Plugins/OrientationAnalysis/Gui/Widgets/QuatWidget.h index 07901a2822..e82e0463e3 100644 --- a/Source/Plugins/OrientationAnalysis/Gui/Widgets/QuatWidget.h +++ b/Source/Plugins/OrientationAnalysis/Gui/Widgets/QuatWidget.h @@ -47,7 +47,7 @@ class QuatWidget : public OrientationWidget, private Ui::QuatWidget QuatWidget(QWidget* parent = nullptr); virtual ~QuatWidget(); -protected slots: +protected Q_SLOTS: void valuesUpdated(const QString& text); virtual void updateData(OrientationUtilityCalculator* calculator); diff --git a/Source/Plugins/OrientationAnalysis/Gui/Widgets/RodriguesWidget.cpp b/Source/Plugins/OrientationAnalysis/Gui/Widgets/RodriguesWidget.cpp index 5dfa548b26..deb9ae5896 100644 --- a/Source/Plugins/OrientationAnalysis/Gui/Widgets/RodriguesWidget.cpp +++ b/Source/Plugins/OrientationAnalysis/Gui/Widgets/RodriguesWidget.cpp @@ -128,25 +128,25 @@ void RodriguesWidget::valuesUpdated(const QString& text) values[1] = rod[1]; values[2] = rod[2]; - emit clearErrorTable(); + Q_EMIT clearErrorTable(); int errorCode = 0; std::stringstream ss; ss << "Rodrigues vector was normalized. Actual values used for the calculation are: "; ss << values[0] << ", " << values[1] << ", " << values[2] << ", " << values[3]; - emit invalidValues(errorCode, QString::fromStdString(ss.str())); + Q_EMIT invalidValues(errorCode, QString::fromStdString(ss.str())); OrientationTransforms, double>::ResultType result = OrientationTransforms, double>::ro_check(values); errorCode = result.result; QString errorMsg = QString::fromStdString(result.msg); if(errorCode >= 0) { - emit valuesChanged(values, OrientationConverter::Rodrigues, false); + Q_EMIT valuesChanged(values, OrientationConverter::Rodrigues, false); } else { - emit valuesChanged(QVector(), OrientationConverter::Rodrigues, true); - emit invalidValues(errorCode, errorMsg); + Q_EMIT valuesChanged(QVector(), OrientationConverter::Rodrigues, true); + Q_EMIT invalidValues(errorCode, errorMsg); } } diff --git a/Source/Plugins/OrientationAnalysis/Gui/Widgets/RodriguesWidget.h b/Source/Plugins/OrientationAnalysis/Gui/Widgets/RodriguesWidget.h index 147dd049ba..161611f065 100644 --- a/Source/Plugins/OrientationAnalysis/Gui/Widgets/RodriguesWidget.h +++ b/Source/Plugins/OrientationAnalysis/Gui/Widgets/RodriguesWidget.h @@ -47,7 +47,7 @@ class RodriguesWidget : public OrientationWidget, private Ui::RodriguesWidget RodriguesWidget(QWidget* parent = nullptr); virtual ~RodriguesWidget(); -protected slots: +protected Q_SLOTS: void valuesUpdated(const QString& text); virtual void updateData(OrientationUtilityCalculator* calculator); diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/BadDataNeighborOrientationCheck.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/BadDataNeighborOrientationCheck.cpp index 207acaf9fa..5acb3ae72e 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/BadDataNeighborOrientationCheck.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/BadDataNeighborOrientationCheck.cpp @@ -183,10 +183,10 @@ void BadDataNeighborOrientationCheck::dataCheck() void BadDataNeighborOrientationCheck::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/BadDataNeighborOrientationCheck.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/BadDataNeighborOrientationCheck.h index e6ef5c4941..a53ecc9470 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/BadDataNeighborOrientationCheck.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/BadDataNeighborOrientationCheck.h @@ -146,7 +146,7 @@ class OrientationAnalysis_EXPORT BadDataNeighborOrientationCheck : public Abstra */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ChangeAngleRepresentation.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ChangeAngleRepresentation.cpp index 81cabb6934..831e554509 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ChangeAngleRepresentation.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ChangeAngleRepresentation.cpp @@ -39,7 +39,6 @@ #include #include #include -#include #endif #include "SIMPLib/Common/Constants.h" @@ -172,10 +171,10 @@ void ChangeAngleRepresentation::dataCheck() void ChangeAngleRepresentation::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } @@ -195,8 +194,7 @@ void ChangeAngleRepresentation::execute() int64_t totalPoints = static_cast(m_CellEulerAnglesPtr.lock()->getNumberOfTuples()); #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; #endif float conversionFactor = 1.0f; diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ChangeAngleRepresentation.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ChangeAngleRepresentation.h index 1ca2e68178..c116cf025f 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ChangeAngleRepresentation.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ChangeAngleRepresentation.h @@ -128,7 +128,7 @@ class OrientationAnalysis_EXPORT ChangeAngleRepresentation : public AbstractFilt */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ConvertHexGridToSquareGrid.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ConvertHexGridToSquareGrid.cpp index ad6c4b08e9..e73eba3e39 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ConvertHexGridToSquareGrid.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ConvertHexGridToSquareGrid.cpp @@ -165,10 +165,10 @@ void ConvertHexGridToSquareGrid::dataCheck() void ConvertHexGridToSquareGrid::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ConvertHexGridToSquareGrid.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ConvertHexGridToSquareGrid.h index d8127bd4a2..6fcebf5885 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ConvertHexGridToSquareGrid.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ConvertHexGridToSquareGrid.h @@ -163,7 +163,7 @@ class OrientationAnalysis_EXPORT ConvertHexGridToSquareGrid : public AbstractFil */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ConvertOrientations.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ConvertOrientations.cpp index bf96326256..53b6d94993 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ConvertOrientations.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ConvertOrientations.cpp @@ -212,10 +212,10 @@ void ConvertOrientations::dataCheck() void ConvertOrientations::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ConvertOrientations.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ConvertOrientations.h index ec246201ba..7888016016 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ConvertOrientations.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ConvertOrientations.h @@ -139,7 +139,7 @@ class OrientationAnalysis_EXPORT ConvertOrientations : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ConvertQuaternion.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ConvertQuaternion.cpp index 7d4e024dbd..dc0977a4c6 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ConvertQuaternion.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ConvertQuaternion.cpp @@ -46,7 +46,6 @@ #include #include #include -#include #endif @@ -215,10 +214,10 @@ void ConvertQuaternion::preflight() { // These are the REQUIRED lines of CODE to make sure the filter behaves correctly setInPreflight(true); // Set the fact that we are preflighting. - emit preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update - emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter + Q_EMIT preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update + Q_EMIT updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter dataCheck(); // Run our DataCheck to make sure everthing is setup correctly - emit preflightExecuted(); // We are done preflighting this filter + Q_EMIT preflightExecuted(); // We are done preflighting this filter setInPreflight(false); // Inform the system this filter is NOT in preflight mode anymore. } @@ -237,8 +236,7 @@ void ConvertQuaternion::execute() size_t totalPoints = m_QuaternionsPtr.lock()->getNumberOfTuples(); #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; #endif #ifdef SIMPL_USE_PARALLEL_ALGORITHMS diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ConvertQuaternion.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ConvertQuaternion.h index 28dff7264b..ae75d8f641 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ConvertQuaternion.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ConvertQuaternion.h @@ -134,7 +134,7 @@ class OrientationAnalysis_EXPORT ConvertQuaternion : public AbstractFilter */ void preflight() override; - signals: + Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/CreateEnsembleInfo.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/CreateEnsembleInfo.cpp index 64680d8058..0e94146830 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/CreateEnsembleInfo.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/CreateEnsembleInfo.cpp @@ -172,10 +172,10 @@ void CreateEnsembleInfo::dataCheck() void CreateEnsembleInfo::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/CreateEnsembleInfo.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/CreateEnsembleInfo.h index d318c28efc..31373cd824 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/CreateEnsembleInfo.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/CreateEnsembleInfo.h @@ -147,7 +147,7 @@ class OrientationAnalysis_EXPORT CreateEnsembleInfo : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/CreateLambertSphere.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/CreateLambertSphere.cpp index cc07ad6413..ca50a781de 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/CreateLambertSphere.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/CreateLambertSphere.cpp @@ -347,10 +347,10 @@ void CreateLambertSphere::dataCheck() void CreateLambertSphere::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/CreateLambertSphere.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/CreateLambertSphere.h index 632330e93c..f673859b14 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/CreateLambertSphere.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/CreateLambertSphere.h @@ -174,7 +174,7 @@ class OrientationAnalysis_EXPORT CreateLambertSphere : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/EMsoftSO3Sampler.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/EMsoftSO3Sampler.cpp index 9b5ee45cc6..a60eb98ccd 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/EMsoftSO3Sampler.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/EMsoftSO3Sampler.cpp @@ -257,10 +257,10 @@ void EMsoftSO3Sampler::preflight() { // These are the REQUIRED lines of CODE to make sure the filter behaves correctly setInPreflight(true); // Set the fact that we are preflighting. - emit preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update - emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter + Q_EMIT preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update + Q_EMIT updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter dataCheck(); // Run our DataCheck to make sure everthing is setup correctly - emit preflightExecuted(); // We are done preflighting this filter + Q_EMIT preflightExecuted(); // We are done preflighting this filter setInPreflight(false); // Inform the system this filter is NOT in preflight mode anymore. } diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/EMsoftSO3Sampler.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/EMsoftSO3Sampler.h index afa3f65315..e86b61910c 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/EMsoftSO3Sampler.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/EMsoftSO3Sampler.h @@ -215,7 +215,7 @@ class OrientationAnalysis_EXPORT EMsoftSO3Sampler : public AbstractFilter */ void setUpdateProgress(int tuplesCompleted); -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/EbsdToH5Ebsd.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/EbsdToH5Ebsd.cpp index 313c42ac37..62b442d3b6 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/EbsdToH5Ebsd.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/EbsdToH5Ebsd.cpp @@ -199,10 +199,10 @@ void EbsdToH5Ebsd::dataCheck() void EbsdToH5Ebsd::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/EbsdToH5Ebsd.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/EbsdToH5Ebsd.h index 0e44bf3dc3..3571f709f0 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/EbsdToH5Ebsd.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/EbsdToH5Ebsd.h @@ -158,7 +158,7 @@ class OrientationAnalysis_EXPORT EbsdToH5Ebsd : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/EnsembleInfoReader.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/EnsembleInfoReader.cpp index 03adec0653..47c3dadf56 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/EnsembleInfoReader.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/EnsembleInfoReader.cpp @@ -222,10 +222,10 @@ void EnsembleInfoReader::dataCheck() void EnsembleInfoReader::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindAvgCAxes.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindAvgCAxes.cpp index 2e6c04c6e0..dd91d09908 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindAvgCAxes.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindAvgCAxes.cpp @@ -158,10 +158,10 @@ void FindAvgCAxes::dataCheck() void FindAvgCAxes::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindAvgCAxes.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindAvgCAxes.h index a2fc34b8db..f458907044 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindAvgCAxes.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindAvgCAxes.h @@ -134,7 +134,7 @@ class OrientationAnalysis_EXPORT FindAvgCAxes : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindAvgOrientations.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindAvgOrientations.cpp index e2e5d7ae18..1a2107ef1f 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindAvgOrientations.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindAvgOrientations.cpp @@ -202,10 +202,10 @@ void FindAvgOrientations::dataCheck() void FindAvgOrientations::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindAvgOrientations.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindAvgOrientations.h index 522e3ad4fe..7cf541467b 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindAvgOrientations.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindAvgOrientations.h @@ -146,7 +146,7 @@ class OrientationAnalysis_EXPORT FindAvgOrientations : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindBasalLoadingFactor.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindBasalLoadingFactor.cpp index ccbac7f682..044f6cb0d3 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindBasalLoadingFactor.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindBasalLoadingFactor.cpp @@ -136,10 +136,10 @@ void FindBasalLoadingFactor::dataCheck() void FindBasalLoadingFactor::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindBasalLoadingFactor.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindBasalLoadingFactor.h index dc4f5b0e90..8f65203a72 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindBasalLoadingFactor.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindBasalLoadingFactor.h @@ -142,7 +142,7 @@ class OrientationAnalysis_EXPORT FindBasalLoadingFactor : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindBoundaryStrengths.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindBoundaryStrengths.cpp index 76f63807e6..e60c8b99ed 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindBoundaryStrengths.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindBoundaryStrengths.cpp @@ -248,11 +248,11 @@ void FindBoundaryStrengths::dataCheckVoxel() void FindBoundaryStrengths::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheckVoxel(); dataCheckSurfaceMesh(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindBoundaryStrengths.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindBoundaryStrengths.h index 95ce21e698..ed75b64bbe 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindBoundaryStrengths.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindBoundaryStrengths.h @@ -159,7 +159,7 @@ class OrientationAnalysis_EXPORT FindBoundaryStrengths : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindCAxisLocations.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindCAxisLocations.cpp index dc2b1d54dd..da74803bf9 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindCAxisLocations.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindCAxisLocations.cpp @@ -129,10 +129,10 @@ void FindCAxisLocations::dataCheck() void FindCAxisLocations::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindCAxisLocations.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindCAxisLocations.h index 61e6751f94..b0b0fae276 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindCAxisLocations.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindCAxisLocations.h @@ -130,7 +130,7 @@ class OrientationAnalysis_EXPORT FindCAxisLocations : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindDistsToCharactGBs.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindDistsToCharactGBs.cpp index 7c5df4719c..699f57cd80 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindDistsToCharactGBs.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindDistsToCharactGBs.cpp @@ -60,7 +60,6 @@ #include #include #include -#include #endif const double FindDistsToCharactGBs::INF_DIST = 999.0; @@ -448,10 +447,10 @@ void FindDistsToCharactGBs::preflight() { // These are the REQUIRED lines of CODE to make sure the filter behaves correctly setInPreflight(true); // Set the fact that we are preflighting. - emit preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update - emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter + Q_EMIT preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update + Q_EMIT updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter dataCheck(); // Run our DataCheck to make sure everthing is setup correctly - emit preflightExecuted(); // We are done preflighting this filter + Q_EMIT preflightExecuted(); // We are done preflighting this filter setInPreflight(false); // Inform the system this filter is NOT in preflight mode anymore. } @@ -480,8 +479,7 @@ void FindDistsToCharactGBs::execute() double* m_FaceNormals = m_SurfaceMeshFaceNormalsPtr.lock()->getPointer(0); #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; #endif int64_t trisChunkSize = 50000; diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindDistsToCharactGBs.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindDistsToCharactGBs.h index 0da1012ee7..196045bcac 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindDistsToCharactGBs.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindDistsToCharactGBs.h @@ -167,7 +167,7 @@ class OrientationAnalysis_EXPORT FindDistsToCharactGBs : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindFeatureNeighborCAxisMisalignments.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindFeatureNeighborCAxisMisalignments.cpp index 9d38f694c1..305c8d9687 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindFeatureNeighborCAxisMisalignments.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindFeatureNeighborCAxisMisalignments.cpp @@ -211,10 +211,10 @@ void FindFeatureNeighborCAxisMisalignments::dataCheck() void FindFeatureNeighborCAxisMisalignments::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindFeatureNeighborCAxisMisalignments.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindFeatureNeighborCAxisMisalignments.h index dabc0885bf..81a243ab07 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindFeatureNeighborCAxisMisalignments.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindFeatureNeighborCAxisMisalignments.h @@ -151,7 +151,7 @@ class OrientationAnalysis_EXPORT FindFeatureNeighborCAxisMisalignments : public */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindFeatureReferenceCAxisMisorientations.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindFeatureReferenceCAxisMisorientations.cpp index 8d95bcb54f..d0420a33b8 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindFeatureReferenceCAxisMisorientations.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindFeatureReferenceCAxisMisorientations.cpp @@ -213,10 +213,10 @@ void FindFeatureReferenceCAxisMisorientations::dataCheck() void FindFeatureReferenceCAxisMisorientations::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindFeatureReferenceCAxisMisorientations.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindFeatureReferenceCAxisMisorientations.h index f046457dd8..e0612a5aac 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindFeatureReferenceCAxisMisorientations.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindFeatureReferenceCAxisMisorientations.h @@ -150,7 +150,7 @@ class OrientationAnalysis_EXPORT FindFeatureReferenceCAxisMisorientations : publ */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindFeatureReferenceMisorientations.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindFeatureReferenceMisorientations.cpp index 5c3d3a00ed..eebd910064 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindFeatureReferenceMisorientations.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindFeatureReferenceMisorientations.cpp @@ -264,10 +264,10 @@ void FindFeatureReferenceMisorientations::dataCheck() void FindFeatureReferenceMisorientations::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindFeatureReferenceMisorientations.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindFeatureReferenceMisorientations.h index e08a840046..a36971ef66 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindFeatureReferenceMisorientations.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindFeatureReferenceMisorientations.h @@ -158,7 +158,7 @@ class OrientationAnalysis_EXPORT FindFeatureReferenceMisorientations : public Ab */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindGBCD.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindGBCD.cpp index f6ab7096d0..d474618838 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindGBCD.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindGBCD.cpp @@ -40,7 +40,6 @@ #include #include #include -#include #endif #include @@ -564,15 +563,15 @@ void FindGBCD::dataCheckVoxel() void FindGBCD::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheckVoxel(); // order here matters...because we are going to use the size of the crystal structures out of the dataCheckVoxel to size the faceAttrMat in dataCheckSurfaceMesh if(getErrorCondition() >= 0) { dataCheckSurfaceMesh(); } - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } @@ -596,8 +595,7 @@ void FindGBCD::execute() } #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; #endif size_t totalPhases = m_CrystalStructuresPtr.lock()->getNumberOfTuples(); diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindGBCD.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindGBCD.h index 03279eab5d..341fcb5436 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindGBCD.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindGBCD.h @@ -159,7 +159,7 @@ class OrientationAnalysis_EXPORT FindGBCD : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindGBCDMetricBased.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindGBCDMetricBased.cpp index 8aff1f9635..595750658d 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindGBCDMetricBased.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindGBCDMetricBased.cpp @@ -70,7 +70,6 @@ #include #include #include -#include #endif const float FindGBCDMetricBased::k_ResolutionChoices[FindGBCDMetricBased::k_NumberResolutionChoices][2] = {{3.0f, 7.0f}, {5.0f, 5.0f}, {5.0f, 7.0f}, {5.0f, 8.0f}, @@ -723,10 +722,10 @@ void FindGBCDMetricBased::preflight() { // These are the REQUIRED lines of CODE to make sure the filter behaves correctly setInPreflight(true); // Set the fact that we are preflighting. - emit preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update - emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter + Q_EMIT preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update + Q_EMIT updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter dataCheck(); // Run our DataCheck to make sure everthing is setup correctly - emit preflightExecuted(); // We are done preflighting this filter + Q_EMIT preflightExecuted(); // We are done preflighting this filter setInPreflight(false); // Inform the system this filter is NOT in preflight mode anymore. } @@ -908,8 +907,7 @@ void FindGBCDMetricBased::execute() // --------- find triangles (and equivalent crystallographic parameters) with +- the fixed misorientation --------- #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; tbb::concurrent_vector selectedTris(0); #else QVector selectedTris(0); diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindGBCDMetricBased.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindGBCDMetricBased.h index 92abd7b619..2beb70ec5b 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindGBCDMetricBased.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindGBCDMetricBased.h @@ -199,7 +199,7 @@ class OrientationAnalysis_EXPORT FindGBCDMetricBased : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindGBPDMetricBased.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindGBPDMetricBased.cpp index 984640bb46..d3231a6d1f 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindGBPDMetricBased.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindGBPDMetricBased.cpp @@ -70,7 +70,6 @@ #include #include #include -#include #endif namespace GBPDMetricBased @@ -638,10 +637,10 @@ void FindGBPDMetricBased::preflight() { // These are the REQUIRED lines of CODE to make sure the filter behaves correctly setInPreflight(true); // Set the fact that we are preflighting. - emit preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update - emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter + Q_EMIT preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update + Q_EMIT updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter dataCheck(); // Run our DataCheck to make sure everthing is setup correctly - emit preflightExecuted(); // We are done preflighting this filter + Q_EMIT preflightExecuted(); // We are done preflighting this filter setInPreflight(false); // Inform the system this filter is NOT in preflight mode anymore. } @@ -988,8 +987,7 @@ void FindGBPDMetricBased::execute() size_t numMeshTris = m_SurfaceMeshFaceAreasPtr.lock()->getNumberOfTuples(); #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; tbb::concurrent_vector selectedTris(0); #else QVector selectedTris(0); diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindGBPDMetricBased.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindGBPDMetricBased.h index 91b0009be3..f47e410af2 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindGBPDMetricBased.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindGBPDMetricBased.h @@ -191,7 +191,7 @@ class OrientationAnalysis_EXPORT FindGBPDMetricBased : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindKernelAvgMisorientations.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindKernelAvgMisorientations.cpp index 01e92e7b9f..d26648ce2b 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindKernelAvgMisorientations.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindKernelAvgMisorientations.cpp @@ -198,10 +198,10 @@ void FindKernelAvgMisorientations::dataCheck() void FindKernelAvgMisorientations::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindKernelAvgMisorientations.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindKernelAvgMisorientations.h index 2e419fd66d..0632e1e575 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindKernelAvgMisorientations.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindKernelAvgMisorientations.h @@ -147,7 +147,7 @@ class OrientationAnalysis_EXPORT FindKernelAvgMisorientations : public AbstractF */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindLocalAverageCAxisMisalignments.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindLocalAverageCAxisMisalignments.cpp index 84909909e7..79aa4e364e 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindLocalAverageCAxisMisalignments.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindLocalAverageCAxisMisalignments.cpp @@ -252,10 +252,10 @@ void FindLocalAverageCAxisMisalignments::dataCheck() void FindLocalAverageCAxisMisalignments::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindLocalAverageCAxisMisalignments.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindLocalAverageCAxisMisalignments.h index fdbec85b8a..857847ba22 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindLocalAverageCAxisMisalignments.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindLocalAverageCAxisMisalignments.h @@ -182,7 +182,7 @@ class OrientationAnalysis_EXPORT FindLocalAverageCAxisMisalignments : public Abs */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindMicroTextureRegions.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindMicroTextureRegions.cpp index d3c301253f..abc724025e 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindMicroTextureRegions.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindMicroTextureRegions.cpp @@ -154,10 +154,10 @@ void FindMicroTextureRegions::dataCheck() void FindMicroTextureRegions::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindMicroTextureRegions.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindMicroTextureRegions.h index 815d995307..c7f243f9e9 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindMicroTextureRegions.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindMicroTextureRegions.h @@ -143,7 +143,7 @@ class OrientationAnalysis_EXPORT FindMicroTextureRegions : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindMisorientations.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindMisorientations.cpp index 552de36ff1..96cf4d5f22 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindMisorientations.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindMisorientations.cpp @@ -206,10 +206,10 @@ void FindMisorientations::dataCheck() void FindMisorientations::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindMisorientations.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindMisorientations.h index 1974686576..0b2133fc5d 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindMisorientations.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindMisorientations.h @@ -151,7 +151,7 @@ class OrientationAnalysis_EXPORT FindMisorientations : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindOrientationFieldCurl.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindOrientationFieldCurl.cpp index c29ae77519..2543c0dcbf 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindOrientationFieldCurl.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindOrientationFieldCurl.cpp @@ -36,11 +36,9 @@ #include "FindOrientationFieldCurl.h" #ifdef SIMPL_USE_PARALLEL_ALGORITHMS -#include #include #include #include -#include #include #endif @@ -237,10 +235,10 @@ void FindOrientationFieldCurl::dataCheck() void FindOrientationFieldCurl::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } @@ -305,8 +303,7 @@ void FindOrientationFieldCurl::execute() } #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; #endif // first determine the misorientation vectors on all the voxel faces diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindOrientationFieldCurl.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindOrientationFieldCurl.h index 4268dd9e73..585e8e5cb8 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindOrientationFieldCurl.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindOrientationFieldCurl.h @@ -151,7 +151,7 @@ class OrientationAnalysis_EXPORT FindOrientationFieldCurl : public AbstractFilte */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindSchmids.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindSchmids.cpp index 33f94aacbe..2cc2dec249 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindSchmids.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindSchmids.cpp @@ -267,10 +267,10 @@ void FindSchmids::dataCheck() void FindSchmids::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindSchmids.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindSchmids.h index 52b897affd..3d348d5f95 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindSchmids.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindSchmids.h @@ -175,7 +175,7 @@ class OrientationAnalysis_EXPORT FindSchmids : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindSlipTransmissionMetrics.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindSlipTransmissionMetrics.cpp index 2b01a10f6f..aac9614748 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindSlipTransmissionMetrics.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindSlipTransmissionMetrics.cpp @@ -209,10 +209,10 @@ void FindSlipTransmissionMetrics::dataCheck() void FindSlipTransmissionMetrics::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindSlipTransmissionMetrics.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindSlipTransmissionMetrics.h index ccc1581d4e..1ae442e87d 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindSlipTransmissionMetrics.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindSlipTransmissionMetrics.h @@ -155,7 +155,7 @@ class OrientationAnalysis_EXPORT FindSlipTransmissionMetrics : public AbstractFi */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindTwinBoundaries.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindTwinBoundaries.cpp index 2e7b371b37..69fc5f6ce0 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindTwinBoundaries.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindTwinBoundaries.cpp @@ -39,7 +39,6 @@ #include #include #include -#include #endif #include "SIMPLib/Common/Constants.h" @@ -407,11 +406,11 @@ void FindTwinBoundaries::dataCheckSurfaceMesh() void FindTwinBoundaries::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheckVoxel(); dataCheckSurfaceMesh(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } @@ -434,8 +433,7 @@ void FindTwinBoundaries::execute() } #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; #endif size_t numTriangles = m_SurfaceMeshFaceLabelsPtr.lock()->getNumberOfTuples(); diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindTwinBoundaries.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindTwinBoundaries.h index c170bdc072..3e131049df 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindTwinBoundaries.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindTwinBoundaries.h @@ -162,7 +162,7 @@ class OrientationAnalysis_EXPORT FindTwinBoundaries : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindTwinBoundarySchmidFactors.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindTwinBoundarySchmidFactors.cpp index d9ce7c24ae..211dbf6301 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindTwinBoundarySchmidFactors.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindTwinBoundarySchmidFactors.cpp @@ -41,7 +41,6 @@ #include #include #include -#include #endif #include "SIMPLib/Common/Constants.h" @@ -432,11 +431,11 @@ void FindTwinBoundarySchmidFactors::dataCheckSurfaceMesh() void FindTwinBoundarySchmidFactors::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheckVoxel(); dataCheckSurfaceMesh(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } @@ -459,8 +458,7 @@ void FindTwinBoundarySchmidFactors::execute() } #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; #endif size_t numTriangles = m_SurfaceMeshFaceLabelsPtr.lock()->getNumberOfTuples(); diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindTwinBoundarySchmidFactors.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindTwinBoundarySchmidFactors.h index 57caaa02aa..0c682235ec 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindTwinBoundarySchmidFactors.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/FindTwinBoundarySchmidFactors.h @@ -163,7 +163,7 @@ class OrientationAnalysis_EXPORT FindTwinBoundarySchmidFactors : public Abstract */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateEulerColors.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateEulerColors.cpp index 6cc95b09ea..7a1727ee7f 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateEulerColors.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateEulerColors.cpp @@ -185,10 +185,10 @@ void GenerateEulerColors::dataCheck() void GenerateEulerColors::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateEulerColors.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateEulerColors.h index 9ec13d0f88..6bcf017079 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateEulerColors.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateEulerColors.h @@ -152,7 +152,7 @@ class OrientationAnalysis_EXPORT GenerateEulerColors : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateFZQuaternions.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateFZQuaternions.cpp index 358ab08fc3..6bc9107722 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateFZQuaternions.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateFZQuaternions.cpp @@ -8,7 +8,6 @@ #include #include #include -#include #endif #include "SIMPLib/Common/Constants.h" @@ -254,10 +253,10 @@ void GenerateFZQuaternions::preflight() { // These are the REQUIRED lines of CODE to make sure the filter behaves correctly setInPreflight(true); // Set the fact that we are preflighting. - emit preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update - emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter + Q_EMIT preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update + Q_EMIT updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter dataCheck(); // Run our DataCheck to make sure everthing is setup correctly - emit preflightExecuted(); // We are done preflighting this filter + Q_EMIT preflightExecuted(); // We are done preflighting this filter setInPreflight(false); // Inform the system this filter is NOT in preflight mode anymore. } @@ -283,8 +282,7 @@ void GenerateFZQuaternions::execute() int32_t numPhases = static_cast(m_CrystalStructuresPtr.lock()->getNumberOfTuples()); #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; #endif #ifdef SIMPL_USE_PARALLEL_ALGORITHMS diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateFZQuaternions.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateFZQuaternions.h index 975533d708..841f9faec5 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateFZQuaternions.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateFZQuaternions.h @@ -116,7 +116,7 @@ class OrientationAnalysis_EXPORT GenerateFZQuaternions : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateFaceIPFColoring.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateFaceIPFColoring.cpp index c14bd4550b..eda2222adf 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateFaceIPFColoring.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateFaceIPFColoring.cpp @@ -379,11 +379,11 @@ void GenerateFaceIPFColoring::dataCheckVoxel() void GenerateFaceIPFColoring::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheckSurfaceMesh(); dataCheckVoxel(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateFaceIPFColoring.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateFaceIPFColoring.h index 0780b8d09b..637fa94182 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateFaceIPFColoring.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateFaceIPFColoring.h @@ -144,7 +144,7 @@ class OrientationAnalysis_EXPORT GenerateFaceIPFColoring : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateFaceMisorientationColoring.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateFaceMisorientationColoring.cpp index 57bbf2e628..d49dddbc91 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateFaceMisorientationColoring.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateFaceMisorientationColoring.cpp @@ -322,11 +322,11 @@ void GenerateFaceMisorientationColoring::dataCheckVoxel() void GenerateFaceMisorientationColoring::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheckSurfaceMesh(); dataCheckVoxel(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateFaceMisorientationColoring.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateFaceMisorientationColoring.h index cc6a093097..6c566de54d 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateFaceMisorientationColoring.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateFaceMisorientationColoring.h @@ -140,7 +140,7 @@ class OrientationAnalysis_EXPORT GenerateFaceMisorientationColoring : public Abs */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateFaceSchuhMisorientationColoring.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateFaceSchuhMisorientationColoring.cpp index c2be64a43c..dc02951aac 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateFaceSchuhMisorientationColoring.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateFaceSchuhMisorientationColoring.cpp @@ -290,11 +290,11 @@ void GenerateFaceSchuhMisorientationColoring::dataCheckVoxel() void GenerateFaceSchuhMisorientationColoring::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheckSurfaceMesh(); dataCheckVoxel(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateFaceSchuhMisorientationColoring.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateFaceSchuhMisorientationColoring.h index a108350058..571306f907 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateFaceSchuhMisorientationColoring.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateFaceSchuhMisorientationColoring.h @@ -154,7 +154,7 @@ class OrientationAnalysis_EXPORT GenerateFaceSchuhMisorientationColoring : publi */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateIPFColors.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateIPFColors.cpp index f4418a3a16..e6248b73b7 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateIPFColors.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateIPFColors.cpp @@ -39,7 +39,6 @@ #include #include #include -#include #endif #include "SIMPLib/Common/Constants.h" @@ -293,10 +292,10 @@ void GenerateIPFColors::dataCheck() void GenerateIPFColors::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } @@ -324,8 +323,7 @@ void GenerateIPFColors::execute() MatrixMath::Normalize3x1(normRefDir.x, normRefDir.y, normRefDir.z); #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; #endif #ifdef SIMPL_USE_PARALLEL_ALGORITHMS diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateIPFColors.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateIPFColors.h index 10d7f14a98..2ba53f7b62 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateIPFColors.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateIPFColors.h @@ -154,7 +154,7 @@ class OrientationAnalysis_EXPORT GenerateIPFColors : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateOrientationMatrixTranspose.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateOrientationMatrixTranspose.cpp index db5f2b17b6..36103f887c 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateOrientationMatrixTranspose.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateOrientationMatrixTranspose.cpp @@ -16,7 +16,6 @@ #include #include #include -#include #endif class GenerateOrientationMatrixTransposeImpl @@ -152,10 +151,10 @@ void GenerateOrientationMatrixTranspose::preflight() { // These are the REQUIRED lines of CODE to make sure the filter behaves correctly setInPreflight(true); // Set the fact that we are preflighting. - emit preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update - emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter + Q_EMIT preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update + Q_EMIT updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter dataCheck(); // Run our DataCheck to make sure everthing is setup correctly - emit preflightExecuted(); // We are done preflighting this filter + Q_EMIT preflightExecuted(); // We are done preflighting this filter setInPreflight(false); // Inform the system this filter is NOT in preflight mode anymore. } @@ -179,8 +178,7 @@ void GenerateOrientationMatrixTranspose::execute() size_t totalPoints = m_OrientationMatrixPtr.lock()->getNumberOfTuples(); #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; #endif #ifdef SIMPL_USE_PARALLEL_ALGORITHMS diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateOrientationMatrixTranspose.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateOrientationMatrixTranspose.h index a45d7fafca..3e2881c311 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateOrientationMatrixTranspose.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateOrientationMatrixTranspose.h @@ -91,7 +91,7 @@ class GenerateOrientationMatrixTranspose : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateQuaternionConjugate.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateQuaternionConjugate.cpp index 7a960f6c41..7e023dbade 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateQuaternionConjugate.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateQuaternionConjugate.cpp @@ -8,7 +8,6 @@ #include #include #include -#include #endif #include "SIMPLib/Common/Constants.h" @@ -23,7 +22,6 @@ #include #include #include -#include #endif /* Create Enumerations to allow the created Attribute Arrays to take part in renaming */ // enum createdPathID : RenameDataPath::DataID_t @@ -159,10 +157,10 @@ void GenerateQuaternionConjugate::preflight() { // These are the REQUIRED lines of CODE to make sure the filter behaves correctly setInPreflight(true); // Set the fact that we are preflighting. - emit preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update - emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter + Q_EMIT preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update + Q_EMIT updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter dataCheck(); // Run our DataCheck to make sure everthing is setup correctly - emit preflightExecuted(); // We are done preflighting this filter + Q_EMIT preflightExecuted(); // We are done preflighting this filter setInPreflight(false); // Inform the system this filter is NOT in preflight mode anymore. } @@ -181,8 +179,7 @@ void GenerateQuaternionConjugate::execute() size_t totalPoints = m_QuaternionsPtr.lock()->getNumberOfTuples(); #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; #endif #ifdef SIMPL_USE_PARALLEL_ALGORITHMS diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateQuaternionConjugate.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateQuaternionConjugate.h index 97b2120e3d..139a138c1a 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateQuaternionConjugate.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateQuaternionConjugate.h @@ -99,7 +99,7 @@ class OrientationAnalysis_EXPORT GenerateQuaternionConjugate : public AbstractFi */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateRodriguesColors.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateRodriguesColors.cpp index 6fd73440fb..c7a119a3b9 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateRodriguesColors.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateRodriguesColors.cpp @@ -197,10 +197,10 @@ void GenerateRodriguesColors::dataCheck() void GenerateRodriguesColors::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateRodriguesColors.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateRodriguesColors.h index ba2767ea1a..3f44f29b77 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateRodriguesColors.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/GenerateRodriguesColors.h @@ -151,7 +151,7 @@ class OrientationAnalysis_EXPORT GenerateRodriguesColors : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/INLWriter.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/INLWriter.cpp index 271278a732..5db5baa85e 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/INLWriter.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/INLWriter.cpp @@ -226,10 +226,10 @@ void INLWriter::dataCheck() void INLWriter::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ImportEbsdMontage.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ImportEbsdMontage.cpp index de68eeb409..0b09fb023c 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ImportEbsdMontage.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ImportEbsdMontage.cpp @@ -270,10 +270,10 @@ void ImportEbsdMontage::preflight() { // These are the REQUIRED lines of CODE to make sure the filter behaves correctly setInPreflight(true); // Set the fact that we are preflighting. - emit preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update - emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter + Q_EMIT preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update + Q_EMIT updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter dataCheck(); // Run our DataCheck to make sure everthing is setup correctly - emit preflightExecuted(); // We are done preflighting this filter + Q_EMIT preflightExecuted(); // We are done preflighting this filter setInPreflight(false); // Inform the system this filter is NOT in preflight mode anymore. } diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ImportEbsdMontage.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ImportEbsdMontage.h index 978afcb926..33d1c2af5e 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ImportEbsdMontage.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ImportEbsdMontage.h @@ -132,7 +132,7 @@ class OrientationAnalysis_EXPORT ImportEbsdMontage : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ImportH5EspritData.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ImportH5EspritData.cpp index 914a1bc2d3..e423d2e149 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ImportH5EspritData.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ImportH5EspritData.cpp @@ -119,10 +119,10 @@ void ImportH5EspritData::setupFilterParameters() void ImportH5EspritData::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ImportH5OimData.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ImportH5OimData.cpp index 79a7b82827..e5cdf3f95c 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ImportH5OimData.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ImportH5OimData.cpp @@ -236,10 +236,10 @@ void ImportH5OimData::dataCheck() void ImportH5OimData::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ImportH5OimData.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ImportH5OimData.h index b2beae5808..bb814ed005 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ImportH5OimData.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ImportH5OimData.h @@ -200,7 +200,7 @@ class OrientationAnalysis_EXPORT ImportH5OimData : public AbstractFilter SIMPL_PIMPL_PROPERTY_DECL(QVector, PatternDims) Q_PROPERTY(QVector PatternDims READ getPatternDims WRITE setPatternDims) -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) @@ -223,7 +223,7 @@ class OrientationAnalysis_EXPORT ImportH5OimData : public AbstractFilter */ void preflightExecuted(); -public slots: +public Q_SLOTS: /** * @brief flushCache Resets the cache file state */ diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/NeighborOrientationCorrelation.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/NeighborOrientationCorrelation.cpp index cee7eb89ae..b1f60f7530 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/NeighborOrientationCorrelation.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/NeighborOrientationCorrelation.cpp @@ -38,11 +38,9 @@ #include #ifdef SIMPL_USE_PARALLEL_ALGORITHMS -#include #include #include #include -#include #include #endif @@ -250,10 +248,10 @@ void NeighborOrientationCorrelation::dataCheck() void NeighborOrientationCorrelation::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } @@ -479,8 +477,7 @@ void NeighborOrientationCorrelation::execute() return; } #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; #endif QList voxelArrayNames = m->getAttributeMatrix(attrMatName)->getAttributeArrayNames(); diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/NeighborOrientationCorrelation.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/NeighborOrientationCorrelation.h index 22b509b0ee..273b9f9536 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/NeighborOrientationCorrelation.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/NeighborOrientationCorrelation.h @@ -155,7 +155,7 @@ class OrientationAnalysis_EXPORT NeighborOrientationCorrelation : public Abstrac */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/OrientationUtility.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/OrientationUtility.cpp index 494e813080..20a6480760 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/OrientationUtility.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/OrientationUtility.cpp @@ -64,10 +64,10 @@ void OrientationUtility::dataCheck() void OrientationUtility::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/OrientationUtility.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/OrientationUtility.h index 3e76e916ab..55ef6646f7 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/OrientationUtility.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/OrientationUtility.h @@ -89,7 +89,7 @@ class OrientationAnalysis_EXPORT OrientationUtility : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ReadAngData.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ReadAngData.cpp index 261aa11e91..b749a29ca5 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ReadAngData.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ReadAngData.cpp @@ -269,10 +269,10 @@ void ReadAngData::dataCheck() void ReadAngData::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ReadAngData.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ReadAngData.h index f56ae40c80..65bed3d805 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ReadAngData.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ReadAngData.h @@ -162,7 +162,7 @@ class OrientationAnalysis_EXPORT ReadAngData : public AbstractFilter SIMPL_PIMPL_PROPERTY_DECL(Ang_Private_Data, Data) Q_PROPERTY(Ang_Private_Data Data READ getData WRITE setData) -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) @@ -185,7 +185,7 @@ class OrientationAnalysis_EXPORT ReadAngData : public AbstractFilter */ void preflightExecuted(); -public slots: +public Q_SLOTS: /** * @brief flushCache Resets the cache file state */ diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ReadCtfData.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ReadCtfData.cpp index d829f4b46c..25518c0c75 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ReadCtfData.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ReadCtfData.cpp @@ -282,10 +282,10 @@ void ReadCtfData::dataCheck() void ReadCtfData::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ReadCtfData.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ReadCtfData.h index 35053044b2..29389fbfd0 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ReadCtfData.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ReadCtfData.h @@ -189,13 +189,13 @@ class OrientationAnalysis_EXPORT ReadCtfData : public AbstractFilter Q_PROPERTY(Ctf_Private_Data Data READ getData WRITE setData) -public slots: +public Q_SLOTS: /** * @brief flushCache Resets the cache file state */ void flushCache(); -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ReadH5Ebsd.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ReadH5Ebsd.cpp index e198cfd0e1..ecd4a8fb4f 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ReadH5Ebsd.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ReadH5Ebsd.cpp @@ -459,11 +459,11 @@ void ReadH5Ebsd::preflight() readVolumeInfo(); // This is specific to "readers" in general (I think), or at least those readers that need to show // a structure to the user to allow them to select only specific parts of the file to read // Now signal that any GUI widget is ready to read the information from this instance - emit preflightAboutToExecute(); + Q_EMIT preflightAboutToExecute(); // Let the GUI Widget (or anything else) update the parameters for this filter - emit updateFilterParameters(this); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ReadH5Ebsd.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ReadH5Ebsd.h index 6b305a2da7..7abee35302 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ReadH5Ebsd.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ReadH5Ebsd.h @@ -184,7 +184,7 @@ class OrientationAnalysis_EXPORT ReadH5Ebsd : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ReplaceElementAttributesWithNeighborValues.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ReplaceElementAttributesWithNeighborValues.cpp index ecdadaf711..93d747a10d 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ReplaceElementAttributesWithNeighborValues.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ReplaceElementAttributesWithNeighborValues.cpp @@ -358,10 +358,10 @@ void ReplaceElementAttributesWithNeighborValues::dataCheck() void ReplaceElementAttributesWithNeighborValues::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ReplaceElementAttributesWithNeighborValues.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ReplaceElementAttributesWithNeighborValues.h index 840977774c..40b9302199 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ReplaceElementAttributesWithNeighborValues.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/ReplaceElementAttributesWithNeighborValues.h @@ -138,7 +138,7 @@ class OrientationAnalysis_EXPORT ReplaceElementAttributesWithNeighborValues : pu */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/RodriguesConvertor.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/RodriguesConvertor.cpp index 367911ba7f..c996da9a7e 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/RodriguesConvertor.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/RodriguesConvertor.cpp @@ -47,7 +47,6 @@ #include #include #include -#include #endif class RodriguesConvertorImpl @@ -180,10 +179,10 @@ void RodriguesConvertor::preflight() { // These are the REQUIRED lines of CODE to make sure the filter behaves correctly setInPreflight(true); // Set the fact that we are preflighting. - emit preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update - emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter + Q_EMIT preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update + Q_EMIT updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter dataCheck(); // Run our DataCheck to make sure everthing is setup correctly - emit preflightExecuted(); // We are done preflighting this filter + Q_EMIT preflightExecuted(); // We are done preflighting this filter setInPreflight(false); // Inform the system this filter is NOT in preflight mode anymore. } @@ -202,8 +201,7 @@ void RodriguesConvertor::execute() #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; #endif #ifdef SIMPL_USE_PARALLEL_ALGORITHMS diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/RodriguesConvertor.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/RodriguesConvertor.h index 370797251c..725b004519 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/RodriguesConvertor.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/RodriguesConvertor.h @@ -121,7 +121,7 @@ class RodriguesConvertor : public AbstractFilter */ void preflight() override; - signals: + Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/RotateEulerRefFrame.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/RotateEulerRefFrame.cpp index 60d7cceda1..d4d0fa6aee 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/RotateEulerRefFrame.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/RotateEulerRefFrame.cpp @@ -40,7 +40,6 @@ #include #include #include -#include #endif #include "OrientationLib/OrientationMath/OrientationTransforms.hpp" @@ -186,10 +185,10 @@ void RotateEulerRefFrame::dataCheck() void RotateEulerRefFrame::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } @@ -213,8 +212,7 @@ void RotateEulerRefFrame::execute() MatrixMath::Normalize3x1(rotAxis); #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; #endif #ifdef SIMPL_USE_PARALLEL_ALGORITHMS diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/RotateEulerRefFrame.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/RotateEulerRefFrame.h index d4238e9af1..19519dbf59 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/RotateEulerRefFrame.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/RotateEulerRefFrame.h @@ -133,7 +133,7 @@ class OrientationAnalysis_EXPORT RotateEulerRefFrame : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/Stereographic3D.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/Stereographic3D.cpp index 4c4b342f07..412d993fa6 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/Stereographic3D.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/Stereographic3D.cpp @@ -36,7 +36,6 @@ #include #include #include -#include #endif #include "SIMPLib/Common/Constants.h" @@ -206,10 +205,10 @@ void Stereographic3D::preflight() { // These are the REQUIRED lines of CODE to make sure the filter behaves correctly setInPreflight(true); // Set the fact that we are preflighting. - emit preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update - emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter + Q_EMIT preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update + Q_EMIT updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter dataCheck(); // Run our DataCheck to make sure everthing is setup correctly - emit preflightExecuted(); // We are done preflighting this filter + Q_EMIT preflightExecuted(); // We are done preflighting this filter setInPreflight(false); // Inform the system this filter is NOT in preflight mode anymore. } @@ -233,8 +232,7 @@ void Stereographic3D::execute() size_t totalPoints = m_QuatsPtr.lock()->getNumberOfTuples(); #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; #endif #ifdef SIMPL_USE_PARALLEL_ALGORITHMS diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/Stereographic3D.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/Stereographic3D.h index 995e7a6e70..5bdb1afd4e 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/Stereographic3D.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/Stereographic3D.h @@ -126,7 +126,7 @@ class OrientationAnalysis_EXPORT Stereographic3D : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/WriteIPFStandardTriangle.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/WriteIPFStandardTriangle.cpp index 655c470ef0..bd54da6db4 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/WriteIPFStandardTriangle.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/WriteIPFStandardTriangle.cpp @@ -153,10 +153,10 @@ void WriteIPFStandardTriangle::dataCheck() void WriteIPFStandardTriangle::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/WriteIPFStandardTriangle.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/WriteIPFStandardTriangle.h index 84839f9616..b23ca4c642 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/WriteIPFStandardTriangle.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/WriteIPFStandardTriangle.h @@ -142,7 +142,7 @@ class OrientationAnalysis_EXPORT WriteIPFStandardTriangle : public AbstractFilte */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/WritePoleFigure.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/WritePoleFigure.cpp index e56f77344f..16da907bef 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/WritePoleFigure.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/WritePoleFigure.cpp @@ -333,10 +333,10 @@ void WritePoleFigure::preflight() setInPreflight(true); /* Place code here that sanity checks input arrays and input values. Look at some * of the other DREAM3DLib/Filters/.cpp files for sample codes */ - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/WritePoleFigure.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/WritePoleFigure.h index b8186d0456..16e52c2a44 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/WritePoleFigure.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/WritePoleFigure.h @@ -203,7 +203,7 @@ class OrientationAnalysis_EXPORT WritePoleFigure : public AbstractFilter */ void preflight() override; - signals: + Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/WriteStatsGenOdfAngleFile.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/WriteStatsGenOdfAngleFile.cpp index 6d6b4ec204..ca9afda3cb 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/WriteStatsGenOdfAngleFile.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/WriteStatsGenOdfAngleFile.cpp @@ -231,10 +231,10 @@ void WriteStatsGenOdfAngleFile::preflight() setInPreflight(true); /* Place code here that sanity checks input arrays and input values. Look at some * of the other DREAM3DLib/Filters/.cpp files for sample codes */ - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/WriteStatsGenOdfAngleFile.h b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/WriteStatsGenOdfAngleFile.h index 6b849c09e6..caaa8ca07b 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/WriteStatsGenOdfAngleFile.h +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/WriteStatsGenOdfAngleFile.h @@ -163,7 +163,7 @@ class OrientationAnalysis_EXPORT WriteStatsGenOdfAngleFile : public AbstractFilt */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/YSChoiAbaqusReader.cpp b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/YSChoiAbaqusReader.cpp index 2106698a56..76da9a0020 100644 --- a/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/YSChoiAbaqusReader.cpp +++ b/Source/Plugins/OrientationAnalysis/OrientationAnalysisFilters/YSChoiAbaqusReader.cpp @@ -356,10 +356,10 @@ void YSChoiAbaqusReader::dataCheck() void YSChoiAbaqusReader::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/OrientationAnalysis/Test/CreateLambertSphereTest.cpp b/Source/Plugins/OrientationAnalysis/Test/CreateLambertSphereTest.cpp index fd7178dfff..1ada053b82 100644 --- a/Source/Plugins/OrientationAnalysis/Test/CreateLambertSphereTest.cpp +++ b/Source/Plugins/OrientationAnalysis/Test/CreateLambertSphereTest.cpp @@ -100,7 +100,7 @@ class CreateLambertSphereTest QStringList props = {"QuadDataContainerName", "TriangleDataContainerName", "EdgeDataContainerName", "VertexDataContainerName", "VertexAttributeMatrixName", "EdgeAttributeMatrixName", "FaceAttributeMatrixName"}; - foreach(QString prop, props) + Q_FOREACH(QString prop, props) { // Reset the filter by creating a new one filter = filterFactory->create(); diff --git a/Source/Plugins/Processing/ProcessingFilters/DetectEllipsoids.cpp b/Source/Plugins/Processing/ProcessingFilters/DetectEllipsoids.cpp index dbc113f96d..948203bf8e 100644 --- a/Source/Plugins/Processing/ProcessingFilters/DetectEllipsoids.cpp +++ b/Source/Plugins/Processing/ProcessingFilters/DetectEllipsoids.cpp @@ -39,15 +39,6 @@ #include -#ifdef SIMPL_USE_PARALLEL_ALGORITHMS -#include -#include -#include -#include -#include -#include -#endif - #include "SIMPLib/Common/Constants.h" #include "SIMPLib/DataArrays/StringDataArray.h" #include "SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h" @@ -67,6 +58,14 @@ #include #include +#include + +#ifdef SIMPL_USE_PARALLEL_ALGORITHMS +#include +#include +#include +#include +#endif #define STORE_PIXEL_VALUES(array, count) \ array->setComponent(count, 0, xc + x); \ @@ -238,10 +237,10 @@ void DetectEllipsoids::preflight() { // These are the REQUIRED lines of CODE to make sure the filter behaves correctly setInPreflight(true); // Set the fact that we are preflighting. - emit preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update - emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter + Q_EMIT preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update + Q_EMIT updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter dataCheck(); // Run our DataCheck to make sure everthing is setup correctly - emit preflightExecuted(); // We are done preflighting this filter + Q_EMIT preflightExecuted(); // We are done preflighting this filter setInPreflight(false); // Inform the system this filter is NOT in preflight mode anymore. } @@ -398,13 +397,12 @@ void DetectEllipsoids::execute() m_MaxFeatureId = m_TotalNumberOfFeatures; #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; if(doParallel) { std::shared_ptr g(new tbb::task_group); - int threads = tbb::task_scheduler_init::default_num_threads(); + int threads = std::thread::hardware_concurrency(); for(int i = 0; i < threads; i++) { diff --git a/Source/Plugins/Processing/ProcessingFilters/DetectEllipsoids.h b/Source/Plugins/Processing/ProcessingFilters/DetectEllipsoids.h index 98282756ab..92bb5c2d88 100644 --- a/Source/Plugins/Processing/ProcessingFilters/DetectEllipsoids.h +++ b/Source/Plugins/Processing/ProcessingFilters/DetectEllipsoids.h @@ -211,7 +211,7 @@ class Processing_EXPORT DetectEllipsoids : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Processing/ProcessingFilters/ErodeDilateBadData.cpp b/Source/Plugins/Processing/ProcessingFilters/ErodeDilateBadData.cpp index 691e55ef31..90ad0e8c91 100644 --- a/Source/Plugins/Processing/ProcessingFilters/ErodeDilateBadData.cpp +++ b/Source/Plugins/Processing/ProcessingFilters/ErodeDilateBadData.cpp @@ -159,10 +159,10 @@ void ErodeDilateBadData::dataCheck() void ErodeDilateBadData::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Processing/ProcessingFilters/ErodeDilateBadData.h b/Source/Plugins/Processing/ProcessingFilters/ErodeDilateBadData.h index 4c47dc56c2..e8f8783d28 100644 --- a/Source/Plugins/Processing/ProcessingFilters/ErodeDilateBadData.h +++ b/Source/Plugins/Processing/ProcessingFilters/ErodeDilateBadData.h @@ -151,7 +151,7 @@ class Processing_EXPORT ErodeDilateBadData : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Processing/ProcessingFilters/ErodeDilateCoordinationNumber.cpp b/Source/Plugins/Processing/ProcessingFilters/ErodeDilateCoordinationNumber.cpp index a30b5b54db..e7be79aa7e 100644 --- a/Source/Plugins/Processing/ProcessingFilters/ErodeDilateCoordinationNumber.cpp +++ b/Source/Plugins/Processing/ProcessingFilters/ErodeDilateCoordinationNumber.cpp @@ -137,10 +137,10 @@ void ErodeDilateCoordinationNumber::dataCheck() void ErodeDilateCoordinationNumber::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Processing/ProcessingFilters/ErodeDilateCoordinationNumber.h b/Source/Plugins/Processing/ProcessingFilters/ErodeDilateCoordinationNumber.h index b0b0ae7730..3e89f1be37 100644 --- a/Source/Plugins/Processing/ProcessingFilters/ErodeDilateCoordinationNumber.h +++ b/Source/Plugins/Processing/ProcessingFilters/ErodeDilateCoordinationNumber.h @@ -135,7 +135,7 @@ class Processing_EXPORT ErodeDilateCoordinationNumber : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Processing/ProcessingFilters/ErodeDilateMask.cpp b/Source/Plugins/Processing/ProcessingFilters/ErodeDilateMask.cpp index 30968f09fd..f844a73b51 100644 --- a/Source/Plugins/Processing/ProcessingFilters/ErodeDilateMask.cpp +++ b/Source/Plugins/Processing/ProcessingFilters/ErodeDilateMask.cpp @@ -156,10 +156,10 @@ void ErodeDilateMask::dataCheck() void ErodeDilateMask::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Processing/ProcessingFilters/ErodeDilateMask.h b/Source/Plugins/Processing/ProcessingFilters/ErodeDilateMask.h index f797d8fbdb..adf1807aeb 100644 --- a/Source/Plugins/Processing/ProcessingFilters/ErodeDilateMask.h +++ b/Source/Plugins/Processing/ProcessingFilters/ErodeDilateMask.h @@ -144,7 +144,7 @@ class Processing_EXPORT ErodeDilateMask : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Processing/ProcessingFilters/FillBadData.cpp b/Source/Plugins/Processing/ProcessingFilters/FillBadData.cpp index 99c351a477..a1f9930269 100644 --- a/Source/Plugins/Processing/ProcessingFilters/FillBadData.cpp +++ b/Source/Plugins/Processing/ProcessingFilters/FillBadData.cpp @@ -162,10 +162,10 @@ void FillBadData::dataCheck() void FillBadData::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Processing/ProcessingFilters/FillBadData.h b/Source/Plugins/Processing/ProcessingFilters/FillBadData.h index 97f992431f..58c9742e1c 100644 --- a/Source/Plugins/Processing/ProcessingFilters/FillBadData.h +++ b/Source/Plugins/Processing/ProcessingFilters/FillBadData.h @@ -139,7 +139,7 @@ class Processing_EXPORT FillBadData : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Processing/ProcessingFilters/FindProjectedImageStatistics.cpp b/Source/Plugins/Processing/ProcessingFilters/FindProjectedImageStatistics.cpp index a4a3882775..1164c3eab4 100644 --- a/Source/Plugins/Processing/ProcessingFilters/FindProjectedImageStatistics.cpp +++ b/Source/Plugins/Processing/ProcessingFilters/FindProjectedImageStatistics.cpp @@ -39,7 +39,6 @@ #include #include #include -#include #endif #include "SIMPLib/Common/Constants.h" @@ -310,10 +309,10 @@ void FindProjectedImageStatistics::dataCheck() void FindProjectedImageStatistics::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } @@ -333,8 +332,7 @@ void FindProjectedImageStatistics::execute() DataContainer::Pointer m = getDataContainerArray()->getDataContainer(getSelectedArrayPath().getDataContainerName()); #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; #endif size_t xP = 0, yP = 0, zP = 0; diff --git a/Source/Plugins/Processing/ProcessingFilters/FindProjectedImageStatistics.h b/Source/Plugins/Processing/ProcessingFilters/FindProjectedImageStatistics.h index 7db9de2c92..7329d782da 100644 --- a/Source/Plugins/Processing/ProcessingFilters/FindProjectedImageStatistics.h +++ b/Source/Plugins/Processing/ProcessingFilters/FindProjectedImageStatistics.h @@ -148,7 +148,7 @@ class Processing_EXPORT FindProjectedImageStatistics : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Processing/ProcessingFilters/FindRelativeMotionBetweenSlices.cpp b/Source/Plugins/Processing/ProcessingFilters/FindRelativeMotionBetweenSlices.cpp index 89dc038050..7099f785e9 100644 --- a/Source/Plugins/Processing/ProcessingFilters/FindRelativeMotionBetweenSlices.cpp +++ b/Source/Plugins/Processing/ProcessingFilters/FindRelativeMotionBetweenSlices.cpp @@ -39,7 +39,6 @@ #include #include #include -#include #endif #include "SIMPLib/Common/Constants.h" @@ -308,10 +307,10 @@ void FindRelativeMotionBetweenSlices::dataCheck() void FindRelativeMotionBetweenSlices::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } @@ -332,8 +331,7 @@ void FindRelativeMotionBetweenSlices::execute() ImageGeom::Pointer image = m->getGeometryAs(); #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; #endif int64_t xP = static_cast(image->getXPoints()); diff --git a/Source/Plugins/Processing/ProcessingFilters/FindRelativeMotionBetweenSlices.h b/Source/Plugins/Processing/ProcessingFilters/FindRelativeMotionBetweenSlices.h index ee5d311cff..9487e45f93 100644 --- a/Source/Plugins/Processing/ProcessingFilters/FindRelativeMotionBetweenSlices.h +++ b/Source/Plugins/Processing/ProcessingFilters/FindRelativeMotionBetweenSlices.h @@ -152,7 +152,7 @@ class Processing_EXPORT FindRelativeMotionBetweenSlices : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Processing/ProcessingFilters/FixNonmanifoldVoxels.cpp b/Source/Plugins/Processing/ProcessingFilters/FixNonmanifoldVoxels.cpp index 20d75af700..7a61011a87 100644 --- a/Source/Plugins/Processing/ProcessingFilters/FixNonmanifoldVoxels.cpp +++ b/Source/Plugins/Processing/ProcessingFilters/FixNonmanifoldVoxels.cpp @@ -80,10 +80,10 @@ void FixNonmanifoldVoxels::preflight() { // These are the REQUIRED lines of CODE to make sure the filter behaves correctly setInPreflight(true); // Set the fact that we are preflighting. - emit preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update - emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter + Q_EMIT preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update + Q_EMIT updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter dataCheck(); // Run our DataCheck to make sure everthing is setup correctly - emit preflightExecuted(); // We are done preflighting this filter + Q_EMIT preflightExecuted(); // We are done preflighting this filter setInPreflight(false); // Inform the system this filter is NOT in preflight mode anymore. } diff --git a/Source/Plugins/Processing/ProcessingFilters/FixNonmanifoldVoxels.h b/Source/Plugins/Processing/ProcessingFilters/FixNonmanifoldVoxels.h index d4f9d26ba8..f38395e060 100644 --- a/Source/Plugins/Processing/ProcessingFilters/FixNonmanifoldVoxels.h +++ b/Source/Plugins/Processing/ProcessingFilters/FixNonmanifoldVoxels.h @@ -87,7 +87,7 @@ class Processing_EXPORT FixNonmanifoldVoxels : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Processing/ProcessingFilters/IdentifySample.cpp b/Source/Plugins/Processing/ProcessingFilters/IdentifySample.cpp index 7c9f98a7a3..d56e7d921a 100644 --- a/Source/Plugins/Processing/ProcessingFilters/IdentifySample.cpp +++ b/Source/Plugins/Processing/ProcessingFilters/IdentifySample.cpp @@ -117,10 +117,10 @@ void IdentifySample::dataCheck() void IdentifySample::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Processing/ProcessingFilters/IdentifySample.h b/Source/Plugins/Processing/ProcessingFilters/IdentifySample.h index 9a121d4400..e9b4595559 100644 --- a/Source/Plugins/Processing/ProcessingFilters/IdentifySample.h +++ b/Source/Plugins/Processing/ProcessingFilters/IdentifySample.h @@ -131,7 +131,7 @@ class Processing_EXPORT IdentifySample : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Processing/ProcessingFilters/MinNeighbors.cpp b/Source/Plugins/Processing/ProcessingFilters/MinNeighbors.cpp index a1c353ba89..a8381939c4 100644 --- a/Source/Plugins/Processing/ProcessingFilters/MinNeighbors.cpp +++ b/Source/Plugins/Processing/ProcessingFilters/MinNeighbors.cpp @@ -209,10 +209,10 @@ void MinNeighbors::dataCheck() void MinNeighbors::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Processing/ProcessingFilters/MinNeighbors.h b/Source/Plugins/Processing/ProcessingFilters/MinNeighbors.h index fedae42b12..73aff0520b 100644 --- a/Source/Plugins/Processing/ProcessingFilters/MinNeighbors.h +++ b/Source/Plugins/Processing/ProcessingFilters/MinNeighbors.h @@ -150,7 +150,7 @@ class Processing_EXPORT MinNeighbors : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Processing/ProcessingFilters/MinSize.cpp b/Source/Plugins/Processing/ProcessingFilters/MinSize.cpp index aa38849b8a..b05f442823 100644 --- a/Source/Plugins/Processing/ProcessingFilters/MinSize.cpp +++ b/Source/Plugins/Processing/ProcessingFilters/MinSize.cpp @@ -206,10 +206,10 @@ void MinSize::dataCheck() void MinSize::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Processing/ProcessingFilters/MinSize.h b/Source/Plugins/Processing/ProcessingFilters/MinSize.h index 31f6385acd..586252673d 100644 --- a/Source/Plugins/Processing/ProcessingFilters/MinSize.h +++ b/Source/Plugins/Processing/ProcessingFilters/MinSize.h @@ -147,7 +147,7 @@ class Processing_EXPORT MinSize : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Processing/ProcessingFilters/RemoveFlaggedFeatures.cpp b/Source/Plugins/Processing/ProcessingFilters/RemoveFlaggedFeatures.cpp index 9d7c79a463..c6f4553567 100644 --- a/Source/Plugins/Processing/ProcessingFilters/RemoveFlaggedFeatures.cpp +++ b/Source/Plugins/Processing/ProcessingFilters/RemoveFlaggedFeatures.cpp @@ -141,10 +141,10 @@ void RemoveFlaggedFeatures::dataCheck() void RemoveFlaggedFeatures::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Processing/ProcessingFilters/RemoveFlaggedFeatures.h b/Source/Plugins/Processing/ProcessingFilters/RemoveFlaggedFeatures.h index f1a95f4cc1..88d8312fe1 100644 --- a/Source/Plugins/Processing/ProcessingFilters/RemoveFlaggedFeatures.h +++ b/Source/Plugins/Processing/ProcessingFilters/RemoveFlaggedFeatures.h @@ -135,7 +135,7 @@ class Processing_EXPORT RemoveFlaggedFeatures : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Reconstruction/ReconstructionFilters/AlignSections.cpp b/Source/Plugins/Reconstruction/ReconstructionFilters/AlignSections.cpp index 4df7b2a92a..b1a2b2499d 100644 --- a/Source/Plugins/Reconstruction/ReconstructionFilters/AlignSections.cpp +++ b/Source/Plugins/Reconstruction/ReconstructionFilters/AlignSections.cpp @@ -36,11 +36,9 @@ #include "AlignSections.h" #ifdef SIMPL_USE_PARALLEL_ALGORITHMS -#include #include #include #include -#include #include #endif @@ -239,10 +237,10 @@ void AlignSections::dataCheck() void AlignSections::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } @@ -291,8 +289,7 @@ void AlignSections::execute() find_shifts(xshifts, yshifts); #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; #endif #ifdef SIMPL_USE_PARALLEL_ALGORITHMS diff --git a/Source/Plugins/Reconstruction/ReconstructionFilters/AlignSections.h b/Source/Plugins/Reconstruction/ReconstructionFilters/AlignSections.h index de5c4418c0..9576d7d247 100644 --- a/Source/Plugins/Reconstruction/ReconstructionFilters/AlignSections.h +++ b/Source/Plugins/Reconstruction/ReconstructionFilters/AlignSections.h @@ -142,7 +142,7 @@ class Reconstruction_EXPORT AlignSections : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Reconstruction/ReconstructionFilters/AlignSectionsFeature.cpp b/Source/Plugins/Reconstruction/ReconstructionFilters/AlignSectionsFeature.cpp index 8e721ac12c..90f982ea41 100644 --- a/Source/Plugins/Reconstruction/ReconstructionFilters/AlignSectionsFeature.cpp +++ b/Source/Plugins/Reconstruction/ReconstructionFilters/AlignSectionsFeature.cpp @@ -129,10 +129,10 @@ void AlignSectionsFeature::dataCheck() void AlignSectionsFeature::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Reconstruction/ReconstructionFilters/AlignSectionsFeatureCentroid.cpp b/Source/Plugins/Reconstruction/ReconstructionFilters/AlignSectionsFeatureCentroid.cpp index e43a8da7ff..e30ff26a81 100644 --- a/Source/Plugins/Reconstruction/ReconstructionFilters/AlignSectionsFeatureCentroid.cpp +++ b/Source/Plugins/Reconstruction/ReconstructionFilters/AlignSectionsFeatureCentroid.cpp @@ -154,10 +154,10 @@ void AlignSectionsFeatureCentroid::dataCheck() void AlignSectionsFeatureCentroid::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Reconstruction/ReconstructionFilters/AlignSectionsList.cpp b/Source/Plugins/Reconstruction/ReconstructionFilters/AlignSectionsList.cpp index ecf413ac42..d7b8e38bde 100644 --- a/Source/Plugins/Reconstruction/ReconstructionFilters/AlignSectionsList.cpp +++ b/Source/Plugins/Reconstruction/ReconstructionFilters/AlignSectionsList.cpp @@ -147,10 +147,10 @@ void AlignSectionsList::dataCheck() void AlignSectionsList::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Reconstruction/ReconstructionFilters/AlignSectionsMisorientation.cpp b/Source/Plugins/Reconstruction/ReconstructionFilters/AlignSectionsMisorientation.cpp index b12d93f0c1..5ccad53d81 100644 --- a/Source/Plugins/Reconstruction/ReconstructionFilters/AlignSectionsMisorientation.cpp +++ b/Source/Plugins/Reconstruction/ReconstructionFilters/AlignSectionsMisorientation.cpp @@ -209,10 +209,10 @@ void AlignSectionsMisorientation::dataCheck() void AlignSectionsMisorientation::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Reconstruction/ReconstructionFilters/AlignSectionsMutualInformation.cpp b/Source/Plugins/Reconstruction/ReconstructionFilters/AlignSectionsMutualInformation.cpp index ac083cc6f8..9da41303b8 100644 --- a/Source/Plugins/Reconstruction/ReconstructionFilters/AlignSectionsMutualInformation.cpp +++ b/Source/Plugins/Reconstruction/ReconstructionFilters/AlignSectionsMutualInformation.cpp @@ -207,10 +207,10 @@ void AlignSectionsMutualInformation::dataCheck() void AlignSectionsMutualInformation::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Reconstruction/ReconstructionFilters/CAxisSegmentFeatures.cpp b/Source/Plugins/Reconstruction/ReconstructionFilters/CAxisSegmentFeatures.cpp index 734e3493a6..620dd71ecf 100644 --- a/Source/Plugins/Reconstruction/ReconstructionFilters/CAxisSegmentFeatures.cpp +++ b/Source/Plugins/Reconstruction/ReconstructionFilters/CAxisSegmentFeatures.cpp @@ -261,10 +261,10 @@ void CAxisSegmentFeatures::dataCheck() void CAxisSegmentFeatures::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Reconstruction/ReconstructionFilters/ComputeFeatureRect.cpp b/Source/Plugins/Reconstruction/ReconstructionFilters/ComputeFeatureRect.cpp index 7b4ec9858d..4e90ae59e2 100644 --- a/Source/Plugins/Reconstruction/ReconstructionFilters/ComputeFeatureRect.cpp +++ b/Source/Plugins/Reconstruction/ReconstructionFilters/ComputeFeatureRect.cpp @@ -93,10 +93,10 @@ void ComputeFeatureRect::preflight() { // These are the REQUIRED lines of CODE to make sure the filter behaves correctly setInPreflight(true); // Set the fact that we are preflighting. - emit preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update - emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter + Q_EMIT preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update + Q_EMIT updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter dataCheck(); // Run our DataCheck to make sure everthing is setup correctly - emit preflightExecuted(); // We are done preflighting this filter + Q_EMIT preflightExecuted(); // We are done preflighting this filter setInPreflight(false); // Inform the system this filter is NOT in preflight mode anymore. } diff --git a/Source/Plugins/Reconstruction/ReconstructionFilters/ComputeFeatureRect.h b/Source/Plugins/Reconstruction/ReconstructionFilters/ComputeFeatureRect.h index 125c87cfa4..80e4d2ff98 100644 --- a/Source/Plugins/Reconstruction/ReconstructionFilters/ComputeFeatureRect.h +++ b/Source/Plugins/Reconstruction/ReconstructionFilters/ComputeFeatureRect.h @@ -93,7 +93,7 @@ class Reconstruction_EXPORT ComputeFeatureRect : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Reconstruction/ReconstructionFilters/EBSDSegmentFeatures.cpp b/Source/Plugins/Reconstruction/ReconstructionFilters/EBSDSegmentFeatures.cpp index 05ebefc9cf..101e39537d 100644 --- a/Source/Plugins/Reconstruction/ReconstructionFilters/EBSDSegmentFeatures.cpp +++ b/Source/Plugins/Reconstruction/ReconstructionFilters/EBSDSegmentFeatures.cpp @@ -253,10 +253,10 @@ void EBSDSegmentFeatures::dataCheck() void EBSDSegmentFeatures::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Reconstruction/ReconstructionFilters/GroupFeatures.cpp b/Source/Plugins/Reconstruction/ReconstructionFilters/GroupFeatures.cpp index bc3f3a6413..a6e6d9e6bf 100644 --- a/Source/Plugins/Reconstruction/ReconstructionFilters/GroupFeatures.cpp +++ b/Source/Plugins/Reconstruction/ReconstructionFilters/GroupFeatures.cpp @@ -126,10 +126,10 @@ void GroupFeatures::dataCheck() void GroupFeatures::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Reconstruction/ReconstructionFilters/GroupFeatures.h b/Source/Plugins/Reconstruction/ReconstructionFilters/GroupFeatures.h index 076fac2a6f..1760c1deef 100644 --- a/Source/Plugins/Reconstruction/ReconstructionFilters/GroupFeatures.h +++ b/Source/Plugins/Reconstruction/ReconstructionFilters/GroupFeatures.h @@ -140,7 +140,7 @@ class Reconstruction_EXPORT GroupFeatures : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Reconstruction/ReconstructionFilters/GroupMicroTextureRegions.cpp b/Source/Plugins/Reconstruction/ReconstructionFilters/GroupMicroTextureRegions.cpp index d23d8ed49d..f6ef384f2e 100644 --- a/Source/Plugins/Reconstruction/ReconstructionFilters/GroupMicroTextureRegions.cpp +++ b/Source/Plugins/Reconstruction/ReconstructionFilters/GroupMicroTextureRegions.cpp @@ -287,10 +287,10 @@ void GroupMicroTextureRegions::dataCheck() void GroupMicroTextureRegions::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); GroupFeatures::preflight(); setInPreflight(false); } diff --git a/Source/Plugins/Reconstruction/ReconstructionFilters/IdentifyMicroTextureRegions.cpp b/Source/Plugins/Reconstruction/ReconstructionFilters/IdentifyMicroTextureRegions.cpp index 2a29794ce4..916aa5c021 100644 --- a/Source/Plugins/Reconstruction/ReconstructionFilters/IdentifyMicroTextureRegions.cpp +++ b/Source/Plugins/Reconstruction/ReconstructionFilters/IdentifyMicroTextureRegions.cpp @@ -40,11 +40,9 @@ #include #ifdef SIMPL_USE_PARALLEL_ALGORITHMS -#include #include #include #include -#include #include #endif @@ -401,10 +399,10 @@ void IdentifyMicroTextureRegions::dataCheck() void IdentifyMicroTextureRegions::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } @@ -586,8 +584,7 @@ void IdentifyMicroTextureRegions::execute() m_CAxisToleranceRad = m_CAxisTolerance * SIMPLib::Constants::k_Pi / 180.0f; #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; #endif // first determine the misorientation vectors on all the voxel faces diff --git a/Source/Plugins/Reconstruction/ReconstructionFilters/IdentifyMicroTextureRegions.h b/Source/Plugins/Reconstruction/ReconstructionFilters/IdentifyMicroTextureRegions.h index bdab13b806..fc94f52e26 100644 --- a/Source/Plugins/Reconstruction/ReconstructionFilters/IdentifyMicroTextureRegions.h +++ b/Source/Plugins/Reconstruction/ReconstructionFilters/IdentifyMicroTextureRegions.h @@ -160,7 +160,7 @@ class Reconstruction_EXPORT IdentifyMicroTextureRegions : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Reconstruction/ReconstructionFilters/MergeColonies.cpp b/Source/Plugins/Reconstruction/ReconstructionFilters/MergeColonies.cpp index c602039af9..c7d114d98b 100644 --- a/Source/Plugins/Reconstruction/ReconstructionFilters/MergeColonies.cpp +++ b/Source/Plugins/Reconstruction/ReconstructionFilters/MergeColonies.cpp @@ -336,10 +336,10 @@ void MergeColonies::dataCheck() void MergeColonies::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Reconstruction/ReconstructionFilters/MergeTwins.cpp b/Source/Plugins/Reconstruction/ReconstructionFilters/MergeTwins.cpp index ad6ba950ea..a7c43f37ac 100644 --- a/Source/Plugins/Reconstruction/ReconstructionFilters/MergeTwins.cpp +++ b/Source/Plugins/Reconstruction/ReconstructionFilters/MergeTwins.cpp @@ -257,10 +257,10 @@ void MergeTwins::dataCheck() void MergeTwins::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Reconstruction/ReconstructionFilters/ScalarSegmentFeatures.cpp b/Source/Plugins/Reconstruction/ReconstructionFilters/ScalarSegmentFeatures.cpp index cbcf4d9d1f..ce02d1a810 100644 --- a/Source/Plugins/Reconstruction/ReconstructionFilters/ScalarSegmentFeatures.cpp +++ b/Source/Plugins/Reconstruction/ReconstructionFilters/ScalarSegmentFeatures.cpp @@ -332,10 +332,10 @@ void ScalarSegmentFeatures::dataCheck() void ScalarSegmentFeatures::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Reconstruction/ReconstructionFilters/SegmentFeatures.cpp b/Source/Plugins/Reconstruction/ReconstructionFilters/SegmentFeatures.cpp index bc5189b5ed..77b5d35105 100644 --- a/Source/Plugins/Reconstruction/ReconstructionFilters/SegmentFeatures.cpp +++ b/Source/Plugins/Reconstruction/ReconstructionFilters/SegmentFeatures.cpp @@ -88,10 +88,10 @@ void SegmentFeatures::dataCheck() void SegmentFeatures::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Reconstruction/ReconstructionFilters/SegmentFeatures.h b/Source/Plugins/Reconstruction/ReconstructionFilters/SegmentFeatures.h index 9637776734..3aaf31b050 100644 --- a/Source/Plugins/Reconstruction/ReconstructionFilters/SegmentFeatures.h +++ b/Source/Plugins/Reconstruction/ReconstructionFilters/SegmentFeatures.h @@ -120,7 +120,7 @@ class Reconstruction_EXPORT SegmentFeatures : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Reconstruction/ReconstructionFilters/SineParamsSegmentFeatures.cpp b/Source/Plugins/Reconstruction/ReconstructionFilters/SineParamsSegmentFeatures.cpp index 004365d776..de611a5cfa 100644 --- a/Source/Plugins/Reconstruction/ReconstructionFilters/SineParamsSegmentFeatures.cpp +++ b/Source/Plugins/Reconstruction/ReconstructionFilters/SineParamsSegmentFeatures.cpp @@ -212,10 +212,10 @@ void SineParamsSegmentFeatures::dataCheck() void SineParamsSegmentFeatures::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Reconstruction/ReconstructionFilters/VectorSegmentFeatures.cpp b/Source/Plugins/Reconstruction/ReconstructionFilters/VectorSegmentFeatures.cpp index 05bf1cb691..1b58b777cf 100644 --- a/Source/Plugins/Reconstruction/ReconstructionFilters/VectorSegmentFeatures.cpp +++ b/Source/Plugins/Reconstruction/ReconstructionFilters/VectorSegmentFeatures.cpp @@ -222,10 +222,10 @@ void VectorSegmentFeatures::dataCheck() void VectorSegmentFeatures::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Sampling/SamplingFilters/AppendImageGeometryZSlice.cpp b/Source/Plugins/Sampling/SamplingFilters/AppendImageGeometryZSlice.cpp index d3597ae81d..ed42abbde0 100644 --- a/Source/Plugins/Sampling/SamplingFilters/AppendImageGeometryZSlice.cpp +++ b/Source/Plugins/Sampling/SamplingFilters/AppendImageGeometryZSlice.cpp @@ -222,10 +222,10 @@ void AppendImageGeometryZSlice::dataCheck() void AppendImageGeometryZSlice::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Sampling/SamplingFilters/AppendImageGeometryZSlice.h b/Source/Plugins/Sampling/SamplingFilters/AppendImageGeometryZSlice.h index 2311ae1844..96124c0973 100644 --- a/Source/Plugins/Sampling/SamplingFilters/AppendImageGeometryZSlice.h +++ b/Source/Plugins/Sampling/SamplingFilters/AppendImageGeometryZSlice.h @@ -132,7 +132,7 @@ class Sampling_EXPORT AppendImageGeometryZSlice : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Sampling/SamplingFilters/ChangeResolution.cpp b/Source/Plugins/Sampling/SamplingFilters/ChangeResolution.cpp index c24fa24194..4cf6f76bbd 100644 --- a/Source/Plugins/Sampling/SamplingFilters/ChangeResolution.cpp +++ b/Source/Plugins/Sampling/SamplingFilters/ChangeResolution.cpp @@ -187,13 +187,13 @@ void ChangeResolution::dataCheck() void ChangeResolution::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); if(getErrorCondition() < 0) { - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); return; } @@ -280,7 +280,7 @@ void ChangeResolution::preflight() cellFeatureAttrMat->removeInactiveObjects(activeObjects, m_FeatureIdsPtr.lock().get()); } } - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Sampling/SamplingFilters/ChangeResolution.h b/Source/Plugins/Sampling/SamplingFilters/ChangeResolution.h index 7ae3a51d8f..3772a9c12d 100644 --- a/Source/Plugins/Sampling/SamplingFilters/ChangeResolution.h +++ b/Source/Plugins/Sampling/SamplingFilters/ChangeResolution.h @@ -149,7 +149,7 @@ class Sampling_EXPORT ChangeResolution : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Sampling/SamplingFilters/CropImageGeometry.cpp b/Source/Plugins/Sampling/SamplingFilters/CropImageGeometry.cpp index 2f14404aa0..8c22013e11 100644 --- a/Source/Plugins/Sampling/SamplingFilters/CropImageGeometry.cpp +++ b/Source/Plugins/Sampling/SamplingFilters/CropImageGeometry.cpp @@ -384,10 +384,10 @@ void CropImageGeometry::dataCheck() void CropImageGeometry::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Sampling/SamplingFilters/CropImageGeometry.h b/Source/Plugins/Sampling/SamplingFilters/CropImageGeometry.h index 1155c4a6f3..8e222c7c93 100644 --- a/Source/Plugins/Sampling/SamplingFilters/CropImageGeometry.h +++ b/Source/Plugins/Sampling/SamplingFilters/CropImageGeometry.h @@ -186,7 +186,7 @@ class Sampling_EXPORT CropImageGeometry : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Sampling/SamplingFilters/ExtractFlaggedFeatures.cpp b/Source/Plugins/Sampling/SamplingFilters/ExtractFlaggedFeatures.cpp index 35eb4363c1..0554442bb7 100644 --- a/Source/Plugins/Sampling/SamplingFilters/ExtractFlaggedFeatures.cpp +++ b/Source/Plugins/Sampling/SamplingFilters/ExtractFlaggedFeatures.cpp @@ -134,10 +134,10 @@ void ExtractFlaggedFeatures::dataCheck() void ExtractFlaggedFeatures::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Sampling/SamplingFilters/ExtractFlaggedFeatures.h b/Source/Plugins/Sampling/SamplingFilters/ExtractFlaggedFeatures.h index 6dcdb4e3ef..a9cf42929c 100644 --- a/Source/Plugins/Sampling/SamplingFilters/ExtractFlaggedFeatures.h +++ b/Source/Plugins/Sampling/SamplingFilters/ExtractFlaggedFeatures.h @@ -128,7 +128,7 @@ class Sampling_EXPORT ExtractFlaggedFeatures : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Sampling/SamplingFilters/NearestPointFuseRegularGrids.cpp b/Source/Plugins/Sampling/SamplingFilters/NearestPointFuseRegularGrids.cpp index 581e8f46d7..4f653d5bb6 100644 --- a/Source/Plugins/Sampling/SamplingFilters/NearestPointFuseRegularGrids.cpp +++ b/Source/Plugins/Sampling/SamplingFilters/NearestPointFuseRegularGrids.cpp @@ -177,10 +177,10 @@ void NearestPointFuseRegularGrids::dataCheck() void NearestPointFuseRegularGrids::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Sampling/SamplingFilters/NearestPointFuseRegularGrids.h b/Source/Plugins/Sampling/SamplingFilters/NearestPointFuseRegularGrids.h index 60e4a5405e..e77ff890c8 100644 --- a/Source/Plugins/Sampling/SamplingFilters/NearestPointFuseRegularGrids.h +++ b/Source/Plugins/Sampling/SamplingFilters/NearestPointFuseRegularGrids.h @@ -128,7 +128,7 @@ class Sampling_EXPORT NearestPointFuseRegularGrids : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Sampling/SamplingFilters/RegularGridSampleSurfaceMesh.cpp b/Source/Plugins/Sampling/SamplingFilters/RegularGridSampleSurfaceMesh.cpp index 0cbdc8aded..c00324bf05 100644 --- a/Source/Plugins/Sampling/SamplingFilters/RegularGridSampleSurfaceMesh.cpp +++ b/Source/Plugins/Sampling/SamplingFilters/RegularGridSampleSurfaceMesh.cpp @@ -170,10 +170,10 @@ void RegularGridSampleSurfaceMesh::dataCheck() void RegularGridSampleSurfaceMesh::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); SampleSurfaceMesh::preflight(); setInPreflight(false); } diff --git a/Source/Plugins/Sampling/SamplingFilters/RegularizeZSpacing.cpp b/Source/Plugins/Sampling/SamplingFilters/RegularizeZSpacing.cpp index 8d7ac92734..e796b509d2 100644 --- a/Source/Plugins/Sampling/SamplingFilters/RegularizeZSpacing.cpp +++ b/Source/Plugins/Sampling/SamplingFilters/RegularizeZSpacing.cpp @@ -161,10 +161,10 @@ void RegularizeZSpacing::dataCheck() void RegularizeZSpacing::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Sampling/SamplingFilters/RegularizeZSpacing.h b/Source/Plugins/Sampling/SamplingFilters/RegularizeZSpacing.h index 742a2d37c7..12393260f5 100644 --- a/Source/Plugins/Sampling/SamplingFilters/RegularizeZSpacing.h +++ b/Source/Plugins/Sampling/SamplingFilters/RegularizeZSpacing.h @@ -132,7 +132,7 @@ class Sampling_EXPORT RegularizeZSpacing : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Sampling/SamplingFilters/RotateSampleRefFrame.cpp b/Source/Plugins/Sampling/SamplingFilters/RotateSampleRefFrame.cpp index f41e31fc3d..32aab45398 100644 --- a/Source/Plugins/Sampling/SamplingFilters/RotateSampleRefFrame.cpp +++ b/Source/Plugins/Sampling/SamplingFilters/RotateSampleRefFrame.cpp @@ -39,7 +39,6 @@ #include #include #include -#include #endif #include "SIMPLib/Common/Constants.h" @@ -233,10 +232,10 @@ void RotateSampleRefFrame::preflight() setInPreflight(true); setErrorCondition(0); setWarningCondition(0); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); if(getErrorCondition() < 0) { @@ -587,8 +586,7 @@ void RotateSampleRefFrame::execute() int64_t* newindicies = newIndiciesPtr->getPointer(0); #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; #endif #ifdef SIMPL_USE_PARALLEL_ALGORITHMS diff --git a/Source/Plugins/Sampling/SamplingFilters/RotateSampleRefFrame.h b/Source/Plugins/Sampling/SamplingFilters/RotateSampleRefFrame.h index 680a2aee66..2cdcd6a38d 100644 --- a/Source/Plugins/Sampling/SamplingFilters/RotateSampleRefFrame.h +++ b/Source/Plugins/Sampling/SamplingFilters/RotateSampleRefFrame.h @@ -138,7 +138,7 @@ class Sampling_EXPORT RotateSampleRefFrame : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Sampling/SamplingFilters/SampleSurfaceMesh.cpp b/Source/Plugins/Sampling/SamplingFilters/SampleSurfaceMesh.cpp index ef7c004049..5a2fd5f938 100644 --- a/Source/Plugins/Sampling/SamplingFilters/SampleSurfaceMesh.cpp +++ b/Source/Plugins/Sampling/SamplingFilters/SampleSurfaceMesh.cpp @@ -44,8 +44,6 @@ #include #include #include -#include -#include #endif #include "SIMPLib/Common/Constants.h" @@ -296,10 +294,10 @@ void SampleSurfaceMesh::dataCheck() void SampleSurfaceMesh::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } @@ -455,8 +453,7 @@ void SampleSurfaceMesh::execute() notifyStatusMessage(getMessagePrefix(), getHumanLabel(), "Sampling triangle geometry ..."); #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; #endif // C++11 RIGHT HERE.... diff --git a/Source/Plugins/Sampling/SamplingFilters/SampleSurfaceMesh.h b/Source/Plugins/Sampling/SamplingFilters/SampleSurfaceMesh.h index 11646d6623..7b2a32ed41 100644 --- a/Source/Plugins/Sampling/SamplingFilters/SampleSurfaceMesh.h +++ b/Source/Plugins/Sampling/SamplingFilters/SampleSurfaceMesh.h @@ -132,7 +132,7 @@ class Sampling_EXPORT SampleSurfaceMesh : public AbstractFilter */ void sendThreadSafeProgressMessage(int featureId, size_t numCompleted, size_t totalFeatures); -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Sampling/SamplingFilters/SampleSurfaceMeshSpecifiedPoints.cpp b/Source/Plugins/Sampling/SamplingFilters/SampleSurfaceMeshSpecifiedPoints.cpp index e2f1f4f260..15b8be6c7b 100644 --- a/Source/Plugins/Sampling/SamplingFilters/SampleSurfaceMeshSpecifiedPoints.cpp +++ b/Source/Plugins/Sampling/SamplingFilters/SampleSurfaceMeshSpecifiedPoints.cpp @@ -155,10 +155,10 @@ void SampleSurfaceMeshSpecifiedPoints::preflight() { // These are the REQUIRED lines of CODE to make sure the filter behaves correctly setInPreflight(true); // Set the fact that we are preflighting. - emit preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update - emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter + Q_EMIT preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update + Q_EMIT updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter dataCheck(); // Run our DataCheck to make sure everthing is setup correctly - emit preflightExecuted(); // We are done preflighting this filter + Q_EMIT preflightExecuted(); // We are done preflighting this filter SampleSurfaceMesh::preflight(); setInPreflight(false); // Inform the system this filter is NOT in preflight mode anymore. } diff --git a/Source/Plugins/Sampling/SamplingFilters/UncertainRegularGridSampleSurfaceMesh.cpp b/Source/Plugins/Sampling/SamplingFilters/UncertainRegularGridSampleSurfaceMesh.cpp index 5004e07c1d..ceb000710e 100644 --- a/Source/Plugins/Sampling/SamplingFilters/UncertainRegularGridSampleSurfaceMesh.cpp +++ b/Source/Plugins/Sampling/SamplingFilters/UncertainRegularGridSampleSurfaceMesh.cpp @@ -177,10 +177,10 @@ void UncertainRegularGridSampleSurfaceMesh::dataCheck() void UncertainRegularGridSampleSurfaceMesh::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); SampleSurfaceMesh::preflight(); setInPreflight(false); } diff --git a/Source/Plugins/Sampling/SamplingFilters/WarpRegularGrid.cpp b/Source/Plugins/Sampling/SamplingFilters/WarpRegularGrid.cpp index ffceb8a13b..703d167c74 100644 --- a/Source/Plugins/Sampling/SamplingFilters/WarpRegularGrid.cpp +++ b/Source/Plugins/Sampling/SamplingFilters/WarpRegularGrid.cpp @@ -186,10 +186,10 @@ void WarpRegularGrid::dataCheck() void WarpRegularGrid::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Sampling/SamplingFilters/WarpRegularGrid.h b/Source/Plugins/Sampling/SamplingFilters/WarpRegularGrid.h index bec38f113c..17583b08d8 100644 --- a/Source/Plugins/Sampling/SamplingFilters/WarpRegularGrid.h +++ b/Source/Plugins/Sampling/SamplingFilters/WarpRegularGrid.h @@ -163,7 +163,7 @@ class Sampling_EXPORT WarpRegularGrid : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Sampling/Test/CropVolumeTest.cpp b/Source/Plugins/Sampling/Test/CropVolumeTest.cpp index 852e697eea..b3e4982a60 100644 --- a/Source/Plugins/Sampling/Test/CropVolumeTest.cpp +++ b/Source/Plugins/Sampling/Test/CropVolumeTest.cpp @@ -253,7 +253,7 @@ class CropVolumeTest err = am2->addAttributeArray(k_ActivesName, actives); DREAM3D_REQUIRE(err >= 0); - foreach(QString da, am1->getAttributeArrayNames()) + Q_FOREACH(QString da, am1->getAttributeArrayNames()) { DREAM3D_REQUIRE_EQUAL(am1->getAttributeArray(da)->getNumberOfTuples(), tDims[0] * tDims[1] * tDims[2]); } diff --git a/Source/Plugins/Statistics/StatisticsFilters/CalculateArrayHistogram.cpp b/Source/Plugins/Statistics/StatisticsFilters/CalculateArrayHistogram.cpp index 3cb3122868..217e08839d 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/CalculateArrayHistogram.cpp +++ b/Source/Plugins/Statistics/StatisticsFilters/CalculateArrayHistogram.cpp @@ -231,10 +231,10 @@ void CalculateArrayHistogram::dataCheck() void CalculateArrayHistogram::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Statistics/StatisticsFilters/CalculateArrayHistogram.h b/Source/Plugins/Statistics/StatisticsFilters/CalculateArrayHistogram.h index 905655fe8d..568a813cc8 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/CalculateArrayHistogram.h +++ b/Source/Plugins/Statistics/StatisticsFilters/CalculateArrayHistogram.h @@ -172,7 +172,7 @@ class Statistics_EXPORT CalculateArrayHistogram : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Statistics/StatisticsFilters/ComputeMomentInvariants2D.cpp b/Source/Plugins/Statistics/StatisticsFilters/ComputeMomentInvariants2D.cpp index cc044635c2..d2fff28a22 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/ComputeMomentInvariants2D.cpp +++ b/Source/Plugins/Statistics/StatisticsFilters/ComputeMomentInvariants2D.cpp @@ -158,10 +158,10 @@ void ComputeMomentInvariants2D::preflight() { // These are the REQUIRED lines of CODE to make sure the filter behaves correctly setInPreflight(true); // Set the fact that we are preflighting. - emit preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update - emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter + Q_EMIT preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update + Q_EMIT updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter dataCheck(); // Run our DataCheck to make sure everthing is setup correctly - emit preflightExecuted(); // We are done preflighting this filter + Q_EMIT preflightExecuted(); // We are done preflighting this filter setInPreflight(false); // Inform the system this filter is NOT in preflight mode anymore. } diff --git a/Source/Plugins/Statistics/StatisticsFilters/ComputeMomentInvariants2D.h b/Source/Plugins/Statistics/StatisticsFilters/ComputeMomentInvariants2D.h index ec5576c394..cafc0e032f 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/ComputeMomentInvariants2D.h +++ b/Source/Plugins/Statistics/StatisticsFilters/ComputeMomentInvariants2D.h @@ -113,7 +113,7 @@ class Statistics_EXPORT ComputeMomentInvariants2D : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Statistics/StatisticsFilters/CorrelateValuesWithVectorDirection.cpp b/Source/Plugins/Statistics/StatisticsFilters/CorrelateValuesWithVectorDirection.cpp index ebbc784722..ff3c325d98 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/CorrelateValuesWithVectorDirection.cpp +++ b/Source/Plugins/Statistics/StatisticsFilters/CorrelateValuesWithVectorDirection.cpp @@ -154,10 +154,10 @@ void CorrelateValuesWithVectorDirection::preflight() { // These are the REQUIRED lines of CODE to make sure the filter behaves correctly setInPreflight(true); // Set the fact that we are preflighting. - emit preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update - emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter + Q_EMIT preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update + Q_EMIT updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter dataCheck(); // Run our DataCheck to make sure everthing is setup correctly - emit preflightExecuted(); // We are done preflighting this filter + Q_EMIT preflightExecuted(); // We are done preflighting this filter setInPreflight(false); // Inform the system this filter is NOT in preflight mode anymore. } diff --git a/Source/Plugins/Statistics/StatisticsFilters/CorrelateValuesWithVectorDirection.h b/Source/Plugins/Statistics/StatisticsFilters/CorrelateValuesWithVectorDirection.h index 16f9f0d3dd..0d07b8199e 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/CorrelateValuesWithVectorDirection.h +++ b/Source/Plugins/Statistics/StatisticsFilters/CorrelateValuesWithVectorDirection.h @@ -142,7 +142,7 @@ class Statistics_EXPORT CorrelateValuesWithVectorDirection : public AbstractFilt */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindAvgScalarValueForFeatures.cpp b/Source/Plugins/Statistics/StatisticsFilters/FindAvgScalarValueForFeatures.cpp index 550a136f5a..8526e2bac3 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindAvgScalarValueForFeatures.cpp +++ b/Source/Plugins/Statistics/StatisticsFilters/FindAvgScalarValueForFeatures.cpp @@ -149,10 +149,10 @@ void FindAvgScalarValueForFeatures::dataCheck() void FindAvgScalarValueForFeatures::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindAvgScalarValueForFeatures.h b/Source/Plugins/Statistics/StatisticsFilters/FindAvgScalarValueForFeatures.h index b7a9a0f9ee..6364b160e2 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindAvgScalarValueForFeatures.h +++ b/Source/Plugins/Statistics/StatisticsFilters/FindAvgScalarValueForFeatures.h @@ -137,7 +137,7 @@ class Statistics_EXPORT FindAvgScalarValueForFeatures : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindBoundaryElementFractions.cpp b/Source/Plugins/Statistics/StatisticsFilters/FindBoundaryElementFractions.cpp index 45515d25dc..7efa50fa66 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindBoundaryElementFractions.cpp +++ b/Source/Plugins/Statistics/StatisticsFilters/FindBoundaryElementFractions.cpp @@ -148,10 +148,10 @@ void FindBoundaryElementFractions::dataCheck() void FindBoundaryElementFractions::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindBoundaryElementFractions.h b/Source/Plugins/Statistics/StatisticsFilters/FindBoundaryElementFractions.h index a88a97de28..9bc709085e 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindBoundaryElementFractions.h +++ b/Source/Plugins/Statistics/StatisticsFilters/FindBoundaryElementFractions.h @@ -132,7 +132,7 @@ class Statistics_EXPORT FindBoundaryElementFractions : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindDifferenceMap.cpp b/Source/Plugins/Statistics/StatisticsFilters/FindDifferenceMap.cpp index d40f3f004e..3ad6f644cc 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindDifferenceMap.cpp +++ b/Source/Plugins/Statistics/StatisticsFilters/FindDifferenceMap.cpp @@ -16,7 +16,6 @@ #include #include #include -#include #endif /** @@ -86,8 +85,7 @@ template class ExecuteFindDifferenceMap void Execute(IDataArray::Pointer firstArrayPtr, IDataArray::Pointer secondArrayPtr, IDataArray::Pointer differenceMapPtr) { #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; #endif size_t numTuples = firstArrayPtr->getNumberOfTuples(); @@ -286,10 +284,10 @@ void FindDifferenceMap::preflight() { // These are the REQUIRED lines of CODE to make sure the filter behaves correctly setInPreflight(true); // Set the fact that we are preflighting. - emit preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update - emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter + Q_EMIT preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update + Q_EMIT updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter dataCheck(); // Run our DataCheck to make sure everthing is setup correctly - emit preflightExecuted(); // We are done preflighting this filter + Q_EMIT preflightExecuted(); // We are done preflighting this filter setInPreflight(false); // Inform the system this filter is NOT in preflight mode anymore. } diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindDifferenceMap.h b/Source/Plugins/Statistics/StatisticsFilters/FindDifferenceMap.h index 800ce3c8b1..e25b081ba8 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindDifferenceMap.h +++ b/Source/Plugins/Statistics/StatisticsFilters/FindDifferenceMap.h @@ -102,7 +102,7 @@ class Statistics_EXPORT FindDifferenceMap : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindEllipsoidError.cpp b/Source/Plugins/Statistics/StatisticsFilters/FindEllipsoidError.cpp index 37f7e162e0..98bfb62d8b 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindEllipsoidError.cpp +++ b/Source/Plugins/Statistics/StatisticsFilters/FindEllipsoidError.cpp @@ -221,10 +221,10 @@ void FindEllipsoidError::dataCheck() void FindEllipsoidError::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindEllipsoidError.h b/Source/Plugins/Statistics/StatisticsFilters/FindEllipsoidError.h index 93910cc53a..e1e9dc3b38 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindEllipsoidError.h +++ b/Source/Plugins/Statistics/StatisticsFilters/FindEllipsoidError.h @@ -167,7 +167,7 @@ class Statistics_EXPORT FindEllipsoidError : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindEuclideanDistMap.cpp b/Source/Plugins/Statistics/StatisticsFilters/FindEuclideanDistMap.cpp index f731be3cb7..680ef3573d 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindEuclideanDistMap.cpp +++ b/Source/Plugins/Statistics/StatisticsFilters/FindEuclideanDistMap.cpp @@ -36,11 +36,9 @@ #include "FindEuclideanDistMap.h" #ifdef SIMPL_USE_PARALLEL_ALGORITHMS -#include #include #include #include -#include #include #endif @@ -458,12 +456,12 @@ void FindEuclideanDistMap::dataCheck() void FindEuclideanDistMap::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); if(getErrorCondition() < 0) { - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); return; } @@ -473,7 +471,7 @@ void FindEuclideanDistMap::preflight() AttributeMatrix::Pointer attrMat = m->getAttributeMatrix(getFeatureIdsArrayPath().getAttributeMatrixName()); attrMat->removeAttributeArray(getNearestNeighborsArrayName()); } - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } @@ -656,8 +654,7 @@ void FindEuclideanDistMap::findDistanceMap() } #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; #endif #ifdef SIMPL_USE_PARALLEL_ALGORITHMS diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindEuclideanDistMap.h b/Source/Plugins/Statistics/StatisticsFilters/FindEuclideanDistMap.h index 404485da13..964cd8b826 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindEuclideanDistMap.h +++ b/Source/Plugins/Statistics/StatisticsFilters/FindEuclideanDistMap.h @@ -169,7 +169,7 @@ class Statistics_EXPORT FindEuclideanDistMap : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindFeatureClustering.cpp b/Source/Plugins/Statistics/StatisticsFilters/FindFeatureClustering.cpp index 93b94b4c0f..895d165721 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindFeatureClustering.cpp +++ b/Source/Plugins/Statistics/StatisticsFilters/FindFeatureClustering.cpp @@ -225,10 +225,10 @@ void FindFeatureClustering::dataCheck() void FindFeatureClustering::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindFeatureClustering.h b/Source/Plugins/Statistics/StatisticsFilters/FindFeatureClustering.h index 14bb3aec61..af79ff64fe 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindFeatureClustering.h +++ b/Source/Plugins/Statistics/StatisticsFilters/FindFeatureClustering.h @@ -167,7 +167,7 @@ class Statistics_EXPORT FindFeatureClustering : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindFeatureHistogram.cpp b/Source/Plugins/Statistics/StatisticsFilters/FindFeatureHistogram.cpp index c2c0c6a08a..f60c7aa423 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindFeatureHistogram.cpp +++ b/Source/Plugins/Statistics/StatisticsFilters/FindFeatureHistogram.cpp @@ -176,10 +176,10 @@ void FindFeatureHistogram::dataCheck() void FindFeatureHistogram::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindFeatureHistogram.h b/Source/Plugins/Statistics/StatisticsFilters/FindFeatureHistogram.h index 83990bc04f..5bb743d27c 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindFeatureHistogram.h +++ b/Source/Plugins/Statistics/StatisticsFilters/FindFeatureHistogram.h @@ -163,7 +163,7 @@ class Statistics_EXPORT FindFeatureHistogram : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindLargestCrossSections.cpp b/Source/Plugins/Statistics/StatisticsFilters/FindLargestCrossSections.cpp index 65ebffc557..cc58230469 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindLargestCrossSections.cpp +++ b/Source/Plugins/Statistics/StatisticsFilters/FindLargestCrossSections.cpp @@ -160,10 +160,10 @@ void FindLargestCrossSections::dataCheck() void FindLargestCrossSections::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindLargestCrossSections.h b/Source/Plugins/Statistics/StatisticsFilters/FindLargestCrossSections.h index 420967801e..3670f3b8ef 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindLargestCrossSections.h +++ b/Source/Plugins/Statistics/StatisticsFilters/FindLargestCrossSections.h @@ -132,7 +132,7 @@ class Statistics_EXPORT FindLargestCrossSections : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindNeighborhoods.cpp b/Source/Plugins/Statistics/StatisticsFilters/FindNeighborhoods.cpp index 9369d32be9..daa73080be 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindNeighborhoods.cpp +++ b/Source/Plugins/Statistics/StatisticsFilters/FindNeighborhoods.cpp @@ -55,7 +55,6 @@ #include #include #include -#include #endif class FindNeighborhoodsImpl @@ -292,10 +291,10 @@ void FindNeighborhoods::dataCheck() void FindNeighborhoods::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } @@ -366,8 +365,7 @@ void FindNeighborhoods::execute() } #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; #endif #ifdef SIMPL_USE_PARALLEL_ALGORITHMS diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindNeighborhoods.h b/Source/Plugins/Statistics/StatisticsFilters/FindNeighborhoods.h index 76d3b1fc55..f3eea3d0a1 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindNeighborhoods.h +++ b/Source/Plugins/Statistics/StatisticsFilters/FindNeighborhoods.h @@ -148,7 +148,7 @@ class Statistics_EXPORT FindNeighborhoods : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindNeighbors.cpp b/Source/Plugins/Statistics/StatisticsFilters/FindNeighbors.cpp index d96258789e..5f550624ef 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindNeighbors.cpp +++ b/Source/Plugins/Statistics/StatisticsFilters/FindNeighbors.cpp @@ -207,10 +207,10 @@ void FindNeighbors::dataCheck() void FindNeighbors::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindNeighbors.h b/Source/Plugins/Statistics/StatisticsFilters/FindNeighbors.h index 0dba46381c..ec1966b5f6 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindNeighbors.h +++ b/Source/Plugins/Statistics/StatisticsFilters/FindNeighbors.h @@ -157,7 +157,7 @@ class Statistics_EXPORT FindNeighbors : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindNumFeatures.cpp b/Source/Plugins/Statistics/StatisticsFilters/FindNumFeatures.cpp index eb3bf3dab9..a01686dcea 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindNumFeatures.cpp +++ b/Source/Plugins/Statistics/StatisticsFilters/FindNumFeatures.cpp @@ -127,10 +127,10 @@ void FindNumFeatures::dataCheck() void FindNumFeatures::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindNumFeatures.h b/Source/Plugins/Statistics/StatisticsFilters/FindNumFeatures.h index 5a9ee47463..0cd106711c 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindNumFeatures.h +++ b/Source/Plugins/Statistics/StatisticsFilters/FindNumFeatures.h @@ -128,7 +128,7 @@ class Statistics_EXPORT FindNumFeatures : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindSaltykovSizes.cpp b/Source/Plugins/Statistics/StatisticsFilters/FindSaltykovSizes.cpp index 42ec0fd294..014344ade7 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindSaltykovSizes.cpp +++ b/Source/Plugins/Statistics/StatisticsFilters/FindSaltykovSizes.cpp @@ -124,10 +124,10 @@ void FindSaltykovSizes::dataCheck() void FindSaltykovSizes::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindSaltykovSizes.h b/Source/Plugins/Statistics/StatisticsFilters/FindSaltykovSizes.h index 5712daab2c..74876b2587 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindSaltykovSizes.h +++ b/Source/Plugins/Statistics/StatisticsFilters/FindSaltykovSizes.h @@ -136,7 +136,7 @@ class Statistics_EXPORT FindSaltykovSizes : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindShapes.cpp b/Source/Plugins/Statistics/StatisticsFilters/FindShapes.cpp index ffd2789327..5d7b7272ce 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindShapes.cpp +++ b/Source/Plugins/Statistics/StatisticsFilters/FindShapes.cpp @@ -768,10 +768,10 @@ void FindShapes::find_axiseulers2D() void FindShapes::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindShapes.h b/Source/Plugins/Statistics/StatisticsFilters/FindShapes.h index f91c3ceb67..1d201651ff 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindShapes.h +++ b/Source/Plugins/Statistics/StatisticsFilters/FindShapes.h @@ -246,7 +246,7 @@ class Statistics_EXPORT FindShapes : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindSizes.cpp b/Source/Plugins/Statistics/StatisticsFilters/FindSizes.cpp index 24a00a15d4..c933f19da4 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindSizes.cpp +++ b/Source/Plugins/Statistics/StatisticsFilters/FindSizes.cpp @@ -186,10 +186,10 @@ void FindSizes::dataCheck() void FindSizes::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindSizes.h b/Source/Plugins/Statistics/StatisticsFilters/FindSizes.h index dd18fe9b80..780ef8ac96 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindSizes.h +++ b/Source/Plugins/Statistics/StatisticsFilters/FindSizes.h @@ -145,7 +145,7 @@ class Statistics_EXPORT FindSizes : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindSurfaceAreaToVolume.cpp b/Source/Plugins/Statistics/StatisticsFilters/FindSurfaceAreaToVolume.cpp index f5637326ab..dcdf51fc23 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindSurfaceAreaToVolume.cpp +++ b/Source/Plugins/Statistics/StatisticsFilters/FindSurfaceAreaToVolume.cpp @@ -164,10 +164,10 @@ void FindSurfaceAreaToVolume::dataCheck() void FindSurfaceAreaToVolume::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindSurfaceAreaToVolume.h b/Source/Plugins/Statistics/StatisticsFilters/FindSurfaceAreaToVolume.h index ed4d088542..f26495675f 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindSurfaceAreaToVolume.h +++ b/Source/Plugins/Statistics/StatisticsFilters/FindSurfaceAreaToVolume.h @@ -140,7 +140,7 @@ class Statistics_EXPORT FindSurfaceAreaToVolume : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindVolFractions.cpp b/Source/Plugins/Statistics/StatisticsFilters/FindVolFractions.cpp index f39dd179b4..30232c9167 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindVolFractions.cpp +++ b/Source/Plugins/Statistics/StatisticsFilters/FindVolFractions.cpp @@ -129,10 +129,10 @@ void FindVolFractions::dataCheck() void FindVolFractions::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Statistics/StatisticsFilters/FindVolFractions.h b/Source/Plugins/Statistics/StatisticsFilters/FindVolFractions.h index c0ed6f32bf..8691042f3d 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FindVolFractions.h +++ b/Source/Plugins/Statistics/StatisticsFilters/FindVolFractions.h @@ -128,7 +128,7 @@ class Statistics_EXPORT FindVolFractions : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Statistics/StatisticsFilters/FitCorrelatedFeatureData.cpp b/Source/Plugins/Statistics/StatisticsFilters/FitCorrelatedFeatureData.cpp index 209a02c402..7ca36d5b5f 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FitCorrelatedFeatureData.cpp +++ b/Source/Plugins/Statistics/StatisticsFilters/FitCorrelatedFeatureData.cpp @@ -217,10 +217,10 @@ void FitCorrelatedFeatureData::dataCheck() void FitCorrelatedFeatureData::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Statistics/StatisticsFilters/FitCorrelatedFeatureData.h b/Source/Plugins/Statistics/StatisticsFilters/FitCorrelatedFeatureData.h index 3ca779b99c..d9e649e2c0 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FitCorrelatedFeatureData.h +++ b/Source/Plugins/Statistics/StatisticsFilters/FitCorrelatedFeatureData.h @@ -169,7 +169,7 @@ class Statistics_EXPORT FitCorrelatedFeatureData : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Statistics/StatisticsFilters/FitFeatureData.cpp b/Source/Plugins/Statistics/StatisticsFilters/FitFeatureData.cpp index 25da63cacb..de176a5bfe 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FitFeatureData.cpp +++ b/Source/Plugins/Statistics/StatisticsFilters/FitFeatureData.cpp @@ -195,10 +195,10 @@ void FitFeatureData::dataCheck() void FitFeatureData::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Statistics/StatisticsFilters/FitFeatureData.h b/Source/Plugins/Statistics/StatisticsFilters/FitFeatureData.h index d0c2a6dbb1..8cdccef2b1 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/FitFeatureData.h +++ b/Source/Plugins/Statistics/StatisticsFilters/FitFeatureData.h @@ -149,7 +149,7 @@ class Statistics_EXPORT FitFeatureData : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Statistics/StatisticsFilters/GenerateEnsembleStatistics.cpp b/Source/Plugins/Statistics/StatisticsFilters/GenerateEnsembleStatistics.cpp index 0a79c314ec..434f829dd5 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/GenerateEnsembleStatistics.cpp +++ b/Source/Plugins/Statistics/StatisticsFilters/GenerateEnsembleStatistics.cpp @@ -658,10 +658,10 @@ void GenerateEnsembleStatistics::dataCheck() void GenerateEnsembleStatistics::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } @@ -1056,18 +1056,19 @@ void GenerateEnsembleStatistics::gatherODFStats() QString errorMessage; QTextStream out(&errorMessage); out << "The option 'Calculate Crystallographic Statistics' only works with Laue classes [Cubic m3m] and [Hexagonal 6/mmm]. "; - out << "The offending phase was " << i << " with a value of " << QString::fromStdString(m_OrientationOps[laueClass]->getSymmetryName()); + out << "The offending phase was " << i << " with a value of " << m_OrientationOps[i]->getSymmetryName(); out << ".\nThe following Laue classes were also found [Phase #] Laue Class:\n"; for(size_t e = 1; e < numensembles; e++) { uint32_t lc = m_CrystalStructures[e]; - out << " [" << QString::number(e) << "] " << QString::fromStdString(m_OrientationOps[lc]->getSymmetryName()); + out << " [" << QString::number(e) << "] " << m_OrientationOps[lc]->getSymmetryName(); if(e < numensembles - 1) { out << "\n"; } } - setErrorCondition(-3015, errorMessage); + setErrorCondition(-3015); + notifyErrorMessage(getHumanLabel(), errorMessage, getErrorCondition()); return; } } @@ -1464,7 +1465,7 @@ void GenerateEnsembleStatistics::execute() { gatherODFStats(); } - if(getErrorCode() < 0) + if(getErrorCondition() < 0) { return; } diff --git a/Source/Plugins/Statistics/StatisticsFilters/GenerateEnsembleStatistics.h b/Source/Plugins/Statistics/StatisticsFilters/GenerateEnsembleStatistics.h index 0e06085aac..ad9b5e4667 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/GenerateEnsembleStatistics.h +++ b/Source/Plugins/Statistics/StatisticsFilters/GenerateEnsembleStatistics.h @@ -286,7 +286,7 @@ class Statistics_EXPORT GenerateEnsembleStatistics : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/Statistics/StatisticsFilters/QuiltCellData.cpp b/Source/Plugins/Statistics/StatisticsFilters/QuiltCellData.cpp index d42f4edf92..a215013f4b 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/QuiltCellData.cpp +++ b/Source/Plugins/Statistics/StatisticsFilters/QuiltCellData.cpp @@ -249,10 +249,10 @@ void QuiltCellData::dataCheck() void QuiltCellData::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/Statistics/StatisticsFilters/QuiltCellData.h b/Source/Plugins/Statistics/StatisticsFilters/QuiltCellData.h index 7b5dff84e8..370cb49a7b 100644 --- a/Source/Plugins/Statistics/StatisticsFilters/QuiltCellData.h +++ b/Source/Plugins/Statistics/StatisticsFilters/QuiltCellData.h @@ -156,7 +156,7 @@ class Statistics_EXPORT QuiltCellData : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/BinaryNodesTrianglesReader.cpp b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/BinaryNodesTrianglesReader.cpp index 9c3308b851..7bf3d1fce7 100644 --- a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/BinaryNodesTrianglesReader.cpp +++ b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/BinaryNodesTrianglesReader.cpp @@ -195,10 +195,10 @@ void BinaryNodesTrianglesReader::dataCheck() void BinaryNodesTrianglesReader::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/CalculateTriangleGroupCurvatures.cpp b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/CalculateTriangleGroupCurvatures.cpp index 639ce28ad7..7c7deca655 100644 --- a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/CalculateTriangleGroupCurvatures.cpp +++ b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/CalculateTriangleGroupCurvatures.cpp @@ -40,7 +40,6 @@ #ifdef SIMPL_USE_PARALLEL_ALGORITHMS #include #include -#include #endif #include diff --git a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/FeatureFaceCurvatureFilter.cpp b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/FeatureFaceCurvatureFilter.cpp index e2702a260e..97e6dcf02a 100644 --- a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/FeatureFaceCurvatureFilter.cpp +++ b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/FeatureFaceCurvatureFilter.cpp @@ -37,7 +37,6 @@ #ifdef SIMPL_USE_PARALLEL_ALGORITHMS #include #include -#include #endif #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h" @@ -332,10 +331,10 @@ void FeatureFaceCurvatureFilter::dataCheck() void FeatureFaceCurvatureFilter::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } @@ -404,8 +403,7 @@ void FeatureFaceCurvatureFilter::execute() m_CompletedFeatureFaces = 0; #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; #endif #ifdef SIMPL_USE_PARALLEL_ALGORITHMS diff --git a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/FindTriangleGeomCentroids.cpp b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/FindTriangleGeomCentroids.cpp index f6761c87ab..64e393f849 100644 --- a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/FindTriangleGeomCentroids.cpp +++ b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/FindTriangleGeomCentroids.cpp @@ -152,10 +152,10 @@ void FindTriangleGeomCentroids::preflight() { // These are the REQUIRED lines of CODE to make sure the filter behaves correctly setInPreflight(true); // Set the fact that we are preflighting. - emit preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update - emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter + Q_EMIT preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update + Q_EMIT updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter dataCheck(); // Run our DataCheck to make sure everthing is setup correctly - emit preflightExecuted(); // We are done preflighting this filter + Q_EMIT preflightExecuted(); // We are done preflighting this filter setInPreflight(false); // Inform the system this filter is NOT in preflight mode anymore. } diff --git a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/FindTriangleGeomCentroids.h b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/FindTriangleGeomCentroids.h index 1065561c51..fbd132276a 100644 --- a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/FindTriangleGeomCentroids.h +++ b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/FindTriangleGeomCentroids.h @@ -128,7 +128,7 @@ class SurfaceMeshing_EXPORT FindTriangleGeomCentroids : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/FindTriangleGeomNeighbors.cpp b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/FindTriangleGeomNeighbors.cpp index f42236435d..2067b0a464 100644 --- a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/FindTriangleGeomNeighbors.cpp +++ b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/FindTriangleGeomNeighbors.cpp @@ -150,10 +150,10 @@ void FindTriangleGeomNeighbors::dataCheck() void FindTriangleGeomNeighbors::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/FindTriangleGeomNeighbors.h b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/FindTriangleGeomNeighbors.h index 6086fde5d2..8c45885fba 100644 --- a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/FindTriangleGeomNeighbors.h +++ b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/FindTriangleGeomNeighbors.h @@ -132,7 +132,7 @@ class SurfaceMeshing_EXPORT FindTriangleGeomNeighbors : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/FindTriangleGeomShapes.cpp b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/FindTriangleGeomShapes.cpp index 74a391a8cd..74c87afd52 100644 --- a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/FindTriangleGeomShapes.cpp +++ b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/FindTriangleGeomShapes.cpp @@ -203,10 +203,10 @@ void FindTriangleGeomShapes::dataCheck() void FindTriangleGeomShapes::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/FindTriangleGeomShapes.h b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/FindTriangleGeomShapes.h index a78f3d9eee..af4c0ce0ad 100644 --- a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/FindTriangleGeomShapes.h +++ b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/FindTriangleGeomShapes.h @@ -150,7 +150,7 @@ class SurfaceMeshing_EXPORT FindTriangleGeomShapes : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/FindTriangleGeomSizes.cpp b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/FindTriangleGeomSizes.cpp index 68be9626ae..2508cca786 100644 --- a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/FindTriangleGeomSizes.cpp +++ b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/FindTriangleGeomSizes.cpp @@ -139,10 +139,10 @@ void FindTriangleGeomSizes::preflight() { // These are the REQUIRED lines of CODE to make sure the filter behaves correctly setInPreflight(true); // Set the fact that we are preflighting. - emit preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update - emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter + Q_EMIT preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update + Q_EMIT updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter dataCheck(); // Run our DataCheck to make sure everthing is setup correctly - emit preflightExecuted(); // We are done preflighting this filter + Q_EMIT preflightExecuted(); // We are done preflighting this filter setInPreflight(false); // Inform the system this filter is NOT in preflight mode anymore. } diff --git a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/FindTriangleGeomSizes.h b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/FindTriangleGeomSizes.h index b82752c2a1..5c75dd7fe6 100644 --- a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/FindTriangleGeomSizes.h +++ b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/FindTriangleGeomSizes.h @@ -128,7 +128,7 @@ class SurfaceMeshing_EXPORT FindTriangleGeomSizes : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/GenerateGeometryConnectivity.cpp b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/GenerateGeometryConnectivity.cpp index a598cf2b02..c541f9ca7f 100644 --- a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/GenerateGeometryConnectivity.cpp +++ b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/GenerateGeometryConnectivity.cpp @@ -107,10 +107,10 @@ void GenerateGeometryConnectivity::dataCheck() void GenerateGeometryConnectivity::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/LaplacianSmoothing.cpp b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/LaplacianSmoothing.cpp index ba2e574462..d5c2fb7269 100644 --- a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/LaplacianSmoothing.cpp +++ b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/LaplacianSmoothing.cpp @@ -188,10 +188,10 @@ void LaplacianSmoothing::dataCheck() void LaplacianSmoothing::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/M3CSliceBySlice.cpp b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/M3CSliceBySlice.cpp index 5bb9d75756..634dc319f7 100644 --- a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/M3CSliceBySlice.cpp +++ b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/M3CSliceBySlice.cpp @@ -383,10 +383,10 @@ void M3CSliceBySlice::dataCheck() void M3CSliceBySlice::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); QString nodesFile = QDir::tempPath() + Detail::NodesFile; SMTempFile::Pointer nodesTempFile = SMTempFile::New(); diff --git a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/M3CSliceBySlice.h b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/M3CSliceBySlice.h index 3608f2ecd3..5a1d20784b 100644 --- a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/M3CSliceBySlice.h +++ b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/M3CSliceBySlice.h @@ -126,7 +126,7 @@ class SurfaceMeshing_EXPORT M3CSliceBySlice : public AbstractFilter void execute(); -signals: +Q_SIGNALS: void updateFilterParameters(AbstractFilter* filter); void parametersChanged(); void preflightAboutToExecute(); diff --git a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/MovingFiniteElementSmoothing.cpp b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/MovingFiniteElementSmoothing.cpp index 5a747ab0da..ccf736e85b 100644 --- a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/MovingFiniteElementSmoothing.cpp +++ b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/MovingFiniteElementSmoothing.cpp @@ -245,10 +245,10 @@ void MovingFiniteElementSmoothing::dataCheck() void MovingFiniteElementSmoothing::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); /* *** THIS FILTER NEEDS TO BE CHECKED *** */ diff --git a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/MovingFiniteElementSmoothing.h b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/MovingFiniteElementSmoothing.h index b5ea84a547..c794e71126 100644 --- a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/MovingFiniteElementSmoothing.h +++ b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/MovingFiniteElementSmoothing.h @@ -136,7 +136,7 @@ class SurfaceMeshing_EXPORT MovingFiniteElementSmoothing : public SurfaceMeshFil */ void preflight() override; - signals: + Q_SIGNALS: void updateFilterParameters(AbstractFilter* filter); void parametersChanged(); void preflightAboutToExecute(); diff --git a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/QuickSurfaceMesh.cpp b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/QuickSurfaceMesh.cpp index 8f143cea5b..897c519caa 100644 --- a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/QuickSurfaceMesh.cpp +++ b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/QuickSurfaceMesh.cpp @@ -346,10 +346,10 @@ void QuickSurfaceMesh::dataCheck() void QuickSurfaceMesh::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/QuickSurfaceMesh.h b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/QuickSurfaceMesh.h index b43a8bf7c1..597e0735e4 100644 --- a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/QuickSurfaceMesh.h +++ b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/QuickSurfaceMesh.h @@ -158,7 +158,7 @@ class SurfaceMeshing_EXPORT QuickSurfaceMesh : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/ReverseTriangleWinding.cpp b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/ReverseTriangleWinding.cpp index 4f9e113637..5aca8b1403 100644 --- a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/ReverseTriangleWinding.cpp +++ b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/ReverseTriangleWinding.cpp @@ -150,10 +150,10 @@ void ReverseTriangleWinding::dataCheck() void ReverseTriangleWinding::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/SharedFeatureFaceFilter.cpp b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/SharedFeatureFaceFilter.cpp index 5b14b5aad2..744857f2a1 100644 --- a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/SharedFeatureFaceFilter.cpp +++ b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/SharedFeatureFaceFilter.cpp @@ -169,10 +169,10 @@ void SharedFeatureFaceFilter::dataCheck() void SharedFeatureFaceFilter::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/SurfaceMeshFilter.h b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/SurfaceMeshFilter.h index 96c135c2c4..822b3cfa25 100644 --- a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/SurfaceMeshFilter.h +++ b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/SurfaceMeshFilter.h @@ -58,7 +58,7 @@ class SurfaceMeshing_EXPORT SurfaceMeshFilter : public AbstractFilter ~SurfaceMeshFilter() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/TriangleAreaFilter.cpp b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/TriangleAreaFilter.cpp index b275d9e692..b93494c259 100644 --- a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/TriangleAreaFilter.cpp +++ b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/TriangleAreaFilter.cpp @@ -39,7 +39,6 @@ #include #include #include -#include #endif #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h" @@ -187,10 +186,10 @@ void TriangleAreaFilter::dataCheck() void TriangleAreaFilter::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } @@ -210,8 +209,7 @@ void TriangleAreaFilter::execute() DataContainer::Pointer sm = getDataContainerArray()->getDataContainer(getSurfaceMeshTriangleAreasArrayPath().getDataContainerName()); #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; #endif TriangleGeom::Pointer triangleGeom = sm->getGeometryAs(); diff --git a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/TriangleCentroidFilter.cpp b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/TriangleCentroidFilter.cpp index af1cd7a632..814c19622f 100644 --- a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/TriangleCentroidFilter.cpp +++ b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/TriangleCentroidFilter.cpp @@ -39,7 +39,6 @@ #include #include #include -#include #endif #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h" @@ -173,10 +172,10 @@ void TriangleCentroidFilter::dataCheck() void TriangleCentroidFilter::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } @@ -196,8 +195,7 @@ void TriangleCentroidFilter::execute() DataContainer::Pointer sm = getDataContainerArray()->getDataContainer(getSurfaceMeshTriangleCentroidsArrayPath().getDataContainerName()); #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; #endif // No check because datacheck() made sure we can do the next line. diff --git a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/TriangleDihedralAngleFilter.cpp b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/TriangleDihedralAngleFilter.cpp index 38fd37a80b..4008e7a35e 100644 --- a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/TriangleDihedralAngleFilter.cpp +++ b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/TriangleDihedralAngleFilter.cpp @@ -39,7 +39,6 @@ #include #include #include -#include #endif #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h" @@ -208,10 +207,10 @@ void TriangleDihedralAngleFilter::dataCheck() void TriangleDihedralAngleFilter::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } @@ -231,8 +230,7 @@ void TriangleDihedralAngleFilter::execute() DataContainer::Pointer sm = getDataContainerArray()->getDataContainer(getSurfaceMeshTriangleDihedralAnglesArrayPath().getDataContainerName()); #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; #endif TriangleGeom::Pointer triangleGeom = sm->getGeometryAs(); diff --git a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/TriangleNormalFilter.cpp b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/TriangleNormalFilter.cpp index 447f44814a..be6ad1b361 100644 --- a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/TriangleNormalFilter.cpp +++ b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/TriangleNormalFilter.cpp @@ -186,10 +186,10 @@ void TriangleNormalFilter::dataCheck() void TriangleNormalFilter::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/VerifyTriangleWinding.cpp b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/VerifyTriangleWinding.cpp index 75167513d3..1c4019b3f4 100644 --- a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/VerifyTriangleWinding.cpp +++ b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/VerifyTriangleWinding.cpp @@ -340,10 +340,10 @@ void VerifyTriangleWinding::dataCheck() void VerifyTriangleWinding::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); /* *** THIS FILTER NEEDS TO BE CHECKED *** */ diff --git a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/VerifyTriangleWinding.h b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/VerifyTriangleWinding.h index 49add09a40..e87e361b40 100644 --- a/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/VerifyTriangleWinding.h +++ b/Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/VerifyTriangleWinding.h @@ -120,7 +120,7 @@ class SurfaceMeshing_EXPORT VerifyTriangleWinding : public SurfaceMeshFilter */ void preflight() override; - signals: + Q_SIGNALS: void updateFilterParameters(AbstractFilter* filter); void parametersChanged(); void preflightAboutToExecute(); diff --git a/Source/Plugins/SyntheticBuilding/Gui/FilterParameterWidgets/InitializeSyntheticVolumeWidget.cpp b/Source/Plugins/SyntheticBuilding/Gui/FilterParameterWidgets/InitializeSyntheticVolumeWidget.cpp index 85f23fad48..960f4ee801 100644 --- a/Source/Plugins/SyntheticBuilding/Gui/FilterParameterWidgets/InitializeSyntheticVolumeWidget.cpp +++ b/Source/Plugins/SyntheticBuilding/Gui/FilterParameterWidgets/InitializeSyntheticVolumeWidget.cpp @@ -113,7 +113,7 @@ AbstractFilter* InitializeSyntheticVolumeWidget::getFilter() const // ----------------------------------------------------------------------------- void InitializeSyntheticVolumeWidget::setWidgetListEnabled(bool b) { - foreach(QWidget* w, m_WidgetList) + Q_FOREACH(QWidget* w, m_WidgetList) { w->setEnabled(b); } @@ -198,7 +198,7 @@ void InitializeSyntheticVolumeWidget::on_m_InputFile_textChanged(const QString& // We need to send the file down to the filter BEFORE any of the preflight starts because it needs this updated file // m_Filter->setInputFile(m_InputFile->text()); // Once the input file is changed then kick off the prefligth by emitting the parametersChanged() signal - emit parametersChanged(); + Q_EMIT parametersChanged(); m_DidCausePreflight = false; m_NewFileLoaded = false; @@ -321,7 +321,7 @@ void InitializeSyntheticVolumeWidget::on_m_InputFile_textChanged(const QString& // Estimate the number of Features estimateNumFeaturesSetup(); - emit parametersChanged(); + Q_EMIT parametersChanged(); } // ----------------------------------------------------------------------------- @@ -332,7 +332,7 @@ void InitializeSyntheticVolumeWidget::filterNeedsInputParameters(AbstractFilter* if(nullptr == filter) { QString ss = QObject::tr("Error Setting InitializeSyntheticVolumeWidget Gui values to Filter instance. Filter instance was nullptr.").arg(getFilterParameter()->getPropertyName()); - emit errorSettingFilterParameter(ss); + Q_EMIT errorSettingFilterParameter(ss); } InitializeSyntheticVolume* filt = qobject_cast(filter); @@ -386,7 +386,7 @@ void InitializeSyntheticVolumeWidget::displayErrorMessage(const PipelineMessage& void InitializeSyntheticVolumeWidget::on_m_XPoints_valueChanged(int v) { estimateNumFeaturesSetup(); - emit parametersChanged(); + Q_EMIT parametersChanged(); } // ----------------------------------------------------------------------------- @@ -395,7 +395,7 @@ void InitializeSyntheticVolumeWidget::on_m_XPoints_valueChanged(int v) void InitializeSyntheticVolumeWidget::on_m_YPoints_valueChanged(int v) { estimateNumFeaturesSetup(); - emit parametersChanged(); + Q_EMIT parametersChanged(); } // ----------------------------------------------------------------------------- @@ -404,7 +404,7 @@ void InitializeSyntheticVolumeWidget::on_m_YPoints_valueChanged(int v) void InitializeSyntheticVolumeWidget::on_m_ZPoints_valueChanged(int v) { estimateNumFeaturesSetup(); - emit parametersChanged(); + Q_EMIT parametersChanged(); } // ----------------------------------------------------------------------------- @@ -413,7 +413,7 @@ void InitializeSyntheticVolumeWidget::on_m_ZPoints_valueChanged(int v) void InitializeSyntheticVolumeWidget::on_m_ZResolution_valueChanged(double v) { estimateNumFeaturesSetup(); - emit parametersChanged(); + Q_EMIT parametersChanged(); } // ----------------------------------------------------------------------------- @@ -422,7 +422,7 @@ void InitializeSyntheticVolumeWidget::on_m_ZResolution_valueChanged(double v) void InitializeSyntheticVolumeWidget::on_m_YResolution_valueChanged(double v) { estimateNumFeaturesSetup(); - emit parametersChanged(); + Q_EMIT parametersChanged(); } // ----------------------------------------------------------------------------- @@ -431,7 +431,7 @@ void InitializeSyntheticVolumeWidget::on_m_YResolution_valueChanged(double v) void InitializeSyntheticVolumeWidget::on_m_XResolution_valueChanged(double v) { estimateNumFeaturesSetup(); - emit parametersChanged(); + Q_EMIT parametersChanged(); } // ----------------------------------------------------------------------------- diff --git a/Source/Plugins/SyntheticBuilding/Gui/FilterParameterWidgets/InitializeSyntheticVolumeWidget.h b/Source/Plugins/SyntheticBuilding/Gui/FilterParameterWidgets/InitializeSyntheticVolumeWidget.h index 42bcac21fc..ee98e974da 100644 --- a/Source/Plugins/SyntheticBuilding/Gui/FilterParameterWidgets/InitializeSyntheticVolumeWidget.h +++ b/Source/Plugins/SyntheticBuilding/Gui/FilterParameterWidgets/InitializeSyntheticVolumeWidget.h @@ -71,14 +71,14 @@ class InitializeSyntheticVolumeWidget : public FilterParameterWidget, private Ui void setFilter(AbstractFilter* value); AbstractFilter* getFilter() const; - public slots: + public Q_SLOTS: //void widgetChanged(const QString& msg); void beforePreflight(); void afterPreflight(); void filterNeedsInputParameters(AbstractFilter* filter); void displayErrorMessage(const PipelineMessage& msg); - protected slots: + protected Q_SLOTS: // Auto Hookup Slots void on_m_InputFileBtn_clicked(); void on_m_InputFile_textChanged(const QString& text); diff --git a/Source/Plugins/SyntheticBuilding/Gui/FilterParameterWidgets/StatsGeneratorWidget.cpp b/Source/Plugins/SyntheticBuilding/Gui/FilterParameterWidgets/StatsGeneratorWidget.cpp index 47f353af47..78839a52bd 100644 --- a/Source/Plugins/SyntheticBuilding/Gui/FilterParameterWidgets/StatsGeneratorWidget.cpp +++ b/Source/Plugins/SyntheticBuilding/Gui/FilterParameterWidgets/StatsGeneratorWidget.cpp @@ -243,7 +243,7 @@ void StatsGeneratorWidget::loadData() // ----------------------------------------------------------------------------- void StatsGeneratorWidget::on_updatePipelineBtn_clicked() { - emit parametersChanged(); + Q_EMIT parametersChanged(); } // ----------------------------------------------------------------------------- @@ -456,7 +456,7 @@ void StatsGeneratorWidget::on_addPhase_clicked() // Make sure the new tab is the active tab phaseTabs->setCurrentIndex(phaseTabs->count() - 1); } - emit parametersChanged(); + Q_EMIT parametersChanged(); } // ----------------------------------------------------------------------------- @@ -529,7 +529,7 @@ void StatsGeneratorWidget::on_editPhase_clicked() phaseTabs->setTabText(phaseTabs->currentIndex(), dialog.getPhaseName()); QString cName = ppw->getComboString(); setWindowModified(true); - emit parametersChanged(); + Q_EMIT parametersChanged(); // ppw->updatePlots(); } if(dialog.getPhaseType() == PhaseType::Type::Precipitate) @@ -543,7 +543,7 @@ void StatsGeneratorWidget::on_editPhase_clicked() phaseTabs->setTabText(phaseTabs->currentIndex(), dialog.getPhaseName()); QString cName = ppw->getComboString(); setWindowModified(true); - emit parametersChanged(); + Q_EMIT parametersChanged(); // ppw->updatePlots(); } if(dialog.getPhaseType() == PhaseType::Type::Transformation) @@ -557,7 +557,7 @@ void StatsGeneratorWidget::on_editPhase_clicked() phaseTabs->setTabText(phaseTabs->currentIndex(), dialog.getPhaseName()); QString cName = tpw->getComboString(); setWindowModified(true); - emit parametersChanged(); + Q_EMIT parametersChanged(); // tpw->updatePlots(); } if(dialog.getPhaseType() == PhaseType::Type::Matrix) @@ -570,7 +570,7 @@ void StatsGeneratorWidget::on_editPhase_clicked() phaseTabs->setTabText(phaseTabs->currentIndex(), dialog.getPhaseName()); QString cName = mpw->getComboString(); setWindowModified(true); - emit parametersChanged(); + Q_EMIT parametersChanged(); } if(dialog.getPhaseType() == PhaseType::Type::Boundary) { @@ -582,7 +582,7 @@ void StatsGeneratorWidget::on_editPhase_clicked() phaseTabs->setTabText(phaseTabs->currentIndex(), dialog.getPhaseName()); QString cName = bpw->getComboString(); setWindowModified(true); - emit parametersChanged(); + Q_EMIT parametersChanged(); } } } @@ -608,7 +608,7 @@ void StatsGeneratorWidget::on_phaseTabs_tabCloseRequested(int index) } } setWindowModified(true); - emit parametersChanged(); + Q_EMIT parametersChanged(); } // ----------------------------------------------------------------------------- diff --git a/Source/Plugins/SyntheticBuilding/Gui/FilterParameterWidgets/StatsGeneratorWidget.h b/Source/Plugins/SyntheticBuilding/Gui/FilterParameterWidgets/StatsGeneratorWidget.h index e521e551c8..2fdc0d5df1 100644 --- a/Source/Plugins/SyntheticBuilding/Gui/FilterParameterWidgets/StatsGeneratorWidget.h +++ b/Source/Plugins/SyntheticBuilding/Gui/FilterParameterWidgets/StatsGeneratorWidget.h @@ -81,7 +81,7 @@ class StatsGeneratorWidget : public FilterParameterWidget, private Ui::StatsGene void loadData() override; -protected slots: +protected Q_SLOTS: void beforePreflight(); void afterPreflight(); diff --git a/Source/Plugins/SyntheticBuilding/Gui/Utilities/PoleFigureImageUtilities.cpp b/Source/Plugins/SyntheticBuilding/Gui/Utilities/PoleFigureImageUtilities.cpp index 25eab9a533..e331d51f2d 100644 --- a/Source/Plugins/SyntheticBuilding/Gui/Utilities/PoleFigureImageUtilities.cpp +++ b/Source/Plugins/SyntheticBuilding/Gui/Utilities/PoleFigureImageUtilities.cpp @@ -39,6 +39,7 @@ #include #include #include +#include #include "SIMPLib/Math/SIMPLibMath.h" #include "SIMPLib/Utilities/ColorTable.h" diff --git a/Source/Plugins/SyntheticBuilding/Gui/Widgets/BoundaryPhaseWidget.h b/Source/Plugins/SyntheticBuilding/Gui/Widgets/BoundaryPhaseWidget.h index 5263ee0df5..3b32b06b92 100644 --- a/Source/Plugins/SyntheticBuilding/Gui/Widgets/BoundaryPhaseWidget.h +++ b/Source/Plugins/SyntheticBuilding/Gui/Widgets/BoundaryPhaseWidget.h @@ -67,9 +67,9 @@ class BoundaryPhaseWidget : public StatsGenWidget, private Ui::BoundaryPhaseWidg virtual QIcon getPhaseIcon(); -protected slots: +protected Q_SLOTS: -signals: +Q_SIGNALS: void dataChanged(); void progressText(const QString& text); diff --git a/Source/Plugins/SyntheticBuilding/Gui/Widgets/EditPhaseDialog.cpp b/Source/Plugins/SyntheticBuilding/Gui/Widgets/EditPhaseDialog.cpp index cae0382708..be35a7240a 100644 --- a/Source/Plugins/SyntheticBuilding/Gui/Widgets/EditPhaseDialog.cpp +++ b/Source/Plugins/SyntheticBuilding/Gui/Widgets/EditPhaseDialog.cpp @@ -192,7 +192,7 @@ void EditPhaseDialog::setupGui() // Disable the selection of crystal structures that are not supported. QVector indx = {2, 3, 4, 5, 7, 8, 9, 10}; - foreach(int idx, indx) + Q_FOREACH(int idx, indx) { QStandardItemModel* model = qobject_cast(xtalCombo->model()); bool disabled = true; diff --git a/Source/Plugins/SyntheticBuilding/Gui/Widgets/EditPhaseDialog.h b/Source/Plugins/SyntheticBuilding/Gui/Widgets/EditPhaseDialog.h index 0025fd93dc..cc6455780a 100644 --- a/Source/Plugins/SyntheticBuilding/Gui/Widgets/EditPhaseDialog.h +++ b/Source/Plugins/SyntheticBuilding/Gui/Widgets/EditPhaseDialog.h @@ -81,7 +81,7 @@ class EditPhaseDialog : public SVDialog, private Ui::EditPhaseDialog void setPhaseName(QString& name); QString getPhaseName(); -protected slots: +protected Q_SLOTS: void on_phaseFraction_textChanged(const QString& string); void on_phaseTypeCombo_currentIndexChanged(int index); diff --git a/Source/Plugins/SyntheticBuilding/Gui/Widgets/MatrixPhaseWidget.h b/Source/Plugins/SyntheticBuilding/Gui/Widgets/MatrixPhaseWidget.h index 5832cc622a..b3691a26d9 100644 --- a/Source/Plugins/SyntheticBuilding/Gui/Widgets/MatrixPhaseWidget.h +++ b/Source/Plugins/SyntheticBuilding/Gui/Widgets/MatrixPhaseWidget.h @@ -66,9 +66,9 @@ class MatrixPhaseWidget : public StatsGenWidget, private Ui::MatrixPhaseWidget QIcon getPhaseIcon(); -protected slots: +protected Q_SLOTS: -signals: +Q_SIGNALS: void dataChanged(); void progressText(const QString& text); diff --git a/Source/Plugins/SyntheticBuilding/Gui/Widgets/PrecipitatePhaseWidget.cpp b/Source/Plugins/SyntheticBuilding/Gui/Widgets/PrecipitatePhaseWidget.cpp index 2965463c3b..ce23daa86d 100644 --- a/Source/Plugins/SyntheticBuilding/Gui/Widgets/PrecipitatePhaseWidget.cpp +++ b/Source/Plugins/SyntheticBuilding/Gui/Widgets/PrecipitatePhaseWidget.cpp @@ -293,7 +293,7 @@ void PrecipitatePhaseWidget::on_m_GenerateDefaultData_clicked() { setDataHasBeenGenerated(true); updatePlots(); - emit dataChanged(); + Q_EMIT dataChanged(); } // ----------------------------------------------------------------------------- @@ -409,7 +409,7 @@ int PrecipitatePhaseWidget::gatherStatsData(AttributeMatrix::Pointer attrMat, bo // ----------------------------------------------------------------------------- void PrecipitatePhaseWidget::extractStatsData(AttributeMatrix::Pointer attrMat, int index) { - emit progressText(QString("Precipitate Phase extracting statistics...")); + Q_EMIT progressText(QString("Precipitate Phase extracting statistics...")); setWidgetListEnabled(true); setPhaseIndex(index); @@ -456,7 +456,7 @@ void PrecipitatePhaseWidget::extractStatsData(AttributeMatrix::Pointer attrMat, { qbins[i] = bins->getValue(i); } - emit progressText(QString("Extracting Size Distribution Values")); + Q_EMIT progressText(QString("Extracting Size Distribution Values")); qApp->processEvents(); getFeatureSizeWidget()->extractStatsData(precipitateStatsData.get(), index); @@ -465,17 +465,17 @@ void PrecipitatePhaseWidget::extractStatsData(AttributeMatrix::Pointer attrMat, float minCutOff = getFeatureSizeWidget()->getMinCutOff(); float maxCutOff = getFeatureSizeWidget()->getMaxCutOff(); float binStepSize = getFeatureSizeWidget()->getBinStep(); - emit progressText(QString("Extracting Omega 3 Distribution Values")); + Q_EMIT progressText(QString("Extracting Omega 3 Distribution Values")); qApp->processEvents(); getOmega3PlotWidget()->setDistributionType(precipitateStatsData->getOmegas_DistType(), false); getOmega3PlotWidget()->extractStatsData(index, qbins, precipitateStatsData->getFeatureSize_Omegas()); getOmega3PlotWidget()->setSizeDistributionValues(mu, sigma, minCutOff, maxCutOff, binStepSize); - emit progressText(QString("Extracting B Over a Distribution Values")); + Q_EMIT progressText(QString("Extracting B Over a Distribution Values")); qApp->processEvents(); getBOverAPlotPlotWidget()->setDistributionType(precipitateStatsData->getBOverA_DistType(), false); getBOverAPlotPlotWidget()->extractStatsData(index, qbins, precipitateStatsData->getFeatureSize_BOverA()); getBOverAPlotPlotWidget()->setSizeDistributionValues(mu, sigma, minCutOff, maxCutOff, binStepSize); - emit progressText(QString("Extracting C Over A Distribution Values")); + Q_EMIT progressText(QString("Extracting C Over A Distribution Values")); qApp->processEvents(); getCOverAPlotWidget()->setDistributionType(precipitateStatsData->getCOverA_DistType(), false); getCOverAPlotWidget()->extractStatsData(index, qbins, precipitateStatsData->getFeatureSize_COverA()); @@ -483,17 +483,17 @@ void PrecipitatePhaseWidget::extractStatsData(AttributeMatrix::Pointer attrMat, m_RdfPlot->extractStatsData(index, precipitateStatsData.get(), PhaseType::Type::Precipitate); - emit progressText(QString("Extracting ODF Distribution Values")); + Q_EMIT progressText(QString("Extracting ODF Distribution Values")); qApp->processEvents(); // Set the ODF Data getODFWidget()->extractStatsData(index, precipitateStatsData.get(), PhaseType::Type::Precipitate); - emit progressText(QString("Extracting MDF Distribution Values")); + Q_EMIT progressText(QString("Extracting MDF Distribution Values")); qApp->processEvents(); // Set the ODF Data getMDFWidget()->extractStatsData(index, precipitateStatsData.get(), PhaseType::Type::Precipitate); - emit progressText(QString("Extracting Axis ODF Distribution Values")); + Q_EMIT progressText(QString("Extracting Axis ODF Distribution Values")); qApp->processEvents(); // Set the Axis ODF Data getAxisODFWidget()->extractStatsData(index, precipitateStatsData.get(), PhaseType::Type::Precipitate); diff --git a/Source/Plugins/SyntheticBuilding/Gui/Widgets/PrecipitatePhaseWidget.h b/Source/Plugins/SyntheticBuilding/Gui/Widgets/PrecipitatePhaseWidget.h index d3674c9374..91eadc799d 100644 --- a/Source/Plugins/SyntheticBuilding/Gui/Widgets/PrecipitatePhaseWidget.h +++ b/Source/Plugins/SyntheticBuilding/Gui/Widgets/PrecipitatePhaseWidget.h @@ -80,11 +80,11 @@ class PrecipitatePhaseWidget : public PrimaryPhaseWidget void generateDefaultData() override; -protected slots: +protected Q_SLOTS: void on_m_GenerateDefaultData_clicked(); -signals: +Q_SIGNALS: void dataChanged(); diff --git a/Source/Plugins/SyntheticBuilding/Gui/Widgets/Presets/Dialogs/RolledPresetDialog.h b/Source/Plugins/SyntheticBuilding/Gui/Widgets/Presets/Dialogs/RolledPresetDialog.h index f52ba1ac4b..75829fe9c8 100644 --- a/Source/Plugins/SyntheticBuilding/Gui/Widgets/Presets/Dialogs/RolledPresetDialog.h +++ b/Source/Plugins/SyntheticBuilding/Gui/Widgets/Presets/Dialogs/RolledPresetDialog.h @@ -58,7 +58,7 @@ class RolledPresetDialog : public QDialog float getB(); float getC(); -public slots: +public Q_SLOTS: void checkInputs(const QString& text); diff --git a/Source/Plugins/SyntheticBuilding/Gui/Widgets/PrimaryPhaseWidget.cpp b/Source/Plugins/SyntheticBuilding/Gui/Widgets/PrimaryPhaseWidget.cpp index 9342016f88..d978b2b63f 100644 --- a/Source/Plugins/SyntheticBuilding/Gui/Widgets/PrimaryPhaseWidget.cpp +++ b/Source/Plugins/SyntheticBuilding/Gui/Widgets/PrimaryPhaseWidget.cpp @@ -535,7 +535,7 @@ void PrimaryPhaseWidget::dataWasEdited() // ----------------------------------------------------------------------------- void PrimaryPhaseWidget::setWidgetListEnabled(bool b) { - foreach(QWidget* w, m_WidgetList) + Q_FOREACH(QWidget* w, m_WidgetList) { w->setEnabled(b); } @@ -673,7 +673,7 @@ void PrimaryPhaseWidget::on_m_GenerateDefaultData_clicked() { setDataHasBeenGenerated(true); updatePlots(); - emit dataChanged(); + Q_EMIT dataChanged(); } // ----------------------------------------------------------------------------- @@ -688,7 +688,7 @@ void PrimaryPhaseWidget::on_m_ResetDataBtn_clicked() setDataHasBeenGenerated(true); // Set this boolean to true so that data generation is triggered m_ResetData = true; updatePlots(); // Regenerate all the default data - emit dataChanged(); + Q_EMIT dataChanged(); m_ResetData = false; } @@ -776,7 +776,7 @@ int PrimaryPhaseWidget::gatherStatsData(AttributeMatrix::Pointer attrMat, bool p void PrimaryPhaseWidget::extractStatsData(AttributeMatrix::Pointer attrMat, int index) { - emit progressText(QString("Primary Phase extracting statistics...")); + Q_EMIT progressText(QString("Primary Phase extracting statistics...")); setWidgetListEnabled(true); setPhaseIndex(index); qApp->processEvents(); @@ -808,7 +808,7 @@ void PrimaryPhaseWidget::extractStatsData(AttributeMatrix::Pointer attrMat, int setPhaseName(phaseName); setTabTitle(phaseName); m_FeatureSizeDistWidget->setCrystalStructure(getCrystalStructure()); - foreach(StatsGenPlotWidget* w, m_SGPlotWidgets) + Q_FOREACH(StatsGenPlotWidget* w, m_SGPlotWidgets) { w->setCrystalStructure(getCrystalStructure()); } @@ -829,7 +829,7 @@ void PrimaryPhaseWidget::extractStatsData(AttributeMatrix::Pointer attrMat, int } m_FeatureSizeDistWidget->extractStatsData(primaryStatsData.get(), index); - emit progressText(QString("Extracting Size Distribution Values")); + Q_EMIT progressText(QString("Extracting Size Distribution Values")); qApp->processEvents(); float mu = m_FeatureSizeDistWidget->getMu(); @@ -838,19 +838,19 @@ void PrimaryPhaseWidget::extractStatsData(AttributeMatrix::Pointer attrMat, int float maxCutOff = m_FeatureSizeDistWidget->getMaxCutOff(); float binStepSize = m_FeatureSizeDistWidget->getBinStep(); - emit progressText(QString("Extracting Omega 3 Distribution Values")); + Q_EMIT progressText(QString("Extracting Omega 3 Distribution Values")); qApp->processEvents(); m_Omega3Plot->setDistributionType(primaryStatsData->getOmegas_DistType(), false); m_Omega3Plot->extractStatsData(index, qbins, primaryStatsData->getFeatureSize_Omegas()); m_Omega3Plot->setSizeDistributionValues(mu, sigma, minCutOff, maxCutOff, binStepSize); - emit progressText(QString("Extracting B Over a Distribution Values")); + Q_EMIT progressText(QString("Extracting B Over a Distribution Values")); qApp->processEvents(); m_BOverAPlot->setDistributionType(primaryStatsData->getBOverA_DistType(), false); m_BOverAPlot->extractStatsData(index, qbins, primaryStatsData->getFeatureSize_BOverA()); m_BOverAPlot->setSizeDistributionValues(mu, sigma, minCutOff, maxCutOff, binStepSize); - emit progressText(QString("Extracting C Over A Distribution Values")); + Q_EMIT progressText(QString("Extracting C Over A Distribution Values")); qApp->processEvents(); m_COverAPlot->setDistributionType(primaryStatsData->getCOverA_DistType(), false); m_COverAPlot->extractStatsData(index, qbins, primaryStatsData->getFeatureSize_COverA()); @@ -858,24 +858,24 @@ void PrimaryPhaseWidget::extractStatsData(AttributeMatrix::Pointer attrMat, int if(m_NeighborPlot != nullptr) { - emit progressText(QString("Extracting Neighbor Distribution Values")); + Q_EMIT progressText(QString("Extracting Neighbor Distribution Values")); qApp->processEvents(); m_NeighborPlot->setDistributionType(primaryStatsData->getNeighbors_DistType(), false); m_NeighborPlot->extractStatsData(index, qbins, primaryStatsData->getFeatureSize_Neighbors()); m_NeighborPlot->setSizeDistributionValues(mu, sigma, minCutOff, maxCutOff, binStepSize); } - emit progressText(QString("Extracting ODF Distribution Values")); + Q_EMIT progressText(QString("Extracting ODF Distribution Values")); qApp->processEvents(); // Set the ODF Data m_ODFWidget->extractStatsData(index, primaryStatsData.get(), PhaseType::Type::Primary); - emit progressText(QString("Extracting MDF Distribution Values")); + Q_EMIT progressText(QString("Extracting MDF Distribution Values")); qApp->processEvents(); // Set the ODF Data m_MDFWidget->extractStatsData(index, primaryStatsData.get(), PhaseType::Type::Primary); - emit progressText(QString("Extracting Axis ODF Distribution Values")); + Q_EMIT progressText(QString("Extracting Axis ODF Distribution Values")); qApp->processEvents(); // Set the Axis ODF Data m_AxisODFWidget->extractStatsData(index, primaryStatsData.get(), PhaseType::Type::Primary); diff --git a/Source/Plugins/SyntheticBuilding/Gui/Widgets/PrimaryPhaseWidget.h b/Source/Plugins/SyntheticBuilding/Gui/Widgets/PrimaryPhaseWidget.h index 9385a19336..37506cda34 100644 --- a/Source/Plugins/SyntheticBuilding/Gui/Widgets/PrimaryPhaseWidget.h +++ b/Source/Plugins/SyntheticBuilding/Gui/Widgets/PrimaryPhaseWidget.h @@ -91,7 +91,7 @@ class PrimaryPhaseWidget : public StatsGenWidget, private Ui::PrimaryPhaseWidget void generateDefaultData() override; -protected slots: +protected Q_SLOTS: void on_m_GenerateDefaultData_clicked(); @@ -103,7 +103,7 @@ protected slots: void bulkLoadEvent(bool fail); -signals: +Q_SIGNALS: void dataChanged(); void progressText(const QString& text); diff --git a/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenAxisODFWidget.cpp b/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenAxisODFWidget.cpp index 75a2cced34..517a37470f 100644 --- a/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenAxisODFWidget.cpp +++ b/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenAxisODFWidget.cpp @@ -261,7 +261,7 @@ void StatsGenAxisODFWidget::tableDataChanged(const QModelIndex& topLeft, const Q Q_UNUSED(bottomRight); on_m_CalculateODFBtn_clicked(); - emit dataChanged(); + Q_EMIT dataChanged(); } // ----------------------------------------------------------------------------- @@ -511,7 +511,7 @@ void StatsGenAxisODFWidget::calculateAxisODF() QImage image = PoleFigureImageUtilities::Create3ImagePoleFigure(figures[0].get(), figures[1].get(), figures[2].get(), config, m_ImageLayoutCB->currentIndex()); m_PoleFigureLabel->setPixmap(QPixmap::fromImage(image)); - emit dataChanged(); + Q_EMIT dataChanged(); } // ----------------------------------------------------------------------------- @@ -568,7 +568,7 @@ void StatsGenAxisODFWidget::on_deleteODFTextureBtn_clicked() m_ODFTableView->resizeColumnsToContents(); } updatePlots(); - emit dataChanged(); + Q_EMIT dataChanged(); } // ----------------------------------------------------------------------------- diff --git a/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenAxisODFWidget.h b/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenAxisODFWidget.h index 8c43d233ef..32479f59d0 100644 --- a/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenAxisODFWidget.h +++ b/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenAxisODFWidget.h @@ -91,7 +91,7 @@ class StatsGenAxisODFWidget : public QWidget, private Ui::StatsGenAxisODFWidget void drawODFPlotGrid(QwtPlot* plot); -protected slots: +protected Q_SLOTS: void on_m_CalculateODFBtn_clicked(); void on_addODFTextureBtn_clicked(); void on_deleteODFTextureBtn_clicked(); @@ -102,7 +102,7 @@ protected slots: virtual void on_m_WeightSpreads_clicked(bool b); virtual void on_m_WeightSpreadsBulkLoad_clicked(bool b); -signals: +Q_SIGNALS: void dataChanged(); protected: diff --git a/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenFeatureSizeWidget.cpp b/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenFeatureSizeWidget.cpp index 8c64af0e80..6355e0ca70 100644 --- a/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenFeatureSizeWidget.cpp +++ b/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenFeatureSizeWidget.cpp @@ -213,7 +213,7 @@ void StatsGenFeatureSizeWidget::plotPointSelected(const QPointF& point) } } m_SizeDistributionPlot->replot(); - emit binSelected(selectedBin); + Q_EMIT binSelected(selectedBin); } // ----------------------------------------------------------------------------- @@ -327,39 +327,39 @@ bool StatsGenFeatureSizeWidget::validateMuSigma() if(!muValid) { m_NumberBinsGenerated->setText("Error: Mu not valid"); - emit userEnteredValidData(false); + Q_EMIT userEnteredValidData(false); return false; } bool sigmaValid = validateValue(m_SigmaValidator, m_Sigma_SizeDistribution); if(!sigmaValid) { m_NumberBinsGenerated->setText("Error: Sigma not valid"); - emit userEnteredValidData(false); + Q_EMIT userEnteredValidData(false); return false; } bool minValid = validateValue(m_MinCutoffValidator, m_MinSigmaCutOff); if(!minValid) { m_NumberBinsGenerated->setText("Error: Min Cutoff not valid"); - emit userEnteredValidData(false); + Q_EMIT userEnteredValidData(false); return false; } bool maxValid = validateValue(m_MaxCutoffValidator, m_MaxSigmaCutOff); if(!maxValid) { m_NumberBinsGenerated->setText("Error: Max Cutoff not valid"); - emit userEnteredValidData(false); + Q_EMIT userEnteredValidData(false); return false; } if(muValid && sigmaValid && minValid && maxValid) { - emit userEnteredValidData(true); + Q_EMIT userEnteredValidData(true); return true; } m_NumberBinsGenerated->setText("Error"); - emit userEnteredValidData(false); + Q_EMIT userEnteredValidData(false); return false; } @@ -408,7 +408,7 @@ void StatsGenFeatureSizeWidget::on_m_Mu_SizeDistribution_textChanged(const QStri { return; } - emit dataChanged(); + Q_EMIT dataChanged(); } // ----------------------------------------------------------------------------- @@ -443,7 +443,7 @@ void StatsGenFeatureSizeWidget::on_m_Sigma_SizeDistribution_textChanged(const QS { return; } - emit dataChanged(); + Q_EMIT dataChanged(); } // ----------------------------------------------------------------------------- @@ -465,7 +465,7 @@ void StatsGenFeatureSizeWidget::on_m_MinSigmaCutOff_textChanged(const QString& t { return; } - emit dataChanged(); + Q_EMIT dataChanged(); } // ----------------------------------------------------------------------------- @@ -487,7 +487,7 @@ void StatsGenFeatureSizeWidget::on_m_MaxSigmaCutOff_textChanged(const QString& t { return; } - emit dataChanged(); + Q_EMIT dataChanged(); } // ----------------------------------------------------------------------------- @@ -508,7 +508,7 @@ void StatsGenFeatureSizeWidget::on_m_BinStepSize_valueChanged(double v) { return; } - emit dataChanged(); + Q_EMIT dataChanged(); } // ----------------------------------------------------------------------------- diff --git a/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenFeatureSizeWidget.h b/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenFeatureSizeWidget.h index 41f6437c30..60ff61867a 100644 --- a/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenFeatureSizeWidget.h +++ b/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenFeatureSizeWidget.h @@ -192,7 +192,7 @@ class StatsGenFeatureSizeWidget : public QWidget, private Ui::StatsGenFeatureSiz } } -signals: +Q_SIGNALS: void userEnteredValidData(bool); @@ -226,7 +226,7 @@ class StatsGenFeatureSizeWidget : public QWidget, private Ui::StatsGenFeatureSiz */ void mousePressEvent(QMouseEvent* event) override; -protected slots: +protected Q_SLOTS: void on_m_Mu_SizeDistribution_textChanged(const QString& text); void on_m_Sigma_SizeDistribution_textChanged(const QString& text); diff --git a/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenMDFWidget.cpp b/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenMDFWidget.cpp index b9d7f3fa3c..343711bd3d 100644 --- a/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenMDFWidget.cpp +++ b/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenMDFWidget.cpp @@ -271,7 +271,7 @@ void StatsGenMDFWidget::updatePlots() updateMDFPlot(odf); - emit dataChanged(); + Q_EMIT dataChanged(); } // ----------------------------------------------------------------------------- diff --git a/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenMDFWidget.h b/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenMDFWidget.h index e18ec3bad3..850b895079 100644 --- a/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenMDFWidget.h +++ b/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenMDFWidget.h @@ -120,10 +120,10 @@ class StatsGenMDFWidget : public QWidget, private Ui::StatsGenMDFWidget SGMDFTableModel* tableModel(); -public slots: +public Q_SLOTS: void updatePlots(); -protected slots: +protected Q_SLOTS: void on_addMDFRowBtn_clicked(); void on_deleteMDFRowBtn_clicked(); void on_m_MDFUpdateBtn_clicked(); @@ -131,7 +131,7 @@ protected slots: void tableDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight); -signals: +Q_SIGNALS: void dataChanged(); protected: diff --git a/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenODFWidget.cpp b/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenODFWidget.cpp index 18a4e47d4e..03d17234c7 100644 --- a/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenODFWidget.cpp +++ b/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenODFWidget.cpp @@ -119,8 +119,8 @@ void StatsGenODFWidget::on_m_WeightSpreads_clicked(bool /* checked */) m_ODFTableView->setModel(m_ODFTableModel); QAbstractItemDelegate* idelegate = m_ODFTableModel->getItemDelegate(); m_ODFTableView->setItemDelegate(idelegate); - emit bulkLoadEvent(false); - emit dataChanged(); + Q_EMIT bulkLoadEvent(false); + Q_EMIT dataChanged(); } // ----------------------------------------------------------------------------- @@ -132,8 +132,8 @@ void StatsGenODFWidget::on_m_WeightSpreadsBulkLoad_clicked(bool /* checked */) m_ODFTableView->setModel(m_OdfBulkTableModel); QAbstractItemDelegate* idelegate = m_OdfBulkTableModel->getItemDelegate(); m_ODFTableView->setItemDelegate(idelegate); - emit bulkLoadEvent(!(m_OdfBulkTableModel->rowCount() > 0)); - emit dataChanged(); + Q_EMIT bulkLoadEvent(!(m_OdfBulkTableModel->rowCount() > 0)); + Q_EMIT dataChanged(); } // ----------------------------------------------------------------------------- @@ -491,7 +491,7 @@ void StatsGenODFWidget::updatePlots() calculateODF(); m_AbortUpdate = true; updatePFStatus(QString("")); - emit odfDataChanged(); + Q_EMIT odfDataChanged(); } // ----------------------------------------------------------------------------- @@ -629,7 +629,7 @@ void StatsGenODFWidget::calculateODF() m_PoleFigureLabel->setPixmap(QPixmap::fromImage(image)); delete progressDialog; - emit dataChanged(); + Q_EMIT dataChanged(); } // ----------------------------------------------------------------------------- @@ -691,7 +691,7 @@ void StatsGenODFWidget::on_selectAnglesFile_clicked() void StatsGenODFWidget::on_angleFilePath_textChanged() { // If the text has changed, we don't know if the file exists/is valid, - // so blow away the bulk table model, if it exists, and emit that + // so blow away the bulk table model, if it exists, and Q_EMIT that // the user needs to select a valid file and reload if(m_OdfBulkTableModel != nullptr) { @@ -702,7 +702,7 @@ void StatsGenODFWidget::on_angleFilePath_textChanged() m_OdfBulkTableModel->setCrystalStructure(m_CrystalStructure); m_OdfBulkTableModel->setInitialValues(); - emit bulkLoadEvent(true); + Q_EMIT bulkLoadEvent(true); updatePlots(); } @@ -714,14 +714,14 @@ void StatsGenODFWidget::on_loadODFTextureBtn_clicked() QString file = angleFilePath->text(); if(file.isEmpty()) { - emit bulkLoadEvent(true); + Q_EMIT bulkLoadEvent(true); return; } QFileInfo fi(angleFilePath->text()); if(!fi.exists()) { - emit bulkLoadEvent(true); + Q_EMIT bulkLoadEvent(true); return; } @@ -741,7 +741,7 @@ void StatsGenODFWidget::on_loadODFTextureBtn_clicked() { QMessageBox::critical(this, "ANG File Loading NOT Supported", "Please use the 'Write StatsGenerator ODF Angle File' filter from DREAM.3D to generate a file. See that filter's help for the proper format.", QMessageBox::Ok); - emit bulkLoadEvent(true); + Q_EMIT bulkLoadEvent(true); return; #if 0 phaseOfInterest->setEnabled(true); @@ -807,7 +807,7 @@ void StatsGenODFWidget::on_loadODFTextureBtn_clicked() { QMessageBox::critical(this, "CTF File Loading not Supported", "Please use the 'Write StatsGenerator ODF Angle File' filter from DREAM.3D to generate a file. See that filter's help for the proper format.", QMessageBox::Ok); - emit bulkLoadEvent(true); + Q_EMIT bulkLoadEvent(true); return; #if 0 phaseOfInterest->setEnabled(true); @@ -901,7 +901,7 @@ void StatsGenODFWidget::on_loadODFTextureBtn_clicked() if(loader->getErrorCode() < 0) { QMessageBox::critical(this, "Error Loading Angle data", loader->getErrorMessage(), QMessageBox::Ok); - emit bulkLoadEvent(true); + Q_EMIT bulkLoadEvent(true); return; } count = data->getNumberOfTuples(); @@ -946,7 +946,7 @@ void StatsGenODFWidget::on_loadODFTextureBtn_clicked() m_OdfBulkTableModel->blockSignals(false); #endif - emit bulkLoadEvent(false); + Q_EMIT bulkLoadEvent(false); on_m_CalculateODFBtn_clicked(); progress.setValue(3); } diff --git a/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenODFWidget.h b/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenODFWidget.h index 5809dc7bfd..13d9d8bdb3 100644 --- a/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenODFWidget.h +++ b/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenODFWidget.h @@ -102,7 +102,7 @@ class StatsGenODFWidget : public QWidget, private Ui::StatsGenAxisODFWidget SIMPL_INSTANCE_PROPERTY(bool, Initializing) -protected slots: +protected Q_SLOTS: void on_m_CalculateODFBtn_clicked(); void on_addODFTextureBtn_clicked(); void on_deleteODFTextureBtn_clicked(); @@ -123,7 +123,7 @@ protected slots: void on_m_PFLambertSize_valueChanged(int i); void updatePFStatus(const QString &msg); -signals: +Q_SIGNALS: void dataChanged(); void bulkLoadEvent(bool fail); void odfDataChanged(); diff --git a/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenPlotWidget.cpp b/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenPlotWidget.cpp index 1e6ae7ed2f..f75c1bddf7 100644 --- a/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenPlotWidget.cpp +++ b/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenPlotWidget.cpp @@ -304,7 +304,7 @@ void StatsGenPlotWidget::resetTableModel() void StatsGenPlotWidget::userCommittedData(QWidget* w) { m_UserUpdatedData = true; - emit dataChanged(); + Q_EMIT dataChanged(); } // ----------------------------------------------------------------------------- diff --git a/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenPlotWidget.h b/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenPlotWidget.h index d29ffd7634..f6c6454d91 100644 --- a/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenPlotWidget.h +++ b/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenPlotWidget.h @@ -104,10 +104,10 @@ class StatsGenPlotWidget : public QWidget, private Ui::StatsGenPlotWidget void setSizeDistributionValues(float mu, float sigma, float minCutOff, float maxCutOff, float binStepSize); -signals: +Q_SIGNALS: void dataChanged(); -public slots: +public Q_SLOTS: void updatePlotCurves(); void userCommittedData(QWidget* w); void highlightCurve(int index); diff --git a/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenRDFWidget.cpp b/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenRDFWidget.cpp index c3249afc86..11e4f518da 100644 --- a/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenRDFWidget.cpp +++ b/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenRDFWidget.cpp @@ -227,7 +227,7 @@ void StatsGenRDFWidget::on_generateRDFBtn_clicked() // Update the Qwt plot with the correct values updateRDFPlot(qFreq); - emit rdfParametersChanged(); + Q_EMIT rdfParametersChanged(); } // ----------------------------------------------------------------------------- diff --git a/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenRDFWidget.h b/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenRDFWidget.h index da9fd81465..ddb390a50a 100644 --- a/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenRDFWidget.h +++ b/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenRDFWidget.h @@ -132,13 +132,13 @@ class StatsGenRDFWidget : public QWidget */ QString getTabTitle(); -protected slots: +protected Q_SLOTS: /** * @brief on_generateRDFBtn_clicked */ void on_generateRDFBtn_clicked(); -signals: +Q_SIGNALS: /** * @brief rdfParametersChanged diff --git a/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenWidget.h b/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenWidget.h index 999e75004e..7b5db83288 100644 --- a/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenWidget.h +++ b/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsGenWidget.h @@ -95,14 +95,14 @@ class StatsGenWidget : public QWidget virtual void generateDefaultData(); - // public slots: + // public Q_SLOTS: // virtual void on_m_GenerateDefaultData_clicked(); - // protected slots: + // protected Q_SLOTS: // virtual void dataWasEdited(); - // signals: + // Q_SIGNALS: // void phaseParametersChanged(); public: diff --git a/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsProgressWidget.h b/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsProgressWidget.h index 36fc38fc33..b3850d68bc 100644 --- a/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsProgressWidget.h +++ b/Source/Plugins/SyntheticBuilding/Gui/Widgets/StatsProgressWidget.h @@ -55,7 +55,7 @@ class StatsProgressWidget : public QWidget ~StatsProgressWidget() override; -public slots: +public Q_SLOTS: /** * @brief setValue diff --git a/Source/Plugins/SyntheticBuilding/Gui/Widgets/TableModels/SGBetaTableModel.cpp b/Source/Plugins/SyntheticBuilding/Gui/Widgets/TableModels/SGBetaTableModel.cpp index 85b5e00a8e..81c4277910 100644 --- a/Source/Plugins/SyntheticBuilding/Gui/Widgets/TableModels/SGBetaTableModel.cpp +++ b/Source/Plugins/SyntheticBuilding/Gui/Widgets/TableModels/SGBetaTableModel.cpp @@ -240,7 +240,7 @@ bool SGBetaTableModel::setData(const QModelIndex& index, const QVariant& value, Q_ASSERT(false); } - emit dataChanged(index, index); + Q_EMIT dataChanged(index, index); return true; } @@ -265,7 +265,7 @@ bool SGBetaTableModel::insertRows(int row, int count, const QModelIndex& index) m_RowCount = m_BinNumbers.count(); } endInsertRows(); - emit dataChanged(index, index); + Q_EMIT dataChanged(index, index); return true; } @@ -288,7 +288,7 @@ bool SGBetaTableModel::removeRows(int row, int count, const QModelIndex& index) m_RowCount = m_BinNumbers.count(); } endRemoveRows(); - emit dataChanged(index, index); + Q_EMIT dataChanged(index, index); return true; } @@ -383,7 +383,7 @@ void SGBetaTableModel::setTableData(QVector bins, QVector> { offset = 0; } - // Now mass insert the data to the table then emit that the data has changed + // Now mass insert the data to the table then Q_EMIT that the data has changed beginInsertRows(QModelIndex(), row, offset); m_BinNumbers = bins; m_Alpha = data[0]; @@ -398,6 +398,6 @@ void SGBetaTableModel::setTableData(QVector bins, QVector> offset = 0; } QModelIndex botRight = createIndex(offset, ColumnCount); - emit dataChanged(topLeft, botRight); + Q_EMIT dataChanged(topLeft, botRight); } } diff --git a/Source/Plugins/SyntheticBuilding/Gui/Widgets/TableModels/SGLogNormalTableModel.cpp b/Source/Plugins/SyntheticBuilding/Gui/Widgets/TableModels/SGLogNormalTableModel.cpp index e1df6bd8f0..3639fb0b5d 100644 --- a/Source/Plugins/SyntheticBuilding/Gui/Widgets/TableModels/SGLogNormalTableModel.cpp +++ b/Source/Plugins/SyntheticBuilding/Gui/Widgets/TableModels/SGLogNormalTableModel.cpp @@ -240,7 +240,7 @@ bool SGLogNormalTableModel::setData(const QModelIndex& index, const QVariant& va Q_ASSERT(false); } - emit dataChanged(index, index); + Q_EMIT dataChanged(index, index); return true; } @@ -264,7 +264,7 @@ bool SGLogNormalTableModel::insertRows(int row, int count, const QModelIndex& in m_RowCount = m_BinNumbers.count(); } endInsertRows(); - emit dataChanged(index, index); + Q_EMIT dataChanged(index, index); return true; } @@ -287,7 +287,7 @@ bool SGLogNormalTableModel::removeRows(int row, int count, const QModelIndex& in m_RowCount = m_BinNumbers.count(); } endRemoveRows(); - emit dataChanged(index, index); + Q_EMIT dataChanged(index, index); return true; } @@ -374,7 +374,7 @@ void SGLogNormalTableModel::setTableData(QVector bins, QVector bins, QVector& angles, const QVector 0) { - // Now mass insert the data to the table then emit that the data has changed + // Now mass insert the data to the table then Q_EMIT that the data has changed beginInsertRows(QModelIndex(), row, row + count - 1); m_Angles = angles; m_Weights = weights; @@ -429,7 +429,7 @@ void SGMDFTableModel::setTableData(const QVector& angles, const QVector e1, QVector e2, QVector QModelIndex botRight; if(count >= 1) { - // Now mass insert the data to the table then emit that the data has changed + // Now mass insert the data to the table then Q_EMIT that the data has changed beginInsertRows(QModelIndex(), row, row + count - 1); m_Euler1s = e1; m_Euler2s = e2; @@ -436,7 +436,7 @@ void SGODFTableModel::setTableData(QVector e1, QVector e2, QVector createIndex(0, 0); createIndex(count - 1, ColumnCount); } - emit dataChanged(topLeft, botRight); + Q_EMIT dataChanged(topLeft, botRight); } // ----------------------------------------------------------------------------- diff --git a/Source/Plugins/SyntheticBuilding/Gui/Widgets/TableModels/SGPowerLawTableModel.cpp b/Source/Plugins/SyntheticBuilding/Gui/Widgets/TableModels/SGPowerLawTableModel.cpp index ff5baa1150..292dcd84f7 100644 --- a/Source/Plugins/SyntheticBuilding/Gui/Widgets/TableModels/SGPowerLawTableModel.cpp +++ b/Source/Plugins/SyntheticBuilding/Gui/Widgets/TableModels/SGPowerLawTableModel.cpp @@ -265,7 +265,7 @@ bool SGPowerLawTableModel::setData(const QModelIndex& index, const QVariant& val Q_ASSERT(false); } - emit dataChanged(index, index); + Q_EMIT dataChanged(index, index); return true; } @@ -291,7 +291,7 @@ bool SGPowerLawTableModel::insertRows(int row, int count, const QModelIndex& ind m_RowCount = m_BinNumbers.count(); } endInsertRows(); - emit dataChanged(index, index); + Q_EMIT dataChanged(index, index); return true; } @@ -315,7 +315,7 @@ bool SGPowerLawTableModel::removeRows(int row, int count, const QModelIndex& ind m_RowCount = m_BinNumbers.count(); } endRemoveRows(); - emit dataChanged(index, index); + Q_EMIT dataChanged(index, index); return true; } @@ -412,7 +412,7 @@ void SGPowerLawTableModel::setTableData(QVector bins, QVector bins, QVector freqs) QModelIndex botRight; if(count >= 1) { - // Now mass insert the data to the table then emit that the data has changed + // Now mass insert the data to the table then Q_EMIT that the data has changed beginInsertRows(QModelIndex(), row, row + count - 1); m_Frequencies = freqs; m_RowCount = count; @@ -336,5 +336,5 @@ void SGRDFTableModel::setTableData(QVector freqs) createIndex(0, 0); createIndex(count - 1, ColumnCount); } - emit dataChanged(topLeft, botRight); + Q_EMIT dataChanged(topLeft, botRight); } diff --git a/Source/Plugins/SyntheticBuilding/Gui/Widgets/TextureDialog.h b/Source/Plugins/SyntheticBuilding/Gui/Widgets/TextureDialog.h index 19da5626ad..4089a935d2 100644 --- a/Source/Plugins/SyntheticBuilding/Gui/Widgets/TextureDialog.h +++ b/Source/Plugins/SyntheticBuilding/Gui/Widgets/TextureDialog.h @@ -66,7 +66,7 @@ class TextureDialog : public SVDialog, private Ui::TextureDialog void getODFEntry(float& e1, float& e2, float& e3, float& weight, float& sigma); -protected slots: +protected Q_SLOTS: void on_presetListWidget_itemSelectionChanged(); void on_presetListWidget_itemDoubleClicked(QListWidgetItem* item); diff --git a/Source/Plugins/SyntheticBuilding/Gui/Widgets/TransformationPhaseWidget.cpp b/Source/Plugins/SyntheticBuilding/Gui/Widgets/TransformationPhaseWidget.cpp index ac13da1140..eb91d2ee4e 100644 --- a/Source/Plugins/SyntheticBuilding/Gui/Widgets/TransformationPhaseWidget.cpp +++ b/Source/Plugins/SyntheticBuilding/Gui/Widgets/TransformationPhaseWidget.cpp @@ -496,7 +496,7 @@ void TransformationPhaseWidget::dataWasEdited() // ----------------------------------------------------------------------------- void TransformationPhaseWidget::setWidgetListEnabled(bool b) { - foreach(QWidget* w, m_WidgetList) + Q_FOREACH(QWidget* w, m_WidgetList) { w->setEnabled(b); } @@ -548,7 +548,7 @@ void TransformationPhaseWidget::on_m_GenerateDefaultData_clicked() { setDataHasBeenGenerated(true); updatePlots(); - emit dataChanged(); + Q_EMIT dataChanged(); } // ----------------------------------------------------------------------------- @@ -563,7 +563,7 @@ void TransformationPhaseWidget::on_m_ResetDataBtn_clicked() setDataHasBeenGenerated(true); // Set this boolean to true so that data generation is triggered m_ResetData = true; updatePlots(); // Regenerate all the default data - emit dataChanged(); + Q_EMIT dataChanged(); m_ResetData = false; } @@ -652,7 +652,7 @@ int TransformationPhaseWidget::gatherStatsData(AttributeMatrix::Pointer attrMat, void TransformationPhaseWidget::extractStatsData(AttributeMatrix::Pointer attrMat, int index) { - emit progressText(QString("Primary Phase extracting statistics...")); + Q_EMIT progressText(QString("Primary Phase extracting statistics...")); setWidgetListEnabled(true); setPhaseIndex(index); qApp->processEvents(); @@ -684,7 +684,7 @@ void TransformationPhaseWidget::extractStatsData(AttributeMatrix::Pointer attrMa setPhaseName(phaseName); setTabTitle(phaseName); m_FeatureSizeDistWidget->setCrystalStructure(getCrystalStructure()); - foreach(StatsGenPlotWidget* w, m_SGPlotWidgets) + Q_FOREACH(StatsGenPlotWidget* w, m_SGPlotWidgets) { w->setCrystalStructure(getCrystalStructure()); } @@ -705,7 +705,7 @@ void TransformationPhaseWidget::extractStatsData(AttributeMatrix::Pointer attrMa } m_FeatureSizeDistWidget->extractStatsData(primaryStatsData.get(), index); - emit progressText(QString("Extracting Size Distribution Values")); + Q_EMIT progressText(QString("Extracting Size Distribution Values")); qApp->processEvents(); float mu = m_FeatureSizeDistWidget->getMu(); @@ -714,19 +714,19 @@ void TransformationPhaseWidget::extractStatsData(AttributeMatrix::Pointer attrMa float maxCutOff = m_FeatureSizeDistWidget->getMaxCutOff(); float binStepSize = m_FeatureSizeDistWidget->getBinStep(); - emit progressText(QString("Extracting Omega 3 Distribution Values")); + Q_EMIT progressText(QString("Extracting Omega 3 Distribution Values")); qApp->processEvents(); m_Omega3Plot->setDistributionType(primaryStatsData->getOmegas_DistType(), false); m_Omega3Plot->extractStatsData(index, qbins, primaryStatsData->getFeatureSize_Omegas()); m_Omega3Plot->setSizeDistributionValues(mu, sigma, minCutOff, maxCutOff, binStepSize); - emit progressText(QString("Extracting B Over a Distribution Values")); + Q_EMIT progressText(QString("Extracting B Over a Distribution Values")); qApp->processEvents(); m_BOverAPlot->setDistributionType(primaryStatsData->getBOverA_DistType(), false); m_BOverAPlot->extractStatsData(index, qbins, primaryStatsData->getFeatureSize_BOverA()); m_BOverAPlot->setSizeDistributionValues(mu, sigma, minCutOff, maxCutOff, binStepSize); - emit progressText(QString("Extracting C Over A Distribution Values")); + Q_EMIT progressText(QString("Extracting C Over A Distribution Values")); qApp->processEvents(); m_COverAPlot->setDistributionType(primaryStatsData->getCOverA_DistType(), false); m_COverAPlot->extractStatsData(index, qbins, primaryStatsData->getFeatureSize_COverA()); @@ -734,24 +734,24 @@ void TransformationPhaseWidget::extractStatsData(AttributeMatrix::Pointer attrMa if(m_NeighborPlot != nullptr) { - emit progressText(QString("Extracting Neighbor Distribution Values")); + Q_EMIT progressText(QString("Extracting Neighbor Distribution Values")); qApp->processEvents(); m_NeighborPlot->setDistributionType(primaryStatsData->getNeighbors_DistType(), false); m_NeighborPlot->extractStatsData(index, qbins, primaryStatsData->getFeatureSize_Neighbors()); m_NeighborPlot->setSizeDistributionValues(mu, sigma, minCutOff, maxCutOff, binStepSize); } - emit progressText(QString("Extracting ODF Distribution Values")); + Q_EMIT progressText(QString("Extracting ODF Distribution Values")); qApp->processEvents(); // Set the ODF Data m_ODFWidget->extractStatsData(index, primaryStatsData.get(), PhaseType::Type::Primary); - emit progressText(QString("Extracting MDF Distribution Values")); + Q_EMIT progressText(QString("Extracting MDF Distribution Values")); qApp->processEvents(); // Set the ODF Data m_MDFWidget->extractStatsData(index, primaryStatsData.get(), PhaseType::Type::Primary); - emit progressText(QString("Extracting Axis ODF Distribution Values")); + Q_EMIT progressText(QString("Extracting Axis ODF Distribution Values")); qApp->processEvents(); // Set the Axis ODF Data m_AxisODFWidget->extractStatsData(index, primaryStatsData.get(), PhaseType::Type::Primary); diff --git a/Source/Plugins/SyntheticBuilding/Gui/Widgets/TransformationPhaseWidget.h b/Source/Plugins/SyntheticBuilding/Gui/Widgets/TransformationPhaseWidget.h index b6015ef9f4..e3ca9baa83 100644 --- a/Source/Plugins/SyntheticBuilding/Gui/Widgets/TransformationPhaseWidget.h +++ b/Source/Plugins/SyntheticBuilding/Gui/Widgets/TransformationPhaseWidget.h @@ -109,7 +109,7 @@ class TransformationPhaseWidget : public StatsGenWidget, private Ui::Transformat void generateDefaultData() override; -protected slots: +protected Q_SLOTS: void on_m_GenerateDefaultData_clicked(); @@ -120,7 +120,7 @@ protected slots: void dataWasEdited(); void bulkLoadEvent(bool fail); -signals: +Q_SIGNALS: void dataChanged(); void progressText(const QString& text); diff --git a/Source/Plugins/SyntheticBuilding/Source/SGApplication.h b/Source/Plugins/SyntheticBuilding/Source/SGApplication.h index a39fcad552..164dcb01c5 100644 --- a/Source/Plugins/SyntheticBuilding/Source/SGApplication.h +++ b/Source/Plugins/SyntheticBuilding/Source/SGApplication.h @@ -57,7 +57,7 @@ class SGApplication : public QApplication QString newTempFile(QString directory); void checkWindowPosition(StatsGeneratorUI* win); -public slots: +public Q_SLOTS: void windowClosed(StatsGeneratorUI* window); private: diff --git a/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/AddBadData.cpp b/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/AddBadData.cpp index 766e0be6ba..6cc6813eb9 100644 --- a/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/AddBadData.cpp +++ b/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/AddBadData.cpp @@ -138,10 +138,10 @@ void AddBadData::dataCheck() void AddBadData::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/AddBadData.h b/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/AddBadData.h index dceaded950..2c5b25fbfb 100644 --- a/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/AddBadData.h +++ b/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/AddBadData.h @@ -140,7 +140,7 @@ class SyntheticBuilding_EXPORT AddBadData : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/AddOrientationNoise.cpp b/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/AddOrientationNoise.cpp index 7ab85e6a2e..f9a57daf80 100644 --- a/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/AddOrientationNoise.cpp +++ b/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/AddOrientationNoise.cpp @@ -119,10 +119,10 @@ void AddOrientationNoise::dataCheck() void AddOrientationNoise::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/AddOrientationNoise.h b/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/AddOrientationNoise.h index 2190375111..9408c6c8dd 100644 --- a/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/AddOrientationNoise.h +++ b/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/AddOrientationNoise.h @@ -128,7 +128,7 @@ class SyntheticBuilding_EXPORT AddOrientationNoise : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/EstablishMatrixPhase.cpp b/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/EstablishMatrixPhase.cpp index eabbb2e3d3..fc7773d701 100644 --- a/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/EstablishMatrixPhase.cpp +++ b/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/EstablishMatrixPhase.cpp @@ -296,10 +296,10 @@ void EstablishMatrixPhase::dataCheck() void EstablishMatrixPhase::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/EstablishMatrixPhase.h b/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/EstablishMatrixPhase.h index 7e578bb056..d5232adc29 100644 --- a/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/EstablishMatrixPhase.h +++ b/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/EstablishMatrixPhase.h @@ -167,7 +167,7 @@ class SyntheticBuilding_EXPORT EstablishMatrixPhase : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/EstablishShapeTypes.cpp b/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/EstablishShapeTypes.cpp index b0055987e0..e8e3e7c110 100644 --- a/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/EstablishShapeTypes.cpp +++ b/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/EstablishShapeTypes.cpp @@ -155,10 +155,10 @@ void EstablishShapeTypes::dataCheck() void EstablishShapeTypes::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/EstablishShapeTypes.h b/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/EstablishShapeTypes.h index ce84ae4f95..6b05479af2 100644 --- a/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/EstablishShapeTypes.h +++ b/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/EstablishShapeTypes.h @@ -136,7 +136,7 @@ class SyntheticBuilding_EXPORT EstablishShapeTypes : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/GeneratePrecipitateStatsData.cpp b/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/GeneratePrecipitateStatsData.cpp index e24dd7b678..7da63f340b 100644 --- a/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/GeneratePrecipitateStatsData.cpp +++ b/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/GeneratePrecipitateStatsData.cpp @@ -362,10 +362,10 @@ void GeneratePrecipitateStatsData::preflight() { // These are the REQUIRED lines of CODE to make sure the filter behaves correctly setInPreflight(true); // Set the fact that we are preflighting. - emit preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update - emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter + Q_EMIT preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update + Q_EMIT updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter dataCheck(); // Run our DataCheck to make sure everthing is setup correctly - emit preflightExecuted(); // We are done preflighting this filter + Q_EMIT preflightExecuted(); // We are done preflighting this filter setInPreflight(false); // Inform the system this filter is NOT in preflight mode anymore. } diff --git a/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/GeneratePrecipitateStatsData.h b/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/GeneratePrecipitateStatsData.h index f4ff1cd5fe..f82a6ecab3 100644 --- a/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/GeneratePrecipitateStatsData.h +++ b/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/GeneratePrecipitateStatsData.h @@ -182,7 +182,7 @@ class SyntheticBuilding_EXPORT GeneratePrecipitateStatsData : public AbstractFil */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/GeneratePrimaryStatsData.cpp b/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/GeneratePrimaryStatsData.cpp index d79bcc4ec3..ed4072c7b6 100644 --- a/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/GeneratePrimaryStatsData.cpp +++ b/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/GeneratePrimaryStatsData.cpp @@ -352,10 +352,10 @@ void GeneratePrimaryStatsData::preflight() { // These are the REQUIRED lines of CODE to make sure the filter behaves correctly setInPreflight(true); // Set the fact that we are preflighting. - emit preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update - emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter + Q_EMIT preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update + Q_EMIT updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter dataCheck(); // Run our DataCheck to make sure everthing is setup correctly - emit preflightExecuted(); // We are done preflighting this filter + Q_EMIT preflightExecuted(); // We are done preflighting this filter setInPreflight(false); // Inform the system this filter is NOT in preflight mode anymore. } diff --git a/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/GeneratePrimaryStatsData.h b/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/GeneratePrimaryStatsData.h index 4d508cca62..b4f50a6ea2 100644 --- a/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/GeneratePrimaryStatsData.h +++ b/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/GeneratePrimaryStatsData.h @@ -168,7 +168,7 @@ class SyntheticBuilding_EXPORT GeneratePrimaryStatsData : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/InitializeSyntheticVolume.cpp b/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/InitializeSyntheticVolume.cpp index 6a92926493..f73480871c 100644 --- a/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/InitializeSyntheticVolume.cpp +++ b/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/InitializeSyntheticVolume.cpp @@ -241,10 +241,10 @@ void InitializeSyntheticVolume::dataCheck() void InitializeSyntheticVolume::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/InitializeSyntheticVolume.h b/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/InitializeSyntheticVolume.h index 51f031083a..65e6953860 100644 --- a/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/InitializeSyntheticVolume.h +++ b/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/InitializeSyntheticVolume.h @@ -170,7 +170,7 @@ class SyntheticBuilding_EXPORT InitializeSyntheticVolume : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/InsertAtoms.cpp b/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/InsertAtoms.cpp index 783eb588d6..6af7c8c5a5 100644 --- a/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/InsertAtoms.cpp +++ b/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/InsertAtoms.cpp @@ -39,7 +39,6 @@ #include #include #include -#include #endif #include "SIMPLib/Common/Constants.h" @@ -454,10 +453,10 @@ void InsertAtoms::dataCheck() void InsertAtoms::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } @@ -580,8 +579,7 @@ void InsertAtoms::execute() SIMPL_RANDOMNG_NEW() #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; #endif // pull down faces diff --git a/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/InsertAtoms.h b/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/InsertAtoms.h index 21f6d0bfef..38102ee154 100644 --- a/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/InsertAtoms.h +++ b/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/InsertAtoms.h @@ -149,7 +149,7 @@ class SyntheticBuilding_EXPORT InsertAtoms : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/InsertPrecipitatePhases.cpp b/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/InsertPrecipitatePhases.cpp index 73c14b42a9..8e812c2fc8 100644 --- a/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/InsertPrecipitatePhases.cpp +++ b/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/InsertPrecipitatePhases.cpp @@ -590,10 +590,10 @@ void InsertPrecipitatePhases::dataCheck() void InsertPrecipitatePhases::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); AttributeMatrix::Pointer attrMat = getDataContainerArray()->getAttributeMatrix(getFeaturePhasesArrayPath()); if(attrMat == nullptr) @@ -3005,7 +3005,7 @@ void InsertPrecipitatePhases::moveShapeDescriptions() AttributeMatrix::Pointer cellFeatureAttrMat = getDataContainerArray()->getAttributeMatrix(getFeaturePhasesArrayPath()); QList attrArrays; - foreach(const QString name, names) + Q_FOREACH(const QString name, names) { IDataArray::Pointer arrayPtr = cellFeatureAttrMat->removeAttributeArray(name); if(arrayPtr != IDataArray::NullPointer()) @@ -3043,7 +3043,7 @@ void InsertPrecipitatePhases::saveToNewAttributeMatrix(QListresizeAttributeArrays(tDims); } - foreach(IDataArray::Pointer incomingArray, incomingArrays) + Q_FOREACH(IDataArray::Pointer incomingArray, incomingArrays) { newAM->addAttributeArray(incomingArray->getName(), incomingArray); } @@ -3068,7 +3068,7 @@ void InsertPrecipitatePhases::appendToExistingAttributeMatrix(QListresizeAttributeArrays(tDims); } - foreach(IDataArray::Pointer incomingArray, incomingArrays) + Q_FOREACH(IDataArray::Pointer incomingArray, incomingArrays) { int err = 0; IDataArray::Pointer existingArray = existingAM->getPrereqIDataArray(this, incomingArray->getName(), err); diff --git a/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/InsertPrecipitatePhases.h b/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/InsertPrecipitatePhases.h index 648eba9b27..f05ff5a5ae 100644 --- a/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/InsertPrecipitatePhases.h +++ b/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/InsertPrecipitatePhases.h @@ -256,7 +256,7 @@ class SyntheticBuilding_EXPORT InsertPrecipitatePhases : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/JumbleOrientations.cpp b/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/JumbleOrientations.cpp index 68cd2e9d33..4dc72be7bf 100644 --- a/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/JumbleOrientations.cpp +++ b/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/JumbleOrientations.cpp @@ -177,10 +177,10 @@ void JumbleOrientations::dataCheck() void JumbleOrientations::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/JumbleOrientations.h b/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/JumbleOrientations.h index f8b08e6c98..2c2f55e8ea 100644 --- a/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/JumbleOrientations.h +++ b/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/JumbleOrientations.h @@ -140,7 +140,7 @@ class SyntheticBuilding_EXPORT JumbleOrientations : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/MatchCrystallography.cpp b/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/MatchCrystallography.cpp index 2328ae4981..b8d65f21f0 100644 --- a/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/MatchCrystallography.cpp +++ b/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/MatchCrystallography.cpp @@ -339,10 +339,10 @@ void MatchCrystallography::dataCheck() void MatchCrystallography::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); setInPreflight(false); } diff --git a/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/MatchCrystallography.h b/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/MatchCrystallography.h index 797e6f5a25..50de7d4837 100644 --- a/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/MatchCrystallography.h +++ b/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/MatchCrystallography.h @@ -185,7 +185,7 @@ class SyntheticBuilding_EXPORT MatchCrystallography : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/PackPrimaryPhases.cpp b/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/PackPrimaryPhases.cpp index 70eccc5238..d0353d03bd 100644 --- a/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/PackPrimaryPhases.cpp +++ b/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/PackPrimaryPhases.cpp @@ -41,7 +41,6 @@ #include #include #include -#include #endif #include @@ -806,10 +805,10 @@ void PackPrimaryPhases::dataCheck() void PackPrimaryPhases::preflight() { setInPreflight(true); - emit preflightAboutToExecute(); - emit updateFilterParameters(this); + Q_EMIT preflightAboutToExecute(); + Q_EMIT updateFilterParameters(this); dataCheck(); - emit preflightExecuted(); + Q_EMIT preflightExecuted(); DataContainer::Pointer dc = getDataContainerArray()->getDataContainer(getOutputCellAttributeMatrixPath()); if(dc == nullptr) @@ -2636,8 +2635,7 @@ void PackPrimaryPhases::assignVoxels() }; #ifdef SIMPL_USE_PARALLEL_ALGORITHMS - tbb::task_scheduler_init init; - bool doParallel = true; + bool doParallel = true; #endif int64_t column = 0, row = 0, plane = 0; @@ -3480,7 +3478,7 @@ void PackPrimaryPhases::moveShapeDescriptions() QVector tDims(1, 0); QList attrArrays; - foreach(const QString name, names) + Q_FOREACH(const QString name, names) { IDataArray::Pointer arrayPtr = cellFeatureAttrMat->removeAttributeArray(name); if(arrayPtr != IDataArray::NullPointer()) @@ -3503,7 +3501,7 @@ void PackPrimaryPhases::moveShapeDescriptions() newAM->resizeAttributeArrays(tDims); } - foreach(IDataArray::Pointer incomingArray, attrArrays) + Q_FOREACH(IDataArray::Pointer incomingArray, attrArrays) { newAM->addAttributeArray(incomingArray->getName(), incomingArray); } @@ -3522,7 +3520,7 @@ void PackPrimaryPhases::moveShapeDescriptions() existingAM->resizeAttributeArrays(tDims); } - foreach(IDataArray::Pointer incomingArray, attrArrays) + Q_FOREACH(IDataArray::Pointer incomingArray, attrArrays) { int err = 0; IDataArray::Pointer existingArray = existingAM->getPrereqIDataArray(this, incomingArray->getName(), err); diff --git a/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/PackPrimaryPhases.h b/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/PackPrimaryPhases.h index 54e684d2de..5dfba666ff 100644 --- a/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/PackPrimaryPhases.h +++ b/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/PackPrimaryPhases.h @@ -240,7 +240,7 @@ class SyntheticBuilding_EXPORT PackPrimaryPhases : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/StatsGeneratorFilter.cpp b/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/StatsGeneratorFilter.cpp index 4afab89fa6..b47105583f 100644 --- a/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/StatsGeneratorFilter.cpp +++ b/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/StatsGeneratorFilter.cpp @@ -286,10 +286,10 @@ void StatsGeneratorFilter::preflight() { // These are the REQUIRED lines of CODE to make sure the filter behaves correctly setInPreflight(true); // Set the fact that we are preflighting. - emit preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update - emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter + Q_EMIT preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update + Q_EMIT updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter dataCheck(); // Run our DataCheck to make sure everthing is setup correctly - emit preflightExecuted(); // We are done preflighting this filter + Q_EMIT preflightExecuted(); // We are done preflighting this filter setInPreflight(false); // Inform the system this filter is NOT in preflight mode anymore. } diff --git a/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/StatsGeneratorFilter.h b/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/StatsGeneratorFilter.h index 449002836e..e2ed4e9dda 100644 --- a/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/StatsGeneratorFilter.h +++ b/Source/Plugins/SyntheticBuilding/SyntheticBuildingFilters/StatsGeneratorFilter.h @@ -179,7 +179,7 @@ class SyntheticBuilding_EXPORT StatsGeneratorFilter : public AbstractFilter */ void preflight() override; -signals: +Q_SIGNALS: /** * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters * be pushed from a user-facing control (such as a widget) diff --git a/Test/PreFlightTest.cpp b/Test/PreFlightTest.cpp index 0f680aef20..473158cde3 100644 --- a/Test/PreFlightTest.cpp +++ b/Test/PreFlightTest.cpp @@ -321,15 +321,15 @@ void verifyPreflightEmitsProperly() QTextStream ss(&buf); if(p.m_beforePreflight == false) { - ss << filter->getNameOfClass() << " Missing emit preflightAboutToExecute()"; + ss << filter->getNameOfClass() << " Missing Q_EMIT preflightAboutToExecute()"; } if(p.m_afterPreflight == false) { - ss << filter->getNameOfClass() << " Missing emit preflightExecuted()"; + ss << filter->getNameOfClass() << " Missing Q_EMIT preflightExecuted()"; } if(p.m_filterNeedsInputParameters == false) { - ss << filter->getNameOfClass() << " Missing emit updateFilterParameters()"; + ss << filter->getNameOfClass() << " Missing Q_EMIT updateFilterParameters()"; } if(filter->getInPreflight() == true) { @@ -464,7 +464,7 @@ void TestUncategorizedFilterParameters() if(filter.get() != nullptr) { QVector parameters = filter->getFilterParameters(); - foreach(FilterParameter::Pointer fp, parameters) + Q_FOREACH(FilterParameter::Pointer fp, parameters) { if(fp->getCategory() == FilterParameter::Uncategorized) { diff --git a/Test/PreflightVerify.h b/Test/PreflightVerify.h index abcfdbc51a..b6fcc437a4 100644 --- a/Test/PreflightVerify.h +++ b/Test/PreflightVerify.h @@ -23,7 +23,7 @@ class PreflightVerify : public QObject bool m_filterNeedsInputParameters; - public slots: + public Q_SLOTS: void widgetChanged(const QString& msg); void beforePreflight(); void afterPreflight(); diff --git a/Tools/SandboxTool.cpp b/Tools/SandboxTool.cpp index a3357c108f..08f786543a 100644 --- a/Tools/SandboxTool.cpp +++ b/Tools/SandboxTool.cpp @@ -135,14 +135,14 @@ template void RecursiveFileSearch(const QDir& currentDir, const QSt QFileInfoList dirList = currentDir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot); if(!dirList.isEmpty()) { - foreach(QFileInfo fi, dirList) + Q_FOREACH(QFileInfo fi, dirList) { RecursiveFileSearch(QDir(fi.absoluteFilePath()), filters); // Recursive call } } QFileInfoList itemList = currentDir.entryInfoList(filters); - foreach(QFileInfo itemInfo, itemList) + Q_FOREACH(QFileInfo itemInfo, itemList) { QString headerFilePath = itemInfo.absoluteFilePath(); T()(headerFilePath); diff --git a/Tools/Unused/ExamplePipelineCoverage.cpp b/Tools/Unused/ExamplePipelineCoverage.cpp index d470f5687a..21258baabc 100644 --- a/Tools/Unused/ExamplePipelineCoverage.cpp +++ b/Tools/Unused/ExamplePipelineCoverage.cpp @@ -253,14 +253,14 @@ class AnalyzePrebuiltPipelines QFileInfoList dirList = currentDir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot); if(dirList.size() > 0) { - foreach(QFileInfo fi, dirList) + Q_FOREACH(QFileInfo fi, dirList) { recursiveDirFind(QDir(fi.absoluteFilePath())); // Recursive call } } QFileInfoList itemList = currentDir.entryInfoList(fileFilters); - foreach(QFileInfo itemInfo, itemList) + Q_FOREACH(QFileInfo itemInfo, itemList) { QString itemFilePath = itemInfo.absoluteFilePath(); // std::cout << "PIPELINE FILE: " << itemFilePath.toStdString() << std::endl;