Moved BinaryThresholding to new Thresholding folder

Author: smistad

source/FAST/Algorithms/IntensityNormalization/ZeroMeanUnitVariance.cpp

@@ -21,7 +21,7 @@ void ZeroMeanUnitVariance::execute() {
 	if(m_perChannel && input->getNrOfChannels() > 1) {
 	    for(int c = 0; c < input->getNrOfChannels(); ++c) {
             // TODO this can be improved by not using ImageChannelConverter, and instead upgrade to
-            //  calculateAverageIntensity functions to support per channel
+            //  calculateAverageIntensity functions to support per channel. Or implement a ChannelSplitter?
 	        std::vector<int> channelsToRemove;
 	        for(int i = 0; i < input->getNrOfChannels(); ++i) {
 	            if(i != c)
@@ -32,7 +32,6 @@ void ZeroMeanUnitVariance::execute() {
 	                ->runAndGetOutputData<Image>();
 	        average[c] = channelImage->calculateAverageIntensity();
 	        standardDeviation[c] = channelImage->calculateStandardDeviationIntensity();
-	        std::cout << "normalizing: " << average[c] << " " << standardDeviation[c] << std::endl;
 	    }
 	} else {
 	    float avg = input->calculateAverageIntensity();

source/FAST/Algorithms/LevelSet/LevelSetSegmentation.cpp

@@ -1,6 +1,6 @@
 #include "LevelSetSegmentation.hpp"
 #include "FAST/Data/Image.hpp"
-#include "FAST/Algorithms/BinaryThresholding/BinaryThresholding.hpp"
+#include "FAST/Algorithms/Thresholding/BinaryThresholding.hpp"
 
 namespace fast {
 

source/FAST/Algorithms/LungSegmentation/LungSegmentation.cpp

@@ -1,10 +1,9 @@
 #include <unordered_set>
 #include <stack>
-#include <FAST/Algorithms/BinaryThresholding/BinaryThresholding.hpp>
+#include <FAST/Algorithms/Thresholding/BinaryThresholding.hpp>
 #include "LungSegmentation.hpp"
 #include "FAST/Data/Image.hpp"
 #include "FAST/Algorithms/SeededRegionGrowing/SeededRegionGrowing.hpp"
-#include "FAST/Algorithms/BinaryThresholding/BinaryThresholding.hpp"
 #include "FAST/Algorithms/AirwaySegmentation/AirwaySegmentation.hpp"
 #include "FAST/Algorithms/ImageInverter/ImageInverter.hpp"
 #include "FAST/Algorithms/ImageMultiply/ImageMultiply.hpp"

source/FAST/Algorithms/Region/Tests.cpp

@@ -1,7 +1,7 @@
 #include "RegionProperties.hpp"
 #include <FAST/Testing.hpp>
 #include <FAST/Importers/ImageFileImporter.hpp>
-#include <FAST/Algorithms/BinaryThresholding/BinaryThresholding.hpp>
+#include <FAST/Algorithms/Thresholding/BinaryThresholding.hpp>
 
 using namespace fast;
 

source/FAST/Algorithms/Skeletonization/SkeletonizationTests.cpp

@@ -3,7 +3,7 @@
 #include "FAST/Importers/ImageImporter.hpp"
 #include "FAST/Visualization/ImageRenderer/ImageRenderer.hpp"
 #include "FAST/Visualization/SimpleWindow.hpp"
-#include "FAST/Algorithms/BinaryThresholding/BinaryThresholding.hpp"
+#include "FAST/Algorithms/Thresholding/BinaryThresholding.hpp"
 
 using namespace fast;
 

source/FAST/Algorithms/TemporalSmoothing/Tests.cpp

@@ -2,7 +2,7 @@
 #include <FAST/Streamers/ImageFileStreamer.hpp>
 #include <FAST/Visualization/SimpleWindow.hpp>
 #include <FAST/Visualization/ImageRenderer/ImageRenderer.hpp>
-#include <FAST/Algorithms/BinaryThresholding/BinaryThresholding.hpp>
+#include <FAST/Algorithms/Thresholding/BinaryThresholding.hpp>
 #include "ImageWeightedMovingAverage.hpp"
 
 using namespace fast;

…inaryThresholding/BinaryThresholding.cpp …thms/Thresholding/BinaryThresholding.cppsource/FAST/Algorithms/BinaryThresholding/BinaryThresholding.cpp renamed to source/FAST/Algorithms/Thresholding/BinaryThresholding.cpp source/FAST/Algorithms/BinaryThresholding/BinaryThresholding.cpp renamed to source/FAST/Algorithms/Thresholding/BinaryThresholding.cpp

@@ -29,8 +29,8 @@ BinaryThresholding::BinaryThresholding() {
     mUpperThresholdSet = false;
     createInputPort<Image>(0);
     createOutputPort<Image>(0);
-    createOpenCLProgram(Config::getKernelSourcePath() + "Algorithms/BinaryThresholding/BinaryThresholding3D.cl", "3D");
-    createOpenCLProgram(Config::getKernelSourcePath() + "Algorithms/BinaryThresholding/BinaryThresholding2D.cl", "2D");
+    createOpenCLProgram(Config::getKernelSourcePath() + "Algorithms/Thresholding/BinaryThresholding3D.cl", "3D");
+    createOpenCLProgram(Config::getKernelSourcePath() + "Algorithms/Thresholding/BinaryThresholding2D.cl", "2D");
 
     createFloatAttribute("lower-threshold", "Lower threshold", "Lower intensity threshold", std::nanf(""));
     createFloatAttribute("upper-threshold", "Upper threshold", "Upper intensity threshold", std::nanf(""));