3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix of "Repir from File menu doesn't save the file #2064"

Browse source 
The file was saved, albeit using an "obj" format, but into a file
with an ".stl" extension.
The software was fixed to propose a file to save with a correct ".obj"
extension.
This commit is contained in:
bubnikv 2019-04-13 14:45:35 +02:00
parent 1e455bc065
commit 255a4e05dc
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/slic3r/GUI/MainFrame.cpp
View file

@ -549,7 +549,7 @@ void MainFrame::quick_slice(const int qs)
dlg->ShowModal(); dlg->ShowModal();
return; return;
} }
if (std::ifstream(m_qs_last_input_file.char_str())) { if (std::ifstream(m_qs_last_input_file.ToUTF8().data())) {
auto dlg = new wxMessageDialog(this, _(L("Previously sliced file ("))+m_qs_last_input_file+_(L(") not found.")), auto dlg = new wxMessageDialog(this, _(L("Previously sliced file ("))+m_qs_last_input_file+_(L(") not found.")),
_(L("File Not Found")), wxICON_ERROR | wxOK); _(L("File Not Found")), wxICON_ERROR | wxOK);
dlg->ShowModal(); dlg->ShowModal();
@ -664,24 +664,23 @@ void MainFrame::repair_stl()
dlg->Destroy(); dlg->Destroy();
} }
auto output_file = input_file; wxString output_file = input_file;
{ {
// output_file = ~s / \.[sS][tT][lL]$ / _fixed.obj / ;
auto dlg = new wxFileDialog( this, L("Save OBJ file (less prone to coordinate errors than STL) as:"), auto dlg = new wxFileDialog( this, L("Save OBJ file (less prone to coordinate errors than STL) as:"),
get_dir_name(output_file), get_base_name(output_file), get_dir_name(output_file), get_base_name(output_file, ".obj"),
file_wildcards(FT_OBJ), wxFD_SAVE | wxFD_OVERWRITE_PROMPT); file_wildcards(FT_OBJ), wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
if (dlg->ShowModal() != wxID_OK) { if (dlg->ShowModal() != wxID_OK) {
dlg->Destroy(); dlg->Destroy();
return /*undef*/; return;
} }
output_file = dlg->GetPath(); output_file = dlg->GetPath();
dlg->Destroy(); dlg->Destroy();
} }
auto tmesh = new Slic3r::TriangleMesh(); auto tmesh = new Slic3r::TriangleMesh();
tmesh->ReadSTLFile(input_file.char_str()); tmesh->ReadSTLFile(input_file.ToUTF8().data());
tmesh->repair(); tmesh->repair();
tmesh->WriteOBJFile(output_file.char_str()); tmesh->WriteOBJFile(output_file.ToUTF8().data());
Slic3r::GUI::show_info(this, L("Your file was repaired."), L("Repair")); Slic3r::GUI::show_info(this, L("Your file was repaired."), L("Repair"));
} }
@ -921,9 +920,12 @@ void MainFrame::update_ui_from_settings()
tab->update_ui_from_settings(); tab->update_ui_from_settings();
} }
std::string MainFrame::get_base_name(const wxString &full_name) const std::string MainFrame::get_base_name(const wxString &full_name, const char *extension) const
{ {
return boost::filesystem::path(full_name.wx_str()).filename().string(); boost::filesystem::path filename = boost::filesystem::path(full_name.wx_str()).filename();
if (extension != nullptr)
filename = filename.replace_extension(extension);
return filename.string();
} }
std::string MainFrame::get_dir_name(const wxString &full_name) const std::string MainFrame::get_dir_name(const wxString &full_name) const

2
src/slic3r/GUI/MainFrame.hpp
View file

@ -54,7 +54,7 @@ class MainFrame : public DPIFrame
PrintHostQueueDialog *m_printhost_queue_dlg; PrintHostQueueDialog *m_printhost_queue_dlg;
std::string get_base_name(const wxString &full_name) const; std::string get_base_name(const wxString &full_name, const char *extension = nullptr) const;
std::string get_dir_name(const wxString &full_name) const; std::string get_dir_name(const wxString &full_name) const;
void on_presets_changed(SimpleEvent&); void on_presets_changed(SimpleEvent&);