From 77e5e7bb9eb0e585d8ed35b94dd29510e4aa819a Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Wed, 10 Jan 2001 12:12:18 +0000
Subject: [PATCH] *** empty log message ***
---
Common/Context.cpp | 3 ++-
Common/Views.h | 4 ++--
Fltk/Callbacks.cpp | 12 +++++++-----
Fltk/GUI.cpp | 28 +++++++++++++++++++++-------
4 files changed, 32 insertions(+), 15 deletions(-)
diff --git a/Common/Context.cpp b/Common/Context.cpp
index ee823cc8c0..2db6aea23a 100644
--- a/Common/Context.cpp
+++ b/Common/Context.cpp
@@ -1,4 +1,4 @@
-// $Id: Context.cpp,v 1.28 2001-01-10 10:06:15 geuzaine Exp $
+// $Id: Context.cpp,v 1.29 2001-01-10 12:12:17 geuzaine Exp $
#include "Gmsh.h"
#include "Const.h"
@@ -201,6 +201,7 @@ void Init_Context(void){
CTX.font = "-*-helvetica-medium-r-*-*-*-*-*-*-*-*-*-*" ;
CTX.fixed_font = "fixed" ;
+ CTX.lc = 1.0 ;
CTX.min[0] = CTX.min[1] = CTX.min[2] = 0.0 ;
CTX.max[0] = CTX.max[1] = CTX.max[2] = 1.0 ;
CTX.range[0] = CTX.range[1] = CTX.range[2] = 1.0 ;
diff --git a/Common/Views.h b/Common/Views.h
index f1a00f7209..1f304f3b8c 100644
--- a/Common/Views.h
+++ b/Common/Views.h
@@ -61,11 +61,11 @@ extern List_T *Post_ViewList;
#define DRAW_POST_LOCATE_COG 1
#define DRAW_POST_LOCATE_VERTEX 2
-// ScaleType
+// RangeType
#define DRAW_POST_DEFAULT 1
#define DRAW_POST_CUSTOM 2
-// RangeType
+// ScaleType
#define DRAW_POST_LINEAR 1
#define DRAW_POST_LOGARITHMIC 2
diff --git a/Fltk/Callbacks.cpp b/Fltk/Callbacks.cpp
index 53a8244b57..778cb5665b 100644
--- a/Fltk/Callbacks.cpp
+++ b/Fltk/Callbacks.cpp
@@ -1,4 +1,4 @@
-// $Id: Callbacks.cpp,v 1.9 2001-01-10 10:40:23 geuzaine Exp $
+// $Id: Callbacks.cpp,v 1.10 2001-01-10 12:12:18 geuzaine Exp $
#include "Gmsh.h"
#include "GmshUI.h"
@@ -915,31 +915,33 @@ void view_options_custom_range_cb(CALLBACK_ARGS){
STARTVIEWMOD
if(((Fl_Check_Button*)w)->value()){
WID->activate_custom(1);
- v->ScaleType = DRAW_POST_CUSTOM;
+ v->RangeType = DRAW_POST_CUSTOM;
}
else{
WID->activate_custom(0);
- v->ScaleType = DRAW_POST_DEFAULT;
+ v->RangeType = DRAW_POST_DEFAULT;
}
ENDVIEWMOD
}
void view_options_custom_min_cb(CALLBACK_ARGS){
STARTVIEWMOD
+ //printf("set cust min %d %d %g\n", v->Num, i, ((Fl_Value_Input*)w)->value());
v->CustomMin = ((Fl_Value_Input*)w)->value() ;
ENDVIEWMOD
}
void view_options_custom_max_cb(CALLBACK_ARGS){
STARTVIEWMOD
+ //printf("set cust max %d %d %g\n", v->Num, i, ((Fl_Value_Input*)w)->value());
v->CustomMax = ((Fl_Value_Input*)w)->value() ;
ENDVIEWMOD
}
void view_options_linear_range_cb(CALLBACK_ARGS){
STARTVIEWMOD
if(((Fl_Check_Button*)w)->value()){
- v->RangeType = DRAW_POST_LINEAR;
+ v->ScaleType = DRAW_POST_LINEAR;
}
else{
- v->RangeType = DRAW_POST_LOGARITHMIC;
+ v->ScaleType = DRAW_POST_LOGARITHMIC;
}
ENDVIEWMOD
}
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index 07babdf1d5..a572f958a0 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1075,7 +1075,7 @@ void GUI::create_post_options_window(){
post_value[0] = new Fl_Value_Input(2*WB, 2*WB+1*BH, IW, BH, "Delay");
post_value[0]->minimum(0);
post_value[0]->maximum(10);
- post_value[0]->step(0.1);
+ post_value[0]->step(0.01);
post_value[0]->callback(opt_post_anim_delay_cb);
post_value[0]->value(CTX.post.anim_delay);
post_value[0]->labelsize(CTX.fontsize);
@@ -1300,6 +1300,7 @@ void GUI::create_about_window(){
void GUI::create_view_window(int num){
static int init_view_window = 0;
int i;
+ double val;
if(!init_view_window){
init_view_window = 1 ;
@@ -1411,7 +1412,8 @@ void GUI::create_view_window(int num){
view_value[9]->labelsize(CTX.fontsize);
view_value[9]->type(FL_HORIZONTAL);
view_value[9]->align(FL_ALIGN_RIGHT);
- view_value[9]->minimum(1);
+ view_value[9]->minimum(0);
+ view_value[9]->maximum(0);
view_value[9]->step(1);
view_timestep->end();
}
@@ -1494,18 +1496,24 @@ void GUI::create_view_window(int num){
view_input[1]->value(v->Format);
// range
- if(v->ScaleType==DRAW_POST_CUSTOM) activate_custom(1);
+ if(v->RangeType==DRAW_POST_CUSTOM) activate_custom(1);
else activate_custom(0);
view_butt[3]->callback(view_options_custom_range_cb, (void*)num);
- view_butt[3]->value(v->ScaleType==DRAW_POST_CUSTOM);
+ view_butt[3]->value(v->RangeType==DRAW_POST_CUSTOM);
view_value[0]->callback(view_options_custom_min_cb, (void*)num);
view_value[0]->value(v->CustomMin);
view_value[1]->callback(view_options_custom_max_cb, (void*)num);
view_value[1]->value(v->CustomMax);
+ val = v->CustomMax-v->CustomMin ;
+ for(i=0 ; i<2 ; i++){
+ view_value[i]->step(val,1000);
+ view_value[i]->minimum(v->CustomMin);
+ view_value[i]->maximum(v->CustomMax);
+ }
view_butt[4]->callback(view_options_linear_range_cb, (void*)num);
- view_butt[4]->value(v->RangeType==DRAW_POST_LINEAR);
+ view_butt[4]->value(v->ScaleType==DRAW_POST_LINEAR);
view_butt[5]->callback(view_options_logarithmic_range_cb, (void*)num);
- view_butt[5]->value(v->RangeType==DRAW_POST_LOGARITHMIC);
+ view_butt[5]->value(v->ScaleType==DRAW_POST_LOGARITHMIC);
// intervals
view_value[2]->callback(view_options_nbiso_cb, (void*)num);
@@ -1532,13 +1540,19 @@ void GUI::create_view_window(int num){
view_value[7]->value(v->Raise[1]);
view_value[8]->callback(view_options_zraise_cb, (void*)num);
view_value[8]->value(v->Raise[2]);
+ val = 10.*CTX.lc ;
+ for(i=3 ; i<9 ; i++){
+ view_value[i]->step(val,1000);
+ view_value[i]->minimum(-val);
+ view_value[i]->maximum(val);
+ }
// timestep
if(v->NbTimeStep==1) view_timestep->deactivate();
else view_timestep->activate();
view_value[9]->callback(view_options_timestep_cb, (void*)num);
view_value[9]->value(v->TimeStep);
- view_value[9]->maximum(v->NbTimeStep);
+ view_value[9]->maximum(v->NbTimeStep-1);
// vector
if(v->ScalarOnly) view_vector->deactivate();
--
GitLab