From f30e866ee46966bcbeee87c51812c98ba703dc26 Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 3 Feb 2026 16:43:22 -0800 Subject: [PATCH] handle line width specification better --- topologytool.py | 108 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 103 insertions(+), 5 deletions(-) diff --git a/topologytool.py b/topologytool.py index a937dcd..7d5ba45 100644 --- a/topologytool.py +++ b/topologytool.py @@ -37,6 +37,8 @@ class Topology: self.linemap_cols = linemap_cols if linemap_width is None: self.linemap_width = linemap_size[1] / 400 + else: + self.linemap_width = linemap_width self.linemap_roundcap = linemap_roundcap self.linemap_transparent = linemap_transparent self.subregion_mode = subregion_mode @@ -159,7 +161,102 @@ class Topology: values[r, c] = np.mean(this_array[this_array != 0]) return values - def create_svg_file(self, rotation=None,file_index=None): + def create_rectangle_svg_file(self, rotation=None,file_index=None): + + # subfunction to draw an array, options are line y/n, fill y/n, line and fill color + def svg_draw_list(svg_context, draw_list, line_color="White",fill_shape=False): + if line_color == "White": + svg_context.set_source_rgb(1, 1, 1) + if line_color == "Black": + svg_context.set_source_rgb(0, 0, 0) + + for item in range(len(draw_list)): + if item == 0: + svg_context.move_to(draw_list[item][0],draw_list[item][1]) + else: + svg_context.line_to(draw_list[item][0],draw_list[item][1]) + if fill_shape: + svg_context.close_path() + svg_context.fill_preserve() + svg_context.stroke() + + + # if no refetch, check if file exists + if os.path.exists(self.elevation_filename): + print("Elevation file exists") + if self.refetch_elevation_data: + print("Refetching elevation data requested") + self.create_elevation_file() + else: + print("Elevation file does not exist, fetching") + self.create_elevation_file() + # get png data to cols x rows grid + values = self.convert_png_to_data(rotation) + + svg_filename = self.storage_directory + "/" + self.target_region_name+".svg" + if rotation is not None: + rotation_string = f"{rotation:05.2f}" + svg_filename = self.storage_directory + "/" + self.target_region_name + ".r" + rotation_string + ".svg" + if file_index is not None: + # assume this is an integer, convert to a string with %05d + file_index_string = f"{file_index:05d}" + svg_filename = (self.storage_directory + + "/" + self.target_region_name + + ".rot_" + + rotation_string + + "_degrees." + + file_index_string + + ".svg") + + # now make a line drawing of it + surface = cairo.SVGSurface(svg_filename, + self.linemap_size[0], + self.linemap_size[1]) + cr = cairo.Context(surface) + + # Background + #cr.set_source_rgb(1, 1, 1) + cr.set_source_rgb(0, 0, 0) + cr.paint() + + # Simple Orthographic Projection Matrix (pseudo-3D) + # Projects (x,y,z) -> (x+z/2, y+z/2) + # max height should be no more than 3 times the distance between rows, this could be a setting + def project(x, y, z): + return (x * self.linemap_xscale, y * self.linemap_yscale - (z if z > 0 else (-1.5 * self.linemap_yscale))) + # return (offset[0] + x * scale + z * 2, offset[1] + y * scale + z * 2) + + rows, cols = values.shape + max_val = values.max() + + # Normalize data for visualization height (0-100) -- max is no more than three row heights + norm_data = (values / max_val) * self.linemap_xscale * 3 + + # Draw Lines along rows + cr.set_source_rgb(0, 0, 0) # Black lines + cr.set_line_width(self.linemap_width) + cr.set_line_cap(cairo.LINE_CAP_ROUND) + cr.set_line_join(cairo.LINE_JOIN_ROUND) + x = 0 + y = 0 + + if True: + for r in range(rows): + draw_list = [] + for c in range(cols): + z = norm_data[r,c] + x,y = project(c, r, z) # now need to make array of x,y vals and pass to drawing func + draw_list.append((x,y)) + print("***" + str(draw_list)) + svg_draw_list(cr, draw_list, line_color="Black", fill_shape=True) + svg_draw_list(cr, draw_list, line_color="White", fill_shape=False) + + + surface.write_to_png(svg_filename.replace(".svg", ".topo.png")) + surface.finish() + + def create_svg_file(self, rotation=None, file_index=None): + # subfunction to draw an array, options are line y/n, fill y/n, line and fill color def svg_draw_list(svg_context, draw_list, line_color="White",fill_shape=False): if line_color == "White": @@ -274,15 +371,16 @@ def main(): topology = Topology(country="Switzerland", storage_directory="/Users/he/PycharmProjects/toposhirt/outputfiles", subregion_mode=False, - linemap_cols=80, - linemap_rows=80, - linemap_size=(1080,1080)) + linemap_cols=200, + linemap_rows=200, + linemap_size=(1080,1080), + linemap_width=0.3) topology.list_subunits() print(topology.get_boundingbox()) topology.create_svg_file() for r in range(4*360): print("Rotating by [{}] degrees".format(r/4.0)) - topology.create_svg_file(rotation=(r / 4.0), file_index=r) + #topology.create_svg_file(rotation=(r / 4.0), file_index=r) sys.exit(0)