From a2cce52f39bc4bcc3e37932e403efae59cfa95fc Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Tue, 6 Jan 2009 11:13:01 +0000
Subject: [PATCH] field tweaks
---
Fltk/fieldWindow.cpp | 19 +++++++------------
Mesh/Field.cpp | 3 +++
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/Fltk/fieldWindow.cpp b/Fltk/fieldWindow.cpp
index 3d19f96190..3fadaa0e30 100644
--- a/Fltk/fieldWindow.cpp
+++ b/Fltk/fieldWindow.cpp
@@ -66,16 +66,11 @@ static void field_put_on_view_cb(Fl_Widget *w, void *data)
{
Fl_Menu_Button* mb = ((Fl_Menu_Button*)w);
Field *field = (Field*)GUI::instance()->fields->editor_group->user_data();
- int iView;
- if(sscanf(mb->text(), "View [%i]", &iView)){
- if(iView < (int)PView::list.size()){
- field->put_on_view(PView::list[iView]);
- }
- }
- else{
+ if(mb->value() == 0)
field->put_on_new_view();
- GUI::instance()->updateViews();
- }
+ else if(mb->value() - 1 < PView::list.size())
+ field->put_on_view(PView::list[mb->value() - 1]);
+ GUI::instance()->updateViews();
Draw();
}
@@ -120,7 +115,7 @@ fieldWindow::fieldWindow(int deltaFontSize) : _deltaFontSize(deltaFontSize)
delete_btn->callback(field_delete_cb, this);
y += BH;
- put_on_view_btn = new Fl_Menu_Button(x, y, w, BH, "Put on view");
+ put_on_view_btn = new Fl_Menu_Button(x, y, w, BH, "Visualize");
put_on_view_btn->callback(field_put_on_view_cb, this);
x += w + WB;
@@ -183,11 +178,11 @@ fieldWindow::fieldWindow(int deltaFontSize) : _deltaFontSize(deltaFontSize)
void fieldWindow::loadFieldViewList()
{
put_on_view_btn->clear();
- put_on_view_btn->add("New view");
+ put_on_view_btn->add("Create new View");
put_on_view_btn->activate();
for(unsigned int i = 0; i < PView::list.size(); i++) {
std::ostringstream s;
- s << "View [" << i << "]";
+ s << "Put on View [" << i << "]";
put_on_view_btn->add(s.str().c_str());
}
}
diff --git a/Mesh/Field.cpp b/Mesh/Field.cpp
index f95bc613ea..0bbaff8b35 100644
--- a/Mesh/Field.cpp
+++ b/Mesh/Field.cpp
@@ -1340,6 +1340,9 @@ void Field::put_on_view(PView *view, int comp)
}
}
}
+ std::ostringstream oss;
+ oss << "Field " << id;
+ data->setName(oss.str());
data->finalize();
view->setChanged(true);
}
--
GitLab