3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-29 19:53:44 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

NEW: support to display wired network for printer

Browse source 
JIRA: STUDIO-3519

Change-Id: I1c32254e249a3c0010973b17953121f4aa718f76
Signed-off-by: Stone Li <stone.li@bambulab.com>
This commit is contained in:
Stone Li 2023-09-11 10:15:41 +08:00 • committed by Lane.Wei
parent 29bdbf891c
commit be53cf4c7a
5 changed files with 22 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
resources/images/monitor_network_wired.svg Normal file
View file

@ -0,0 +1,10 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_5_11)">
<path d="M15 3.2C15.33 3.2 15.6 3.47 15.6 3.8V7.4C15.6 7.73 15.33 8 15 8H12.6H11.4H9C8.67 8 8.4 7.73 8.4 7.4V3.8C8.4 3.47 8.67 3.2 9 3.2H15ZM12.6 9.2H15C15.9938 9.2 16.8 8.39375 16.8 7.4V3.8C16.8 2.80625 15.9938 2 15 2H9C8.00625 2 7.2 2.80625 7.2 3.8V7.4C7.2 8.39375 8.00625 9.2 9 9.2H11.4V11H0.6C0.27 11 0 11.27 0 11.6C0 11.93 0.27 12.2 0.6 12.2H5.4V14H3C2.00625 14 1.2 14.8063 1.2 15.8V19.4C1.2 20.3938 2.00625 21.2 3 21.2H9C9.99375 21.2 10.8 20.3938 10.8 19.4V15.8C10.8 14.8063 9.99375 14 9 14H6.6V12.2H17.4V14H15C14.0063 14 13.2 14.8063 13.2 15.8V19.4C13.2 20.3938 14.0063 21.2 15 21.2H21C21.9938 21.2 22.8 20.3938 22.8 19.4V15.8C22.8 14.8063 21.9938 14 21 14H18.6V12.2H23.4C23.73 12.2 24 11.93 24 11.6C24 11.27 23.73 11 23.4 11H12.6V9.2ZM18.6 15.2H21C21.33 15.2 21.6 15.47 21.6 15.8V19.4C21.6 19.73 21.33 20 21 20H15C14.67 20 14.4 19.73 14.4 19.4V15.8C14.4 15.47 14.67 15.2 15 15.2H17.4H18.6ZM6.6 15.2H9C9.33 15.2 9.6 15.47 9.6 15.8V19.4C9.6 19.73 9.33 20 9 20H3C2.67 20 2.4 19.73 2.4 19.4V15.8C2.4 15.47 2.67 15.2 3 15.2H5.4H6.6Z" fill="black"/>
</g>
<defs>
<clipPath id="clip0_5_11">
<rect width="24" height="19.2" fill="white" transform="translate(0 2)"/>
</clipPath>
</defs>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.3 KiB

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

@ -1386,6 +1386,8 @@ void MachineObject::parse_status(int flag)
}
sdcard_state = MachineObject::SdcardState((flag >> 8) & 0x11);
network_wired = ((flag >> 18) & 0x1) != 0;
}
PrintingSpeedLevel MachineObject::_parse_printing_speed_lvl(int lvl)
@ -2539,6 +2541,7 @@ void MachineObject::reset()
m_is_support_show_bak = false;
extruder_axis_status = LOAD;
nozzle_diameter = 0.0f;
network_wired = false;
// reset print_json
json empty_j;

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

@ -573,6 +573,7 @@ public:
std::string wifi_signal;
std::string link_th;
std::string link_ams;
bool network_wired { false };
/* lights */
LIGHT_EFFECT chamber_light;

7
src/slic3r/GUI/Widgets/SideTools.cpp
View file

@ -31,6 +31,7 @@ namespace Slic3r { namespace GUI {
m_wifi_weak_img = ScalableBitmap(this, "monitor_signal_weak", 18);
m_wifi_middle_img = ScalableBitmap(this, "monitor_signal_middle", 18);
m_wifi_strong_img = ScalableBitmap(this, "monitor_signal_strong", 18);
m_network_wired_img = ScalableBitmap(this, "monitor_network_wired", 18);
m_intetval_timer = new wxTimer();
m_intetval_timer->SetOwner(this);
@ -204,6 +205,7 @@ void SideToolsPanel::doRender(wxDC &dc)
if (m_wifi_type == WifiSignal::WEAK) dc.DrawBitmap(m_wifi_weak_img.bmp(), left, (size.y - m_wifi_weak_img.GetBmpSize().y) / 2);
if (m_wifi_type == WifiSignal::MIDDLE) dc.DrawBitmap(m_wifi_middle_img.bmp(), left, (size.y - m_wifi_middle_img.GetBmpSize().y) / 2);
if (m_wifi_type == WifiSignal::STRONG) dc.DrawBitmap(m_wifi_strong_img.bmp(), left, (size.y - m_wifi_strong_img.GetBmpSize().y) / 2);
if (m_wifi_type == WifiSignal::WIRED) dc.DrawBitmap(m_network_wired_img.bmp(), left, (size.y - m_network_wired_img.GetBmpSize().y) / 2);
}
if (m_hover) {
@ -452,7 +454,10 @@ void SideTools::update_status(MachineObject* obj)
m_side_tools->set_current_printer_signal(WifiSignal::NONE);
}
else {
if (!obj->wifi_signal.empty() && boost::ends_with(obj->wifi_signal, "dBm")) {
if (obj->network_wired) {
m_side_tools->set_current_printer_signal(WifiSignal::WIRED);
}
else if (!obj->wifi_signal.empty() && boost::ends_with(obj->wifi_signal, "dBm")) {
try {
wifi_signal_val = std::stoi(obj->wifi_signal.substr(0, obj->wifi_signal.size() - 3));
}

2
src/slic3r/GUI/Widgets/SideTools.hpp
View file

@ -22,6 +22,7 @@ enum WifiSignal {
WEAK,
MIDDLE,
STRONG,
WIRED,
};
enum MonitorStatus {
@ -58,6 +59,7 @@ private:
ScalableBitmap m_wifi_weak_img;
ScalableBitmap m_wifi_middle_img;
ScalableBitmap m_wifi_strong_img;
ScalableBitmap m_network_wired_img;
protected:
wxStaticBitmap *m_bitmap_info;