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

Improvements to SVG debug tools: honor input order and support all colours

Browse source
This commit is contained in:
Alessandro Ranellucci 2013-08-13 10:34:49 +02:00
parent dbe429cf73
commit ef8ce1b5ba
1 changed files with 38 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

98
lib/Slic3r/SVG.pm
View file

@ -34,33 +34,36 @@ sub svg {
} }
sub output { sub output {
my ($filename, %things) = @_; my ($filename, @things) = @_;
my $svg = svg(); my $svg = svg();
my $arrows = 1;
foreach my $type (qw(expolygons red_expolygons green_expolygons)) { while (my $type = shift @things) {
next if !$things{$type}; my $value = shift @things;
my ($colour) = $type =~ /^(red|green)_/;
my $g = $svg->group( if ($type eq 'no_arrows') {
style => { $arrows = 0;
'stroke-width' => 2, } elsif ($type =~ /^(?:(.+?)_)?expolygons$/) {
'stroke' => $colour || 'black', my $colour = $1;
'fill' => ($type !~ /polygons/ ? 'none' : ($colour || 'grey')),
'fill-type' => $filltype, my $g = $svg->group(
}, style => {
); 'stroke-width' => 2,
foreach my $expolygon (@{$things{$type}}) { 'stroke' => $colour || 'black',
my $points = join ' ', map "M $_ z", map join(" ", reverse map $_->[0]*factor() . " " . $_->[1]*factor(), @$_), @$expolygon; 'fill' => ($type !~ /polygons/ ? 'none' : ($colour || 'grey')),
$g->path( 'fill-type' => $filltype,
d => $points, },
); );
} foreach my $expolygon (@$value) {
} my $points = join ' ', map "M $_ z", map join(" ", reverse map $_->[0]*factor() . " " . $_->[1]*factor(), @$_), @$expolygon;
$g->path(
foreach my $type (qw(polygons polylines white_polygons green_polygons red_polygons red_polylines green_polylines)) { d => $points,
if ($things{$type}) { );
my $method = $type =~ /polygons/ ? 'polygon' : 'polyline'; }
my ($colour) = $type =~ /^(red|green)_/; } elsif ($type =~ /^(?:(.+?)_)?(polygon|polyline)s$/) {
my ($colour, $method) = ($1, $2);
my $g = $svg->group( my $g = $svg->group(
style => { style => {
'stroke-width' => 2, 'stroke-width' => 2,
@ -68,7 +71,7 @@ sub output {
'fill' => ($type !~ /polygons/ ? 'none' : ($colour || 'grey')), 'fill' => ($type !~ /polygons/ ? 'none' : ($colour || 'grey')),
}, },
); );
foreach my $polygon (@{$things{$type}}) { foreach my $polygon (@$value) {
my $path = $svg->get_path( my $path = $svg->get_path(
'x' => [ map($_->[X] * factor(), @$polygon) ], 'x' => [ map($_->[X] * factor(), @$polygon) ],
'y' => [ map($_->[Y] * factor(), @$polygon) ], 'y' => [ map($_->[Y] * factor(), @$polygon) ],
@ -76,15 +79,13 @@ sub output {
); );
$g->$method( $g->$method(
%$path, %$path,
'marker-end' => $things{no_arrows} ? "" : "url(#endArrow)", 'marker-end' => $arrows ? "" : "url(#endArrow)",
); );
} }
} } elsif ($type =~ /^(?:(.+?)_)?points$/) {
} my $colour = $1;
my $r = $colour eq 'black' ? 5 : 3;
foreach my $type (qw(points red_points)) {
if ($things{$type}) {
my ($colour, $r) = $type eq 'points' ? ('black', 5) : ('red', 3);
my $g = $svg->group( my $g = $svg->group(
style => { style => {
'stroke-width' => 2, 'stroke-width' => 2,
@ -92,25 +93,22 @@ sub output {
'fill' => $colour, 'fill' => $colour,
}, },
); );
foreach my $point (@{$things{$type}}) { foreach my $point (@$value) {
$g->circle( $g->circle(
cx => $point->[X] * factor(), cx => $point->[X] * factor(),
cy => $point->[Y] * factor(), cy => $point->[Y] * factor(),
r => $r, r => $r,
); );
} }
} } elsif ($type =~ /^(?:(.+?)_)?lines$/) {
} my $colour = $1;
foreach my $type (qw(lines red_lines green_lines)) {
if ($things{$type}) {
my ($colour) = $type =~ /^(red|green)_/;
my $g = $svg->group( my $g = $svg->group(
style => { style => {
'stroke-width' => 2, 'stroke-width' => 2,
}, },
); );
foreach my $line (@{$things{$type}}) { foreach my $line (@$value) {
$g->line( $g->line(
x1 => $line->[0][X] * factor(), x1 => $line->[0][X] * factor(),
y1 => $line->[0][Y] * factor(), y1 => $line->[0][Y] * factor(),
@ -119,7 +117,7 @@ sub output {
style => { style => {
'stroke' => $colour || 'black', 'stroke' => $colour || 'black',
}, },
'marker-end' => $things{no_arrows} ? "" : "url(#endArrow)", 'marker-end' => $arrows ? "" : "url(#endArrow)",
); );
} }
} }
@ -128,26 +126,6 @@ sub output {
write_svg($svg, $filename); write_svg($svg, $filename);
} }
sub output_points {
my ($print, $filename, $points, $red_points) = @_;
return output($print, $filename, points => $points, red_points => $red_points);
}
sub output_polygons {
my ($print, $filename, $polygons) = @_;
return output($print, $filename, polygons => $polygons);
}
sub output_polylines {
my ($print, $filename, $polylines) = @_;
return output($print, $filename, polylines => $polylines);
}
sub output_lines {
my ($print, $filename, $lines) = @_;
return output($print, $filename, lines => $lines);
}
sub write_svg { sub write_svg {
my ($svg, $filename) = @_; my ($svg, $filename) = @_;