GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-14 10:45:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix compilation

Browse Source
This commit is contained in:
supermerill 2020-11-09 01:16:17 +01:00
parent 743781db53
commit e831cb07ab
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/libslic3r/GCode.cpp
View File

@ -832,13 +832,11 @@ void GCode::do_export(Print* print, const char* path, GCodePreviewData* preview_
#endif // ENABLE_GCODE_VIEWER
std::error_code err_code;
if (rename_file(path_tmp, path))
if (copy_file(path_tmp, path, ("Failed to rename the output G-code file from " + path_tmp + " to " + path + '\n' +
"Is " + path_tmp + " locked? " + err_code.message() + '\n'), true) != CopyFileResult::SUCCESS)
throw Slic3r::RuntimeError(
std::string("Failed to rename the output G-code file from ") + path_tmp + " to " + path + '\n' +
"Is " + path_tmp + " locked? " + err_code.message() + '\n');
if (rename_file(path_tmp, path)) {
std::string err_msg = ("Failed to rename the output G-code file from " + path_tmp + " to " + path + '\n');
if (copy_file(path_tmp, path, err_msg, true) != CopyFileResult::SUCCESS)
throw Slic3r::RuntimeError(err_msg);
}
BOOST_LOG_TRIVIAL(info) << "Exporting G-code finished" << log_memory_info();
print->set_done(psGCodeExport);

2
src/libslic3r/GCode/GCodeProcessor.cpp
View File

@ -2157,7 +2157,7 @@ void GCodeProcessor::store_move_vertex(EMoveType type)
m_height,
m_mm3_per_mm,
m_fan_speed,
m_layer_id, //layer_duration: set later
float(m_layer_id), //layer_duration: set later
m_time_processor.machines[0].time, //time: set later
m_temperature
};

4
src/slic3r/GUI/Tab.cpp
View File

@ -1744,11 +1744,11 @@ bool Tab::create_pages(std::string setting_type_name, int idx_page)
if (!in_line) {
if (colored) {
m_colored_Label_colors[setting_id] = &m_default_text_clr;
Line l = current_group->create_single_option_line(option, label_path.empty() ? wxEmptyString : label_path);
Line l = current_group->create_single_option_line(option, label_path.empty() ? wxString(wxEmptyString) : wxString(label_path));
l.full_Label_color = m_colored_Label_colors[setting_id];
current_group->append_line(l);
} else {
current_group->append_line(current_group->create_single_option_line(option, label_path.empty() ? wxEmptyString : label_path));
current_group->append_line(current_group->create_single_option_line(option, label_path.empty() ? wxString(wxEmptyString) : wxString(label_path)));
}
} else {
current_line.append_option(option);