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

Do not reset sl1 import dialog settings between imports

Browse Source
This commit is contained in:
tamasmeszaros 2021-11-05 15:29:58 +01:00
parent fb429c1e23
commit 1c940ef145
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/slic3r/GUI/Jobs/SLAImportJob.cpp
View File

@ -122,7 +122,9 @@ public:
std::string err; std::string err;
ConfigSubstitutions config_substitutions; ConfigSubstitutions config_substitutions;
priv(Plater *plt) : plater{plt} {} ImportDlg import_dlg;
priv(Plater *plt) : plater{plt}, import_dlg{plt} {}
}; };
SLAImportJob::SLAImportJob(std::shared_ptr<ProgressIndicator> pri, Plater *plater) SLAImportJob::SLAImportJob(std::shared_ptr<ProgressIndicator> pri, Plater *plater)
@ -176,14 +178,12 @@ void SLAImportJob::prepare()
{ {
reset(); reset();
ImportDlg dlg{p->plater}; if (p->import_dlg.ShowModal() == wxID_OK) {
auto path = p->import_dlg.get_path();
if (dlg.ShowModal() == wxID_OK) {
auto path = dlg.get_path();
auto nm = wxFileName(path); auto nm = wxFileName(path);
p->path = !nm.Exists(wxFILE_EXISTS_REGULAR) ? "" : nm.GetFullPath(); p->path = !nm.Exists(wxFILE_EXISTS_REGULAR) ? "" : nm.GetFullPath();
p->sel = dlg.get_selection(); p->sel = p->import_dlg.get_selection();
p->win = dlg.get_marchsq_windowsize(); p->win = p->import_dlg.get_marchsq_windowsize();
p->config_substitutions.clear(); p->config_substitutions.clear();
} else { } else {
p->path = ""; p->path = "";