Skip to content
Snippets Groups Projects
Commit e8b78e2f authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

2D graphs + View options UI clean-up

parent 1f63c3e1
No related branches found
No related tags found
No related merge requests found
Expand all Show whitespace changes
Inline Side-by-side
Common/Options.cpp
+ 65
− 42
View file @ e8b78e2f
// $Id: Options.cpp,v 1.50 2001-10-29 08:52:19 geuzaine Exp $ // $Id: Options.cpp,v 1.51 2001-10-29 16:06:55 geuzaine Exp $
#include "Gmsh.h" #include "Gmsh.h"
#include "GmshUI.h" #include "GmshUI.h"
...@@ -1621,7 +1621,7 @@ double opt_view_nb_timestep(OPT_ARGS_NUM){ ...@@ -1621,7 +1621,7 @@ double opt_view_nb_timestep(OPT_ARGS_NUM){
v->NbTimeStep = (int)val; v->NbTimeStep = (int)val;
#ifdef _FLTK #ifdef _FLTK
if(WID && (action & GMSH_GUI) && (num == WID->view_number)) if(WID && (action & GMSH_GUI) && (num == WID->view_number))
WID->view_value[9]->maximum(v->NbTimeStep-1); WID->view_value[50]->maximum(v->NbTimeStep-1);
if(WID && (action & GMSH_GUI) && v->NbTimeStep > 1) if(WID && (action & GMSH_GUI) && v->NbTimeStep > 1)
WID->g_status_butt[5]->activate(); WID->g_status_butt[5]->activate();
#endif #endif
...@@ -1637,7 +1637,7 @@ double opt_view_timestep(OPT_ARGS_NUM){ ...@@ -1637,7 +1637,7 @@ double opt_view_timestep(OPT_ARGS_NUM){
} }
#ifdef _FLTK #ifdef _FLTK
if(WID && (action & GMSH_GUI) && (num == WID->view_number)) if(WID && (action & GMSH_GUI) && (num == WID->view_number))
WID->view_value[9]->value(v->TimeStep); WID->view_value[50]->value(v->TimeStep);
#endif #endif
return v->TimeStep; return v->TimeStep;
} }
...@@ -1665,7 +1665,7 @@ double opt_view_custom_min(OPT_ARGS_NUM){ ...@@ -1665,7 +1665,7 @@ double opt_view_custom_min(OPT_ARGS_NUM){
} }
#ifdef _FLTK #ifdef _FLTK
if(WID && (action & GMSH_GUI) && (num == WID->view_number)){ if(WID && (action & GMSH_GUI) && (num == WID->view_number)){
WID->view_value[0]->value(v->CustomMin); WID->view_value[31]->value(v->CustomMin);
} }
#endif #endif
return v->CustomMin; return v->CustomMin;
...@@ -1678,7 +1678,7 @@ double opt_view_custom_max(OPT_ARGS_NUM){ ...@@ -1678,7 +1678,7 @@ double opt_view_custom_max(OPT_ARGS_NUM){
} }
#ifdef _FLTK #ifdef _FLTK
if(WID && (action & GMSH_GUI) && (num == WID->view_number)) if(WID && (action & GMSH_GUI) && (num == WID->view_number))
WID->view_value[1]->value(v->CustomMax); WID->view_value[32]->value(v->CustomMax);
#endif #endif
return v->CustomMax; return v->CustomMax;
} }
...@@ -1690,7 +1690,7 @@ double opt_view_offset0(OPT_ARGS_NUM){ ...@@ -1690,7 +1690,7 @@ double opt_view_offset0(OPT_ARGS_NUM){
} }
#ifdef _FLTK #ifdef _FLTK
if(WID && (action & GMSH_GUI) && (num == WID->view_number)) if(WID && (action & GMSH_GUI) && (num == WID->view_number))
WID->view_value[3]->value(v->Offset[0]); WID->view_value[40]->value(v->Offset[0]);
#endif #endif
return v->Offset[0]; return v->Offset[0];
} }
...@@ -1702,7 +1702,7 @@ double opt_view_offset1(OPT_ARGS_NUM){ ...@@ -1702,7 +1702,7 @@ double opt_view_offset1(OPT_ARGS_NUM){
} }
#ifdef _FLTK #ifdef _FLTK
if(WID && (action & GMSH_GUI) && (num == WID->view_number)) if(WID && (action & GMSH_GUI) && (num == WID->view_number))
WID->view_value[4]->value(v->Offset[1]); WID->view_value[41]->value(v->Offset[1]);
#endif #endif
return v->Offset[1]; return v->Offset[1];
} }
...@@ -1714,7 +1714,7 @@ double opt_view_offset2(OPT_ARGS_NUM){ ...@@ -1714,7 +1714,7 @@ double opt_view_offset2(OPT_ARGS_NUM){
} }
#ifdef _FLTK #ifdef _FLTK
if(WID && (action & GMSH_GUI) && (num == WID->view_number)) if(WID && (action & GMSH_GUI) && (num == WID->view_number))
WID->view_value[5]->value(v->Offset[2]); WID->view_value[42]->value(v->Offset[2]);
#endif #endif
return v->Offset[2]; return v->Offset[2];
} }
...@@ -1726,7 +1726,7 @@ double opt_view_raise0(OPT_ARGS_NUM){ ...@@ -1726,7 +1726,7 @@ double opt_view_raise0(OPT_ARGS_NUM){
} }
#ifdef _FLTK #ifdef _FLTK
if(WID && (action & GMSH_GUI) && (num == WID->view_number)) if(WID && (action & GMSH_GUI) && (num == WID->view_number))
WID->view_value[6]->value(v->Raise[0]); WID->view_value[43]->value(v->Raise[0]);
#endif #endif
return v->Raise[0]; return v->Raise[0];
} }
...@@ -1738,7 +1738,7 @@ double opt_view_raise1(OPT_ARGS_NUM){ ...@@ -1738,7 +1738,7 @@ double opt_view_raise1(OPT_ARGS_NUM){
} }
#ifdef _FLTK #ifdef _FLTK
if(WID && (action & GMSH_GUI) && (num == WID->view_number)) if(WID && (action & GMSH_GUI) && (num == WID->view_number))
WID->view_value[7]->value(v->Raise[1]); WID->view_value[44]->value(v->Raise[1]);
#endif #endif
return v->Raise[1]; return v->Raise[1];
} }
...@@ -1750,7 +1750,7 @@ double opt_view_raise2(OPT_ARGS_NUM){ ...@@ -1750,7 +1750,7 @@ double opt_view_raise2(OPT_ARGS_NUM){
} }
#ifdef _FLTK #ifdef _FLTK
if(WID && (action & GMSH_GUI) && (num == WID->view_number)) if(WID && (action & GMSH_GUI) && (num == WID->view_number))
WID->view_value[8]->value(v->Raise[2]); WID->view_value[45]->value(v->Raise[2]);
#endif #endif
return v->Raise[2]; return v->Raise[2];
} }
...@@ -1774,7 +1774,7 @@ double opt_view_explode(OPT_ARGS_NUM){ ...@@ -1774,7 +1774,7 @@ double opt_view_explode(OPT_ARGS_NUM){
} }
#ifdef _FLTK #ifdef _FLTK
if(WID && (action & GMSH_GUI) && (num == WID->view_number)) if(WID && (action & GMSH_GUI) && (num == WID->view_number))
WID->view_value[12]->value(v->Explode); WID->view_value[60]->value(v->Explode);
#endif #endif
return v->Explode; return v->Explode;
} }
...@@ -1802,10 +1802,10 @@ double opt_view_intervals_type(OPT_ARGS_NUM){ ...@@ -1802,10 +1802,10 @@ double opt_view_intervals_type(OPT_ARGS_NUM){
} }
#ifdef _FLTK #ifdef _FLTK
if(WID && (action & GMSH_GUI) && (num == WID->view_number)){ if(WID && (action & GMSH_GUI) && (num == WID->view_number)){
WID->view_butt[3]->value(v->IntervalsType==DRAW_POST_ISO); WID->view_butt[30]->value(v->IntervalsType==DRAW_POST_ISO);
WID->view_butt[4]->value(v->IntervalsType==DRAW_POST_DISCRETE); WID->view_butt[31]->value(v->IntervalsType==DRAW_POST_DISCRETE);
WID->view_butt[5]->value(v->IntervalsType==DRAW_POST_CONTINUOUS); WID->view_butt[32]->value(v->IntervalsType==DRAW_POST_CONTINUOUS);
WID->view_butt[6]->value(v->IntervalsType==DRAW_POST_NUMERIC); WID->view_butt[33]->value(v->IntervalsType==DRAW_POST_NUMERIC);
} }
#endif #endif
return v->IntervalsType; return v->IntervalsType;
...@@ -1819,7 +1819,7 @@ double opt_view_saturate_values(OPT_ARGS_NUM){ ...@@ -1819,7 +1819,7 @@ double opt_view_saturate_values(OPT_ARGS_NUM){
} }
#ifdef _FLTK #ifdef _FLTK
if(WID && (action & GMSH_GUI) && (num == WID->view_number)){ if(WID && (action & GMSH_GUI) && (num == WID->view_number)){
WID->view_butt[25]->value(v->SaturateValues); WID->view_butt[38]->value(v->SaturateValues);
} }
#endif #endif
return v->SaturateValues; return v->SaturateValues;
...@@ -1831,6 +1831,13 @@ double opt_view_graph_type(OPT_ARGS_NUM){ ...@@ -1831,6 +1831,13 @@ double opt_view_graph_type(OPT_ARGS_NUM){
v->GraphType = (int)val; v->GraphType = (int)val;
v->Changed = 1; v->Changed = 1;
} }
#ifdef _FLTK
if(WID && (action & GMSH_GUI) && (num == WID->view_number)){
WID->view_butt[1]->value(v->GraphType==DRAW_POST_3D);
WID->view_butt[2]->value(v->GraphType==DRAW_POST_2D_SPACE);
WID->view_butt[3]->value(v->GraphType==DRAW_POST_2D_TIME);
}
#endif
return v->GraphType; return v->GraphType;
} }
...@@ -1840,6 +1847,10 @@ double opt_view_graph_position0(OPT_ARGS_NUM){ ...@@ -1840,6 +1847,10 @@ double opt_view_graph_position0(OPT_ARGS_NUM){
v->GraphPosition[0] = (int)val; v->GraphPosition[0] = (int)val;
v->Changed = 1; v->Changed = 1;
} }
#ifdef _FLTK
if(WID && (action & GMSH_GUI) && (num == WID->view_number))
WID->view_value[20]->value(v->GraphPosition[0]);
#endif
return v->GraphPosition[0]; return v->GraphPosition[0];
} }
...@@ -1849,6 +1860,10 @@ double opt_view_graph_position1(OPT_ARGS_NUM){ ...@@ -1849,6 +1860,10 @@ double opt_view_graph_position1(OPT_ARGS_NUM){
v->GraphPosition[1] = (int)val; v->GraphPosition[1] = (int)val;
v->Changed = 1; v->Changed = 1;
} }
#ifdef _FLTK
if(WID && (action & GMSH_GUI) && (num == WID->view_number))
WID->view_value[21]->value(v->GraphPosition[1]);
#endif
return v->GraphPosition[1]; return v->GraphPosition[1];
} }
...@@ -1858,6 +1873,10 @@ double opt_view_graph_size0(OPT_ARGS_NUM){ ...@@ -1858,6 +1873,10 @@ double opt_view_graph_size0(OPT_ARGS_NUM){
v->GraphSize[0] = (int)val; v->GraphSize[0] = (int)val;
v->Changed = 1; v->Changed = 1;
} }
#ifdef _FLTK
if(WID && (action & GMSH_GUI) && (num == WID->view_number))
WID->view_value[22]->value(v->GraphSize[0]);
#endif
return v->GraphSize[0]; return v->GraphSize[0];
} }
...@@ -1867,6 +1886,10 @@ double opt_view_graph_size1(OPT_ARGS_NUM){ ...@@ -1867,6 +1886,10 @@ double opt_view_graph_size1(OPT_ARGS_NUM){
v->GraphSize[1] = (int)val; v->GraphSize[1] = (int)val;
v->Changed = 1; v->Changed = 1;
} }
#ifdef _FLTK
if(WID && (action & GMSH_GUI) && (num == WID->view_number))
WID->view_value[23]->value(v->GraphSize[1]);
#endif
return v->GraphSize[1]; return v->GraphSize[1];
} }
...@@ -1878,7 +1901,7 @@ double opt_view_nb_iso(OPT_ARGS_NUM){ ...@@ -1878,7 +1901,7 @@ double opt_view_nb_iso(OPT_ARGS_NUM){
} }
#ifdef _FLTK #ifdef _FLTK
if(WID && (action & GMSH_GUI) && (num == WID->view_number)) if(WID && (action & GMSH_GUI) && (num == WID->view_number))
WID->view_value[2]->value(v->NbIso); WID->view_value[30]->value(v->NbIso);
#endif #endif
return v->NbIso; return v->NbIso;
} }
...@@ -1903,7 +1926,7 @@ double opt_view_light(OPT_ARGS_NUM){ ...@@ -1903,7 +1926,7 @@ double opt_view_light(OPT_ARGS_NUM){
} }
#ifdef _FLTK #ifdef _FLTK
if(WID && (action & GMSH_GUI) && (num == WID->view_number)) if(WID && (action & GMSH_GUI) && (num == WID->view_number))
WID->view_butt[17]->value(v->Light); WID->view_butt[11]->value(v->Light);
#endif #endif
return v->Light; return v->Light;
} }
...@@ -1915,7 +1938,7 @@ double opt_view_smooth_normals(OPT_ARGS_NUM){ ...@@ -1915,7 +1938,7 @@ double opt_view_smooth_normals(OPT_ARGS_NUM){
} }
#ifdef _FLTK #ifdef _FLTK
if(WID && (action & GMSH_GUI) && (num == WID->view_number)) if(WID && (action & GMSH_GUI) && (num == WID->view_number))
WID->view_butt[27]->value(v->SmoothNormals); WID->view_butt[12]->value(v->SmoothNormals);
#endif #endif
return v->SmoothNormals; return v->SmoothNormals;
} }
...@@ -1928,7 +1951,7 @@ double opt_view_angle_smooth_normals(OPT_ARGS_NUM){ ...@@ -1928,7 +1951,7 @@ double opt_view_angle_smooth_normals(OPT_ARGS_NUM){
} }
#ifdef _FLTK #ifdef _FLTK
if(WID && (action & GMSH_GUI) && (num == WID->view_number)) if(WID && (action & GMSH_GUI) && (num == WID->view_number))
WID->view_value[13]->value(v->AngleSmoothNormals); WID->view_value[10]->value(v->AngleSmoothNormals);
#endif #endif
return v->AngleSmoothNormals; return v->AngleSmoothNormals;
} }
...@@ -1940,7 +1963,7 @@ double opt_view_show_element(OPT_ARGS_NUM){ ...@@ -1940,7 +1963,7 @@ double opt_view_show_element(OPT_ARGS_NUM){
} }
#ifdef _FLTK #ifdef _FLTK
if(WID && (action & GMSH_GUI) && (num == WID->view_number)) if(WID && (action & GMSH_GUI) && (num == WID->view_number))
WID->view_butt[13]->value(v->ShowElement); WID->view_butt[10]->value(v->ShowElement);
#endif #endif
return v->ShowElement; return v->ShowElement;
} }
...@@ -1951,7 +1974,7 @@ double opt_view_show_time(OPT_ARGS_NUM){ ...@@ -1951,7 +1974,7 @@ double opt_view_show_time(OPT_ARGS_NUM){
} }
#ifdef _FLTK #ifdef _FLTK
if(WID && (action & GMSH_GUI) && (num == WID->view_number)) if(WID && (action & GMSH_GUI) && (num == WID->view_number))
WID->view_butt[15]->value(v->ShowTime); WID->view_butt[50]->value(v->ShowTime);
#endif #endif
return v->ShowTime; return v->ShowTime;
} }
...@@ -1962,7 +1985,7 @@ double opt_view_show_scale(OPT_ARGS_NUM){ ...@@ -1962,7 +1985,7 @@ double opt_view_show_scale(OPT_ARGS_NUM){
} }
#ifdef _FLTK #ifdef _FLTK
if(WID && (action & GMSH_GUI) && (num == WID->view_number)) if(WID && (action & GMSH_GUI) && (num == WID->view_number))
WID->view_butt[14]->value(v->ShowScale); WID->view_butt[4]->value(v->ShowScale);
#endif #endif
return v->ShowScale; return v->ShowScale;
} }
...@@ -1974,7 +1997,7 @@ double opt_view_draw_points(OPT_ARGS_NUM){ ...@@ -1974,7 +1997,7 @@ double opt_view_draw_points(OPT_ARGS_NUM){
} }
#ifdef _FLTK #ifdef _FLTK
if(WID && (action & GMSH_GUI) && (num == WID->view_number)) if(WID && (action & GMSH_GUI) && (num == WID->view_number))
WID->view_butt[18]->value(v->DrawPoints); WID->view_butt[13]->value(v->DrawPoints);
#endif #endif
return v->DrawPoints; return v->DrawPoints;
} }
...@@ -1986,7 +2009,7 @@ double opt_view_draw_lines(OPT_ARGS_NUM){ ...@@ -1986,7 +2009,7 @@ double opt_view_draw_lines(OPT_ARGS_NUM){
} }
#ifdef _FLTK #ifdef _FLTK
if(WID && (action & GMSH_GUI) && (num == WID->view_number)) if(WID && (action & GMSH_GUI) && (num == WID->view_number))
WID->view_butt[19]->value(v->DrawLines); WID->view_butt[14]->value(v->DrawLines);
#endif #endif
return v->DrawLines; return v->DrawLines;
} }
...@@ -1998,7 +2021,7 @@ double opt_view_draw_triangles(OPT_ARGS_NUM){ ...@@ -1998,7 +2021,7 @@ double opt_view_draw_triangles(OPT_ARGS_NUM){
} }
#ifdef _FLTK #ifdef _FLTK
if(WID && (action & GMSH_GUI) && (num == WID->view_number)) if(WID && (action & GMSH_GUI) && (num == WID->view_number))
WID->view_butt[20]->value(v->DrawTriangles); WID->view_butt[15]->value(v->DrawTriangles);
#endif #endif
return v->DrawTriangles; return v->DrawTriangles;
} }
...@@ -2010,7 +2033,7 @@ double opt_view_draw_tetrahedra(OPT_ARGS_NUM){ ...@@ -2010,7 +2033,7 @@ double opt_view_draw_tetrahedra(OPT_ARGS_NUM){
} }
#ifdef _FLTK #ifdef _FLTK
if(WID && (action & GMSH_GUI) && (num == WID->view_number)) if(WID && (action & GMSH_GUI) && (num == WID->view_number))
WID->view_butt[21]->value(v->DrawTetrahedra); WID->view_butt[16]->value(v->DrawTetrahedra);
#endif #endif
return v->DrawTetrahedra; return v->DrawTetrahedra;
} }
...@@ -2022,7 +2045,7 @@ double opt_view_draw_scalars(OPT_ARGS_NUM){ ...@@ -2022,7 +2045,7 @@ double opt_view_draw_scalars(OPT_ARGS_NUM){
} }
#ifdef _FLTK #ifdef _FLTK
if(WID && (action & GMSH_GUI) && (num == WID->view_number)) if(WID && (action & GMSH_GUI) && (num == WID->view_number))
WID->view_butt[22]->value(v->DrawScalars); WID->view_butt[17]->value(v->DrawScalars);
#endif #endif
return v->DrawScalars; return v->DrawScalars;
} }
...@@ -2034,7 +2057,7 @@ double opt_view_draw_vectors(OPT_ARGS_NUM){ ...@@ -2034,7 +2057,7 @@ double opt_view_draw_vectors(OPT_ARGS_NUM){
} }
#ifdef _FLTK #ifdef _FLTK
if(WID && (action & GMSH_GUI) && (num == WID->view_number)) if(WID && (action & GMSH_GUI) && (num == WID->view_number))
WID->view_butt[23]->value(v->DrawVectors); WID->view_butt[18]->value(v->DrawVectors);
#endif #endif
return v->DrawVectors; return v->DrawVectors;
} }
...@@ -2046,7 +2069,7 @@ double opt_view_draw_tensors(OPT_ARGS_NUM){ ...@@ -2046,7 +2069,7 @@ double opt_view_draw_tensors(OPT_ARGS_NUM){
} }
#ifdef _FLTK #ifdef _FLTK
if(WID && (action & GMSH_GUI) && (num == WID->view_number)) if(WID && (action & GMSH_GUI) && (num == WID->view_number))
WID->view_butt[24]->value(v->DrawTensors); WID->view_butt[19]->value(v->DrawTensors);
#endif #endif
return v->DrawTensors; return v->DrawTensors;
} }
...@@ -2057,7 +2080,7 @@ double opt_view_transparent_scale(OPT_ARGS_NUM){ ...@@ -2057,7 +2080,7 @@ double opt_view_transparent_scale(OPT_ARGS_NUM){
} }
#ifdef _FLTK #ifdef _FLTK
if(WID && (action & GMSH_GUI) && (num == WID->view_number)) if(WID && (action & GMSH_GUI) && (num == WID->view_number))
WID->view_butt[16]->value(v->TransparentScale); WID->view_butt[5]->value(v->TransparentScale);
#endif #endif
return v->TransparentScale; return v->TransparentScale;
} }
...@@ -2069,9 +2092,9 @@ double opt_view_scale_type(OPT_ARGS_NUM){ ...@@ -2069,9 +2092,9 @@ double opt_view_scale_type(OPT_ARGS_NUM){
} }
#ifdef _FLTK #ifdef _FLTK
if(WID && (action & GMSH_GUI) && (num == WID->view_number)){ if(WID && (action & GMSH_GUI) && (num == WID->view_number)){
WID->view_butt[1]->value(v->ScaleType==DRAW_POST_LINEAR); WID->view_butt[35]->value(v->ScaleType==DRAW_POST_LINEAR);
WID->view_butt[2]->value(v->ScaleType==DRAW_POST_LOGARITHMIC); WID->view_butt[36]->value(v->ScaleType==DRAW_POST_LOGARITHMIC);
WID->view_butt[26]->value(v->ScaleType==DRAW_POST_DOUBLELOGARITHMIC); WID->view_butt[37]->value(v->ScaleType==DRAW_POST_DOUBLELOGARITHMIC);
} }
#endif #endif
return v->ScaleType; return v->ScaleType;
...@@ -2084,7 +2107,7 @@ double opt_view_range_type(OPT_ARGS_NUM){ ...@@ -2084,7 +2107,7 @@ double opt_view_range_type(OPT_ARGS_NUM){
} }
#ifdef _FLTK #ifdef _FLTK
if(WID && (action & GMSH_GUI) && (num == WID->view_number)) if(WID && (action & GMSH_GUI) && (num == WID->view_number))
WID->view_butt[0]->value(v->RangeType==DRAW_POST_CUSTOM); WID->view_butt[34]->value(v->RangeType==DRAW_POST_CUSTOM);
#endif #endif
return v->RangeType; return v->RangeType;
} }
...@@ -2096,10 +2119,10 @@ double opt_view_arrow_type(OPT_ARGS_NUM){ ...@@ -2096,10 +2119,10 @@ double opt_view_arrow_type(OPT_ARGS_NUM){
} }
#ifdef _FLTK #ifdef _FLTK
if(WID && (action & GMSH_GUI) && (num == WID->view_number)){ if(WID && (action & GMSH_GUI) && (num == WID->view_number)){
WID->view_butt[7]->value(v->ArrowType==DRAW_POST_SEGMENT); WID->view_butt[60]->value(v->ArrowType==DRAW_POST_SEGMENT);
WID->view_butt[8]->value(v->ArrowType==DRAW_POST_ARROW); WID->view_butt[61]->value(v->ArrowType==DRAW_POST_ARROW);
WID->view_butt[9]->value(v->ArrowType==DRAW_POST_CONE); WID->view_butt[62]->value(v->ArrowType==DRAW_POST_CONE);
WID->view_butt[10]->value(v->ArrowType==DRAW_POST_DISPLACEMENT); WID->view_butt[63]->value(v->ArrowType==DRAW_POST_DISPLACEMENT);
} }
#endif #endif
return v->ArrowType; return v->ArrowType;
...@@ -2112,8 +2135,8 @@ double opt_view_arrow_location(OPT_ARGS_NUM){ ...@@ -2112,8 +2135,8 @@ double opt_view_arrow_location(OPT_ARGS_NUM){
} }
#ifdef _FLTK #ifdef _FLTK
if(WID && (action & GMSH_GUI) && (num == WID->view_number)){ if(WID && (action & GMSH_GUI) && (num == WID->view_number)){
WID->view_butt[11]->value(v->ArrowLocation==DRAW_POST_LOCATE_COG); WID->view_butt[64]->value(v->ArrowLocation==DRAW_POST_LOCATE_COG);
WID->view_butt[12]->value(v->ArrowLocation==DRAW_POST_LOCATE_VERTEX); WID->view_butt[65]->value(v->ArrowLocation==DRAW_POST_LOCATE_VERTEX);
} }
#endif #endif
return v->ArrowLocation; return v->ArrowLocation;
......
Fltk/Callbacks.cpp
+ 98
− 78
View file @ e8b78e2f
// $Id: Callbacks.cpp,v 1.86 2001-10-29 08:52:19 geuzaine Exp $ // $Id: Callbacks.cpp,v 1.87 2001-10-29 16:06:55 geuzaine Exp $
#include <sys/types.h> #include <sys/types.h>
#include <signal.h> #include <signal.h>
...@@ -1737,13 +1737,13 @@ void view_options_plugin_cb(CALLBACK_ARGS){ ...@@ -1737,13 +1737,13 @@ void view_options_plugin_cb(CALLBACK_ARGS){
} }
void view_options_custom_cb(CALLBACK_ARGS){ void view_options_custom_cb(CALLBACK_ARGS){
if(WID->view_butt[0]->value()){ if(WID->view_butt[34]->value()){
WID->view_value[0]->activate(); WID->view_value[31]->activate();
WID->view_value[1]->activate(); WID->view_value[32]->activate();
} }
else{ else{
WID->view_value[0]->deactivate(); WID->view_value[31]->deactivate();
WID->view_value[1]->deactivate(); WID->view_value[32]->deactivate();
} }
} }
...@@ -1773,122 +1773,130 @@ void view_options_ok_cb(CALLBACK_ARGS){ ...@@ -1773,122 +1773,130 @@ void view_options_ok_cb(CALLBACK_ARGS){
// view_butts // view_butts
//not this one. if(WID->view_butt[0]->changed()) //not this one. if(WID->view_butt[34]->changed())
opt_view_range_type(i, GMSH_SET, opt_view_range_type(i, GMSH_SET,
WID->view_butt[0]->value()?DRAW_POST_CUSTOM: WID->view_butt[34]->value()?DRAW_POST_CUSTOM:
DRAW_POST_DEFAULT); DRAW_POST_DEFAULT);
if(force || WID->view_butt[1]->changed() || if(force || WID->view_butt[1]->changed() ||
WID->view_butt[2]->changed() || WID->view_butt[2]->changed() ||
WID->view_butt[3]->changed()) WID->view_butt[3]->changed())
opt_view_graph_type(i, GMSH_SET,
WID->view_butt[1]->value()?DRAW_POST_3D:
WID->view_butt[2]->value()?DRAW_POST_2D_SPACE:
DRAW_POST_2D_TIME);
if(force || WID->view_butt[35]->changed() ||
WID->view_butt[36]->changed() ||
WID->view_butt[37]->changed())
opt_view_scale_type(i, GMSH_SET, opt_view_scale_type(i, GMSH_SET,
WID->view_butt[1]->value()?DRAW_POST_LINEAR: WID->view_butt[35]->value()?DRAW_POST_LINEAR:
WID->view_butt[2]->value()?DRAW_POST_LOGARITHMIC: WID->view_butt[36]->value()?DRAW_POST_LOGARITHMIC:
DRAW_POST_DOUBLELOGARITHMIC); DRAW_POST_DOUBLELOGARITHMIC);
if(force || WID->view_butt[25]->changed()) if(force || WID->view_butt[38]->changed())
opt_view_saturate_values(i, GMSH_SET, opt_view_saturate_values(i, GMSH_SET,
WID->view_butt[25]->value()); WID->view_butt[38]->value());
if(force || WID->view_butt[3]->changed() || if(force || WID->view_butt[30]->changed() ||
WID->view_butt[4]->changed() || WID->view_butt[31]->changed() ||
WID->view_butt[5]->changed() || WID->view_butt[32]->changed() ||
WID->view_butt[6]->changed()) WID->view_butt[33]->changed())
opt_view_intervals_type(i, GMSH_SET, opt_view_intervals_type(i, GMSH_SET,
WID->view_butt[3]->value()?DRAW_POST_ISO: WID->view_butt[30]->value()?DRAW_POST_ISO:
WID->view_butt[4]->value()?DRAW_POST_DISCRETE: WID->view_butt[31]->value()?DRAW_POST_DISCRETE:
WID->view_butt[5]->value()?DRAW_POST_CONTINUOUS: WID->view_butt[32]->value()?DRAW_POST_CONTINUOUS:
DRAW_POST_NUMERIC); DRAW_POST_NUMERIC);
if(force || WID->view_butt[7]->changed() || if(force || WID->view_butt[60]->changed() ||
WID->view_butt[8]->changed() || WID->view_butt[61]->changed() ||
WID->view_butt[9]->changed() || WID->view_butt[62]->changed() ||
WID->view_butt[10]->changed()) WID->view_butt[63]->changed())
opt_view_arrow_type(i, GMSH_SET, opt_view_arrow_type(i, GMSH_SET,
WID->view_butt[7]->value()?DRAW_POST_SEGMENT: WID->view_butt[60]->value()?DRAW_POST_SEGMENT:
WID->view_butt[8]->value()?DRAW_POST_ARROW: WID->view_butt[61]->value()?DRAW_POST_ARROW:
WID->view_butt[9]->value()?DRAW_POST_CONE: WID->view_butt[62]->value()?DRAW_POST_CONE:
DRAW_POST_DISPLACEMENT); DRAW_POST_DISPLACEMENT);
if(force || WID->view_butt[11]->changed() || if(force || WID->view_butt[64]->changed() ||
WID->view_butt[12]->changed()) WID->view_butt[65]->changed())
opt_view_arrow_location(i, GMSH_SET, opt_view_arrow_location(i, GMSH_SET,
WID->view_butt[11]->value()?DRAW_POST_LOCATE_COG: WID->view_butt[64]->value()?DRAW_POST_LOCATE_COG:
DRAW_POST_LOCATE_VERTEX); DRAW_POST_LOCATE_VERTEX);
if(force || WID->view_butt[10]->changed())
opt_view_show_element(i, GMSH_SET, WID->view_butt[10]->value());
if(force || WID->view_butt[4]->changed())
opt_view_show_scale(i, GMSH_SET, WID->view_butt[4]->value());
if(force || WID->view_butt[50]->changed())
opt_view_show_time(i, GMSH_SET, WID->view_butt[50]->value());
if(force || WID->view_butt[5]->changed())
opt_view_transparent_scale(i, GMSH_SET, WID->view_butt[5]->value());
if(force || WID->view_butt[11]->changed())
opt_view_light(i,GMSH_SET,WID->view_butt[11]->value());
if(force || WID->view_butt[12]->changed())
opt_view_smooth_normals(i,GMSH_SET,WID->view_butt[12]->value());
if(force || WID->view_butt[13]->changed()) if(force || WID->view_butt[13]->changed())
opt_view_show_element(i, GMSH_SET, WID->view_butt[13]->value()); opt_view_draw_points(i, GMSH_SET, WID->view_butt[13]->value());
if(force || WID->view_butt[14]->changed()) if(force || WID->view_butt[14]->changed())
opt_view_show_scale(i, GMSH_SET, WID->view_butt[14]->value()); opt_view_draw_lines(i, GMSH_SET, WID->view_butt[14]->value());
if(force || WID->view_butt[15]->changed()) if(force || WID->view_butt[15]->changed())
opt_view_show_time(i, GMSH_SET, WID->view_butt[15]->value()); opt_view_draw_triangles(i, GMSH_SET, WID->view_butt[15]->value());
if(force || WID->view_butt[16]->changed()) if(force || WID->view_butt[16]->changed())
opt_view_transparent_scale(i, GMSH_SET, WID->view_butt[16]->value()); opt_view_draw_tetrahedra(i, GMSH_SET, WID->view_butt[16]->value());
if(force || WID->view_butt[17]->changed()) if(force || WID->view_butt[17]->changed())
opt_view_light(i,GMSH_SET,WID->view_butt[17]->value()); opt_view_draw_scalars(i, GMSH_SET, WID->view_butt[17]->value());
if(force || WID->view_butt[27]->changed())
opt_view_smooth_normals(i,GMSH_SET,WID->view_butt[27]->value());
if(force || WID->view_butt[18]->changed()) if(force || WID->view_butt[18]->changed())
opt_view_draw_points(i, GMSH_SET, WID->view_butt[18]->value()); opt_view_draw_vectors(i, GMSH_SET, WID->view_butt[18]->value());
if(force || WID->view_butt[19]->changed()) if(force || WID->view_butt[19]->changed())
opt_view_draw_lines(i, GMSH_SET, WID->view_butt[19]->value()); opt_view_draw_tensors(i, GMSH_SET, WID->view_butt[19]->value());
if(force || WID->view_butt[20]->changed())
opt_view_draw_triangles(i, GMSH_SET, WID->view_butt[20]->value());
if(force || WID->view_butt[21]->changed())
opt_view_draw_tetrahedra(i, GMSH_SET, WID->view_butt[21]->value());
if(force || WID->view_butt[22]->changed())
opt_view_draw_scalars(i, GMSH_SET, WID->view_butt[22]->value());
if(force || WID->view_butt[23]->changed())
opt_view_draw_vectors(i, GMSH_SET, WID->view_butt[23]->value());
if(force || WID->view_butt[24]->changed())
opt_view_draw_tensors(i, GMSH_SET, WID->view_butt[24]->value());
// view_values // view_values
if(force || WID->view_value[0]->changed()) if(force || WID->view_value[31]->changed())
opt_view_custom_min(i, GMSH_SET, WID->view_value[0]->value()); opt_view_custom_min(i, GMSH_SET, WID->view_value[31]->value());
if(force || WID->view_value[1]->changed()) if(force || WID->view_value[32]->changed())
opt_view_custom_max(i, GMSH_SET, WID->view_value[1]->value()); opt_view_custom_max(i, GMSH_SET, WID->view_value[32]->value());
if(force || WID->view_value[2]->changed()) if(force || WID->view_value[30]->changed())
opt_view_nb_iso(i, GMSH_SET, WID->view_value[2]->value()); opt_view_nb_iso(i, GMSH_SET, WID->view_value[30]->value());
if(force || WID->view_value[3]->changed()) if(force || WID->view_value[40]->changed())
opt_view_offset0(i, GMSH_SET, WID->view_value[3]->value()); opt_view_offset0(i, GMSH_SET, WID->view_value[40]->value());
if(force || WID->view_value[4]->changed()) if(force || WID->view_value[41]->changed())
opt_view_offset1(i, GMSH_SET, WID->view_value[4]->value()); opt_view_offset1(i, GMSH_SET, WID->view_value[41]->value());
if(force || WID->view_value[5]->changed()) if(force || WID->view_value[42]->changed())
opt_view_offset2(i, GMSH_SET, WID->view_value[5]->value()); opt_view_offset2(i, GMSH_SET, WID->view_value[42]->value());
if(force || WID->view_value[6]->changed()) if(force || WID->view_value[43]->changed())
opt_view_raise0(i, GMSH_SET, WID->view_value[6]->value()); opt_view_raise0(i, GMSH_SET, WID->view_value[43]->value());
if(force || WID->view_value[7]->changed()) if(force || WID->view_value[44]->changed())
opt_view_raise1(i, GMSH_SET, WID->view_value[7]->value()); opt_view_raise1(i, GMSH_SET, WID->view_value[44]->value());
if(force || WID->view_value[8]->changed()) if(force || WID->view_value[45]->changed())
opt_view_raise2(i, GMSH_SET, WID->view_value[8]->value()); opt_view_raise2(i, GMSH_SET, WID->view_value[45]->value());
if(force || WID->view_value[9]->changed()) if(force || WID->view_value[50]->changed())
opt_view_timestep(i, GMSH_SET, WID->view_value[9]->value()); opt_view_timestep(i, GMSH_SET, WID->view_value[50]->value());
if(force || WID->view_value[10]->changed()) if(force || WID->view_value[60]->changed())
opt_view_arrow_scale(i, GMSH_SET, WID->view_value[10]->value()); opt_view_arrow_scale(i, GMSH_SET, WID->view_value[60]->value());
if(force || WID->view_value[11]->changed()) if(force || WID->view_value[11]->changed())
opt_view_boundary(i, GMSH_SET, WID->view_value[11]->value()); opt_view_boundary(i, GMSH_SET, WID->view_value[11]->value());
...@@ -1896,8 +1904,20 @@ void view_options_ok_cb(CALLBACK_ARGS){ ...@@ -1896,8 +1904,20 @@ void view_options_ok_cb(CALLBACK_ARGS){
if(force || WID->view_value[12]->changed()) if(force || WID->view_value[12]->changed())
opt_view_explode(i, GMSH_SET, WID->view_value[12]->value()); opt_view_explode(i, GMSH_SET, WID->view_value[12]->value());
if(force || WID->view_value[13]->changed()) if(force || WID->view_value[10]->changed())
opt_view_angle_smooth_normals(i,GMSH_SET,WID->view_value[13]->value()); opt_view_angle_smooth_normals(i,GMSH_SET,WID->view_value[10]->value());
if(force || WID->view_value[20]->changed())
opt_view_graph_position0(i,GMSH_SET,WID->view_value[20]->value());
if(force || WID->view_value[21]->changed())
opt_view_graph_position1(i,GMSH_SET,WID->view_value[21]->value());
if(force || WID->view_value[22]->changed())
opt_view_graph_size0(i,GMSH_SET,WID->view_value[22]->value());
if(force || WID->view_value[23]->changed())
opt_view_graph_size1(i,GMSH_SET,WID->view_value[23]->value());
// view_inputs // view_inputs
......
Fltk/GUI.cpp
+ 206
− 167
View file @ e8b78e2f
This diff is collapsed.
Fltk/GUI.h
+ 1
− 1
View file @ e8b78e2f
...@@ -160,7 +160,7 @@ public: ...@@ -160,7 +160,7 @@ public:
int init_view_window, view_number ; int init_view_window, view_number ;
Fl_Window *view_window ; Fl_Window *view_window ;
Fl_Group *view_timestep, *view_vector ; Fl_Group *view_timestep, *view_vector ;
#define VIEW_OPT_BUTT 50 #define VIEW_OPT_BUTT 100
Fl_Check_Button *view_butt[VIEW_OPT_BUTT] ; Fl_Check_Button *view_butt[VIEW_OPT_BUTT] ;
Fl_Value_Input *view_value[VIEW_OPT_BUTT] ; Fl_Value_Input *view_value[VIEW_OPT_BUTT] ;
Fl_Input *view_input[VIEW_OPT_BUTT] ; Fl_Input *view_input[VIEW_OPT_BUTT] ;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment