3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-23 08:41:11 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Connected filament_ramming_parameters to respective dialog, other minor changes

Browse source
This commit is contained in:
Lukas Matena 2018-03-28 15:37:10 +02:00
parent 56fef5302c
commit 1b4dc685f4
5 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
xs/src/libslic3r/GCode/WipeTowerPrusaMM.cpp
View file

@ -800,7 +800,7 @@ void WipeTowerPrusaMM::toolchange_Unload(
const float start_x = writer.x();
turning_point = ( xr-start_x > start_x-xl ? xr : xl );
const float max_x_dist = 2*std::abs(start_x-turning_point);
const unsigned int N = 4 + std::max(0,(m_filpar[m_current_tool].cooling_time-14)/3);
const unsigned int N = 4 + std::max(0.f, (m_filpar[m_current_tool].cooling_time-14)/3);
float time = m_filpar[m_current_tool].cooling_time / float(N);
i = 0;

4
xs/src/libslic3r/GCode/WipeTowerPrusaMM.hpp
View file

@ -67,7 +67,7 @@ public:
// Set the extruder properties.
void set_extruder(size_t idx, material_type material, int temp, int first_layer_temp, float loading_speed,
float unloading_speed, float delay, int cooling_time, std::string ramming_parameters)
float unloading_speed, float delay, float cooling_time, std::string ramming_parameters)
{
//while (m_filpar.size() < idx+1) // makes sure the required element is in the vector
m_filpar.push_back(FilamentParameters());
@ -205,7 +205,7 @@ private:
float loading_speed = 0.f;
float unloading_speed = 0.f;
float delay = 0.f ;
int cooling_time = 0;
float cooling_time = 0.f;
float ramming_line_width_multiplicator = 0.f;
float ramming_step_multiplicator = 0.f;
std::vector<float> ramming_speed;