Skip to content
Open
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/SkirtBrim.h
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ class SkirtBrim
* @param width The maximum inside brim width to be generated
* @param line_width The line width used to print the support inside brim
*/
void generateSupportInsideBrim(const Settings& settings, const Shape& support_outline, const size_t width, const size_t line_width);
void generateSupportInsideBrim(const Settings& settings, const Shape& support_outline, const coord_t width, const coord_t line_width);

/*!
* Generates the outside part of the support brim
Expand All @@ -236,7 +236,7 @@ class SkirtBrim
* @param line_width The line width used to print the support inside brim
* @param exclusion_area The exclusion areas on which the brim is not allowed to grow
*/
void generateSupportOutsideBrim(const Shape& support_outline, const size_t width, const size_t line_width, const Shape& exclusion_area);
void generateSupportOutsideBrim(const Shape& support_outline, const coord_t width, const coord_t line_width, const Shape& exclusion_area);

public:
/*!
Expand Down
6 changes: 3 additions & 3 deletions src/MeshGroup.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -513,15 +513,15 @@ bool loadMeshIntoMeshGroup(MeshGroup* meshgroup, const fs::path& filename, const
bool load_success = false;
bool has_uv = false;

const fs::path base_filename = filename.stem();
const std::string base_filename = filename.stem();
std::string extension = filename.extension().string();
extension = extension.substr(1, extension.size()); // Remove the initial '.'
ranges::transform(extension, extension.begin(), static_cast<int (*)(int)>(std::tolower)); // To lowercase

if (extension == "stl")
{
// Check for corresponding UV and PNG files
const fs::path uv_filename = fs::path(base_filename).replace_extension("uv");
const fs::path uv_filename = fs::path(base_filename + ".uv");

std::vector<Point2F> uv_coordinates;
has_uv = loadUVCoordinatesFromFile(uv_filename, uv_coordinates);
Expand Down Expand Up @@ -579,7 +579,7 @@ bool loadMeshIntoMeshGroup(MeshGroup* meshgroup, const fs::path& filename, const

spdlog::info("loading '{}' took {:03.3f} seconds", filename.string(), load_timer.restart());

mesh.mesh_name_ = base_filename.string();
mesh.mesh_name_ = base_filename;
meshgroup->meshes.push_back(mesh);
}

Expand Down
6 changes: 3 additions & 3 deletions src/SkirtBrim.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -674,9 +674,9 @@ std::vector<Shape> SkirtBrim::generateAllowedAreas(const std::vector<Outline>& s
return allowed_areas_per_extruder;
}

void SkirtBrim::generateSupportInsideBrim(const Settings& settings, const Shape& support_outline, const size_t width, const size_t line_width)
void SkirtBrim::generateSupportInsideBrim(const Settings& settings, const Shape& support_outline, const coord_t width, const coord_t line_width)
{
const coord_t support_brim_minimum_hole_area = MM2_2INT(settings.get<size_t>("support_brim_minimum_hole_area"));
const coord_t support_brim_minimum_hole_area = MM2_2INT(settings.get<coord_t>("support_brim_minimum_hole_area"));

PolygonUtils::InsetOutset base_insets = PolygonUtils::generateInsetOutset(support_outline, -width, line_width);
for (Shape& base_inset : base_insets.walls)
Expand All @@ -699,7 +699,7 @@ void SkirtBrim::generateSupportInsideBrim(const Settings& settings, const Shape&
}
}

void SkirtBrim::generateSupportOutsideBrim(const Shape& support_outline, const size_t width, const size_t line_width, const Shape& exclusion_area)
void SkirtBrim::generateSupportOutsideBrim(const Shape& support_outline, const coord_t width, const coord_t line_width, const Shape& exclusion_area)
{
PolygonUtils::InsetOutset base_outsets = PolygonUtils::generateInsetOutset(support_outline, width, line_width);

Expand Down
Loading