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

fix the fix

parent a79fbe17
No related branches found
No related tags found
No related merge requests found
...@@ -804,6 +804,7 @@ void Msg::ImportPhysicalsAsOnelabRegions() ...@@ -804,6 +804,7 @@ void Msg::ImportPhysicalsAsOnelabRegions()
((dim == 3) ? "Volume" : (dim == 2) ? "Surface" : ((dim == 3) ? "Volume" : (dim == 2) ? "Surface" :
(dim == 1) ? "Line" : "Point") + num.str(); (dim == 1) ? "Line" : "Point") + num.str();
name.insert(0, "Gmsh/Physical groups/"); name.insert(0, "Gmsh/Physical groups/");
/*
std::vector<onelab::region> regions; std::vector<onelab::region> regions;
std::set<std::string> val; std::set<std::string> val;
val.insert(num.str()); val.insert(num.str());
...@@ -816,12 +817,12 @@ void Msg::ImportPhysicalsAsOnelabRegions() ...@@ -816,12 +817,12 @@ void Msg::ImportPhysicalsAsOnelabRegions()
regions[0].setAttribute("Closed", "1"); regions[0].setAttribute("Closed", "1");
_onelabClient->set(regions[0]); _onelabClient->set(regions[0]);
} }
*/
// onelab::region p(name, num.str()); onelab::region p(name, num.str());
// p.setDimension(dim); p.setDimension(dim);
// p.setReadOnly(true); p.setReadOnly(true);
// p.setAttribute("Closed", "1"); p.setAttribute("Closed", "1");
// _onelabClient->set(p); _onelabClient->set(p);
} }
} }
} }
......
...@@ -441,15 +441,12 @@ namespace onelab{ ...@@ -441,15 +441,12 @@ namespace onelab{
region(const std::string &name="", region(const std::string &name="",
const std::set<std::string> &value = std::set<std::string>(), const std::set<std::string> &value = std::set<std::string>(),
const std::string &label="", const std::string &help="") const std::string &label="", const std::string &help="")
: parameter(name, label, help), _value(value), _dimension(-1) { : parameter(name, label, help), _value(value), _dimension(-1) {}
setChanged(false); // FIXME
}
region(const std::string &name, const std::string &value, region(const std::string &name, const std::string &value,
const std::string &label="", const std::string &help="") const std::string &label="", const std::string &help="")
: parameter(name, label, help), _dimension(-1) : parameter(name, label, help), _dimension(-1)
{ {
if(value.size()) _value.insert(value); if(value.size()) _value.insert(value);
setChanged(false); // FIXME
} }
void setValue(const std::set<std::string> &value){ _value = value; } void setValue(const std::set<std::string> &value){ _value = value; }
void setDimension(int dim){ _dimension = dim; } void setDimension(int dim){ _dimension = dim; }
...@@ -477,7 +474,6 @@ namespace onelab{ ...@@ -477,7 +474,6 @@ namespace onelab{
} }
setDimension(p.getDimension()); setDimension(p.getDimension());
setChoices(p.getChoices()); setChoices(p.getChoices());
setChanged(false); // FIXME
} }
std::string toChar() const std::string toChar() const
{ {
......
...@@ -658,7 +658,7 @@ onelabWindow::onelabWindow(int deltaFontSize) ...@@ -658,7 +658,7 @@ onelabWindow::onelabWindow(int deltaFontSize)
_tree->connectorstyle(FL_TREE_CONNECTOR_SOLID); _tree->connectorstyle(FL_TREE_CONNECTOR_SOLID);
_tree->showroot(0); _tree->showroot(0);
_itemWidth = (int)(0.5 * _tree->w()); _itemWidth = (int)(0.4 * _tree->w());
_butt[0] = new Fl_Button(width - 2*WB - 2*BB, height - WB - BH, BB, BH, "Check"); _butt[0] = new Fl_Button(width - 2*WB - 2*BB, height - WB - BH, BB, BH, "Check");
_butt[0]->callback(onelab_cb, (void*)"check"); _butt[0]->callback(onelab_cb, (void*)"check");
...@@ -1021,7 +1021,7 @@ void onelabWindow::rebuildTree() ...@@ -1021,7 +1021,7 @@ void onelabWindow::rebuildTree()
{ {
FL_NORMAL_SIZE -= _deltaFontSize; FL_NORMAL_SIZE -= _deltaFontSize;
_itemWidth = (int)(0.45 * _tree->w()); _itemWidth = (int)(0.4 * _tree->w());
std::set<std::string> closed; std::set<std::string> closed;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment