mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: switch diameter button order & total ams count 

Change-Id: Ife11b131269cd5b1ed6c1555621d5ea727a07027
Jira: STUDIO-9984, STUDIO-9739
This commit is contained in:
chunmao.guo 2025-01-19 10:07:29 +08:00 committed by lane.wei
parent 4a83044867
commit 35e8c0d5da
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/slic3r/GUI/MediaFilePanel.cpp
View File

@ -477,6 +477,7 @@ void MediaFilePanel::fetchUrl(boost::weak_ptr<PrinterFileSystem> wfs)
fs->SetUrl("0"); fs->SetUrl("0");
return; return;
} }
BOOST_LOG_TRIVIAL(info) << "MediaFilePanel::fetchUrl: " << m_local_proto << m_remote_proto;
m_waiting_support = false; m_waiting_support = false;
NetworkAgent *agent = wxGetApp().getAgent(); NetworkAgent *agent = wxGetApp().getAgent();
std::string agent_version = agent ? agent->get_version() : ""; std::string agent_version = agent ? agent->get_version() : "";

5
src/slic3r/GUI/MediaPlayCtrl.cpp
View File

@ -297,6 +297,7 @@ void MediaPlayCtrl::Play()
} }
m_play_timer = std::chrono::system_clock::now(); m_play_timer = std::chrono::system_clock::now();
BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl::Play: " << m_lan_proto << m_remote_proto << m_disable_lan;
NetworkAgent *agent = wxGetApp().getAgent(); NetworkAgent *agent = wxGetApp().getAgent();
std::string agent_version = agent ? agent->get_version() : ""; std::string agent_version = agent ? agent->get_version() : "";
@ -597,7 +598,9 @@ void MediaPlayCtrl::ToggleStream()
} }
NetworkAgent *agent = wxGetApp().getAgent(); NetworkAgent *agent = wxGetApp().getAgent();
if (!agent) return; if (!agent) return;
agent->get_camera_url(m_machine, [this, m = m_machine, v = agent->get_version(), dv = m_dev_ver](std::string url) { std::string protocols[] = {"", "\"tutk\"", "\"agora\"", "\"tutk\",\"agora\""};
agent->get_camera_url(m_machine + "|" + m_dev_ver + "|" + protocols[m_remote_proto],
[this, m = m_machine, v = agent->get_version(), dv = m_dev_ver](std::string url) {
if (boost::algorithm::starts_with(url, "bambu:///")) { if (boost::algorithm::starts_with(url, "bambu:///")) {
url += "&device=" + m; url += "&device=" + m;
url += "&net_ver=" + v; url += "&net_ver=" + v;

16
src/slic3r/GUI/Plater.cpp
View File

@ -803,9 +803,11 @@ public:
txt1->SetBackgroundColour(0xF8F8F8); txt1->SetBackgroundColour(0xF8F8F8);
txt1->SetForegroundColour("#262E30"); txt1->SetForegroundColour("#262E30");
int ams4 = 0, ams1 = 0; int ams4 = 0, ams1 = 0;
int oth4 = 0, oth1 = 0;
GetAMSCount(index, ams4, ams1); GetAMSCount(index, ams4, ams1);
auto val4 = new SpinInput(box, {}, {}, wxDefaultPosition, {FromDIP(60), -1}, 0, 0, 4, ams4); GetAMSCount(1 - index, oth4, oth1);
auto val1 = new SpinInput(box, {}, {}, wxDefaultPosition, {FromDIP(60), -1}, 0, 0, 8, ams1); auto val4 = new SpinInput(box, {}, {}, wxDefaultPosition, {FromDIP(60), -1}, 0, 0, 4 - oth4, ams4);
auto val1 = new SpinInput(box, {}, {}, wxDefaultPosition, {FromDIP(60), -1}, 0, 0, 8 - oth1, ams1);
auto event_handler = [index, val4, val1, extruder](auto &evt) { auto event_handler = [index, val4, val1, extruder](auto &evt) {
SetAMSCount(index, val4->GetValue(), val1->GetValue()); SetAMSCount(index, val4->GetValue(), val1->GetValue());
UpdateAMSCount(index, extruder); UpdateAMSCount(index, extruder);
@ -1100,12 +1102,12 @@ bool Sidebar::priv::switch_diameter(bool single)
"If the left and right nozzles are inconsistent, we can only proceed with single-head printing. " "If the left and right nozzles are inconsistent, we can only proceed with single-head printing. "
"Please confirm which nozzle you would like to use for this project."), "Please confirm which nozzle you would like to use for this project."),
_L("Switch diameter"), wxNO | wxCANCEL); _L("Switch diameter"), wxNO | wxCANCEL);
dlg.SetButtonLabel(wxID_CANCEL, wxString::Format(_L("Left nozzle: %smm"), diameter_left)); dlg.SetButtonLabel(wxID_NO, wxString::Format(_L("Left nozzle: %smm"), diameter_left));
dlg.SetButtonLabel(wxID_NO, wxString::Format(_L("Right nozzle: %smm"), diameter_right)); dlg.SetButtonLabel(wxID_CANCEL, wxString::Format(_L("Right nozzle: %smm"), diameter_right));
int result = dlg.ShowModal(); int result = dlg.ShowModal();
if (result == wxID_CANCEL) if (result == wxID_NO)
diameter = diameter_left; diameter = diameter_left;
else if (result == wxID_NO) else if (result == wxID_CANCEL)
diameter = diameter_right; diameter = diameter_right;
else else
return false; return false;
@ -1685,7 +1687,7 @@ Sidebar::Sidebar(Plater *parent)
wxBoxSizer* bSizer39; wxBoxSizer* bSizer39;
bSizer39 = new wxBoxSizer( wxHORIZONTAL ); bSizer39 = new wxBoxSizer( wxHORIZONTAL );
p->m_filament_icon = new ScalableButton(p->m_panel_filament_title, wxID_ANY, "filament"); p->m_filament_icon = new ScalableButton(p->m_panel_filament_title, wxID_ANY, "filament");
p->m_staticText_filament_settings = new Label(p->m_panel_filament_title, _L("Filament"), LB_PROPAGATE_MOUSE_EVENT); p->m_staticText_filament_settings = new Label(p->m_panel_filament_title, _L("Filaments"), LB_PROPAGATE_MOUSE_EVENT);
bSizer39->Add(p->m_filament_icon, 0, wxALIGN_CENTER | wxLEFT | wxRIGHT, FromDIP(10)); bSizer39->Add(p->m_filament_icon, 0, wxALIGN_CENTER | wxLEFT | wxRIGHT, FromDIP(10));
bSizer39->Add( p->m_staticText_filament_settings, 0, wxALIGN_CENTER ); bSizer39->Add( p->m_staticText_filament_settings, 0, wxALIGN_CENTER );
bSizer39->Add(FromDIP(10), 0, 0, 0, 0); bSizer39->Add(FromDIP(10), 0, 0, 0, 0);