mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-08 23:46:24 -06:00
FIX: revert "Disable i3 traditional timelapse"
Jira: XXXX Change-Id: I5ab7ce8e39787149c16983607e2bd1330f4d6ea0
This commit is contained in:
parent
d9a3d9d7d8
commit
4c2754f4ee
2 changed files with 0 additions and 51 deletions
|
@ -1675,7 +1675,6 @@ void SelectMachineDialog::update_select_layout(MachineObject *obj)
|
|||
&& obj->is_support_print_with_timelapse()
|
||||
&& is_show_timelapse()) {
|
||||
select_timelapse->Show();
|
||||
set_timelapse_enable_status();
|
||||
} else {
|
||||
select_timelapse->Hide();
|
||||
}
|
||||
|
@ -2164,11 +2163,6 @@ void SelectMachineDialog::show_status(PrintDialogStatus status, std::vector<wxSt
|
|||
update_print_status_msg(msg_text, true, true);
|
||||
Enable_Send_Button(false);
|
||||
Enable_Refresh_Button(true);
|
||||
} else if (status == PrintDialogStatus::PrintStatusUnsupportedSelectedTimelapse) {
|
||||
wxString msg_text = _L("This printer does not support selected timelapse mode, you can change the timelapse mode");
|
||||
update_print_status_msg(msg_text, true, true);
|
||||
Enable_Send_Button(true);
|
||||
Enable_Refresh_Button(true);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -3178,10 +3172,6 @@ void SelectMachineDialog::update_show_status()
|
|||
show_status(PrintDialogStatus::PrintStatusNoSdcard);
|
||||
return;
|
||||
}
|
||||
else if (!is_enable_timelapse()) {
|
||||
show_status(PrintDialogStatus::PrintStatusUnsupportedSelectedTimelapse);
|
||||
return;
|
||||
}
|
||||
|
||||
// check sdcard when if lan mode printer
|
||||
if (obj_->is_lan_mode_printer()) {
|
||||
|
@ -3257,44 +3247,6 @@ void SelectMachineDialog::update_show_status()
|
|||
}
|
||||
}
|
||||
|
||||
void SelectMachineDialog::set_timelapse_enable_status()
|
||||
{
|
||||
AppConfig *config = wxGetApp().app_config;
|
||||
if (is_enable_timelapse()) {
|
||||
if (!config || config->get("print", "timelapse") == "0")
|
||||
m_checkbox_list["timelapse"]->SetValue(false);
|
||||
else
|
||||
m_checkbox_list["timelapse"]->SetValue(true);
|
||||
select_timelapse->Enable(true);
|
||||
} else {
|
||||
m_checkbox_list["timelapse"]->SetValue(false);
|
||||
select_timelapse->Enable(false);
|
||||
if (config) {
|
||||
config->set_str("print", "timelapse", "0");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
bool SelectMachineDialog::is_enable_timelapse()
|
||||
{
|
||||
if (auto op_timelapse_type = wxGetApp().preset_bundle->prints.get_edited_preset().config.option<ConfigOptionEnum<TimelapseType>>("timelapse_type"))
|
||||
{
|
||||
DeviceManager *dev_manager = Slic3r::GUI::wxGetApp().getDeviceManager();
|
||||
if (!dev_manager)
|
||||
return false;
|
||||
|
||||
MachineObject *cur_machine_obj = dev_manager->get_selected_machine();
|
||||
if (!cur_machine_obj)
|
||||
return false;
|
||||
|
||||
TimelapseType cur_timelapse_type = op_timelapse_type->value;
|
||||
if (cur_timelapse_type == TimelapseType::tlTraditional && cur_machine_obj->get_printer_arch() == PrinterArch::ARCH_I3) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
bool SelectMachineDialog::is_show_timelapse()
|
||||
{
|
||||
auto compare_version = [](const std::string &version1, const std::string &version2) -> bool {
|
||||
|
|
|
@ -273,7 +273,6 @@ enum PrintDialogStatus {
|
|||
PrintStatusNotSupportedPrintAll,
|
||||
PrintStatusBlankPlate,
|
||||
PrintStatusUnsupportedPrinter,
|
||||
PrintStatusUnsupportedSelectedTimelapse,
|
||||
};
|
||||
|
||||
std::string get_print_status_info(PrintDialogStatus status);
|
||||
|
@ -443,9 +442,7 @@ public:
|
|||
void update_print_status_msg(wxString msg, bool is_warning = false, bool is_printer = true);
|
||||
void update_print_error_info(int code, std::string msg, std::string extra);
|
||||
void set_flow_calibration_state(bool state);
|
||||
bool is_enable_timelapse();
|
||||
bool is_show_timelapse();
|
||||
void set_timelapse_enable_status();
|
||||
bool is_same_printer_model();
|
||||
bool is_blocking_printing();
|
||||
bool has_tips(MachineObject* obj);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue