GitHub-Proxy/OrcaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SoftFever/OrcaSlicer.git synced 2025-08-05 15:10:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix of the previous commit (fixing warnings)

Browse Source
This commit is contained in:
Vojtech Bubnik 2021-02-09 19:46:09 +01:00
parent 5e9a8ea700
commit 20456b45e5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libslic3r/Fill/FillRectilinear.cpp
View File

@ -2245,13 +2245,13 @@ static std::vector<MonotonicRegionLink> chain_monotonic_regions(
#endif /* NDEBUG */ #endif /* NDEBUG */
// How many times to repeat the ant simulation (number of ant generations). // How many times to repeat the ant simulation (number of ant generations).
constexpr int const const num_rounds = 25; constexpr int const num_rounds = 25;
// After how many rounds without an improvement to exit? // After how many rounds without an improvement to exit?
constexpr int const num_rounds_no_change_exit = 8; constexpr int const num_rounds_no_change_exit = 8;
// With how many ants each of the run will be performed? // With how many ants each of the run will be performed?
const int const num_ants = std::min(int(regions.size()), 10); const int num_ants = std::min(int(regions.size()), 10);
// Base (initial) pheromone level. This value will be adjusted based on the length of the first greedy path found. // Base (initial) pheromone level. This value will be adjusted based on the length of the first greedy path found.
float pheromone_initial_deposit = 0.5f; float pheromone_initial_deposit = 0.5f;
// Evaporation rate of pheromones. // Evaporation rate of pheromones.
constexpr float const pheromone_evaporation = 0.1f; constexpr float const pheromone_evaporation = 0.1f;
// Evaporation rate to diversify paths taken by individual ants. // Evaporation rate to diversify paths taken by individual ants.

2
src/slic3r/Utils/RetinaHelperImpl.mm
View File

@ -11,7 +11,7 @@
namespace Slic3r { namespace Slic3r {
namespace GUI { namespace GUI {
RetinaHelper::RetinaHelper(wxWindow*) RetinaHelper::RetinaHelper(wxWindow *window)
{ {
m_self = nullptr; m_self = nullptr;
m_self = [[RetinaHelperImpl alloc] initWithView:window->GetHandle() handler:window->GetEventHandler()]; m_self = [[RetinaHelperImpl alloc] initWithView:window->GetHandle() handler:window->GetEventHandler()];