fallback of merger extended

zippy84 · Aug 16, 2023 · ad078e6 · ad078e6
1 parent 5444ad4
commit ad078e6
Show file tree

Hide file tree

Showing 14 changed files with 260 additions and 94 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2012-2022 Ronald Römer
+# Copyright 2012-2023 Ronald Römer
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/README.md b/README.md
@@ -235,7 +235,7 @@ from vtkbool.vtkBool import vtkPolyDataBooleanFilter
 
 ## Copyright
 
-2012-2022 Ronald Römer
+2012-2023 Ronald Römer
 
 ## License
 

diff --git a/Utilities.cxx b/Utilities.cxx
@@ -1,5 +1,5 @@
 /*
-Copyright 2012-2022 Ronald Römer
+Copyright 2012-2023 Ronald Römer
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -97,7 +97,7 @@ void WriteVTK (const char *name, vtkPolyData *pd) {
  w->Delete();
 }
 
-double GetAngle (double *vA, double *vB, double *n) {
+double GetAngle (const double *vA, const double *vB, const double *n) {
  // http://math.stackexchange.com/questions/878785/how-to-find-an-angle-in-range0-360-between-2-vectors
 
  double _vA[3];

diff --git a/Utilities.h b/Utilities.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2012-2022 Ronald Römer
+Copyright 2012-2023 Ronald Römer
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@ limitations under the License.
 
 #define NOTSET -1
 
-double GetAngle (double *vA, double *vB, double *n);
+double GetAngle (const double *vA, const double *vB, const double *n);
 
 /* VTK */
 void ComputeNormal (vtkPoints *pts, double *n, vtkIdType num, const vtkIdType *poly);
@@ -68,6 +68,14 @@ class Point3d {
  << ", id=" << p.id << ")";
  return out;
  }
+
+ static double GetVec (const Point3d &a, const Point3d &b, double *v) {
+ v[0] = b.x-a.x;
+ v[1] = b.y-a.y;
+ v[2] = b.z-a.z;
+
+ return vtkMath::Normalize(v);
+ }
 };
 
 typedef std::vector<vtkIdType> IdsType;

diff --git a/testing/_test/_test.py b/testing/_test/_test.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # *-* coding: UTF-8 *-*
 
-# Copyright 2012-2022 Ronald Römer
+# Copyright 2012-2023 Ronald Römer
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/testing/generate_frieze.py b/testing/generate_frieze.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # *-* coding: UTF-8 *-*
 
-# Copyright 2012-2022 Ronald Römer
+# Copyright 2012-2023 Ronald Römer
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/testing/milling/milling.py b/testing/milling/milling.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # *-* coding: UTF-8 *-*
 
-# Copyright 2012-2022 Ronald Römer
+# Copyright 2012-2023 Ronald Römer
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/testing/test_filter.py b/testing/test_filter.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # *-* coding: UTF-8 *-*
 
-# Copyright 2012-2022 Ronald Römer
+# Copyright 2012-2023 Ronald Römer
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/testing/test_merger.cxx b/testing/test_merger.cxx
@@ -1,5 +1,5 @@
 /*
-Copyright 2012-2022 Ronald Römer
+Copyright 2012-2023 Ronald Römer
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/testing/test_python.py b/testing/test_python.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # *-* coding: UTF-8 *-*
 
-# Copyright 2012-2022 Ronald Römer
+# Copyright 2012-2023 Ronald Römer
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.