Added option to distance map to use the old method.

Author: SteveMaas1978

FEBioStudio/PostDataPanel.cpp

@@ -256,6 +256,7 @@ class CDistanceMapProps : public CPropertyList
 		addProperty("Signed distance", CProperty::Bool);
 		addProperty("Flip Primary", CProperty::Bool);
 		addProperty("Flip Secondary", CProperty::Bool);
+		addProperty("Method", CProperty::Enum)->setEnumValues(QStringList() << "new" << "old");
 		addProperty("", CProperty::Action, "Apply");
 	}
 
@@ -276,6 +277,7 @@ class CDistanceMapProps : public CPropertyList
 		case 2: return m_map->m_bsigned; break;
 		case 3: return m_map->m_flipPrimary; break;
 		case 4: return m_map->m_flipSecondary; break;
+		case 5: return m_map->m_nopt;
 		}
 		return QVariant();
 	}
@@ -297,7 +299,8 @@ class CDistanceMapProps : public CPropertyList
 		case 2: m_map->m_bsigned = v.toBool(); break;
 		case 3: m_map->m_flipPrimary = v.toBool(); break;
 		case 4: m_map->m_flipSecondary = v.toBool(); break;
-		case 5:
+		case 5: m_map->m_nopt = v.toInt(); break;
+		case 6:
 		{
 			CDlgStartThread dlg(nullptr, new DistanceMapThread(m_map));
 			dlg.exec();

PostLib/FEDistanceMap.cpp

@@ -40,6 +40,7 @@ Post::FEDistanceMap::FEDistanceMap(Post::FEPostModel* fem, int flags) : Post::Mo
 	m_bsigned = false;
 	m_flipPrimary = false;
 	m_flipSecondary = false;
+	m_nopt = 0;
 }
 
 //-----------------------------------------------------------------------------
@@ -51,6 +52,7 @@ Post::ModelDataField* Post::FEDistanceMap::Clone() const
 	pd->m_surf2 = m_surf2;
 	pd->m_tol = m_tol;
 	pd->m_bsigned = m_bsigned;
+	pd->m_nopt = m_nopt;
 	return pd;
 }
 
@@ -195,8 +197,16 @@ void Post::FEDistanceMap::ApplyState(int n)
 		a[i] = (P.q - r).Length();
 		if (m_bsigned)
 		{
-			double s = (P.q - r)*P.n;
-			if (s > 0) a[i] = -a[i];
+			if (m_nopt == 0) // new approach
+			{
+				double s = (P.q - r) * P.n;
+				if (s > 0) a[i] = -a[i];
+			}
+			else // old approach
+			{
+				double s = (P.q - r) * m_surf1.m_norm[i];
+				if (s < 0) a[i] = -a[i];
+			}
 		}
 	}
 	vector<int> nf1(m_surf1.Faces());
@@ -215,8 +225,16 @@ void Post::FEDistanceMap::ApplyState(int n)
 		b[i] = (P.q - r).Length();
 		if (m_bsigned)
 		{
-			double s = (P.q - r)*P.n;
-			if (s > 0) b[i] = -b[i];
+			if (m_nopt == 0) // new approach
+			{
+				double s = (P.q - r) * P.n;
+				if (s > 0) b[i] = -b[i];
+			}
+			else
+			{
+				double s = (P.q - r) * m_surf2.m_norm[i];
+				if (s < 0) b[i] = -b[i];
+			}
 		}
 	}
 	vector<int> nf2(m_surf2.Faces());

PostLib/FEDistanceMap.h

@@ -86,6 +86,8 @@ class FEDistanceMap : public ModelDataField
 
     void SetSigned(bool sign) { m_bsigned = sign; }
 
+	void SetMethod(int nopt) { m_nopt = nopt; }
+
 	void FlipPrimary(bool b) { m_flipPrimary = b; }
 	void FlipSecondary(bool b) { m_flipSecondary = b; }
 
@@ -108,5 +110,6 @@ class FEDistanceMap : public ModelDataField
 	bool	m_bsigned;		//!< signed or non-signed distance
 	bool	m_flipPrimary;
 	bool	m_flipSecondary;
+	int		m_nopt;
 };
 }

PyLib/PyFBSPost.cpp

@@ -198,6 +198,7 @@ void init_FBSPost(py::module& m)
 		.def("SetSigned", &FEDistanceMap::SetSigned)
 		.def("FlipPrimary", &FEDistanceMap::FlipPrimary)
 		.def("FlipSecondary", &FEDistanceMap::FlipSecondary)
+		.def("SetMethod", &FEDistanceMap::SetMethod)
 		.def("Apply", &FEDistanceMap::Apply)
 		;
 }