First round of int/float formatting fixes after refactor

Author: Wittmann-MEE

src/kiutils/footprint.py

@@ -235,7 +235,7 @@ def _to_sexpr_raw(self):
         expr.append(format_bool('hide', self.hide))
 
         if self.opacity is not None:
-            expr.append(['opacity', self.opacity])
+            expr.append(['opacity', format_float(self.opacity)])
 
         expr.append(['offset', self.pos._to_sexpr_raw()])
         expr.append(['scale', self.scale._to_sexpr_raw()])
@@ -667,7 +667,7 @@ def _to_sexpr_raw(self):
             expr.append(chamfer_expr)
 
         if self.dieLength is not None:
-            expr.append(['die_length', self.dieLength])
+            expr.append(['die_length', format_float(self.dieLength)])
 
         if self.net is not None:
             expr.append(self.net._to_sexpr_raw())
@@ -907,7 +907,7 @@ def libId(self, symbol_id: str):
     generator_version: Optional[str] = None
     """The ``generator_version`` token attribute defines the version of the program used to write the file"""
 
-    embedded_fonts: Optional[str] = None
+    embedded_fonts: Optional[bool] = None
     """The ``embedded_fonts`` token defines if the embedded fonts are used in the footprint"""
 
     sheet_name: str = ""
@@ -986,7 +986,7 @@ def from_sexpr(cls, exp: list) -> Footprint:
             elif item[0] == 'private_layers': object.privateLayers.extend(item[1:])
             elif item[0] == 'net_tie_pad_groups': object.netTiePadGroups.extend(item[1:])
             elif item[0] == 'dimension': object.graphicItems.append(Dimension.from_sexpr(item))
-            elif item[0] == 'embedded_fonts': object.embedded_fonts = item[1]
+            elif item[0] == 'embedded_fonts': object.embedded_fonts = parse_bool(item, 'embedded_fonts')
             elif item[0] == 'embedded_files': object.embedded_files.extend([EmbeddedFile().from_sexpr(f) for f in item[1:]])
             else:
                 raise ValueError(f"Unrecognized property key: {item[0]}. Full expression: {item}")
@@ -1200,7 +1200,7 @@ def _to_sexpr_raw(self):
             expr.append(item._to_sexpr_raw())
 
         if self.embedded_fonts is not None:
-            expr.append(['embedded_fonts', self.embedded_fonts])
+            expr.append(format_bool('embedded_fonts', self.embedded_fonts, yesno=True))
 
         # Embedded files
         if len(self.embedded_files) > 0:

src/kiutils/items/brditems.py

@@ -84,7 +84,7 @@ def to_sexpr(self, indent=2, newline=True) -> str:
         return sexp_to_string(raw_expr)
 
     def _to_sexpr_raw(self):
-        expr = ['general', ['thickness', self.thickness]]
+        expr = ['general', ['thickness', format_float(self.thickness)]]
 
         if self.legacy_teardrops is not None:
             expr.append(['legacy_teardrops', self.legacy_teardrops])
@@ -338,7 +338,7 @@ def _to_sexpr_raw(self):
             expr.append(['color', escape_and_quote(self.color)])
 
         if self.thickness is not None:
-            expr.append(['thickness', self.thickness])
+            expr.append(['thickness', format_float(self.thickness)])
 
         if self.material is not None:
             expr.append(['material', escape_and_quote(self.material)])
@@ -692,7 +692,7 @@ def from_sexpr(cls, exp: list) -> PlotSettings:
             elif item[0] == 'plotinvisibletext' : object.plotInvisibleText = parse_bool(item, 'plotinvisibletext')
             elif item[0] == 'sketchpadsonfab' : object.sketchPadsOnFab = parse_bool(item, 'sketchpadsonfab')
             elif item[0] == 'subtractmaskfromsilk' : object.subtractMaskFromSilk = parse_bool(item, 'subtractmaskfromsilk')
-            elif item[0] == 'outputformat' : object.outputFormat = item[1]
+            elif item[0] == 'outputformat' : object.outputFormat = int(item[1])
             elif item[0] == 'mirror' : object.mirror = parse_bool(item, 'mirror')
             elif item[0] == 'drillshape' : object.drillShape = int(item[1])
             elif item[0] == 'scaleselection' : object.scaleSelection = int(item[1])
@@ -746,7 +746,7 @@ def _to_sexpr_raw(self):
         if self.svgUseInch is not None:
             expr.append(['svguseinch', self.svgUseInch])
 
-        expr.append(['svgprecision', self.svgPrecision])
+        expr.append(['svgprecision', format_float(self.svgPrecision)])
 
         if self.excludeEdgeLayer is not None:
             expr.append(['excludeedgelayer', self.excludeEdgeLayer])
