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

Implemented naming of the SLA export file based on the output file name

Browse source 
template.

Reworked naming of the plater exports to not use the output file name
template, but to derive the file name from the first printable object's name.

Fixed error handling: Reimpemented the Perl's "eval" blocks
as try / catch blocks.
This commit is contained in:
bubnikv 2018-12-03 13:14:28 +01:00
parent 041fae8148
commit d46d0dc365
25 changed files with 474 additions and 344 deletions
src/slic3r/GUI
MainFrame.cpp

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

@ -681,10 +681,9 @@ void MainFrame::load_config_file(wxString file/* = wxEmptyString*/)
}
try {
wxGetApp().preset_bundle->load_config_file(file.ToStdString());
} catch (std::exception & /* ex */) {
// Dont proceed further if the config file cannot be loaded.
// if (Slic3r::GUI::catch_error(this))
// return;
} catch (const std::exception &ex) {
show_error(this, ex.what());
return;
}
wxGetApp().load_current_presets();
wxGetApp().app_config->update_config_dir(get_dir_name(file));
@ -696,9 +695,9 @@ void MainFrame::export_configbundle()
if (!wxGetApp().check_unsaved_changes())
return;
// validate current configuration in case it's dirty
auto valid = wxGetApp().preset_bundle->full_config().validate();
if (!valid.empty()) {
// Slic3r::GUI::catch_error(this);
auto err = wxGetApp().preset_bundle->full_config().validate();
if (! err.empty()) {
show_error(this, err);
return;
}
// Ask user for a file name.
@ -715,8 +714,8 @@ void MainFrame::export_configbundle()
wxGetApp().app_config->update_config_dir(get_dir_name(file));
try {
wxGetApp().preset_bundle->export_configbundle(file.ToStdString());
} catch (std::exception & /* ex */) {
// Slic3r::GUI::catch_error(this);
} catch (const std::exception &ex) {
show_error(this, ex.what());
}
}
}
@ -742,9 +741,10 @@ void MainFrame::load_configbundle(wxString file/* = wxEmptyString, const bool re
auto presets_imported = 0;
try {
presets_imported = wxGetApp().preset_bundle->load_configbundle(file.ToStdString());
} catch (std::exception & /* ex */) {
// Slic3r::GUI::catch_error(this) and return;
presets_imported = wxGetApp().preset_bundle->load_configbundle(file.ToStdString());
} catch (const std::exception &ex) {
show_error(this, ex.what());
return;
}
// Load the currently selected preset into the GUI, update the preset selection box.