From d65311858c9ff99b218d420d73d07e49fce00e16 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Sun, 6 Nov 2022 14:03:15 +0800 Subject: [PATCH] remember last filament choice and ignore network plugin check for thirdpary printers --- src/.doxygen | 4 ++-- src/libslic3r/AppConfig.cpp | 2 -- src/slic3r/GUI/MainFrame.cpp | 4 +++- version.inc | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/.doxygen b/src/.doxygen index c4e3e1b789b..623ec7f68fd 100644 --- a/src/.doxygen +++ b/src/.doxygen @@ -485,7 +485,7 @@ LOOKUP_CACHE_SIZE = 6 # DOT_NUM_THREADS setting. # Minimum value: 0, maximum value: 32, default value: 1. -NUM_PROC_THREADS = 10 +NUM_PROC_THREADS = 0 #--------------------------------------------------------------------------- # Build related configuration options @@ -2420,7 +2420,7 @@ HAVE_DOT = YES # Minimum value: 0, maximum value: 32, default value: 0. # This tag requires that the tag HAVE_DOT is set to YES. -DOT_NUM_THREADS = 8 +DOT_NUM_THREADS = 0 # DOT_COMMON_ATTR is common attributes for nodes, edges and labels of # subgraphs. When you want a differently looking font in the dot files that diff --git a/src/libslic3r/AppConfig.cpp b/src/libslic3r/AppConfig.cpp index 5214b29d83d..69469649325 100644 --- a/src/libslic3r/AppConfig.cpp +++ b/src/libslic3r/AppConfig.cpp @@ -459,7 +459,6 @@ std::string AppConfig::load() for (auto iter = it.value().begin(); iter != it.value().end(); iter++) { if (iter.key() == "filaments") { // BBS: filament presets is now considered as project config instead of app config -#if 0 int idx = 0; for(auto& element: iter.value()) { if (idx == 0) @@ -468,7 +467,6 @@ std::string AppConfig::load() m_storage[it.key()]["filament_" + std::to_string(idx)] = element; idx++; } -#endif } else { m_storage[it.key()][iter.key()] = iter.value().get(); } diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index bac87f07db8..3e9c777d64e 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -838,7 +838,9 @@ void MainFrame::init_tabpanel() m_tabpanel->Bind(wxEVT_NOTEBOOK_PAGE_CHANGING, [this](wxBookCtrlEvent& e) { int old_sel = e.GetOldSelection(); int new_sel = e.GetSelection(); - if (new_sel == tpMonitor) { + if (wxGetApp().preset_bundle && + wxGetApp().preset_bundle->printers.get_edited_preset().is_bbl_vendor_preset(wxGetApp().preset_bundle) && + new_sel == tpMonitor) { if (!wxGetApp().getAgent()) { e.Veto(); BOOST_LOG_TRIVIAL(info) << boost::format("skipped tab switch from %1% to %2%, lack of network plugins")%old_sel %new_sel; diff --git a/version.inc b/version.inc index 3dad0ed7e1c..3ef4b2432fb 100644 --- a/version.inc +++ b/version.inc @@ -11,4 +11,4 @@ if(NOT DEFINED BBL_INTERNAL_TESTING) set(BBL_INTERNAL_TESTING "1") endif() set(SLIC3R_VERSION "01.03.00.22") -set(SoftFever_VERSION "1.3.2") +set(SoftFever_VERSION "1.3.3 beta2")