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

Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk

Browse Source
This commit is contained in:
Enrico Turri 2019-09-17 08:19:57 +02:00
commit 5ae2a39e2f
5 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/slic3r/GUI/AppConfig.cpp
View File

@ -26,7 +26,7 @@ namespace Slic3r {
static const std::string VENDOR_PREFIX = "vendor:"; static const std::string VENDOR_PREFIX = "vendor:";
static const std::string MODEL_PREFIX = "model:"; static const std::string MODEL_PREFIX = "model:";
static const std::string VERSION_CHECK_URL = "http://files.prusa3d.com/wp-content/uploads/repository/PrusaSlicer-settings-master/live/PrusaSlicer.version"; static const std::string VERSION_CHECK_URL = "https://files.prusa3d.com/wp-content/uploads/repository/PrusaSlicer-settings-master/live/PrusaSlicer.version";
void AppConfig::reset() void AppConfig::reset()
{ {

3
src/slic3r/GUI/GUI_ObjectList.cpp
View File

@ -1401,7 +1401,8 @@ wxMenuItem* ObjectList::append_menu_item_settings(wxMenu* menu_)
menu->SetFirstSeparator(); menu->SetFirstSeparator();
// Add frequently settings // Add frequently settings
create_freq_settings_popupmenu(menu, sel_vol==nullptr); const bool is_object_settings = m_objects_model->GetItemType(GetSelection()) == itObject;
create_freq_settings_popupmenu(menu, is_object_settings);
if (mode == comAdvanced) if (mode == comAdvanced)
return nullptr; return nullptr;

6
src/slic3r/GUI/GUI_ObjectSettings.cpp
View File

@ -106,6 +106,12 @@ bool ObjectSettings::update_settings_list()
update_settings_list(); update_settings_list();
m_parent->Layout(); m_parent->Layout();
}); });
/* Check overriden options list after deleting.
* Some options couldn't be deleted because of another one.
* Like, we couldn't delete fill pattern, if fill density is set to 100%
*/
update_config_values(config);
}); });
return btn; return btn;
}; };

10
src/slic3r/Utils/PresetUpdater.cpp
View File

@ -245,6 +245,16 @@ void PresetUpdater::priv::sync_version() const
}) })
.on_complete([&](std::string body, unsigned /* http_status */) { .on_complete([&](std::string body, unsigned /* http_status */) {
boost::trim(body); boost::trim(body);
const auto nl_pos = body.find_first_of("\n\r");
if (nl_pos != std::string::npos) {
body.resize(nl_pos);
}
if (! Semver::parse(body)) {
BOOST_LOG_TRIVIAL(warning) << boost::format("Received invalid contents from `%1%`: Not a correct semver: `%2%`") % SLIC3R_APP_NAME % body;
return;
}
BOOST_LOG_TRIVIAL(info) << boost::format("Got %1% online version: `%2%`. Sending to GUI thread...") % SLIC3R_APP_NAME % body; BOOST_LOG_TRIVIAL(info) << boost::format("Got %1% online version: `%2%`. Sending to GUI thread...") % SLIC3R_APP_NAME % body;
wxCommandEvent* evt = new wxCommandEvent(EVT_SLIC3R_VERSION_ONLINE); wxCommandEvent* evt = new wxCommandEvent(EVT_SLIC3R_VERSION_ONLINE);

2
xs/xsp/ExtrusionEntityCollection.xsp
View File

@ -9,7 +9,7 @@
%name{_new} ExtrusionEntityCollection(); %name{_new} ExtrusionEntityCollection();
~ExtrusionEntityCollection(); ~ExtrusionEntityCollection();
Clone<ExtrusionEntityCollection> clone() Clone<ExtrusionEntityCollection> clone()
%code{% RETVAL = THIS->clone(); %}; %code{% RETVAL = (ExtrusionEntityCollection*)THIS->clone(); %};
void reverse(); void reverse();
void clear(); void clear();
ExtrusionEntityCollection* chained_path(bool no_reverse, ExtrusionRole role = erMixed) ExtrusionEntityCollection* chained_path(bool no_reverse, ExtrusionRole role = erMixed)