From 132ff45fef5f08d8cfa734f1ca43bee1b716b78e Mon Sep 17 00:00:00 2001
From: Jean-Francois Remacle <jean-francois.remacle@uclouvain.be>
Date: Sat, 10 Mar 2001 19:55:07 +0000
Subject: [PATCH] New Plugin Defeinitions
---
Fltk/Callbacks.cpp | 20 +-
Fltk/Callbacks.h | 1 +
Fltk/GUI.cpp | 2107 +++++++++++++++++-----------------
Fltk/GUI.h | 15 +
Fltk/Makefile | 106 +-
Graphics/Iso.cpp | 13 +-
Graphics/Iso.h | 6 +-
Graphics/IsoSimplex.cpp | 140 ++-
Graphics/Makefile | 163 +--
Makefile | 8 +-
Mesh/Makefile | 325 +++---
Motif/Makefile | 195 ++--
Parser/Makefile | 42 +-
Plugin/Cutplane/CutPlane.cpp | 35 +-
Plugin/Cutplane/CutPlane.h | 12 +-
Plugin/Cutplane/Makefile | 8 +-
Plugin/Makefile | 6 +-
Plugin/Plugin.cpp | 10 +-
Plugin/Plugin.h | 18 +-
jpeg/Makefile | 53 +-
20 files changed, 1725 insertions(+), 1558 deletions(-)
diff --git a/Fltk/Callbacks.cpp b/Fltk/Callbacks.cpp
index ee02235ddf..9e2f1da2a9 100644
--- a/Fltk/Callbacks.cpp
+++ b/Fltk/Callbacks.cpp
@@ -1,4 +1,4 @@
-// $Id: Callbacks.cpp,v 1.39 2001-03-06 04:38:56 remacle Exp $
+// $Id: Callbacks.cpp,v 1.40 2001-03-10 19:55:06 remacle Exp $
#include <map>
#include "Gmsh.h"
@@ -1459,7 +1459,7 @@ void view_plugin_cb(CALLBACK_ARGS){
{
Post_View *v = (Post_View*)List_Pointer(Post_ViewList,iView);
p->execute(v);
- Msg(INFO,"Plugin %s was called",name);
+ Msg(INFO,"Plugin %s was called win = %p",name,p->dialogBox);
}
catch (GMSH_Plugin *err)
{
@@ -1469,6 +1469,22 @@ void view_plugin_cb(CALLBACK_ARGS){
//
}
+void view_options_plugin_cb(CALLBACK_ARGS){
+ std::pair<int,GMSH_Plugin*> *pair = (std::pair<int,GMSH_Plugin*>*)data;
+ int iView = pair->first;
+ GMSH_Plugin *p = pair->second;
+
+ if(!p->dialogBox)p->dialogBox = WID->create_plugin_window(p,iView);
+
+ Fl_Window *pwindow = p->dialogBox->main_window;
+
+
+ if(pwindow->shown())
+ pwindow->redraw();
+ else
+ pwindow->show();
+}
+
void view_options_custom_cb(CALLBACK_ARGS){
if(WID->view_butt[0]->value()){
WID->view_value[0]->activate();
diff --git a/Fltk/Callbacks.h b/Fltk/Callbacks.h
index 20897ca074..978d1ad67d 100644
--- a/Fltk/Callbacks.h
+++ b/Fltk/Callbacks.h
@@ -196,6 +196,7 @@ void view_elements_cb(CALLBACK_ARGS) ;
void view_applybgmesh_cb(CALLBACK_ARGS) ;
void view_options_cb(CALLBACK_ARGS) ;
void view_plugin_cb(CALLBACK_ARGS) ;
+void view_options_plugin_cb(CALLBACK_ARGS) ;
void view_options_custom_cb(CALLBACK_ARGS) ;
void view_options_timestep_cb(CALLBACK_ARGS) ;
void view_options_ok_cb(CALLBACK_ARGS) ;
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index 8dcb6ed135..91b87d65b7 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1,4 +1,4 @@
-// $Id: GUI.cpp,v 1.56 2001-03-06 04:38:56 remacle Exp $
+// $Id: GUI.cpp,v 1.57 2001-03-10 19:55:06 remacle 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.
@@ -505,7 +505,7 @@ void GUI::wait(){
//********************************* Create the menu window *****************************
-void add_post_plugins ( Fl_Menu_Button *button , int iView)
+void GUI::add_post_plugins ( Fl_Menu_Button *button , int iView)
{
char name[256],menuname[256];
for(GMSH_PluginManager::iter it = GMSH_PluginManager::Instance()->begin();
@@ -518,1034 +518,1089 @@ void add_post_plugins ( Fl_Menu_Button *button , int iView)
p->getName(name);
std::pair<int,GMSH_Plugin*> *pair =
new std::pair<int,GMSH_Plugin*>(iView,p);
- sprintf(menuname,"Plugins/%s",name);
+ sprintf(menuname,"Plugins/%s/Run",name);
button->add(menuname, 0,(Fl_Callback *)view_plugin_cb,
(void*)(pair), 0);
- }
- }
-}
-
-void GUI::create_menu_window(int argc, char **argv){
- int i, y;
-
- if(!init_menu_window){
- init_menu_window = 1 ;
-
- int width = 13*CTX.fontsize-CTX.fontsize/2-2 ;
- MH = BH + BH+6 ; // this is the initial height: no dynamic button is shown!
-
- m_window = new Fl_Window(width,MH);
- m_window->box(WINDOW_BOX);
- m_window->label("Gmsh");
- m_window->callback(file_quit_cb);
-
- m_menu_bar = new Fl_Menu_Bar(0,0,width,BH);
- m_menu_bar->menu(m_menubar_table);
- m_menu_bar->textsize(CTX.fontsize);
- m_menu_bar->box(FL_UP_BOX);
- m_menu_bar->global();
-
- Fl_Box *o = new Fl_Box(0,BH,width,BH+6);
- o->box(FL_UP_BOX);
-
- y = BH + 3;
-
- m_navig_butt[0] = new Fl_Button(1,y,18,BH/2,"@<");
- m_navig_butt[0]->labeltype(FL_SYMBOL_LABEL);
- m_navig_butt[0]->box(FL_FLAT_BOX);
- m_navig_butt[0]->selection_color(FL_WHITE);
- m_navig_butt[0]->callback(mod_back_cb);
- m_navig_butt[1] = new Fl_Button(1,y+BH/2,18,BH/2,"@>");
- m_navig_butt[1]->labeltype(FL_SYMBOL_LABEL);
- m_navig_butt[1]->box(FL_FLAT_BOX);
- m_navig_butt[1]->selection_color(FL_WHITE);
- m_navig_butt[1]->callback(mod_forward_cb);
-
- m_module_butt = new Fl_Choice(19,y,width-24,BH);
- m_module_butt->menu(m_module_table);
- m_module_butt->textsize(CTX.fontsize);
- m_module_butt->box(FL_THIN_DOWN_BOX);
-
- y = MH ;
-
- for(i=0; i<NB_BUTT_MAX; i++){
- m_push_butt[i] = new Fl_Button(0,y+i*BH,width,BH);
- m_push_butt[i]->labelsize(CTX.fontsize);
- m_push_butt[i]->hide();
- m_toggle_butt[i] = new Fl_Light_Button(0,y+i*BH,width,BH);
- m_toggle_butt[i]->labelsize(CTX.fontsize);
- m_toggle_butt[i]->callback(view_toggle_cb, (void*)i);
- m_toggle_butt[i]->hide();
- m_popup_butt[i] = new Fl_Menu_Button(0,y+i*BH,width,BH);
- m_popup_butt[i]->type(Fl_Menu_Button::POPUP3);
- m_popup_butt[i]->add("Reload/View", 0,
- (Fl_Callback *)view_reload_cb, (void*)i, 0);
- m_popup_butt[i]->add("Reload/All Views", 0,
- (Fl_Callback *)view_reload_all_cb, (void*)i, 0);
- m_popup_butt[i]->add("Remove/View", 0,
- (Fl_Callback *)view_remove_cb, (void*)i, 0);
- m_popup_butt[i]->add("Remove/All Views", 0,
- (Fl_Callback *)view_remove_all_cb, (void*)i, 0);
- m_popup_butt[i]->add("Duplicate/View without Options", 0,
- (Fl_Callback *)view_duplicate_cb, (void*)i, 0) ;
- m_popup_butt[i]->add("Duplicate/View with Options", 0,
- (Fl_Callback *)view_duplicate_with_options_cb, (void*)i, 0) ;
- m_popup_butt[i]->add("Save as/ASCII View...", 0,
- (Fl_Callback *)view_save_ascii_cb, (void*)i, 0) ;
- m_popup_butt[i]->add("Save as/Binary View...", 0,
- (Fl_Callback *)view_save_binary_cb, (void*)i, 0) ;
- m_popup_butt[i]->add("Apply as Background Mesh", 0,
- (Fl_Callback *)view_applybgmesh_cb, (void*)i, FL_MENU_DIVIDER);
- m_popup_butt[i]->add("Options...", 0,
- (Fl_Callback *)view_options_cb, (void*)i, 0);
- add_post_plugins ( m_popup_butt[i] , i);
- m_popup_butt[i]->textsize(CTX.fontsize);
- m_popup_butt[i]->hide();
- }
-
- m_window->position(CTX.position[0],CTX.position[1]);
- m_window->end();
- }
- else{
- if(m_window->shown())
- m_window->redraw();
- else
- m_window->show(1, argv);
-
- }
-
-}
-
-// Dynamically set the height of the menu window
-
-void GUI::set_menu_size(int nb_butt){
- m_window->size(m_window->w(), MH + nb_butt*BH);
-}
-
-// Dynamically set the context
-
-void GUI::set_context(Context_Item *menu_asked, int flag){
- static int nb_back = 0, nb_forward = 0, init_context=0;
- static Context_Item *menu_history[NB_HISTORY_MAX];
- Context_Item *menu;
- Post_View *v;
- int i;
-
- if(!init_context){
- init_context = 1;
- for(i=0 ; i<NB_HISTORY_MAX ; i++){
- menu_history[i] = NULL ;
- }
- }
-
- if(nb_back > NB_HISTORY_MAX-2) nb_back = 1; // we should do a circular list
-
- if(flag == -1){
- if(nb_back > 1){
- nb_back--;
- nb_forward++;
- menu = menu_history[nb_back-1];
- }
- else return;
- }
- else if(flag == 1){
- if(nb_forward > 0){
- nb_back++;
- nb_forward--;
- menu = menu_history[nb_back-1];
- }
- else return;
- }
- else{
- menu = menu_asked;
- if(!nb_back || menu_history[nb_back-1] != menu){
- menu_history[nb_back++] = menu;
- }
- nb_forward = 0;
- }
-
- int nb = 0;
-
- if(menu[0].label[0] == '0') m_module_butt->value(0);
- else if(menu[0].label[0] == '1') m_module_butt->value(1);
- else if(menu[0].label[0] == '2') m_module_butt->value(2);
- else {
- Msg(WARNING, "Something Wrong in your Dynamic Context Definition");
- return;
- }
-
- Msg(STATUS2, menu[0].label+1);
-
- if(m_module_butt->value() == 2){ // post-processing contexts
- for(i = 0 ; i < List_Nbr(Post_ViewList) ; i++) {
- if(i == NB_BUTT_MAX) break;
- nb++ ;
- v = (Post_View*)List_Pointer(Post_ViewList,i);
- m_push_butt[i]->hide();
- m_toggle_butt[i]->show();
- m_toggle_butt[i]->value(v->Visible);
- m_toggle_butt[i]->label(v->Name);
- m_popup_butt[i]->show();
- }
- for(i = List_Nbr(Post_ViewList) ; i < NB_BUTT_MAX ; i++) {
- m_push_butt[i]->hide();
- m_toggle_butt[i]->hide();
- m_popup_butt[i]->hide();
- }
- }
- else{ // geometry and mesh contexts
- for(i=0 ; i < NB_BUTT_MAX ; i++){
- m_toggle_butt[i]->hide();
- m_popup_butt[i]->hide();
- if(menu[i+1].label){
- m_push_butt[i]->label(menu[i+1].label);
- m_push_butt[i]->callback(menu[i+1].callback);
- m_push_butt[i]->redraw();
- m_push_butt[i]->show();
- nb++;
- }
- else
- break;
- }
- for(i=nb ; i<NB_BUTT_MAX ; i++){
- m_toggle_butt[i]->hide();
- m_popup_butt[i]->hide();
- m_push_butt[i]->hide();
- }
- }
-
- set_menu_size(nb);
-
-}
-
-int GUI::get_context(){
- return m_module_butt->value();
-}
-
-
-//******************************** Create the graphic window ***************************
-
-void GUI::create_graphic_window(int argc, char **argv){
- int i, x;
-
- if(!init_graphic_window){
- init_graphic_window = 1 ;
-
- int sh = 2*CTX.fontsize-4; // status bar height
- int sw = CTX.fontsize+4; //status button width
- int width = CTX.viewport[2]-CTX.viewport[0];
- int glheight = CTX.viewport[3]-CTX.viewport[1];
- int height = glheight + sh;
-
- g_window = new Fl_Window(width, height);
- g_window->callback(file_quit_cb);
-
- g_opengl_window = new Opengl_Window(0,0,width,glheight);
- if(!opt_general_double_buffer(0,GMSH_GET,0)){
- Msg(INFO, "Setting Opengl visual to single buffered");
- g_opengl_window->mode(FL_RGB | FL_DEPTH | FL_SINGLE);
- }
- g_opengl_window->end();
-
- {
- Fl_Group *o = new Fl_Group(0,glheight,width,sh);
- o->box(FL_THIN_UP_BOX);
-
- x = 2;
-
- g_status_butt[0] = new Fl_Button(x,glheight+2,sw,sh-4,"X"); x+=sw;
- g_status_butt[0]->callback(status_xyz1p_cb, (void*)0);
- //g_status_butt[0]->tooltip("Set X view");
- g_status_butt[1] = new Fl_Button(x,glheight+2,sw,sh-4,"Y"); x+=sw;
- g_status_butt[1]->callback(status_xyz1p_cb, (void*)1);
- g_status_butt[2] = new Fl_Button(x,glheight+2,sw,sh-4,"Z"); x+=sw;
- g_status_butt[2]->callback(status_xyz1p_cb, (void*)2);
- g_status_butt[3] = new Fl_Button(x,glheight+2,2*CTX.fontsize,sh-4,"1:1"); x+=2*CTX.fontsize;
- g_status_butt[3]->callback(status_xyz1p_cb, (void*)3);
- g_status_butt[4] = new Fl_Button(x,glheight+2,sw,sh-4,"?"); x+=sw;
- g_status_butt[4]->callback(status_xyz1p_cb, (void*)4);
- g_status_butt[5] = new Fl_Button(x,glheight+2,sw,sh-4); x+=sw;
- g_status_butt[5]->callback(status_play_cb);
- start_bmp = new Fl_Bitmap(start_bits,start_width,start_height);
- start_bmp->label(g_status_butt[5]);
- stop_bmp = new Fl_Bitmap(stop_bits,stop_width,stop_height);
- g_status_butt[5]->deactivate();
- g_status_butt[6] = new Fl_Button(x,glheight+2,sw,sh-4); x+=sw;
- g_status_butt[6]->callback(status_cancel_cb);
- abort_bmp = new Fl_Bitmap(abort_bits,abort_width,abort_height);
- abort_bmp->label(g_status_butt[6]);
- g_status_butt[6]->deactivate();
- for(i = 0 ; i<7 ; i++){
- g_status_butt[i]->box(FL_FLAT_BOX);
- g_status_butt[i]->selection_color(FL_WHITE);
- g_status_butt[i]->labelsize(CTX.fontsize);
- g_status_butt[i]->align(FL_ALIGN_CENTER|FL_ALIGN_INSIDE|FL_ALIGN_CLIP);
- }
-
- 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,(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);
- g_status_label[i]->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE|FL_ALIGN_CLIP);
- }
-
- o->end();
- }
-
- g_window->resizable(g_opengl_window);
- g_window->position(CTX.gl_position[0],CTX.gl_position[1]);
- g_window->end();
- }
- else{
- if(g_window->shown())
- g_window->redraw();
- else
- g_window->show(1, argv);
-
- }
-}
-
-// Set the size of the graphical window
-
-void GUI::set_size(int new_w, int new_h){
- g_window->size(new_w,new_h+g_window->h()-g_opengl_window->h());
-}
-
-// Set graphic window title
-
-void GUI::set_title(char *str){
- g_window->label(str);
-}
-
-// Set animation button
-
-void GUI::set_anim(int mode){
- if(mode){
- g_status_butt[5]->callback(status_play_cb);
- start_bmp->label(g_status_butt[5]);
- }
- else{
- g_status_butt[5]->callback(status_pause_cb);
- stop_bmp->label(g_status_butt[5]);
- }
-}
-
-// Set the status messages
-
-void GUI::set_status(char *msg, int num){
- g_status_label[num]->label(msg);
- g_status_label[num]->redraw();
-}
-
-// set the current drawing context
-
-void GUI::make_opengl_current(){
- g_opengl_window->make_current();
-}
-
-void GUI::make_overlay_current(){
- g_opengl_window->make_overlay_current();
-}
-
-// Draw the opengl window
-
-void GUI::redraw_opengl(){
- g_opengl_window->redraw();
-}
-
-// Draw the opengl overlay window
-
-void GUI::redraw_overlay(){
- g_opengl_window->redraw_overlay();
-}
-
-//************************ Create the window for general options ***********************
-
-void GUI::create_general_options_window(){
- int i;
-
- if(!init_general_options_window){
- init_general_options_window = 1 ;
-
- int width = 25*CTX.fontsize;
- int height = 5*WB+10*BH ;
-
- gen_window = new Fl_Window(width,height);
- gen_window->box(WINDOW_BOX);
- gen_window->label("General Options");
- {
- Fl_Tabs* o = new Fl_Tabs(WB, WB, width-2*WB, height-3*WB-BH);
- {
- Fl_Group* o = new Fl_Group(WB, WB+BH, width-2*WB, height-3*WB-2*BH, "Display");
- o->labelsize(CTX.fontsize);
- gen_butt[0] = new Fl_Check_Button(2*WB, 2*WB+1*BH, BW, BH, "Show moving axes");
- gen_butt[1] = new Fl_Check_Button(2*WB, 2*WB+2*BH, BW, BH, "Show small axes");
- gen_butt[2] = new Fl_Check_Button(2*WB, 2*WB+3*BH, BW, BH, "Enable fast redraw");
- gen_butt[3] = new Fl_Check_Button(2*WB, 2*WB+4*BH, BW, BH, "Enable double buffering");
- gen_butt[4] = new Fl_Check_Button(2*WB, 2*WB+5*BH, BW, BH, "Use display lists");
- gen_butt[5] = new Fl_Check_Button(2*WB, 2*WB+6*BH, BW, BH, "Enable alpha blending");
- gen_butt[6] = new Fl_Check_Button(2*WB, 2*WB+7*BH, BW, BH, "Use trackball rotation mode");
- for(i=0 ; i<7 ; i++){
- gen_butt[i]->type(FL_TOGGLE_BUTTON);
- gen_butt[i]->down_box(FL_DOWN_BOX);
- gen_butt[i]->labelsize(CTX.fontsize);
- gen_butt[i]->selection_color(FL_YELLOW);
- }
- o->end();
- }
- {
- Fl_Group* o = new Fl_Group(WB, WB+BH, width-2*WB, height-3*WB-2*BH, "Output");
- o->labelsize(CTX.fontsize);
- gen_butt[7] = new Fl_Check_Button(2*WB, 2*WB+1*BH, BW, BH, "Print messages on terminal");
- gen_butt[8] = new Fl_Check_Button(2*WB, 2*WB+2*BH, BW, BH, "Save session information on exit");
- gen_butt[9] = new Fl_Check_Button(2*WB, 2*WB+3*BH, BW, BH, "Save options on exit");
- for(i=7 ; i<10 ; i++){
- gen_butt[i]->type(FL_TOGGLE_BUTTON);
- gen_butt[i]->down_box(FL_DOWN_BOX);
- gen_butt[i]->labelsize(CTX.fontsize);
- gen_butt[i]->selection_color(FL_YELLOW);
- }
- gen_value[5] = new Fl_Value_Input(2*WB, 2*WB+4*BH, IW, BH, "Message verbosity");
- gen_value[5]->minimum(0);
- gen_value[5]->maximum(10);
- gen_value[5]->step(1);
- gen_value[5]->labelsize(CTX.fontsize);
- gen_value[5]->textsize(CTX.fontsize);
- gen_value[5]->type(FL_HORIZONTAL);
- gen_value[5]->align(FL_ALIGN_RIGHT);
- gen_input[0] = new Fl_Input(2*WB, 2*WB+5*BH, IW, BH, "Default file name");
- gen_input[1] = new Fl_Input(2*WB, 2*WB+6*BH, IW, BH, "Temporary file");
- gen_input[2] = new Fl_Input(2*WB, 2*WB+7*BH, IW, BH, "Error file");
- gen_input[3] = new Fl_Input(2*WB, 2*WB+8*BH, IW, BH, "Option file");
- for(i=0 ; i<4 ; i++){
- gen_input[i]->labelsize(CTX.fontsize);
- gen_input[i]->textsize(CTX.fontsize);
- gen_input[i]->align(FL_ALIGN_RIGHT);
- }
- o->end();
- }
- {
- Fl_Group* o = new Fl_Group(WB, WB+BH, width-2*WB, height-3*WB-2*BH, "Projection");
- o->labelsize(CTX.fontsize);
- o->hide();
- gen_butt[10] = new Fl_Check_Button(2*WB, 2*WB+1*BH, BW, BH, "Orthographic");
- gen_butt[11] = new Fl_Check_Button(2*WB, 2*WB+2*BH, BW, BH, "Perspective");
- for(i=10 ; i<12 ; i++){
- gen_butt[i]->type(FL_RADIO_BUTTON);
- gen_butt[i]->labelsize(CTX.fontsize);
- gen_butt[i]->selection_color(FL_YELLOW);
- }
- o->end();
- }
- {
- Fl_Group* o = new Fl_Group(WB, WB+BH, width-2*WB, height-3*WB-2*BH, "Colors");
- o->labelsize(CTX.fontsize);
- o->hide();
- gen_value[0] = new Fl_Value_Input(2*WB, 2*WB+1*BH, IW, BH, "Predefined color scheme");
- gen_value[0]->minimum(0);
- gen_value[0]->maximum(2);
- gen_value[0]->step(1);
- gen_value[0]->labelsize(CTX.fontsize);
- gen_value[0]->textsize(CTX.fontsize);
- gen_value[0]->type(FL_HORIZONTAL);
- gen_value[0]->align(FL_ALIGN_RIGHT);
- gen_value[0]->callback(opt_general_color_scheme_cb);
-
- Fl_Scroll* s = new Fl_Scroll(2*WB, 3*WB+2*BH, IW+20, height-3*WB-4*BH);
- i = 0;
- while(GeneralOptions_Color[i].str){
- gen_col[i] = new Fl_Button(2*WB, 3*WB+(2+i)*BH, IW, BH, GeneralOptions_Color[i].str);
- gen_col[i]->callback(color_cb, (void*)GeneralOptions_Color[i].function) ;
- gen_col[i]->labelsize(CTX.fontsize);
- i++;
- }
- s->end();
- o->end();
- }
- {
- Fl_Group* o = new Fl_Group(WB, WB+BH, width-2*WB, height-3*WB-2*BH, "Light");
- o->labelsize(CTX.fontsize);
- o->hide();
- gen_value[1] = new Fl_Value_Input(2*WB, 2*WB+1*BH, IW, BH, "Material shininess");
- gen_value[1]->minimum(0);
- gen_value[1]->maximum(10);
- gen_value[1]->step(0.1);
- gen_butt[12] = new Fl_Check_Button(2*WB, 2*WB+2*BH, BW, BH, "Moving light");
- gen_butt[12]->type(FL_TOGGLE_BUTTON);
- gen_butt[12]->down_box(FL_DOWN_BOX);
- gen_butt[12]->labelsize(CTX.fontsize);
- gen_butt[12]->selection_color(FL_YELLOW);
- gen_value[2] = new Fl_Value_Input(2*WB, 2*WB+3*BH, IW, BH, "Light position X");
- gen_value[2]->minimum(-1);
- gen_value[2]->maximum(1);
- gen_value[2]->step(0.01);
- gen_value[3] = new Fl_Value_Input(2*WB, 2*WB+4*BH, IW, BH, "Light position Y");
- gen_value[3]->minimum(-1);
- gen_value[3]->maximum(1);
- gen_value[3]->step(0.01);
- gen_value[4] = new Fl_Value_Input(2*WB, 2*WB+5*BH, IW, BH, "Light position Z");
- gen_value[4]->minimum(-1);
- gen_value[4]->maximum(1);
- gen_value[4]->step(0.01);
- for(i=1 ; i<5 ; i++){
- gen_value[i]->labelsize(CTX.fontsize);
- gen_value[i]->textsize(CTX.fontsize);
- gen_value[i]->type(FL_HORIZONTAL);
- gen_value[i]->align(FL_ALIGN_RIGHT);
- }
- o->end();
- }
- o->end();
- }
-
- {
- Fl_Return_Button* o = new Fl_Return_Button(width-2*BB-2*WB, height-BH-WB, BB, BH, "OK");
- o->labelsize(CTX.fontsize);
- o->callback(opt_general_ok_cb);
- }
- {
- Fl_Button* o = new Fl_Button(width-BB-WB, height-BH-WB, BB, BH, "Cancel");
- o->labelsize(CTX.fontsize);
- o->callback(cancel_cb, (void*)gen_window);
- }
-
- if(CTX.center_windows)
- gen_window->position(m_window->x()+m_window->w()/2-width/2,
- m_window->y()+9*BH-height/2);
- gen_window->end();
- }
- else{
- if(gen_window->shown())
- gen_window->redraw();
- else
- gen_window->show();
-
- }
-
-}
-
-//************************ Create the window for geometry options **********************
-
-void GUI::create_geometry_options_window(){
- int i;
-
- if(!init_geometry_options_window){
- init_geometry_options_window = 1 ;
-
- int width = 25*CTX.fontsize;
- int height = 5*WB+9*BH ;
-
- geo_window = new Fl_Window(width,height);
- geo_window->box(WINDOW_BOX);
- geo_window->label("Geometry Options");
- {
- Fl_Tabs* o = new Fl_Tabs(WB, WB, width-2*WB, height-3*WB-BH);
- {
- Fl_Group* o = new Fl_Group(WB, WB+BH, width-2*WB, height-3*WB-2*BH, "Visibility");
- o->labelsize(CTX.fontsize);
- geo_butt[0] = new Fl_Check_Button(2*WB, 2*WB+1*BH, IW, BH, "Points");
- geo_butt[1] = new Fl_Check_Button(2*WB, 2*WB+2*BH, IW, BH, "Curves");
- geo_butt[2] = new Fl_Check_Button(2*WB, 2*WB+3*BH, IW, BH, "Surfaces");
- geo_butt[3] = new Fl_Check_Button(2*WB, 2*WB+4*BH, IW, BH, "Volumes");
- geo_butt[4] = new Fl_Check_Button(width/2, 2*WB+1*BH, IW, BH, "Point numbers");
- geo_butt[5] = new Fl_Check_Button(width/2, 2*WB+2*BH, IW, BH, "Curve numbers");
- geo_butt[6] = new Fl_Check_Button(width/2, 2*WB+3*BH, IW, BH, "Surface numbers");
- geo_butt[7] = new Fl_Check_Button(width/2, 2*WB+4*BH, IW, BH, "Volume numbers");
- for(i=0 ; i<8 ; i++){
- geo_butt[i]->type(FL_TOGGLE_BUTTON);
- geo_butt[i]->down_box(FL_DOWN_BOX);
- geo_butt[i]->labelsize(CTX.fontsize);
- geo_butt[i]->selection_color(FL_YELLOW);
- }
-
- geo_input = new Fl_Input(2*WB, 2*WB+5*BH, IW, BH, "Show by entity number");
- geo_input->labelsize(CTX.fontsize);
- geo_input->textsize(CTX.fontsize);
- geo_input->align(FL_ALIGN_RIGHT);
- geo_input->callback(opt_geometry_show_by_entity_num_cb);
- geo_input->when(FL_WHEN_ENTER_KEY|FL_WHEN_NOT_CHANGED);
-
- geo_value[0] = new Fl_Value_Input(2*WB, 2*WB+6*BH, IW, BH, "Normals");
- geo_value[0]->minimum(0);
- geo_value[0]->maximum(100);
- geo_value[0]->step(0.1);
- geo_value[1] = new Fl_Value_Input(2*WB, 2*WB+7*BH, IW, BH, "Tangents");
- geo_value[1]->minimum(0);
- geo_value[1]->maximum(100);
- geo_value[1]->step(0.1);
- for(i=0 ; i<2 ; i++){
- geo_value[i]->labelsize(CTX.fontsize);
- geo_value[i]->textsize(CTX.fontsize);
- geo_value[i]->type(FL_HORIZONTAL);
- geo_value[i]->align(FL_ALIGN_RIGHT);
- }
- o->end();
- }
- {
- Fl_Group* o = new Fl_Group(WB, WB+BH, width-2*WB, height-3*WB-2*BH, "Colors");
- o->labelsize(CTX.fontsize);
- o->hide();
- geo_value[2] = new Fl_Value_Input(2*WB, 2*WB+1*BH, IW, BH, "Predefined color scheme");
- geo_value[2]->minimum(0);
- geo_value[2]->maximum(2);
- geo_value[2]->step(1);
- geo_value[2]->labelsize(CTX.fontsize);
- geo_value[2]->textsize(CTX.fontsize);
- geo_value[2]->type(FL_HORIZONTAL);
- geo_value[2]->align(FL_ALIGN_RIGHT);
- geo_value[2]->callback(opt_geometry_color_scheme_cb);
-
- Fl_Scroll* s = new Fl_Scroll(2*WB, 3*WB+2*BH, IW+20, height-3*WB-4*BH);
- i = 0;
- while(GeometryOptions_Color[i].str){
- geo_col[i] = new Fl_Button(2*WB, 3*WB+(2+i)*BH, IW, BH, GeometryOptions_Color[i].str);
- geo_col[i]->callback(color_cb, (void*)GeometryOptions_Color[i].function) ;
- geo_col[i]->labelsize(CTX.fontsize);
- i++;
- }
- s->end();
- o->end();
- }
- o->end();
- }
-
- {
- Fl_Return_Button* o = new Fl_Return_Button(width-2*BB-2*WB, height-BH-WB, BB, BH, "OK");
- o->labelsize(CTX.fontsize);
- o->callback(opt_geometry_ok_cb);
- }
- {
- Fl_Button* o = new Fl_Button(width-BB-WB, height-BH-WB, BB, BH, "Cancel");
- o->labelsize(CTX.fontsize);
- o->callback(cancel_cb, (void*)geo_window);
- }
-
- if(CTX.center_windows)
- geo_window->position(m_window->x()+m_window->w()/2-width/2,
- m_window->y()+9*BH-height/2);
- geo_window->end();
- }
- else{
- if(geo_window->shown())
- geo_window->redraw();
- else
- geo_window->show();
-
- }
-
-}
-
-//****************************** Create the window for mesh options ********************
-
-void GUI::create_mesh_options_window(){
- int i;
-
- if(!init_mesh_options_window){
- init_mesh_options_window = 1 ;
-
- int width = 25*CTX.fontsize;
- int height = 5*WB+9*BH ;
-
- mesh_window = new Fl_Window(width,height);
- mesh_window->box(WINDOW_BOX);
- mesh_window->label("Mesh Options");
- {
- Fl_Tabs* o = new Fl_Tabs(WB, WB, width-2*WB, height-3*WB-BH);
- {
- Fl_Group* o = new Fl_Group(WB, WB+BH, width-2*WB, height-3*WB-2*BH, "Algorithm");
- o->labelsize(CTX.fontsize);
- o->hide();
- mesh_butt[0] = new Fl_Check_Button(2*WB, 2*WB+1*BH, BW, BH, "Second order elements");
- mesh_butt[1] = new Fl_Check_Button(2*WB, 2*WB+2*BH, BW, BH, "Interactive");
- mesh_butt[2] = new Fl_Check_Button(2*WB, 2*WB+3*BH, BW, BH, "Anisotropic");
- for(i=0 ; i<3 ; i++){
- mesh_butt[i]->type(FL_TOGGLE_BUTTON);
- mesh_butt[i]->down_box(FL_DOWN_BOX);
- mesh_butt[i]->labelsize(CTX.fontsize);
- mesh_butt[i]->selection_color(FL_YELLOW);
- }
- mesh_value[0] = new Fl_Value_Input(2*WB, 2*WB+4*BH, IW, BH, "Number of smoothing steps");
- mesh_value[0]->minimum(0);
- mesh_value[0]->maximum(100);
- mesh_value[0]->step(1);
- mesh_value[1] = new Fl_Value_Input(2*WB, 2*WB+5*BH, IW, BH, "Mesh scaling factor");
- mesh_value[1]->minimum(0.001);
- mesh_value[1]->maximum(1000);
- mesh_value[1]->step(0.001);
- mesh_value[2] = new Fl_Value_Input(2*WB, 2*WB+6*BH, IW, BH, "Characteristic length factor");
- mesh_value[2]->minimum(0.001);
- mesh_value[2]->maximum(1000);
- mesh_value[2]->step(0.001);
- mesh_value[3] = new Fl_Value_Input(2*WB, 2*WB+7*BH, IW, BH, "Random perturbation factor");
- mesh_value[3]->minimum(1.e-6);
- mesh_value[3]->maximum(1.e-1);
- mesh_value[3]->step(1.e-6);
- for(i = 0 ; i<4 ; i++){
- mesh_value[i]->labelsize(CTX.fontsize);
- mesh_value[i]->textsize(CTX.fontsize);
- mesh_value[i]->type(FL_HORIZONTAL);
- mesh_value[i]->align(FL_ALIGN_RIGHT);
- }
- o->end();
- }
- {
- Fl_Group* o = new Fl_Group(WB, WB+BH, width-2*WB, height-3*WB-2*BH, "Visibility");
- o->labelsize(CTX.fontsize);
- mesh_butt[3] = new Fl_Check_Button(2*WB, 2*WB+1*BH, IW, BH, "Points");
- mesh_butt[4] = new Fl_Check_Button(2*WB, 2*WB+2*BH, IW, BH, "Curves");
- mesh_butt[5] = new Fl_Check_Button(2*WB, 2*WB+3*BH, IW, BH, "Surfaces");
- mesh_butt[6] = new Fl_Check_Button(2*WB, 2*WB+4*BH, IW, BH, "Volumes");
- mesh_butt[7] = new Fl_Check_Button(width/2, 2*WB+1*BH, IW, BH, "Point Numbers");
- mesh_butt[8] = new Fl_Check_Button(width/2, 2*WB+2*BH, IW, BH, "Curve Numbers");
- mesh_butt[9] = new Fl_Check_Button(width/2, 2*WB+3*BH, IW, BH, "Surface Numbers");
- mesh_butt[10] = new Fl_Check_Button(width/2, 2*WB+4*BH, IW, BH, "Volume Numbers");
- for(i=3 ; i<11 ; i++){
- mesh_butt[i]->type(FL_TOGGLE_BUTTON);
- mesh_butt[i]->down_box(FL_DOWN_BOX);
- mesh_butt[i]->labelsize(CTX.fontsize);
- mesh_butt[i]->selection_color(FL_YELLOW);
- }
- mesh_input = new Fl_Input(2*WB, 2*WB+5*BH, IW, BH, "Show by entity Number");
- mesh_input->labelsize(CTX.fontsize);
- mesh_input->textsize(CTX.fontsize);
- mesh_input->align(FL_ALIGN_RIGHT);
- mesh_input->callback(opt_mesh_show_by_entity_num_cb);
- mesh_input->when(FL_WHEN_ENTER_KEY|FL_WHEN_NOT_CHANGED);
-
- mesh_value[4] = new Fl_Value_Input(2*WB, 2*WB+6*BH, IW, BH, "Show by element quality");
- mesh_value[4]->minimum(0);
- mesh_value[4]->maximum(1);
- mesh_value[4]->step(0.001);
- mesh_value[5] = new Fl_Value_Input(2*WB, 2*WB+7*BH, IW, BH, "Normals");
- mesh_value[5]->minimum(0);
- mesh_value[5]->maximum(100);
- mesh_value[5]->step(1);
- for(i=4 ; i<6 ; i++){
- mesh_value[i]->labelsize(CTX.fontsize);
- mesh_value[i]->textsize(CTX.fontsize);
- mesh_value[i]->type(FL_HORIZONTAL);
- mesh_value[i]->align(FL_ALIGN_RIGHT);
- }
- o->end();
- }
- {
- Fl_Group* o = new Fl_Group(WB, WB+BH, width-2*WB, height-3*WB-2*BH, "Aspect");
- o->labelsize(CTX.fontsize);
- o->hide();
- mesh_butt[11] = new Fl_Check_Button(2*WB, 2*WB+1*BH, BW, BH, "Wireframe");
- mesh_butt[12] = new Fl_Check_Button(2*WB, 2*WB+2*BH, BW, BH, "Hidden lines");
- mesh_butt[13] = new Fl_Check_Button(2*WB, 2*WB+3*BH, BW, BH, "Solid");
- for(i=11 ; i<14 ; i++){
- mesh_butt[i]->type(FL_RADIO_BUTTON);
- mesh_butt[i]->down_box(FL_DOWN_BOX);
- mesh_butt[i]->labelsize(CTX.fontsize);
- mesh_butt[i]->selection_color(FL_YELLOW);
- }
- mesh_value[6] = new Fl_Value_Input(2*WB, 2*WB+4*BH, IW, BH, "Explode elements");
- mesh_value[6]->minimum(0);
- mesh_value[6]->maximum(1);
- mesh_value[6]->step(0.01);
- mesh_value[6]->labelsize(CTX.fontsize);
- mesh_value[6]->textsize(CTX.fontsize);
- mesh_value[6]->type(FL_HORIZONTAL);
- mesh_value[6]->align(FL_ALIGN_RIGHT);
- o->end();
- }
- {
- Fl_Group* o = new Fl_Group(WB, WB+BH, width-2*WB, height-3*WB-2*BH, "Colors");
- o->labelsize(CTX.fontsize);
- o->hide();
- mesh_butt[14] = new Fl_Check_Button(2*WB, 2*WB+1*BH, IW, BH, "Switch color by geometrical entity");
- mesh_butt[14]->type(FL_TOGGLE_BUTTON);
- mesh_butt[14]->down_box(FL_DOWN_BOX);
- mesh_butt[14]->labelsize(CTX.fontsize);
- mesh_butt[14]->selection_color(FL_YELLOW);
-
- mesh_value[7] = new Fl_Value_Input(2*WB, 2*WB+2*BH, IW, BH, "Predefined color scheme");
- mesh_value[7]->minimum(0);
- mesh_value[7]->maximum(2);
- mesh_value[7]->step(1);
- mesh_value[7]->labelsize(CTX.fontsize);
- mesh_value[7]->textsize(CTX.fontsize);
- mesh_value[7]->type(FL_HORIZONTAL);
- mesh_value[7]->align(FL_ALIGN_RIGHT);
- mesh_value[7]->callback(opt_mesh_color_scheme_cb);
-
- Fl_Scroll* s = new Fl_Scroll(2*WB, 3*WB+3*BH, IW+20, height-3*WB-5*BH);
- i = 0;
- while(MeshOptions_Color[i].str){
- mesh_col[i] = new Fl_Button(2*WB, 3*WB+(3+i)*BH, IW, BH, MeshOptions_Color[i].str);
- mesh_col[i]->callback(color_cb, (void*)MeshOptions_Color[i].function) ;
- mesh_col[i]->labelsize(CTX.fontsize);
- i++;
- }
- s->end();
- o->end();
- }
- o->end();
- }
-
- {
- Fl_Return_Button* o = new Fl_Return_Button(width-2*BB-2*WB, height-BH-WB, BB, BH, "OK");
- o->labelsize(CTX.fontsize);
- o->callback(opt_mesh_ok_cb);
- }
- {
- Fl_Button* o = new Fl_Button(width-BB-WB, height-BH-WB, BB, BH, "Cancel");
- o->labelsize(CTX.fontsize);
- o->callback(cancel_cb, (void*)mesh_window);
- }
-
- if(CTX.center_windows)
- mesh_window->position(m_window->x()+m_window->w()/2-width/2,
- m_window->y()+9*BH-height/2);
- mesh_window->end();
- }
- else{
- if(mesh_window->shown())
- mesh_window->redraw();
- else
- mesh_window->show();
-
- }
-
-}
-
-
-//******************** Create the window for post-processing options *******************
-
-void GUI::create_post_options_window(){
- int i;
-
- if(!init_post_options_window){
- init_post_options_window = 1 ;
-
- int width = 17*CTX.fontsize;
- int height = 5*WB+5*BH ;
-
- post_window = new Fl_Window(width,height);
- post_window->box(WINDOW_BOX);
- post_window->label("Post Processing Options");
- {
- Fl_Tabs* o = new Fl_Tabs(WB, WB, width-2*WB, height-3*WB-BH);
- {
- Fl_Group* o = new Fl_Group(WB, WB+BH, width-2*WB, height-3*WB-2*BH, "Links");
- o->labelsize(CTX.fontsize);
- post_butt[0] = new Fl_Check_Button(2*WB, 2*WB+1*BH, BW, BH, "No link between views");
- post_butt[1] = new Fl_Check_Button(2*WB, 2*WB+2*BH, BW, BH, "Link visible views");
- post_butt[2] = new Fl_Check_Button(2*WB, 2*WB+3*BH, BW, BH, "Link all views");
- for(i=0 ; i<3 ; i++){
- post_butt[i]->type(FL_RADIO_BUTTON);
- post_butt[i]->labelsize(CTX.fontsize);
- post_butt[i]->selection_color(FL_YELLOW);
- }
- o->end();
- }
- {
- Fl_Group* o = new Fl_Group(WB, WB+BH, width-2*WB, height-3*WB-2*BH, "Smoothing");
- o->labelsize(CTX.fontsize);
- post_butt[3] = new Fl_Check_Button(2*WB, 2*WB+1*BH, BW, BH, "Smooth");
- post_butt[3]->type(FL_TOGGLE_BUTTON);
- post_butt[3]->down_box(FL_DOWN_BOX);
- post_butt[3]->labelsize(CTX.fontsize);
- post_butt[3]->selection_color(FL_YELLOW);
- o->end();
- }
- {
- Fl_Group* o = new Fl_Group(WB, WB+BH, width-2*WB, height-3*WB-2*BH, "Animation");
- o->labelsize(CTX.fontsize);
- o->hide();
- post_value[0] = new Fl_Value_Input(2*WB, 2*WB+1*BH, IW, BH, "Delay");
- post_value[0]->minimum(0);
- post_value[0]->maximum(10);
- post_value[0]->step(0.01);
- post_value[0]->labelsize(CTX.fontsize);
- post_value[0]->textsize(CTX.fontsize);
- post_value[0]->type(FL_HORIZONTAL);
- post_value[0]->align(FL_ALIGN_RIGHT);
- o->end();
- }
- o->end();
- }
-
- {
- Fl_Return_Button* o = new Fl_Return_Button(width-2*BB-2*WB, height-BH-WB, BB, BH, "OK");
- o->labelsize(CTX.fontsize);
- o->callback(opt_post_ok_cb);
- }
- {
- Fl_Button* o = new Fl_Button(width-BB-WB, height-BH-WB, BB, BH, "Cancel");
- o->labelsize(CTX.fontsize);
- o->callback(cancel_cb, (void*)post_window);
- }
-
- if(CTX.center_windows)
- post_window->position(m_window->x()+m_window->w()/2-width/2,
+ if(p->getNbOptions())
+ {
+ sprintf(menuname,"Plugins/%s/Options...",name);
+ button->add(menuname, 0,(Fl_Callback *)view_options_plugin_cb,
+ (void*)(pair), 0);
+ p->dialogBox = 0;
+ }
+ }
+ }
+ }
+
+ void GUI::create_menu_window(int argc, char **argv){
+ int i, y;
+
+ if(!init_menu_window){
+ init_menu_window = 1 ;
+
+ int width = 13*CTX.fontsize-CTX.fontsize/2-2 ;
+ MH = BH + BH+6 ; // this is the initial height: no dynamic button is shown!
+
+ m_window = new Fl_Window(width,MH);
+ m_window->box(WINDOW_BOX);
+ m_window->label("Gmsh");
+ m_window->callback(file_quit_cb);
+
+ m_menu_bar = new Fl_Menu_Bar(0,0,width,BH);
+ m_menu_bar->menu(m_menubar_table);
+ m_menu_bar->textsize(CTX.fontsize);
+ m_menu_bar->box(FL_UP_BOX);
+ m_menu_bar->global();
+
+ Fl_Box *o = new Fl_Box(0,BH,width,BH+6);
+ o->box(FL_UP_BOX);
+
+ y = BH + 3;
+
+ m_navig_butt[0] = new Fl_Button(1,y,18,BH/2,"@<");
+ m_navig_butt[0]->labeltype(FL_SYMBOL_LABEL);
+ m_navig_butt[0]->box(FL_FLAT_BOX);
+ m_navig_butt[0]->selection_color(FL_WHITE);
+ m_navig_butt[0]->callback(mod_back_cb);
+ m_navig_butt[1] = new Fl_Button(1,y+BH/2,18,BH/2,"@>");
+ m_navig_butt[1]->labeltype(FL_SYMBOL_LABEL);
+ m_navig_butt[1]->box(FL_FLAT_BOX);
+ m_navig_butt[1]->selection_color(FL_WHITE);
+ m_navig_butt[1]->callback(mod_forward_cb);
+
+ m_module_butt = new Fl_Choice(19,y,width-24,BH);
+ m_module_butt->menu(m_module_table);
+ m_module_butt->textsize(CTX.fontsize);
+ m_module_butt->box(FL_THIN_DOWN_BOX);
+
+ y = MH ;
+
+ for(i=0; i<NB_BUTT_MAX; i++){
+ m_push_butt[i] = new Fl_Button(0,y+i*BH,width,BH);
+ m_push_butt[i]->labelsize(CTX.fontsize);
+ m_push_butt[i]->hide();
+ m_toggle_butt[i] = new Fl_Light_Button(0,y+i*BH,width,BH);
+ m_toggle_butt[i]->labelsize(CTX.fontsize);
+ m_toggle_butt[i]->callback(view_toggle_cb, (void*)i);
+ m_toggle_butt[i]->hide();
+ m_popup_butt[i] = new Fl_Menu_Button(0,y+i*BH,width,BH);
+ m_popup_butt[i]->type(Fl_Menu_Button::POPUP3);
+ m_popup_butt[i]->add("Reload/View", 0,
+ (Fl_Callback *)view_reload_cb, (void*)i, 0);
+ m_popup_butt[i]->add("Reload/All Views", 0,
+ (Fl_Callback *)view_reload_all_cb, (void*)i, 0);
+ m_popup_butt[i]->add("Remove/View", 0,
+ (Fl_Callback *)view_remove_cb, (void*)i, 0);
+ m_popup_butt[i]->add("Remove/All Views", 0,
+ (Fl_Callback *)view_remove_all_cb, (void*)i, 0);
+ m_popup_butt[i]->add("Duplicate/View without Options", 0,
+ (Fl_Callback *)view_duplicate_cb, (void*)i, 0) ;
+ m_popup_butt[i]->add("Duplicate/View with Options", 0,
+ (Fl_Callback *)view_duplicate_with_options_cb, (void*)i, 0) ;
+ m_popup_butt[i]->add("Save as/ASCII View...", 0,
+ (Fl_Callback *)view_save_ascii_cb, (void*)i, 0) ;
+ m_popup_butt[i]->add("Save as/Binary View...", 0,
+ (Fl_Callback *)view_save_binary_cb, (void*)i, 0) ;
+ m_popup_butt[i]->add("Apply as Background Mesh", 0,
+ (Fl_Callback *)view_applybgmesh_cb, (void*)i, FL_MENU_DIVIDER);
+ m_popup_butt[i]->add("Options...", 0,
+ (Fl_Callback *)view_options_cb, (void*)i, 0);
+ add_post_plugins ( m_popup_butt[i] , i);
+ m_popup_butt[i]->textsize(CTX.fontsize);
+ m_popup_butt[i]->hide();
+ }
+
+ m_window->position(CTX.position[0],CTX.position[1]);
+ m_window->end();
+ }
+ else{
+ if(m_window->shown())
+ m_window->redraw();
+ else
+ m_window->show(1, argv);
+
+ }
+
+ }
+
+ // Dynamically set the height of the menu window
+
+ void GUI::set_menu_size(int nb_butt){
+ m_window->size(m_window->w(), MH + nb_butt*BH);
+ }
+
+ // Dynamically set the context
+
+ void GUI::set_context(Context_Item *menu_asked, int flag){
+ static int nb_back = 0, nb_forward = 0, init_context=0;
+ static Context_Item *menu_history[NB_HISTORY_MAX];
+ Context_Item *menu;
+ Post_View *v;
+ int i;
+
+ if(!init_context){
+ init_context = 1;
+ for(i=0 ; i<NB_HISTORY_MAX ; i++){
+ menu_history[i] = NULL ;
+ }
+ }
+
+ if(nb_back > NB_HISTORY_MAX-2) nb_back = 1; // we should do a circular list
+
+ if(flag == -1){
+ if(nb_back > 1){
+ nb_back--;
+ nb_forward++;
+ menu = menu_history[nb_back-1];
+ }
+ else return;
+ }
+ else if(flag == 1){
+ if(nb_forward > 0){
+ nb_back++;
+ nb_forward--;
+ menu = menu_history[nb_back-1];
+ }
+ else return;
+ }
+ else{
+ menu = menu_asked;
+ if(!nb_back || menu_history[nb_back-1] != menu){
+ menu_history[nb_back++] = menu;
+ }
+ nb_forward = 0;
+ }
+
+ int nb = 0;
+
+ if(menu[0].label[0] == '0') m_module_butt->value(0);
+ else if(menu[0].label[0] == '1') m_module_butt->value(1);
+ else if(menu[0].label[0] == '2') m_module_butt->value(2);
+ else {
+ Msg(WARNING, "Something Wrong in your Dynamic Context Definition");
+ return;
+ }
+
+ Msg(STATUS2, menu[0].label+1);
+
+ if(m_module_butt->value() == 2){ // post-processing contexts
+ for(i = 0 ; i < List_Nbr(Post_ViewList) ; i++) {
+ if(i == NB_BUTT_MAX) break;
+ nb++ ;
+ v = (Post_View*)List_Pointer(Post_ViewList,i);
+ m_push_butt[i]->hide();
+ m_toggle_butt[i]->show();
+ m_toggle_butt[i]->value(v->Visible);
+ m_toggle_butt[i]->label(v->Name);
+ m_popup_butt[i]->show();
+ }
+ for(i = List_Nbr(Post_ViewList) ; i < NB_BUTT_MAX ; i++) {
+ m_push_butt[i]->hide();
+ m_toggle_butt[i]->hide();
+ m_popup_butt[i]->hide();
+ }
+ }
+ else{ // geometry and mesh contexts
+ for(i=0 ; i < NB_BUTT_MAX ; i++){
+ m_toggle_butt[i]->hide();
+ m_popup_butt[i]->hide();
+ if(menu[i+1].label){
+ m_push_butt[i]->label(menu[i+1].label);
+ m_push_butt[i]->callback(menu[i+1].callback);
+ m_push_butt[i]->redraw();
+ m_push_butt[i]->show();
+ nb++;
+ }
+ else
+ break;
+ }
+ for(i=nb ; i<NB_BUTT_MAX ; i++){
+ m_toggle_butt[i]->hide();
+ m_popup_butt[i]->hide();
+ m_push_butt[i]->hide();
+ }
+ }
+
+ set_menu_size(nb);
+
+ }
+
+ int GUI::get_context(){
+ return m_module_butt->value();
+ }
+
+
+ //******************************** Create the graphic window ***************************
+
+ void GUI::create_graphic_window(int argc, char **argv){
+ int i, x;
+
+ if(!init_graphic_window){
+ init_graphic_window = 1 ;
+
+ int sh = 2*CTX.fontsize-4; // status bar height
+ int sw = CTX.fontsize+4; //status button width
+ int width = CTX.viewport[2]-CTX.viewport[0];
+ int glheight = CTX.viewport[3]-CTX.viewport[1];
+ int height = glheight + sh;
+
+ g_window = new Fl_Window(width, height);
+ g_window->callback(file_quit_cb);
+
+ g_opengl_window = new Opengl_Window(0,0,width,glheight);
+ if(!opt_general_double_buffer(0,GMSH_GET,0)){
+ Msg(INFO, "Setting Opengl visual to single buffered");
+ g_opengl_window->mode(FL_RGB | FL_DEPTH | FL_SINGLE);
+ }
+ g_opengl_window->end();
+
+ {
+ Fl_Group *o = new Fl_Group(0,glheight,width,sh);
+ o->box(FL_THIN_UP_BOX);
+
+ x = 2;
+
+ g_status_butt[0] = new Fl_Button(x,glheight+2,sw,sh-4,"X"); x+=sw;
+ g_status_butt[0]->callback(status_xyz1p_cb, (void*)0);
+ //g_status_butt[0]->tooltip("Set X view");
+ g_status_butt[1] = new Fl_Button(x,glheight+2,sw,sh-4,"Y"); x+=sw;
+ g_status_butt[1]->callback(status_xyz1p_cb, (void*)1);
+ g_status_butt[2] = new Fl_Button(x,glheight+2,sw,sh-4,"Z"); x+=sw;
+ g_status_butt[2]->callback(status_xyz1p_cb, (void*)2);
+ g_status_butt[3] = new Fl_Button(x,glheight+2,2*CTX.fontsize,sh-4,"1:1"); x+=2*CTX.fontsize;
+ g_status_butt[3]->callback(status_xyz1p_cb, (void*)3);
+ g_status_butt[4] = new Fl_Button(x,glheight+2,sw,sh-4,"?"); x+=sw;
+ g_status_butt[4]->callback(status_xyz1p_cb, (void*)4);
+ g_status_butt[5] = new Fl_Button(x,glheight+2,sw,sh-4); x+=sw;
+ g_status_butt[5]->callback(status_play_cb);
+ start_bmp = new Fl_Bitmap(start_bits,start_width,start_height);
+ start_bmp->label(g_status_butt[5]);
+ stop_bmp = new Fl_Bitmap(stop_bits,stop_width,stop_height);
+ g_status_butt[5]->deactivate();
+ g_status_butt[6] = new Fl_Button(x,glheight+2,sw,sh-4); x+=sw;
+ g_status_butt[6]->callback(status_cancel_cb);
+ abort_bmp = new Fl_Bitmap(abort_bits,abort_width,abort_height);
+ abort_bmp->label(g_status_butt[6]);
+ g_status_butt[6]->deactivate();
+ for(i = 0 ; i<7 ; i++){
+ g_status_butt[i]->box(FL_FLAT_BOX);
+ g_status_butt[i]->selection_color(FL_WHITE);
+ g_status_butt[i]->labelsize(CTX.fontsize);
+ g_status_butt[i]->align(FL_ALIGN_CENTER|FL_ALIGN_INSIDE|FL_ALIGN_CLIP);
+ }
+
+ 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,(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);
+ g_status_label[i]->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE|FL_ALIGN_CLIP);
+ }
+
+ o->end();
+ }
+
+ g_window->resizable(g_opengl_window);
+ g_window->position(CTX.gl_position[0],CTX.gl_position[1]);
+ g_window->end();
+ }
+ else{
+ if(g_window->shown())
+ g_window->redraw();
+ else
+ g_window->show(1, argv);
+
+ }
+ }
+
+ // Set the size of the graphical window
+
+ void GUI::set_size(int new_w, int new_h){
+ g_window->size(new_w,new_h+g_window->h()-g_opengl_window->h());
+ }
+
+ // Set graphic window title
+
+ void GUI::set_title(char *str){
+ g_window->label(str);
+ }
+
+ // Set animation button
+
+ void GUI::set_anim(int mode){
+ if(mode){
+ g_status_butt[5]->callback(status_play_cb);
+ start_bmp->label(g_status_butt[5]);
+ }
+ else{
+ g_status_butt[5]->callback(status_pause_cb);
+ stop_bmp->label(g_status_butt[5]);
+ }
+ }
+
+ // Set the status messages
+
+ void GUI::set_status(char *msg, int num){
+ g_status_label[num]->label(msg);
+ g_status_label[num]->redraw();
+ }
+
+ // set the current drawing context
+
+ void GUI::make_opengl_current(){
+ g_opengl_window->make_current();
+ }
+
+ void GUI::make_overlay_current(){
+ g_opengl_window->make_overlay_current();
+ }
+
+ // Draw the opengl window
+
+ void GUI::redraw_opengl(){
+ g_opengl_window->redraw();
+ }
+
+ // Draw the opengl overlay window
+
+ void GUI::redraw_overlay(){
+ g_opengl_window->redraw_overlay();
+ }
+
+ //************************ Create the window for general options ***********************
+
+ void GUI::create_general_options_window(){
+ int i;
+
+ if(!init_general_options_window){
+ init_general_options_window = 1 ;
+
+ int width = 25*CTX.fontsize;
+ int height = 5*WB+10*BH ;
+
+ gen_window = new Fl_Window(width,height);
+ gen_window->box(WINDOW_BOX);
+ gen_window->label("General Options");
+ {
+ Fl_Tabs* o = new Fl_Tabs(WB, WB, width-2*WB, height-3*WB-BH);
+ {
+ Fl_Group* o = new Fl_Group(WB, WB+BH, width-2*WB, height-3*WB-2*BH, "Display");
+ o->labelsize(CTX.fontsize);
+ gen_butt[0] = new Fl_Check_Button(2*WB, 2*WB+1*BH, BW, BH, "Show moving axes");
+ gen_butt[1] = new Fl_Check_Button(2*WB, 2*WB+2*BH, BW, BH, "Show small axes");
+ gen_butt[2] = new Fl_Check_Button(2*WB, 2*WB+3*BH, BW, BH, "Enable fast redraw");
+ gen_butt[3] = new Fl_Check_Button(2*WB, 2*WB+4*BH, BW, BH, "Enable double buffering");
+ gen_butt[4] = new Fl_Check_Button(2*WB, 2*WB+5*BH, BW, BH, "Use display lists");
+ gen_butt[5] = new Fl_Check_Button(2*WB, 2*WB+6*BH, BW, BH, "Enable alpha blending");
+ gen_butt[6] = new Fl_Check_Button(2*WB, 2*WB+7*BH, BW, BH, "Use trackball rotation mode");
+ for(i=0 ; i<7 ; i++){
+ gen_butt[i]->type(FL_TOGGLE_BUTTON);
+ gen_butt[i]->down_box(FL_DOWN_BOX);
+ gen_butt[i]->labelsize(CTX.fontsize);
+ gen_butt[i]->selection_color(FL_YELLOW);
+ }
+ o->end();
+ }
+ {
+ Fl_Group* o = new Fl_Group(WB, WB+BH, width-2*WB, height-3*WB-2*BH, "Output");
+ o->labelsize(CTX.fontsize);
+ gen_butt[7] = new Fl_Check_Button(2*WB, 2*WB+1*BH, BW, BH, "Print messages on terminal");
+ gen_butt[8] = new Fl_Check_Button(2*WB, 2*WB+2*BH, BW, BH, "Save session information on exit");
+ gen_butt[9] = new Fl_Check_Button(2*WB, 2*WB+3*BH, BW, BH, "Save options on exit");
+ for(i=7 ; i<10 ; i++){
+ gen_butt[i]->type(FL_TOGGLE_BUTTON);
+ gen_butt[i]->down_box(FL_DOWN_BOX);
+ gen_butt[i]->labelsize(CTX.fontsize);
+ gen_butt[i]->selection_color(FL_YELLOW);
+ }
+ gen_value[5] = new Fl_Value_Input(2*WB, 2*WB+4*BH, IW, BH, "Message verbosity");
+ gen_value[5]->minimum(0);
+ gen_value[5]->maximum(10);
+ gen_value[5]->step(1);
+ gen_value[5]->labelsize(CTX.fontsize);
+ gen_value[5]->textsize(CTX.fontsize);
+ gen_value[5]->type(FL_HORIZONTAL);
+ gen_value[5]->align(FL_ALIGN_RIGHT);
+ gen_input[0] = new Fl_Input(2*WB, 2*WB+5*BH, IW, BH, "Default file name");
+ gen_input[1] = new Fl_Input(2*WB, 2*WB+6*BH, IW, BH, "Temporary file");
+ gen_input[2] = new Fl_Input(2*WB, 2*WB+7*BH, IW, BH, "Error file");
+ gen_input[3] = new Fl_Input(2*WB, 2*WB+8*BH, IW, BH, "Option file");
+ for(i=0 ; i<4 ; i++){
+ gen_input[i]->labelsize(CTX.fontsize);
+ gen_input[i]->textsize(CTX.fontsize);
+ gen_input[i]->align(FL_ALIGN_RIGHT);
+ }
+ o->end();
+ }
+ {
+ Fl_Group* o = new Fl_Group(WB, WB+BH, width-2*WB, height-3*WB-2*BH, "Projection");
+ o->labelsize(CTX.fontsize);
+ o->hide();
+ gen_butt[10] = new Fl_Check_Button(2*WB, 2*WB+1*BH, BW, BH, "Orthographic");
+ gen_butt[11] = new Fl_Check_Button(2*WB, 2*WB+2*BH, BW, BH, "Perspective");
+ for(i=10 ; i<12 ; i++){
+ gen_butt[i]->type(FL_RADIO_BUTTON);
+ gen_butt[i]->labelsize(CTX.fontsize);
+ gen_butt[i]->selection_color(FL_YELLOW);
+ }
+ o->end();
+ }
+ {
+ Fl_Group* o = new Fl_Group(WB, WB+BH, width-2*WB, height-3*WB-2*BH, "Colors");
+ o->labelsize(CTX.fontsize);
+ o->hide();
+ gen_value[0] = new Fl_Value_Input(2*WB, 2*WB+1*BH, IW, BH, "Predefined color scheme");
+ gen_value[0]->minimum(0);
+ gen_value[0]->maximum(2);
+ gen_value[0]->step(1);
+ gen_value[0]->labelsize(CTX.fontsize);
+ gen_value[0]->textsize(CTX.fontsize);
+ gen_value[0]->type(FL_HORIZONTAL);
+ gen_value[0]->align(FL_ALIGN_RIGHT);
+ gen_value[0]->callback(opt_general_color_scheme_cb);
+
+ Fl_Scroll* s = new Fl_Scroll(2*WB, 3*WB+2*BH, IW+20, height-3*WB-4*BH);
+ i = 0;
+ while(GeneralOptions_Color[i].str){
+ gen_col[i] = new Fl_Button(2*WB, 3*WB+(2+i)*BH, IW, BH, GeneralOptions_Color[i].str);
+ gen_col[i]->callback(color_cb, (void*)GeneralOptions_Color[i].function) ;
+ gen_col[i]->labelsize(CTX.fontsize);
+ i++;
+ }
+ s->end();
+ o->end();
+ }
+ {
+ Fl_Group* o = new Fl_Group(WB, WB+BH, width-2*WB, height-3*WB-2*BH, "Light");
+ o->labelsize(CTX.fontsize);
+ o->hide();
+ gen_value[1] = new Fl_Value_Input(2*WB, 2*WB+1*BH, IW, BH, "Material shininess");
+ gen_value[1]->minimum(0);
+ gen_value[1]->maximum(10);
+ gen_value[1]->step(0.1);
+ gen_butt[12] = new Fl_Check_Button(2*WB, 2*WB+2*BH, BW, BH, "Moving light");
+ gen_butt[12]->type(FL_TOGGLE_BUTTON);
+ gen_butt[12]->down_box(FL_DOWN_BOX);
+ gen_butt[12]->labelsize(CTX.fontsize);
+ gen_butt[12]->selection_color(FL_YELLOW);
+ gen_value[2] = new Fl_Value_Input(2*WB, 2*WB+3*BH, IW, BH, "Light position X");
+ gen_value[2]->minimum(-1);
+ gen_value[2]->maximum(1);
+ gen_value[2]->step(0.01);
+ gen_value[3] = new Fl_Value_Input(2*WB, 2*WB+4*BH, IW, BH, "Light position Y");
+ gen_value[3]->minimum(-1);
+ gen_value[3]->maximum(1);
+ gen_value[3]->step(0.01);
+ gen_value[4] = new Fl_Value_Input(2*WB, 2*WB+5*BH, IW, BH, "Light position Z");
+ gen_value[4]->minimum(-1);
+ gen_value[4]->maximum(1);
+ gen_value[4]->step(0.01);
+ for(i=1 ; i<5 ; i++){
+ gen_value[i]->labelsize(CTX.fontsize);
+ gen_value[i]->textsize(CTX.fontsize);
+ gen_value[i]->type(FL_HORIZONTAL);
+ gen_value[i]->align(FL_ALIGN_RIGHT);
+ }
+ o->end();
+ }
+ o->end();
+ }
+
+ {
+ Fl_Return_Button* o = new Fl_Return_Button(width-2*BB-2*WB, height-BH-WB, BB, BH, "OK");
+ o->labelsize(CTX.fontsize);
+ o->callback(opt_general_ok_cb);
+ }
+ {
+ Fl_Button* o = new Fl_Button(width-BB-WB, height-BH-WB, BB, BH, "Cancel");
+ o->labelsize(CTX.fontsize);
+ o->callback(cancel_cb, (void*)gen_window);
+ }
+
+ if(CTX.center_windows)
+ gen_window->position(m_window->x()+m_window->w()/2-width/2,
m_window->y()+9*BH-height/2);
- post_window->end();
- }
- else{
- if(post_window->shown())
- post_window->redraw();
- else
- post_window->show();
-
- }
-
-}
-
-//*********************** Create the window for the statistics *************************
-
-void GUI::create_statistics_window(){
- int i;
-
- if(!init_statistics_window){
- init_statistics_window = 1 ;
-
- int width = 22*CTX.fontsize;
- int height = 5*WB+16*BH ;
-
- stat_window = new Fl_Window(width,height);
- stat_window->box(WINDOW_BOX);
- stat_window->label("Statistics");
- {
- Fl_Tabs* o = new Fl_Tabs(WB, WB, width-2*WB, height-3*WB-BH);
- {
- Fl_Group* o = new Fl_Group(WB, WB+BH, width-2*WB, height-3*WB-2*BH, "Geometry");
- o->labelsize(CTX.fontsize);
- o->hide();
- stat_value[0] = new Fl_Output(width/2, 2*WB+1*BH, IW, BH, "Number of points");
- stat_value[1] = new Fl_Output(width/2, 2*WB+2*BH, IW, BH, "Number of curves");
- stat_value[2] = new Fl_Output(width/2, 2*WB+3*BH, IW, BH, "Number of surfaces");
- stat_value[3] = new Fl_Output(width/2, 2*WB+4*BH, IW, BH, "Number of volumes");
- o->end();
- }
- {
- Fl_Group* o = new Fl_Group(WB, WB+BH, width-2*WB, height-3*WB-2*BH, "Mesh");
- o->labelsize(CTX.fontsize);
- stat_value[4] = new Fl_Output(width/2, 2*WB+1*BH, IW, BH, "Nodes on curves");
- stat_value[5] = new Fl_Output(width/2, 2*WB+2*BH, IW, BH, "Nodes on surfaces");
- stat_value[6] = new Fl_Output(width/2, 2*WB+3*BH, IW, BH, "Nodes in volumes");
- stat_value[7] = new Fl_Output(width/2, 2*WB+4*BH, IW, BH, "Triangles");
- stat_value[8] = new Fl_Output(width/2, 2*WB+5*BH, IW, BH, "Quadrangles");
- stat_value[9] = new Fl_Output(width/2, 2*WB+6*BH, IW, BH, "Tetrahedra");
- stat_value[10] = new Fl_Output(width/2, 2*WB+7*BH, IW, BH, "Hexahedra");
- stat_value[11] = new Fl_Output(width/2, 2*WB+8*BH, IW, BH, "Prisms");
- stat_value[12] = new Fl_Output(width/2, 2*WB+9*BH, IW, BH, "Time for 1D mesh");
- stat_value[13] = new Fl_Output(width/2, 2*WB+10*BH, IW, BH, "Time for 2D mesh");
- stat_value[14] = new Fl_Output(width/2, 2*WB+11*BH, IW, BH, "Time for 3D mesh");
- stat_value[15] = new Fl_Output(width/2, 2*WB+12*BH, IW, BH, "Gamma factor");
- stat_value[16] = new Fl_Output(width/2, 2*WB+13*BH, IW, BH, "Eta factor");
- stat_value[17] = new Fl_Output(width/2, 2*WB+14*BH, IW, BH, "Rho factor");
- o->end();
- }
- {
- Fl_Group* o = new Fl_Group(WB, WB+BH, width-2*WB, height-3*WB-2*BH, "Post-processing");
- o->labelsize(CTX.fontsize);
- o->hide();
- stat_value[18] = new Fl_Output(width/2, 2*WB+1*BH, IW, BH, "Views loaded");
- stat_value[19] = new Fl_Output(width/2, 2*WB+2*BH, IW, BH, "Visible Points");
- stat_value[20] = new Fl_Output(width/2, 2*WB+3*BH, IW, BH, "Visible lines");
- stat_value[21] = new Fl_Output(width/2, 2*WB+4*BH, IW, BH, "Visible triangles");
- stat_value[22] = new Fl_Output(width/2, 2*WB+5*BH, IW, BH, "Visible tetrahedra");
- o->end();
- }
- o->end();
- }
-
- for(i=0 ; i<23 ; i++){
- stat_value[i]->labelsize(CTX.fontsize);
- stat_value[i]->textsize(CTX.fontsize);
- stat_value[i]->type(FL_HORIZONTAL);
- stat_value[i]->align(FL_ALIGN_LEFT);
- stat_value[i]->value(0);
- }
-
- {
- Fl_Return_Button* o = new Fl_Return_Button(width-2*BB-BB/4-2*WB, height-BH-WB, BB+BB/4, BH, "Update");
- o->labelsize(CTX.fontsize);
- o->callback(opt_statistics_update_cb);
- }
- {
- Fl_Button* o = new Fl_Button(width-BB-WB, height-BH-WB, BB, BH, "Cancel");
- o->labelsize(CTX.fontsize);
- o->callback(cancel_cb, (void*)stat_window);
- }
-
- if(CTX.center_windows)
- stat_window->position(m_window->x()+m_window->w()/2-width/2,
+ gen_window->end();
+ }
+ else{
+ if(gen_window->shown())
+ gen_window->redraw();
+ else
+ gen_window->show();
+
+ }
+
+ }
+
+ //************************ Create the window for geometry options **********************
+
+ void GUI::create_geometry_options_window(){
+ int i;
+
+ if(!init_geometry_options_window){
+ init_geometry_options_window = 1 ;
+
+ int width = 25*CTX.fontsize;
+ int height = 5*WB+9*BH ;
+
+ geo_window = new Fl_Window(width,height);
+ geo_window->box(WINDOW_BOX);
+ geo_window->label("Geometry Options");
+ {
+ Fl_Tabs* o = new Fl_Tabs(WB, WB, width-2*WB, height-3*WB-BH);
+ {
+ Fl_Group* o = new Fl_Group(WB, WB+BH, width-2*WB, height-3*WB-2*BH, "Visibility");
+ o->labelsize(CTX.fontsize);
+ geo_butt[0] = new Fl_Check_Button(2*WB, 2*WB+1*BH, IW, BH, "Points");
+ geo_butt[1] = new Fl_Check_Button(2*WB, 2*WB+2*BH, IW, BH, "Curves");
+ geo_butt[2] = new Fl_Check_Button(2*WB, 2*WB+3*BH, IW, BH, "Surfaces");
+ geo_butt[3] = new Fl_Check_Button(2*WB, 2*WB+4*BH, IW, BH, "Volumes");
+ geo_butt[4] = new Fl_Check_Button(width/2, 2*WB+1*BH, IW, BH, "Point numbers");
+ geo_butt[5] = new Fl_Check_Button(width/2, 2*WB+2*BH, IW, BH, "Curve numbers");
+ geo_butt[6] = new Fl_Check_Button(width/2, 2*WB+3*BH, IW, BH, "Surface numbers");
+ geo_butt[7] = new Fl_Check_Button(width/2, 2*WB+4*BH, IW, BH, "Volume numbers");
+ for(i=0 ; i<8 ; i++){
+ geo_butt[i]->type(FL_TOGGLE_BUTTON);
+ geo_butt[i]->down_box(FL_DOWN_BOX);
+ geo_butt[i]->labelsize(CTX.fontsize);
+ geo_butt[i]->selection_color(FL_YELLOW);
+ }
+
+ geo_input = new Fl_Input(2*WB, 2*WB+5*BH, IW, BH, "Show by entity number");
+ geo_input->labelsize(CTX.fontsize);
+ geo_input->textsize(CTX.fontsize);
+ geo_input->align(FL_ALIGN_RIGHT);
+ geo_input->callback(opt_geometry_show_by_entity_num_cb);
+ geo_input->when(FL_WHEN_ENTER_KEY|FL_WHEN_NOT_CHANGED);
+
+ geo_value[0] = new Fl_Value_Input(2*WB, 2*WB+6*BH, IW, BH, "Normals");
+ geo_value[0]->minimum(0);
+ geo_value[0]->maximum(100);
+ geo_value[0]->step(0.1);
+ geo_value[1] = new Fl_Value_Input(2*WB, 2*WB+7*BH, IW, BH, "Tangents");
+ geo_value[1]->minimum(0);
+ geo_value[1]->maximum(100);
+ geo_value[1]->step(0.1);
+ for(i=0 ; i<2 ; i++){
+ geo_value[i]->labelsize(CTX.fontsize);
+ geo_value[i]->textsize(CTX.fontsize);
+ geo_value[i]->type(FL_HORIZONTAL);
+ geo_value[i]->align(FL_ALIGN_RIGHT);
+ }
+ o->end();
+ }
+ {
+ Fl_Group* o = new Fl_Group(WB, WB+BH, width-2*WB, height-3*WB-2*BH, "Colors");
+ o->labelsize(CTX.fontsize);
+ o->hide();
+ geo_value[2] = new Fl_Value_Input(2*WB, 2*WB+1*BH, IW, BH, "Predefined color scheme");
+ geo_value[2]->minimum(0);
+ geo_value[2]->maximum(2);
+ geo_value[2]->step(1);
+ geo_value[2]->labelsize(CTX.fontsize);
+ geo_value[2]->textsize(CTX.fontsize);
+ geo_value[2]->type(FL_HORIZONTAL);
+ geo_value[2]->align(FL_ALIGN_RIGHT);
+ geo_value[2]->callback(opt_geometry_color_scheme_cb);
+
+ Fl_Scroll* s = new Fl_Scroll(2*WB, 3*WB+2*BH, IW+20, height-3*WB-4*BH);
+ i = 0;
+ while(GeometryOptions_Color[i].str){
+ geo_col[i] = new Fl_Button(2*WB, 3*WB+(2+i)*BH, IW, BH, GeometryOptions_Color[i].str);
+ geo_col[i]->callback(color_cb, (void*)GeometryOptions_Color[i].function) ;
+ geo_col[i]->labelsize(CTX.fontsize);
+ i++;
+ }
+ s->end();
+ o->end();
+ }
+ o->end();
+ }
+
+ {
+ Fl_Return_Button* o = new Fl_Return_Button(width-2*BB-2*WB, height-BH-WB, BB, BH, "OK");
+ o->labelsize(CTX.fontsize);
+ o->callback(opt_geometry_ok_cb);
+ }
+ {
+ Fl_Button* o = new Fl_Button(width-BB-WB, height-BH-WB, BB, BH, "Cancel");
+ o->labelsize(CTX.fontsize);
+ o->callback(cancel_cb, (void*)geo_window);
+ }
+
+ if(CTX.center_windows)
+ geo_window->position(m_window->x()+m_window->w()/2-width/2,
m_window->y()+9*BH-height/2);
- stat_window->end();
- set_statistics();
- stat_window->show();
- }
- else{
- if(stat_window->shown())
- stat_window->redraw();
- else{
- set_statistics();
- stat_window->show();
- }
- }
-
-}
-
-void GUI::set_statistics(){
-
- int i;
- static double s[50];
- static char label[50][256];
-
- GetStatistics(s);
-
- // geom
- sprintf(label[0], "%g", s[0]); stat_value[0]->value(label[0]);
- sprintf(label[1], "%g", s[1]); stat_value[1]->value(label[1]);
- sprintf(label[2], "%g", s[2]); stat_value[2]->value(label[2]);
- sprintf(label[3], "%g", s[3]); stat_value[3]->value(label[3]);
-
- // mesh
- sprintf(label[4], "%g", s[4]); stat_value[4]->value(label[4]);
- sprintf(label[5], "%g", s[5]); stat_value[5]->value(label[5]);
- sprintf(label[6], "%g", s[6]); stat_value[6]->value(label[6]);
- sprintf(label[7], "%g", s[7]-s[8]); stat_value[7]->value(label[7]);
- sprintf(label[8], "%g", s[8]); stat_value[8]->value(label[8]);
- sprintf(label[9], "%g", s[9]); stat_value[9]->value(label[9]);
- sprintf(label[10], "%g", s[10]); stat_value[10]->value(label[10]);
- sprintf(label[11], "%g", s[11]); stat_value[11]->value(label[11]);
- sprintf(label[12], "%g", s[12]); stat_value[12]->value(label[12]);
- sprintf(label[13], "%g", s[13]); stat_value[13]->value(label[13]);
- sprintf(label[14], "%g", s[14]); stat_value[14]->value(label[14]);
- sprintf(label[15], "%.4g (%.4g->%.4g)", s[17], s[19], s[18]);
- stat_value[15]->value(label[15]);
- sprintf(label[16], "%.4g (%.4g->%.4g)", s[20], s[22], s[21]);
- stat_value[16]->value(label[16]);
- sprintf(label[17], "%.4g (%.4g->%.4g)", s[23], s[25], s[24]);
- stat_value[17]->value(label[17]);
-
- // post
- s[15] = List_Nbr(Post_ViewList) ;
- sprintf(label[18], "%g", s[15]); stat_value[18]->value(label[18]);
- s[16] = s[17] = s[18] = s[19] = 0 ;
- for(i=0 ; i<List_Nbr(Post_ViewList) ; i++){
- Post_View *v = (Post_View*)List_Pointer(Post_ViewList, i);
- if(v->Visible){
- s[16] += v->NbSP + v->NbVP + v->NbTP;
- s[17] += v->NbSL + v->NbVL + v->NbTL;
- s[18] += v->NbST + v->NbVT + v->NbTT;
- s[19] += v->NbSS + v->NbVS + v->NbTS;
- }
- }
- sprintf(label[19], "%g", s[16]); stat_value[19]->value(label[19]);
- sprintf(label[20], "%g", s[17]); stat_value[20]->value(label[20]);
- sprintf(label[21], "%g", s[18]); stat_value[21]->value(label[21]);
- sprintf(label[22], "%g", s[19]); stat_value[22]->value(label[22]);
-
- for(i=0 ; i<23 ; i++)
- stat_value[16]->redraw();
-
+ geo_window->end();
+ }
+ else{
+ if(geo_window->shown())
+ geo_window->redraw();
+ else
+ geo_window->show();
+
+ }
+
+ }
+
+ //****************************** Create the window for mesh options ********************
+
+ void GUI::create_mesh_options_window(){
+ int i;
+
+ if(!init_mesh_options_window){
+ init_mesh_options_window = 1 ;
+
+ int width = 25*CTX.fontsize;
+ int height = 5*WB+9*BH ;
+
+ mesh_window = new Fl_Window(width,height);
+ mesh_window->box(WINDOW_BOX);
+ mesh_window->label("Mesh Options");
+ {
+ Fl_Tabs* o = new Fl_Tabs(WB, WB, width-2*WB, height-3*WB-BH);
+ {
+ Fl_Group* o = new Fl_Group(WB, WB+BH, width-2*WB, height-3*WB-2*BH, "Algorithm");
+ o->labelsize(CTX.fontsize);
+ o->hide();
+ mesh_butt[0] = new Fl_Check_Button(2*WB, 2*WB+1*BH, BW, BH, "Second order elements");
+ mesh_butt[1] = new Fl_Check_Button(2*WB, 2*WB+2*BH, BW, BH, "Interactive");
+ mesh_butt[2] = new Fl_Check_Button(2*WB, 2*WB+3*BH, BW, BH, "Anisotropic");
+ for(i=0 ; i<3 ; i++){
+ mesh_butt[i]->type(FL_TOGGLE_BUTTON);
+ mesh_butt[i]->down_box(FL_DOWN_BOX);
+ mesh_butt[i]->labelsize(CTX.fontsize);
+ mesh_butt[i]->selection_color(FL_YELLOW);
+ }
+ mesh_value[0] = new Fl_Value_Input(2*WB, 2*WB+4*BH, IW, BH, "Number of smoothing steps");
+ mesh_value[0]->minimum(0);
+ mesh_value[0]->maximum(100);
+ mesh_value[0]->step(1);
+ mesh_value[1] = new Fl_Value_Input(2*WB, 2*WB+5*BH, IW, BH, "Mesh scaling factor");
+ mesh_value[1]->minimum(0.001);
+ mesh_value[1]->maximum(1000);
+ mesh_value[1]->step(0.001);
+ mesh_value[2] = new Fl_Value_Input(2*WB, 2*WB+6*BH, IW, BH, "Characteristic length factor");
+ mesh_value[2]->minimum(0.001);
+ mesh_value[2]->maximum(1000);
+ mesh_value[2]->step(0.001);
+ mesh_value[3] = new Fl_Value_Input(2*WB, 2*WB+7*BH, IW, BH, "Random perturbation factor");
+ mesh_value[3]->minimum(1.e-6);
+ mesh_value[3]->maximum(1.e-1);
+ mesh_value[3]->step(1.e-6);
+ for(i = 0 ; i<4 ; i++){
+ mesh_value[i]->labelsize(CTX.fontsize);
+ mesh_value[i]->textsize(CTX.fontsize);
+ mesh_value[i]->type(FL_HORIZONTAL);
+ mesh_value[i]->align(FL_ALIGN_RIGHT);
+ }
+ o->end();
+ }
+ {
+ Fl_Group* o = new Fl_Group(WB, WB+BH, width-2*WB, height-3*WB-2*BH, "Visibility");
+ o->labelsize(CTX.fontsize);
+ mesh_butt[3] = new Fl_Check_Button(2*WB, 2*WB+1*BH, IW, BH, "Points");
+ mesh_butt[4] = new Fl_Check_Button(2*WB, 2*WB+2*BH, IW, BH, "Curves");
+ mesh_butt[5] = new Fl_Check_Button(2*WB, 2*WB+3*BH, IW, BH, "Surfaces");
+ mesh_butt[6] = new Fl_Check_Button(2*WB, 2*WB+4*BH, IW, BH, "Volumes");
+ mesh_butt[7] = new Fl_Check_Button(width/2, 2*WB+1*BH, IW, BH, "Point Numbers");
+ mesh_butt[8] = new Fl_Check_Button(width/2, 2*WB+2*BH, IW, BH, "Curve Numbers");
+ mesh_butt[9] = new Fl_Check_Button(width/2, 2*WB+3*BH, IW, BH, "Surface Numbers");
+ mesh_butt[10] = new Fl_Check_Button(width/2, 2*WB+4*BH, IW, BH, "Volume Numbers");
+ for(i=3 ; i<11 ; i++){
+ mesh_butt[i]->type(FL_TOGGLE_BUTTON);
+ mesh_butt[i]->down_box(FL_DOWN_BOX);
+ mesh_butt[i]->labelsize(CTX.fontsize);
+ mesh_butt[i]->selection_color(FL_YELLOW);
+ }
+ mesh_input = new Fl_Input(2*WB, 2*WB+5*BH, IW, BH, "Show by entity Number");
+ mesh_input->labelsize(CTX.fontsize);
+ mesh_input->textsize(CTX.fontsize);
+ mesh_input->align(FL_ALIGN_RIGHT);
+ mesh_input->callback(opt_mesh_show_by_entity_num_cb);
+ mesh_input->when(FL_WHEN_ENTER_KEY|FL_WHEN_NOT_CHANGED);
+
+ mesh_value[4] = new Fl_Value_Input(2*WB, 2*WB+6*BH, IW, BH, "Show by element quality");
+ mesh_value[4]->minimum(0);
+ mesh_value[4]->maximum(1);
+ mesh_value[4]->step(0.001);
+ mesh_value[5] = new Fl_Value_Input(2*WB, 2*WB+7*BH, IW, BH, "Normals");
+ mesh_value[5]->minimum(0);
+ mesh_value[5]->maximum(100);
+ mesh_value[5]->step(1);
+ for(i=4 ; i<6 ; i++){
+ mesh_value[i]->labelsize(CTX.fontsize);
+ mesh_value[i]->textsize(CTX.fontsize);
+ mesh_value[i]->type(FL_HORIZONTAL);
+ mesh_value[i]->align(FL_ALIGN_RIGHT);
+ }
+ o->end();
+ }
+ {
+ Fl_Group* o = new Fl_Group(WB, WB+BH, width-2*WB, height-3*WB-2*BH, "Aspect");
+ o->labelsize(CTX.fontsize);
+ o->hide();
+ mesh_butt[11] = new Fl_Check_Button(2*WB, 2*WB+1*BH, BW, BH, "Wireframe");
+ mesh_butt[12] = new Fl_Check_Button(2*WB, 2*WB+2*BH, BW, BH, "Hidden lines");
+ mesh_butt[13] = new Fl_Check_Button(2*WB, 2*WB+3*BH, BW, BH, "Solid");
+ for(i=11 ; i<14 ; i++){
+ mesh_butt[i]->type(FL_RADIO_BUTTON);
+ mesh_butt[i]->down_box(FL_DOWN_BOX);
+ mesh_butt[i]->labelsize(CTX.fontsize);
+ mesh_butt[i]->selection_color(FL_YELLOW);
+ }
+ mesh_value[6] = new Fl_Value_Input(2*WB, 2*WB+4*BH, IW, BH, "Explode elements");
+ mesh_value[6]->minimum(0);
+ mesh_value[6]->maximum(1);
+ mesh_value[6]->step(0.01);
+ mesh_value[6]->labelsize(CTX.fontsize);
+ mesh_value[6]->textsize(CTX.fontsize);
+ mesh_value[6]->type(FL_HORIZONTAL);
+ mesh_value[6]->align(FL_ALIGN_RIGHT);
+ o->end();
+ }
+ {
+ Fl_Group* o = new Fl_Group(WB, WB+BH, width-2*WB, height-3*WB-2*BH, "Colors");
+ o->labelsize(CTX.fontsize);
+ o->hide();
+ mesh_butt[14] = new Fl_Check_Button(2*WB, 2*WB+1*BH, IW, BH, "Switch color by geometrical entity");
+ mesh_butt[14]->type(FL_TOGGLE_BUTTON);
+ mesh_butt[14]->down_box(FL_DOWN_BOX);
+ mesh_butt[14]->labelsize(CTX.fontsize);
+ mesh_butt[14]->selection_color(FL_YELLOW);
+
+ mesh_value[7] = new Fl_Value_Input(2*WB, 2*WB+2*BH, IW, BH, "Predefined color scheme");
+ mesh_value[7]->minimum(0);
+ mesh_value[7]->maximum(2);
+ mesh_value[7]->step(1);
+ mesh_value[7]->labelsize(CTX.fontsize);
+ mesh_value[7]->textsize(CTX.fontsize);
+ mesh_value[7]->type(FL_HORIZONTAL);
+ mesh_value[7]->align(FL_ALIGN_RIGHT);
+ mesh_value[7]->callback(opt_mesh_color_scheme_cb);
+
+ Fl_Scroll* s = new Fl_Scroll(2*WB, 3*WB+3*BH, IW+20, height-3*WB-5*BH);
+ i = 0;
+ while(MeshOptions_Color[i].str){
+ mesh_col[i] = new Fl_Button(2*WB, 3*WB+(3+i)*BH, IW, BH, MeshOptions_Color[i].str);
+ mesh_col[i]->callback(color_cb, (void*)MeshOptions_Color[i].function) ;
+ mesh_col[i]->labelsize(CTX.fontsize);
+ i++;
+ }
+ s->end();
+ o->end();
+ }
+ o->end();
+ }
+
+ {
+ Fl_Return_Button* o = new Fl_Return_Button(width-2*BB-2*WB, height-BH-WB, BB, BH, "OK");
+ o->labelsize(CTX.fontsize);
+ o->callback(opt_mesh_ok_cb);
+ }
+ {
+ Fl_Button* o = new Fl_Button(width-BB-WB, height-BH-WB, BB, BH, "Cancel");
+ o->labelsize(CTX.fontsize);
+ o->callback(cancel_cb, (void*)mesh_window);
+ }
+
+ if(CTX.center_windows)
+ mesh_window->position(m_window->x()+m_window->w()/2-width/2,
+ m_window->y()+9*BH-height/2);
+ mesh_window->end();
+ }
+ else{
+ if(mesh_window->shown())
+ mesh_window->redraw();
+ else
+ mesh_window->show();
+
+ }
+
+ }
+
+
+ //******************** Create the window for post-processing options *******************
+
+ void GUI::create_post_options_window(){
+ int i;
+
+ if(!init_post_options_window){
+ init_post_options_window = 1 ;
+
+ int width = 17*CTX.fontsize;
+ int height = 5*WB+5*BH ;
+
+ post_window = new Fl_Window(width,height);
+ post_window->box(WINDOW_BOX);
+ post_window->label("Post Processing Options");
+ {
+ Fl_Tabs* o = new Fl_Tabs(WB, WB, width-2*WB, height-3*WB-BH);
+ {
+ Fl_Group* o = new Fl_Group(WB, WB+BH, width-2*WB, height-3*WB-2*BH, "Links");
+ o->labelsize(CTX.fontsize);
+ post_butt[0] = new Fl_Check_Button(2*WB, 2*WB+1*BH, BW, BH, "No link between views");
+ post_butt[1] = new Fl_Check_Button(2*WB, 2*WB+2*BH, BW, BH, "Link visible views");
+ post_butt[2] = new Fl_Check_Button(2*WB, 2*WB+3*BH, BW, BH, "Link all views");
+ for(i=0 ; i<3 ; i++){
+ post_butt[i]->type(FL_RADIO_BUTTON);
+ post_butt[i]->labelsize(CTX.fontsize);
+ post_butt[i]->selection_color(FL_YELLOW);
+ }
+ o->end();
+ }
+ {
+ Fl_Group* o = new Fl_Group(WB, WB+BH, width-2*WB, height-3*WB-2*BH, "Smoothing");
+ o->labelsize(CTX.fontsize);
+ post_butt[3] = new Fl_Check_Button(2*WB, 2*WB+1*BH, BW, BH, "Smooth");
+ post_butt[3]->type(FL_TOGGLE_BUTTON);
+ post_butt[3]->down_box(FL_DOWN_BOX);
+ post_butt[3]->labelsize(CTX.fontsize);
+ post_butt[3]->selection_color(FL_YELLOW);
+ o->end();
+ }
+ {
+ Fl_Group* o = new Fl_Group(WB, WB+BH, width-2*WB, height-3*WB-2*BH, "Animation");
+ o->labelsize(CTX.fontsize);
+ o->hide();
+ post_value[0] = new Fl_Value_Input(2*WB, 2*WB+1*BH, IW, BH, "Delay");
+ post_value[0]->minimum(0);
+ post_value[0]->maximum(10);
+ post_value[0]->step(0.01);
+ post_value[0]->labelsize(CTX.fontsize);
+ post_value[0]->textsize(CTX.fontsize);
+ post_value[0]->type(FL_HORIZONTAL);
+ post_value[0]->align(FL_ALIGN_RIGHT);
+ o->end();
+ }
+ o->end();
+ }
+
+ {
+ Fl_Return_Button* o = new Fl_Return_Button(width-2*BB-2*WB, height-BH-WB, BB, BH, "OK");
+ o->labelsize(CTX.fontsize);
+ o->callback(opt_post_ok_cb);
+ }
+ {
+ Fl_Button* o = new Fl_Button(width-BB-WB, height-BH-WB, BB, BH, "Cancel");
+ o->labelsize(CTX.fontsize);
+ o->callback(cancel_cb, (void*)post_window);
+ }
+
+ if(CTX.center_windows)
+ post_window->position(m_window->x()+m_window->w()/2-width/2,
+ m_window->y()+9*BH-height/2);
+ post_window->end();
+ }
+ else{
+ if(post_window->shown())
+ post_window->redraw();
+ else
+ post_window->show();
+
+ }
+
+ }
+
+ //*********************** Create the window for the statistics *************************
+
+ void GUI::create_statistics_window(){
+ int i;
+
+ if(!init_statistics_window){
+ init_statistics_window = 1 ;
+
+ int width = 22*CTX.fontsize;
+ int height = 5*WB+16*BH ;
+
+ stat_window = new Fl_Window(width,height);
+ stat_window->box(WINDOW_BOX);
+ stat_window->label("Statistics");
+ {
+ Fl_Tabs* o = new Fl_Tabs(WB, WB, width-2*WB, height-3*WB-BH);
+ {
+ Fl_Group* o = new Fl_Group(WB, WB+BH, width-2*WB, height-3*WB-2*BH, "Geometry");
+ o->labelsize(CTX.fontsize);
+ o->hide();
+ stat_value[0] = new Fl_Output(width/2, 2*WB+1*BH, IW, BH, "Number of points");
+ stat_value[1] = new Fl_Output(width/2, 2*WB+2*BH, IW, BH, "Number of curves");
+ stat_value[2] = new Fl_Output(width/2, 2*WB+3*BH, IW, BH, "Number of surfaces");
+ stat_value[3] = new Fl_Output(width/2, 2*WB+4*BH, IW, BH, "Number of volumes");
+ o->end();
+ }
+ {
+ Fl_Group* o = new Fl_Group(WB, WB+BH, width-2*WB, height-3*WB-2*BH, "Mesh");
+ o->labelsize(CTX.fontsize);
+ stat_value[4] = new Fl_Output(width/2, 2*WB+1*BH, IW, BH, "Nodes on curves");
+ stat_value[5] = new Fl_Output(width/2, 2*WB+2*BH, IW, BH, "Nodes on surfaces");
+ stat_value[6] = new Fl_Output(width/2, 2*WB+3*BH, IW, BH, "Nodes in volumes");
+ stat_value[7] = new Fl_Output(width/2, 2*WB+4*BH, IW, BH, "Triangles");
+ stat_value[8] = new Fl_Output(width/2, 2*WB+5*BH, IW, BH, "Quadrangles");
+ stat_value[9] = new Fl_Output(width/2, 2*WB+6*BH, IW, BH, "Tetrahedra");
+ stat_value[10] = new Fl_Output(width/2, 2*WB+7*BH, IW, BH, "Hexahedra");
+ stat_value[11] = new Fl_Output(width/2, 2*WB+8*BH, IW, BH, "Prisms");
+ stat_value[12] = new Fl_Output(width/2, 2*WB+9*BH, IW, BH, "Time for 1D mesh");
+ stat_value[13] = new Fl_Output(width/2, 2*WB+10*BH, IW, BH, "Time for 2D mesh");
+ stat_value[14] = new Fl_Output(width/2, 2*WB+11*BH, IW, BH, "Time for 3D mesh");
+ stat_value[15] = new Fl_Output(width/2, 2*WB+12*BH, IW, BH, "Gamma factor");
+ stat_value[16] = new Fl_Output(width/2, 2*WB+13*BH, IW, BH, "Eta factor");
+ stat_value[17] = new Fl_Output(width/2, 2*WB+14*BH, IW, BH, "Rho factor");
+ o->end();
+ }
+ {
+ Fl_Group* o = new Fl_Group(WB, WB+BH, width-2*WB, height-3*WB-2*BH, "Post-processing");
+ o->labelsize(CTX.fontsize);
+ o->hide();
+ stat_value[18] = new Fl_Output(width/2, 2*WB+1*BH, IW, BH, "Views loaded");
+ stat_value[19] = new Fl_Output(width/2, 2*WB+2*BH, IW, BH, "Visible Points");
+ stat_value[20] = new Fl_Output(width/2, 2*WB+3*BH, IW, BH, "Visible lines");
+ stat_value[21] = new Fl_Output(width/2, 2*WB+4*BH, IW, BH, "Visible triangles");
+ stat_value[22] = new Fl_Output(width/2, 2*WB+5*BH, IW, BH, "Visible tetrahedra");
+ o->end();
+ }
+ o->end();
+ }
+
+ for(i=0 ; i<23 ; i++){
+ stat_value[i]->labelsize(CTX.fontsize);
+ stat_value[i]->textsize(CTX.fontsize);
+ stat_value[i]->type(FL_HORIZONTAL);
+ stat_value[i]->align(FL_ALIGN_LEFT);
+ stat_value[i]->value(0);
+ }
+
+ {
+ Fl_Return_Button* o = new Fl_Return_Button(width-2*BB-BB/4-2*WB, height-BH-WB, BB+BB/4, BH, "Update");
+ o->labelsize(CTX.fontsize);
+ o->callback(opt_statistics_update_cb);
+ }
+ {
+ Fl_Button* o = new Fl_Button(width-BB-WB, height-BH-WB, BB, BH, "Cancel");
+ o->labelsize(CTX.fontsize);
+ o->callback(cancel_cb, (void*)stat_window);
+ }
+
+ if(CTX.center_windows)
+ stat_window->position(m_window->x()+m_window->w()/2-width/2,
+ m_window->y()+9*BH-height/2);
+ stat_window->end();
+ set_statistics();
+ stat_window->show();
+ }
+ else{
+ if(stat_window->shown())
+ stat_window->redraw();
+ else{
+ set_statistics();
+ stat_window->show();
+ }
+ }
+
+ }
+
+ void GUI::set_statistics(){
+
+ int i;
+ static double s[50];
+ static char label[50][256];
+
+ GetStatistics(s);
+
+ // geom
+ sprintf(label[0], "%g", s[0]); stat_value[0]->value(label[0]);
+ sprintf(label[1], "%g", s[1]); stat_value[1]->value(label[1]);
+ sprintf(label[2], "%g", s[2]); stat_value[2]->value(label[2]);
+ sprintf(label[3], "%g", s[3]); stat_value[3]->value(label[3]);
+
+ // mesh
+ sprintf(label[4], "%g", s[4]); stat_value[4]->value(label[4]);
+ sprintf(label[5], "%g", s[5]); stat_value[5]->value(label[5]);
+ sprintf(label[6], "%g", s[6]); stat_value[6]->value(label[6]);
+ sprintf(label[7], "%g", s[7]-s[8]); stat_value[7]->value(label[7]);
+ sprintf(label[8], "%g", s[8]); stat_value[8]->value(label[8]);
+ sprintf(label[9], "%g", s[9]); stat_value[9]->value(label[9]);
+ sprintf(label[10], "%g", s[10]); stat_value[10]->value(label[10]);
+ sprintf(label[11], "%g", s[11]); stat_value[11]->value(label[11]);
+ sprintf(label[12], "%g", s[12]); stat_value[12]->value(label[12]);
+ sprintf(label[13], "%g", s[13]); stat_value[13]->value(label[13]);
+ sprintf(label[14], "%g", s[14]); stat_value[14]->value(label[14]);
+ sprintf(label[15], "%.4g (%.4g->%.4g)", s[17], s[19], s[18]);
+ stat_value[15]->value(label[15]);
+ sprintf(label[16], "%.4g (%.4g->%.4g)", s[20], s[22], s[21]);
+ stat_value[16]->value(label[16]);
+ sprintf(label[17], "%.4g (%.4g->%.4g)", s[23], s[25], s[24]);
+ stat_value[17]->value(label[17]);
+
+ // post
+ s[15] = List_Nbr(Post_ViewList) ;
+ sprintf(label[18], "%g", s[15]); stat_value[18]->value(label[18]);
+ s[16] = s[17] = s[18] = s[19] = 0 ;
+ for(i=0 ; i<List_Nbr(Post_ViewList) ; i++){
+ Post_View *v = (Post_View*)List_Pointer(Post_ViewList, i);
+ if(v->Visible){
+ s[16] += v->NbSP + v->NbVP + v->NbTP;
+ s[17] += v->NbSL + v->NbVL + v->NbTL;
+ s[18] += v->NbST + v->NbVT + v->NbTT;
+ s[19] += v->NbSS + v->NbVS + v->NbTS;
+ }
+ }
+ sprintf(label[19], "%g", s[16]); stat_value[19]->value(label[19]);
+ sprintf(label[20], "%g", s[17]); stat_value[20]->value(label[20]);
+ sprintf(label[21], "%g", s[18]); stat_value[21]->value(label[21]);
+ sprintf(label[22], "%g", s[19]); stat_value[22]->value(label[22]);
+
+ for(i=0 ; i<23 ; i++)
+ stat_value[16]->redraw();
+
+ }
+
+ /*
+ A plugin has n options, we also show infos about
+ the plugin on the top of the window
+ */
+ PluginDialogBox * GUI::create_plugin_window(GMSH_Plugin *p, int iView)
+ {
+ char buffer[1024],namep[1024],copyright[256],author[256],help[1024];
+
+ PluginDialogBox *pdb = new PluginDialogBox;
+ int n = p->getNbOptions();
+ p->getName(namep);
+ p->getInfos(author,copyright,help);
+ int width = 20*CTX.fontsize;
+ int height = (n+2)*BH ;
+ Fl_Window *pl_window = new Fl_Window(width,height);
+ pdb->main_window = pl_window;
+ pl_window->box(WINDOW_BOX);
+ sprintf(buffer,"%s Plugin",namep);
+ char *nbuffer = new char[strlen(buffer)+1];
+ strcpy(nbuffer,buffer);
+ pl_window->label(nbuffer);
+
+ if(n > 20)Msg(GERROR,"Plugin has too much parameters");
+
+ for(int i=0;i<n;i++)
+ {
+ StringXNumber sxn;
+ p->GetOption(i,&sxn);
+ pdb->view_value[i] = new Fl_Value_Input(2*WB, 2*WB+(i)*BH, IW, BH, sxn.str);
+ pdb->view_value[i]->labelsize(CTX.fontsize);
+ pdb->view_value[i]->textsize(CTX.fontsize);
+ pdb->view_value[i]->type(FL_HORIZONTAL);
+ pdb->view_value[i]->align(FL_ALIGN_RIGHT);
+ }
+
+ Fl_Button* cancel = new Fl_Button(width-BB-WB, height-BH-WB, BB, BH, "Close");
+ Fl_Button* ok = new Fl_Return_Button(width-2*BB-2*WB, height-BH-WB, BB, BH, "Run");
+ ok->labelsize(CTX.fontsize);
+ std::pair<int,GMSH_Plugin*> *pair =
+ new std::pair<int,GMSH_Plugin*>(iView,p);
+ ok->callback(view_plugin_cb, (void*)pair);
+ cancel->labelsize(CTX.fontsize);
+ cancel->callback(cancel_cb, (void*)pl_window);
+ pl_window->end();
+
+ return pdb;
}
//********************** Create the window for the messages ****************************
diff --git a/Fltk/GUI.h b/Fltk/GUI.h
index 5f467dd551..d5a6c5a8db 100644
--- a/Fltk/GUI.h
+++ b/Fltk/GUI.h
@@ -60,6 +60,19 @@ extern Context_Item menu_mesh_define[];
extern Context_Item menu_mesh_define_transfinite[];
extern Context_Item menu_post[];
+// Forward Declarations
+
+class GMSH_Plugin;
+
+// A generalized dialogbox for plugins
+
+struct PluginDialogBox
+{
+ Fl_Window *main_window;
+ int nb_viewvalue;
+ Fl_Value_Input *view_value[20];
+};
+
// The GUI class contains only the important widgets (which can be set/queried).
class GUI{
@@ -69,6 +82,7 @@ class GUI{
// Bitmaps
Fl_Bitmap *icon1_bmp, *icon2_bmp, *icon3_bmp;
Fl_Bitmap *abort_bmp, *start_bmp, *stop_bmp, *about_bmp ;
+ void add_post_plugins ( Fl_Menu_Button *button , int iView);
public:
@@ -164,6 +178,7 @@ public:
void create_geometry_options_window();
void create_mesh_options_window();
void create_post_options_window();
+ PluginDialogBox *create_plugin_window(GMSH_Plugin *, int);
void create_view_options_window(int numview);
void create_statistics_window();
void create_message_window();
diff --git a/Fltk/Makefile b/Fltk/Makefile
index 76e281ac20..63e15fd8f6 100644
--- a/Fltk/Makefile
+++ b/Fltk/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.13 2001-03-04 22:58:17 remacle Exp $
+# $Id: Makefile,v 1.14 2001-03-10 19:55:07 remacle Exp $
#
# Makefile for "libFltk.a"
#
@@ -61,58 +61,60 @@ depend:
$(RM) $(RMFLAGS) Makefile.new
# DO NOT DELETE THIS LINE
-Main.o: Main.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
- ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
- ../Common/GmshUI.h ../Common/GmshVersion.h ../Geo/Geo.h ../Geo/Verif.h \
- ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \
- ../Common/Views.h ../Common/Const.h ../Common/ColorTable.h \
- ../Common/Context.h ../Common/Options.h ../Parser/Parser.h \
- ../Common/Static.h GUI.h Opengl_Window.h Colorbar_Window.h \
- ../Parser/OpenFile.h ../Common/GetOptions.h
+Main.o: Main.cpp ../Plugin/PluginManager.h ../Common/Gmsh.h \
+ ../Common/Message.h ../DataStr/Malloc.h ../DataStr/List.h \
+ ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
+ ../Common/GmshUI.h ../Common/GmshVersion.h ../Geo/Geo.h \
+ ../Geo/Verif.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+ ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h \
+ ../Graphics/Draw.h ../Common/Views.h ../Common/Const.h \
+ ../Common/ColorTable.h ../Common/Context.h ../Common/Options.h \
+ ../Parser/Parser.h ../Common/Static.h GUI.h Opengl_Window.h \
+ Colorbar_Window.h ../Parser/OpenFile.h ../Common/GetOptions.h
Message.o: Message.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \
- ../Common/GmshVersion.h ../Common/Context.h ../Common/Const.h \
- ../Common/Options.h GUI.h Opengl_Window.h Colorbar_Window.h \
- ../Common/ColorTable.h
-GUI.o: GUI.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
- ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
- ../Common/GmshUI.h ../Common/GmshVersion.h ../Common/Context.h \
- ../Common/Const.h ../Common/Options.h ../Geo/Geo.h ../Mesh/Mesh.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \
- ../Common/Views.h ../Common/ColorTable.h GUI.h Opengl_Window.h \
- Colorbar_Window.h Callbacks.h ../Common/Bitmaps.h \
- ../Common/GetOptions.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \
+ ../Common/GmshVersion.h ../Common/Context.h ../Common/Const.h \
+ ../Common/Options.h GUI.h Opengl_Window.h Colorbar_Window.h \
+ ../Common/ColorTable.h
+GUI.o: GUI.cpp ../Plugin/PluginManager.h ../Plugin/Plugin.h \
+ ../Common/Options.h ../Common/Gmsh.h ../Common/Message.h \
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \
+ ../Common/GmshVersion.h ../Common/Context.h ../Common/Const.h \
+ ../Geo/Geo.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+ ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h \
+ ../Graphics/Draw.h ../Common/Views.h ../Common/ColorTable.h GUI.h \
+ Opengl_Window.h Colorbar_Window.h Callbacks.h ../Common/Bitmaps.h \
+ ../Common/GetOptions.h
Callbacks.o: Callbacks.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \
- ../Geo/Verif.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h \
- ../Graphics/Draw.h ../Common/Views.h ../Common/Const.h \
- ../Common/ColorTable.h ../Common/Timer.h ../Geo/Visibility.h \
- ../Graphics/CreateFile.h ../Parser/OpenFile.h ../Common/GetOptions.h \
- ../Common/Context.h ../Common/Options.h GUI.h Opengl_Window.h \
- Colorbar_Window.h Callbacks.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \
+ ../Geo/Verif.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+ ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h \
+ ../Graphics/Draw.h ../Common/Views.h ../Common/Const.h \
+ ../Common/ColorTable.h ../Common/Timer.h ../Geo/Visibility.h \
+ ../Graphics/CreateFile.h ../Parser/OpenFile.h ../Common/GetOptions.h \
+ ../Common/Context.h ../Common/Options.h GUI.h Opengl_Window.h \
+ Colorbar_Window.h Callbacks.h ../Plugin/Plugin.h
Opengl.o: Opengl.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \
- ../Common/Context.h ../Common/Const.h ../Geo/Geo.h ../Mesh/Mesh.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \
- ../Common/Views.h ../Common/ColorTable.h GUI.h Opengl_Window.h \
- Colorbar_Window.h ../Graphics/gl2ps.h
-Opengl_Window.o: Opengl_Window.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \
- ../Common/Context.h ../Common/Const.h ../Geo/Geo.h ../Mesh/Mesh.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \
- ../Common/Views.h ../Common/ColorTable.h GUI.h Opengl_Window.h \
- Colorbar_Window.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \
+ ../Common/Context.h ../Common/Const.h ../Geo/Geo.h ../Mesh/Mesh.h \
+ ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
+ ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \
+ ../Common/Views.h ../Common/ColorTable.h GUI.h Opengl_Window.h \
+ Colorbar_Window.h ../Graphics/gl2ps.h
+Opengl_Window.o: Opengl_Window.cpp ../Common/Gmsh.h \
+ ../Common/Message.h ../DataStr/Malloc.h ../DataStr/List.h \
+ ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
+ ../Common/GmshUI.h ../Common/Context.h ../Common/Const.h ../Geo/Geo.h \
+ ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
+ ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \
+ ../Common/Views.h ../Common/ColorTable.h GUI.h Opengl_Window.h \
+ Colorbar_Window.h
Colorbar_Window.o: Colorbar_Window.cpp ../Common/Gmsh.h \
- ../Common/Message.h ../DataStr/Malloc.h ../DataStr/List.h \
- ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
- ../Common/GmshUI.h GUI.h Opengl_Window.h Colorbar_Window.h \
- ../Common/ColorTable.h ../Common/Context.h ../Common/Const.h
+ ../Common/Message.h ../DataStr/Malloc.h ../DataStr/List.h \
+ ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
+ ../Common/GmshUI.h GUI.h Opengl_Window.h Colorbar_Window.h \
+ ../Common/ColorTable.h ../Common/Context.h ../Common/Const.h
diff --git a/Graphics/Iso.cpp b/Graphics/Iso.cpp
index 9d29d8b495..7708ff1df2 100644
--- a/Graphics/Iso.cpp
+++ b/Graphics/Iso.cpp
@@ -1,4 +1,4 @@
-// $Id: Iso.cpp,v 1.8 2001-02-04 10:23:56 geuzaine Exp $
+// $Id: Iso.cpp,v 1.9 2001-03-10 19:55:07 remacle Exp $
#include "Gmsh.h"
#include "Mesh.h"
@@ -11,7 +11,7 @@ void RaiseFill(int i, double Val, double ValMin, double Raise[3][5]);
/* I n t e r p o l a t e */
/* ------------------------------------------------------------------------ */
-void InterpolateIso(double *X, double *Y, double *Z,
+double InterpolateIso(double *X, double *Y, double *Z,
double *Val, double V, int I1, int I2,
double *XI, double *YI ,double *ZI){
@@ -19,11 +19,14 @@ void InterpolateIso(double *X, double *Y, double *Z,
*XI = X[I1];
*YI = Y[I1];
*ZI = Z[I1];
+ return 0;
}
else{
- *XI= (V - Val[I1])*(X[I2]-X[I1])/(Val[I2]-Val[I1]) + X[I1];
- *YI= (V - Val[I1])*(Y[I2]-Y[I1])/(Val[I2]-Val[I1]) + Y[I1];
- *ZI= (V - Val[I1])*(Z[I2]-Z[I1])/(Val[I2]-Val[I1]) + Z[I1];
+ double coef = (V - Val[I1])/(Val[I2]-Val[I1]);
+ *XI= coef*(X[I2]-X[I1]) + X[I1];
+ *YI= coef*(Y[I2]-Y[I1]) + Y[I1];
+ *ZI= coef*(Z[I2]-Z[I1]) + Z[I1];
+ return coef;
}
}
diff --git a/Graphics/Iso.h b/Graphics/Iso.h
index e5d5444794..b62294a81b 100644
--- a/Graphics/Iso.h
+++ b/Graphics/Iso.h
@@ -19,8 +19,8 @@ void CutLine1D (double *X, double *Y, double *Z, double *Val,
double *Xp, double *Yp, double *Zp, int *nb,
double *value);
-void InterpolateIso(double *X, double *Y, double *Z,
- double *Val, double V, int I1, int I2,
- double *XI, double *YI ,double *ZI);
+double InterpolateIso(double *X, double *Y, double *Z,
+ double *Val, double V, int I1, int I2,
+ double *XI, double *YI ,double *ZI);
#endif
diff --git a/Graphics/IsoSimplex.cpp b/Graphics/IsoSimplex.cpp
index 967ca28be8..e3ee2919f2 100644
--- a/Graphics/IsoSimplex.cpp
+++ b/Graphics/IsoSimplex.cpp
@@ -10,10 +10,6 @@
extern Context_T CTX;
-/* ------------------------------------------------------------------------ */
-/* S i m p l e x */
-/* ------------------------------------------------------------------------ */
-
/*
compute the gradient of a linear interpolation in a tetrahedron
*/
@@ -40,61 +36,24 @@ void gradSimplex (double *x, double *y, double *z, double *v, double *grad)
sys3x3 (mat, b, grad, &det);
}
-void IsoSimplex( Post_View *View,
- int preproNormals,
- double *X, double *Y, double *Z, double *Val,
- double V, double Vmin, double Vmax,
- double *Offset, double Raise[3][5], int shade){
- int nb,i;
- double Xp[6],Yp[6],Zp[6];
- double Xpi[6],Ypi[6],Zpi[6];
- double norms[12];
-
- if(V != Vmax){
- nb = 0;
- if((Val[0] > V && Val[1] <= V) || (Val[1] > V && Val[0] <= V)){
- InterpolateIso(X,Y,Z,Val,V,0,1,&Xp[nb],&Yp[nb],&Zp[nb]); nb++;
- }
- if((Val[0] > V && Val[2] <= V) || (Val[2] > V && Val[0] <= V)){
- InterpolateIso(X,Y,Z,Val,V,0,2,&Xp[nb],&Yp[nb],&Zp[nb]); nb++;
- }
- if((Val[0] > V && Val[3] <= V) || (Val[3] > V && Val[0] <= V)){
- InterpolateIso(X,Y,Z,Val,V,0,3,&Xp[nb],&Yp[nb],&Zp[nb]); nb++;
- }
- if((Val[1] > V && Val[2] <= V) || (Val[2] > V && Val[1] <= V)){
- InterpolateIso(X,Y,Z,Val,V,1,2,&Xp[nb],&Yp[nb],&Zp[nb]); nb++;
- }
- if((Val[1] > V && Val[3] <= V) || (Val[3] > V && Val[1] <= V)){
- InterpolateIso(X,Y,Z,Val,V,1,3,&Xp[nb],&Yp[nb],&Zp[nb]); nb++;
- }
- if((Val[2] > V && Val[3] <= V) || (Val[3] > V && Val[2] <= V)){
- InterpolateIso(X,Y,Z,Val,V,2,3,&Xp[nb],&Yp[nb],&Zp[nb]); nb++;
- }
- }
- else{
- nb=0;
- if((Val[0] < V && Val[1] <= V) || (Val[1] < V && Val[0] <= V)){
- InterpolateIso(X,Y,Z,Val,V,0,1,&Xp[nb],&Yp[nb],&Zp[nb]); nb++;
- }
- if((Val[0] < V && Val[2] <= V) || (Val[2] < V && Val[0] <= V)){
- InterpolateIso(X,Y,Z,Val,V,0,2,&Xp[nb],&Yp[nb],&Zp[nb]); nb++;
- }
- if((Val[0] < V && Val[3] <= V) || (Val[3] < V && Val[0] <= V)){
- InterpolateIso(X,Y,Z,Val,V,0,3,&Xp[nb],&Yp[nb],&Zp[nb]); nb++;
- }
- if((Val[1] < V && Val[2] <= V) || (Val[2] < V && Val[1] <= V)){
- InterpolateIso(X,Y,Z,Val,V,1,2,&Xp[nb],&Yp[nb],&Zp[nb]); nb++;
- }
- if((Val[1] < V && Val[3] <= V) || (Val[3] < V && Val[1] <= V)){
- InterpolateIso(X,Y,Z,Val,V,1,3,&Xp[nb],&Yp[nb],&Zp[nb]); nb++;
- }
- if((Val[2] < V && Val[3] <= V) || (Val[3] < V && Val[2] <= V)){
- InterpolateIso(X,Y,Z,Val,V,2,3,&Xp[nb],&Yp[nb],&Zp[nb]); nb++;
- }
- }
-
- if(nb < 3)return;
+/* ------------------------------------------------------------------------ */
+/* S i m p l e x */
+/* ------------------------------------------------------------------------ */
+void EnhanceSimplexPolygon (Post_View *View,
+ int nb, // nb of points in polygon
+ double *Xp, // x positions
+ double *Yp, // y positions
+ double *Zp, // z positions
+ double *Valp, // values at points
+ double *X, // x positions of the simplex
+ double *Y, // y positions of the simplex
+ double *Z, // z posistions of the simplex
+ double *Val, // values at simplex points
+ double *norms, // output : normals at points
+ int preproNormals // do we compute normals or do we get them
+ )
+{
/*
3 possibilities for quads
-) 0,2,5,3
@@ -103,6 +62,8 @@ void IsoSimplex( Post_View *View,
in all cases, simply invert the 2 last ones
for having the quads ordered
*/
+ int i;
+ double Xpi[6],Ypi[6],Zpi[6];
if(nb == 4)
{
@@ -153,6 +114,7 @@ void IsoSimplex( Post_View *View,
n[1] = -n[1];
n[2] = -n[2];
}
+
if(preproNormals)
{
for(i=0;i<nb;i++)
@@ -174,7 +136,67 @@ void IsoSimplex( Post_View *View,
}
}
}
-
+}
+
+
+void IsoSimplex( Post_View *View,
+ int preproNormals,
+ double *X, double *Y, double *Z, double *Val,
+ double V, double Vmin, double Vmax,
+ double *Offset, double Raise[3][5], int shade){
+ int nb,i;
+ double Xp[6],Yp[6],Zp[6],PVals[6];
+ double norms[12];
+
+ if(V != Vmax){
+ nb = 0;
+ if((Val[0] > V && Val[1] <= V) || (Val[1] > V && Val[0] <= V)){
+ InterpolateIso(X,Y,Z,Val,V,0,1,&Xp[nb],&Yp[nb],&Zp[nb]); nb++;
+ }
+ if((Val[0] > V && Val[2] <= V) || (Val[2] > V && Val[0] <= V)){
+ InterpolateIso(X,Y,Z,Val,V,0,2,&Xp[nb],&Yp[nb],&Zp[nb]); nb++;
+ }
+ if((Val[0] > V && Val[3] <= V) || (Val[3] > V && Val[0] <= V)){
+ InterpolateIso(X,Y,Z,Val,V,0,3,&Xp[nb],&Yp[nb],&Zp[nb]); nb++;
+ }
+ if((Val[1] > V && Val[2] <= V) || (Val[2] > V && Val[1] <= V)){
+ InterpolateIso(X,Y,Z,Val,V,1,2,&Xp[nb],&Yp[nb],&Zp[nb]); nb++;
+ }
+ if((Val[1] > V && Val[3] <= V) || (Val[3] > V && Val[1] <= V)){
+ InterpolateIso(X,Y,Z,Val,V,1,3,&Xp[nb],&Yp[nb],&Zp[nb]); nb++;
+ }
+ if((Val[2] > V && Val[3] <= V) || (Val[3] > V && Val[2] <= V)){
+ InterpolateIso(X,Y,Z,Val,V,2,3,&Xp[nb],&Yp[nb],&Zp[nb]); nb++;
+ }
+ }
+ else{
+ nb=0;
+ if((Val[0] < V && Val[1] <= V) || (Val[1] < V && Val[0] <= V)){
+ InterpolateIso(X,Y,Z,Val,V,0,1,&Xp[nb],&Yp[nb],&Zp[nb]); nb++;
+ }
+ if((Val[0] < V && Val[2] <= V) || (Val[2] < V && Val[0] <= V)){
+ InterpolateIso(X,Y,Z,Val,V,0,2,&Xp[nb],&Yp[nb],&Zp[nb]); nb++;
+ }
+ if((Val[0] < V && Val[3] <= V) || (Val[3] < V && Val[0] <= V)){
+ InterpolateIso(X,Y,Z,Val,V,0,3,&Xp[nb],&Yp[nb],&Zp[nb]); nb++;
+ }
+ if((Val[1] < V && Val[2] <= V) || (Val[2] < V && Val[1] <= V)){
+ InterpolateIso(X,Y,Z,Val,V,1,2,&Xp[nb],&Yp[nb],&Zp[nb]); nb++;
+ }
+ if((Val[1] < V && Val[3] <= V) || (Val[3] < V && Val[1] <= V)){
+ InterpolateIso(X,Y,Z,Val,V,1,3,&Xp[nb],&Yp[nb],&Zp[nb]); nb++;
+ }
+ if((Val[2] < V && Val[3] <= V) || (Val[3] < V && Val[2] <= V)){
+ InterpolateIso(X,Y,Z,Val,V,2,3,&Xp[nb],&Yp[nb],&Zp[nb]); nb++;
+ }
+ }
+
+ if(nb < 3)return;
+
+ EnhanceSimplexPolygon (View, nb, Xp, Yp, Zp, PVals, X, Y, Z, Val, norms, preproNormals);
+
+ if(preproNormals)return;
+
if(nb == 3)
Draw_Triangle(Xp,Yp,Zp,norms,Offset,Raise,shade);
else if(nb == 4)
diff --git a/Graphics/Makefile b/Graphics/Makefile
index dfde226392..a12862b318 100644
--- a/Graphics/Makefile
+++ b/Graphics/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.19 2001-02-18 18:04:03 geuzaine Exp $
+# $Id: Makefile,v 1.20 2001-03-10 19:55:07 remacle Exp $
#
# Makefile for "libGraphics.a"
#
@@ -70,92 +70,97 @@ depend:
$(RM) $(RMFLAGS) Makefile.new
# DO NOT DELETE THIS LINE
-Draw.o: Draw.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
- ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
- ../Common/GmshUI.h ../Geo/Geo.h ../Mesh/Mesh.h ../Mesh/Vertex.h \
- ../Mesh/Simplex.h ../Mesh/Edge.h ../Geo/ExtrudeParams.h \
- ../Mesh/Metric.h Draw.h ../Common/Views.h ../Common/Const.h \
- ../Common/ColorTable.h ../Common/Context.h ../Geo/MinMax.h
-Mesh.o: Mesh.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
- ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
- ../Common/GmshUI.h ../Geo/Geo.h ../Mesh/Mesh.h ../Mesh/Vertex.h \
- ../Mesh/Simplex.h ../Mesh/Edge.h ../Geo/ExtrudeParams.h \
- ../Mesh/Metric.h Draw.h ../Common/Views.h ../Common/Const.h \
- ../Common/ColorTable.h ../Common/Context.h ../Geo/MinMax.h gl2ps.h \
- ../Geo/Verif.h ../Mesh/Numeric.h ../Geo/Visibility.h
-Geom.o: Geom.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
- ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
- ../Common/GmshUI.h ../Geo/Geo.h ../Mesh/Mesh.h ../Mesh/Vertex.h \
- ../Mesh/Simplex.h ../Mesh/Edge.h ../Geo/ExtrudeParams.h \
- ../Mesh/Metric.h Draw.h ../Common/Views.h ../Common/Const.h \
- ../Common/ColorTable.h ../Common/Context.h ../Geo/Verif.h \
- ../Mesh/Interpolation.h ../Mesh/Numeric.h ../Geo/Visibility.h
-Post.o: Post.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
- ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
- ../Common/GmshUI.h ../Geo/Geo.h ../Mesh/Mesh.h ../Mesh/Vertex.h \
- ../Mesh/Simplex.h ../Mesh/Edge.h ../Geo/ExtrudeParams.h \
- ../Mesh/Metric.h Draw.h ../Common/Views.h ../Common/Const.h \
- ../Common/ColorTable.h ../Common/Context.h
+Draw.o: Draw.cpp ../Common/Gmsh.h ../Common/Message.h \
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \
+ ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
+ ../Geo/ExtrudeParams.h ../Mesh/Metric.h Draw.h ../Common/Views.h \
+ ../Common/Const.h ../Common/ColorTable.h ../Common/Context.h \
+ ../Geo/MinMax.h
+Mesh.o: Mesh.cpp ../Common/Gmsh.h ../Common/Message.h \
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \
+ ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
+ ../Geo/ExtrudeParams.h ../Mesh/Metric.h Draw.h ../Common/Views.h \
+ ../Common/Const.h ../Common/ColorTable.h ../Common/Context.h \
+ ../Geo/MinMax.h gl2ps.h ../Geo/Verif.h ../Mesh/Numeric.h \
+ ../Geo/Visibility.h
+Geom.o: Geom.cpp ../Common/Gmsh.h ../Common/Message.h \
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \
+ ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
+ ../Geo/ExtrudeParams.h ../Mesh/Metric.h Draw.h ../Common/Views.h \
+ ../Common/Const.h ../Common/ColorTable.h ../Common/Context.h \
+ ../Geo/Verif.h ../Mesh/Interpolation.h ../Mesh/Numeric.h \
+ ../Geo/Visibility.h
+Post.o: Post.cpp ../Common/Gmsh.h ../Common/Message.h \
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \
+ ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
+ ../Geo/ExtrudeParams.h ../Mesh/Metric.h Draw.h ../Common/Views.h \
+ ../Common/Const.h ../Common/ColorTable.h ../Common/Context.h
PostSimplex.o: PostSimplex.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \
- ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h Draw.h ../Common/Views.h \
- ../Common/Const.h ../Common/ColorTable.h Iso.h IsoSimplex.h \
- ../Common/Context.h
-Iso.o: Iso.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
- ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
- ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h Draw.h ../Common/Views.h \
- ../Common/Const.h ../Common/ColorTable.h ../Mesh/Numeric.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \
+ ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
+ ../Geo/ExtrudeParams.h ../Mesh/Metric.h Draw.h ../Common/Views.h \
+ ../Common/Const.h ../Common/ColorTable.h Iso.h IsoSimplex.h \
+ ../Common/Context.h
+Iso.o: Iso.cpp ../Common/Gmsh.h ../Common/Message.h \
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Mesh/Mesh.h ../Mesh/Vertex.h \
+ ../Mesh/Simplex.h ../Mesh/Edge.h ../Geo/ExtrudeParams.h \
+ ../Mesh/Metric.h Draw.h ../Common/Views.h ../Common/Const.h \
+ ../Common/ColorTable.h ../Mesh/Numeric.h
IsoSimplex.o: IsoSimplex.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \
- ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h Draw.h ../Common/Views.h \
- ../Common/Const.h ../Common/ColorTable.h Iso.h ../Common/Context.h \
- ../Mesh/Numeric.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \
+ ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
+ ../Geo/ExtrudeParams.h ../Mesh/Metric.h Draw.h ../Common/Views.h \
+ ../Common/Const.h ../Common/ColorTable.h Iso.h ../Common/Context.h \
+ ../Mesh/Numeric.h
Entity.o: Entity.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Mesh/Mesh.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h Draw.h ../Common/Views.h \
- ../Common/Const.h ../Common/ColorTable.h ../Common/Context.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Mesh/Mesh.h \
+ ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
+ ../Geo/ExtrudeParams.h ../Mesh/Metric.h Draw.h ../Common/Views.h \
+ ../Common/Const.h ../Common/ColorTable.h ../Common/Context.h
Scale.o: Scale.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \
- ../Common/Const.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h Draw.h \
- ../Common/Views.h ../Common/ColorTable.h ../Common/Context.h \
- ../Motif/XContext.h
-Axes.o: Axes.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
- ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
- ../Common/GmshUI.h ../Common/Const.h ../Mesh/Mesh.h ../Mesh/Vertex.h \
- ../Mesh/Simplex.h ../Mesh/Edge.h ../Geo/ExtrudeParams.h \
- ../Mesh/Metric.h Draw.h ../Common/Views.h ../Common/ColorTable.h \
- ../Common/Context.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \
+ ../Common/Const.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+ ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h Draw.h \
+ ../Common/Views.h ../Common/ColorTable.h ../Common/Context.h \
+ ../Motif/XContext.h
+Axes.o: Axes.cpp ../Common/Gmsh.h ../Common/Message.h \
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \
+ ../Common/Const.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+ ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h Draw.h \
+ ../Common/Views.h ../Common/ColorTable.h ../Common/Context.h
CreateFile.o: CreateFile.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Mesh/Mesh.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Parser/OpenFile.h \
- ../Common/Const.h Draw.h ../Common/Views.h ../Common/ColorTable.h \
- ../Common/Context.h ../Motif/Widgets.h ../Motif/XContext.h XDump.h \
- gl2ps.h gl2gif.h gl2jpeg.h gl2ppm.h gl2yuv.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Mesh/Mesh.h \
+ ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
+ ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Parser/OpenFile.h \
+ ../Common/Const.h Draw.h ../Common/Views.h ../Common/ColorTable.h \
+ ../Common/Context.h ../Motif/Widgets.h ../Motif/XContext.h XDump.h \
+ gl2ps.h gl2gif.h gl2jpeg.h gl2ppm.h gl2yuv.h
XDump.o: XDump.cpp
gl2ps.o: gl2ps.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h gl2ps.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h gl2ps.h
gl2gif.o: gl2gif.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h gl2gif.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h gl2gif.h
gl2jpeg.o: gl2jpeg.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \
- ../jpeg/jpeglib.h ../jpeg/jconfig.h ../jpeg/jmorecfg.h ../jpeg/jerror.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \
+ ../jpeg/jpeglib.h ../jpeg/jconfig.h ../jpeg/jmorecfg.h \
+ ../jpeg/jerror.h
gl2ppm.o: gl2ppm.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h
gl2yuv.o: gl2yuv.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h
diff --git a/Makefile b/Makefile
index 1c3e9b158e..dae4abcad4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.80 2001-03-08 09:19:41 geuzaine Exp $
+# $Id: Makefile,v 1.81 2001-03-10 19:55:06 remacle Exp $
# ----------------------------------------------------------------------
# Makefile for Gmsh
# ----------------------------------------------------------------------
@@ -42,7 +42,7 @@ FLTK_LIB_LINUX_SCOREC = /users/develop/develop/visual/fltk/1.0/lib/x86_linux/lib
GMSH_DIR = Adapt Common DataStr Geo Graphics Mesh Parser Motif Fltk\
jpeg utils
GMSH_XMOTIF_DIR = Adapt Common DataStr Geo Graphics Mesh Parser Motif jpeg
- GMSH_FLTK_DIR = Adapt Common DataStr Geo Graphics Mesh Parser Fltk jpeg Plugin Plugin/CutPlane
+ GMSH_FLTK_DIR = Adapt Common DataStr Geo Graphics Mesh Parser Fltk jpeg Plugin
GMSH_BOX_DIR = Adapt Box Common DataStr Geo Mesh Parser
GMSH_BIN_DIR = bin
GMSH_LIB_DIR = lib
@@ -53,7 +53,7 @@ FLTK_LIB_LINUX_SCOREC = /users/develop/develop/visual/fltk/1.0/lib/x86_linux/lib
GMSH_XMOTIF_LIB = -L$(GMSH_LIB_DIR) -lMotif -lGraphics -lParser -lMesh -lGeo\
-lAdapt -lCommon -lDataStr -lJpeg
GMSH_FLTK_LIB = -L$(GMSH_LIB_DIR) -lFltk -lParser -lGraphics -lMesh -lGeo\
- -lAdapt -lCommon -lDataStr -lJpeg -lPlugin
+ -lAdapt -lCommon -lDataStr -lJpeg -lPlugin
GMSH_BOX_LIB = -L$(GMSH_LIB_DIR) -lBox -lParser -lMesh -lGeo\
-lAdapt -lCommon -lDataStr
GMSH_ARCHIVE = $(GMSH_ARCHIVE_DIR)/gmsh-`date "+%Y.%m.%d"`
@@ -515,7 +515,7 @@ fltk_cygwin_laptopjf:
); done
g++ -Wl,--subsystem,windows -o $(GMSH_BIN_DIR)/gmsh-cyg.exe $(GMSH_FLTK_LIB) \
../fltk-1.0.9/lib/libfltk.a -lglu32 -lopengl32 -lgdi32 -lwsock32 -lm
- strip $(GMSH_BIN_DIR)/gmsh-cyg.exe
+# strip $(GMSH_BIN_DIR)/gmsh-cyg.exe
fltk_cygwin_laptopjf_tag: tag fltk_cygwin_laptopjf
diff --git a/Mesh/Makefile b/Mesh/Makefile
index c62dfe4c78..e7d98b164c 100644
--- a/Mesh/Makefile
+++ b/Mesh/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.16 2001-02-23 00:07:51 remacle Exp $
+# $Id: Makefile,v 1.17 2001-03-10 19:55:07 remacle Exp $
#
# Makefile for "libMesh.a"
#
@@ -90,191 +90,202 @@ depend:
# DO NOT DELETE THIS LINE
1D_Mesh.o: 1D_Mesh.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h ../Geo/Geo.h \
- Mesh.h Vertex.h Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h \
- ../Common/Context.h Interpolation.h Numeric.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h ../Geo/Geo.h \
+ Mesh.h Vertex.h Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h \
+ ../Common/Context.h Interpolation.h Numeric.h
2D_Mesh.o: 2D_Mesh.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h ../Geo/Geo.h \
- ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h Mesh.h Create.h \
- 2D_Mesh.h Numeric.h ../Common/Context.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h ../Geo/Geo.h \
+ ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+ ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h Mesh.h \
+ Create.h 2D_Mesh.h Numeric.h ../Common/Context.h
2D_SMesh.o: 2D_SMesh.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Geo/Geo.h Mesh.h Vertex.h \
- Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h Numeric.h \
- Interpolation.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Geo/Geo.h Mesh.h Vertex.h \
+ Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h Numeric.h \
+ Interpolation.h
2D_Elliptic.o: 2D_Elliptic.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h ../Geo/Geo.h \
- ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h Mesh.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h ../Geo/Geo.h \
+ ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+ ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h Mesh.h
2D_BGMesh.o: 2D_BGMesh.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h Mesh.h Vertex.h \
- Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h 2D_Mesh.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h Mesh.h Vertex.h \
+ Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h 2D_Mesh.h
2D_Recombine.o: 2D_Recombine.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h Mesh.h Vertex.h \
- Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h 2D_Mesh.h Create.h \
- Numeric.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h Mesh.h Vertex.h \
+ Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h 2D_Mesh.h Create.h \
+ Numeric.h
2D_InitMesh.o: 2D_InitMesh.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h Mesh.h Vertex.h \
- Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h 2D_Mesh.h Numeric.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h Mesh.h Vertex.h \
+ Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h 2D_Mesh.h Numeric.h
2D_Bowyer.o: 2D_Bowyer.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h Mesh.h Vertex.h \
- Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h 2D_Mesh.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h Mesh.h Vertex.h \
+ Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h 2D_Mesh.h
2D_Bricks.o: 2D_Bricks.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h Mesh.h Vertex.h \
- Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h 2D_Mesh.h
-2D_DivAndConq.o: 2D_DivAndConq.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h Mesh.h Vertex.h \
- Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h 2D_Mesh.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h Mesh.h Vertex.h \
+ Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h 2D_Mesh.h
+2D_DivAndConq.o: 2D_DivAndConq.cpp ../Common/Gmsh.h \
+ ../Common/Message.h ../DataStr/Malloc.h ../DataStr/List.h \
+ ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
+ ../Common/Const.h Mesh.h Vertex.h Simplex.h Edge.h \
+ ../Geo/ExtrudeParams.h Metric.h 2D_Mesh.h
2D_Util.o: 2D_Util.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h Mesh.h Vertex.h \
- Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h 2D_Mesh.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h Mesh.h Vertex.h \
+ Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h 2D_Mesh.h
2D_Links.o: 2D_Links.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h Mesh.h Vertex.h \
- Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h 2D_Mesh.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h Mesh.h Vertex.h \
+ Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h 2D_Mesh.h
2D_Tree.o: 2D_Tree.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h Mesh.h Vertex.h Simplex.h Edge.h \
- ../Geo/ExtrudeParams.h Metric.h 2D_Mesh.h
-2D_Cylindrical.o: 2D_Cylindrical.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h Mesh.h Vertex.h \
- Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h ../Common/Context.h \
- Numeric.h
-2D_Parametric.o: 2D_Parametric.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h ../Geo/Geo.h \
- ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h Interpolation.h \
- Mesh.h 2D_Mesh.h Create.h ../Common/Context.h Numeric.h
-2D_Mesh_Aniso.o: 2D_Mesh_Aniso.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h ../Geo/Geo.h \
- ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h Mesh.h \
- Interpolation.h Create.h ../Common/Context.h Numeric.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h Mesh.h Vertex.h Simplex.h Edge.h \
+ ../Geo/ExtrudeParams.h Metric.h 2D_Mesh.h
+2D_Cylindrical.o: 2D_Cylindrical.cpp ../Common/Gmsh.h \
+ ../Common/Message.h ../DataStr/Malloc.h ../DataStr/List.h \
+ ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
+ ../Common/Const.h Mesh.h Vertex.h Simplex.h Edge.h \
+ ../Geo/ExtrudeParams.h Metric.h ../Common/Context.h Numeric.h
+2D_Parametric.o: 2D_Parametric.cpp ../Common/Gmsh.h \
+ ../Common/Message.h ../DataStr/Malloc.h ../DataStr/List.h \
+ ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
+ ../Common/Const.h ../Geo/Geo.h ../Geo/CAD.h ../Mesh/Mesh.h \
+ ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
+ ../Geo/ExtrudeParams.h ../Mesh/Metric.h Interpolation.h Mesh.h \
+ 2D_Mesh.h Create.h ../Common/Context.h Numeric.h
+2D_Mesh_Aniso.o: 2D_Mesh_Aniso.cpp ../Common/Gmsh.h \
+ ../Common/Message.h ../DataStr/Malloc.h ../DataStr/List.h \
+ ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
+ ../Common/Const.h ../Geo/Geo.h ../Geo/CAD.h ../Mesh/Mesh.h \
+ ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
+ ../Geo/ExtrudeParams.h ../Mesh/Metric.h Mesh.h Interpolation.h \
+ Create.h ../Common/Context.h Numeric.h
3D_Mesh.o: 3D_Mesh.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h Mesh.h Vertex.h \
- Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h 3D_Mesh.h Create.h \
- Numeric.h ../Common/Context.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h Mesh.h Vertex.h \
+ Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h 3D_Mesh.h Create.h \
+ Numeric.h ../Common/Context.h
3D_SMesh.o: 3D_SMesh.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h Mesh.h Vertex.h Simplex.h Edge.h \
- ../Geo/ExtrudeParams.h Metric.h Interpolation.h Create.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h Mesh.h Vertex.h Simplex.h Edge.h \
+ ../Geo/ExtrudeParams.h Metric.h Interpolation.h Create.h
3D_BGMesh.o: 3D_BGMesh.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h Mesh.h Vertex.h Simplex.h Edge.h \
- ../Geo/ExtrudeParams.h Metric.h 2D_Mesh.h 3D_Mesh.h ../Adapt/Adapt.h \
- ../Common/Views.h ../Common/Const.h ../Common/ColorTable.h Numeric.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h Mesh.h Vertex.h Simplex.h Edge.h \
+ ../Geo/ExtrudeParams.h Metric.h 2D_Mesh.h 3D_Mesh.h ../Adapt/Adapt.h \
+ ../Common/Views.h ../Common/Const.h ../Common/ColorTable.h Numeric.h
3D_Extrude.o: 3D_Extrude.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h ../Geo/Geo.h \
- ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h Mesh.h \
- ../Common/Context.h Create.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h ../Geo/Geo.h \
+ ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+ ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h Mesh.h \
+ ../Common/Context.h Create.h
3D_Coherence.o: 3D_Coherence.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h ../Geo/Geo.h \
- Mesh.h Vertex.h Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h \
- 3D_Mesh.h Create.h Numeric.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h ../Geo/Geo.h \
+ Mesh.h Vertex.h Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h \
+ 3D_Mesh.h Create.h Numeric.h
3D_Divide.o: 3D_Divide.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h Mesh.h Vertex.h \
- Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h Mesh.h Vertex.h \
+ Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h
3D_Bricks.o: 3D_Bricks.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h Mesh.h Vertex.h \
- Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h Mesh.h Vertex.h \
+ Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h
MeshQuality.o: MeshQuality.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h Mesh.h Vertex.h \
- Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h Numeric.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h Mesh.h Vertex.h \
+ Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h Numeric.h
Create.o: Create.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h ../Geo/Geo.h \
- ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h Mesh.h Numeric.h \
- ../Common/Context.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h ../Geo/Geo.h \
+ ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+ ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h Mesh.h \
+ Numeric.h ../Common/Context.h
Generator.o: Generator.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h Mesh.h Vertex.h \
- Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h Create.h \
- ../Common/Context.h ../Parser/OpenFile.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h Mesh.h Vertex.h \
+ Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h Create.h \
+ ../Common/Context.h ../Parser/OpenFile.h
Print_Mesh.o: Print_Mesh.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h ../Geo/Geo.h \
- ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h Mesh.h Create.h \
- ../Common/Context.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h ../Geo/Geo.h \
+ ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+ ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h Mesh.h \
+ Create.h ../Common/Context.h
Read_Mesh.o: Read_Mesh.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Geo/Geo.h Mesh.h Vertex.h \
- Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h Create.h \
- ../Geo/MinMax.h
-STL.o: STL.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
- ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
- Mesh.h Vertex.h Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Geo/Geo.h Mesh.h Vertex.h \
+ Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h Create.h \
+ ../Geo/MinMax.h
+STL.o: STL.cpp ../Common/Gmsh.h ../Common/Message.h \
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h Mesh.h Vertex.h Simplex.h Edge.h \
+ ../Geo/ExtrudeParams.h Metric.h
+SMS.o: SMS.cpp ../Common/Gmsh.h ../Common/Message.h \
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Geo/Geo.h Mesh.h Vertex.h \
+ Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h Create.h \
+ ../Geo/MinMax.h ../Geo/CAD.h ../Mesh/Mesh.h ../Common/Context.h \
+ ../Common/Const.h
SwapEdge.o: SwapEdge.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h Mesh.h Vertex.h \
- Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h SwapPatterns.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h Mesh.h Vertex.h \
+ Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h SwapPatterns.h
Numeric.o: Numeric.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h ../Geo/Geo.h \
- ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h Mesh.h Numeric.h \
- Interpolation.h ../Adapt/nrutil.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h ../Geo/Geo.h \
+ ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+ ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h Mesh.h \
+ Numeric.h Interpolation.h ../Adapt/nrutil.h
Metric.o: Metric.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h ../Geo/Geo.h \
- ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h Mesh.h Matrix.h \
- Interpolation.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h ../Geo/Geo.h \
+ ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+ ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h Mesh.h \
+ Matrix.h Interpolation.h
Nurbs.o: Nurbs.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h Mesh.h Vertex.h Simplex.h Edge.h \
- ../Geo/ExtrudeParams.h Metric.h
-Interpolation.o: Interpolation.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h ../Geo/Geo.h \
- ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h Mesh.h Numeric.h \
- Interpolation.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h Mesh.h Vertex.h Simplex.h Edge.h \
+ ../Geo/ExtrudeParams.h Metric.h
+Interpolation.o: Interpolation.cpp ../Common/Gmsh.h \
+ ../Common/Message.h ../DataStr/Malloc.h ../DataStr/List.h \
+ ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
+ ../Common/Const.h ../Geo/Geo.h ../Geo/CAD.h ../Mesh/Mesh.h \
+ ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
+ ../Geo/ExtrudeParams.h ../Mesh/Metric.h Mesh.h Numeric.h \
+ Interpolation.h
SecondOrder.o: SecondOrder.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Geo/Geo.h Mesh.h Vertex.h \
- Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h Interpolation.h \
- Numeric.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Geo/Geo.h Mesh.h Vertex.h \
+ Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h Interpolation.h \
+ Numeric.h
Smoothing.o: Smoothing.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h Mesh.h Vertex.h \
- Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h Mesh.h Vertex.h \
+ Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h
CrossData.o: CrossData.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h Mesh.h Vertex.h Simplex.h Edge.h \
- ../Geo/ExtrudeParams.h Metric.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h Mesh.h Vertex.h Simplex.h Edge.h \
+ ../Geo/ExtrudeParams.h Metric.h
Vertex.o: Vertex.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h Vertex.h ../Common/Context.h \
- ../Common/Const.h
-Edge.o: Edge.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
- ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
- Mesh.h Vertex.h Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h \
- ../Common/Const.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h Vertex.h ../Common/Context.h \
+ ../Common/Const.h
+Edge.o: Edge.cpp ../Common/Gmsh.h ../Common/Message.h \
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h Mesh.h Vertex.h Simplex.h Edge.h \
+ ../Geo/ExtrudeParams.h Metric.h ../Common/Const.h
Simplex.o: Simplex.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h ../Geo/Geo.h \
- Mesh.h Vertex.h Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h \
- Numeric.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h ../Geo/Geo.h \
+ Mesh.h Vertex.h Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h \
+ Numeric.h
diff --git a/Motif/Makefile b/Motif/Makefile
index 065e4fbdfe..e538429e2b 100644
--- a/Motif/Makefile
+++ b/Motif/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.10 2001-02-20 18:32:58 geuzaine Exp $
+# $Id: Makefile,v 1.11 2001-03-10 19:55:07 remacle Exp $
#
# Makefile for "libMotif.a"
#
@@ -71,114 +71,117 @@ depend:
$(RM) $(RMFLAGS) Makefile.new
# DO NOT DELETE THIS LINE
-Main.o: Main.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
- ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
- ../Common/GmshUI.h ../Common/GmshVersion.h ../Geo/Geo.h ../Geo/Verif.h \
- ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \
- ../Common/Views.h ../Common/Const.h ../Common/ColorTable.h \
- ../Common/Context.h ../Common/Options.h ../Parser/Parser.h Widgets.h \
- Pixmaps.h XColors.h XContext.h XRessources.h CbContext.h CbGeom.h \
- Register.h Geometry.h ../Parser/OpenFile.h ../Common/GetOptions.h \
- ../Common/Static.h XStatic.h
+Main.o: Main.cpp ../Common/Gmsh.h ../Common/Message.h \
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \
+ ../Common/GmshVersion.h ../Geo/Geo.h ../Geo/Verif.h ../Mesh/Mesh.h \
+ ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
+ ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \
+ ../Common/Views.h ../Common/Const.h ../Common/ColorTable.h \
+ ../Common/Context.h ../Common/Options.h ../Parser/Parser.h Widgets.h \
+ Pixmaps.h XColors.h XContext.h XRessources.h CbContext.h CbGeom.h \
+ Register.h Geometry.h ../Parser/OpenFile.h ../Common/GetOptions.h \
+ ../Common/Static.h XStatic.h
Widgets.o: Widgets.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Mesh/Mesh.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Common/Context.h \
- ../Common/Const.h XContext.h Info.h Widgets.h Help.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Mesh/Mesh.h \
+ ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
+ ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Common/Context.h \
+ ../Common/Const.h XContext.h Info.h Widgets.h Help.h
Geometry.o: Geometry.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \
- ../Common/Context.h ../Common/Const.h XContext.h Widgets.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \
+ ../Common/Context.h ../Common/Const.h XContext.h Widgets.h
Register.o: Register.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \
- ../Common/Context.h ../Common/Const.h XContext.h Widgets.h Register.h \
- CbOptions.h CbContext.h CbFile.h CbGeom.h CbMesh.h CbPost.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \
+ ../Common/Context.h ../Common/Const.h XContext.h Widgets.h Register.h \
+ CbOptions.h CbContext.h CbFile.h CbGeom.h CbMesh.h CbPost.h
Pixmaps.o: Pixmaps.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h Widgets.h \
- ../Common/Context.h ../Common/Const.h Pixmaps.h ../Common/Bitmaps.h \
- XColors.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h Widgets.h \
+ ../Common/Context.h ../Common/Const.h Pixmaps.h ../Common/Bitmaps.h \
+ XColors.h
Opengl.o: Opengl.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \
- ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \
- ../Common/Views.h ../Common/Const.h ../Common/ColorTable.h \
- ../Common/Context.h ../Geo/MinMax.h Widgets.h XContext.h \
- ../Graphics/gl2ps.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \
+ ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
+ ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \
+ ../Common/Views.h ../Common/Const.h ../Common/ColorTable.h \
+ ../Common/Context.h ../Geo/MinMax.h Widgets.h XContext.h \
+ ../Graphics/gl2ps.h
XColors.o: XColors.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h XContext.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h XContext.h
Message.o: Message.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \
- ../Common/GmshVersion.h ../Common/Context.h ../Common/Const.h Widgets.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \
+ ../Common/GmshVersion.h ../Common/Context.h ../Common/Const.h \
+ Widgets.h
CbContext.o: CbContext.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \
- ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \
- ../Common/Views.h ../Common/Const.h ../Common/ColorTable.h Widgets.h \
- ../Common/Context.h XContext.h CbContext.h CbGeom.h CbMesh.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \
+ ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
+ ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \
+ ../Common/Views.h ../Common/Const.h ../Common/ColorTable.h Widgets.h \
+ ../Common/Context.h XContext.h CbContext.h CbGeom.h CbMesh.h
CbPost.o: CbPost.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \
- ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \
- ../Common/Views.h ../Common/Const.h ../Common/ColorTable.h Widgets.h \
- ../Common/Context.h XContext.h ../Parser/OpenFile.h CbPost.h CbGeom.h \
- CbMesh.h CbColorbar.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \
+ ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
+ ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \
+ ../Common/Views.h ../Common/Const.h ../Common/ColorTable.h Widgets.h \
+ ../Common/Context.h XContext.h ../Parser/OpenFile.h CbPost.h CbGeom.h \
+ CbMesh.h CbColorbar.h
CbColorbar.o: CbColorbar.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \
- ../Common/Const.h XColors.h Widgets.h Register.h ../Common/Context.h \
- XContext.h ../Common/ColorTable.h CbColorbar.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \
+ ../Common/Const.h XColors.h Widgets.h Register.h ../Common/Context.h \
+ XContext.h ../Common/ColorTable.h CbColorbar.h
CbGeom.o: CbGeom.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \
- ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \
- ../Common/Views.h ../Common/Const.h ../Common/ColorTable.h Widgets.h \
- ../Common/Context.h ../Geo/Verif.h ../Parser/OpenFile.h CbGeom.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \
+ ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
+ ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \
+ ../Common/Views.h ../Common/Const.h ../Common/ColorTable.h Widgets.h \
+ ../Common/Context.h ../Geo/Verif.h ../Parser/OpenFile.h CbGeom.h
CbMesh.o: CbMesh.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \
- ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \
- ../Common/Views.h ../Common/Const.h ../Common/ColorTable.h CbMesh.h \
- ../Common/Context.h Widgets.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \
+ ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
+ ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \
+ ../Common/Views.h ../Common/Const.h ../Common/ColorTable.h CbMesh.h \
+ ../Common/Context.h Widgets.h
CbOptions.o: CbOptions.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \
- ../Geo/Verif.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h \
- ../Graphics/Draw.h ../Common/Views.h ../Common/Const.h \
- ../Common/ColorTable.h Widgets.h Pixmaps.h ../Common/Context.h \
- ../Common/Options.h XContext.h Register.h ../Common/Timer.h \
- ../Geo/Visibility.h CbOptions.h CbGeom.h CbMesh.h CbPost.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \
+ ../Geo/Verif.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+ ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h \
+ ../Graphics/Draw.h ../Common/Views.h ../Common/Const.h \
+ ../Common/ColorTable.h Widgets.h Pixmaps.h ../Common/Context.h \
+ ../Common/Options.h XContext.h Register.h ../Common/Timer.h \
+ ../Geo/Visibility.h CbOptions.h CbGeom.h CbMesh.h CbPost.h
CbFile.o: CbFile.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \
- ../Parser/OpenFile.h ../Common/Const.h ../Mesh/Mesh.h ../Mesh/Vertex.h \
- ../Mesh/Simplex.h ../Mesh/Edge.h ../Geo/ExtrudeParams.h \
- ../Mesh/Metric.h ../Graphics/Draw.h ../Common/Views.h \
- ../Common/ColorTable.h Widgets.h ../Common/Context.h \
- ../Common/Options.h ../Graphics/CreateFile.h CbFile.h CbColorbar.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \
+ ../Parser/OpenFile.h ../Common/Const.h ../Mesh/Mesh.h \
+ ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
+ ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \
+ ../Common/Views.h ../Common/ColorTable.h Widgets.h \
+ ../Common/Context.h ../Common/Options.h ../Graphics/CreateFile.h \
+ CbFile.h CbColorbar.h
CbInput.o: CbInput.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Mesh/Mesh.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \
- ../Common/Views.h ../Common/Const.h ../Common/ColorTable.h Widgets.h \
- ../Common/Context.h ../Common/Options.h XContext.h Register.h \
- CbContext.h CbGeom.h CbPost.h CbMesh.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Mesh/Mesh.h \
+ ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
+ ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \
+ ../Common/Views.h ../Common/Const.h ../Common/ColorTable.h Widgets.h \
+ ../Common/Context.h ../Common/Options.h XContext.h Register.h \
+ CbContext.h CbGeom.h CbPost.h CbMesh.h
CbGeneral.o: CbGeneral.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Mesh/Mesh.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \
- ../Common/Views.h ../Common/Const.h ../Common/ColorTable.h \
- ../Common/Context.h XContext.h Widgets.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Mesh/Mesh.h \
+ ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
+ ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \
+ ../Common/Views.h ../Common/Const.h ../Common/ColorTable.h \
+ ../Common/Context.h XContext.h Widgets.h
diff --git a/Parser/Makefile b/Parser/Makefile
index a89293efab..e3603cbd5e 100644
--- a/Parser/Makefile
+++ b/Parser/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.17 2001-02-18 18:04:03 geuzaine Exp $
+# $Id: Makefile,v 1.18 2001-03-10 19:55:07 remacle Exp $
#
# Makefile for "libParser.a"
#
@@ -64,26 +64,26 @@ depend:
# DO NOT DELETE THIS LINE
Gmsh.yy.o: Gmsh.yy.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h ../Geo/Geo.h \
- ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
- ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h Gmsh.tab.cpp.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h ../Geo/Geo.h \
+ ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+ ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h Gmsh.tab.cpp.h
Gmsh.tab.o: Gmsh.tab.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h \
- ../Common/Context.h ../Geo/Geo.h ../Geo/CAD.h ../Mesh/Mesh.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Geo/DataBase.h \
- ../Graphics/Draw.h ../Common/Views.h ../Common/ColorTable.h \
- ../Mesh/Create.h ../Geo/StepGeomDatabase.h ../Common/Options.h \
- ../Common/Colors.h Parser.h OpenFile.h FunctionManager.h \
- ../Common/Timer.h ../Graphics/CreateFile.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h \
+ ../Common/Context.h ../Geo/Geo.h ../Geo/CAD.h ../Mesh/Mesh.h \
+ ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
+ ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Geo/DataBase.h \
+ ../Graphics/Draw.h ../Common/Views.h ../Common/ColorTable.h \
+ ../Mesh/Create.h ../Geo/StepGeomDatabase.h ../Common/Options.h \
+ ../Common/Colors.h Parser.h OpenFile.h FunctionManager.h \
+ ../Common/Timer.h ../Graphics/CreateFile.h
OpenFile.o: OpenFile.cpp ../Common/Gmsh.h ../Common/Message.h \
- ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
- ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h \
- ../Common/Context.h Parser.h OpenFile.h ../Geo/Geo.h ../Mesh/Mesh.h \
- ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
- ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Common/Views.h \
- ../Common/ColorTable.h ../Geo/MinMax.h ../Geo/Visibility.h \
- ../Common/GmshUI.h ../Graphics/Draw.h ../Motif/Widgets.h
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h \
+ ../Common/Context.h Parser.h OpenFile.h ../Geo/Geo.h ../Mesh/Mesh.h \
+ ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
+ ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Common/Views.h \
+ ../Common/ColorTable.h ../Geo/MinMax.h ../Geo/Visibility.h \
+ ../Common/GmshUI.h ../Graphics/Draw.h ../Motif/Widgets.h
FunctionManager.o: FunctionManager.cpp FunctionManager.h
diff --git a/Plugin/Cutplane/CutPlane.cpp b/Plugin/Cutplane/CutPlane.cpp
index 9ee89f9b5d..a5a7b4d39c 100644
--- a/Plugin/Cutplane/CutPlane.cpp
+++ b/Plugin/Cutplane/CutPlane.cpp
@@ -5,11 +5,21 @@
/*
Plugin Entry : GMSH_RegisterPlugin
*/
-extern "C"{
-GMSH_Plugin *GMSH_RegisterPlugin ()
+
+double opt_cut_plane_A(OPT_ARGS_NUM)
{
- return new GMSH_CutPlanePlugin (1.0,0.0,0.0,0.0);
}
+
+StringXNumber CutPlaneOptions_Number[] = {
+ { GMSH_FULLRC, "A" , opt_cut_plane_A , 1. }
+};
+
+extern "C"
+{
+ GMSH_Plugin *GMSH_RegisterCutPlanePlugin ()
+ {
+ return new GMSH_CutPlanePlugin (1.0,0.0,0.0,0.0);
+ }
}
@@ -35,10 +45,9 @@ int GMSH_CutPlanePlugin::getNbOptions() const
return 4;
}
-void GMSH_CutPlanePlugin:: GetOption (int iopt, char *optionName, void *optionValue) const
+void GMSH_CutPlanePlugin:: GetOption (int iopt, StringXNumber *option) const
{
- // geuz, t'es le specialiste des options, regarde comment
- // on pourrait faire Plugin.CutPlane.a = 1.0;
+ *option = CutPlaneOptions_Number[iopt];
}
void GMSH_CutPlanePlugin::CatchErrorMessage (char *errorMessage) const
@@ -48,8 +57,9 @@ void GMSH_CutPlanePlugin::CatchErrorMessage (char *errorMessage) const
Post_View *GMSH_CutPlanePlugin::execute (Post_View *v)
{
+
int i,nb,edtet[6][2] = {{0,1},{0,2},{0,3},{1,2},{1,3},{2,3}};
- /* for all scalar simplices */
+ // for all scalar simplices
if(v->NbSS)
{
nb = List_Nbr(v->ST) / v->NbST ;
@@ -77,11 +87,8 @@ Post_View *GMSH_CutPlanePlugin::execute (Post_View *v)
}
}
}
- return 0;
-}
-void GMSH_CutPlanePlugin::SetOption (char *optionName, void *optionValue)
-{
+ return 0;
}
double GMSH_CutPlanePlugin :: levelset (double x, double y, double z)
@@ -89,3 +96,9 @@ double GMSH_CutPlanePlugin :: levelset (double x, double y, double z)
return a * x + b * y + c * z + d;
}
+
+
+
+
+
+
diff --git a/Plugin/Cutplane/CutPlane.h b/Plugin/Cutplane/CutPlane.h
index 54ab0fd754..6c840281a5 100644
--- a/Plugin/Cutplane/CutPlane.h
+++ b/Plugin/Cutplane/CutPlane.h
@@ -1,11 +1,16 @@
#ifndef _CUTPLANE_H_
#define _CUTPLANE_H
-#include "Plugin.h"
+#include "../Plugin.h"
+extern "C"
+{
+ GMSH_Plugin *GMSH_RegisterCutPlanePlugin ();
+}
+
class GMSH_CutPlanePlugin : public GMSH_Post_Plugin
{
/*Plane a x + b y + c z + d = 0*/
double a,b,c,d;
- double levelset (double x, double y, double z);
+ virtual double levelset (double x, double y, double z);
public:
GMSH_CutPlanePlugin(double A, double B, double C, double D);
virtual void getName (char *name) const;
@@ -13,9 +18,8 @@ public:
char *copyright,
char *help_text) const;
virtual void CatchErrorMessage (char *errorMessage) const;
- virtual void SetOption (char *optionName, void *optionValue);
virtual int getNbOptions() const;
- virtual void GetOption (int iopt, char *optionName, void *optionValue) const;
+ virtual void GetOption (int iopt, StringXNumber *option) const;
virtual Post_View *execute (Post_View *);
};
#endif
diff --git a/Plugin/Cutplane/Makefile b/Plugin/Cutplane/Makefile
index 9139f33feb..e20568d8a6 100644
--- a/Plugin/Cutplane/Makefile
+++ b/Plugin/Cutplane/Makefile
@@ -1,16 +1,16 @@
-# $Id: Makefile,v 1.4 2001-03-06 04:38:56 remacle Exp $
+# $Id: Makefile,v 1.5 2001-03-10 19:55:07 remacle Exp $
#
# Makefile for "libAdapt.a"
#
.IGNORE:
-CC = c++ -fPIC
-AR = gcc -shared -o
+CC = c++
+AR = ar ruvs
RM = rm
RANLIB = ranlib
-LIB = ../lib/libCutPlane.so
+LIB = ../../lib/libCutPlane.a
INCLUDE = -I../../Common -I../../DataStr -I../ -I../../Graphics
C_FLAGS = -g -Wall
diff --git a/Plugin/Makefile b/Plugin/Makefile
index 2fcfa9b771..b84e722e51 100644
--- a/Plugin/Makefile
+++ b/Plugin/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.3 2001-03-05 02:02:41 remacle Exp $
+# $Id: Makefile,v 1.4 2001-03-10 19:55:07 remacle Exp $
#
# Makefile for "libAdapt.a"
#
@@ -11,7 +11,7 @@ RM = rm
RANLIB = ranlib
LIB = ../lib/libPlugin.a
-INCLUDE = -I../Common
+INCLUDE = -I../Common -I../Graphics -I../DataStr
C_FLAGS = -g -Wall
OS_FLAGS =
@@ -20,7 +20,7 @@ VERSION_FLAGS =
RMFLAGS = -f
CFLAGS = $(C_FLAGS) $(OS_FLAGS) $(VERSION_FLAGS) $(INCLUDE) $(GUI_INCLUDE)
-SRC = Plugin.cpp
+SRC = Plugin.cpp CutPlane.cpp
OBJ = $(SRC:.cpp=.o)
diff --git a/Plugin/Plugin.cpp b/Plugin/Plugin.cpp
index 9507cb6dec..e940efa50e 100644
--- a/Plugin/Plugin.cpp
+++ b/Plugin/Plugin.cpp
@@ -5,6 +5,8 @@
#include "PluginManager.h"
#include "Message.h"
#include <FL/filename.H>
+#include "CutPlane/CutPlane.h"
+
using namespace std;
const char *GMSH_PluginEntry = "GMSH_RegisterPlugin";
@@ -43,9 +45,11 @@ void GMSH_PluginManager::RegisterDefaultPlugins()
struct dirent **list;
char ext[6];
+ allPlugins.insert(std::pair<char*,GMSH_Plugin*>("Cut Plane" ,GMSH_RegisterCutPlanePlugin()));
+
+
char *homeplugins = getenv ("GMSHPLUGINSHOME");
- if(!homeplugins)
- homeplugins = "./Plugin/lib";
+ if(!homeplugins)return;
int nbFiles = filename_list(homeplugins,&list);
if(nbFiles <= 0) return;
for(int i=0;i<nbFiles;i++)
@@ -54,7 +58,7 @@ void GMSH_PluginManager::RegisterDefaultPlugins()
if(strlen(name) > 3)
{
strcpy(ext,name+(strlen(name)-3));
- if(!strcmp(ext,".so"))
+ if(!strcmp(ext,".so") || !strcmp(ext,"dll"))
{
AddPlugin(homeplugins,name);
}
diff --git a/Plugin/Plugin.h b/Plugin/Plugin.h
index 437c02e37c..8b9ee24e7e 100644
--- a/Plugin/Plugin.h
+++ b/Plugin/Plugin.h
@@ -7,17 +7,30 @@
-) When there is an unacceptable error in the plugin,
just throw this, the plugin manager will be able to
catch the exception.
+
+ Some Plugins are default gmsh plugins and are insterted
+ directly in the executable. I think that it's a good
+ way to start.
*/
+#include <stdio.h>
+#include "Options.h"
+
+class PluginDialogBox;
class Post_View;
class GMSH_Plugin
{
public :
+ /* a dialog box for user interface */
+ PluginDialogBox *dialogBox;
/*this is there for internal use, this variable will be
used by the PluginManager, just forget it*/
void *hlib;
/* 3 kind of plugins, one for cad, one for mesh, one for postpro*/
- typedef enum GMSH_PLUGIN_TYPE {GMSH_CAD_PLUGIN, GMSH_MESH_PLUGIN, GMSH_POST_PLUGIN};
+ typedef enum GMSH_PLUGIN_TYPE {GMSH_CAD_PLUGIN,
+ GMSH_MESH_PLUGIN,
+ GMSH_POST_PLUGIN,
+ GMSH_SOLVE_PLUGIN};
/* returns the type of plugin for downcasting GMSH_Plugin into
GMSH_CAD_Plugin, GMSH_Mesh_Plugin and GMSH_Post_Plugin */
virtual GMSH_PLUGIN_TYPE getType() const = 0;
@@ -29,9 +42,8 @@ public :
will show the message and hopefully continue */
virtual void CatchErrorMessage (char *errorMessage) const = 0;
/* gmsh style option, ca be loaded, saved and set*/
- virtual void SetOption (char *optionName, void *optionValue) = 0;
virtual int getNbOptions() const = 0;
- virtual void GetOption (int iopt, char *optionName, void *optionValue) const = 0;
+ virtual void GetOption (int iopt, StringXNumber *option) const = 0;
};
/* Base class for Post-Processing Plugins
diff --git a/jpeg/Makefile b/jpeg/Makefile
index 3e548b2229..6b8cd89417 100644
--- a/jpeg/Makefile
+++ b/jpeg/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.10 2001-02-18 18:04:03 geuzaine Exp $
+# $Id: Makefile,v 1.11 2001-03-10 19:55:07 remacle Exp $
#
# Makefile for "libJpeg.a"
#
@@ -51,42 +51,43 @@ depend:
$(RM) $(RMFLAGS) Makefile.new
# DO NOT DELETE THIS LINE
-jcomapi.o: jcomapi.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h \
- jerror.h
+jcomapi.o: jcomapi.c jinclude.h jconfig.h jpeglib.h jmorecfg.h \
+ jpegint.h jerror.h
jutils.o: jutils.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h \
- jerror.h
-jerror.o: jerror.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jversion.h \
- jerror.h
-jmemmgr.o: jmemmgr.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h \
- jerror.h jmemsys.h
+ jerror.h
+jerror.o: jerror.c jinclude.h jconfig.h jpeglib.h jmorecfg.h \
+ jversion.h jerror.h
+jmemmgr.o: jmemmgr.c jinclude.h jconfig.h jpeglib.h jmorecfg.h \
+ jpegint.h jerror.h jmemsys.h
jmemnobs.o: jmemnobs.c jinclude.h jconfig.h jpeglib.h jmorecfg.h \
- jpegint.h jerror.h jmemsys.h
+ jpegint.h jerror.h jmemsys.h
jcapi.o: jcapi.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h \
- jerror.h
-jcparam.o: jcparam.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h \
- jerror.h
-jdatadst.o: jdatadst.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h
+ jerror.h
+jcparam.o: jcparam.c jinclude.h jconfig.h jpeglib.h jmorecfg.h \
+ jpegint.h jerror.h
+jdatadst.o: jdatadst.c jinclude.h jconfig.h jpeglib.h jmorecfg.h \
+ jerror.h
jcmaster.o: jcmaster.c jinclude.h jconfig.h jpeglib.h jmorecfg.h \
- jpegint.h jerror.h
+ jpegint.h jerror.h
jcmarker.o: jcmarker.c jinclude.h jconfig.h jpeglib.h jmorecfg.h \
- jpegint.h jerror.h
+ jpegint.h jerror.h
jcmainct.o: jcmainct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h \
- jpegint.h jerror.h
+ jpegint.h jerror.h
jcprepct.o: jcprepct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h \
- jpegint.h jerror.h
+ jpegint.h jerror.h
jccoefct.o: jccoefct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h \
- jpegint.h jerror.h
-jccolor.o: jccolor.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h \
- jerror.h
+ jpegint.h jerror.h
+jccolor.o: jccolor.c jinclude.h jconfig.h jpeglib.h jmorecfg.h \
+ jpegint.h jerror.h
jcsample.o: jcsample.c jinclude.h jconfig.h jpeglib.h jmorecfg.h \
- jpegint.h jerror.h
+ jpegint.h jerror.h
jchuff.o: jchuff.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h \
- jerror.h
+ jerror.h
jcdctmgr.o: jcdctmgr.c jinclude.h jconfig.h jpeglib.h jmorecfg.h \
- jpegint.h jerror.h jdct.h
+ jpegint.h jerror.h jdct.h
jfdctfst.o: jfdctfst.c jinclude.h jconfig.h jpeglib.h jmorecfg.h \
- jpegint.h jerror.h jdct.h
+ jpegint.h jerror.h jdct.h
jfdctflt.o: jfdctflt.c jinclude.h jconfig.h jpeglib.h jmorecfg.h \
- jpegint.h jerror.h jdct.h
+ jpegint.h jerror.h jdct.h
jfdctint.o: jfdctint.c jinclude.h jconfig.h jpeglib.h jmorecfg.h \
- jpegint.h jerror.h jdct.h
+ jpegint.h jerror.h jdct.h
--
GitLab