@@ -966,13 +966,13 @@ def _to_sexpr_raw(self):
         expr.append(['pad_to_mask_clearance', format_float(self.packToMaskClearance)])
 
         if self.solderMaskMinWidth is not None:
-            expr.append(['solder_mask_min_width', self.solderMaskMinWidth])
+            expr.append(['solder_mask_min_width', format_float(self.solderMaskMinWidth)])
 
         if self.padToPasteClearance is not None:
-            expr.append(['pad_to_paste_clearance', self.padToPasteClearance])
+            expr.append(['pad_to_paste_clearance', format_float(self.padToPasteClearance)])
 
         if self.padToPasteClearanceRatio is not None:
-            expr.append(['pad_to_paste_clearance_ratio', self.padToPasteClearanceRatio])
+            expr.append(['pad_to_paste_clearance_ratio', format_float(self.padToPasteClearanceRatio)])
 
         if self.allow_soldermask_bridges_in_footprints is not None:
             expr.append(format_bool('allow_soldermask_bridges_in_footprints', self.allow_soldermask_bridges_in_footprints, yesno=True))
@@ -1357,7 +1357,7 @@ def from_sexpr(cls, exp: list) -> Arc:
             elif item[0] == 'end': object.end = Position().from_sexpr(item)
             elif item[0] == 'width': object.width = item[1]
             elif item[0] == 'layer': object.layer = item[1]
-            elif item[0] == 'net': object.net = item[1]
+            elif item[0] == 'net': object.net = int(item[1])
             elif item[0] == 'tstamp': object.tstamp = item[1]
             elif item[0] == 'uuid': object.tstamp = item[1] # Haha :)
             else:
@@ -1394,7 +1394,7 @@ def _to_sexpr_raw(self, zone_poly=False):
             expr.extend([
                 ['width', format_float(self.width)],
                 ['layer', escape_and_quote(self.layer)],
-                ['net', int(self.net)],
+                ['net', self.net],
             ])
 
         if self.tstamp is not None:
@@ -1629,7 +1629,7 @@ def from_sexpr(cls, exp: list) -> Generated:
                     raise Exception(f"Expected points property pts, got: {points_expr}")
                 for point in points_expr[1:]:
                     object.base_line_coupled.append(Position().from_sexpr(point))
-            elif item[0] == 'corner_radius_percent': object.corner_radius = item[1]
+            elif item[0] == 'corner_radius_percent': object.corner_radius = int(item[1])
             elif item[0] == 'end': object.end = Position().from_sexpr(item[1])
             elif item[0] == 'initial_side': object.initial_side = item[1]
             elif item[0] == 'last_diff_pair_gap': object.last_diff_pair_gap = item[1]

src/kiutils/items/common.py

@@ -388,7 +388,7 @@ def _to_sexpr_raw(self):
         expr.append(['size', format_float(self.height), format_float(self.width)])
 
         if self.thickness is not None:
-            expr.append(['thickness', self.thickness])
+            expr.append(['thickness', format_float(self.thickness)])
 
         if self.bold:
             expr.append(format_bool('bold', self.bold))
@@ -400,7 +400,7 @@ def _to_sexpr_raw(self):
             expr.append(format_bool('italic', self.italic))
 
         if self.lineSpacing is not None:
-            expr.append(['line_spacing', self.lineSpacing])
+            expr.append(['line_spacing', format_float(self.lineSpacing)])
 
         return expr
 
@@ -779,7 +779,7 @@ def _to_sexpr_raw(self):
         if self.paperSize == 'User':
             if self.width is None or self.height is None:
                 raise Exception("Page size set to 'User' but width or height not specified")
-            expr.extend([self.width, self.height])
+            expr.extend([format_float(self.width), format_float(self.height)])
 
         if self.portrait:
             expr.append('portrait')
@@ -1103,7 +1103,7 @@ def from_sexpr(cls, exp: list) -> RenderCache:
 
         object = cls()
         object.text = exp[1]
-        object.id = exp[2]
+        object.id = int(exp[2])
         for item in exp[3:]:
             if not isinstance(item, list):
                 raise ValueError(f"Expected list property [key, value], got: {item}. Full expression: {exp}")
@@ -1286,7 +1286,7 @@ def _to_sexpr_raw(self):
             expr.append(['layer', escape_and_quote(self.layer)])
 
         if self.scale is not None:
-            expr.append(['scale', self.scale])
+            expr.append(['scale', format_float(self.scale)])
 
         if self.uuid is not None:
             expr.append(['uuid', quote(self.uuid)])

src/kiutils/items/dimensions.py

@@ -92,9 +92,9 @@ def from_sexpr(cls, exp: list) -> DimensionFormat:
                 raise ValueError(f"Expected list property [key, value], got: {item}. Full expression: {exp}")
             elif item[0] == 'prefix': object.prefix = item[1]
             elif item[0] == 'suffix': object.suffix = item[1]
