Applied-Scientific-Research · BHill96 · Nov 21, 2020 · Nov 21, 2020 · Nov 21, 2020
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -236,21 +236,21 @@ SET( EXTERNAL_LIBS ${FASTSUM_LIBS} )
 
 ADD_DEFINITIONS (${CPREPROCDEFS})
 
-INCLUDE_DIRECTORIES( "src/glad" )
-FILE(GLOB IMGUISOURCES "src/imgui/*.cpp" )
-INCLUDE_DIRECTORIES( "src/tinyxml2" )
-INCLUDE_DIRECTORIES( "src/tinyexpr" )
-INCLUDE_DIRECTORIES( "src/cppcodec" )
-INCLUDE_DIRECTORIES( "src/miniz" )
+INCLUDE_DIRECTORIES( "lib" )
+# For some of the GUI libraries who need glad
+INCLUDE_DIRECTORIES( "lib/glad" )
+# For some of the internal libraries who need nanoflann
+INCLUDE_DIRECTORIES( "lib/nanoflann" )
+# For some of the internal libraries who need nnls 
+INCLUDE_DIRECTORIES( "lib/eigen-nnls" )
 INCLUDE_DIRECTORIES( "src" )
 
 IF (CMAKE_COMPILER_IS_GNUCXX)
   SET_SOURCE_FILES_PROPERTIES("src/imgui/imgui_draw.cpp" PROPERTIES COMPILE_FLAGS -Wno-maybe-uninitialized)
 ENDIF()
 
