fix Merger

Author: zippy84

Merger.cxx

@@ -57,7 +57,7 @@ Merger::Merger (vtkPolyData *pd, const PStrips &pStrips, const StripsType &strip
             double proj[2];
             Transform(pt, proj, base);
 
-            p.emplace_back(proj[0], proj[1], 0);
+            p.emplace_back(proj[0], proj[1], 0, NOTSET, sp.ind);
         }
 
         p.pop_back();
@@ -85,8 +85,6 @@ void Merger::Run () {
 
     assert(origCellIds != nullptr);
 
-    const Base &base = pStrips.base;
-
     std::vector<GroupType> groups(polys.size());
 
     PolysType::const_iterator itrA, itrB;
@@ -140,18 +138,15 @@ void Merger::Run () {
             auto newCell = vtkSmartPointer<vtkIdList>::New();
 
             for (auto &p : poly) {
-                double in[] = {p.x, p.y},
-                    out[3];
-
-                BackTransform(in, out, base);
-
                 vtkIdType id = p.id;
 
                 if (id == NOTSET) {
                     auto itr = newIds.find(p);
 
                     if (itr == newIds.end()) {
-                        id = pdPts->InsertNextPoint(out);
+                        auto &q = pStrips.pts.at(p.otherId);
+
+                        id = pdPts->InsertNextPoint(q.pt);
                         newIds.emplace(p, id);
                     } else {
                         id = itr->second;

Utilities.h

@@ -48,10 +48,10 @@ void WriteVTK (const char *name, vtkPolyData *pd);
 class Point3d {
 public:
     const double x, y, z;
-    vtkIdType id;
+    vtkIdType id, otherId;
 
     Point3d () = delete;
-    Point3d (const double x, const double y, const double z, vtkIdType id = NOTSET) : x(x), y(y), z(z), id(id) {}
+    Point3d (const double x, const double y, const double z, vtkIdType id = NOTSET, vtkIdType otherId = NOTSET) : x(x), y(y), z(z), id(id), otherId(otherId) {}
     bool operator< (const Point3d &other) const {
         const long x1 = std::lround(x*1e5),
             y1 = std::lround(y*1e5),
@@ -70,7 +70,8 @@ class Point3d {
         out << "Point3d(x=" << p.x
             << ", y=" << p.y
             << ", z=" << p.z
-            << ", id=" << p.id << ")";
+            << ", id=" << p.id
+            << ", otherId=" << p.otherId << ")";
         return out;
     }