juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-07-29 13:52:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #199 from Snapmaker/dev_2.3.0_alves

Browse Source 
fix modify machine and switch page bug
This commit is contained in:
Alves
2026-03-13 12:26:05 +08:00
committed by GitHub
parent bca8a5cfb5 0919694d13
commit 2ecbcf1f8d
4 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/slic3r/GUI/GUI_App.cpp
View File

@@ -2016,8 +2016,8 @@ void GUI_App::init_app_config()
std::time_t t = std::time(0); std::time_t t = std::time(0);
std::tm * now_time = std::localtime(&t); std::tm * now_time = std::localtime(&t);
std::stringstream buf; std::stringstream buf;
buf << std::put_time(now_time, "debug_%a_%b_%d_%H_%M_%S_"); buf << std::put_time(now_time, "%Y-%m-%d-%H-%M-%S");
buf << get_current_pid() << ".log"; buf << ".log";
std::string log_filename = buf.str(); std::string log_filename = buf.str();
#if !BBL_RELEASE_TO_PUBLIC #if !BBL_RELEASE_TO_PUBLIC
set_log_path_and_level(log_filename, 5); set_log_path_and_level(log_filename, 5);

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;

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

@@ -253,12 +253,7 @@ void WebViewPanel::reload() {
void WebViewPanel::load_url(wxString& url) void WebViewPanel::load_url(wxString& url)
{ {
this->Show();
this->Raise();
/*m_url->SetLabelText(url);
if (wxGetApp().get_mode() == comDevelop)
wxLogMessage(m_url->GetValue());*/
m_browser->LoadURL(url); m_browser->LoadURL(url);
wxGetApp().fltviews().add_webview_panel(this, url); wxGetApp().fltviews().add_webview_panel(this, url);