Added AssignSubsetsByVolumeAspectRatio (only for tetrahedra currently)

Author: sreiter

promesh_plugin.cpp

@@ -75,10 +75,14 @@ static void RegisterMisc(ProMeshRegistry& reg, string baseGrp)
 			"mesh # projection normal || value=[0,0,1]", TOOLTIP_PROJECTED_DISTANCE);
 
 	grp = baseGrp + string("/Info/Qualities");
-	reg.add_function("PrintFaceAspectRatios", &PrintFaceAspectRatios, grp, "",
+	reg.add_function("PrintFaceAspectRatios", &PrintAspectRatios<Face>, grp, "",
 			"mesh", TOOLTIP_PRINT_FACE_ASPECT_RATIOS)
-		.add_function("PrintFaceAspectRatioHistogram", &PrintFaceAspectRatioHistogram, grp, "",
-			"mesh # histogram sections || min=1; value=10", TOOLTIP_PRINT_FACE_ASPECT_RATIO_HISTOGRAM);
+		.add_function("PrintVolumeAspectRatios", &PrintAspectRatios<Volume>, grp, "",
+			"mesh", TOOLTIP_PRINT_VOLUME_ASPECT_RATIOS)
+		.add_function("PrintFaceAspectRatioHistogram", &PrintAspectRatioHistogram<Face>, grp, "",
+			"mesh # histogram sections || min=1; value=10", TOOLTIP_PRINT_FACE_ASPECT_RATIO_HISTOGRAM)
+		.add_function("PrintVolumeAspectRatioHistogram", &PrintAspectRatioHistogram<Volume>, grp, "",
+			"mesh # histogram sections || min=1; value=10", TOOLTIP_PRINT_VOLUME_ASPECT_RATIO_HISTOGRAM);
 
 	grp = baseGrp + string("/Info/Measure length, area, volume");
 	reg.add_function("MeasureGridLength", &MeasureGridLength, grp, "length",

register_selection_tools.cpp

@@ -199,10 +199,26 @@ void RegisterSelectionTools(ProMeshRegistry& reg, string baseGrp)
 
 			.add_function("SelectInterfaceFaces", &SelectInterfaceElements<Face>, grp, "",
 				"mesh # regard selected neighbors only", TOOLTIP_SELECT_INTERFACE_ELEMENTS)
-			.add_function("SelectFacesByNormal", &SelectFacesByNormal, grp, "",
+			
+			.add_function("SelectFacesByNormal",
+			    static_cast<void (*)(Mesh*, const vector3&, number)>(&SelectFacesByNormal),
+			    grp, "",
 				"mesh #"
 				"normal #"
-				"max deviation angle || value=10", TOOLTIP_SELECT_FACES_BY_NORMAL)
+				"max deviation angle || value=10",
+				TOOLTIP_SELECT_FACES_BY_NORMAL,
+				"", RT_NO_PROMESH)
+
+			.add_function("SelectFacesByNormal",
+			    static_cast<void (*)(Mesh*, const vector3&, number, number, bool)>(&SelectFacesByNormal),
+			    grp, "",
+				"mesh #"
+				"normal #"
+				"min deviation angle || value=0 #"
+				"max deviation angle || value=10 #"
+				"ignore inner faces	|| value=true",
+				TOOLTIP_SELECT_FACES_BY_NORMAL)
+
 			.add_function("SelectAnisotropicFaces", &SelectAnisotropicElements<Face>, grp, "",
 				"mesh # min edge ratio || value=0.5D", TOOLTIP_SELECT_ANISOTROPIC_ELEMENTS)
 			.add_function("SelectDegenerateFaces", &SelectDegenerateFaces, grp, "",

register_subset_tools.cpp

@@ -113,7 +113,10 @@ void RegisterSubsetTools(ProMeshRegistry& reg, std::string baseGrp)
 		.add_function("AssignSubsetColors", &AssignSubsetColors, grp, "", "mesh", TOOLTIP_ASSIGN_SUBSET_COLORS)
 		.add_function("AssignSubsetsByElementType", &AssignSubsetsByElementType, grp, "",
 			"mesh", TOOLTIP_ASSIGN_SUBSETS_BY_ELEMENT_TYPE)
-		.add_function("AssignSubsetsByAspectRatio", &AssignSubsetsByAspectRatio, grp, "",
+		.add_function("AssignFaceSubsetsByAspectRatio", &AssignSubsetsByAspectRatio<Face>, grp, "",
+		    "mesh # histogram sections || min=1; value=10 # erase old subsets || value=true",
+		    TOOLTIP_ASSIGN_SUBSETS_BY_ASPECT_RATIO)
+		.add_function("AssignVolumeSubsetsByAspectRatio", &AssignSubsetsByAspectRatio<Volume>, grp, "",
 		    "mesh # histogram sections || min=1; value=10 # erase old subsets || value=true",
 		    TOOLTIP_ASSIGN_SUBSETS_BY_ASPECT_RATIO)
 		.add_function("AssignSubsetsFromRaster", &AssignSubsetsFromRaster, grp, "",

tools/quality_tools.cpp

@@ -37,42 +37,52 @@
 namespace ug {
 namespace promesh {
 
-void PrintFaceAspectRatios (Mesh* msh)
+template <class elem_t>
+void PrintAspectRatios (Mesh* msh)
 {
 	Selector& sel = msh->selector();
 	AspectRatioInfo ari;
-	if(sel.num<Face>() > 0){
-		UG_LOG("Face Aspect Ratios (" << sel.num<Face>() << " faces):\n\n");
-		ari = GetFaceAspectRatioInfo (sel.faces_begin(), sel.faces_end(),
+	if(sel.num<elem_t>() > 0){
+		UG_LOG("Aspect Ratios (" << sel.num<elem_t>() << " "
+		       << GRID_BASE_OBJECT_PLURAL_NAMES[elem_t::BASE_OBJECT_ID] << "):\n\n");
+		ari = GetAspectRatioInfo (sel.begin<elem_t>(), sel.end<elem_t>(),
 									  msh->position_accessor());
 	}
 	else{
 		Grid& g = msh->grid();
-		UG_LOG("Face Aspect Ratios (" << g.num<Face>() << " faces):\n\n");
-		ari = GetFaceAspectRatioInfo (g.faces_begin(), g.faces_end(),
+		UG_LOG("Aspect Ratios (" << g.num<elem_t>() << " "
+		       << GRID_BASE_OBJECT_PLURAL_NAMES[elem_t::BASE_OBJECT_ID] << "):\n\n");
+		ari = GetAspectRatioInfo (g.begin<elem_t>(), g.end<elem_t>(),
 									  msh->position_accessor());
 	}
 
 	UG_LOG(ari.to_string() << std::endl);
 }
 
-void PrintFaceAspectRatioHistogram (Mesh* msh, int numHistoSecs)
+template void PrintAspectRatios <Face> (Mesh*);
+template void PrintAspectRatios <Volume> (Mesh*);
+
+
+template <class elem_t>
+void PrintAspectRatioHistogram (Mesh* msh, int numHistoSecs)
 {
 	if(numHistoSecs < 1){
 		UG_LOG("Can't create histogram with " << numHistoSecs << " sections.\n");
 	}
 
 	Selector& sel = msh->selector();
 	std::vector<int> histo;
-	if(sel.num<Face>() > 0){
-		UG_LOG("Face Aspect Ratio Histogram (" << sel.num<Face>() << " faces):\n\n");
-		GetFaceAspectRatioHistogram (histo, sel.faces_begin(), sel.faces_end(),
+	if(sel.num<elem_t>() > 0){
+		UG_LOG("Aspect Ratio Histogram (" << sel.num<elem_t>() << " "
+		       << GRID_BASE_OBJECT_PLURAL_NAMES[elem_t::BASE_OBJECT_ID] << "):\n\n");
+		GetAspectRatioHistogram (histo, sel.begin<elem_t>(), sel.end<elem_t>(),
 	                             	 numHistoSecs, msh->position_accessor());
 	}
 	else{
 		Grid& g = msh->grid();
-		UG_LOG("Face Aspect Ratio Histogram (" << g.num<Face>() << " faces):\n\n");
-		GetFaceAspectRatioHistogram (histo, g.faces_begin(), g.faces_end(),
+		UG_LOG("Aspect Ratio Histogram (" << g.num<elem_t>() << " "
+		       << GRID_BASE_OBJECT_PLURAL_NAMES[elem_t::BASE_OBJECT_ID] << "):\n\n");
+		GetAspectRatioHistogram (histo, g.begin<elem_t>(), g.end<elem_t>(),
 	                             	 numHistoSecs, msh->position_accessor());
 	}
 
@@ -87,5 +97,7 @@ void PrintFaceAspectRatioHistogram (Mesh* msh, int numHistoSecs)
 	UG_LOG(t.to_string() << std::endl);
 }
 
+template void PrintAspectRatioHistogram <Face> (Mesh* msh, int numHistoSecs);
+template void PrintAspectRatioHistogram <Volume> (Mesh* msh, int numHistoSecs);
 }//	end of namespace
 }//	end of namespace

tools/quality_tools.h

@@ -35,15 +35,19 @@
 
 #include "../mesh.h"
 
-#define TOOLTIP_PRINT_FACE_ASPECT_RATIOS "Prints information on aspect ratios of faces"
-#define TOOLTIP_PRINT_FACE_ASPECT_RATIO_HISTOGRAM "Prints a histogram of face aspect ratios"
+#define TOOLTIP_PRINT_FACE_ASPECT_RATIOS "Prints information on aspect ratios of selected faces"
+#define TOOLTIP_PRINT_VOLUME_ASPECT_RATIOS "Prints information on aspect ratios of selected volumes"
+#define TOOLTIP_PRINT_FACE_ASPECT_RATIO_HISTOGRAM "Prints a histogram of aspect ratios of selected faces"
+#define TOOLTIP_PRINT_VOLUME_ASPECT_RATIO_HISTOGRAM "Prints a histogram of aspect ratios of selected volumes"
 
 namespace ug {
 namespace promesh {
 
-void PrintFaceAspectRatios (Mesh* msh);
+template <class elem_t>
+void PrintAspectRatios (Mesh* msh);
 
-void PrintFaceAspectRatioHistogram (Mesh* msh, int numHistoSecs);
+template <class elem_t>
+void PrintAspectRatioHistogram (Mesh* msh, int numHistoSecs);
 
 }
 }

tools/selection_tools.cpp

@@ -819,6 +819,37 @@ void SelectFacesByNormal(
 	}
 }
 
+
+void SelectFacesByNormal(
+			Mesh* obj,
+			const vector3& refNormal,
+			number minDeviationAngle,
+			number maxDeviationAngle,
+			bool noInnerFaces)
+{
+	number minDot = cos(deg_to_rad(maxDeviationAngle));
+	number maxDot = cos(deg_to_rad(minDeviationAngle));
+
+	Grid& grid = obj->grid();
+	Selector& sel = obj->selector();
+	Grid::AttachmentAccessor<Vertex, APosition> aaPos(grid, aPosition);
+
+	vector3 n;
+	VecNormalize(n, refNormal);
+
+	for(FaceIterator iter = grid.faces_begin(); iter != grid.faces_end(); ++iter){
+		vector3 fn;
+		CalculateNormal(fn, *iter, aaPos);
+		const number d = VecDot(fn, n);
+		if((d > minDot - SMALL && d < maxDot + SMALL)
+		   && (!noInnerFaces || (NumAssociatedVolumes(grid, *iter) < 2)))
+		{
+			sel.select(*iter);
+		}
+	}
+}
+
+
 void FaceSelectionFill(Mesh* obj)
 {
 	Selector& sel = obj->selector();

tools/selection_tools.h

@@ -362,6 +362,13 @@ void SelectFacesByNormal(
 			const vector3& refNormal,
 			number maxDeviationAngle);
 
+void SelectFacesByNormal(
+			Mesh* obj,
+			const vector3& refNormal,
+			number minDeviationAngle,
+			number maxDeviationAngle,
+			bool noInnerFaces);
+
 void FaceSelectionFill(Mesh* obj);
 
 size_t SelectBentQuadrilaterals(Mesh* obj, number dotThreshold);

tools/subset_tools.cpp

@@ -434,6 +434,7 @@ void CopySubsetIndicesToSides(
 }
 
 // NEW GROUP: Quality Util
+template <class elem_t>
 void AssignSubsetsByAspectRatio (
 			Mesh* msh,
 			int numHistoSecs,
@@ -451,30 +452,32 @@ void AssignSubsetsByAspectRatio (
 	Selector& sel = msh->selector();
 	SubsetHandler& sh = msh->subset_handler();
 
+	int firstSubset = sh.num_subsets();
+	if(eraseOldSubsets){
+		sh.clear();
+		firstSubset = 0;
+	}
+
+
 	AInt aHistoSecs;
-	g.attach_to_faces(aHistoSecs);
-	Grid::FaceAttachmentAccessor<AInt> aaHistoSec (g, aHistoSecs);
+	g.attach_to<elem_t>(aHistoSecs);
+	Grid::AttachmentAccessor<elem_t, AInt> aaHistoSec (g, aHistoSecs);
 
 	std::vector<int> histo;
 
-	FaceIterator facesBegin = sel.faces_begin();
-	FaceIterator facesEnd = sel.faces_end();
-	size_t numFaces = sel.num<Face>();
-	if(numFaces == 0){
-		facesBegin = g.faces_begin();
-		facesEnd = g.faces_end();
-		numFaces = g.num<Face>();
+	typedef typename Grid::traits<elem_t>::iterator	iter_t;
+	iter_t elemsBegin = sel.begin<elem_t>();
+	iter_t elemsEnd = sel.end<elem_t>();
+	size_t numElems = sel.num<elem_t>();
+	if(numElems == 0){
+		elemsBegin = g.begin<elem_t>();
+		elemsEnd = g.end<elem_t>();
+		numElems = g.num<elem_t>();
 	}
 
-	GetFaceAspectRatioHistogram (histo, facesBegin, facesEnd,
-                             	 numHistoSecs, msh->position_accessor(),
-                             	 &aaHistoSec);
-
-	int firstSubset = sh.num_subsets();
-	if(eraseOldSubsets){
-		sh.clear();
-		firstSubset = 0;
-	}
+	GetAspectRatioHistogram (histo, elemsBegin, elemsEnd,
+                             numHistoSecs, msh->position_accessor(),
+                             &aaHistoSec);
 
 	const number stepSize = 1. / (number) numHistoSecs;
 	StringStreamTable t;
@@ -487,17 +490,20 @@ void AssignSubsetsByAspectRatio (
 		t(1, i) << histo[i];
 	}
 
-	for(FaceIterator iface = facesBegin; iface != facesEnd; ++iface)
-		sh.assign_subset(*iface, aaHistoSec[*iface]);
+	for(iter_t ielem = elemsBegin; ielem != elemsEnd; ++ielem)
+		sh.assign_subset(*ielem, aaHistoSec[*ielem]);
 
 	AssignSubsetColorsBlueToGreen (sh, firstSubset, numHistoSecs);
 
-	g.detach_from_faces(aHistoSecs);
+	g.detach_from<elem_t>(aHistoSecs);
 
-	UG_LOG("Face Aspect Ratio Histogram (" << numFaces << " faces):\n\n");
+	UG_LOG("Aspect Ratio Histogram (" << numElems << " elements):\n\n");
 	UG_LOG(t.to_string() << std::endl);
 }
 
+template void AssignSubsetsByAspectRatio <Face> (Mesh*, int, bool);
+template void AssignSubsetsByAspectRatio <Volume> (Mesh*, int, bool);
+
 
 template <int dim, class elem_t>
 void AssignSubsetsFromRaster_IMPL (Mesh* obj, const char* rasterFileName)

tools/subset_tools.h

@@ -62,7 +62,7 @@
 #define	TOOLTIP_SEPARATE_DEGENERATED_BOUNDARY_FACE_SUBSETS "Separates degenerated boundary face subsets at sharp creases."
 #define	TOOLTIP_COPY_SUBSET_INDICES_TO_SIDES "Copies subset indices of selected elements to sides of those elements."
 #define	TOOLTIP_ASSIGN_SUBSETS_BY_ELEMENT_TYPE "Assigns elemets to subsets based on their concrete type."
-#define TOOLTIP_ASSIGN_SUBSETS_BY_ASPECT_RATIO "Assigns subsets according to a aspect ratio histogram"
+#define TOOLTIP_ASSIGN_SUBSETS_BY_ASPECT_RATIO "Assigns subsets according to an aspect ratio histogram"
 #define TOOLTIP_ASSIGN_SUBSETS_FROM_RASTER "Assigns the subset index for each element from the raster-cell in which the center of the element lies."
 
 namespace ug{
@@ -139,6 +139,7 @@ void CopySubsetIndicesToSides(
 			bool selectionOnly,
 			bool toUnassignedOnly);
 
+template <class elem_t>
 void AssignSubsetsByAspectRatio (
 			Mesh* msh,
 			int numHistoSecs,