diff options
| author | Enrico Turri <enricoturri@seznam.cz> | 2018-08-23 16:37:38 +0300 |
|---|---|---|
| committer | Enrico Turri <enricoturri@seznam.cz> | 2018-08-23 16:37:38 +0300 |
| commit | 66ce6384392a7a748e1535a8d84671ffe9f01ef7 (patch) | |
| tree | 2b5b5c805171667fab51db69f6620f061c066003 /lib | |
| parent | a5fcdeec23dd7a4ac17f1331310e6275cd4ef2ca (diff) | |
| parent | 76d60070eb8ccb10f60aebb8036075a2065a9fb8 (diff) | |
Fixed conflicts after merging with branch eigenize
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Slic3r/ExPolygon.pm | 12 | ||||
| -rw-r--r-- | lib/Slic3r/GUI/2DBed.pm | 1 | ||||
| -rw-r--r-- | lib/Slic3r/Point.pm | 5 | ||||
| -rw-r--r-- | lib/Slic3r/Polyline.pm | 5 |
4 files changed, 1 insertions, 22 deletions
diff --git a/lib/Slic3r/ExPolygon.pm b/lib/Slic3r/ExPolygon.pm index 27aa1a59b..6adb650c2 100644 --- a/lib/Slic3r/ExPolygon.pm +++ b/lib/Slic3r/ExPolygon.pm @@ -7,18 +7,6 @@ use warnings; use List::Util qw(first); use Slic3r::Geometry::Clipper qw(union_ex diff_pl); -sub wkt { - my $self = shift; - return sprintf "POLYGON(%s)", - join ',', map "($_)", map { join ',', map "$_->[0] $_->[1]", @$_ } @$self; -} - -sub dump_perl { - my $self = shift; - return sprintf "[%s]", - join ',', map "[$_]", map { join ',', map "[$_->[0],$_->[1]]", @$_ } @$self; -} - sub offset { my $self = shift; return Slic3r::Geometry::Clipper::offset(\@$self, @_); diff --git a/lib/Slic3r/GUI/2DBed.pm b/lib/Slic3r/GUI/2DBed.pm index ebbc70b6b..0891a4836 100644 --- a/lib/Slic3r/GUI/2DBed.pm +++ b/lib/Slic3r/GUI/2DBed.pm @@ -1,4 +1,5 @@ # Bed shape dialog +# still used by the Slic3r::GUI::Controller::ManualControlDialog Perl module. package Slic3r::GUI::2DBed; use strict; diff --git a/lib/Slic3r/Point.pm b/lib/Slic3r/Point.pm index 535a97194..1134138ea 100644 --- a/lib/Slic3r/Point.pm +++ b/lib/Slic3r/Point.pm @@ -7,11 +7,6 @@ sub new_scale { return $class->new(map Slic3r::Geometry::scale($_), @_); } -sub dump_perl { - my $self = shift; - return sprintf "[%s,%s]", @$self; -} - package Slic3r::Pointf; use strict; use warnings; diff --git a/lib/Slic3r/Polyline.pm b/lib/Slic3r/Polyline.pm index 9cc142409..a42b5d1c4 100644 --- a/lib/Slic3r/Polyline.pm +++ b/lib/Slic3r/Polyline.pm @@ -10,9 +10,4 @@ sub new_scale { return $class->new(map [ Slic3r::Geometry::scale($_->[X]), Slic3r::Geometry::scale($_->[Y]) ], @points); } -sub dump_perl { - my $self = shift; - return sprintf "[%s]", join ',', map "[$_->[0],$_->[1]]", @$self; -} - 1; |