juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-19 19:33:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

small tweak

Browse Source
This commit is contained in:
SoftFever
2026-03-16 18:56:17 +08:00
parent 55ddf158e5
commit ba18b67e12
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libslic3r/GCode/ToolOrdering.cpp
View File

@@ -381,7 +381,6 @@ void ToolOrdering::sort_and_build_data(const PrintObject& object , unsigned int
// (print->config().print_sequence == PrintSequence::ByObject is true). // (print->config().print_sequence == PrintSequence::ByObject is true).
ToolOrdering::ToolOrdering(const PrintObject &object, unsigned int first_extruder, bool prime_multi_material) ToolOrdering::ToolOrdering(const PrintObject &object, unsigned int first_extruder, bool prime_multi_material)
{ {
m_wipe_tower_type = object.print()->wipe_tower_type();
m_print_full_config = &object.print()->full_print_config(); m_print_full_config = &object.print()->full_print_config();
m_print_object_ptr = &object; m_print_object_ptr = &object;
m_print = const_cast<Print*>(object.print()); m_print = const_cast<Print*>(object.print());
@@ -427,7 +426,6 @@ ToolOrdering::ToolOrdering(const PrintObject &object, unsigned int first_extrude
// (print->config().print_sequence == PrintSequence::ByObject is false). // (print->config().print_sequence == PrintSequence::ByObject is false).
ToolOrdering::ToolOrdering(const Print &print, unsigned int first_extruder, bool prime_multi_material) ToolOrdering::ToolOrdering(const Print &print, unsigned int first_extruder, bool prime_multi_material)
{ {
m_wipe_tower_type = print.wipe_tower_type();
m_print_full_config = &print.full_print_config(); m_print_full_config = &print.full_print_config();
m_print = const_cast<Print *>(&print); // for update the context of print m_print = const_cast<Print *>(&print); // for update the context of print
m_print_config_ptr = &print.config(); m_print_config_ptr = &print.config();
@@ -1222,12 +1220,13 @@ void ToolOrdering::reorder_extruders_for_minimum_flush_volume(bool reorder_first
using FlushMatrix = std::vector<std::vector<float>>; using FlushMatrix = std::vector<std::vector<float>>;
size_t nozzle_nums = print_config->nozzle_diameter.values.size(); size_t nozzle_nums = print_config->nozzle_diameter.values.size();
const auto wipe_tower_type = m_print->wipe_tower_type();
std::vector<FlushMatrix> nozzle_flush_mtx; std::vector<FlushMatrix> nozzle_flush_mtx;
for (size_t nozzle_id = 0; nozzle_id < nozzle_nums; ++nozzle_id) { for (size_t nozzle_id = 0; nozzle_id < nozzle_nums; ++nozzle_id) {
std::vector<float> flush_matrix(cast<float>(get_flush_volumes_matrix(print_config->flush_volumes_matrix.values, nozzle_id, nozzle_nums))); std::vector<float> flush_matrix(cast<float>(get_flush_volumes_matrix(print_config->flush_volumes_matrix.values, nozzle_id, nozzle_nums)));
std::vector<std::vector<float>> wipe_volumes; std::vector<std::vector<float>> wipe_volumes;
if ((print_config->purge_in_prime_tower && print_config->single_extruder_multi_material) || m_wipe_tower_type == WipeTowerType::Type1) { if ((print_config->purge_in_prime_tower && print_config->single_extruder_multi_material) || wipe_tower_type == WipeTowerType::Type1) {
for (unsigned int i = 0; i < number_of_extruders; ++i) for (unsigned int i = 0; i < number_of_extruders; ++i)
wipe_volumes.push_back(std::vector<float>(flush_matrix.begin() + i * number_of_extruders, flush_matrix.begin() + (i + 1) * number_of_extruders)); wipe_volumes.push_back(std::vector<float>(flush_matrix.begin() + i * number_of_extruders, flush_matrix.begin() + (i + 1) * number_of_extruders));
} else { } else {

1
src/libslic3r/GCode/ToolOrdering.hpp
View File

@@ -279,7 +279,6 @@ private:
const PrintObject* m_print_object_ptr = nullptr; const PrintObject* m_print_object_ptr = nullptr;
Print* m_print; Print* m_print;
bool m_sorted = false; bool m_sorted = false;
WipeTowerType m_wipe_tower_type = WipeTowerType::Type1;
FilamentChangeStats m_stats_by_single_extruder; FilamentChangeStats m_stats_by_single_extruder;
FilamentChangeStats m_stats_by_multi_extruder_curr; FilamentChangeStats m_stats_by_multi_extruder_curr;