diff --git a/Common/ColorTable.cpp b/Common/ColorTable.cpp index 952fb4a1fe85cc2a822226ea0d0d0bc8afe1f8d7..8662530838ae8268847b3be0fa6967da068adb78 100644 --- a/Common/ColorTable.cpp +++ b/Common/ColorTable.cpp @@ -1,4 +1,4 @@ -// $Id: ColorTable.cpp,v 1.6 2002-02-14 15:39:09 colignon Exp $ +// $Id: ColorTable.cpp,v 1.7 2002-02-14 17:09:45 geuzaine Exp $ #include "Gmsh.h" #include "ColorTable.h" @@ -130,7 +130,7 @@ void ColorTable_Recompute(GmshColorTable *ct, int rgb_flag, int alpha_flag){ r = 0 ; g = 0 ; b = 0 ; } else if(s-bias<=0.2){ - r = 57*(1-100*((s-bias)-0.1)*((s-bias)-0.1)) ; g = 0 ; b = (int)((s-bias)*(255./0.2)) ; + r = (int)(57*(1-100*((s-bias)-0.1)*((s-bias)-0.1))) ; g = 0 ; b = (int)((s-bias)*(255./0.2)) ; } else if(s-bias<=0.3624){ r = 0 ; g = (int)((s-bias-0.2)*(255./0.1624)) ; b = 255 ; diff --git a/Fltk/Colorbar_Window.cpp b/Fltk/Colorbar_Window.cpp index 9d671b972a0ec3cdc54f4da91033861afd2b223f..c4ec2d2ea5b52d4380c63d82bc3a2d38f4e09eb8 100644 --- a/Fltk/Colorbar_Window.cpp +++ b/Fltk/Colorbar_Window.cpp @@ -1,4 +1,4 @@ -// $Id: Colorbar_Window.cpp,v 1.18 2002-02-13 09:20:41 stainier Exp $ +// $Id: Colorbar_Window.cpp,v 1.19 2002-02-14 17:09:45 geuzaine Exp $ #include "Gmsh.h" #include "GmshUI.h" @@ -246,7 +246,7 @@ void Colorbar_Window::redraw_range(int a, int b){ int xx0=10, xx1=13*font_height, yy0=10; if (help_flag){ i = 0; - fl_draw("1, 2, ..., 6", xx0,yy0+(i+1)*font_height); + fl_draw("1, 2, ..., 7", xx0,yy0+(i+1)*font_height); fl_draw( "select predefined colormap", xx1,yy0+(i+1)*font_height); i++; fl_draw("mouse1", xx0,yy0+(i+1)*font_height); fl_draw( "draw red or hue channel", xx1,yy0+(i+1)*font_height); i++; diff --git a/doc/CONTRIBUTORS b/doc/CONTRIBUTORS index 5fcf3136b3bae985685e961b0d8ad8265cda9c32..7949e16d1e23259e8522c9f25a6cf755d3632eb2 100644 --- a/doc/CONTRIBUTORS +++ b/doc/CONTRIBUTORS @@ -1,4 +1,4 @@ -$Id: CONTRIBUTORS,v 1.9 2002-02-13 17:14:46 geuzaine Exp $ +$Id: CONTRIBUTORS,v 1.10 2002-02-14 17:09:45 geuzaine Exp $ Gmsh is copyright (c) 1997-2002 by @@ -7,6 +7,7 @@ Gmsh is copyright (c) 1997-2002 by Parts of the code have been contributed by + David Colignon <david.colignon@ulg.ac.be> Patrick Dular <patrick.dular@ulg.ac.be> Marc Um� <Marc.Ume@digitalgraphics.be> Laurent Stainier <l.stainier@ulg.ac.be> @@ -24,7 +25,6 @@ will be added to the list! Guillaume Alleon <guillaume.alleon@airbus.aeromatra.com> �ric Bechet <eric.bechet@epost.de> Laurent Champaney <laurent.champaney@meca.uvsq.fr> - David Colignon <david.colignon@ulg.ac.be> Philippe Geuzaine <geuzaine@gnat.colorado.edu> Johan Gyselinck <johan.gyselinck@ulg.ac.be> Fran�ois Henrotte <fhenrott@esat.kuleuven.ac.be>