From 243a718db2843e9b10a67e6ece0932c914091b12 Mon Sep 17 00:00:00 2001 From: Oliver Wang Date: Fri, 17 Oct 2003 22:28:40 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=2501 --- api/reduce.C | 14 +++++++------- checkin_notes | 5 +++++ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/api/reduce.C b/api/reduce.C index 934174625b..2f34387d5d 100644 --- a/api/reduce.C +++ b/api/reduce.C @@ -794,15 +794,15 @@ void REDUCED_ARRAY::draw_labels() { double aspect_ratio = 4.0/3.0; if ((double)h*aspect_ratio > (double)w) { - model[1]*=1.0f/((w/aspect_ratio)/h); - model[5]*=1.0f/((w/aspect_ratio)/h); - model[9]*=1.0f/((w/aspect_ratio)/h); + model[1]*=1.0f/(((double)w/aspect_ratio)/(double)h); + model[5]*=1.0f/(((double)w/aspect_ratio)/(double)h); + model[9]*=1.0f/(((double)w/aspect_ratio)/(double)h); } else { - model[0]*=1.0f/((h*aspect_ratio)/w); - model[4]*=1.0f/((h*aspect_ratio)/w); - model[8]*=1.0f/((h*aspect_ratio)/w); + model[0]*=1.0f/(((double)h*aspect_ratio)/(double)w); + model[4]*=1.0f/(((double)h*aspect_ratio)/(double)w); + model[8]*=1.0f/(((double)h*aspect_ratio)/(double)w); } //project to ortho coordinates @@ -819,7 +819,7 @@ void REDUCED_ARRAY::draw_labels() { model, proj, viewport,x_pos ); - get_2d_positions(draw_pos[0]+draw_size[0],draw_pos[1],draw_pos[2]+draw_size[2], + get_2d_positions(draw_pos[0]+draw_size[0]+.2f,draw_pos[1]+.6f,draw_pos[2]+draw_size[2]-.4f, model, proj, viewport,p_pos ); glPopMatrix(); diff --git a/checkin_notes b/checkin_notes index 8c36971cd7..ac02b0122e 100755 --- a/checkin_notes +++ b/checkin_notes @@ -6884,3 +6884,8 @@ David 17 Oct 2003 error_numbers.h sched/ handle_request.C + +Oliver 17 Oct 2003 + - small label coord tweak + api/ + reduce.c \ No newline at end of file