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

Fixed usage of custom filename extension in SLA mode, broken in 283fd6f.

Browse Source
This commit is contained in:
Lukas Matena 2023-12-22 13:38:01 +01:00
parent eede1f1e9c
commit e922fdceb4
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -567,7 +567,7 @@ wxString file_wildcards(FileType file_type, const std::string &custom_extension)
return file_wildcards(file_wildcards_by_type[file_type], custom_extension); return file_wildcards(file_wildcards_by_type[file_type], custom_extension);
} }
wxString sla_wildcards(const char *formatid) wxString sla_wildcards(const char *formatid, const std::string& custom_extension)
{ {
const ArchiveEntry *entry = get_archive_entry(formatid); const ArchiveEntry *entry = get_archive_entry(formatid);
wxString ret; wxString ret;
@ -587,11 +587,11 @@ wxString sla_wildcards(const char *formatid)
wc.file_extensions.emplace_back(ext); wc.file_extensions.emplace_back(ext);
} }
ret = file_wildcards(wc, {}); ret = file_wildcards(wc, custom_extension);
} }
if (ret.empty()) if (ret.empty())
ret = file_wildcards(FT_SL1); ret = file_wildcards(FT_SL1, custom_extension);
return ret; return ret;
} }

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

@ -85,7 +85,7 @@ enum FileType
extern wxString file_wildcards(FileType file_type, const std::string &custom_extension = {}); extern wxString file_wildcards(FileType file_type, const std::string &custom_extension = {});
wxString sla_wildcards(const char *formatid); wxString sla_wildcards(const char *formatid, const std::string& custom_extension);
enum ConfigMenuIDs { enum ConfigMenuIDs {
ConfigMenuWizard, ConfigMenuWizard,

2
src/slic3r/GUI/Plater.cpp
View File

@ -6794,7 +6794,7 @@ void Plater::export_gcode(bool prefer_removable)
start_dir, start_dir,
from_path(default_output_file.filename()), from_path(default_output_file.filename()),
printer_technology() == ptFFF ? GUI::file_wildcards(FT_GCODE, ext) : printer_technology() == ptFFF ? GUI::file_wildcards(FT_GCODE, ext) :
GUI::sla_wildcards(p->sla_print.printer_config().sla_archive_format.value.c_str()), GUI::sla_wildcards(p->sla_print.printer_config().sla_archive_format.value.c_str(), ext),
wxFD_SAVE | wxFD_OVERWRITE_PROMPT wxFD_SAVE | wxFD_OVERWRITE_PROMPT
); );
if (dlg.ShowModal() == wxID_OK) { if (dlg.ShowModal() == wxID_OK) {