3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-29 11:41:20 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch 'master' of https://github.com/prusa3d/Slic3r into svg_icons

Browse source
This commit is contained in:
Enrico Turri 2019-02-27 11:16:28 +01:00
commit 922224541b
3 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libslic3r/Format/3mf.cpp
View file

@ -1755,7 +1755,7 @@ namespace Slic3r {
// Conversion of a floating-point value to text and back is exact as long as at least max_digits10 were used (9 for float, 17 for double). // Conversion of a floating-point value to text and back is exact as long as at least max_digits10 were used (9 for float, 17 for double).
// It is guaranteed to produce the same floating-point value, even though the intermediate text representation is not exact. // It is guaranteed to produce the same floating-point value, even though the intermediate text representation is not exact.
// The default value of std::stream precision is 6 digits only! // The default value of std::stream precision is 6 digits only!
stream << std::defaultfloat << std::setprecision(std::numeric_limits<float>::max_digits10); stream << std::setprecision(std::numeric_limits<float>::max_digits10);
stream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"; stream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
stream << "<" << MODEL_TAG << " unit=\"millimeter\" xml:lang=\"en-US\" xmlns=\"http://schemas.microsoft.com/3dmanufacturing/core/2015/02\" xmlns:slic3rpe=\"http://schemas.slic3r.org/3mf/2017/06\">\n"; stream << "<" << MODEL_TAG << " unit=\"millimeter\" xml:lang=\"en-US\" xmlns=\"http://schemas.microsoft.com/3dmanufacturing/core/2015/02\" xmlns:slic3rpe=\"http://schemas.slic3r.org/3mf/2017/06\">\n";
stream << " <" << METADATA_TAG << " name=\"" << SLIC3RPE_3MF_VERSION << "\">" << VERSION_3MF << "</" << METADATA_TAG << ">\n"; stream << " <" << METADATA_TAG << " name=\"" << SLIC3RPE_3MF_VERSION << "\">" << VERSION_3MF << "</" << METADATA_TAG << ">\n";

2
src/libslic3r/Format/AMF.cpp
View file

@ -861,7 +861,7 @@ bool store_amf(const char *path, Model *model, const DynamicPrintConfig *config)
// Conversion of a floating-point value to text and back is exact as long as at least max_digits10 were used (9 for float, 17 for double). // Conversion of a floating-point value to text and back is exact as long as at least max_digits10 were used (9 for float, 17 for double).
// It is guaranteed to produce the same floating-point value, even though the intermediate text representation is not exact. // It is guaranteed to produce the same floating-point value, even though the intermediate text representation is not exact.
// The default value of std::stream precision is 6 digits only! // The default value of std::stream precision is 6 digits only!
stream << std::defaultfloat << std::setprecision(std::numeric_limits<float>::max_digits10); stream << std::setprecision(std::numeric_limits<float>::max_digits10);
stream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"; stream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
stream << "<amf unit=\"millimeter\">\n"; stream << "<amf unit=\"millimeter\">\n";
stream << "<metadata type=\"cad\">Slic3r " << SLIC3R_VERSION << "</metadata>\n"; stream << "<metadata type=\"cad\">Slic3r " << SLIC3R_VERSION << "</metadata>\n";

3
src/slic3r/GUI/wxExtensions.cpp
View file

@ -1483,8 +1483,7 @@ PrusaDoubleSlider::PrusaDoubleSlider(wxWindow *parent,
line_pens = { &DARK_GREY_PEN, &GREY_PEN, &LIGHT_GREY_PEN }; line_pens = { &DARK_GREY_PEN, &GREY_PEN, &LIGHT_GREY_PEN };
segm_pens = { &DARK_ORANGE_PEN, &ORANGE_PEN, &LIGHT_ORANGE_PEN }; segm_pens = { &DARK_ORANGE_PEN, &ORANGE_PEN, &LIGHT_ORANGE_PEN };
wxPaintDC dc(this); const wxFont& font = GetFont();
const wxFont& font = dc.GetFont();
m_font = is_osx ? font.Smaller().Smaller() : font.Smaller(); m_font = is_osx ? font.Smaller().Smaller() : font.Smaller();
} }