diff --git a/Fltk/highOrderToolsWindow.cpp b/Fltk/highOrderToolsWindow.cpp
index 4181ea08b5465fc9fe53d3e5ba24309eb3c31116..5cdb9b684fb670d1e5ff6d2aa5bccb1d9401c329 100644
--- a/Fltk/highOrderToolsWindow.cpp
+++ b/Fltk/highOrderToolsWindow.cpp
@@ -41,11 +41,10 @@ typedef unsigned long intptr_t;
#include "Parser.h"
#endif
-
-static void change_completeness_cb(Fl_Widget *w, void *data){
-
+static void change_completeness_cb(Fl_Widget *w, void *data)
+{
highOrderToolsWindow *o = FlGui::instance()->highordertools;
- bool onlyVisible = (bool)o->butt[1]->value();
+ bool onlyVisible = (bool)o->butt[1]->value();
if (!o->complete){
SetHighOrderComplete (GModel::current(), onlyVisible);
o->complete = 1;
@@ -61,11 +60,11 @@ static void change_completeness_cb(Fl_Widget *w, void *data){
static void highordertools_runp_cb(Fl_Widget *w, void *data)
{
highOrderToolsWindow *o = FlGui::instance()->highordertools;
-
+
int order = (int)o->value[0]->value();
- bool linear = !(bool)o->butt[2]->value();
- bool incomplete = (bool)o->butt[0]->value();
- bool onlyVisible = (bool)o->butt[1]->value();
+ bool linear = !(bool)o->butt[2]->value();
+ bool incomplete = (bool)o->butt[0]->value();
+ bool onlyVisible = (bool)o->butt[1]->value();
if (order == 1)
SetOrder1(GModel::current());
@@ -78,304 +77,263 @@ static void highordertools_runp_cb(Fl_Widget *w, void *data)
printf ("GEntity %d of dim %d : dist %12.5E\n",it->first->tag(),it->first->dim(),it->second);
}
-
CTX::instance()->mesh.changed |= (ENT_LINE | ENT_SURFACE | ENT_VOLUME);
drawContext::global()->draw();
-
}
-static void chooseopti_cb(Fl_Widget *w, void *data){
+static void chooseopti_cb(Fl_Widget *w, void *data)
+{
highOrderToolsWindow *o = FlGui::instance()->highordertools;
- int elastic = o->choice[2]->value();
-
+ int elastic = o->choice[2]->value();
+
if (elastic == 1){
- o->choice[0]->deactivate();
- o->choice[1]->deactivate();
+ o->choice[0]->deactivate();
+ o->choice[1]->deactivate();
for (int i=3;i<=6;i++)
- o->value[i]->deactivate();
+ o->value[i]->deactivate();
// o->push[1]->deactivate();
}
else {
o->push[0]->activate();
- o->choice[0]->activate();
- o->choice[1]->activate();
+ o->choice[0]->activate();
+ o->choice[1]->activate();
for (int i=3;i<=6;i++)
- o->value[i]->activate();
+ o->value[i]->activate();
// o->push[1]->activate();
}
-
+
}
static void highordertools_runelas_cb(Fl_Widget *w, void *data)
{
highOrderToolsWindow *o = FlGui::instance()->highordertools;
-
- bool elastic = o->choice[2]->value() == 1;
- double threshold_min = o->value[1]->value();
- bool onlyVisible = (bool)o->butt[1]->value();
- int nbLayers = (int) o->value[2]->value();
- double threshold_max = o->value[8]->value();
+
+ bool elastic = o->choice[2]->value() == 1;
+ double threshold_min = o->value[1]->value();
+ bool onlyVisible = (bool)o->butt[1]->value();
+ int nbLayers = (int) o->value[2]->value();
+ double threshold_max = o->value[8]->value();
if(elastic)ElasticAnalogy(GModel::current(), threshold_min, onlyVisible);
else {
OptHomParameters p;
- p.nbLayers = nbLayers;
+ p.nbLayers = nbLayers;
p.BARRIER_MIN = threshold_min;
p.BARRIER_MAX = threshold_max;
p.onlyVisible = onlyVisible;
p.dim = GModel::current()->getDim();//o->meshOrder;
- p.itMax = (int) o->value[3]->value();
- p.weightFixed = o->value[5]->value();
- p.weightFree = o->value[6]->value();
- p.DistanceFactor = o->value[7]->value();
- p.method = o->CAD ? (int)o->choice[0]->value() : 2;
- p.filter = (int)o->choice[1]->value();
+ p.itMax = (int) o->value[3]->value();
+ p.weightFixed = o->value[5]->value();
+ p.weightFree = o->value[6]->value();
+ p.DistanceFactor = o->value[7]->value();
+ p.method = o->CAD ? (int)o->choice[0]->value() : 2;
+ p.filter = (int)o->choice[1]->value();
HighOrderMeshOptimizer (GModel::current(),p);
printf("CPU TIME = %4f seconds\n",p.CPU);
}
-
CTX::instance()->mesh.changed |= (ENT_LINE | ENT_SURFACE | ENT_VOLUME);
drawContext::global()->draw();
-
}
-
highOrderToolsWindow::highOrderToolsWindow(int deltaFontSize)
{
FL_NORMAL_SIZE -= deltaFontSize;
- static int cols[5] = {2 * WB, BB, BB, 2 * BB, 0};
- int width = cols[0] + cols[1] + cols[2] + cols[3] + 6 * WB;
+ int width = 3 * IW + 4 * WB;
int height = 23 * BH;
win = new paletteWindow
(width, height, CTX::instance()->nonModalWindows ? true : false, "High Order Tools");
win->box(GMSH_WINDOW_BOX);
- // Fl_Tabs *o = new Fl_Tabs
- // (WB, WB, width - 2 * WB, height - 3 * WB - BH);
- // {
- // Fl_Group *g = new Fl_Group
- // (WB, WB + BH, width - 2 * WB, height - 3 * WB - 2 * BH, "Check Validity");
- // g->end();
- // Fl_Group::current()->resizable(g);
- // }
- {
- // Fl_Group *g = new Fl_Group
- // (WB, WB + BH, width - 2 * WB, height - 3 * WB - 2 * BH, "Generate High Order Mesh");
-
- // int y = 3 * WB + BH;
- int y = WB;
- int x = 2*WB;
-
- output[0] = new Fl_Output
- (x,y, IW, BH, "CAD MODEL");
- output[0]->align(FL_ALIGN_RIGHT);
- output[0]->value("AVAILABLE");
-
- y += BH;
-
- butt[1] = new Fl_Check_Button
- (x,y, IW, BH, "Apply to visible entities only");
- butt[1]->type(FL_TOGGLE_BUTTON);
- butt[1]->value(1);
-
- {
- y += BH / 2;
- Fl_Box* b = new Fl_Box(x, y + BH - WB, width - 4 * WB, 2);
- b->box(FL_ENGRAVED_FRAME);
- b->labeltype(FL_NO_LABEL);
- }
-
- {
- y += BH;
- Fl_Box *b = new Fl_Box
- (x, y, width, BH, "Generate high order nodes");
- b->align(FL_ALIGN_LEFT | FL_ALIGN_INSIDE);
- }
+ int y = WB;
+ int x = 2 * WB;
- y += BH;
- value[0] = new Fl_Value_Input
- (x,y, IW, BH, "Polynomial Order");
- value[0]->minimum(1);
- value[0]->maximum(10);
- value[0]->step(1);
- value[0]->align(FL_ALIGN_RIGHT);
- value[0]->value(meshOrder);
+ butt[1] = new Fl_Check_Button
+ (x,y, 1.5*IW-WB, BH, "Apply to visible entities only");
+ butt[1]->type(FL_TOGGLE_BUTTON);
+ butt[1]->value(1);
- y += BH;
+ output[0] = new Fl_Output
+ (width/2,y, IW, BH, "CAD");
+ output[0]->align(FL_ALIGN_RIGHT);
+ output[0]->value("Available");
- butt[0] = new Fl_Check_Button
- (x,y, IW, BH, "Use Incomplete Elements");
- butt[0]->type(FL_TOGGLE_BUTTON);
- butt[0]->value(!complete);
- butt[0]->callback(change_completeness_cb);
+ {
+ y += BH / 2;
+ Fl_Box* b = new Fl_Box(x, y + BH - WB, width - 4 * WB, 2);
+ b->box(FL_ENGRAVED_FRAME);
+ b->labeltype(FL_NO_LABEL);
+ }
+ {
y += BH;
+ Fl_Box *b = new Fl_Box
+ (x - WB, y, width, BH, "1. Generation of high order nodes");
+ b->align(FL_ALIGN_LEFT | FL_ALIGN_INSIDE);
+ }
+ y += BH;
- butt[2] = new Fl_Check_Button
- (x,y, IW, BH, "Generate curvilinear elements");
- butt[2]->type(FL_TOGGLE_BUTTON);
- butt[2]->value(1);
-
- push[0] = new Fl_Button
- (x+1.9*IW, y, (int)(1.2*BB), BH, "Apply");
- push[0]->callback(highordertools_runp_cb);
+ value[0] = new Fl_Value_Input
+ (x,y, IW, BH, "Polynomial order");
+ value[0]->minimum(1);
+ value[0]->maximum(10);
+ value[0]->step(1);
+ value[0]->align(FL_ALIGN_RIGHT);
+ value[0]->value(meshOrder);
+ y += BH;
- // g->end();
- // Fl_Group::current()->resizable(g);
- // }
- // {
- // Fl_Group *g = new Fl_Group
- // (WB, WB + BH, width - 2 * WB, height - 3 * WB - 2 * BH, "Optimize");
+ butt[0] = new Fl_Check_Button
+ (x,y, 1.5*IW-WB, BH, "Use incomplete elements");
+ butt[0]->type(FL_TOGGLE_BUTTON);
+ butt[0]->value(!complete);
+ butt[0]->callback(change_completeness_cb);
+ y += BH;
- {
- y += BH / 2;
- Fl_Box* b = new Fl_Box(x, y + BH - WB, width - 4 * WB, 2);
- b->box(FL_ENGRAVED_FRAME);
- b->labeltype(FL_NO_LABEL);
- }
+ butt[2] = new Fl_Check_Button
+ (x,y, 1.5*IW-WB, BH, "Generate curvilinear elements");
+ butt[2]->type(FL_TOGGLE_BUTTON);
+ butt[2]->value(1);
- {
- y += BH;
- Fl_Box *b = new Fl_Box
- (x, y, width, BH, "Optimization");
- b->align(FL_ALIGN_LEFT | FL_ALIGN_INSIDE);
- }
- {
- y += BH;
-
- value[1] = new Fl_Value_Input
- (x,y, IW/2.0, BH);
- value[1]->minimum(0);
- value[1]->maximum(1);
- value[1]->step(.01);
- value[1]->align(FL_ALIGN_RIGHT);
- value[1]->value(0.1);
-
- value[8] = new Fl_Value_Input
- (x+IW/2.0,y, IW/2.0, BH, "Jacobian Range");
- value[8]->minimum(1);
- value[8]->maximum(10);
- value[8]->step(.01);
- value[8]->align(FL_ALIGN_RIGHT);
- value[8]->value(2);
-
- y += 1.2*BH;
- value[2] = new Fl_Value_Input
- (x,y, IW, BH, "Number of Layers");
- value[2]->minimum(1);
- value[2]->maximum(20);
- value[2]->step(1);
- value[2]->align(FL_ALIGN_RIGHT);
- value[2]->value(6);
-
- y += 1.2*BH;
- value[7] = new Fl_Value_Input
- (x,y, IW, BH, "Distance Factor");
- value[7]->minimum(1);
- value[7]->maximum(20000);
- value[7]->step(1);
- value[7]->align(FL_ALIGN_RIGHT);
- value[7]->value(12);
+ push[0] = new Fl_Button
+ (width - BB - 2 * WB, y, BB, BH, "Apply");
+ push[0]->callback(highordertools_runp_cb);
- }
- {
-
- static Fl_Menu_Item menu_method[] = {
- {"Optimization", 0, 0, 0},
- {"ElasticAnalogy", 0, 0, 0},
- {0}
- };
-
- y += BH;
- choice[2] = new Fl_Choice
- (x,y, IW, BH, "Algorithm");
- choice[2]->align(FL_ALIGN_RIGHT);
- choice[2]->menu(menu_method);
- choice[2]->callback(chooseopti_cb);
- }
- {
- static Fl_Menu_Item menu_objf[] = {
- {"CAD + FIXBND", 0, 0, 0},
- {"CAD + FREEBND", 0, 0, 0},
- {"MESH ONLY", 0, 0, 0},
- {0}
- };
-
-
- static Fl_Menu_Item menu_strategy[] = {
- {"GLOBAL", 0, 0, 0},
- {"BLOBS ", 0, 0, 0},
- {0}
- };
-
- y += BH;
- choice[0] = new Fl_Choice
- (x,y, IW, BH, "Objective Function");
- choice[0]->menu(menu_objf);
- choice[0]->align(FL_ALIGN_RIGHT);
-
-
- y += BH;
- choice[1] = new Fl_Choice
- (x,y, IW, BH, "Strategy");
- choice[1]->menu(menu_strategy);
- choice[1]->align(FL_ALIGN_RIGHT);
-
-
- y += 1.2*BH;
- value[5] = new Fl_Value_Input
- (x,y, IW, BH, "W fixed");
- value[5]->align(FL_ALIGN_RIGHT);
- value[5]->value(1.e+5);
-
- value[6] = new Fl_Value_Input
- (x+IW*1.5,y, IW, BH, "W free");
- value[6]->align(FL_ALIGN_RIGHT);
- value[6]->value(1.e+2);
-
- y += 1.2*BH;
- value[3] = new Fl_Value_Input
- (x,y, IW, BH, "Maximum nb. of Iterations");
- value[3]->minimum(1);
- value[3]->maximum(10000);
- value[3]->step(10);
- value[3]->align(FL_ALIGN_RIGHT);
- value[3]->value(300);
-
-
- y += 1.2*BH;
- value[4] = new Fl_Value_Input
- (x,y, IW, BH, "Tolerance");
- value[4]->minimum(1.e-12);
- value[4]->maximum(0.1);
- value[4]->step(1.e-5);
- value[4]->align(FL_ALIGN_RIGHT);
- value[4]->value(1.e-4);
-
- push[1] = new Fl_Button
- (x+1.9*IW, y, (int)(1.2*BB), BH, "Apply");
- push[1]->callback(highordertools_runelas_cb);
+ {
+ y += BH / 2;
+ Fl_Box* b = new Fl_Box(x, y + BH - WB, width - 4 * WB, 2);
+ b->box(FL_ENGRAVED_FRAME);
+ b->labeltype(FL_NO_LABEL);
+ }
- }
-
- y += 1.5*BH;
- messages = new Fl_Browser
- (x,y, width-2*x, height - y - 2*WB);
- messages->box(FL_THIN_DOWN_BOX);
- messages->textfont(FL_COURIER);
- messages->textsize(FL_NORMAL_SIZE - 1);
- messages->type(FL_MULTI_BROWSER);
- // messages->callback(message_browser_cb, this);
+ {
+ y += BH;
+ Fl_Box *b = new Fl_Box
+ (x - WB, y, width, BH, "2. Optimization");
+ b->align(FL_ALIGN_LEFT | FL_ALIGN_INSIDE);
}
- // win->resizable(o);
+ y += BH;
+
+ value[1] = new Fl_Value_Input
+ (x,y, IW/2.0, BH);
+ value[1]->minimum(0);
+ value[1]->maximum(1);
+ value[1]->step(.01);
+ value[1]->align(FL_ALIGN_RIGHT);
+ value[1]->value(0.1);
+
+ value[8] = new Fl_Value_Input
+ (x+IW/2.0,y, IW/2.0, BH, "Jacobian range");
+ value[8]->minimum(1);
+ value[8]->maximum(10);
+ value[8]->step(.01);
+ value[8]->align(FL_ALIGN_RIGHT);
+ value[8]->value(2);
+
+ y += BH;
+ value[2] = new Fl_Value_Input
+ (x,y, IW, BH, "Number of layers");
+ value[2]->minimum(1);
+ value[2]->maximum(20);
+ value[2]->step(1);
+ value[2]->align(FL_ALIGN_RIGHT);
+ value[2]->value(6);
+
+ y += BH;
+ value[7] = new Fl_Value_Input
+ (x,y, IW, BH, "Distance factor");
+ value[7]->minimum(1);
+ value[7]->maximum(20000);
+ value[7]->step(1);
+ value[7]->align(FL_ALIGN_RIGHT);
+ value[7]->value(12);
+
+ static Fl_Menu_Item menu_method[] = {
+ {"Optimization", 0, 0, 0},
+ {"ElasticAnalogy", 0, 0, 0},
+ {0}
+ };
+
+ y += BH;
+ choice[2] = new Fl_Choice
+ (x,y, IW, BH, "Algorithm");
+ choice[2]->align(FL_ALIGN_RIGHT);
+ choice[2]->menu(menu_method);
+ choice[2]->callback(chooseopti_cb);
+
+ static Fl_Menu_Item menu_objf[] = {
+ {"CAD + FIXBND", 0, 0, 0},
+ {"CAD + FREEBND", 0, 0, 0},
+ {"MESH ONLY", 0, 0, 0},
+ {0}
+ };
+
+ static Fl_Menu_Item menu_strategy[] = {
+ {"GLOBAL", 0, 0, 0},
+ {"BLOBS ", 0, 0, 0},
+ {0}
+ };
+
+ y += BH;
+ choice[0] = new Fl_Choice
+ (x,y, IW, BH, "Objective function");
+ choice[0]->menu(menu_objf);
+ choice[0]->align(FL_ALIGN_RIGHT);
+
+ y += BH;
+ choice[1] = new Fl_Choice
+ (x,y, IW, BH, "Strategy");
+ choice[1]->menu(menu_strategy);
+ choice[1]->align(FL_ALIGN_RIGHT);
+
+ y += BH;
+ value[5] = new Fl_Value_Input
+ (x,y, IW, BH, "W fixed");
+ value[5]->align(FL_ALIGN_RIGHT);
+ value[5]->value(1.e+5);
+
+ value[6] = new Fl_Value_Input
+ (x+IW*1.5,y, IW, BH, "W free");
+ value[6]->align(FL_ALIGN_RIGHT);
+ value[6]->value(1.e+2);
+
+ y += BH;
+ value[3] = new Fl_Value_Input
+ (x,y, IW, BH, "Maximum number of iterations");
+ value[3]->minimum(1);
+ value[3]->maximum(10000);
+ value[3]->step(10);
+ value[3]->align(FL_ALIGN_RIGHT);
+ value[3]->value(300);
+
+ y += BH;
+ value[4] = new Fl_Value_Input
+ (x,y, IW, BH, "Tolerance");
+ value[4]->minimum(1.e-12);
+ value[4]->maximum(0.1);
+ value[4]->step(1.e-5);
+ value[4]->align(FL_ALIGN_RIGHT);
+ value[4]->value(1.e-4);
+
+ push[1] = new Fl_Button
+ (width - BB - 2 * WB, y, BB, BH, "Apply");
+ push[1]->callback(highordertools_runelas_cb);
+
+ y += 1.5*BH;
+ messages = new Fl_Browser
+ (x,y, width-2*x, height - y - 2*WB);
+ messages->box(FL_THIN_DOWN_BOX);
+ messages->textfont(FL_COURIER);
+ messages->textsize(FL_NORMAL_SIZE - 1);
+ messages->type(FL_MULTI_BROWSER);
+
+ // win->resizable(o);
win->position(CTX::instance()->hotPosition[0], CTX::instance()->hotPosition[1]);
win->end();
FL_NORMAL_SIZE += deltaFontSize;
@@ -383,21 +341,22 @@ highOrderToolsWindow::highOrderToolsWindow(int deltaFontSize)
void highOrderToolsWindow::show(bool redrawOnly)
{
- getMeshInfoForHighOrder (GModel::current(),meshOrder,complete, CAD);
+ getMeshInfoForHighOrder (GModel::current(),meshOrder,complete, CAD);
if(win->shown() && redrawOnly)
win->redraw();
else {
value[0]->value(meshOrder);
butt[0]->value(!complete);
- if (CAD)output[0]->value("AVAILABLE");
+ if (CAD)output[0]->value("Available");
else {
- output[0]->value("NOT AVAILABLE");
- choice[0]->value(2);
+ output[0]->value("Not Available");
+ choice[0]->value(2);
}
win->show();
}
}
+
void highordertools_cb(Fl_Widget *w, void *data)
{
// get the visibility info from the model, and update the browser
diff --git a/Fltk/menuWindow.cpp b/Fltk/menuWindow.cpp
index 7a8e317a28b87557c35342df0a93ea56e396e518..ffd81a5f42ccc0f6cb5984efd9b1b135f9360fb8 100644
--- a/Fltk/menuWindow.cpp
+++ b/Fltk/menuWindow.cpp
@@ -2371,7 +2371,6 @@ static Fl_Menu_Item bar_table[] = {
{"&Options", FL_CTRL+FL_SHIFT+'n', (Fl_Callback *)options_cb, 0},
{"Pl&ugins", FL_CTRL+FL_SHIFT+'u', (Fl_Callback *)plugin_cb, (void*)(-1)},
{"&Visibility", FL_CTRL+FL_SHIFT+'v', (Fl_Callback *)visibility_cb, 0},
- {"&High Order Tools", FL_CTRL+FL_SHIFT+'h', (Fl_Callback *)highordertools_cb, 0},
{"&Clipping", FL_CTRL+FL_SHIFT+'c', (Fl_Callback *)clip_cb, 0},
{"&Manipulator", FL_CTRL+FL_SHIFT+'m', (Fl_Callback *)manip_cb, 0},
#if defined(HAVE_ONELAB)
@@ -2440,7 +2439,6 @@ static Fl_Menu_Item sysbar_table[] = {
{"Options", FL_META+FL_SHIFT+'n', (Fl_Callback *)options_cb, 0},
{"Plugins", FL_META+FL_SHIFT+'u', (Fl_Callback *)plugin_cb, (void*)(-1)},
{"Visibility", FL_META+FL_SHIFT+'v', (Fl_Callback *)visibility_cb, 0},
- {"&High Order Tools", FL_META+FL_SHIFT+'h', (Fl_Callback *)highordertools_cb, 0},
{"Clipping", FL_META+FL_SHIFT+'c', (Fl_Callback *)clip_cb, 0},
{"Manipulator", FL_META+FL_SHIFT+'m', (Fl_Callback *)manip_cb, 0},
#if defined(HAVE_ONELAB)
@@ -2701,6 +2699,7 @@ contextItem menu_mesh[] = {
{"3", (Fl_Callback *)mesh_degree_cb, (void*)3},
{"4", (Fl_Callback *)mesh_degree_cb, (void*)4},
{"5", (Fl_Callback *)mesh_degree_cb, (void*)5},
+ {"Optimize", (Fl_Callback *)highordertools_cb},
{""}
};