3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-01-28 11:50:49 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Spoolman Statistics Moved to Preset

Browse source 
Spoolman statistics are now stored in the filament preset and are not saved to a file
This commit is contained in:
Ocraftyone 2024-06-05 01:47:31 -04:00
parent 61c06a4a4b
commit b395da52f6
No known key found for this signature in database
GPG key ID: 85836ED21AD4D125
10 changed files with 123 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/libslic3r/GCode.cpp
View file

@ -1666,6 +1666,35 @@ void GCode::do_export(Print* print, const char* path, GCodeProcessorResult* resu
result->filename = path;
}
std::vector<int> filaments_with_spoolman_idxs;
for (int l = 0; l < print->config().filament_density.size(); ++l) {
if (print->config().filament_spoolman_enabled.get_at(l))
filaments_with_spoolman_idxs.push_back(l);
}
if (!filaments_with_spoolman_idxs.empty()) {
// get used filament (meters and grams) from used volume in respect to the active extruder
auto get_used_filament_from_volume = [&](int extruder_id) {
double volume = print->m_print_statistics.filament_stats[extruder_id];
std::pair<double, double> ret = { volume / (PI * sqr(0.5 * print->config().filament_diameter.get_at(extruder_id))),
volume * print->config().filament_density.get_at(extruder_id) * 0.001 };
return ret;
};
for (const auto& item : filaments_with_spoolman_idxs) {
auto [est_used_length, est_used_weight] = get_used_filament_from_volume(item);
double remaining_length = print->config().filament_remaining_length.get_at(item);
double remaining_weight = print->config().filament_remaining_weight.get_at(item);
if (est_used_length > remaining_length || est_used_weight > remaining_weight) {
std::string filament_name = print->config().filament_settings_id.get_at(item);
std::string msg = boost::str(boost::format(_("Filament %1% does not have enough material for the print. Used: %2$.2f m, %3$.2f g, Remaining: %4$.2f m, %5$.2f g")) %
filament_name % (est_used_length * 0.001) % est_used_weight % remaining_length % remaining_weight);
print->active_step_add_warning(PrintStateBase::WarningLevel::CRITICAL, msg);
}
}
}
//BBS: add some log for error output
BOOST_LOG_TRIVIAL(debug) << boost::format("Finished processing gcode to %1% ") % path_tmp;