-            elif item[0] == 'units': object.units = item[1]
-            elif item[0] == 'units_format': object.unitsFormat = item[1]
-            elif item[0] == 'precision': object.precision = item[1]
+            elif item[0] == 'units': object.units = int(item[1])
+            elif item[0] == 'units_format': object.unitsFormat = int(item[1])
+            elif item[0] == 'precision': object.precision = int(item[1])
             elif item[0] == 'override_value': object.overrideValue = item[1]
             else:
                 raise ValueError(f"Unrecognized property key: {item[0]}. Full expression: {item}")

src/kiutils/items/fpitems.py

@@ -263,7 +263,7 @@ def _to_sexpr_raw(self):
         ]
 
         if self.width is not None:
-            expr.append(['width', self.width])
+            expr.append(['width', format_float(self.width)])
         elif self.stroke is not None:
             expr.append(self.stroke._to_sexpr_raw())
 
@@ -372,7 +372,7 @@ def _to_sexpr_raw(self):
         ]
 
         if self.width is not None:
-            expr.append(['width', self.width])
+            expr.append(['width', format_float(self.width)])
         elif self.stroke is not None:
             expr.append(self.stroke._to_sexpr_raw())
 
@@ -535,7 +535,7 @@ def _to_sexpr_raw(self):
             expr.append(['end', format_float(self.end.X), format_float(self.end.Y)])
 
         if self.angle is not None:
-            expr.append(['angle', self.angle])
+            expr.append(['angle', format_float(self.angle)])
 
         expr.append(['layer', escape_and_quote(self.layer)])
 
@@ -650,7 +650,7 @@ def _to_sexpr_raw(self):
         ]
 
         if self.width is not None:
-            expr.append(['width', self.width])
+            expr.append(['width', format_float(self.width)])
         elif self.stroke is not None:
             expr.append(self.stroke._to_sexpr_raw())
 
@@ -762,7 +762,7 @@ def _to_sexpr_raw(self):
         ]
 
         if self.width is not None:
-            expr.append(['width', self.width])
+            expr.append(['width', format_float(self.width)])
         elif self.stroke is not None:
             expr.append(self.stroke._to_sexpr_raw())
 
@@ -873,7 +873,7 @@ def _to_sexpr_raw(self):
         expr.append(pts_expr)
 
         if self.width is not None:
-            expr.append(['width', self.width])
+            expr.append(['width', format_float(self.width)])
         elif self.stroke is not None:
             expr.append(self.stroke._to_sexpr_raw())
 
@@ -983,7 +983,7 @@ def _to_sexpr_raw(self):
         expr.append(pts_expr)
 
         if self.width is not None:
-            expr.append(['width', self.width])
+            expr.append(['width', format_float(self.width)])
         elif self.stroke is not None:
             expr.append(self.stroke._to_sexpr_raw())
 

src/kiutils/items/schitems.py

@@ -1041,7 +1041,7 @@ def from_sexpr(cls, exp: list) -> SymbolProjectPath:
             if not isinstance(item, list):
                 raise ValueError(f"Expected list property [key, value], got: {item}. Full expression: {exp}")
             elif item[0] == 'reference': object.reference = item[1]
-            elif item[0] == 'unit': object.unit = item[1]
+            elif item[0] == 'unit': object.unit = int(item[1])
             else:
                 raise ValueError(f"Unrecognized property key: {item[0]}. Full expression: {item}")
 
@@ -1273,7 +1273,7 @@ def from_sexpr(cls, exp: list) -> SchematicSymbol:
             elif item[0] == 'lib_id': object.libId = item[1]
             elif item[0] == 'lib_name': object.libName = item[1]
             elif item[0] == 'uuid': object.uuid = item[1]
-            elif item[0] == 'unit': object.unit = item[1]
+            elif item[0] == 'unit': object.unit = int(item[1])
             elif item[0] == 'at': object.position = Position().from_sexpr(item)
             elif item[0] == 'property': object.properties.append(Property().from_sexpr(item))
             elif item[0] == 'pin': object.pins.update({item[1]: item[2][1]})
@@ -1851,7 +1851,7 @@ def from_sexpr(cls, exp: list) -> SymbolInstance:
             if not isinstance(item, list):
                 raise ValueError(f"Expected list property [key, value], got: {item}. Full expression: {exp}")
             elif item[0] == 'reference': object.reference = item[1]
-            elif item[0] == 'unit': object.unit = item[1]
+            elif item[0] == 'unit': object.unit = int(item[1])
             elif item[0] == 'value': object.value = item[1]
             elif item[0] == 'footprint': object.footprint = item[1]
             else:

src/kiutils/items/zones.py

