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

ENH: refine filename when exporting gcode.3mf

Browse source 
Change-Id: Icace408c89f9d9da4695723ea8757ab023f85849
Signed-off-by: Stone Li <stone.li@bambulab.com>
This commit is contained in:
Stone Li 2022-08-15 16:10:48 +08:00 • committed by Lane.Wei
parent 2866e33304
commit 639bb98396
3 changed files with 50 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/slic3r/GUI/PartPlate.hpp
View file

@ -74,7 +74,7 @@ public:
}; };
private: private:
PartPlateList* m_partplate_list; PartPlateList* m_partplate_list {nullptr };
Plater* m_plater; //Plater reference, not own it Plater* m_plater; //Plater reference, not own it
Model* m_model; //Model reference, not own it Model* m_model; //Model reference, not own it
PrinterTechnology printer_technology; PrinterTechnology printer_technology;
@ -507,7 +507,7 @@ public:
m_height_limit_mode = mode; m_height_limit_mode = mode;
} }
int get_curr_plate_index() { return m_current_plate; } int get_curr_plate_index() const { return m_current_plate; }
PartPlate* get_curr_plate() { return m_plate_list[m_current_plate]; } PartPlate* get_curr_plate() { return m_plate_list[m_current_plate]; }
PartPlate* get_selected_plate(); PartPlate* get_selected_plate();

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

@ -1821,6 +1821,7 @@ struct Plater::priv
// returns the path to project file with the given extension (none if extension == wxEmptyString) // returns the path to project file with the given extension (none if extension == wxEmptyString)
// extension should contain the leading dot, i.e.: ".3mf" // extension should contain the leading dot, i.e.: ".3mf"
wxString get_project_filename(const wxString& extension = wxEmptyString) const; wxString get_project_filename(const wxString& extension = wxEmptyString) const;
wxString get_export_gcode_filename(const wxString& extension = wxEmptyString, bool only_filename = false) const;
void set_project_filename(const wxString& filename); void set_project_filename(const wxString& filename);
//BBS store bbs project name //BBS store bbs project name
@ -5568,8 +5569,30 @@ PlateBBoxData Plater::priv::generate_first_layer_bbox()
wxString Plater::priv::get_project_filename(const wxString& extension) const wxString Plater::priv::get_project_filename(const wxString& extension) const
{ {
auto full_filename = m_project_folder / std::string((m_project_name + extension).mb_str(wxConvUTF8)); if (m_project_name.empty())
return m_project_folder.empty() ? "" : from_path(full_filename); return "";
else {
auto full_filename = m_project_folder / std::string((m_project_name + extension).mb_str(wxConvUTF8));
return m_project_folder.empty() ? "" : from_path(full_filename);
}
}
wxString Plater::priv::get_export_gcode_filename(const wxString& extension, bool only_filename) const
{
std::string plate_index_str = (boost::format("_plate_%1%") % std::to_string(partplate_list.get_curr_plate_index() + 1)).str();
if (!m_project_folder.empty()) {
if (!only_filename) {
auto full_filename = m_project_folder / std::string((m_project_name + plate_index_str + extension).mb_str(wxConvUTF8));
return from_path(full_filename);
} else {
return m_project_name + wxString(plate_index_str) + extension;
}
} else {
if (only_filename)
return m_project_name + wxString(plate_index_str) + extension;
else
return "";
}
} }
wxString Plater::priv::get_project_name() wxString Plater::priv::get_project_name()
@ -7869,16 +7892,28 @@ void Plater::export_gcode_3mf()
//calc default_output_file, get default output file from background process //calc default_output_file, get default output file from background process
fs::path default_output_file; fs::path default_output_file;
default_output_file = into_path(get_project_filename(".3mf")); AppConfig& appconfig = *wxGetApp().app_config;
if (default_output_file.empty()) std::string start_dir;
default_output_file = into_path(get_project_name() + ".3mf"); default_output_file = into_path(get_export_gcode_filename(".3mf"));
if (default_output_file.empty()) {
try {
start_dir = appconfig.get_last_output_dir("", false);
wxString filename = get_export_gcode_filename(".3mf", true);
std::string full_filename = start_dir + "/" + filename.utf8_string();
default_output_file = boost::filesystem::path(full_filename);
} catch(...) {
;
}
}
//BBS replace gcode extension to .gcode.3mf //BBS replace gcode extension to .gcode.3mf
default_output_file = default_output_file.replace_extension(".gcode.3mf"); default_output_file = 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()));
AppConfig &appconfig = *wxGetApp().app_config;
//Get a last save path //Get a last save path
std::string start_dir = appconfig.get_last_output_dir(default_output_file.parent_path().string(), false); start_dir = appconfig.get_last_output_dir(default_output_file.parent_path().string(), false);
fs::path output_path; fs::path output_path;
{ {
std::string ext = default_output_file.extension().string(); std::string ext = default_output_file.extension().string();
@ -8854,6 +8889,11 @@ wxString Plater::get_project_filename(const wxString& extension) const
return p->get_project_filename(extension); return p->get_project_filename(extension);
} }
wxString Plater::get_export_gcode_filename(const wxString & extension, bool only_filename) const
{
return p->get_export_gcode_filename(extension, only_filename);
}
void Plater::set_project_filename(const wxString& filename) void Plater::set_project_filename(const wxString& filename)
{ {
p->set_project_filename(filename); p->set_project_filename(filename);

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

@ -370,6 +370,7 @@ public:
//void show_action_buttons(const bool is_ready_to_slice) const; //void show_action_buttons(const bool is_ready_to_slice) const;
wxString get_project_filename(const wxString& extension = wxEmptyString) const; wxString get_project_filename(const wxString& extension = wxEmptyString) const;
wxString get_export_gcode_filename(const wxString& extension = wxEmptyString, bool only_filename = false) const;
void set_project_filename(const wxString& filename); void set_project_filename(const wxString& filename);
bool is_export_gcode_scheduled() const; bool is_export_gcode_scheduled() const;