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

feature fix select machine and switch device page bug.

Browse Source
This commit is contained in:
alves
2026-03-13 11:14:55 +08:00
parent b689657226
commit 9ed9c9a983
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/slic3r/GUI/MainFrame.cpp
View File

@@ -1155,10 +1155,11 @@ void MainFrame::init_tabpanel() {
Bind(EVT_LOAD_PRINTER_URL, [this](LoadPrinterViewEvent &evt) { Bind(EVT_LOAD_PRINTER_URL, [this](LoadPrinterViewEvent &evt) {
wxString url = evt.GetString(); wxString url = evt.GetString();
wxString key = evt.GetAPIkey(); wxString key = evt.GetAPIkey();
m_printer_view->Show();
m_printer_view->load_url(url, key); m_printer_view->load_url(url, key);
}); });
m_printer_view->Hide();
if (wxGetApp().is_enable_multi_machine()) { if (wxGetApp().is_enable_multi_machine()) {
m_multi_machine = new MultiMachinePage(m_tabpanel, wxID_ANY, wxDefaultPosition, wxDefaultSize); m_multi_machine = new MultiMachinePage(m_tabpanel, wxID_ANY, wxDefaultPosition, wxDefaultSize);
m_multi_machine->SetBackgroundColour(*wxWHITE); m_multi_machine->SetBackgroundColour(*wxWHITE);
@@ -1196,7 +1197,7 @@ void MainFrame::show_device(bool bBBLPrinter) {
return; return;
// Remove printer view // Remove printer view
if ((idx = m_tabpanel->FindPage(m_printer_view)) != wxNOT_FOUND) { if ((idx = m_tabpanel->FindPage(m_printer_view)) != wxNOT_FOUND) {
//m_printer_view->Show(false); m_printer_view->Show(false);
m_tabpanel->RemovePage(idx); m_tabpanel->RemovePage(idx);
} }
@@ -1253,12 +1254,10 @@ void MainFrame::show_device(bool bBBLPrinter) {
Bind(EVT_LOAD_PRINTER_URL, [this](LoadPrinterViewEvent& evt) { Bind(EVT_LOAD_PRINTER_URL, [this](LoadPrinterViewEvent& evt) {
wxString url = evt.GetString(); wxString url = evt.GetString();
wxString key = evt.GetAPIkey(); wxString key = evt.GetAPIkey();
// select_tab(MainFrame::tpMonitor);
m_printer_view->Show();
m_printer_view->load_url(url, key); m_printer_view->load_url(url, key);
}); });
} }
//m_printer_view->Show(false); m_printer_view->Show(false);
m_tabpanel->InsertPage(tpMonitor, m_printer_view, _L("Device"), std::string("tab_monitor_active"), m_tabpanel->InsertPage(tpMonitor, m_printer_view, _L("Device"), std::string("tab_monitor_active"),
std::string("tab_monitor_active")); std::string("tab_monitor_active"));
} }

2
src/slic3r/GUI/PrinterWebView.cpp
View File

@@ -69,8 +69,6 @@ PrinterWebView::~PrinterWebView()
void PrinterWebView::load_url(wxString& url, wxString apikey) void PrinterWebView::load_url(wxString& url, wxString apikey)
{ {
// this->Show();
// this->Raise();
if (m_browser == nullptr) if (m_browser == nullptr)
return; return;
m_apikey = apikey; m_apikey = apikey;