Refine G-code startup and preview refresh

app.py

@@ -2928,6 +2928,22 @@ def shift_selected_slice(records: list[dict] | None, selected: str | None, index
     return gr.update(value=next_index), label, preview
 
 
+def _tiff_preview_update(records: list[dict], selected: str | None = None) -> tuple[dict[str, Any], dict[str, Any], str, Image.Image | None]:
+    dropdown = _dropdown_update(records, selected)
+    selected_value = dropdown.get("value") if isinstance(dropdown, dict) else selected
+    pos = _selected_record_index(records, selected_value)
+    state = (records[pos].get("tiff_state") if pos >= 0 else None) or _empty_state()
+    label, preview = _render_selected_slice(state, 0)
+    slider = gr.update(
+        minimum=0,
+        maximum=max(0, len(state.get("tiff_paths", [])) - 1),
+        value=0,
+        step=1,
+        interactive=len(state.get("tiff_paths", [])) > 1,
+    )
+    return dropdown, slider, label, preview
+
+
 def generate_dynamic_stacks(
     records: list[dict] | None,
     settings_table: Any,
@@ -2989,20 +3005,12 @@ def generate_dynamic_stacks(
         messages.append("Reference TIFF Stack: updated automatically.")
     else:
         messages.append("Reference TIFF Stack: skipped (no generated shape slices available).")
-    first_state = records[0].get("tiff_state") or _empty_state()
-    label, preview = _render_selected_slice(first_state, 0)
-    slider = gr.update(
-        minimum=0,
-        maximum=max(0, len(first_state.get("tiff_paths", [])) - 1),
-        value=0,
-        step=1,
-        interactive=len(first_state.get("tiff_paths", [])) > 1,
-    )
+    selected_update, slider, label, preview = _tiff_preview_update(records)
     return (
         records,
         [record.get("zip_path") for record in records if record.get("zip_path")],
         "\n".join(messages),
-        _dropdown_update(records),
+        selected_update,
         slider,
         label,
         preview,
@@ -3089,6 +3097,10 @@ def split_selected_shape_for_grid(
             records,
             _shape_settings_rows(records),
             _spacing_table_update(records, existing_spacing, use_individual_spacing),
+            _dropdown_update(records),
+            _reset_slider(),
+            "No slice stack loaded yet.",
+            None,
             [],
             [],
             _gcode_dropdown_update(records),
@@ -3123,6 +3135,10 @@ def split_selected_shape_for_grid(
             records,
             _shape_settings_rows(records),
             _spacing_table_update(records, existing_spacing, use_individual_spacing),
+            _dropdown_update(records, selected),
+            _reset_slider(),
+            "No slice stack loaded yet.",
+            None,
             [record.get("zip_path") for record in records if record.get("zip_path")],
             [record.get("gcode_path") for record in records if record.get("gcode_path")],
             _gcode_dropdown_update(records),
@@ -3168,6 +3184,8 @@ def split_selected_shape_for_grid(
         })
         split_records.append(piece_record)
     next_records = _reindex_shape_records([*records[:pos], *split_records, *records[pos + 1:]])
+    split_selected = _shape_choice(next_records[pos]) if pos < len(next_records) else None
+    selected_update, main_slider, main_label, main_preview = _tiff_preview_update(next_records, split_selected)
     slider, label, preview = preview_selected_split_piece(pieces, None)
     status = (
         f"Split Shape {source.get('idx', pos + 1)} into {len(pieces)} print-ready stacks "
@@ -3180,6 +3198,10 @@ def split_selected_shape_for_grid(
         next_records,
         _shape_settings_rows(next_records),
         _spacing_table_update(next_records, existing_spacing, use_individual_spacing),
+        selected_update,
+        main_slider,
+        main_label,
+        main_preview,
         [record.get("zip_path") for record in next_records if record.get("zip_path")],
         [record.get("gcode_path") for record in next_records if record.get("gcode_path")],
         _gcode_dropdown_update(next_records),
@@ -3219,6 +3241,7 @@ def generate_dynamic_gcode(
     all_g1: bool,
     use_reference_motion: bool,
     raster_pattern: str | None,
+    pressure_ramp_enabled: bool,
     lead_in_enabled: bool,
     lead_in_length: float,
     lead_in_clearance: float,
@@ -3252,6 +3275,7 @@ def generate_dynamic_gcode(
                 port=int(record.get("port", 1)),
                 layer_height=float(layer_height),
                 fil_width=float(pixel_size),
+                pressure_ramp_enabled=bool(pressure_ramp_enabled),
                 all_g1=bool(all_g1),
                 motion_tiffs=motion_tiffs,
                 raster_pattern=raster_pattern,
@@ -3653,6 +3677,7 @@ def build_dynamic_demo() -> gr.Blocks:
                 value=True,
             )
             gcode_all_g1 = gr.Checkbox(label="Move at one constant speed (no fast travel moves)", value=True)
+            gcode_pressure_ramp_enabled = gr.Checkbox(label="Increase Pressure Each Layer", value=True)
             gcode_raster_pattern = gr.Dropdown(
                 label="Raster Pattern",
                 choices=list(RASTER_PATTERN_CHOICES),
@@ -3942,6 +3967,10 @@ def build_dynamic_demo() -> gr.Blocks:
                 shape_records,
                 shape_settings,
                 nozzle_spacing_table,
+                selected_shape,
+                slice_slider,
+                slice_label,
+                slice_preview,
                 tiff_downloads,
                 gcode_downloads,
                 gcode_text_source,
@@ -3978,6 +4007,7 @@ def build_dynamic_demo() -> gr.Blocks:
                 gcode_all_g1,
                 gcode_use_ref_motion,
                 gcode_raster_pattern,
+                gcode_pressure_ramp_enabled,
                 gcode_lead_in_enabled,
                 gcode_lead_in_length,
                 gcode_lead_in_clearance,
@@ -3987,6 +4017,10 @@ def build_dynamic_demo() -> gr.Blocks:
                 pixel_size,
             ],
             outputs=[shape_records, gcode_downloads, gcode_status, gcode_text_source, gcode_source],
+        ).then(
+            fn=load_selected_gcode_text,
+            inputs=[shape_records, gcode_text_source],
+            outputs=[gcode_text],
         )
         gcode_text_source.change(fn=load_selected_gcode_text, inputs=[shape_records, gcode_text_source], outputs=[gcode_text])
         refresh_gcode_text_button.click(fn=load_selected_gcode_text, inputs=[shape_records, gcode_text_source], outputs=[gcode_text])

tests/test_tiff_to_gcode.py

@@ -69,6 +69,10 @@ def _moves_with_colors(gcode_text: str) -> list[dict]:
     return moves
 
 
+def _pressure_set_count(gcode_text: str) -> int:
+    return gcode_text.count("\\x30\\x38\\x50\\x53") + gcode_text.count("setpress(")
+
+
 def test_trace_mask_contours_uses_tiff_pixel_border_edges() -> None:
     contours = _trace_mask_contours(
         np.array(
@@ -535,8 +539,8 @@ def test_gcode_header_writes_presets_before_initial_aux_commands(tmp_path) -> No
 
     assert lines[0] == "G91"
     assert lines[1] == "{aux_command}WAGO_ValveCommands(7, 0)"
-    assert lines[2].startswith("{preset}serialPort3.write(")
-    assert lines[3].startswith("{preset}serialPort3.write(")
+    assert lines[2] == "serialPort3.write(eval(setpress(25)))"
+    assert lines[3] == "serialPort3.write(eval(togglepress()))"
     assert lines[4].startswith("{aux_command}WAGO_ValveCommands(")
     assert lines[5].startswith("{aux_command}WAGO_ValveCommands(")
 
@@ -585,6 +589,41 @@ def test_gcode_lead_in_runs_once_before_first_layer(tmp_path) -> None:
     assert not any(move["start"][0] < -3.0 or move["end"][0] < -3.0 for move in moves[first_z_index:])
 
 
+def test_gcode_pressure_ramp_can_be_disabled(tmp_path) -> None:
+    tiff_paths = []
+    for index in range(2):
+        tiff_path = tmp_path / f"slice_{index:04d}.tif"
+        Image.new("L", (1, 1), 0).save(tiff_path)
+        tiff_paths.append(tiff_path)
+
+    zip_path = tmp_path / "slices.zip"
+    with zipfile.ZipFile(zip_path, mode="w") as archive:
+        for tiff_path in tiff_paths:
+            archive.write(tiff_path, arcname=tiff_path.name)
+
+    ramped_path = generate_snake_path_gcode(
+        zip_path,
+        shape_name="pressure_ramped",
+        pressure=25,
+        valve=7,
+        port=3,
+        layer_height=1.0,
+        pressure_ramp_enabled=True,
+    )
+    fixed_path = generate_snake_path_gcode(
+        zip_path,
+        shape_name="pressure_fixed",
+        pressure=25,
+        valve=7,
+        port=3,
+        layer_height=1.0,
+        pressure_ramp_enabled=False,
+    )
+
+    assert _pressure_set_count(ramped_path.read_text()) > 1
+    assert _pressure_set_count(fixed_path.read_text()) == 1
+
+
 def test_gcode_uses_g1_for_print_and_g0_for_travel(tmp_path) -> None:
     tiff_path = tmp_path / "slice_0000.tif"
     Image.new("L", (1, 1), 0).save(tiff_path)

tiff_to_gcode.py

@@ -66,12 +66,16 @@ def _togglepress() -> str:
 
 
 def _setpress_cmd(port: str, pressure: float, start: bool) -> str:
-    insert = "{preset}" if start else ""
+    if start:
+        return f"\n\r{port}.write(eval(setpress({pressure:g})))"
+    insert = ""
     return f"\n\r{insert}{port}.write({_setpress(pressure)})"
 
 
 def _toggle_cmd(port: str, start: bool) -> str:
-    insert = "{preset}" if start else ""
+    if start:
+        return f"\n\r{port}.write(eval(togglepress()))"
+    insert = ""
     return f"\n\r{insert}{port}.write({_togglepress()})"
 
 
@@ -1050,6 +1054,7 @@ def generate_snake_path_gcode(
     fil_width: float = 0.8,
     invert: bool = True,
     increase_pressure_per_layer: float = 0.1,
+    pressure_ramp_enabled: bool = True,
     all_g1: bool = False,
     motion_tiffs: list[str] | None = None,
     raster_pattern: str | None = RASTER_PATTERN_SAME_DIRECTION,
@@ -1301,8 +1306,11 @@ def generate_snake_path_gcode(
                     f"{move_type} X{move['X']} Y{move['Y']} Z{move['Z']} "
                     f"; Color {move['Color']}"
                 )
-                pressure_cur += increase_pressure_per_layer
-                pressure_next = _setpress_cmd(com_port, pressure_cur, start=False)
+                if pressure_ramp_enabled:
+                    pressure_cur += increase_pressure_per_layer
+                    pressure_next = _setpress_cmd(com_port, pressure_cur, start=False)
+                else:
+                    pressure_next = None
             else:
                 line = (
                     f"{move_type} X{move['X']} Y{move['Y']} ; Color {move['Color']}"