3-dimensional GLCM

CMakeLists.txt

@@ -130,7 +130,6 @@ set(CMAKE_CXX_FLAGS_RELEASE "-O2")
 #== GTest 
 option(RUN_GTEST "Downloads google unit test API and runs google test scripts to test Nyxus" OFF)
 
-
 #==== Source files
 set(SOURCE
 	src/nyx/arrow_output_stream.cpp
@@ -166,6 +165,8 @@ set(SOURCE
 	src/nyx/features/2d_geomoments_basic_nt.cpp
 	src/nyx/features/3d_intensity.cpp
 	src/nyx/features/3d_gldzm.cpp
+	src/nyx/features/3d_glcm.cpp
+	src/nyx/features/3d_glcm_nontriv.cpp
 	src/nyx/features/intensity.cpp
 	src/nyx/features/neighbors.cpp
 	src/nyx/features/ngldm.cpp

src/nyx/env_features.cpp

@@ -32,6 +32,7 @@
 #include "features/neighbors.h"
 #include "features/ngldm.h"
 #include "features/ngtdm.h"
+#include "features/3d_glcm.h"
 #include "features/roi_radius.h"
 #include "helpers/helpers.h"
 #include "helpers/system_resource.h"
@@ -437,6 +438,14 @@ bool Environment::expand_3D_featuregroup (const std::string& s)
 		return true;
 	}
 
+	if (s == Nyxus::theFeatureSet.findGroupNameByCode(Fgroup3D::FG3_GLCM))
+	{
+		theFeatureSet.enableAll (false);
+
+		theFeatureSet.enableFeatures (D3_GLCM_feature::featureset);
+		return true;
+	}
+
 	if (s == Nyxus::theFeatureSet.findGroupNameByCode(Fgroup3D::FG3_GLDZM))
 	{
 		theFeatureSet.enableAll(false);
@@ -467,8 +476,6 @@ bool Environment::expand_3D_featuregroup (const std::string& s)
 		return true;
 	}
 
-
-
 	return false;
 }
 

src/nyx/environment.cpp

@@ -801,7 +801,7 @@ bool Environment::parse_cmdline(int argc, char** argv)
 	}
 
 	// -- check if any feature is enablesd as a result of expanding user's choice
-	if (theFeatureSet.numOfEnabled() == 0)
+	if (theFeatureSet.numOfEnabled(dim()) == 0)
 	{
 		std::cerr << "Error: no features are selected. Stopping \n";
 		return false;

src/nyx/feature_mgr_init.cpp

@@ -29,6 +29,7 @@
 #include "features/zernike.h"
 
 #include "features/3d_intensity.h"
+#include "features/3d_glcm.h"
 #include "features/3d_gldzm.h"
 
 #include "features/focus_score.h"
@@ -71,6 +72,7 @@ FeatureManager::FeatureManager()
 	register_feature (new RadialDistributionFeature());
 	// 3D
 	register_feature (new D3_PixelIntensityFeatures());
+	register_feature (new D3_GLCM_feature());
 	register_feature (new D3_GLDZM_feature());
 
 	// image quality