mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-09-09 10:16:50 +00:00
ENH:remove restrictions on mixed use of high and low temp filaments
jira: STUDIO-10482 Change-Id: Ifdf6f11b45f2e6d138ea615a3ad1f23d40ad3fe9 (cherry picked from commit 0178e930809cabcdbc09ab305e70e4323598b343) (cherry picked from commit 8f92391717e37dd0f51aa067ad626b83630a46b1)
This commit is contained in:
@@ -305,6 +305,10 @@ void AppConfig::set_defaults()
|
||||
set_bool("remember_printer_config", true);
|
||||
}
|
||||
|
||||
if (get("enable_high_low_temp_mixed_printing").empty()){
|
||||
set_bool("enable_high_low_temp_mixed_printing", false);
|
||||
}
|
||||
|
||||
if (get("auto_calculate_when_filament_change").empty()){
|
||||
set_bool("auto_calculate_when_filament_change", true);
|
||||
}
|
||||
|
||||
@@ -1058,6 +1058,9 @@ int Print::get_compatible_filament_type(const std::set<int>& filament_types)
|
||||
//BBS: this function is used to check whether multi filament can be printed
|
||||
StringObjectException Print::check_multi_filament_valid(const Print& print)
|
||||
{
|
||||
if (!print.need_check_multi_filaments_compatibility())
|
||||
return {std::string()};
|
||||
|
||||
auto print_config = print.config();
|
||||
std::vector<unsigned int> extruders = print.extruders();
|
||||
std::vector<std::string> filament_types;
|
||||
|
||||
@@ -1059,6 +1059,9 @@ public:
|
||||
BoundingBoxf get_wipe_tower_bbx() const { return m_wipe_tower_data.bbx; }
|
||||
Vec2f get_rib_offset() const { return m_wipe_tower_data.rib_offset; }
|
||||
|
||||
void set_check_multi_filaments_compatibility(bool check) { m_need_check_multi_filaments_compatibility = check; }
|
||||
bool need_check_multi_filaments_compatibility() const { return m_need_check_multi_filaments_compatibility; }
|
||||
|
||||
// scaled point
|
||||
Vec2d translate_to_print_space(const Point &point) const;
|
||||
static FilamentTempType get_filament_temp_type(const std::string& filament_type);
|
||||
@@ -1151,6 +1154,8 @@ private:
|
||||
//SoftFever: calibration
|
||||
Calib_Params m_calib_params;
|
||||
|
||||
bool m_need_check_multi_filaments_compatibility{true};
|
||||
|
||||
// To allow GCode to set the Print's GCodeExport step status.
|
||||
friend class GCode;
|
||||
// Allow PrintObject to access m_mutex and m_cancel_callback.
|
||||
|
||||
Reference in New Issue
Block a user