initial

Author: friskluft

CMakeLists.txt

@@ -164,8 +164,9 @@ set(SOURCE
 	src/nyx/features/2d_geomoments.cpp
 	src/nyx/features/2d_geomoments_basic.cpp
 	src/nyx/features/2d_geomoments_basic_nt.cpp
+	src/nyx/features/3d_intensity.cpp
+	src/nyx/features/3d_gldzm.cpp
 	src/nyx/features/intensity.cpp
-	src/nyx/features/intensity_3d.cpp
 	src/nyx/features/neighbors.cpp
 	src/nyx/features/ngldm.cpp
 	src/nyx/features/ngtdm.cpp

src/nyx/env_features.cpp

@@ -469,6 +469,38 @@ bool Environment::expand_3D_featuregroup (const std::string& s)
 		return true;
 	}
 
+	if (s == Nyxus::theFeatureSet.findGroupNameByCode(Fgroup3D::FG3_GLDZM))
+	{
+		theFeatureSet.enableAll(false);
+
+		auto F =
+		{
+			Feature3D::GLDZM_SDE,
+			Feature3D::GLDZM_LDE,
+			Feature3D::GLDZM_LGLZE,
+			Feature3D::GLDZM_HGLZE,
+			Feature3D::GLDZM_SDLGLE,
+			Feature3D::GLDZM_SDHGLE,
+			Feature3D::GLDZM_LDLGLE,
+			Feature3D::GLDZM_LDHGLE,
+			Feature3D::GLDZM_GLNU,
+			Feature3D::GLDZM_GLNUN,
+			Feature3D::GLDZM_ZDNU,
+			Feature3D::GLDZM_ZDNUN,
+			Feature3D::GLDZM_ZP,
+			Feature3D::GLDZM_GLM,
+			Feature3D::GLDZM_GLV,
+			Feature3D::GLDZM_ZDM,
+			Feature3D::GLDZM_ZDV,
+			Feature3D::GLDZM_ZDE
+		};
+
+		theFeatureSet.enableFeatures(F);
+		return true;
+	}
+
+
+
 	return false;
 }
 

src/nyx/feature_mgr_init.cpp

@@ -22,19 +22,23 @@
 #include "features/ngtdm.h"
 #include "features/2d_geomoments.h"
 #include "features/intensity.h"
-#include "features/intensity_3d.h"
 #include "features/moments.h"
 #include "features/neighbors.h"
 #include "features/caliper.h"
 #include "features/roi_radius.h"
 #include "features/zernike.h"
+
+#include "features/3d_intensity.h"
+#include "features/3d_gldzm.h"
+
 #include "features/focus_score.h"
 #include "features/power_spectrum.h"
 #include "features/saturation.h"
 #include "features/sharpness.h"
 
 FeatureManager::FeatureManager()
 {
+	// 2D
 	register_feature (new PixelIntensityFeatures());
 	register_feature (new BasicMorphologyFeatures());
 	register_feature (new NeighborsFeature());
@@ -65,7 +69,11 @@ FeatureManager::FeatureManager()
 	register_feature (new GaborFeature());
 	register_feature (new ZernikeFeature());
 	register_feature (new RadialDistributionFeature());
-	register_feature (new PixelIntensityFeatures_3D());
+	// 3D
+	register_feature (new D3_PixelIntensityFeatures());
+	register_feature (new D3_GLDZM_feature());
+
+	// image quality
 	register_feature (new FocusScoreFeature());
 	register_feature (new PowerSpectrumFeature());
 	register_feature (new SaturationFeature());