-FILE(GLOB HEADERS "src/*.h" )
-SET(SOURCES ${HEADERS}
-            "src/Simulation.cpp"
+FILE(GLOB IMGUISOURCES "lib/imgui/*.cpp" )
+SET(SOURCES "src/Simulation.cpp"
             "src/FlowFeature.cpp"
             "src/CollectionHelper.cpp"
             "src/BoundaryFeature.cpp"
@@ -261,13 +261,13 @@ SET(SOURCES ${HEADERS}
             "src/IglReadGeom.cpp"
             "src/IglRefine.cpp"
             "src/StatusFile.cpp"
-            "src/tinyxml2/tinyxml2.cpp"
-            "src/tinyexpr/tinyexpr.c" )
-SET(GUI_SOURCES "src/glad/glad.c"
+            "lib/tinyxml2/tinyxml2.cpp"
+            "lib/tinyexpr/tinyexpr.c" )
+SET(GUI_SOURCES "lib/glad/glad.c"
                 "src/ShaderHelper.cpp"
                 "src/FeatureDraw.cpp"
-                "src/miniz/miniz.c"
-                "src/miniz/FrameBufferToImage.cpp" )
+                "lib/miniz/miniz.c"
+                "lib/miniz/FrameBufferToImage.cpp" )
 
 # create a binary for the GUI version
 IF( BUILD_GUI )

diff --git a/src/cppcodec/base64_rfc4648.hpp → lib/cppcodec/base64_rfc4648.hpp b/src/cppcodec/base64_rfc4648.hpp → lib/cppcodec/base64_rfc4648.hpp
diff --git a/src/cppcodec/data/access.hpp → lib/cppcodec/data/access.hpp b/src/cppcodec/data/access.hpp → lib/cppcodec/data/access.hpp
diff --git a/src/cppcodec/data/raw_result_buffer.hpp → lib/cppcodec/data/raw_result_buffer.hpp b/src/cppcodec/data/raw_result_buffer.hpp → lib/cppcodec/data/raw_result_buffer.hpp
diff --git a/src/cppcodec/detail/base64.hpp → lib/cppcodec/detail/base64.hpp b/src/cppcodec/detail/base64.hpp → lib/cppcodec/detail/base64.hpp
diff --git a/src/cppcodec/detail/codec.hpp → lib/cppcodec/detail/codec.hpp b/src/cppcodec/detail/codec.hpp → lib/cppcodec/detail/codec.hpp
diff --git a/src/cppcodec/detail/config.hpp → lib/cppcodec/detail/config.hpp b/src/cppcodec/detail/config.hpp → lib/cppcodec/detail/config.hpp
diff --git a/src/cppcodec/detail/stream_codec.hpp → lib/cppcodec/detail/stream_codec.hpp b/src/cppcodec/detail/stream_codec.hpp → lib/cppcodec/detail/stream_codec.hpp
diff --git a/src/cppcodec/parse_error.hpp → lib/cppcodec/parse_error.hpp b/src/cppcodec/parse_error.hpp → lib/cppcodec/parse_error.hpp
diff --git a/src/nnls.h → lib/eigen-nnls/nnls.h b/src/nnls.h → lib/eigen-nnls/nnls.h
diff --git a/src/glad/glad.c → lib/glad/glad.c b/src/glad/glad.c → lib/glad/glad.c
diff --git a/src/glad/glad.h → lib/glad/glad.h b/src/glad/glad.h → lib/glad/glad.h
diff --git a/src/glad/khrplatform.h → lib/glad/khrplatform.h b/src/glad/khrplatform.h → lib/glad/khrplatform.h
diff --git a/src/igl/IndexComparison.h → lib/igl/IndexComparison.h b/src/igl/IndexComparison.h → lib/igl/IndexComparison.h
diff --git a/src/igl/LinSpaced.h → lib/igl/LinSpaced.h b/src/igl/LinSpaced.h → lib/igl/LinSpaced.h
diff --git a/src/igl/SortableRow.h → lib/igl/SortableRow.h b/src/igl/SortableRow.h → lib/igl/SortableRow.h
diff --git a/src/igl/basename.cpp → lib/igl/basename.cpp b/src/igl/basename.cpp → lib/igl/basename.cpp
diff --git a/src/igl/basename.h → lib/igl/basename.h b/src/igl/basename.h → lib/igl/basename.h
diff --git a/src/igl/boundary_facets.cpp → lib/igl/boundary_facets.cpp b/src/igl/boundary_facets.cpp → lib/igl/boundary_facets.cpp
diff --git a/src/igl/boundary_facets.h → lib/igl/boundary_facets.h b/src/igl/boundary_facets.h → lib/igl/boundary_facets.h
diff --git a/src/igl/colon.cpp → lib/igl/colon.cpp b/src/igl/colon.cpp → lib/igl/colon.cpp
diff --git a/src/igl/colon.h → lib/igl/colon.h b/src/igl/colon.h → lib/igl/colon.h
diff --git a/src/igl/cumsum.cpp → lib/igl/cumsum.cpp b/src/igl/cumsum.cpp → lib/igl/cumsum.cpp
diff --git a/src/igl/cumsum.h → lib/igl/cumsum.h b/src/igl/cumsum.h → lib/igl/cumsum.h
diff --git a/src/igl/deprecated.h → lib/igl/deprecated.h b/src/igl/deprecated.h → lib/igl/deprecated.h
diff --git a/src/igl/dirname.cpp → lib/igl/dirname.cpp b/src/igl/dirname.cpp → lib/igl/dirname.cpp
diff --git a/src/igl/dirname.h → lib/igl/dirname.h b/src/igl/dirname.h → lib/igl/dirname.h
diff --git a/src/igl/face_occurrences.cpp → lib/igl/face_occurrences.cpp b/src/igl/face_occurrences.cpp → lib/igl/face_occurrences.cpp
diff --git a/src/igl/face_occurrences.h → lib/igl/face_occurrences.h b/src/igl/face_occurrences.h → lib/igl/face_occurrences.h
diff --git a/src/igl/get_seconds.cpp → lib/igl/get_seconds.cpp b/src/igl/get_seconds.cpp → lib/igl/get_seconds.cpp
diff --git a/src/igl/get_seconds.h → lib/igl/get_seconds.h b/src/igl/get_seconds.h → lib/igl/get_seconds.h
diff --git a/src/igl/igl_inline.h → lib/igl/igl_inline.h b/src/igl/igl_inline.h → lib/igl/igl_inline.h
diff --git a/src/igl/list_to_matrix.cpp → lib/igl/list_to_matrix.cpp b/src/igl/list_to_matrix.cpp → lib/igl/list_to_matrix.cpp
diff --git a/src/igl/list_to_matrix.h → lib/igl/list_to_matrix.h b/src/igl/list_to_matrix.h → lib/igl/list_to_matrix.h
diff --git a/src/igl/matrix_to_list.cpp → lib/igl/matrix_to_list.cpp b/src/igl/matrix_to_list.cpp → lib/igl/matrix_to_list.cpp
diff --git a/src/igl/matrix_to_list.h → lib/igl/matrix_to_list.h b/src/igl/matrix_to_list.h → lib/igl/matrix_to_list.h
diff --git a/src/igl/max_size.cpp → lib/igl/max_size.cpp b/src/igl/max_size.cpp → lib/igl/max_size.cpp
diff --git a/src/igl/max_size.h → lib/igl/max_size.h b/src/igl/max_size.h → lib/igl/max_size.h
diff --git a/src/igl/min_size.cpp → lib/igl/min_size.cpp b/src/igl/min_size.cpp → lib/igl/min_size.cpp
diff --git a/src/igl/min_size.h → lib/igl/min_size.h b/src/igl/min_size.h → lib/igl/min_size.h
diff --git a/src/igl/oriented_facets.cpp → lib/igl/oriented_facets.cpp b/src/igl/oriented_facets.cpp → lib/igl/oriented_facets.cpp
diff --git a/src/igl/oriented_facets.h → lib/igl/oriented_facets.h b/src/igl/oriented_facets.h → lib/igl/oriented_facets.h
diff --git a/src/igl/parallel_for.h → lib/igl/parallel_for.h b/src/igl/parallel_for.h → lib/igl/parallel_for.h
diff --git a/src/igl/pathinfo.cpp → lib/igl/pathinfo.cpp b/src/igl/pathinfo.cpp → lib/igl/pathinfo.cpp
diff --git a/src/igl/pathinfo.h → lib/igl/pathinfo.h b/src/igl/pathinfo.h → lib/igl/pathinfo.h
diff --git a/src/igl/ply.h → lib/igl/ply.h b/src/igl/ply.h → lib/igl/ply.h
diff --git a/src/igl/polygon_mesh_to_triangle_mesh.cpp → lib/igl/polygon_mesh_to_triangle_mesh.cpp b/src/igl/polygon_mesh_to_triangle_mesh.cpp → lib/igl/polygon_mesh_to_triangle_mesh.cpp
diff --git a/src/igl/polygon_mesh_to_triangle_mesh.h → lib/igl/polygon_mesh_to_triangle_mesh.h b/src/igl/polygon_mesh_to_triangle_mesh.h → lib/igl/polygon_mesh_to_triangle_mesh.h
diff --git a/src/igl/readMESH.cpp → lib/igl/readMESH.cpp b/src/igl/readMESH.cpp → lib/igl/readMESH.cpp
diff --git a/src/igl/readMESH.h → lib/igl/readMESH.h b/src/igl/readMESH.h → lib/igl/readMESH.h
diff --git a/src/igl/readOBJ.cpp → lib/igl/readOBJ.cpp b/src/igl/readOBJ.cpp → lib/igl/readOBJ.cpp
diff --git a/src/igl/readOBJ.h → lib/igl/readOBJ.h b/src/igl/readOBJ.h → lib/igl/readOBJ.h
diff --git a/src/igl/readOFF.cpp → lib/igl/readOFF.cpp b/src/igl/readOFF.cpp → lib/igl/readOFF.cpp
diff --git a/src/igl/readOFF.h → lib/igl/readOFF.h b/src/igl/readOFF.h → lib/igl/readOFF.h
diff --git a/src/igl/readPLY.cpp → lib/igl/readPLY.cpp b/src/igl/readPLY.cpp → lib/igl/readPLY.cpp
diff --git a/src/igl/readPLY.h → lib/igl/readPLY.h b/src/igl/readPLY.h → lib/igl/readPLY.h
diff --git a/src/igl/readSTL.cpp → lib/igl/readSTL.cpp b/src/igl/readSTL.cpp → lib/igl/readSTL.cpp
diff --git a/src/igl/readSTL.h → lib/igl/readSTL.h b/src/igl/readSTL.h → lib/igl/readSTL.h
diff --git a/src/igl/readWRL.cpp → lib/igl/readWRL.cpp b/src/igl/readWRL.cpp → lib/igl/readWRL.cpp
diff --git a/src/igl/readWRL.h → lib/igl/readWRL.h b/src/igl/readWRL.h → lib/igl/readWRL.h
diff --git a/src/igl/read_triangle_mesh.cpp → lib/igl/read_triangle_mesh.cpp b/src/igl/read_triangle_mesh.cpp → lib/igl/read_triangle_mesh.cpp
diff --git a/src/igl/read_triangle_mesh.h → lib/igl/read_triangle_mesh.h b/src/igl/read_triangle_mesh.h → lib/igl/read_triangle_mesh.h
diff --git a/src/igl/reorder.cpp → lib/igl/reorder.cpp b/src/igl/reorder.cpp → lib/igl/reorder.cpp
diff --git a/src/igl/reorder.h → lib/igl/reorder.h b/src/igl/reorder.h → lib/igl/reorder.h
diff --git a/src/igl/sort.cpp → lib/igl/sort.cpp b/src/igl/sort.cpp → lib/igl/sort.cpp
diff --git a/src/igl/sort.h → lib/igl/sort.h b/src/igl/sort.h → lib/igl/sort.h
diff --git a/src/igl/sortrows.cpp → lib/igl/sortrows.cpp b/src/igl/sortrows.cpp → lib/igl/sortrows.cpp
diff --git a/src/igl/sortrows.h → lib/igl/sortrows.h b/src/igl/sortrows.h → lib/igl/sortrows.h
diff --git a/src/igl/triangle_triangle_adjacency.cpp → lib/igl/triangle_triangle_adjacency.cpp b/src/igl/triangle_triangle_adjacency.cpp → lib/igl/triangle_triangle_adjacency.cpp
diff --git a/src/igl/triangle_triangle_adjacency.h → lib/igl/triangle_triangle_adjacency.h b/src/igl/triangle_triangle_adjacency.h → lib/igl/triangle_triangle_adjacency.h
diff --git a/src/igl/unique_edge_map.cpp → lib/igl/unique_edge_map.cpp b/src/igl/unique_edge_map.cpp → lib/igl/unique_edge_map.cpp
diff --git a/src/igl/unique_edge_map.h → lib/igl/unique_edge_map.h b/src/igl/unique_edge_map.h → lib/igl/unique_edge_map.h
diff --git a/src/igl/unique_rows.cpp → lib/igl/unique_rows.cpp b/src/igl/unique_rows.cpp → lib/igl/unique_rows.cpp
diff --git a/src/igl/unique_rows.h → lib/igl/unique_rows.h b/src/igl/unique_rows.h → lib/igl/unique_rows.h
diff --git a/src/igl/unique_simplices.cpp → lib/igl/unique_simplices.cpp b/src/igl/unique_simplices.cpp → lib/igl/unique_simplices.cpp
diff --git a/src/igl/unique_simplices.h → lib/igl/unique_simplices.h b/src/igl/unique_simplices.h → lib/igl/unique_simplices.h
diff --git a/src/igl/upsample.cpp → lib/igl/upsample.cpp b/src/igl/upsample.cpp → lib/igl/upsample.cpp
diff --git a/src/igl/upsample.h → lib/igl/upsample.h b/src/igl/upsample.h → lib/igl/upsample.h
diff --git a/src/igl/verbose.h → lib/igl/verbose.h b/src/igl/verbose.h → lib/igl/verbose.h
diff --git a/src/igl/vertex_triangle_adjacency.cpp → lib/igl/vertex_triangle_adjacency.cpp b/src/igl/vertex_triangle_adjacency.cpp → lib/igl/vertex_triangle_adjacency.cpp
diff --git a/src/igl/vertex_triangle_adjacency.h → lib/igl/vertex_triangle_adjacency.h b/src/igl/vertex_triangle_adjacency.h → lib/igl/vertex_triangle_adjacency.h
diff --git a/src/imgui/.editorconfig → lib/imgui/.editorconfig b/src/imgui/.editorconfig → lib/imgui/.editorconfig
diff --git a/src/imgui/.gitattributes → lib/imgui/.gitattributes b/src/imgui/.gitattributes → lib/imgui/.gitattributes
diff --git a/src/imgui/.github/issue_template.md → lib/imgui/.github/issue_template.md b/src/imgui/.github/issue_template.md → lib/imgui/.github/issue_template.md
diff --git a/src/imgui/.github/pull_request_template.md → lib/imgui/.github/pull_request_template.md b/src/imgui/.github/pull_request_template.md → lib/imgui/.github/pull_request_template.md
diff --git a/src/imgui/ImguiWindowsFileIO.cpp → lib/imgui/ImguiWindowsFileIO.cpp b/src/imgui/ImguiWindowsFileIO.cpp → lib/imgui/ImguiWindowsFileIO.cpp
diff --git a/src/imgui/ImguiWindowsFileIO.hpp → lib/imgui/ImguiWindowsFileIO.hpp b/src/imgui/ImguiWindowsFileIO.hpp → lib/imgui/ImguiWindowsFileIO.hpp
diff --git a/src/imgui/imconfig.h → lib/imgui/imconfig.h b/src/imgui/imconfig.h → lib/imgui/imconfig.h
diff --git a/src/imgui/imgui.cpp → lib/imgui/imgui.cpp b/src/imgui/imgui.cpp → lib/imgui/imgui.cpp
diff --git a/src/imgui/imgui.h → lib/imgui/imgui.h b/src/imgui/imgui.h → lib/imgui/imgui.h
diff --git a/src/imgui/imgui_demo.cpp → lib/imgui/imgui_demo.cpp b/src/imgui/imgui_demo.cpp → lib/imgui/imgui_demo.cpp
diff --git a/src/imgui/imgui_draw.cpp → lib/imgui/imgui_draw.cpp b/src/imgui/imgui_draw.cpp → lib/imgui/imgui_draw.cpp
diff --git a/src/imgui/imgui_impl_glfw.cpp → lib/imgui/imgui_impl_glfw.cpp b/src/imgui/imgui_impl_glfw.cpp → lib/imgui/imgui_impl_glfw.cpp
diff --git a/src/imgui/imgui_impl_glfw.h → lib/imgui/imgui_impl_glfw.h b/src/imgui/imgui_impl_glfw.h → lib/imgui/imgui_impl_glfw.h
diff --git a/src/imgui/imgui_impl_opengl3.cpp → lib/imgui/imgui_impl_opengl3.cpp b/src/imgui/imgui_impl_opengl3.cpp → lib/imgui/imgui_impl_opengl3.cpp
diff --git a/src/imgui/imgui_impl_opengl3.h → lib/imgui/imgui_impl_opengl3.h b/src/imgui/imgui_impl_opengl3.h → lib/imgui/imgui_impl_opengl3.h
diff --git a/src/imgui/imgui_internal.h → lib/imgui/imgui_internal.h b/src/imgui/imgui_internal.h → lib/imgui/imgui_internal.h
diff --git a/src/imgui/imgui_widgets.cpp → lib/imgui/imgui_widgets.cpp b/src/imgui/imgui_widgets.cpp → lib/imgui/imgui_widgets.cpp
diff --git a/src/imgui/imstb_rectpack.h → lib/imgui/imstb_rectpack.h b/src/imgui/imstb_rectpack.h → lib/imgui/imstb_rectpack.h
diff --git a/src/imgui/imstb_textedit.h → lib/imgui/imstb_textedit.h b/src/imgui/imstb_textedit.h → lib/imgui/imstb_textedit.h
diff --git a/src/imgui/imstb_truetype.h → lib/imgui/imstb_truetype.h b/src/imgui/imstb_truetype.h → lib/imgui/imstb_truetype.h
diff --git a/src/json/json.hpp → lib/json/json.hpp b/src/json/json.hpp → lib/json/json.hpp
diff --git a/src/miniz/FrameBufferToImage.cpp → lib/miniz/FrameBufferToImage.cpp b/src/miniz/FrameBufferToImage.cpp → lib/miniz/FrameBufferToImage.cpp
diff --git a/src/miniz/FrameBufferToImage.h → lib/miniz/FrameBufferToImage.h b/src/miniz/FrameBufferToImage.h → lib/miniz/FrameBufferToImage.h
diff --git a/src/miniz/miniz.c → lib/miniz/miniz.c b/src/miniz/miniz.c → lib/miniz/miniz.c
diff --git a/src/miniz/miniz.h → lib/miniz/miniz.h b/src/miniz/miniz.h → lib/miniz/miniz.h
diff --git a/src/nanoflann.hpp → lib/nanoflann/nanoflann.hpp b/src/nanoflann.hpp → lib/nanoflann/nanoflann.hpp
diff --git a/src/tinyexpr/tinyexpr.c → lib/tinyexpr/tinyexpr.c b/src/tinyexpr/tinyexpr.c → lib/tinyexpr/tinyexpr.c
diff --git a/src/tinyexpr/tinyexpr.h → lib/tinyexpr/tinyexpr.h b/src/tinyexpr/tinyexpr.h → lib/tinyexpr/tinyexpr.h
diff --git a/src/tinyxml2/tinyxml2.cpp → lib/tinyxml2/tinyxml2.cpp b/src/tinyxml2/tinyxml2.cpp → lib/tinyxml2/tinyxml2.cpp
diff --git a/src/tinyxml2/tinyxml2.h → lib/tinyxml2/tinyxml2.h b/src/tinyxml2/tinyxml2.h → lib/tinyxml2/tinyxml2.h
diff --git a/src/Body.h b/src/Body.h
@@ -10,8 +10,8 @@
 #include "Omega3D.h"
 
 #define TE_NAT_LOG
-#include "tinyexpr.h"
-#include "json/json.hpp"
+#include <tinyexpr/tinyexpr.h>
+#include <json/json.hpp>
 
 #include <Eigen/Geometry>
 

diff --git a/src/BoundaryFeature.cpp b/src/BoundaryFeature.cpp
@@ -46,6 +46,10 @@ void parse_boundary_json(std::vector<std::unique_ptr<BoundaryFeature>>& _flist,
   // and pass the json object to the specific parser
   _flist.back()->from_json(_jin);
 
+  // finally, generate the draw information
+  _flist.back()->create();
+  _flist.back()->generate_draw_geom();
+
   std::cout << "  finished " << _flist.back()->to_string() << std::endl;
 }
 
@@ -150,6 +154,7 @@ bool BoundaryFeature::draw_creation_gui(std::vector<std::unique_ptr<BoundaryFeat
       sim.add_body(bp);
     }
     bf->set_body(bp);
+    bf->create();
     bf->generate_draw_geom();
     bfs.emplace_back(std::move(bf));
     bf = nullptr;
@@ -166,6 +171,39 @@ bool BoundaryFeature::draw_creation_gui(std::vector<std::unique_ptr<BoundaryFeat
 
   return created;
 }
+
+void BoundaryFeature::draw_feature_list(std::vector<std::unique_ptr<BoundaryFeature>> &feat,
+                                        std::unique_ptr<BoundaryFeature> &editingFeat, int &edit_feat_index, 
+                                        int &del_feat_index, bool &redraw, int &buttonIDs) {
+  for (int i=0; i<(int)feat.size(); ++i) {
+    ImGui::PushID(++buttonIDs);
+    if (ImGui::Checkbox("", feat[i]->addr_enabled())) { redraw = true; }
+    ImGui::PopID();
+
+    // add an "edit" button after the checkbox (so it's not easy to accidentally hit remove)
+    ImGui::SameLine();
+    ImGui::PushID(++buttonIDs);
+    if (ImGui::SmallButton("edit")) {
+      editingFeat = std::unique_ptr<BoundaryFeature>(feat[i]->copy());
+      edit_feat_index = i;
+    }
+    ImGui::PopID();
+
+    if (feat[i]->is_enabled()) {
+      ImGui::SameLine();
+      ImGui::Text("%s", feat[i]->to_string().c_str());
+    } else {
+      ImGui::SameLine();
+      ImGui::TextColored(ImVec4(0.5f,0.5f,0.5f,1.0f), "%s", feat[i]->to_string().c_str());
+    }
+
+    // add a "remove" button at the end of the line (so it's not easy to accidentally hit)
+    ImGui::SameLine();
+    ImGui::PushID(++buttonIDs);
+    if (ImGui::SmallButton("remove")) { del_feat_index = i; }
+    ImGui::PopID();
+  }
+}
 #endif
 
 //

diff --git a/src/BoundaryFeature.h b/src/BoundaryFeature.h
@@ -30,43 +30,34 @@ class BoundaryFeature : public Feature {
                   float _x,
                   float _y,
                   float _z)
-    : Feature(true),
-      m_bp(_bp),
-      m_external(_ext),
-      m_x(_x),
-      m_y(_y),
-      m_z(_z)
+    : Feature(_x, _y, _z, true, _bp),
+      m_external(_ext)
     {}
 
   virtual ~BoundaryFeature() = default;
   virtual BoundaryFeature* copy() const = 0;
 
-  std::shared_ptr<Body> get_body() { return m_bp; }
-
   virtual void debug(std::ostream& os) const = 0;
   virtual std::string to_string() const = 0;
   virtual std::string to_short_string() const = 0;
   virtual void from_json(const nlohmann::json) = 0;
   virtual nlohmann::json to_json() const = 0;
   virtual void create() = 0;
   virtual ElementPacket<float> init_elements(const float) const = 0;
-  //virtual std::vector<float> step_elements(const float) const = 0;
-  void set_body(std::shared_ptr<Body> _bp) { m_bp = _bp; }
   virtual void generate_draw_geom() = 0;
-  virtual ElementPacket<float> get_draw_packet() { return m_draw; }
+#ifdef USE_IMGUI
+  virtual bool draw_info_gui(const std::string) = 0;
+#endif
+
 #ifdef USE_IMGUI
   static int obj_movement_gui(int &, char*, char*, char*, char*, char*, char*);
   static bool draw_creation_gui(std::vector<std::unique_ptr<BoundaryFeature>> &, Simulation&);
-  virtual bool draw_info_gui(const std::string) = 0;
+  static void draw_feature_list(std::vector<std::unique_ptr<BoundaryFeature>> &, std::unique_ptr<BoundaryFeature> &,
+                                int &, int &, bool &, int &);
 #endif
 
 protected:
-  std::shared_ptr<Body> m_bp;
   bool m_external;
-  float m_x;
-  float m_y;
-  float m_z;
-  ElementPacket<float> m_draw;
 };
 
 std::ostream& operator<<(std::ostream& os, BoundaryFeature const& ff);

