3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-12 01:07:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Use .gcode.3mf as ext for gcode 3mf files (#8928)

Browse source
This commit is contained in:
SoftFever 2025-03-16 22:17:38 +08:00 • committed by GitHub
parent 69154652ba
commit e6467d4872
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/slic3r/GUI/GUI_App.cpp
View file

@ -505,7 +505,8 @@ static const FileWildcards file_wildcards_by_type[FT_SIZE] = {
/* FT_OBJ */ { "OBJ files"sv, { ".obj"sv } }, /* FT_OBJ */ { "OBJ files"sv, { ".obj"sv } },
/* FT_AMF */ { "AMF files"sv, { ".amf"sv, ".zip.amf"sv, ".xml"sv } }, /* FT_AMF */ { "AMF files"sv, { ".amf"sv, ".zip.amf"sv, ".xml"sv } },
/* FT_3MF */ { "3MF files"sv, { ".3mf"sv } }, /* FT_3MF */ { "3MF files"sv, { ".3mf"sv } },
/* FT_GCODE */ { "G-code files"sv, { ".gcode"sv, ".3mf"sv } }, /* FT_GCODE_3MF */ {"Gcode 3MF files"sv, {".gcode.3mf"sv}},
/* FT_GCODE */ { "G-code files"sv, { ".gcode"sv} },
#ifdef __APPLE__ #ifdef __APPLE__
/* FT_MODEL */ /* FT_MODEL */
{"Supported files"sv, {".3mf"sv, ".stl"sv, ".oltp"sv, ".stp"sv, ".step"sv, ".svg"sv, ".amf"sv, ".obj"sv, ".usd"sv, ".usda"sv, ".usdc"sv, ".usdz"sv, ".abc"sv, ".ply"sv}}, {"Supported files"sv, {".3mf"sv, ".stl"sv, ".oltp"sv, ".stp"sv, ".step"sv, ".svg"sv, ".amf"sv, ".obj"sv, ".usd"sv, ".usda"sv, ".usdc"sv, ".usdz"sv, ".abc"sv, ".ply"sv}},

1
src/slic3r/GUI/GUI_App.hpp
View file

@ -91,6 +91,7 @@ enum FileType
FT_OBJ, FT_OBJ,
FT_AMF, FT_AMF,
FT_3MF, FT_3MF,
FT_GCODE_3MF,
FT_GCODE, FT_GCODE,
FT_MODEL, FT_MODEL,
FT_ZIP, FT_ZIP,

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

@ -11694,7 +11694,7 @@ void Plater::export_gcode_3mf(bool export_all)
show_error(this, ex.what(), false); show_error(this, ex.what(), false);
return; return;
} }
default_output_file.replace_extension(".3mf"); default_output_file.replace_extension(".gcode.3mf");
default_output_file = fs::path(Slic3r::fold_utf8_to_ascii(default_output_file.string())); default_output_file = fs::path(Slic3r::fold_utf8_to_ascii(default_output_file.string()));
//Get a last save path //Get a last save path
@ -11706,7 +11706,7 @@ void Plater::export_gcode_3mf(bool export_all)
wxFileDialog dlg(this, _L("Save Sliced file as:"), wxFileDialog dlg(this, _L("Save Sliced file as:"),
start_dir, start_dir,
from_path(default_output_file.filename()), from_path(default_output_file.filename()),
GUI::file_wildcards(FT_3MF, ext), GUI::file_wildcards(FT_GCODE_3MF, ""),
wxFD_SAVE | wxFD_OVERWRITE_PROMPT wxFD_SAVE | wxFD_OVERWRITE_PROMPT
); );
if (dlg.ShowModal() == wxID_OK) { if (dlg.ShowModal() == wxID_OK) {