juli/OrcaSlicer
1
1 Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-10-20 06:01:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update the codes to 01.01.00.10 for the formal release

Browse Source 
1. first formal version of macos
2. add the bambu networking plugin install logic
3. auto compute the wipe volume when filament change
4. add the logic of wiping into support
5. refine the GUI layout and icons, improve the gui apperance in lots of
   small places
6. serveral improve to support
7. support AMS auto-mapping
8. disable lots of unstable features: such as params table, media file download, HMS
9. fix serveral kinds of bugs
10. update the document of building
11. ...
This commit is contained in:
lane.wei authored and Lane.Wei committed 2022-07-22 20:35:34 +08:00
1 parent e1528e4299
commit e9e4d75877
267 files changed
+10323 -32225
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/slic3r/GUI/Monitor.cpp
+22 -15
View File
@@ -335,7 +335,7 @@ void MonitorPanel::on_size(wxSizeEvent &event)
// update wifi signal image
int wifi_signal_val = 0;
if (!obj->is_connected()) {
if (!obj->is_connected() || obj->is_connecting()) {
m_side_tools->set_current_printer_signal(WifiSignal::NONE);
} else {
if (!obj->wifi_signal.empty() && boost::ends_with(obj->wifi_signal, "dBm")) {
@@ -381,6 +381,7 @@ void MonitorPanel::update_all()
}
if (obj) {
wxGetApp().reset_to_active();
if (obj->connection_type() != last_conn_type) {
last_conn_type = obj->connection_type();
}
@@ -404,7 +405,10 @@ void MonitorPanel::update_all()
return;
}
if (!obj->is_connected()) {
if (obj->is_connecting()) {
show_status(MONITOR_CONNECTING);
return;
} else if (!obj->is_connected()) {
int server_status = 0;
// only disconnected server in cloud mode
if (obj->connection_type() != "lan") {
@@ -413,7 +417,6 @@ void MonitorPanel::update_all()
}
}
show_status((int) MONITOR_DISCONNECTED + server_status);
m_status_info_panel->show_unload_ctrl();
return;
}
@@ -457,15 +460,9 @@ bool MonitorPanel::Show(bool show)
obj->reset_update_time();
}
}
if (m_agent)
m_agent->start_subscribe("monitor");
}
else {
} else {
m_refresh_timer->Stop();
m_status_info_panel->m_media_play_ctrl->SetMachineObject(nullptr);
if (m_agent)
m_agent->stop_subscribe("monitor");
}
return wxPanel::Show(show);
}
@@ -503,8 +500,15 @@ void MonitorPanel::show_status(int status)
else
m_connection_info->SetLabel(_L("Failed to connect to the printer"));
m_connection_info->Show();
}else if ((status & (int) MonitorStatus::MONITOR_NORMAL) != 0) {
m_connection_info->SetBackgroundColor(wxColour(255, 111, 0));
m_connection_info->SetBorderColor(wxColour(255, 111, 0));
} else if ((status & (int) MonitorStatus::MONITOR_NORMAL) != 0) {
m_connection_info->Hide();
} else if ((status & (int) MonitorStatus::MONITOR_CONNECTING) != 0) {
m_connection_info->SetLabel(_L("Connecting..."));
m_connection_info->SetBackgroundColor(wxColour(0, 174, 66));
m_connection_info->SetBorderColor(wxColour(0, 174, 66));
m_connection_info->Show();
}
Freeze();
@@ -515,11 +519,14 @@ void MonitorPanel::show_status(int status)
m_status_info_panel->show_status(status);
m_tabpanel->Refresh();
m_tabpanel->Layout();
} else if (((status & (int)MonitorStatus::MONITOR_NORMAL) != 0) ||
((status & (int)MonitorStatus::MONITOR_DISCONNECTED) != 0) ||
((status & (int) MonitorStatus::MONITOR_DISCONNECTED_SERVER) != 0)
} else if (((status & (int)MonitorStatus::MONITOR_NORMAL) != 0)
|| ((status & (int)MonitorStatus::MONITOR_DISCONNECTED) != 0)
|| ((status & (int) MonitorStatus::MONITOR_DISCONNECTED_SERVER) != 0)
|| ((status & (int)MonitorStatus::MONITOR_CONNECTING) != 0)
) {
if (((status & (int) MonitorStatus::MONITOR_DISCONNECTED) != 0) || ((status & (int) MonitorStatus::MONITOR_DISCONNECTED_SERVER) != 0)) {
if (((status & (int) MonitorStatus::MONITOR_DISCONNECTED) != 0)
|| ((status & (int) MonitorStatus::MONITOR_DISCONNECTED_SERVER) != 0)
|| ((status & (int)MonitorStatus::MONITOR_CONNECTING) != 0)) {
m_side_tools->set_current_printer_signal(WifiSignal::NONE);
set_default();
}