diff --git a/Common/Context.h b/Common/Context.h
index df11fd5d32094f808696fd8a7573ab712c366f69..66620f77e342777ce43b3d26560cea2cfc879a14 100644
--- a/Common/Context.h
+++ b/Common/Context.h
@@ -228,7 +228,6 @@ public :
struct{
unsigned int point, line, surface, volume;
unsigned int point_sel, line_sel, surface_sel, volume_sel;
- unsigned int point_hlt, line_hlt, surface_hlt, volume_hlt;
unsigned int tangents, normals;
} geom;
struct{
diff --git a/Common/DefaultOptions.h b/Common/DefaultOptions.h
index 0a4741e5aa4b0576c9ce3ef27fa5ceb93d7b2fdb..4bf7e23687ac76023265af4f8671cf047edfb4b8 100644
--- a/Common/DefaultOptions.h
+++ b/Common/DefaultOptions.h
@@ -1413,7 +1413,7 @@ StringXColor GeometryOptions_Color[] = {
{128, 128, 128, 255}, {128, 128, 128, 255}, {0, 0, 0, 255},
"Normal geometry surface color" },
{ F|O, "Volumes" , opt_geometry_color_volumes ,
- {128, 128, 128, 255}, {128, 128, 128, 255}, {0, 0, 0, 255},
+ {255, 255, 0, 255}, {255, 255, 0, 255}, {0, 0, 0, 255},
"Normal geometry volume color" },
{ F|O, "PointsSelect" , opt_geometry_color_points_select ,
{255, 0, 0, 255}, {255, 0, 0, 255}, {255, 0, 0, 255},
@@ -1464,50 +1464,6 @@ StringXColor GeometryOptions_Color[] = {
#define COL18 {255, 228, 22, 255}
#define COL19 {255, 240, 38, 255}
-// jet:
-// #define COL0 {0, 0, 143, 255}
-// #define COL1 {0, 0, 197, 255}
-// #define COL2 {0, 0, 250, 255}
-// #define COL3 {0, 49, 255, 255}
-// #define COL4 {0, 103, 255, 255}
-// #define COL5 {0, 156, 255, 255}
-// #define COL6 {0, 210, 255, 255}
-// #define COL7 {9, 255, 253, 255}
-// #define COL8 {62, 255, 200, 255}
-// #define COL9 {116, 255, 146, 255}
-// #define COL10 {170, 255, 92, 255}
-// #define COL11 {223, 255, 39, 255}
-// #define COL12 {255, 240, 0, 255}
-// #define COL13 {255, 186, 0, 255}
-// #define COL14 {255, 132, 0, 255}
-// #define COL15 {255, 79, 0, 255}
-// #define COL16 {255, 25, 0, 255}
-// #define COL17 {226, 0, 0, 255}
-// #define COL18 {173, 0, 0, 255}
-// #define COL19 {119, 0, 0, 255}
-
-// truncated hsv:
-// #define COL0 {255, 0, 0, 255}
-// #define COL1 {255, 67, 0, 255}
-// #define COL2 {255, 134, 0, 255}
-// #define COL3 {255, 201, 0, 255}
-// #define COL4 {241, 255, 0, 255}
-// #define COL5 {174, 255, 0, 255}
-// #define COL6 {107, 255, 0, 255}
-// #define COL7 {40, 255, 0, 255}
-// #define COL8 {0, 255, 26, 255}
-// #define COL9 {0, 255, 93, 255}
-// #define COL10 {0, 255, 161, 255}
-// #define COL11 {0, 255, 228, 255}
-// #define COL12 {0, 214, 255, 255}
-// #define COL13 {0, 147, 255, 255}
-// #define COL14 {0, 80, 255, 255}
-// #define COL15 {0, 13, 255, 255}
-// #define COL16 {53, 0, 255, 255}
-// #define COL17 {120, 0, 255, 255}
-// #define COL18 {187, 0, 255, 255}
-// #define COL19 {255, 0, 254, 255}
-
StringXColor MeshOptions_Color[] = {
{ F|O, "Points" , opt_mesh_color_points ,
{0, 255, 0, 255}, {0, 255, 0, 255}, {0, 0, 0, 255},
diff --git a/Fltk/Callbacks.cpp b/Fltk/Callbacks.cpp
index 5a76bf2786c96b622997f37581ea39386c8d38e9..44e41122573e17f7bd39866615ceea21223113f8 100644
--- a/Fltk/Callbacks.cpp
+++ b/Fltk/Callbacks.cpp
@@ -1,4 +1,4 @@
-// $Id: Callbacks.cpp,v 1.429 2006-08-13 14:43:54 geuzaine Exp $
+// $Id: Callbacks.cpp,v 1.430 2006-08-13 20:46:54 geuzaine Exp $
//
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
//
@@ -81,14 +81,14 @@ int SelectContour(int type, int num, List_T * List)
k = allEdgesLinked(num, List);
for(int i = 0; i < List_Nbr(List); i++) {
List_Read(List, i, &ip);
- HighlightEntityNum(0, abs(ip), 0, 1);
+ HighlightEntityNum(0, abs(ip), 0, 0, 1);
}
break;
case ENT_SURFACE:
k = allFacesLinked(num, List);
for(int i = 0; i < List_Nbr(List); i++) {
List_Read(List, i, &ip);
- HighlightEntityNum(0, 0, abs(ip), 1);
+ HighlightEntityNum(0, 0, abs(ip), 0, 1);
}
break;
}
@@ -948,13 +948,14 @@ void general_options_rotation_center_select_cb(CALLBACK_ARGS)
GVertex *v[SELECTION_MAX_HITS];
GEdge *c[SELECTION_MAX_HITS];
GFace *s[SELECTION_MAX_HITS];
+ GRegion *r[SELECTION_MAX_HITS];
int ne;
opt_geometry_points(0, GMSH_SET | GMSH_GUI, 1);
Draw();
Msg(ONSCREEN, "Select point\n[Press 'q' to abort]");
- char ib = SelectEntity(ENT_POINT, &ne, v, c, s);
+ char ib = SelectEntity(ENT_POINT, &ne, v, c, s, r);
if(ib == 'l') {
// This would bypass the "Apply" button... Not necessarily bad,
// but it's not consistent with the rest of the GUI.
@@ -1850,8 +1851,9 @@ void geometry_elementary_add_new_point_cb(CALLBACK_ARGS)
GVertex *v[SELECTION_MAX_HITS];
GEdge *c[SELECTION_MAX_HITS];
GFace *s[SELECTION_MAX_HITS];
+ GRegion *r[SELECTION_MAX_HITS];
int ne;
- char ib = SelectEntity(ENT_NONE, &ne, v, c, s);
+ char ib = SelectEntity(ENT_NONE, &ne, v, c, s, r);
if(ib == 'e'){
add_point(CTX.filename,
(char*)WID->context_geometry_input[2]->value(),
@@ -1875,6 +1877,7 @@ static void _new_multiline(int type)
GVertex *v[SELECTION_MAX_HITS];
GEdge *c[SELECTION_MAX_HITS];
GFace *s[SELECTION_MAX_HITS];
+ GRegion *r[SELECTION_MAX_HITS];
int n, p[100], ne;
opt_geometry_points(0, GMSH_SET | GMSH_GUI, 1);
@@ -1889,7 +1892,7 @@ static void _new_multiline(int type)
else
Msg(ONSCREEN, "Select control points\n"
"[Press 'e' to end selection, 'u' to undo last selection or 'q' to abort]");
- char ib = SelectEntity(ENT_POINT, &ne, v, c, s);
+ char ib = SelectEntity(ENT_POINT, &ne, v, c, s, r);
if(ib == 'l') {
for(int i = 0; i < ne; i++)
p[n++] = v[i]->tag();
@@ -1920,7 +1923,7 @@ static void _new_multiline(int type)
}
if(ib == 'u') {
if(n > 0){
- ZeroHighlightEntityNum(p[n-1], 0, 0);
+ ZeroHighlightEntityNum(p[n-1], 0, 0, 0);
Draw();
n--;
}
@@ -1946,6 +1949,7 @@ void geometry_elementary_add_new_line_cb(CALLBACK_ARGS)
GVertex *v[SELECTION_MAX_HITS];
GEdge *c[SELECTION_MAX_HITS];
GFace *s[SELECTION_MAX_HITS];
+ GRegion *r[SELECTION_MAX_HITS];
int n, p[100], ne;
opt_geometry_points(0, GMSH_SET | GMSH_GUI, 1);
@@ -1960,7 +1964,7 @@ void geometry_elementary_add_new_line_cb(CALLBACK_ARGS)
if(n == 1)
Msg(ONSCREEN, "Select end point\n"
"[Press 'u' to undo last selection or 'q' to abort]");
- char ib = SelectEntity(ENT_POINT, &ne, v, c, s);
+ char ib = SelectEntity(ENT_POINT, &ne, v, c, s, r);
if(ib == 'l') {
p[n++] = v[0]->tag();
}
@@ -1969,7 +1973,7 @@ void geometry_elementary_add_new_line_cb(CALLBACK_ARGS)
}
if(ib == 'u') {
if(n > 0){
- ZeroHighlightEntityNum(p[n-1], 0, 0);
+ ZeroHighlightEntityNum(p[n-1], 0, 0, 0);
Draw();
n--;
}
@@ -2006,6 +2010,7 @@ void geometry_elementary_add_new_circle_cb(CALLBACK_ARGS)
GVertex *v[SELECTION_MAX_HITS];
GEdge *c[SELECTION_MAX_HITS];
GFace *s[SELECTION_MAX_HITS];
+ GRegion *r[SELECTION_MAX_HITS];
int n, p[100], ne;
opt_geometry_points(0, GMSH_SET | GMSH_GUI, 1);
@@ -2023,7 +2028,7 @@ void geometry_elementary_add_new_circle_cb(CALLBACK_ARGS)
if(n == 2)
Msg(ONSCREEN, "Select end point\n"
"[Press 'u' to undo last selection or 'q' to abort]");
- char ib = SelectEntity(ENT_POINT, &ne, v, c, s);
+ char ib = SelectEntity(ENT_POINT, &ne, v, c, s, r);
if(ib == 'l') {
p[n++] = v[0]->tag();
}
@@ -2032,7 +2037,7 @@ void geometry_elementary_add_new_circle_cb(CALLBACK_ARGS)
}
if(ib == 'u') {
if(n > 0){
- ZeroHighlightEntityNum(p[n-1], 0, 0);
+ ZeroHighlightEntityNum(p[n-1], 0, 0, 0);
Draw();
n--;
}
@@ -2059,6 +2064,7 @@ void geometry_elementary_add_new_ellipse_cb(CALLBACK_ARGS)
GVertex *v[SELECTION_MAX_HITS];
GEdge *c[SELECTION_MAX_HITS];
GFace *s[SELECTION_MAX_HITS];
+ GRegion *r[SELECTION_MAX_HITS];
int n, p[100], ne;
opt_geometry_points(0, GMSH_SET | GMSH_GUI, 1);
@@ -2079,7 +2085,7 @@ void geometry_elementary_add_new_ellipse_cb(CALLBACK_ARGS)
if(n == 3)
Msg(ONSCREEN, "Select end point\n"
"[Press 'u' to undo last selection or 'q' to abort]");
- char ib = SelectEntity(ENT_POINT, &ne, v, c, s);
+ char ib = SelectEntity(ENT_POINT, &ne, v, c, s, r);
if(ib == 'l') {
p[n++] = v[0]->tag();
}
@@ -2088,7 +2094,7 @@ void geometry_elementary_add_new_ellipse_cb(CALLBACK_ARGS)
}
if(ib == 'u') {
if(n > 0){
- ZeroHighlightEntityNum(p[n-1], 0, 0);
+ ZeroHighlightEntityNum(p[n-1], 0, 0, 0);
Draw();
n--;
}
@@ -2115,6 +2121,7 @@ static void _new_surface_volume(int mode)
GVertex *v[SELECTION_MAX_HITS];
GEdge *c[SELECTION_MAX_HITS];
GFace *s[SELECTION_MAX_HITS];
+ GRegion *r[SELECTION_MAX_HITS];
int type, num, ne;
List_T *List1 = List_Create(10, 10, sizeof(int));
@@ -2154,7 +2161,7 @@ static void _new_surface_volume(int mode)
"[Press 'u' to undo last selection or 'q' to abort]");
}
- char ib = SelectEntity(type, &ne, v, c, s);
+ char ib = SelectEntity(type, &ne, v, c, s, r);
if(ib == 'q') {
ZeroHighlight();
Draw();
@@ -2165,7 +2172,8 @@ static void _new_surface_volume(int mode)
List_Read(List1, List_Nbr(List1)-1, &num);
ZeroHighlightEntityNum(0,
(type == ENT_LINE) ? abs(num) : 0,
- (type != ENT_LINE) ? abs(num) : 0);
+ (type != ENT_LINE) ? abs(num) : 0,
+ 0);
List_Pop(List1);
Draw();
}
@@ -2189,7 +2197,7 @@ static void _new_surface_volume(int mode)
else
Msg(ONSCREEN, "Select hole boundaries\n"
"[Press 'e' to end selection, 'u' to undo last selection or 'q' to abort]");
- ib = SelectEntity(type, &ne, v, c, s);
+ ib = SelectEntity(type, &ne, v, c, s, r);
if(ib == 'q') {
ZeroHighlight();
Draw();
@@ -2206,7 +2214,8 @@ static void _new_surface_volume(int mode)
List_Read(List1, List_Nbr(List1)-1, &num);
ZeroHighlightEntityNum(0,
(type == ENT_LINE) ? abs(num) : 0,
- (type != ENT_LINE) ? abs(num) : 0);
+ (type != ENT_LINE) ? abs(num) : 0,
+ 0);
List_Pop(List1);
Draw();
}
@@ -2269,6 +2278,7 @@ static void _action_point_line_surface_volume(int action, int mode, char *what)
GVertex *v[SELECTION_MAX_HITS];
GEdge *c[SELECTION_MAX_HITS];
GFace *s[SELECTION_MAX_HITS];
+ GRegion *r[SELECTION_MAX_HITS];
int type, ne;
char *str;
@@ -2288,9 +2298,9 @@ static void _action_point_line_surface_volume(int action, int mode, char *what)
opt_geometry_surfaces(0, GMSH_SET | GMSH_GUI, 1);
}
else if(!strcmp(what, "Volume")) {
- Msg(GERROR, "Interactive volume selection not implemented yet!");
- Msg(GERROR, "You will have to edit the input file by hand...");
- return;
+ type = ENT_VOLUME;
+ str = "volumes";
+ opt_geometry_volumes(0, GMSH_SET | GMSH_GUI, 1);
}
else{
Msg(GERROR, "Unknown entity to select");
@@ -2315,7 +2325,7 @@ static void _action_point_line_surface_volume(int action, int mode, char *what)
Msg(ONSCREEN, "Select %s\n"
"[Press 'e' to end selection, 'u' to undo last selection or 'q' to abort]", str);
- char ib = SelectEntity(type, &ne, v, c, s);
+ char ib = SelectEntity(type, &ne, v, c, s, r);
if(ib == 'l') {
// we don't use List_Insert in order to keep the original
// ordering (this is slower, but this way undo works as
@@ -2338,6 +2348,11 @@ static void _action_point_line_surface_volume(int action, int mode, char *what)
if(List_ISearchSeq(List1, &tag, fcmp_int) < 0)
List_Add(List1, &tag);
break;
+ case ENT_VOLUME:
+ tag = r[i]->tag();
+ if(List_ISearchSeq(List1, &tag, fcmp_int) < 0)
+ List_Add(List1, &tag);
+ break;
}
}
}
@@ -2352,19 +2367,25 @@ static void _action_point_line_surface_volume(int action, int mode, char *what)
tag = v[i]->tag();
index = List_ISearchSeq(List1, &tag, fcmp_int);
if(index >= 0) List_PSuppress(List1, index);
- ZeroHighlightEntityNum(tag, 0, 0);
+ ZeroHighlightEntityNum(tag, 0, 0, 0);
break;
case ENT_LINE:
tag = c[i]->tag();
index = List_ISearchSeq(List1, &tag, fcmp_int);
if(index >= 0) List_PSuppress(List1, index);
- ZeroHighlightEntityNum(0, tag, 0);
+ ZeroHighlightEntityNum(0, tag, 0, 0);
break;
case ENT_SURFACE:
tag = s[i]->tag();
index = List_ISearchSeq(List1, &tag, fcmp_int);
if(index >= 0) List_PSuppress(List1, index);
- ZeroHighlightEntityNum(0, 0, tag);
+ ZeroHighlightEntityNum(0, 0, tag, 0);
+ break;
+ case ENT_VOLUME:
+ tag = r[i]->tag();
+ index = List_ISearchSeq(List1, &tag, fcmp_int);
+ if(index >= 0) List_PSuppress(List1, index);
+ ZeroHighlightEntityNum(0, 0, 0, tag);
break;
}
}
@@ -2376,7 +2397,8 @@ static void _action_point_line_surface_volume(int action, int mode, char *what)
List_Read(List1, List_Nbr(List1)-1, &num);
ZeroHighlightEntityNum((type == ENT_POINT) ? num : 0,
(type == ENT_LINE) ? num : 0,
- (type == ENT_SURFACE) ? num : 0);
+ (type == ENT_SURFACE) ? num : 0,
+ (type == ENT_VOLUME) ? num : 0);
Draw();
List_Pop(List1);
}
@@ -2434,14 +2456,7 @@ static void _action_point_line_surface_volume(int action, int mode, char *what)
delet(List1, CTX.filename, what);
break;
case 7:
- {
- int num = add_physical(List1, CTX.filename, type);
- GMSH_Solve_Plugin *sp = GMSH_PluginManager::instance()->findSolverPlugin();
- if(sp){
- sp->receiveNewPhysicalGroup(type, num);
- sp->writeSolverFile(CTX.filename);
- }
- }
+ add_physical(List1, CTX.filename, type);
break;
case 8:
add_charlength(List1, CTX.filename, (char*)WID->context_mesh_input[0]->value());
@@ -2881,6 +2896,7 @@ static void _add_transfinite_elliptic(int type, int dim)
GVertex *v[SELECTION_MAX_HITS];
GEdge *c[SELECTION_MAX_HITS];
GFace *s[SELECTION_MAX_HITS];
+ GRegion *r[SELECTION_MAX_HITS];
char ib;
int n, p[100], ne;
@@ -2902,11 +2918,15 @@ static void _add_transfinite_elliptic(int type, int dim)
else
Msg(ONSCREEN, "Select lines\n"
"[Press 'e' to end selection, 'u' to undo last selection or 'q' to abort]");
- ib = SelectEntity(ENT_LINE, &ne, v, c, s);
+ ib = SelectEntity(ENT_LINE, &ne, v, c, s, r);
break;
case 2:
Msg(ONSCREEN, "Select surface\n[Press 'q' to abort]");
- ib = SelectEntity(ENT_SURFACE, &ne, v, c, s);
+ ib = SelectEntity(ENT_SURFACE, &ne, v, c, s, r);
+ break;
+ case 3:
+ Msg(ONSCREEN, "Select volume\n[Press 'q' to abort]");
+ ib = SelectEntity(ENT_VOLUME, &ne, v, c, s, r);
break;
default:
ib = 'l';
@@ -2928,7 +2948,7 @@ static void _add_transfinite_elliptic(int type, int dim)
if(ib == 'u') {
if(dim == 1) {
if(n > 0){
- ZeroHighlightEntityNum(0, p[n-1], 0);
+ ZeroHighlightEntityNum(0, p[n-1], 0, 0);
Draw();
n--;
}
@@ -2948,23 +2968,25 @@ static void _add_transfinite_elliptic(int type, int dim)
p[n++] = c[0]->tag();
break;
case 2:
- p[n++] = s[0]->tag();
- // fall-through
case 3:
+ if(dim == 2)
+ p[n++] = s[0]->tag();
+ else
+ p[n++] = r[0]->tag();
while(1) {
- if(n == ((dim == 2) ? 1 : 0))
+ if(n == 1)
Msg(ONSCREEN, "Select (ordered) boundary points\n"
"[Press 'e' to end selection or 'q' to abort]");
else
Msg(ONSCREEN, "Select (ordered) boundary points\n"
"[Press 'e' to end selection, 'u' to undo last selection or 'q' to abort]");
- ib = SelectEntity(ENT_POINT, &ne, v, c, s);
+ ib = SelectEntity(ENT_POINT, &ne, v, c, s, r);
if(ib == 'l') {
p[n++] = v[0]->tag();
}
if(ib == 'u') {
- if(n > ((dim == 2) ? 1 : 0)){
- ZeroHighlightEntityNum(p[n-1], 0, 0);
+ if(n > 1){
+ ZeroHighlightEntityNum(p[n-1], 0, 0, 0);
Draw();
n--;
}
@@ -2983,9 +3005,8 @@ static void _add_transfinite_elliptic(int type, int dim)
type ? "elliptic" : "transfinite");
break;
case 3:
- if(n == 6 || n == 8)
- add_trsfvol(n, p, CTX.filename,
- (char*)WID->context_mesh_input[3]->value());
+ if(n == 6 + 1 || n == 8 + 1)
+ add_trsfvol(n, p, CTX.filename);
else
Msg(GERROR, "Wrong number of points for transfinite volume");
break;
@@ -3024,7 +3045,6 @@ void mesh_define_transfinite_surface_cb(CALLBACK_ARGS)
void mesh_define_transfinite_volume_cb(CALLBACK_ARGS)
{
- WID->create_mesh_context_window(3);
_add_transfinite_elliptic(0, 3);
}
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index 77eb853ea5b5efacf074f4eb429f55ed32bdf537..a9bc1ebfe0d80062294bd2db93871b8964e9b441 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1,4 +1,4 @@
-// $Id: GUI.cpp,v 1.510 2006-08-13 14:43:55 geuzaine Exp $
+// $Id: GUI.cpp,v 1.511 2006-08-13 20:46:54 geuzaine Exp $
//
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
//
@@ -4410,7 +4410,7 @@ void GUI::create_mesh_context_window(int num)
return;
}
- int width = 32 * fontsize;
+ int width = 30 * fontsize;
int height = 5 * WB + 5 * BH;
context_mesh_window = new Dialog_Window(width, height, "Contextual Mesh Definitions");
@@ -4419,7 +4419,7 @@ void GUI::create_mesh_context_window(int num)
Fl_Tabs *o = new Fl_Tabs(WB, WB, width - 2 * WB, height - 3 * WB - BH);
// 0: Characteristic length
{
- g[0] = new Fl_Group(WB, WB + BH, width - 2 * WB, height - 3 * WB - 2 * BH, "Charact. Length");
+ g[0] = new Fl_Group(WB, WB + BH, width - 2 * WB, height - 3 * WB - 2 * BH, "Length");
context_mesh_input[0] = new Fl_Input(2 * WB, 2 * WB + 1 * BH, IW, BH, "Value");
context_mesh_input[0]->value("0.1");
context_mesh_input[0]->align(FL_ALIGN_RIGHT);
@@ -4427,7 +4427,7 @@ void GUI::create_mesh_context_window(int num)
}
// 1: Transfinite line
{
- g[1] = new Fl_Group(WB, WB + BH, width - 2 * WB, height - 3 * WB - 2 * BH, "Transf. Line");
+ g[1] = new Fl_Group(WB, WB + BH, width - 2 * WB, height - 3 * WB - 2 * BH, "Transfinite Line");
context_mesh_input[1] = new Fl_Input(2 * WB, 2 * WB + 1 * BH, IW, BH, "Number of points");
context_mesh_input[1]->value("10");
context_mesh_input[2] = new Fl_Input(2 * WB, 2 * WB + 3 * BH, IW, BH, "Parameter");
@@ -4448,7 +4448,7 @@ void GUI::create_mesh_context_window(int num)
// 2: Transfinite surface
{
- g[2] = new Fl_Group(WB, WB + BH, width - 2 * WB, height - 3 * WB - 2 * BH, "Transf. Surface");
+ g[2] = new Fl_Group(WB, WB + BH, width - 2 * WB, height - 3 * WB - 2 * BH, "Transfinite Surface");
context_mesh_choice[1] = new Fl_Choice(2 * WB, 2 * WB + 1 * BH, IW, BH, "Transfinite Arrangement");
context_mesh_choice[1]->menu(menu_transfinite_dir);
@@ -4456,14 +4456,6 @@ void GUI::create_mesh_context_window(int num)
g[2]->end();
}
- // 3: Transfinite volume
- {
- g[3] = new Fl_Group(WB, WB + BH, width - 2 * WB, height - 3 * WB - 2 * BH, "Transf. Volume");
- context_mesh_input[3] = new Fl_Input(2 * WB, 2 * WB + 1 * BH, IW, BH, "Volume number");
- context_mesh_input[3]->value("1");
- context_mesh_input[3]->align(FL_ALIGN_RIGHT);
- g[3]->end();
- }
o->end();
}
diff --git a/Fltk/Opengl.cpp b/Fltk/Opengl.cpp
index 5a2df5636d9c554f3b8c056840e0b341cdb81c89..d337b11dc51395d1e05f9c38b901fe2c3b3fdc7c 100644
--- a/Fltk/Opengl.cpp
+++ b/Fltk/Opengl.cpp
@@ -1,4 +1,4 @@
-// $Id: Opengl.cpp,v 1.61 2006-07-14 12:54:33 geuzaine Exp $
+// $Id: Opengl.cpp,v 1.62 2006-08-13 20:46:54 geuzaine Exp $
//
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
//
@@ -186,7 +186,8 @@ void Draw_OnScreenMessages()
char SelectEntity(int type, int *n,
GVertex *v[SELECTION_MAX_HITS],
GEdge *c[SELECTION_MAX_HITS],
- GFace *s[SELECTION_MAX_HITS])
+ GFace *s[SELECTION_MAX_HITS],
+ GRegion *r[SELECTION_MAX_HITS])
{
if(!WID) return 'q';
@@ -205,6 +206,7 @@ char SelectEntity(int type, int *n,
v[i] = 0;
c[i] = 0;
s[i] = 0;
+ r[i] = 0;
}
WID->wait();
@@ -239,11 +241,11 @@ char SelectEntity(int type, int *n,
WID->try_selection_xywh[1],
WID->try_selection_xywh[2],
WID->try_selection_xywh[3],
- v, c, s);
+ v, c, s, r);
if(*n){
if(add){
for(int i = 0; i < *n; i++)
- HighlightEntity(v[i], c[i], s[i], 1);
+ HighlightEntity(v[i], c[i], s[i], r[i], 1);
Draw();
}
// don't call ZeroHighlight here if we (try to) deselect:
diff --git a/Fltk/Opengl_Window.cpp b/Fltk/Opengl_Window.cpp
index 5960e699d0faae0cbe517f8c0979a96841c6d635..cb3623f764c70c61a9f1da9a4f700db957724ae4 100644
--- a/Fltk/Opengl_Window.cpp
+++ b/Fltk/Opengl_Window.cpp
@@ -1,4 +1,4 @@
-// $Id: Opengl_Window.cpp,v 1.63 2006-07-14 12:54:33 geuzaine Exp $
+// $Id: Opengl_Window.cpp,v 1.64 2006-08-13 20:46:54 geuzaine Exp $
//
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
//
@@ -180,6 +180,7 @@ int Opengl_Window::handle(int event)
GVertex *v[SELECTION_MAX_HITS];
GEdge *c[SELECTION_MAX_HITS];
GFace *s[SELECTION_MAX_HITS];
+ GRegion *r[SELECTION_MAX_HITS];
double dx, dy;
switch (event) {
@@ -352,17 +353,18 @@ int Opengl_Window::handle(int event)
else if(CTX.enable_mouse_selection >= 2){ // hover mode
if(curr.win[0] != prev.win[0] || curr.win[1] != prev.win[1]){
WID->make_opengl_current();
- v[0] = NULL; c[0] = NULL; s[0] = NULL;
+ v[0] = NULL; c[0] = NULL; s[0] = NULL; r[0] = NULL;
Process_SelectionBuffer(WID->selection, 0,
(int)curr.win[0], (int)curr.win[1], 5, 5,
- v, c, s);
+ v, c, s, r);
if((WID->selection == ENT_POINT && v[0]) ||
(WID->selection == ENT_LINE && c[0]) ||
- (WID->selection == ENT_SURFACE && s[0]))
+ (WID->selection == ENT_SURFACE && s[0]) ||
+ (WID->selection == ENT_VOLUME && r[0]))
WID->g_window->cursor(FL_CURSOR_CROSS, FL_BLACK, FL_WHITE);
else
WID->g_window->cursor(FL_CURSOR_DEFAULT, FL_BLACK, FL_WHITE);
- HighlightEntity(v[0], c[0], s[0], 0);
+ HighlightEntity(v[0], c[0], s[0], r[0], 0);
}
}
prev.set();
diff --git a/Geo/GEdge.h b/Geo/GEdge.h
index 74e609e63a287cf139692eeb2383762fe09d245c..fb93f2e0233280777361921a1aef37f0f6c66267 100644
--- a/Geo/GEdge.h
+++ b/Geo/GEdge.h
@@ -22,8 +22,13 @@ class GEdge : public GEntity {
GVertex *_v1);
virtual ~GEdge() ;
- virtual int dim() const {return 1;}
+ GVertex *getBeginVertex () const { return v0; }
+ GVertex *getEndVertex () const { return v1; }
+
+ void addFace(GFace *f);
+ void delFace(GFace *f);
+ virtual int dim() const {return 1;}
virtual bool periodic(int dim=0) const = 0;
virtual bool continuous(int dim=0) const = 0;
virtual void setVisibility(char val, bool recursive=false);
@@ -43,18 +48,21 @@ class GEdge : public GEntity {
// Get first derivative of edge at the given parameter.
virtual SVector3 firstDer(double par) const = 0;
- // reparmaterize the point onto the given face.
+ // Reparmaterize the point onto the given face.
virtual SPoint2 reparamOnFace(GFace *face, double epar,int dir) const = 0;
- // recompute the mesh partitions defined on this edge.
+ // Recompute the mesh partitions defined on this edge.
void recomputeMeshPartitions();
- void addFace(GFace *f);
- void delFace(GFace *f);
+ // Returns the minimum number of segments used for meshing the edge
+ virtual int minimumMeshSegments () const {return 1;}
+
+ // Returns the minimum number of segments used for drawing the edge
+ virtual int minimumDrawSegments () const {return 1;}
+
+ // Returns a type-specific additional information string
+ virtual std::string getAdditionalInfoString();
- GVertex *getBeginVertex () const { return v0; }
- GVertex *getEndVertex () const { return v1; }
-
struct {
char Method;
double coeffTransfinite;
@@ -63,11 +71,6 @@ class GEdge : public GEntity {
} meshAttributes ;
std::vector<MLine*> lines;
-
- virtual int minimumMeshSegments () const {return 1;}
- virtual int minimumDrawSegments () const {return 1;}
-
- virtual std::string getAdditionalInfoString();
};
#endif
diff --git a/Geo/GEntity.h b/Geo/GEntity.h
index adc4b0c9e4caa8a8e972df3c6d3e0f15a37522fb..e4453f45abef15ac501cf3a407d45c6da8da7727 100644
--- a/Geo/GEntity.h
+++ b/Geo/GEntity.h
@@ -46,7 +46,8 @@ class GEntity {
RuledSurface,
ParametricSurface,
DiscreteSurface,
- Volume
+ Volume,
+ DiscreteVolume
};
// Returns a string describing the entity type
@@ -69,7 +70,8 @@ class GEntity {
"Ruled surface",
"Parametric surface",
"Discrete surface",
- "Volume"
+ "Volume",
+ "Discrete volume"
};
unsigned int type = (unsigned int)geomType();
if(type >= sizeof(name) / sizeof(name[0]))
@@ -133,11 +135,11 @@ class GEntity {
// The bounding box
virtual SBoundingBox3d bounds() const{throw;}
- // get/set the visibility flag
+ // Get/set the visibility flag
virtual char getVisibility(){ return _visible; }
virtual void setVisibility(char val, bool recursive=false){ _visible = val; }
- // get/set the multi-purpose flag
+ // Get/set the multi-purpose flag
virtual char getFlag(){ return _flag; }
virtual void setFlag(char val){ _flag = val; }
diff --git a/Geo/GFace.cpp b/Geo/GFace.cpp
index 2cdaec14d20ceef5d0dc330355a42a4ae76c123d..123f4b8462e06c01ed41bc136ada81869b625ae3 100644
--- a/Geo/GFace.cpp
+++ b/Geo/GFace.cpp
@@ -34,6 +34,18 @@ GFace::~GFace ()
quadrangles.clear();
}
+SBoundingBox3d GFace::bounds() const
+{
+ std::list<GEdge*>::const_iterator it = l_edges.begin();
+ SBoundingBox3d res = (*it)->bounds();
+ ++it;
+ while(it != l_edges.end()){
+ res += (*it)->bounds();
+ ++it;
+ }
+ return res;
+}
+
std::list<GVertex*> GFace::vertices() const
{
std::list<GEdge*>::const_iterator it = l_edges.begin();
diff --git a/Geo/GFace.h b/Geo/GFace.h
index 9708d2c263f9bc02825e4629a18f76acba47653f..0291f6344b2414997d82a8bb7501cc2a28982f06 100644
--- a/Geo/GFace.h
+++ b/Geo/GFace.h
@@ -21,7 +21,6 @@ class GRegion;
class GFace : public GEntity
{
protected:
- // std::list<GEdgeLoop *> l_edgeLoops;
std::list<GEdge *> l_edges;
std::list<int> l_dirs;
GRegion *r1, *r2;
@@ -44,6 +43,9 @@ class GFace : public GEntity
virtual int dim() const {return 2;}
virtual void setVisibility(char val, bool recursive=false);
+ // The bounding box
+ virtual SBoundingBox3d bounds() const;
+
// Get the location of any parametric degeneracies on the face in
// the given parametric direction.
virtual int paramDegeneracies(int dir, double *par) = 0;
@@ -75,17 +77,17 @@ class GFace : public GEntity
// to worry about that.
virtual bool surfPeriodic(int dim) const = 0;
- // recompute the mesh partitions defined on this face.
+ // Recompute the mesh partitions defined on this face.
void recomputeMeshPartitions();
- // recompute the mean plane of the surface from a list of points
+ // Recompute the mean plane of the surface from a list of points
void computeMeanPlane(const std::vector<MVertex*> &points);
void computeMeanPlane(const std::vector<SPoint3> &points);
- // recompute the mean plane of the surface from its bounding vertices
+ // Recompute the mean plane of the surface from its bounding vertices
void computeMeanPlane();
- // get the mean plane info
+ // Get the mean plane info
void getMeanPlaneData(double VX[3], double VY[3],
double &x, double &y, double &z) const;
diff --git a/Geo/GRegion.cpp b/Geo/GRegion.cpp
index c158bfb100e371b7f2be93fe09812ae2e45e49b3..6b8dccc41f8c84eada8a6695ca157ae3684826bf 100644
--- a/Geo/GRegion.cpp
+++ b/Geo/GRegion.cpp
@@ -31,6 +31,18 @@ GRegion::~GRegion ()
pyramids.clear();
}
+SBoundingBox3d GRegion::bounds() const
+{
+ std::list<GFace*>::const_iterator it = l_faces.begin();
+ SBoundingBox3d res = (*it)->bounds();
+ ++it;
+ while(it != l_faces.end()){
+ res += (*it)->bounds();
+ ++it;
+ }
+ return res;
+}
+
void GRegion::setVisibility(char val, bool recursive)
{
GEntity::setVisibility(val);
diff --git a/Geo/GRegion.h b/Geo/GRegion.h
index 05376a55b0e383cd79fb967b90d3125cd911448d..5a499293d91817197d51655d62123d2669d41fb7 100644
--- a/Geo/GRegion.h
+++ b/Geo/GRegion.h
@@ -9,14 +9,18 @@ class GRegion : public GEntity {
protected:
std::list<GFace *> l_faces;
std::list<int> l_dirs;
+
public:
GRegion(GModel *model, int tag) : GEntity (model, tag) {}
virtual ~GRegion();
+
virtual int dim() const {return 3;}
- virtual GeomType geomType() const {return Volume;}
virtual void setVisibility(char val, bool recursive=false);
- // recompute the mesh partitions defined on this region.
+ // The bounding box
+ virtual SBoundingBox3d bounds() const;
+
+ // Recompute the mesh partitions defined on this region.
void recomputeMeshPartitions();
std::vector<MTetrahedron*> tetrahedra;
diff --git a/Geo/Geo.cpp b/Geo/Geo.cpp
index 2139899b5511212d98244d2da2492a76224ab56a..2ea599b17cc4c3fabd4c926006843768b1e59f99 100644
--- a/Geo/Geo.cpp
+++ b/Geo/Geo.cpp
@@ -1,4 +1,4 @@
-// $Id: Geo.cpp,v 1.53 2006-08-12 18:05:14 geuzaine Exp $
+// $Id: Geo.cpp,v 1.54 2006-08-13 20:46:54 geuzaine Exp $
//
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
//
@@ -389,13 +389,13 @@ void add_vol(List_T *list, char *fich)
add_infile(text, fich);
}
-void add_trsfvol(int N, int *l, char *fich, char *vol)
+void add_trsfvol(int N, int *l, char *fich)
{
char text[BUFFSIZE], text2[BUFFSIZE];
- snprintf(text, BUFFSIZE, "Transfinite Volume{%s} = {", vol);
- for(int i = 0; i < N; i++) {
- if(i == 0)
+ snprintf(text, BUFFSIZE, "Transfinite Volume{%d} = {", l[0]);
+ for(int i = 1; i < N; i++) {
+ if(i == 1)
snprintf(text2, BUFFSIZE, "%d", l[i]);
else
snprintf(text2, BUFFSIZE, ",%d", l[i]);
@@ -406,7 +406,6 @@ void add_trsfvol(int N, int *l, char *fich, char *vol)
add_infile(text, fich);
}
-
int add_physical(List_T *list, char *fich, int type)
{
char text[BUFFSIZE];
diff --git a/Geo/Geo.h b/Geo/Geo.h
index 8eadbefa6d389b54290b09392d52ed4e0176f874..975f219c47c17d343212143f4c75633981dcff67 100644
--- a/Geo/Geo.h
+++ b/Geo/Geo.h
@@ -89,7 +89,7 @@ void delet(List_T *list, char *fich, char *what);
void add_infile(char *text, char *fich);
void add_trsfline(int N, int *l, char *fich, char *type, char *typearg, char *pts);
void add_trsfellisurf(int type, int N, int *l, char *fich, char *dir);
-void add_trsfvol(int N, int *l, char *fich, char *vol);
+void add_trsfvol(int N, int *l, char *fich);
void add_charlength(List_T *list, char *fich, char *lc);
void add_recosurf(List_T *list, char *fich);
void add_param(char *par, char *value, char *fich);
diff --git a/Geo/Makefile b/Geo/Makefile
index 9c0026ab5442fa516d560c4559707c3175de3813..4018df22fe966886008e2026de4a0dfb73431a84 100644
--- a/Geo/Makefile
+++ b/Geo/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.91 2006-08-13 05:31:41 geuzaine Exp $
+# $Id: Makefile,v 1.92 2006-08-13 20:46:54 geuzaine Exp $
#
# Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
#
@@ -208,16 +208,14 @@ gmshFace.o: gmshFace.cpp gmshModel.h GModel.h GVertex.h GEntity.h Range.h \
gmshRegion.o: gmshRegion.cpp gmshModel.h GModel.h GVertex.h GEntity.h \
Range.h SPoint3.h SBoundingBox3d.h MVertex.h ../Common/GmshDefines.h \
GPoint.h GEdge.h SVector3.h SPoint2.h MElement.h ../Numeric/Numeric.h \
- GFace.h Pair.h GRegion.h gmshEdge.h gmshVertex.h ../Mesh/Mesh.h \
+ GFace.h Pair.h GRegion.h gmshFace.h gmshVertex.h ../Mesh/Mesh.h \
../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../Mesh/Vertex.h \
../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h \
../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h \
../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Mesh/Vertex.h \
- ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h gmshFace.h \
- gmshRegion.h ../Mesh/Interpolation.h ../Mesh/Vertex.h ../Mesh/Mesh.h \
- CAD.h ExtrudeParams.h Geo.h ../Mesh/Create.h ../Mesh/Vertex.h \
- ../Mesh/Mesh.h ../Mesh/Utils.h ../Mesh/Vertex.h ../Mesh/Mesh.h
+ ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h gmshRegion.h Geo.h \
+ ../Mesh/Create.h ../Mesh/Vertex.h ../Mesh/Mesh.h
# 1 "/Users/geuzaine/.gmsh/Geo//"
SVector3.o: SVector3.cpp SVector3.h SPoint3.h
# 1 "/Users/geuzaine/.gmsh/Geo//"
diff --git a/Geo/gmshEdge.cpp b/Geo/gmshEdge.cpp
index 6acd96e218297c1618e64846c00d6a3d4672e6bf..8f08f5c06b34a66137cf21e73b46796b48e20f8e 100644
--- a/Geo/gmshEdge.cpp
+++ b/Geo/gmshEdge.cpp
@@ -23,10 +23,6 @@ gmshEdge::gmshEdge(GModel *model, int num)
CreateReversedCurve(THEM, c);
}
-gmshEdge::~gmshEdge()
-{
-}
-
Range<double> gmshEdge::parBounds(int i) const
{
return(Range<double>(c->ubeg, c->uend));
@@ -36,7 +32,7 @@ SBoundingBox3d gmshEdge::bounds() const
{
SBoundingBox3d bbox;
const int N = 10;
- for (int i = 0; i < N; i++){
+ for(int i = 0; i < N; i++){
double u = c->ubeg + (double)i/(double)(N - 1) * (c->uend - c->ubeg);
Vertex a = InterpolateCurve(c, u, 0);
bbox += SPoint3(a.Pos.X, a.Pos.Y, a.Pos.Z);
@@ -58,7 +54,7 @@ GPoint gmshEdge::closestPoint(const SPoint3 & qp)
v.Pos.X = qp.x();
v.Pos.Y = qp.y();
v.Pos.Z = qp.z();
- ProjectPointOnCurve (c, &v, &a, &der);
+ ProjectPointOnCurve(c, &v, &a, &der);
return GPoint(a.Pos.X, a.Pos.Y, a.Pos.Z, this, a.u);
}
@@ -70,7 +66,6 @@ int gmshEdge::containsParam(double pt) const
SVector3 gmshEdge::firstDer(double par) const
{
- if(!c) return SVector3(0., 0., 0.);
Vertex a = InterpolateCurve(c, par, 1);
return SVector3(a.Pos.X, a.Pos.Y, a.Pos.Z);
}
@@ -87,22 +82,6 @@ double gmshEdge::parFromPoint(const SPoint3 &pt) const
return a.u;
}
-bool gmshEdge::continuous(int) const
-{
- return true;
-}
-
-bool gmshEdge::degenerate(int) const
-{
- return false;
-}
-
-bool gmshEdge::periodic(int dim) const
-{
- return false;
-}
-
-
GEntity::GeomType gmshEdge::geomType() const
{
switch (c->Typ){
@@ -121,17 +100,6 @@ GEntity::GeomType gmshEdge::geomType() const
}
}
-
-void * gmshEdge::getNativePtr() const
-{
- return c;
-}
-
-int gmshEdge::containsPoint(const SPoint3 &pt) const
-{
- throw;
-}
-
int gmshEdge::minimumMeshSegments () const
{
if(geomType() == Circle || geomType() == Ellipse)
diff --git a/Geo/gmshEdge.h b/Geo/gmshEdge.h
index 4841145afae0785b81045ed01935fa8292b796f5..ced0f6135d0ca87c5933876ac4bb7b46b706fd5f 100644
--- a/Geo/gmshEdge.h
+++ b/Geo/gmshEdge.h
@@ -8,30 +8,30 @@
#include "Range.h"
class gmshEdge : public GEdge {
+ protected:
+ Curve *c;
+
public:
gmshEdge(GModel *model, Curve *edge, GVertex *v1, GVertex *v2);
gmshEdge(GModel *model, int num);
- virtual ~gmshEdge();
- double period() const{throw ;}
+ virtual ~gmshEdge() {}
+ double period() const { throw ; }
Range<double> parBounds(int i) const;
- virtual bool periodic(int dim=0) const;
+ virtual bool periodic(int dim=0) const { return false; }
virtual GeomType geomType() const;
- virtual bool degenerate(int) const;
- virtual bool continuous(int dim) const;
- // Geometric Ops
+ virtual bool degenerate(int) const { return false; }
+ virtual bool continuous(int dim) const { return true; }
SBoundingBox3d bounds() const;
virtual GPoint point(double p) const;
virtual GPoint closestPoint(const SPoint3 & queryPoint);
- virtual int containsPoint(const SPoint3 &pt) const;
+ virtual int containsPoint(const SPoint3 &pt) const { throw; }
virtual int containsParam(double pt) const;
virtual SVector3 firstDer(double par) const;
- virtual SPoint2 reparamOnFace(GFace * face, double epar, int dir) const {throw;}
- void * getNativePtr() const;
+ virtual SPoint2 reparamOnFace(GFace * face, double epar, int dir) const { throw; }
+ void * getNativePtr() const { return c; }
virtual double parFromPoint(const SPoint3 &pt) const;
virtual int minimumMeshSegments () const;
virtual int minimumDrawSegments () const;
- protected:
- Curve *c;
};
#endif
diff --git a/Geo/gmshFace.cpp b/Geo/gmshFace.cpp
index 0fbc5259588c3a7e78fd24171dd4f457a3c4f305..1786f4c21547ec018c6f3f600d74075582b83972 100644
--- a/Geo/gmshFace.cpp
+++ b/Geo/gmshFace.cpp
@@ -41,23 +41,6 @@ Range<double> gmshFace::parBounds(int i) const
return Range<double>(0, 1);
}
-int gmshFace::paramDegeneracies(int dir, double *par)
-{
- return 0;
-}
-
-SBoundingBox3d gmshFace::bounds() const
-{
- std::list<GEdge*>::const_iterator it = l_edges.begin();
- SBoundingBox3d res = (*it)->bounds();
- ++it;
- while(it != l_edges.end()){
- res += (*it)->bounds();
- ++it;
- }
- return res;
-}
-
SVector3 gmshFace::normal(const SPoint2 ¶m) const
{
if(geomType() != Plane){
@@ -116,7 +99,7 @@ Pair<SVector3,SVector3> gmshFace::firstDer(const SPoint2 ¶m) const
GPoint gmshFace::point(const SPoint2 &pt) const
{
- return point(pt.x(),pt.y());
+ return point(pt.x(), pt.y());
}
GPoint gmshFace::point(double par1, double par2) const
@@ -171,23 +154,7 @@ SPoint2 gmshFace::parFromPoint(const SPoint3 &qp) const
else{
XYZtoUV(s, qp.x(), qp.y(), qp.z(), &u, &v, 1.0);
}
- SPoint2 pt2(u,v);
- return pt2;
-}
-
-bool gmshFace::continuous(int dim) const
-{
- return true;
-}
-
-bool gmshFace::periodic(int dim) const
-{
- return false;
-}
-
-bool gmshFace::degenerate(int dim) const
-{
- return false;
+ return SPoint2(u, v);
}
GEntity::GeomType gmshFace::geomType() const
@@ -202,16 +169,6 @@ GEntity::GeomType gmshFace::geomType() const
}
}
-int gmshFace::geomDirection() const
-{
- return 1;
-}
-
-void * gmshFace::getNativePtr() const
-{
- return s;
-}
-
int gmshFace::containsPoint(const SPoint3 &pt) const
{
if(geomType() == Plane){
diff --git a/Geo/gmshFace.h b/Geo/gmshFace.h
index 1cb06657fb883573f413a22f8ca2eeee4db53f0f..64c1e96d3c60ef4a6814bce9d118e1e1f37918e9 100644
--- a/Geo/gmshFace.h
+++ b/Geo/gmshFace.h
@@ -8,14 +8,16 @@
#include "Range.h"
class gmshFace : public GFace {
+ protected:
+ Surface *s;
+
public:
gmshFace(GModel *m, Surface *face);
gmshFace(GModel *m, int num);
virtual ~gmshFace(){}
Range<double> parBounds(int i) const;
- virtual int paramDegeneracies(int dir, double *par);
+ virtual int paramDegeneracies(int dir, double *par) { return 0; }
- virtual SBoundingBox3d bounds() const;
virtual GPoint point(double par1, double par2) const;
virtual GPoint point(const SPoint2 &pt) const;
virtual GPoint closestPoint(const SPoint3 & queryPoint) ;
@@ -29,14 +31,13 @@ class gmshFace : public GFace {
double *array) const {throw;}
virtual GEntity::GeomType geomType() const;
- virtual int geomDirection() const;
+ virtual int geomDirection() const { return 1; }
- virtual bool continuous(int dim) const;
- virtual bool periodic(int dim) const;
- virtual bool degenerate(int dim) const;
+ virtual bool continuous(int dim) const { return true; }
+ virtual bool periodic(int dim) const { return false; }
+ virtual bool degenerate(int dim) const { return false; }
virtual double period(int dir) const {throw;}
- void * getNativePtr() const;
- Surface *s;
+ void * getNativePtr() const { return s; }
virtual bool surfPeriodic(int dim) const {throw;}
virtual SPoint2 parFromPoint(const SPoint3 &) const;
};
diff --git a/Geo/gmshRegion.cpp b/Geo/gmshRegion.cpp
index 489e423cc2a9bdd663141da1b81faaafbc6ef8c9..b48feef4a8a043f058e2811bbb1b90131d9063db 100644
--- a/Geo/gmshRegion.cpp
+++ b/Geo/gmshRegion.cpp
@@ -1,13 +1,9 @@
#include "gmshModel.h"
-#include "gmshEdge.h"
#include "gmshFace.h"
#include "gmshRegion.h"
-#include "Interpolation.h"
-#include "CAD.h"
#include "Geo.h"
#include "Mesh.h"
#include "Create.h"
-#include "Utils.h"
extern Mesh *THEM;
@@ -32,3 +28,11 @@ gmshRegion::gmshRegion(GModel *m, int num)
v = Create_Volume(num, MSH_VOLUME_DISCRETE);
Tree_Add(THEM->Volumes, &v);
}
+
+GEntity::GeomType gmshRegion::geomType() const
+{
+ switch (v->Typ){
+ case MSH_VOLUME_DISCRETE : return DiscreteVolume;
+ default : return Volume;
+ }
+}
diff --git a/Geo/gmshRegion.h b/Geo/gmshRegion.h
index c19e780c0234b0de05e0f8e1a4296559ecfa1820..d751eba3477f114397801d4092bdced811c3c34b 100644
--- a/Geo/gmshRegion.h
+++ b/Geo/gmshRegion.h
@@ -6,14 +6,15 @@
#include "GRegion.h"
class gmshRegion : public GRegion {
-public:
+ protected:
+ ::Volume *v;
+
+ public:
gmshRegion(GModel *m, ::Volume *_v);
gmshRegion(GModel *m, int num);
virtual ~gmshRegion() {}
- void * getNativePtr() const {return v;}
- ::Volume *v;
-protected:
-
+ virtual GeomType geomType() const;
+ void * getNativePtr() const { return v; }
};
#endif
diff --git a/Geo/gmshVertex.h b/Geo/gmshVertex.h
index f478773d6dbfeb45ac5d73bfbe84a395da6459b3..e97e1cd1673a88d7a8efd15a212cd07d36b6500a 100644
--- a/Geo/gmshVertex.h
+++ b/Geo/gmshVertex.h
@@ -41,8 +41,8 @@ class gmshVertex : public GVertex {
{
return v ? v->Pos.Z : mesh_vertices.size() ? mesh_vertices[0]->z() : 0.;
}
- void * getNativePtr() const {return v;}
- virtual double prescribedMeshSizeAtVertex() const {return v ? v->lc : 0.;}
+ void * getNativePtr() const { return v; }
+ virtual double prescribedMeshSizeAtVertex() const { return v ? v->lc : 0.; }
};
#endif
diff --git a/Graphics/Draw.cpp b/Graphics/Draw.cpp
index d0dca08b12236c4171d09264bafb30c4499abb89..e49ddf03970ab99b60868c2521856bfd8bef091c 100644
--- a/Graphics/Draw.cpp
+++ b/Graphics/Draw.cpp
@@ -1,4 +1,4 @@
-// $Id: Draw.cpp,v 1.102 2006-08-12 21:31:24 geuzaine Exp $
+// $Id: Draw.cpp,v 1.103 2006-08-13 20:46:54 geuzaine Exp $
//
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
//
@@ -361,7 +361,8 @@ int Process_SelectionBuffer(int type, bool multi,
int x, int y, int w, int h,
GVertex *v[SELECTION_MAX_HITS],
GEdge *c[SELECTION_MAX_HITS],
- GFace *s[SELECTION_MAX_HITS])
+ GFace *s[SELECTION_MAX_HITS],
+ GRegion *r[SELECTION_MAX_HITS])
{
hit hits[SELECTION_BUFFER_SIZE];
GLuint selectBuf[SELECTION_BUFFER_SIZE];
@@ -430,7 +431,8 @@ int Process_SelectionBuffer(int type, bool multi,
if((type == ENT_NONE && hits[i].type == typmin) ||
(type == ENT_POINT && hits[i].type == 0) ||
(type == ENT_LINE && hits[i].type == 1) ||
- (type == ENT_SURFACE && hits[i].type == 2)){
+ (type == ENT_SURFACE && hits[i].type == 2) ||
+ (type == ENT_VOLUME && hits[i].type == 3)){
switch (hits[i].type) {
case 0:
if(!(v[j] = GMODEL->vertexByTag(hits[i].ient))){
@@ -456,6 +458,14 @@ int Process_SelectionBuffer(int type, bool multi,
j++;
if(!multi) return 1;
break;
+ case 3:
+ if(!(r[j] = GMODEL->regionByTag(hits[i].ient))){
+ Msg(GERROR, "Problem in volume selection processing");
+ return j;
+ }
+ j++;
+ if(!multi) return 1;
+ break;
}
}
}
diff --git a/Graphics/Draw.h b/Graphics/Draw.h
index 500168697d81d5478972d518b53088882d253bee..b3ed27be02f454db02d36820fe8ed7100b975744 100644
--- a/Graphics/Draw.h
+++ b/Graphics/Draw.h
@@ -26,6 +26,7 @@
class GVertex;
class GEdge;
class GFace;
+class GRegion;
#define GMSH_RENDER 1
#define GMSH_SELECT 2
@@ -46,11 +47,13 @@ int Process_SelectionBuffer(int type, bool multi,
int x, int y, int w, int h,
GVertex *v[SELECTION_MAX_HITS],
GEdge *c[SELECTION_MAX_HITS],
- GFace *s[SELECTION_MAX_HITS]);
+ GFace *s[SELECTION_MAX_HITS],
+ GRegion *r[SELECTION_MAX_HITS]);
char SelectEntity(int type, int *n,
GVertex *v[SELECTION_MAX_HITS],
GEdge *c[SELECTION_MAX_HITS],
- GFace *s[SELECTION_MAX_HITS]);
+ GFace *s[SELECTION_MAX_HITS],
+ GRegion *r[SELECTION_MAX_HITS]);
void unproject(double x, double y, double p[3], double d[3]);
void Viewport2World(double win[3], double xyz[3]);
@@ -60,10 +63,10 @@ unsigned int PaletteContinuous(Post_View * View, double min, double max, double
unsigned int PaletteContinuousLinear(Post_View * v, double min, double max, double val);
unsigned int PaletteDiscrete(Post_View * View, int nbi, int i);
-void HighlightEntity(GVertex *v, GEdge *c, GFace *s, int permanent);
-void HighlightEntityNum(int v, int c, int s, int permanant);
-void ZeroHighlightEntity(GVertex *v, GEdge *c, GFace *s);
-void ZeroHighlightEntityNum(int v, int c, int s);
+void HighlightEntity(GVertex *v, GEdge *c, GFace *s, GRegion *r, int permanent);
+void HighlightEntityNum(int v, int c, int s, int r, int permanant);
+void ZeroHighlightEntity(GVertex *v, GEdge *c, GFace *s, GRegion *r);
+void ZeroHighlightEntityNum(int v, int c, int s, int r);
void ZeroHighlight();
void Draw3d(void);
diff --git a/Graphics/Geom.cpp b/Graphics/Geom.cpp
index 9d3e4167f61d3bffaa368f2ddffa7c761cb09cf6..13f4ffc9ecd0b785c085d73734d3910bcbccc2cd 100644
--- a/Graphics/Geom.cpp
+++ b/Graphics/Geom.cpp
@@ -1,4 +1,4 @@
-// $Id: Geom.cpp,v 1.110 2006-08-13 18:11:17 geuzaine Exp $
+// $Id: Geom.cpp,v 1.111 2006-08-13 20:46:55 geuzaine Exp $
//
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
//
@@ -92,7 +92,7 @@ class drawGEdge
public :
void operator () (GEdge *e)
{
- if(!e->getVisibility())
+ if(!e->getVisibility() || e->geomType() == GEntity::DiscreteCurve)
return;
if(CTX.render_mode == GMSH_SELECT) {
@@ -116,33 +116,28 @@ public :
double t_max = t_bounds.high();
if(CTX.geom.lines) {
- if(e->geomType() == GEntity::DiscreteCurve){
- // do nothing: we draw the elements in the mesh drawing routines
+ int N = e->minimumDrawSegments() + 1;
+ if(CTX.geom.line_type > 0) {
+ for(int i = 0; i < N - 1; i++) {
+ double t1 = t_min + (double)i / (double)(N - 1) * (t_max - t_min);
+ GPoint p1 = e->point(t1);
+ double t2 = t_min + (double)(i + 1) / (double)(N - 1) * (t_max - t_min);
+ GPoint p2 = e->point(t2);
+ double x[2] = {p1.x(), p2.x()};
+ double y[2] = {p1.y(), p2.y()};
+ double z[2] = {p1.z(), p2.z()};
+ Draw_Cylinder(e->getFlag() > 0 ? CTX.geom.line_sel_width :
+ CTX.geom.line_width, x, y, z, CTX.geom.light);
+ }
}
else {
- int N = e->minimumDrawSegments() + 1;
- if(CTX.geom.line_type > 0) {
- for(int i = 0; i < N - 1; i++) {
- double t1 = t_min + (double)i / (double)(N - 1) * (t_max - t_min);
- GPoint p1 = e->point(t1);
- double t2 = t_min + (double)(i + 1) / (double)(N - 1) * (t_max - t_min);
- GPoint p2 = e->point(t2);
- double x[2] = {p1.x(), p2.x()};
- double y[2] = {p1.y(), p2.y()};
- double z[2] = {p1.z(), p2.z()};
- Draw_Cylinder(e->getFlag() > 0 ? CTX.geom.line_sel_width :
- CTX.geom.line_width, x, y, z, CTX.geom.light);
- }
- }
- else {
- glBegin(GL_LINE_STRIP);
- for(int i = 0; i < N; i++) {
- double t = t_min + (double)i / (double)(N - 1) * (t_max - t_min);
- GPoint p = e->point(t);
- glVertex3d(p.x(), p.y(), p.z());
- }
- glEnd();
+ glBegin(GL_LINE_STRIP);
+ for(int i = 0; i < N; i++) {
+ double t = t_min + (double)i / (double)(N - 1) * (t_max - t_min);
+ GPoint p = e->point(t);
+ glVertex3d(p.x(), p.y(), p.z());
}
+ glEnd();
}
}
@@ -326,7 +321,7 @@ private:
public :
void operator () (GFace *f)
{
- if(!f->getVisibility())
+ if(!f->getVisibility() || f->geomType() == GEntity::DiscreteSurface)
return;
if(CTX.render_mode == GMSH_SELECT) {
@@ -346,15 +341,10 @@ public :
glColor4ubv((GLubyte *) & CTX.color.geom.surface);
}
- if(f->geomType() == GEntity::DiscreteSurface){
- // do nothing: we draw the elements in the mesh drawing routines
- }
- else if(f->geomType() == GEntity::Plane){
+ if(f->geomType() == GEntity::Plane)
_drawPlaneGFace(f);
- }
- else{
+ else
_drawNonPlaneGFace(f);
- }
if(CTX.render_mode == GMSH_SELECT) {
glPopName();
@@ -369,6 +359,43 @@ class drawGRegion
public :
void operator () (GRegion *r)
{
+ if(!r->getVisibility() || r->geomType() == GEntity::DiscreteVolume)
+ return;
+
+ if(CTX.render_mode == GMSH_SELECT) {
+ glPushName(3);
+ glPushName(r->tag());
+ }
+
+ if(r->getFlag() > 0) {
+ glColor4ubv((GLubyte *) & CTX.color.geom.volume_sel);
+ }
+ else {
+ glColor4ubv((GLubyte *) & CTX.color.geom.volume);
+ }
+
+ SBoundingBox3d bb = r->bounds();
+ SPoint3 p = bb.center();
+ const double size = 10.;
+
+ if(CTX.geom.volumes){
+ Draw_Sphere(size, p.x(), p.y(), p.z(), CTX.geom.light);
+ }
+
+ if(CTX.geom.volumes_num){
+ char Num[100];
+ sprintf(Num, "%d", r->tag());
+ double offset = (0.5 * size + 0.3 * CTX.gl_fontsize) * CTX.pixel_equiv_x;
+ glRasterPos3d(p.x() + offset / CTX.s[0],
+ p.y() + offset / CTX.s[1],
+ p.z() + offset / CTX.s[2]);
+ Draw_String(Num);
+ }
+
+ if(CTX.render_mode == GMSH_SELECT) {
+ glPopName();
+ glPopName();
+ }
}
};
@@ -406,15 +433,16 @@ void HighlightEntity(GEntity *e, int permanent)
Msg(STATUS2N, "%s", e->getInfoString().c_str());
}
-void HighlightEntity(GVertex *v, GEdge *c, GFace *s, int permanent)
+void HighlightEntity(GVertex *v, GEdge *c, GFace *s, GRegion *r, int permanent)
{
if(v) HighlightEntity(v, permanent);
else if(c) HighlightEntity(c, permanent);
else if(s) HighlightEntity(s, permanent);
+ else if(r) HighlightEntity(r, permanent);
else if(!permanent) Msg(STATUS2N, " ");
}
-void HighlightEntityNum(int v, int c, int s, int permanent)
+void HighlightEntityNum(int v, int c, int s, int r, int permanent)
{
if(v) {
GVertex *pv = GMODEL->vertexByTag(v);
@@ -428,6 +456,10 @@ void HighlightEntityNum(int v, int c, int s, int permanent)
GFace *ps = GMODEL->faceByTag(s);
if(ps) HighlightEntity(ps, permanent);
}
+ if(r) {
+ GRegion *pr = GMODEL->regionByTag(r);
+ if(pr) HighlightEntity(pr, permanent);
+ }
}
void ZeroHighlightEntity(GEntity *e)
@@ -435,11 +467,12 @@ void ZeroHighlightEntity(GEntity *e)
e->setFlag(-2);
}
-void ZeroHighlightEntity(GVertex *v, GEdge *c, GFace *s)
+void ZeroHighlightEntity(GVertex *v, GEdge *c, GFace *s, GRegion *r)
{
if(v) ZeroHighlightEntity(v);
if(c) ZeroHighlightEntity(c);
if(s) ZeroHighlightEntity(s);
+ if(r) ZeroHighlightEntity(r);
}
void ZeroHighlight()
@@ -450,9 +483,11 @@ void ZeroHighlight()
ZeroHighlightEntity(*it);
for(GModel::fiter it = GMODEL->firstFace(); it != GMODEL->lastFace(); it++)
ZeroHighlightEntity(*it);
+ for(GModel::riter it = GMODEL->firstRegion(); it != GMODEL->lastRegion(); it++)
+ ZeroHighlightEntity(*it);
}
-void ZeroHighlightEntityNum(int v, int c, int s)
+void ZeroHighlightEntityNum(int v, int c, int s, int r)
{
if(v) {
GVertex *pv = GMODEL->vertexByTag(v);
@@ -466,4 +501,8 @@ void ZeroHighlightEntityNum(int v, int c, int s)
GFace *ps = GMODEL->faceByTag(s);
if(ps) ZeroHighlightEntity(ps);
}
+ if(r) {
+ GRegion *pr = GMODEL->regionByTag(r);
+ if(pr) ZeroHighlightEntity(pr);
+ }
}
diff --git a/tutorial/t1.geo b/tutorial/t1.geo
index 8761b856825e7606bb483187dc189ba625483127..6060c856604655c0699ba2ab796208f33be8b5a8 100644
--- a/tutorial/t1.geo
+++ b/tutorial/t1.geo
@@ -92,3 +92,4 @@ Physical Surface(MySurface) = {6} ;
// the mesh will be directly saved with their default orientation and
// with a region number equal to the number of the elementary entity
// they discretize.
+Transfinite Surface {6} = {1,2,3,4};