diff --git a/Fltk/Callbacks.cpp b/Fltk/Callbacks.cpp
index 7fc701dad1ac71ebd2b18f654c8be64e49cc0691..23d3f5c72a3732195f6a874fbd17da941d4ac50c 100644
--- a/Fltk/Callbacks.cpp
+++ b/Fltk/Callbacks.cpp
@@ -1,4 +1,4 @@
-// $Id: Callbacks.cpp,v 1.177 2003-06-19 16:20:45 geuzaine Exp $
+// $Id: Callbacks.cpp,v 1.178 2003-06-19 16:48:49 geuzaine Exp $
//
// Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
//
@@ -1365,7 +1365,7 @@ void help_short_cb(CALLBACK_ARGS)
Msg(DIRECT, "Other shortcuts");
Msg(DIRECT, "");
Msg(DIRECT, " 0 or Esc reload geometry input file");
- Msg(DIRECT, " 1 or F1 mesh curves");
+ Msg(DIRECT, " 1 or F1 mesh lines");
Msg(DIRECT, " 2 or F2 mesh surfaces");
Msg(DIRECT, " 3 or F3 mesh volumes");
Msg(DIRECT, " Alt+a hide/show small axes");
@@ -1720,7 +1720,7 @@ static void _new_surface_volume(int mode)
List_Reset(Liste2);
while(1) {
- Msg(STATUS3N, "Select boundary ('q'=quit)");
+ Msg(STATUS3N, "Select exterior boundary ('q'=quit)");
ib = SelectEntity(type, &v, &c, &s);
if(ib <= 0) {
ZeroHighlight(THEM);
@@ -1792,7 +1792,7 @@ void geometry_elementary_add_new_volume_cb(CALLBACK_ARGS)
_new_surface_volume(2);
}
-static void _transform_point_curve_surface(int transfo, int mode, char *what)
+static void _transform_point_line_surface(int transfo, int mode, char *what)
{
Vertex *v;
Curve *c;
@@ -1876,19 +1876,19 @@ void geometry_elementary_add_translate_cb(CALLBACK_ARGS)
void geometry_elementary_add_translate_point_cb(CALLBACK_ARGS)
{
WID->create_geometry_context_window(2);
- _transform_point_curve_surface(0, 1, "Point");
+ _transform_point_line_surface(0, 1, "Point");
}
-void geometry_elementary_add_translate_curve_cb(CALLBACK_ARGS)
+void geometry_elementary_add_translate_line_cb(CALLBACK_ARGS)
{
WID->create_geometry_context_window(2);
- _transform_point_curve_surface(0, 1, "Line");
+ _transform_point_line_surface(0, 1, "Line");
}
void geometry_elementary_add_translate_surface_cb(CALLBACK_ARGS)
{
WID->create_geometry_context_window(2);
- _transform_point_curve_surface(0, 1, "Surface");
+ _transform_point_line_surface(0, 1, "Surface");
}
void geometry_elementary_translate_cb(CALLBACK_ARGS)
@@ -1899,19 +1899,19 @@ void geometry_elementary_translate_cb(CALLBACK_ARGS)
void geometry_elementary_translate_point_cb(CALLBACK_ARGS)
{
WID->create_geometry_context_window(2);
- _transform_point_curve_surface(0, 0, "Point");
+ _transform_point_line_surface(0, 0, "Point");
}
-void geometry_elementary_translate_curve_cb(CALLBACK_ARGS)
+void geometry_elementary_translate_line_cb(CALLBACK_ARGS)
{
WID->create_geometry_context_window(2);
- _transform_point_curve_surface(0, 0, "Line");
+ _transform_point_line_surface(0, 0, "Line");
}
void geometry_elementary_translate_surface_cb(CALLBACK_ARGS)
{
WID->create_geometry_context_window(2);
- _transform_point_curve_surface(0, 0, "Surface");
+ _transform_point_line_surface(0, 0, "Surface");
}
void geometry_elementary_add_rotate_cb(CALLBACK_ARGS)
@@ -1922,19 +1922,19 @@ void geometry_elementary_add_rotate_cb(CALLBACK_ARGS)
void geometry_elementary_add_rotate_point_cb(CALLBACK_ARGS)
{
WID->create_geometry_context_window(3);
- _transform_point_curve_surface(1, 1, "Point");
+ _transform_point_line_surface(1, 1, "Point");
}
-void geometry_elementary_add_rotate_curve_cb(CALLBACK_ARGS)
+void geometry_elementary_add_rotate_line_cb(CALLBACK_ARGS)
{
WID->create_geometry_context_window(3);
- _transform_point_curve_surface(1, 1, "Line");
+ _transform_point_line_surface(1, 1, "Line");
}
void geometry_elementary_add_rotate_surface_cb(CALLBACK_ARGS)
{
WID->create_geometry_context_window(3);
- _transform_point_curve_surface(1, 1, "Surface");
+ _transform_point_line_surface(1, 1, "Surface");
}
void geometry_elementary_rotate_cb(CALLBACK_ARGS)
@@ -1945,19 +1945,19 @@ void geometry_elementary_rotate_cb(CALLBACK_ARGS)
void geometry_elementary_rotate_point_cb(CALLBACK_ARGS)
{
WID->create_geometry_context_window(3);
- _transform_point_curve_surface(1, 0, "Point");
+ _transform_point_line_surface(1, 0, "Point");
}
-void geometry_elementary_rotate_curve_cb(CALLBACK_ARGS)
+void geometry_elementary_rotate_line_cb(CALLBACK_ARGS)
{
WID->create_geometry_context_window(3);
- _transform_point_curve_surface(1, 0, "Line");
+ _transform_point_line_surface(1, 0, "Line");
}
void geometry_elementary_rotate_surface_cb(CALLBACK_ARGS)
{
WID->create_geometry_context_window(3);
- _transform_point_curve_surface(1, 0, "Surface");
+ _transform_point_line_surface(1, 0, "Surface");
}
void geometry_elementary_add_scale_cb(CALLBACK_ARGS)
@@ -1968,19 +1968,19 @@ void geometry_elementary_add_scale_cb(CALLBACK_ARGS)
void geometry_elementary_add_scale_point_cb(CALLBACK_ARGS)
{
WID->create_geometry_context_window(4);
- _transform_point_curve_surface(2, 1, "Point");
+ _transform_point_line_surface(2, 1, "Point");
}
-void geometry_elementary_add_scale_curve_cb(CALLBACK_ARGS)
+void geometry_elementary_add_scale_line_cb(CALLBACK_ARGS)
{
WID->create_geometry_context_window(4);
- _transform_point_curve_surface(2, 1, "Line");
+ _transform_point_line_surface(2, 1, "Line");
}
void geometry_elementary_add_scale_surface_cb(CALLBACK_ARGS)
{
WID->create_geometry_context_window(4);
- _transform_point_curve_surface(2, 1, "Surface");
+ _transform_point_line_surface(2, 1, "Surface");
}
void geometry_elementary_scale_cb(CALLBACK_ARGS)
@@ -1991,19 +1991,19 @@ void geometry_elementary_scale_cb(CALLBACK_ARGS)
void geometry_elementary_scale_point_cb(CALLBACK_ARGS)
{
WID->create_geometry_context_window(4);
- _transform_point_curve_surface(2, 0, "Point");
+ _transform_point_line_surface(2, 0, "Point");
}
-void geometry_elementary_scale_curve_cb(CALLBACK_ARGS)
+void geometry_elementary_scale_line_cb(CALLBACK_ARGS)
{
WID->create_geometry_context_window(4);
- _transform_point_curve_surface(2, 0, "Line");
+ _transform_point_line_surface(2, 0, "Line");
}
void geometry_elementary_scale_surface_cb(CALLBACK_ARGS)
{
WID->create_geometry_context_window(4);
- _transform_point_curve_surface(2, 0, "Surface");
+ _transform_point_line_surface(2, 0, "Surface");
}
void geometry_elementary_add_symmetry_cb(CALLBACK_ARGS)
@@ -2014,19 +2014,19 @@ void geometry_elementary_add_symmetry_cb(CALLBACK_ARGS)
void geometry_elementary_add_symmetry_point_cb(CALLBACK_ARGS)
{
WID->create_geometry_context_window(5);
- _transform_point_curve_surface(3, 1, "Point");
+ _transform_point_line_surface(3, 1, "Point");
}
-void geometry_elementary_add_symmetry_curve_cb(CALLBACK_ARGS)
+void geometry_elementary_add_symmetry_line_cb(CALLBACK_ARGS)
{
WID->create_geometry_context_window(5);
- _transform_point_curve_surface(3, 1, "Line");
+ _transform_point_line_surface(3, 1, "Line");
}
void geometry_elementary_add_symmetry_surface_cb(CALLBACK_ARGS)
{
WID->create_geometry_context_window(5);
- _transform_point_curve_surface(3, 1, "Surface");
+ _transform_point_line_surface(3, 1, "Surface");
}
void geometry_elementary_symmetry_cb(CALLBACK_ARGS)
@@ -2037,19 +2037,19 @@ void geometry_elementary_symmetry_cb(CALLBACK_ARGS)
void geometry_elementary_symmetry_point_cb(CALLBACK_ARGS)
{
WID->create_geometry_context_window(5);
- _transform_point_curve_surface(3, 0, "Point");
+ _transform_point_line_surface(3, 0, "Point");
}
-void geometry_elementary_symmetry_curve_cb(CALLBACK_ARGS)
+void geometry_elementary_symmetry_line_cb(CALLBACK_ARGS)
{
WID->create_geometry_context_window(5);
- _transform_point_curve_surface(3, 0, "Line");
+ _transform_point_line_surface(3, 0, "Line");
}
void geometry_elementary_symmetry_surface_cb(CALLBACK_ARGS)
{
WID->create_geometry_context_window(5);
- _transform_point_curve_surface(3, 0, "Surface");
+ _transform_point_line_surface(3, 0, "Surface");
}
void geometry_elementary_extrude_cb(CALLBACK_ARGS)
@@ -2065,19 +2065,19 @@ void geometry_elementary_extrude_translate_cb(CALLBACK_ARGS)
void geometry_elementary_extrude_translate_point_cb(CALLBACK_ARGS)
{
WID->create_geometry_context_window(2);
- _transform_point_curve_surface(4, 0, "Point");
+ _transform_point_line_surface(4, 0, "Point");
}
-void geometry_elementary_extrude_translate_curve_cb(CALLBACK_ARGS)
+void geometry_elementary_extrude_translate_line_cb(CALLBACK_ARGS)
{
WID->create_geometry_context_window(2);
- _transform_point_curve_surface(4, 0, "Line");
+ _transform_point_line_surface(4, 0, "Line");
}
void geometry_elementary_extrude_translate_surface_cb(CALLBACK_ARGS)
{
WID->create_geometry_context_window(2);
- _transform_point_curve_surface(4, 0, "Surface");
+ _transform_point_line_surface(4, 0, "Surface");
}
void geometry_elementary_extrude_rotate_cb(CALLBACK_ARGS)
@@ -2088,19 +2088,19 @@ void geometry_elementary_extrude_rotate_cb(CALLBACK_ARGS)
void geometry_elementary_extrude_rotate_point_cb(CALLBACK_ARGS)
{
WID->create_geometry_context_window(3);
- _transform_point_curve_surface(5, 0, "Point");
+ _transform_point_line_surface(5, 0, "Point");
}
-void geometry_elementary_extrude_rotate_curve_cb(CALLBACK_ARGS)
+void geometry_elementary_extrude_rotate_line_cb(CALLBACK_ARGS)
{
WID->create_geometry_context_window(3);
- _transform_point_curve_surface(5, 0, "Line");
+ _transform_point_line_surface(5, 0, "Line");
}
void geometry_elementary_extrude_rotate_surface_cb(CALLBACK_ARGS)
{
WID->create_geometry_context_window(3);
- _transform_point_curve_surface(5, 0, "Surface");
+ _transform_point_line_surface(5, 0, "Surface");
}
void geometry_elementary_delete_cb(CALLBACK_ARGS)
@@ -2110,17 +2110,17 @@ void geometry_elementary_delete_cb(CALLBACK_ARGS)
void geometry_elementary_delete_point_cb(CALLBACK_ARGS)
{
- _transform_point_curve_surface(6, 0, "Point");
+ _transform_point_line_surface(6, 0, "Point");
}
-void geometry_elementary_delete_curve_cb(CALLBACK_ARGS)
+void geometry_elementary_delete_line_cb(CALLBACK_ARGS)
{
- _transform_point_curve_surface(6, 0, "Line");
+ _transform_point_line_surface(6, 0, "Line");
}
void geometry_elementary_delete_surface_cb(CALLBACK_ARGS)
{
- _transform_point_curve_surface(6, 0, "Surface");
+ _transform_point_line_surface(6, 0, "Surface");
}
static void _add_physical(char *what)
@@ -2206,7 +2206,7 @@ void geometry_physical_add_point_cb(CALLBACK_ARGS)
_add_physical("Point");
}
-void geometry_physical_add_curve_cb(CALLBACK_ARGS)
+void geometry_physical_add_line_cb(CALLBACK_ARGS)
{
_add_physical("Line");
}
diff --git a/Fltk/Callbacks.h b/Fltk/Callbacks.h
index 8a74cb89cfef726df16b64bfbe11db140c588c01..16ffe1812ed00116ae1193c461a621c99a340fa8 100644
--- a/Fltk/Callbacks.h
+++ b/Fltk/Callbacks.h
@@ -175,53 +175,53 @@ void geometry_elementary_add_new_ruledsurface_cb(CALLBACK_ARGS) ;
void geometry_elementary_add_new_volume_cb(CALLBACK_ARGS) ;
void geometry_elementary_add_translate_cb(CALLBACK_ARGS) ;
void geometry_elementary_add_translate_point_cb(CALLBACK_ARGS) ;
-void geometry_elementary_add_translate_curve_cb(CALLBACK_ARGS) ;
+void geometry_elementary_add_translate_line_cb(CALLBACK_ARGS) ;
void geometry_elementary_add_translate_surface_cb(CALLBACK_ARGS) ;
void geometry_elementary_add_rotate_cb(CALLBACK_ARGS) ;
void geometry_elementary_add_rotate_point_cb(CALLBACK_ARGS) ;
-void geometry_elementary_add_rotate_curve_cb(CALLBACK_ARGS) ;
+void geometry_elementary_add_rotate_line_cb(CALLBACK_ARGS) ;
void geometry_elementary_add_rotate_surface_cb(CALLBACK_ARGS) ;
void geometry_elementary_add_scale_cb(CALLBACK_ARGS) ;
void geometry_elementary_add_scale_point_cb(CALLBACK_ARGS) ;
-void geometry_elementary_add_scale_curve_cb(CALLBACK_ARGS) ;
+void geometry_elementary_add_scale_line_cb(CALLBACK_ARGS) ;
void geometry_elementary_add_scale_surface_cb(CALLBACK_ARGS) ;
void geometry_elementary_add_symmetry_cb(CALLBACK_ARGS) ;
void geometry_elementary_add_symmetry_point_cb(CALLBACK_ARGS) ;
-void geometry_elementary_add_symmetry_curve_cb(CALLBACK_ARGS) ;
+void geometry_elementary_add_symmetry_line_cb(CALLBACK_ARGS) ;
void geometry_elementary_add_symmetry_surface_cb(CALLBACK_ARGS) ;
void geometry_elementary_translate_cb(CALLBACK_ARGS) ;
void geometry_elementary_translate_point_cb(CALLBACK_ARGS) ;
-void geometry_elementary_translate_curve_cb(CALLBACK_ARGS) ;
+void geometry_elementary_translate_line_cb(CALLBACK_ARGS) ;
void geometry_elementary_translate_surface_cb(CALLBACK_ARGS) ;
void geometry_elementary_rotate_cb(CALLBACK_ARGS) ;
void geometry_elementary_rotate_point_cb(CALLBACK_ARGS) ;
-void geometry_elementary_rotate_curve_cb(CALLBACK_ARGS) ;
+void geometry_elementary_rotate_line_cb(CALLBACK_ARGS) ;
void geometry_elementary_rotate_surface_cb(CALLBACK_ARGS) ;
void geometry_elementary_scale_cb(CALLBACK_ARGS) ;
void geometry_elementary_scale_point_cb(CALLBACK_ARGS) ;
-void geometry_elementary_scale_curve_cb(CALLBACK_ARGS) ;
+void geometry_elementary_scale_line_cb(CALLBACK_ARGS) ;
void geometry_elementary_scale_surface_cb(CALLBACK_ARGS) ;
void geometry_elementary_symmetry_cb(CALLBACK_ARGS) ;
void geometry_elementary_symmetry_point_cb(CALLBACK_ARGS) ;
-void geometry_elementary_symmetry_curve_cb(CALLBACK_ARGS) ;
+void geometry_elementary_symmetry_line_cb(CALLBACK_ARGS) ;
void geometry_elementary_symmetry_surface_cb(CALLBACK_ARGS) ;
void geometry_elementary_extrude_cb(CALLBACK_ARGS) ;
void geometry_elementary_extrude_translate_cb(CALLBACK_ARGS) ;
void geometry_elementary_extrude_translate_point_cb(CALLBACK_ARGS) ;
-void geometry_elementary_extrude_translate_curve_cb(CALLBACK_ARGS) ;
+void geometry_elementary_extrude_translate_line_cb(CALLBACK_ARGS) ;
void geometry_elementary_extrude_translate_surface_cb(CALLBACK_ARGS) ;
void geometry_elementary_extrude_rotate_cb(CALLBACK_ARGS) ;
void geometry_elementary_extrude_rotate_point_cb(CALLBACK_ARGS) ;
-void geometry_elementary_extrude_rotate_curve_cb(CALLBACK_ARGS) ;
+void geometry_elementary_extrude_rotate_line_cb(CALLBACK_ARGS) ;
void geometry_elementary_extrude_rotate_surface_cb(CALLBACK_ARGS) ;
void geometry_elementary_delete_cb(CALLBACK_ARGS) ;
void geometry_elementary_delete_point_cb(CALLBACK_ARGS) ;
-void geometry_elementary_delete_curve_cb(CALLBACK_ARGS) ;
+void geometry_elementary_delete_line_cb(CALLBACK_ARGS) ;
void geometry_elementary_delete_surface_cb(CALLBACK_ARGS) ;
void geometry_physical_cb(CALLBACK_ARGS) ;
void geometry_physical_add_cb(CALLBACK_ARGS) ;
void geometry_physical_add_point_cb (CALLBACK_ARGS) ;
-void geometry_physical_add_curve_cb (CALLBACK_ARGS) ;
+void geometry_physical_add_line_cb (CALLBACK_ARGS) ;
void geometry_physical_add_surface_cb (CALLBACK_ARGS) ;
void geometry_physical_add_volume_cb (CALLBACK_ARGS) ;
void geometry_edit_cb(CALLBACK_ARGS) ;
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index 6a92865a7b69814ce193e7c90f957fc9c43079e9..ee2040b8db306859f7a64373faae6edc9d6c3e9d 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1,4 +1,4 @@
-// $Id: GUI.cpp,v 1.240 2003-06-14 06:23:04 geuzaine Exp $
+// $Id: GUI.cpp,v 1.241 2003-06-19 16:48:49 geuzaine Exp $
//
// Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
//
@@ -192,11 +192,11 @@ Context_Item menu_geometry[] = {
{ "0Geometry Elementary Add New", NULL } ,
{ "Parameter", (Fl_Callback *)geometry_elementary_add_new_parameter_cb } ,
{ "Point", (Fl_Callback *)geometry_elementary_add_new_point_cb } ,
- { "Line", (Fl_Callback *)geometry_elementary_add_new_line_cb } ,
+ { "Straight line", (Fl_Callback *)geometry_elementary_add_new_line_cb } ,
{ "Spline", (Fl_Callback *)geometry_elementary_add_new_spline_cb } ,
{ "B-Spline", (Fl_Callback *)geometry_elementary_add_new_bspline_cb } ,
- { "Circle", (Fl_Callback *)geometry_elementary_add_new_circle_cb } ,
- { "Ellipse", (Fl_Callback *)geometry_elementary_add_new_ellipse_cb } ,
+ { "Circle arc", (Fl_Callback *)geometry_elementary_add_new_circle_cb } ,
+ { "Ellipse arc", (Fl_Callback *)geometry_elementary_add_new_ellipse_cb } ,
{ "Plane surface", (Fl_Callback *)geometry_elementary_add_new_planesurface_cb } ,
{ "Ruled surface", (Fl_Callback *)geometry_elementary_add_new_ruledsurface_cb } ,
{ "Volume", (Fl_Callback *)geometry_elementary_add_new_volume_cb } ,
@@ -205,56 +205,56 @@ Context_Item menu_geometry[] = {
Context_Item menu_geometry_elementary_add_translate[] = {
{ "0Geometry Elementary Add Translate", NULL } ,
{ "Point", (Fl_Callback *)geometry_elementary_add_translate_point_cb } ,
- { "Curve", (Fl_Callback *)geometry_elementary_add_translate_curve_cb } ,
+ { "Line", (Fl_Callback *)geometry_elementary_add_translate_line_cb } ,
{ "Surface", (Fl_Callback *)geometry_elementary_add_translate_surface_cb } ,
{ NULL }
};
Context_Item menu_geometry_elementary_add_rotate[] = {
{ "0Geometry Elementary Add Rotate", NULL } ,
{ "Point", (Fl_Callback *)geometry_elementary_add_rotate_point_cb } ,
- { "Curve", (Fl_Callback *)geometry_elementary_add_rotate_curve_cb } ,
+ { "Line", (Fl_Callback *)geometry_elementary_add_rotate_line_cb } ,
{ "Surface", (Fl_Callback *)geometry_elementary_add_rotate_surface_cb } ,
{ NULL }
};
Context_Item menu_geometry_elementary_add_scale[] = {
{ "0Geometry Elementary Add Scale", NULL } ,
{ "Point", (Fl_Callback *)geometry_elementary_add_scale_point_cb } ,
- { "Curve", (Fl_Callback *)geometry_elementary_add_scale_curve_cb } ,
+ { "Line", (Fl_Callback *)geometry_elementary_add_scale_line_cb } ,
{ "Surface", (Fl_Callback *)geometry_elementary_add_scale_surface_cb } ,
{ NULL }
};
Context_Item menu_geometry_elementary_add_symmetry[] = {
{ "0Geometry Elementary Add Symmetry", NULL } ,
{ "Point", (Fl_Callback *)geometry_elementary_add_symmetry_point_cb } ,
- { "Curve", (Fl_Callback *)geometry_elementary_add_symmetry_curve_cb } ,
+ { "Line", (Fl_Callback *)geometry_elementary_add_symmetry_line_cb } ,
{ "Surface", (Fl_Callback *)geometry_elementary_add_symmetry_surface_cb } ,
{ NULL }
};
Context_Item menu_geometry_elementary_translate[] = {
{ "0Geometry Elementary Translate", NULL } ,
{ "Point", (Fl_Callback *)geometry_elementary_translate_point_cb } ,
- { "Curve", (Fl_Callback *)geometry_elementary_translate_curve_cb } ,
+ { "Line", (Fl_Callback *)geometry_elementary_translate_line_cb } ,
{ "Surface", (Fl_Callback *)geometry_elementary_translate_surface_cb } ,
{ NULL }
};
Context_Item menu_geometry_elementary_rotate[] = {
{ "0Geometry Elementary Rotate", NULL } ,
{ "Point", (Fl_Callback *)geometry_elementary_rotate_point_cb } ,
- { "Curve", (Fl_Callback *)geometry_elementary_rotate_curve_cb } ,
+ { "Line", (Fl_Callback *)geometry_elementary_rotate_line_cb } ,
{ "Surface", (Fl_Callback *)geometry_elementary_rotate_surface_cb } ,
{ NULL }
};
Context_Item menu_geometry_elementary_scale[] = {
{ "0Geometry Elementary Scale", NULL } ,
{ "Point", (Fl_Callback *)geometry_elementary_scale_point_cb } ,
- { "Curve", (Fl_Callback *)geometry_elementary_scale_curve_cb } ,
+ { "Line", (Fl_Callback *)geometry_elementary_scale_line_cb } ,
{ "Surface", (Fl_Callback *)geometry_elementary_scale_surface_cb } ,
{ NULL }
};
Context_Item menu_geometry_elementary_symmetry[] = {
{ "0Geometry Elementary Symmetry", NULL } ,
{ "Point", (Fl_Callback *)geometry_elementary_symmetry_point_cb } ,
- { "Curve", (Fl_Callback *)geometry_elementary_symmetry_curve_cb } ,
+ { "Line", (Fl_Callback *)geometry_elementary_symmetry_line_cb } ,
{ "Surface", (Fl_Callback *)geometry_elementary_symmetry_surface_cb } ,
{ NULL }
};
@@ -267,21 +267,21 @@ Context_Item menu_geometry[] = {
Context_Item menu_geometry_elementary_extrude_translate[] = {
{ "0Geometry Elementary Extrude Translate", NULL } ,
{ "Point", (Fl_Callback *)geometry_elementary_extrude_translate_point_cb } ,
- { "Curve", (Fl_Callback *)geometry_elementary_extrude_translate_curve_cb } ,
+ { "Line", (Fl_Callback *)geometry_elementary_extrude_translate_line_cb } ,
{ "Surface", (Fl_Callback *)geometry_elementary_extrude_translate_surface_cb } ,
{ NULL }
};
Context_Item menu_geometry_elementary_extrude_rotate[] = {
{ "0Geometry Elementary Extrude Rotate", NULL } ,
{ "Point", (Fl_Callback *)geometry_elementary_extrude_rotate_point_cb } ,
- { "Curve", (Fl_Callback *)geometry_elementary_extrude_rotate_curve_cb } ,
+ { "Line", (Fl_Callback *)geometry_elementary_extrude_rotate_line_cb } ,
{ "Surface", (Fl_Callback *)geometry_elementary_extrude_rotate_surface_cb } ,
{ NULL }
};
Context_Item menu_geometry_elementary_delete[] = {
{ "0Geometry Elementary Delete", NULL } ,
{ "Point", (Fl_Callback *)geometry_elementary_delete_point_cb } ,
- { "Curve", (Fl_Callback *)geometry_elementary_delete_curve_cb } ,
+ { "Line", (Fl_Callback *)geometry_elementary_delete_line_cb } ,
{ "Surface", (Fl_Callback *)geometry_elementary_delete_surface_cb } ,
{ NULL }
};
@@ -293,7 +293,7 @@ Context_Item menu_geometry[] = {
Context_Item menu_geometry_physical_add[] = {
{ "0Geometry Physical Add", NULL } ,
{ "Point", (Fl_Callback *)geometry_physical_add_point_cb } ,
- { "Curve", (Fl_Callback *)geometry_physical_add_curve_cb } ,
+ { "Line", (Fl_Callback *)geometry_physical_add_line_cb } ,
{ "Surface", (Fl_Callback *)geometry_physical_add_surface_cb } ,
{ "Volume", (Fl_Callback *)geometry_physical_add_volume_cb } ,
{ NULL }
@@ -1523,11 +1523,11 @@ void GUI::create_option_window()
{
Fl_Group *o = new Fl_Group(WB, WB + BH, width - 2 * WB, height - 2 * WB - BH, "Visibility");
geo_butt[0] = new Fl_Check_Button(2 * WB, 2 * WB + 1 * BH, BW / 2 - WB, BH, "Points");
- geo_butt[1] = new Fl_Check_Button(2 * WB, 2 * WB + 2 * BH, BW / 2 - WB, BH, "Curves");
+ geo_butt[1] = new Fl_Check_Button(2 * WB, 2 * WB + 2 * BH, BW / 2 - WB, BH, "Lines");
geo_butt[2] = new Fl_Check_Button(2 * WB, 2 * WB + 3 * BH, BW / 2 - WB, BH, "Surfaces");
geo_butt[3] = new Fl_Check_Button(2 * WB, 2 * WB + 4 * BH, BW / 2 - WB, BH, "Volumes");
geo_butt[4] = new Fl_Check_Button(width / 2, 2 * WB + 1 * BH, BW / 2 - WB, BH, "Point numbers");
- geo_butt[5] = new Fl_Check_Button(width / 2, 2 * WB + 2 * BH, BW / 2 - WB, BH, "Curve numbers");
+ geo_butt[5] = new Fl_Check_Button(width / 2, 2 * WB + 2 * BH, BW / 2 - WB, BH, "Line numbers");
geo_butt[6] = new Fl_Check_Button(width / 2, 2 * WB + 3 * BH, BW / 2 - WB, BH, "Surface numbers");
geo_butt[7] = new Fl_Check_Button(width / 2, 2 * WB + 4 * BH, BW / 2 - WB, BH, "Volume numbers");
for(i = 0; i < 8; i++) {
@@ -2325,14 +2325,14 @@ void GUI::create_statistics_window()
Fl_Group *o = new Fl_Group(WB, WB + BH, width - 2 * WB, height - 3 * WB - 2 * BH, "Geometry");
o->hide();
stat_value[num++] = new Fl_Output(2 * WB, 2 * WB + 1 * BH, IW, BH, "Points");
- stat_value[num++] = new Fl_Output(2 * WB, 2 * WB + 2 * BH, IW, BH, "Curves");
+ stat_value[num++] = new Fl_Output(2 * WB, 2 * WB + 2 * BH, IW, BH, "Lines");
stat_value[num++] = new Fl_Output(2 * WB, 2 * WB + 3 * BH, IW, BH, "Surfaces");
stat_value[num++] = new Fl_Output(2 * WB, 2 * WB + 4 * BH, IW, BH, "Volumes");
o->end();
}
{
Fl_Group *o = new Fl_Group(WB, WB + BH, width - 2 * WB, height - 3 * WB - 2 * BH, "Mesh");
- stat_value[num++] = new Fl_Output(2 * WB, 2 * WB + 1 * BH, IW, BH, "Nodes on curves");
+ stat_value[num++] = new Fl_Output(2 * WB, 2 * WB + 1 * BH, IW, BH, "Nodes on Lines");
stat_value[num++] = new Fl_Output(2 * WB, 2 * WB + 2 * BH, IW, BH, "Nodes on surfaces");
stat_value[num++] = new Fl_Output(2 * WB, 2 * WB + 3 * BH, IW, BH, "Nodes in volumes");
stat_value[num++] = new Fl_Output(2 * WB, 2 * WB + 4 * BH, IW, BH, "Triangles");
@@ -2752,7 +2752,7 @@ void GUI::create_visibility_window()
{"Node", 0, 0},
{"Element", 0, 0},
{"Point", 0, 0},
- {"Curve", 0, 0},
+ {"Line", 0, 0},
{"Surface", 0, 0},
{"Volume", 0, 0},
{0}