Changed match to if statements and fixed readme typo

Author: benjaminbeer256

python/__pycache__/composite.cpython-312.pyc

@@ -68,8 +68,8 @@ def main():
 
     # Create plot based on plot subcommand, default values in Plot class will be used if argument is not specified
     plot_args = plot_parser.parse_args(plot_command.split())
-    p = plot.Plot(title=" ".join(plot_args.title), xmin=plot_args.xmin, xmax=plot_args.xmax, ymin=plot_args.ymin, ymax=plot_args.ymax, xlabel=" ".join(plot_args.xlabel) if plot_args.xlabel is not None else None, ylabel=" ".join(plot_args.ylabel) if plot_args.ylabel is not None else None, opacity=plot_args.opacity, 
-                  smoothing=plot_args.smoothing, bp_shift=plot_args.bp_shift, combined=plot_args.combined, color_trace=plot_args.color_trace, hide_legend=plot_args.hide_legend)
+    p = plot.Plot(title=" ".join(plot_args.title) if plot_args.title is not None else None, xmin=plot_args.xmin, xmax=plot_args.xmax, ymin=plot_args.ymin, ymax=plot_args.ymax, xlabel=" ".join(plot_args.xlabel) if plot_args.xlabel is not None else None, 
+                  ylabel=" ".join(plot_args.ylabel) if plot_args.ylabel is not None else None, opacity=plot_args.opacity, smoothing=plot_args.smoothing, bp_shift=plot_args.bp_shift, combined=plot_args.combined, color_trace=plot_args.color_trace, hide_legend=plot_args.hide_legend)
 
     # Create arrays for default composite names and colors
     names = range(1, len(composite_commands) + 1)

python/__pycache__/plot.cpython-312.pyc

