amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

remember last filament choice and ignore network plugin check for thirdpary printers

Browse source
This commit is contained in:
SoftFever 2022-11-06 14:03:15 +08:00
parent ec7a7ff1ff
commit d65311858c
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/.doxygen
View file

@ -485,7 +485,7 @@ LOOKUP_CACHE_SIZE = 6
# DOT_NUM_THREADS setting. # DOT_NUM_THREADS setting.
# Minimum value: 0, maximum value: 32, default value: 1. # Minimum value: 0, maximum value: 32, default value: 1.
NUM_PROC_THREADS = 10 NUM_PROC_THREADS = 0
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# Build related configuration options # Build related configuration options
@ -2420,7 +2420,7 @@ HAVE_DOT = YES
# Minimum value: 0, maximum value: 32, default value: 0. # Minimum value: 0, maximum value: 32, default value: 0.
# This tag requires that the tag HAVE_DOT is set to YES. # 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 # 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 # subgraphs. When you want a differently looking font in the dot files that

2
src/libslic3r/AppConfig.cpp
View file

@ -459,7 +459,6 @@ std::string AppConfig::load()
for (auto iter = it.value().begin(); iter != it.value().end(); iter++) { for (auto iter = it.value().begin(); iter != it.value().end(); iter++) {
if (iter.key() == "filaments") { if (iter.key() == "filaments") {
// BBS: filament presets is now considered as project config instead of app config // BBS: filament presets is now considered as project config instead of app config
#if 0
int idx = 0; int idx = 0;
for(auto& element: iter.value()) { for(auto& element: iter.value()) {
if (idx == 0) if (idx == 0)
@ -468,7 +467,6 @@ std::string AppConfig::load()
m_storage[it.key()]["filament_" + std::to_string(idx)] = element; m_storage[it.key()]["filament_" + std::to_string(idx)] = element;
idx++; idx++;
} }
#endif
} else { } else {
m_storage[it.key()][iter.key()] = iter.value().get<std::string>(); m_storage[it.key()][iter.key()] = iter.value().get<std::string>();
} }

4
src/slic3r/GUI/MainFrame.cpp
View file

@ -838,7 +838,9 @@ void MainFrame::init_tabpanel()
m_tabpanel->Bind(wxEVT_NOTEBOOK_PAGE_CHANGING, [this](wxBookCtrlEvent& e) { m_tabpanel->Bind(wxEVT_NOTEBOOK_PAGE_CHANGING, [this](wxBookCtrlEvent& e) {
int old_sel = e.GetOldSelection(); int old_sel = e.GetOldSelection();
int new_sel = e.GetSelection(); 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()) { if (!wxGetApp().getAgent()) {
e.Veto(); e.Veto();
BOOST_LOG_TRIVIAL(info) << boost::format("skipped tab switch from %1% to %2%, lack of network plugins")%old_sel %new_sel; BOOST_LOG_TRIVIAL(info) << boost::format("skipped tab switch from %1% to %2%, lack of network plugins")%old_sel %new_sel;

2
version.inc
View file

@ -11,4 +11,4 @@ if(NOT DEFINED BBL_INTERNAL_TESTING)
set(BBL_INTERNAL_TESTING "1") set(BBL_INTERNAL_TESTING "1")
endif() endif()
set(SLIC3R_VERSION "01.03.00.22") set(SLIC3R_VERSION "01.03.00.22")
set(SoftFever_VERSION "1.3.2") set(SoftFever_VERSION "1.3.3 beta2")