From d53f28c89bd31d60fc864ab9b11eccab872f7d8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joachim=20Sch=C3=B6berl?= <joachim.schoeberl@tuwien.ac.at>
Date: Mon, 13 Jan 2020 16:41:06 +0100
Subject: [PATCH] named edges in CSG geometry

---
 libsrc/csg/csgeom.hpp     |  5 +++++
 libsrc/csg/edgeflw.cpp    | 23 +++++++++++++++++++++++
 libsrc/csg/python_csg.cpp | 11 ++++++++++-
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/libsrc/csg/csgeom.hpp b/libsrc/csg/csgeom.hpp
index c419c9a4..f5cb21a4 100644
--- a/libsrc/csg/csgeom.hpp
+++ b/libsrc/csg/csgeom.hpp
@@ -367,6 +367,11 @@ namespace netgen
 
     NgArray<BCModification> bcmodifications;
 
+
+    map<tuple<Surface*,Surface*>, string> named_edges;
+      
+
+    
     virtual int GenerateMesh (shared_ptr<Mesh> & mesh, MeshingParameters & mparam) override;
 
     void AddSplineSurface (shared_ptr<SplineSurface> ss) { spline_surfaces.Append(ss); }
diff --git a/libsrc/csg/edgeflw.cpp b/libsrc/csg/edgeflw.cpp
index ab736f91..d89e2fd9 100644
--- a/libsrc/csg/edgeflw.cpp
+++ b/libsrc/csg/edgeflw.cpp
@@ -485,6 +485,29 @@ namespace netgen
 		      layer,
 		      mesh);
 	  }
+
+
+        {
+          // named edge ?
+          // cout << "check edge name, size = " << geometry.named_edges.size() << endl;
+          // for (auto pair : geometry.named_edges)
+          // cout << "key = " << get<0> (pair.first) << "-" << get<1> (pair.first) << ", val = " << pair.second << endl;
+          
+          Surface * sp1 = const_cast<Surface*> (geometry.GetSurface(s1));
+          Surface * sp2 = const_cast<Surface*> (geometry.GetSurface(s2));
+          // cout << "sp1 = " << sp1 << ", sp2 = " << sp2 << endl;
+
+          auto ptr = geometry.named_edges.find(tuple(sp1, sp2));
+          if (ptr != geometry.named_edges.end())
+            for (int i = 0; i < refedges.Size(); i++)
+              mesh.SetCD2Name(refedges[i].edgenr, ptr->second);
+          
+          ptr = geometry.named_edges.find(tuple(sp2, sp1));
+          if (ptr != geometry.named_edges.end())
+            for (int i = 0; i < refedges.Size(); i++)
+              mesh.SetCD2Name(refedges[i].edgenr, ptr->second);
+        }
+        
 	for(int i=0; i<refedges.Size(); i++)
 	  {
 	    auto splinesurface = dynamic_cast<const SplineSurface*>(geometry.GetSurface(refedges[i].surfnr1));
diff --git a/libsrc/csg/python_csg.cpp b/libsrc/csg/python_csg.cpp
index c5616e5c..a48475e0 100644
--- a/libsrc/csg/python_csg.cpp
+++ b/libsrc/csg/python_csg.cpp
@@ -569,7 +569,16 @@ However, when r = 0, the top part becomes a point(tip) and meshing fails!
          py::arg("solid1"), py::arg("solid2"),
          py::arg("trafo")=Transformation<3>(Vec<3>(0,0,0))
          )
-
+    .def("NameEdge", [] (CSGeometry & self, shared_ptr<SPSolid> s1, shared_ptr<SPSolid> s2, string name)
+         {
+           Array<Surface*> surfs1, surfs2;
+           s1->GetSolid()->ForEachSurface( [&surfs1] (Surface * s, bool inv) { surfs1.Append(s); });
+           s2->GetSolid()->ForEachSurface( [&surfs2] (Surface * s, bool inv) { surfs2.Append(s); });
+           for (auto s1 : surfs1)
+             for (auto s2 : surfs2)
+               self.named_edges[tuple(s1,s2)] = name;
+         })
+         
     .def("AddPoint", [] (CSGeometry & self, Point<3> p, int index) -> CSGeometry&
          {
            self.AddUserPoint(CSGeometry::UserPoint(p, index));