mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-09-18 14:32:36 +00:00
Kris Austin
8bff9aaf32
* fix(GUI): honor "Ignore" when layer height exceeds the configured maximum Entering a layer height above the printer's max_layer_height on the Print Settings tab fired two guards in sequence. Tab::on_value_change prompts "...Adjust to the set range automatically?" with an Adjust/Ignore choice, and ConfigManipulation::update_print_fff_config then showed an OK-only "Too large layer height. Reset to X" dialog whose result was never checked, so it always reset the value. The second guard overrode the user's "Ignore", resetting the layer height regardless. Changes: - Extract the shared Adjust/Ignore dialog into ConfigManipulation::layer_height_out_of_range_dialog, reused by the tab (Tab::on_value_change) and the per-object/part settings panels. The dialog now names the value it will clamp to and reads correctly for too-low as well as too-high. - The tab/plate path is already covered by Tab::on_value_change, so the duplicate reset is dropped from update_print_fff_config. - The per-object/part panels have no on_value_change hook, so add ConfigManipulation::check_object_layer_height and call it from the object settings update paths, gated on the edited option (changed_opt_key == "layer_height"). It prompts once per layer-height edit and does not re-prompt when unrelated object settings change after the user chose "Ignore". Fixes #14214 * refactor(GUI): unify the layer-height range check across tab and object panels Copilot review of #14369 noted that the per-object check only guarded the max at extruder 0 and skipped the too-low case, diverging from the tab. Move the whole range check into ConfigManipulation::check_layer_height, used by both Tab::on_value_change and the per-object/part panels. It takes the widest [min, max] window across the printer's extruders, offers Adjust/Ignore in both directions, and resets a near-zero value. The tab's inline block collapses to one call, dropping the duplicated limit logic. * fix(GUI): only enforce layer-height limits that are actually set max_layer_height defaults to 0 (unset), so the unconditional range check offered to clamp any layer height to 0 on presets that don't define it. Guard each branch (near-zero, too-high, too-low) so an unset limit disables that direction; the slice-time nozzle-diameter check still applies. Also run check_layer_height before update_print_fff_config in the object panels so a near-zero per-object value prompts the same way the tab does, with update_print_fff_config's fallback still covering the no-minimum case.
114 lines
5.2 KiB
C++
114 lines
5.2 KiB
C++
#ifndef slic3r_ConfigManipulation_hpp_
|
|
#define slic3r_ConfigManipulation_hpp_
|
|
|
|
/* Class for validation config options
|
|
* and update (enable/disable) IU components
|
|
*
|
|
* Used for config validation for global config (Print Settings Tab)
|
|
* and local config (overrides options on sidebar)
|
|
* */
|
|
|
|
#include "libslic3r/PrintConfig.hpp"
|
|
#include "Field.hpp"
|
|
|
|
namespace Slic3r {
|
|
|
|
class ModelConfig;
|
|
class ObjectBase;
|
|
|
|
namespace GUI {
|
|
|
|
class ConfigManipulation
|
|
{
|
|
bool is_msg_dlg_already_exist{ false };
|
|
bool m_is_initialized_support_material_overhangs_queried{ false };
|
|
bool m_support_material_overhangs_queried{ false };
|
|
bool is_BBL_Printer{false};
|
|
|
|
// function to loading of changed configuration
|
|
std::function<void()> load_config = nullptr;
|
|
std::function<void (const std::string&, bool toggle, int opt_index)> cb_toggle_field = nullptr;
|
|
std::function<void(const std::string &, bool toggle, int opt_index)> cb_toggle_line = nullptr;
|
|
std::function<void(const std::string &, const wxString &, int opt_index)> cb_set_option_label = nullptr;
|
|
// callback to propagation of changed value, if needed
|
|
std::function<void(const std::string&, const boost::any&)> cb_value_change = nullptr;
|
|
//BBS: change local config to const DynamicPrintConfig
|
|
const DynamicPrintConfig* local_config = nullptr;
|
|
//ModelConfig* local_config = nullptr;
|
|
wxWindow* m_msg_dlg_parent {nullptr};
|
|
|
|
t_config_option_keys m_applying_keys;
|
|
|
|
public:
|
|
ConfigManipulation(std::function<void()> load_config,
|
|
std::function<void(const std::string&, bool toggle, int opt_index)> cb_toggle_field,
|
|
std::function<void(const std::string&, bool toggle, int opt_index)> cb_toggle_line,
|
|
std::function<void(const std::string&, const boost::any&)> cb_value_change,
|
|
//BBS: change local config to DynamicPrintConfig
|
|
const DynamicPrintConfig* local_config = nullptr,
|
|
wxWindow* msg_dlg_parent = nullptr,
|
|
std::function<void(const std::string &, const wxString &, int opt_index)> cb_set_option_label = nullptr) :
|
|
load_config(load_config),
|
|
cb_toggle_field(cb_toggle_field),
|
|
cb_toggle_line(cb_toggle_line),
|
|
cb_set_option_label(cb_set_option_label),
|
|
cb_value_change(cb_value_change),
|
|
m_msg_dlg_parent(msg_dlg_parent),
|
|
local_config(local_config) {}
|
|
ConfigManipulation() {}
|
|
|
|
~ConfigManipulation() {
|
|
load_config = nullptr;
|
|
cb_toggle_field = nullptr;
|
|
cb_toggle_line = nullptr;
|
|
cb_set_option_label = nullptr;
|
|
cb_value_change = nullptr;
|
|
}
|
|
|
|
bool is_applying() const;
|
|
|
|
void apply(DynamicPrintConfig* config, DynamicPrintConfig* new_config);
|
|
t_config_option_keys const &applying_keys() const;
|
|
void toggle_field(const std::string& field_key, const bool toggle, int opt_index = -1);
|
|
void toggle_line(const std::string& field_key, const bool toggle, int opt_index = -1);
|
|
void set_option_label(const std::string& field_key, const wxString& label, int opt_index = -1);
|
|
|
|
// FFF print
|
|
void update_print_fff_config(DynamicPrintConfig* config, const bool is_global_config = false, const bool is_plate_config = false);
|
|
void toggle_print_fff_options(DynamicPrintConfig* config, int variant_index, const bool is_global_config = false);
|
|
void apply_null_fff_config(DynamicPrintConfig *config, std::vector<std::string> const &keys, std::map<ObjectBase*, ModelConfig*> const & configs);
|
|
|
|
//BBS: FFF filament nozzle temperature range
|
|
void check_nozzle_recommended_temperature_range(DynamicPrintConfig *config);
|
|
void check_nozzle_temperature_range(DynamicPrintConfig* config);
|
|
void check_nozzle_temperature_initial_layer_range(DynamicPrintConfig* config);
|
|
void check_adaptive_pressure_advance_model(DynamicPrintConfig* config);
|
|
void check_filament_max_volumetric_speed(DynamicPrintConfig *config);
|
|
void check_chamber_temperature(DynamicPrintConfig* config);
|
|
void check_chamber_minimal_temperature(DynamicPrintConfig* config);
|
|
bool check_layer_height(DynamicPrintConfig* config);
|
|
bool layer_height_out_of_range_dialog(DynamicPrintConfig* config, double clamp_to);
|
|
void layer_height_limits(double& min_layer_height, double& max_layer_height) const;
|
|
void set_is_BBL_Printer(bool is_bbl_printer) { is_BBL_Printer = is_bbl_printer; };
|
|
bool get_is_BBL_Printer() { return is_BBL_Printer; };
|
|
// SLA print
|
|
void update_print_sla_config(DynamicPrintConfig* config, const bool is_global_config = false);
|
|
void toggle_print_sla_options(DynamicPrintConfig* config);
|
|
|
|
bool is_initialized_support_material_overhangs_queried() { return m_is_initialized_support_material_overhangs_queried; }
|
|
void initialize_support_material_overhangs_queried(bool queried)
|
|
{
|
|
m_is_initialized_support_material_overhangs_queried = true;
|
|
m_support_material_overhangs_queried = queried;
|
|
}
|
|
int show_spiral_mode_settings_dialog(bool is_object_config = false);
|
|
|
|
private:
|
|
bool get_temperature_range(DynamicPrintConfig *config, int &range_low, int &range_high);
|
|
};
|
|
|
|
} // GUI
|
|
} // Slic3r
|
|
|
|
#endif /* slic3r_ConfigManipulation_hpp_ */
|