3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-11-02 20:51:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

ENH: sync with localazy and fix compile error

Browse source 
Change-Id: I7cae72f24c2fde61e0c1e99c89c21801b7d10125
Signed-off-by: Stone Li <stone.li@bambulab.com>
This commit is contained in:
Stone Li 2023-02-10 09:35:31 +08:00 • committed by Lane.Wei
parent ecd8418640
commit 6122f5010a
24 changed files with 12418 additions and 6080 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/slic3r/GUI/DeviceManager.cpp
View file

@ -323,15 +323,6 @@ std::string MachineObject::get_access_code()
return get_user_access_code();
}
void MachineObject::set_access_code(std::string code)
{
this->access_code = code;
AppConfig* config = GUI::wxGetApp().app_config;
if (config && !code.empty()) {
GUI::wxGetApp().app_config->set_str("access_code", dev_id, code);
}
}
void MachineObject::set_user_access_code(std::string code)
{
this->user_access_code = code;

1
src/slic3r/GUI/DeviceManager.hpp
View file

@ -409,7 +409,6 @@ public:
void set_access_code(std::string code);
std::string get_access_code();
void set_access_code(std::string code);
void set_user_access_code(std::string code);
std::string get_user_access_code();

5
src/slic3r/GUI/Jobs/PrintJob.cpp
View file

@ -106,6 +106,8 @@ void PrintJob::process()
/* display info */
wxString msg;
int curr_percent = 10;
NetworkAgent* m_agent = wxGetApp().getAgent();
AppConfig* config = wxGetApp().app_config;
if (this->connection_type == "lan") {
msg = _L("Sending print job over LAN");
@ -291,9 +293,6 @@ void PrintJob::process()
return was_canceled();
};
NetworkAgent* m_agent = wxGetApp().getAgent();
if (params.connection_type != "lan") {
if (params.dev_ip.empty())
params.comments = "no_ip";