diff --git a/Common/Context.h b/Common/Context.h
index 6d87a44df2e598309f11ef7c0d9faabc66acfaf8..e02c5daac5f1d7440077d56878aca90a44bf8ae2 100644
--- a/Common/Context.h
+++ b/Common/Context.h
@@ -109,7 +109,7 @@ public :
int point_sel_size, line_sel_width;
int hidden, shade;
int highlight;
- int level, old_circle, old_newreg;
+ int level, old_circle, circle_points, old_newreg;
double normals, tangents;
double scaling_factor;
int color_scheme ;
diff --git a/Common/DefaultOptions.h b/Common/DefaultOptions.h
index 95d199c708df77e4573ab7248fab7fc637dc8f91..4b6c9292e0ef6490efab08842b9aca764a9583ca 100644
--- a/Common/DefaultOptions.h
+++ b/Common/DefaultOptions.h
@@ -63,6 +63,8 @@ StringXString ViewOptions_String[] = {
"Number format (in standard C form)" },
{ F, "FileName" , opt_view_filename , "" ,
"Default file name to assign to the post-processing view" },
+ { F|O, "AbscissaName" , opt_view_abscissa_name , "" ,
+ "Abscissa name for 2D graphs" },
{ 0, NULL , NULL , NULL , NULL }
} ;
@@ -329,6 +331,8 @@ StringXNumber GeometryOptions_Number[] = {
"Use old circle description (compatibility option for old Gmsh geometries)" },
{ F|O, "OldNewReg" , opt_geometry_old_newreg , 1. ,
"Use old newreg definition for geometrical transformations (compatibility option for old Gmsh geometries)" },
+ { F|O, "CirclePoints" , opt_geometry_circle_points, 20. ,
+ "Number of points used to draw a circle/ellipsis" },
{ F|O, "ScalingFactor" , opt_geometry_scaling_factor , 1.0 ,
"Global geometry scaling factor" },
{ F|O, "ColorScheme" , opt_geometry_color_scheme , 0. ,
@@ -445,6 +449,18 @@ StringXNumber PostProcessingOptions_Number[] = {
} ;
StringXNumber ViewOptions_Number[] = {
+ { F|O, "Type" , opt_view_type , DRAW_POST_3D ,
+ "Type of graph (1=3D, 2=2D-space, 3=2D-time)" },
+ { F|O, "PositionX" , opt_view_position0 , 80. ,
+ "Horizontal position (in pixels) of the upper left corner of the scale or 2D graph" },
+ { F|O, "PositionY" , opt_view_position1 , 50. ,
+ "Vertical position (in pixels) of the upper left corner of the scale or 2D graph" },
+ { F|O, "AutoPosition" , opt_view_auto_position , 1. ,
+ "Position the scale or the 2D graph automatically to avoid overlaps" },
+ { F|O, "Width" , opt_view_size0 , 300. ,
+ "Width (in pixels) of the scale or 2D graph" },
+ { F|O, "Height" , opt_view_size1 , 200. ,
+ "Height (in pixels) of the scale or 2D graph" },
{ F, "NbTimeStep" , opt_view_nb_timestep , 1. ,
"Number of time steps in the view (do _not_ change this!)" },
{ F, "TimeStep" , opt_view_timestep , 0. ,
@@ -471,6 +487,8 @@ StringXNumber ViewOptions_Number[] = {
"Elevation of the view along Z-axis (in model coordinates)" },
{ F|O, "ArrowScale" , opt_view_arrow_scale , 50. ,
"Size of the vector (e.g. arrow size in pixels)" },
+ { F|O, "Grid" , opt_view_grid , 2 ,
+ "Grid mode for 2D graphs (0=none, 1=simple, 2=frame, 3=grid)" },
{ F|O, "Explode" , opt_view_explode , 1. ,
"Explode elements (0: reduced to point; 1: not transformed)" },
{ F, "Visible" , opt_view_visible , 1. ,
@@ -479,20 +497,10 @@ StringXNumber ViewOptions_Number[] = {
"Type of interval display (1=iso, 2=continuous, 3=discrete, 4=numeric)" },
{ F|O, "SaturateValues" , opt_view_saturate_values , 0 ,
"Saturate the view values to custom min and max (1=true, 0=false)" },
- { F|O, "GraphType" , opt_view_graph_type , DRAW_POST_3D ,
- "Graph type (1=3D, 2=2D-space, 3=2D-time)" },
- { F|O, "GraphGrid" , opt_view_graph_grid , 1 ,
- "Grid mode for 2D graphs (0=none, 1=simple, 2=frame, 3=grid)" },
- { F|O, "GraphPositionX" , opt_view_graph_position0 , 100. ,
- "Horizontal position (in pixels) of the upper left corner of a 2D graph" },
- { F|O, "GraphPositionY" , opt_view_graph_position1 , 100. ,
- "Vertical position (in pixels) of the upper left corner of a 2D graph" },
- { F|O, "GraphWidth" , opt_view_graph_size0 , 300. ,
- "Width (in pixels) of a 2D graph" },
- { F|O, "GraphHeight" , opt_view_graph_size1 , 200. ,
- "Height (in pixels) of a 2D graph" },
{ F|O, "NbIso" , opt_view_nb_iso , 15. ,
"Number of intervals" },
+ { F|O, "NbAbscissa" , opt_view_nb_abscissa , 5. ,
+ "Number of abscissa intervals for 2D graphs" },
{ F|O, "Boundary" , opt_view_boundary , 0 ,
"Draw the N-b dimensional boundary of the simplex (N=dimension, b=option value)" },
{ F|O, "Light" , opt_view_light , 0. ,
@@ -542,7 +550,7 @@ StringXNumber ViewOptions_Number[] = {
StringXNumber PrintOptions_Number[] = {
{ F|O, "Format" , opt_print_format , FORMAT_AUTO ,
- "Print format (10=automatic)" },
+ "File format (10=automatic)" },
{ F|O, "EpsQuality" , opt_print_eps_quality , 1 ,
"Postscript quality (1=simple sort, 2=recursive sort)" },
{ F|O, "EpsBackground" , opt_print_eps_background , 1 ,
diff --git a/Common/Options.cpp b/Common/Options.cpp
index 705cb5c7bff3bf531bf63e2127a6b64227c5afb9..d03355e65ba91699237e56efefc4fa1e226c57f0 100644
--- a/Common/Options.cpp
+++ b/Common/Options.cpp
@@ -1,4 +1,4 @@
-// $Id: Options.cpp,v 1.54 2001-10-31 08:34:18 geuzaine Exp $
+// $Id: Options.cpp,v 1.55 2001-11-05 08:37:43 geuzaine Exp $
#include "Gmsh.h"
#include "GmshUI.h"
@@ -324,7 +324,7 @@ void Print_NumberOptions(int num, int level, StringXNumber s[], char *prefix, FI
char tmp[1024];
while(s[i].str){
if(s[i].level & level){
- sprintf(tmp, "%s%s = %g; // %s", prefix,
+ sprintf(tmp, "%s%s = %.16g; // %s", prefix,
s[i].str, s[i].function(num, GMSH_GET, 0), s[i].help);
if(file) fprintf(file, "%s\n", tmp); else Msg(DIRECT, tmp);
}
@@ -534,6 +534,17 @@ char * opt_view_filename(OPT_ARGS_STR){
strcpy(v->FileName, val);
return v->FileName;
}
+char * opt_view_abscissa_name(OPT_ARGS_STR){
+ GET_VIEW(NULL) ;
+ if(action & GMSH_SET){
+ strcpy(v->AbscissaName, val);
+ }
+#ifdef _FLTK
+ if(WID && (action & GMSH_GUI) && (num == WID->view_number))
+ WID->view_input[2]->value(v->AbscissaName);
+#endif
+ return v->AbscissaName;
+}
char * opt_print_eps_font(OPT_ARGS_STR){
@@ -1230,6 +1241,11 @@ double opt_geometry_old_newreg(OPT_ARGS_NUM){
CTX.geom.old_newreg = (int)val;
return CTX.geom.old_newreg;
}
+double opt_geometry_circle_points(OPT_ARGS_NUM){
+ if(action & GMSH_SET)
+ CTX.geom.circle_points = (int)val;
+ return CTX.geom.circle_points;
+}
double opt_geometry_scaling_factor(OPT_ARGS_NUM){
if(action & GMSH_SET)
CTX.geom.scaling_factor = (int)val;
@@ -1859,86 +1875,114 @@ double opt_view_saturate_values(OPT_ARGS_NUM){
return v->SaturateValues;
}
-double opt_view_graph_type(OPT_ARGS_NUM){
+double opt_view_type(OPT_ARGS_NUM){
GET_VIEW(0.) ;
if(action & GMSH_SET){
- v->GraphType = (int)val;
+ v->Type = (int)val;
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);
+ WID->view_butt[1]->value(v->Type==DRAW_POST_3D);
+ WID->view_butt[2]->value(v->Type==DRAW_POST_2D_SPACE);
+ WID->view_butt[3]->value(v->Type==DRAW_POST_2D_TIME);
}
#endif
- return v->GraphType;
+ return v->Type;
}
-double opt_view_graph_position0(OPT_ARGS_NUM){
+double opt_view_position0(OPT_ARGS_NUM){
GET_VIEW(0.) ;
if(action & GMSH_SET){
- v->GraphPosition[0] = (int)val;
+ v->Position[0] = (int)val;
v->Changed = 1;
}
#ifdef _FLTK
if(WID && (action & GMSH_GUI) && (num == WID->view_number))
- WID->view_value[20]->value(v->GraphPosition[0]);
+ WID->view_value[20]->value(v->Position[0]);
#endif
- return v->GraphPosition[0];
+ return v->Position[0];
}
-double opt_view_graph_position1(OPT_ARGS_NUM){
+double opt_view_position1(OPT_ARGS_NUM){
GET_VIEW(0.) ;
if(action & GMSH_SET){
- v->GraphPosition[1] = (int)val;
+ v->Position[1] = (int)val;
v->Changed = 1;
}
#ifdef _FLTK
if(WID && (action & GMSH_GUI) && (num == WID->view_number))
- WID->view_value[21]->value(v->GraphPosition[1]);
+ WID->view_value[21]->value(v->Position[1]);
#endif
- return v->GraphPosition[1];
+ return v->Position[1];
}
-double opt_view_graph_size0(OPT_ARGS_NUM){
+double opt_view_auto_position(OPT_ARGS_NUM){
GET_VIEW(0.) ;
if(action & GMSH_SET){
- v->GraphSize[0] = (int)val;
+ v->AutoPosition = (int)val;
+ v->Changed = 1;
+ }
+#ifdef _FLTK
+ if(WID && (action & GMSH_GUI) && (num == WID->view_number)){
+ WID->view_butt[7]->value(v->AutoPosition);
+ }
+#endif
+ return v->AutoPosition;
+}
+
+double opt_view_size0(OPT_ARGS_NUM){
+ GET_VIEW(0.) ;
+ if(action & GMSH_SET){
+ v->Size[0] = (int)val;
v->Changed = 1;
}
#ifdef _FLTK
if(WID && (action & GMSH_GUI) && (num == WID->view_number))
- WID->view_value[22]->value(v->GraphSize[0]);
+ WID->view_value[22]->value(v->Size[0]);
#endif
- return v->GraphSize[0];
+ return v->Size[0];
}
-double opt_view_graph_size1(OPT_ARGS_NUM){
+double opt_view_size1(OPT_ARGS_NUM){
GET_VIEW(0.) ;
if(action & GMSH_SET){
- v->GraphSize[1] = (int)val;
+ v->Size[1] = (int)val;
v->Changed = 1;
}
#ifdef _FLTK
if(WID && (action & GMSH_GUI) && (num == WID->view_number))
- WID->view_value[23]->value(v->GraphSize[1]);
+ WID->view_value[23]->value(v->Size[1]);
+#endif
+ return v->Size[1];
+}
+
+double opt_view_grid(OPT_ARGS_NUM){
+ GET_VIEW(0.) ;
+ if(action & GMSH_SET){
+ v->Grid = (int)val;
+ v->Changed = 1;
+ }
+#ifdef _FLTK
+ if(WID && (action & GMSH_GUI) && (num == WID->view_number)){
+ WID->view_value[26]->value(v->Grid);
+ }
#endif
- return v->GraphSize[1];
+ return v->Grid;
}
-double opt_view_graph_grid(OPT_ARGS_NUM){
+double opt_view_nb_abscissa(OPT_ARGS_NUM){
GET_VIEW(0.) ;
if(action & GMSH_SET){
- v->GraphGrid = (int)val;
+ v->NbAbscissa = (int)val;
v->Changed = 1;
}
#ifdef _FLTK
if(WID && (action & GMSH_GUI) && (num == WID->view_number)){
- WID->view_value[24]->value(v->GraphGrid);
+ WID->view_value[25]->value(v->NbAbscissa);
}
#endif
- return v->GraphGrid;
+ return v->NbAbscissa;
}
double opt_view_nb_iso(OPT_ARGS_NUM){
diff --git a/Common/Options.h b/Common/Options.h
index d24f06216159900ca24e66132691e3e9a443021c..eb9ba3b8307038ef3ddd2820deac4aecc9c3b069 100644
--- a/Common/Options.h
+++ b/Common/Options.h
@@ -28,6 +28,7 @@ char * opt_solver_getdp_command(OPT_ARGS_STR);
char * opt_view_name(OPT_ARGS_STR);
char * opt_view_format(OPT_ARGS_STR);
char * opt_view_filename(OPT_ARGS_STR);
+char * opt_view_abscissa_name(OPT_ARGS_STR);
char * opt_print_eps_font(OPT_ARGS_STR);
// NUMBERS
@@ -153,6 +154,7 @@ double opt_geometry_aspect(OPT_ARGS_NUM);
double opt_geometry_highlight(OPT_ARGS_NUM);
double opt_geometry_old_circle(OPT_ARGS_NUM);
double opt_geometry_old_newreg(OPT_ARGS_NUM);
+double opt_geometry_circle_points(OPT_ARGS_NUM);
double opt_geometry_scaling_factor(OPT_ARGS_NUM);
double opt_geometry_color_scheme(OPT_ARGS_NUM);
double opt_mesh_quality(OPT_ARGS_NUM);
@@ -221,13 +223,15 @@ double opt_view_explode(OPT_ARGS_NUM);
double opt_view_visible(OPT_ARGS_NUM);
double opt_view_intervals_type(OPT_ARGS_NUM);
double opt_view_saturate_values(OPT_ARGS_NUM);
-double opt_view_graph_type(OPT_ARGS_NUM);
-double opt_view_graph_grid(OPT_ARGS_NUM);
-double opt_view_graph_position0(OPT_ARGS_NUM);
-double opt_view_graph_position1(OPT_ARGS_NUM);
-double opt_view_graph_size0(OPT_ARGS_NUM);
-double opt_view_graph_size1(OPT_ARGS_NUM);
+double opt_view_type(OPT_ARGS_NUM);
+double opt_view_grid(OPT_ARGS_NUM);
+double opt_view_position0(OPT_ARGS_NUM);
+double opt_view_position1(OPT_ARGS_NUM);
+double opt_view_auto_position(OPT_ARGS_NUM);
+double opt_view_size0(OPT_ARGS_NUM);
+double opt_view_size1(OPT_ARGS_NUM);
double opt_view_nb_iso(OPT_ARGS_NUM);
+double opt_view_nb_abscissa(OPT_ARGS_NUM);
double opt_view_boundary(OPT_ARGS_NUM);
double opt_view_light(OPT_ARGS_NUM);
double opt_view_smooth_normals(OPT_ARGS_NUM);
diff --git a/Common/Views.cpp b/Common/Views.cpp
index 1fb9f75c2896d11731fd010f27d01083a64845c2..017ca0af340d6305affe834b6b1eede8eac5df16 100644
--- a/Common/Views.cpp
+++ b/Common/Views.cpp
@@ -1,4 +1,4 @@
-// $Id: Views.cpp,v 1.58 2001-10-31 08:34:18 geuzaine Exp $
+// $Id: Views.cpp,v 1.59 2001-11-05 08:37:43 geuzaine Exp $
#include <set>
#include "Gmsh.h"
@@ -394,7 +394,14 @@ void FreeView(Post_View *v){
}
void CopyViewOptions(Post_View *src, Post_View *dest){
+ dest->Type = src->Type;
+ dest->Position[0] = src->Position[0];
+ dest->Position[1] = src->Position[1];
+ dest->AutoPosition = src->AutoPosition;
+ dest->Size[0] = src->Size[0];
+ dest->Size[1] = src->Size[1];
strcpy(dest->Format, src->Format);
+ strcpy(dest->AbscissaName, src->AbscissaName);
dest->CustomMin = src->CustomMin;
dest->CustomMax = src->CustomMax;
dest->Offset[0] = src->Offset[0];
@@ -408,13 +415,8 @@ void CopyViewOptions(Post_View *src, Post_View *dest){
dest->Visible = src->Visible;
dest->IntervalsType = src->IntervalsType;
dest->SaturateValues = src->SaturateValues;
- dest->GraphType = src->GraphType;
- dest->GraphGrid = src->GraphGrid;
- dest->GraphPosition[0] = src->GraphPosition[0];
- dest->GraphPosition[1] = src->GraphPosition[1];
- dest->GraphSize[0] = src->GraphSize[0];
- dest->GraphSize[1] = src->GraphSize[1];
dest->Boundary = src->Boundary ;
+ dest->NbAbscissa = src->NbAbscissa;
dest->NbIso = src->NbIso;
dest->Light = src->Light ;
dest->SmoothNormals = src->SmoothNormals ;
@@ -438,6 +440,7 @@ void CopyViewOptions(Post_View *src, Post_View *dest){
dest->TimeStep = src->TimeStep;
dest->PointSize = src->PointSize;
dest->LineWidth = src->LineWidth;
+ dest->Grid = src->Grid;
ColorTable_Copy(&src->CT);
ColorTable_Paste(&dest->CT);
}
@@ -470,6 +473,27 @@ void Print_ColorTable(int num, char *prefix, FILE *file){
if(file) fprintf(file, "%s\n", tmp); else Msg(DIRECT, tmp);
}
+Post_View *Create2DGraph(char *xname, char *yname,
+ int nbdata, double *x, double *y){
+ int i;
+ double d=0.;
+ char filename[1024];
+ Post_View *v;
+
+ v = BeginView(1);
+ for(i=0;i<nbdata;i++){
+ List_Add(v->SP, &x[i]);
+ List_Add(v->SP, &d);
+ List_Add(v->SP, &d);
+ List_Add(v->SP, &y[i]);
+ v->NbSP++;
+ }
+ sprintf(filename,"%s.pos",yname);
+ EndView(v, 1, filename, yname);
+ v->Type = DRAW_POST_2D_SPACE;
+ strcpy(v->AbscissaName, xname);
+ return v;
+}
/* ------------------------------------------------------------------------ */
/* R e a d _ V i e w */
diff --git a/Common/Views.h b/Common/Views.h
index f20a9711a70de158ea796e4b566ebc90a84def55..a284e9c3ae6cf537bf6456e90e59f028e117e13a 100644
--- a/Common/Views.h
+++ b/Common/Views.h
@@ -9,7 +9,7 @@ class Post_View{
public :
// intrinsic to a view
int Num, Index, Changed, DuplicateOf, Links, Dirty;
- char FileName[256], Name[256];
+ char FileName[256], Name[256], AbscissaName[256];
// the data
int datasize; // size(double) or sizeof(float)
@@ -28,10 +28,11 @@ class Post_View{
List_T *T2D, *T2C, *T3D, *T3C; // 2D and 3D text strings
// options
+ int Type, Position[2], AutoPosition, Size[2];
char Format[256];
double CustomMin, CustomMax;
double Offset[3], Raise[3], ArrowScale, Explode;
- int Visible, IntervalsType, NbIso, Light, SmoothNormals ;
+ int Visible, IntervalsType, NbIso, NbAbscissa, Light, SmoothNormals ;
double AngleSmoothNormals;
int SaturateValues;
int ShowElement, ShowTime, ShowScale;
@@ -41,9 +42,8 @@ class Post_View{
int DrawStrings;
int DrawPoints, DrawLines, DrawTriangles, DrawTetrahedra;
int DrawScalars, DrawVectors, DrawTensors;
- int Boundary, PointSize, LineWidth;
+ int Boundary, PointSize, LineWidth, Grid;
ColorTable CT;
- int GraphType, GraphPosition[2], GraphSize[2], GraphGrid;
// dynamic
double (*GVFI) (double min, double max, int nb, int index);
@@ -61,7 +61,7 @@ class Post_View{
void transform(double mat[3][3]);
};
-// GraphType
+// Type
#define DRAW_POST_3D 1
#define DRAW_POST_2D_SPACE 2
#define DRAW_POST_2D_TIME 3
@@ -110,6 +110,7 @@ int BGMWithView (Post_View *ErrView);
int CreateBGM(Post_View *ErrView, int OptiMethod, double Degree,
double OptiValue, double *ObjFunct, char *OutFile);
double ErrorInView(Post_View * ErrView, int *n);
+Post_View *Create2DGraph(char *xname, char *yname, int nbdata, double *x, double *y);
ColorTable *Get_ColorTable(int num);
void Print_ColorTable(int num, char *prefix, FILE *file);
diff --git a/DataStr/List.cpp b/DataStr/List.cpp
index 03b127f7cf85137390f892a8522c35b84f469771..4957cd5c8dd192efd268dab1e533ae32e0a0f89e 100644
--- a/DataStr/List.cpp
+++ b/DataStr/List.cpp
@@ -1,4 +1,4 @@
-// $Id: List.cpp,v 1.18 2001-10-31 08:34:19 geuzaine Exp $
+// $Id: List.cpp,v 1.19 2001-11-05 08:37:43 geuzaine Exp $
#include <stdlib.h>
#include <stdio.h>
@@ -413,9 +413,9 @@ void List_WriteToFile(List_T *liste, FILE *file, int format){
switch(format){
case LIST_FORMAT_ASCII :
if(liste->size == sizeof(double))
- for(i=0;i<n;i++) fprintf(file, " %g", *((double*)&liste->array[i*liste->size])) ;
+ for(i=0;i<n;i++) fprintf(file, " %.16g", *((double*)&liste->array[i*liste->size])) ;
else if(liste->size == sizeof(float))
- for(i=0;i<n;i++) fprintf(file, " %g", *((float*)&liste->array[i*liste->size])) ;
+ for(i=0;i<n;i++) fprintf(file, " %.16g", *((float*)&liste->array[i*liste->size])) ;
else if(liste->size == sizeof(int))
for(i=0;i<n;i++) fprintf(file, " %d", *((int*)&liste->array[i*liste->size])) ;
else if(liste->size == sizeof(char))
diff --git a/Fltk/Callbacks.cpp b/Fltk/Callbacks.cpp
index 3b72a4aa0b70980f746e6ef4668e8da1ae1b4d94..e2e448a18d78e86ba864d00445ebd24a309bcaa8 100644
--- a/Fltk/Callbacks.cpp
+++ b/Fltk/Callbacks.cpp
@@ -1,4 +1,4 @@
-// $Id: Callbacks.cpp,v 1.90 2001-10-31 08:34:19 geuzaine Exp $
+// $Id: Callbacks.cpp,v 1.91 2001-11-05 08:37:43 geuzaine Exp $
#include <sys/types.h>
#include <signal.h>
@@ -484,8 +484,23 @@ void opt_statistics_update_cb(CALLBACK_ARGS) {
WID->set_statistics();
}
void opt_statistics_histogram_cb(CALLBACK_ARGS) {
- Print_Histogram(M.Histogram[(int)data]);
- WID->create_message_window();
+ int i, type=(int)data;
+
+ Print_Histogram(M.Histogram[type]);
+ //WID->create_message_window();
+
+ double *x=(double*)Malloc(NB_HISTOGRAM*sizeof(double));
+ double *y=(double*)Malloc(NB_HISTOGRAM*sizeof(double));
+ for(i=0;i<NB_HISTOGRAM;i++){
+ x[i]=(double)(i+1)/(double)NB_HISTOGRAM;
+ y[i]=(double)M.Histogram[type][i];
+ }
+ char *name;
+ if(type==0) name = "Gamma";
+ else if(type==1) name = "Eta";
+ else name = "Rho";
+ Create2DGraph(name,"Elements",NB_HISTOGRAM,x,y);
+ Draw();
}
// Option Messages Menu
@@ -1790,10 +1805,10 @@ void view_options_ok_cb(CALLBACK_ARGS){
if(force || WID->view_butt[1]->changed() ||
WID->view_butt[2]->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);
+ opt_view_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() ||
@@ -1839,6 +1854,10 @@ void view_options_ok_cb(CALLBACK_ARGS){
if(force || WID->view_butt[4]->changed())
opt_view_show_scale(i, GMSH_SET, WID->view_butt[4]->value());
+ if(force || WID->view_butt[7]->changed())
+ opt_view_auto_position(i, GMSH_SET,
+ WID->view_butt[7]->value());
+
if(force || WID->view_butt[50]->changed())
opt_view_show_time(i, GMSH_SET, WID->view_butt[50]->value());
@@ -1926,19 +1945,22 @@ void view_options_ok_cb(CALLBACK_ARGS){
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());
+ opt_view_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());
+ opt_view_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());
+ opt_view_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());
+ opt_view_size1(i,GMSH_SET,WID->view_value[23]->value());
+
+ if(force || WID->view_value[25]->changed())
+ opt_view_nb_abscissa(i,GMSH_SET,WID->view_value[25]->value());
- if(force || WID->view_value[24]->changed())
- opt_view_graph_grid(i,GMSH_SET,WID->view_value[24]->value());
+ if(force || WID->view_value[26]->changed())
+ opt_view_grid(i,GMSH_SET,WID->view_value[26]->value());
// view_inputs
@@ -1948,6 +1970,9 @@ void view_options_ok_cb(CALLBACK_ARGS){
if(force || WID->view_input[1]->changed())
opt_view_format(i, GMSH_SET, (char*)WID->view_input[1]->value());
+ if(force || WID->view_input[2]->changed())
+ opt_view_abscissa_name(i, GMSH_SET, (char*)WID->view_input[2]->value());
+
// colorbar window
if(force || (WID->view_colorbar_window->changed() && i!=(int)data)){
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index a07efe95b1b6c75284a54f538f5a0ce5554a753e..a3d6711238a797acba1f065c04fceaa7bd25333c 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1,4 +1,4 @@
-// $Id: GUI.cpp,v 1.125 2001-11-01 09:40:06 geuzaine Exp $
+// $Id: GUI.cpp,v 1.126 2001-11-05 08:37:43 geuzaine Exp $
// To make the interface as visually consistent as possible, please:
// - use the BH, BW, WB, IW values for button heights/widths, window borders, etc.
@@ -1636,13 +1636,13 @@ void GUI::create_statistics_window(){
stat_value[num++] = new Fl_Output(2*WB, 2*WB+14*BH, IW, BH, "Eta factor");
stat_value[num++] = new Fl_Output(2*WB, 2*WB+15*BH, IW, BH, "Rho factor");
- Fl_Button* b0 = new Fl_Button(width-BB-2*WB, 2*WB+13*BH, BB, BH, "List");
+ Fl_Button* b0 = new Fl_Button(width-BB-2*WB, 2*WB+13*BH, BB, BH, "Graph");
b0->labelsize(CTX.fontsize);
b0->callback(opt_statistics_histogram_cb, (void*)0);
- Fl_Button* b1 = new Fl_Button(width-BB-2*WB, 2*WB+14*BH, BB, BH, "List");
+ Fl_Button* b1 = new Fl_Button(width-BB-2*WB, 2*WB+14*BH, BB, BH, "Graph");
b1->labelsize(CTX.fontsize);
b1->callback(opt_statistics_histogram_cb, (void*)1);
- Fl_Button* b2 = new Fl_Button(width-BB-2*WB, 2*WB+15*BH, BB, BH, "List");
+ Fl_Button* b2 = new Fl_Button(width-BB-2*WB, 2*WB+15*BH, BB, BH, "Graph");
b2->labelsize(CTX.fontsize);
b2->callback(opt_statistics_histogram_cb, (void*)2);
@@ -2070,9 +2070,10 @@ void GUI::create_view_options_window(int num){
view_input[i]->callback(set_changed_cb, 0);
}
view_butt[4] = new Fl_Check_Button(2*WB, 2*WB+3*BH, BW, BH, "Show scale");
- view_butt[5] = new Fl_Check_Button(2*WB, 2*WB+4*BH, BW, BH, "Show annotations");
- view_butt[6] = new Fl_Check_Button(2*WB, 2*WB+5*BH, BW, BH, "Transparent labels");
- for(i=4 ; i<=6 ; i++){
+ view_butt[5] = new Fl_Check_Button(width/2, 2*WB+4*BH, BW, BH, "Show annotations");
+ view_butt[6] = new Fl_Check_Button(2*WB, 2*WB+4*BH, BW, BH, "Transparent scale");
+ view_butt[7] = new Fl_Check_Button(2*WB, 2*WB+5*BH, BW, BH, "Auto position");
+ for(i=4 ; i<=7 ; i++){
view_butt[i]->type(FL_TOGGLE_BUTTON);
view_butt[i]->down_box(FL_DOWN_BOX);
view_butt[i]->labelsize(CTX.fontsize);
@@ -2080,6 +2081,18 @@ void GUI::create_view_options_window(int num){
view_butt[i]->callback(set_changed_cb, 0);
}
+ view_value[20] = new Fl_Value_Input(2*WB, 2*WB+ 6*BH, IW, BH, "X position");
+ view_value[21] = new Fl_Value_Input(2*WB, 2*WB+ 7*BH, IW, BH, "Y position");
+ view_value[22] = new Fl_Value_Input(2*WB, 2*WB+ 8*BH, IW, BH, "Width");
+ view_value[23] = new Fl_Value_Input(2*WB, 2*WB+ 9*BH, IW, BH, "Height");
+ for(i=20 ; i<=23 ; i++){
+ view_value[i]->labelsize(CTX.fontsize);
+ view_value[i]->textsize(CTX.fontsize);
+ view_value[i]->type(FL_HORIZONTAL);
+ view_value[i]->align(FL_ALIGN_RIGHT);
+ view_value[i]->callback(set_changed_cb, 0);
+ }
+
o->end();
}
// 3D
@@ -2140,16 +2153,22 @@ void GUI::create_view_options_window(int num){
view_2d = new Fl_Group(WB, WB+BH, width-2*WB, height-3*WB-2*BH, "2D");
view_2d->labelsize(CTX.fontsize);
view_2d->hide();
-
- view_value[20] = new Fl_Value_Input(2*WB, 2*WB+ 1*BH, IW, BH, "X position");
- view_value[21] = new Fl_Value_Input(2*WB, 2*WB+ 2*BH, IW, BH, "Y position");
- view_value[22] = new Fl_Value_Input(2*WB, 2*WB+ 3*BH, IW, BH, "Width");
- view_value[23] = new Fl_Value_Input(2*WB, 2*WB+ 4*BH, IW, BH, "Height");
- view_value[24] = new Fl_Value_Input(2*WB, 2*WB+ 5*BH, IW, BH, "Grid mode");
- view_value[24]->minimum(0.);
- view_value[24]->step(1);
- view_value[24]->maximum(3);
- for(i=20 ; i<=24 ; i++){
+
+ view_input[2] = new Fl_Input(2*WB, 2*WB+1*BH, IW, BH, "Abscissa name");
+ view_input[2]->labelsize(CTX.fontsize);
+ view_input[2]->textsize(CTX.fontsize);
+ view_input[2]->align(FL_ALIGN_RIGHT);
+ view_input[2]->callback(set_changed_cb, 0);
+
+ view_value[25] = new Fl_Value_Input(2*WB, 2*WB+ 2*BH, IW, BH, "Abscissa points");
+ view_value[25]->minimum(0.);
+ view_value[25]->step(1);
+ view_value[25]->maximum(256);
+ view_value[26] = new Fl_Value_Input(2*WB, 2*WB+ 3*BH, IW, BH, "Grid mode");
+ view_value[26]->minimum(0.);
+ view_value[26]->step(1);
+ view_value[26]->maximum(3);
+ for(i=25 ; i<=26 ; i++){
view_value[i]->labelsize(CTX.fontsize);
view_value[i]->textsize(CTX.fontsize);
view_value[i]->type(FL_HORIZONTAL);
@@ -2157,7 +2176,7 @@ void GUI::create_view_options_window(int num){
view_value[i]->callback(set_changed_cb, 0);
}
- view_2d->end();
+ view_2d->end();
}
// Range
{
@@ -2324,6 +2343,7 @@ void GUI::create_view_options_window(int num){
view_value[i]->align(FL_ALIGN_RIGHT);
view_value[i]->callback(set_changed_cb, 0);
}
+
o->end();
}
// Colors
@@ -2380,10 +2400,23 @@ void GUI::update_view_window(int num){
// general
opt_view_name(num, GMSH_GUI, NULL);
opt_view_format(num, GMSH_GUI, NULL);
- opt_view_graph_type(num, GMSH_GUI, 0);
+ opt_view_type(num, GMSH_GUI, 0);
opt_view_show_scale(num, GMSH_GUI, 0);
opt_view_draw_strings(num, GMSH_GUI, 0);
opt_view_transparent_scale(num, GMSH_GUI, 0);
+ opt_view_auto_position(num, GMSH_GUI, 0);
+ if(v->NbSP){
+ view_butt[2]->activate();
+ view_butt[3]->activate();
+ }
+ else{
+ view_butt[2]->deactivate();
+ view_butt[3]->deactivate();
+ }
+ opt_view_position0(num, GMSH_GUI, 0);
+ opt_view_position1(num, GMSH_GUI, 0);
+ opt_view_size0(num, GMSH_GUI, 0);
+ opt_view_size1(num, GMSH_GUI, 0);
//3D
if(v->TextOnly){
@@ -2411,21 +2444,13 @@ void GUI::update_view_window(int num){
opt_view_draw_tensors(num, GMSH_GUI, 0);
//2D
- if(v->NbSP){
+ if(v->NbSP)
view_2d->activate();
- view_butt[2]->activate();
- view_butt[3]->activate();
- }
- else{
+ else
view_2d->deactivate();
- view_butt[2]->deactivate();
- view_butt[3]->deactivate();
- }
- opt_view_graph_position0(num, GMSH_GUI, 0);
- opt_view_graph_position1(num, GMSH_GUI, 0);
- opt_view_graph_size0(num, GMSH_GUI, 0);
- opt_view_graph_size1(num, GMSH_GUI, 0);
- opt_view_graph_grid(num, GMSH_GUI, 0);
+ opt_view_abscissa_name(num, GMSH_GUI, NULL);
+ opt_view_nb_abscissa(num, GMSH_GUI, 0);
+ opt_view_grid(num, GMSH_GUI, 0);
// range
opt_view_nb_iso(num, GMSH_GUI, 0);
diff --git a/Fltk/GUI.h b/Fltk/GUI.h
index 5129f0f294fb79f922334769016951aae8846bce..7a110f8f3fa49990c491fe2bf44d54679da51857 100644
--- a/Fltk/GUI.h
+++ b/Fltk/GUI.h
@@ -159,7 +159,7 @@ public:
// view options window
int init_view_window, view_number ;
Fl_Window *view_window ;
- Fl_Group *view_2d, *view_3d, *view_range, *view_timestep, *view_vector ;
+ Fl_Group *view_3d, *view_2d, *view_range, *view_timestep, *view_vector ;
#define VIEW_OPT_BUTT 100
Fl_Check_Button *view_butt[VIEW_OPT_BUTT] ;
Fl_Value_Input *view_value[VIEW_OPT_BUTT] ;
diff --git a/Fltk/Socket.cpp b/Fltk/Socket.cpp
index b30cb5232b389cb8d6988215de3085b80165cd2e..f82a5a4533b7de3c6bc71c6baca3a6c12c060abe 100644
--- a/Fltk/Socket.cpp
+++ b/Fltk/Socket.cpp
@@ -1,4 +1,4 @@
-/* $Id: Socket.cpp,v 1.13 2001-10-31 16:33:46 remacle Exp $ */
+/* $Id: Socket.cpp,v 1.14 2001-11-05 08:37:43 geuzaine Exp $ */
#include <stdio.h>
#include <stdlib.h>
@@ -147,8 +147,7 @@ int Socket_StartProgram(char *progname, char *sockname){
}
len = sizeof(from);
- socklen_t slen = len;
- if ( (sock = accept(s, (struct sockaddr *)&from, &slen)) < 0) {
+ if ( (sock = accept(s, (struct sockaddr *)&from, &len)) < 0) {
Msg(GERROR, "Socket accept failed");
return -1;
}
diff --git a/Graphics/Geom.cpp b/Graphics/Geom.cpp
index 4e9131e65a0f4aaecc462977b9a19960bfe586b4..ded8b5725d34f7fc57aa0f8f1135f11d1eee8c93 100644
--- a/Graphics/Geom.cpp
+++ b/Graphics/Geom.cpp
@@ -1,4 +1,4 @@
-// $Id: Geom.cpp,v 1.30 2001-10-29 08:52:19 geuzaine Exp $
+// $Id: Geom.cpp,v 1.31 2001-11-05 08:37:43 geuzaine Exp $
#include "Gmsh.h"
#include "GmshUI.h"
@@ -110,11 +110,20 @@ void Draw_Curve (void *a, void *b){
if(CTX.geom.lines){
int n = List_Nbr(c->Control_Points);
- if(c->Typ == MSH_SEGM_LINE)
- N = n;
- else
- N = (n<10) ? 50 : 10 * n;
-
+ switch(c->Typ){
+ case MSH_SEGM_LINE :
+ N = n;
+ break;
+ case MSH_SEGM_CIRC :
+ case MSH_SEGM_CIRC_INV :
+ case MSH_SEGM_ELLI :
+ case MSH_SEGM_ELLI_INV :
+ N = CTX.geom.circle_points;
+ break;
+ default :
+ N = 10 * n;
+ break;
+ }
if(c->Typ == MSH_SEGM_DISCRETE){
Simplex *s;
List_T *temp = Tree2List(c->Simplexes);
diff --git a/Graphics/Graph2D.cpp b/Graphics/Graph2D.cpp
index d894961bf04f504ccbc212bf7a77b5c26320b2f5..ae6e9664593d807a10a53b910d1d0897d9b3420b 100644
--- a/Graphics/Graph2D.cpp
+++ b/Graphics/Graph2D.cpp
@@ -1,4 +1,4 @@
-// $Id: Graph2D.cpp,v 1.8 2001-10-31 08:34:19 geuzaine Exp $
+// $Id: Graph2D.cpp,v 1.9 2001-11-05 08:37:43 geuzaine Exp $
#include "Gmsh.h"
#include "GmshUI.h"
@@ -15,35 +15,33 @@ extern Context_T CTX;
2D graphics (gnuplot style)
------------------------------------------------------------------------ */
-#define TIC 5
-
-static void addval(Post_View *v, double min, double max,
- int i, int j, int j_inc,
- double xtop, double dx, double ybot,
+static void addval(Post_View *v, double Abs, double Val,
+ double AbsMin, double AbsMax, double ValMin, double ValMax,
+ double xtop, double width, double ybot, double height,
int numeric){
char label[256];
- double d, x, y;
+ double x, y;
- if(v->GraphType==DRAW_POST_2D_SPACE){
- d = ((double*)List_Pointer_Fast(v->SP,j+3))[v->TimeStep];
- x = xtop+j/j_inc*dx;
- }
- else{
- d = ((double*)List_Pointer_Fast(v->SP,i+3))[j];
- x = xtop+j*dx;
- }
+ if(AbsMax==AbsMin)
+ x = xtop;
+ else
+ x = xtop+(Abs-AbsMin)/(AbsMax-AbsMin)*width;
if(v->SaturateValues){
- if(d > max) d = max;
- else if(d < min) d = min;
+ if(Val > ValMax) Val = ValMax;
+ else if(Val < ValMin) Val = ValMin;
}
- y = ybot+(d-min)/(max-min)*v->GraphSize[1];
+
+ if(ValMax==ValMin)
+ y = ybot;
+ else
+ y = ybot+(Val-ValMin)/(ValMax-ValMin)*height;
- if(d>=min && d<=max){
- Palette2(v,min,max,d);
+ if(Val>=ValMin && Val<=ValMax){
+ Palette2(v,ValMin,ValMax,Val);
if(numeric){
glRasterPos2d(x+3,y+3);
- sprintf(label, v->Format, d);
+ sprintf(label, v->Format, Val);
Draw_String(label);
}
else
@@ -52,16 +50,28 @@ static void addval(Post_View *v, double min, double max,
}
-static void Draw_Graph2D(Post_View *v){
+static void Draw_Graph2D(Post_View *v,
+ double xx, double yy, double width, double height,
+ double tic, double bb[4]){
char label[1024] ;
int font_h, font_a ;
int i, i_inc, i_max, j, j_inc, j_max, k, nb;
double dx, dy, dv;
- double xtop = v->GraphPosition[0];
- double ytop = CTX.viewport[3]-v->GraphPosition[1];
- double ybot = ytop-v->GraphSize[1];
- double ValMin, ValMax;
+ double xtop = xx;
+ double ytop = CTX.viewport[3]-yy;
+ double ybot = ytop-height;
+ double ValMin, ValMax, AbsMin, AbsMax;
+ if(!v->TransparentScale){
+ glColor4ubv((GLubyte*)&CTX.color.bg);
+ glBegin(GL_QUADS);
+ glVertex2d(bb[0],CTX.viewport[3]-bb[1]);
+ glVertex2d(bb[2],CTX.viewport[3]-bb[1]);
+ glVertex2d(bb[2],CTX.viewport[3]-bb[3]);
+ glVertex2d(bb[0],CTX.viewport[3]-bb[3]);
+ glEnd();
+ }
+
gl_font(FL_HELVETICA,CTX.gl_fontsize);
font_h = gl_height() ; // hauteur totale de la fonte
font_a = gl_height()-gl_descent() ; // hauteur de la fonte au dessus de pt de ref
@@ -71,57 +81,46 @@ static void Draw_Graph2D(Post_View *v){
case DRAW_POST_CUSTOM : ValMin = v->CustomMin ; ValMax = v->CustomMax ; break;
}
- if(!v->TransparentScale){
- glColor4ubv((GLubyte*)&CTX.color.bg);
- glBegin(GL_QUADS);
- glVertex2d(xtop,ytop);
- glVertex2d(xtop+v->GraphSize[0],ytop);
- glVertex2d(xtop+v->GraphSize[0],ybot);
- glVertex2d(xtop,ybot);
- glEnd();
- }
-
- // The axes + labels
-
glPointSize(CTX.point_size);
gl2psPointSize(CTX.point_size * CTX.print.eps_point_size_factor);
glLineWidth(CTX.line_width);
gl2psLineWidth(CTX.line_width * CTX.print.eps_line_width_factor);
- // 2 axes
- if(v->GraphGrid){
+ // axes
+
+ if(v->Grid){
glColor4ubv((GLubyte*)&CTX.color.fg);
glBegin(GL_LINE_STRIP);
glVertex2d(xtop,ytop);
- glVertex2d(xtop,ytop-v->GraphSize[1]);
- glVertex2d(xtop+v->GraphSize[0],ybot);
- if(v->GraphGrid>1){
- glVertex2d(xtop+v->GraphSize[0],ytop);
+ glVertex2d(xtop,ytop-height);
+ glVertex2d(xtop+width,ybot);
+ if(v->Grid>1){
+ glVertex2d(xtop+width,ytop);
glVertex2d(xtop,ytop);
}
glEnd();
}
// y tics + labels
- if(v->NbIso * font_h > v->GraphSize[1])
- nb = 1;
- else
- nb = v->NbIso;
- dy = v->GraphSize[1]/(double)nb;
+
+ nb = v->NbIso;
+ if(v->ShowScale && (v->NbIso * font_h > height)) nb = (int)floor(height/font_h);
+
+ dy = height/(double)nb;
dv = (ValMax-ValMin)/(double)nb;
for(i=0; i<nb+1; i++){
- if(v->GraphGrid>0 && i!=0 && i!=nb){
+ if(v->Grid>0){
glColor4ubv((GLubyte*)&CTX.color.fg);
glBegin(GL_LINES);
glVertex2d(xtop,ytop-i*dy);
- glVertex2d(xtop+TIC,ytop-i*dy);
- if(v->GraphGrid>1){
- glVertex2d(xtop+v->GraphSize[0]-TIC,ytop-i*dy);
- glVertex2d(xtop+v->GraphSize[0],ytop-i*dy);
+ glVertex2d(xtop+tic,ytop-i*dy);
+ if(v->Grid>1){
+ glVertex2d(xtop+width-tic,ytop-i*dy);
+ glVertex2d(xtop+width,ytop-i*dy);
}
glEnd();
- if(v->GraphGrid>2){
+ if(v->Grid>2 && i!=0 && i!=nb){
glEnable(GL_LINE_STIPPLE);
glLineStipple(1,0x1111);
gl2psEnable(GL2PS_LINE_STIPPLE);
@@ -129,7 +128,7 @@ static void Draw_Graph2D(Post_View *v){
gl2psLineWidth(1 * CTX.print.eps_line_width_factor);
glBegin(GL_LINES);
glVertex2d(xtop,ytop-i*dy);
- glVertex2d(xtop+v->GraphSize[0],ytop-i*dy);
+ glVertex2d(xtop+width,ytop-i*dy);
glEnd();
glDisable(GL_LINE_STIPPLE);
gl2psDisable(GL2PS_LINE_STIPPLE);
@@ -141,16 +140,16 @@ static void Draw_Graph2D(Post_View *v){
glColor4ubv((GLubyte*)&CTX.color.text);
sprintf(label, v->Format, (i==nb)?ValMin:(ValMax-i*dv));
if(CTX.stream == TO_FILE)
- glRasterPos2d(xtop-gl_width(label)-3*TIC,ytop-i*dy-font_a/3.);
+ glRasterPos2d(xtop-gl_width(label)-3*tic,ytop-i*dy-font_a/3.);
else
- glRasterPos2d(xtop-gl_width(label)-TIC,ytop-i*dy-font_a/3.);
+ glRasterPos2d(xtop-gl_width(label)-tic,ytop-i*dy-font_a/3.);
Draw_String(label);
}
}
if(v->ShowScale){
glColor4ubv((GLubyte*)&CTX.color.text);
- if(v->GraphType==DRAW_POST_2D_SPACE && List_Nbr(v->Time)>1 && v->ShowTime)
+ if(v->Type==DRAW_POST_2D_SPACE && List_Nbr(v->Time)>1 && v->ShowTime)
sprintf(label, "%s (%g)", v->Name, *(double*)List_Pointer(v->Time,v->TimeStep));
else
sprintf(label, "%s", v->Name);
@@ -159,30 +158,51 @@ static void Draw_Graph2D(Post_View *v){
}
// x tics + labels
- if(v->GraphType==DRAW_POST_2D_SPACE)
- nb = v->NbSP;
+
+ if(v->Type==DRAW_POST_2D_SPACE){
+ AbsMin = AbsMax = 0.;
+ double p1[3]={0.,0.,0.}, p2[3];
+ for(i=0; i<List_Nbr(v->SP); i+=List_Nbr(v->SP)/v->NbSP){
+ for(k=0;k<3;k++){
+ List_Read(v->SP,i+k,&p2[k]);
+ if(i) p1[k] = p2[k]-p1[k];
+ }
+ AbsMax += sqrt (p1[0] * p1[0] + p1[1] * p1[1] + p1[2] * p1[2]);
+ for(k=0;k<3;k++){
+ p1[k] = p2[k];
+ }
+ }
+ }
+ else{
+ AbsMin = *(double*)List_Pointer(v->Time,0);
+ AbsMax = *(double*)List_Pointer(v->Time,List_Nbr(v->Time)-1);
+ }
+
+ nb = v->NbAbscissa;
+ if(v->ShowScale){
+ sprintf(label, v->Format, AbsMin);
+ double ww = gl_width(label);
+ sprintf(label, v->Format, AbsMax);
+ if(gl_width(label) > ww) ww = gl_width(label);
+ if((nb-1)*(ww+2) > width) nb = (int)floor(width/(ww+2))+1;
+ }
+ if(nb==1)
+ dx = width;
else
- nb = v->NbTimeStep;
- if(nb == 1) nb=0;
- sprintf(label, v->Format, 9.999);
- if(nb*gl_width(label) > v->GraphSize[0])
- nb = 2;
- dx = v->GraphSize[0]/(double)(nb-1);
- double dist=0., p1[3]={0.,0.,0.}, p2[3];
- j=0;
+ dx = width/(double)(nb-1);
for(i=0; i<nb; i++){
- if(v->GraphGrid>0 && i!=0 && i!=nb-1){
+ if(v->Grid>0){
glColor4ubv((GLubyte*)&CTX.color.fg);
glBegin(GL_LINES);
glVertex2d(xtop+i*dx,ybot);
- glVertex2d(xtop+i*dx,ybot+TIC);
- if(v->GraphGrid>1){
+ glVertex2d(xtop+i*dx,ybot+tic);
+ if(v->Grid>1){
glVertex2d(xtop+i*dx,ytop);
- glVertex2d(xtop+i*dx,ytop-TIC);
+ glVertex2d(xtop+i*dx,ytop-tic);
}
glEnd();
- if(v->GraphGrid>2){
+ if(v->Grid>2 && i!=0 && i!=nb-1){
glEnable(GL_LINE_STIPPLE);
glLineStipple(1,0x1111);
gl2psEnable(GL2PS_LINE_STIPPLE);
@@ -198,29 +218,24 @@ static void Draw_Graph2D(Post_View *v){
gl2psLineWidth(CTX.line_width * CTX.print.eps_line_width_factor);
}
}
-
if(v->ShowScale){
glColor4ubv((GLubyte*)&CTX.color.text);
- if(v->GraphType==DRAW_POST_2D_SPACE){
- for(k=0;k<3;k++){
- List_Read(v->SP,j+k,&p2[k]);
- if(i) p1[k] = p2[k]-p1[k];
- }
- dist += sqrt (p1[0] * p1[0] + p1[1] * p1[1] + p1[2] * p1[2]);
- sprintf(label, v->Format, dist);
- for(k=0;k<3;k++){
- p1[k] = p2[k];
- }
- j += List_Nbr(v->SP) / v->NbSP;
- }
+ if(nb==1)
+ sprintf(label, v->Format, AbsMin);
else
- sprintf(label, v->Format, *(double*)List_Pointer(v->Time,i));
+ sprintf(label, v->Format, AbsMin+i*(AbsMax-AbsMin)/(double)(nb-1));
glRasterPos2d(xtop+i*dx-gl_width(label)/2.,ybot-1.5*font_h);
Draw_String(label);
}
}
+ if(v->ShowScale){
+ glColor4ubv((GLubyte*)&CTX.color.text);
+ sprintf(label, "%s", v->AbscissaName);
+ glRasterPos2d(xtop+width/2-gl_width(label)/2.,ybot-3*font_h);
+ Draw_String(label);
+ }
- // The curve(s)
+ // the curve(s)
glPointSize(v->PointSize);
gl2psPointSize(v->PointSize * CTX.print.eps_point_size_factor);
@@ -228,43 +243,61 @@ static void Draw_Graph2D(Post_View *v){
glLineWidth(v->LineWidth);
gl2psLineWidth(v->LineWidth * CTX.print.eps_line_width_factor);
- if(v->GraphType==DRAW_POST_2D_SPACE){
+ if(v->Type==DRAW_POST_2D_SPACE){
i_inc = 1;
i_max = 1;
- nb = v->NbSP;
- j_inc = List_Nbr(v->SP) / v->NbSP ;
+ j_inc = List_Nbr(v->SP)/v->NbSP ;
j_max = List_Nbr(v->SP);
}
else{
- i_inc = List_Nbr(v->SP) / v->NbSP ;
+ i_inc = List_Nbr(v->SP)/v->NbSP ;
i_max = List_Nbr(v->SP) ;
- nb = v->NbTimeStep;
j_inc = 1;
j_max = v->TimeStep+1;
}
- if(nb==1) nb=0;
- dx = v->GraphSize[0]/(double)(nb-1);
+ double Abs = 0., Val = 0., p1[3]={0.,0.,0.}, p2[3];
+#define GETVAL \
+ if(v->Type==DRAW_POST_2D_SPACE){ \
+ for(k=0;k<3;k++){ \
+ List_Read(v->SP,j+k,&p2[k]); \
+ if(j) p1[k] = p2[k]-p1[k]; \
+ } \
+ Abs += sqrt (p1[0] * p1[0] + p1[1] * p1[1] + p1[2] * p1[2]); \
+ for(k=0;k<3;k++){ \
+ p1[k] = p2[k]; \
+ } \
+ Val = ((double*)List_Pointer_Fast(v->SP,j+3))[v->TimeStep]; \
+ } \
+ else{ \
+ Abs = *(double*)List_Pointer_Fast(v->Time,j); \
+ Val = ((double*)List_Pointer_Fast(v->SP,i+3))[j]; \
+ }
for(i=0; i<i_max; i+=i_inc){
if(v->IntervalsType == DRAW_POST_ISO ||
v->IntervalsType == DRAW_POST_DISCRETE ||
v->IntervalsType == DRAW_POST_NUMERIC){
glBegin(GL_POINTS);
- for(j=0; j<j_max; j+=j_inc)
- addval(v,ValMin,ValMax,i,j,j_inc,xtop,dx,ybot,0);
+ for(j=0; j<j_max; j+=j_inc){
+ GETVAL;
+ addval(v,Abs,Val,AbsMin,AbsMax,ValMin,ValMax,xtop,width,ybot,height,0);
+ }
glEnd();
}
if(v->IntervalsType == DRAW_POST_NUMERIC){
for(j=0; j<j_max; j+=j_inc){
- addval(v,ValMin,ValMax,i,j,j_inc,xtop,dx,ybot,1);
+ GETVAL;
+ addval(v,Abs,Val,AbsMin,AbsMax,ValMin,ValMax,xtop,width,ybot,height,1);
}
}
if(v->IntervalsType == DRAW_POST_DISCRETE ||
v->IntervalsType == DRAW_POST_CONTINUOUS){
glBegin(GL_LINE_STRIP);
- for(j=0; j<j_max; j+=j_inc)
- addval(v,ValMin,ValMax,i,j,j_inc,xtop,dx,ybot,0);
+ for(j=0; j<j_max; j+=j_inc){
+ GETVAL;
+ addval(v,Abs,Val,AbsMin,AbsMax,ValMin,ValMax,xtop,width,ybot,height,0);
+ }
glEnd();
}
@@ -272,19 +305,66 @@ static void Draw_Graph2D(Post_View *v){
}
+void getbb(double pos[2], double width, double height,
+ double dx, double dy, double tic, double space,
+ double bbtot[4], double bb[4]){
+ bbtot[0] = pos[0]-dx-space;//topleft x
+ bb[0] = bbtot[0];
+ //don't recompute bbtot[1].
+ bb[1] = pos[1]-1.5*dy-space;//topleft y
+
+ bbtot[2] = MAX(bbtot[2],pos[0]+width+(dx-tic)/2+space);//bottomright x
+ bb[2] = pos[0]+width+(dx-tic)/2+space;
+
+ bbtot[3] = pos[1]+height+2*dy+space;//bottomright y
+ bb[3] = bbtot[3];
+}
void Draw_Graph2D(void){
- int i;
+ int i,nbauto=0;
Post_View *v;
+ double dx,dy,bb[4],bbtot[4]={0.,0.,0.,0.},pos[2],tic,space=10.;
+ char label[1024];
if(!CTX.post.list) return;
for(i=0;i<List_Nbr(CTX.post.list);i++){
v = (Post_View*)List_Pointer(CTX.post.list,i);
- if(v->Visible && v->NbSP && v->GraphType!=DRAW_POST_3D) Draw_Graph2D(v);
+ if(v->Visible && v->NbSP && v->Type!=DRAW_POST_3D){
+ tic = 4+v->LineWidth;
+ dx = dy = 0.;
+ if(v->ShowScale){
+ gl_font(FL_HELVETICA,CTX.gl_fontsize);
+ sprintf(label,v->Format,v->CustomMin);
+ if(gl_width(label)+tic > dx) dx = gl_width(label)+tic;
+ sprintf(label,v->Format,v->CustomMax);
+ if(gl_width(label)+tic > dx) dx = gl_width(label)+tic;
+ dy = 1.5*gl_height();//2 en dessous et 1 au dessus !
+ }
+ if(!v->AutoPosition || !nbauto){
+ pos[0] = v->Position[0];
+ pos[1] = v->Position[1];
+ bbtot[1] = pos[1]-1.5*dy-space;//top y
+ getbb(pos,v->Size[0],v->Size[1],dx,dy,tic,space,bbtot,bb);
+ Draw_Graph2D(v,pos[0],pos[1],v->Size[0],v->Size[1],tic,bb);
+ }
+ else{
+ if(bbtot[3]+v->Size[1]+3*dy+2*space < CTX.viewport[3]){//try to put below
+ pos[1] = bbtot[3]+1.5*dy+space;
+ getbb(pos,v->Size[0],v->Size[1],dx,dy,tic,space,bbtot,bb);
+ Draw_Graph2D(v,pos[0],pos[1],v->Size[0],v->Size[1],tic,bb);
+ }
+ else{ //start a new column
+ pos[0]=bbtot[2]+dx+space;
+ pos[1]=bbtot[1]+1.5*dy+space;
+ getbb(pos,v->Size[0],v->Size[1],dx,dy,tic,space,bbtot,bb);
+ Draw_Graph2D(v,pos[0],pos[1],v->Size[0],v->Size[1],tic,bb);
+ }
+ }
+ nbauto++;
+ }
}
-
}
diff --git a/Graphics/Post.cpp b/Graphics/Post.cpp
index a072a3d983fbbab00f1ad616db69191106444b64..c8253daa0bb3d5d04dcd31946906e3258ad3b78e 100644
--- a/Graphics/Post.cpp
+++ b/Graphics/Post.cpp
@@ -1,4 +1,4 @@
-// $Id: Post.cpp,v 1.28 2001-10-31 08:34:19 geuzaine Exp $
+// $Id: Post.cpp,v 1.29 2001-11-05 08:37:43 geuzaine Exp $
#include "Gmsh.h"
#include "GmshUI.h"
@@ -144,7 +144,7 @@ void Draw_Post (void) {
if(!CTX.post.draw){ // draw only the bbox of the visible views
for(iView=0 ; iView<List_Nbr(CTX.post.list) ; iView++){
v = (Post_View*)List_Pointer(CTX.post.list,iView);
- if(v->Visible && v->GraphType==DRAW_POST_3D){
+ if(v->Visible && v->Type==DRAW_POST_3D){
glColor4ubv((GLubyte*)&CTX.color.fg);
glBegin(GL_LINE_LOOP);
glVertex3d(v->BBox[0], v->BBox[2], v->BBox[4]);
@@ -245,7 +245,7 @@ void Draw_Post (void) {
// Points
- if(v->GraphType==DRAW_POST_3D && v->NbSP && v->DrawPoints && v->DrawScalars){
+ if(v->Type==DRAW_POST_3D && v->NbSP && v->DrawPoints && v->DrawScalars){
nb = List_Nbr(v->SP) / v->NbSP ;
for(i = 0 ; i < List_Nbr(v->SP) ; i+=nb){
Get_Coords(1., v->Offset, 1,
diff --git a/Graphics/Scale.cpp b/Graphics/Scale.cpp
index ef68d262589bcbc360fa14d289d2ab31507f10f8..caf6cf9091bd6040cdd281cc9e57bb87b0ad8df8 100644
--- a/Graphics/Scale.cpp
+++ b/Graphics/Scale.cpp
@@ -1,4 +1,4 @@
-// $Id: Scale.cpp,v 1.25 2001-10-31 08:34:19 geuzaine Exp $
+// $Id: Scale.cpp,v 1.26 2001-11-05 08:37:43 geuzaine Exp $
#include "Gmsh.h"
#include "GmshUI.h"
@@ -11,9 +11,6 @@
extern Context_T CTX;
-static double overall ;
-#define CHECK_W overall=gl_width(label) ; if(overall > cv_w) cv_w=overall
-
/* Even if all computations in these routines are made in window
coordinates, double precision is used to work at subpixel accuracy */
@@ -26,36 +23,40 @@ extern double GiveValueFromIndex_Log(double ValMin, double ValMax, int NbIso, in
extern int GiveIndexFromValue_Lin(double ValMin, double ValMax, int NbIso, double Val);
extern int GiveIndexFromValue_Log(double ValMin, double ValMax, int NbIso, double Val);
-void draw_scale(Post_View *v, double xmin, double ymin, double *width, double height){
+void draw_scale(Post_View *v,
+ double xmin, double ymin, double width, double height,
+ double tic, double space, double dx, double dy){
+
int i, nbv;
- double font_h, font_a, label_h;
- double cs_xmin, cs_ymin, cs_h, cs_w, cs_bh;
- double cv_xmin, cv_ymin, cv_h, cv_w, cv_bh;
+ double font_h, font_a;
+ double cs_bh, cv_xmin, cv_bh;
char label[1024] ;
double Val, ValMin, ValMax;
gl_font(FL_HELVETICA,CTX.gl_fontsize);
- font_h = gl_height() ; /* hauteur totale de la fonte */
- font_a = gl_height()-gl_descent() ;/* hauteur de la fonte au dessus de pt de ref */
- label_h = 1.8*font_h ; /* hauteur du label */
-
- cs_xmin = xmin ; /* colorscale xmin */
- cs_ymin = ymin+label_h ; /* colorscale ymin */
- cs_w = 16. ; /* colorscale width */
- cs_h = height-label_h ; /* colorscale height */
- cs_bh = cs_h/v->NbIso ; /* colorscale box height */
-
- cv_xmin = cs_xmin+cs_w+5 ; /* valuescale xmin */
- cv_ymin = cs_ymin ; /* valuescale ymin */
- cv_w = 0.0 ; /* valuescale width: to be computed */
- cv_h = cs_h ; /* valuescale height */
- cv_bh = 0.0 ; /* valuescale box height: to be computed */
+ font_h = gl_height() ; // hauteur totale de la fonte
+ font_a = gl_height()-gl_descent() ; // hauteur de la fonte au dessus de pt de ref
+ cs_bh = height/v->NbIso ; // colorscale box height
+ cv_xmin = xmin+width+tic ; // valuescale xmin
glPointSize(v->PointSize);
gl2psPointSize(v->PointSize * CTX.print.eps_point_size_factor);
glLineWidth(v->LineWidth);
gl2psLineWidth(v->LineWidth * CTX.print.eps_line_width_factor);
+
+ if(!v->TransparentScale){
+ double dytop=0.;
+ if(v->IntervalsType != DRAW_POST_ISO)
+ dytop = font_h/2.;
+ glColor4ubv((GLubyte*)&CTX.color.bg);
+ glBegin(GL_QUADS);
+ glVertex2d(xmin-space,ymin-dy-space);
+ glVertex2d(xmin+width+dx+space,ymin-dy-space);
+ glVertex2d(xmin+width+dx+space,ymin+height+dytop+space);
+ glVertex2d(xmin-space,ymin+height+dytop+space);
+ glEnd();
+ }
if(v->IntervalsType == DRAW_POST_CONTINUOUS)
glShadeModel(GL_SMOOTH);
@@ -80,128 +81,105 @@ void draw_scale(Post_View *v, double xmin, double ymin, double *width, double he
break;
}
- /* background : bidouille
- il faudra changer l'ordre des operations
- */
-
- if(!v->TransparentScale){
- sprintf(label, v->Format, (ValMin+ValMax)/Pi);
- CHECK_W;
- *width = cv_xmin-cs_xmin+cv_w;
- glColor4ubv((GLubyte*)&CTX.color.bg);
- glBegin(GL_QUADS);
- glVertex2d(xmin, ymin);
- glVertex2d(xmin+*width, ymin);
- glVertex2d(xmin+*width, ymin+height);
- glVertex2d(xmin, ymin+height);
- glEnd();
- }
-
- /* colorscale */
+ // colorscale
for(i=0;i<v->NbIso;i++){
if(v->IntervalsType==DRAW_POST_DISCRETE){
Palette(v,v->NbIso,i);
glBegin(GL_QUADS);
- glVertex2d(cs_xmin, cs_ymin+i*cs_bh);
- glVertex2d(cs_xmin+cs_w, cs_ymin+i*cs_bh);
- glVertex2d(cs_xmin+cs_w, cs_ymin+(i+1)*cs_bh);
- glVertex2d(cs_xmin, cs_ymin+(i+1)*cs_bh);
+ glVertex2d(xmin, ymin+i*cs_bh);
+ glVertex2d(xmin+width, ymin+i*cs_bh);
+ glVertex2d(xmin+width, ymin+(i+1)*cs_bh);
+ glVertex2d(xmin, ymin+(i+1)*cs_bh);
glEnd();
}
else if (v->IntervalsType==DRAW_POST_CONTINUOUS){
glBegin(GL_QUADS);
Palette2(v,ValMin,ValMax,ValMin+i*(ValMax-ValMin)/v->NbIso);
- glVertex2d(cs_xmin, cs_ymin+i*cs_bh);
- glVertex2d(cs_xmin+cs_w, cs_ymin+i*cs_bh);
+ glVertex2d(xmin, ymin+i*cs_bh);
+ glVertex2d(xmin+width, ymin+i*cs_bh);
Palette2(v,ValMin,ValMax,ValMin+(i+1)*(ValMax-ValMin)/v->NbIso);
- glVertex2d(cs_xmin+cs_w, cs_ymin+(i+1)*cs_bh);
- glVertex2d(cs_xmin, cs_ymin+(i+1)*cs_bh);
+ glVertex2d(xmin+width, ymin+(i+1)*cs_bh);
+ glVertex2d(xmin, ymin+(i+1)*cs_bh);
glEnd();
}
else{
Palette(v,v->NbIso,i);
glBegin(GL_LINES);
- glVertex2d(cs_xmin, cs_ymin+i*cs_bh+0.5*cs_bh);
- glVertex2d(cs_xmin+cs_w, cs_ymin+i*cs_bh+0.5*cs_bh);
+ glVertex2d(xmin, ymin+i*cs_bh+0.5*cs_bh);
+ glVertex2d(xmin+width, ymin+i*cs_bh+0.5*cs_bh);
glEnd();
}
}
- /* valuescale */
+ // valuescale
- nbv = (v->NbIso<floor(cs_h/font_h))?v->NbIso:-1;
- cv_bh = cv_h/nbv;
+ nbv = (v->NbIso<floor(height/font_h))?v->NbIso:-1;
+ cv_bh = height/nbv;
glColor4ubv((GLubyte*)&CTX.color.text);
- /* only min and max if not enough room */
- if(nbv<0){
+
+ if(nbv<0){ // only min and max if not enough room
if(v->IntervalsType == DRAW_POST_DISCRETE ||
v->IntervalsType == DRAW_POST_CONTINUOUS){
sprintf(label, v->Format, ValMin);
- glRasterPos2d(cv_xmin,cv_ymin-font_a/3.);
- Draw_String(label); CHECK_W;
+ glRasterPos2d(cv_xmin,ymin-font_a/3.);
+ Draw_String(label);
sprintf(label, v->Format, ValMax);
- glRasterPos2d(cv_xmin,cv_ymin+cv_h-font_a/3.);
- Draw_String(label); CHECK_W;
+ glRasterPos2d(cv_xmin,ymin+height-font_a/3.);
+ Draw_String(label);
}
else {
sprintf(label, v->Format, ValMin);
- glRasterPos2d(cv_xmin,cv_ymin+(cs_bh/2)-font_a/3.);
- Draw_String(label); CHECK_W;
+ glRasterPos2d(cv_xmin,ymin+(cs_bh/2)-font_a/3.);
+ Draw_String(label);
sprintf(label, v->Format, ValMax);
- glRasterPos2d(cv_xmin,cv_ymin+cv_h-(cs_bh/2)-font_a/3.);
- Draw_String(label); CHECK_W;
+ glRasterPos2d(cv_xmin,ymin+height-(cs_bh/2)-font_a/3.);
+ Draw_String(label);
}
}
-
- /* all the values if enough space */
else {
if(v->IntervalsType == DRAW_POST_DISCRETE ||
v->IntervalsType == DRAW_POST_CONTINUOUS){
for(i=0 ; i<nbv+1 ; i++){
Val = v->GVFI(ValMin,ValMax,nbv+1,i);
sprintf(label, v->Format, Val);
- /* suppressing the 2 following lines improves fltk performance
- a lot on linux. and only on linux. Why? */
- glRasterPos2d(cv_xmin,cv_ymin+i*cv_bh-font_a/3.);
- Draw_String(label); CHECK_W;
+ glRasterPos2d(cv_xmin,ymin+i*cv_bh-font_a/3.);
+ Draw_String(label);
}
}
else {
for(i=0 ; i<nbv ; i++){
Val = v->GVFI(ValMin,ValMax,nbv,i);
sprintf(label, v->Format, Val);
- glRasterPos2d(cv_xmin,cv_ymin+(2*i+1)*(cv_bh/2)-font_a/3.);
- Draw_String(label); CHECK_W;
+ glRasterPos2d(cv_xmin,ymin+(2*i+1)*(cv_bh/2)-font_a/3.);
+ Draw_String(label);
}
}
}
- /* the label */
+ // the label
- glRasterPos2d(cv_xmin,ymin);
+ glRasterPos2d(cv_xmin,ymin-2*font_h);
if(List_Nbr(v->Time)>1 && v->ShowTime)
sprintf(label, "%s (%g)", v->Name, *(double*)List_Pointer(v->Time,v->TimeStep));
else
sprintf(label, "%s", v->Name);
- Draw_String(label); CHECK_W;
-
-
- /* compute the width */
- *width = cv_xmin-cs_xmin+cv_w;
+ Draw_String(label);
}
static List_T *todraw=NULL;
void Draw_Scales(void){
- int i;
- double xmin, ymin, width, height, xsep, ysep;
- double oldwidth, totalwidth;
+ int i;
+ double xmin, ymin, width, height, xsep, ysep;
+ double oldwidth, totalwidth;
+ double dx=0., dy=0., tic=5., space=10.;
+ char label[1024];
Post_View *v;
if(!CTX.post.list) return;
@@ -215,7 +193,7 @@ void Draw_Scales(void){
for(i=0;i<List_Nbr(CTX.post.list);i++){
v = (Post_View*)List_Pointer(CTX.post.list,i);
- if(v->Visible && v->ShowScale && v->GraphType==DRAW_POST_3D && !v->TextOnly)
+ if(v->Visible && v->ShowScale && v->Type==DRAW_POST_3D && !v->TextOnly)
List_Add(todraw,&v);
}
@@ -223,37 +201,50 @@ void Draw_Scales(void){
return;
}
- if(List_Nbr(todraw)==1){
- xsep = 20. ;
+ xsep = 20. ;
+ width = 16.0;
+ totalwidth = 0.0;
+ if(List_Nbr(todraw)==1)
ysep = (CTX.viewport[3]-CTX.viewport[1])/6. ;
- xmin = CTX.viewport[0] + xsep ;
- ymin = CTX.viewport[1] + ysep ;
- width = 0.0;
- height = CTX.viewport[3]-CTX.viewport[1] - 2*ysep ;
-
- v = *((Post_View**)List_Pointer(todraw,0));
- draw_scale(v,xmin,ymin,&width,height);
- }
- else{
- xsep = 20. ;
+ else
ysep = (CTX.viewport[3]-CTX.viewport[1])/15. ;
- xmin = CTX.viewport[0] + xsep ;
- ymin = CTX.viewport[1] + ysep ;
- width = 0.0;
- totalwidth = 0.0;
- height = (CTX.viewport[3]-CTX.viewport[1]-3*ysep)/2. ;
-
- for(i=0;i<List_Nbr(todraw);i++){
- v = *(Post_View**)List_Pointer(todraw,i);
- oldwidth = width;
- draw_scale(v,
- xmin+totalwidth+(i/2)*xsep,
- ymin+(1-i%2)*(height+ysep),
- &width,
- height);
- if(i%2) totalwidth += DMAX(width,oldwidth);
+ xmin = CTX.viewport[0] + xsep ;
+ ymin = CTX.viewport[1] + ysep ;
+
+ for(i=0;i<List_Nbr(todraw);i++){
+ v = *(Post_View**)List_Pointer(todraw,i);
+ oldwidth = width+dx+space;
+ dx = dy = 0.;
+ gl_font(FL_HELVETICA,CTX.gl_fontsize);
+ sprintf(label,v->Format,v->CustomMin);
+ if(gl_width(label)+tic > dx) dx = gl_width(label)+tic;
+ sprintf(label,v->Format,v->CustomMax);
+ if(gl_width(label)+tic > dx) dx = gl_width(label)+tic;
+ if(List_Nbr(v->Time)>1 && v->ShowTime)
+ sprintf(label, "%s (%g)", v->Name, *(double*)List_Pointer(v->Time,v->TimeStep));
+ else
+ sprintf(label, "%s", v->Name);
+ if(gl_width(label)+tic > dx) dx = gl_width(label)+tic;
+ dy = 2.*gl_height();
+ if(v->AutoPosition){
+ if(List_Nbr(todraw)==1){
+ height = CTX.viewport[3]-CTX.viewport[1]-2*ysep-dy ;
+ draw_scale(v,xmin,ymin+dy,width,height,tic,space,dx,dy);
+ }
+ else{
+ height = (CTX.viewport[3]-CTX.viewport[1]-3*ysep-2.5*dy)/2. ;
+ draw_scale(v,
+ xmin+totalwidth+(i/2)*xsep,
+ ymin+dy+(1-i%2)*(height+1.5*dy+ysep),
+ width, height, tic, space,dx, dy);
+ }
+ if(i%2) totalwidth += DMAX(width+dx+space,oldwidth);
}
+ else
+ draw_scale(v,v->Position[0],CTX.viewport[3]-v->Size[1]-v->Position[1],
+ v->Size[0],v->Size[1],tic,space,dx,dy);
}
+
}
diff --git a/Plugin/Triangulate.cpp b/Plugin/Triangulate.cpp
index ca10db04d941d9bdfaf73f38567e73de506ea49a..47f883a0c5887f09705a4b55653358b9995bd355 100644
--- a/Plugin/Triangulate.cpp
+++ b/Plugin/Triangulate.cpp
@@ -1,4 +1,4 @@
-// $Id: Triangulate.cpp,v 1.2 2001-10-29 08:52:21 geuzaine Exp $
+// $Id: Triangulate.cpp,v 1.3 2001-11-05 08:37:43 geuzaine Exp $
#include "Gmsh.h"
#include "Plugin.h"
@@ -71,13 +71,13 @@ extern "C" {
}
void Triangulate(Post_View *vin, Post_View *vout){
- int i, j=0, j0, j1, j2;
+ int nb, i, j=0, j0, j1, j2;
Surface *s;
Vertex *v;
struct triangulateio in, out;
- int nb = List_Nbr(vin->SP)/vin->NbSP ;
- List_T *points = List_Create(nb,1,sizeof(Vertex*));
+ List_T *points = List_Create(vin->NbSP,1,sizeof(Vertex*));
+ nb = List_Nbr(vin->SP)/vin->NbSP ;
for(i = 0 ; i < List_Nbr(vin->SP) ; i+=nb){
v = Create_Vertex(j++,
diff --git a/benchmarks/extrude/stator1910.geo b/benchmarks/extrude/stator1910.geo
index 817b310f35d664e93a0a15bebd13166c91796202..dde4538adb845fedd5df54a5bb00bdb38a932866 100644
--- a/benchmarks/extrude/stator1910.geo
+++ b/benchmarks/extrude/stator1910.geo
@@ -1,4 +1,3 @@
-
Geometry.AutoCoherence=0;
s=1;
@@ -10,11 +9,13 @@ r = 9.5*mm;
nbr_tooth = 72;
nbr_gap = 12;
-NodLin = 6;
+NodLin = 24;
teta_vide = 1/40;
teta_tooth = 5*Pi/180-teta_vide;
teta_gap = teta_vide/2;
+insc=150;
+
Point(1) = {0,0,0,lc}; Point(2) = {r,0,0,lc/1.5}; Point(3) = {12.5e-3,0,0,lc};
Point(4) = {17.5e-3,0,-1e-3,lc}; Point(5) = {35e-3,0,-1e-3,lc}; Point(6) = {37e-3,0,-4e-3,lc/4};
Point(7) = {38e-3,0,-4e-3,lc/4}; Point(8) = {12.5e-3,0,1e-3,lc}; Point(9) = {17.5e-3,0,1e-3,lc};
@@ -48,8 +49,10 @@ N_ = 100;
V_100dent = 123456;
+
// Sector 1 ______________________________________________________________
+
i_sect = 1;
Extrude Surface {2, {0,0,1}, {0,0,0}, teta_gap/2}{
@@ -91,7 +94,7 @@ l_dent=teta_tooth*R/L_sec;
For i In {0:4}
ListVol1[i]=V_corp ; // corp
ListVol2[i]=V_dent+i; // dents ou vides : V_dent<-dent, V_dent+1<-vide ...
- ListVol3[i]=V_PZT_lower + N_*(i_sect-1); // PZT_lower
+ ListVol3[i]=V_PZT_lower + N_*(i_sect-1); // PZT_lower
ListVol4[i]=V_PZT_upper + N_*(i_sect-1); // PZT_upper
ListExt[i]=1;
EndFor
@@ -107,89 +110,89 @@ For i In {1:3}
EndFor
ListDiv[4]=1;
-Extrude Surface {86+150, {0,0,1}, {0,0,0}, Pi/12-teta_vide}{
+Extrude Surface {86+insc, {0,0,1}, {0,0,0}, Pi/12-teta_vide}{
Recombine ; Layers { ListExt[{0:4}] , ListVol1[{0:4}], ListDiv[{0:4}] };
};
-Extrude Surface {108+150, {0,0,1}, {0,0,0}, Pi/12-teta_vide}{
+Extrude Surface {108+insc, {0,0,1}, {0,0,0}, Pi/12-teta_vide}{
Recombine ; Layers { ListExt[{0:4}] , ListVol2[{0:4}], ListDiv[{0:4}] };
};
-Extrude Surface {130+150, {0,0,1}, {0,0,0}, Pi/12-teta_vide}{
+Extrude Surface {130+insc, {0,0,1}, {0,0,0}, Pi/12-teta_vide}{
Recombine ; Layers { ListExt[{0:4}] , ListVol2[{0:4}], ListDiv[{0:4}] };
};
-Extrude Surface {152+150, {0,0,1}, {0,0,0}, Pi/12-teta_vide}{
+Extrude Surface {152+insc, {0,0,1}, {0,0,0}, Pi/12-teta_vide}{
Recombine ; Layers { ListExt[{0:4}] , ListVol3[{0:4}], ListDiv[{0:4}] };
};
-Extrude Surface {174+150, {0,0,1}, {0,0,0}, Pi/12-teta_vide}{
+Extrude Surface {174+insc, {0,0,1}, {0,0,0}, Pi/12-teta_vide}{
Recombine ; Layers { ListExt[{0:4}] , ListVol4[{0:4}], ListDiv[{0:4}] };
};
-Extrude Surface {86+2*150, {0,0,1}, {0,0,0}, teta_vide/2 -teta_gap/2 }{
+Extrude Surface {86+2*insc, {0,0,1}, {0,0,0}, teta_vide/2 -teta_gap/2 }{
Recombine ; Layers { 1 ,V_corp, 1 }; // corp
};
-Extrude Surface {108+2*150, {0,0,1}, {0,0,0}, teta_vide/2 -teta_gap/2 }{
+Extrude Surface {108+2*insc, {0,0,1}, {0,0,0}, teta_vide/2 -teta_gap/2 }{
Recombine ; Layers { 1, V_100dent, 1 }; // pas de dent
};
-Extrude Surface {130+2*150, {0,0,1}, {0,0,0}, teta_vide/2 -teta_gap/2 }{
+Extrude Surface {130+2*insc, {0,0,1}, {0,0,0}, teta_vide/2 -teta_gap/2 }{
Recombine ; Layers { 1, V_100dent, 1}; // pas de dent
};
-Extrude Surface {152+2*150, {0,0,1}, {0,0,0}, teta_vide/2 -teta_gap/2 }{
+Extrude Surface {152+2*insc, {0,0,1}, {0,0,0}, teta_vide/2 -teta_gap/2 }{
Recombine ; Layers { 1, V_PZT_lower + N_*(i_sect-1), 1}; // PZT_lower
};
-Extrude Surface {174+2*150, {0,0,1}, {0,0,0}, teta_vide/2 -teta_gap/2 }{
+Extrude Surface {174+2*insc, {0,0,1}, {0,0,0}, teta_vide/2 -teta_gap/2 }{
Recombine ; Layers { 1, V_PZT_upper + N_*(i_sect-1), 1}; // PZT_upper
};
-Extrude Surface {86+3*150, {0,0,1}, {0,0,0}, teta_gap/2}{
+Extrude Surface {86+3*insc, {0,0,1}, {0,0,0}, teta_gap/2}{
Recombine ; Layers { 1, V_corp, 1}; // corp
};
-Extrude Surface {108+3*150, {0,0,1}, {0,0,0}, teta_gap/2}{
+Extrude Surface {108+3*insc, {0,0,1}, {0,0,0}, teta_gap/2}{
Recombine ; Layers { 1, V_100dent, 1}; // pas de dent
};
-Extrude Surface {130+3*150, {0,0,1}, {0,0,0}, teta_gap/2}{
+Extrude Surface {130+3*insc, {0,0,1}, {0,0,0}, teta_gap/2}{
Recombine ; Layers { 1, V_100dent, 1}; // pas de dent
};
-Extrude Surface {152+3*150, {0,0,1}, {0,0,0}, teta_gap/2}{
+Extrude Surface {152+3*insc, {0,0,1}, {0,0,0}, teta_gap/2}{
Recombine ; Layers { 1, V_PZT_lower + N_*(i_sect-1), 1 }; // PZT_lower
};
-Extrude Surface {174+3*150, {0,0,1}, {0,0,0}, teta_gap/2}{
+Extrude Surface {174+3*insc, {0,0,1}, {0,0,0}, teta_gap/2}{
Recombine ; Layers { 1, V_PZT_upper + N_*(i_sect-1), 1 }; // PZT_upper
};
// Sector 2..n ______________________________________________________________
-For i_sect In {2:4}
+For i_sect In {2:NodLin}
-Extrude Surface {86+((i_sect-2)*5+4)*150, {0,0,1}, {0,0,0}, teta_gap/2}{
+Extrude Surface {86+((i_sect-2)*5+4)*insc, {0,0,1}, {0,0,0}, teta_gap/2}{
Recombine ; Layers { 1, V_corp, 1}; // corp
};
-Extrude Surface {108+((i_sect-2)*5+4)*150, {0,0,1}, {0,0,0}, teta_gap/2}{
+Extrude Surface {108+((i_sect-2)*5+4)*insc, {0,0,1}, {0,0,0}, teta_gap/2}{
Recombine ; Layers { 1, V_100dent, 1}; // pas de dent
};
-Extrude Surface {130+((i_sect-2)*5+4)*150, {0,0,1}, {0,0,0}, teta_gap/2}{
+Extrude Surface {130+((i_sect-2)*5+4)*insc, {0,0,1}, {0,0,0}, teta_gap/2}{
Recombine ; Layers { 1, V_100dent, 1}; // pas de dent
};
-Extrude Surface {152+((i_sect-2)*5+4)*150, {0,0,1}, {0,0,0}, teta_gap/2}{
+Extrude Surface {152+((i_sect-2)*5+4)*insc, {0,0,1}, {0,0,0}, teta_gap/2}{
Recombine ; Layers { 1, V_PZT_lower + N_*(i_sect-1), 1 }; // PZT_lower
};
-Extrude Surface {174+((i_sect-2)*5+4)*150, {0,0,1}, {0,0,0}, teta_gap/2}{
+Extrude Surface {174+((i_sect-2)*5+4)*insc, {0,0,1}, {0,0,0}, teta_gap/2}{
Recombine ; Layers { 1, V_PZT_upper + N_*(i_sect-1), 1 }; // PZT_upper
};
-Extrude Surface {86+((i_sect-2)*5+5)*150, {0,0,1}, {0,0,0}, teta_vide/2 -teta_gap/2 }{
+Extrude Surface {86+((i_sect-2)*5+5)*insc, {0,0,1}, {0,0,0}, teta_vide/2 -teta_gap/2 }{
Recombine ; Layers { 1, V_corp, 1 }; // corp
};
-Extrude Surface {108+((i_sect-2)*5+5)*150, {0,0,1}, {0,0,0}, teta_vide/2 -teta_gap/2 }{
+Extrude Surface {108+((i_sect-2)*5+5)*insc, {0,0,1}, {0,0,0}, teta_vide/2 -teta_gap/2 }{
Recombine ; Layers { 1, V_100dent, 1 }; // pas de dent
};
-Extrude Surface {130+((i_sect-2)*5+5)*150, {0,0,1}, {0,0,0}, teta_vide/2 -teta_gap/2 }{
+Extrude Surface {130+((i_sect-2)*5+5)*insc, {0,0,1}, {0,0,0}, teta_vide/2 -teta_gap/2 }{
Recombine ; Layers { 1, V_100dent, 1}; // pas de dent
};
-Extrude Surface {152+((i_sect-2)*5+5)*150, {0,0,1}, {0,0,0}, teta_vide/2 -teta_gap/2 }{
+Extrude Surface {152+((i_sect-2)*5+5)*insc, {0,0,1}, {0,0,0}, teta_vide/2 -teta_gap/2 }{
Recombine ; Layers { 1, V_PZT_lower + N_*(i_sect-1), 1}; // PZT_lower
};
-Extrude Surface {174+((i_sect-2)*5+5)*150, {0,0,1}, {0,0,0}, teta_vide/2 -teta_gap/2 }{
+Extrude Surface {174+((i_sect-2)*5+5)*insc, {0,0,1}, {0,0,0}, teta_vide/2 -teta_gap/2 }{
Recombine ; Layers { 1, V_PZT_upper + N_*(i_sect-1), 1}; // PZT_upper
};
@@ -198,51 +201,51 @@ For i In {0:4}
ListVol5[i] = V_PZT_upper + N_*(i_sect-1); // PZT_upper
EndFor
-Extrude Surface {86+((i_sect-2)*5+6)*150, {0,0,1}, {0,0,0}, Pi/12-teta_vide}{
+Extrude Surface {86+((i_sect-2)*5+6)*insc, {0,0,1}, {0,0,0}, Pi/12-teta_vide}{
Recombine ; Layers { ListExt[{0:4}] , ListVol1[{0:4}], ListDiv[{0:4}] };
};
-Extrude Surface {108+((i_sect-2)*5+6)*150, {0,0,1}, {0,0,0}, Pi/12-teta_vide}{
+Extrude Surface {108+((i_sect-2)*5+6)*insc, {0,0,1}, {0,0,0}, Pi/12-teta_vide}{
Recombine ; Layers { ListExt[{0:4}] , ListVol2[{0:4}], ListDiv[{0:4}] };
};
-Extrude Surface {130+((i_sect-2)*5+6)*150, {0,0,1}, {0,0,0}, Pi/12-teta_vide}{
+Extrude Surface {130+((i_sect-2)*5+6)*insc, {0,0,1}, {0,0,0}, Pi/12-teta_vide}{
Recombine ; Layers { ListExt[{0:4}] , ListVol2[{0:4}], ListDiv[{0:4}] };
};
-Extrude Surface {152+((i_sect-2)*5+6)*150, {0,0,1}, {0,0,0}, Pi/12-teta_vide}{
+Extrude Surface {152+((i_sect-2)*5+6)*insc, {0,0,1}, {0,0,0}, Pi/12-teta_vide}{
Recombine ; Layers { ListExt[{0:4}] , ListVol3[{0:4}], ListDiv[{0:4}] };
};
-Extrude Surface {174+((i_sect-2)*5+6)*150, {0,0,1}, {0,0,0}, Pi/12-teta_vide}{
+Extrude Surface {174+((i_sect-2)*5+6)*insc, {0,0,1}, {0,0,0}, Pi/12-teta_vide}{
Recombine ; Layers { ListExt[{0:4}] , ListVol4[{0:4}], ListDiv[{0:4}] };
};
-Extrude Surface {86+((i_sect-2)*5+7)*150, {0,0,1}, {0,0,0}, teta_vide/2 -teta_gap/2 }{
+Extrude Surface {86+((i_sect-2)*5+7)*insc, {0,0,1}, {0,0,0}, teta_vide/2 -teta_gap/2 }{
Recombine ; Layers { 1, V_corp, 1 }; // corp
};
-Extrude Surface {108+((i_sect-2)*5+7)*150, {0,0,1}, {0,0,0}, teta_vide/2 -teta_gap/2 }{
+Extrude Surface {108+((i_sect-2)*5+7)*insc, {0,0,1}, {0,0,0}, teta_vide/2 -teta_gap/2 }{
Recombine ; Layers { 1, V_100dent, 1 }; // pas de dent
};
-Extrude Surface {130+((i_sect-2)*5+7)*150, {0,0,1}, {0,0,0}, teta_vide/2 -teta_gap/2 }{
+Extrude Surface {130+((i_sect-2)*5+7)*insc, {0,0,1}, {0,0,0}, teta_vide/2 -teta_gap/2 }{
Recombine ; Layers { 1, V_100dent, 1}; // pas de dent
};
-Extrude Surface {152+((i_sect-2)*5+7)*150, {0,0,1}, {0,0,0}, teta_vide/2 -teta_gap/2 }{
+Extrude Surface {152+((i_sect-2)*5+7)*insc, {0,0,1}, {0,0,0}, teta_vide/2 -teta_gap/2 }{
Recombine ; Layers { 1, V_PZT_lower + N_*(i_sect-1), 1}; // PZT_lower
};
-Extrude Surface {174+((i_sect-2)*5+7)*150, {0,0,1}, {0,0,0}, teta_vide/2 -teta_gap/2 }{
+Extrude Surface {174+((i_sect-2)*5+7)*insc, {0,0,1}, {0,0,0}, teta_vide/2 -teta_gap/2 }{
Recombine ; Layers { 1, V_PZT_upper + N_*(i_sect-1), 1}; // PZT_upper
};
-Extrude Surface {86+((i_sect-2)*5+8)*150, {0,0,1}, {0,0,0}, teta_gap/2}{
+Extrude Surface {86+((i_sect-2)*5+8)*insc, {0,0,1}, {0,0,0}, teta_gap/2}{
Recombine ; Layers { 1, V_corp, 1}; // corp
};
-Extrude Surface {108+((i_sect-2)*5+8)*150, {0,0,1}, {0,0,0}, teta_gap/2}{
+Extrude Surface {108+((i_sect-2)*5+8)*insc, {0,0,1}, {0,0,0}, teta_gap/2}{
Recombine ; Layers { 1, V_100dent, 1}; // pas de dent
};
-Extrude Surface {130+((i_sect-2)*5+8)*150, {0,0,1}, {0,0,0}, teta_gap/2}{
+Extrude Surface {130+((i_sect-2)*5+8)*insc, {0,0,1}, {0,0,0}, teta_gap/2}{
Recombine ; Layers { 1, V_100dent, 1}; // pas de dent
};
-Extrude Surface {152+((i_sect-2)*5+8)*150, {0,0,1}, {0,0,0}, teta_gap/2}{
+Extrude Surface {152+((i_sect-2)*5+8)*insc, {0,0,1}, {0,0,0}, teta_gap/2}{
Recombine ; Layers { 1, V_PZT_lower + N_*(i_sect-1), 1 }; // PZT_lower
};
-Extrude Surface {174+((i_sect-2)*5+8)*150, {0,0,1}, {0,0,0}, teta_gap/2}{
+Extrude Surface {174+((i_sect-2)*5+8)*insc, {0,0,1}, {0,0,0}, teta_gap/2}{
Recombine ; Layers { 1, V_PZT_upper + N_*(i_sect-1), 1 }; // PZT_upper
};
@@ -250,16 +253,16 @@ EndFor
Coherence;
+
// Extruding finished !!! __________________________________________________________________
-/*
+
PZTplus = 1000;
PZTminus = 2000;
-
Corp = 3000;
-ElectrodePlus = 1001;
-ElectrodeMinus = 1002;
+ElectrodeUpper = 1001;
+ElectrodeLower = 1002;
Masse = 1003;
Inner_Cylinder = 1009;
@@ -271,32 +274,50 @@ For i In {0:2}
EndFor
Physical Volume(Corp) = {V_corp, ListDent[{0:2}]};
-switch = 1;
-For i_sect In {1:4}
- ListPZT_lower_plus[i_sect] = V_PZT_lower + N_*(i_sect-1)+ (iNodLin-1);
- ListPZT_lower_plus[i_sect] = V_PZT_lower + N_*(i_sect+1-1) + (iNodLin-1);
- ListPZT_lower_minus[i_sect]=
-EndFor
-
- ListPZT_lower_plus[i_sect] = V_PZT_lower + N_*(i_sect-1);
- ListPZT_lower_minus[i_sect+2]= V_PZT_lower + N_*(i_sect-1+2);
-
- ListPZT_upper_plus[i_sect] = V_PZT_lower + N_*(i_sect-1);
- ListPZT_upper_minus[i_sect+2]= V_PZT_lower + N_*(i_sect-1+1);
+i_plus[{1:12}]={1,2, 5,6, 9,10, 13,14, 17,18, 21,22}; // (++)(--)(++)(--)(++)(--)(++)(--)(++)(--)(++)(--)
+i_minus[{1:12}]={ 3,4, 7,8, 11,12, 15,16, 19,20, 23,24};
+For i In {1:12}
+ ListPZT_upper_plus[i] = V_PZT_upper + N_*(i_plus[i]-1);
+ ListPZT_upper_minus[i] = V_PZT_upper + N_*(i_minus[i]-1);
+EndFor
+i_plus[{1:12}]= {1, 4,5, 8,9, 12,13, 16,17, 20,21, 24};// +)(--)(++)(--)(++)(--)(++)(--)(++)(--)(++)(--)(+
+i_minus[{1:12}] = { 2,3, 6,7, 10,11, 14,15, 18,19, 22,23};
+For i In {1:12}
+ ListPZT_lower_plus[i] = V_PZT_lower + N_*(i_plus[i]-1);
+ ListPZT_lower_minus[i] = V_PZT_lower + N_*(i_minus[i]-1);
EndFor
-Physical Volume(PZTplus) = { ListPZTplus[{1:2}] } ;
-Physical Volume(PZTminus) = { ListPZTminus[{3:4}] } ;
+Physical Volume(PZTplus) = { ListPZT_lower_plus[{1:12}], ListPZT_upper_plus[{1:12}] } ;
+Physical Volume(PZTminus) = { ListPZT_lower_minus[{1:12}], ListPZT_upper_minus[{1:12}] } ;
-*/
+For i In {1:NodLin*5} // taking into account the gaps,...
+ List_Electrode_Upper[i] = 169+(i-1)*insc;
+ List_Electrode_Lower[i] = 143+(i-1)*insc;
+EndFor
+i_upper_plus[{1:48}] ={2:9, 22:29, 42:49, 62:69, 82:89, 102:109};
+i_upper_minus[{1:48}]={ 12:19, 32:39, 52:59, 72:79, 92:99, 112:119};
+i_lower_plus[{1:48}]={1,2,3,4, 17:24, 37:44, 57:64, 77:84, 97:104, 117,118,119,120};
+i_lower_minus[{1:48}]={ 7:14, 27:34, 47:54, 67:74, 87:94, 107:114};
+Physical Surface (ElectrodeUpper) = { List_Electrode_Upper[{i_upper_plus[{1:48}]}], List_Electrode_Upper[{i_upper_minus[{1:48}]}] } ;
+Physical Surface (ElectrodeLower) = { List_Electrode_Lower[{i_lower_plus[{1:48}]}], List_Electrode_Lower[{i_lower_minus[{1:48}]}] } ;
+For i In {1:NodLin*5} // taking into account the gaps,...
+ List_Emasse_upper[i]=85+(i-1)*insc;
+ List_Emasse_lower[i]=69+(i-1)*insc;
+EndFor
+Physical Surface (Masse) = { List_Emasse_upper[{1:120}], List_Emasse_lower[{1:120}] } ;
+For i In {1:NodLin*5}
+ List_IC[i]=53+(i-1)*insc;
+EndFor
+Physical Surface (Inner_Cylinder) = { List_IC[{1:120}] };
+//Physical Point (Point99) = {};
diff --git a/benchmarks/misc/charts.geo b/benchmarks/misc/charts.geo
index f54af44a8442e829a1caafe7391e88f495c588ba..1b6415ffd2cd4fe9dca8da90aab45da735e3c3af 100644
--- a/benchmarks/misc/charts.geo
+++ b/benchmarks/misc/charts.geo
@@ -15,9 +15,9 @@ View "test" {
SP(9,0,0){0 ,0.2+0 ,0.42+0 ,0.2+0 ,0.42+0 ,0.2+0 ,0.42+0 ,0.2+0 ,0.42+0 };
};
-View[PostProcessing.NbViews-1].GraphType=2;
+View[PostProcessing.NbViews-1].Type=2;
View[PostProcessing.NbViews-1].Format="%.3g";
-View[PostProcessing.NbViews-1].GraphGrid=3;
+View[PostProcessing.NbViews-1].Grid=3;
/*
View "annote" {
diff --git a/doc/FAQ b/doc/FAQ
index 92dbd596d2fbd28adbcf5da31dcd23c17bac2230..f2f1427ec47fd029ba87bd7cbfdb6a9b88f892b7 100644
--- a/doc/FAQ
+++ b/doc/FAQ
@@ -1,5 +1,4 @@
-
-GMSH FREQUENTLY ASKED QUESTIONS ($Date: 2001-10-06 16:32:40 $)
+GMSH FREQUENTLY ASKED QUESTIONS ($Date: 2001-11-05 08:37:43 $)
1. GENERAL
==========
@@ -29,14 +28,16 @@ mailing list (<gmsh@geuz.org>) on this site.
2.1) Which OSes does Gmsh run on?
-Windows 95/98/NT/2000, Linux (with glibc > 2.1), Compaq Tru 64 Unix,
-Sun OS, IBM AIX, SGI IRIX, HP-UX.
+Windows 95/98/NT/2000, Linux (with glibc > 2.1), Compaq Tru 64 Unix
+(aka OSF1), Sun OS, IBM AIX, SGI IRIX, HP-UX.
2.2) Are there additional requirements to run Gmsh?
For Unix versions only: you should have the OpenGL libraries installed
on your system, and in the path of the library loader. A free
-replacement for OpenGL can be found at <http://www.mesa3d.org>.
+replacement for OpenGL can be found at <http://www.mesa3d.org>. For
+Windows versions: please read the README.txt file included in the
+distribution.
3. GENERAL PROBLEMS
@@ -50,7 +51,7 @@ your system. If not, install them.
3.2) Gmsh does not work under HP-UX.
The HP version is reported not to work with HP's native OpenGL. You
-should install Mesa instead.
+should install Mesa <http://www.mesa3d.org> instead.
3.3) Gmsh keeps re-displaying its graphics when other windows partially hide
the graphical window.
@@ -96,25 +97,39 @@ The old 2D algorithm will disappear once all its features are
integrated in the new one, so please don't send bug reports on the
old algorithm anymore.
-5.2) What should I do when the 3D unstructured algorithm fails?
+5.2) The new 2D unstructured algorithm also fails! Then what?
+
+Send us your geometry, and we will investigate. Please keep the
+following in mind though: 2D (surface) meshes are generated by
+projecting a 2D mesh in the mean plane of the surface. This gives nice
+results only if the surface curvature is small enough. Otherwise you
+_have_ to cut the surface in pieces.
+
+5.3) What should I do when the 3D unstructured algorithm fails?
The 3D algorithm is still very experimental. Try to change some
characteristic lengths in your input file to generate meshes that
better suit the geometrical details of your structure.
-5.3) I changed the characteristic lengths, but the 3D algorithm still does
+5.4) I changed the characteristic lengths, but the 3D algorithm still does
not work. What should I do?
Buy a professional mesh generator ;-)
-5.4) The quality of the elements generated by the 3D algorithm is very bad.
+5.5) The 3D algorithm is reaaaaally slow. Can you improve it?
+
+We are working on it. But since we have a (very) limited amount of
+time to spend on the development of Gmsh, this may take a while. For
+very big meshes, see the answer to the previous question...
+
+5.6) The quality of the elements generated by the 3D algorithm is very bad.
Yes, this is normal(!). At the time of this writing, we do not
-post-process the 3D Delaunay mesh, so that some (<0.1%) badly shaped
-tetrahedra will likely subsist in any unstructured 3D mesh. This will
-be fixed in the future.
+post-process the 3D Delaunay mesh, so that some (typically 0.1 to
+0.5%) badly shaped tetrahedra will likely subsist in any unstructured
+3D mesh. This may/should be fixed in the future.
-5.5) Non-recombined 3D extruded meshes sometimes fail.
+5.6) Non-recombined 3D extruded meshes sometimes fail.
The swapping algorithm is not very clever at the moment. Try to change
the surface mesh a bit, or recombine your mesh to generate prisms or
@@ -127,11 +142,11 @@ hexahedra.
6.1) On Windows, Gmsh does not seem to find the solver
executable. What's wrong?
-- the shell executable 'sh.exe' has to be in your path
-- the solver executable 'getdp.exe' has to be in the same directory as
-'sh.exe', unless you configure sh accordingly
+- the shell executable 'sh.exe' has to be in your path;
+- the solver executable (e.g. 'getdp.exe') has to be in the same
+directory as 'sh.exe', unless you configure sh accordingly
- if an absolute path is given to locate getdp.exe, it should begin
-with /cygwin/.
+with /cygwin/drive/.
7. POST-PROCESSING PROBLEMS
diff --git a/doc/VERSIONS b/doc/VERSIONS
index e9de286ee0852146e123c6f949a727ad47dd9ad8..567b2bee11cb4f73cd28c19c2bc5fc2a4693dc12 100644
--- a/doc/VERSIONS
+++ b/doc/VERSIONS
@@ -1,12 +1,13 @@
-$Date: 2001-11-01 09:40:33 $
+$Date: 2001-11-05 08:37:43 $
New in 1.28: Corrected the 'Using Progression' attribute for
-tranfinite meshes to actually match a real progression; New
-Triangulate plugin; New 2D graphs (space+time charts); Better
-performance of geometrical transformations (Warning: the automatic
-numbering of some automatically created entities has changed); New
-text primitives in post-processing views (file format updated to
-version 1.1); More robust mean plane computation and error checks;
+tranfinite meshes to actually match a real geometric progression; new
+Triangulate plugin; new 2D graphs (space+time charts); better
+performance of geometrical transformations (warning: the numbering of
+some automatically created entities has changed); new text primitives
+in post-processing views (file format updated to version 1.1); more
+robust mean plane computation and error checks; various other small
+additions and clean-ups;
New in 1.27: Added ability to extrude curves with Layers/Recombine
attributes; New PointSize/LineWidth options; Fixed For/EndFor loops in
diff --git a/tutorial/t2.geo b/tutorial/t2.geo
index 57387fb58762d4c8449b856dae9cb2f6afa97c3b..678e4e95066e9d1a8485bb6f0d30b42b75c9536d 100644
--- a/tutorial/t2.geo
+++ b/tutorial/t2.geo
@@ -52,7 +52,7 @@ Extrude Surface { 11, {0, 0, h} } ;
// manually a characteristic length for some of the automatically
// created points:
-Characteristic Length{6,2,52,3,16,12} = lc * 3 ;
+Characteristic Length{6,2,52,3,16,12} = lc * 2 ;
// If the transformation tools are handy to create complex geometries,
// it is sometimes useful to generate the flat geometry, consisting
diff --git a/tutorial/t8.geo b/tutorial/t8.geo
index afe35b24d90475d9d5d78374f9261657b687761b..c36eff35043b6704b3edb7e7a80f3fc58096a2d3 100644
--- a/tutorial/t8.geo
+++ b/tutorial/t8.geo
@@ -46,23 +46,26 @@ View[1].ShowScale = 0;
View[2].Name = "Test..." ;
View[2].IntervalsType = 2 ;
-View[2].GraphType = 2;
+View[2].Type = 2;
View[2].IntervalsType = 2 ;
-View[2].GraphPositionX = 85;
-View[2].GraphPositionY = 50;
-View[2].GraphWidth = 200;
-View[2].GraphHeight = 150;
+View[2].AutoPosition = 0;
+View[2].PositionX = 85;
+View[2].PositionY = 50;
+View[2].Width = 200;
+View[2].Height = 150;
-View[3].GraphType = 3;
+View[3].Type = 3;
View[3].RangeType = 2;
View[3].IntervalsType = 4 ;
View[3].ShowScale = 0;
+View[3].Grid = 0;
View[3].CustomMin = View[2].CustomMin;
View[3].CustomMax = View[2].CustomMax;
-View[3].GraphPositionX = View[2].GraphPositionX;
-View[3].GraphPositionY = View[2].GraphPositionY;
-View[3].GraphWidth = View[2].GraphWidth;
-View[3].GraphHeight = View[2].GraphHeight;
+View[3].AutoPosition = 0;
+View[3].PositionX = View[2].PositionX;
+View[3].PositionY = View[2].PositionY;
+View[3].Width = View[2].Width;
+View[3].Height = View[2].Height;
// We loop from 1 to 255 with a step of 1 (to use a step different
// from 1, just add a third argument in the list. For example, 'For
diff --git a/tutorial/tutorial.html b/tutorial/tutorial.html
index 9885a2ddecadfeabd5ee6c34546ab13ed0054871..78fc6278bb96dca79aa8308556ff8f1fb43eed89 100644
--- a/tutorial/tutorial.html
+++ b/tutorial/tutorial.html
@@ -23,7 +23,7 @@
<H1>README 1/10</H1>
[<A HREF="#top">top</A>][prev][<A HREF="#file2">next</A>]
<PRE>
-$Id: tutorial.html,v 1.25 2001-10-30 08:18:50 geuzaine Exp $
+$Id: tutorial.html,v 1.26 2001-11-05 08:37:43 geuzaine Exp $
Here are the examples in the Gmsh tutorial. These examples are
commented (both C and C++-style comments can be used in Gmsh input
@@ -298,7 +298,7 @@ Extrude Surface { 11, {0, 0, h} } ;
</FONT></I><I><FONT COLOR="#B22222">// manually a characteristic length for some of the automatically
</FONT></I><I><FONT COLOR="#B22222">// created points:
</FONT></I>
-Characteristic Length{6,2,52,3,16,12} = lc * 3 ;
+Characteristic Length{6,2,52,3,16,12} = lc * 2 ;
<I><FONT COLOR="#B22222">// If the transformation tools are handy to create complex geometries,
</FONT></I><I><FONT COLOR="#B22222">// it is sometimes useful to generate the flat geometry, consisting
@@ -1094,23 +1094,26 @@ View[1].ShowScale = 0;
View[2].Name = "Test..." ;
View[2].IntervalsType = 2 ;
-View[2].GraphType = 2;
+View[2].Type = 2;
View[2].IntervalsType = 2 ;
-View[2].GraphPositionX = 85;
-View[2].GraphPositionY = 50;
-View[2].GraphWidth = 200;
-View[2].GraphHeight = 150;
+View[2].AutoPosition = 0;
+View[2].PositionX = 85;
+View[2].PositionY = 50;
+View[2].Width = 200;
+View[2].Height = 150;
-View[3].GraphType = 3;
+View[3].Type = 3;
View[3].RangeType = 2;
View[3].IntervalsType = 4 ;
View[3].ShowScale = 0;
+View[3].Grid = 0;
View[3].CustomMin = View[2].CustomMin;
View[3].CustomMax = View[2].CustomMax;
-View[3].GraphPositionX = View[2].GraphPositionX;
-View[3].GraphPositionY = View[2].GraphPositionY;
-View[3].GraphWidth = View[2].GraphWidth;
-View[3].GraphHeight = View[2].GraphHeight;
+View[3].AutoPosition = 0;
+View[3].PositionX = View[2].PositionX;
+View[3].PositionY = View[2].PositionY;
+View[3].Width = View[2].Width;
+View[3].Height = View[2].Height;
<I><FONT COLOR="#B22222">// We loop from 1 to 255 with a step of 1 (to use a step different
</FONT></I><I><FONT COLOR="#B22222">// from 1, just add a third argument in the list. For example, 'For