GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-05 21:06:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Export shape to svg is translated to top left corner.

Browse Source 
Scale input is limit less.
This commit is contained in:
Filip Sykala - NTB T15p 2023-07-26 14:54:34 +02:00
parent 1e1caad019
commit 173aefd92a
3 changed files with 63 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/libslic3r/NSVGUtils.cpp
View File

@ -1,4 +1,7 @@
#include "NSVGUtils.hpp"
#include <array>
#include <charconv> // to_chars
#include "ClipperUtils.hpp"
namespace {
@ -27,7 +30,22 @@ ExPolygons to_expolygons(const NSVGimage &image, float tessTol, int max_level, f
continue;
expolygons_append(expolygons, union_ex(polygons));
}
return union_ex(expolygons);
return expolygons;
}
void bounds(const NSVGimage &image, Vec2f& min, Vec2f &max)
{
for (const NSVGshape *shape = image.shapes; shape != NULL; shape = shape->next)
for (const NSVGpath *path = shape->paths; path != NULL; path = path->next) {
if (min.x() > path->bounds[0])
min.x() = path->bounds[0];
if (min.y() > path->bounds[1])
min.y() = path->bounds[1];
if (max.x() < path->bounds[2])
max.x() = path->bounds[2];
if (max.y() < path->bounds[3])
max.y() = path->bounds[3];
}
}
NSVGimage_ptr nsvgParseFromFile(const std::string &filename, const char *units, float dpi)
@ -43,20 +61,12 @@ bool save(const NSVGimage &image, const std::string &svg_file_path)
return false;
fprintf(file, "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>");
// tl .. top left
Vec2f tl(std::numeric_limits<float>::max(), std::numeric_limits<float>::max());
// br .. bottom right
Vec2f br(std::numeric_limits<float>::min(), std::numeric_limits<float>::min());
for (const NSVGshape *shape = image.shapes; shape != NULL; shape = shape->next)
for (const NSVGpath *path = shape->paths; path != NULL; path = path->next) {
if (tl.x() > path->bounds[0])
tl.x() = path->bounds[0];
if (tl.y() > path->bounds[1])
tl.y() = path->bounds[1];
if (br.x() < path->bounds[2])
br.x() = path->bounds[2];
if (br.y() < path->bounds[3])
br.y() = path->bounds[3];
}
bounds(image, tl, br);
tl.x() = std::floor(tl.x());
tl.y() = std::floor(tl.y());
@ -64,21 +74,23 @@ bool save(const NSVGimage &image, const std::string &svg_file_path)
br.x() = std::ceil(br.x());
br.y() = std::ceil(br.y());
Vec2f s = br - tl;
Point size = s.cast<Point::coord_type>();
//// IMPROVE: use path bounds instead of BoundingBox
//BoundingBox bb = get_extents(to_polygons(image));
//// bb has opposit value of y axe
//// Values stored in point are fixed point numbers need extend
//Point s = bb.size() + Point(2, 2); // extended size
//Point tl(bb.min.x() - 1, -bb.max.y() - 1); // top left corner
//Point br(tl.x() + s.x(), tl.y() + s.y()); // bottom right
fprintf(file, "<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"%dmm\" height=\"%dmm\" viewBox=\"%d %d %d %d\" >\n",
(int)s.x(), (int)s.y(), (int)tl.x(), (int)tl.y(), (int)br.x(), (int)br.y());
fprintf(file, "<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"%dmm\" height=\"%dmm\" viewBox=\"0 0 %d %d\" >\n",
size.x(), size.y(), size.x(), size.y());
fprintf(file, "<!-- Created with PrusaSlicer (https://www.prusa3d.com/prusaslicer/) -->\n");
auto write_point = [](std::string &d, const float *p) {
d += std::to_string(p[0]) + "," + std::to_string(p[1]) + " ";
std::array<char, 128> buffer;
auto write_point = [&tl, &buffer](std::string &d, const float *p) {
float x = p[0] - tl.x();
float y = p[1] - tl.y();
auto to_string = [&buffer](float f) -> std::string {
auto [ptr, ec] = std::to_chars(buffer.data(), buffer.data() + buffer.size(), f);
if (ec != std::errc{})
return "0";
return std::string(buffer.data(), ptr);
};
d += to_string(x) + "," + to_string(y) + " ";
};
for (const NSVGshape *shape = image.shapes; shape != NULL; shape = shape->next) {
@ -94,8 +106,7 @@ bool save(const NSVGimage &image, const std::string &svg_file_path)
// NOTE: After close must be a space
d += " M "; // move on start point
}
//write_point(d, path->pts);
d += std::to_string(path->pts[0]) + "," + std::to_string(path->pts[1]) + " ";
write_point(d, path->pts);
size_t path_size = static_cast<size_t>(path->npts - 1);
if (path->closed) {
@ -112,9 +123,8 @@ bool save(const NSVGimage &image, const std::string &svg_file_path)
type = Type::curve;
d += "C "; // start sequence of triplets defining curves
}
d += std::to_string(p[2]) + "," + std::to_string(p[3]) + " " +
std::to_string(p[4]) + "," + std::to_string(p[5]) + " " ;
write_point(d, &p[2]);
write_point(d, &p[4]);
} else {
if (type != Type::line) {
@ -122,7 +132,7 @@ bool save(const NSVGimage &image, const std::string &svg_file_path)
d += "L "; // start sequence of line points
}
}
d += std::to_string(p[6]) + "," + std::to_string(p[7]) + " ";
write_point(d, &p[6]);
}
if (path->closed) {
type = Type::close;

2
src/libslic3r/NSVGUtils.hpp
View File

@ -24,6 +24,8 @@ namespace Slic3r {
Polygons to_polygons(const NSVGimage &image, float tessTol = 10., int max_level = 10, float scale = 1.f, bool is_y_negative = true);
ExPolygons to_expolygons(const NSVGimage &image, float tessTol = 10., int max_level = 10, float scale = 1.f, bool is_y_negative = true);
void bounds(const NSVGimage &image, Vec2f &min, Vec2f &max);
using NSVGimage_ptr = std::unique_ptr<NSVGimage, void (*)(NSVGimage*)>;
NSVGimage_ptr nsvgParseFromFile(const std::string &svg_file_path, const char *units = "mm", float dpi = 96.0f);
bool save(const NSVGimage &image, const std::string &svg_file_path);

28
src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp
View File

@ -16,6 +16,7 @@
#include "libslic3r/SVG.hpp" // debug store
#include "libslic3r/Geometry.hpp" // covex hull 2d
#include "libslic3r/Timer.hpp" // covex hull 2d
#include "libslic3r/Emboss.hpp" // heal_shape
#include "libslic3r/NSVGUtils.hpp"
#include "libslic3r/Model.hpp"
@ -875,7 +876,7 @@ bool GLGizmoSVG::draw_preview(){
ImVec2 s(m_texture.width, m_texture.height);
ImGui::Image(id, s);
if(ImGui::IsItemHovered()){
size_t count_shapes = count(*m_volume->emboss_shape->svg_file.image->shapes);
size_t count_shapes = ::count(*m_volume->emboss_shape->svg_file.image->shapes);
ImGui::SetTooltip("%d count shapes", count_shapes);
}
}
@ -1000,18 +1001,20 @@ void GLGizmoSVG::draw_size()
std::optional<Vec3d> new_absolute_scale;
const double minimal_scale_ratio_change = 1e-4;
if (m_keep_ratio) {
std::stringstream ss;
ss << std::setprecision(2) << width << " x " << height << " " << (use_inch ? "in" : "mm");
ss << std::setprecision(2) << std::fixed << width << " x " << height << " " << (use_inch ? "in" : "mm");
ImGui::SameLine(m_gui_cfg->input_offset);
ImGui::SetNextItemWidth(m_gui_cfg->input_width);
// convert to float for slider
float width_f = width;
if (m_imgui->slider_float("##width_size_slider", &width_f, 5.f, 100.f, ss.str().c_str())) {
if (m_imgui->slider_float("##width_size_slider", &width_f, 5.f, 100.f, ss.str().c_str(), 1.f, false)) {
double width_ratio = width_f / width;
if (std::fabs(width_ratio - 1.) > 1e-4) {
if (std::fabs(width_ratio - 1.) > minimal_scale_ratio_change) {
m_scale_width = m_scale_width.value_or(1.f) * width_ratio;
m_scale_height = m_scale_height.value_or(1.f) * width_ratio;
new_absolute_scale = Vec3d(*m_scale_width, *m_scale_height, 1.);
@ -1033,8 +1036,10 @@ void GLGizmoSVG::draw_size()
double prev_width = width;
if (ImGui::InputDouble("##width", &width, step, fast_step, size_format, flags)) {
double width_ratio = width / prev_width;
m_scale_width = m_scale_width.value_or(1.f) * width_ratio;
new_absolute_scale = Vec3d(*m_scale_width, m_scale_height.value_or(1.f), 1.);
if (std::fabs(width_ratio - 1.) > minimal_scale_ratio_change) {
m_scale_width = m_scale_width.value_or(1.f) * width_ratio;
new_absolute_scale = Vec3d(*m_scale_width, m_scale_height.value_or(1.f), 1.);
}
}
if (ImGui::IsItemHovered())
ImGui::SetTooltip("%s", "Width of SVG.");
@ -1044,8 +1049,10 @@ void GLGizmoSVG::draw_size()
double prev_height = height;
if (ImGui::InputDouble("##height", &height, step, fast_step, size_format, flags)) {
double height_ratio = height / prev_height;
m_scale_height = m_scale_height.value_or(1.f) * height_ratio;
new_absolute_scale = Vec3d(m_scale_width.value_or(1.f), *m_scale_height, 1.);
if (std::fabs(height_ratio - 1.) > minimal_scale_ratio_change) {
m_scale_height = m_scale_height.value_or(1.f) * height_ratio;
new_absolute_scale = Vec3d(m_scale_width.value_or(1.f), *m_scale_height, 1.);
}
}
if (ImGui::IsItemHovered())
ImGui::SetTooltip("%s", "Height of SVG.");
@ -1464,11 +1471,16 @@ ExPolygonsWithIds create_shape_with_ids(const NSVGimage &image, double tesselati
if (expoly.empty())
return {};
expoly = union_ex(expoly);
if (!Slic3r::Emboss::heal_shape(expoly, 10))
return {};
// SVG is used as centered
// Do not disturb user by settings of pivot position
BoundingBox bb = get_extents(expoly);
translate(expoly, -bb.center());
// Preparation for multi shape in svg
unsigned id = 0;
return {{id, expoly}};
}