Replace multitude of Extruder fields with querying a PrintConfig object by id.

This commit is contained in:
Y. Sapir 2014-04-27 00:28:32 +03:00
parent b319dc9361
commit 2565d80679
7 changed files with 38 additions and 140 deletions

View file

@ -3,55 +3,28 @@
#include <myinit.h>
#include "Point.hpp"
#include "PrintConfig.hpp"
namespace Slic3r {
class Extruder
{
public:
Extruder(int id, bool use_relative_e_distances,
const Point *extruder_offset,
double nozzle_diameter,
double filament_diameter,
double extrusion_multiplier,
int temperature,
int first_layer_temperature,
double retract_length,
double retract_lift,
int retract_speed,
double retract_restart_extra,
double retract_before_travel,
bool retract_layer_change,
double retract_length_toolchange,
double retract_restart_extra_toolchange,
double wipe);
Extruder(int id, PrintConfig *config);
virtual ~Extruder() {}
void reset();
double extrude(double dE);
bool use_relative_e_distances() const;
int id;
bool use_relative_e_distances;
double E;
double absolute_E;
double retracted;
double restart_extra;
// options:
Point extruder_offset;
double nozzle_diameter;
double filament_diameter;
double extrusion_multiplier;
int temperature;
int first_layer_temperature;
double retract_length;
double retract_lift;
int retract_speed;
double retract_restart_extra;
double retract_before_travel;
bool retract_layer_change;
double retract_length_toolchange;
double retract_restart_extra_toolchange;
double wipe;
// TODO: maybe better to keep a reference to an existing object than copy it
PrintConfig config;
};
}