some typo & warnings

This commit is contained in:
supermerill 2021-08-21 17:35:01 +02:00
parent 474e202a65
commit 43a7d347be
3 changed files with 4 additions and 4 deletions

View File

@ -60,7 +60,7 @@ int CLI::run(int argc, char **argv)
set_current_thread_name("slic3r_main"); set_current_thread_name("slic3r_main");
//init random generator //init random generator
std::srand(std::time(nullptr)); std::srand((unsigned int)std::time(nullptr));
#ifdef __WXGTK__ #ifdef __WXGTK__
// On Linux, wxGTK has no support for Wayland, and the app crashes on // 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")) { if (! m_config.opt_bool("dont_arrange")) {
ArrangeParams arrange_cfg; ArrangeParams arrange_cfg;
arrange_cfg.min_obj_distance = scaled(PrintConfig::min_object_distance(&m_print_config)) * 2; 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) { if (dups > 1) {
try { try {
// if all input objects have defined position(s) apply duplication to the whole model // if all input objects have defined position(s) apply duplication to the whole model

View File

@ -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." "\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." " This setting allows you some leway to broaden the detection."
"\nIn mm or in % of the radius."); "\nIn mm or in % of the radius.");
def->sidetext = L("mm²"); def->sidetext = L("mm or %");
def->mode = comExpert; def->mode = comExpert;
def->set_default_value(new ConfigOptionFloatOrPercent(0.01, false)); def->set_default_value(new ConfigOptionFloatOrPercent(0.01, false));

View File

@ -57,7 +57,7 @@ static constexpr coordf_t RESOLUTION = 0.0125;
#ifdef __linux__ #ifdef __linux__
static constexpr coord_t SCALED_RESOLUTION = 12500; static constexpr coord_t SCALED_RESOLUTION = 12500;
#else #else
static constexpr coord_t SCALED_RESOLUTION = 0.0125 * UNSCALING_FACTOR; static constexpr coord_t SCALED_RESOLUTION = coord_t(0.0125 * UNSCALING_FACTOR);
#endif #endif
//for creating circles (for brim_ear) //for creating circles (for brim_ear)
#define POLY_SIDES 24 #define POLY_SIDES 24