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

FIX: cannot cali for single nozzle printer

Browse Source 
jira: none
Change-Id: I1cc0e5e4b0f9db2a66694c894f96a14047fde9e5
(cherry picked from commit 7bd3a5218af9f3d172090a80da447c4f2bbfff61)
This commit is contained in:
zhimin.zeng
2024-08-05 17:34:45 +08:00
committed by Noisyfox
parent f6bfad9de1
commit 2ee934a7ee
4 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/slic3r/GUI/CalibrationWizardPresetPage.cpp
View File

@@ -1556,7 +1556,12 @@ void CalibrationPresetPage::sync_ams_info(MachineObject* obj)
{ {
if (!obj) return; if (!obj) return;
std::map<int, DynamicPrintConfig> full_filament_ams_list = wxGetApp().sidebar().build_filament_ams_list(obj); std::map<int, DynamicPrintConfig> old_full_filament_ams_list = wxGetApp().sidebar().build_filament_ams_list(obj);
std::map<int, DynamicPrintConfig> full_filament_ams_list;
for (auto ams_item : old_full_filament_ams_list) {
int key = ams_item.first & 0x0FFFF;
full_filament_ams_list[key] = std::move(ams_item.second);
}
// sync filament_ams_list from obj ams list // sync filament_ams_list from obj ams list
filament_ams_list.clear(); filament_ams_list.clear();

5
src/slic3r/GUI/DeviceManager.cpp
View File

@@ -1173,6 +1173,11 @@ void MachineObject::reset_mapping_result(std::vector<FilamentInfo>& result)
} }
} }
bool MachineObject::is_multi_extruders() const
{
return m_nozzle_data.total_nozzle_count > 1;
}
bool MachineObject::is_bbl_filament(std::string tag_uid) bool MachineObject::is_bbl_filament(std::string tag_uid)
{ {
if (tag_uid.empty()) if (tag_uid.empty())

9
src/slic3r/GUI/DeviceManager.hpp
View File

@@ -569,6 +569,7 @@ public:
// exceed index start with 0 // exceed index start with 0
bool is_mapping_exceed_filament(std::vector<FilamentInfo>& result, int &exceed_index); bool is_mapping_exceed_filament(std::vector<FilamentInfo>& result, int &exceed_index);
void reset_mapping_result(std::vector<FilamentInfo>& result); void reset_mapping_result(std::vector<FilamentInfo>& result);
bool is_multi_extruders() const;
/*online*/ /*online*/
bool online_rfid; bool online_rfid;
@@ -749,17 +750,17 @@ public:
} liveview_local{ LVL_None }; } liveview_local{ LVL_None };
enum LiveviewRemote { enum LiveviewRemote {
LVR_None, LVR_None,
LVR_Tutk, LVR_Tutk,
LVR_Agora, LVR_Agora,
LVR_TutkAgora LVR_TutkAgora
} liveview_remote{ LVR_None }; } liveview_remote{ LVR_None };
enum FileLocal { enum FileLocal {
FL_None, FL_None,
FL_Local FL_Local
} file_local{ FL_None }; } file_local{ FL_None };
enum FileRemote { enum FileRemote {
FR_None, FR_None,
FR_Tutk, FR_Tutk,
FR_Agora, FR_Agora,
FR_TutkAgora FR_TutkAgora
} file_remote{ FR_None }; } file_remote{ FR_None };

1
src/slic3r/GUI/Plater.cpp
View File

@@ -2080,7 +2080,6 @@ void Sidebar::auto_calc_flushing_volumes(const int modify_id)
auto& printer_config = preset_bundle->printers.get_edited_preset().config; auto& printer_config = preset_bundle->printers.get_edited_preset().config;
const auto& full_config = wxGetApp().preset_bundle->full_config(); const auto& full_config = wxGetApp().preset_bundle->full_config();
auto& ams_multi_color_filament = preset_bundle->ams_multi_color_filment; auto& ams_multi_color_filament = preset_bundle->ams_multi_color_filment;
auto& ams_filament_list = preset_bundle->filament_ams_list;
const std::vector<double>& init_matrix = (project_config.option<ConfigOptionFloats>("flush_volumes_matrix"))->values; const std::vector<double>& init_matrix = (project_config.option<ConfigOptionFloats>("flush_volumes_matrix"))->values;
const std::vector<double>& init_extruders = (project_config.option<ConfigOptionFloats>("flush_volumes_vector"))->values; const std::vector<double>& init_extruders = (project_config.option<ConfigOptionFloats>("flush_volumes_vector"))->values;