GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-14 18:46:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix #256, set auto speed before applying the first layer one

Browse Source 
fix string type for tab.cpp
This commit is contained in:
supermerill 2020-05-29 22:57:56 +02:00
parent 75fdafc82e
commit 493dec834b
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libslic3r/GCode.cpp
View File

@ -3832,13 +3832,15 @@ std::string GCode::_before_extrude(const ExtrusionPath &path, const std::string
throw std::invalid_argument("Invalid speed"); throw std::invalid_argument("Invalid speed");
} }
} }
if (m_volumetric_speed != 0. && speed == 0)
speed = m_volumetric_speed / path.mm3_per_mm;
if (speed == 0) // this code shouldn't trigger as if it's 0, you have to get a m_volumetric_speed
speed = m_config.max_print_speed.value;
if (this->on_first_layer()) if (this->on_first_layer())
if (path.role() == erInternalInfill || path.role() == erSolidInfill) if (path.role() == erInternalInfill || path.role() == erSolidInfill)
speed = std::min(m_config.get_abs_value("first_layer_infill_speed", speed), speed); speed = std::min(m_config.get_abs_value("first_layer_infill_speed", speed), speed);
else else
speed = std::min(m_config.get_abs_value("first_layer_speed", speed), speed); speed = std::min(m_config.get_abs_value("first_layer_speed", speed), speed);
if (m_volumetric_speed != 0. && speed == 0)
speed = m_volumetric_speed / path.mm3_per_mm;
if (m_config.max_volumetric_speed.value > 0) { if (m_config.max_volumetric_speed.value > 0) {
// cap speed with max_volumetric_speed anyway (even if user is not using autospeed) // cap speed with max_volumetric_speed anyway (even if user is not using autospeed)
speed = std::min( speed = std::min(

6
src/slic3r/GUI/Tab.cpp
View File

@ -1184,17 +1184,17 @@ bool Tab::create_pages(std::string setting_type_name, int idx_page)
if (params.size() < 2) continue; if (params.size() < 2) continue;
if (params.size() == 2) params.push_back("wrench"); if (params.size() == 2) params.push_back("wrench");
std::wstring label = _(L(params[params.size()-2])); std::string label = L(params[params.size()-2]);
for (int i = 1; i < params.size() - 1; i++) { for (int i = 1; i < params.size() - 1; i++) {
if (params[i] == "idx") if (params[i] == "idx")
{ {
label = label + _(L(" " + std::to_string(int(idx_page + 1)))); label = label + " " + std::to_string(int(idx_page + 1));
} }
} }
if(logs) std::cout << "create page " << label.c_str() <<" : "<< params[params.size() - 1] << "\n"; if(logs) std::cout << "create page " << label.c_str() <<" : "<< params[params.size() - 1] << "\n";
current_page = add_options_page(label, params[params.size() - 1]); current_page = add_options_page(_(label), params[params.size() - 1]);
} }
else if (boost::starts_with(full_line, "end_page")) else if (boost::starts_with(full_line, "end_page"))
{ {