juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-07-31 14:52:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

NEW: Add FilamentMapDialog

Browse Source 
support drag drop to modify the filament map
jira: none

Change-Id: I0ed3180a0fa8e95e7c871bb039eb844faccd1344
(cherry picked from commit 67f67d76889668fdd80ae5e496b6cbca5f771a43)
This commit is contained in:
zhimin.zeng
2024-07-17 10:51:02 +08:00
committed by Noisyfox
parent 58cd714283
commit c34eb170f1
13 changed files with 533 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1185,7 +1185,8 @@ void ToolOrdering::reorder_extruders_for_minimum_flush_volume()
std::vector<int>filament_maps(number_of_extruders, 0);
if (nozzle_nums > 1) {
filament_maps = m_print->get_filament_maps();
if (print_config->print_sequence != PrintSequence::ByObject || m_print->objects().size() == 1) {
if (m_print->get_filament_map_mode() == FilamentMapMode::fmmAuto
&& (print_config->print_sequence != PrintSequence::ByObject || m_print->objects().size() == 1)) {
const PrintConfig* print_config = m_print_config_ptr;
if (!print_config && m_print_object_ptr) {
print_config = &(m_print_object_ptr->print()->config());

5
src/libslic3r/Print.cpp
View File

@@ -2626,6 +2626,11 @@ std::vector<int> Print::get_filament_maps() const
return m_config.filament_map.values;
}
FilamentMapMode Print::get_filament_map_mode() const
{
return m_config.filament_map_mode;
}
size_t Print::get_extruder_id(unsigned int filament_id) const
{
std::vector<int> filament_map = get_filament_maps();

1
src/libslic3r/Print.hpp
View File

@@ -936,6 +936,7 @@ public:
void update_filament_maps_to_config(std::vector<int> f_maps);
std::vector<int> get_filament_maps() const;
FilamentMapMode get_filament_map_mode() const;
// get the group label of filament
size_t get_extruder_id(unsigned int filament_id) const;