Fixed script

Author: rjc8237

scripts/holonomy_overlay.py

@@ -1,4 +1,4 @@
-# Script to generate an overlay from a similarity mesh
+# Script to generate an overlay from a marked mesh
 
 import os, sys
 script_dir = os.path.dirname(__file__)
@@ -28,10 +28,11 @@ def similarity_overlay_one(args, fname):
     # Skip meshes that are already processed
     try:
         uv_mesh_path = os.path.join(output_dir, name + '_refined_with_uv.obj')
-        V, F = igl.read_triangle_mesh(uv_mesh_path)
-        if (len(V) > 0):
-            print("Skipping processed mesh")
-            return
+        if os.path.isfile(uv_mesh_path):
+            V, F = igl.read_triangle_mesh(uv_mesh_path)
+            if (len(V) > 0):
+                print("Skipping processed mesh")
+                return
     except:
         pass
 

scripts/holonomy_render.py

@@ -40,7 +40,7 @@ def render_uv_one(args, fname):
     os.makedirs(output_dir, exist_ok=True)
 
     # Get logger
-    log_path = os.path.join(output_dir, name+'_similarity_render.log')
+    log_path = os.path.join(output_dir, name+'_holonomy_render.log')
     logger = script_util.get_logger(log_path)
     logger.info("Rendering {}".format(name))
 
@@ -62,11 +62,6 @@ def render_uv_one(args, fname):
         logger.error("Could not load uv coordinates")
         return
 
-    # Cut mesh along along uv lines
-    #v_cut = script_util.cut_mesh(v3d, f, uv, fuv)
-    #v3d = v_cut
-    #f = fuv
-
     # Need to build double mesh when it has boundary
     is_bd = igl.is_border_vertex(v3d_orig, f_orig)
     build_double = (np.sum(is_bd) != 0)
@@ -116,28 +111,12 @@ def render_uv_one(args, fname):
         blue_size = 0
 
     # Get cut to singularity edges (or build for double meshes)
-    use_boundary_edges = True
     if (args["no_cut"]):
         v_cut_to_sin = []
         f_cut_to_sin = []
         logger.info("Skipping cut to singularity")
-    elif (use_boundary_edges):
-        v_cut_to_sin, f_cut_to_sin = script_util.get_boundary_edges(v3d, uv, f, fuv, bd_thick)
     else:
-        try:
-            cut_to_sin_list_path = os.path.join(uv_dir, m + "_output", name+"_cut_to_sin_list.pickle")
-            logger.info("Loading cut_to_sin_list at {}".format(cut_to_sin_list_path))
-            with open(cut_to_sin_list_path, 'rb') as fp:
-                cut_to_sin_list = pickle.load(fp)
-        except:
-            logger.error("Could not load cut_to_sin_list")
-            # FIXME Make independent function
-            bd_loops = igl.all_boundary_loop(f)
-            cut_to_sin_list = []
-            #for loop in bd_loops:
-            #    for i in np.arange(len(loop) - 1):
-            #        cut_to_sin_list.append([loop[i], loop[i+1]])
-        v_cut_to_sin, f_cut_to_sin = opt.get_edges(v3d_orig, f_orig, cut_to_sin_list, bd_thick)
+        v_cut_to_sin, f_cut_to_sin = script_util.get_boundary_edges(v3d, uv, f, fuv, bd_thick)
 
     # Get point matrices
     logger.info("Getting point matrices")
@@ -172,32 +151,11 @@ def render_uv_one(args, fname):
     u, v = render.get_corner_uv(n, h, to, f, fuv, uv)
 
     # Get colormap for the mesh
-    logger.info('Getting {} colormap'.format(args['colormap']))
-    if args['interpolate_from_original']:
-        r = energies.get_interpolated_vertex_energy(
-            v3d,
-            f,
-            uv,
-            fuv,
-            vn_to_v,
-            endpoints,
-            args['colormap']
-        )
-    else:
-        r = energies.get_vertex_energy(v3d, f, uv, fuv, args['colormap'])
-    r = 0.25 + 0.0 * np.abs(r)
-    r = 0.5 + 0.0 * np.abs(r)
-    #colormap = cm.get_cmap('YlOrBr')
-    #colormap = cm.get_cmap('OrRd')
-    #colormap = cm.get_cmap('PuRd')
+    if args['render_color'] == 'blue':
+        r = 0.25 + 0.0 * np.abs(r)
+    elif args['render_color'] == 'purple':
+        r = 0.5 + 0.0 * np.abs(r)
     colormap = cm.get_cmap('cool')
-    colormap_scale = args['colormap_scale']
-    logger.info('Using colormap scale {}'.format(colormap_scale))
-    if (colormap_scale > 0):
-        norm = colors.CenteredNorm(colormap_scale*0.5, colormap_scale*0.6)
-    else:
-        norm = colors.CenteredNorm(0, 1)
-        r = r * 0
     norm = colors.NoNorm()
 
     # Render image
@@ -247,7 +205,6 @@ def render_uv_one(args, fname):
 def render_uv_many(args):
     script_util.run_many(render_uv_one, args)
 
-
 def add_render_uv_arguments(parser):
     parser.add_argument(
         "-o", "--output_dir",
@@ -269,20 +226,9 @@ def add_render_uv_arguments(parser):
         default=1
     )
     parser.add_argument(
-        "--colormap",
-        help="energy for colormap",
-        default="scale_factors"
-    )
-    parser.add_argument(
-        "--interpolate_from_original",
-        help="use interpolated colormap from original values",
-        action="store_true"
-    )
-    parser.add_argument(
-        "--colormap_scale",
-        help="ratio to scale colormap by",
-        type=float,
-        default=1
+        "--render_color",
+        help="color for the mesh render",
+        default="blue"
     )
     parser.add_argument(
         "--suffix",