@@ -22,7 +22,7 @@ The `composite` and `reference-line` subcommands can be repeated for as many com
 plot [plot options]
 ```
 
-The `plot` subcommand takes no positional arguments, and the options specify properties for the entire plot, such as domain, range, and the axis labels. Options can also be used to specify default properties for all composites such as `opacity` and `smoothing`. This implementation of the plotter autoscales the axes to fit the largest composite by default, ignoring the `xmin`, `xmax`, `ymin`, and `ymax` options unless `--no-shirk` or `--no-resize` is specified.
+The `plot` subcommand takes no positional arguments, and the options specify properties for the entire plot, such as domain, range, and the axis labels. Options can also be used to specify default properties for all composites such as `opacity` and `smoothing`. This implementation of the plotter autoscales the axes to fit the largest composite by default, ignoring the `xmin`, `xmax`, `ymin`, and `ymax` options unless `--no-shrink` or `--no-resize` is specified.
 
 The available options for the `plot` subcommand are:
 

python/__pycache__/svgFactory.cpython-312.pyc

@@ -133,83 +133,82 @@ def axis(orient, scale, plot):
     top = plot.margins.get("top")
     right = plot.width - (plot.margins.get('right'))
     left = plot.margins.get("left")
-    match orient:
-        # Draw left axis
-        case "left":
-            axis.setAttribute("x1", str(left))
-            axis.setAttribute("x2", str(left))
-            axis.setAttribute("y1", str(top))
-            axis.setAttribute("y2", str(bottom))
-            i = top
-            while i < bottom:
-                tick = document.createElement("line")
-                tick.setAttribute("y1", str(i))
-                tick.setAttribute("y2", str(i))
-                tick.setAttribute("x1", str(left))
-                tick.setAttribute("x2", str(left + tickSize))
-                axis_group.appendChild(tick)
-                i += tickSpacing
-        # Draw right axis
-        case "right":
-            axis.setAttribute("x1", str(right))
-            axis.setAttribute("x2", str(right))
-            axis.setAttribute("y1", str(top))
-            axis.setAttribute("y2", str(bottom))
-            i = top
-            while i < bottom:
-                tick = document.createElement("line")
-                tick.setAttribute("y1", str(i))
-                tick.setAttribute("y2", str(i))
-                tick.setAttribute("x1", str(right))
-                tick.setAttribute("x2", str(right + tickSize))
-                axis_group.appendChild(tick)
-                i += tickSpacing
-        # Draw bottom axis
-        case "bottom":
-            axis.setAttribute("x1", str(left))
-            axis.setAttribute("x2", str(right))
-            axis.setAttribute("y1", str(bottom))
-            axis.setAttribute("y2", str(bottom))
-            i = left
-            while i < right:
-                tick = document.createElement("line")
-                tick.setAttribute("y1", str(bottom))
-                tick.setAttribute("y2", str(bottom + tickSize))
-                tick.setAttribute("x1", str(i))
-                tick.setAttribute("x2", str(i))
-                axis_group.appendChild(tick)
-                i += tickSpacing
-        # Draw top axis
-        case "top":
+    # Draw left axis
+    if (orient == "left"):
+        axis.setAttribute("x1", str(left))
+        axis.setAttribute("x2", str(left))
+        axis.setAttribute("y1", str(top))
+        axis.setAttribute("y2", str(bottom))
+        i = top
+        while i < bottom:
+            tick = document.createElement("line")
+            tick.setAttribute("y1", str(i))
+            tick.setAttribute("y2", str(i))
+            tick.setAttribute("x1", str(left))
+            tick.setAttribute("x2", str(left + tickSize))
+            axis_group.appendChild(tick)
+            i += tickSpacing
+    # Draw right axis
+    elif (orient == "right"):
+        axis.setAttribute("x1", str(right))
+        axis.setAttribute("x2", str(right))
+        axis.setAttribute("y1", str(top))
+        axis.setAttribute("y2", str(bottom))
+        i = top
+        while i < bottom:
+            tick = document.createElement("line")
+            tick.setAttribute("y1", str(i))
+            tick.setAttribute("y2", str(i))
+            tick.setAttribute("x1", str(right))
+            tick.setAttribute("x2", str(right + tickSize))
+            axis_group.appendChild(tick)
+            i += tickSpacing
+    # Draw bottom axis
+    elif(orient == "bottom"):
+        axis.setAttribute("x1", str(left))
+        axis.setAttribute("x2", str(right))
+        axis.setAttribute("y1", str(bottom))
+        axis.setAttribute("y2", str(bottom))
+        i = left
+        while i < right:
+            tick = document.createElement("line")
+            tick.setAttribute("y1", str(bottom))
+            tick.setAttribute("y2", str(bottom + tickSize))
+            tick.setAttribute("x1", str(i))
+            tick.setAttribute("x2", str(i))
+            axis_group.appendChild(tick)
+            i += tickSpacing
+    # Draw top axis
+    elif (orient == "top"):
+        axis.setAttribute("x1", str(left))
+        axis.setAttribute("x2", str(right))
+        axis.setAttribute("y1", str(top))
+        axis.setAttribute("y2", str(top))
+        i = left
+        while i < right:
+            tick = document.createElement("line")
+            tick.setAttribute("y1", str(top))
+            tick.setAttribute("y2", str(top + tickSize))
+            tick.setAttribute("x1", str(i))
+            tick.setAttribute("x2", str(i))
+            axis_group.appendChild(tick)
+            i += tickSpacing
+    # Draw middle axis if plot is not combined
+    elif (orient == "middle"):
+        if not plot.combined == True:
             axis.setAttribute("x1", str(left))
             axis.setAttribute("x2", str(right))
-            axis.setAttribute("y1", str(top))
-            axis.setAttribute("y2", str(top))
+            axis.setAttribute("y1", str(plot.yscale.get(0)))
+            axis.setAttribute("y2", str(plot.yscale.get(0)))
             i = left
             while i < right:
                 tick = document.createElement("line")
-                tick.setAttribute("y1", str(top))
-                tick.setAttribute("y2", str(top + tickSize))
+                tick.setAttribute("y1", str(plot.yscale.get(0) - tickSize))
+                tick.setAttribute("y2", str(plot.yscale.get(0) + tickSize))
                 tick.setAttribute("x1", str(i))
                 tick.setAttribute("x2", str(i))
                 axis_group.appendChild(tick)
                 i += tickSpacing
-        # Draw middle axis if plot is not combined
-        case "middle":
-            if not plot.combined == True:
-                axis.setAttribute("x1", str(left))
-                axis.setAttribute("x2", str(right))
-                axis.setAttribute("y1", str(plot.yscale.get(0)))
-                axis.setAttribute("y2", str(plot.yscale.get(0)))
-                i = left
-                while i < right:
-                    tick = document.createElement("line")
-                    tick.setAttribute("y1", str(plot.yscale.get(0) - tickSize))
-                    tick.setAttribute("y2", str(plot.yscale.get(0) + tickSize))
-                    tick.setAttribute("x1", str(i))
-                    tick.setAttribute("x2", str(i))
-                    axis_group.appendChild(tick)
-                    i += tickSpacing
     axis_group.setAttribute("stroke", "black")
     axis_group.appendChild(axis)
     return axis_group