From 43a7d347be196b3620e39a639a079ab310cbd964 Mon Sep 17 00:00:00 2001 From: supermerill Date: Sat, 21 Aug 2021 17:35:01 +0200 Subject: [PATCH] some typo & warnings --- src/PrusaSlicer.cpp | 4 ++-- src/libslic3r/PrintConfig.cpp | 2 +- src/libslic3r/libslic3r.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/PrusaSlicer.cpp b/src/PrusaSlicer.cpp index ff951e6b4..24ba4a1b2 100644 --- a/src/PrusaSlicer.cpp +++ b/src/PrusaSlicer.cpp @@ -60,7 +60,7 @@ int CLI::run(int argc, char **argv) set_current_thread_name("slic3r_main"); //init random generator - std::srand(std::time(nullptr)); + std::srand((unsigned int)std::time(nullptr)); #ifdef __WXGTK__ // On Linux, wxGTK has no support for Wayland, and the app crashes on @@ -480,7 +480,7 @@ int CLI::run(int argc, char **argv) if (! m_config.opt_bool("dont_arrange")) { ArrangeParams arrange_cfg; arrange_cfg.min_obj_distance = scaled(PrintConfig::min_object_distance(&m_print_config)) * 2; - arrange_cfg.min_obj_distance += m_print_config.opt_float("duplicate_distance"); + arrange_cfg.min_obj_distance += scaled(m_print_config.opt_float("duplicate_distance")); if (dups > 1) { try { // if all input objects have defined position(s) apply duplication to the whole model diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 54b60265d..565160bbd 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -4413,7 +4413,7 @@ void PrintConfigDef::init_fff_params() "\nAs cylinders are often exported as triangles of varying size, points may not be on the circle circumference." " This setting allows you some leway to broaden the detection." "\nIn mm or in % of the radius."); - def->sidetext = L("mm²"); + def->sidetext = L("mm or %"); def->mode = comExpert; def->set_default_value(new ConfigOptionFloatOrPercent(0.01, false)); diff --git a/src/libslic3r/libslic3r.h b/src/libslic3r/libslic3r.h index a5e8f98dd..71103513b 100644 --- a/src/libslic3r/libslic3r.h +++ b/src/libslic3r/libslic3r.h @@ -57,7 +57,7 @@ static constexpr coordf_t RESOLUTION = 0.0125; #ifdef __linux__ static constexpr coord_t SCALED_RESOLUTION = 12500; #else -static constexpr coord_t SCALED_RESOLUTION = 0.0125 * UNSCALING_FACTOR; +static constexpr coord_t SCALED_RESOLUTION = coord_t(0.0125 * UNSCALING_FACTOR); #endif //for creating circles (for brim_ear) #define POLY_SIDES 24