juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-17 02:22:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Unicode handling:

Browse Source 
Removed the Perl dependencies on Encode, Encode::Locale and Unicode::Normalize.
Added dependency on boost::locale.
Added encode_path, decode_path, normalize_utf8 functions to Slic3r.xs

Slic3r.xs has been made mostly utf8 safe by using the boost::nowide library,
thanks to @alexrj for the idea.

Simplified the encode_path / decode_path stuff:
wxWidgets are unicode already, so there is no need to decode_path() from it.
Perl / win32 interfacing is non-unicode, so decode_path() is executed
on ARGV just at the beginning of the perl scripts.
This commit is contained in:
bubnikv
2017-08-03 17:31:31 +02:00
parent 31085fb1d7
commit 1385018724
33 changed files with 236 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
utils/amf-to-stl.pl
View File

@@ -14,6 +14,9 @@ use Getopt::Long qw(:config no_auto_abbrev);
use Slic3r;
$|++;
# Convert all parameters from the local code page to utf8 on Windows.
@ARGV = map Slic3r::decode_path($_), @ARGV if $^O eq 'MSWin32';
my %opt = ();
{
my %options = (
@@ -25,12 +28,12 @@ my %opt = ();
}
{
my $model = Slic3r::Model->load_amf(Slic3r::encode_path($ARGV[0]));
my $model = Slic3r::Model->load_amf($ARGV[0]);
my $output_file = $ARGV[0];
$output_file =~ s/\.[aA][mM][fF](?:\.[xX][mM][lL])?$/\.stl/;
printf "Writing to %s\n", basename($output_file);
$model->store_stl(Slic3r::encode_path($output_file), binary => !$opt{ascii});
$model->store_stl($output_file, binary => !$opt{ascii});
}

4
utils/dump-stl.pl
View File

@@ -18,7 +18,7 @@ $|++;
$ARGV[0] or usage(1);
if (-e $ARGV[0]) {
my $model = Slic3r::Model->load_stl(Slic3r::encode_path($ARGV[0]), basename($ARGV[0]));
my $model = Slic3r::Model->load_stl($ARGV[0], basename($ARGV[0]));
$model->objects->[0]->add_instance(offset => Slic3r::Pointf->new(0,0));
my $mesh = $model->mesh;
$mesh->repair;
@@ -27,7 +27,7 @@ if (-e $ARGV[0]) {
exit 0;
} elsif ((my $model = Slic3r::Test::model($ARGV[0]))) {
$ARGV[1] or die "Missing writeable destination as second argument\n";
$model->store_stl(Slic3r::encode_path($ARGV[1]), 1);
$model->store_stl($ARGV[1], 1);
printf "Model $ARGV[0] written to $ARGV[1]\n";
exit 0;
} else {

4
utils/split_stl.pl
View File

@@ -25,7 +25,7 @@ my %opt = ();
}
{
my $model = Slic3r::Model->load_stl(Slic3r::encode_path($ARGV[0]), basename($ARGV[0]));
my $model = Slic3r::Model->load_stl($ARGV[0], basename($ARGV[0]));
my $basename = $ARGV[0];
$basename =~ s/\.[sS][tT][lL]$//;
@@ -43,7 +43,7 @@ my %opt = ();
my $output_file = sprintf '%s_%02d.stl', $basename, ++$part_count;
printf "Writing to %s\n", basename($output_file);
$new_model->store_stl(Slic3r::encode_path($output_file), !$opt{ascii});
$new_model->store_stl($output_file, !$opt{ascii});
}
}

4
utils/stl-to-amf.pl
View File

@@ -25,7 +25,7 @@ my %opt = ();
}
{
my @models = map Slic3r::Model->load_stl(Slic3r::encode_path($_), basename($_)), @ARGV;
my @models = map Slic3r::Model->load_stl($_, basename($_)), @ARGV;
my $output_file = $ARGV[0];
$output_file =~ s/\.[sS][tT][lL]$/.amf.xml/;
@@ -53,7 +53,7 @@ my %opt = ();
}
printf "Writing to %s\n", basename($output_file);
$new_model->store_amf(Slic3r::encode_path($output_file));
$new_model->store_amf($output_file);
}