Some code refactoring
This commit is contained in:
parent
9f91272009
commit
7f649c5509
@ -1411,27 +1411,25 @@ void Sidebar::update_sliced_info_sizer()
|
|||||||
new_label = _L("Used Filament (g)");
|
new_label = _L("Used Filament (g)");
|
||||||
info_text = wxString::Format("%.2f", ps.total_weight);
|
info_text = wxString::Format("%.2f", ps.total_weight);
|
||||||
|
|
||||||
const auto& extruders_filaments = wxGetApp().preset_bundle->extruders_filaments;
|
|
||||||
const PresetCollection& filaments = wxGetApp().preset_bundle->filaments;
|
|
||||||
|
|
||||||
if (ps.filament_stats.size() > 1)
|
if (ps.filament_stats.size() > 1)
|
||||||
new_label += ":";
|
new_label += ":";
|
||||||
|
|
||||||
for (auto filament : ps.filament_stats) {
|
const auto& extruders_filaments = wxGetApp().preset_bundle->extruders_filaments;
|
||||||
const Preset* filament_preset = filaments.find_preset(extruders_filaments[filament.first].get_selected_preset_name(), false);
|
for (const auto& [filament_id, filament_vol] : ps.filament_stats) {
|
||||||
if (filament_preset) {
|
assert(filament_id < extruders_filaments.size());
|
||||||
|
if (const Preset* preset = extruders_filaments[filament_id].get_selected_preset()) {
|
||||||
double filament_weight;
|
double filament_weight;
|
||||||
if (ps.filament_stats.size() == 1)
|
if (ps.filament_stats.size() == 1)
|
||||||
filament_weight = ps.total_weight;
|
filament_weight = ps.total_weight;
|
||||||
else {
|
else {
|
||||||
double filament_density = filament_preset->config.opt_float("filament_density", 0);
|
double filament_density = preset->config.opt_float("filament_density", 0);
|
||||||
filament_weight = filament.second * filament_density/* *2.4052f*/ * 0.001; // assumes 1.75mm filament diameter;
|
filament_weight = filament_vol * filament_density/* *2.4052f*/ * 0.001; // assumes 1.75mm filament diameter;
|
||||||
|
|
||||||
new_label += "\n - " + format_wxstr(_L("Filament at extruder %1%"), filament.first + 1);
|
new_label += "\n - " + format_wxstr(_L("Filament at extruder %1%"), filament_id + 1);
|
||||||
info_text += wxString::Format("\n%.2f", filament_weight);
|
info_text += wxString::Format("\n%.2f", filament_weight);
|
||||||
}
|
}
|
||||||
|
|
||||||
double spool_weight = filament_preset->config.opt_float("filament_spool_weight", 0);
|
double spool_weight = preset->config.opt_float("filament_spool_weight", 0);
|
||||||
if (spool_weight != 0.0) {
|
if (spool_weight != 0.0) {
|
||||||
new_label += "\n " + _L("(including spool)");
|
new_label += "\n " + _L("(including spool)");
|
||||||
info_text += wxString::Format(" (%.2f)\n", filament_weight + spool_weight);
|
info_text += wxString::Format(" (%.2f)\n", filament_weight + spool_weight);
|
||||||
|
Loading…
Reference in New Issue
Block a user