mirror of
https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git
synced 2025-07-30 22:52:01 +08:00
First steps for Preview3d
This is now blocking on the slicing pipeline being set up to test
This commit is contained in:
Benjamin Landers
parent
9ca0fed4b5
commit
c1d71bd520
@ -253,6 +253,7 @@ IF(wxWidgets_FOUND)
|
||||
${GUI_LIBDIR}/Scene3D.cpp
|
||||
${GUI_LIBDIR}/Plater/Plate2D.cpp
|
||||
${GUI_LIBDIR}/Plater/Plate3D.cpp
|
||||
${GUI_LIBDIR}/Plater/Preview3D.cpp
|
||||
${GUI_LIBDIR}/Plater/PlaterObject.cpp
|
||||
${GUI_LIBDIR}/ProgressStatusBar.cpp
|
||||
${GUI_LIBDIR}/Settings.cpp
|
||||
|
||||
@ -92,7 +92,7 @@ Plater::Plater(wxWindow* parent, const wxString& title) :
|
||||
canvas3D->on_select_object = std::function<void (ObjIdx obj_idx)>(on_select_object);
|
||||
canvas3D->on_instances_moved = std::function<void ()>(on_instances_moved);
|
||||
|
||||
preview3D = new Preview3D(preview_notebook, wxDefaultSize, objects, model, config);
|
||||
preview3D = new Preview3D(preview_notebook, wxDefaultSize, print, objects, model, config);
|
||||
preview_notebook->AddPage(preview3D, _("Preview"));
|
||||
|
||||
preview2D = new Preview2D(preview_notebook, wxDefaultSize, objects, model, config);
|
||||
|
||||
171
src/GUI/Plater/3DPreview.pm
Normal file
171
src/GUI/Plater/3DPreview.pm
Normal file
@ -0,0 +1,171 @@
|
||||
package Slic3r::GUI::Plater::3DPreview;
|
||||
use strict;
|
||||
use warnings;
|
||||
use utf8;
|
||||
|
||||
use Slic3r::Print::State ':steps';
|
||||
use Wx qw(:misc :sizer :slider :statictext);
|
||||
use Wx::Event qw(EVT_SLIDER EVT_KEY_DOWN);
|
||||
use base qw(Wx::Panel Class::Accessor);
|
||||
|
||||
__PACKAGE__->mk_accessors(qw(print enabled _loaded canvas slider));
|
||||
|
||||
sub new {
|
||||
my $class = shift;
|
||||
my ($parent, $print) = @_;
|
||||
|
||||
my $self = $class->SUPER::new($parent, -1, wxDefaultPosition);
|
||||
|
||||
# init GUI elements
|
||||
my $canvas = Slic3r::GUI::3DScene->new($self);
|
||||
$self->canvas($canvas);
|
||||
my $slider = Wx::Slider->new(
|
||||
$self, -1,
|
||||
0, # default
|
||||
0, # min
|
||||
# we set max to a bogus non-zero value because the MSW implementation of wxSlider
|
||||
# will skip drawing the slider if max <= min:
|
||||
1, # max
|
||||
wxDefaultPosition,
|
||||
wxDefaultSize,
|
||||
wxVERTICAL | wxSL_INVERSE,
|
||||
);
|
||||
$self->slider($slider);
|
||||
|
||||
my $z_label = $self->{z_label} = Wx::StaticText->new($self, -1, "", wxDefaultPosition,
|
||||
[40,-1], wxALIGN_CENTRE_HORIZONTAL);
|
||||
$z_label->SetFont($Slic3r::GUI::small_font);
|
||||
|
||||
my $vsizer = Wx::BoxSizer->new(wxVERTICAL);
|
||||
$vsizer->Add($slider, 1, wxALL | wxEXPAND | wxALIGN_CENTER, 3);
|
||||
$vsizer->Add($z_label, 0, wxALL | wxEXPAND | wxALIGN_CENTER, 3);
|
||||
|
||||
my $sizer = Wx::BoxSizer->new(wxHORIZONTAL);
|
||||
$sizer->Add($canvas, 1, wxALL | wxEXPAND, 0);
|
||||
$sizer->Add($vsizer, 0, wxTOP | wxBOTTOM | wxEXPAND, 5);
|
||||
|
||||
EVT_SLIDER($self, $slider, sub {
|
||||
$self->set_z($self->{layers_z}[$slider->GetValue])
|
||||
if $self->enabled;
|
||||
});
|
||||
EVT_KEY_DOWN($canvas, sub {
|
||||
my ($s, $event) = @_;
|
||||
|
||||
my $key = $event->GetKeyCode;
|
||||
if ($key == 85 || $key == 315) {
|
||||
$slider->SetValue($slider->GetValue + 1);
|
||||
$self->set_z($self->{layers_z}[$slider->GetValue]);
|
||||
} elsif ($key == 68 || $key == 317) {
|
||||
$slider->SetValue($slider->GetValue - 1);
|
||||
$self->set_z($self->{layers_z}[$slider->GetValue]);
|
||||
} else {
|
||||
$event->Skip;
|
||||
}
|
||||
});
|
||||
|
||||
$self->SetSizer($sizer);
|
||||
$self->SetMinSize($self->GetSize);
|
||||
$sizer->SetSizeHints($self);
|
||||
|
||||
# init canvas
|
||||
$self->print($print);
|
||||
$self->reload_print;
|
||||
|
||||
return $self;
|
||||
}
|
||||
|
||||
sub reload_print {
|
||||
my ($self, $obj_idx) = @_;
|
||||
|
||||
$self->canvas->reset_objects;
|
||||
$self->_loaded(0);
|
||||
$self->load_print($obj_idx);
|
||||
}
|
||||
|
||||
sub load_print {
|
||||
my ($self, $obj_idx) = @_;
|
||||
|
||||
return if $self->_loaded;
|
||||
|
||||
# we require that there's at least one object and the posSlice step
|
||||
# is performed on all of them (this ensures that _shifted_copies was
|
||||
# populated and we know the number of layers)
|
||||
if (!$self->print->object_step_done(STEP_SLICE)) {
|
||||
$self->enabled(0);
|
||||
$self->slider->Hide;
|
||||
$self->canvas->Refresh; # clears canvas
|
||||
return;
|
||||
}
|
||||
|
||||
my $z_idx;
|
||||
{
|
||||
my %z = (); # z => 1
|
||||
if(defined $obj_idx) { # Load only given object
|
||||
foreach my $layer (@{$self->{print}->get_object($obj_idx)->layers}) {
|
||||
$z{$layer->print_z} = 1;
|
||||
}
|
||||
}else{ # Load all objects on the plater + support material
|
||||
foreach my $object (@{$self->{print}->objects}) {
|
||||
foreach my $layer (@{$object->layers}, @{$object->support_layers}) {
|
||||
$z{$layer->print_z} = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
$self->enabled(1);
|
||||
$self->{layers_z} = [ sort { $a <=> $b } keys %z ];
|
||||
$self->slider->SetRange(0, scalar(@{$self->{layers_z}})-1);
|
||||
if (($z_idx = $self->slider->GetValue) <= $#{$self->{layers_z}} && $self->slider->GetValue != 0) {
|
||||
# use $z_idx
|
||||
} else {
|
||||
$self->slider->SetValue(scalar(@{$self->{layers_z}})-1);
|
||||
$z_idx = @{$self->{layers_z}} ? -1 : undef;
|
||||
}
|
||||
$self->slider->Show;
|
||||
$self->Layout;
|
||||
}
|
||||
|
||||
if ($self->IsShown) {
|
||||
# set colors
|
||||
$self->canvas->color_toolpaths_by($Slic3r::GUI::Settings->{_}{color_toolpaths_by});
|
||||
if ($self->canvas->color_toolpaths_by eq 'extruder') {
|
||||
my @filament_colors = map { s/^#//; [ map $_/255, (unpack 'C*', pack 'H*', $_), 255 ] }
|
||||
@{$self->print->config->filament_colour};
|
||||
$self->canvas->colors->[$_] = $filament_colors[$_] for 0..$#filament_colors;
|
||||
} else {
|
||||
$self->canvas->colors([ $self->canvas->default_colors ]);
|
||||
}
|
||||
|
||||
if(defined $obj_idx) { # Load only one object
|
||||
$self->canvas->load_print_object_toolpaths($self->{print}->get_object($obj_idx));
|
||||
}else{ # load all objects
|
||||
# load skirt and brim
|
||||
$self->canvas->load_print_toolpaths($self->print);
|
||||
|
||||
foreach my $object (@{$self->print->objects}) {
|
||||
$self->canvas->load_print_object_toolpaths($object);
|
||||
|
||||
#my @volume_ids = $self->canvas->load_object($object->model_object);
|
||||
#$self->canvas->volumes->[$_]->color->[3] = 0.2 for @volume_ids;
|
||||
}
|
||||
}
|
||||
$self->_loaded(1);
|
||||
}
|
||||
|
||||
$self->set_z($self->{layers_z}[$z_idx]);
|
||||
}
|
||||
|
||||
sub set_z {
|
||||
my ($self, $z) = @_;
|
||||
|
||||
return if !$self->enabled;
|
||||
$self->{z_label}->SetLabel(sprintf '%.2f', $z);
|
||||
$self->canvas->set_toolpaths_range(0, $z);
|
||||
$self->canvas->Refresh if $self->IsShown;
|
||||
}
|
||||
|
||||
sub set_bed_shape {
|
||||
my ($self, $bed_shape) = @_;
|
||||
$self->canvas->set_bed_shape($bed_shape);
|
||||
}
|
||||
|
||||
1;
|
||||
145
src/GUI/Plater/Preview3D.cpp
Normal file
145
src/GUI/Plater/Preview3D.cpp
Normal file
@ -0,0 +1,145 @@
|
||||
#include "Preview3D.hpp"
|
||||
#include <wx/event.h>
|
||||
|
||||
namespace Slic3r { namespace GUI {
|
||||
|
||||
Preview3D::Preview3D(wxWindow* parent, const wxSize& size, std::shared_ptr<Slic3r::Print> _print, std::vector<PlaterObject>& _objects, std::shared_ptr<Model> _model, std::shared_ptr<Config> _config) :
|
||||
wxPanel(parent, wxID_ANY, wxDefaultPosition, size, wxTAB_TRAVERSAL), print(_print), objects(_objects), model(_model), config(_config), canvas(this,size)
|
||||
{
|
||||
|
||||
// init GUI elements
|
||||
slider = new wxSlider(
|
||||
this, -1,
|
||||
0, // default
|
||||
0, // min
|
||||
// we set max to a bogus non-zero value because the MSW implementation of wxSlider
|
||||
// will skip drawing the slider if max <= min:
|
||||
1, // max
|
||||
wxDefaultPosition,
|
||||
wxDefaultSize,
|
||||
wxVERTICAL | wxSL_INVERSE
|
||||
);
|
||||
|
||||
this->z_label = new wxStaticText(this, -1, "", wxDefaultPosition,
|
||||
wxSize(40,-1), wxALIGN_CENTRE_HORIZONTAL);
|
||||
//z_label->SetFont(Slic3r::GUI::small_font);
|
||||
|
||||
auto* vsizer = new wxBoxSizer(wxVERTICAL);
|
||||
vsizer->Add(slider, 1, wxALL | wxEXPAND | wxALIGN_CENTER, 3);
|
||||
vsizer->Add(z_label, 0, wxALL | wxEXPAND | wxALIGN_CENTER, 3);
|
||||
|
||||
auto* sizer = new wxBoxSizer(wxHORIZONTAL);
|
||||
sizer->Add(&canvas, 1, wxALL | wxEXPAND, 0);
|
||||
sizer->Add(vsizer, 0, wxTOP | wxBOTTOM | wxEXPAND, 5);
|
||||
|
||||
this->Bind(wxEVT_SLIDER, [this](wxCommandEvent &e){
|
||||
//$self->set_z($self->{layers_z}[$slider->GetValue])
|
||||
// if $self->enabled;
|
||||
});
|
||||
this->Bind(wxEVT_CHAR, [this](wxKeyEvent &e) {
|
||||
/*my ($s, $event) = @_;
|
||||
|
||||
my $key = $event->GetKeyCode;
|
||||
if ($key == 85 || $key == 315) {
|
||||
$slider->SetValue($slider->GetValue + 1);
|
||||
$self->set_z($self->{layers_z}[$slider->GetValue]);
|
||||
} elsif ($key == 68 || $key == 317) {
|
||||
$slider->SetValue($slider->GetValue - 1);
|
||||
$self->set_z($self->{layers_z}[$slider->GetValue]);
|
||||
} else {
|
||||
$event->Skip;
|
||||
}*/
|
||||
});
|
||||
|
||||
SetSizer(sizer);
|
||||
SetMinSize(GetSize());
|
||||
sizer->SetSizeHints(this);
|
||||
|
||||
// init canvas
|
||||
reload_print();
|
||||
|
||||
}
|
||||
void Preview3D::reload_print(){
|
||||
|
||||
canvas.resetObjects();
|
||||
loaded = false;
|
||||
load_print();
|
||||
}
|
||||
|
||||
void Preview3D::load_print() {
|
||||
if(loaded) return;
|
||||
|
||||
// we require that there's at least one object and the posSlice step
|
||||
// is performed on all of them (this ensures that _shifted_copies was
|
||||
// populated and we know the number of layers)
|
||||
if(!print->step_done(posSlice)) {
|
||||
_enabled = false;
|
||||
slider->Hide();
|
||||
canvas.Refresh(); // clears canvas
|
||||
return;
|
||||
}
|
||||
|
||||
size_t z_idx = 0;
|
||||
{
|
||||
layers_z.clear();
|
||||
// Load all objects on the plater + support material
|
||||
for(auto* object : print->objects) {
|
||||
for(auto layer : object->layers){
|
||||
layers_z.push_back(layer->print_z);
|
||||
}
|
||||
for(auto layer : object->support_layers) {
|
||||
layers_z.push_back(layer->print_z);
|
||||
}
|
||||
}
|
||||
|
||||
_enabled = true;
|
||||
std::sort(layers_z.begin(),layers_z.end());
|
||||
slider->SetRange(0, layers_z.size()-1);
|
||||
z_idx = slider->GetValue();
|
||||
// If invalide z_idx, move the slider to the top
|
||||
if (z_idx >= layers_z.size() || slider->GetValue() == 0) {
|
||||
slider->SetValue(layers_z.size()-1);
|
||||
//$z_idx = @{$self->{layer_z}} ? -1 : undef;
|
||||
z_idx = slider->GetValue(); // not sure why the perl version makes z_idx invalid
|
||||
}
|
||||
slider->Show();
|
||||
Layout();
|
||||
}
|
||||
if (IsShown()) {
|
||||
// set colors
|
||||
/*canvas.color_toolpaths_by($Slic3r::GUI::Settings->{_}{color_toolpaths_by});
|
||||
if ($self->canvas->color_toolpaths_by eq 'extruder') {
|
||||
my @filament_colors = map { s/^#//; [ map $_/255, (unpack 'C*', pack 'H*', $_), 255 ] }
|
||||
@{$self->print->config->filament_colour};
|
||||
$self->canvas->colors->[$_] = $filament_colors[$_] for 0..$#filament_colors;
|
||||
} else {
|
||||
$self->canvas->colors([ $self->canvas->default_colors ]);
|
||||
}*/
|
||||
|
||||
// load skirt and brim
|
||||
//$self->canvas->load_print_toolpaths($self->print);
|
||||
|
||||
/*foreach my $object (@{$self->print->objects}) {
|
||||
canvas.load_print_object_toolpaths($object);
|
||||
}*/
|
||||
loaded = true;
|
||||
}
|
||||
|
||||
set_z(layers_z.at(z_idx));
|
||||
}
|
||||
void Preview3D::set_z(float z) {
|
||||
if(!_enabled) return;
|
||||
z_label->SetLabel(std::to_string(z));
|
||||
//canvas.set_toolpaths_range(0, $z);
|
||||
if(IsShown())canvas.Refresh();
|
||||
}
|
||||
|
||||
/*
|
||||
void set_bed_shape() {
|
||||
my ($self, $bed_shape) = @_;
|
||||
$self->canvas->set_bed_shape($bed_shape);
|
||||
}
|
||||
*/
|
||||
|
||||
} } // Namespace Slic3r::GUI
|
||||
|
||||
@ -5,20 +5,36 @@
|
||||
#include <wx/wx.h>
|
||||
#endif
|
||||
|
||||
#include "PlaterObject.hpp"
|
||||
#include "Scene3D.hpp"
|
||||
#include "Model.hpp"
|
||||
#include "Config.hpp"
|
||||
#include "Print.hpp"
|
||||
|
||||
namespace Slic3r { namespace GUI {
|
||||
|
||||
class PreviewScene3D : public Scene3D {
|
||||
public:
|
||||
PreviewScene3D(wxWindow* parent, const wxSize& size) : Scene3D(parent,size){}
|
||||
// TODO: load_print_toolpaths(Print);
|
||||
// TODO: load_print_object_toolpaths(PrintObject);
|
||||
void resetObjects(){volumes.clear();}
|
||||
};
|
||||
|
||||
class Preview3D : public wxPanel {
|
||||
public:
|
||||
void reload_print() {};
|
||||
Preview3D(wxWindow* parent, const wxSize& size, std::vector<PlaterObject>& _objects, std::shared_ptr<Model> _model, std::shared_ptr<Config> _config) :
|
||||
wxPanel(parent, wxID_ANY, wxDefaultPosition, size, wxTAB_TRAVERSAL), objects(_objects), model(_model), config(_config)
|
||||
{}
|
||||
|
||||
void reload_print();
|
||||
Preview3D(wxWindow* parent, const wxSize& size, std::shared_ptr<Slic3r::Print> _print, std::vector<PlaterObject>& _objects, std::shared_ptr<Model> _model, std::shared_ptr<Config> _config);
|
||||
void enabled(bool enable = true) {}
|
||||
private:
|
||||
void load_print();
|
||||
void set_z(float z);
|
||||
bool loaded = false, _enabled = false;
|
||||
std::vector<float> layers_z;
|
||||
std::shared_ptr<Slic3r::Print> print;
|
||||
PreviewScene3D canvas;
|
||||
wxSlider* slider;
|
||||
wxStaticText* z_label;
|
||||
std::vector<PlaterObject>& objects; //< reference to parent vector
|
||||
std::shared_ptr<Slic3r::Model> model;
|
||||
std::shared_ptr<Slic3r::Config> config;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user