@@ -223,14 +223,14 @@ def from_sexpr(cls, exp: list) -> FillSettings:
             elif item[0] == 'thermal_bridge_width': object.thermalBridgeWidth = item[1]
             elif item[0] == 'smoothing': object.smoothingStyle = item[1]
             elif item[0] == 'radius': object.smoothingRadius = item[1]
-            elif item[0] == 'island_removal_mode': object.islandRemovalMode = item[1]
+            elif item[0] == 'island_removal_mode': object.islandRemovalMode = int(item[1])
             elif item[0] == 'island_area_min': object.islandAreaMin = item[1]
             elif item[0] == 'hatch_thickness': object.hatchThickness = item[1]
             elif item[0] == 'hatch_gap': object.hatchGap = item[1]
             elif item[0] == 'hatch_orientation': object.hatchOrientation = item[1]
-            elif item[0] == 'hatch_smoothing_level': object.hatchSmoothingLevel = item[1]
+            elif item[0] == 'hatch_smoothing_level': object.hatchSmoothingLevel = int(item[1])
             elif item[0] == 'hatch_smoothing_value': object.hatchSmoothingValue = item[1]
-            elif item[0] == 'hatch_border_algorithm': object.hatchBorderAlgorithm = item[1]
+            elif item[0] == 'hatch_border_algorithm': object.hatchBorderAlgorithm = int(item[1])
             elif item[0] == 'hatch_min_hole_area': object.hatchMinHoleArea = item[1]
             else:
                 raise ValueError(f"Unrecognized property key: {item[0]}. Full expression: {item}")
@@ -260,26 +260,26 @@ def _to_sexpr_raw(self):
         if self.mode is not None:
             expr.append(['mode', self.mode])
 
-        expr.append(['thermal_gap', self.thermalGap])
-        expr.append(['thermal_bridge_width', self.thermalBridgeWidth])
+        expr.append(['thermal_gap', format_float(self.thermalGap)])
+        expr.append(['thermal_bridge_width', format_float(self.thermalBridgeWidth)])
 
         if self.smoothingStyle is not None:
             expr.append(['smoothing', self.smoothingStyle])
 
         if self.smoothingRadius is not None:
-            expr.append(['radius', self.smoothingRadius])
+            expr.append(['radius', format_float(self.smoothingRadius)])
 
         if self.islandRemovalMode is not None:
             expr.append(['island_removal_mode', self.islandRemovalMode])
 
         if self.islandAreaMin is not None:
-            expr.append(['island_area_min', self.islandAreaMin])
+            expr.append(['island_area_min', format_float(self.islandAreaMin)])
 
         if self.hatchThickness is not None:
-            expr.append(['hatch_thickness', self.hatchThickness])
+            expr.append(['hatch_thickness', format_float(self.hatchThickness)])
 
         if self.hatchGap is not None:
-            expr.append(['hatch_gap', self.hatchGap])
+            expr.append(['hatch_gap', format_float(self.hatchGap)])
 
         if self.hatchOrientation is not None:
             expr.append(['hatch_orientation', self.hatchOrientation])
@@ -288,13 +288,13 @@ def _to_sexpr_raw(self):
             expr.append(['hatch_smoothing_level', self.hatchSmoothingLevel])
 
         if self.hatchSmoothingValue is not None:
-            expr.append(['hatch_smoothing_value', self.hatchSmoothingValue])
+            expr.append(['hatch_smoothing_value', format_float(self.hatchSmoothingValue)])
 
         if self.hatchBorderAlgorithm is not None:
             expr.append(['hatch_border_algorithm', self.hatchBorderAlgorithm])
 
         if self.hatchMinHoleArea is not None:
-            expr.append(['hatch_min_hole_area', self.hatchMinHoleArea])
+            expr.append(['hatch_min_hole_area', format_float(self.hatchMinHoleArea)])
 
         return expr
 
@@ -659,7 +659,7 @@ def from_sexpr(cls, exp: list) -> Zone:
             elif item[0] == 'uuid': object.tstamp = item[1] # Haha :)
             elif item[0] == 'name': object.name = item[1]
             elif item[0] == 'hatch': object.hatch = Hatch(style=item[1], pitch=item[2])
-            elif item[0] == 'priority': object.priority = item[1]
+            elif item[0] == 'priority': object.priority = int(item[1])
             elif item[0] == 'connect_pads':
                 if len(item) == 2:
                     object.clearance = item[1][1]
@@ -734,7 +734,7 @@ def _to_sexpr_raw(self):
         connect_pads_expr.append(['clearance', format_float(self.clearance)])
         expr.append(connect_pads_expr)
 
-        expr.append(['min_thickness', self.minThickness])
+        expr.append(['min_thickness', float(self.minThickness)])
 
         if self.filledAreasThickness is not None:
             expr.append(['filled_areas_thickness', self.filledAreasThickness])