Skip to content

Commit

Permalink
remember last filament choice and ignore network plugin check for thi…
Browse files Browse the repository at this point in the history
…rdpary printers
  • Loading branch information
SoftFever committed Nov 6, 2022
1 parent ec7a7ff commit d653118
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions src/.doxygen
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions src/libslic3r/AppConfig.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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<std::string>();
}
Expand Down
4 changes: 3 additions & 1 deletion src/slic3r/GUI/MainFrame.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion version.inc
Original file line number Diff line number Diff line change
Expand Up @@ -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")

0 comments on commit d653118

Please sign in to comment.