3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-09 07:56:24 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix small area flow comp regression and some other small tweaks (#5844)

Browse source 
* Fix regression, always create SmallAreaInfillFlowCompensator model
small_area_infill_flow_compensation is per-region parameter, it's not necessary to iterate though all regions to check whether to create a model.

* Make SmallAreaInfillFlowCompensator robus.
1. handle spaces/tabs/new lines etc
2. don't throw expection, fall back to no-op instead if parsing failed

* Fixing an issue that changing small_area_infill_flow_compensation per modifier didn't take effect
This commit is contained in:
SoftFever 2024-06-25 00:20:20 +08:00 • committed by GitHub
parent 5c9b82d6ec
commit 34ad17bcd2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 56 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

85
src/libslic3r/GCode/SmallAreaInfillFlowCompensator.cpp
View file

@ -14,6 +14,7 @@
#include "../PrintConfig.hpp"
#include "SmallAreaInfillFlowCompensator.hpp"
#include <boost/log/trivial.hpp>
namespace Slic3r {
@ -24,61 +25,75 @@ bool nearly_equal(double a, double b)
SmallAreaInfillFlowCompensator::SmallAreaInfillFlowCompensator(const Slic3r::GCodeConfig& config)
{
for (auto& line : config.small_area_infill_flow_compensation_model.values) {
std::istringstream iss(line);
std::string value_str;
double eLength = 0.0;
try {
for (auto& line : config.small_area_infill_flow_compensation_model.values) {
std::istringstream iss(line);
std::string value_str;
double eLength = 0.0;
if (std::getline(iss, value_str, ',')) {
try {
eLength = std::stod(value_str);
if (std::getline(iss, value_str, ',')) {
eLengths.push_back(eLength);
flowComps.push_back(std::stod(value_str));
if (std::getline(iss, value_str, ',')) {
try {
// Trim leading and trailing whitespace
value_str = std::regex_replace(value_str, std::regex("^\\s+|\\s+$"), "");
if (value_str.empty()) {
continue;
}
eLength = std::stod(value_str);
if (std::getline(iss, value_str, ',')) {
eLengths.push_back(eLength);
flowComps.push_back(std::stod(value_str));
}
} catch (...) {
std::stringstream ss;
ss << "Error parsing data point in small area infill compensation model:" << line << std::endl;
throw Slic3r::InvalidArgument(ss.str());
}
} catch (...) {
std::stringstream ss;
ss << "Error parsing data point in small area infill compensation model:" << line << std::endl;
throw Slic3r::InvalidArgument(ss.str());
}
}
}
for (int i = 0; i < eLengths.size(); i++) {
if (i == 0) {
if (!nearly_equal(eLengths[i], 0.0)) {
throw Slic3r::InvalidArgument("First extrusion length for small area infill compensation model must be 0");
}
} else {
if (nearly_equal(eLengths[i], 0.0)) {
throw Slic3r::InvalidArgument("Only the first extrusion length for small area infill compensation model can be 0");
}
if (eLengths[i] <= eLengths[i - 1]) {
throw Slic3r::InvalidArgument("Extrusion lengths for subsequent points must be increasing");
for (int i = 0; i < eLengths.size(); i++) {
if (i == 0) {
if (!nearly_equal(eLengths[i], 0.0)) {
throw Slic3r::InvalidArgument("First extrusion length for small area infill compensation model must be 0");
}
} else {
if (nearly_equal(eLengths[i], 0.0)) {
throw Slic3r::InvalidArgument("Only the first extrusion length for small area infill compensation model can be 0");
}
if (eLengths[i] <= eLengths[i - 1]) {
throw Slic3r::InvalidArgument("Extrusion lengths for subsequent points must be increasing");
}
}
}
}
if (!flowComps.empty() && !nearly_equal(flowComps.back(), 1.0)) {
throw Slic3r::InvalidArgument("Final compensation factor for small area infill flow compensation model must be 1.0");
}
if (!flowComps.empty() && !nearly_equal(flowComps.back(), 1.0)) {
throw Slic3r::InvalidArgument("Final compensation factor for small area infill flow compensation model must be 1.0");
}
flowModel.set_points(eLengths, flowComps);
flowModel = std::make_unique<tk::spline>();
flowModel->set_points(eLengths, flowComps);
} catch (std::exception& e) {
BOOST_LOG_TRIVIAL(error) << "Error parsing small area infill compensation model: " << e.what();
}
}
double SmallAreaInfillFlowCompensator::flow_comp_model(const double line_length)
{
if(flowModel == nullptr)
return 1.0;
if (line_length == 0 || line_length > max_modified_length()) {
return 1.0;
}
return flowModel(line_length);
return (*flowModel)(line_length);
}
double SmallAreaInfillFlowCompensator::modify_flow(const double line_length, const double dE, const ExtrusionRole role)
{
if (role == ExtrusionRole::erSolidInfill || role == ExtrusionRole::erTopSolidInfill || role == ExtrusionRole::erBottomSurface) {
if (flowModel &&
(role == ExtrusionRole::erSolidInfill || role == ExtrusionRole::erTopSolidInfill || role == ExtrusionRole::erBottomSurface)) {
return dE * flow_comp_model(line_length);
}