3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-08 15:37:30 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix various memory leaks

Browse source 
(cherry picked from commit prusa3d/PrusaSlicer@deb17c5920)
This commit is contained in:
Lukáš Hejl 2023-10-21 17:51:49 +08:00 • committed by Noisyfox
parent 7907426d00
commit 499b9d1be8
7 changed files with 79 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/libslic3r/ExtrusionEntityCollection.cpp
View file

@ -56,12 +56,9 @@ ExtrusionEntityCollection::operator ExtrusionPaths() const
return paths; return paths;
} }
ExtrusionEntity* ExtrusionEntityCollection::clone() const ExtrusionEntity *ExtrusionEntityCollection::clone() const
{ {
ExtrusionEntityCollection* coll = new ExtrusionEntityCollection(*this); return new ExtrusionEntityCollection(*this);
for (size_t i = 0; i < coll->entities.size(); ++i)
coll->entities[i] = this->entities[i]->clone();
return coll;
} }
void ExtrusionEntityCollection::reverse() void ExtrusionEntityCollection::reverse()

28
src/libslic3r/Semver.hpp
View file

@ -110,10 +110,30 @@ public:
void set_maj(int maj) { ver.major = maj; } void set_maj(int maj) { ver.major = maj; }
void set_min(int min) { ver.minor = min; } void set_min(int min) { ver.minor = min; }
void set_patch(int patch) { ver.patch = patch; } void set_patch(int patch) { ver.patch = patch; }
void set_metadata(boost::optional<const std::string&> meta) { ver.metadata = meta ? strdup(*meta) : nullptr; } void set_metadata(boost::optional<const std::string &> meta)
void set_metadata(const char *meta) { ver.metadata = meta ? strdup(meta) : nullptr; } {
void set_prerelease(boost::optional<const std::string&> pre) { ver.prerelease = pre ? strdup(*pre) : nullptr; } if (ver.metadata)
void set_prerelease(const char *pre) { ver.prerelease = pre ? strdup(pre) : nullptr; } free(ver.metadata);
ver.metadata = meta ? strdup(*meta) : nullptr;
}
void set_metadata(const char *meta)
{
if (ver.metadata)
free(ver.metadata);
ver.metadata = meta ? strdup(meta) : nullptr;
}
void set_prerelease(boost::optional<const std::string &> pre)
{
if (ver.prerelease)
free(ver.prerelease);
ver.prerelease = pre ? strdup(*pre) : nullptr;
}
void set_prerelease(const char *pre)
{
if (ver.prerelease)
free(ver.prerelease);
ver.prerelease = pre ? strdup(pre) : nullptr;
}
// Comparison // Comparison
bool operator<(const Semver &b) const { return ::semver_compare(ver, b.ver) == -1; } bool operator<(const Semver &b) const { return ::semver_compare(ver, b.ver) == -1; }

1
src/slic3r/GUI/BedShapeDialog.hpp
View file

