added a way to add fibers in that start with a given fiber into the network.

Pavel Govyadinov
1 parent 23af8e36
Showing 1 changed file with 28 additions and 8 deletions Show diff stats
stim/gl/gl_spider.h
@@ -1314,15 +1314,23 @@ class gl_spider : public virtual gl_texture&lt;T&gt;
 		}	
 		void
-		addToNetwork(pair<stim::fiber<float>, int> in)
+		addToNetwork(pair<stim::fiber<float>, int> in, stim::vec<float> spos, 
+				stim::vec<float> smag, stim::vec<float> sdir)
 		{
                         std::vector<stim::vec<float> > ce = in.first.centerline();                
                         std::vector<stim::vec<float> > cm = in.first.centerlinemag();
-			if(ce.size() >2)
+			if(ce.size() > 2)
 			{
 				if(in.second == -1)
 				{
-					nt.addEdge(ce, cm, -1, -1);
+					spos[0] = spos[0]-0.15*sdir[0]*smag[0];
+					spos[1] = spos[1]-0.15*sdir[1]*smag[0];
+					spos[2] = spos[2]-0.15*sdir[2]*smag[0];
+					int h = selectObject(spos, -sdir, smag[0]);
+					if(h != -1)
+						nt.addEdge(ce, cm, h, -1);
+					else
+						nt.addEdge(ce, cm, -1, -1);
 				}
 				else if(in.second != -1)
 				{
@@ -1337,9 +1345,22 @@ class gl_spider : public virtual gl_texture&lt;T&gt;
 			return nt;
 		}
+		void
+		printSizes()
+		{
+			std::cout << nt.sizeE() << "edges" << std::endl;
+			std::cout << nt.sizeV() << "nodes" << std::endl;
+			
+		}
+
 		std::pair<stim::fiber<float>, int >
 		traceLine(stim::vec<float> pos, stim::vec<float> mag, int min_cost)
 		{
+			//starting (seed) position and magnitude.
+			stim::vec<float> spos = getPosition();
+			stim::vec<float> smag = getMagnitude();
+			stim::vec<float> sdir = getDirection();	
+
 			Bind();
 			sk.Begin(stim::OBJ_LINE);
@@ -1364,7 +1385,7 @@ class gl_spider : public virtual gl_texture&lt;T&gt;
 					running = false;
 					sk.End();
 					pair<stim::fiber<float>, int> a(stim::fiber<float> (cL, cM), -1);
-					addToNetwork(a);
+					addToNetwork(a, spos, smag, sdir);
 					return a;
 					break;
 				} else {
@@ -1378,7 +1399,7 @@ class gl_spider : public virtual gl_texture&lt;T&gt;
 						running = false;
 						sk.End();
 						pair<stim::fiber<float>, int> a(stim::fiber<float> (cL, cM), -1);
-						addToNetwork(a);
+						addToNetwork(a, spos, smag, sdir);
 						return a;
 						break;
 					}
@@ -1397,7 +1418,7 @@ class gl_spider : public virtual gl_texture&lt;T&gt;
 						running = false;
 						sk.End();
 						pair<stim::fiber<float>, int> a(stim::fiber<float> (cL, cM), -1);
-						addToNetwork(a);
+						addToNetwork(a, spos, smag, sdir);
 						return a;
 						break;
 					}
@@ -1406,11 +1427,10 @@ class gl_spider : public virtual gl_texture&lt;T&gt;
 						h = selectObject(p, getDirection(), m[0]);
 						//Have we hit something previously traced?
 						if(h != -1){
-							std::cout << "I hit a line" << h << std::endl;
 							running = false;
 							sk.End();
 							pair<stim::fiber<float>, int> a(stim::fiber<float> (cL, cM), -1);
-							addToNetwork(a);
+							addToNetwork(a, spos, smag, sdir);
 							return a;
 							break;
 						}