From 4f29c19cc73f80c0d132ab0c05d5a6b531cc4d59 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Sat, 13 Jan 2024 11:53:26 +0100 Subject: [PATCH 1/2] Fix failing UT due to missing setting keys --- tests/LayerPlanTest.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/LayerPlanTest.cpp b/tests/LayerPlanTest.cpp index 455e59c82a..901f6d1073 100644 --- a/tests/LayerPlanTest.cpp +++ b/tests/LayerPlanTest.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2023 UltiMaker +// Copyright (c) 2024 UltiMaker // CuraEngine is released under the terms of the AGPLv3 or higher #include "LayerPlan.h" //The code under test. @@ -124,6 +124,8 @@ class LayerPlanTest : public testing::Test settings->add("prime_tower_line_width", "0.48"); settings->add("prime_tower_min_volume", "10"); settings->add("prime_tower_size", "40"); + settings->add("raft_interface_layers", "1"); + settings->add("raft_surface_layers", "1"); settings->add("raft_base_line_width", "0.401"); settings->add("raft_base_acceleration", "5001"); settings->add("raft_base_jerk", "5.1"); From a24232b9b957ad59b262b54e0398c374040a6705 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Sat, 13 Jan 2024 11:57:27 +0100 Subject: [PATCH 2/2] fix gcode timing file --- .github/workflows/gcodeanalyzer.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gcodeanalyzer.yml b/.github/workflows/gcodeanalyzer.yml index 116937507c..fd3c171165 100644 --- a/.github/workflows/gcodeanalyzer.yml +++ b/.github/workflows/gcodeanalyzer.yml @@ -179,7 +179,7 @@ jobs: run: | for file in `ls ../NightlyTestModels/*.stl`; do - ( time ./build/Release/CuraEngine slice --force-read-parent --force-read-nondefault -v -p -j ../Cura/resources/definitions/ultimaker_s3.def.json -l $file -o ../`basename $file .stl`.gcode ) 2> $file.time + ( time ./build/Release/CuraEngine slice --force-read-parent --force-read-nondefault -v -p -j ../Cura/resources/definitions/ultimaker_s3.def.json -l $file -o ../`basename $file .stl`.gcode ) 2> ../`basename $file .stl`.time done working-directory: CuraEngine @@ -205,7 +205,7 @@ jobs: if ext.lower() != ".gcode": continue infilename = os.path.join(folder_path, filename) - with open(infilename + ".time", "r") as f: + with open(infilename.split(".")[0] + ".time", "r") as f: timer = float(re.match(r"^.*?cpu (\d+\.\d+)", f.read())[1]) frame = GCodeAnalyzer.DataFrame(infilename)