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

Wipe tower update fixes

Browse source
This commit is contained in:
bubnikv 2018-12-06 15:40:41 +01:00
parent 79986188a7
commit e41f8b9bc7
1 changed files with 21 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1046,6 +1046,7 @@ private:
bool can_arrange() const; bool can_arrange() const;
bool can_mirror() const; bool can_mirror() const;
void update_fff_scene();
void update_sla_scene(); void update_sla_scene();
}; };
@ -1961,7 +1962,7 @@ unsigned int Plater::priv::update_background_process()
// bitmap of enum UpdateBackgroundProcessReturnState // bitmap of enum UpdateBackgroundProcessReturnState
unsigned int return_state = 0; unsigned int return_state = 0;
// If the async_apply_config() was not called by the timer, kill the timer, so the async_apply_config() // If the update_background_process() was not called by the timer, kill the timer, so the async_apply_config()
// will not be called again in vain. // will not be called again in vain.
this->background_process_timer.Stop(); this->background_process_timer.Stop();
// Update the "out of print bed" state of ModelInstances. // Update the "out of print bed" state of ModelInstances.
@ -1992,11 +1993,8 @@ unsigned int Plater::priv::update_background_process()
// but the G-code paths are calculated first once the preview is made visible. // but the G-code paths are calculated first once the preview is made visible.
this->preview->reload_print(); this->preview->reload_print();
// We also need to reload 3D scene because of the wipe tower preview box // We also need to reload 3D scene because of the wipe tower preview box
if (this->config->opt_bool("wipe_tower")) { if (this->config->opt_bool("wipe_tower"))
// std::vector<int> selections = this->collect_selections();
// this->canvas3D->set_objects_selections(selections);
return_state |= UPDATE_BACKGROUND_PROCESS_REFRESH_SCENE; return_state |= UPDATE_BACKGROUND_PROCESS_REFRESH_SCENE;
}
break; break;
case ptSLA: case ptSLA:
return_state |= UPDATE_BACKGROUND_PROCESS_REFRESH_SCENE; return_state |= UPDATE_BACKGROUND_PROCESS_REFRESH_SCENE;
@ -2046,6 +2044,18 @@ void Plater::priv::async_apply_config()
} }
} }
void Plater::priv::update_fff_scene()
{
if (this->preview != nullptr)
this->preview->reload_print();
// In case this was MM print, wipe tower bounding box on 3D tab might need redrawing with exact depth:
#if ENABLE_REMOVE_TABS_FROM_PLATER
view3D->reload_scene(true);
#else
this->canvas3D->reload_scene(true);
#endif // ENABLE_REMOVE_TABS_FROM_PLATER
}
void Plater::priv::update_sla_scene() void Plater::priv::update_sla_scene()
{ {
// Update the SLAPrint from the current Model, so that the reload_scene() // Update the SLAPrint from the current Model, so that the reload_scene()
@ -2227,8 +2237,7 @@ void Plater::priv::on_slicing_update(SlicingStatusEvent &evt)
if (evt.status.flags & PrintBase::SlicingStatus::RELOAD_SCENE) { if (evt.status.flags & PrintBase::SlicingStatus::RELOAD_SCENE) {
switch (this->printer_technology) { switch (this->printer_technology) {
case ptFFF: case ptFFF:
if (this->preview != nullptr) this->update_fff_scene();
this->preview->reload_print();
break; break;
case ptSLA: case ptSLA:
#if ENABLE_REMOVE_TABS_FROM_PLATER #if ENABLE_REMOVE_TABS_FROM_PLATER
@ -2248,12 +2257,7 @@ void Plater::priv::on_slicing_completed(wxCommandEvent &)
{ {
switch (this->printer_technology) { switch (this->printer_technology) {
case ptFFF: case ptFFF:
if (this->preview != nullptr) this->update_fff_scene();
this->preview->reload_print();
// in case this was MM print, wipe tower bounding box on 3D tab might need redrawing with exact depth:
// auto selections = collect_selections();
// this->canvas3D->set_objects_selections(selections);
// this->canvas3D->reload_scene(true);
break; break;
case ptSLA: case ptSLA:
#if ENABLE_REMOVE_TABS_FROM_PLATER #if ENABLE_REMOVE_TABS_FROM_PLATER
@ -2300,8 +2304,7 @@ void Plater::priv::on_process_completed(wxCommandEvent &evt)
// refresh preview // refresh preview
switch (this->printer_technology) { switch (this->printer_technology) {
case ptFFF: case ptFFF:
if (this->preview != nullptr) this->update_fff_scene();
this->preview->reload_print();
break; break;
case ptSLA: case ptSLA:
#if ENABLE_REMOVE_TABS_FROM_PLATER #if ENABLE_REMOVE_TABS_FROM_PLATER
@ -2959,8 +2962,9 @@ void Plater::on_config_change(const DynamicPrintConfig &config)
if (p->preview) p->preview->set_bed_shape(p->config->option<ConfigOptionPoints>(opt_key)->values); if (p->preview) p->preview->set_bed_shape(p->config->option<ConfigOptionPoints>(opt_key)->values);
update_scheduled = true; update_scheduled = true;
} }
else if(opt_key == "wipe_tower" /*|| opt_key == "filament_minimal_purge_on_wipe_tower"*/ || // ? #ys_FIXME else if (boost::starts_with(opt_key, "wipe_tower") ||
opt_key == "single_extruder_multi_material") { // opt_key == "filament_minimal_purge_on_wipe_tower" // ? #ys_FIXME
opt_key == "single_extruder_multi_material") {
update_scheduled = true; update_scheduled = true;
} }
// else if(opt_key == "serial_port") { // else if(opt_key == "serial_port") {