New selection -> removed obsolete methods\n+\nFixed a few compile warnings

This commit is contained in:
Enrico Turri 2018-10-08 15:17:36 +02:00
parent 384cfa0e6d
commit 9ae6d115a2
14 changed files with 39 additions and 29 deletions

View file

@ -484,14 +484,14 @@ namespace Slic3r {
{
_state.filament_load_times.clear();
for (double t : filament_load_times)
_state.filament_load_times.push_back(t);
_state.filament_load_times.push_back((float)t);
}
void GCodeTimeEstimator::set_filament_unload_times(const std::vector<double> &filament_unload_times)
{
_state.filament_unload_times.clear();
for (double t : filament_unload_times)
_state.filament_unload_times.push_back(t);
_state.filament_unload_times.push_back((float)t);
}
float GCodeTimeEstimator::get_filament_load_time(unsigned int id_extruder)
@ -731,7 +731,7 @@ namespace Slic3r {
#endif // ENABLE_MOVE_STATS
}
_last_st_synchronized_block_id = _blocks.size() - 1;
_last_st_synchronized_block_id = (int)_blocks.size() - 1;
// The additional time has been consumed (added to the total time), reset it to zero.
set_additional_time(0.);
}