juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-08-08 10:37:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resync the device status pages

Browse Source
This commit is contained in:
SoftFever
2026-07-17 08:30:22 +08:00
parent 5e95aca42d
commit 80d3c3908d
8 changed files with 145 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
src/slic3r/GUI/UpgradePanel.cpp
View File

@@ -219,6 +219,8 @@ MachineInfoPanel::MachineInfoPanel(wxWindow* parent, wxWindowID id, const wxPoin
createAirPumpWidgets(m_main_left_sizer);
createExtinguishWidgets(m_main_left_sizer);
createFilaTrackSwitchWidgets(m_main_left_sizer);
createRotaryWidgets(m_main_left_sizer); // Orca: accessory firmware version display
createExhaustFan(m_main_left_sizer); // Orca: accessory firmware version display
// nozzle rack widgets (H2C induction hotend rack; hidden unless GetNozzleRack()->IsSupported())
createNozzleRackWidgets(m_main_left_sizer);
@@ -429,6 +431,48 @@ void MachineInfoPanel::createFilaTrackSwitchWidgets(wxBoxSizer* main_left_sizer)
main_left_sizer->Add(m_filatrack_sizer, 0, wxEXPAND, 0);
}
// Orca: accessory firmware version display (device photo asset not shipped, so no left icon)
void MachineInfoPanel::createRotaryWidgets(wxBoxSizer* main_left_sizer)
{
m_rotary_line_above = new wxStaticLine(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL);
m_rotary_line_above->SetBackgroundColour(wxColour(206, 206, 206));
main_left_sizer->Add(m_rotary_line_above, 0, wxEXPAND | wxLEFT, FromDIP(40));
m_rotary_img = new wxStaticBitmap(this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize(FromDIP(200), FromDIP(200)));
wxBoxSizer* content_sizer = new wxBoxSizer(wxVERTICAL);
content_sizer->Add(0, 40, 0, wxEXPAND, FromDIP(5));
m_rotary_version = new uiDeviceUpdateVersion(this, wxID_ANY);
content_sizer->Add(m_rotary_version, 0, wxEXPAND, 0);
m_rotary_sizer = new wxBoxSizer(wxHORIZONTAL);
m_rotary_sizer->Add(m_rotary_img, 0, wxALIGN_TOP | wxALL, FromDIP(5));
m_rotary_sizer->Add(content_sizer, 1, wxEXPAND, 0);
main_left_sizer->Add(m_rotary_sizer, 0, wxEXPAND, 0);
}
// Orca: accessory firmware version display (device photo asset not shipped, so no left icon)
void MachineInfoPanel::createExhaustFan(wxBoxSizer* main_left_sizer)
{
m_exhaustfan_line_above = new wxStaticLine(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL);
m_exhaustfan_line_above->SetBackgroundColour(wxColour(206, 206, 206));
main_left_sizer->Add(m_exhaustfan_line_above, 0, wxEXPAND | wxLEFT, FromDIP(40));
m_exhaustfan_img = new wxStaticBitmap(this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize(FromDIP(200), FromDIP(200)));
wxBoxSizer* content_sizer = new wxBoxSizer(wxVERTICAL);
content_sizer->Add(0, 40, 0, wxEXPAND, FromDIP(5));
m_exhaustfan_version = new uiDeviceUpdateVersion(this, wxID_ANY);
content_sizer->Add(m_exhaustfan_version, 0, wxEXPAND, 0);
m_exhaustfan_sizer = new wxBoxSizer(wxHORIZONTAL);
m_exhaustfan_sizer->Add(m_exhaustfan_img, 0, wxALIGN_TOP | wxALL, FromDIP(5));
m_exhaustfan_sizer->Add(content_sizer, 1, wxEXPAND, 0);
main_left_sizer->Add(m_exhaustfan_sizer, 0, wxEXPAND, 0);
}
void MachineInfoPanel::msw_rescale()
{
rescale_bitmaps();
@@ -569,6 +613,8 @@ void MachineInfoPanel::update(MachineObject* obj)
update_laszer(obj);
update_extinguish(obj);
update_filatrack(obj);
update_rotary(obj); // Orca: accessory firmware version display
update_exhaustfan(obj); // Orca: accessory firmware version display
update_nozzle_rack(obj);
//update progress
@@ -1167,6 +1213,34 @@ void MachineInfoPanel::update_filatrack(MachineObject* obj)
}
}
// Orca: accessory firmware version display (backing parse landed in cluster 2)
void MachineInfoPanel::update_rotary(MachineObject* obj)
{
if (obj && obj->rotary_version_info.isValid())
{
m_rotary_version->UpdateInfo(obj->rotary_version_info);
show_rotary(true);
}
else
{
show_rotary(false);
}
}
// Orca: accessory firmware version display (backing parse landed in cluster 2)
void MachineInfoPanel::update_exhaustfan(MachineObject* obj)
{
if (obj && obj->exhaustfan_version_info.isValid())
{
m_exhaustfan_version->UpdateInfo(obj->exhaustfan_version_info);
show_exhaustfan(true);
}
else
{
show_exhaustfan(false);
}
}
void MachineInfoPanel::show_status(int status, std::string upgrade_status_str)
{
if (last_status == status && last_status_str == upgrade_status_str) return;
@@ -1311,6 +1385,28 @@ void MachineInfoPanel::show_filatrack(bool show)
}
}
// Orca: accessory firmware version display
void MachineInfoPanel::show_rotary(bool show)
{
if (m_rotary_version->IsShown() != show)
{
m_rotary_img->Show(show);
m_rotary_line_above->Show(show);
m_rotary_version->Show(show);
}
}
// Orca: accessory firmware version display
void MachineInfoPanel::show_exhaustfan(bool show)
{
if (m_exhaustfan_version->IsShown() != show)
{
m_exhaustfan_img->Show(show);
m_exhaustfan_line_above->Show(show);
m_exhaustfan_version->Show(show);
}
}
void MachineInfoPanel::createNozzleRackWidgets(wxBoxSizer *main_left_sizer)
{
// horizontal line above