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

improve labels

parent 12c38ad9
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
CHANGELOG.txt
+ 2
− 2
View file @ 6428e493
4.11.0 (Work-in-progress): improved copying ("Duplicata") of mutiple shapes with
OCC; small bug fixes.
4.11.0 (Work-in-progress): improved copying ("Duplicata") of multiple shapes
with OCC; small bug fixes.
* Incompatible API changes: new argument to mesh/computeHomology; new optional
arguments to occ/addThruSections
......
doc/texinfo/opt_general.texi
+ 3
− 3
View file @ 6428e493
......@@ -38,12 +38,12 @@ Saved in: @code{General.OptionsFileName}
@item General.BuildInfo
Gmsh build information (read-only)@*
Default value: @code{"Version: 4.10.4-git-7987ac173; License: GNU General Public License; Build OS: MacOSX-sdk; Build date: 20220613; Build host: MacBook-Pro-Christophe.local; Build options: 64Bit ALGLIB[contrib] ANN[contrib] Bamg Blossom Cairo Cgns DIntegration Dlopen DomHex Eigen[contrib] Fltk GMP Gmm[contrib] Hxt Jpeg Kbipack MathEx[contrib] Med Mesh Metis[contrib] Mmg Mpeg Netgen ONELAB ONELABMetamodel OpenCASCADE OpenCASCADE-CAF OpenGL OpenMP OptHom Parasolid ParasolidSTEP Parser Plugins Png Post QuadMeshingTools QuadTri Solver TetGen/BR TouchBar Voro++[contrib] WinslowUntangler Zlib; FLTK version: 1.4.0; OCC version: 7.7.0; MED version: 4.1.1; Packaged by: geuzaine; Web site: https://gmsh.info; Issue tracker: https://gitlab.onelab.info/gmsh/gmsh/issues"}@*
Default value: @code{"Version: 4.11.0-git-86b3a8b39; License: GNU General Public License; Build OS: MacOSX-sdk; Build date: 20220701; Build host: MBP-Christophe; Build options: 64Bit ALGLIB[contrib] ANN[contrib] Bamg Blas[petsc] Blossom Cairo Cgns DIntegration Dlopen DomHex Eigen[contrib] Fltk GMP Gmm[contrib] Hxt Jpeg Kbipack Lapack[petsc] MathEx[contrib] Med Mesh Metis[contrib] Mmg Mpeg Netgen ONELAB ONELABMetamodel OpenCASCADE OpenCASCADE-CAF OpenGL OpenMP OptHom PETSc Parasolid ParasolidSTEP Parser Plugins Png Post QuadMeshingTools QuadTri Solver TetGen/BR TouchBar Voro++[contrib] WinslowUntangler Zlib; FLTK version: 1.4.0; PETSc version: 3.16.3 (complex arithmtic); OCC version: 7.7.0; MED version: 4.1.1; Packaged by: geuzaine; Web site: https://gmsh.info; Issue tracker: https://gitlab.onelab.info/gmsh/gmsh/issues"}@*
Saved in: @code{-}
@item General.BuildOptions
Gmsh build options (read-only)@*
Default value: @code{"64Bit ALGLIB[contrib] ANN[contrib] Bamg Blossom Cairo Cgns DIntegration Dlopen DomHex Eigen[contrib] Fltk GMP Gmm[contrib] Hxt Jpeg Kbipack MathEx[contrib] Med Mesh Metis[contrib] Mmg Mpeg Netgen ONELAB ONELABMetamodel OpenCASCADE OpenCASCADE-CAF OpenGL OpenMP OptHom Parasolid ParasolidSTEP Parser Plugins Png Post QuadMeshingTools QuadTri Solver TetGen/BR TouchBar Voro++[contrib] WinslowUntangler Zlib"}@*
Default value: @code{"64Bit ALGLIB[contrib] ANN[contrib] Bamg Blas[petsc] Blossom Cairo Cgns DIntegration Dlopen DomHex Eigen[contrib] Fltk GMP Gmm[contrib] Hxt Jpeg Kbipack Lapack[petsc] MathEx[contrib] Med Mesh Metis[contrib] Mmg Mpeg Netgen ONELAB ONELABMetamodel OpenCASCADE OpenCASCADE-CAF OpenGL OpenMP OptHom PETSc Parasolid ParasolidSTEP Parser Plugins Png Post QuadMeshingTools QuadTri Solver TetGen/BR TouchBar Voro++[contrib] WinslowUntangler Zlib"}@*
Saved in: @code{-}
@item General.DefaultFileName
......@@ -168,7 +168,7 @@ Saved in: @code{General.SessionFileName}
@item General.Version
Gmsh version (read-only)@*
Default value: @code{"4.10.4-git-7987ac173"}@*
Default value: @code{"4.11.0-git-86b3a8b39"}@*
Saved in: @code{-}
@item General.WatchFilePattern
......
src/fltk/clippingWindow.cpp
+ 7
− 6
View file @ 6428e493
......@@ -225,6 +225,7 @@ clippingWindow::clippingWindow(int deltaFontSize)
for(int j = 0; j < 4; j++) {
plane[j]->align(FL_ALIGN_RIGHT);
plane[j]->callback(clip_update_cb);
plane[j]->tooltip("A * X + B * Y + C * Z + D = 0");
}
group[0]->end();
......@@ -236,12 +237,12 @@ clippingWindow::clippingWindow(int deltaFontSize)
int w2 = (width - L - 4 * WB) / 2;
int BW = w2 - 2 * FL_NORMAL_SIZE;
box[0] = new Fl_Value_Input(L + 2 * WB, 2 * WB + 1 * BH, BW, BH, "Cx");
box[1] = new Fl_Value_Input(L + 2 * WB, 2 * WB + 2 * BH, BW, BH, "Cy");
box[2] = new Fl_Value_Input(L + 2 * WB, 2 * WB + 3 * BH, BW, BH, "Cz");
box[3] = new Fl_Value_Input(L + 2 * WB + w2, 2 * WB + 1 * BH, BW, BH, "Wx");
box[4] = new Fl_Value_Input(L + 2 * WB + w2, 2 * WB + 2 * BH, BW, BH, "Wy");
box[5] = new Fl_Value_Input(L + 2 * WB + w2, 2 * WB + 3 * BH, BW, BH, "Wz");
box[0] = new Fl_Value_Input(L + 2 * WB, 2 * WB + 1 * BH, BW, BH, "X");
box[1] = new Fl_Value_Input(L + 2 * WB, 2 * WB + 2 * BH, BW, BH, "Y");
box[2] = new Fl_Value_Input(L + 2 * WB, 2 * WB + 3 * BH, BW, BH, "Z");
box[3] = new Fl_Value_Input(L + 2 * WB + w2, 2 * WB + 1 * BH, BW, BH, "DX");
box[4] = new Fl_Value_Input(L + 2 * WB + w2, 2 * WB + 2 * BH, BW, BH, "DY");
box[5] = new Fl_Value_Input(L + 2 * WB + w2, 2 * WB + 3 * BH, BW, BH, "DZ");
for(int i = 0; i < 6; i++) {
box[i]->align(FL_ALIGN_RIGHT);
box[i]->callback(clip_update_cb);
......
src/fltk/contextWindow.cpp
+ 15
− 12
View file @ 6428e493
......@@ -1370,7 +1370,7 @@ transformContextWindow::transformContextWindow(int deltaFontSize)
{
FL_NORMAL_SIZE -= deltaFontSize;
int width = 34 * FL_NORMAL_SIZE;
int width = 36 * FL_NORMAL_SIZE;
int height = 5 * WB + 10 * BH;
win = new paletteWindow(width, height,
......@@ -1415,13 +1415,13 @@ transformContextWindow::transformContextWindow(int deltaFontSize)
input[5] = new Fl_Input(2 * WB, 2 * WB + 3 * BH, IW, BH, "Axis point Z");
input[5]->value("0");
input[6] =
new Fl_Input(width / 2 + 2 * WB, 2 * WB + 1 * BH, IW, BH, "Axis DX");
new Fl_Input(width / 2 + 2 * WB, 2 * WB + 1 * BH, IW/2, BH, "Axis direction DX");
input[6]->value("0");
input[7] =
new Fl_Input(width / 2 + 2 * WB, 2 * WB + 2 * BH, IW, BH, "Axis DY");
new Fl_Input(width / 2 + 2 * WB, 2 * WB + 2 * BH, IW/2, BH, "Axis direction DY");
input[7]->value("1");
input[8] =
new Fl_Input(width / 2 + 2 * WB, 2 * WB + 3 * BH, IW, BH, "Axis DZ");
new Fl_Input(width / 2 + 2 * WB, 2 * WB + 3 * BH, IW/2, BH, "Axis direction DZ");
input[8]->value("0");
input[9] = new Fl_Input(2 * WB, 2 * WB + 4 * BH, IW, BH, "Angle");
input[9]->value("Pi/4");
......@@ -1450,11 +1450,11 @@ transformContextWindow::transformContextWindow(int deltaFontSize)
input[11]->value("0");
input[12] = new Fl_Input(2 * WB, 2 * WB + 3 * BH, IW, BH, "Center Z");
input[12]->value("0");
input[13] = new Fl_Input(2 * WB, 2 * WB + 4 * BH, IW, BH, "Scale X");
input[13] = new Fl_Input(2 * WB, 2 * WB + 4 * BH, IW, BH, "Scaling X");
input[13]->value("0.5");
input[14] = new Fl_Input(2 * WB, 2 * WB + 5 * BH, IW, BH, "Scale Y");
input[14] = new Fl_Input(2 * WB, 2 * WB + 5 * BH, IW, BH, "Scaling Y");
input[14]->value("0.5");
input[15] = new Fl_Input(2 * WB, 2 * WB + 6 * BH, IW, BH, "Scale Z");
input[15] = new Fl_Input(2 * WB, 2 * WB + 6 * BH, IW, BH, "Scaling Z");
input[15]->value("0.5");
for(int i = 10; i < 16; i++) { input[i]->align(FL_ALIGN_RIGHT); }
butt[2] = new Fl_Check_Button(2 * WB, 2 * WB + 7 * BH, width - 4 * WB, BH,
......@@ -1466,15 +1466,18 @@ transformContextWindow::transformContextWindow(int deltaFontSize)
{
group[3] = new Fl_Group(WB, WB + BH, width - 2 * WB, height - 2 * WB - BH,
"Symmetry");
input[16] = new Fl_Input(2 * WB, 2 * WB + 1 * BH, IW, BH, "Plane A");
input[16] = new Fl_Input(2 * WB, 2 * WB + 1 * BH, IW, BH, "Symmetry plane coefficient A");
input[16]->value("1");
input[17] = new Fl_Input(2 * WB, 2 * WB + 2 * BH, IW, BH, "Plane B");
input[17] = new Fl_Input(2 * WB, 2 * WB + 2 * BH, IW, BH, "Symmetry plane coefficient B");
input[17]->value("0");
input[18] = new Fl_Input(2 * WB, 2 * WB + 3 * BH, IW, BH, "Plane C");
input[18] = new Fl_Input(2 * WB, 2 * WB + 3 * BH, IW, BH, "Symmetry plane coefficient C");
input[18]->value("0");
input[19] = new Fl_Input(2 * WB, 2 * WB + 4 * BH, IW, BH, "Plane D");
input[19] = new Fl_Input(2 * WB, 2 * WB + 4 * BH, IW, BH, "Symmetry plane coefficient D");
input[19]->value("1");
for(int i = 16; i < 20; i++) { input[i]->align(FL_ALIGN_RIGHT); }
for(int i = 16; i < 20; i++) {
input[i]->align(FL_ALIGN_RIGHT);
input[i]->tooltip("A * X + B * Y + C * Z + D = 0");
}
butt[3] = new Fl_Check_Button(2 * WB, 2 * WB + 5 * BH, width - 4 * WB, BH,
"Apply symmetry on copy");
butt[3]->value(0);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment