mirror of
https://github.com/QIDITECH/QIDIStudio.git
synced 2026-02-07 12:21:50 +03:00
update slic3r
This commit is contained in:
@@ -16,6 +16,8 @@
|
||||
#include "Plater.hpp"
|
||||
#include "Widgets/WebView.hpp"
|
||||
|
||||
#include "DeviceCore/DevManager.h"
|
||||
|
||||
namespace Slic3r {
|
||||
namespace GUI {
|
||||
|
||||
@@ -844,7 +846,7 @@ PingCodeBindDialog::~PingCodeBindDialog() {
|
||||
EndModal(wxID_OK);
|
||||
MessageDialog msg_wingow(nullptr, _L("Log in successful."), "", wxAPPLY | wxOK);
|
||||
msg_wingow.ShowModal();
|
||||
if(m_machine_info) wxGetApp().on_start_subscribe_again(m_machine_info->dev_id);
|
||||
if(m_machine_info) wxGetApp().on_start_subscribe_again(m_machine_info->get_dev_id());
|
||||
}
|
||||
|
||||
void BindMachineDialog::on_bind_printer(wxCommandEvent &event)
|
||||
@@ -860,7 +862,7 @@ PingCodeBindDialog::~PingCodeBindDialog() {
|
||||
if (m_machine_info == nullptr || m_machine_info == NULL) return;
|
||||
|
||||
//check dev_id
|
||||
if (m_machine_info->dev_id.empty()) return;
|
||||
if (m_machine_info->get_dev_id().empty()) return;
|
||||
|
||||
// update ota version
|
||||
NetworkAgent* agent = wxGetApp().getAgent();
|
||||
@@ -869,7 +871,7 @@ PingCodeBindDialog::~PingCodeBindDialog() {
|
||||
|
||||
m_simplebook->SetSelection(0);
|
||||
m_bind_job = std::make_shared<BindJob>(m_status_bar, wxGetApp().plater(),
|
||||
m_machine_info->dev_id, m_machine_info->dev_ip, m_machine_info->bind_sec_link, m_machine_info->bind_ssdp_version);
|
||||
m_machine_info->get_dev_id(), m_machine_info->get_dev_ip(), m_machine_info->bind_sec_link, m_machine_info->bind_ssdp_version);
|
||||
|
||||
if (m_machine_info && (m_machine_info->get_printer_series() == PrinterSeries::SERIES_X1)) {
|
||||
m_bind_job->set_improved(false);
|
||||
@@ -919,7 +921,7 @@ void BindMachineDialog::on_show(wxShowEvent &event)
|
||||
m_printer_img->Refresh();
|
||||
m_printer_img->Show();
|
||||
|
||||
m_printer_name->SetLabelText(from_u8(m_machine_info->dev_name));
|
||||
m_printer_name->SetLabelText(from_u8(m_machine_info->get_dev_name()));
|
||||
|
||||
if (wxGetApp().is_user_login()) {
|
||||
wxString username_text = from_u8(wxGetApp().getAgent()->get_user_nickanme());
|
||||
@@ -1100,16 +1102,16 @@ void UnBindMachineDialog::on_unbind_printer(wxCommandEvent &event)
|
||||
}
|
||||
|
||||
m_machine_info->set_access_code("");
|
||||
int result = wxGetApp().request_user_unbind(m_machine_info->dev_id);
|
||||
int result = wxGetApp().request_user_unbind(m_machine_info->get_dev_id());
|
||||
if (result == 0) {
|
||||
DeviceManager* dev = Slic3r::GUI::wxGetApp().getDeviceManager();
|
||||
if (!dev) return;
|
||||
// clean local machine access code info
|
||||
MachineObject* obj = dev->get_local_machine(m_machine_info->dev_id);
|
||||
MachineObject* obj = dev->get_local_machine(m_machine_info->get_dev_id());
|
||||
if (obj) {
|
||||
obj->set_access_code("");
|
||||
}
|
||||
dev->erase_user_machine(m_machine_info->dev_id);
|
||||
dev->erase_user_machine(m_machine_info->get_dev_id());
|
||||
|
||||
m_status_text->SetLabelText(_L("Log out successful."));
|
||||
m_button_cancel->SetLabel(_L("Close"));
|
||||
@@ -1139,7 +1141,7 @@ void UnBindMachineDialog::on_show(wxShowEvent &event)
|
||||
m_printer_img->Refresh();
|
||||
m_printer_img->Show();
|
||||
|
||||
m_printer_name->SetLabelText(from_u8(m_machine_info->dev_name));
|
||||
m_printer_name->SetLabelText(from_u8(m_machine_info->get_dev_name()));
|
||||
|
||||
|
||||
if (wxGetApp().is_user_login()) {
|
||||
|
||||
Reference in New Issue
Block a user