mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-16 18:12:10 +00:00
ENH: add text to specify active tunnel
JIRA: [STUDIO-13803] Change-Id: Ia6af5ba881c93a1d284295b244d19b39aee2ae91 (cherry picked from commit cb6c6afeee3e519aca87ac82eacc4b85fda63f65)
This commit is contained in:
@@ -1371,6 +1371,10 @@ wxBoxSizer *StatusBasePanel::create_monitoring_page()
|
||||
m_staticText_timelapse->Hide();
|
||||
bSizer_monitoring_title->Add(m_staticText_timelapse, 0, wxALIGN_CENTER_VERTICAL | wxALL, FromDIP(5));
|
||||
|
||||
m_mqtt_source = new wxStaticText(m_panel_monitoring_title, wxID_ANY, _L("MqttSource"), wxDefaultPosition, wxDefaultSize, 0);
|
||||
m_mqtt_source->Wrap(-1);
|
||||
bSizer_monitoring_title->Add(m_mqtt_source, 0, wxALIGN_CENTER_VERTICAL | wxALL, FromDIP(5));
|
||||
|
||||
m_bmToggleBtn_timelapse = new SwitchButton(m_panel_monitoring_title);
|
||||
m_bmToggleBtn_timelapse->SetMinSize(SWITCH_BUTTON_SIZE);
|
||||
m_bmToggleBtn_timelapse->Hide();
|
||||
@@ -2643,6 +2647,11 @@ void StatusPanel::update(MachineObject *obj)
|
||||
m_bmToggleBtn_timelapse->SetValue(obj->is_tunnel_mqtt);
|
||||
#endif
|
||||
|
||||
if (obj->HasRecentCloudMessage() && obj->HasRecentLanMessage()) m_mqtt_source->SetLabel("Cloud+Lan");
|
||||
else if (obj->HasRecentCloudMessage()) m_mqtt_source->SetLabel("Cloud");
|
||||
else if (obj->HasRecentLanMessage()) m_mqtt_source->SetLabel("Lan");
|
||||
else m_mqtt_source->SetLabel("None");
|
||||
|
||||
//m_machine_ctrl_panel->Freeze();
|
||||
if (obj->is_in_printing() && !obj->can_resume()) {
|
||||
show_printing_status(false, true);
|
||||
@@ -2984,7 +2993,7 @@ void StatusPanel::update_temp_ctrl(MachineObject *obj)
|
||||
if (!nozzle_temp_input) {
|
||||
auto main_extder = obj->GetExtderSystem()->GetExtderById(MAIN_EXTRUDER_ID);
|
||||
if (main_extder)
|
||||
{
|
||||
{
|
||||
m_tempCtrl_nozzle->SetCurrTemp((int)main_extder->GetCurrentTemp());
|
||||
if (main_extder->GetTargetTemp() - main_extder->GetCurrentTemp() > TEMP_THRESHOLD_VAL)
|
||||
{
|
||||
@@ -3005,7 +3014,7 @@ void StatusPanel::update_temp_ctrl(MachineObject *obj)
|
||||
if (!nozzle_temp_input && nozzle_num >= 2) {
|
||||
auto deputy_extder = obj->GetExtderSystem()->GetExtderById(DEPUTY_EXTRUDER_ID);
|
||||
if (deputy_extder)
|
||||
{
|
||||
{
|
||||
m_tempCtrl_nozzle_deputy->SetCurrTemp((int)deputy_extder->GetCurrentTemp());
|
||||
if (deputy_extder->GetTargetTemp() - deputy_extder->GetCurrentTemp() > TEMP_THRESHOLD_VAL)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user