diff --git a/Common/Options.cpp b/Common/Options.cpp index fcf7eeb2413b2b4dcffdf427ca91798315378666..9191661a0541bdf8da84d0a6d06d1479f1ce62e1 100644 --- a/Common/Options.cpp +++ b/Common/Options.cpp @@ -1,4 +1,4 @@ -// $Id: Options.cpp,v 1.392 2008-04-15 16:48:57 geuzaine Exp $ +// $Id: Options.cpp,v 1.393 2008-04-16 15:15:22 sabarieg Exp $ // // Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle // @@ -4383,7 +4383,7 @@ double opt_mesh_lc_from_points(OPT_ARGS_NUM) double opt_mesh_lc_extend_from_boundary(OPT_ARGS_NUM) { if(action & GMSH_SET) - CTX.mesh.lc_extend_from_boundary = val; + CTX.mesh.lc_extend_from_boundary = (int)val; return CTX.mesh.lc_extend_from_boundary; } diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp index e558d016d605c553e13bfccdb7ff614c002e4101..f5268647e507c0d03c294df2563b46bca751ec64 100644 --- a/Fltk/GUI.cpp +++ b/Fltk/GUI.cpp @@ -1,4 +1,4 @@ -// $Id: GUI.cpp,v 1.679 2008-04-16 11:26:32 geuzaine Exp $ +// $Id: GUI.cpp,v 1.680 2008-04-16 15:15:22 sabarieg Exp $ // // Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle // @@ -3896,7 +3896,7 @@ void FieldDialogBox::load_field(Field *f) ((Fl_Value_Input*)(*input))->value(option->numerical_value()); break; case FIELD_OPTION_BOOL: - ((Fl_Check_Button*)(*input))->value(option->numerical_value()); + ((Fl_Check_Button*)(*input))->value((int)option->numerical_value()); break; case FIELD_OPTION_LIST: vstr.str(""); @@ -3940,7 +3940,7 @@ FieldDialogBox::FieldDialogBox(Field *f, int x, int y, int width, int height,int revert_btn = new Fl_Button(x+width - 2*BB-2*WB ,y+ height - 2*BH -2*WB, BB, BH, "Revert"); revert_btn->callback(view_field_revert_cb,this); Fl_Scroll *s = new Fl_Scroll(x + WB, y + 2*WB + 2*BH, width - 2 * WB, height - 4*BH - 5 * WB); - double yy=y+3*WB+2*BH; + int yy=y+3*WB+2*BH; for(std::map<const char*,FieldOption*>::iterator it=f->options.begin();it!=f->options.end();it++){ Fl_Widget *input; switch(it->second->get_type()){ diff --git a/Mesh/Field.cpp b/Mesh/Field.cpp index c97202e3219fed992e06d7f524ad27b7166d3bc7..2937c029075f30c917cd8843eaac3409b2d74b38 100644 --- a/Mesh/Field.cpp +++ b/Mesh/Field.cpp @@ -1,4 +1,4 @@ -// $Id: Field.cpp,v 1.29 2008-04-09 09:17:25 geuzaine Exp $ +// $Id: Field.cpp,v 1.30 2008-04-16 15:15:21 sabarieg Exp $ // // Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle // @@ -91,7 +91,7 @@ FieldOptionInt(int &_val, bool * _status = NULL):FieldOption(_status), void numerical_value(double v) { modified(); - val = v; + val = (int)v; }; void get_text_representation(std::string & v_str) {