3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-11 16:57:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Buttons "Add Part" and "Add Modifier" (in the Object Settings) works now

Browse source
This commit is contained in:
YuSanka 2018-06-14 15:33:42 +02:00
parent 8899be8cca
commit 9504780ef4
7 changed files with 133 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

104
xs/src/slic3r/GUI/GUI_ObjectParts.cpp
View file

@ -1,42 +1,96 @@
#include "GUI.hpp"
#include "GUI_ObjectParts.hpp"
#include "Model.hpp"
#include "wxExtensions.hpp"
#include <wx/msgdlg.h>
#include <wx/frame.h>
#include <boost/filesystem.hpp>
namespace Slic3r
{
namespace GUI
{
void on_btn_load(wxWindow* parent, bool is_modifier /*= false*/)
{
auto input_files = open_model(parent);
// for(auto input_file : input_files) {
// my $model = eval{ Slic3r::Model->read_from_file($input_file) };
// if ($@) {
// Slic3r::GUI::show_error($self, $@);
// next;
// }
bool m_parts_changed = false;
bool m_part_settings_changed = false;
// foreach my $object(@{$model->objects}) {
// foreach my $volume(@{$object->volumes}) {
// my $new_volume = $self->{model_object}->add_volume($volume);
// $new_volume->set_modifier($is_modifier);
// $new_volume->set_name(basename($input_file));
//
// # apply the same translation we applied to the object
// $new_volume->mesh->translate(@{$self->{model_object}->origin_translation});
//
// # set a default extruder value, since user can't add it manually
// $new_volume->config->set_ifndef('extruder', 0);
//
// $self->{parts_changed} = 1;
// }
// }
// }
bool is_parts_changed(){return m_parts_changed;}
bool is_part_settings_changed(){ return m_part_settings_changed; }
void load_part(wxWindow* parent, ModelObject* model_object, wxArrayString& part_names, bool is_modifier)
{
wxArrayString input_files;
open_model(parent, input_files);
for (int i = 0; i < input_files.size(); ++i) {
std::string input_file = input_files.Item(i).ToStdString();
Model model;
try {
model = Model::read_from_file(input_file);
}
catch (std::exception &e) {
auto msg = _(L("Error! ")) + input_file + " : " + e.what() + ".";
show_error(parent, msg);
exit(1);
}
for ( auto object : model.objects) {
for (auto volume : object->volumes) {
auto new_volume = model_object->add_volume(*volume);
new_volume->modifier = is_modifier;
boost::filesystem::path(input_file).filename().string();
new_volume->name = boost::filesystem::path(input_file).filename().string();
part_names.Add(new_volume->name);
// apply the same translation we applied to the object
new_volume->mesh.translate( model_object->origin_translation.x,
model_object->origin_translation.y,
model_object->origin_translation.y );
// set a default extruder value, since user can't add it manually
new_volume->config.set_key_value("extruder", new ConfigOptionInt(0));
m_parts_changed = true;
}
}
}
parts_changed();
}
void on_btn_load(wxWindow* parent, bool is_modifier /*= false*/)
{
auto objects_ctrl = get_objects_ctrl();
auto item = objects_ctrl->GetSelection();
if (!item)
return;
int obj_idx = -1;
auto objects_model = get_objects_model();
if (objects_model->GetParent(item) == wxDataViewItem(0))
obj_idx = objects_model->GetIdByItem(item);
else
return;
if (obj_idx < 0) return;
wxArrayString part_names;
ModelObjectPtrs& objects = get_objects();
load_part(parent, objects[obj_idx], part_names, is_modifier);
auto event = get_event_object_settings_changed();
if (event > 0) {
wxCommandEvent e(event);
auto event_str = wxString::Format("%d %d %d", obj_idx,
is_parts_changed() ? 1 : 0,
is_part_settings_changed() ? 1 : 0);
e.SetString(event_str);
get_main_frame()->ProcessWindowEvent(e);
}
for (int i = 0; i < part_names.size(); ++i)
objects_ctrl->Select(objects_model->AddChild(item, part_names.Item(i)));
}
void parts_changed(){ ; }
} //namespace GUI