Reworked changes to use None instead of -1 to denote autofit

Author: jmwright

cadquery/occ_impl/exporters/svg.py

@@ -133,8 +133,8 @@ def getSVG(shape, opts=None):
     :type Shape: Vertex, Edge, Wire, Face, Shell, Solid, or Compound.
     :param opts: An options dictionary that influences the SVG that is output.
     :type opts: Dictionary, keys are as follows:
-        width: Width of the resulting image (-1 to fit based on height).
-        height: Height of the resulting image (-1 to fit based on width).
+        width: Width of the resulting image (None to fit based on height).
+        height: Height of the resulting image (None to fit based on width).
         marginLeft: Inset margin from the left side of the document.
         marginTop: Inset margin from the top side of the document.
         projectionDir: Direction the camera will view the shape from.
@@ -169,8 +169,13 @@ def getSVG(shape, opts=None):
     # need to guess the scale and the coordinate center
     uom = guessUnitOfMeasure(shape)
 
-    width = float(d["width"])
-    height = float(d["height"])
+    # Handle the case where the height or width are None
+    width = d["width"]
+    if width != None:
+        width = float(d["width"])
+    height = d["height"]
+    if d["height"] != None:
+        height = float(d["height"])
     marginLeft = float(d["marginLeft"])
     marginTop = float(d["marginTop"])
     projectionDir = tuple(d["projectionDir"])
@@ -236,9 +241,9 @@ def getSVG(shape, opts=None):
     bb = Compound.makeCompound(hidden + visible).BoundingBox()
 
     # Determine whether the user wants to fit the drawing to the bounding box
-    if width <= 0 or height <= 0:
+    if width == None or height == None:
         # Fit image to specified width (or height)
-        if width <= 0:
+        if width == None:
             width = (height - (2.0 * marginTop)) * (
                 bb.xlen / bb.ylen
             ) + 2.0 * marginLeft

doc/importexport.rst

@@ -205,8 +205,8 @@ Exporting SVG
 The SVG exporter has several options which can be useful for achieving the desired final output. Those 
 options are as follows.
 
-* *width* - Document width of the resulting image.
-* *height* - Document height of the resulting image.
+* *width* - Width of the resulting image (None to fit based on height).
+* *height* - Height of the resulting image (None to fit based on width).
 * *marginLeft* - Inset margin from the left side of the document.
 * *marginTop* - Inset margin from the top side of the document.
 * *projectionDir* - Direction the camera will view the shape from.
@@ -216,7 +216,6 @@ options are as follows.
 * *hiddenColor* - Color of the line that hidden edges are drawn with.
 * *showHidden* - Whether or not to show hidden lines.
 * *focus* - If specified, creates a perspective SVG with the projector at the distance specified.
-* *fitView* - If specified, will attempt to fit the height and width of the image to the contents. The ``marginLeft`` and ``marginTop`` options  will be respected and will add to the total image size so that the margin can be duplicated at the bottom right. The ``width`` or ``height`` options that were specified will be overridden, but the largest dimension should be preserved except when margins are used.
 
 The options are passed to the exporter in a dictionary, and can be left out to force the SVG to be created with default options. 
 Below are examples with and without options set.

tests/test_exporters.py

@@ -552,7 +552,7 @@ def testSVGOptions(self):
             "out.svg",
             opt={
                 "width": 100,
-                "height": 50,
+                "height": None,
                 "marginLeft": 10,
                 "marginTop": 10,
                 "showAxes": False,
@@ -562,15 +562,14 @@ def testSVGOptions(self):
                 "hiddenColor": (0, 0, 255),
                 "showHidden": True,
                 "focus": 4,
-                "fitView": True,
             },
         )
 
         exporters.export(
             self._box(),
             "out.svg",
             opt={
-                "width": 50,
+                "width": None,
                 "height": 100,
                 "marginLeft": 10,
                 "marginTop": 10,
@@ -581,7 +580,6 @@ def testSVGOptions(self):
                 "hiddenColor": (0, 0, 255),
                 "showHidden": True,
                 "focus": 4,
-                "fitView": True,
             },
         )