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

Merge branch 'et_reload_from_disk' of https://github.com/prusa3d/PrusaSlicer into dev

Browse source
This commit is contained in:
Enrico Turri 2019-09-11 15:36:23 +02:00
commit 22ab022088
1 changed files with 32 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
src/slic3r/GUI/Plater.cpp
View file

@ -1936,6 +1936,7 @@ private:
* */ * */
std::string m_last_fff_printer_profile_name; std::string m_last_fff_printer_profile_name;
std::string m_last_sla_printer_profile_name; std::string m_last_sla_printer_profile_name;
bool m_update_objects_list_on_loading{ true };
}; };
const std::regex Plater::priv::pattern_bundle(".*[.](amf|amf[.]xml|zip[.]amf|3mf|prusa)", std::regex::icase); const std::regex Plater::priv::pattern_bundle(".*[.](amf|amf[.]xml|zip[.]amf|3mf|prusa)", std::regex::icase);
@ -2460,8 +2461,11 @@ std::vector<size_t> Plater::priv::load_model_objects(const ModelObjectPtrs &mode
_(L("Object too large?"))); _(L("Object too large?")));
} }
for (const size_t idx : obj_idxs) { if (m_update_objects_list_on_loading)
wxGetApp().obj_list()->add_object_to_list(idx); {
for (const size_t idx : obj_idxs) {
wxGetApp().obj_list()->add_object_to_list(idx);
}
} }
update(); update();
@ -3095,6 +3099,9 @@ void Plater::priv::reload_from_disk()
// disable render to avoid to show intermediate states // disable render to avoid to show intermediate states
view3D->get_canvas3d()->enable_render(false); view3D->get_canvas3d()->enable_render(false);
// disable update of objects list while loading to avoid to show intermediate states
m_update_objects_list_on_loading = false;
const auto new_idxs = load_files(input_paths, true, false); const auto new_idxs = load_files(input_paths, true, false);
if (new_idxs.empty()) if (new_idxs.empty())
{ {
@ -3103,33 +3110,43 @@ void Plater::priv::reload_from_disk()
return; return;
} }
for (const auto idx : new_idxs) { for (const auto idx : new_idxs)
{
ModelObject *object = model.objects[idx]; ModelObject *object = model.objects[idx];
object->config.apply(object_orig->config); object->config.apply(object_orig->config);
object->clear_instances(); object->clear_instances();
for (const ModelInstance *instance : object_orig->instances) { for (const ModelInstance *instance : object_orig->instances)
{
object->add_instance(*instance); object->add_instance(*instance);
} }
if (object->volumes.size() == object_orig->volumes.size()) { for (const ModelVolume* v : object_orig->volumes)
for (size_t i = 0; i < object->volumes.size(); i++) { {
if (v->is_modifier())
object->add_volume(*v);
}
if (object->volumes.size() == object_orig->volumes.size())
{
for (size_t i = 0; i < object->volumes.size(); i++)
{
object->volumes[i]->config.apply(object_orig->volumes[i]->config); object->volumes[i]->config.apply(object_orig->volumes[i]->config);
} }
} }
if (object->instances.size() > 1)
{
sidebar->obj_list()->increase_object_instances(idx, object->instances.size());
for (int i = 0; i < (int)object->instances.size(); ++i)
{
sidebar->obj_list()->update_printable_state((int)idx, i);
}
}
// XXX: Restore more: layer_height_ranges, layer_height_profile (?) // XXX: Restore more: layer_height_ranges, layer_height_profile (?)
} }
// re-enable update of objects list
m_update_objects_list_on_loading = true;
// puts the new objects into the list
for (const auto idx : new_idxs)
{
wxGetApp().obj_list()->add_object_to_list(idx);
}
remove(obj_orig_idx); remove(obj_orig_idx);
// new GLVolumes have been created at this point, so update their printable state // new GLVolumes have been created at this point, so update their printable state
@ -3148,8 +3165,6 @@ void Plater::priv::reload_from_disk()
{ {
selection.add_instance((unsigned int)idx - 1, instance_idx, false); selection.add_instance((unsigned int)idx - 1, instance_idx, false);
} }
wxGetApp().obj_list()->update_and_show_object_settings_item();
} }
void Plater::priv::fix_through_netfabb(const int obj_idx, const int vol_idx/* = -1*/) void Plater::priv::fix_through_netfabb(const int obj_idx, const int vol_idx/* = -1*/)