mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-08 23:46:24 -06:00
34ad17bcd2
* 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
103 lines
3.7 KiB
C++
103 lines
3.7 KiB
C++
// Modify the flow of extrusion lines inversely proportional to the length of
|
|
// the extrusion line. When infill lines get shorter the flow rate will auto-
|
|
// matically be reduced to mitigate the effect of small infill areas being
|
|
// over-extruded.
|
|
|
|
// Based on original work by Alexander Þór licensed under the GPLv3:
|
|
// https://github.com/Alexander-T-Moss/Small-Area-Flow-Comp
|
|
|
|
#include <math.h>
|
|
#include <cstring>
|
|
#include <cfloat>
|
|
|
|
#include "../libslic3r.h"
|
|
#include "../PrintConfig.hpp"
|
|
|
|
#include "SmallAreaInfillFlowCompensator.hpp"
|
|
#include <boost/log/trivial.hpp>
|
|
|
|
namespace Slic3r {
|
|
|
|
bool nearly_equal(double a, double b)
|
|
{
|
|
return std::nextafter(a, std::numeric_limits<double>::lowest()) <= b && std::nextafter(a, std::numeric_limits<double>::max()) >= b;
|
|
}
|
|
|
|
SmallAreaInfillFlowCompensator::SmallAreaInfillFlowCompensator(const Slic3r::GCodeConfig& config)
|
|
{
|
|
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 {
|
|
// 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());
|
|
}
|
|
}
|
|
}
|
|
|
|
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");
|
|
}
|
|
|
|
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);
|
|
}
|
|
|
|
double SmallAreaInfillFlowCompensator::modify_flow(const double line_length, const double dE, const ExtrusionRole role)
|
|
{
|
|
if (flowModel &&
|
|
(role == ExtrusionRole::erSolidInfill || role == ExtrusionRole::erTopSolidInfill || role == ExtrusionRole::erBottomSurface)) {
|
|
return dE * flow_comp_model(line_length);
|
|
}
|
|
|
|
return dE;
|
|
}
|
|
|
|
} // namespace Slic3r
|