juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-20 11:53:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Add bed type in send print page

Browse Source 
jira: STUDIO-7824

Change-Id: I64d9ed41b862ed4e3b8c21218c289132d767105e
(cherry picked from commit 7bb5060b739b3a95fe889ae64e8d7289e2c928d9)
This commit is contained in:
hang.xu
2024-08-12 17:27:40 +08:00
committed by Noisyfox
parent 1ada437979
commit 49631198bb
1 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/slic3r/GUI/SelectMachine.cpp
View File

@@ -4070,24 +4070,9 @@ void SelectMachineDialog::sys_color_changed()
bool SelectMachineDialog::Show(bool show) bool SelectMachineDialog::Show(bool show)
{ {
if (show) {
m_refresh_timer->Start(LIST_REFRESH_INTERVAL);
} else {
m_refresh_timer->Stop();
DeviceManager *dev = Slic3r::GUI::wxGetApp().getDeviceManager();
if (dev) {
MachineObject *obj_ = dev->get_selected_machine();
if (obj_ && obj_->connection_type() == "cloud" /*&& m_print_type == FROM_SDCARD_VIEW*/) {
if (obj_->is_connected()) { obj_->disconnect(); }
}
}
return DPIDialog::Show(false);
}
show_status(PrintDialogStatus::PrintStatusInit); show_status(PrintDialogStatus::PrintStatusInit);
PresetBundle& preset_bundle = *wxGetApp().preset_bundle; PresetBundle& preset_bundle = *wxGetApp().preset_bundle;
const auto& project_config = preset_bundle.project_config; const auto& project_config = preset_bundle.project_config;
@@ -4109,6 +4094,9 @@ bool SelectMachineDialog::Show(bool show)
} }
// set default value when show this dialog // set default value when show this dialog
if (show) {
m_refresh_timer->Start(LIST_REFRESH_INTERVAL);
show_status(PrintDialogStatus::PrintStatusInit);
wxGetApp().UpdateDlgDarkUI(this); wxGetApp().UpdateDlgDarkUI(this);
wxGetApp().reset_to_active(); wxGetApp().reset_to_active();
set_default(); set_default();
@@ -4117,6 +4105,20 @@ bool SelectMachineDialog::Show(bool show)
Layout(); Layout();
Fit(); Fit();
CenterOnParent(); CenterOnParent();
}
else {
m_refresh_timer->Stop();
DeviceManager* dev = Slic3r::GUI::wxGetApp().getDeviceManager();
if (dev) {
MachineObject* obj_ = dev->get_selected_machine();
if (obj_ && obj_->connection_type() == "cloud" /*&& m_print_type == FROM_SDCARD_VIEW*/) {
if (obj_->is_connected()) {
obj_->disconnect();
}
}
}
}
return DPIDialog::Show(show); return DPIDialog::Show(show);
} }