GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-01 05:52:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not run preset updater and rebuild bundle map on ConfigWizard::run

Browse Source 
Call preset updater sync and update check before CW as it always was.
This commit is contained in:
David Kocik 2024-06-14 10:43:28 +02:00
parent 7a41ad4937
commit e7e9b8c7a1
3 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/slic3r/GUI/ConfigWizard.cpp
View File

@ -692,7 +692,7 @@ PageUpdateManager::PageUpdateManager(ConfigWizard* parent_in)
wxBusyCursor wait;
if (manager->set_selected_repositories()) {
wizard_p()->is_config_from_archive = true;
wizard_p()->set_config_updated_from_archive(true);
wizard_p()->set_config_updated_from_archive(true, true);
}
else
revert_page_selection();
@ -3652,14 +3652,12 @@ bool ConfigWizard::priv::check_sla_selected()
return false;
}
void ConfigWizard::priv::set_config_updated_from_archive(bool is_updated)
void ConfigWizard::priv::set_config_updated_from_archive(bool load_installed_printers, bool run_preset_updater)
{
// is updated is false if this is first call since ConfigWizard::run and RunReason is not RR_USER
if (is_updated)
{
// THIS IS NOT A MAIN THREAD!
// This set with preset_updater used to be done in GUI_App::run_wizard before ConfigWizard::run()
if (run_preset_updater) {
// This block of preset_updater functions is done in GUI_App::run_wizard before ConfigWizard::run()
// It needs to be also done when repos are confirmed inside wizard.
// Possible optimalization - do not run this block if no repos were changed.
GUI_App& app = wxGetApp();
// Do blocking sync on every change of archive repos, so user is always offered recent profiles.
const SharedArchiveRepositoryVector &repos = app.plater()->get_preset_archive_database()->get_selected_archive_repositories();
@ -3668,9 +3666,11 @@ void ConfigWizard::priv::set_config_updated_from_archive(bool is_updated)
app.preset_updater->update_index_db();
app.preset_updater->config_update(app.app_config->orig_version(), PresetUpdater::UpdateParams::SHOW_TEXT_BOX, repos);
// We have now probably changed data. We need to rebuild or database from which wizards constructs.
// We have now probably changed data. We need to rebuild database from which wizards constructs.
// Just reload bundles and upadte installed printer from appconfig_new.
bundles = BundleMap::load();
}
if (load_installed_printers) {
// Initialize the is_visible flag in printer Presets
for (auto& pair : bundles)
pair.second.preset_bundle->load_installed_printers(appconfig_new);
@ -4096,7 +4096,7 @@ bool ConfigWizard::run(RunReason reason, StartPage start_page)
p->set_run_reason(reason);
p->set_start_page(start_page);
p->is_config_from_archive = reason == RR_USER;
p->set_config_updated_from_archive(p->is_config_from_archive);
p->set_config_updated_from_archive(p->is_config_from_archive, false);
if (ShowModal() == wxID_OK) {
bool apply_keeped_changes = false;

2
src/slic3r/GUI/ConfigWizard_private.hpp
View File

@ -709,7 +709,7 @@ struct ConfigWizard::priv
bool check_sla_selected(); // Used to decide whether to display SLA Materials page
int em() const { return index->em(); }
void set_config_updated_from_archive(bool is_updated);
void set_config_updated_from_archive(bool load_installed_printers, bool run_preset_updater);
Repository* get_repo(const std::string& repo_id);

22
src/slic3r/GUI/GUI_App.cpp
View File

@ -3264,15 +3264,27 @@ bool GUI_App::run_wizard(ConfigWizard::RunReason reason, ConfigWizard::StartPage
m_login_dialog.reset();
}
#endif // 0
plater()->get_preset_archive_database()->sync_blocking();
// ConfigWizard can take some time to start. Because it is a wxWidgets window, it has to be done in UI thread,
// so displaying a nice modal dialog and letting the CW start in a worker thread is not an option.
// Let's at least show a modeless dialog before the UI thread freezes.
auto cw_loading_dlg = new ConfigWizardLoadingDialog(mainframe, _L("Loading Configuration Wizard..."));
// ConfigWizard can take some time to start. Because it is a wxWidgets window, it has to be done
// in UI thread, so displaying a nice modal dialog and letting the CW start in a worker thread
// is not an option. Let's at least show a modeless dialog before the UI thread freezes.
auto cw_loading_dlg = new ConfigWizardLoadingDialog(mainframe, _L("Loading Configuration Wizard..."));
cw_loading_dlg->CenterOnParent();
cw_loading_dlg->Show();
wxYield();
// We have to update repos
plater()->get_preset_archive_database()->sync_blocking();
if (reason == ConfigWizard::RunReason::RR_USER) {
// Since there might be new repos, we need to sync preset updater
const SharedArchiveRepositoryVector &repos = plater()->get_preset_archive_database()->get_selected_archive_repositories();
preset_updater->sync_blocking(preset_bundle, this, repos);
preset_updater->update_index_db();
// Offer update installation.
preset_updater->config_update(app_config->orig_version(), PresetUpdater::UpdateParams::SHOW_TEXT_BOX, repos);
}
auto wizard = new ConfigWizard(mainframe);
cw_loading_dlg->Close();