Hi, I'm sorry. I forgot to add path to last e-mail :-). Best Regards,
Jiri
diff -u -r gmsh-2.2.7-cvs-devel/Common/DefaultOptions.h gmsh-2.2.7-cvs-20081202/Common/DefaultOptions.h
--- gmsh-2.2.7-cvs-devel/Common/DefaultOptions.h 2008-12-03 10:28:45.000000000 +0100
+++ gmsh-2.2.7-cvs-20081202/Common/DefaultOptions.h 2008-12-02 00:02:49.000000000 +0100
@@ -1197,8 +1197,6 @@
"Relative radius of arrow head" },
{ F|O, "ArrowSize" , opt_view_arrow_size , 60. ,
"Display size of arrows (in pixels)" },
- { F|O, "MinArrowSize", opt_view_min_arrow_size, 0. ,
- "Minimal display size of arrows (in pixels)" },
{ F|O, "ArrowSizeProportional" , opt_view_arrow_size_proportional , 1. ,
"Scale the arrows according to the norm of the vector" },
{ F|O, "ArrowStemLength" , opt_view_arrow_stem_length , 0.56 ,
diff -u -r gmsh-2.2.7-cvs-devel/Common/Options.cpp gmsh-2.2.7-cvs-20081202/Common/Options.cpp
--- gmsh-2.2.7-cvs-devel/Common/Options.cpp 2008-12-03 10:13:25.000000000 +0100
+++ gmsh-2.2.7-cvs-20081202/Common/Options.cpp 2008-12-02 00:02:50.000000000 +0100
@@ -6390,23 +6390,6 @@
#endif
}
-double opt_view_min_arrow_size(OPT_ARGS_NUM)
-{
-#if !defined(HAVE_NO_POST)
- GET_VIEW(0.);
- if(action & GMSH_SET) {
- opt->MinArrowSize = val;
- }
-#if defined(HAVE_FLTK)
- if(_gui_action_valid(action, num))
- GUI::instance()->options->view.value[60]->value(opt->MinArrowSize);
-#endif
- return opt->MinArrowSize;
-#else
- return 0.;
-#endif
-}
-
double opt_view_arrow_size_proportional(OPT_ARGS_NUM)
{
#if !defined(HAVE_NO_POST)
diff -u -r gmsh-2.2.7-cvs-devel/Common/Options.h gmsh-2.2.7-cvs-20081202/Common/Options.h
--- gmsh-2.2.7-cvs-devel/Common/Options.h 2008-12-03 10:44:23.000000000 +0100
+++ gmsh-2.2.7-cvs-20081202/Common/Options.h 2008-12-02 00:02:50.000000000 +0100
@@ -580,7 +580,6 @@
double opt_view_transform21(OPT_ARGS_NUM);
double opt_view_transform22(OPT_ARGS_NUM);
double opt_view_arrow_size(OPT_ARGS_NUM);
-double opt_view_min_arrow_size(OPT_ARGS_NUM);
double opt_view_arrow_size_proportional(OPT_ARGS_NUM);
double opt_view_arrow_head_radius(OPT_ARGS_NUM);
double opt_view_arrow_stem_length(OPT_ARGS_NUM);
diff -u -r gmsh-2.2.7-cvs-devel/doc/texinfo/opt_view.texi gmsh-2.2.7-cvs-20081202/doc/texinfo/opt_view.texi
--- gmsh-2.2.7-cvs-devel/doc/texinfo/opt_view.texi 2008-12-03 10:38:40.000000000 +0100
+++ gmsh-2.2.7-cvs-20081202/doc/texinfo/opt_view.texi 2008-11-26 00:03:00.000000000 +0100
@@ -129,11 +129,6 @@
Default value: @[EMAIL PROTECTED]
Saved in: @code{General.OptionsFileName}
[EMAIL PROTECTED] View.MinaArrowSize
-Minimal size of arrows (in pixels)@*
-Default value: @[EMAIL PROTECTED]
-Saved in: @code{General.OptionsFileName}
-
@item View.ArrowSizeProportional
Scale the arrows according to the norm of the [EMAIL PROTECTED]
Default value: @[EMAIL PROTECTED]
diff -u -r gmsh-2.2.7-cvs-devel/Fltk/Callbacks.cpp gmsh-2.2.7-cvs-20081202/Fltk/Callbacks.cpp
--- gmsh-2.2.7-cvs-devel/Fltk/Callbacks.cpp 2008-12-03 10:11:39.000000000 +0100
+++ gmsh-2.2.7-cvs-20081202/Fltk/Callbacks.cpp 2008-12-02 00:02:50.000000000 +0100
@@ -1356,7 +1356,6 @@
double normal_raise = opt_view_normal_raise(current, GMSH_GET, 0);
double timestep = opt_view_timestep(current, GMSH_GET, 0);
double arrow_size = opt_view_arrow_size(current, GMSH_GET, 0);
- double min_arrow_size = opt_view_min_arrow_size(current, GMSH_GET, 0);
double arrow_size_proportional = opt_view_arrow_size_proportional(current, GMSH_GET, 0);
double displacement_factor = opt_view_displacement_factor(current, GMSH_GET, 0);
double point_size = opt_view_point_size(current, GMSH_GET, 0);
@@ -1675,10 +1674,6 @@
if(force || (val != arrow_size))
opt_view_arrow_size(i, GMSH_SET, val);
- val = o->view.value[64]->value();
- if(force || (val != min_arrow_size))
- opt_view_min_arrow_size(i, GMSH_SET, val);
-
val = o->view.value[63]->value();
if(force || (val != displacement_factor))
opt_view_displacement_factor(i, GMSH_SET, val);
diff -u -r gmsh-2.2.7-cvs-devel/Fltk/GUI.h gmsh-2.2.7-cvs-20081202/Fltk/GUI.h
--- gmsh-2.2.7-cvs-devel/Fltk/GUI.h 2008-12-02 14:36:33.000000000 +0100
+++ gmsh-2.2.7-cvs-20081202/Fltk/GUI.h 2008-12-02 00:02:50.000000000 +0100
@@ -62,7 +62,7 @@
// return the single static instance of the GUI
static GUI *instance(int argc=0, char **argv=0);
// check if the GUI is available
- static bool available(){ return (_instance != 0); }
+ static bool GUI::available(){ return (_instance != 0); }
// run the GUI until there's no window left
int run(){ return Fl::run(); }
// check (now!) if there are any pending events, and process them
diff -u -r gmsh-2.2.7-cvs-devel/Fltk/optionWindow.cpp gmsh-2.2.7-cvs-20081202/Fltk/optionWindow.cpp
--- gmsh-2.2.7-cvs-devel/Fltk/optionWindow.cpp 2008-12-03 14:13:35.000000000 +0100
+++ gmsh-2.2.7-cvs-20081202/Fltk/optionWindow.cpp 2008-12-01 21:08:22.000000000 +0100
@@ -92,8 +92,8 @@
optionWindow::optionWindow(int fontsize) : _fontsize(fontsize)
{
- int width = 35 * _fontsize + WB;
- int height = 14 * BH + 5 * WB;
+ int width = 34 * _fontsize + WB;
+ int height = 13 * BH + 5 * WB;
int L = 7 * _fontsize;
win = new dialogWindow(width, height, CTX.non_modal_windows);
@@ -1828,14 +1828,6 @@
view.value[60]->align(FL_ALIGN_RIGHT);
view.value[60]->callback(view_options_ok_cb);
- view.value[64] = new Fl_Value_Input
- (L + 2 * WB, 2 * WB + 8 * BH, IW, BH, "Minimal arrow size");
- view.value[64]->align(FL_ALIGN_RIGHT);
- view.value[64]->minimum(0);
- view.value[64]->maximum(100);
- view.value[64]->step(1);
- view.value[64]->callback(view_options_ok_cb);
-
view.butt[0] = new Fl_Check_Button
(L + width - (int)(1.15*BB) - 2 * WB, 2 * WB + 7 * BH, (int)(1.15*BB), BH,
"Proportional");
@@ -1843,7 +1835,7 @@
view.butt[0]->callback(view_options_ok_cb);
view.value[63] = new Fl_Value_Input
- (L + 2 * WB, 2 * WB + 9 * BH, IW, BH, "Displacement factor");
+ (L + 2 * WB, 2 * WB + 8 * BH, IW, BH, "Displacement factor");
view.value[63]->minimum(0.);
view.value[63]->maximum(1.);
view.value[63]->step(0.01);
@@ -1852,7 +1844,7 @@
view.value[63]->callback(view_options_ok_cb);
view.choice[10] = new Fl_Choice
- (L + 2 * WB, 2 * WB + 10 * BH, IW, BH, "Data source");
+ (L + 2 * WB, 2 * WB + 9 * BH, IW, BH, "Data source");
view.choice[10]->align(FL_ALIGN_RIGHT);
view.choice[10]->add("Self");
view.choice[10]->callback(view_options_ok_cb);
@@ -1866,13 +1858,13 @@
{0}
};
view.choice[3] = new Fl_Choice
- (L + 2 * WB, 2 * WB + 11 * BH, IW, BH, "Glyph location");
+ (L + 2 * WB, 2 * WB + 10 * BH, IW, BH, "Glyph location");
view.choice[3]->menu(menu_vecloc);
view.choice[3]->align(FL_ALIGN_RIGHT);
view.choice[3]->callback(view_options_ok_cb);
view.butt[1] = new Fl_Check_Button
- (L + width - (int)(1.15*BB) - 2 * WB, 2 * WB + 11 * BH, (int)(1.15*BB), BH,
+ (L + width - (int)(1.15*BB) - 2 * WB, 2 * WB + 10 * BH, (int)(1.15*BB), BH,
"Center glyph");
view.butt[1]->type(FL_TOGGLE_BUTTON);
view.butt[1]->callback(view_options_ok_cb);
@@ -1882,7 +1874,7 @@
{0}
};
view.choice[4] = new Fl_Choice
- (L + 2 * WB, 2 * WB + 12 * BH, IW, BH, "Tensor display");
+ (L + 2 * WB, 2 * WB + 11 * BH, IW, BH, "Tensor display");
view.choice[4]->menu(menu_tensor);
view.choice[4]->align(FL_ALIGN_RIGHT);
view.choice[4]->callback(view_options_ok_cb);
diff -u -r gmsh-2.2.7-cvs-devel/Graphics/drawPost.cpp gmsh-2.2.7-cvs-20081202/Graphics/drawPost.cpp
--- gmsh-2.2.7-cvs-devel/Graphics/drawPost.cpp 2008-12-03 13:54:57.000000000 +0100
+++ gmsh-2.2.7-cvs-20081202/Graphics/drawPost.cpp 2008-12-02 00:02:53.000000000 +0100
@@ -1078,27 +1078,18 @@
double scale = opt->ArrowSize / lmax;
// log scaling
if(opt->ScaleType == PViewOptions::Logarithmic &&
- opt->ArrowSizeProportional && opt->TmpMin > 0 &&
- opt->TmpMax > opt->TmpMin && l != opt->TmpMin)
- {
- scale = opt->ArrowSize / l *
- log10(l / opt->TmpMin) / log10(opt->TmpMax / opt->TmpMin);
+ opt->ArrowSizeProportional && opt->TmpMin > 0 &&
+ opt->TmpMax > opt->TmpMin && l != opt->TmpMin){
+ scale = opt->ArrowSize / l *
+ log10(l / opt->TmpMin) / log10(opt->TmpMax / opt->TmpMin);
}
double px = v[0] * scale, py = v[1] * scale, pz = v[2] * scale;
// only draw vectors larger than 1 pixel on screen, except when
- // drawing "comet" glyphs or minimal arrow size is larger then 1 pixel
- if(opt->VectorType == 6 || fabs(px) > 1. || fabs(py) > 1. || fabs(pz) > 1. || opt->MinArrowSize>1.){
+ // drawing "comet" glyphs
+ if(opt->VectorType == 6 || fabs(px) > 1. || fabs(py) > 1. || fabs(pz) > 1.){
double d = ctx->pixel_equiv_x / ctx->s[0];
double dx = px * d, dy = py * d, dz = pz * d;
double x = s[0], y = s[1], z = s[2];
- // add to arrow minimal arrow size (value of opt->MinArrowSize is in pixels)
- if(opt->MinArrowSize>1.0){
- dx += d * opt->MinArrowSize*(v[0]/l);
- dy += d * opt->MinArrowSize*(v[1]/l);
- dz += d * opt->MinArrowSize*(v[2]/l);
- }
- // arrow doesn't begin at vector position, vector position is in
- // the middle of arrow
if(opt->CenterGlyphs){
x -= 0.5 * dx;
y -= 0.5 * dy;
diff -u -r gmsh-2.2.7-cvs-devel/Post/PViewOptions.h gmsh-2.2.7-cvs-20081202/Post/PViewOptions.h
--- gmsh-2.2.7-cvs-devel/Post/PViewOptions.h 2008-12-03 10:25:10.000000000 +0100
+++ gmsh-2.2.7-cvs-20081202/Post/PViewOptions.h 2008-11-26 00:02:58.000000000 +0100
@@ -59,7 +59,7 @@
SBoundingBox3d TmpBBox;
double Offset[3], Raise[3], Transform[3][3], DisplacementFactor, NormalRaise;
double Explode;
- double ArrowSize, MinArrowSize, ArrowRelHeadRadius, ArrowRelStemRadius, ArrowRelStemLength;
+ double ArrowSize, ArrowRelHeadRadius, ArrowRelStemRadius, ArrowRelStemLength;
double Normals, Tangents;
int Visible, IntervalsType, NbIso, ArrowSizeProportional;
int Light, LightTwoSide, LightLines, SmoothNormals;
smime.p7s
Description: S/MIME cryptographic signature
_______________________________________________ gmsh mailing list [email protected] http://www.geuz.org/mailman/listinfo/gmsh
