Commit 96e8ab1f6220f97b8e83f1cc516ea0c47c52ef8f

Authored by David Mayerich
1 parent 86dfa80b

fixed stim::cylinder template error

Showing 1 changed file with 8 additions and 5 deletions   Show diff stats
stim/visualization/cylinder.h
@@ -4,6 +4,9 @@ @@ -4,6 +4,9 @@
4 #include <stim/math/circle.h> 4 #include <stim/math/circle.h>
5 #include <stim/biomodels/centerline.h> 5 #include <stim/biomodels/centerline.h>
6 6
  7 +/*
  8 +
  9 +*/
7 10
8 namespace stim 11 namespace stim
9 { 12 {
@@ -12,13 +15,13 @@ class cylinder @@ -12,13 +15,13 @@ class cylinder
12 : public centerline<T> 15 : public centerline<T>
13 { 16 {
14 private: 17 private:
15 - stim::circle<T> s; //an arbitrary circle  
16 - std::vector<stim::circle<T> > e; //an array of circles that store the centerline 18 + stim::circle<T> s; //an arbitrary circle
  19 + std::vector<stim::circle<T> > e; //an array of circles that store the centerline
17 20
18 std::vector<stim::vec3<T> > norms; 21 std::vector<stim::vec3<T> > norms;
19 std::vector<stim::vec<T> > Us; 22 std::vector<stim::vec<T> > Us;
20 - std::vector<stim::vec<T> > mags;  
21 - std::vector< T > L; //length of the cylinder at each position. 23 + std::vector<stim::vec<T> > mags; //stores a list of magnitudes for each point in the centerline (assuming mags[0] is the radius)
  24 + std::vector< T > L; //length of the cylinder at each position (pre-integration)
22 25
23 26
24 using stim::centerline<T>::c; 27 using stim::centerline<T>::c;
@@ -234,7 +237,7 @@ class cylinder @@ -234,7 +237,7 @@ class cylinder
234 cylinder(std::vector< stim::vec3<T> > inP) 237 cylinder(std::vector< stim::vec3<T> > inP)
235 : centerline<T>(inP) 238 : centerline<T>(inP)
236 { 239 {
237 - std::vector< T > inM; //create an array of arbitrary magnitudes 240 + std::vector< stim::vec<T> > inM; //create an array of arbitrary magnitudes
238 241
239 stim::vec<T> zero; 242 stim::vec<T> zero;
240 zero.push_back(0); 243 zero.push_back(0);