GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-13 17:58:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

move version to 2.2.51.1

Browse Source 
a log & failsafe for when the ui file is bad/not complete.
This commit is contained in:
supermerill 2020-06-05 15:14:48 +02:00
parent 055cfb80c9
commit c68e94daf2
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/slic3r/GUI/Tab.cpp
View File

@ -1123,7 +1123,7 @@ t_change set_or_add(t_change previous, t_change toadd) {
} }
catch (const std::exception & ex) { catch (const std::exception & ex) {
std::cout << "Exception while calling group event about "<<opt_key<<": " << ex.what(); std::cerr << "Exception while calling group event about "<<opt_key<<": " << ex.what();
throw ex; throw ex;
} }
}; };
@ -1131,10 +1131,13 @@ t_change set_or_add(t_change previous, t_change toadd) {
bool Tab::create_pages(std::string setting_type_name, int idx_page) bool Tab::create_pages(std::string setting_type_name, int idx_page)
{ {
std::cout << "create settings " << setting_type_name << "\n";
//search for the file //search for the file
const boost::filesystem::path ui_layout_file = (boost::filesystem::path(resources_dir()) / "ui_layout" / setting_type_name).make_preferred(); const boost::filesystem::path ui_layout_file = (boost::filesystem::path(resources_dir()) / "ui_layout" / setting_type_name).make_preferred();
if (! boost::filesystem::exists(ui_layout_file)) return false; if (!boost::filesystem::exists(ui_layout_file)) {
std::cerr << "Error: cannot create " << setting_type_name << "settings, cannot find file " << ui_layout_file << "\n";
return false;
}else
std::cout << "create settings " << setting_type_name << "\n";
#ifdef __WXMSW__ #ifdef __WXMSW__
bool first_page = true; bool first_page = true;
@ -3268,6 +3271,7 @@ wxSizer* TabPrinter::create_bed_shape_widget(wxWindow* parent)
void Tab::compatible_widget_reload(PresetDependencies &deps) void Tab::compatible_widget_reload(PresetDependencies &deps)
{ {
if (deps.btn == nullptr) return; // check if it has been initalised (should be, but someone may want to remove it from the ui)
bool has_any = ! m_config->option<ConfigOptionStrings>(deps.key_list)->values.empty(); bool has_any = ! m_config->option<ConfigOptionStrings>(deps.key_list)->values.empty();
has_any ? deps.btn->Enable() : deps.btn->Disable(); has_any ? deps.btn->Enable() : deps.btn->Disable();
deps.checkbox->SetValue(! has_any); deps.checkbox->SetValue(! has_any);

4
version.inc
View File

@ -5,5 +5,5 @@ set(SLIC3R_APP_NAME "SuperSlicer")
set(SLIC3R_APP_KEY "SuperSlicer") set(SLIC3R_APP_KEY "SuperSlicer")
set(SLIC3R_VERSION "2.2.51") set(SLIC3R_VERSION "2.2.51")
set(SLIC3R_BUILD_ID "SuperSlicer_${SLIC3R_VERSION}+UNKNOWN") set(SLIC3R_BUILD_ID "SuperSlicer_${SLIC3R_VERSION}+UNKNOWN")
set(SLIC3R_RC_VERSION "2,2,51,0") set(SLIC3R_RC_VERSION "2,2,51,1")
set(SLIC3R_RC_VERSION_DOTS "2.2.51.0") set(SLIC3R_RC_VERSION_DOTS "2.2.51.1")