diff --git a/src/Feature.h b/src/Feature.h
@@ -2,11 +2,14 @@
  * Feature.h - Parent class to all features
  *
  * (c)2019-20 Applied Scientific Research, Inc.
- *            Written by Mark J Stock <[email protected]>
+ *            Mark J Stock <[email protected]>
+ *            Blake B Hillier <[email protected]>
  */
 
 #pragma once
 
+#include "ElementPacket.h"
+
 #include <iostream>
 #include <vector>
 
@@ -16,16 +19,40 @@
 class Feature {
 public:
   explicit
-  Feature(bool _enabled)
-    : m_enabled(_enabled)
+  Feature(float _x,
+          float _y,
+          float _z,
+          bool _enabled,
+          std::shared_ptr<Body> _bp)
+    : m_x(_x),
+      m_y(_y),
+      m_enabled(_enabled),
+      m_bp(_bp)
     {}
+  ~Feature() = default;
+  virtual Feature* copy() const = 0;
+
+  virtual void debug(std::ostream &) const = 0;
+  virtual std::string to_string() const = 0;
+  virtual void from_json(const nlohmann::json) = 0;
+  virtual nlohmann::json to_json() const = 0;
+  virtual ElementPacket<float> init_elements(float) const = 0;
+  virtual void generate_draw_geom() = 0;
 
   void enable() { m_enabled = true; };
   void disable() { m_enabled = false; };
   bool is_enabled() const { return m_enabled; };
   bool* addr_enabled() { return &m_enabled; };
+  ElementPacket<float> get_draw_packet() { return m_draw; }
+  std::shared_ptr<Body> get_body() { return m_bp; }
+  void set_body(std::shared_ptr<Body> _bp) { m_bp = _bp; }
 
 protected:
+  float m_x;
+  float m_y;
+  float m_z;
   bool m_enabled;
+  std::shared_ptr<Body> m_bp;
+  ElementPacket<float> m_draw;
 };
 
