diff --git a/fluid_project/add_model.fl b/fluid_project/add_model.fl index 9b247ee..2a63303 100644 --- a/fluid_project/add_model.fl +++ b/fluid_project/add_model.fl @@ -5,11 +5,11 @@ code_name {.cxx} Function {cb_add_mod_btn(Fl_Button*, void*)} {open return_type void } { Fl_Window edit_mod_win { - label {Model editor (gm3d)} open selected - xywh {889 252 314 320} type Double visible + label {gm3d editor} open selected + xywh {645 271 314 320} type Double visible } { Fl_Group mod_type_group { - label {Model Type :} open + label {Entity Type :} open xywh {20 25 250 53} align 5 } { Fl_Round_Button reg_bok_rbtn { @@ -21,7 +21,7 @@ Function {cb_add_mod_btn(Fl_Button*, void*)} {open return_type void xywh {160 25 100 28} down_box ROUND_DOWN_BOX } Fl_Round_Button sph_rbtn { - label Ellipsoid + label Sphere xywh {20 50 70 28} down_box ROUND_DOWN_BOX } Fl_Round_Button int_face_rbtn { @@ -30,7 +30,7 @@ Function {cb_add_mod_btn(Fl_Button*, void*)} {open return_type void } } Fl_Group val_type_group { - label {Value Type :} open + label {Value Type:} open xywh {20 100 250 30} align 5 } { Fl_Round_Button app_val_rbtn { @@ -47,24 +47,24 @@ Function {cb_add_mod_btn(Fl_Button*, void*)} {open return_type void } } Fl_Group agn_part_group { - label {Assign Part :} open + label {Solid Side:} open xywh {20 150 160 28} align 5 } { Fl_Round_Button top_val_btn { - label Top - xywh {20 150 50 28} down_box ROUND_DOWN_BOX deactivate + label Above + xywh {20 150 70 28} down_box ROUND_DOWN_BOX deactivate } Fl_Round_Button bot_val_btn { - label Bottom - xywh {90 150 70 28} down_box ROUND_DOWN_BOX deactivate + label Below + xywh {95 150 70 28} down_box ROUND_DOWN_BOX deactivate } } Fl_Input sig_mod_para_input { - label {Model Parameter :} + label {Geometric Parameters:} xywh {20 200 275 28} align 5 } Fl_Input mod_val_input { - label {Model Value :} + label {Physical Value:} xywh {180 150 115 28} align 5 } Fl_Button sig_add_btn { @@ -80,7 +80,7 @@ Function {cb_add_mod_btn(Fl_Button*, void*)} {open return_type void xywh {215 240 80 28} deactivate } Fl_Return_Button can_add_btn { - label Cancel + label Quit xywh {215 280 80 28} } } diff --git a/fluid_project/gm3d_gui2.fl b/fluid_project/gm3d_gui2.fl index 469f463..a92d68e 100644 --- a/fluid_project/gm3d_gui2.fl +++ b/fluid_project/gm3d_gui2.fl @@ -2,34 +2,28 @@ version 1.0305 header_name {.h} code_name {.cxx} -Function {cb_mesh_para_input(Fl_Input*, void*)} {open -} {} - -Function {cb_mesh_file_btn(Fl_Widget*, void*)} {open -} {} - Function {cb_edit_mod_btn(Fl_Widget*, void*)} {open } {} Function {cb_mod_para_file_btn(Fl_Widget*, void*)} {open } {} +Function {cb_mod_para_save_btn(Fl_Widget*, void*)} {open +} {} + Function {cb_mod_para_brw(Fl_Browser*, void*)} {open } {} -Function {cb_mod_ele_input(Fl_Input*, void*)} {open +Function {cb_mesh_mod_savename(Fl_Input*, void*)} {open } {} Function {cb_rm_emp_bok_check(Fl_Check_Button*, void*)} {open } {} -Function {cb_mod_file_out_btn(Fl_Widget*, void*)} {open -} {} - Function {cb_build_mod_btn(Fl_Widget*, void*)} {open } {} -Function {cb_mod_file_input(Fl_Input*, void*)} {open +Function {cb_mod_file_out_btn(Fl_Widget*, void*)} {open } {} Function {cb_mod_file_btn(Fl_Widget*, void*)} {open @@ -41,9 +35,6 @@ Function {cb_obs_file_input(Fl_Input*, void*)} {open Function {cb_obs_file_btn(Fl_Widget*, void*)} {open } {} -Function {cb_res_file_input(Fl_Input*, void*)} {open -} {} - Function {cb_res_file_btn(Fl_Widget*, void*)} {open } {} @@ -63,195 +54,191 @@ Function {} {open } { Fl_Window main_window { label gm3d open - xywh {857 85 500 600} type Double visible + xywh {645 105 500 580} type Double visible } { Fl_Tabs main_tabs {open - xywh {10 10 480 580} + xywh {10 10 480 560} } { Fl_Group model_tab { - label {Build Model} open selected - xywh {10 40 480 550} + label {Build 3D Mesh Model} selected + xywh {10 40 480 530} } { Fl_Input mesh_para_input { - label {Input Mesh Parameters :} - callback cb_mesh_para_input - xywh {40 70 300 28} align 5 + label {Mesh Parameters:} + tooltip {////////} xywh {40 70 420 28} align 5 } - Fl_Button mesh_file_btn { - label {Mesh File} - callback cb_mesh_file_btn - xywh {360 70 100 28} + Fl_Group {} { + label {Entities Parameters:} + xywh {40 130 369 40} align 5 + } { + Fl_Button edit_mod_btn { + label Editor + callback cb_edit_mod_btn + tooltip {Open the model editor to add or edit a model.} xywh {40 135 100 28} + } + Fl_Button mod_para_file_btn { + label {Import From} + callback cb_mod_para_file_btn + tooltip {Import models from a text file.} xywh {160 135 100 28} + } + Fl_Button mod_para_save_btn { + label {Save As} + callback cb_mod_para_save_btn + tooltip {Save models to a text file.} xywh {280 135 100 28} deactivate + } } - Fl_Button mod_para_file_btn { - label {Add Model From File} - callback cb_mod_para_file_btn - xywh {170 160 160 28} + Fl_Browser mod_para_brw { + label {Added Physical Entities} + callback cb_mod_para_brw + tooltip {Select a model to edit or remove it using the model editor.} xywh {40 195 420 250} align 5 } - Fl_Input mod_ele_input_build { - label {Input Model Element Data Name:} - callback cb_mod_ele_input - xywh {40 445 215 28} align 5 - } - Fl_Button build_mod_btn { - label {Build Model !} - callback cb_build_mod_btn - xywh {40 545 420 28} - } - Fl_Output mesh_para_output { - label {Mesh Parameters :} - xywh {40 120 300 28} box NO_BOX align 5 - } - Fl_Button edit_mod_btn { - label {Model Editor} - callback cb_edit_mod_btn - xywh {40 160 100 28} + Fl_Input mesh_model_save_name { + label {Mesh Model's Name:} + callback cb_mesh_mod_savename + tooltip {Name of the meshed 3D model.} xywh {40 475 215 28} align 5 } Fl_Check_Button rm_emp_bok_check { label {Remove Empty Blocks} callback cb_rm_emp_bok_check - xywh {280 447 180 28} down_box DOWN_BOX + tooltip {Remove blocks with zero value from output mesh model files.} xywh {280 475 180 28} down_box DOWN_BOX } - Fl_Browser mod_para_brw { - callback cb_mod_para_brw - xywh {40 205 420 210} + Fl_Button build_mod_btn { + label {Build Mesh Model} + callback cb_build_mod_btn + tooltip {Build 3D meshed model uisng entity parameters listed in the browser.} xywh {40 520 300 28} deactivate } Fl_Button mod_file_out_btn { - label {Model File} + label {Save As} callback cb_mod_file_out_btn - xywh {360 500 100 28} - } - Fl_Output mod_out_file_output { - label {Output File Name :} - xywh {40 500 300 28} box NO_BOX align 5 + tooltip {Save 3D meshed model to a file.} xywh {360 520 100 28} deactivate } } Fl_Group forward_tab { label {Forward Modeling} - xywh {10 40 480 550} hide + xywh {10 40 480 530} box ROUNDED_FRAME hide } { + Fl_Button mod_file_btn { + label {Mesh Model File} + callback cb_mod_file_btn + xywh {40 70 120 28} + } + Fl_Output mesh_mod_disp { + label {Selected:} + xywh {240 70 220 28} box FLAT_BOX color 49 + } + Fl_Group {} { + label Observations + xywh {40 130 420 80} align 5 + } { + Fl_Button obs_file_btn { + label {Observation File} + callback cb_obs_file_btn + xywh {40 135 120 28} + } + Fl_Output obs_file_disp { + label {Selected:} + xywh {240 135 220 28} box FLAT_BOX color 49 + } + Fl_Check_Button manual_input_check { + label {Input Manually} + callback cb_manual_input_check + xywh {40 175 120 30} down_box DOWN_BOX + } + Fl_Input obs_file_input { + callback cb_obs_file_input + xywh {180 175 280 28} align 5 deactivate + } + } + Fl_Input mod_ele_input { + label {Mesh Model Data Name:} + callback cb_mod_ele_input + xywh {260 245 200 28} align 5 + } Fl_Group grav_group { - label {Forward Gravitational Data :} open - xywh {40 340 190 58} align 5 + label {Forward Gravitational Data:} + xywh {40 245 190 60} align 5 } { Fl_Check_Button Vz_check { label Vz - xywh {40 340 50 28} down_box DOWN_BOX + xywh {40 247 50 28} down_box DOWN_BOX } Fl_Check_Button Vzx_check { label Vzx - xywh {105 340 50 28} down_box DOWN_BOX + xywh {105 247 50 28} down_box DOWN_BOX } Fl_Check_Button Vzy_check { label Vzy - xywh {170 340 50 28} down_box DOWN_BOX + xywh {170 247 50 28} down_box DOWN_BOX } Fl_Check_Button Vzz_check { label Vzz - xywh {40 370 50 28} down_box DOWN_BOX + xywh {40 277 50 28} down_box DOWN_BOX } } - Fl_Button mod_file_btn { - label {Model File} - callback cb_mod_file_btn - xywh {360 70 100 28} - } - Fl_Button obs_file_btn { - label {Observe File} - callback cb_obs_file_btn - xywh {360 130 100 28} - } - Fl_Input mod_file_input { - label {Input Model FIle :} - callback cb_mod_file_input - xywh {40 70 300 28} align 5 - } - Fl_Output mod_file_output { - label {Chosen Model File :} - xywh {40 240 200 28} box NO_BOX align 5 - } - Fl_Input obs_file_input { - label {Input Observe FIle :} - callback cb_obs_file_input - xywh {40 130 300 28} align 5 - } - Fl_Output obs_file_output { - label {Chosen Observe File :} - xywh {260 240 200 28} box NO_BOX align 5 - } - Fl_Input mod_ele_input { - label {Model Element Data Name :} - callback cb_mod_ele_input - xywh {260 315 200 28} align 5 - } - Fl_Group mag_group {open - xywh {40 440 420 90} + Fl_Group mag_group { + xywh {40 365 420 90} } { Fl_Check_Button DeltaT_check { label DeltaT - xywh {40 475 65 25} down_box DOWN_BOX deactivate + xywh {40 400 65 25} down_box DOWN_BOX deactivate } Fl_Check_Button DeltaTx_check { label DeltaTx - xywh {120 475 70 25} down_box DOWN_BOX deactivate + xywh {120 400 70 25} down_box DOWN_BOX deactivate } Fl_Check_Button DeltaTy_check { label DeltaTy - xywh {200 475 70 25} down_box DOWN_BOX deactivate + xywh {200 400 70 25} down_box DOWN_BOX deactivate } Fl_Check_Button DeltaTz_check { label DeltaTz - xywh {280 475 70 25} down_box DOWN_BOX deactivate + xywh {280 400 70 25} down_box DOWN_BOX deactivate } Fl_Check_Button Hax_check { label Hax - xywh {40 505 65 25} down_box DOWN_BOX deactivate + xywh {40 430 65 25} down_box DOWN_BOX deactivate } Fl_Check_Button Hay_check { label Hay - xywh {120 505 65 25} down_box DOWN_BOX deactivate + xywh {120 430 65 25} down_box DOWN_BOX deactivate } Fl_Check_Button Za_check { label Za - xywh {200 505 65 25} down_box DOWN_BOX deactivate + xywh {200 430 65 25} down_box DOWN_BOX deactivate } Fl_Input mag_para_input { - label {Magnetization Parameters : } + label {Magnetization Parameters: } callback cb_mag_para_input - tooltip {///} xywh {220 440 240 28} deactivate + tooltip {///} xywh {220 365 240 28} deactivate } } Fl_Check_Button mag_data_check { label {Forward Magnetic Data} callback cb_mag_data_check - xywh {40 405 170 30} down_box DOWN_BOX + xywh {40 330 170 30} down_box DOWN_BOX } Fl_Button cal_btn { - label {Calculate !} + label Calculate callback cb_cal_btn - xywh {40 545 420 28} + xywh {40 470 300 28} deactivate } Fl_Input noise_para_input { callback cb_noise_para_input - tooltip {/} xywh {260 370 200 28} align 5 deactivate + tooltip {/} xywh {260 315 200 28} align 5 deactivate } Fl_Check_Button noise_check { - label {Input Noise Parameters :} + label {Input Noise Parameters:} callback cb_noise_check - xywh {260 345 180 30} down_box DOWN_BOX - } - Fl_Input res_file_input { - label {Input Prefix of Output FIle :} - callback cb_res_file_input - xywh {40 190 300 28} align 5 + xywh {260 285 180 30} down_box DOWN_BOX } Fl_Button res_file_btn { - label {Result File} + label {Save As} callback cb_res_file_btn - xywh {360 190 100 28} + xywh {360 470 100 28} deactivate } - Fl_Output res_out_file_output { - label {Prefix of Output File :} - xywh {40 290 200 28} box NO_BOX align 5 + Fl_Progress cal_progress_bar { + label {Calculating...} + xywh {40 520 420 28} selection_color 139 } } }