3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-08 23:46:24 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix segmentation fault when running CLI (#4702)

Browse source 
* fix: replace extruder_clearance_max_radius with extruder_clearance_radius

* fix: add if m_plater before accessing preset_bundle

* fix: generate thumbnail only when callback is defined

* fix: change default gcode thumbnail format to png
This commit is contained in:
Asoka Wotulo 2024-04-07 11:07:44 +07:00 • committed by GitHub
parent 14fc48ffbd
commit fe914e82f3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 50 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/OrcaSlicer.cpp
View file

@ -1312,14 +1312,14 @@ int CLI::run(int argc, char **argv)
old_height_to_rod = config.opt_float("extruder_clearance_height_to_rod"); old_height_to_rod = config.opt_float("extruder_clearance_height_to_rod");
if (config.option<ConfigOptionFloat>("extruder_clearance_height_to_lid")) if (config.option<ConfigOptionFloat>("extruder_clearance_height_to_lid"))
old_height_to_lid = config.opt_float("extruder_clearance_height_to_lid"); old_height_to_lid = config.opt_float("extruder_clearance_height_to_lid");
if (config.option<ConfigOptionFloat>("extruder_clearance_max_radius")) if (config.option<ConfigOptionFloat>("extruder_clearance_radius"))
old_max_radius = config.opt_float("extruder_clearance_max_radius"); old_max_radius = config.opt_float("extruder_clearance_radius");
if (config.option<ConfigOptionFloats>("max_layer_height")) if (config.option<ConfigOptionFloats>("max_layer_height"))
old_max_layer_height = config.option<ConfigOptionFloats>("max_layer_height")->values; old_max_layer_height = config.option<ConfigOptionFloats>("max_layer_height")->values;
if (config.option<ConfigOptionFloats>("min_layer_height")) if (config.option<ConfigOptionFloats>("min_layer_height"))
old_min_layer_height = config.option<ConfigOptionFloats>("min_layer_height")->values; old_min_layer_height = config.option<ConfigOptionFloats>("min_layer_height")->values;
BOOST_LOG_TRIVIAL(info) << boost::format("old printable size from 3mf: {%1%, %2%, %3%}")%old_printable_width %old_printable_depth %old_printable_height; BOOST_LOG_TRIVIAL(info) << boost::format("old printable size from 3mf: {%1%, %2%, %3%}")%old_printable_width %old_printable_depth %old_printable_height;
BOOST_LOG_TRIVIAL(info) << boost::format("old extruder_clearance_height_to_rod %1%, extruder_clearance_height_to_lid %2%, extruder_clearance_max_radius %3%}")%old_height_to_rod %old_height_to_lid %old_max_radius; BOOST_LOG_TRIVIAL(info) << boost::format("old extruder_clearance_height_to_rod %1%, extruder_clearance_height_to_lid %2%, extruder_clearance_radius %3%}")%old_height_to_rod %old_height_to_lid %old_max_radius;
} }
else else
{ {
@ -2774,7 +2774,7 @@ int CLI::run(int argc, char **argv)
double print_height = m_print_config.opt_float("printable_height"); double print_height = m_print_config.opt_float("printable_height");
double height_to_lid = m_print_config.opt_float("extruder_clearance_height_to_lid"); double height_to_lid = m_print_config.opt_float("extruder_clearance_height_to_lid");
double height_to_rod = m_print_config.opt_float("extruder_clearance_height_to_rod"); double height_to_rod = m_print_config.opt_float("extruder_clearance_height_to_rod");
double cleareance_radius = m_print_config.opt_float("extruder_clearance_max_radius"); double cleareance_radius = m_print_config.opt_float("extruder_clearance_radius");
//double plate_stride; //double plate_stride;
std::string bed_texture; std::string bed_texture;

65
src/libslic3r/GCode.cpp
View file

@ -2000,13 +2000,16 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato
// if thumbnail type of BTT_TFT, insert above header // if thumbnail type of BTT_TFT, insert above header
// if not, it is inserted under the header in its normal spot // if not, it is inserted under the header in its normal spot
const GCodeThumbnailsFormat m_gcode_thumbnail_format = print.full_print_config().opt_enum<GCodeThumbnailsFormat>("thumbnails_format"); GCodeThumbnailsFormat m_gcode_thumbnail_format = GCodeThumbnailsFormat::PNG;
if (m_gcode_thumbnail_format == GCodeThumbnailsFormat::BTT_TFT) if (thumbnail_cb != nullptr) {
GCodeThumbnails::export_thumbnails_to_file( m_gcode_thumbnail_format = print.full_print_config().opt_enum<GCodeThumbnailsFormat>("thumbnails_format");
thumbnail_cb, print.get_plate_index(), print.full_print_config().option<ConfigOptionPoints>("thumbnails")->values, if (m_gcode_thumbnail_format == GCodeThumbnailsFormat::BTT_TFT)
m_gcode_thumbnail_format, GCodeThumbnails::export_thumbnails_to_file(
[&file](const char *sz) { file.write(sz); }, thumbnail_cb, print.get_plate_index(), print.full_print_config().option<ConfigOptionPoints>("thumbnails")->values,
[&print]() { print.throw_if_canceled(); }); m_gcode_thumbnail_format,
[&file](const char *sz) { file.write(sz); },
[&print]() { print.throw_if_canceled(); });
}
file.write_format("; HEADER_BLOCK_START\n"); file.write_format("; HEADER_BLOCK_START\n");
// Write information on the generator. // Write information on the generator.
@ -2067,32 +2070,32 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato
// as configuration key / value pairs to be parsable by older versions of // as configuration key / value pairs to be parsable by older versions of
// PrusaSlicer G-code viewer. // PrusaSlicer G-code viewer.
{ {
if (is_bbl_printers) { if (is_bbl_printers) {
file.write("; CONFIG_BLOCK_START\n"); file.write("; CONFIG_BLOCK_START\n");
std::string full_config; std::string full_config;
append_full_config(print, full_config); append_full_config(print, full_config);
if (!full_config.empty()) if (!full_config.empty())
file.write(full_config); file.write(full_config);
// SoftFever: write compatiple image // SoftFever: write compatiple image
int first_layer_bed_temperature = get_bed_temperature(0, true, print.config().curr_bed_type); int first_layer_bed_temperature = get_bed_temperature(0, true, print.config().curr_bed_type);
file.write_format("; first_layer_bed_temperature = %d\n", file.write_format("; first_layer_bed_temperature = %d\n",
first_layer_bed_temperature); first_layer_bed_temperature);
file.write_format( file.write_format(
"; first_layer_temperature = %d\n", "; first_layer_temperature = %d\n",
print.config().nozzle_temperature_initial_layer.get_at(0)); print.config().nozzle_temperature_initial_layer.get_at(0));
file.write("; CONFIG_BLOCK_END\n\n"); file.write("; CONFIG_BLOCK_END\n\n");
} else { } else if (thumbnail_cb != nullptr) {
if (m_gcode_thumbnail_format != GCodeThumbnailsFormat::BTT_TFT) { if (m_gcode_thumbnail_format != GCodeThumbnailsFormat::BTT_TFT) {
auto thumbnaim_fmt = m_gcode_thumbnail_format; auto thumbnaim_fmt = m_gcode_thumbnail_format;
// Orca: if the thumbnail format is ColPic, we write PNG in the beginning of gcode file and ColPic in the end of gcode file. // Orca: if the thumbnail format is ColPic, we write PNG in the beginning of gcode file and ColPic in the end of gcode file.
if(m_gcode_thumbnail_format == GCodeThumbnailsFormat::ColPic) if (m_gcode_thumbnail_format == GCodeThumbnailsFormat::ColPic)
thumbnaim_fmt = GCodeThumbnailsFormat::PNG; thumbnaim_fmt = GCodeThumbnailsFormat::PNG;
GCodeThumbnails::export_thumbnails_to_file( GCodeThumbnails::export_thumbnails_to_file(
thumbnail_cb, print.get_plate_index(), print.full_print_config().option<ConfigOptionPoints>("thumbnails")->values, thumbnail_cb, print.get_plate_index(), print.full_print_config().option<ConfigOptionPoints>("thumbnails")->values,
thumbnaim_fmt, [&file](const char* sz) { file.write(sz); }, [&print]() { print.throw_if_canceled(); }); thumbnaim_fmt, [&file](const char* sz) { file.write(sz); }, [&print]() { print.throw_if_canceled(); });
}
} }
}
} }

20
src/slic3r/GUI/PartPlate.cpp
View file

@ -2356,11 +2356,13 @@ void PartPlate::generate_logo_polygon(ExPolygon &logo_polygon)
{ {
if (m_shape.size() == 4) if (m_shape.size() == 4)
{ {
auto preset_bundle = wxGetApp().preset_bundle;
bool is_bbl_vendor = false; bool is_bbl_vendor = false;
if (preset_bundle)
is_bbl_vendor = preset_bundle->is_bbl_vendor(); if (m_plater) {
if (auto preset_bundle = wxGetApp().preset_bundle; preset_bundle)
is_bbl_vendor = preset_bundle->is_bbl_vendor();
}
//rectangle case //rectangle case
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
{ {
@ -2545,8 +2547,8 @@ bool PartPlate::set_shape(const Pointfs& shape, const Pointfs& exclude_areas, Ve
ExPolygon logo_poly; ExPolygon logo_poly;
generate_logo_polygon(logo_poly); generate_logo_polygon(logo_poly);
m_logo_triangles.reset(); m_logo_triangles.reset();
if (!init_model_from_poly(m_logo_triangles, logo_poly, GROUND_Z + 0.02f)) if (!init_model_from_poly(m_logo_triangles, logo_poly, GROUND_Z + 0.02f))
BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ":Unable to create logo triangles\n"; BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ":Unable to create logo triangles\n";
ExPolygon poly; ExPolygon poly;
@ -2576,8 +2578,10 @@ bool PartPlate::set_shape(const Pointfs& shape, const Pointfs& exclude_areas, Ve
calc_vertex_for_icons(4, m_plate_settings_icon); calc_vertex_for_icons(4, m_plate_settings_icon);
//calc_vertex_for_number(0, (m_plate_index < 9), m_plate_idx_icon); //calc_vertex_for_number(0, (m_plate_index < 9), m_plate_idx_icon);
calc_vertex_for_number(0, false, m_plate_idx_icon); calc_vertex_for_number(0, false, m_plate_idx_icon);
// calc vertex for plate name if (m_plater) {
generate_plate_name_texture(); // calc vertex for plate name
generate_plate_name_texture();
}
} }
calc_height_limit(); calc_height_limit();