From a97dbd1407e3459af0a7dba7f052f56743b0520d Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Thu, 11 Oct 2012 07:48:49 +0000
Subject: [PATCH] work on regions
---
Common/GmshMessage.cpp | 2 +-
Common/onelabUtils.cpp | 1 -
Fltk/contextWindow.cpp | 15 +++++++----
Fltk/onelabWindow.cpp | 51 ++++++++------------------------------
Geo/GeoStringInterface.cpp | 42 +++++++++++++++++--------------
Geo/GeoStringInterface.h | 17 +++++++------
6 files changed, 53 insertions(+), 75 deletions(-)
diff --git a/Common/GmshMessage.cpp b/Common/GmshMessage.cpp
index 90103eb844..eaa2616ffd 100644
--- a/Common/GmshMessage.cpp
+++ b/Common/GmshMessage.cpp
@@ -733,7 +733,7 @@ void Msg::ExchangeOnelabParameter(const std::string &key,
bool noRange = true, noChoices = true, noLoop = true;
bool noGraph = true, noClosed = true;
if(ps.size()){
- //if(!ps[0].getReadOnly())
+ if(!ps[0].getReadOnly())
val[0] = ps[0].getValue(); // use value from server
// keep track of these attributes, which can be changed server-side
if(ps[0].getMin() != -onelab::parameter::maxNumber() ||
diff --git a/Common/onelabUtils.cpp b/Common/onelabUtils.cpp
index 25ef15b2d2..7aa2e80557 100644
--- a/Common/onelabUtils.cpp
+++ b/Common/onelabUtils.cpp
@@ -68,7 +68,6 @@ namespace onelabUtils {
}
onelab::string o("Gmsh/MshFileName", name, "Mesh name");
o.setKind("file");
- o.setAttribute("Closed", "1");
c->set(o);
return name;
}
diff --git a/Fltk/contextWindow.cpp b/Fltk/contextWindow.cpp
index 9fbf9c1ed0..ffe0fae0ca 100644
--- a/Fltk/contextWindow.cpp
+++ b/Fltk/contextWindow.cpp
@@ -18,6 +18,8 @@ static void con_geometry_define_parameter_cb(Fl_Widget *w, void *data)
{
add_param(FlGui::instance()->geoContext->input[0]->value(),
FlGui::instance()->geoContext->input[1]->value(),
+ FlGui::instance()->geoContext->input[24]->value(),
+ FlGui::instance()->geoContext->input[25]->value(),
GModel::current()->getFileName());
FlGui::instance()->resetVisibility();
}
@@ -49,7 +51,7 @@ geometryContextWindow::geometryContextWindow(int deltaFontSize)
int width = 31 * FL_NORMAL_SIZE;
int height = 4 * WB + 8 * BH;
- win = new paletteWindow(width, height, CTX::instance()->nonModalWindows ? true : false,
+ win = new paletteWindow(width, height, CTX::instance()->nonModalWindows ? true : false,
"Contextual Geometry Definitions");
win->box(GMSH_WINDOW_BOX);
{
@@ -62,9 +64,12 @@ geometryContextWindow::geometryContextWindow(int deltaFontSize)
input[0]->value("lc");
input[1] = new Fl_Input(2 * WB, 2 * WB + 2 * BH, IW, BH, "Value");
input[1]->value("0.1");
- for(int i = 0; i < 2; i++) {
- input[i]->align(FL_ALIGN_RIGHT);
- }
+ input[24] = new Fl_Input(2 * WB, 2 * WB + 3 * BH, IW, BH, "Label");
+ input[24]->value("");
+ input[25] = new Fl_Input(2 * WB, 2 * WB + 4 * BH, IW, BH, "Path");
+ input[25]->value("Gmsh/Parameters");
+ for(int i = 0; i < 2; i++) input[i]->align(FL_ALIGN_RIGHT);
+ for(int i = 24; i < 26; i++) input[i]->align(FL_ALIGN_RIGHT);
{
Fl_Return_Button *o = new Fl_Return_Button
(width - BB - 2 * WB, 2 * WB + 7 * BH, BB, BH, "Add");
@@ -251,7 +256,7 @@ meshContextWindow::meshContextWindow(int deltaFontSize)
choice[0]->align(FL_ALIGN_RIGHT);
group[1]->end();
}
-
+
// 2: Transfinite surface
{
group[2] = new Fl_Group
diff --git a/Fltk/onelabWindow.cpp b/Fltk/onelabWindow.cpp
index 3e72f8c650..7a297e8998 100644
--- a/Fltk/onelabWindow.cpp
+++ b/Fltk/onelabWindow.cpp
@@ -23,6 +23,7 @@
#include <FL/Fl_Output.H>
#include <FL/fl_ask.H>
#include "inputRange.h"
+#include "inputRegion.h"
#include "paletteWindow.h"
#include "menuWindow.h"
#include "fileDialogs.h"
@@ -544,7 +545,7 @@ void onelab_cb(Fl_Widget *w, void *data)
if(isMetamodel){
#if defined(HAVE_ONELAB_METAMODEL)
- if(metamodel(action))
+ if(metamodel(action))
geometry_reload_cb(0, 0);
#endif
}
@@ -983,37 +984,6 @@ Fl_Widget *onelabWindow::_addParameterWidget(onelab::string &p, Fl_Tree_Item *n,
return but;
}
-static std::string _set2string(const std::set<std::string> &s)
-{
- std::string out;
- for(std::set<std::string>::const_iterator it = s.begin(); it != s.end(); it++){
- if(it != s.begin()) out += ", ";
- out += *it;
- }
- return out;
-}
-
-static std::string trim(const std::string &str, const std::string& white=" ")
-{
- size_t beg = str.find_first_not_of(white);
- if(beg == std::string::npos) return "";
- size_t end = str.find_last_not_of(white);
- return str.substr(beg, end - beg + 1);
-}
-
-static std::set<std::string> _string2set(const std::string &s)
-{
- std::set<std::string> out;
- std::string::size_type first = 0;
- while(1){
- std::string str = trim(onelab::parameter::getNextToken(s, first, ','));
- //str.erase(std::remove(str.begin(), str.end(), ' '), str.end());
- if(str.empty()) break;
- out.insert(str);
- }
- return out;
-}
-
static void onelab_region_input_cb(Fl_Widget *w, void *data)
{
if(!data) return;
@@ -1021,8 +991,8 @@ static void onelab_region_input_cb(Fl_Widget *w, void *data)
std::vector<onelab::region> regions;
onelab::server::instance()->get(regions, name);
if(regions.size()){
- Fl_Input *o = (Fl_Input*)w;
- regions[0].setValue(_string2set(o->value()));
+ inputRegion *o = (inputRegion*)w;
+ regions[0].setValue(o->value());
onelab::server::instance()->set(regions[0]);
}
}
@@ -1032,16 +1002,15 @@ Fl_Widget *onelabWindow::_addParameterWidget(onelab::region &p, Fl_Tree_Item *n,
{
// non-editable value
if(p.getReadOnly()){
- Fl_Output *but = new Fl_Output(1, 1, _itemWidth, 1);
- but->value(_set2string(p.getValue()).c_str());
+ inputRegion *but = new inputRegion(1, 1, _itemWidth, 1, true);
+ but->value(p.getValue());
but->align(FL_ALIGN_RIGHT);
if(highlight) but->color(c);
return but;
}
- // general group input -- will be improved :-)
- Fl_Input *but = new Fl_Input(1, 1, _itemWidth, 1);
- but->value(_set2string(p.getValue()).c_str());
+ inputRegion *but = new inputRegion(1, 1, _itemWidth, 1, false);
+ but->value(p.getValue());
but->align(FL_ALIGN_RIGHT);
but->callback(onelab_region_input_cb, (void*)n);
if(highlight) but->color(c);
@@ -1052,13 +1021,13 @@ Fl_Widget *onelabWindow::_addParameterWidget(onelab::function &p, Fl_Tree_Item *
bool highlight, Fl_Color c)
{
// non-editable value
- //if(p.getReadOnly()){
+ if(1 || p.getReadOnly()){
Fl_Output *but = new Fl_Output(1, 1, _itemWidth, 1);
but->value("TODO function");
but->align(FL_ALIGN_RIGHT);
if(highlight) but->color(c);
return but;
- //}
+ }
}
void onelabWindow::rebuildTree()
diff --git a/Geo/GeoStringInterface.cpp b/Geo/GeoStringInterface.cpp
index 48eeb5fd8c..32f7c9f134 100644
--- a/Geo/GeoStringInterface.cpp
+++ b/Geo/GeoStringInterface.cpp
@@ -27,14 +27,14 @@ void add_infile(std::string text, std::string fileName, bool forceDestroy)
std::vector<std::string> split = SplitFileName(fileName);
if(split[2].size() && split[2] != ".geo" && split[2] != ".GEO"){
std::ostringstream sstream;
- sstream <<
+ sstream <<
"A scripting command is going to be appended to a non-`.geo' file. Are\n"
"you sure you want to proceed?\n\n"
"You probably want to create a new `.geo' file containing the command\n"
"`Merge \"" << split[1] + split[2] << "\";' and use that file instead.\n\n"
"(To disable this warning in the future, select `Enable expert mode'\n"
"in the option dialog.)";
- int ret = Msg::GetAnswer(sstream.str().c_str(), 2, "Cancel", "Proceed as is",
+ int ret = Msg::GetAnswer(sstream.str().c_str(), 2, "Cancel", "Proceed as is",
"Create new `.geo' file");
if(ret == 2){
std::string newFileName = split[0] + split[1] + ".geo";
@@ -137,7 +137,7 @@ void add_recosurf(List_T *list, std::string fileName)
add_infile(sstream.str(), fileName);
}
-void add_trsfline(std::vector<int> &l, std::string fileName, std::string type,
+void add_trsfline(std::vector<int> &l, std::string fileName, std::string type,
std::string typearg, std::string pts)
{
std::ostringstream sstream;
@@ -194,10 +194,14 @@ void add_embedded(std::string what, std::vector<int> &l, std::string fileName)
add_infile(sstream.str(), fileName, true);
}
-void add_param(std::string par, std::string value, std::string fileName)
+void add_param(std::string par, std::string value, std::string label,
+ std::string path, std::string fileName)
{
std::ostringstream sstream;
- sstream << par << " = " << value << ";";
+ sstream << "DefineConstant[ " << par << " = { " << value;
+ if(label.size()) sstream << ", Label \"" << label << "\"";
+ if(path.size()) sstream << ", Path \"" << path << "\"";
+ sstream << "}];";
add_infile(sstream.str(), fileName);
}
@@ -205,18 +209,18 @@ void add_point(std::string fileName, std::string x, std::string y,
std::string z, std::string lc)
{
std::ostringstream sstream;
- sstream << "Point(" << NEWPOINT() << ") = {" << x << ", " << y << ", "
+ sstream << "Point(" << NEWPOINT() << ") = {" << x << ", " << y << ", "
<< z ;
if(lc.size()) sstream << ", " << lc;
sstream << "};";
add_infile(sstream.str(), fileName);
}
-void add_field_option(int field_id, std::string option_name,
+void add_field_option(int field_id, std::string option_name,
std::string option_value, std::string fileName)
{
std::ostringstream sstream;
- sstream << "Field[" << field_id << "]." << option_name << " = "
+ sstream << "Field[" << field_id << "]." << option_name << " = "
<< option_value << ";";
add_infile(sstream.str(), fileName);
}
@@ -281,7 +285,7 @@ void add_lineloop(List_T *list, std::string fileName, int *numloop)
void add_surf(std::string type, List_T *list, std::string fileName)
{
- std::ostringstream sstream;
+ std::ostringstream sstream;
sstream << type << "(" << NEWSURFACE() << ") = {" << list2string(list) << "};";
add_infile(sstream.str(), fileName);
}
@@ -305,7 +309,7 @@ void add_vol(List_T *list, std::string fileName)
void add_physical(std::string type, List_T *list, std::string fileName)
{
std::ostringstream sstream;
- sstream << "Physical " << type << "(" << NEWPHYSICAL() << ") = {"
+ sstream << "Physical " << type << "(" << NEWPHYSICAL() << ") = {"
<< list2string(list) << "};";
add_infile(sstream.str(), fileName);
}
@@ -315,15 +319,15 @@ void add_compound(std::string type, List_T *list, std::string fileName)
std::ostringstream sstream;
if(SplitFileName(fileName)[2] != ".geo") sstream << "CreateTopology;\n";
if (type == "Surface"){
- sstream << "Compound " << type << "(" << NEWSURFACE()+1000 << ") = {"
+ sstream << "Compound " << type << "(" << NEWSURFACE()+1000 << ") = {"
<< list2string(list) << "};";
}
else if (type == "Line"){
- sstream << "Compound " << type << "(" << NEWLINE()+1000 << ") = {"
+ sstream << "Compound " << type << "(" << NEWLINE()+1000 << ") = {"
<< list2string(list) << "};";
}
else{
- sstream << "Compound " << type << "(" << NEWREG() << ") = {"
+ sstream << "Compound " << type << "(" << NEWREG() << ") = {"
<< list2string(list) << "};";
}
add_infile(sstream.str(), fileName);
@@ -341,12 +345,12 @@ void translate(int add, List_T *list, std::string fileName, std::string what,
add_infile(sstream.str(), fileName);
}
-void rotate(int add, List_T *list, std::string fileName, std::string what,
+void rotate(int add, List_T *list, std::string fileName, std::string what,
std::string ax, std::string ay, std::string az,
std::string px, std::string py, std::string pz, std::string angle)
{
std::ostringstream sstream;
- sstream << "Rotate {{" << ax << ", " << ay << ", " << az << "}, {"
+ sstream << "Rotate {{" << ax << ", " << ay << ", " << az << "}, {"
<< px << ", " << py << ", " << pz << "}, " << angle << "} {\n ";
if(add) sstream << "Duplicata { ";
sstream << what << "{" << list2string(list) << "};";
@@ -379,21 +383,21 @@ void symmetry(int add, List_T *list, std::string fileName, std::string what,
add_infile(sstream.str(), fileName);
}
-void extrude(List_T *list, std::string fileName, std::string what,
+void extrude(List_T *list, std::string fileName, std::string what,
std::string tx, std::string ty, std::string tz)
{
std::ostringstream sstream;
- sstream << "Extrude {" << tx << ", " << ty << ", " << tz << "} {\n " << what
+ sstream << "Extrude {" << tx << ", " << ty << ", " << tz << "} {\n " << what
<< "{" << list2string(list) << "};\n}";
add_infile(sstream.str(), fileName);
}
-void protude(List_T *list, std::string fileName, std::string what,
+void protude(List_T *list, std::string fileName, std::string what,
std::string ax, std::string ay, std::string az,
std::string px, std::string py, std::string pz, std::string angle)
{
std::ostringstream sstream;
- sstream << "Extrude {{" << ax << ", " << ay << ", " << az << "}, {"
+ sstream << "Extrude {{" << ax << ", " << ay << ", " << az << "}, {"
<< px << ", " << py << ", " << pz << "}, " << angle << "} {\n "
<< what << "{" << list2string(list) << "};\n}";
add_infile(sstream.str(), fileName);
diff --git a/Geo/GeoStringInterface.h b/Geo/GeoStringInterface.h
index 9416216fbc..25a49d1983 100644
--- a/Geo/GeoStringInterface.h
+++ b/Geo/GeoStringInterface.h
@@ -15,13 +15,14 @@ void delet(List_T *list, std::string fileName, std::string what);
void add_infile(std::string text, std::string fileName, bool deleted_something=false);
void add_charlength(List_T *list, std::string fileName, std::string lc);
void add_recosurf(List_T *list, std::string fileName);
-void add_trsfline(std::vector<int> &l, std::string fileName, std::string type,
+void add_trsfline(std::vector<int> &l, std::string fileName, std::string type,
std::string typearg, std::string pts);
void add_trsfsurf(std::vector<int> &l, std::string fileName, std::string dir);
void add_trsfvol(std::vector<int> &l, std::string fileName);
void add_embedded(std::string what, std::vector<int> &l, std::string fileName);
-void add_param(std::string par, std::string value, std::string fileName);
-void add_point(std::string fileName, std::string x, std::string y, std::string z,
+void add_param(std::string par, std::string value, std::string label,
+ std::string path, std::string fileName);
+void add_point(std::string fileName, std::string x, std::string y, std::string z,
std::string lc);
void add_multline(std::string type, std::vector<int> &p, std::string fileName);
void add_circ(int p1, int p2, int p3, std::string fileName);
@@ -39,17 +40,17 @@ void add_physical(std::string type, List_T *list, std::string fileName);
void add_compound(std::string type, List_T *list, std::string fileName);
void translate(int add, List_T *list, std::string fileName, std::string what,
std::string tx, std::string ty, std::string tz);
-void rotate(int add, List_T *list, std::string fileName, std::string what,
+void rotate(int add, List_T *list, std::string fileName, std::string what,
std::string ax, std::string ay, std::string az,
std::string px, std::string py, std::string pz, std::string angle);
void dilate(int add, List_T *list, std::string fileName, std::string what,
std::string dx, std::string dy, std::string dz, std::string df);
-void symmetry(int add, List_T *list, std::string fileName, std::string what,
+void symmetry(int add, List_T *list, std::string fileName, std::string what,
std::string sa, std::string sb, std::string sc, std::string sd);
-void extrude(List_T *list, std::string fileName, std::string what, std::string tx,
+void extrude(List_T *list, std::string fileName, std::string what, std::string tx,
std::string ty, std::string tz);
-void protude(List_T *list, std::string fileName, std::string what,
- std::string ax, std::string ay, std::string az,
+void protude(List_T *list, std::string fileName, std::string what,
+ std::string ax, std::string ay, std::string az,
std::string px, std::string py, std::string pz, std::string angle);
void split_edge(int edge_id, List_T *vertices, std::string fileName);
--
GitLab