mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-18 11:02:08 +00:00
Compare commits
2 Commits
v1.3.3-sf-
...
v1.3.3-sf-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f15b6d5cf8 | ||
|
|
d65311858c |
@@ -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
|
||||
|
||||
@@ -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<std::string>();
|
||||
}
|
||||
|
||||
@@ -4065,6 +4065,10 @@ std::string GCode::set_extruder(unsigned int extruder_id, double print_z)
|
||||
gcode += this->placeholder_parser_process("filament_start_gcode", filament_start_gcode, extruder_id);
|
||||
check_add_eol(gcode);
|
||||
}
|
||||
if (m_config.enable_pressure_advance.get_at(extruder_id)) {
|
||||
gcode += m_writer.set_pressure_advance(m_config.pressure_advance.get_at(extruder_id));
|
||||
}
|
||||
|
||||
gcode += m_writer.toolchange(extruder_id);
|
||||
return gcode;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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 beta3")
|
||||
|
||||
Reference in New Issue
Block a user