mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-24 15:13:58 -06:00
Merge remote-tracking branch 'origin/master' into profile_changes_reset
This commit is contained in:
YuSanka
commit
08a8fe84a4
46 changed files with 11102 additions and 6732 deletions
|
|
@ -9,13 +9,11 @@ use List::Util qw(first);
|
|||
use Slic3r::GUI::2DBed;
|
||||
use Slic3r::GUI::AboutDialog;
|
||||
use Slic3r::GUI::BedShapeDialog;
|
||||
use Slic3r::GUI::BonjourBrowser;
|
||||
use Slic3r::GUI::ConfigWizard;
|
||||
use Slic3r::GUI::Controller;
|
||||
use Slic3r::GUI::Controller::ManualControlDialog;
|
||||
use Slic3r::GUI::Controller::PrinterPanel;
|
||||
use Slic3r::GUI::MainFrame;
|
||||
use Slic3r::GUI::Notifier;
|
||||
use Slic3r::GUI::Plater;
|
||||
use Slic3r::GUI::Plater::2D;
|
||||
use Slic3r::GUI::Plater::2DToolpaths;
|
||||
|
|
@ -34,7 +32,6 @@ use Slic3r::GUI::SystemInfo;
|
|||
use Wx::Locale gettext => 'L';
|
||||
|
||||
our $have_OpenGL = eval "use Slic3r::GUI::3DScene; 1";
|
||||
our $have_LWP = eval "use LWP::UserAgent; 1";
|
||||
|
||||
use Wx 0.9901 qw(:bitmap :dialog :icon :id :misc :systemsettings :toplevelwindow :filedialog :font);
|
||||
use Wx::Event qw(EVT_IDLE EVT_COMMAND EVT_MENU);
|
||||
|
|
@ -88,7 +85,6 @@ sub OnInit {
|
|||
Slic3r::set_data_dir($datadir || Wx::StandardPaths::Get->GetUserDataDir);
|
||||
Slic3r::GUI::set_wxapp($self);
|
||||
|
||||
$self->{notifier} = Slic3r::GUI::Notifier->new;
|
||||
$self->{app_config} = Slic3r::GUI::AppConfig->new;
|
||||
$self->{preset_bundle} = Slic3r::GUI::PresetBundle->new;
|
||||
|
||||
|
|
@ -177,6 +173,13 @@ sub recreate_GUI{
|
|||
$topwindow->Destroy;
|
||||
}
|
||||
|
||||
EVT_IDLE($self->{mainframe}, sub {
|
||||
while (my $cb = shift @cb) {
|
||||
$cb->();
|
||||
}
|
||||
$self->{app_config}->save if $self->{app_config}->dirty;
|
||||
});
|
||||
|
||||
my $run_wizard = 1 if $self->{preset_bundle}->has_defauls_only;
|
||||
if ($run_wizard) {
|
||||
# On OSX the UI was not initialized correctly if the wizard was called
|
||||
|
|
@ -271,7 +274,9 @@ sub notify {
|
|||
$frame->RequestUserAttention(&Wx::wxMAC ? wxUSER_ATTENTION_ERROR : wxUSER_ATTENTION_INFO)
|
||||
unless ($frame->IsActive);
|
||||
|
||||
$self->{notifier}->notify($message);
|
||||
# There used to be notifier using a Growl application for OSX, but Growl is dead.
|
||||
# The notifier also supported the Linux X D-bus notifications, but that support was broken.
|
||||
#TODO use wxNotificationMessage?
|
||||
}
|
||||
|
||||
# Called after the Preferences dialog is closed and the program settings are saved.
|
||||
|
|
|
|||
|
|
@ -1,53 +0,0 @@
|
|||
# A tiny dialog to select an OctoPrint device to print to.
|
||||
|
||||
package Slic3r::GUI::BonjourBrowser;
|
||||
use strict;
|
||||
use warnings;
|
||||
use utf8;
|
||||
|
||||
use Wx qw(:dialog :id :misc :sizer :choicebook wxTAB_TRAVERSAL);
|
||||
use Wx::Event qw(EVT_CLOSE);
|
||||
use base 'Wx::Dialog';
|
||||
|
||||
sub new {
|
||||
my $class = shift;
|
||||
my ($parent, $devices) = @_;
|
||||
my $self = $class->SUPER::new($parent, -1, "Device Browser", wxDefaultPosition, [350,700], wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER);
|
||||
|
||||
$self->{devices} = $devices;
|
||||
|
||||
# label
|
||||
my $text = Wx::StaticText->new($self, -1, "Choose an OctoPrint device in your network:", wxDefaultPosition, wxDefaultSize);
|
||||
|
||||
# selector
|
||||
$self->{choice} = my $choice = Wx::Choice->new($self, -1, wxDefaultPosition, wxDefaultSize,
|
||||
[ map $_->name, @{$self->{devices}} ]);
|
||||
|
||||
my $main_sizer = Wx::BoxSizer->new(wxVERTICAL);
|
||||
$main_sizer->Add($text, 1, wxEXPAND | wxALL, 10);
|
||||
$main_sizer->Add($choice, 1, wxEXPAND | wxALL, 10);
|
||||
$main_sizer->Add($self->CreateButtonSizer(wxOK | wxCANCEL), 0, wxEXPAND);
|
||||
|
||||
$self->SetSizer($main_sizer);
|
||||
$self->SetMinSize($self->GetSize);
|
||||
$main_sizer->SetSizeHints($self);
|
||||
|
||||
# needed to actually free memory
|
||||
EVT_CLOSE($self, sub {
|
||||
$self->EndModal(wxID_OK);
|
||||
$self->Destroy;
|
||||
});
|
||||
|
||||
return $self;
|
||||
}
|
||||
|
||||
sub GetValue {
|
||||
my ($self) = @_;
|
||||
return $self->{devices}[ $self->{choice}->GetSelection ]->address;
|
||||
}
|
||||
sub GetPort {
|
||||
my ($self) = @_;
|
||||
return $self->{devices}[ $self->{choice}->GetSelection ]->port;
|
||||
}
|
||||
|
||||
1;
|
||||
|
|
@ -25,10 +25,6 @@ our $last_config;
|
|||
our $VALUE_CHANGE_EVENT = Wx::NewEventType;
|
||||
# 2) To inform about a preset selection change or a "modified" status change.
|
||||
our $PRESETS_CHANGED_EVENT = Wx::NewEventType;
|
||||
# 3) To inform about a click on Browse button
|
||||
our $BUTTON_BROWSE_EVENT = Wx::NewEventType;
|
||||
# 4) To inform about a click on Test button
|
||||
our $BUTTON_TEST_EVENT = Wx::NewEventType;
|
||||
|
||||
sub new {
|
||||
my ($class, %params) = @_;
|
||||
|
|
@ -169,59 +165,7 @@ sub _init_tabpanel {
|
|||
}
|
||||
}
|
||||
});
|
||||
# The following event is emited by the C++ Tab implementation ,
|
||||
# when the Browse button was clicked
|
||||
EVT_COMMAND($self, -1, $BUTTON_BROWSE_EVENT, sub {
|
||||
my ($self, $event) = @_;
|
||||
my $msg = $event->GetString;
|
||||
|
||||
# look for devices
|
||||
my $entries;
|
||||
{
|
||||
my $res = Net::Bonjour->new('http');
|
||||
$res->discover;
|
||||
$entries = [ $res->entries ];
|
||||
}
|
||||
if (@{$entries}) {
|
||||
my $dlg = Slic3r::GUI::BonjourBrowser->new($self, $entries);
|
||||
my $tab = Slic3r::GUI::get_preset_tab("printer");
|
||||
$tab->load_key_value('octoprint_host', $dlg->GetValue . ":" . $dlg->GetPort)
|
||||
if $dlg->ShowModal == wxID_OK;
|
||||
} else {
|
||||
Wx::MessageDialog->new($self, L('No Bonjour device found'), L('Device Browser'), wxOK | wxICON_INFORMATION)->ShowModal;
|
||||
}
|
||||
});
|
||||
# The following event is emited by the C++ Tab implementation ,
|
||||
# when the Test button was clicked
|
||||
EVT_COMMAND($self, -1, $BUTTON_TEST_EVENT, sub {
|
||||
my ($self, $event) = @_;
|
||||
my $msg = $event->GetString;
|
||||
|
||||
my $ua = LWP::UserAgent->new;
|
||||
$ua->timeout(10);
|
||||
|
||||
my $config = Slic3r::GUI::get_preset_tab("printer")->get_config;
|
||||
my $res = $ua->get(
|
||||
"http://" . $config->octoprint_host . "/api/version",
|
||||
'X-Api-Key' => $config->octoprint_apikey,
|
||||
);
|
||||
if ($res->is_success) {
|
||||
Slic3r::GUI::show_info($self, L("Connection to OctoPrint works correctly."), _L("Success!"));
|
||||
} else {
|
||||
Slic3r::GUI::show_error($self,
|
||||
L("I wasn't able to connect to OctoPrint (") . $res->status_line .
|
||||
L("). Check hostname and OctoPrint version (at least 1.1.0 is required)."));
|
||||
}
|
||||
});
|
||||
# A variable to inform C++ Tab implementation about disabling of Browse button
|
||||
$self->{is_disabled_button_browse} = (!eval "use Net::Bonjour; 1") ? 1 : 0 ;
|
||||
# A variable to inform C++ Tab implementation about user_agent
|
||||
$self->{is_user_agent} = (eval "use LWP::UserAgent; 1") ? 1 : 0 ;
|
||||
Slic3r::GUI::create_preset_tabs($self->{no_controller},
|
||||
$self->{is_disabled_button_browse},
|
||||
$self->{is_user_agent},
|
||||
$VALUE_CHANGE_EVENT, $PRESETS_CHANGED_EVENT,
|
||||
$BUTTON_BROWSE_EVENT, $BUTTON_TEST_EVENT);
|
||||
Slic3r::GUI::create_preset_tabs($self->{no_controller}, $VALUE_CHANGE_EVENT, $PRESETS_CHANGED_EVENT);
|
||||
$self->{options_tabs} = {};
|
||||
for my $tab_name (qw(print filament printer)) {
|
||||
$self->{options_tabs}{$tab_name} = Slic3r::GUI::get_preset_tab("$tab_name");
|
||||
|
|
|
|||
|
|
@ -1,46 +0,0 @@
|
|||
# Notify about the end of slicing.
|
||||
# The notifications are sent out using the Growl protocol if installed, and using DBus XWindow protocol.
|
||||
|
||||
package Slic3r::GUI::Notifier;
|
||||
use Moo;
|
||||
|
||||
has 'growler' => (is => 'rw');
|
||||
|
||||
my $icon = Slic3r::var("Slic3r.png");
|
||||
|
||||
sub BUILD {
|
||||
my ($self) = @_;
|
||||
|
||||
if (eval 'use Growl::GNTP; 1') {
|
||||
# register with growl
|
||||
eval {
|
||||
$self->growler(Growl::GNTP->new(AppName => 'Slic3r', AppIcon => $icon));
|
||||
$self->growler->register([{Name => 'SKEIN_DONE', DisplayName => 'Slicing Done'}]);
|
||||
};
|
||||
# if register() fails (for example because of a timeout), disable growler at all
|
||||
$self->growler(undef) if $@;
|
||||
}
|
||||
}
|
||||
|
||||
sub notify {
|
||||
my ($self, $message) = @_;
|
||||
my $title = 'Slicing Done!';
|
||||
|
||||
eval {
|
||||
$self->growler->notify(Event => 'SKEIN_DONE', Title => $title, Message => $message)
|
||||
if $self->growler;
|
||||
};
|
||||
# Net::DBus is broken in multithreaded environment
|
||||
if (0 && eval 'use Net::DBus; 1') {
|
||||
eval {
|
||||
my $session = Net::DBus->session;
|
||||
my $serv = $session->get_service('org.freedesktop.Notifications');
|
||||
my $notifier = $serv->get_object('/org/freedesktop/Notifications',
|
||||
'org.freedesktop.Notifications');
|
||||
$notifier->Notify('Slic3r', 0, $icon, $title, $message, [], {}, -1);
|
||||
undef $Net::DBus::bus_session;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
1;
|
||||
|
|
@ -8,7 +8,6 @@ use utf8;
|
|||
use File::Basename qw(basename dirname);
|
||||
use List::Util qw(sum first max);
|
||||
use Slic3r::Geometry qw(X Y Z scale unscale deg2rad rad2deg);
|
||||
use LWP::UserAgent;
|
||||
use threads::shared qw(shared_clone);
|
||||
use Wx qw(:button :colour :cursor :dialog :filedialog :keycode :icon :font :id :listctrl :misc
|
||||
:panel :sizer :toolbar :window wxTheApp :notebook :combobox wxNullBitmap);
|
||||
|
|
@ -1334,6 +1333,9 @@ sub export_gcode {
|
|||
} else {
|
||||
my $default_output_file = eval { $self->{print}->output_filepath($main::opt{output} // '') };
|
||||
Slic3r::GUI::catch_error($self) and return;
|
||||
# If possible, remove accents from accented latin characters.
|
||||
# This function is useful for generating file names to be processed by legacy firmwares.
|
||||
$default_output_file = Slic3r::GUI::fold_utf8_to_ascii($default_output_file);
|
||||
my $dlg = Wx::FileDialog->new($self, L('Save G-code file as:'),
|
||||
wxTheApp->{app_config}->get_last_output_dir(dirname($default_output_file)),
|
||||
basename($default_output_file), &Slic3r::GUI::FILE_WILDCARDS->{gcode}, wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
|
||||
|
|
@ -1941,7 +1943,7 @@ sub selection_changed {
|
|||
$self->{object_info_manifold}->SetToolTipString($message);
|
||||
$self->{object_info_manifold_warning_icon}->SetToolTipString($message);
|
||||
} else {
|
||||
$self->{object_info_manifold}->SetLabel(L("Yes"));
|
||||
$self->{object_info_manifold}->SetLabel(L("Yes"));
|
||||
$self->{object_info_manifold_warning_icon}->Hide;
|
||||
}
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ require Exporter;
|
|||
our @ISA = qw(Exporter);
|
||||
our @EXPORT_OK = qw(_eq);
|
||||
|
||||
use IO::Scalar;
|
||||
use List::Util qw(first);
|
||||
use Slic3r::Geometry qw(epsilon X Y Z);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,177 +0,0 @@
|
|||
# 2D cut in the XZ plane through the toolpaths.
|
||||
# For debugging purposes.
|
||||
|
||||
package Slic3r::Test::SectionCut;
|
||||
use Moo;
|
||||
|
||||
use List::Util qw(first min max);
|
||||
use Slic3r::Geometry qw(unscale);
|
||||
use Slic3r::Geometry::Clipper qw(intersection_pl);
|
||||
use SVG;
|
||||
use Slic3r::SVG;
|
||||
|
||||
has 'print' => (is => 'ro', required => 1);
|
||||
has 'scale' => (is => 'ro', default => sub { 30 });
|
||||
has 'y_percent' => (is => 'ro', default => sub { 0.5 }); # Y coord of section line expressed as factor
|
||||
has 'line' => (is => 'rw');
|
||||
has '_height' => (is => 'rw');
|
||||
has '_svg' => (is => 'rw');
|
||||
has '_svg_style' => (is => 'rw', default => sub { {} });
|
||||
|
||||
sub BUILD {
|
||||
my $self = shift;
|
||||
|
||||
# calculate the Y coordinate of the section line
|
||||
my $bb = $self->print->bounding_box;
|
||||
my $y = ($bb->y_min + $bb->y_max) * $self->y_percent;
|
||||
|
||||
# store our section line
|
||||
$self->line(Slic3r::Line->new([ $bb->x_min, $y ], [ $bb->x_max, $y ]));
|
||||
}
|
||||
|
||||
sub export_svg {
|
||||
my $self = shift;
|
||||
my ($filename) = @_;
|
||||
|
||||
# get bounding box of print and its height
|
||||
# (Print should return a BoundingBox3 object instead)
|
||||
my $bb = $self->print->bounding_box;
|
||||
my $print_size = $bb->size;
|
||||
$self->_height(max(map $_->print_z, map @{$_->layers}, @{$self->print->objects}));
|
||||
|
||||
# initialize the SVG canvas
|
||||
$self->_svg(my $svg = SVG->new(
|
||||
width => $self->scale * unscale($print_size->x),
|
||||
height => $self->scale * $self->_height,
|
||||
));
|
||||
|
||||
# set default styles
|
||||
$self->_svg_style->{'stroke-width'} = 1;
|
||||
$self->_svg_style->{'fill-opacity'} = 0.5;
|
||||
$self->_svg_style->{'stroke-opacity'} = 0.2;
|
||||
|
||||
# plot perimeters
|
||||
$self->_svg_style->{'stroke'} = '#EE0000';
|
||||
$self->_svg_style->{'fill'} = '#FF0000';
|
||||
$self->_plot_group(sub { map @{$_->perimeters}, @{$_[0]->regions} });
|
||||
|
||||
# plot infill
|
||||
$self->_svg_style->{'stroke'} = '#444444';
|
||||
$self->_svg_style->{'fill'} = '#454545';
|
||||
$self->_plot_group(sub { map @{$_->fills}, @{$_[0]->regions} });
|
||||
|
||||
# plot support material
|
||||
$self->_svg_style->{'stroke'} = '#12EF00';
|
||||
$self->_svg_style->{'fill'} = '#22FF00';
|
||||
$self->_plot_group(sub { $_[0]->isa('Slic3r::Layer::Support') ? ($_[0]->support_fills) : () });
|
||||
|
||||
Slic3r::open(\my $fh, '>', $filename);
|
||||
print $fh $svg->xmlify;
|
||||
close $fh;
|
||||
printf "Section cut SVG written to %s\n", $filename;
|
||||
}
|
||||
|
||||
sub _plot_group {
|
||||
my $self = shift;
|
||||
my ($filter) = @_;
|
||||
|
||||
my $bb = $self->print->bounding_box;
|
||||
my $g = $self->_svg->group(style => { %{$self->_svg_style} });
|
||||
|
||||
foreach my $object (@{$self->print->objects}) {
|
||||
foreach my $copy (@{$object->_shifted_copies}) {
|
||||
foreach my $layer (@{$object->layers}, @{$object->support_layers}) {
|
||||
# get all ExtrusionPath objects
|
||||
my @paths = map $_->clone,
|
||||
map { ($_->isa('Slic3r::ExtrusionLoop') || $_->isa('Slic3r::ExtrusionPath::Collection')) ? @$_ : $_ }
|
||||
grep defined $_,
|
||||
$filter->($layer);
|
||||
|
||||
# move paths to location of copy
|
||||
$_->polyline->translate(@$copy) for @paths;
|
||||
|
||||
if (0) {
|
||||
# export plan with section line and exit
|
||||
require "Slic3r/SVG.pm";
|
||||
Slic3r::SVG::output(
|
||||
"line.svg",
|
||||
no_arrows => 1,
|
||||
lines => [ $self->line ],
|
||||
red_polylines => [ map $_->polyline, @paths ],
|
||||
);
|
||||
exit;
|
||||
}
|
||||
|
||||
foreach my $path (@paths) {
|
||||
foreach my $line (@{$path->lines}) {
|
||||
my @intersections = @{intersection_pl(
|
||||
[ $self->line->as_polyline ],
|
||||
$line->grow(Slic3r::Geometry::scale $path->width/2),
|
||||
)};
|
||||
|
||||
die "Intersection has more than two points!\n"
|
||||
if defined first { @$_ > 2 } @intersections;
|
||||
|
||||
# turn intersections to lines
|
||||
my @lines = map Slic3r::Line->new(@$_), @intersections;
|
||||
|
||||
# align intersections to canvas
|
||||
$_->translate(-$bb->x_min, 0) for @lines;
|
||||
|
||||
# we want lines oriented from left to right in order to draw
|
||||
# rectangles correctly
|
||||
foreach my $line (@lines) {
|
||||
$line->reverse if $line->a->x > $line->b->x;
|
||||
}
|
||||
|
||||
if ($path->is_bridge) {
|
||||
foreach my $line (@lines) {
|
||||
my $radius = $path->width / 2;
|
||||
my $width = unscale abs($line->b->x - $line->a->x);
|
||||
if ((10 * $radius) < $width) {
|
||||
# we're cutting the path in the longitudinal direction, so we've got a rectangle
|
||||
$g->rectangle(
|
||||
'x' => $self->scale * unscale($line->a->x),
|
||||
'y' => $self->scale * $self->_y($layer->print_z),
|
||||
'width' => $self->scale * $width,
|
||||
'height' => $self->scale * $radius * 2,
|
||||
'rx' => $self->scale * $radius * 0.35,
|
||||
'ry' => $self->scale * $radius * 0.35,
|
||||
);
|
||||
} else {
|
||||
$g->circle(
|
||||
'cx' => $self->scale * (unscale($line->a->x) + $radius),
|
||||
'cy' => $self->scale * $self->_y($layer->print_z - $radius),
|
||||
'r' => $self->scale * $radius,
|
||||
);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
foreach my $line (@lines) {
|
||||
my $height = $path->height;
|
||||
$height = $layer->height if $height == -1;
|
||||
$g->rectangle(
|
||||
'x' => $self->scale * unscale($line->a->x),
|
||||
'y' => $self->scale * $self->_y($layer->print_z),
|
||||
'width' => $self->scale * unscale($line->b->x - $line->a->x),
|
||||
'height' => $self->scale * $height,
|
||||
'rx' => $self->scale * $height * 0.5,
|
||||
'ry' => $self->scale * $height * 0.5,
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
sub _y {
|
||||
my $self = shift;
|
||||
my ($y) = @_;
|
||||
|
||||
return $self->_height - $y;
|
||||
}
|
||||
|
||||
1;
|
||||
Loading…
Add table
Add a link
Reference in a new issue