@ -18,6 +18,7 @@ namespace GUI {
class ConfigOptionsGroup; class ConfigOptionsGroup;
using ConfigOptionsGroupShp = std::shared_ptr<ConfigOptionsGroup>; using ConfigOptionsGroupShp = std::shared_ptr<ConfigOptionsGroup>;
using ConfigOptionsGroupWkp = std::weak_ptr<ConfigOptionsGroup>;
struct BedShape struct BedShape
{ {

24
src/slic3r/GUI/GLCanvas3D.cpp
View file

@ -8703,10 +8703,14 @@ void GLCanvas3D::_load_print_object_toolpaths(const PrintObject& print_object, c
BOOST_LOG_TRIVIAL(debug) << "Loading print object toolpaths in parallel - finalizing results" << m_volumes.log_memory_info() << log_memory_info(); BOOST_LOG_TRIVIAL(debug) << "Loading print object toolpaths in parallel - finalizing results" << m_volumes.log_memory_info() << log_memory_info();
// Remove empty volumes from the newly added volumes. // Remove empty volumes from the newly added volumes.
m_volumes.volumes.erase( {
std::remove_if(m_volumes.volumes.begin() + volumes_cnt_initial, m_volumes.volumes.end(), for (auto ptr_it = m_volumes.volumes.begin() + volumes_cnt_initial; ptr_it != m_volumes.volumes.end(); ++ptr_it)
[](const GLVolume *volume) { return volume->empty(); }), if ((*ptr_it)->empty()) {
m_volumes.volumes.end()); delete *ptr_it;
*ptr_it = nullptr;
}
m_volumes.volumes.erase(std::remove(m_volumes.volumes.begin() + volumes_cnt_initial, m_volumes.volumes.end(), nullptr), m_volumes.volumes.end());
}
for (size_t i = volumes_cnt_initial; i < m_volumes.volumes.size(); ++i) { for (size_t i = volumes_cnt_initial; i < m_volumes.volumes.size(); ++i) {
GLVolume* v = m_volumes.volumes[i]; GLVolume* v = m_volumes.volumes[i];
v->is_outside = ! build_volume.all_paths_inside_vertices_and_normals_interleaved(v->indexed_vertex_array.vertices_and_normals_interleaved, v->indexed_vertex_array.bounding_box()); v->is_outside = ! build_volume.all_paths_inside_vertices_and_normals_interleaved(v->indexed_vertex_array.vertices_and_normals_interleaved, v->indexed_vertex_array.bounding_box());
@ -8872,10 +8876,14 @@ void GLCanvas3D::_load_wipe_tower_toolpaths(const BuildVolume& build_volume, con
BOOST_LOG_TRIVIAL(debug) << "Loading wipe tower toolpaths in parallel - finalizing results" << m_volumes.log_memory_info() << log_memory_info(); BOOST_LOG_TRIVIAL(debug) << "Loading wipe tower toolpaths in parallel - finalizing results" << m_volumes.log_memory_info() << log_memory_info();
// Remove empty volumes from the newly added volumes. // Remove empty volumes from the newly added volumes.
m_volumes.volumes.erase( {
std::remove_if(m_volumes.volumes.begin() + volumes_cnt_initial, m_volumes.volumes.end(), for (auto ptr_it = m_volumes.volumes.begin() + volumes_cnt_initial; ptr_it != m_volumes.volumes.end(); ++ptr_it)
[](const GLVolume *volume) { return volume->empty(); }), if ((*ptr_it)->empty()) {
m_volumes.volumes.end()); delete *ptr_it;
*ptr_it = nullptr;
}
m_volumes.volumes.erase(std::remove(m_volumes.volumes.begin() + volumes_cnt_initial, m_volumes.volumes.end(), nullptr), m_volumes.volumes.end());
}
for (size_t i = volumes_cnt_initial; i < m_volumes.volumes.size(); ++i) { for (size_t i = volumes_cnt_initial; i < m_volumes.volumes.size(); ++i) {
GLVolume* v = m_volumes.volumes[i]; GLVolume* v = m_volumes.volumes[i];
v->is_outside = ! build_volume.all_paths_inside_vertices_and_normals_interleaved(v->indexed_vertex_array.vertices_and_normals_interleaved, v->indexed_vertex_array.bounding_box()); v->is_outside = ! build_volume.all_paths_inside_vertices_and_normals_interleaved(v->indexed_vertex_array.vertices_and_normals_interleaved, v->indexed_vertex_array.bounding_box());

1
src/slic3r/GUI/GUI_ObjectList.cpp
View file

@ -304,6 +304,7 @@ ObjectList::ObjectList(wxWindow* parent) :
ObjectList::~ObjectList() ObjectList::~ObjectList()
{ {
delete m_objects_model;
} }
void ObjectList::set_min_height() void ObjectList::set_min_height()

2
src/slic3r/GUI/GUI_ObjectList.hpp
View file

@ -205,7 +205,7 @@ private:
public: public:
ObjectList(wxWindow* parent); ObjectList(wxWindow* parent);
~ObjectList(); ~ObjectList() override;
void set_min_height(); void set_min_height();
void update_min_height(); void update_min_height();

57
src/slic3r/GUI/Tab.cpp
View file

@ -2572,8 +2572,8 @@ bool Tab::validate_custom_gcode(const wxString& title, const std::string& gcode)
return !invalid; return !invalid;
} }
static void validate_custom_gcode_cb(Tab* tab, ConfigOptionsGroupShp opt_group, const t_config_option_key& opt_key, const boost::any& value) { static void validate_custom_gcode_cb(Tab* tab, const wxString& title, const t_config_option_key& opt_key, const boost::any& value) {
tab->validate_custom_gcodes_was_shown = !Tab::validate_custom_gcode(opt_group->title, boost::any_cast<std::string>(value)); tab->validate_custom_gcodes_was_shown = !Tab::validate_custom_gcode(title, boost::any_cast<std::string>(value));
tab->update_dirty(); tab->update_dirty();
tab->on_value_change(opt_key, value); tab->on_value_change(opt_key, value);
} }
@ -2590,19 +2590,20 @@ void TabFilament::add_filament_overrides_page()
//BBS //BBS
line = optgroup->create_single_option_line(optgroup->get_option(opt_key)); line = optgroup->create_single_option_line(optgroup->get_option(opt_key));
line.near_label_widget = [this, optgroup, opt_key, opt_index](wxWindow* parent) { line.near_label_widget = [this, optgroup_wk = ConfigOptionsGroupWkp(optgroup), opt_key, opt_index](wxWindow* parent) {
wxCheckBox* check_box = new wxCheckBox(parent, wxID_ANY, ""); wxCheckBox* check_box = new wxCheckBox(parent, wxID_ANY, "");
check_box->Bind(wxEVT_CHECKBOX, [optgroup, opt_key, opt_index](wxCommandEvent& evt) { check_box->Bind(wxEVT_CHECKBOX, [optgroup_wk, opt_key, opt_index](wxCommandEvent& evt) {
const bool is_checked = evt.IsChecked(); const bool is_checked = evt.IsChecked();
Field* field = optgroup->get_fieldc(opt_key, opt_index); if (auto optgroup_sh = optgroup_wk.lock(); optgroup_sh) {
if (field != nullptr) { if (Field *field = optgroup_sh->get_fieldc(opt_key, opt_index); field != nullptr) {
field->toggle(is_checked); field->toggle(is_checked);
if (is_checked) if (is_checked)
field->set_last_meaningful_value(); field->set_last_meaningful_value();
else else
field->set_na_value(); field->set_na_value();
} }
}
}, check_box->GetId()); }, check_box->GetId());
m_overrides_options[opt_key] = check_box; m_overrides_options[opt_key] = check_box;
@ -2758,7 +2759,7 @@ void TabFilament::build()
line.append_option(optgroup->get_option("textured_plate_temp")); line.append_option(optgroup->get_option("textured_plate_temp"));
optgroup->append_line(line); optgroup->append_line(line);
optgroup->m_on_change = [this, optgroup](t_config_option_key opt_key, boost::any value) optgroup->m_on_change = [this](t_config_option_key opt_key, boost::any value)
{ {
DynamicPrintConfig& filament_config = wxGetApp().preset_bundle->filaments.get_edited_preset().config; DynamicPrintConfig& filament_config = wxGetApp().preset_bundle->filaments.get_edited_preset().config;
@ -2853,8 +2854,8 @@ void TabFilament::build()
page = add_options_page(L("Advanced"), "advanced"); page = add_options_page(L("Advanced"), "advanced");
optgroup = page->new_optgroup(L("Filament start G-code"), L"param_gcode", 0); optgroup = page->new_optgroup(L("Filament start G-code"), L"param_gcode", 0);
optgroup->m_on_change = [this, optgroup](const t_config_option_key& opt_key, const boost::any& value) { optgroup->m_on_change = [this, &optgroup_title = optgroup->title](const t_config_option_key& opt_key, const boost::any& value) {
validate_custom_gcode_cb(this, optgroup, opt_key, value); validate_custom_gcode_cb(this, optgroup_title, opt_key, value);
}; };
option = optgroup->get_option("filament_start_gcode"); option = optgroup->get_option("filament_start_gcode");
option.opt.full_width = true; option.opt.full_width = true;
@ -2863,8 +2864,8 @@ void TabFilament::build()
optgroup->append_single_option_line(option); optgroup->append_single_option_line(option);
optgroup = page->new_optgroup(L("Filament end G-code"), L"param_gcode", 0); optgroup = page->new_optgroup(L("Filament end G-code"), L"param_gcode", 0);
optgroup->m_on_change = [this, optgroup](const t_config_option_key& opt_key, const boost::any& value) { optgroup->m_on_change = [this, &optgroup_title = optgroup->title](const t_config_option_key& opt_key, const boost::any& value) {
validate_custom_gcode_cb(this, optgroup, opt_key, value); validate_custom_gcode_cb(this, optgroup_title, opt_key, value);
}; };
option = optgroup->get_option("filament_end_gcode"); option = optgroup->get_option("filament_end_gcode");
option.opt.full_width = true; option.opt.full_width = true;
@ -3170,8 +3171,8 @@ void TabPrinter::build_fff()
const int notes_field_height = 25; // 250 const int notes_field_height = 25; // 250
page = add_options_page(L("Machine gcode"), "cog"); page = add_options_page(L("Machine gcode"), "cog");
optgroup = page->new_optgroup(L("Machine start G-code"), L"param_gcode", 0); optgroup = page->new_optgroup(L("Machine start G-code"), L"param_gcode", 0);
optgroup->m_on_change = [this, optgroup](const t_config_option_key& opt_key, const boost::any& value) { optgroup->m_on_change = [this, &optgroup_title = optgroup->title](const t_config_option_key& opt_key, const boost::any& value) {
validate_custom_gcode_cb(this, optgroup, opt_key, value); validate_custom_gcode_cb(this, optgroup_title, opt_key, value);
}; };
option = optgroup->get_option("machine_start_gcode"); option = optgroup->get_option("machine_start_gcode");
option.opt.full_width = true; option.opt.full_width = true;
@ -3180,8 +3181,8 @@ void TabPrinter::build_fff()
optgroup->append_single_option_line(option); optgroup->append_single_option_line(option);
optgroup = page->new_optgroup(L("Machine end G-code"), L"param_gcode", 0); optgroup = page->new_optgroup(L("Machine end G-code"), L"param_gcode", 0);
optgroup->m_on_change = [this, optgroup](const t_config_option_key& opt_key, const boost::any& value) { optgroup->m_on_change = [this, &optgroup_title = optgroup->title](const t_config_option_key& opt_key, const boost::any& value) {
validate_custom_gcode_cb(this, optgroup, opt_key, value); validate_custom_gcode_cb(this, optgroup_title, opt_key, value);
}; };
option = optgroup->get_option("machine_end_gcode"); option = optgroup->get_option("machine_end_gcode");
option.opt.full_width = true; option.opt.full_width = true;
@ -3190,8 +3191,8 @@ void TabPrinter::build_fff()
optgroup->append_single_option_line(option); optgroup->append_single_option_line(option);
optgroup = page->new_optgroup(L("Before layer change G-code"),"param_gcode", 0); optgroup = page->new_optgroup(L("Before layer change G-code"),"param_gcode", 0);
optgroup->m_on_change = [this, optgroup](const t_config_option_key& opt_key, const boost::any& value) { optgroup->m_on_change = [this, &optgroup_title = optgroup->title](const t_config_option_key& opt_key, const boost::any& value) {
validate_custom_gcode_cb(this, optgroup, opt_key, value); validate_custom_gcode_cb(this, optgroup_title, opt_key, value);
}; };
option = optgroup->get_option("before_layer_change_gcode"); option = optgroup->get_option("before_layer_change_gcode");
option.opt.full_width = true; option.opt.full_width = true;
@ -3200,8 +3201,8 @@ void TabPrinter::build_fff()
optgroup->append_single_option_line(option); optgroup->append_single_option_line(option);
optgroup = page->new_optgroup(L("Layer change G-code"), L"param_gcode", 0); optgroup = page->new_optgroup(L("Layer change G-code"), L"param_gcode", 0);
optgroup->m_on_change = [this, optgroup](const t_config_option_key& opt_key, const boost::any& value) { optgroup->m_on_change = [this, &optgroup_title = optgroup->title](const t_config_option_key& opt_key, const boost::any& value) {
validate_custom_gcode_cb(this, optgroup, opt_key, value); validate_custom_gcode_cb(this, optgroup_title, opt_key, value);
}; };
option = optgroup->get_option("layer_change_gcode"); option = optgroup->get_option("layer_change_gcode");
option.opt.full_width = true; option.opt.full_width = true;
@ -3210,8 +3211,8 @@ void TabPrinter::build_fff()
optgroup->append_single_option_line(option); optgroup->append_single_option_line(option);
optgroup = page->new_optgroup(L("Time lapse G-code"), L"param_gcode", 0); optgroup = page->new_optgroup(L("Time lapse G-code"), L"param_gcode", 0);
optgroup->m_on_change = [this, optgroup](const t_config_option_key& opt_key, const boost::any& value) { optgroup->m_on_change = [this, &optgroup_title = optgroup->title](const t_config_option_key& opt_key, const boost::any& value) {
validate_custom_gcode_cb(this, optgroup, opt_key, value); validate_custom_gcode_cb(this, optgroup_title, opt_key, value);
}; };
option = optgroup->get_option("time_lapse_gcode"); option = optgroup->get_option("time_lapse_gcode");
option.opt.full_width = true; option.opt.full_width = true;
@ -3220,8 +3221,8 @@ void TabPrinter::build_fff()
optgroup->append_single_option_line(option); optgroup->append_single_option_line(option);
optgroup = page->new_optgroup(L("Change filament G-code"), L"param_gcode", 0); optgroup = page->new_optgroup(L("Change filament G-code"), L"param_gcode", 0);
optgroup->m_on_change = [this, optgroup](const t_config_option_key& opt_key, const boost::any& value) { optgroup->m_on_change = [this, &optgroup_title = optgroup->title](const t_config_option_key& opt_key, const boost::any& value) {
validate_custom_gcode_cb(this, optgroup, opt_key, value); validate_custom_gcode_cb(this, optgroup_title, opt_key, value);
}; };
option = optgroup->get_option("change_filament_gcode"); option = optgroup->get_option("change_filament_gcode");
option.opt.full_width = true; option.opt.full_width = true;
@ -3230,8 +3231,8 @@ void TabPrinter::build_fff()
optgroup->append_single_option_line(option); optgroup->append_single_option_line(option);
optgroup = page->new_optgroup(L("Pause G-code"), L"param_gcode", 0); optgroup = page->new_optgroup(L("Pause G-code"), L"param_gcode", 0);
optgroup->m_on_change = [this, optgroup](const t_config_option_key& opt_key, const boost::any& value) { optgroup->m_on_change = [this, &optgroup_title = optgroup->title](const t_config_option_key& opt_key, const boost::any& value) {
validate_custom_gcode_cb(this, optgroup, opt_key, value); validate_custom_gcode_cb(this, optgroup_title, opt_key, value);
}; };
option = optgroup->get_option("machine_pause_gcode"); option = optgroup->get_option("machine_pause_gcode");
option.opt.is_code = true; option.opt.is_code = true;
@ -3239,8 +3240,8 @@ void TabPrinter::build_fff()
optgroup->append_single_option_line(option); optgroup->append_single_option_line(option);
optgroup = page->new_optgroup(L("Template Custom G-code"), L"param_gcode", 0); optgroup = page->new_optgroup(L("Template Custom G-code"), L"param_gcode", 0);
optgroup->m_on_change = [this, optgroup](const t_config_option_key& opt_key, const boost::any& value) { optgroup->m_on_change = [this, &optgroup_title = optgroup->title](const t_config_option_key& opt_key, const boost::any& value) {
validate_custom_gcode_cb(this, optgroup, opt_key, value); validate_custom_gcode_cb(this, optgroup_title, opt_key, value);
}; };
option = optgroup->get_option("template_custom_gcode"); option = optgroup->get_option("template_custom_gcode");
option.opt.is_code = true; option.opt.is_code = true;
@ -3468,7 +3469,7 @@ if (is_marlin_flavor)
auto optgroup = page->new_optgroup(L("Single extruder multimaterial setup")); auto optgroup = page->new_optgroup(L("Single extruder multimaterial setup"));
optgroup->append_single_option_line("single_extruder_multi_material", "semm"); optgroup->append_single_option_line("single_extruder_multi_material", "semm");
// Orca: we only support Single Extruder Multi Material, so it's always enabled // Orca: we only support Single Extruder Multi Material, so it's always enabled
// optgroup->m_on_change = [this, optgroup](const t_config_option_key &opt_key, const boost::any &value) { // optgroup->m_on_change = [this](const t_config_option_key &opt_key, const boost::any &value) {
// wxTheApp->CallAfter([this, opt_key, value]() { // wxTheApp->CallAfter([this, opt_key, value]() {
// if (opt_key == "single_extruder_multi_material") { // if (opt_key == "single_extruder_multi_material") {
// build_unregular_pages(); // build_unregular_pages();