Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/prusa3d/PrusaSlicer.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/Slic3r/GUI.pm1
-rw-r--r--lib/Slic3r/GUI/BedShapeDialog.pm316
-rw-r--r--xs/src/slic3r/GUI/ConfigWizard.cpp17
-rw-r--r--xs/src/slic3r/GUI/GUI.cpp2
-rw-r--r--xs/src/slic3r/Utils/PresetUpdater.cpp27
5 files changed, 28 insertions, 335 deletions
diff --git a/lib/Slic3r/GUI.pm b/lib/Slic3r/GUI.pm
index 52c482813..80130fefe 100644
--- a/lib/Slic3r/GUI.pm
+++ b/lib/Slic3r/GUI.pm
@@ -7,7 +7,6 @@ use File::Basename qw(basename);
use FindBin;
use List::Util qw(first);
use Slic3r::GUI::2DBed;
-use Slic3r::GUI::BedShapeDialog;
use Slic3r::GUI::Controller;
use Slic3r::GUI::Controller::ManualControlDialog;
use Slic3r::GUI::Controller::PrinterPanel;
diff --git a/lib/Slic3r/GUI/BedShapeDialog.pm b/lib/Slic3r/GUI/BedShapeDialog.pm
deleted file mode 100644
index 70c8e0256..000000000
--- a/lib/Slic3r/GUI/BedShapeDialog.pm
+++ /dev/null
@@ -1,316 +0,0 @@
-# The bed shape dialog.
-# The dialog opens from Print Settins tab -> Bed Shape: Set...
-
-package Slic3r::GUI::BedShapeDialog;
-use strict;
-use warnings;
-use utf8;
-
-use List::Util qw(min max);
-use Slic3r::Geometry qw(X Y unscale);
-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, $default) = @_;
- my $self = $class->SUPER::new($parent, -1, "Bed Shape", wxDefaultPosition, [350,700], wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER);
-
- $self->{panel} = my $panel = Slic3r::GUI::BedShapePanel->new($self, $default);
-
- my $main_sizer = Wx::BoxSizer->new(wxVERTICAL);
- $main_sizer->Add($panel, 1, wxEXPAND);
- $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->{panel}->GetValue;
-}
-
-package Slic3r::GUI::BedShapePanel;
-
-use List::Util qw(min max sum first);
-use Scalar::Util qw(looks_like_number);
-use Slic3r::Geometry qw(PI X Y unscale scaled_epsilon);
-use Wx qw(:font :id :misc :sizer :choicebook :filedialog :pen :brush wxTAB_TRAVERSAL);
-use Wx::Event qw(EVT_CLOSE EVT_CHOICEBOOK_PAGE_CHANGED EVT_BUTTON);
-use base 'Wx::Panel';
-
-use constant SHAPE_RECTANGULAR => 0;
-use constant SHAPE_CIRCULAR => 1;
-use constant SHAPE_CUSTOM => 2;
-
-sub new {
- my $class = shift;
- my ($parent, $default) = @_;
- my $self = $class->SUPER::new($parent, -1);
-
- $self->on_change(undef);
-
- my $box = Wx::StaticBox->new($self, -1, "Shape");
- my $sbsizer = Wx::StaticBoxSizer->new($box, wxVERTICAL);
-
- # shape options
- $self->{shape_options_book} = Wx::Choicebook->new($self, -1, wxDefaultPosition, [300,-1], wxCHB_TOP);
- $sbsizer->Add($self->{shape_options_book});
-
- $self->{optgroups} = [];
- {
- my $optgroup = $self->_init_shape_options_page('Rectangular');
- $optgroup->append_single_option_line(Slic3r::GUI::OptionsGroup::Option->new(
- opt_id => 'rect_size',
- type => 'point',
- label => 'Size',
- tooltip => 'Size in X and Y of the rectangular plate.',
- default => [200,200],
- ));
- $optgroup->append_single_option_line(Slic3r::GUI::OptionsGroup::Option->new(
- opt_id => 'rect_origin',
- type => 'point',
- label => 'Origin',
- tooltip => 'Distance of the 0,0 G-code coordinate from the front left corner of the rectangle.',
- default => [0,0],
- ));
- }
- {
- my $optgroup = $self->_init_shape_options_page('Circular');
- $optgroup->append_single_option_line(Slic3r::GUI::OptionsGroup::Option->new(
- opt_id => 'diameter',
- type => 'f',
- label => 'Diameter',
- tooltip => 'Diameter of the print bed. It is assumed that origin (0,0) is located in the center.',
- sidetext => 'mm',
- default => 200,
- ));
- }
- {
- my $optgroup = $self->_init_shape_options_page('Custom');
- $optgroup->append_line(Slic3r::GUI::OptionsGroup::Line->new(
- full_width => 1,
- widget => sub {
- my ($parent) = @_;
-
- my $btn = Wx::Button->new($parent, -1, "Load shape from STL...", wxDefaultPosition, wxDefaultSize);
- EVT_BUTTON($self, $btn, sub { $self->_load_stl });
- return $btn;
- }
- ));
- }
-
- EVT_CHOICEBOOK_PAGE_CHANGED($self, -1, sub {
- $self->_update_shape;
- });
-
- # right pane with preview canvas
- my $canvas = $self->{canvas} = Slic3r::GUI::2DBed->new($self);
-
- # main sizer
- my $top_sizer = Wx::BoxSizer->new(wxHORIZONTAL);
- $top_sizer->Add($sbsizer, 0, wxEXPAND | wxTOP | wxBOTTOM, 10);
- $top_sizer->Add($canvas, 1, wxEXPAND | wxALL, 10) if $canvas;
-
- $self->SetSizerAndFit($top_sizer);
-
- $self->_set_shape($default);
- $self->_update_preview;
-
- return $self;
-}
-
-sub on_change {
- my ($self, $cb) = @_;
- $self->{on_change} = $cb // sub {};
-}
-
-# Called from the constructor.
-# Set the initial bed shape from a list of points.
-# Deduce the bed shape type (rect, circle, custom)
-# This routine shall be smart enough if the user messes up
-# with the list of points in the ini file directly.
-sub _set_shape {
- my ($self, $points) = @_;
-
- # is this a rectangle?
- if (@$points == 4) {
- my $polygon = Slic3r::Polygon->new_scale(@$points);
- my $lines = $polygon->lines;
- if ($lines->[0]->parallel_to_line($lines->[2]) && $lines->[1]->parallel_to_line($lines->[3])) {
- # okay, it's a rectangle
-
- # find origin
- # the || 0 hack prevents "-0" which might confuse the user
- my $x_min = min(map $_->[X], @$points) || 0;
- my $x_max = max(map $_->[X], @$points) || 0;
- my $y_min = min(map $_->[Y], @$points) || 0;
- my $y_max = max(map $_->[Y], @$points) || 0;
- my $origin = [-$x_min, -$y_min];
-
- $self->{shape_options_book}->SetSelection(SHAPE_RECTANGULAR);
- my $optgroup = $self->{optgroups}[SHAPE_RECTANGULAR];
- $optgroup->set_value('rect_size', [ $x_max-$x_min, $y_max-$y_min ]);
- $optgroup->set_value('rect_origin', $origin);
- $self->_update_shape;
- return;
- }
- }
-
- # is this a circle?
- {
- # Analyze the array of points. Do they reside on a circle?
- my $polygon = Slic3r::Polygon->new_scale(@$points);
- my $center = $polygon->bounding_box->center;
- my @vertex_distances = map $center->distance_to($_), @$polygon;
- my $avg_dist = sum(@vertex_distances)/@vertex_distances;
- if (!defined first { abs($_ - $avg_dist) > 10*scaled_epsilon } @vertex_distances) {
- # all vertices are equidistant to center
- $self->{shape_options_book}->SetSelection(SHAPE_CIRCULAR);
- my $optgroup = $self->{optgroups}[SHAPE_CIRCULAR];
- $optgroup->set_value('diameter', sprintf("%.0f", unscale($avg_dist*2)));
- $self->_update_shape;
- return;
- }
- }
-
- if (@$points < 3) {
- # Invalid polygon. Revert to default bed dimensions.
- $self->{shape_options_book}->SetSelection(SHAPE_RECTANGULAR);
- my $optgroup = $self->{optgroups}[SHAPE_RECTANGULAR];
- $optgroup->set_value('rect_size', [200, 200]);
- $optgroup->set_value('rect_origin', [0, 0]);
- $self->_update_shape;
- return;
- }
-
- # This is a custom bed shape, use the polygon provided.
- $self->{shape_options_book}->SetSelection(SHAPE_CUSTOM);
- # Copy the polygon to the canvas, make a copy of the array.
- $self->{canvas}->bed_shape([@$points]);
- $self->_update_shape;
-}
-
-# Update the bed shape from the dialog fields.
-sub _update_shape {
- my ($self) = @_;
-
- my $page_idx = $self->{shape_options_book}->GetSelection;
- if ($page_idx == SHAPE_RECTANGULAR) {
- my $rect_size = $self->{optgroups}[SHAPE_RECTANGULAR]->get_value('rect_size');
- my $rect_origin = $self->{optgroups}[SHAPE_RECTANGULAR]->get_value('rect_origin');
- my ($x, $y) = @$rect_size;
- return if !looks_like_number($x) || !looks_like_number($y); # empty strings or '-' or other things
- return if !$x || !$y or $x == 0 or $y == 0;
- my ($x0, $y0) = (0,0);
- my ($x1, $y1) = ($x ,$y);
- {
- my ($dx, $dy) = @$rect_origin;
- return if !looks_like_number($dx) || !looks_like_number($dy); # empty strings or '-' or other things
- $x0 -= $dx;
- $x1 -= $dx;
- $y0 -= $dy;
- $y1 -= $dy;
- }
- $self->{canvas}->bed_shape([
- [$x0,$y0],
- [$x1,$y0],
- [$x1,$y1],
- [$x0,$y1],
- ]);
- } elsif ($page_idx == SHAPE_CIRCULAR) {
- my $diameter = $self->{optgroups}[SHAPE_CIRCULAR]->get_value('diameter');
- return if !$diameter or $diameter == 0;
- my $r = $diameter/2;
- my $twopi = 2*PI;
- my $edges = 60;
- my $polygon = Slic3r::Polygon->new_scale(
- map [ $r * cos $_, $r * sin $_ ],
- map { $twopi/$edges*$_ } 1..$edges
- );
- $self->{canvas}->bed_shape([
- map [ unscale($_->x), unscale($_->y) ], @$polygon #))
- ]);
- }
-
- $self->{on_change}->();
- $self->_update_preview;
-}
-
-sub _update_preview {
- my ($self) = @_;
- $self->{canvas}->Refresh if $self->{canvas};
- $self->Refresh;
-}
-
-# Called from the constructor.
-# Create a panel for a rectangular / circular / custom bed shape.
-sub _init_shape_options_page {
- my ($self, $title) = @_;
-
- my $panel = Wx::Panel->new($self->{shape_options_book});
- my $optgroup;
- push @{$self->{optgroups}}, $optgroup = Slic3r::GUI::OptionsGroup->new(
- parent => $panel,
- title => 'Settings',
- label_width => 100,
- on_change => sub {
- my ($opt_id) = @_;
- #$self->{"_$opt_id"} = $optgroup->get_value($opt_id);
- $self->_update_shape;
- },
- );
- $panel->SetSizerAndFit($optgroup->sizer);
- $self->{shape_options_book}->AddPage($panel, $title);
-
- return $optgroup;
-}
-
-# Loads an stl file, projects it to the XY plane and calculates a polygon.
-sub _load_stl {
- my ($self) = @_;
-
- my $dialog = Wx::FileDialog->new($self, 'Choose a file to import bed shape from (STL/OBJ/AMF/PRUSA):', "", "", &Slic3r::GUI::MODEL_WILDCARD, wxFD_OPEN | wxFD_FILE_MUST_EXIST);
- if ($dialog->ShowModal != wxID_OK) {
- $dialog->Destroy;
- return;
- }
- my $input_file = $dialog->GetPaths;
- $dialog->Destroy;
-
- my $model = Slic3r::Model->read_from_file($input_file);
- my $mesh = $model->mesh;
- my $expolygons = $mesh->horizontal_projection;
-
- if (@$expolygons == 0) {
- Slic3r::GUI::show_error($self, "The selected file contains no geometry.");
- return;
- }
- if (@$expolygons > 1) {
- Slic3r::GUI::show_error($self, "The selected file contains several disjoint areas. This is not supported.");
- return;
- }
-
- my $polygon = $expolygons->[0]->contour;
- $self->{canvas}->bed_shape([ map [ unscale($_->x), unscale($_->y) ], @$polygon ]);
- $self->_update_preview();
-}
-
-# Returns the resulting bed shape polygon. This value will be stored to the ini file.
-sub GetValue {
- my ($self) = @_;
- return $self->{canvas}->bed_shape;
-}
-
-1;
diff --git a/xs/src/slic3r/GUI/ConfigWizard.cpp b/xs/src/slic3r/GUI/ConfigWizard.cpp
index aed0c3534..ce06da853 100644
--- a/xs/src/slic3r/GUI/ConfigWizard.cpp
+++ b/xs/src/slic3r/GUI/ConfigWizard.cpp
@@ -113,6 +113,11 @@ PrinterPicker::PrinterPicker(wxWindow *parent, const VendorProfile &vendor, cons
sizer->Add(all_none_sizer, 0, wxEXPAND);
SetSizer(sizer);
+
+ if (cboxes.size() > 0) {
+ cboxes[0]->SetValue(true);
+ on_checkbox(cboxes[0], true);
+ }
}
void PrinterPicker::select_all(bool select)
@@ -598,10 +603,10 @@ void ConfigWizardIndex::on_paint(wxPaintEvent & evt)
static const std::unordered_map<std::string, std::pair<std::string, std::string>> legacy_preset_map {{
{ "Original Prusa i3 MK2.ini", std::make_pair("MK2S", "0.4") },
- { "Original Prusa i3 MK2 MM Single Mode.ini", std::make_pair("MK2S", "0.4") },
- { "Original Prusa i3 MK2 MM Single Mode 0.6 nozzle.ini", std::make_pair("MK2S", "0.6") },
- { "Original Prusa i3 MK2 MultiMaterial.ini", std::make_pair("MK2S", "0.4") },
- { "Original Prusa i3 MK2 MultiMaterial 0.6 nozzle.ini", std::make_pair("MK2S", "0.6") },
+ { "Original Prusa i3 MK2 MM Single Mode.ini", std::make_pair("MK2SMM", "0.4") },
+ { "Original Prusa i3 MK2 MM Single Mode 0.6 nozzle.ini", std::make_pair("MK2SMM", "0.6") },
+ { "Original Prusa i3 MK2 MultiMaterial.ini", std::make_pair("MK2SMM", "0.4") },
+ { "Original Prusa i3 MK2 MultiMaterial 0.6 nozzle.ini", std::make_pair("MK2SMM", "0.6") },
{ "Original Prusa i3 MK2 0.25 nozzle.ini", std::make_pair("MK2S", "0.25") },
{ "Original Prusa i3 MK2 0.6 nozzle.ini", std::make_pair("MK2S", "0.6") },
{ "Original Prusa i3 MK3.ini", std::make_pair("MK3", "0.4") },
@@ -809,8 +814,8 @@ ConfigWizard::ConfigWizard(wxWindow *parent, RunReason reason) :
topsizer->AddSpacer(INDEX_MARGIN);
topsizer->Add(p->hscroll, 1, wxEXPAND);
- p->btn_prev = new wxButton(this, wxID_BACKWARD);
- p->btn_next = new wxButton(this, wxID_FORWARD);
+ p->btn_prev = new wxButton(this, wxID_NONE, _(L("< &Back")));
+ p->btn_next = new wxButton(this, wxID_NONE, _(L("&Next >")));
p->btn_finish = new wxButton(this, wxID_APPLY, _(L("&Finish")));
p->btn_cancel = new wxButton(this, wxID_CANCEL);
p->btnsizer->AddStretchSpacer();
diff --git a/xs/src/slic3r/GUI/GUI.cpp b/xs/src/slic3r/GUI/GUI.cpp
index 974c554b6..e2f3925fc 100644
--- a/xs/src/slic3r/GUI/GUI.cpp
+++ b/xs/src/slic3r/GUI/GUI.cpp
@@ -423,7 +423,7 @@ bool check_unsaved_changes()
bool config_wizard_startup(bool app_config_exists)
{
- if (! app_config_exists || g_PresetBundle->has_defauls_only()) {
+ if (! app_config_exists || g_PresetBundle->printers.size() <= 1) {
config_wizard(ConfigWizard::RR_DATA_EMPTY);
return true;
} else if (g_AppConfig->legacy_datadir()) {
diff --git a/xs/src/slic3r/Utils/PresetUpdater.cpp b/xs/src/slic3r/Utils/PresetUpdater.cpp
index f34fc4c19..8159a75e2 100644
--- a/xs/src/slic3r/Utils/PresetUpdater.cpp
+++ b/xs/src/slic3r/Utils/PresetUpdater.cpp
@@ -259,7 +259,7 @@ void PresetUpdater::priv::sync_config(const std::set<VendorProfile> vendors) con
}
const auto recommended = recommended_it->config_version;
- BOOST_LOG_TRIVIAL(debug) << boost::format("New index for vendor: %1%: current version: %2%, recommended version: %3%")
+ BOOST_LOG_TRIVIAL(debug) << boost::format("Got index for vendor: %1%: current version: %2%, recommended version: %3%")
% vendor.name
% vendor.config_version.to_string()
% recommended.to_string();
@@ -352,20 +352,25 @@ Updates PresetUpdater::priv::get_config_updates() const
continue;
}
- auto path_in_cache = cache_path / (idx.vendor() + ".ini");
- if (! fs::exists(path_in_cache)) {
- BOOST_LOG_TRIVIAL(warning) << "Index indicates update, but new bundle not found in cache: " << path_in_cache.string();
- continue;
+ auto path_src = cache_path / (idx.vendor() + ".ini");
+ if (! fs::exists(path_src)) {
+ auto path_in_rsrc = rsrc_path / (idx.vendor() + ".ini");
+ if (! fs::exists(path_in_rsrc)) {
+ BOOST_LOG_TRIVIAL(warning) << boost::format("Index for vendor %1% indicates update, but bundle found in neither cache nor resources")
+ % idx.vendor();;
+ continue;
+ } else {
+ path_src = std::move(path_in_rsrc);
+ }
}
- const auto cached_vp = VendorProfile::from_ini(path_in_cache, false);
- if (cached_vp.config_version == recommended->config_version) {
- updates.updates.emplace_back(std::move(path_in_cache), std::move(bundle_path), *recommended);
+ const auto new_vp = VendorProfile::from_ini(path_src, false);
+ if (new_vp.config_version == recommended->config_version) {
+ updates.updates.emplace_back(std::move(path_src), std::move(bundle_path), *recommended);
} else {
- BOOST_LOG_TRIVIAL(warning) << boost::format("Vendor: %1%: Index indicates update (%2%) but cached bundle has a different version: %3%")
+ BOOST_LOG_TRIVIAL(warning) << boost::format("Index for vendor %1% indicates update (%2%) but the new bundle was found neither in cache nor resources")
% idx.vendor()
- % recommended->config_version.to_string()
- % cached_vp.config_version.to_string();
+ % recommended->config_version.to_string();
}
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-24 01:14:48 +0300