Merge branch 'master' of https://git.stim.ee.uh.edu/codebase/stimlib

David Mayerich
2 parents 424c1475 b7624d0d
Showing 3 changed files with 87 additions and 26 deletions Show diff stats
stim/biomodels/network.h
stim/visualization/gl_aaboundingbox.h
stim/visualization/gl_network.h
@@ -175,21 +175,49 @@ public:
 		return E[e].r(i);
 	}
+	///Returns the average radius of specific edge
+	T get_average_R(unsigned e) {
+		T result = 0.0;
+		unsigned n = E[e].size();
+		for (unsigned p = 0; p < n; p++)
+			result += E[e].r(p);
+
+		return (T)result / n;
+	}
+
 	///Returns the length of current edge
 	T get_L(unsigned e) {
 		return E[e].length();
 	}
 	///Returns the start vertex of current edge
-	size_t get_SP(unsigned e) {
+	size_t get_start_vertex(unsigned e) {
 		return E[e].v[0];
 	}
 	///Returns the end vertex of current edge
-	size_t get_EP(unsigned e) {
+	size_t get_end_vertex(unsigned e) {
 		return E[e].v[1];
 	}
+	///Returns one vertex
+	stim::vec3<T> get_vertex(unsigned i) {
+		return V[i];
+	}
+
+	///Returns the boundary vertices' indices
+	std::vector<unsigned> get_boundary_vertex() {
+		std::vector<unsigned> result;
+
+		for (unsigned v = 0; v < V.size(); v++) {
+			if (V[v].e[0].size() + V[v].e[1].size() == 1) {	// boundary vertex
+				result.push_back(v);
+			}
+		}
+
+		return result;
+	}
+
 	//scale the network by some constant value
 	//	I don't think these work??????
 	/*std::vector<vertex> operator*(T s){
@@ -4,44 +4,44 @@
 #include <stim/visualization/aaboundingbox.h>
 #include <GL/gl.h>
-namespace stim{
+namespace stim {
-template <typename T>
-class gl_aaboundingbox : public aaboundingbox<T>{
+	template <typename T>
+	class gl_aaboundingbox : public aaboundingbox<T> {
-public:
+	public:
-	using stim::aaboundingbox<T>::A;
-	using stim::aaboundingbox<T>::B;
+		using stim::aaboundingbox<T>::A;
+		using stim::aaboundingbox<T>::B;
-	//default constructor
-	gl_aaboundingbox() : stim::aaboundingbox<T>(){}
+		//default constructor
+		gl_aaboundingbox() : stim::aaboundingbox<T>() {}
-	//constructor takes an AABB
-	gl_aaboundingbox(stim::aaboundingbox<T> b) : stim::aaboundingbox<T>(b){}
+		//constructor takes an AABB
+		gl_aaboundingbox(stim::aaboundingbox<T> b) : stim::aaboundingbox<T>(b) {}
-	/// Specifies vertices of the bounding box using CW winding. Use GL_LINE_LOOP for wireframe or GL_QUADS for a solid.
-	void glWire(){
+		/// Specifies vertices of the bounding box using CW winding. Use GL_LINE_LOOP for wireframe or GL_QUADS for a solid.
+		void glWire() {
-		//front plane (in A[2])
-		glBegin(GL_LINE_LOOP);
+			//front plane (in A[2])
+			glBegin(GL_LINE_LOOP);
 			glVertex3f(A[0], A[1], A[2]);
 			glVertex3f(A[0], B[1], A[2]);
 			glVertex3f(B[0], B[1], A[2]);
 			glVertex3f(B[0], A[1], A[2]);
-		glEnd();
+			glEnd();
-		//back plane (in B[2])
-		glBegin(GL_LINE_LOOP);
+			//back plane (in B[2])
+			glBegin(GL_LINE_LOOP);
 			glVertex3f(B[0], B[1], B[2]);
 			glVertex3f(A[0], B[1], B[2]);
-			glVertex3f(A[0], A[1], B[2]);			
+			glVertex3f(A[0], A[1], B[2]);
 			glVertex3f(B[0], A[1], B[2]);
-		glEnd();
+			glEnd();
-		//fill out the rest of the lines to connect the two faces
-		glBegin(GL_LINES);
+			//fill out the rest of the lines to connect the two faces
+			glBegin(GL_LINES);
 			glVertex3f(A[0], B[1], A[2]);
 			glVertex3f(A[0], B[1], B[2]);
 			glVertex3f(B[0], B[1], B[2]);
@@ -50,12 +50,12 @@ public:
 			glVertex3f(B[0], A[1], B[2]);
 			glVertex3f(A[0], A[1], B[2]);
 			glVertex3f(A[0], A[1], A[2]);
-		glEnd();
+			glEnd();
-	}
+		}
-};		//end stim::gl_aabb
+	};		//end stim::gl_aabb
 };		//end namespace stim
@@ -155,6 +155,39 @@ public:
 		glCallList(dlist);						//render the display list
 	}
+	///render the network cylinder as a series of tubes(when only one network loaded) 
+	void glCylinder0() {
+
+		if (!glIsList(dlist)) {										// if dlist isn't a display list, create it
+			dlist = glGenLists(1);									// generate a display list
+			glNewList(dlist, GL_COMPILE);							// start a new display list
+			T radius = 0.0;
+			for (unsigned e = 0; e < E.size(); e++) {				// for each edge in the network
+				radius = get_average_R(e) / get_average_R(0);	// calculate the  radius
+				for (unsigned p = 1; p < E[e].size(); p++) {		// for each point on that edge
+					stim::circle<T> C1 = E[e].circ(p - 1);
+					stim::circle<T> C2 = E[e].circ(p);
+					C1.set_R(2 * radius);								// re-scale the circle to the same
+					C2.set_R(2 * radius);
+					std::vector< stim::vec3<T> > Cp1 = C1.glpoints(20);// get 20 points on the circle plane
+					std::vector< stim::vec3<T> > Cp2 = C2.glpoints(20);
+					glBegin(GL_QUAD_STRIP);
+					for (unsigned i = 0; i < Cp1.size(); i++) {
+						glVertex3f(Cp1[i][0], Cp1[i][1], Cp1[i][2]);
+						glVertex3f(Cp2[i][0], Cp2[i][1], Cp2[i][2]);
+					}
+					glEnd();
+				}													// set the texture coordinate based on the specified magnitude index
+			}
+			for (unsigned n = 0; n < V.size(); n++) {
+				size_t num = V[n].e[0].size();					// store the number of outgoing edge of that vertex
+				renderBall(V[n][0], V[n][1], V[n][2], 2 * radius, 20);
+			}
+			glEndList();						// end the display list
+		}
+		glCallList(dlist);						// render the display list
+	}
+
 	///render the network cylinder as a series of tubes
 	///colors are based on metric values 
 	void glCylinder(float sigma, float radius) {