From 5af855e16b3bc7a4a10ddad487a6750618d13e6f Mon Sep 17 00:00:00 2001
From: Oliver Wang <owang@unknown.invalid>
Date: Fri, 26 Sep 2003 00:01:33 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=2364
---
 api/gutil.C  |  3 +-
 api/reduce.C | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++--
 api/reduce.h |  1 +
 3 files changed, 94 insertions(+), 4 deletions(-)

diff --git a/api/gutil.C b/api/gutil.C
index 1ddc0e55aa..88ff904b83 100755
--- a/api/gutil.C
+++ b/api/gutil.C
@@ -17,8 +17,7 @@
 // Contributor(s):
 //
 
-//#include "config.h"
-#define HAVE_GLUT_H
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/api/reduce.C b/api/reduce.C
index 546e57c8c4..3141beed05 100644
--- a/api/reduce.C
+++ b/api/reduce.C
@@ -328,7 +328,7 @@ void REDUCED_ARRAY::draw_row_rect_x(DrawType type,int row)
 			
 
 			//draw lines
-			
+			/*
 			mode_unshaded();    
 			glLineWidth(.5f);			
 			glBegin(GL_LINES);
@@ -391,7 +391,7 @@ void REDUCED_ARRAY::draw_row_rect_x(DrawType type,int row)
 				glVertex3f(x1, y0, z1);
 				glVertex3f(x1, y0, z0);
 		*/
-			}
+	//		}
 			glEnd();	
 		break;
 		case TYPE_SURFACE:
@@ -894,4 +894,94 @@ void REDUCED_ARRAY::draw_labels()
 }
 
 
+void REDUCED_ARRAY::draw_3dlabels()
+{	
+	double model[16];	
+	double proj[16];
+	double z_pos[3];
+	double x_pos[3];
+	double p_pos[3];
+	double xzmin_corner[3];
+	double zmax_corner[3];
+	double xmax_corner[3];
+
+	float arrowh = .35f;
+	float arroww = .05f;
+
+	glLineWidth(1.4f);
+	glBegin(GL_LINES);
+	glColor3f(1,1,1);
+	glVertex3f(draw_pos[0]+draw_size[0]+.4f,draw_pos[1],draw_pos[2]+draw_size[2]-.5f);
+	glVertex3f(draw_pos[0]+draw_size[0]+.4f,draw_pos[1]+1.2f,draw_pos[2]+draw_size[2]-.5f);
+	glEnd();
+
+	glBegin(GL_TRIANGLE_FAN);
+	glVertex3f(draw_pos[0]+draw_size[0]+.4f,draw_pos[1]+1.2f+arrowh,draw_pos[2]+draw_size[2]-.5f);
+
+	glVertex3f(draw_pos[0]+draw_size[0]+.4f-arroww,draw_pos[1]+1.2f,draw_pos[2]+draw_size[2]-.5f-arroww);
+	glVertex3f(draw_pos[0]+draw_size[0]+.4f+arroww,draw_pos[1]+1.2f,draw_pos[2]+draw_size[2]-.5f-arroww);
+	glVertex3f(draw_pos[0]+draw_size[0]+.4f+arroww,draw_pos[1]+1.2f,draw_pos[2]+draw_size[2]-.5f+arroww);
+	glVertex3f(draw_pos[0]+draw_size[0]+.4f-arroww,draw_pos[1]+1.2f,draw_pos[2]+draw_size[2]-.5f+arroww);
+	glVertex3f(draw_pos[0]+draw_size[0]+.4f-arroww,draw_pos[1]+1.2f,draw_pos[2]+draw_size[2]-.5f-arroww);
+	glEnd();
+
+	int viewport[4];
+			
+	get_matrix(model);				
+	get_projection(proj);
+	get_viewport(viewport);
+
+	float offset = 0;
+
+	char* zlabel = "Time(sec)";
+	char* xlabel = "Frequency(HZ)";
+	char* plabel = "Power";
+
+	char* zmax = "107.4";
+	char* zmin = "0";
+
+	char* xmax = "9765.620";
+	char* xmin = "0.0";
+
+	float left_of_z = -0.1f;
+	float left_of_z2 = -0.04f;
+	float below_x = -.03f;
+	float center_x = -.06f;
+	
+	float w=.3f;
+	float l=1.0f;
+	float h=.3f;
+	float s=.3f;
+	mode_unshaded();	
+	glColor3d(1,1,1);	
+	float zpos[3]={draw_pos[0]-.5,draw_pos[1],draw_pos[2]+(draw_size[2]/2.0f)};
+	float xpos[3]={draw_pos[0]+draw_size[0]/2.0f,draw_pos[1]-.2,draw_pos[2]+draw_size[2]};
+	float ppos[3]={draw_pos[0]+draw_size[0]+.4f,draw_pos[1]+1.5f/2.3f,draw_pos[2]+draw_size[2]-.5f};
+
+	glPushMatrix();	
+	float r[3] = {0,1,0};
+    draw_rotated_text(zpos,h,w,s,zlabel,90.0f,r);
+	
+	glPopMatrix();
+    
+	draw_text_line(xpos, w, l, xlabel);	
+    draw_text_line(ppos, w, l, plabel);	
+	
+/*	glMatrixMode(GL_MODELVIEW);
+	glPushMatrix();
+	glLoadIdentity();
+  	
+	glRasterPos3d(zpos[0],zpos[1],zpos[2]);
+	print_text(listBase[0], zlabel);
+
+	glRasterPos3d(xpos[0],xpos[1],xpos[2]);
+	print_text(listBase[0], xlabel);
+
+	glRasterPos3d(ppos[0],ppos[1],ppos[2]);
+	print_text(listBase[0], plabel);
+
+	glPopMatrix();
+*/
+}
+
 
diff --git a/api/reduce.h b/api/reduce.h
index cf6e4128f3..47a2c68840 100644
--- a/api/reduce.h
+++ b/api/reduce.h
@@ -77,4 +77,5 @@ public:
     void draw_axes();
 	void draw_axis_labels();
 	void draw_labels();	
+	void draw_3dlabels();	
 };