diff --git a/src/FlowFeature.cpp b/src/FlowFeature.cpp
@@ -105,6 +105,39 @@ bool FlowFeature::draw_creation_gui(std::vector<std::unique_ptr<FlowFeature>> &f
   ImGui::EndPopup();
   return created;
 }
+
+void FlowFeature::draw_feature_list(std::vector<std::unique_ptr<FlowFeature>> &feat,
+                                    std::unique_ptr<FlowFeature> &editingFeat, int &edit_feat_index,
+                                    int &del_feat_index, bool &redraw, int &buttonIDs) {
+  for (int i=0; i<(int)feat.size(); ++i) {
+    ImGui::PushID(++buttonIDs);
+    if (ImGui::Checkbox("", feat[i]->addr_enabled())) { redraw = true; }
+    ImGui::PopID();
+
+    // add an "edit" button after the checkbox (so it's not easy to accidentally hit remove)
+    ImGui::SameLine();
+    ImGui::PushID(++buttonIDs);
+    if (ImGui::SmallButton("edit")) {
+      editingFeat = std::unique_ptr<FlowFeature>(feat[i]->copy());
+      edit_feat_index = i;
+    }
+    ImGui::PopID();
+
+    if (feat[i]->is_enabled()) {
+      ImGui::SameLine();
+      ImGui::Text("%s", feat[i]->to_string().c_str());
+    } else {
+      ImGui::SameLine();
+      ImGui::TextColored(ImVec4(0.5f,0.5f,0.5f,1.0f), "%s", feat[i]->to_string().c_str());
+    }
+
+    // add a "remove" button at the end of the line (so it's not easy to accidentally hit)
+    ImGui::SameLine();
+    ImGui::PushID(++buttonIDs);
+    if (ImGui::SmallButton("remove")) { del_feat_index = i; }
+    ImGui::PopID();
+  }
+}
 #endif
 
 //

