From 27271a69f630683d8aa9be8c27d3e61403aad2ea Mon Sep 17 00:00:00 2001 From: SoftFever Date: Tue, 21 Feb 2023 19:07:20 +0800 Subject: [PATCH] take flow ratio into account for max volumetric speed test --- .github/workflows/build_linux.yml | 2 +- .github/workflows/build_mac_arm64.yml | 2 +- .github/workflows/build_mac_x64.yml | 2 +- .github/workflows/build_win.yml | 2 +- src/slic3r/GUI/Plater.cpp | 11 ++++++----- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml index 1a3caea5ce5..749a272d702 100644 --- a/.github/workflows/build_linux.yml +++ b/.github/workflows/build_linux.yml @@ -1,6 +1,6 @@ name: Build Linux -on: [pull_request] +on: [pull_request,push] jobs: appimage-builder: diff --git a/.github/workflows/build_mac_arm64.yml b/.github/workflows/build_mac_arm64.yml index f7568996e77..ecd7698737f 100644 --- a/.github/workflows/build_mac_arm64.yml +++ b/.github/workflows/build_mac_arm64.yml @@ -1,6 +1,6 @@ name: Build Mac arm64 -on: [pull_request] +on: [pull_request,push] jobs: build_win64: diff --git a/.github/workflows/build_mac_x64.yml b/.github/workflows/build_mac_x64.yml index fb5609251cf..ae837c8c35f 100644 --- a/.github/workflows/build_mac_x64.yml +++ b/.github/workflows/build_mac_x64.yml @@ -1,6 +1,6 @@ name: Build Mac x64 -on: [pull_request] +on: [pull_request,push] jobs: build_win64: diff --git a/.github/workflows/build_win.yml b/.github/workflows/build_win.yml index 5095ef3f5de..99b52040d92 100644 --- a/.github/workflows/build_win.yml +++ b/.github/workflows/build_win.yml @@ -1,6 +1,6 @@ name: Build Win64 -on: [pull_request] +on: [pull_request,push] jobs: build_win64: diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 0e213d8ff38..96110db39fb 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -8130,7 +8130,7 @@ void Plater::calib_max_vol_speed(const Calib_Params& params) max_lh->values[0] = { layer_height }; filament_config->set_key_value("filament_max_volumetric_speed", new ConfigOptionFloats { 200 }); - filament_config->set_key_value("slow_down_layer_time", new ConfigOptionFloats { 0.0 }); + filament_config->set_key_value("slow_down_layer_time", new ConfigOptionFloats{0.0}); print_config->set_key_value("enable_overhang_speed", new ConfigOptionBool { false }); print_config->set_key_value("timelapse_type", new ConfigOptionEnum(tlTraditional)); @@ -8167,10 +8167,11 @@ void Plater::calib_max_vol_speed(const Calib_Params& params) } auto new_params = params; - Flow wall_flow = Flow(line_width, layer_height, nozzle_diameter); - new_params.end = params.end / wall_flow.mm3_per_mm(); - new_params.start = params.start / wall_flow.mm3_per_mm(); - new_params.step = params.step / wall_flow.mm3_per_mm(); + auto mm3_per_mm = Flow(line_width, layer_height, nozzle_diameter).mm3_per_mm() * + filament_config->option("filament_flow_ratio")->get_at(0); + new_params.end = params.end / mm3_per_mm; + new_params.start = params.start / mm3_per_mm; + new_params.step = params.step / mm3_per_mm; p->background_process.fff_print()->set_calib_params(new_params);