mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-11-22 18:31:02 -07:00
Fixed second batch of locale-dependent calls
This commit is contained in:
Lukas Matena
parent
9ee2fc8275
commit
fef385cd6b
13 changed files with 78 additions and 45 deletions
|
|
@ -2,6 +2,7 @@
|
|||
#include "../Exception.hpp"
|
||||
#include "../Model.hpp"
|
||||
#include "../Utils.hpp"
|
||||
#include "../LocalesUtils.hpp"
|
||||
#include "../GCode.hpp"
|
||||
#include "../Geometry.hpp"
|
||||
#include "../GCode/ThumbnailData.hpp"
|
||||
|
|
@ -2408,6 +2409,7 @@ namespace Slic3r {
|
|||
};
|
||||
|
||||
auto format_coordinate = [](float f, char *buf) -> char* {
|
||||
assert(is_decimal_separator_point());
|
||||
#if EXPORT_3MF_USE_SPIRIT_KARMA_FP
|
||||
// Slightly faster than sprintf("%.9g"), but there is an issue with the karma floating point formatter,
|
||||
// https://github.com/boostorg/spirit/pull/586
|
||||
|
|
@ -2575,6 +2577,7 @@ namespace Slic3r {
|
|||
|
||||
bool _3MF_Exporter::_add_layer_height_profile_file_to_archive(mz_zip_archive& archive, Model& model)
|
||||
{
|
||||
assert(is_decimal_separator_point());
|
||||
std::string out = "";
|
||||
char buffer[1024];
|
||||
|
||||
|
|
@ -2666,6 +2669,7 @@ namespace Slic3r {
|
|||
|
||||
bool _3MF_Exporter::_add_sla_support_points_file_to_archive(mz_zip_archive& archive, Model& model)
|
||||
{
|
||||
assert(is_decimal_separator_point());
|
||||
std::string out = "";
|
||||
char buffer[1024];
|
||||
|
||||
|
|
@ -2700,6 +2704,7 @@ namespace Slic3r {
|
|||
|
||||
bool _3MF_Exporter::_add_sla_drain_holes_file_to_archive(mz_zip_archive& archive, Model& model)
|
||||
{
|
||||
assert(is_decimal_separator_point());
|
||||
const char *const fmt = "object_id=%d|";
|
||||
std::string out;
|
||||
|
||||
|
|
@ -2750,6 +2755,7 @@ namespace Slic3r {
|
|||
|
||||
bool _3MF_Exporter::_add_print_config_file_to_archive(mz_zip_archive& archive, const DynamicPrintConfig &config)
|
||||
{
|
||||
assert(is_decimal_separator_point());
|
||||
char buffer[1024];
|
||||
sprintf(buffer, "; %s\n\n", header_slic3r_generated().c_str());
|
||||
std::string out = buffer;
|
||||
|
|
@ -2926,6 +2932,9 @@ bool load_3mf(const char* path, DynamicPrintConfig* config, Model* model, bool c
|
|||
if (path == nullptr || config == nullptr || model == nullptr)
|
||||
return false;
|
||||
|
||||
// All import should use "C" locales for number formatting.
|
||||
CNumericLocalesSetter locales_setter;
|
||||
|
||||
_3MF_Importer importer;
|
||||
bool res = importer.load_model_from_file(path, *model, *config, check_version);
|
||||
importer.log_errors();
|
||||
|
|
@ -2934,6 +2943,9 @@ bool load_3mf(const char* path, DynamicPrintConfig* config, Model* model, bool c
|
|||
|
||||
bool store_3mf(const char* path, Model* model, const DynamicPrintConfig* config, bool fullpath_sources, const ThumbnailData* thumbnail_data, bool zip64)
|
||||
{
|
||||
// All export should use "C" locales for number formatting.
|
||||
CNumericLocalesSetter locales_setter;
|
||||
|
||||
if (path == nullptr || model == nullptr)
|
||||
return false;
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
#include "../I18N.hpp"
|
||||
#include "../Geometry.hpp"
|
||||
#include "../CustomGCode.hpp"
|
||||
#include "../LocalesUtils.hpp"
|
||||
|
||||
#include "AMF.hpp"
|
||||
|
||||
|
|
@ -498,6 +499,7 @@ void AMFParserContext::characters(const XML_Char *s, int len)
|
|||
|
||||
void AMFParserContext::endElement(const char * /* name */)
|
||||
{
|
||||
assert(is_decimal_separator_point());
|
||||
switch (m_path.back()) {
|
||||
|
||||
// Constellation transformation:
|
||||
|
|
@ -1052,6 +1054,8 @@ bool load_amf_archive(const char* path, DynamicPrintConfig* config, Model* model
|
|||
// If config is not a null pointer, updates it if the amf file/archive contains config data
|
||||
bool load_amf(const char* path, DynamicPrintConfig* config, Model* model, bool check_version)
|
||||
{
|
||||
CNumericLocalesSetter locales_setter; // use "C" locales and point as a decimal separator
|
||||
|
||||
if (boost::iends_with(path, ".amf.xml"))
|
||||
// backward compatibility with older slic3r output
|
||||
return load_amf_file(path, config, model);
|
||||
|
|
@ -1251,40 +1255,25 @@ bool store_amf(const char* path, Model* model, const DynamicPrintConfig* config,
|
|||
stream << " </object>\n";
|
||||
if (!object->instances.empty()) {
|
||||
for (ModelInstance *instance : object->instances) {
|
||||
char buf[512];
|
||||
::sprintf(buf,
|
||||
" <instance objectid=\"%zu\">\n"
|
||||
" <deltax>%lf</deltax>\n"
|
||||
" <deltay>%lf</deltay>\n"
|
||||
" <deltaz>%lf</deltaz>\n"
|
||||
" <rx>%lf</rx>\n"
|
||||
" <ry>%lf</ry>\n"
|
||||
" <rz>%lf</rz>\n"
|
||||
" <scalex>%lf</scalex>\n"
|
||||
" <scaley>%lf</scaley>\n"
|
||||
" <scalez>%lf</scalez>\n"
|
||||
" <mirrorx>%lf</mirrorx>\n"
|
||||
" <mirrory>%lf</mirrory>\n"
|
||||
" <mirrorz>%lf</mirrorz>\n"
|
||||
" <printable>%d</printable>\n"
|
||||
" </instance>\n",
|
||||
object_id,
|
||||
instance->get_offset(X),
|
||||
instance->get_offset(Y),
|
||||
instance->get_offset(Z),
|
||||
instance->get_rotation(X),
|
||||
instance->get_rotation(Y),
|
||||
instance->get_rotation(Z),
|
||||
instance->get_scaling_factor(X),
|
||||
instance->get_scaling_factor(Y),
|
||||
instance->get_scaling_factor(Z),
|
||||
instance->get_mirror(X),
|
||||
instance->get_mirror(Y),
|
||||
instance->get_mirror(Z),
|
||||
instance->printable);
|
||||
std::stringstream buf;
|
||||
buf << " <instance objectid=\"" << object_id << "\">\n"
|
||||
<< " <deltax>" << instance->get_offset(X) << "</deltax>\n"
|
||||
<< " <deltay>" << instance->get_offset(Y) << "</deltay>\n"
|
||||
<< " <deltaz>" << instance->get_offset(Z) << "</deltaz>\n"
|
||||
<< " <rx>" << instance->get_rotation(X) << "</rx>\n"
|
||||
<< " <ry>" << instance->get_rotation(Y) << "</ry>\n"
|
||||
<< " <rz>" << instance->get_rotation(Z) << "</rz>\n"
|
||||
<< " <scalex>" << instance->get_scaling_factor(X) << "</scalex>\n"
|
||||
<< " <scaley>" << instance->get_scaling_factor(Y) << "</scaley>\n"
|
||||
<< " <scalez>" << instance->get_scaling_factor(Z) << "</scalez>\n"
|
||||
<< " <mirrorx>" << instance->get_mirror(X) << "</mirrorx>\n"
|
||||
<< " <mirrory>" << instance->get_mirror(Y) << "</mirrory>\n"
|
||||
<< " <mirrorz>" << instance->get_mirror(Z) << "</mirrorz>\n"
|
||||
<< " <printable>" << instance->printable << "</printable>\n"
|
||||
<< " </instance>\n";
|
||||
|
||||
//FIXME missing instance->scaling_factor
|
||||
instances.append(buf);
|
||||
instances.append(buf.str());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,6 +13,6 @@ extern bool load_amf(const char* path, DynamicPrintConfig* config, Model* model,
|
|||
// The model could be modified during the export process if meshes are not repaired or have no shared vertices
|
||||
extern bool store_amf(const char* path, Model* model, const DynamicPrintConfig* config, bool fullpath_sources);
|
||||
|
||||
}; // namespace Slic3r
|
||||
} // namespace Slic3r
|
||||
|
||||
#endif /* slic3r_Format_AMF_hpp_ */
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@
|
|||
|
||||
#include "objparser.hpp"
|
||||
|
||||
#include "libslic3r/LocalesUtils.hpp"
|
||||
|
||||
namespace ObjParser {
|
||||
|
||||
static bool obj_parseline(const char *line, ObjData &data)
|
||||
|
|
@ -15,6 +17,8 @@ static bool obj_parseline(const char *line, ObjData &data)
|
|||
if (*line == 0)
|
||||
return true;
|
||||
|
||||
assert(is_decimal_separator_point());
|
||||
|
||||
// Ignore whitespaces at the beginning of the line.
|
||||
//FIXME is this a good idea?
|
||||
EATWS();
|
||||
|
|
@ -322,6 +326,8 @@ static bool obj_parseline(const char *line, ObjData &data)
|
|||
|
||||
bool objparse(const char *path, ObjData &data)
|
||||
{
|
||||
Slic3r::CNumericLocalesSetter locales_setter;
|
||||
|
||||
FILE *pFile = boost::nowide::fopen(path, "rt");
|
||||
if (pFile == 0)
|
||||
return false;
|
||||
|
|
@ -365,6 +371,8 @@ bool objparse(const char *path, ObjData &data)
|
|||
|
||||
bool objparse(std::istream &stream, ObjData &data)
|
||||
{
|
||||
Slic3r::CNumericLocalesSetter locales_setter;
|
||||
|
||||
try {
|
||||
char buf[65536 * 2];
|
||||
size_t len = 0;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue