3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Work with model objects like reference (from/to perl side)

Browse Source
This commit is contained in:
YuSanka 2018-07-24 12:15:36 +02:00
parent 36f8050d7b
commit 97a25cf608
6 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/Slic3r/GUI/Plater.pm
View File

@ -449,6 +449,7 @@ sub new {
my $expert_mode_part_sizer = Wx::BoxSizer->new(wxVERTICAL); my $expert_mode_part_sizer = Wx::BoxSizer->new(wxVERTICAL);
Slic3r::GUI::add_expert_mode_part( $self->{right_panel}, $expert_mode_part_sizer, Slic3r::GUI::add_expert_mode_part( $self->{right_panel}, $expert_mode_part_sizer,
$self->{model},
$self->{event_object_selection_changed}, $self->{event_object_selection_changed},
$self->{event_object_settings_changed}, $self->{event_object_settings_changed},
$self->{event_remove_object}); $self->{event_remove_object});

2
xs/src/slic3r/GUI/GUI.cpp
View File

@ -893,6 +893,7 @@ wxString from_u8(const std::string &str)
} }
void add_expert_mode_part( wxWindow* parent, wxBoxSizer* sizer, void add_expert_mode_part( wxWindow* parent, wxBoxSizer* sizer,
Model &model,
int event_object_selection_changed, int event_object_selection_changed,
int event_object_settings_changed, int event_object_settings_changed,
int event_remove_object) int event_remove_object)
@ -900,6 +901,7 @@ void add_expert_mode_part( wxWindow* parent, wxBoxSizer* sizer,
set_event_object_selection_changed(event_object_selection_changed); set_event_object_selection_changed(event_object_selection_changed);
set_event_object_settings_changed(event_object_settings_changed); set_event_object_settings_changed(event_object_settings_changed);
set_event_remove_object(event_remove_object); set_event_remove_object(event_remove_object);
set_objects_from_model(model);
init_mesh_icons(); init_mesh_icons();
// wxWindowUpdateLocker noUpdates(parent); // wxWindowUpdateLocker noUpdates(parent);

1
xs/src/slic3r/GUI/GUI.hpp
View File

@ -188,6 +188,7 @@ wxString L_str(const std::string &str);
wxString from_u8(const std::string &str); wxString from_u8(const std::string &str);
void add_expert_mode_part( wxWindow* parent, wxBoxSizer* sizer, void add_expert_mode_part( wxWindow* parent, wxBoxSizer* sizer,
Model &model,
int event_object_selection_changed, int event_object_selection_changed,
int event_object_settings_changed, int event_object_settings_changed,
int event_remove_object); int event_remove_object);

30
xs/src/slic3r/GUI/GUI_ObjectParts.cpp
View File

@ -40,7 +40,7 @@ int m_selected_object_id = -1;
bool g_prevent_list_events = false; // We use this flag to avoid circular event handling Select() bool g_prevent_list_events = false; // We use this flag to avoid circular event handling Select()
// happens to fire a wxEVT_LIST_ITEM_SELECTED on OSX, whose event handler // happens to fire a wxEVT_LIST_ITEM_SELECTED on OSX, whose event handler
// calls this method again and again and again // calls this method again and again and again
ModelObjectPtrs m_objects; ModelObjectPtrs* m_objects;
int m_event_object_selection_changed = 0; int m_event_object_selection_changed = 0;
int m_event_object_settings_changed = 0; int m_event_object_settings_changed = 0;
@ -124,6 +124,10 @@ void set_event_remove_object(const int& event){
m_event_remove_object = event; m_event_remove_object = event;
} }
void set_objects_from_model(Model &model) {
m_objects = &(model.objects);
}
void init_mesh_icons(){ void init_mesh_icons(){
m_icon_modifiermesh = wxIcon(Slic3r::GUI::from_u8(Slic3r::var("plugin.png")), wxBITMAP_TYPE_PNG); m_icon_modifiermesh = wxIcon(Slic3r::GUI::from_u8(Slic3r::var("plugin.png")), wxBITMAP_TYPE_PNG);
m_icon_solidmesh = wxIcon(Slic3r::GUI::from_u8(Slic3r::var("package.png")), wxBITMAP_TYPE_PNG); m_icon_solidmesh = wxIcon(Slic3r::GUI::from_u8(Slic3r::var("package.png")), wxBITMAP_TYPE_PNG);
@ -297,7 +301,7 @@ void update_after_moving()
Point3 l = m_last_coords; Point3 l = m_last_coords;
auto d = Pointf3(m.x - l.x, m.y - l.y, m.z - l.z); auto d = Pointf3(m.x - l.x, m.y - l.y, m.z - l.z);
auto volume = m_objects[m_selected_object_id]->volumes[volume_id]; auto volume = (*m_objects)[m_selected_object_id]->volumes[volume_id];
volume->mesh.translate(d.x,d.y,d.z); volume->mesh.translate(d.x,d.y,d.z);
m_last_coords = m; m_last_coords = m;
@ -546,11 +550,11 @@ void add_object_to_list(const std::string &name, ModelObject* model_object)
m_objects_model->SetValue(variant, item, 0); m_objects_model->SetValue(variant, item, 0);
} }
ModelObjectPtrs* objects = m_objects;
// part_selection_changed(); // part_selection_changed();
#ifdef __WXMSW__ #ifdef __WXMSW__
object_ctrl_selection_changed(); object_ctrl_selection_changed();
#endif //__WXMSW__ #endif //__WXMSW__
m_objects.push_back(model_object);
} }
void delete_object_from_list() void delete_object_from_list()
@ -856,9 +860,9 @@ void on_btn_load(wxWindow* parent, bool is_modifier /*= false*/, bool is_lambda/
if (obj_idx < 0) return; if (obj_idx < 0) return;
wxArrayString part_names; wxArrayString part_names;
if (is_lambda) if (is_lambda)
load_lambda(parent, m_objects[obj_idx], part_names, is_modifier); load_lambda(parent, (*m_objects)[obj_idx], part_names, is_modifier);
else else
load_part(parent, m_objects[obj_idx], part_names, is_modifier); load_part(parent, (*m_objects)[obj_idx], part_names, is_modifier);
parts_changed(obj_idx); parts_changed(obj_idx);
@ -879,11 +883,11 @@ void on_btn_del()
auto volume_id = m_objects_model->GetVolumeIdByItem(item); auto volume_id = m_objects_model->GetVolumeIdByItem(item);
if (volume_id < 0) if (volume_id < 0)
return; return;
auto volume = m_objects[m_selected_object_id]->volumes[volume_id]; auto volume = (*m_objects)[m_selected_object_id]->volumes[volume_id];
// if user is deleting the last solid part, throw error // if user is deleting the last solid part, throw error
int solid_cnt = 0; int solid_cnt = 0;
for (auto vol : m_objects[m_selected_object_id]->volumes) for (auto vol : (*m_objects)[m_selected_object_id]->volumes)
if (!vol->modifier) if (!vol->modifier)
++solid_cnt; ++solid_cnt;
if (!volume->modifier && solid_cnt == 1) { if (!volume->modifier && solid_cnt == 1) {
@ -891,7 +895,7 @@ void on_btn_del()
return; return;
} }
m_objects[m_selected_object_id]->delete_volume(volume_id); (*m_objects)[m_selected_object_id]->delete_volume(volume_id);
m_parts_changed = true; m_parts_changed = true;
parts_changed(m_selected_object_id); parts_changed(m_selected_object_id);
@ -912,7 +916,7 @@ void on_btn_split()
if (volume_id < 0) if (volume_id < 0)
return; return;
auto volume = m_objects[m_selected_object_id]->volumes[volume_id]; auto volume = (*m_objects)[m_selected_object_id]->volumes[volume_id];
DynamicPrintConfig& config = get_preset_bundle()->prints.get_edited_preset().config; DynamicPrintConfig& config = get_preset_bundle()->prints.get_edited_preset().config;
auto nozzle_dmrs_cnt = config.option<ConfigOptionFloats>("nozzle_diameter")->values.size(); auto nozzle_dmrs_cnt = config.option<ConfigOptionFloats>("nozzle_diameter")->values.size();
if (volume->split(nozzle_dmrs_cnt) > 1) { if (volume->split(nozzle_dmrs_cnt) > 1) {
@ -929,7 +933,7 @@ void on_btn_move_up(){
auto volume_id = m_objects_model->GetVolumeIdByItem(item); auto volume_id = m_objects_model->GetVolumeIdByItem(item);
if (volume_id < 0) if (volume_id < 0)
return; return;
auto& volumes = m_objects[m_selected_object_id]->volumes; auto& volumes = (*m_objects)[m_selected_object_id]->volumes;
if (0 < volume_id && volume_id < volumes.size()) { if (0 < volume_id && volume_id < volumes.size()) {
std::swap(volumes[volume_id - 1], volumes[volume_id]); std::swap(volumes[volume_id - 1], volumes[volume_id]);
m_parts_changed = true; m_parts_changed = true;
@ -948,7 +952,7 @@ void on_btn_move_down(){
auto volume_id = m_objects_model->GetVolumeIdByItem(item); auto volume_id = m_objects_model->GetVolumeIdByItem(item);
if (volume_id < 0) if (volume_id < 0)
return; return;
auto& volumes = m_objects[m_selected_object_id]->volumes; auto& volumes = (*m_objects)[m_selected_object_id]->volumes;
if (0 <= volume_id && volume_id+1 < volumes.size()) { if (0 <= volume_id && volume_id+1 < volumes.size()) {
std::swap(volumes[volume_id + 1], volumes[volume_id]); std::swap(volumes[volume_id + 1], volumes[volume_id]);
m_parts_changed = true; m_parts_changed = true;
@ -975,13 +979,13 @@ void parts_changed(int obj_idx)
void update_settings_value() void update_settings_value()
{ {
auto og = get_optgroup(ogFrequentlyObjectSettings); auto og = get_optgroup(ogFrequentlyObjectSettings);
if (m_selected_object_id < 0 || m_objects.size() <= m_selected_object_id) { if (m_selected_object_id < 0 || m_objects->size() <= m_selected_object_id) {
og->set_value("scale_x", 0); og->set_value("scale_x", 0);
og->set_value("scale_y", 0); og->set_value("scale_y", 0);
og->set_value("scale_z", 0); og->set_value("scale_z", 0);
return; return;
} }
auto bb_size = m_objects[m_selected_object_id]->instance_bounding_box(0).size(); auto bb_size = (*m_objects)[m_selected_object_id]->instance_bounding_box(0).size();
og->set_value("scale_x", int(bb_size.x+0.5)); og->set_value("scale_x", int(bb_size.x+0.5));
og->set_value("scale_y", int(bb_size.y+0.5)); og->set_value("scale_y", int(bb_size.y+0.5));
og->set_value("scale_z", int(bb_size.z+0.5)); og->set_value("scale_z", int(bb_size.z+0.5));

2
xs/src/slic3r/GUI/GUI_ObjectParts.hpp
View File

@ -10,6 +10,7 @@ class wxMenu;
namespace Slic3r { namespace Slic3r {
class ModelObject; class ModelObject;
class Model;
namespace GUI { namespace GUI {
@ -73,6 +74,7 @@ void init_mesh_icons();
void set_event_object_selection_changed(const int& event); void set_event_object_selection_changed(const int& event);
void set_event_object_settings_changed(const int& event); void set_event_object_settings_changed(const int& event);
void set_event_remove_object(const int& event); void set_event_remove_object(const int& event);
void set_objects_from_model(Model &model);
bool is_parts_changed(); bool is_parts_changed();
bool is_part_settings_changed(); bool is_part_settings_changed();

2
xs/xsp/GUI.xsp
View File

@ -88,11 +88,13 @@ void add_frequently_changed_parameters(SV *ui_parent, SV *ui_sizer, SV *ui_p_siz
(wxFlexGridSizer*)wxPli_sv_2_object(aTHX_ ui_p_sizer, "Wx::FlexGridSizer")); %}; (wxFlexGridSizer*)wxPli_sv_2_object(aTHX_ ui_p_sizer, "Wx::FlexGridSizer")); %};
void add_expert_mode_part( SV *ui_parent, SV *ui_sizer, void add_expert_mode_part( SV *ui_parent, SV *ui_sizer,
Model *model,
int event_object_selection_changed, int event_object_selection_changed,
int event_object_settings_changed, int event_object_settings_changed,
int event_remove_object) int event_remove_object)
%code%{ Slic3r::GUI::add_expert_mode_part( (wxWindow*)wxPli_sv_2_object(aTHX_ ui_parent, "Wx::Window"), %code%{ Slic3r::GUI::add_expert_mode_part( (wxWindow*)wxPli_sv_2_object(aTHX_ ui_parent, "Wx::Window"),
(wxBoxSizer*)wxPli_sv_2_object(aTHX_ ui_sizer, "Wx::BoxSizer"), (wxBoxSizer*)wxPli_sv_2_object(aTHX_ ui_sizer, "Wx::BoxSizer"),
*model,
event_object_selection_changed, event_object_selection_changed,
event_object_settings_changed, event_object_settings_changed,
event_remove_object); %}; event_remove_object); %};