diff --git a/src/FlowFeature.h b/src/FlowFeature.h
@@ -26,37 +26,29 @@ class FlowFeature : public Feature {
               float _y,
               float _z,
               std::shared_ptr<Body> _bp)
-    : Feature(true),
-      m_x(_x),
-      m_y(_y),
-      m_z(_z),
-      m_bp(_bp)
+    : Feature(_x, _y, _z, true, _bp)
     {}
-  virtual ~FlowFeature() {}
+  virtual ~FlowFeature() = default; 
   virtual FlowFeature* copy() const = 0;
 
-  std::shared_ptr<Body> get_body() { return m_bp; }
-
   virtual void debug(std::ostream& os) const = 0;
   virtual std::string to_string() const = 0;
   virtual void from_json(const nlohmann::json) = 0;
   virtual nlohmann::json to_json() const = 0;
   virtual ElementPacket<float> init_elements(float) const = 0;
   virtual ElementPacket<float> step_elements(float) const = 0;
   virtual void generate_draw_geom() = 0;
-  virtual ElementPacket<float> get_draw_packet() { return m_draw; }
 #ifdef USE_IMGUI
-  static bool draw_creation_gui(std::vector<std::unique_ptr<FlowFeature>> &, const float);
   virtual bool draw_info_gui(const std::string, const float) = 0;
 #endif
-  // emit particles as vector of float4
 
-protected:
-  float m_x;
-  float m_y;
-  float m_z;
-  ElementPacket<float> m_draw;
-  std::shared_ptr<Body> m_bp;
+#ifdef USE_IMGUI
+  static bool draw_creation_gui(std::vector<std::unique_ptr<FlowFeature>> &, const float);
+  static void draw_feature_list(std::vector<std::unique_ptr<FlowFeature>> &, std::unique_ptr<FlowFeature> &, int &,
+                                int &, bool &, int &);
+#endif
+
+  // emit particles as vector of float4
 };
 
 std::ostream& operator<<(std::ostream& os, FlowFeature const& ff);

diff --git a/src/MeasureFeature.cpp b/src/MeasureFeature.cpp
@@ -97,6 +97,39 @@ bool MeasureFeature::draw_creation_gui(std::vector<std::unique_ptr<MeasureFeatur
   ImGui::EndPopup();
   return created;
 }
+
+void MeasureFeature::draw_feature_list(std::vector<std::unique_ptr<MeasureFeature>> &feat,
+                                       std::unique_ptr<MeasureFeature> &editingFeat, int &edit_feat_index, 
+                                       int &del_feat_index, bool &redraw, int &buttonIDs) {
+  for (int i=0; i<(int)feat.size(); ++i) {
+    ImGui::PushID(++buttonIDs);
+    if (ImGui::Checkbox("", feat[i]->addr_enabled())) { redraw = true; }
+    ImGui::PopID();
+
+    // add an "edit" button after the checkbox (so it's not easy to accidentally hit remove)
+    ImGui::SameLine();
+    ImGui::PushID(++buttonIDs);
+    if (ImGui::SmallButton("edit")) {
+      editingFeat = std::unique_ptr<MeasureFeature>(feat[i]->copy());
+      edit_feat_index = i;
+    }
+    ImGui::PopID();
+
+    if (feat[i]->is_enabled()) {
+      ImGui::SameLine();
+      ImGui::Text("%s", feat[i]->to_string().c_str());
+    } else {
+      ImGui::SameLine();
+      ImGui::TextColored(ImVec4(0.5f,0.5f,0.5f,1.0f), "%s", feat[i]->to_string().c_str());
+    }
+
+    // add a "remove" button at the end of the line (so it's not easy to accidentally hit)
+    ImGui::SameLine();
+    ImGui::PushID(++buttonIDs);
+    if (ImGui::SmallButton("remove")) { del_feat_index = i; }
+    ImGui::PopID();
+  }
+}
 #endif
 
 float MeasureFeature::jitter(const float _z, const float _ips) const {