autoforge 1.4.0__tar.gz → 1.4.1__tar.gz

{autoforge-1.4.0 → autoforge-1.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: AutoForge
-Version: 1.4.0
+Version: 1.4.1
 Summary: AutoForge is a Python tool for generating 3D printed layered models from an input image.
 Author-email: Hendric Voss <hvoss@techfak.uni-bielefeld.de>
 License: CC BY-NC-SA 4.0
@@ -114,6 +114,7 @@ autoforge --input_image path/to/input_image.jpg --csv_file path/to/materials.csv
   **Note:** We solve on a smaller size as this is many times faster, but also a bit less accurate. Increase if you need more accuracy.
 - `--init_tau`: Initial tau value for Gumbel-Softmax (default: 1.0).
 - `--final_tau`: Final tau value for the Gumbel-Softmax formulation (default: 0.01).
+- `--stl_output_size`: Size of the output stl file in mm (default: 200) (20cm).
 - `--visualize`: Flag to enable live visualization of the composite image during optimization.
 - `--tensorboard`: Enable TensorBoard logging
 - `--run-name`: Name of the run used for TensorBoard logging (optional).

{autoforge-1.4.0 → autoforge-1.4.1}/README.md

@@ -93,6 +93,7 @@ autoforge --input_image path/to/input_image.jpg --csv_file path/to/materials.csv
   **Note:** We solve on a smaller size as this is many times faster, but also a bit less accurate. Increase if you need more accuracy.
 - `--init_tau`: Initial tau value for Gumbel-Softmax (default: 1.0).
 - `--final_tau`: Final tau value for the Gumbel-Softmax formulation (default: 0.01).
+- `--stl_output_size`: Size of the output stl file in mm (default: 200) (20cm).
 - `--visualize`: Flag to enable live visualization of the composite image during optimization.
 - `--tensorboard`: Enable TensorBoard logging
 - `--run-name`: Name of the run used for TensorBoard logging (optional).

{autoforge-1.4.0 → autoforge-1.4.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "AutoForge"
-version="1.4.0"
+version="1.4.1"
 description = "AutoForge is a Python tool for generating 3D printed layered models from an input image."
 authors = [{ name = "Hendric Voss", email = "hvoss@techfak.uni-bielefeld.de" }]
 readme = "README.md"

{autoforge-1.4.0 → autoforge-1.4.1}/src/AutoForge.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: AutoForge
-Version: 1.4.0
+Version: 1.4.1
 Summary: AutoForge is a Python tool for generating 3D printed layered models from an input image.
 Author-email: Hendric Voss <hvoss@techfak.uni-bielefeld.de>
 License: CC BY-NC-SA 4.0
@@ -114,6 +114,7 @@ autoforge --input_image path/to/input_image.jpg --csv_file path/to/materials.csv
   **Note:** We solve on a smaller size as this is many times faster, but also a bit less accurate. Increase if you need more accuracy.
 - `--init_tau`: Initial tau value for Gumbel-Softmax (default: 1.0).
 - `--final_tau`: Final tau value for the Gumbel-Softmax formulation (default: 0.01).
+- `--stl_output_size`: Size of the output stl file in mm (default: 200) (20cm).
 - `--visualize`: Flag to enable live visualization of the composite image during optimization.
 - `--tensorboard`: Enable TensorBoard logging
 - `--run-name`: Name of the run used for TensorBoard logging (optional).

{autoforge-1.4.0 → autoforge-1.4.1}/src/autoforge/Helper/OutputHelper.py

@@ -186,33 +186,44 @@ def generate_project_file(
         json.dump(project_data, f, indent=4)
 
 
-def generate_stl(height_map, filename, background_height, scale=1.0):
+def generate_stl(height_map, filename, background_height, maximum_x_y_size):
     """
     Generate a binary STL file from a height map with shared boundary vertices
-    to fix non-manifold edge warnings.
+    to fix non-manifold edge warnings, scaling the x and y dimensions to a maximum
+    size specified in millimeters.
 
     Args:
         height_map (np.ndarray): 2D array representing the height map.
         filename (str): The name of the output STL file.
         background_height (float): The height of the background in the STL model.
-        scale (float, optional): Scale factor for the x dimension (and optionally y). Defaults to 1.0.
+        maximum_x_y_size (float): Maximum size (in millimeters) for the x and y dimensions.
     """
     H, W = height_map.shape
 
     # Create the top vertices grid.
-    # Note: y is computed as H-1-i. (Apply scale to y if desired.)
+    # Note: y is computed as H-1-i.
     top_vertices = np.zeros((H, W, 3), dtype=np.float32)
     for i in range(H):
         for j in range(W):
-            top_vertices[i, j, 0] = j * scale
-            top_vertices[i, j, 1] = H - 1 - i  # or (H - 1 - i) * scale if you want uniform scaling
+            top_vertices[i, j, 0] = j
+            top_vertices[i, j, 1] = H - 1 - i  # y coordinate: top row has highest value
             top_vertices[i, j, 2] = height_map[i, j] + background_height
 
-    # Create the bottom vertices for the boundary by copying the x and y coordinates,
-    # but setting z to 0. Using these ensures that adjacent triangles share the same vertices.
+    # Create the bottom vertices for the boundary by copying x and y coordinates,
+    # but setting z to 0.
     bottom_vertices = top_vertices.copy()
     bottom_vertices[:, :, 2] = 0
 
+    # --- Scale vertices so that the maximum x or y dimension equals maximum_x_y_size ---
+    # The current extents in x and y are 0 to (W - 1) and 0 to (H - 1), respectively.
+    # We use the maximum of these as our original size.
+    original_max = max(W - 1, H - 1)
+    scale = maximum_x_y_size / original_max
+    top_vertices[:, :, 0] *= scale
+    top_vertices[:, :, 1] *= scale
+    bottom_vertices[:, :, 0] *= scale
+    bottom_vertices[:, :, 1] *= scale
+
     triangles = []
 
     def add_triangle(v1, v2, v3):
@@ -226,7 +237,7 @@ def generate_stl(height_map, filename, background_height, scale=1.0):
             v1 = top_vertices[i, j + 1]
             v2 = top_vertices[i + 1, j + 1]
             v3 = top_vertices[i + 1, j]
-            # Using reversed order so that normals face upward.
+            # Use reversed order so that normals face upward.
             add_triangle(v2, v1, v0)
             add_triangle(v3, v2, v0)
 

{autoforge-1.4.0 → autoforge-1.4.1}/src/autoforge/auto_forge.py

@@ -98,6 +98,13 @@ def main():
         help="Enable visualization during optimization",
     )
 
+    parser.add_argument(
+        "--stl_output_size",
+        type=int,
+        default=200,
+        help="Size of the longest dimension of the output STL file",
+    )
+
     parser.add_argument(
         "--perform_pruning",
         type=bool,
@@ -382,7 +389,7 @@ def main():
     height_map_mm = (
         disc_height_image.cpu().numpy().astype(np.float32)
     ) * args.layer_height
-    generate_stl(height_map_mm, stl_filename, args.background_height, scale=1.0)
+    generate_stl(height_map_mm, stl_filename, args.background_height, maximum_x_y_size=args.stl_output_size)
 
     # Swap instructions
     background_layers = int(args.background_height // args.layer_height)