diff --git a/resources/profiles/PrusaResearch/MK3S_thumbnail.png b/resources/profiles/PrusaResearch/MK3S_thumbnail.png index 5fa1a665b..8a859b82e 100644 Binary files a/resources/profiles/PrusaResearch/MK3S_thumbnail.png and b/resources/profiles/PrusaResearch/MK3S_thumbnail.png differ diff --git a/src/libslic3r/GCode/GCodeProcessor.cpp b/src/libslic3r/GCode/GCodeProcessor.cpp index f4b38e2ec..1e302c656 100644 --- a/src/libslic3r/GCode/GCodeProcessor.cpp +++ b/src/libslic3r/GCode/GCodeProcessor.cpp @@ -29,6 +29,11 @@ static const float MMMIN_TO_MMSEC = 1.0f / 60.0f; static const float DEFAULT_ACCELERATION = 1500.0f; // Prusa Firmware 1_75mm_MK2 static const float DEFAULT_TRAVEL_ACCELERATION = 1250.0f; +static const size_t MIN_EXTRUDERS_COUNT = 5; +static const float DEFAULT_FILAMENT_DIAMETER = 1.75f; +static const float DEFAULT_FILAMENT_DENSITY = 1.245f; +static const Slic3r::Vec3f DEFAULT_EXTRUDER_OFFSET = Slic3r::Vec3f::Zero(); + namespace Slic3r { #if ENABLE_VALIDATE_CUSTOM_GCODE @@ -187,72 +192,6 @@ void GCodeProcessor::TimeMachine::CustomGCodeTime::reset() times = std::vector>(); } -void GCodeProcessor::UsedFilaments::reset() -{ - color_change_cache = 0.0f; - volumes_per_color_change = std::vector(); - - tool_change_cache = 0.0f; - volumes_per_extruder.clear(); - - role_cache = 0.0f; - filaments_per_role.clear(); -} - -void GCodeProcessor::UsedFilaments::increase_caches(double extruded_volume) -{ - color_change_cache += extruded_volume; - tool_change_cache += extruded_volume; - role_cache += extruded_volume; -} - -void GCodeProcessor::UsedFilaments::process_color_change_cache() -{ - if (color_change_cache != 0.0f) { - volumes_per_color_change.push_back(color_change_cache); - color_change_cache = 0.0f; - } -} - -void GCodeProcessor::UsedFilaments::process_extruder_cache(GCodeProcessor* processor) -{ - size_t active_extruder_id = processor->m_extruder_id; - if (tool_change_cache != 0.0f) { - if (volumes_per_extruder.find(active_extruder_id) != volumes_per_extruder.end()) - volumes_per_extruder[active_extruder_id] += tool_change_cache; - else - volumes_per_extruder[active_extruder_id] = tool_change_cache; - tool_change_cache = 0.0f; - } -} - -void GCodeProcessor::UsedFilaments::process_role_cache(GCodeProcessor* processor) -{ - if (role_cache != 0.0f) { - std::pair filament = { 0.0f, 0.0f }; - - double s = PI * sqr(0.5 * processor->m_filament_diameters[processor->m_extruder_id]); - filament.first = role_cache/s * 0.001; - filament.second = role_cache * processor->m_filament_densities[processor->m_extruder_id] * 0.001; - - ExtrusionRole active_role = processor->m_extrusion_role; - if (filaments_per_role.find(active_role) != filaments_per_role.end()) { - filaments_per_role[active_role].first += filament.first; - filaments_per_role[active_role].second += filament.second; - } - else - filaments_per_role[active_role] = filament; - role_cache = 0.0f; - } -} - -void GCodeProcessor::UsedFilaments::process_caches(GCodeProcessor* processor) -{ - process_color_change_cache(); - process_extruder_cache(processor); - process_role_cache(processor); -} - void GCodeProcessor::TimeMachine::reset() { enabled = false; @@ -785,6 +724,95 @@ void GCodeProcessor::TimeProcessor::post_process(const std::string& filename) "Is " + out_path + " locked?" + '\n'); } +void GCodeProcessor::UsedFilaments::reset() +{ + color_change_cache = 0.0f; + volumes_per_color_change = std::vector(); + + tool_change_cache = 0.0f; + volumes_per_extruder.clear(); + + role_cache = 0.0f; + filaments_per_role.clear(); +} + +void GCodeProcessor::UsedFilaments::increase_caches(double extruded_volume) +{ + color_change_cache += extruded_volume; + tool_change_cache += extruded_volume; + role_cache += extruded_volume; +} + +void GCodeProcessor::UsedFilaments::process_color_change_cache() +{ + if (color_change_cache != 0.0f) { + volumes_per_color_change.push_back(color_change_cache); + color_change_cache = 0.0f; + } +} + +void GCodeProcessor::UsedFilaments::process_extruder_cache(GCodeProcessor* processor) +{ + size_t active_extruder_id = processor->m_extruder_id; + if (tool_change_cache != 0.0f) { + if (volumes_per_extruder.find(active_extruder_id) != volumes_per_extruder.end()) + volumes_per_extruder[active_extruder_id] += tool_change_cache; + else + volumes_per_extruder[active_extruder_id] = tool_change_cache; + tool_change_cache = 0.0f; + } +} + +void GCodeProcessor::UsedFilaments::process_role_cache(GCodeProcessor* processor) +{ + if (role_cache != 0.0f) { + std::pair filament = { 0.0f, 0.0f }; + + double s = PI * sqr(0.5 * processor->m_result.filament_diameters[processor->m_extruder_id]); + filament.first = role_cache / s * 0.001; + filament.second = role_cache * processor->m_result.filament_densities[processor->m_extruder_id] * 0.001; + + ExtrusionRole active_role = processor->m_extrusion_role; + if (filaments_per_role.find(active_role) != filaments_per_role.end()) { + filaments_per_role[active_role].first += filament.first; + filaments_per_role[active_role].second += filament.second; + } + else + filaments_per_role[active_role] = filament; + role_cache = 0.0f; + } +} + +void GCodeProcessor::UsedFilaments::process_caches(GCodeProcessor* processor) +{ + process_color_change_cache(); + process_extruder_cache(processor); + process_role_cache(processor); +} + +#if ENABLE_GCODE_VIEWER_STATISTICS +void GCodeProcessor::Result::reset() { + moves = std::vector(); + bed_shape = Pointfs(); + settings_ids.reset(); + extruders_count = 0; + extruder_colors = std::vector(); + filament_diameters = std::vector(MIN_EXTRUDERS_COUNT, DEFAULT_FILAMENT_DIAMETER); + filament_densities = std::vector(MIN_EXTRUDERS_COUNT, DEFAULT_FILAMENT_DENSITY); + time = 0; +} +#else +void GCodeProcessor::Result::reset() { + moves = std::vector(); + bed_shape = Pointfs(); + settings_ids.reset(); + extruders_count = 0; + extruder_colors = std::vector(); + filament_diameters = std::vector(MIN_EXTRUDERS_COUNT, DEFAULT_FILAMENT_DIAMETER); + filament_densities = std::vector(MIN_EXTRUDERS_COUNT, DEFAULT_FILAMENT_DENSITY); +} +#endif // ENABLE_GCODE_VIEWER_STATISTICS + const std::vector> GCodeProcessor::Producers = { { EProducer::PrusaSlicer, "PrusaSlicer" }, { EProducer::Slic3rPE, "Slic3r Prusa Edition" }, @@ -886,14 +914,14 @@ void GCodeProcessor::apply_config(const PrintConfig& config) m_extruder_temps.resize(extruders_count); - m_filament_diameters.resize(config.filament_diameter.values.size()); + m_result.filament_diameters.resize(config.filament_diameter.values.size()); for (size_t i = 0; i < config.filament_diameter.values.size(); ++i) { - m_filament_diameters[i] = static_cast(config.filament_diameter.values[i]); + m_result.filament_diameters[i] = static_cast(config.filament_diameter.values[i]); } - m_filament_densities.resize(config.filament_density.values.size()); + m_result.filament_densities.resize(config.filament_density.values.size()); for (size_t i = 0; i < config.filament_density.values.size(); ++i) { - m_filament_densities[i] = static_cast(config.filament_density.values[i]); + m_result.filament_densities[i] = static_cast(config.filament_density.values[i]); } if ((m_flavor == gcfMarlinLegacy || m_flavor == gcfMarlinFirmware) && config.machine_limits_usage.value != MachineLimitsUsage::Ignore) { @@ -959,21 +987,37 @@ void GCodeProcessor::apply_config(const DynamicPrintConfig& config) if (printer_settings_id != nullptr) m_result.settings_ids.printer = printer_settings_id->value; + m_result.extruders_count = config.option("nozzle_diameter")->values.size(); + const ConfigOptionFloats* filament_diameters = config.option("filament_diameter"); if (filament_diameters != nullptr) { - for (double diam : filament_diameters->values) { - m_filament_diameters.push_back(static_cast(diam)); + m_result.filament_diameters.clear(); + m_result.filament_diameters.resize(filament_diameters->values.size()); + for (size_t i = 0; i < filament_diameters->values.size(); ++i) { + m_result.filament_diameters[i] = static_cast(filament_diameters->values[i]); + } + } + + if (m_result.filament_diameters.size() < m_result.extruders_count) { + for (size_t i = m_result.filament_diameters.size(); i < m_result.extruders_count; ++i) { + m_result.filament_diameters.emplace_back(DEFAULT_FILAMENT_DIAMETER); } } const ConfigOptionFloats* filament_densities = config.option("filament_density"); if (filament_densities != nullptr) { - for (double dens : filament_densities->values) { - m_filament_densities.push_back(static_cast(dens)); + m_result.filament_densities.clear(); + m_result.filament_densities.resize(filament_densities->values.size()); + for (size_t i = 0; i < filament_densities->values.size(); ++i) { + m_result.filament_densities[i] = static_cast(filament_densities->values[i]); } } - m_result.extruders_count = config.option("nozzle_diameter")->values.size(); + if (m_result.filament_densities.size() < m_result.extruders_count) { + for (size_t i = m_result.filament_densities.size(); i < m_result.extruders_count; ++i) { + m_result.filament_densities.emplace_back(DEFAULT_FILAMENT_DENSITY); + } + } const ConfigOptionPoints* extruder_offset = config.option("extruder_offset"); if (extruder_offset != nullptr) { @@ -983,6 +1027,12 @@ void GCodeProcessor::apply_config(const DynamicPrintConfig& config) m_extruder_offsets[i] = { offset(0), offset(1), 0.0f }; } } + + if (m_extruder_offsets.size() < m_result.extruders_count) { + for (size_t i = m_extruder_offsets.size(); i < m_result.extruders_count; ++i) { + m_extruder_offsets.emplace_back(DEFAULT_EXTRUDER_OFFSET); + } + } const ConfigOptionStrings* extruder_colour = config.option("extruder_colour"); if (extruder_colour != nullptr) { @@ -998,6 +1048,12 @@ void GCodeProcessor::apply_config(const DynamicPrintConfig& config) } } + if (m_result.extruder_colors.size() < m_result.extruders_count) { + for (size_t i = m_result.extruder_colors.size(); i < m_result.extruders_count; ++i) { + m_result.extruder_colors.emplace_back(std::string()); + } + } + // replace missing values with default std::string default_color = "#FF8000"; for (size_t i = 0; i < m_result.extruder_colors.size(); ++i) { @@ -1133,12 +1189,10 @@ void GCodeProcessor::enable_stealth_time_estimator(bool enabled) void GCodeProcessor::reset() { - static const size_t Min_Extruder_Count = 5; - m_units = EUnits::Millimeters; m_global_positioning_type = EPositioningType::Absolute; m_e_local_positioning_type = EPositioningType::Absolute; - m_extruder_offsets = std::vector(Min_Extruder_Count, Vec3f::Zero()); + m_extruder_offsets = std::vector(MIN_EXTRUDERS_COUNT, Vec3f::Zero()); m_flavor = gcfRepRapSprinter; m_start_position = { 0.0f, 0.0f, 0.0f, 0.0f }; @@ -1163,17 +1217,15 @@ void GCodeProcessor::reset() m_extrusion_role = erNone; m_extruder_id = 0; - m_extruder_colors.resize(Min_Extruder_Count); - for (size_t i = 0; i < Min_Extruder_Count; ++i) { + m_extruder_colors.resize(MIN_EXTRUDERS_COUNT); + for (size_t i = 0; i < MIN_EXTRUDERS_COUNT; ++i) { m_extruder_colors[i] = static_cast(i); } - m_extruder_temps.resize(Min_Extruder_Count); - for (size_t i = 0; i < Min_Extruder_Count; ++i) { + m_extruder_temps.resize(MIN_EXTRUDERS_COUNT); + for (size_t i = 0; i < MIN_EXTRUDERS_COUNT; ++i) { m_extruder_temps[i] = 0.0f; } - m_filament_diameters = std::vector(Min_Extruder_Count, 1.75f); - m_filament_densities = std::vector(Min_Extruder_Count, 1.245f); m_extruded_last_z = 0.0f; #if ENABLE_START_GCODE_VISUALIZATION m_first_layer_height = 0.0f; @@ -2205,7 +2257,7 @@ void GCodeProcessor::process_G0(const GCodeReader::GCodeLine& line) void GCodeProcessor::process_G1(const GCodeReader::GCodeLine& line) { - float filament_diameter = (static_cast(m_extruder_id) < m_filament_diameters.size()) ? m_filament_diameters[m_extruder_id] : m_filament_diameters.back(); + float filament_diameter = (static_cast(m_extruder_id) < m_result.filament_diameters.size()) ? m_result.filament_diameters[m_extruder_id] : m_result.filament_diameters.back(); float filament_radius = 0.5f * filament_diameter; float area_filament_cross_section = static_cast(M_PI) * sqr(filament_radius); auto absolute_position = [this, area_filament_cross_section](Axis axis, const GCodeReader::GCodeLine& lineG1) { @@ -2307,7 +2359,7 @@ void GCodeProcessor::process_G1(const GCodeReader::GCodeLine& line) m_width = delta_pos[E] * static_cast(M_PI * sqr(1.05f * filament_radius)) / (delta_xyz * m_height); else if (m_extrusion_role == erBridgeInfill || m_extrusion_role == erNone) // cross section: circle - m_width = static_cast(m_filament_diameters[m_extruder_id]) * std::sqrt(delta_pos[E] / delta_xyz); + m_width = static_cast(m_result.filament_diameters[m_extruder_id]) * std::sqrt(delta_pos[E] / delta_xyz); else // cross section: rectangle + 2 semicircles m_width = delta_pos[E] * static_cast(M_PI * sqr(filament_radius)) / (delta_xyz * m_height) + static_cast(1.0 - 0.25 * M_PI) * m_height; @@ -2945,8 +2997,7 @@ void GCodeProcessor::process_T(const std::string_view command) } else { unsigned char id = static_cast(eid); if (m_extruder_id != id) { - unsigned char extruders_count = static_cast(m_extruder_offsets.size()); - if (id >= extruders_count) + if (id >= m_result.extruders_count) BOOST_LOG_TRIVIAL(error) << "GCodeProcessor encountered an invalid toolchange, maybe from a custom gcode."; else { unsigned char old_extruder_id = m_extruder_id; diff --git a/src/libslic3r/GCode/GCodeProcessor.hpp b/src/libslic3r/GCode/GCodeProcessor.hpp index 8975255ec..616731b49 100644 --- a/src/libslic3r/GCode/GCodeProcessor.hpp +++ b/src/libslic3r/GCode/GCodeProcessor.hpp @@ -343,7 +343,6 @@ namespace Slic3r { std::map volumes_per_extruder; double role_cache; - // ExtrusionRole : std::map> filaments_per_role; void reset(); @@ -403,27 +402,14 @@ namespace Slic3r { SettingsIds settings_ids; size_t extruders_count; std::vector extruder_colors; + std::vector filament_diameters; + std::vector filament_densities; PrintEstimatedStatistics print_statistics; #if ENABLE_GCODE_VIEWER_STATISTICS int64_t time{ 0 }; - void reset() { - time = 0; - moves = std::vector(); - bed_shape = Pointfs(); - extruder_colors = std::vector(); - extruders_count = 0; - settings_ids.reset(); - } -#else - void reset() { - moves = std::vector(); - bed_shape = Pointfs(); - extruder_colors = std::vector(); - extruders_count = 0; - settings_ids.reset(); - } #endif // ENABLE_GCODE_VIEWER_STATISTICS + void reset(); }; #if ENABLE_SEAMS_VISUALIZATION @@ -549,8 +535,6 @@ namespace Slic3r { unsigned char m_extruder_id; ExtruderColors m_extruder_colors; ExtruderTemps m_extruder_temps; - std::vector m_filament_diameters; - std::vector m_filament_densities; float m_extruded_last_z; #if ENABLE_START_GCODE_VISUALIZATION float m_first_layer_height; // mm diff --git a/src/slic3r/GUI/GCodeViewer.cpp b/src/slic3r/GUI/GCodeViewer.cpp index 285f07051..9139f4450 100644 --- a/src/slic3r/GUI/GCodeViewer.cpp +++ b/src/slic3r/GUI/GCodeViewer.cpp @@ -606,6 +606,8 @@ void GCodeViewer::load(const GCodeProcessor::Result& gcode_result, const Print& return; m_settings_ids = gcode_result.settings_ids; + m_filament_diameters = gcode_result.filament_diameters; + m_filament_densities = gcode_result.filament_densities; if (wxGetApp().is_editor()) load_shells(print, initialized); @@ -746,6 +748,8 @@ void GCodeViewer::reset() m_tool_colors = std::vector(); m_extruders_count = 0; m_extruder_ids = std::vector(); + m_filament_diameters = std::vector(); + m_filament_densities = std::vector(); m_extrusions.reset_role_visibility_flags(); m_extrusions.reset_ranges(); m_shells.volumes.clear(); @@ -2892,20 +2896,10 @@ void GCodeViewer::render_legend() const } // get used filament (meters and grams) from used volume in respect to the active extruder - auto get_used_filament_from_volume = [imperial_units](double volume, int extruder_id) { - const std::vector& filament_presets = wxGetApp().preset_bundle->filament_presets; - const PresetCollection& filaments = wxGetApp().preset_bundle->filaments; - - double koef = imperial_units ? 1.0/ObjectManipulation::in_to_mm : 0.001; - - std::pair ret = { 0.0, 0.0 }; - if (const Preset* filament_preset = filaments.find_preset(filament_presets[extruder_id], false)) { - double filament_radius = 0.5 * filament_preset->config.opt_float("filament_diameter", 0); - double s = PI * sqr(filament_radius); - ret.first = volume / s * koef; - double filament_density = filament_preset->config.opt_float("filament_density", 0); - ret.second = volume * filament_density * 0.001; - } + auto get_used_filament_from_volume = [this, imperial_units](double volume, int extruder_id) { + double koef = imperial_units ? 1.0 / ObjectManipulation::in_to_mm : 0.001; + std::pair ret = { koef * volume / (PI * sqr(0.5 * m_filament_diameters[extruder_id])), + volume * m_filament_densities[extruder_id] * 0.001 }; return ret; }; @@ -3339,10 +3333,19 @@ void GCodeViewer::render_legend() const } // settings section - if (wxGetApp().is_gcode_viewer() && - (m_view_type == EViewType::FeatureType || m_view_type == EViewType::Tool) && - (!m_settings_ids.print.empty() || !m_settings_ids.filament.empty() || !m_settings_ids.printer.empty())) { - + bool has_settings = false; + has_settings |= !m_settings_ids.print.empty(); + has_settings |= !m_settings_ids.printer.empty(); + bool has_filament_settings = true; + has_filament_settings &= !m_settings_ids.filament.empty(); + for (const std::string& fs : m_settings_ids.filament) { + has_filament_settings &= !fs.empty(); + } + has_settings |= has_filament_settings; + bool show_settings = wxGetApp().is_gcode_viewer(); + show_settings &= (m_view_type == EViewType::FeatureType || m_view_type == EViewType::Tool); + show_settings &= has_settings; + if (show_settings) { auto calc_offset = [this]() { float ret = 0.0f; if (!m_settings_ids.printer.empty()) @@ -3359,13 +3362,8 @@ void GCodeViewer::render_legend() const return ret; }; - - ImGui::Spacing(); - ImGui::Spacing(); - ImGui::PushStyleColor(ImGuiCol_Separator, { 1.0f, 1.0f, 1.0f, 1.0f }); - ImGui::Separator(); - ImGui::PopStyleColor(); ImGui::Spacing(); + imgui.title(_u8L("Settings")); float offset = calc_offset(); @@ -3381,11 +3379,13 @@ void GCodeViewer::render_legend() const } if (!m_settings_ids.filament.empty()) { for (unsigned char i : m_extruder_ids) { - std::string txt = _u8L("Filament"); - txt += (m_extruder_ids.size() == 1) ? ":" : " " + std::to_string(i + 1); - imgui.text(txt); - ImGui::SameLine(offset); - imgui.text(m_settings_ids.filament[i]); + if (i < static_cast(m_settings_ids.filament.size()) && !m_settings_ids.filament[i].empty()) { + std::string txt = _u8L("Filament"); + txt += (m_extruder_ids.size() == 1) ? ":" : " " + std::to_string(i + 1); + imgui.text(txt); + ImGui::SameLine(offset); + imgui.text(m_settings_ids.filament[i]); + } } } } diff --git a/src/slic3r/GUI/GCodeViewer.hpp b/src/slic3r/GUI/GCodeViewer.hpp index 931f01b68..48cc53ba0 100644 --- a/src/slic3r/GUI/GCodeViewer.hpp +++ b/src/slic3r/GUI/GCodeViewer.hpp @@ -615,6 +615,8 @@ private: std::vector m_roles; size_t m_extruders_count; std::vector m_extruder_ids; + std::vector m_filament_diameters; + std::vector m_filament_densities; Extrusions m_extrusions; SequentialView m_sequential_view; Shells m_shells;