diff --git a/Fltk/Colorbar_Window.cpp b/Fltk/Colorbar_Window.cpp index db18e239c34ae7b7c119eff510a7c74427a20735..65b58c22056974c4e7fd035965d9e8f0a1ed1a67 100644 --- a/Fltk/Colorbar_Window.cpp +++ b/Fltk/Colorbar_Window.cpp @@ -1,4 +1,4 @@ -// $Id: Colorbar_Window.cpp,v 1.4 2001-02-03 13:10:26 geuzaine Exp $ +// $Id: Colorbar_Window.cpp,v 1.5 2001-02-03 15:55:18 geuzaine Exp $ #include "Gmsh.h" #include "GmshUI.h" @@ -320,9 +320,11 @@ void Colorbar_Window::draw(){ // Update -void Colorbar_Window::update(char *name, float min, float max, ColorTable *table){ - label = name; - ct = table; +void Colorbar_Window::update(char *name, float min, float max, + ColorTable *table, int *changed){ + label = name; + ct = table; + viewchanged = changed; minval = min; maxval = max; redraw(); @@ -460,6 +462,7 @@ int Colorbar_Window::handle(int event){ if(compute){ ColorTable_Recompute(ct, 1, 1); draw(); + *viewchanged = 1; } // discard the event for other uses return 1; @@ -532,6 +535,8 @@ int Colorbar_Window::handle(int event){ else { // changing color graph int a, b, value; + + *viewchanged = 1; value = y_to_intensity(ypos); diff --git a/Fltk/Colorbar_Window.h b/Fltk/Colorbar_Window.h index 434b0a90e3a887091b409eabb9028b5295b138f3..d74ca3e9189dbe142bdbd42f92f995c778212fb3 100644 --- a/Fltk/Colorbar_Window.h +++ b/Fltk/Colorbar_Window.h @@ -10,8 +10,8 @@ class Colorbar_Window : public Fl_Window { // new int x_to_index(int x); int index_to_x(int index); - int intensity_to_y(int intensity); int y_to_intensity(int y); + int intensity_to_y(int intensity); void redraw_range(int a, int b); void redraw_marker(); @@ -25,12 +25,13 @@ class Colorbar_Window : public Fl_Window { int help_flag; // if nonzero, print help message int marker_pos; // position of marker as index into table - ColorTable *ct; // pointer to the color table (allocated in Post_View) + ColorTable *ct; // pointer to the color table (allocated in Post_View) + int *viewchanged;// pointer to changed bit in view public: Colorbar_Window(int x,int y,int w,int h,const char *l=0); - void update(char *name, float min, float max, ColorTable *ct); + void update(char *name, float min, float max, ColorTable *ct, int *changed); }; diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp index 8d86734bce9589f812a077935f03a240cf854e68..0f51ee53d2e694d8d4746b35f4d570a503aebe19 100644 --- a/Fltk/GUI.cpp +++ b/Fltk/GUI.cpp @@ -1,4 +1,4 @@ -// $Id: GUI.cpp,v 1.33 2001-02-03 14:03:46 geuzaine Exp $ +// $Id: GUI.cpp,v 1.34 2001-02-03 15:55:18 geuzaine Exp $ // To make the interface as visually consistent as possible, please: // - use the BH, BW, WB, IW values for button heights/widths, window borders, etc. @@ -787,8 +787,8 @@ void GUI::create_graphic_window(int argc, char **argv){ } g_status_label[0] = new Fl_Box(x,glheight+2,(width-x)/3,sh-4); - g_status_label[1] = new Fl_Box(x+(width-x)/3,glheight+2,(height-x)/3,sh-4); - g_status_label[2] = new Fl_Box(x+2*(width-x)/3,glheight+2,(height-x)/3-2,sh-4); + g_status_label[1] = new Fl_Box(x+(width-x)/3,glheight+2,(width-x)/3,sh-4); + g_status_label[2] = new Fl_Box(x+2*(width-x)/3,glheight+2,(width-x)/3-2,sh-4); for(i = 0 ; i<3 ; i++){ g_status_label[i]->box(FL_FLAT_BOX); g_status_label[i]->labelsize(CTX.fontsize); @@ -1910,7 +1910,7 @@ void GUI::update_view_window(int num){ view_input[0]->value(v->Name); view_input[1]->callback(view_options_format_cb, (void*)num); view_input[1]->value(v->Format); - view_colorbar_window->update(v->Name, v->Min, v->Max, &v->CT); + view_colorbar_window->update(v->Name, v->Min, v->Max, &v->CT, &v->Changed); // range if(v->RangeType==DRAW_POST_CUSTOM) activate_custom(1);