Bugfix: spiral vase was not working when extrusion axis was not E. #2350

This commit is contained in:
Alessandro Ranellucci 2014-11-23 18:59:18 +01:00
parent c1e26a70f8
commit 2c64c3dd5b
5 changed files with 35 additions and 9 deletions

View file

@ -29,14 +29,7 @@ void
GCodeWriter::apply_print_config(const PrintConfig &print_config)
{
this->config.apply(print_config, true);
if (FLAVOR_IS(gcfMach3)) {
this->_extrusion_axis = "A";
} else if (FLAVOR_IS(gcfNoExtrusion)) {
this->_extrusion_axis = "";
} else {
this->_extrusion_axis = this->config.extrusion_axis;
}
this->_extrusion_axis = this->config.get_extrusion_axis();
}
void

View file

@ -372,6 +372,17 @@ class GCodeConfig : public virtual StaticPrintConfig
return NULL;
};
std::string get_extrusion_axis() const
{
if (this->gcode_flavor.value == gcfMach3) {
return "A";
} else if (this->gcode_flavor.value == gcfNoExtrusion) {
return "";
} else {
return this->extrusion_axis.value;
}
};
};
class PrintConfig : public GCodeConfig

View file

@ -51,6 +51,7 @@
%code{% THIS->apply(*other, true); %};
std::vector<std::string> get_keys()
%code{% THIS->keys(&RETVAL); %};
std::string get_extrusion_axis();
};
%name{Slic3r::Config::Print} class PrintConfig {
@ -71,6 +72,7 @@
%code{% THIS->apply(*other, true); %};
std::vector<std::string> get_keys()
%code{% THIS->keys(&RETVAL); %};
std::string get_extrusion_axis();
};
%name{Slic3r::Config::PrintRegion} class PrintRegionConfig {
@ -141,6 +143,7 @@
%code{% THIS->apply(*other, true); %};
std::vector<std::string> get_keys()
%code{% THIS->keys(&RETVAL); %};
std::string get_extrusion_axis();
};
%package{Slic3r::Config};