From 1694834a0b670366bcf17a1422cca3ccecb134f2 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sun, 26 Aug 2001 12:12:18 +0000
Subject: [PATCH] typos
---
Fltk/GUI.cpp | 35 +++++++++++++++++------------------
Fltk/Socket.cpp | 4 ++--
doc/VERSIONS | 4 ++--
3 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index fdc2a01e44..2fcefbd7d9 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1,4 +1,4 @@
-// $Id: GUI.cpp,v 1.110 2001-08-23 18:03:45 geuzaine Exp $
+// $Id: GUI.cpp,v 1.111 2001-08-26 12:12:18 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.
@@ -1205,38 +1205,27 @@ void GUI::create_mesh_options_window(){
o->hide();
mesh_butt[0] = new Fl_Check_Button(2*WB, 2*WB+1*BH, BW, BH, "Isotropic");
- mesh_butt[1] = new Fl_Check_Button(2*WB, 2*WB+2*BH, BW, BH, "Triangle");
+ mesh_butt[1] = new Fl_Check_Button(2*WB, 2*WB+2*BH, BW, BH, "Isotropic (Triangle)");
mesh_butt[2] = new Fl_Check_Button(2*WB, 2*WB+3*BH, BW, BH, "Anisotropic");
for(i=0 ; i<3 ; i++){
mesh_butt[i]->type(FL_RADIO_BUTTON);
- mesh_butt[i]->down_box(FL_DOWN_BOX);
mesh_butt[i]->labelsize(CTX.fontsize);
mesh_butt[i]->selection_color(FL_YELLOW);
}
- mesh_butt[3] = new Fl_Check_Button(2*WB, 2*WB+4*BH, BW, BH, "Second order elements");
- mesh_butt[3]->deactivate();//2nd order elements do not work. Disable the graphical option.
- mesh_butt[4] = new Fl_Check_Button(2*WB, 2*WB+5*BH, BW, BH, "Interactive");
- mesh_butt[5] = new Fl_Check_Button(2*WB, 2*WB+6*BH, BW, BH, "Constrained background mesh");
- for(i=3 ; i<6 ; i++){
- mesh_butt[i]->type(FL_TOGGLE_BUTTON);
- mesh_butt[i]->down_box(FL_DOWN_BOX);
- mesh_butt[i]->labelsize(CTX.fontsize);
- mesh_butt[i]->selection_color(FL_YELLOW);
- }
- mesh_value[0] = new Fl_Value_Input(2*WB, 2*WB+7*BH, IW, BH, "Number of smoothing steps");
+ mesh_value[0] = new Fl_Value_Input(2*WB, 2*WB+4*BH, IW, BH, "Number of smoothing steps");
mesh_value[0]->minimum(0);
mesh_value[0]->maximum(100);
mesh_value[0]->step(1);
- mesh_value[1] = new Fl_Value_Input(2*WB, 2*WB+8*BH, IW, BH, "Mesh scaling factor");
+ mesh_value[1] = new Fl_Value_Input(2*WB, 2*WB+5*BH, IW, BH, "Mesh scaling factor");
mesh_value[1]->minimum(0.001);
mesh_value[1]->maximum(1000);
mesh_value[1]->step(0.001);
- mesh_value[2] = new Fl_Value_Input(2*WB, 2*WB+9*BH, IW, BH, "Characteristic length factor");
+ mesh_value[2] = new Fl_Value_Input(2*WB, 2*WB+6*BH, IW, BH, "Characteristic length factor");
mesh_value[2]->minimum(0.001);
mesh_value[2]->maximum(1000);
mesh_value[2]->step(0.001);
- mesh_value[3] = new Fl_Value_Input(2*WB, 2*WB+10*BH, IW, BH, "Random perturbation factor");
+ mesh_value[3] = new Fl_Value_Input(2*WB, 2*WB+7*BH, IW, BH, "Random perturbation factor");
mesh_value[3]->minimum(1.e-6);
mesh_value[3]->maximum(1.e-1);
mesh_value[3]->step(1.e-6);
@@ -1246,6 +1235,17 @@ void GUI::create_mesh_options_window(){
mesh_value[i]->type(FL_HORIZONTAL);
mesh_value[i]->align(FL_ALIGN_RIGHT);
}
+
+ mesh_butt[3] = new Fl_Check_Button(2*WB, 2*WB+8*BH, BW, BH, "Second order elements");
+ mesh_butt[3]->deactivate();//2nd order elements do not work. Disable the graphical option.
+ mesh_butt[4] = new Fl_Check_Button(2*WB, 2*WB+9*BH, BW, BH, "Interactive");
+ mesh_butt[5] = new Fl_Check_Button(2*WB, 2*WB+10*BH, BW, BH, "Constrained background mesh");
+ for(i=3 ; i<6 ; i++){
+ mesh_butt[i]->type(FL_TOGGLE_BUTTON);
+ mesh_butt[i]->down_box(FL_DOWN_BOX);
+ mesh_butt[i]->labelsize(CTX.fontsize);
+ mesh_butt[i]->selection_color(FL_YELLOW);
+ }
o->end();
}
{
@@ -1305,7 +1305,6 @@ void GUI::create_mesh_options_window(){
mesh_butt[16] = new Fl_Check_Button(2*WB, 2*WB+3*BH, BW, BH, "Solid");
for(i=14 ; i<17 ; i++){
mesh_butt[i]->type(FL_RADIO_BUTTON);
- mesh_butt[i]->down_box(FL_DOWN_BOX);
mesh_butt[i]->labelsize(CTX.fontsize);
mesh_butt[i]->selection_color(FL_YELLOW);
}
diff --git a/Fltk/Socket.cpp b/Fltk/Socket.cpp
index 625f78ce97..f1bd75856e 100644
--- a/Fltk/Socket.cpp
+++ b/Fltk/Socket.cpp
@@ -1,4 +1,4 @@
-/* $Id: Socket.cpp,v 1.11 2001-05-21 13:01:13 geuzaine Exp $ */
+/* $Id: Socket.cpp,v 1.12 2001-08-26 12:12:18 geuzaine Exp $ */
#include <stdio.h>
#include <stdlib.h>
@@ -182,7 +182,7 @@ int Socket_Connect(char *sockname){
int len, sock;
int tries;
- /* slight delay to be sure that the socket is bind by the
+ /* slight delay to be sure that the socket is bound by the
server before we attempt to connect to it... */
Socket_Idle(0.1);
diff --git a/doc/VERSIONS b/doc/VERSIONS
index 0d81912273..dea0d7a460 100644
--- a/doc/VERSIONS
+++ b/doc/VERSIONS
@@ -1,9 +1,9 @@
-$Id: VERSIONS,v 1.60 2001-08-23 18:03:45 geuzaine Exp $
+$Id: VERSIONS,v 1.61 2001-08-26 12:12:18 geuzaine Exp $
New in 1.24: Fixed characteristic length interpolation for Splines;
Added BSplines; Integrated Jonathan Shewchuk's Triangle as an
alternative isotropic 2D mesh generator; New AngleSmoothNormals
-option;
+option; various other bug fixes, additions and clean-ups;
New in 1.23: Fixed duplicate elements generation + non-matching
tetrahedra faces in 3D extruded meshes; Better display of displacement
--
GitLab