GCode Preview - Code cleanup
This commit is contained in:
Enrico Turri
parent
c63e6b74fa
commit
a417cf955d
24 changed files with 12 additions and 987 deletions
|
|
@ -30,7 +30,6 @@ use Slic3r::Geometry qw(PI);
|
|||
# _dirty: boolean flag indicating, that the screen has to be redrawn on EVT_IDLE.
|
||||
# volumes: reference to vector of Slic3r::GUI::3DScene::Volume.
|
||||
# _camera_type: 'perspective' or 'ortho'
|
||||
# ===================== ENRICO_GCODE_PREVIEW ==================================================
|
||||
__PACKAGE__->mk_accessors( qw(_quat _dirty init
|
||||
enable_picking
|
||||
enable_moving
|
||||
|
|
@ -72,46 +71,6 @@ __PACKAGE__->mk_accessors( qw(_quat _dirty init
|
|||
|
||||
) );
|
||||
|
||||
#__PACKAGE__->mk_accessors( qw(_quat _dirty init
|
||||
# enable_picking
|
||||
# enable_moving
|
||||
# use_plain_shader
|
||||
# on_viewport_changed
|
||||
# on_hover
|
||||
# on_select
|
||||
# on_double_click
|
||||
# on_right_click
|
||||
# on_move
|
||||
# on_model_update
|
||||
# volumes
|
||||
# _sphi _stheta
|
||||
# cutting_plane_z
|
||||
# cut_lines_vertices
|
||||
# bed_shape
|
||||
# bed_triangles
|
||||
# bed_grid_lines
|
||||
# bed_polygon
|
||||
# background
|
||||
# origin
|
||||
# _mouse_pos
|
||||
# _hover_volume_idx
|
||||
#
|
||||
# _drag_volume_idx
|
||||
# _drag_start_pos
|
||||
# _drag_volume_center_offset
|
||||
# _drag_start_xy
|
||||
# _dragged
|
||||
#
|
||||
# _layer_height_edited
|
||||
#
|
||||
# _camera_type
|
||||
# _camera_target
|
||||
# _camera_distance
|
||||
# _zoom
|
||||
#
|
||||
# ) );
|
||||
# ===================== ENRICO_GCODE_PREVIEW ==================================================
|
||||
|
||||
use constant TRACKBALLSIZE => 0.8;
|
||||
use constant TURNTABLE_MODE => 1;
|
||||
use constant GROUND_Z => -0.02;
|
||||
|
|
@ -181,9 +140,7 @@ sub new {
|
|||
$self->_stheta(45);
|
||||
$self->_sphi(45);
|
||||
$self->_zoom(1);
|
||||
# ===================== ENRICO_GCODE_PREVIEW ==================================================
|
||||
$self->_legend_enabled(0);
|
||||
# ===================== ENRICO_GCODE_PREVIEW ==================================================
|
||||
$self->use_plain_shader(0);
|
||||
|
||||
# Collection of GLVolume objects
|
||||
|
|
@ -256,12 +213,10 @@ sub new {
|
|||
return $self;
|
||||
}
|
||||
|
||||
# ===================== ENRICO_GCODE_PREVIEW ==================================================
|
||||
sub set_legend_enabled {
|
||||
my ($self, $value) = @_;
|
||||
$self->_legend_enabled($value);
|
||||
}
|
||||
# ===================== ENRICO_GCODE_PREVIEW ==================================================
|
||||
|
||||
sub Destroy {
|
||||
my ($self) = @_;
|
||||
|
|
@ -1370,10 +1325,8 @@ sub Render {
|
|||
glDisable(GL_BLEND);
|
||||
}
|
||||
|
||||
# ===================== ENRICO_GCODE_PREVIEW ==================================================
|
||||
# draw gcode preview legend
|
||||
$self->draw_legend;
|
||||
# ===================== ENRICO_GCODE_PREVIEW ==================================================
|
||||
|
||||
$self->draw_active_object_annotations;
|
||||
|
||||
|
|
@ -1508,29 +1461,9 @@ sub _variable_layer_thickness_load_reset_image {
|
|||
# Paint the tooltip.
|
||||
sub _render_image {
|
||||
my ($self, $image, $l, $r, $b, $t) = @_;
|
||||
# ===================== ENRICO_GCODE_PREVIEW ==================================================
|
||||
$self->_render_texture($image->{texture_id}, $l, $r, $b, $t);
|
||||
|
||||
# glColor4f(1.,1.,1.,1.);
|
||||
# glDisable(GL_LIGHTING);
|
||||
# glEnable(GL_BLEND);
|
||||
# glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
||||
# glEnable(GL_TEXTURE_2D);
|
||||
# glBindTexture(GL_TEXTURE_2D, $image->{texture_id});
|
||||
# glBegin(GL_QUADS);
|
||||
# glTexCoord2d(0.,1.); glVertex3f($l, $b, 0);
|
||||
# glTexCoord2d(1.,1.); glVertex3f($r, $b, 0);
|
||||
# glTexCoord2d(1.,0.); glVertex3f($r, $t, 0);
|
||||
# glTexCoord2d(0.,0.); glVertex3f($l, $t, 0);
|
||||
# glEnd();
|
||||
# glBindTexture(GL_TEXTURE_2D, 0);
|
||||
# glDisable(GL_TEXTURE_2D);
|
||||
# glDisable(GL_BLEND);
|
||||
# glEnable(GL_LIGHTING);
|
||||
# ===================== ENRICO_GCODE_PREVIEW ==================================================
|
||||
}
|
||||
|
||||
# ===================== ENRICO_GCODE_PREVIEW ==================================================
|
||||
sub _render_texture {
|
||||
my ($self, $tex_id, $l, $r, $b, $t) = @_;
|
||||
|
||||
|
|
@ -1551,7 +1484,6 @@ sub _render_texture {
|
|||
glDisable(GL_BLEND);
|
||||
glEnable(GL_LIGHTING);
|
||||
}
|
||||
# ===================== ENRICO_GCODE_PREVIEW ==================================================
|
||||
|
||||
sub draw_active_object_annotations {
|
||||
# $fakecolor is a boolean indicating, that the objects shall be rendered in a color coding the object index for picking.
|
||||
|
|
@ -1665,7 +1597,6 @@ sub draw_active_object_annotations {
|
|||
glEnable(GL_DEPTH_TEST);
|
||||
}
|
||||
|
||||
# ===================== ENRICO_GCODE_PREVIEW ==================================================
|
||||
sub draw_legend {
|
||||
my ($self) = @_;
|
||||
|
||||
|
|
@ -1694,7 +1625,6 @@ sub draw_legend {
|
|||
}
|
||||
}
|
||||
}
|
||||
# ===================== ENRICO_GCODE_PREVIEW ==================================================
|
||||
|
||||
sub opengl_info
|
||||
{
|
||||
|
|
@ -2096,14 +2026,12 @@ sub load_wipe_tower_toolpaths {
|
|||
if ($print->step_done(STEP_WIPE_TOWER));
|
||||
}
|
||||
|
||||
# ===================== ENRICO_GCODE_PREVIEW ==================================================
|
||||
sub load_gcode_preview {
|
||||
my ($self, $print) = @_;
|
||||
|
||||
$self->SetCurrent($self->GetContext) if $self->UseVBOs;
|
||||
Slic3r::GUI::_3DScene::load_gcode_preview($print, $self->volumes, $self->UseVBOs);
|
||||
}
|
||||
# ===================== ENRICO_GCODE_PREVIEW ==================================================
|
||||
|
||||
sub set_toolpaths_range {
|
||||
my ($self, $min_z, $max_z) = @_;
|
||||
|
|
|
|||
|
|
@ -153,7 +153,6 @@ sub new {
|
|||
|
||||
EVT_NOTEBOOK_PAGE_CHANGED($self, $self->{preview_notebook}, sub {
|
||||
my $preview = $self->{preview_notebook}->GetCurrentPage;
|
||||
# ===================== ENRICO_GCODE_PREVIEW ==================================================
|
||||
if ($preview == $self->{preview3D})
|
||||
{
|
||||
$self->{preview3D}->canvas->set_legend_enabled(1);
|
||||
|
|
@ -161,8 +160,7 @@ sub new {
|
|||
} else {
|
||||
$self->{preview3D}->canvas->set_legend_enabled(0);
|
||||
}
|
||||
# $self->{preview3D}->load_print(1) if ($preview == $self->{preview3D});
|
||||
# ===================== ENRICO_GCODE_PREVIEW ==================================================
|
||||
|
||||
$preview->OnActivate if $preview->can('OnActivate');
|
||||
});
|
||||
|
||||
|
|
@ -785,9 +783,7 @@ sub remove {
|
|||
splice @{$self->{objects}}, $obj_idx, 1;
|
||||
$self->{model}->delete_object($obj_idx);
|
||||
$self->{print}->delete_object($obj_idx);
|
||||
# ===================== ENRICO_GCODE_PREVIEW ==================================================
|
||||
$self->{print}->clear_gcode_preview_data;
|
||||
# ===================== ENRICO_GCODE_PREVIEW ==================================================
|
||||
$self->{list}->DeleteItem($obj_idx);
|
||||
$self->object_list_changed;
|
||||
|
||||
|
|
@ -808,9 +804,7 @@ sub reset {
|
|||
@{$self->{objects}} = ();
|
||||
$self->{model}->clear_objects;
|
||||
$self->{print}->clear_objects;
|
||||
# ===================== ENRICO_GCODE_PREVIEW ==================================================
|
||||
$self->{print}->clear_gcode_preview_data;
|
||||
# ===================== ENRICO_GCODE_PREVIEW ==================================================
|
||||
$self->{list}->DeleteAllItems;
|
||||
$self->object_list_changed;
|
||||
|
||||
|
|
@ -1451,11 +1445,9 @@ sub on_export_completed {
|
|||
# this updates buttons status
|
||||
$self->object_list_changed;
|
||||
|
||||
# ===================== ENRICO_GCODE_PREVIEW ==================================================
|
||||
# refresh preview
|
||||
$self->{toolpaths2D}->reload_print if $self->{toolpaths2D};
|
||||
$self->{preview3D}->reload_print if $self->{preview3D};
|
||||
# ===================== ENRICO_GCODE_PREVIEW ==================================================
|
||||
}
|
||||
|
||||
sub do_print {
|
||||
|
|
|
|||
|
|
@ -5,16 +5,10 @@ use utf8;
|
|||
|
||||
use Slic3r::Print::State ':steps';
|
||||
use Wx qw(:misc :sizer :slider :statictext :keycode wxWHITE);
|
||||
# ===================== ENRICO_GCODE_PREVIEW ==================================================
|
||||
use Wx::Event qw(EVT_SLIDER EVT_KEY_DOWN EVT_CHECKBOX EVT_CHOICE EVT_CHECKLISTBOX);
|
||||
#use Wx::Event qw(EVT_SLIDER EVT_KEY_DOWN EVT_CHECKBOX);
|
||||
# ===================== ENRICO_GCODE_PREVIEW ==================================================
|
||||
use base qw(Wx::Panel Class::Accessor);
|
||||
|
||||
# ===================== ENRICO_GCODE_PREVIEW ==================================================
|
||||
__PACKAGE__->mk_accessors(qw(print enabled _loaded canvas slider_low slider_high single_layer auto_zoom));
|
||||
#__PACKAGE__->mk_accessors(qw(print enabled _loaded canvas slider_low slider_high single_layer));
|
||||
# ===================== ENRICO_GCODE_PREVIEW ==================================================
|
||||
|
||||
sub new {
|
||||
my $class = shift;
|
||||
|
|
@ -24,9 +18,7 @@ sub new {
|
|||
$self->{config} = $config;
|
||||
$self->{number_extruders} = 1;
|
||||
$self->{preferred_color_mode} = 'feature';
|
||||
# ===================== ENRICO_GCODE_PREVIEW ==================================================
|
||||
$self->auto_zoom(1);
|
||||
# ===================== ENRICO_GCODE_PREVIEW ==================================================
|
||||
|
||||
# init GUI elements
|
||||
my $canvas = Slic3r::GUI::3DScene->new($self);
|
||||
|
|
@ -69,7 +61,6 @@ sub new {
|
|||
my $checkbox_singlelayer = $self->{checkbox_singlelayer} = Wx::CheckBox->new($self, -1, "1 Layer");
|
||||
my $checkbox_color_by_extruder = $self->{checkbox_color_by_extruder} = Wx::CheckBox->new($self, -1, "Tool");
|
||||
|
||||
# ===================== ENRICO_GCODE_PREVIEW ==================================================
|
||||
my $choice_view_type = Wx::Choice->new($self, -1);
|
||||
$choice_view_type->Append("Feature type");
|
||||
$choice_view_type->Append("Height");
|
||||
|
|
@ -96,8 +87,7 @@ sub new {
|
|||
|
||||
my $checkbox_travel = Wx::CheckBox->new($self, -1, "Travel");
|
||||
my $checkbox_retractions = Wx::CheckBox->new($self, -1, "Retractions");
|
||||
my $checkbox_unretractions = Wx::CheckBox->new($self, -1, "Unretractions");
|
||||
# ===================== ENRICO_GCODE_PREVIEW ==================================================
|
||||
my $checkbox_unretractions = Wx::CheckBox->new($self, -1, "Unretractions");
|
||||
|
||||
my $hsizer = Wx::BoxSizer->new(wxHORIZONTAL);
|
||||
my $vsizer = Wx::BoxSizer->new(wxVERTICAL);
|
||||
|
|
@ -112,13 +102,11 @@ sub new {
|
|||
$vsizer_outer->Add($hsizer, 3, wxALIGN_CENTER_HORIZONTAL, 0);
|
||||
$vsizer_outer->Add($checkbox_singlelayer, 0, wxTOP | wxALIGN_CENTER_HORIZONTAL, 5);
|
||||
$vsizer_outer->Add($checkbox_color_by_extruder, 0, wxTOP | wxALIGN_CENTER_HORIZONTAL, 5);
|
||||
# ===================== ENRICO_GCODE_PREVIEW ==================================================
|
||||
$vsizer_outer->Add($choice_view_type, 0, wxEXPAND | wxALL | wxALIGN_CENTER_HORIZONTAL, 5);
|
||||
$vsizer_outer->Add($checklist_features, 0, wxTOP | wxALL | wxALIGN_CENTER_HORIZONTAL, 5);
|
||||
$vsizer_outer->Add($checkbox_travel, 0, wxEXPAND | wxALL | wxALIGN_CENTER_VERTICAL, 5);
|
||||
$vsizer_outer->Add($checkbox_retractions, 0, wxEXPAND | wxALL | wxALIGN_CENTER_VERTICAL, 5);
|
||||
$vsizer_outer->Add($checkbox_unretractions, 0, wxEXPAND | wxALL | wxALIGN_CENTER_VERTICAL, 5);
|
||||
# ===================== ENRICO_GCODE_PREVIEW ==================================================
|
||||
|
||||
my $sizer = Wx::BoxSizer->new(wxHORIZONTAL);
|
||||
$sizer->Add($canvas, 1, wxALL | wxEXPAND, 0);
|
||||
|
|
@ -199,7 +187,6 @@ sub new {
|
|||
$self->reload_print;
|
||||
});
|
||||
|
||||
# ===================== ENRICO_GCODE_PREVIEW ==================================================
|
||||
EVT_CHOICE($self, $choice_view_type, sub {
|
||||
my $selection = $choice_view_type->GetCurrentSelection();
|
||||
$self->print->set_gcode_preview_type($selection);
|
||||
|
|
@ -238,7 +225,6 @@ sub new {
|
|||
$self->refresh_print;
|
||||
$self->auto_zoom(1);
|
||||
});
|
||||
# ===================== ENRICO_GCODE_PREVIEW ==================================================
|
||||
|
||||
$self->SetSizer($sizer);
|
||||
$self->SetMinSize($self->GetSize);
|
||||
|
|
@ -258,16 +244,13 @@ sub reload_print {
|
|||
$self->_loaded(0);
|
||||
|
||||
if (! $self->IsShown && ! $force) {
|
||||
# ===================== ENRICO_GCODE_PREVIEW ==================================================
|
||||
# $self->{reload_delayed} = 1;
|
||||
# ===================== ENRICO_GCODE_PREVIEW ==================================================
|
||||
return;
|
||||
}
|
||||
|
||||
$self->load_print;
|
||||
}
|
||||
|
||||
# ===================== ENRICO_GCODE_PREVIEW ==================================================
|
||||
sub refresh_print {
|
||||
my ($self) = @_;
|
||||
|
||||
|
|
@ -279,7 +262,6 @@ sub refresh_print {
|
|||
|
||||
$self->load_print;
|
||||
}
|
||||
# ===================== ENRICO_GCODE_PREVIEW ==================================================
|
||||
|
||||
sub load_print {
|
||||
my ($self) = @_;
|
||||
|
|
@ -361,10 +343,9 @@ sub load_print {
|
|||
}
|
||||
|
||||
if ($self->IsShown) {
|
||||
# ===================== ENRICO_GCODE_PREVIEW ==================================================
|
||||
$self->canvas->load_gcode_preview($self->print);
|
||||
|
||||
# load skirt and brim
|
||||
# # load skirt and brim
|
||||
# $self->canvas->load_print_toolpaths($self->print, \@colors);
|
||||
# $self->canvas->load_wipe_tower_toolpaths($self->print, \@colors);
|
||||
#
|
||||
|
|
@ -375,15 +356,10 @@ sub load_print {
|
|||
# #my @volume_ids = $self->canvas->load_object($object->model_object);
|
||||
# #$self->canvas->volumes->[$_]->color->[3] = 0.2 for @volume_ids;
|
||||
# }
|
||||
# ===================== ENRICO_GCODE_PREVIEW ==================================================
|
||||
# ===================== ENRICO_GCODE_PREVIEW ==================================================
|
||||
if ($self->auto_zoom)
|
||||
{
|
||||
# ===================== ENRICO_GCODE_PREVIEW ==================================================
|
||||
$self->canvas->zoom_to_volumes;
|
||||
# ===================== ENRICO_GCODE_PREVIEW ==================================================
|
||||
$self->canvas->zoom_to_volumes;
|
||||
}
|
||||
# ===================== ENRICO_GCODE_PREVIEW ==================================================
|
||||
$self->_loaded(1);
|
||||
}
|
||||
|
||||
|
|
@ -445,10 +421,8 @@ sub set_number_extruders {
|
|||
|
||||
# Called by the Platter wxNotebook when this page is activated.
|
||||
sub OnActivate {
|
||||
# ===================== ENRICO_GCODE_PREVIEW ==================================================
|
||||
# my ($self) = @_;
|
||||
# $self->reload_print(1) if ($self->{reload_delayed});
|
||||
# ===================== ENRICO_GCODE_PREVIEW ==================================================
|
||||
}
|
||||
|
||||
1;
|
||||
|
|
|
|||
|
|
@ -122,7 +122,6 @@ sub load_print {
|
|||
}
|
||||
|
||||
if ($self->IsShown) {
|
||||
# ===================== ENRICO_GCODE_PREVIEW ==================================================
|
||||
$self->canvas->load_gcode_preview($self->print);
|
||||
|
||||
# # load skirt and brim
|
||||
|
|
@ -135,7 +134,7 @@ sub load_print {
|
|||
# #my @volume_ids = $self->canvas->load_object($object->model_object);
|
||||
# #$self->canvas->volumes->[$_]->color->[3] = 0.2 for @volume_ids;
|
||||
# }
|
||||
# ===================== ENRICO_GCODE_PREVIEW ==================================================
|
||||
|
||||
$self->canvas->zoom_to_volumes;
|
||||
$self->_loaded(1);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue