From 6836f36339cc0493bc9c43dfcb30f3ed8b9a420d Mon Sep 17 00:00:00 2001
From: Yi Zhang <zhangyiss@icloud.com>
Date: Wed, 10 Jun 2020 22:28:02 +0800
Subject: [PATCH] update on fluid project add_model2

---
 fluid_project/add_model2.fl | 185 ++++++++++++++++++++++++++++++++++++
 fluid_project/gm3d_gui2.fl  |  12 +--
 2 files changed, 191 insertions(+), 6 deletions(-)
 create mode 100644 fluid_project/add_model2.fl

diff --git a/fluid_project/add_model2.fl b/fluid_project/add_model2.fl
new file mode 100644
index 0000000..15b1786
--- /dev/null
+++ b/fluid_project/add_model2.fl
@@ -0,0 +1,185 @@
+# data file for the Fltk User Interface Designer (fluid)
+version 1.0305
+header_name {.h}
+code_name {.cxx}
+Function {cb_add_mod_btn(Fl_Button*, void*)} {open return_type void
+} {
+  Fl_Window edit_mod_win {
+    label {Physical Entity (gm3d)} open
+    xywh {551 245 405 493} type Double visible
+  } {
+    Fl_Group val_type_group {
+      label {Value Type:}
+      xywh {20 340 250 30} align 5
+    } {
+      Fl_Round_Button app_val_rbtn {
+        label Append
+        xywh {20 340 80 28} down_box ROUND_DOWN_BOX
+      }
+      Fl_Round_Button rep_val_rbtn {
+        label Replace
+        xywh {100 340 80 28} down_box ROUND_DOWN_BOX
+      }
+      Fl_Round_Button era_val_rbtn {
+        label Erase
+        xywh {210 340 60 28} down_box ROUND_DOWN_BOX
+      }
+    }
+    Fl_Group agn_part_group {
+      label {Solid Side:}
+      xywh {20 400 160 28} align 5
+    } {
+      Fl_Round_Button top_val_btn {
+        label Above
+        xywh {20 400 70 28} down_box ROUND_DOWN_BOX deactivate
+      }
+      Fl_Round_Button bot_val_btn {
+        label Below
+        xywh {100 400 70 28} down_box ROUND_DOWN_BOX deactivate
+      }
+    }
+    Fl_Input mod_val_input {
+      label {Physical Value:}
+      xywh {210 400 175 28} align 5
+    }
+    Fl_Button sig_add_btn {
+      label Add
+      xywh {20 447 80 28}
+    }
+    Fl_Button sig_replace_btn {
+      label Replace
+      xywh {115 447 80 28} deactivate
+    }
+    Fl_Button sig_delete_btn {
+      label Remove
+      xywh {210 447 80 28} deactivate
+    }
+    Fl_Return_Button can_add_btn {
+      label Quit
+      xywh {305 447 80 28}
+    }
+    Fl_Tabs {} {open
+      xywh {20 15 365 290} box UP_BOX align 5
+    } {
+      Fl_Group block_geo_tab {
+        label Block
+        xywh {20 15 365 260} hide
+      } {
+        Fl_Input {} {
+          label {xmin:}
+          xywh {75 35 110 29}
+        }
+        Fl_Input {} {
+          label {xmax:}
+          xywh {250 35 110 29}
+        }
+        Fl_Input {} {
+          label {xmin:}
+          xywh {75 80 110 29}
+        }
+        Fl_Input {} {
+          label {xmax:}
+          xywh {250 80 110 29}
+        }
+        Fl_Input {} {
+          label {xmin:}
+          xywh {75 125 110 29}
+        }
+        Fl_Input {} {
+          label {xmax:}
+          xywh {250 125 110 29}
+        }
+      }
+      Fl_Group tilt_block_geo_tab {
+        label {Tilted Block}
+        xywh {20 15 365 260} hide
+      } {
+        Fl_Input {} {
+          label {xmin:}
+          xywh {75 35 110 29}
+        }
+        Fl_Input {} {
+          label {xmin:}
+          xywh {250 35 110 29}
+        }
+        Fl_Input {} {
+          label {xmin:}
+          xywh {75 80 110 29}
+        }
+        Fl_Input {} {
+          label {xmin:}
+          xywh {250 80 110 29}
+        }
+        Fl_Input {} {
+          label {xmin:}
+          xywh {75 125 110 29}
+        }
+        Fl_Input {} {
+          label {xmin:}
+          xywh {250 125 110 29}
+        }
+        Fl_Input {} {
+          label {xmin:}
+          xywh {75 170 110 29}
+        }
+        Fl_Input {} {
+          label {xmin:}
+          xywh {250 170 110 29}
+        }
+        Fl_Input {} {
+          label {xmin:}
+          xywh {75 215 110 29}
+        }
+        Fl_Input {} {
+          label {xmin:}
+          xywh {250 215 110 29}
+        }
+      }
+      Fl_Group sphere_geo_tab {
+        label Sphere
+        xywh {20 15 365 260} hide
+      } {
+        Fl_Input {} {
+          label {xmin:}
+          xywh {75 35 110 29}
+        }
+        Fl_Input {} {
+          label {xmax:}
+          xywh {250 35 110 29}
+        }
+        Fl_Input {} {
+          label {xmin:}
+          xywh {75 80 110 29}
+        }
+        Fl_Input {} {
+          label {xmax:}
+          xywh {250 80 110 29}
+        }
+        Fl_Input {} {
+          label {xmin:}
+          xywh {75 125 110 29}
+        }
+        Fl_Input {} {
+          label {xmax:}
+          xywh {250 125 110 29}
+        }
+      }
+      Fl_Group interface_geo_tab {
+        label Interface
+        xywh {20 15 365 260}
+      } {
+        Fl_Button {} {
+          label {Import From}
+          xywh {40 35 100 28}
+        }
+        Fl_Browser {} {
+          xywh {40 75 325 185}
+        }
+        Fl_Output {} {
+          label {File:}
+          xywh {185 36 180 28} box FLAT_BOX
+        }
+      }
+    }
+  }
+}
diff --git a/fluid_project/gm3d_gui2.fl b/fluid_project/gm3d_gui2.fl
index b2a0de4..2adfa69 100644
--- a/fluid_project/gm3d_gui2.fl
+++ b/fluid_project/gm3d_gui2.fl
@@ -57,14 +57,14 @@ Function {} {open
     xywh {616 107 500 580} type Double visible
   } {
     Fl_Tabs main_tabs {open
-      xywh {10 10 525 560}
+      xywh {10 10 480 560}
     } {
       Fl_Group model_tab {
-        label {Build 3D Mesh Model} open selected
-        xywh {10 40 525 530}
+        label {Build 3D Mesh Model}
+        xywh {10 40 480 530} hide
       } {
         Fl_Group {} {
-          label {3D Mesh:}
+          label {3D Mesh:} open
           xywh {40 70 340 75} align 5
         } {
           Fl_Button mesh_para_file_btn {
@@ -131,8 +131,8 @@ Function {} {open
         }
       }
       Fl_Group forward_tab {
-        label {Forward Modeling}
-        xywh {10 40 485 530} box ROUNDED_FRAME hide
+        label {Forward Modeling} selected
+        xywh {10 40 480 530} box ROUNDED_FRAME
       } {
         Fl_Group {} {
           label {Mesh Model:} open